[neon/kde/kcalc/Neon/release] /: update snaps for core20

[Jonathan Riddell]

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

update snaps for core20

M  +38   -3    snapcraft.yaml

https://invent.kde.org/neon/kde/kcalc/commit/cd33771b805b20302e5fc87e3250c0e6963140b9

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 929464a..036f89f 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -31,12 +31,21 @@ plugs:
         interface: content
         default-provider: kde-frameworks-5-qt-5-15-core20
         target: kf5
+package-repositories:
+-   type: apt
+    components:
+    - main
+    suites:
+    - focal
+    key-id: 444DABCF3667D0283F894EDDE6D4736255751E5D
+    url: http://origin.archive.neon.kde.org/user
+    key-server: keyserver.ubuntu.com
 parts:
     kcalc:
         parse-info:
         - usr/share/metainfo/org.kde.kcalc.appdata.xml
         build-snaps:
-        - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
+        - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate/latest/candidate
         after:
         - kde-frameworks-5-env
         plugin: cmake
@@ -57,8 +66,34 @@ parts:
         - "-DENABLE_TESTING=OFF"
         - "-DBUILD_TESTING=OFF"
         - "-DKDE_SKIP_TEST_SETTINGS=ON"
-        - "-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
+        - "-DCMAKE_FIND_ROOT_PATH=/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
+        - "-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate/current"
+        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"
     kde-frameworks-5-env:
         plugin: dump
         source: https://anongit.kde.org/snap-kf5-launcher.git
-version: 20.12.3
+        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"