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

[Jonathan Riddell]

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

update to core20 snap

M  +41   -5    snapcraft.yaml

https://invent.kde.org/neon/extras/okteta/commit/23168959709f2c15df0adbef44357ad6031fae61

diff --git a/snapcraft.yaml b/snapcraft.yaml
index b1333c1..d898f7a 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -3,7 +3,7 @@ name: okteta
 version: 0.26.5
 confinement: strict
 grade: stable
-base: core18
+base: core20
 adopt-info: okteta
 apps:
     okteta:
@@ -27,16 +27,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:
     okteta:
         parse-info:
         - usr/share/metainfo/org.kde.okteta.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
@@ -50,13 +59,40 @@ parts:
         - xvfb
         stage-packages:
         - libqca-qt5-2
-        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"