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

Jonathan Riddell null at kde.org
Mon Mar 22 16:11:44 GMT 2021


Git commit 61cde9cda6c316bc2b4cdc24f6d2fbdde9dd1864 by Jonathan Riddell.
Committed on 22/03/2021 at 16:10.
Pushed by jriddell into branch 'Neon/release'.

update snap for core20

M  +6    -17   snapcraft.yaml

https://invent.kde.org/neon/extras/skrooge/commit/61cde9cda6c316bc2b4cdc24f6d2fbdde9dd1864

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 8179c1a..f424b6f 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -40,28 +40,14 @@ package-repositories:
     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:
-        - "$exclusion"
-        source: https://anongit.kde.org/snap-kf5-launcher.git
     skrooge:
         build-snaps:
         - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
         after:
         - kde-frameworks-5-env
         plugin: cmake
+        build-environment:
+        - CMAKE_BUILD_PARALLEL_LEVEL: "4"
         build-packages:
         - libgrantlee5-dev
         - libkf5kdelibs4support-dev
@@ -85,7 +71,7 @@ parts:
         - "-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"
+        - "-DCMAKE_FIND_ROOT_PATH=/usr\\;/usr\\;/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
         parse-info:
         - usr/share/metainfo/org.kde.skrooge.appdata.xml
         filesets:
@@ -101,3 +87,6 @@ parts:
             - "-usr/lib/aspell/*"
         prime:
         - "$exclusion"
+    kde-frameworks-5-env:
+        plugin: dump
+        source: https://invent.kde.org/packaging/snap-kf5-launcher.git


More information about the Neon-commits mailing list