[neon/snap-packaging/kde-qt6-core-sdk/work.core26] /: Merge branch 'work.core24' into work.core26

Scarlett Moore null at kde.org
Fri Jun 19 11:33:50 BST 2026


Git commit 8ad5bace9918ffe62d4633a75fe3291d0d7eb842 by Scarlett Moore.
Committed on 19/06/2026 at 10:33.
Pushed by scarlettmoore into branch 'work.core26'.

Merge branch 'work.core24' into work.core26

M  +13   -10   snapcraft.yaml

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

diff --cc snapcraft.yaml
index 6025abe,1369df2..1a66864
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@@ -144,8 -155,9 +146,9 @@@ parts
        - -DQT_UNITY_BUILD=ON
      build-snaps:
        - cmake
 -      - ffmpeg-2404-sdk
 +      - ffmpeg-2604-sdk
        - hunspell-dictionaries
+       - node/22/stable
      build-packages:
        - binutils
        - bison
@@@ -350,10 -362,10 +353,10 @@@
      stage-packages:
        - libpulse0
      build-environment:
 -      - CMAKE_PREFIX_PATH: /snap/ffmpeg-2404-sdk/current/usr${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH}
 +      - CMAKE_PREFIX_PATH: /snap/ffmpeg-2604-sdk/current/usr${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH}
        - DICPATH: "$CRAFT_STAGE/usr/share/hunspell"
 -      - PKG_CONFIG_PATH: /snap/ffmpeg-2404-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
 +      - PKG_CONFIG_PATH: /snap/ffmpeg-2604-sdk/current/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
-       - LLVM_INSTALL_DIR: $CRAFT_STAGE/usr/lib/llvm-18/lib
+       - LLVM_INSTALL_DIR: $CRAFT_STAGE/usr/lib/llvm-19/lib
      prime:
        - -usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libcurl*
        - -usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libvulkan*


More information about the Neon-commits mailing list