From 9956491d55fa48d190bf61134753e0512c374eff Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 29 Oct 2015 13:50:27 +0100 Subject: [PATCH] Improve GTK quartz theme patch for Mac OS. --- Makefile.am | 2 +- build/macos/quartz-theme-gtkrc.patch | 24 ++++++++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0c23d65c0..f080b33b1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -226,7 +226,7 @@ Linphone.app: MS2_PLUGINS_INSTALL_PREFIX=$(prefix) \ LINPHONE_ADDITIONAL_DEPENDENCIES_PREFIX=$(LINPHONE_ADDITIONAL_DEPENDENCIES_PREFIX) \ gtk-mac-bundler $(PACKAGE_BUNDLE_FILE) - patch -R ${BUNDLEDIR}/Contents/Resources/share/themes/Quartz/gtk-2.0/gtkrc ${srcdir}/build/macos/quartz-theme-gtkrc.patch + patch ${BUNDLEDIR}/Contents/Resources/share/themes/Quartz/gtk-2.0/gtkrc ${srcdir}/build/macos/quartz-theme-gtkrc.patch rm -f ${BUNDLEDIR}/Contents/Resources/lib/libopenh264* bundle: $(MACAPPNAME) diff --git a/build/macos/quartz-theme-gtkrc.patch b/build/macos/quartz-theme-gtkrc.patch index 9099f2cac..ac7a48a98 100644 --- a/build/macos/quartz-theme-gtkrc.patch +++ b/build/macos/quartz-theme-gtkrc.patch @@ -1,4 +1,20 @@ -85c85 -< buttontype = "textured" ---- -> buttontype = "aqua" +--- /opt/local/share/themes/Quartz/gtk-2.0/gtkrc 2015-03-25 15:29:53.000000000 +0100 ++++ gtkrc 2015-10-29 13:43:15.000000000 +0100 +@@ -12,7 +12,7 @@ + gtk-menu-images = 0 + gtk-toolbar-style = 0 + gtk-enable-mnemonics = 0 +-gtk-icon-sizes = "gtk-small-toolbar=16,16:gtk-large-toolbar=22,22" ++gtk-icon-sizes = "gtk-menu=12,12:gtk-button=16,16:gtk-small-toolbar=16,16:gtk-large-toolbar=22,22" + gtk-toolbar-icon-size = large-toolbar + gtk-error-bell = 0 + gtk-show-input-method-menu = 0 +@@ -82,7 +82,7 @@ + + engine "quartz" + { +- buttontype = "aqua" ++ buttontype = "textured" + } + } +