From e34e2553fe07d4e41f6323e5587efee4ef978e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Lespez?= Date: Thu, 4 Aug 2022 15:45:43 +0200 Subject: [PATCH] Remove libglib-2.0.so.0 and libgobject-2.0.so.0 (to no break libsecret support) from Appimage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Frédéric Lespez --- linux/build-appimage-daily.sh | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/linux/build-appimage-daily.sh b/linux/build-appimage-daily.sh index 5b20c044d..f166503d2 100755 --- a/linux/build-appimage-daily.sh +++ b/linux/build-appimage-daily.sh @@ -79,10 +79,12 @@ cp -P -r /usr/lib/x86_64-linux-gnu/nss ./usr/lib/ # Use linuxdeployqt to deploy cd /build -wget --ca-directory=/etc/ssl/certs -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" -chmod a+x linuxdeployqt*.AppImage -./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract -rm ./linuxdeployqt-continuous-x86_64.AppImage +LINUXDEPLOYQT_VERSION="continuous" +wget -O linuxdeployqt.AppImage --ca-directory=/etc/ssl/certs -c "https://github.com/probonopd/linuxdeployqt/releases/download/${LINUXDEPLOYQT_VERSION}/linuxdeployqt-continuous-x86_64.AppImage" +chmod a+x linuxdeployqt.AppImage +./linuxdeployqt.AppImage --appimage-extract +rm ./linuxdeployqt.AppImage +cp -r ./squashfs-root ./linuxdeployqt-squashfs-root unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH export LD_LIBRARY_PATH=/app/usr/lib/ ./squashfs-root/AppRun ${DESKTOP_FILE} -bundle-non-qt-libs -qmldir=/build/desktop/src/gui @@ -93,6 +95,15 @@ export LD_LIBRARY_PATH=/app/usr/lib/ # Build AppImage ./squashfs-root/AppRun ${DESKTOP_FILE} -appimage +# Workaround issue #103 +rm -rf ./squashfs-root +APPIMAGE=$(ls Nextcloud*.AppImage) +"./${APPIMAGE}" --appimage-extract +rm "./${APPIMAGE}" +rm ./squashfs-root/usr/lib/libglib-2.0.so.0 +rm ./squashfs-root/usr/lib/libgobject-2.0.so.0 +PATH=./linuxdeployqt-squashfs-root/usr/bin:$PATH appimagetool -n ./squashfs-root "$APPIMAGE" + export VERSION_MAJOR=$(cat build-client/version.h | grep MIRALL_VERSION_MAJOR | cut -d ' ' -f 3) export VERSION_MINOR=$(cat build-client/version.h | grep MIRALL_VERSION_MINOR | cut -d ' ' -f 3) export VERSION_PATCH=$(cat build-client/version.h | grep MIRALL_VERSION_PATCH | cut -d ' ' -f 3)