[neon/kde/kdf/Neon/release] /: update snap for core20

Jonathan Riddell null at kde.org
Mon Mar 22 16:14:43 GMT 2021


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

update snap for core20

M  +4    -17   snapcraft.yaml

https://invent.kde.org/neon/kde/kdf/commit/51665a863e6c1d0d6a1c33f8613d3cb32b9bb1c5

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 9077ed7..e725e43 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -44,8 +44,8 @@ parts:
         after:
         - kde-frameworks-5-env
         plugin: cmake
-        build-packages:
-        - qt5-default
+        build-environment:
+        - CMAKE_BUILD_PARALLEL_LEVEL: "4"
         stage-packages:
         - coreutils
         source: http://download.kde.org/stable/release-service/20.12.3/src/kdf-20.12.3.tar.xz
@@ -56,7 +56,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\\;/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
         - "-DKDE_INSTALL_PLUGINDIR=/usr/lib/x86_64-linux-gnu/qt5/plugins/"
         filesets:
             exclusion:
@@ -73,17 +73,4 @@ parts:
         - "$exclusion"
     kde-frameworks-5-env:
         plugin: dump
-        source: https://anongit.kde.org/snap-kf5-launcher.git
-        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://invent.kde.org/packaging/snap-kf5-launcher.git


More information about the Neon-commits mailing list