[neon/snap-packaging/kde-qt6-core-sdk] /: Move pkgconfig sed to debs stage part. Change back to Release.

[Scarlett Moore]

Git commit ae098b357e19190ce778c0f0f22e2919e0a26ba2 by Scarlett Moore.
Committed on 07/06/2024 at 12:00.
Pushed by scarlettmoore into branch 'master'.

Move pkgconfig sed to debs stage part. Change back to Release.

M  +6    -8    snapcraft.yaml

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

diff --git a/snapcraft.yaml b/snapcraft.yaml
index eb8c7e1..08a4294 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -8,7 +8,7 @@ description: |
   interactive functionality.
 architectures:
   - build-on: amd64
-  - build-on: arm64
+ #  - build-on: arm64
   # - build-on: armhf
   # - build-on: ppc64el
 grade: stable
@@ -42,7 +42,7 @@ parts:
     source-depth: 1
     cmake-generator: Ninja
     cmake-parameters:
-      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
+      - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
       - -DINSTALL_BINDIR=/usr/bin/qt6
       - -DINSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
@@ -111,7 +111,7 @@ 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/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
+      - 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
     build-snaps:
@@ -385,17 +385,15 @@ parts:
       - -usr/share/doc-base
       - -usr/share/lintian
       - -usr/share/man
+    override-stage: |
+      set -eux
+      find $CRAFT_STAGE -type f,l -name "*.pc" -exec bash -c "sed -i 's:prefix=/root/stage/usr:prefix=/snap/kde-qt6-core22-sdk/current/usr:g' {}*" \;
 
   cleanup:
     plugin: nil
     after: [debs]
     override-stage: |
       set -eux
-      find $CRAFT_PRIME -type f,l -name "*.pc" -exec bash -c "sed -i 's:prefix=/root/stage/usr:prefix=/snap/$CRAFT_PROJECT_NAME/current:g' {}*" \;
-      find $CRAFT_PRIME -type f,l -name "*.pc" -exec bash -c "sed -i 's|libdir=/usr|libdir=/snap/$CRAFT_PROJECT_NAME/current/usr|g' {}*" \;
-      find $CRAFT_PRIME -type f,l -name "*.pc" -exec bash -c "sed -i 's|includedir=/usr|includedir=/snap/$CRAFT_PROJECT_NAME/current/usr|g' {}*" \;
-      find $CRAFT_PRIME -type f,l -name "*.pc" -exec bash -c "sed -i 's|exec_prefix=/usr|exec_prefix=/snap/$CRAFT_PROJECT_NAME/current/usr|g' {}*" \;
-      find $CRAFT_PRIME -type f,l -name "*.pc" -exec bash -c "sed -i 's|modlibexecdir=/usr|modlibexecdir=/snap/$CRAFT_PROJECT_NAME/current/usr|g' {}*" \;
       for snap in "core22" "ffmpeg-2204-sdk"; do
         cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$CRAFT_PRIME/{}" \;
       done