[neon/extras/calligra/Neon/release] /: update snap

[Jonathan Riddell]

Git commit e8f4a16da544713015b284e2391f685bfab0a2c7 by Jonathan Riddell.
Committed on 28/05/2021 at 14:24.
Pushed by jriddell into branch 'Neon/release'.

update snap

M  +1    -1    debian/changelog
M  +15   -7    snapcraft.yaml

https://invent.kde.org/neon/extras/calligra/commit/e8f4a16da544713015b284e2391f685bfab0a2c7

diff --git a/debian/changelog b/debian/changelog
index 2ccf7bd..3ae8f6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-calligra (1:3.2.0-0neon) xenial; urgency=medium
+calligra (1:3.2.1-0neon) xenial; urgency=medium
 
   * New release
 
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 7fc94d6..67e2500 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,6 +1,6 @@
 ---
 name: calligra
-version: 3.1.90
+version: 3.2.1
 confinement: strict
 grade: stable
 base: core20
@@ -83,11 +83,9 @@ parts:
   calligra:
     after:
     - kdelibs4support
+    - kross
     plugin: cmake
-    build-environment:
-    - CMAKE_BUILD_PARALLEL_LEVEL: "4"
     build-packages:
-    - kross-dev
     - libboost-dev
     - libboost-system-dev
     - libeigen3-dev
@@ -147,7 +145,7 @@ parts:
     - usr/share/metainfo/org.kde.calligrasheets.appdata.xml
     - usr/share/metainfo/org.kde.calligrastage.appdata.xml
     - usr/share/metainfo/org.kde.karbon.appdata.xml
-    source: https://download.kde.org/stable/calligra/3.2.0/calligra-3.2.0.tar.xz
+    source: https://download.kde.org/stable/calligra/3.2.1/calligra-3.2.1.tar.xz
     cmake-parameters:
     - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
     - "-DCMAKE_INSTALL_PREFIX=/usr"
@@ -172,8 +170,6 @@ parts:
     - "$exclusion"
   kdelibs4support:
     plugin: cmake
-    build-environment:
-    - CMAKE_BUILD_PARALLEL_LEVEL: "4"
     build-packages:
     - extra-cmake-modules
     - cmake
@@ -183,6 +179,7 @@ parts:
     - libsm-dev
     - libnm-dev
     - kdoctools-dev
+    - kded5
     source: https://download.kde.org/stable/frameworks/5.79/portingAids/kdelibs4support-5.79.0.tar.xz
     cmake-parameters:
     - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
@@ -192,3 +189,14 @@ parts:
     - "-DBUILD_TESTING=OFF"
     - "-DKDE_SKIP_TEST_SETTINGS=ON"
     - "-DCMAKE_FIND_ROOT_PATH=/usr\\;/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
+  kross:
+    plugin: cmake
+    source: https://download.kde.org/stable/frameworks/5.79/portingAids/kross-5.79.0.tar.xz
+    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=/usr\\;/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"