From 51648b0714ac05b504b711c37f5f8c978bf221e1 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sun, 16 Jun 2024 16:21:24 +1000 Subject: [PATCH] CI/AppImage: Explicitly remove libwayland-* --- scripts/appimage/make-appimage.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/scripts/appimage/make-appimage.sh b/scripts/appimage/make-appimage.sh index 7c1b3938d..31b7898d6 100755 --- a/scripts/appimage/make-appimage.sh +++ b/scripts/appimage/make-appimage.sh @@ -70,6 +70,12 @@ declare -a MANUAL_QT_PLUGINS=( "wayland-shell-integration" ) +declare -a REMOVE_LIBS=( + 'libwayland-client.so*' + 'libwayland-cursor.so*' + 'libwayland-egl.so*' +) + set -e LINUXDEPLOY=./linuxdeploy-x86_64.AppImage @@ -165,6 +171,16 @@ for GROUP in "${MANUAL_QT_PLUGINS[@]}"; do done done +# Why do we have to manually remove these libs? Because the linuxdeploy Qt plugin +# copies them, not the "main" linuxdeploy binary, and plugins don't inherit the +# include list... +for lib in "${REMOVE_LIBS[@]}"; do + for libpath in $(find "$OUTDIR/usr/lib" -name "$lib"); do + echo " Removing problematic library ${libpath}." + rm -f "$libpath" + done +done + # Restore unstripped deps (for cache). rm -fr "$DEPSDIR" mv "$DEPSDIR.bak" "$DEPSDIR"