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

[Jonathan Riddell]

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

update snaps for core20

M  +47   -25   snapcraft.yaml

https://invent.kde.org/neon/kde/kontact/commit/954273ad6f8537882a2c9403cc775bad0caf22da

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 9d1b910..ae48b7e 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -3,7 +3,7 @@ name: kontact
 version: 20.12.3
 confinement: devmode
 grade: devel
-base: core18
+base: core20
 adopt-info: kontact
 apps:
     kontact:
@@ -51,10 +51,19 @@ apps:
         - desktop-legacy
 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:
     kde-frameworks-5-env:
         plugin: dump
@@ -71,7 +80,7 @@ parts:
         - usr/share/metainfo/org.kde.kontact.appdata.xml
         plugin: cmake
         build-snaps:
-        - kde-frameworks-5-qt-5-14-core18-sdk
+        - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
         build-packages:
         - kross-dev
         - libassuan-dev
@@ -95,26 +104,26 @@ parts:
         - libkf5templateparser-dev
         - qt5-default
         stage-packages:
-        - kross-dev
-        - libassuan-dev
-        - libboost-dev
-        - libboost-graph-dev
-        - libgpgme11-dev
-        - libgrantlee5-dev
-        - libkf5akonadi-dev
-        - libkf5akonadiserver-dev
-        - libkf5eventviews-dev
-        - libkf5grantleetheme-dev
-        - libkf5kdelibs4support-dev
-        - libkf5kdepimdbusinterfaces-dev
-        - libkf5khtml-dev
-        - libkf5kontactinterface-dev
-        - libkf5libkdepim-dev
-        - libkf5mailcommon-dev
-        - libkf5messagecomposer-dev
-        - libkf5mimetreeparser-dev
-        - libkf5pimtextedit-dev
-        - libkf5templateparser-dev
+        - kross
+        - libassuan
+        - libboost
+        - libboost-graph
+        - libgpgme11
+        - libgrantlee5
+        - libkf5akonadi
+        - libkf5akonadiserver
+        - libkf5eventviews
+        - libkf5grantleetheme
+        - libkf5kdelibs4support
+        - libkf5kdepimdbusinterfaces
+        - libkf5khtml
+        - libkf5kontactinterface
+        - libkf5libkdepim
+        - libkf5mailcommon
+        - libkf5messagecomposer
+        - libkf5mimetreeparser
+        - libkf5pimtextedit
+        - libkf5templateparser
         - libkf5grantleetheme-plugins
         - kdepim-runtime
         - accountwizard
@@ -126,11 +135,24 @@ parts:
         - sasl2-bin
         - libsasl2-modules
         source: http://download.kde.org/stable/release-service/20.12.3/src/kontact-20.12.3.tar.xz
+        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"
         - "-etc/xdg/autostart/org.kde.korgac.desktop"
-        configflags:
+        cmake-parameters:
         - "-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"