From 743bf334d4c986d1c10f891ea63600c05fdbfb43 Mon Sep 17 00:00:00 2001
From: deepend <deepend@tilde.club>
Date: Sun, 22 Feb 2026 15:14:40 -0700
Subject: [PATCH]     Migrated the macOS bundle manifest to GTK3 by switching
 the package reference to gtk+-3.0, updating the theme resource path to
 gtk-3.0, and changing the GTK translation domain from gtk20 to gtk30.

    Updated bundled runtime config payload from GTK2-style gtkrc to GTK3 settings.ini in the bundle manifest, and added a new osx/settings.ini with Mac theme/key-theme defaults and image settings.

    Updated osx/launcher.sh to remove the GTK2-specific GTK2_RC_FILES usage, switch module file paths from gtk-2.0 to gtk-3.0, and add GTK3-appropriate GTK_THEME / GTK_KEY_THEME environment variables for macOS runtime behavior.

    Checked the osx/ packaging scripts/manifests for other hardcoded GTK2 identifiers and confirmed none remain in that packaging scope after the migration.
---
 osx/launcher.sh      |  7 ++++---
 osx/settings.ini     |  5 +++++
 osx/zoitechat.bundle | 10 +++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 osx/settings.ini

diff --git a/osx/launcher.sh b/osx/launcher.sh
index 130888c9..732f9866 100755
--- a/osx/launcher.sh
+++ b/osx/launcher.sh
@@ -30,9 +30,10 @@ export GTK_DATA_PREFIX="$bundle_res"
 export GTK_EXE_PREFIX="$bundle_res"
 export GTK_PATH="$bundle_res"
 
-export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
-export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
-export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
+export GTK_THEME="Mac"
+export GTK_KEY_THEME="Mac"
+export GTK_IM_MODULE_FILE="$bundle_etc/gtk-3.0/gtk.immodules"
+export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-3.0/gdk-pixbuf.loaders"
 export PANGO_LIBDIR="$bundle_lib"
 export PANGO_SYSCONFDIR="$bundle_etc"
 
diff --git a/osx/settings.ini b/osx/settings.ini
new file mode 100644
index 00000000..b81bb04d
--- /dev/null
+++ b/osx/settings.ini
@@ -0,0 +1,5 @@
+[Settings]
+gtk-theme-name=Mac
+gtk-key-theme-name=Mac
+gtk-menu-images=0
+gtk-button-images=0
diff --git a/osx/zoitechat.bundle b/osx/zoitechat.bundle
index 81145fb8..af933ed1 100644
--- a/osx/zoitechat.bundle
+++ b/osx/zoitechat.bundle
@@ -8,7 +8,7 @@
 
     <run-install-name-tool/>
     <launcher-script>${project}/launcher.sh</launcher-script >
-    <gtk>gtk+-2.0</gtk>
+    <gtk>gtk+-3.0</gtk>
   </meta>
 
   <plist>${project}/Info.plist</plist>
@@ -47,18 +47,18 @@
     ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
   </binary>
   <data>
-    ${prefix}/share/themes/Mac/gtk-2.0-key/gtkrc
+    ${prefix}/share/themes/Mac/gtk-3.0/gtk-keys.css
   </data>
 
-  <translations name="gtk20">
+  <translations name="gtk30">
     ${prefix}/share/locale
   </translations>
   <translations name="zoitechat">
     ${prefix}/share/locale
   </translations>
 
-  <data dest="${bundle}/Contents/Resources/etc/${gtkdir}/gtkrc">
-    ${project}/gtkrc
+  <data dest="${bundle}/Contents/Resources/etc/${gtkdir}/settings.ini">
+    ${project}/settings.ini
   </data>
 
   <data dest="${bundle}/Contents/Resources">