Improve build

pkg/appimage/appimagebuild

@@ -12,10 +12,14 @@ qmake PREFIX=/usr
 make
 make INSTALL_ROOT=${APPDIR} install
 
-curl -fsSL -o linuxdeployqt https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
-chmod 755 linuxdeployqt
-./linuxdeployqt --appimage-extract
-./squashfs-root/AppRun ${APPDIR}/usr/share/applications/${PKGNAME}.desktop -bundle-non-qt-libs -no-translations
+wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
+wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+chmod 755 *.AppImage
+
+./linuxdeploy-plugin-qt-x86_64.AppImage --appimage-extract
+./linuxdeploy-x86_64.AppImage --appimage-extract
+./squashfs-root/AppRun --list-plugins
+./squashfs-root/AppRun --appdir ${APPDIR}
 
 install -D -m 755 /usr/lib/x86_64-linux-gnu/libfontconfig.so.1 ${APPDIR}/usr/lib/libfontconfig.so.1
 install -D -m 755 /usr/lib/x86_64-linux-gnu/libfreetype.so.6 ${APPDIR}/usr/lib/libfreetype.so.6
@@ -27,6 +31,6 @@ install -D -m 755 /usr/bin/unzip ${APPDIR}/usr/bin/unzip
 install -D -m 755 /usr/lib/p7zip/7zr ${APPDIR}/usr/bin/7zr
 install -D -m 755 /usr/bin/unar ${APPDIR}/usr/bin/unar
 
-./squashfs-root/AppRun ${APPDIR}/usr/share/applications/${PKGNAME}.desktop -appimage
+./squashfs-root/AppRun --appdir ${APPDIR} --plugin qt -output appimage
 
 mv *-x86_64.AppImage ../${PKGNAME}-${PKGVER}-${PKGREL}-x86_64.AppImage

scripts/package

@@ -20,20 +20,12 @@ appimage() { # docker-image: ubuntu:14.04
 
 install_build_deps_appimage() {
     apt-get update -qq
-    apt-get -y --force-yes install curl git vim-common
-    #apt  install build-essential qt5-default libqt5websockets5-dev
-    #apt -y install cmake automake libtool pkg-config wget desktop-file-utils libglib2.0-dev libcairo2-dev libssl-dev libcurl3 libcurl4-openssl-dev libxpm-dev
-    apt-get -y --force-yes install libfontconfig1 libfreetype6 libssl1.0.0 zlib1g unzip p7zip unar
-
-    apt-get -y --force-yes install software-properties-common
+    apt-get -y --force-yes install curl wget git vim-common software-properties-common
     add-apt-repository -y ppa:beineri/opt-qt-5.12.3-xenial
-    echo 'deb http://download.opensuse.org/repositories/home:/TheAssassin:/AppImageLibraries/xUbuntu_16.04/ /' > /etc/apt/sources.list.d/curl-httponly.list
-    curl -fsSL https://download.opensuse.org/repositories/home:TheAssassin:AppImageLibraries/xUbuntu_16.04/Release.key | apt-key add -
     apt-get update -qq
 
-    apt-get -y --force-yes install build-essential mesa-common-dev libglu1-mesa-dev qt512base qt512websockets
+    apt-get -y --force-yes install build-essential qt512base qt512wayland qt512websockets desktop-file-utils libgl1 libdrm-dev mesa-common-dev libssl-dev libtool automake pkg-config libglib2.0-dev libcairo2-dev libglu1-mesa-dev
     curl -fsSL https://github.com/Kitware/CMake/releases/download/v3.13.3/cmake-3.13.3-Linux-x86_64.tar.gz | tar -xz --strip-components=1 -C /
-    apt-get -y --force-yes install automake libtool pkg-config wget desktop-file-utils libglib2.0-dev libcairo2-dev libssl-dev libcurl3 libcurl4-openssl-dev libxpm-dev
 }
 
 build_appimage() {