[neon/snap-packaging/kcalc-snap] /: move to core24

[Scarlett Moore]

Git commit 2a3c45d0e92101b81aa550c71276edadf139049a by Scarlett Moore.
Committed on 11/02/2025 at 13:02.
Pushed by scarlettmoore into branch 'master'.

move to core24

M  +16   -15   snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kcalc-snap/-/commit/2a3c45d0e92101b81aa550c71276edadf139049a

diff --git a/snapcraft.yaml b/snapcraft.yaml
index cddc70c..50f5563 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,12 +1,12 @@
 
-# SPDX-FileCopyrightText: 2023 Scarlett Moore <sgmoore at kde.org>
+# SPDX-FileCopyrightText: 2023-2024 Scarlett Moore <sgmoore at kde.org>
 #
 # SPDX-License-Identifier: CC0-1.0
 ---
 name: kcalc
 confinement: strict
 grade: stable
-base: core22
+base: core24
 adopt-info: kcalc
 apps:
     kcalc:
@@ -29,7 +29,7 @@ package-repositories:
     components:
     - main
     suites:
-    - jammy
+    - noble
     key-id: 444DABCF3667D0283F894EDDE6D4736255751E5D
     url: http://archive.neon.kde.org/user
     key-server: keyserver.ubuntu.com
@@ -44,12 +44,15 @@ parts:
         - docbook-xml
         - docbook-xsl
         - gettext
+        - libxkbcommon-dev
         stage-packages:
         - libmpfr6
         - libgmp10
         - breeze-icon-theme
+        - libxkbcommon0
+        - manpages
         source: https://invent.kde.org//utilities/kcalc.git
-        source-branch: release/24.08
+        source-branch: release/24.12
         cmake-parameters:
         - "--log-level=STATUS"
         - "-DBUILD_TESTING=OFF"
@@ -57,7 +60,7 @@ parts:
         - "-DCMAKE_BUILD_TYPE=Release"
         - "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON"
         - "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON"
-        - "-DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core22-sdk/current\\;/snap/kf6-core22-sdk/current\\;/usr"
+        - "-DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core24-sdk/current\\;/snap/kf6-core24-sdk/current\\;/usr"
         - "-DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF"
         - "-DCMAKE_INSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR"
         - "-DCMAKE_INSTALL_LOCALSTATEDIR=/var"
@@ -65,7 +68,7 @@ parts:
         - "-DCMAKE_INSTALL_RUNSTATEDIR=/run"
         - "-DCMAKE_INSTALL_SYSCONFDIR=/etc"
         - "-DCMAKE_LIBRARY_PATH=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR"
-        - "-DCMAKE_PREFIX_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core22-sdk/current\\;/snap/kf6-core22-sdk/current\\;/usr"
+        - "-DCMAKE_PREFIX_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core24-sdk/current\\;/snap/kf6-core24-sdk/current\\;/usr"
         - "-DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON"
         - "-DCMAKE_VERBOSE_MAKEFILE=ON"
         - "-DENABLE_TESTING=OFF"
@@ -79,28 +82,26 @@ parts:
         - "-usr/include/*"
         - "-usr/share/ECM/*"
         - "-usr/share/man/*"
-        - "-usr/share/icons/breeze-dark*"
         - "-usr/bin/X11"
         - "-usr/lib/gcc/$CRAFT_ARCH_TRIPLET_BUILD_FOR/6.0.0"
         - "-usr/lib/aspell/*"
         - "-usr/share/lintian"
         - "-usr/share/kglobalaccel/org.kde.kcalc.desktop"
         build-environment:
-        - PATH: /snap/kde-qt6-core22-sdk/current/usr/bin:/snap/kf6-core22-sdk/current/usr/bin${PATH:+:$PATH}
-        - XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/snap/kde-qt6-core22-sdk/current/usr/share:/snap/kf6-core22-sdk/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}
-        - XDG_CONFIG_HOME: $CRAFT_STAGE/etc/xdg:/snap/kde-qt6-core22-sdk/etc/xdg:/snap/kf6-core22-sdk/etc/xdg:/etc/xdg${XDG_CONFIG_HOME:+:$XDG_CONFIG_HOME}
-        - LD_LIBRARY_PATH: /snap/kde-qt6-core22-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kf6-core22-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kde-qt6-core22-sdk/current/usr/lib:/snap/kf6-core22-sdk/current/usr/lib:$CRAFT_STAGE/usr/lib:CRAFT_STAGE/usr/lib:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR{LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}
+        - PATH: /snap/kde-qt6-core24-sdk/current/usr/bin:/snap/kf6-core24-sdk/current/usr/bin${PATH:+:$PATH}
+        - XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/snap/kde-qt6-core24-sdk/current/usr/share:/snap/kf6-core24-sdk/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}
+        - XDG_CONFIG_HOME: $CRAFT_STAGE/etc/xdg:/snap/kde-qt6-core24-sdk/etc/xdg:/snap/kf6-core24-sdk/etc/xdg:/etc/xdg${XDG_CONFIG_HOME:+:$XDG_CONFIG_HOME}
+        - LD_LIBRARY_PATH: /snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kf6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kde-qt6-core24-sdk/current/usr/lib:/snap/kf6-core24-sdk/current/usr/lib:/snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libproxy:$CRAFT_STAGE/usr/lib:CRAFT_STAGE/usr/lib:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR{LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}
     cleanup:
         after:
         - kcalc
         plugin: nil
         build-snaps:
-        - core22
-        - kf6-core22
-        - kde-qt6-core22
+        - core24
+        - kf6-core24
         override-prime: |
             set -eux
-            for snap in "core22" "kf6-core22" "kde-qt6-core22"
+            for snap in "core24" "kf6-core24"
             do
                 cd "/snap/$snap/current" && find . -type f,l -exec rm -rf "$CRAFT_PRIME/{}" \;
             done