[neon/snap-packaging/kde-qt6-core-sdk/core24] /: Core24

[Scarlett Moore]

Git commit fa9db5d61e52ae46f30aaa7debddb8b73373cb81 by Scarlett Moore.
Committed on 23/09/2024 at 11:01.
Pushed by scarlettmoore into branch 'core24'.

Core24

M  +18   -16   snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kde-qt6-core-sdk/-/commit/fa9db5d61e52ae46f30aaa7debddb8b73373cb81

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 4cd0c10..b3cf169 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,14 +1,18 @@
-name: kde-qt6-core22-sdk
-base: core22
+name: kde-qt6-core24-sdk
+base: core24
 version: 6.7.2
 summary: KDE fork Qt Framework SDK
 description: |
   Qt is a cross-platform application development framework widely used
   for developing software with graphical user interfaces (GUIs) and
   interactive functionality.
-architectures:
-  - build-on: amd64
- #  - build-on: arm64
+platforms:
+  amd64:
+    build-on: [amd64]
+    build-for: [amd64]
+  arm64:
+    build-on: [arm64]
+    build-for: [arm64]
   # - build-on: armhf
   # - build-on: ppc64el
 grade: stable
@@ -29,7 +33,7 @@ package-repositories:
     components:
       - main
     suites:
-      - jammy
+      - noble
     key-id: 444DABCF3667D0283F894EDDE6D4736255751E5D
     url: http://origin.archive.neon.kde.org/user
     key-server: keyserver.ubuntu.com
@@ -111,11 +115,11 @@ parts:
       - -DFEATURE_use_mold_linker=ON
       - -DBUILD_SHARED_LIBS=ON
     build-environment:
-      - PKG_CONFIG_PATH: /snap/ffmpeg-2204-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
-      - CMAKE_PREFIX_PATH: /snap/ffmpeg-2204-sdk/current/usr${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH}
-      - CMAKE_FIND_ROOT_PATH: /snap/ffmpeg-2204-sdk/current/usr
+      - PKG_CONFIG_PATH: /snap/ffmpeg-2404-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
+      - CMAKE_PREFIX_PATH: /snap/ffmpeg-2404-sdk/current/usr${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH}
+      - CMAKE_FIND_ROOT_PATH: /snap/ffmpeg-2404-sdk/current/usr
     build-snaps:
-      - ffmpeg-2204-sdk
+      - ffmpeg-2404-sdk
       - cmake
     build-packages:
       - bison
@@ -228,8 +232,7 @@ parts:
       - ninja-build
       - nodejs
       - pkg-config
-      - python-pip
-      - python2-minimal
+      - python3-pip
       - python3-html5lib
       - python3-minimal
       - unixodbc-dev
@@ -237,7 +240,7 @@ parts:
     stage-packages:
       - libpulse0
     stage-snaps:
-      - ffmpeg-2204
+      - ffmpeg-2404
     # override-pull: |
     #   craftctl default
     #   # while read -r PATCHFILE ; do
@@ -370,8 +373,7 @@ parts:
       - ninja-build
       - nodejs
       - pkg-config
-      - python-pip
-      - python2-minimal
+      - python3-pip
       - python3-html5lib
       - python3-minimal
       - unixodbc-dev
@@ -399,6 +401,6 @@ parts:
     after: [debs]
     override-stage: |
       set -eux
-      for snap in "core22" "ffmpeg-2204-sdk"; do
+      for snap in "core24" "ffmpeg-2404-sdk"; do
         cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$CRAFT_PRIME/{}" \;
       done