[neon/snap-packaging/kde-qt6-core-sdk] /: Set - -DFEATURE_system_zlib=ON to match neon as theirs correctly uses

Scarlett Moore null at kde.org
Wed Jun 5 12:18:54 BST 2024


Git commit e979944ae799ac2c3534368db1597136adcb1f1d by Scarlett Moore.
Committed on 05/06/2024 at 11:16.
Pushed by scarlettmoore into branch 'master'.

Set - -DFEATURE_system_zlib=ON to match neon as theirs correctly uses
shared lib.

M  +3    -4    snapcraft.yaml

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

diff --git a/snapcraft.yaml b/snapcraft.yaml
index fa9d1b1..0f2e86c 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -42,8 +42,7 @@ parts:
     source-depth: 1
     cmake-generator: Ninja
     cmake-parameters:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DCMAKE_LIBRARY_PATH=$CRAFT_ARCH_TRIPLET_BUILD_FOR
+      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
       - -DCMAKE_INSTALL_PREFIX=/usr
       - -DINSTALL_BINDIR=/usr/bin/qt6
       - -DINSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
@@ -68,7 +67,7 @@ parts:
       - -DFEATURE_icu=ON
       - -DFEATURE_pcre2=ON
       - -DFEATURE_system_pcre2=ON
-      - -DFEATURE_zlib=ON
+      - -DFEATURE_system_zlib=ON
       - -DFEATURE_ssl=ON
       - -DFEATURE_libproxy=ON
       - -DFEATURE_system_proxies=ON
@@ -389,7 +388,7 @@ parts:
     after: [debs]
     override-stage: |
       set -eux
-      find $CRAFT_PRIME -type f,l -name "*.pc" -exec bash -c "sed -i 's|/root/stage/usr|/snap/$CRAFT_PROJECT_NAME/current/usr|g' {}*" \;
+      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' {}*" \;


More information about the Neon-commits mailing list