[neon/snap-packaging/kf6-core-sdk/work.core24] /: move kcoreaddons up so that its declared variables are found first

Carlos De Maine null at kde.org
Wed Dec 3 23:33:17 GMT 2025 

Git commit 8a515f2f52c148af26359dd0eec814d33920309d by Carlos De Maine.
Committed on 03/12/2025 at 23:33.
Pushed by carlosdem into branch 'work.core24'.

move kcoreaddons up so that its declared variables are found first

M  +50   -48   snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kf6-core-sdk/-/commit/8a515f2f52c148af26359dd0eec814d33920309d

diff --git a/snapcraft.yaml b/snapcraft.yaml
index fdb77c2..ac42c01 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -392,6 +392,56 @@ parts:
       - libudev1
       - media-player-info
       - upower
+
+  kcoreaddons:
+    after:
+      - extra-cmake-modules
+      - qtconf
+    source: https://invent.kde.org/frameworks/kcoreaddons.git
+    source-tag: *kf6-version
+    source-depth: 1
+    build-packages:
+      - doxygen
+      - graphviz
+      - libudev-dev
+      - shared-mime-info
+      - python3-build
+      - gcc
+      - g++
+      - clang-18
+    stage-packages:
+      - shared-mime-info
+      - libudev1
+    build-snaps:
+      - kde-qt6-core24-sdk/latest/beta
+      - kde-pyside6-core24-sdk/latest/beta
+    plugin: cmake
+    cmake-generator: Ninja
+    cmake-parameters: &cmakeparameters-kf6withpyside6
+      - -DBUILD_WITH_QT6=ON
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DQT_MAJOR_VERSION=6
+      - -DCMAKE_FIND_ROOT_PATH="$CRAFT_STAGE\\;/snap/kde-qt6-core24-sdk/current\\;/snap/kde-pyside6-core24-sdk/current\\;/usr"
+    build-environment: &buildenvironment-kf6withpyside6
+      - LLVM_INSTALL_DIR: /snap/kde-qt6-core24-sdk/current/usr/lib/llvm-18
+      - CMAKE_PREFIX_PATH: /snap/kde-qt6-core24-sdk/current/usr:/snap/ffmpeg-2404-sdk/current/usr:/snap/kde-pyside6-core24-sdk/current${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH}
+      - DICPATH: "$CRAFT_STAGE/usr/share/hunspell"
+      - LD_LIBRARY_PATH: "/snap/kde-qt6-core24-sdk/current/usr/lib:/snap/kde-qt6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:/snap/kde-pyside6-core24-sdk/current/usr/lib:/snap/kde-qt6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/libproxy:/snap/ffmpeg-2404-sdk/current/usr/lib/x86_64-linux-gnu/:$CRAFT_STAGE/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/kde-qt6-core24-sdk/current/usr/lib/llvm-18/bin:/snap/kde-pyside6-core24-sdk/current/usr/bin${PATH:+:$PATH}
+      - PKG_CONFIG_PATH: /snap/kde-qt6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/pkgconfig:/snap/kde-pyside6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/pkgconfig:/snap/ffmpeg-2404-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
+      - PYTHONPATH: /snap/kde-qt6-core24-sdk/current/usr/lib/python3.12:/snap/kde-qt6-core24-sdk/current/usr/lib/python3/dist-packages:/snap/kde-pyside6-core24-sdk/current/usr/lib/python3.12:/snap/kde-pyside6-core24-sdk/current/usr/lib/python3/dist-packages
+      - CPATH:  /snap/kde-qt6-core24-sdk/current/usr/include:/snap/kde-pyside6-core24-sdk/current/usr/include${CPATH:+:$CPATH}
+      - C_INCLUDE_PATH: $CRAFT_STAGE/usr/include:/snap/kde-qt6-core24-sdk/current/usr/include:/snap/kde-pyside6-core24-sdk/current/usr/include
+      - CPLUS_INCLUDE_PATH: $CRAFT_STAGE/usr/include:/snap/kde-qt6-core24-sdk/current/usr/include/python3.12:/snap/kde-pyside6-core24-sdk/current/usr/include/PySide6:/snap/kde-pyside6-core24-sdk/current/usr/include/shiboken6:/snap/kde-pyside6-core24-sdk/current/usr/include
+      - 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}
+      - CC: /usr/bin/gcc
+      - CXX: /usr/bin/g++
+    override-pull: |
+        craftctl default
+        patch -p1 < $CRAFT_PROJECT_DIR/patches/kcoreaddons/001_snap_window_class_fix.patch
+
   kwidgetsaddons:
     after:
       - plasma-wayland-protocols
@@ -489,54 +539,6 @@ parts:
     cmake-generator: Ninja
     cmake-parameters: *cmakeparameters-kf6withpyside6
     build-environment: *buildenvironment-kf6withpyside6
-  kcoreaddons:
-    after:
-      - extra-cmake-modules
-      - qtconf
-    source: https://invent.kde.org/frameworks/kcoreaddons.git
-    source-tag: *kf6-version
-    source-depth: 1
-    build-packages:
-      - doxygen
-      - graphviz
-      - libudev-dev
-      - shared-mime-info
-      - python3-build
-      - gcc
-      - g++
-      - clang-18
-    stage-packages:
-      - shared-mime-info
-      - libudev1
-    build-snaps:
-      - kde-qt6-core24-sdk/latest/beta
-      - kde-pyside6-core24-sdk/latest/beta
-    plugin: cmake
-    cmake-generator: Ninja
-    cmake-parameters: &cmakeparameters-kf6withpyside6
-      - -DBUILD_WITH_QT6=ON
-      - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DQT_MAJOR_VERSION=6
-      - -DCMAKE_FIND_ROOT_PATH="$CRAFT_STAGE\\;/snap/kde-qt6-core24-sdk/current\\;/snap/kde-pyside6-core24-sdk/current\\;/usr"
-    build-environment: &buildenvironment-kf6withpyside6
-      - LLVM_INSTALL_DIR: /snap/kde-qt6-core24-sdk/current/usr/lib/llvm-18
-      - CMAKE_PREFIX_PATH: /snap/kde-qt6-core24-sdk/current/usr:/snap/ffmpeg-2404-sdk/current/usr:/snap/kde-pyside6-core24-sdk/current${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH}
-      - DICPATH: "$CRAFT_STAGE/usr/share/hunspell"
-      - LD_LIBRARY_PATH: "/snap/kde-qt6-core24-sdk/current/usr/lib:/snap/kde-qt6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}:/snap/kde-pyside6-core24-sdk/current/usr/lib:/snap/kde-qt6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/libproxy:/snap/ffmpeg-2404-sdk/current/usr/lib/x86_64-linux-gnu/:$CRAFT_STAGE/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/kde-qt6-core24-sdk/current/usr/lib/llvm-18/bin:/snap/kde-pyside6-core24-sdk/current/usr/bin${PATH:+:$PATH}
-      - PKG_CONFIG_PATH: /snap/kde-qt6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/pkgconfig:/snap/kde-pyside6-core24-sdk/current/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/pkgconfig:/snap/ffmpeg-2404-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
-      - PYTHONPATH: /snap/kde-qt6-core24-sdk/current/usr/lib/python3.12:/snap/kde-qt6-core24-sdk/current/usr/lib/python3/dist-packages:/snap/kde-pyside6-core24-sdk/current/usr/lib/python3.12:/snap/kde-pyside6-core24-sdk/current/usr/lib/python3/dist-packages
-      - CPATH:  /snap/kde-qt6-core24-sdk/current/usr/include:/snap/kde-pyside6-core24-sdk/current/usr/include${CPATH:+:$CPATH}
-      - C_INCLUDE_PATH: $CRAFT_STAGE/usr/include:/snap/kde-qt6-core24-sdk/current/usr/include:/snap/kde-pyside6-core24-sdk/current/usr/include
-      - CPLUS_INCLUDE_PATH: $CRAFT_STAGE/usr/include:/snap/kde-qt6-core24-sdk/current/usr/include/python3.12:/snap/kde-pyside6-core24-sdk/current/usr/include/PySide6:/snap/kde-pyside6-core24-sdk/current/usr/include/shiboken6:/snap/kde-pyside6-core24-sdk/current/usr/include
-      - 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}
-      - CC: /usr/bin/gcc
-      - CXX: /usr/bin/g++
-    override-pull: |
-        craftctl default
-        patch -p1 < $CRAFT_PROJECT_DIR/patches/kcoreaddons/001_snap_window_class_fix.patch
   karchive:
     after:
       - extra-cmake-modules

More information about the Neon-commits mailing list