--- configure.ac.orig 2014-05-12 11:51:09.000000000 -0700
+++ configure.ac 2016-04-24 10:05:45.000000000 -0700
_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(GTK_MAC, gtk-mac-integration)
+ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk2)
--- src/glade-window.c.orig 2016-04-24 18:30:58.000000000 -0700
+++ src/glade-window.c 2016-04-24 18:33:31.000000000 -0700
/* Fix up the menubar for MacOSX Quartz builds */
- GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
+ GtkosxApplication *theApp = g_object_new(GTKOSX_TYPE_APPLICATION, NULL);
gtk_widget_hide (menubar);
- gtk_osxapplication_set_menu_bar(theApp, GTK_MENU_SHELL(menubar));
+ gtkosx_application_set_menu_bar(theApp, GTK_MENU_SHELL(menubar));
gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/FileMenu/Quit");
gtk_widget_hide (widget);
gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/HelpMenu/About");
- gtk_osxapplication_insert_app_menu_item (theApp, widget, 0);
+ gtkosx_application_insert_app_menu_item (theApp, widget, 0);
sep = gtk_separator_menu_item_new();
- gtk_osxapplication_insert_app_menu_item (theApp, sep, 1);
+ gtkosx_application_insert_app_menu_item (theApp, sep, 1);
gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/EditMenu/Preferences");
- gtk_osxapplication_insert_app_menu_item (theApp, widget, 2);
+ gtkosx_application_insert_app_menu_item (theApp, widget, 2);
sep = gtk_separator_menu_item_new();
- gtk_osxapplication_insert_app_menu_item (theApp, sep, 3);
+ gtkosx_application_insert_app_menu_item (theApp, sep, 3);
gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/HelpMenu");
- gtk_osxapplication_set_help_menu(theApp, GTK_MENU_ITEM(widget));
+ gtkosx_application_set_help_menu(theApp, GTK_MENU_ITEM(widget));
g_signal_connect(theApp, "NSApplicationWillTerminate",
G_CALLBACK(quit_cb), window);
- gtk_osxapplication_ready(theApp);
+ gtkosx_application_ready(theApp);