deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-10 07:50:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
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.
This commit is contained in:
deepend
2026-02-22 15:14:40 -07:00
parent 1c5bf9d6b1
commit 743bf334d4
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osx/launcher.sh
View File

@@ -30,9 +30,10 @@ export GTK_DATA_PREFIX="$bundle_res"
export GTK_EXE_PREFIX="$bundle_res" export GTK_EXE_PREFIX="$bundle_res"
export GTK_PATH="$bundle_res" export GTK_PATH="$bundle_res"
export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc" export GTK_THEME="Mac"
export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules" export GTK_KEY_THEME="Mac"
export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders" 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_LIBDIR="$bundle_lib"
export PANGO_SYSCONFDIR="$bundle_etc" export PANGO_SYSCONFDIR="$bundle_etc"

5
osx/settings.ini Normal file
View File

@@ -0,0 +1,5 @@
[Settings]
gtk-theme-name=Mac
gtk-key-theme-name=Mac
gtk-menu-images=0
gtk-button-images=0

10
osx/zoitechat.bundle
View File

@@ -8,7 +8,7 @@
<run-install-name-tool/> <run-install-name-tool/>
<launcher-script>${project}/launcher.sh</launcher-script > <launcher-script>${project}/launcher.sh</launcher-script >
<gtk>gtk+-2.0</gtk> <gtk>gtk+-3.0</gtk>
</meta> </meta>
<plist>${project}/Info.plist</plist> <plist>${project}/Info.plist</plist>
@@ -47,18 +47,18 @@
${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/ ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
</binary> </binary>
<data> <data>
${prefix}/share/themes/Mac/gtk-2.0-key/gtkrc ${prefix}/share/themes/Mac/gtk-3.0/gtk-keys.css
</data> </data>
<translations name="gtk20"> <translations name="gtk30">
${prefix}/share/locale ${prefix}/share/locale
</translations> </translations>
<translations name="zoitechat"> <translations name="zoitechat">
${prefix}/share/locale ${prefix}/share/locale
</translations> </translations>
<data dest="${bundle}/Contents/Resources/etc/${gtkdir}/gtkrc"> <data dest="${bundle}/Contents/Resources/etc/${gtkdir}/settings.ini">
${project}/gtkrc ${project}/settings.ini
</data> </data>
<data dest="${bundle}/Contents/Resources"> <data dest="${bundle}/Contents/Resources">