From 92a8bb17780c421fb143272fdd60f0a3f63f0924 Mon Sep 17 00:00:00 2001
From: "J.D. Purcell" <jdpurcell@gmail.com>
Date: Sat, 4 Jan 2025 22:43:31 -0500
Subject: [PATCH] Update Linux AppImage to use Qt 6.8.1

---
 .github/workflows/build.yml   |  5 +++--
 dist/scripts/linuxdeployqt.sh | 34 ++++++++++++++--------------------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5112167f..2fddf32e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,8 +15,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - runner: 'ubuntu-20.04'
-            qtVersion: '5.15.2'
+          - runner: 'ubuntu-22.04'
+            qtVersion: '6.8.1'
+            qtModules: 'qtimageformats'
             buildArch: 'X64'
           - runner: 'macos-14'
             qtVersion: '6.8.1'
diff --git a/dist/scripts/linuxdeployqt.sh b/dist/scripts/linuxdeployqt.sh
index b4bde2c0..77ca7498 100755
--- a/dist/scripts/linuxdeployqt.sh
+++ b/dist/scripts/linuxdeployqt.sh
@@ -1,26 +1,16 @@
 #!/usr/bin/bash
 
-wget 'https://sourceforge.net/projects/qt5ct/files/latest/download'
-tar xf download
-cd qt5ct*
-qmake
-sudo make install
-cd ..
-
-if [ $1 != "" ]; then
-        VERSION=$1
-else
-        VERSION=$(LC_ALL=C sed -n -e '/^VERSION/p' qView.pro)
-        VERSION=${VERSION: -3}
+if [[ -z "$1" ]]; then
+    RELEASE_VER=$(LC_ALL=C sed -n -e '/^VERSION/p' qView.pro)
+    RELEASE_VER=${RELEASE_VER: -3}
 fi
 
-# echo VERSION was set to $VERSION
-# if [[ $2 == *"-extra-plugins"* ]]; then
-#         PLUGINS=$2
-# fi
+sudo apt update
+sudo apt install libfuse2
 
-wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
-chmod a+x linuxdeployqt-continuous-x86_64.AppImage
+wget -c -nv "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
+wget -c -nv "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage"
+chmod a+x linuxdeploy-*.AppImage
 
 mkdir -p bin/appdir/usr
 make install INSTALL_ROOT=bin/appdir
@@ -28,11 +18,15 @@ cp dist/linux/hicolor/scalable/apps/com.interversehq.qView.svg bin/appdir/
 cd bin
 rm qview
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/
-../linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/com.interversehq.qView.desktop -appimage -updateinformation="gh-releases-zsync|jurplel|qView|latest|qView-*x86_64.AppImage.zsync" -extra-plugins=styles/libqt5ct-style.so,platformthemes/libqt5ct.so
+../linuxdeploy-x86_64.AppImage \
+    --plugin qt \
+    --appdir appdir \
+    --desktop-file appdir/usr/share/applications/com.interversehq.qView.desktop \
+    --output appimage
 
 if [ $1 != "" ]; then
     mv *.AppImage qView-JDP-$1-Linux_x86_64.AppImage
 else
-    mv *.AppImage qView-JDP-$VERSION-Linux_x86_64.AppImage
+    mv *.AppImage qView-JDP-$RELEASE_VER-Linux_x86_64.AppImage
 fi
 rm -r appdir