From 182f7d2c5b7903ad925b4a8cc6b7c74a89b47fd0 Mon Sep 17 00:00:00 2001
From: Viktor Ivanov <viktprog@gmail.com>
Date: Mon, 29 Jun 2026 21:00:40 +0900
Subject: [PATCH 1/3] Bundle Gio modules

---
 linuxdeploy-plugin-gtk.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/linuxdeploy-plugin-gtk.sh b/linuxdeploy-plugin-gtk.sh
index 7735e3a..5a2c37f 100755
--- a/linuxdeploy-plugin-gtk.sh
+++ b/linuxdeploy-plugin-gtk.sh
@@ -263,6 +263,14 @@ cat >> "$HOOKFILE" <<EOF
 export GI_TYPELIB_PATH="\$APPDIR/${gi_typelibsdir/$LD_GTK_LIBRARY_PATH//usr/lib}"
 EOF
 
+echo "Installing Gio modules"
+gio_moduledir="$(get_pkgconf_variable "giomoduledir" "gio-2.0" "$LD_GTK_LIBRARY_PATH/gio/modules")"
+copy_lib_tree "$gio_moduledir" "$APPDIR/"
+gio-querymodules "$APPDIR/${gio_moduledir/$LD_GTK_LIBRARY_PATH//usr/lib}"
+cat >> "$HOOKFILE" <<EOF
+export GIO_MODULE_DIR="\$APPDIR/${gio_moduledir/$LD_GTK_LIBRARY_PATH//usr/lib}"
+EOF
+
 case "$DEPLOY_GTK_VERSION" in
     2)
         # https://github.com/linuxdeploy/linuxdeploy-plugin-gtk/pull/20#issuecomment-826354261

From a36d93a6aaad9a92126366d6ff356b6690c8af11 Mon Sep 17 00:00:00 2001
From: Fabian-Lars <30730186+FabianLars@users.noreply.github.com>
Date: Sun, 20 Sep 2026 16:17:15 +0200
Subject: [PATCH 2/3] comment out gdk_backend

---
 linuxdeploy-plugin-gtk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linuxdeploy-plugin-gtk.sh b/linuxdeploy-plugin-gtk.sh
index 5a2c37f..a351e6a 100755
--- a/linuxdeploy-plugin-gtk.sh
+++ b/linuxdeploy-plugin-gtk.sh
@@ -243,7 +243,7 @@ APPIMAGE_GTK_THEME="${APPIMAGE_GTK_THEME:-"Adwaita:$GTK_THEME_VARIANT"}" # Allow
 export APPDIR="${APPDIR:-"$(dirname "$(realpath "$0")")"}" # Workaround to run extracted AppImage
 export GTK_DATA_PREFIX="$APPDIR"
 export GTK_THEME="$APPIMAGE_GTK_THEME" # Custom themes are broken
-export GDK_BACKEND=x11 # Crash with Wayland backend on Wayland - We tested it without it and ended up with this: https://github.com/tauri-apps/tauri/issues/8541
+# export GDK_BACKEND=x11 # Monitor this closely. AppImage used to crash on Wayland!
 export XDG_DATA_DIRS="$APPDIR/usr/share:/usr/share:$XDG_DATA_DIRS" # g_get_system_data_dirs() from GLib
 EOF
 

From 3065019b9f52b2f791ac56149eb64e85ef29a78d Mon Sep 17 00:00:00 2001
From: Lucas Nogueira <lucas@tauri.app>
Date: Fri, 25 Sep 2026 17:08:54 -0300
Subject: [PATCH 3/3] fix: bundle on Fedora and Arch, drop duplicate
 GIO_EXTRA_MODULES

- Find gio-querymodules with search_tool: Fedora only ships
  gio-querymodules-64, so the bare call exited with 127.
- Skip the gdk-pixbuf loaders when their directory does not exist
  (gdk-pixbuf 2.44 with glycin on Arch), instead of failing on `cp ''`.
- Drop the libgiognutls/GIO_EXTRA_MODULES block, now covered by
  GIO_MODULE_DIR. It found two copies of the module and exported a
  newline-separated value that included the build machine's AppDir path.

Tested through tauri PR #16062 (tauri-apps/tauri): AppImages bundle on
Ubuntu 22.04/24.04, Debian 12/13, Fedora 42/44 and Arch, and the Ubuntu
22.04 build runs on 9 distros under X11 and Wayland.
---
 linuxdeploy-plugin-gtk.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/linuxdeploy-plugin-gtk.sh b/linuxdeploy-plugin-gtk.sh
index a351e6a..80c672c 100755
--- a/linuxdeploy-plugin-gtk.sh
+++ b/linuxdeploy-plugin-gtk.sh
@@ -266,7 +266,12 @@ EOF
 echo "Installing Gio modules"
 gio_moduledir="$(get_pkgconf_variable "giomoduledir" "gio-2.0" "$LD_GTK_LIBRARY_PATH/gio/modules")"
 copy_lib_tree "$gio_moduledir" "$APPDIR/"
-gio-querymodules "$APPDIR/${gio_moduledir/$LD_GTK_LIBRARY_PATH//usr/lib}"
+gio_querymodules="$(search_tool "gio-querymodules" "glib-2.0")"
+if [ -x "$gio_querymodules" ]; then
+    "$gio_querymodules" "$APPDIR/${gio_moduledir/$LD_GTK_LIBRARY_PATH//usr/lib}"
+else
+    echo "WARNING: gio-querymodules not found"
+fi
 cat >> "$HOOKFILE" <<EOF
 export GIO_MODULE_DIR="\$APPDIR/${gio_moduledir/$LD_GTK_LIBRARY_PATH//usr/lib}"
 EOF
@@ -327,6 +332,7 @@ gdk_pixbuf_cache_file="$(get_pkgconf_variable "gdk_pixbuf_cache_file" "gdk-pixbu
 gdk_pixbuf_moduledir="$(get_pkgconf_variable "gdk_pixbuf_moduledir" "gdk-pixbuf-2.0" "$gdk_pixbuf_binarydir/loaders")"
 # Note: gdk_pixbuf_query_loaders variable is not defined on some systems
 gdk_pixbuf_query="$(search_tool "gdk-pixbuf-query-loaders" "gdk-pixbuf-2.0")"
+if [ -d "$gdk_pixbuf_binarydir" ]; then
 copy_lib_tree "$gdk_pixbuf_binarydir" "$APPDIR/"
 cat >> "$HOOKFILE" <<EOF
 export GDK_PIXBUF_MODULE_FILE="\$APPDIR/${gdk_pixbuf_cache_file/$LD_GTK_LIBRARY_PATH//usr/lib}"
@@ -341,6 +347,9 @@ if [ ! -f "$APPDIR/${gdk_pixbuf_cache_file/$LD_GTK_LIBRARY_PATH//usr/lib}" ]; th
     echo "WARNING: loaders.cache file is missing"
 fi
 sed -i "s|$gdk_pixbuf_moduledir/||g" "$APPDIR/${gdk_pixbuf_cache_file/$LD_GTK_LIBRARY_PATH//usr/lib}"
+else
+    echo "WARNING: $gdk_pixbuf_binarydir not found, not bundling gdk-pixbuf loaders"
+fi
 
 echo "Copying more libraries"
 gobject_libdir="$(get_pkgconf_variable "libdir" "gobject-2.0" "$LD_GTK_LIBRARY_PATH")"
@@ -386,15 +395,6 @@ done
 # set write permission on lib64 again to make it deletable.
 chmod +w "$APPDIR"/usr/lib64 || true
 
-# We have to copy the files first to not get permission errors when we assign gio_extras_dir
-find /usr/lib* -name libgiognutls.so -exec mkdir -p "$APPDIR"/"$(dirname '{}')" \; -exec cp --parents '{}' "$APPDIR/" \; || true
-# related files that we seemingly don't need:
-# libgiolibproxy.so - libgiognomeproxy.so - glib-pacrunner
-
-gio_extras_dir=$(find "$APPDIR"/usr/lib* -name libgiognutls.so -exec dirname '{}' \; 2>/dev/null)
-cat >> "$HOOKFILE" <<EOF
-export GIO_EXTRA_MODULES="\$APPDIR/${gio_extras_dir#"$APPDIR"/}"
-EOF
 
 #binary patch absolute paths in libwebkit files
 find "$APPDIR"/usr/lib* -name 'libwebkit*' -exec sed -i -e "s|/usr|././|g" '{}' \;