<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[148025] trunk/dports/devel/glade3</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/148025">148025</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2016-04-24 19:30:23 -0700 (Sun, 24 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>glade3: allow glade3 to run if gtk2 was installed with quartz variant</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelglade3Portfile">trunk/dports/devel/glade3/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/devel/glade3/files/</li>
<li><a href="#trunkdportsdevelglade3filespatchquartzdiff">trunk/dports/devel/glade3/files/patch-quartz.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelglade3Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/glade3/Portfile (148024 => 148025)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup active_variants 1.1
</ins><span class="cx">
</span><span class="cx"> name glade3
</span><span class="cx"> version 3.8.5
</span><span class="lines">@@ -59,25 +60,32 @@
</span><span class="cx"> configure.pkg_config_path ${python_framework}/lib/pkgconfig
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant gnome description {Enable support for GNOME2 UI widgets} {
</del><ins>+# currenlty, libbonoboui is broken if gtk2 was installed with +quartz (#48986)
+variant gnome conflicts quartz description {Enable support for GNOME2 UI widgets} {
</ins><span class="cx"> configure.args-replace --disable-gnome --enable-gnome
</span><span class="cx"> depends_lib-append port:libbonoboui \
</span><span class="cx"> port:libgnomeui
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#
-# ige-mac-integration is broken
-#
-# disable quartz variant until this is resolved
-#
</del><ins>+variant quartz conflicts gnome {
+ # configure script automatically detects if gtk2 was installed with quartz variant
+ require_active_variants gtk2 quartz
</ins><span class="cx">
</span><del>-#variant quartz {
-# depends_lib-append port:ige-mac-integration
-# depends_run-delete port:devhelp
-#}
</del><ins>+ depends_lib-append port:gtk-osx-application-gtk2
</ins><span class="cx">
</span><del>-default_variants +python27 +gnome
</del><ins>+ patchfiles-append \
+ patch-quartz.diff
+}
</ins><span class="cx">
</span><ins>+if {![variant_isset quartz]} {
+ require_active_variants gtk2 x11
+}
+
+default_variants +python27
+if {![variant_isset quartz]} {
+ default_variants-append +gnome
+}
+
</ins><span class="cx"> post-activate {
</span><span class="cx"> system "${prefix}/bin/scrollkeeper-update"
</span><span class="cx"> system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span></span></pre></div>
<a id="trunkdportsdevelglade3filespatchquartzdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/glade3/files/patch-quartz.diff (0 => 148025)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+--- 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
</ins></span></pre>
</div>
</div>
</body>
</html>