[neon/snap-packaging/kde-qt6-core-sdk/core24] /: Turn relocTble ON to fix qtools usage.

Scarlett Moore null at kde.org
Wed Sep 25 19:19:51 BST 2024


Git commit b71050025f97ea630be022aa3d3f0e519695ca53 by Scarlett Moore.
Committed on 25/09/2024 at 18:18.
Pushed by scarlettmoore into branch 'core24'.

Turn relocTble ON to fix qtools usage.

Unstage the two duplicate files causing build to fail.

M  +9    -3    snapcraft.yaml

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

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 96027c2..d13526a 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -95,7 +95,7 @@ parts:
       - -DFEATURE_system_png=ON
       - -DFEATURE_system_libb2=ON
       - -DFEATURE_rpath=OFF
-      - -DFEATURE_relocatable=OFF
+      - -DFEATURE_relocatable=ON
       - -DFEATURE_qtpdf_build=ON
       - -DFEATURE_qtpdf_enable_v8=ON
       - -DFEATURE_qtpdf_quick_build=ON
@@ -237,6 +237,8 @@ parts:
       - python3-minimal
       - unixodbc-dev
       - zlib1g-dev
+    stage-packages:
+      - libpulse0
     stage-snaps:
       - ffmpeg-2404
     # override-pull: |
@@ -251,7 +253,8 @@ parts:
     override-build: |
       craftctl default
       mkdir -p $CRAFT_PART_INSTALL/etc/$CRAFT_PART_NAME
-      cp $CRAFT_PART_BUILD/config.summary $CRAFT_PART_INSTALL/etc/$CRAFT_PART_NAME/
+      ls -l $CRAFT_PART_BUILD
+    #  cp $CRAFT_PART_BUILD/config.summary $CRAFT_PART_INSTALL/etc/$CRAFT_PART_NAME/
 
   debs:
     after: [qt6]
@@ -380,6 +383,9 @@ parts:
       - sgml-data
       - libxml2-utils
       - libglvnd-dev
+    stage:
+      - -usr/lib/**/libcurl.so.**
+      - -usr/lib/**/libvulkan.so.**
     prime:
       - -lib
       - -usr/lib/systemd
@@ -399,6 +405,6 @@ parts:
     after: [debs]
     override-stage: |
       set -eux
-      for snap in "core24" "ffmpeg-2404"; do
+      for snap in "core24" "ffmpeg-2404-sdk"; do
         cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$CRAFT_PRIME/{}" \;
       done


More information about the Neon-commits mailing list