Merge pull request #298 from docsteer/297-v220-beta1-linux-build-missing-xcb

Use linuxdeploy over linuxdeployqt

Author: marcusbirkin

.github/workflows/build.yml

@@ -27,12 +27,12 @@ jobs:
             qt: '6.2.4' # Qt6 LTS
             qt_modules: 'qtmultimedia'
             dependencies: |
-              sudo apt-get install mesa-common-dev libgl1-mesa-dev libpcap-dev libgstreamer-gl1.0-0 libgstreamer-plugins-base1.0-0 -y
+              sudo apt-get install mesa-common-dev libgl1-mesa-dev libpcap-dev libgstreamer-gl1.0-0 libgstreamer-plugins-base1.0-0 libxkbcommon-x11-0 -y
             installer_setup: |
               sudo gem install --no-document fpm
             make_cmd: make
             artifact: |
-              sACNView*.AppImage
+              install/linux/sACNView*.AppImage
               install/linux/*.deb
 
           - os: windows-latest

deploy.pri

@@ -65,36 +65,46 @@ linux {
     VERSION = $$system(echo $$GIT_VERSION | sed 's/[a-zA-Z]//')
 
     DEPLOY_DIR = $${_PRO_FILE_PWD_}/install/linux
-    DEPLOY_TARGET = $${DEPLOY_DIR}/AppDir/$${TARGET}
-
-    DEPLOY_COMMAND = $${OUT_PWD}/linuxdeployqt
-    DEPLOY_OPT = -appimage -verbose=2
-    DEPLOY_OPT += -unsupported-allow-new-glibc
 
+    # linuxdeploy
+    DEPLOY_COMMAND = export OUTPUT=$${DEPLOY_DIR}/$${TARGET}_$${VERSION}-$${QMAKE_HOST.arch}.AppImage &&
+    DEPLOY_COMMAND += $${OUT_PWD}/linuxdeploy-x86_64.AppImage
+    DEPLOY_OPT += --plugin=qt
+    DEPLOY_OPT += --create-desktop-file
+    DEPLOY_OPT += --appdir=$${OUT_PWD}/appdir
+    DEPLOY_OPT += --icon-file=$${_PRO_FILE_PWD_}/res/Logo.png
+    DEPLOY_OPT += --icon-file=$${_PRO_FILE_PWD_}/res/icon_16.png
+    DEPLOY_OPT += --icon-file=$${_PRO_FILE_PWD_}/res/icon_24.png
+    DEPLOY_OPT += --icon-file=$${_PRO_FILE_PWD_}/res/icon_32.png
+    DEPLOY_OPT += --icon-file=$${_PRO_FILE_PWD_}/res/icon_48.png
+    DEPLOY_OPT += --icon-file=$${_PRO_FILE_PWD_}/res/icon_256.png
+    DEPLOY_OPT += --icon-filename=$${TARGET}
+    DEPLOY_OPT += --executable=$${OUT_PWD}/$${TARGET}$${TARGET_CUSTOM_EXT}
+    DEPLOY_OPT += --output appimage
+
+    ## Clean Deploy folder
     PRE_DEPLOY_COMMAND += $${QMAKE_DEL_FILE} $${DEPLOY_DIR}/*.AppImage $$escape_expand(\\n\\t)
-    PRE_DEPLOY_COMMAND += $${QMAKE_DEL_FILE} $${DEPLOY_TARGET} $$escape_expand(\\n\\t)
-    PRE_DEPLOY_COMMAND += wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" -O $${DEPLOY_COMMAND} $$escape_expand(\\n\\t)
-    PRE_DEPLOY_COMMAND += chmod a+x $${DEPLOY_COMMAND} $$escape_expand(\\n\\t)
-##    PRE_DEPLOY_COMMAND += unset LD_LIBRARY_PATH $$escape_expand(\\n\\t)
-    PRE_DEPLOY_COMMAND += $$QMAKE_COPY $${OUT_PWD}/$${TARGET} $${DEPLOY_TARGET} $$escape_expand(\\n\\t)
-    PRE_DEPLOY_COMMAND += $$QMAKE_COPY $${DEPLOY_DIR}/usr/share/applications/sacnview.desktop $${DEPLOY_DIR}/AppDir/sacnview.desktop $$escape_expand(\\n\\t)
-    PRE_DEPLOY_COMMAND += $$QMAKE_COPY $${_PRO_FILE_PWD_}/res/Logo.png $${DEPLOY_DIR}/AppDir/sacnview.png $$escape_expand(\\n\\t)
-
-    DEPLOY_CLEANUP = $$QMAKE_COPY $${OUT_PWD}/$${TARGET}*.AppImage $${DEPLOY_DIR}/
-
-    DEPLOY_INSTALLER = $${QMAKE_DEL_FILE} $${DEPLOY_DIR}/*.deb
-    DEPLOY_INSTALLER += && $${QMAKE_DEL_FILE} $${DEPLOY_DIR}/opt/sacnview/*.AppImage
+    PRE_DEPLOY_COMMAND += $${QMAKE_DEL_FILE} $${DEPLOY_DIR}/*.deb $$escape_expand(\\n\\t)
+
+    ## Download linuxdeploy and plugins
+    PRE_DEPLOY_COMMAND += wget -c "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" $$escape_expand(\\n\\t)
+    PRE_DEPLOY_COMMAND += wget -c "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage" $$escape_expand(\\n\\t)
+    PRE_DEPLOY_COMMAND += wget -c "https://github.com/linuxdeploy/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-x86_64.AppImage" $$escape_expand(\\n\\t)
+    PRE_DEPLOY_COMMAND += chmod a+x linuxdeploy-*x86_64.AppImage $$escape_expand(\\n\\t)
+
+    ## Create Debian installer
+    DEPLOY_INSTALLER = $${QMAKE_DEL_FILE} $${DEPLOY_DIR}/opt/sacnview/*.AppImage
     DEPLOY_INSTALLER += && $$QMAKE_COPY $${_PRO_FILE_PWD_}/LICENSE $${DEPLOY_DIR}/COPYRIGHT
-    DEPLOY_INSTALLER += && $$QMAKE_COPY $${DEPLOY_DIR}/$${TARGET}*.AppImage $${DEPLOY_DIR}/opt/sacnview/
-    DEPLOY_INSTALLER += && ln -s $${TARGET}*.AppImage $${DEPLOY_DIR}/opt/sacnview/sACNView2.AppImage
+    DEPLOY_INSTALLER += && $$QMAKE_COPY $${DEPLOY_DIR}/$${TARGET}_$${VERSION}-$${QMAKE_HOST.arch}.AppImage $${DEPLOY_DIR}/opt/sacnview/
+    DEPLOY_INSTALLER += && ln -s $${TARGET}_$${VERSION}-$${QMAKE_HOST.arch}.AppImage $${DEPLOY_DIR}/opt/sacnview/sACNView2.AppImage
     DEPLOY_INSTALLER += && $$QMAKE_COPY $${_PRO_FILE_PWD_}/res/icon_16.png $${DEPLOY_DIR}/usr/share/icons/hicolor/16x16/apps/sacnview.png
     DEPLOY_INSTALLER += && $$QMAKE_COPY $${_PRO_FILE_PWD_}/res/icon_24.png $${DEPLOY_DIR}/usr/share/icons/hicolor/24x24/apps/sacnview.png
     DEPLOY_INSTALLER += && $$QMAKE_COPY $${_PRO_FILE_PWD_}/res/icon_32.png $${DEPLOY_DIR}/usr/share/icons/hicolor/32x32/apps/sacnview.png
     DEPLOY_INSTALLER += && $$QMAKE_COPY $${_PRO_FILE_PWD_}/res/icon_48.png $${DEPLOY_DIR}/usr/share/icons/hicolor/48x48/apps/sacnview.png
     DEPLOY_INSTALLER += && $$QMAKE_COPY $${_PRO_FILE_PWD_}/res/icon_256.png $${DEPLOY_DIR}/usr/share/icons/hicolor/256x256/apps/sacnview.png
     DEPLOY_INSTALLER += && $$QMAKE_COPY $${_PRO_FILE_PWD_}/res/Logo.png $${DEPLOY_DIR}/usr/share/icons/hicolor/scalable/apps/sacnview.png
     DEPLOY_INSTALLER += && cd $${DEPLOY_DIR}
-    DEPLOY_INSTALLER += && fpm -s dir -t deb --deb-meta-file $${DEPLOY_DIR}/COPYRIGHT --license $${LICENSE} --name $${TARGET} --version $${VERSION}  --description $${DESCRIPTION} --url $${URL} opt/ usr/
+    DEPLOY_INSTALLER += && fpm -s dir -t deb --deb-meta-file $${DEPLOY_DIR}/COPYRIGHT --license $${LICENSE} --name $${TARGET} --version $${VERSION} --description $${DESCRIPTION} --url $${URL} opt usr
 }
 
 CONFIG( release , debug | release) {