[neon/snap-packaging/kwrite-snap] /: Core24

[Scarlett Moore]

Git commit d17b2333b56d52eb25800c8a8603c0cc78ddcdd1 by Scarlett Moore.
Committed on 03/02/2025 at 12:05.
Pushed by scarlettmoore into branch 'master'.

Core24

M  +14   -16   snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kwrite-snap/-/commit/d17b2333b56d52eb25800c8a8603c0cc78ddcdd1

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 6ec4b3d..8fe6ad9 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -5,7 +5,7 @@
 name: kwrite
 confinement: strict
 grade: stable
-base: core22
+base: core24
 adopt-info: kwrite
 apps:
     kwrite:
@@ -16,10 +16,8 @@ apps:
         command: usr/bin/kwrite
         plugs:
         - home
-        - cups
+        - cups-control
         - removable-media
-        command-chain:
-        - snap/command-chain/desktop-launch6
 slots:
     session-dbus-interface:
         interface: dbus
@@ -30,7 +28,7 @@ package-repositories:
     components:
     - main
     suites:
-    - jammy
+    - noble
     key-id: 444DABCF3667D0283F894EDDE6D4736255751E5D
     url: http://origin.archive.neon.kde.org/user
     key-server: keyserver.ubuntu.com
@@ -40,7 +38,7 @@ parts:
         - usr/share/metainfo/org.kde.kwrite.appdata.xml
         plugin: cmake
         source: https://invent.kde.org/utilities/kate.git
-        source-branch: release/24.08
+        source-branch: release/24.12
         build-packages:
         - libxkbcommon-dev
         - libpulse0
@@ -65,14 +63,14 @@ parts:
         - -DCMAKE_INSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
         - --log-level=STATUS
         - -DCMAKE_LIBRARY_PATH=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
-        - "-DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core22-sdk/current\\;/snap/kf6-core22-sdk/current/usr"
-        - "-DCMAKE_PREFIX_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_PREFIX_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core24-sdk/current\\;/snap/kf6-core24-sdk/current/usr"
         build-environment:
-            - PATH: /snap/kde-qt6-core22-sdk/current/usr/bin${PATH:+:$PATH}
-            - PKG_CONFIG_PATH: /snap/kde-qt6-core22-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
-            - XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/snap/kde-qt6-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/current/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/kde-qt6-core22-sdk/current/usr/lib:/snap/kf6-core22-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:/snap/kf6-core22-sdk/current/usr/lib:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/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${PATH:+:$PATH}
+            - PKG_CONFIG_PATH: /snap/kde-qt6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
+            - XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/snap/kde-qt6-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/current/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/kde-qt6-core24-sdk/current/usr/lib:/snap/kf6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:/snap/kf6-core24-sdk/current/usr/lib:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/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}"
         prime:
         - -usr/lib/*/cmake/*
         - -usr/include/*
@@ -89,11 +87,11 @@ parts:
         - kwrite
         plugin: nil
         build-snaps:
-        - core22
-        - kf6-core22
+        - core24
+        - kf6-core24
         override-prime: |
             set -eux
-            for snap in "core22" "kf6-core22"; do
+            for snap in "core24" "kf6-core24"; do
                 cd "/snap/$snap/current" && find . -type f,l -exec rm -rf "${CRAFT_PRIME}/{}" \;
             done