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

Jonathan Riddell null at kde.org
Mon Mar 22 16:18:19 GMT 2021


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

update snap for core20

M  +7    -18   snapcraft.yaml

https://invent.kde.org/neon/kde/minuet/commit/3505f393d99fbdf68424873107988ef89786276b

diff --git a/snapcraft.yaml b/snapcraft.yaml
index d2e380f..6553ca4 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -44,6 +44,8 @@ parts:
         after:
         - kde-frameworks-5-env
         plugin: cmake
+        build-environment:
+        - CMAKE_BUILD_PARALLEL_LEVEL: "4"
         build-packages:
         - libasound2-dev
         - libdrumstick-dev
@@ -51,9 +53,9 @@ parts:
         - pkg-config
         - qt5-default
         stage-packages:
-        - libasound2-dev
-        - libdrumstick-dev
-        - libfluidsynth-dev
+        - libasound2
+        - libdrumstick
+        - libfluidsynth
         - pkg-config
         source: http://download.kde.org/stable/release-service/20.12.3/src/minuet-20.12.3.tar.xz
         cmake-parameters:
@@ -63,7 +65,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:
@@ -80,17 +82,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