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

Jonathan Riddell null at kde.org
Mon Mar 22 16:12:35 GMT 2021


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

update snap for core20

M  +4    -15   snapcraft.yaml

https://invent.kde.org/neon/kde/ark/commit/40354df28d7c07e4d589a45abb6bad8bec150322

diff --git a/snapcraft.yaml b/snapcraft.yaml
index fa7a7d4..d3018fa 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -48,6 +48,8 @@ parts:
         after:
         - kde-frameworks-5-env
         plugin: cmake
+        build-environment:
+        - CMAKE_BUILD_PARALLEL_LEVEL: "4"
         build-packages:
         - build-essential
         - cmake
@@ -69,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\\;/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
         filesets:
             exclusion:
             - "-usr/lib/*/cmake/*"
@@ -84,18 +86,5 @@ parts:
         prime:
         - "$exclusion"
     kde-frameworks-5-env:
-        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"
         plugin: dump
-        source: https://anongit.kde.org/snap-kf5-launcher.git
+        source: https://invent.kde.org/packaging/snap-kf5-launcher.git


More information about the Neon-commits mailing list