mirror of
https://github.com/fergalmoran/flameshot.git
synced 2025-12-22 09:51:06 +00:00
Updating snap to core20 (#1951)
Updated snap to core20 and latest KDE framework.
This commit is contained in:
2
.github/workflows/Linux-pack.yml
vendored
2
.github/workflows/Linux-pack.yml
vendored
@@ -637,6 +637,8 @@ jobs:
|
|||||||
- name: Packaging snap
|
- name: Packaging snap
|
||||||
uses: snapcore/action-build@v1
|
uses: snapcore/action-build@v1
|
||||||
id: snapcraft
|
id: snapcraft
|
||||||
|
with:
|
||||||
|
snapcraft-args: --enable-experimental-extensions
|
||||||
- name: Rename snap name
|
- name: Rename snap name
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
name: flameshot
|
name: flameshot
|
||||||
adopt-info: flameshot
|
adopt-info: flameshot
|
||||||
base: core18
|
base: core20
|
||||||
summary: Powerful yet simple to use screenshot software
|
summary: Powerful yet simple to use screenshot software
|
||||||
description: |
|
description: |
|
||||||
A powerful open source screenshot and annotation tool for Linux, Flameshot
|
A powerful open source screenshot and annotation tool for Linux, Flameshot
|
||||||
@@ -18,8 +18,8 @@ architectures:
|
|||||||
|
|
||||||
apps:
|
apps:
|
||||||
flameshot:
|
flameshot:
|
||||||
command: flameshot
|
command: usr/local/bin/flameshot
|
||||||
desktop: usr/share/applications/org.flameshot.Flameshot.desktop
|
desktop: usr/local/share/applications/org.flameshot.Flameshot.desktop
|
||||||
extensions:
|
extensions:
|
||||||
- kde-neon
|
- kde-neon
|
||||||
environment:
|
environment:
|
||||||
@@ -34,22 +34,15 @@ apps:
|
|||||||
- network
|
- network
|
||||||
- network-bind
|
- network-bind
|
||||||
- opengl
|
- opengl
|
||||||
- pulseaudio
|
|
||||||
- wayland
|
|
||||||
- unity7
|
|
||||||
- x11
|
- x11
|
||||||
|
- wayland
|
||||||
|
|
||||||
parts:
|
parts:
|
||||||
flameshot:
|
flameshot:
|
||||||
build-snaps:
|
build-snaps:
|
||||||
- kde-frameworks-5-core18-sdk
|
- kde-frameworks-5-qt-5-15-core20
|
||||||
- kde-frameworks-5-core18
|
|
||||||
- cmake #core18 does not have new enough cmake so install from snap
|
|
||||||
plugin: cmake
|
|
||||||
configflags:
|
|
||||||
- '-DCMAKE_BUILD_TYPE=RelWithDebInfo'
|
|
||||||
- '-DCMAKE_INSTALL_PREFIX=/usr'
|
|
||||||
source: https://github.com/flameshot-org/flameshot.git
|
source: https://github.com/flameshot-org/flameshot.git
|
||||||
|
plugin: cmake
|
||||||
source-type: git
|
source-type: git
|
||||||
override-pull: |
|
override-pull: |
|
||||||
snapcraftctl pull
|
snapcraftctl pull
|
||||||
@@ -60,27 +53,19 @@ parts:
|
|||||||
override-build: |
|
override-build: |
|
||||||
snapcraftctl build
|
snapcraftctl build
|
||||||
# Correct the Icon path
|
# Correct the Icon path
|
||||||
sed -i 's|^Exec=flameshot|Exec=/snap/bin/org.flameshot.Flameshot|' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/org.flameshot.Flameshot.desktop
|
sed -i 's|^Exec=flameshot|Exec=/snap/bin/org.flameshot.Flameshot|' ${SNAPCRAFT_PART_INSTALL}/usr/local/share/applications/org.flameshot.Flameshot.desktop
|
||||||
sed -i 's|^Icon=.*|Icon=${SNAP}/usr/share/icons/hicolor/scalable/apps/org.flameshot.Flameshot.svg|' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/org.flameshot.Flameshot.desktop
|
sed -i 's|^Icon=.*|Icon=${SNAP}/usr/local/share/icons/hicolor/scalable/apps/org.flameshot.Flameshot.svg|' ${SNAPCRAFT_PART_INSTALL}/usr/local/share/applications/org.flameshot.Flameshot.desktop
|
||||||
sed -i 's/^\(Name\(\[.\+\]\)\?=.*\)$/\1 (Snappy Edition)/g' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/org.flameshot.Flameshot.desktop
|
sed -i 's/^\(Name\(\[.\+\]\)\?=.*\)$/\1 (Snappy Edition)/g' ${SNAPCRAFT_PART_INSTALL}/usr/local/share/applications/org.flameshot.Flameshot.desktop
|
||||||
build-packages:
|
build-packages:
|
||||||
- g++
|
- g++
|
||||||
- make
|
- make
|
||||||
- qt5-default
|
- qt5-default
|
||||||
- qttools5-dev-tools
|
- git
|
||||||
- libqt5svg5-dev
|
|
||||||
stage-packages:
|
stage-packages:
|
||||||
- dbus-x11
|
- dbus-x11
|
||||||
- libgtk2.0-0
|
- libgtk2.0-0
|
||||||
- openssl
|
- openssl
|
||||||
- ca-certificates
|
- ca-certificates
|
||||||
- qtwayland5
|
|
||||||
- libqt5dbus5
|
|
||||||
- libqt5network5
|
|
||||||
- libqt5core5a
|
|
||||||
- libqt5widgets5
|
|
||||||
- libqt5gui5
|
|
||||||
- libqt5svg5
|
|
||||||
- libxkbcommon0
|
- libxkbcommon0
|
||||||
- ttf-ubuntu-font-family
|
- ttf-ubuntu-font-family
|
||||||
- dmz-cursor-theme
|
- dmz-cursor-theme
|
||||||
@@ -89,12 +74,6 @@ parts:
|
|||||||
- gnome-themes-standard
|
- gnome-themes-standard
|
||||||
- shared-mime-info
|
- shared-mime-info
|
||||||
- libgdk-pixbuf2.0-0
|
- libgdk-pixbuf2.0-0
|
||||||
prime:
|
|
||||||
# libquazip5-1 pulls in Qt5 from bionic as a dependency. We don't
|
|
||||||
# want it in our snap, however, because we get a newer Qt5 from the
|
|
||||||
# kde-kf5 platform snap.
|
|
||||||
- "-usr/lib/x86_64-linux-gnu/libQt5*"
|
|
||||||
- "-usr/lib/x86_64-linux-gnu/libqt5*"
|
|
||||||
slots:
|
slots:
|
||||||
# Depending on in which environment we're running we either need
|
# Depending on in which environment we're running we either need
|
||||||
# to use the system or session DBus so we also need to have one
|
# to use the system or session DBus so we also need to have one
|
||||||
|
|||||||
Reference in New Issue
Block a user