do not build qt keychain already included in the CI images

clean up some cruft

adapt to the new paths in CI images

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

diff --git a/admin/linux/build-appimage.sh b/admin/linux/build-appimage.sh
index 33298a06b08de3809a23f6833eb3a4a373a630bb..99a32dacb807684de24794b27325b3f6cb8f115b 100755 (executable)
--- a/admin/linux/build-appimage.sh
+++ b/admin/linux/build-appimage.sh
@@ -8,12 +8,10 @@ export BUILDNR=${BUILDNR:-0000}
 export DESKTOP_CLIENT_ROOT=${DESKTOP_CLIENT_ROOT:-/home/user}
 
 #Set Qt-5.15
-export QT_BASE_DIR=/opt/qt5.15
+export QT_BASE_DIR=/opt/kdeqt5.15
 
 export QTDIR=$QT_BASE_DIR
 export PATH=$QT_BASE_DIR/bin:$PATH
-export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH
-export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
 
 # Set defaults
 export SUFFIX=${DRONE_PULL_REQUEST:=master}
@@ -26,17 +24,6 @@ fi
 
 mkdir /app
 
-# QtKeyChain
-git clone https://github.com/frankosterfeld/qtkeychain.git
-cd qtkeychain
-git checkout v0.10.0
-mkdir build
-cd build
-cmake -G Ninja -D CMAKE_INSTALL_PREFIX=/usr ..
-cmake --build . --target all
-DESTDIR=/app cmake --install .
-
-
 # Build client
 mkdir build-client
 cd build-client
@@ -60,7 +47,6 @@ mkdir usr/plugins
 mv usr/lib/*sync_vfs_suffix.so usr/plugins
 mv usr/lib/*sync_vfs_xattr.so usr/plugins
 
-
 rm -rf usr/lib/cmake
 rm -rf usr/include
 rm -rf usr/mkspecs
@@ -80,7 +66,6 @@ DESKTOP_FILE=$(ls /app/usr/share/applications/*.desktop)
 sed -i -e 's|Icon=nextcloud|Icon=Nextcloud|g' ${DESKTOP_FILE} # Bug in desktop file?
 cp ./usr/share/icons/hicolor/512x512/apps/*.png . # Workaround for linuxeployqt bug, FIXME
 
-
 # Because distros need to get their shit together
 cp -R /usr/lib/x86_64-linux-gnu/libssl.so* ./usr/lib/
 cp -R /usr/lib/x86_64-linux-gnu/libcrypto.so* ./usr/lib/
@@ -98,7 +83,7 @@ chmod a+x linuxdeployqt.AppImage
 rm ./linuxdeployqt.AppImage
 cp -r ./squashfs-root ./linuxdeployqt-squashfs-root
 unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=/usr/lib/
+export LD_LIBRARY_PATH=/usr/local/lib/x86_64-linux-gnu
 ./squashfs-root/AppRun ${DESKTOP_FILE} -bundle-non-qt-libs -qmldir=${DESKTOP_CLIENT_ROOT}/src/gui
 
 # Set origin