[neon/extras/skrooge/Neon/release] /: update to core20 snap

Jonathan Riddell null at kde.org
Wed Mar 3 17:06:13 GMT 2021


Git commit 7f2a0c14260c5f28545fae9afe0efd2aef8756e8 by Jonathan Riddell.
Committed on 03/03/2021 at 17:05.
Pushed by jriddell into branch 'Neon/release'.

update to core20 snap

M  +45   -12   snapcraft.yaml

https://invent.kde.org/neon/extras/skrooge/commit/7f2a0c14260c5f28545fae9afe0efd2aef8756e8

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 7887b68..8f95094 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -4,7 +4,7 @@ version: 2.24.6
 adopt-info: skrooge
 confinement: strict
 grade: devel
-base: core18
+base: core20
 apps:
     skrooge:
         command: kf5-launch skrooge
@@ -27,20 +27,39 @@ slots:
         bus: session
 plugs:
     kde-frameworks-5-plug:
-        content: kde-frameworks-5-core18-all
+        content: kde-frameworks-5-qt-5-15-core20-all
         interface: content
-        default-provider: kde-frameworks-5-core18
+        default-provider: kde-frameworks-5-qt-5-15-core20
         target: kf5
+package-repositories:
+-   type: apt
+    components:
+    - main
+    suites:
+    - focal
+    key-id: 444DABCF3667D0283F894EDDE6D4736255751E5D
+    url: http://origin.archive.neon.kde.org/user
+    key-server: keyserver.ubuntu.com
 parts:
     kde-frameworks-5-env:
         plugin: dump
+        filesets:
+            exclusion:
+            - "-usr/lib/*/cmake/*"
+            - "-usr/include/*"
+            - "-usr/share/ECM/*"
+            - "-usr/share/doc/*"
+            - "-usr/share/man/*"
+            - "-usr/share/icons/breeze-dark*"
+            - "-usr/bin/X11"
+            - "-usr/lib/gcc/x86_64-linux-gnu/6.0.0"
+            - "-usr/lib/aspell/*"
         prime:
-        - kf5-launch
-        - kf5
+        - "$exclusion"
         source: https://anongit.kde.org/snap-kf5-launcher.git
     skrooge:
         build-snaps:
-        - kde-frameworks-5-core18-sdk
+        - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
         after:
         - kde-frameworks-5-env
         plugin: cmake
@@ -52,20 +71,34 @@ parts:
         - libsqlcipher-dev
         - xsltproc
         stage-packages:
-        - libgrantlee5-dev
-        - libkf5kdelibs4support-dev
-        - libofx-dev
-        - libqca-qt5-2-dev
-        - libsqlcipher-dev
+        - libgrantlee5
+        - libkf5kdelibs4support
+        - libofx
+        - libqca-qt5-2
+        - libsqlcipher
         - freeglut3
         - libgrantlee-templates5
         - libslang2
         source: https://anongit.kde.org/skrooge.git
-        configflags:
+        cmake-parameters:
         - "-DCMAKE_INSTALL_PREFIX=/usr"
         - "-DCMAKE_BUILD_TYPE=Release"
         - "-DENABLE_TESTING=OFF"
         - "-DBUILD_TESTING=OFF"
         - "-DKDE_SKIP_TEST_SETTINGS=ON"
+        - "-DCMAKE_FIND_ROOT_PATH=/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
         parse-info:
         - usr/share/metainfo/org.kde.skrooge.appdata.xml
+        filesets:
+            exclusion:
+            - "-usr/lib/*/cmake/*"
+            - "-usr/include/*"
+            - "-usr/share/ECM/*"
+            - "-usr/share/doc/*"
+            - "-usr/share/man/*"
+            - "-usr/share/icons/breeze-dark*"
+            - "-usr/bin/X11"
+            - "-usr/lib/gcc/x86_64-linux-gnu/6.0.0"
+            - "-usr/lib/aspell/*"
+        prime:
+        - "$exclusion"


More information about the Neon-commits mailing list