[neon/kde/kalarm/Neon/unstable] /: update to core20

[Jonathan Riddell]

Git commit 2213afbabce208ed7ccee7f5a156be17d67405fa by Jonathan Riddell.
Committed on 03/03/2021 at 16:06.
Pushed by jriddell into branch 'Neon/unstable'.

update to core20

M  +72   -36   snapcraft.yaml

https://invent.kde.org/neon/kde/kalarm/commit/2213afbabce208ed7ccee7f5a156be17d67405fa

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 200b19c..437e70a 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -3,7 +3,7 @@ name: kalarm
 version: 20.12.3
 confinement: strict
 grade: stable
-base: core18
+base: core20
 adopt-info: kalarm
 apps:
     kalarm:
@@ -25,16 +25,25 @@ 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:
     kalarm:
         parse-info:
         - usr/share/metainfo/org.kde.kalarm.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
@@ -75,47 +84,74 @@ parts:
         - xsltproc
         - zlib1g-dev
         stage-packages:
-        - kross-dev
-        - libassuan-dev
-        - libboost-dev
-        - libboost-graph-dev
-        - libkf5akonadi-dev
-        - libkf5akonadicalendar-dev
-        - libkf5akonadicontact-dev
-        - libkf5akonadimime-dev
-        - libkf5akonadiserver-dev
-        - libkf5alarmcalendar-dev
-        - libkf5calendarcore-dev
-        - libkf5calendarutils-dev
-        - libkf5contacteditor-dev
-        - libkf5contacts-dev
-        - libkf5dnssd-dev
-        - libkf5holidays-dev
-        - libkf5identitymanagement-dev
-        - libkf5kdelibs4support-dev
-        - libkf5kdepimdbusinterfaces-dev
-        - libkf5khtml-dev
-        - libkf5libkdepim-dev
-        - libkf5mailcommon-dev
-        - libkf5mailtransport-dev
-        - libkf5messagecomposer-dev
-        - libkf5mime-dev
-        - libkf5mimetreeparser-dev
-        - libkf5pimcommon-dev
-        - libkf5pimtextedit-dev
-        - libkf5templateparser-dev
-        - libkf5webengineviewer-dev
+        - kross
+        - libassuan
+        - libboost
+        - libboost-graph
+        - libkf5akonadi
+        - libkf5akonadicalendar
+        - libkf5akonadicontact
+        - libkf5akonadimime
+        - libkf5akonadiserver
+        - libkf5alarmcalendar
+        - libkf5calendarcore
+        - libkf5calendarutils
+        - libkf5contacteditor
+        - libkf5contacts
+        - libkf5dnssd
+        - libkf5holidays
+        - libkf5identitymanagement
+        - libkf5kdelibs4support
+        - libkf5kdepimdbusinterfaces
+        - libkf5khtml
+        - libkf5libkdepim
+        - libkf5mailcommon
+        - libkf5mailtransport
+        - libkf5messagecomposer
+        - libkf5mime
+        - libkf5mimetreeparser
+        - libkf5pimcommon
+        - libkf5pimtextedit
+        - libkf5templateparser
+        - libkf5webengineviewer
         - pkg-config
         - xsltproc
-        - zlib1g-dev
+        - zlib1g
         source: http://download.kde.org/stable/release-service/20.12.3/src/kalarm-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
+        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"