[neon/snap-packaging/kf6-core-sdk] /: Bring in pc file changes core22

Scarlett Moore null at kde.org
Fri Nov 15 11:47:06 GMT 2024


Git commit 60d071a5b6cba33d94ca5183556b36a6dcdb74ad by Scarlett Moore.
Committed on 15/11/2024 at 11:46.
Pushed by scarlettmoore into branch 'master'.

Bring in pc file changes core22

M  +6    -1    snapcraft.yaml

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

diff --git a/snapcraft.yaml b/snapcraft.yaml
index f8aba69..2be7ec3 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -852,7 +852,9 @@ parts:
         override-pull: |
             craftctl default
             while read -r PATCHFILE ; do 
-                patch -p1 < "$CRAFT_PROJECT_DIR/patches/libdbusmenu-qt6/$PATCHFILE"
+                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"
             done < $CRAFT_PROJECT_DIR/patches/libdbusmenu-qt6/series
         plugin: cmake
         build-snaps:
@@ -2333,3 +2335,6 @@ parts:
         override-stage: |
             craftctl default
             find $CRAFT_STAGE -type f,l -name "*.pc" -exec bash -c "sed -i 's:/root/stage:/snap/$CRAFT_PROJECT_NAME/current:g' {}*" \;
+            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' {}*" \;
+


More information about the Neon-commits mailing list