Updated osx/makebundle.sh to use a robust bundler invocation flow: prefer gtk-mac-bundler, fall back to python3 -m gtk_mac_bundler, fail fast with clear install guidance if neither is available, and verify the .app was actually produced before zipping. Also added macOS prefix/library expectation comments.

Updated osx/zoitechat.bundle to target GTK3 (gtk+-3.0), refreshed runtime module paths (immodules, printbackends, gdk-pixbuf, pango), removed GTK2-specific engine/theme entries, and added prefix comments. This also keeps the requested anchor locations (launcher-script, ${prefix}/lib/${gtkdir}).

Updated osx/launcher.sh to remove obsolete GTK2 environment assumptions (including GTK2_RC_FILES and old GTK2 loader file paths), set GTK3-relevant variables (GTK_IM_MODULE_FILE, GDK_PIXBUF_MODULE_FILE, GSETTINGS_SCHEMA_DIR), and minimize DYLD path hacking by only prepending when already set. Added launcher-script comment anchor and prefix/library docs.

osx/makebundle.sh

@@ -1,11 +1,39 @@
 #!/bin/sh
 
-rm -rf ZoiteChat.app
-rm -f *.app.zip
+set -eu
 
-python $HOME/.local/bin/gtk-mac-bundler zoitechat.bundle
+BUNDLE_DEF="zoitechat.bundle"
+APP_NAME="ZoiteChat.app"
+
+# Expected prefixes for macOS GTK dependencies:
+# - Homebrew: /opt/homebrew (Apple Silicon) or /usr/local (Intel)
+# - MacPorts: /opt/local
+# Required runtime stack includes GTK3, Pango, GDK-Pixbuf and enchant.
+
+if command -v gtk-mac-bundler >/dev/null 2>&1; then
+    BUNDLER_CMD="gtk-mac-bundler"
+elif command -v python3 >/dev/null 2>&1 && python3 -c 'import gtk_mac_bundler' >/dev/null 2>&1; then
+    BUNDLER_CMD="python3 -m gtk_mac_bundler"
+else
+    cat >&2 <<'MSG'
+error: gtk-mac-bundler not found.
+Install one of the following before running osx/makebundle.sh:
+  - executable: gtk-mac-bundler
+  - python module: gtk_mac_bundler (invoked via: python3 -m gtk_mac_bundler)
+MSG
+    exit 1
+fi
+
+rm -rf "$APP_NAME"
+rm -f ./*.app.zip
+
+# shellcheck disable=SC2086
+$BUNDLER_CMD "$BUNDLE_DEF"
+
+if [ ! -d "$APP_NAME" ]; then
+    echo "error: bundler finished but $APP_NAME was not created" >&2
+    exit 1
+fi
 
 echo "Compressing bundle"
-#hdiutil create -format UDBZ -srcdir ZoiteChat.app -quiet ZoiteChat-2.9.6.1-$(git rev-parse --short master).dmg
-zip -9rXq ./ZoiteChat-$(git describe --tags).app.zip ./ZoiteChat.app
-
+zip -9rXq "./ZoiteChat-$(git describe --tags).app.zip" "./$APP_NAME"