[neon/kde/kcalc/Neon/release] /: snap core20

[Jonathan Riddell]

Git commit 030025969dc6f0ba333314260b85087809e202fc by Jonathan Riddell.
Committed on 09/02/2021 at 12:51.
Pushed by jriddell into branch 'Neon/release'.

snap core20

M  +8    -6    snapcraft.yaml

https://invent.kde.org/neon/kde/kcalc/commit/030025969dc6f0ba333314260b85087809e202fc

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 48973b6..13ba84c 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,9 +1,8 @@
 ---
 name: kcalc
-version: 20.12.2
 confinement: strict
 grade: stable
-base: core18
+base: core20
 adopt-info: kcalc
 apps:
     kcalc:
@@ -28,16 +27,16 @@ 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
 parts:
     kcalc:
         parse-info:
         - usr/share/metainfo/org.kde.kcalc.appdata.xml
         build-snaps:
-        - kde-frameworks-5-qt-5-14-core18-sdk
+        - kde-frameworks-5-qt-5-15-core20-sdk
         after:
         - kde-frameworks-5-env
         plugin: cmake
@@ -45,17 +44,20 @@ parts:
         - libmpfr-dev
         - libgmp-dev
         - qt5-default
+        - docbook-xml
+        - docbook-xsl
         stage-packages:
         - libmpfr6
         - libgmp10
         source: http://download.kde.org/stable/release-service/20.12.2/src/kcalc-20.12.2.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=/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