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

[Jonathan Riddell]

Git commit 07ed6ba2d38dc6e9fe789da8b717a2cca29d5b96 by Jonathan Riddell.
Committed on 03/03/2021 at 13:07.
Pushed by jriddell into branch 'Neon/release'.

update snap for core20

M  +49   -15   snapcraft.yaml

https://invent.kde.org/neon/kde/cantor/commit/07ed6ba2d38dc6e9fe789da8b717a2cca29d5b96

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 4450657..42a1ea7 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,9 +1,9 @@
 ---
 name: cantor
-version: 20.12.3
+version: 20.12.2
 confinement: strict
 grade: stable
-base: core18
+base: core20
 adopt-info: cantor
 apps:
     cantor:
@@ -28,14 +28,23 @@ slots:
         bus: session
 plugs:
     kde-frameworks-5-plug:
-        content: kde-frameworks-5-qt-5-14-core18-all
+        content: kde-frameworks-5-qt-5-15-core20-all
         interface: content
-        default-provider: kde-frameworks-5-qt-5-14-core18
+        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:
     cantor:
         build-snaps:
-        - kde-frameworks-5-qt-5-14-core18-sdk
+        - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
         after:
         - kde-frameworks-5-env
         plugin: cmake
@@ -43,7 +52,7 @@ parts:
         - libmarkdown2-dev
         - libanalitza-dev
         - libglib2.0-dev
-        - liblapack3
+        - liblapack3-dev
         - libluajit-5.1-dev
         - libqalculate-dev
         - libspectre-dev
@@ -52,21 +61,32 @@ parts:
         - python3-dev
         - r-base-core
         stage-packages:
-        - libmarkdown2-dev
-        - libanalitza-dev
-        - libglib2.0-dev
+        - libmarkdown2
+        - libanalitza
+        - libglib2.0
         - liblapack3
-        - libluajit-5.1-dev
-        - libqalculate-dev
-        - libspectre-dev
+        - libluajit-5.1
+        - libqalculate
+        - libspectre
         - pkg-config
-        - python-dev
-        - python3-dev
+        - python3
         - r-base-core
+        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:
         - "-var/lib/ghostscript"
         - "-usr/share/ghostscript/*/Resource/CMap"
-        source: http://download.kde.org/stable/release-service/20.12.3/src/cantor-20.12.3.tar.xz
+        - "$exclusion"
+        source: http://download.kde.org/stable/release-service/20.12.2/src/cantor-20.12.2.tar.xz
         configflags:
         - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
         - "-DCMAKE_INSTALL_PREFIX=/usr"
@@ -74,8 +94,22 @@ 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"
         parse-info:
         - usr/share/metainfo/org.kde.cantor.appdata.xml
     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