[gtk-osx] [Modulesets-stable] Glade patches.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] [Modulesets-stable] Glade patches.
- Date: Wed, 9 Nov 2011 01:29:17 +0000 (UTC)
commit 66ee093ce59e0c87d658546bbe655b8f2ed93987
Author: John Ralls <jralls ceridwen us>
Date: Tue Nov 8 17:28:53 2011 -0800
[Modulesets-stable] Glade patches.
Apply gtkosxapplication and menu accelerator patches to glade3 and glade.
modulesets-stable/gtk-osx-random.modules | 10 +-
...63492-Update-Mac-integration-bindings-to-.patch | 408 ++++++++++++++++++
...egration-Fix-up-menu-accelerators-for-Mac.patch | 109 +++++
...63492-Update-Mac-integration-bindings-to-.patch | 446 ++++++++++++++++++++
...egration-Fix-up-menu-accelerators-for-Mac.patch | 111 +++++
5 files changed, 1082 insertions(+), 2 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index e9aaa79..28845e7 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -113,7 +113,10 @@ Libglade itself is deprecated. This is the last release. -->
<autotools id="glade3" autogen-sh="configure"
autogenargs="--disable-scrollkeeper">
<branch module="glade3/3.8/glade3-3.8.0.tar.bz2" version="3.8.0"
- hash="sha256:ad3f726ccd34d210dbec9cc2787cab91f7b4c4b9e7518c00bc72b6d52c9858bb"/>
+ hash="sha256:ad3f726ccd34d210dbec9cc2787cab91f7b4c4b9e7518c00bc72b6d52c9858bb">
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/Glade-3-8-Bug-663492-Update-Mac-integration-bindings-to-.patch " strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/Glade-3-8-Bug-663492-Update-Mac-integration-bindings-to-.patch"; strip="1"/>
+ </branch>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
<dep package="meta-gtk-osx-themes"/>
@@ -126,7 +129,10 @@ Libglade itself is deprecated. This is the last release. -->
<autotools id="glade" autogen-sh="configure"
autogenargs="--disable-scrollkeeper">
<branch module="glade/3.10/glade-3.10.0.tar.bz2" version="3.10.0"
- hash="sha256:7e6a1423f1697d8b40618d0b01f0ebff572ccb80f5818a36af0971c5d1d94253"/>
+ hash="sha256:7e6a1423f1697d8b40618d0b01f0ebff572ccb80f5818a36af0971c5d1d94253">
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/Glade-master-Bug-663492-Update-Mac-integration-bindings-to-.patch"; strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/Glade-master-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch"; strip="1"/>
+ </branch>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
<dep package="meta-gtk-osx-themes"/>
diff --git a/patches/Glade-3-8-Bug-663492-Update-Mac-integration-bindings-to-.patch b/patches/Glade-3-8-Bug-663492-Update-Mac-integration-bindings-to-.patch
new file mode 100644
index 0000000..261e8ff
--- /dev/null
+++ b/patches/Glade-3-8-Bug-663492-Update-Mac-integration-bindings-to-.patch
@@ -0,0 +1,408 @@
+From 5284fe2e57aa004139b38ca13972e50652cffa29 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls ceridwen us>
+Date: Tue, 8 Nov 2011 16:10:10 -0800
+Subject: [PATCH 1/2] [Glade Bug 663492] Update Mac integration bindings to
+ GtkOSXApplication
+
+---
+ configure.ac | 12 ++++++------
+ gladeui/Makefile.am | 6 +++---
+ gladeui/glade-app.c | 8 +++-----
+ src/Makefile.am | 4 ++--
+ src/glade-window.c | 35 ++++++++++++++++++++++++++++++-----
+ 5 files changed, 44 insertions(+), 21 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d398e2a..8f40b99 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -230,9 +230,9 @@ dnl ================================================================
+ _gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0`
+ AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
+ if test "x$_gdk_tgt" = xquartz; then
+- PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration)
++ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration)
+
+- IGE_MAC_BUNDLE_FLAG=
++ GTK_MAC_BUNDLE_FLAG=
+
+ AC_ARG_ENABLE(mac-bundle,
+ AS_HELP_STRING([--enable-mac-bundle], [enable mac bundling]),
+@@ -241,12 +241,12 @@ if test "x$_gdk_tgt" = xquartz; then
+ if test "x$build_bundle" = xyes; then
+ AC_MSG_NOTICE([enableing mac bundle..])
+
+- IGE_MAC_BUNDLE_FLAG=-DMAC_BUNDLE
++ GTK_MAC_BUNDLE_FLAG=-DMAC_BUNDLE
+ fi
+
+- AC_SUBST(IGE_MAC_BUNDLE_FLAG)
+- AC_SUBST(IGE_MAC_LIBS)
+- AC_SUBST(IGE_MAC_CFLAGS)
++ AC_SUBST(GTK_MAC_BUNDLE_FLAG)
++ AC_SUBST(GTK_MAC_LIBS)
++ AC_SUBST(GTK_MAC_CFLAGS)
+ fi
+
+ AC_SUBST([AM_CPPFLAGS])
+diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
+index c2ef6e4..b4741b2 100644
+--- a/gladeui/Makefile.am
++++ b/gladeui/Makefile.am
+@@ -67,8 +67,8 @@ libgladeui_1_la_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(GTK_CFLAGS) \
+- $(IGE_MAC_BUNDLE_FLAG) \
+- $(IGE_MAC_CFLAGS) \
++ $(GTK_MAC_BUNDLE_FLAG) \
++ $(GTK_MAC_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CPPFLAGS)
+
+@@ -76,7 +76,7 @@ libgladeui_1_la_CFLAGS = \
+ $(AM_CFLAGS)
+
+ libgladeui_1_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS)
+-libgladeui_1_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS)
++libgladeui_1_la_LIBADD = $(GTK_LIBS) $(GTK_MAC_LIBS)
+
+
+ libgladeuiincludedir=$(includedir)/libgladeui-1.0/gladeui
+diff --git a/gladeui/glade-app.c b/gladeui/glade-app.c
+index 88cdd48..8af1f08 100644
+--- a/gladeui/glade-app.c
++++ b/gladeui/glade-app.c
+@@ -49,7 +49,7 @@
+ #include <gtk/gtk.h>
+
+ #ifdef MAC_INTEGRATION
+-# include <ige-mac-integration.h>
++# include <gtkosxapplication.h>
+ #endif
+
+ #define GLADE_CONFIG_FILENAME "glade-3.conf"
+@@ -380,10 +380,8 @@ build_package_paths (void)
+ prefix = g_win32_get_package_installation_directory_of_module (NULL);
+
+ # else // defined (MAC_INTEGRATION) && defined (MAC_BUNDLE)
+- IgeMacBundle *bundle = ige_mac_bundle_get_default ();
+-
+- prefix = g_build_filename (ige_mac_bundle_get_path (bundle), "Contents", "Resources", NULL);
+-# endif
++ prefix = quartz_application_get_bundle_path ();
++# endif
+
+ pixmaps_dir = g_build_filename (prefix, "share", PACKAGE, "pixmaps", NULL);
+ catalogs_dir = g_build_filename (prefix, "share", PACKAGE, "catalogs", NULL);
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 4ec720a..00b4150 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -7,7 +7,7 @@ glade_3_CPPFLAGS = \
+ -I$(top_builddir) \
+ -DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \
+ $(GTK_CFLAGS) \
+- $(IGE_MAC_CFLAGS) \
++ $(GTK_MAC_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CPPFLAGS)
+
+@@ -16,7 +16,7 @@ glade_3_CFLAGS = \
+
+ glade_3_LDFLAGS = $(AM_LDFLAGS)
+
+-glade_3_LDADD = $(top_builddir)/gladeui/libgladeui-1.la $(IGE_MAC_LIBS)
++glade_3_LDADD = $(top_builddir)/gladeui/libgladeui-1.la $(GTK_MAC_LIBS)
+
+ glade_3_SOURCES = \
+ glade-window.c \
+diff --git a/src/glade-window.c b/src/glade-window.c
+index b21dba7..f9f971b 100644
+--- a/src/glade-window.c
++++ b/src/glade-window.c
+@@ -42,7 +42,7 @@
+ #include <gtk/gtk.h>
+
+ #ifdef MAC_INTEGRATION
+-# include <ige-mac-integration.h>
++# include <gtkosxapplication.h>
+ #endif
+
+
+@@ -3369,10 +3369,35 @@ glade_window_init (GladeWindow *window)
+ #ifdef MAC_INTEGRATION
+ {
+ /* Fix up the menubar for MacOSX Quartz builds */
++ GtkWidget *sep;
++ GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
+ gtk_widget_hide (menubar);
+- ige_mac_menu_set_menu_bar (GTK_MENU_SHELL (menubar));
+-
+- widget = gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/FileMenu/Quit");
+- ige_mac_menu_set_quit_menu_item (GTK_MENU_ITEM (widget));
++ gtk_osxapplication_set_menu_bar(theApp, GTK_MENU_SHELL(menubar));
++ widget =
++ gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/FileMenu/Quit");
++ gtk_widget_hide (widget);
++ widget =
++ gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/HelpMenu/About");
++ gtk_osxapplication_insert_app_menu_item (theApp, widget, 0);
++ sep = gtk_separator_menu_item_new();
++ g_object_ref(sep);
++ gtk_osxapplication_insert_app_menu_item (theApp, sep, 1);
++
++ widget =
++ gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/EditMenu/Preferences");
++ gtk_osxapplication_insert_app_menu_item (theApp, widget, 2);
++ sep = gtk_separator_menu_item_new();
++ g_object_ref(sep);
++ gtk_osxapplication_insert_app_menu_item (theApp, sep, 3);
++
++ widget =
++ gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/HelpMenu");
++ gtk_osxapplication_set_help_menu(theApp, GTK_MENU_ITEM(widget));
++
++ g_signal_connect(theApp, "NSApplicationWillTerminate",
++ G_CALLBACK(quit_cb), window);
++
++ gtk_osxapplication_ready(theApp);
++
+ }
+ #endif
+
+--- a/configure Mon Apr 4 05:29:57 2011
++++ b/configure Tue Nov 8 17:02:02 2011
+@@ -752,9 +752,9 @@
+ AM_CXXFLAGS
+ AM_CFLAGS
+ AM_CPPFLAGS
+-IGE_MAC_BUNDLE_FLAG
+-IGE_MAC_LIBS
+-IGE_MAC_CFLAGS
++GTK_MAC_BUNDLE_FLAG
++GTK_MAC_LIBS
++GTK_MAC_CFLAGS
+ GDK_TARGET_QUARTZ_FALSE
+ GDK_TARGET_QUARTZ_TRUE
+ WINDRES
+@@ -1026,8 +1026,8 @@
+ GNOME_LIBS
+ PYGTK_CFLAGS
+ PYGTK_LIBS
+-IGE_MAC_CFLAGS
+-IGE_MAC_LIBS'
++GTK_MAC_CFLAGS
++GTK_MAC_LIBS'
+
+
+ # Initialize some variables set by options.
+@@ -1702,10 +1702,10 @@
+ PYGTK_CFLAGS
+ C compiler flags for PYGTK, overriding pkg-config
+ PYGTK_LIBS linker flags for PYGTK, overriding pkg-config
+- IGE_MAC_CFLAGS
+- C compiler flags for IGE_MAC, overriding pkg-config
+- IGE_MAC_LIBS
+- linker flags for IGE_MAC, overriding pkg-config
++ GTK_MAC_CFLAGS
++ C compiler flags for GTK_MAC, overriding pkg-config
++ GTK_MAC_LIBS
++ linker flags for GTK_MAC, overriding pkg-config
+
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -14485,35 +14485,35 @@
+ if test "x$_gdk_tgt" = xquartz; then
+
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IGE_MAC" >&5
+-$as_echo_n "checking for IGE_MAC... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK_MAC" >&5
++$as_echo_n "checking for GTK_MAC... " >&6; }
+
+-if test -n "$IGE_MAC_CFLAGS"; then
+- pkg_cv_IGE_MAC_CFLAGS="$IGE_MAC_CFLAGS"
++if test -n "$GTK_MAC_CFLAGS"; then
++ pkg_cv_GTK_MAC_CFLAGS="$GTK_MAC_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_IGE_MAC_CFLAGS=`$PKG_CONFIG --cflags "ige-mac-integration" 2>/dev/null`
++ pkg_cv_GTK_MAC_CFLAGS=`$PKG_CONFIG --cflags "gtk-mac-integration" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+ else
+ pkg_failed=untried
+ fi
+-if test -n "$IGE_MAC_LIBS"; then
+- pkg_cv_IGE_MAC_LIBS="$IGE_MAC_LIBS"
++if test -n "$GTK_MAC_LIBS"; then
++ pkg_cv_GTK_MAC_LIBS="$GTK_MAC_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_IGE_MAC_LIBS=`$PKG_CONFIG --libs "ige-mac-integration" 2>/dev/null`
++ pkg_cv_GTK_MAC_LIBS=`$PKG_CONFIG --libs "gtk-mac-integration" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -14531,22 +14531,22 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ige-mac-integration" 2>&1`
++ GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk-mac-integration" 2>&1`
+ else
+- IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "ige-mac-integration" 2>&1`
++ GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk-mac-integration" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+- echo "$IGE_MAC_PKG_ERRORS" >&5
++ echo "$GTK_MAC_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements (ige-mac-integration) were not met:
++ as_fn_error "Package requirements (gtk-mac-integration) were not met:
+
+-$IGE_MAC_PKG_ERRORS
++$GTK_MAC_PKG_ERRORS
+
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-Alternatively, you may set the environment variables IGE_MAC_CFLAGS
+-and IGE_MAC_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables GTK_MAC_CFLAGS
++and GTK_MAC_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " "$LINENO" 5
+ elif test $pkg_failed = untried; then
+@@ -14556,21 +14556,21 @@
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+-Alternatively, you may set the environment variables IGE_MAC_CFLAGS
+-and IGE_MAC_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables GTK_MAC_CFLAGS
++and GTK_MAC_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." "$LINENO" 5; }
+ else
+- IGE_MAC_CFLAGS=$pkg_cv_IGE_MAC_CFLAGS
+- IGE_MAC_LIBS=$pkg_cv_IGE_MAC_LIBS
++ GTK_MAC_CFLAGS=$pkg_cv_GTK_MAC_CFLAGS
++ GTK_MAC_LIBS=$pkg_cv_GTK_MAC_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ :
+ fi
+
+- IGE_MAC_BUNDLE_FLAG=
++ GTK_MAC_BUNDLE_FLAG=
+
+ # Check whether --enable-mac-bundle was given.
+ if test "${enable_mac_bundle+set}" = set; then :
+@@ -14584,7 +14584,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: enableing mac bundle.." >&5
+ $as_echo "$as_me: enableing mac bundle.." >&6;}
+
+- IGE_MAC_BUNDLE_FLAG=-DMAC_BUNDLE
++ GTK_MAC_BUNDLE_FLAG=-DMAC_BUNDLE
+ fi
+
+
+
+Diff finished. Tue Nov 8 17:02:24 2011
+diff -c /Volumes/RAID1/local/gtk-stable/src/glade3-3.8.0/src/Makefile.in\~ /Volumes/RAID1/local/gtk-stable/src/glade3-3.8.0/src/Makefile.in
+--- a/src/Makefile.in Mon Apr 4 05:29:56 2011
++++ b/src/Makefile.in Tue Nov 8 17:04:37 2011
+@@ -159,9 +159,9 @@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-IGE_MAC_BUNDLE_FLAG = @IGE_MAC_BUNDLE_FLAG@
+-IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
+-IGE_MAC_LIBS = @IGE_MAC_LIBS@
++GTK_MAC_BUNDLE_FLAG = @GTK_MAC_BUNDLE_FLAG@
++GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
++GTK_MAC_LIBS = @GTK_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -294,7 +294,7 @@
+ -I$(top_builddir) \
+ -DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \
+ $(GTK_CFLAGS) \
+- $(IGE_MAC_CFLAGS) \
++ $(GTK_MAC_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CPPFLAGS)
+
+@@ -303,7 +303,7 @@
+
+ glade_3_LDFLAGS = $(AM_LDFLAGS) $(am__append_2)
+ glade_3_LDADD = $(top_builddir)/gladeui/libgladeui-1.la \
+- $(IGE_MAC_LIBS) $(am__append_1)
++ $(GTK_MAC_LIBS) $(am__append_1)
+ glade_3_SOURCES = \
+ glade-window.c \
+ glade-window.h \
+
+Diff finished. Tue Nov 8 17:04:45 2011
+diff -c /Volumes/RAID1/local/gtk-stable/src/glade3-3.8.0/gladeui/Makefile.in\~ /Volumes/RAID1/local/gtk-stable/src/glade3-3.8.0/gladeui/Makefile.in
+--- a/gladeui/Makefile.in Mon Apr 4 05:29:54 2011
++++ b/gladeui/Makefile.in Tue Nov 8 17:06:44 2011
+@@ -217,9 +217,9 @@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-IGE_MAC_BUNDLE_FLAG = @IGE_MAC_BUNDLE_FLAG@
+-IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
+-IGE_MAC_LIBS = @IGE_MAC_LIBS@
++GTK_MAC_BUNDLE_FLAG = @GTK_MAC_BUNDLE_FLAG@
++GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
++GTK_MAC_LIBS = @GTK_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -413,8 +413,8 @@
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(GTK_CFLAGS) \
+- $(IGE_MAC_BUNDLE_FLAG) \
+- $(IGE_MAC_CFLAGS) \
++ $(GTK_MAC_BUNDLE_FLAG) \
++ $(GTK_MAC_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CPPFLAGS)
+
+@@ -424,7 +424,7 @@
+ libgladeui_1_la_LDFLAGS = -version-info \
+ $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS) \
+ $(am__append_1) $(am__append_2)
+-libgladeui_1_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS)
++libgladeui_1_la_LIBADD = $(GTK_LIBS) $(GTK_MAC_LIBS)
+ libgladeuiincludedir = $(includedir)/libgladeui-1.0/gladeui
+ libgladeuiinclude_HEADERS = \
+ glade.h \
+
+Diff finished. Tue Nov 8 17:06:50 2011
+
+--
+1.7.6.3.dirty
+
diff --git a/patches/Glade-3-8-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch b/patches/Glade-3-8-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch
new file mode 100644
index 0000000..d22ca84
--- /dev/null
+++ b/patches/Glade-3-8-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch
@@ -0,0 +1,109 @@
+From 5b5a2009d1a3cf6ffe6e579981d54e1cc11dcf78 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls ceridwen us>
+Date: Tue, 8 Nov 2011 16:14:28 -0800
+Subject: [PATCH 2/2] [Mac Integration] Fix up menu accelerators for Mac
+
+Makes use of a new feature in Gtk+-2.24.7 & Gtk+-3.2.1 which provides a
+new modifier symbol, <primary>, which uses "command" as the accelerator
+modifier on Quartz and "control" everywhere else.
+
+Special cases the project accelerators, since <alt> disappears on
+Quartz-integrated menus, leaving just the number as an accelerator and
+preventing its use in text.
+---
+ src/glade-window.c | 28 ++++++++++++++++++----------
+ 1 files changed, 18 insertions(+), 10 deletions(-)
+
+diff --git a/src/glade-window.c b/src/glade-window.c
+index f9f971b..6b7934c 100644
+--- a/src/glade-window.c
++++ b/src/glade-window.c
+@@ -931,7 +931,11 @@ refresh_projects_list_menu (GladeWindow *window)
+ gchar action_name[32];
+ gchar *project_name;
+ gchar *tooltip;
++#ifdef MAC_INTEGRATION
++ gchar accel[11];
++#else
+ gchar accel[7];
++#endif
+
+ view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (p->notebook), i);
+ project = glade_design_view_get_project (GLADE_DESIGN_VIEW (view));
+@@ -953,7 +957,11 @@ refresh_projects_list_menu (GladeWindow *window)
+
+ /* alt + 1, 2, 3... 0 to switch to the first ten tabs */
+ if (i < 10)
++#ifdef MAC_INTEGRATION
++ g_snprintf (accel, sizeof (accel), "<control>%d", (i + 1) % 10);
++#else
+ g_snprintf (accel, sizeof (accel), "<alt>%d", (i + 1) % 10);
++#endif
+ else
+ accel[0] = '\0';
+
+@@ -2032,15 +2040,15 @@ static GtkActionEntry static_entries[] = {
+ { "RedoMenu", NULL, NULL },
+
+ /* FileMenu */
+- { "New", GTK_STOCK_NEW, NULL, "<control>N",
++ { "New", GTK_STOCK_NEW, NULL, "<primary>N",
+ N_("Create a new project"), G_CALLBACK (new_cb) },
+
+- { "Open", GTK_STOCK_OPEN, N_("_Open\342\200\246") ,"<control>O",
++ { "Open", GTK_STOCK_OPEN, N_("_Open\342\200\246") ,"<primary>O",
+ N_("Open a project"), G_CALLBACK (open_cb) },
+
+ { "OpenRecent", NULL, N_("Open _Recent") },
+
+- { "Quit", GTK_STOCK_QUIT, NULL, "<control>Q",
++ { "Quit", GTK_STOCK_QUIT, NULL, "<primary>Q",
+ N_("Quit the program"), G_CALLBACK (quit_cb) },
+
+ /* ViewMenu */
+@@ -2059,20 +2067,20 @@ static guint n_static_entries = G_N_ELEMENTS (static_entries);
+ static GtkActionEntry project_entries[] = {
+
+ /* FileMenu */
+- { "Save", GTK_STOCK_SAVE, NULL, "<control>S",
++ { "Save", GTK_STOCK_SAVE, NULL, "<primary>S",
+ N_("Save the current project"), G_CALLBACK (save_cb) },
+
+ { "SaveAs", GTK_STOCK_SAVE_AS, N_("Save _As\342\200\246"), NULL,
+ N_("Save the current project with a different name"), G_CALLBACK (save_as_cb) },
+
+- { "Close", GTK_STOCK_CLOSE, NULL, "<control>W",
++ { "Close", GTK_STOCK_CLOSE, NULL, "<primary>W",
+ N_("Close the current project"), G_CALLBACK (close_cb) },
+
+ /* EditMenu */
+- { "Undo", GTK_STOCK_UNDO, NULL, "<control>Z",
++ { "Undo", GTK_STOCK_UNDO, NULL, "<primary>Z",
+ N_("Undo the last action"), G_CALLBACK (undo_cb) },
+
+- { "Redo", GTK_STOCK_REDO, NULL, "<shift><control>Z",
++ { "Redo", GTK_STOCK_REDO, NULL, "<shift><primary>Z",
+ N_("Redo the last action"), G_CALLBACK (redo_cb) },
+
+ { "Cut", GTK_STOCK_CUT, NULL, NULL,
+@@ -2087,14 +2095,14 @@ static GtkActionEntry project_entries[] = {
+ { "Delete", GTK_STOCK_DELETE, NULL, "Delete",
+ N_("Delete the selection"), G_CALLBACK (delete_cb) },
+
+- { "Preferences", GTK_STOCK_PREFERENCES, NULL, "<control>P",
++ { "Preferences", GTK_STOCK_PREFERENCES, NULL, "<primary>P",
+ N_("Modify project preferences"), G_CALLBACK (preferences_cb) },
+
+ /* ProjectsMenu */
+- { "PreviousProject", NULL, N_("_Previous Project"), "<control>Page_Up",
++ { "PreviousProject", NULL, N_("_Previous Project"), "<primary>Page_Up",
+ N_("Activate previous project"), G_CALLBACK (previous_project_cb) },
+
+- { "NextProject", NULL, N_("_Next Project"), "<control>Page_Down",
++ { "NextProject", NULL, N_("_Next Project"), "<primary>Page_Down",
+ N_("Activate next project"), G_CALLBACK (next_project_cb) }
+
+
+--
+1.7.6.3.dirty
+
diff --git a/patches/Glade-master-Bug-663492-Update-Mac-integration-bindings-to-.patch b/patches/Glade-master-Bug-663492-Update-Mac-integration-bindings-to-.patch
new file mode 100644
index 0000000..7e21f44
--- /dev/null
+++ b/patches/Glade-master-Bug-663492-Update-Mac-integration-bindings-to-.patch
@@ -0,0 +1,446 @@
+From e90717a501d3e99509c0e6ade83e3876d4a84f68 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls ceridwen us>
+Date: Tue, 8 Nov 2011 13:26:24 -0800
+Subject: [PATCH 1/2] [Glade Bug 663492] Update Mac integration bindings to
+ GtkOSXApplication
+
+---
+ configure.ac | 14 +++++++-------
+ gladeui/Makefile.am | 10 +++++-----
+ gladeui/glade-app.c | 7 ++-----
+ src/Makefile.am | 4 ++--
+ src/glade-window.c | 33 ++++++++++++++++++++++++++++-----
+ 5 files changed, 44 insertions(+), 24 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index faa003d..9652f71 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -222,12 +222,12 @@
+ dnl ================================================================
+ dnl Check for GDK Quartz and MacOSX integration package
+ dnl ================================================================
+-_gdk_tgt=`$PKG_CONFIG --variable=target gdk-3.0`
++_gdk_tgt=`$PKG_CONFIG --variable=targets gdk-3.0`
+ AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
+ if test "x$_gdk_tgt" = xquartz; then
+- PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration)
++ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration)
+
+- IGE_MAC_BUNDLE_FLAG=
++ GTK_MAC_BUNDLE_FLAG=
+
+ AC_ARG_ENABLE(mac-bundle,
+ AS_HELP_STRING([--enable-mac-bundle], [enable mac bundling]),
+@@ -236,12 +236,12 @@
+ if test "x$build_bundle" = xyes; then
+ AC_MSG_NOTICE([enableing mac bundle..])
+
+- IGE_MAC_BUNDLE_FLAG=-DMAC_BUNDLE
++ GTK_MAC_BUNDLE_FLAG=-DMAC_BUNDLE
+ fi
+
+- AC_SUBST(IGE_MAC_BUNDLE_FLAG)
+- AC_SUBST(IGE_MAC_LIBS)
+- AC_SUBST(IGE_MAC_CFLAGS)
++ AC_SUBST(GTK_MAC_BUNDLE_FLAG)
++ AC_SUBST(GTK_MAC_LIBS)
++ AC_SUBST(GTK_MAC_CFLAGS)
+ fi
+
+
+diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
+index 76fef97..7563f99 100644
+--- a/gladeui/Makefile.am
++++ b/gladeui/Makefile.am
+@@ -8,7 +8,7 @@
+ -I$(top_builddir) \
+ -DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \
+ $(GTK_CFLAGS) \
+- $(IGE_MAC_CFLAGS) \
++ $(GTK_MAC_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CPPFLAGS)
+
+@@ -17,7 +17,7 @@
+
+ glade_previewer_LDFLAGS = $(AM_LDFLAGS)
+
+-glade_previewer_LDADD = libgladeui-2.la $(IGE_MAC_LIBS)
++glade_previewer_LDADD = libgladeui-2.la $(GTK_MAC_LIBS)
+
+ glade_previewer_SOURCES = \
+ glade-previewer.c
+@@ -95,8 +95,8 @@
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(GTK_CFLAGS) \
+- $(IGE_MAC_BUNDLE_FLAG) \
+- $(IGE_MAC_CFLAGS) \
++ $(GTK_MAC_BUNDLE_FLAG) \
++ $(GTK_MAC_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CPPFLAGS)
+
+@@ -104,7 +104,7 @@
+ $(AM_CFLAGS)
+
+ libgladeui_2_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS)
+-libgladeui_2_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS)
++libgladeui_2_la_LIBADD = $(GTK_LIBS) $(GTK_MAC_LIBS)
+
+
+ libgladeuiincludedir=$(includedir)/libgladeui-2.0/gladeui
+diff --git a/gladeui/glade-app.c b/gladeui/glade-app.c
+index c7ca694..3f906fb 100644
+--- a/gladeui/glade-app.c
++++ b/gladeui/glade-app.c
+@@ -48,7 +48,7 @@
+ #include <gtk/gtk.h>
+
+ #ifdef MAC_INTEGRATION
+-# include <ige-mac-integration.h>
++# include <gtkosxapplication.h>
+ #endif
+
+ #define GLADE_CONFIG_FILENAME "glade.conf"
+@@ -225,11 +225,8 @@
+ prefix = g_win32_get_package_installation_directory_of_module (NULL);
+
+ # else // defined (MAC_INTEGRATION) && defined (MAC_BUNDLE)
+- IgeMacBundle *bundle = ige_mac_bundle_get_default ();
++ prefix = quartz_application_get_resource_path ();
+
+- prefix =
+- g_build_filename (ige_mac_bundle_get_path (bundle), "Contents",
+- "Resources", NULL);
+ # endif
+
+ pixmaps_dir = g_build_filename (prefix, "share", PACKAGE, "pixmaps", NULL);
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 52db167..cddaeec 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -7,7 +7,7 @@
+ -I$(top_builddir) \
+ -DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \
+ $(GTK_CFLAGS) \
+- $(IGE_MAC_CFLAGS) \
++ $(GTK_MAC_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CPPFLAGS)
+
+@@ -16,7 +16,7 @@
+
+ glade_LDFLAGS = $(AM_LDFLAGS)
+
+-glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(IGE_MAC_LIBS)
++glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(GTK_MAC_LIBS)
+
+ glade_SOURCES = \
+ glade-window.c \
+diff --git a/src/glade-window.c b/src/glade-window.c
+index eb564c0..368c007 100644
+--- a/src/glade-window.c
++++ b/src/glade-window.c
+@@ -41,7 +41,7 @@
+ #include <gtk/gtk.h>
+
+ #ifdef MAC_INTEGRATION
+-# include <ige-mac-integration.h>
++# include <gtkosxapplication.h>
+ #endif
+
+
+@@ -3519,12 +3519,35 @@
+ #ifdef MAC_INTEGRATION
+ {
+ /* Fix up the menubar for MacOSX Quartz builds */
++ GtkWidget *sep;
++ GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
+ gtk_widget_hide (menubar);
+- ige_mac_menu_set_menu_bar (GTK_MENU_SHELL (menubar));
+-
++ gtk_osxapplication_set_menu_bar(theApp, GTK_MENU_SHELL(menubar));
+ widget =
+ gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/FileMenu/Quit");
+- ige_mac_menu_set_quit_menu_item (GTK_MENU_ITEM (widget));
++ gtk_widget_hide (widget);
++ widget =
++ gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/HelpMenu/About");
++ gtk_osxapplication_insert_app_menu_item (theApp, widget, 0);
++ sep = gtk_separator_menu_item_new();
++ g_object_ref(sep);
++ gtk_osxapplication_insert_app_menu_item (theApp, sep, 1);
++
++ widget =
++ gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/FileMenu/Properties");
++ gtk_osxapplication_insert_app_menu_item (theApp, widget, 2);
++ sep = gtk_separator_menu_item_new();
++ g_object_ref(sep);
++ gtk_osxapplication_insert_app_menu_item (theApp, sep, 3);
++
++ widget =
++ gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/HelpMenu");
++ gtk_osxapplication_set_help_menu(theApp, GTK_MENU_ITEM(widget));
++
++ g_signal_connect(theApp, "NSApplicationWillTerminate",
++ G_CALLBACK(quit_cb), window);
++
++ gtk_osxapplication_ready(theApp);
+ }
+ #endif
+
+diff -c /Volumes/RAID1/local/gtk-stable-3/src/glade-3.10.0/gladeui/Makefile.in\~ /Volumes/RAID1/local/gtk-stable-3/src/glade-3.10.0/gladeui/Makefile.in
+--- a/gladeui/Makefile.in Mon Apr 4 20:26:34 2011
++++ b/gladeui/Makefile.in Tue Nov 8 17:16:37 2011
+@@ -240,9 +240,9 @@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-IGE_MAC_BUNDLE_FLAG = @IGE_MAC_BUNDLE_FLAG@
+-IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
+-IGE_MAC_LIBS = @IGE_MAC_LIBS@
++GTK_MAC_BUNDLE_FLAG = @GTK_MAC_BUNDLE_FLAG@
++GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
++GTK_MAC_LIBS = @GTK_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -386,7 +386,7 @@
+ -I$(top_builddir) \
+ -DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \
+ $(GTK_CFLAGS) \
+- $(IGE_MAC_CFLAGS) \
++ $(GTK_MAC_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CPPFLAGS)
+
+@@ -394,7 +394,7 @@
+ $(AM_CFLAGS)
+
+ glade_previewer_LDFLAGS = $(AM_LDFLAGS) $(am__append_2)
+-glade_previewer_LDADD = libgladeui-2.la $(IGE_MAC_LIBS) \
++glade_previewer_LDADD = libgladeui-2.la $(GTK_MAC_LIBS) \
+ $(am__append_1)
+ glade_previewer_SOURCES = \
+ glade-previewer.c
+@@ -458,8 +458,8 @@
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(GTK_CFLAGS) \
+- $(IGE_MAC_BUNDLE_FLAG) \
+- $(IGE_MAC_CFLAGS) \
++ $(GTK_MAC_BUNDLE_FLAG) \
++ $(GTK_MAC_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CPPFLAGS)
+
+@@ -469,7 +469,7 @@
+ libgladeui_2_la_LDFLAGS = -version-info \
+ $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS) \
+ $(am__append_3) $(am__append_4)
+-libgladeui_2_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS)
++libgladeui_2_la_LIBADD = $(GTK_LIBS) $(GTK_MAC_LIBS)
+ libgladeuiincludedir = $(includedir)/libgladeui-2.0/gladeui
+ libgladeuiinclude_HEADERS = \
+ glade.h \
+
+Diff finished. Tue Nov 8 17:16:42 2011
+diff -c /Volumes/RAID1/local/gtk-stable-3/src/glade-3.10.0/src/Makefile.in\~ /Volumes/RAID1/local/gtk-stable-3/src/glade-3.10.0/src/Makefile.in
+--- a/src/Makefile.in Mon Apr 4 20:26:35 2011
++++ b/src/Makefile.in Tue Nov 8 17:18:08 2011
+@@ -161,9 +161,9 @@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-IGE_MAC_BUNDLE_FLAG = @IGE_MAC_BUNDLE_FLAG@
+-IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
+-IGE_MAC_LIBS = @IGE_MAC_LIBS@
++GTK_MAC_BUNDLE_FLAG = @GTK_MAC_BUNDLE_FLAG@
++GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
++GTK_MAC_LIBS = @GTK_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -306,7 +306,7 @@
+ -I$(top_builddir) \
+ -DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \
+ $(GTK_CFLAGS) \
+- $(IGE_MAC_CFLAGS) \
++ $(GTK_MAC_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CPPFLAGS)
+
+@@ -314,7 +314,7 @@
+ $(AM_CFLAGS)
+
+ glade_LDFLAGS = $(AM_LDFLAGS) $(am__append_2)
+-glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(IGE_MAC_LIBS) \
++glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(GTK_MAC_LIBS) \
+ $(am__append_1)
+ glade_SOURCES = \
+ glade-window.c \
+
+Diff finished. Tue Nov 8 17:18:17 2011
+diff -c /Volumes/RAID1/local/gtk-stable-3/src/glade-3.10.0/configure\~ /Volumes/RAID1/local/gtk-stable-3/src/glade-3.10.0/configure
+--- a/configure Mon Apr 4 20:26:36 2011
++++ b/configure Tue Nov 8 17:19:30 2011
+@@ -754,9 +754,9 @@
+ AM_CFLAGS
+ AM_CPPFLAGS
+ GLADE_PREFIX
+-IGE_MAC_BUNDLE_FLAG
+-IGE_MAC_LIBS
+-IGE_MAC_CFLAGS
++GTK_MAC_BUNDLE_FLAG
++GTK_MAC_LIBS
++GTK_MAC_CFLAGS
+ GDK_TARGET_QUARTZ_FALSE
+ GDK_TARGET_QUARTZ_TRUE
+ WINDRES
+@@ -1035,8 +1035,8 @@
+ GTK_LIBS
+ PYGOBJECT_CFLAGS
+ PYGOBJECT_LIBS
+-IGE_MAC_CFLAGS
+-IGE_MAC_LIBS'
++GTK_MAC_CFLAGS
++GTK_MAC_LIBS'
+
+
+ # Initialize some variables set by options.
+@@ -1716,10 +1716,10 @@
+ C compiler flags for PYGOBJECT, overriding pkg-config
+ PYGOBJECT_LIBS
+ linker flags for PYGOBJECT, overriding pkg-config
+- IGE_MAC_CFLAGS
+- C compiler flags for IGE_MAC, overriding pkg-config
+- IGE_MAC_LIBS
+- linker flags for IGE_MAC, overriding pkg-config
++ GTK_MAC_CFLAGS
++ C compiler flags for GTK_MAC, overriding pkg-config
++ GTK_MAC_LIBS
++ linker flags for GTK_MAC, overriding pkg-config
+
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -14889,35 +14889,35 @@
+ if test "x$_gdk_tgt" = xquartz; then
+
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IGE_MAC" >&5
+-$as_echo_n "checking for IGE_MAC... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK_MAC" >&5
++$as_echo_n "checking for GTK_MAC... " >&6; }
+
+-if test -n "$IGE_MAC_CFLAGS"; then
+- pkg_cv_IGE_MAC_CFLAGS="$IGE_MAC_CFLAGS"
++if test -n "$GTK_MAC_CFLAGS"; then
++ pkg_cv_GTK_MAC_CFLAGS="$GTK_MAC_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_IGE_MAC_CFLAGS=`$PKG_CONFIG --cflags "ige-mac-integration" 2>/dev/null`
++ pkg_cv_GTK_MAC_CFLAGS=`$PKG_CONFIG --cflags "gtk-mac-integration" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+ else
+ pkg_failed=untried
+ fi
+-if test -n "$IGE_MAC_LIBS"; then
+- pkg_cv_IGE_MAC_LIBS="$IGE_MAC_LIBS"
++if test -n "$GTK_MAC_LIBS"; then
++ pkg_cv_GTK_MAC_LIBS="$GTK_MAC_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_IGE_MAC_LIBS=`$PKG_CONFIG --libs "ige-mac-integration" 2>/dev/null`
++ pkg_cv_GTK_MAC_LIBS=`$PKG_CONFIG --libs "gtk-mac-integration" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -14935,22 +14935,22 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ige-mac-integration" 2>&1`
++ GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk-mac-integration" 2>&1`
+ else
+- IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "ige-mac-integration" 2>&1`
++ GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk-mac-integration" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+- echo "$IGE_MAC_PKG_ERRORS" >&5
++ echo "$GTK_MAC_PKG_ERRORS" >&5
+
+- as_fn_error "Package requirements (ige-mac-integration) were not met:
++ as_fn_error "Package requirements (gtk-mac-integration) were not met:
+
+-$IGE_MAC_PKG_ERRORS
++$GTK_MAC_PKG_ERRORS
+
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-Alternatively, you may set the environment variables IGE_MAC_CFLAGS
+-and IGE_MAC_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables GTK_MAC_CFLAGS
++and GTK_MAC_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " "$LINENO" 5
+ elif test $pkg_failed = untried; then
+@@ -14960,21 +14960,21 @@
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+-Alternatively, you may set the environment variables IGE_MAC_CFLAGS
+-and IGE_MAC_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables GTK_MAC_CFLAGS
++and GTK_MAC_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." "$LINENO" 5; }
+ else
+- IGE_MAC_CFLAGS=$pkg_cv_IGE_MAC_CFLAGS
+- IGE_MAC_LIBS=$pkg_cv_IGE_MAC_LIBS
++ GTK_MAC_CFLAGS=$pkg_cv_GTK_MAC_CFLAGS
++ GTK_MAC_LIBS=$pkg_cv_GTK_MAC_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ :
+ fi
+
+- IGE_MAC_BUNDLE_FLAG=
++ GTK_MAC_BUNDLE_FLAG=
+
+ # Check whether --enable-mac-bundle was given.
+ if test "${enable_mac_bundle+set}" = set; then :
+@@ -14988,7 +14988,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: enableing mac bundle.." >&5
+ $as_echo "$as_me: enableing mac bundle.." >&6;}
+
+- IGE_MAC_BUNDLE_FLAG=-DMAC_BUNDLE
++ GTK_MAC_BUNDLE_FLAG=-DMAC_BUNDLE
+ fi
+
+
+
+Diff finished. Tue Nov 8 17:19:36 2011
+--
+1.7.6.3.dirty
+
diff --git a/patches/Glade-master-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch b/patches/Glade-master-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch
new file mode 100644
index 0000000..d75c61f
--- /dev/null
+++ b/patches/Glade-master-Mac-Integration-Fix-up-menu-accelerators-for-Mac.patch
@@ -0,0 +1,111 @@
+From b53a3b26248f93a74bf30a087ca31226b014ca32 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls ceridwen us>
+Date: Tue, 8 Nov 2011 14:55:31 -0800
+Subject: [PATCH 2/2] [Mac Integration] Fix up menu accelerators for Mac
+
+Makes use of a new feature in Gtk+-2.24.7 & Gtk+-3.2.1 which provides a
+new modifier symbol, <primary>, which uses "command" as the accelerator
+modifier on Quartz and "control" everywhere else.
+
+Special cases the project accelerators, since <alt> disappears on
+Quartz-integrated menus, leaving just the number as an accelerator and
+preventing its use in text.
+---
+ src/glade-window.c | 29 ++++++++++++++++++-----------
+ 1 files changed, 18 insertions(+), 11 deletions(-)
+
+diff --git a/src/glade-window.c b/src/glade-window.c
+index 368c007..203a518 100644
+--- a/src/glade-window.c
++++ b/src/glade-window.c
+@@ -973,8 +973,11 @@ refresh_projects_list_menu (GladeWindow * window)
+ gchar action_name[32];
+ gchar *project_name;
+ gchar *tooltip;
++#ifdef MAC_INTEGRATION
++ gchar accel[11];
++#else
+ gchar accel[7];
+-
++#endif
+ view = gtk_notebook_get_nth_page (GTK_NOTEBOOK (p->notebook), i);
+ project = glade_design_view_get_project (GLADE_DESIGN_VIEW (view));
+
+@@ -997,7 +1000,11 @@ refresh_projects_list_menu (GladeWindow * window)
+
+ /* alt + 1, 2, 3... 0 to switch to the first ten tabs */
+ if (i < 10)
++#ifdef MAC_INTEGRATION
++ g_snprintf (accel, sizeof (accel), "<control>%d", (i + 1) % 10);
++#else
+ g_snprintf (accel, sizeof (accel), "<alt>%d", (i + 1) % 10);
++#endif
+ else
+ accel[0] = '\0';
+
+@@ -2178,15 +2185,15 @@ static GtkActionEntry static_entries[] = {
+ {"RedoMenu", NULL, NULL},
+
+ /* FileMenu */
+- {"New", GTK_STOCK_NEW, NULL, "<control>N",
++ {"New", GTK_STOCK_NEW, NULL, "<primary>N",
+ N_("Create a new project"), G_CALLBACK (new_cb)},
+
+- {"Open", GTK_STOCK_OPEN, N_("_Open\342\200\246"), "<control>O",
++ {"Open", GTK_STOCK_OPEN, N_("_Open\342\200\246"), "<primary>O",
+ N_("Open a project"), G_CALLBACK (open_cb)},
+
+ {"OpenRecent", NULL, N_("Open _Recent")},
+
+- {"Quit", GTK_STOCK_QUIT, NULL, "<control>Q",
++ {"Quit", GTK_STOCK_QUIT, NULL, "<primary>Q",
+ N_("Quit the program"), G_CALLBACK (quit_cb)},
+
+ /* ViewMenu */
+@@ -2206,21 +2213,21 @@ static guint n_static_entries = G_N_ELEMENTS (static_entries);
+ static GtkActionEntry project_entries[] = {
+
+ /* FileMenu */
+- {"Save", GTK_STOCK_SAVE, NULL, "<control>S",
++ {"Save", GTK_STOCK_SAVE, NULL, "<primary>S",
+ N_("Save the current project"), G_CALLBACK (save_cb)},
+
+ {"SaveAs", GTK_STOCK_SAVE_AS, N_("Save _As\342\200\246"), NULL,
+ N_("Save the current project with a different name"),
+ G_CALLBACK (save_as_cb)},
+
+- {"Close", GTK_STOCK_CLOSE, NULL, "<control>W",
++ {"Close", GTK_STOCK_CLOSE, NULL, "<primary>W",
+ N_("Close the current project"), G_CALLBACK (close_cb)},
+
+ /* EditMenu */
+- {"Undo", GTK_STOCK_UNDO, NULL, "<control>Z",
++ {"Undo", GTK_STOCK_UNDO, NULL, "<primary>Z",
+ N_("Undo the last action"), G_CALLBACK (undo_cb)},
+
+- {"Redo", GTK_STOCK_REDO, NULL, "<shift><control>Z",
++ {"Redo", GTK_STOCK_REDO, NULL, "<shift><primary>Z",
+ N_("Redo the last action"), G_CALLBACK (redo_cb)},
+
+ {"Cut", GTK_STOCK_CUT, NULL, NULL,
+@@ -2235,14 +2242,14 @@ static GtkActionEntry project_entries[] = {
+ {"Delete", GTK_STOCK_DELETE, NULL, "Delete",
+ N_("Delete the selection"), G_CALLBACK (delete_cb)},
+
+- {"Properties", GTK_STOCK_PROPERTIES, NULL, "<control>P",
++ {"Properties", GTK_STOCK_PROPERTIES, NULL, "<primary>P",
+ N_("Edit project properties"), G_CALLBACK (properties_cb)},
+
+ /* ProjectsMenu */
+- {"PreviousProject", NULL, N_("_Previous Project"), "<control>Page_Up",
++ {"PreviousProject", NULL, N_("_Previous Project"), "<primary>Page_Up",
+ N_("Activate previous project"), G_CALLBACK (previous_project_cb)},
+
+- {"NextProject", NULL, N_("_Next Project"), "<control>Page_Down",
++ {"NextProject", NULL, N_("_Next Project"), "<primary>Page_Down",
+ N_("Activate next project"), G_CALLBACK (next_project_cb)}
+
+
+--
+1.7.6.3.dirty
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
