From 29350ceecd69ebc96583ccfba28acc22acae0750 Mon Sep 17 00:00:00 2001 From: Simon Peter Date: Fri, 10 Nov 2017 09:35:50 -0800 Subject: Travis: remove linuxdeployqt workaround Do not move around .so* files in order for linuxdeployqt to pick them up. Signed-off-by: Simon Peter Signed-off-by: Dirk Hohndel --- scripts/linux/travisbuild.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/linux/travisbuild.sh b/scripts/linux/travisbuild.sh index 987d71ba2..0cb8bf666 100644 --- a/scripts/linux/travisbuild.sh +++ b/scripts/linux/travisbuild.sh @@ -26,7 +26,6 @@ mkdir -p appdir/usr/plugins/ # mv googlemaps and Grantlee plugins into place mv appdir/usr/usr/local/Qt*/plugins/* appdir/usr/plugins # the usr/usr is not a typo - that's where it ends up mv appdir/usr/lib/grantlee/ appdir/usr/plugins/ -sudo mv appdir/usr/lib/* /usr/local/lib/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/160 rm -rf appdir/usr/home/ appdir/usr/include/ appdir/usr/share/man/ # No need to ship developer and man files as part of the AppImage # get the linuxdeployqt tool and run it to collect the libraries @@ -35,7 +34,6 @@ chmod a+x linuxdeployqt*.AppImage unset QTDIR unset QT_PLUGIN_PATH unset LD_LIBRARY_PATH -export LD_LIBRARY_PATH=/usr/local/lib/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/160 ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs -qmldir=./subsurface/map-widget/ -verbose=2 # create the AppImage -- cgit v1.2.3-70-g09d2