[neon/kde/kolourpaint/Neon/release] /: update to core20

[Jonathan Riddell]

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

update to core20

M  +42   -6    snapcraft.yaml

https://invent.kde.org/neon/kde/kolourpaint/commit/f1c0051ea1b6db33a45c07324121157538977951

diff --git a/snapcraft.yaml b/snapcraft.yaml
index b284491..1b3c116 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -2,7 +2,8 @@
 name: kolourpaint
 confinement: strict
 grade: stable
-base: core18
+base: core20
+version: 20.12.3
 adopt-info: kolourpaint
 apps:
     kolourpaint:
@@ -22,16 +23,25 @@ apps:
         - removable-media
 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:
     kolourpaint:
         parse-info:
         - usr/share/metainfo/org.kde.kolourpaint.appdata.xml
         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
@@ -45,14 +55,40 @@ parts:
         - libkf5sane-dev
         - pkg-config
         source: http://download.kde.org/stable/release-service/20.12.3/src/kolourpaint-20.12.3.tar.xz
-        configflags:
+        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"
+        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"