From d6c4d36b019694d30a28b84323e702a45956f360 Mon Sep 17 00:00:00 2001
From: deepend-tildeclub <58404188+deepend-tildeclub@users.noreply.github.com>
Date: Mon, 12 Jan 2026 23:40:41 -0700
Subject: [PATCH] Update AppImage build workflow for GTK version and
 dependencies

---
 .github/workflows/appimage-build.yml | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/appimage-build.yml b/.github/workflows/appimage-build.yml
index c40155ae..f118d165 100644
--- a/.github/workflows/appimage-build.yml
+++ b/.github/workflows/appimage-build.yml
@@ -22,7 +22,9 @@ jobs:
           sudo apt-get install -y --no-install-recommends \
             build-essential pkg-config meson ninja-build cmake \
             gettext \
-            libcanberra-dev libdbus-glib-1-dev libglib2.0-dev libgtk2.0-dev \
+            libcanberra-dev libdbus-glib-1-dev libglib2.0-dev \
+            libgtk2.0-dev libgtk-3-dev \
+            libgtk-3-bin libglib2.0-bin shared-mime-info gsettings-desktop-schemas \
             libluajit-5.1-dev libpci-dev libperl-dev libssl-dev \
             python3-dev python3-cffi mono-devel desktop-file-utils \
             patchelf file curl
@@ -51,15 +53,25 @@ jobs:
       - name: Build AppImage
         env:
           APPIMAGE_EXTRACT_AND_RUN: 1
+          DEPLOY_GTK_VERSION: 3
         run: |
           set -eux
-          curl -L -o linuxdeploy-x86_64.AppImage \
+
+          # linuxdeploy (AppImage)
+          curl -fL --retry 3 -o linuxdeploy-x86_64.AppImage \
             https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
-          curl -L -o linuxdeploy-plugin-gtk-x86_64.AppImage \
-            https://github.com/linuxdeploy/linuxdeploy-plugin-gtk/releases/download/continuous/linuxdeploy-plugin-gtk-x86_64.AppImage
-          chmod +x linuxdeploy-x86_64.AppImage linuxdeploy-plugin-gtk-x86_64.AppImage
+          chmod +x linuxdeploy-x86_64.AppImage
+
+          # linuxdeploy-plugin-gtk (NO releases; use the maintained plugin script)
+          curl -fL --retry 3 -o linuxdeploy-plugin-gtk \
+            https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh
+          chmod +x linuxdeploy-plugin-gtk
+
+          # Make the plugin discoverable for --plugin gtk
+          export PATH="${PWD}:${PATH}"
 
           VERSION="$(git describe --tags --always)"
+
           ./linuxdeploy-x86_64.AppImage \
             --appdir AppDir \
             --desktop-file AppDir/usr/share/applications/io.github.Zoitechat.desktop \
@@ -67,7 +79,7 @@ jobs:
             --plugin gtk \
             --output appimage
 
-          appimage_path=$(ls -1 *.AppImage | grep -v linuxdeploy | head -n 1)
+          appimage_path="$(ls -1 *.AppImage | grep -v linuxdeploy | head -n 1)"
           mv "$appimage_path" "Zoitechat-${VERSION}-x86_64.AppImage"
 
       - name: Upload AppImage artifact