[148025] trunk/dports/devel/glade3

[mcalhoun at macports.org]

Revision: 148025
          https://trac.macports.org/changeset/148025
Author:   mcalhoun at macports.org
Date:     2016-04-24 19:30:23 -0700 (Sun, 24 Apr 2016)
Log Message:
-----------
glade3: allow glade3 to run if gtk2 was installed with quartz variant

Modified Paths:
--------------
    trunk/dports/devel/glade3/Portfile

Added Paths:
-----------
    trunk/dports/devel/glade3/files/
    trunk/dports/devel/glade3/files/patch-quartz.diff

Modified: trunk/dports/devel/glade3/Portfile
===================================================================
--- trunk/dports/devel/glade3/Portfile	2016-04-25 02:26:52 UTC (rev 148024)
+++ trunk/dports/devel/glade3/Portfile	2016-04-25 02:30:23 UTC (rev 148025)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           active_variants 1.1
 
 name                glade3
 version             3.8.5
@@ -59,25 +60,32 @@
     configure.pkg_config_path ${python_framework}/lib/pkgconfig
 }
 
-variant gnome description {Enable support for GNOME2 UI widgets} {
+# currenlty, libbonoboui is broken if gtk2 was installed with +quartz (#48986)
+variant gnome conflicts quartz description {Enable support for GNOME2 UI widgets} {
     configure.args-replace    --disable-gnome  --enable-gnome
     depends_lib-append        port:libbonoboui \
                               port:libgnomeui
 }
 
-#
-# ige-mac-integration is broken
-#
-# disable quartz variant until this is resolved
-#
+variant quartz conflicts gnome {
+    # configure script automatically detects if gtk2 was installed with quartz variant
+    require_active_variants gtk2 quartz
 
-#variant quartz {
-#         depends_lib-append port:ige-mac-integration
-#         depends_run-delete port:devhelp
-#}
+    depends_lib-append port:gtk-osx-application-gtk2
 
-default_variants +python27 +gnome
+    patchfiles-append \
+        patch-quartz.diff
+}
 
+if {![variant_isset quartz]} {
+    require_active_variants gtk2 x11
+}
+
+default_variants +python27
+if {![variant_isset quartz]} {
+    default_variants-append +gnome
+}
+
 post-activate {
     system "${prefix}/bin/scrollkeeper-update"
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"

Added: trunk/dports/devel/glade3/files/patch-quartz.diff
===================================================================
--- trunk/dports/devel/glade3/files/patch-quartz.diff	                        (rev 0)
+++ trunk/dports/devel/glade3/files/patch-quartz.diff	2016-04-25 02:30:23 UTC (rev 148025)
@@ -0,0 +1,56 @@
+--- configure.ac.orig	2014-05-12 11:51:09.000000000 -0700
++++ configure.ac	2016-04-24 10:05:45.000000000 -0700
+@@ -230,7 +230,7 @@
+ _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)
+ 
+    GTK_MAC_BUNDLE_FLAG=
+ 
+--- 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
+@@ -3395,34 +3395,34 @@
+ 	{
+ 		/* Fix up the menubar for MacOSX Quartz builds */
+ 		GtkWidget *sep;
+-		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));
+ 		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);
++		gtkosx_application_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);
++		gtkosx_application_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);
++		gtkosx_application_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);
++		gtkosx_application_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));
++		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);
+ 
+ 	}
+ #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160424/0dc8c332/attachment-0001.html>