[neon/snap-packaging/kde-qt6-core-sdk/core24] /: Don't stage ffmpeg, rm duplicates.

Scarlett Moore null at kde.org
Thu Sep 26 08:50:38 BST 2024


Git commit 6356bf94e8e90e1b58093babbfc083534b26d4b9 by Scarlett Moore.
Committed on 26/09/2024 at 07:49.
Pushed by scarlettmoore into branch 'core24'.

Don't stage ffmpeg, rm duplicates.

M  +3    -6    snapcraft.yaml

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

diff --git a/snapcraft.yaml b/snapcraft.yaml
index d13526a..8eecaf1 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -239,8 +239,6 @@ parts:
       - zlib1g-dev
     stage-packages:
       - libpulse0
-    stage-snaps:
-      - ffmpeg-2404
     # override-pull: |
     #   craftctl default
     #   # while read -r PATCHFILE ; do
@@ -253,8 +251,7 @@ parts:
     override-build: |
       craftctl default
       mkdir -p $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/
+      cp $CRAFT_PART_BUILD/config.summary $CRAFT_PART_INSTALL/etc/$CRAFT_PART_NAME/
 
   debs:
     after: [qt6]
@@ -384,8 +381,8 @@ parts:
       - libxml2-utils
       - libglvnd-dev
     stage:
-      - -usr/lib/**/libcurl.so.**
-      - -usr/lib/**/libvulkan.so.**
+      - -usr/lib/**/libcurl.so.*
+      - -usr/lib/**/libvulkan.so.*
     prime:
       - -lib
       - -usr/lib/systemd


More information about the Neon-commits mailing list