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

[Jonathan Riddell]

Git commit 35baee6b10c732725918e745dea6cec183e02fb1 by Jonathan Riddell.
Committed on 03/03/2021 at 17:05.
Pushed by jriddell into branch 'Neon/release'.

update to core20 snap

M  +45   -8    snapcraft.yaml

https://invent.kde.org/neon/extras/calligra/commit/35baee6b10c732725918e745dea6cec183e02fb1

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 784c548..738545d 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -3,7 +3,7 @@ name: calligra
 version: 3.1.90
 confinement: strict
 grade: stable
-base: core18
+base: core20
 adopt-info: calligra
 apps:
   calligra:
@@ -28,10 +28,19 @@ 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:
   calligra:
     after:
@@ -81,14 +90,14 @@ parts:
     - shared-mime-info
     - zlib1g-dev
     build-snaps:
-    - kde-frameworks-5-qt-5-14-core18-sdk
+    - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
     stage-packages:
     - libqca-qt5-2
     - libilmbase12
     parse-info:
     - usr/share/metainfo/org.kde.calligrawords.appdata.xml
     source: https://download.kde.org/unstable/calligra/calligra-3.1.90.tar.xz
-    configflags:
+    cmake-parameters:
     - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
     - "-DCMAKE_INSTALL_PREFIX=/usr"
     - "-DCMAKE_BUILD_TYPE=Release"
@@ -96,6 +105,20 @@ 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"
+        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"
   kdelibs4support:
     after:
     - kde-frameworks-5-env
@@ -110,15 +133,29 @@ parts:
     - libsm-dev
     - libnm-dev
     build-snaps:
-    - kde-frameworks-5-qt-5-14-core18-sdk
-    source: https://download.kde.org/stable/frameworks/5.68/portingAids/kdelibs4support-5.68.0.tar.xz
-    configflags:
+    - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate/latest/candidate
+    source: https://download.kde.org/stable/frameworks/5.79/portingAids/kdelibs4support-5.79.0.tar.xz
+    cmake-parameters:
     - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
     - "-DCMAKE_INSTALL_PREFIX=/usr"
     - "-DCMAKE_BUILD_TYPE=Release"
     - "-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"