[neon/snap-packaging/kde-qt6-core-sdk/work.core24] /: Avoid wayland-(scanner|protocols).pc pointing on the same pkgdatadir
Kevin Ottens
null at kde.org
Tue Jan 14 08:03:42 GMT 2025
Git commit 09b16992fde7f20caf333a3c053f1b34796deb38 by Kevin Ottens.
Committed on 14/01/2025 at 08:03.
Pushed by ervin into branch 'work.core24'.
Avoid wayland-(scanner|protocols).pc pointing on the same pkgdatadir
M +2 -1 snapcraft.yaml
https://invent.kde.org/neon/snap-packaging/kde-qt6-core-sdk/-/commit/09b16992fde7f20caf333a3c053f1b34796deb38
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 14c57fa..6c6f287 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -412,7 +412,8 @@ parts:
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' {}*" \;
- find $CRAFT_STAGE -type f,l -name "*.pc" -exec bash -c "sed -i 's:pkgdatadir=.*$:pkgdatadir=/snap/$CRAFT_PROJECT_NAME/current/usr/share/wayland:g' {}*" \;
+ find $CRAFT_STAGE -type f,l -name "wayland-scanner.pc" -exec bash -c "sed -i 's:pkgdatadir=.*$:pkgdatadir=/snap/$CRAFT_PROJECT_NAME/current/usr/share/wayland:g' {}*" \;
+ find $CRAFT_STAGE -type f,l -name "wayland-protocols.pc" -exec bash -c "sed -i 's:pkgdatadir=.*$:pkgdatadir=/snap/$CRAFT_PROJECT_NAME/current/usr/share/wayland-protocols:g' {}*" \;
cleanup:
plugin: nil
More information about the Neon-commits
mailing list