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

[Jonathan Riddell]

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

update snap for core20

M  +9    -18   snapcraft.yaml

https://invent.kde.org/neon/extras/calligra/commit/afcf0bcd4c6f832c45ce7a4e283c4156aee67239

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 8387d42..ffc90fa 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -46,6 +46,8 @@ parts:
     - kde-frameworks-5-env
     - kdelibs4support
     plugin: cmake
+    build-environment:
+    - CMAKE_BUILD_PARALLEL_LEVEL: "4"
     build-packages:
     - qt5-default
     - extra-cmake-modules
@@ -104,7 +106,7 @@ parts:
     - "-DBUILD_TESTING=OFF"
     - "-DKDE_SKIP_TEST_SETTINGS=ON"
     - "-DKDE_INSTALL_PLUGINDIR=/usr/lib/x86_64-linux-gnu/qt5/plugins/"
-    - "-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"
         filesets:
             exclusion:
             - "-usr/lib/*/cmake/*"
@@ -122,6 +124,8 @@ parts:
     after:
     - kde-frameworks-5-env
     plugin: cmake
+    build-environment:
+    - CMAKE_BUILD_PARALLEL_LEVEL: "4"
     build-packages:
     - qt5-default
     - extra-cmake-modules
@@ -141,20 +145,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"
-  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"
+    - "-DCMAKE_FIND_ROOT_PATH=/usr\\;/usr\\;/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
+    kde-frameworks-5-env:
+        plugin: dump
+        source: https://invent.kde.org/packaging/snap-kf5-launcher.git