[neon/snap-packaging/kf6-core-sdk] /: copy paste fail.

Scarlett Moore null at kde.org
Fri Nov 15 13:21:46 GMT 2024


Git commit fa5106fe9eac66697119f325d07423058fd1f944 by Scarlett Moore.
Committed on 15/11/2024 at 13:20.
Pushed by scarlettmoore into branch 'master'.

copy paste fail.

M  +2    -4    snapcraft.yaml

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

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 2be7ec3..a3212a6 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,4 +1,4 @@
----
+ ---
 name: kf6-core22-sdk
 version: 6.8.0
 summary: KDE Frameworks 6
@@ -852,9 +852,7 @@ parts:
         override-pull: |
             craftctl default
             while read -r PATCHFILE ; do 
-                patch -p            find $CRAFT_STAGE -type f,l -name "*.pc" -exec bash -c "sed -i 's:libdir=/usr:libdir=/snap/$CRAFT_PROJECT_NAME/current/usr:g' {}*" \;
-            find $CRAFT_STAGE -type f,l -name "*.pc" -exec bash -c "sed -i 's:includedir=/usr:includedir=/snap/$CRAFT_PROJECT_NAME/current/usr:g' {}*" \;
-1 < "$CRAFT_PROJECT_DIR/patches/libdbusmenu-qt6/$PATCHFILE"
+                patch -p1 < "$CRAFT_PROJECT_DIR/patches/libdbusmenu-qt6/$PATCHFILE"
             done < $CRAFT_PROJECT_DIR/patches/libdbusmenu-qt6/series
         plugin: cmake
         build-snaps:


More information about the Neon-commits mailing list