[neon/snap-packaging/discover-snap] /: Port to core24

[Kevin Ottens]

Git commit 5de8b3688f54cde8ccbe828b1e643b3f4bf4700d by Kevin Ottens.
Committed on 15/04/2025 at 20:49.
Pushed by ervin into branch 'master'.

Port to core24

M  +16   -18   snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/discover-snap/-/commit/5de8b3688f54cde8ccbe828b1e643b3f4bf4700d

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 90064b0..a1b3625 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -13,7 +13,7 @@
 name: plasma-discover
 confinement: strict
 grade: stable
-base: core22
+base: core24
 adopt-info: plasma-discover
 apps:
     plasma-discover:
@@ -60,8 +60,6 @@ apps:
             - network
             - network-status
             - network-manager
-assumes:
-- snapd2.58.3
 compression: lzo
 slots:
     dbus-kde-discover:
@@ -81,7 +79,7 @@ package-repositories:
     components:
     - main
     suites:
-    - jammy
+    - noble
     key-id: 444DABCF3667D0283F894EDDE6D4736255751E5D
     url: http://archive.neon.kde.org/user
     key-server: keyserver.ubuntu.com
@@ -91,16 +89,16 @@ parts:
         - usr/share/metainfo/org.kde.discover.appdata.xml
         source: https://invent.kde.org/plasma/discover.git
         source-type: git
-        source-commit: 982be0af4c25c2fc6187bd4414fb4fac769d2271 # FIXME: First master commit containing all necessary patches, will need to be set to a stable release ASAP
+        source-tag: v6.2.5
         plugin: cmake
         build-packages:
         - libsnapd-glib-dev
         - libsnapd-qt-dev
         - libappstreamqt-dev
         stage-packages:
-        - libsnapd-glib1
-        - libsnapd-qt1
-        - libappstreamqt-3
+        - libsnapd-glib-2-1
+        - libsnapd-qt-2-1
+        - libappstreamqt3
         override-pull: |
             craftctl default
             # Force-disable PackageKit backend which does not have an associated cmake variable
@@ -121,7 +119,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"
@@ -129,7 +127,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"
@@ -150,21 +148,21 @@ parts:
         - "-usr/share/lintian"
         - "-patches"
         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:$CRAFT_STAGE/usr/lib:CRAFT_STAGE/usr/lib:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/kde-qt6-core24-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libproxy{LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}
     cleanup:
         after:
         - plasma-discover
         plugin: nil
         build-snaps:
-        - core22
-        - kf6-core22
-        - kde-qt6-core22
+        - core24
+        - kf6-core24
+        - kde-qt6-core24
         override-prime: |
             set -eux
-            for snap in "core22" "kf6-core22" "kde-qt6-core22"
+            for snap in "core24" "kf6-core24" "kde-qt6-core24"
             do
                 cd "/snap/$snap/current" && find . -type f,l -exec rm -rf "$CRAFT_PRIME/{}" \;
             done