[neon/snap-packaging/kf6-core-sdk] /: Fix multiarch path for pkgconfig, add libzstd to karchive.

[Scarlett Moore]

Git commit 02b5d822919c84a3a2b5935f7ba932a3b7192dce by Scarlett Moore.
Committed on 09/06/2024 at 15:05.
Pushed by scarlettmoore into branch 'master'.

Fix multiarch path for pkgconfig, add libzstd to karchive.

M  +11   -8    snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kf6-core-sdk/-/commit/02b5d822919c84a3a2b5935f7ba932a3b7192dce

diff --git a/snapcraft.yaml b/snapcraft.yaml
index ceed809..01cb71d 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -106,7 +106,7 @@ parts:
         - "-DCMAKE_PREFIX_PATH=$CRAFT_STAGE\\;/snap/kde-qt6-core22-sdk/current\\;/usr"
         build-environment: &buildenvironment
             - PATH: /snap/kde-qt6-core22-sdk/current/usr/bin${PATH:+:$PATH}
-            - PKG_CONFIG_PATH: /snap/kde-qt6-core22-sdk/current/usr/lib/x86_64-linux-gnu/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_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:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/lib/:$CRAFT_STAGE/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
@@ -425,23 +425,26 @@ parts:
         after:
         - extra-cmake-modules
         - qtconf
-        source: https://invent.kde.org/frameworks/karchive.git
-        source-tag: *kf6-version
-        source-depth: 1
         build-packages:
-        - doxygen
-        - graphviz
-        - liblzma-dev
         - libbz2-dev
+        - libzstd-dev
         stage-packages:
         - libbz2-1.0
-        - liblzma5
+        - libzstd1
+        source: https://invent.kde.org/frameworks/karchive.git
+        source-tag: *kf6-version
+        source-depth: 1
         build-snaps:
         - kde-qt6-core22-sdk
         plugin: cmake
         cmake-generator: Ninja
         cmake-parameters: *cmakeparameters
         build-environment: *buildenvironment
+        override-pull: |
+            craftctl default
+            while read -r PATCHFILE ; do
+                patch -p1 < "$CRAFT_PROJECT_DIR/patches/karchive/$PATCHFILE"
+            done < $CRAFT_PROJECT_DIR/patches/karchive/series
     kcodecs:
         after:
         - extra-cmake-modules