<!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>[141294] trunk/dports/devel/glib2</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/141294">141294</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-10-14 15:51:30 -0700 (Wed, 14 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>glib2: realign/restore get-launchd-dbus-session-address patch to avoid startup errors with apps that use glib2 to access the dbus session bus, increment revision.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelglib2Portfile">trunk/dports/devel/glib2/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelglib2filespatchgetlaunchddbussessionaddressdiff">trunk/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsdevelglib2">trunk/dports/devel/glib2/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelglib2"></a>
<div class="propset"><h4>Property changes: trunk/dports/devel/glib2</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/devel/glib2-devel:51739-120463
</span><span class="cx">/users/cal/ports/devel/glib2:96570-97031
</span><span class="cx">/users/devans/GNOME-3/stable/dports/devel/glib2:125662-141255
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/devel/glib2:120511-125619,128305-141254
</span><a id="trunkdportsdevelglib2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/glib2/Portfile (141293 => 141294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/glib2/Portfile 2015-10-14 22:50:58 UTC (rev 141293)
+++ trunk/dports/devel/glib2/Portfile 2015-10-14 22:51:30 UTC (rev 141294)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> conflicts glib2-devel
</span><span class="cx"> set my_name glib
</span><span class="cx"> version 2.46.0
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories devel
</span><span class="cx"> maintainers ryandesign openmaintainer
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> patch-gi18n.h.diff \
</span><span class="cx"> patch-gio_xdgmime_xdgmime.c.diff \
</span><span class="cx"> patch-gio_gdbusprivate.c.diff \
</span><ins>+ patch-get-launchd-dbus-session-address.diff \
</ins><span class="cx"> patch-gmodule-gmodule-dl.c.diff
</span><span class="cx">
</span><span class="cx"> if {[vercmp ${macosx_deployment_target} 10.9] < 0} {
</span></span></pre></div>
<a id="trunkdportsdevelglib2filespatchgetlaunchddbussessionaddressdifffromrev141255usersdevansGNOME3stabledportsdevelglib2filespatchgetlaunchddbussessionaddressdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff (from rev 141255, users/devans/GNOME-3/stable/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff) (0 => 141294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff (rev 0)
+++ trunk/dports/devel/glib2/files/patch-get-launchd-dbus-session-address.diff 2015-10-14 22:51:30 UTC (rev 141294)
</span><span class="lines">@@ -0,0 +1,119 @@
</span><ins>+--- gio/gdbusaddress.c.orig 2015-06-09 16:18:38.000000000 -0700
++++ gio/gdbusaddress.c 2015-06-23 10:54:28.000000000 -0700
+@@ -1475,6 +1475,103 @@
+
+ /* ---------------------------------------------------------------------------------------------------- */
+
++/*
++ * MacPorts specific D-Bus implementation
++ *
++ * When building under MacPorts on darwin
++ * plaforms (including Mac OS X), the
++ * symbols G_OS_UNIX and __APPLE__ are
++ * asserted.
++ *
++ * The D-Bus session daemon is controlled
++ * using the Apple launchd facility.
++ *
++ * For launchd command details see
++ * http://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages
++ *
++ * launchd(8)
++ * launchctl(1)
++ * launchd.plist(5)
++ */
++
++#if defined (G_OS_UNIX) && defined (__APPLE__)
++static gchar *
++get_session_address_macports_specific (GError **error)
++{
++ gchar *ret;
++ gchar *command_line;
++ gchar *launchctl_stdout;
++ gchar *launchctl_stderr;
++ gint exit_status;
++
++ ret = NULL;
++ command_line = NULL;
++ launchctl_stdout = NULL;
++ launchctl_stderr = NULL;
++
++ command_line = g_strdup ("launchctl getenv DBUS_LAUNCHD_SESSION_BUS_SOCKET");
++
++ if (G_UNLIKELY (_g_dbus_debug_address ()))
++ {
++ _g_dbus_debug_print_lock ();
++ g_print ("GDBus-debug:Address: launchctl command line: `%s'\n", command_line);
++ _g_dbus_debug_print_unlock ();
++ }
++
++ if (g_spawn_command_line_sync (command_line,
++ &launchctl_stdout,
++ &launchctl_stderr,
++ &exit_status,
++ error))
++ {
++ if (g_spawn_check_exit_status (exit_status, error))
++ {
++ if (launchctl_stdout != NULL)
++ {
++ if (G_UNLIKELY (_g_dbus_debug_address ()))
++ {
++ gchar *s;
++ _g_dbus_debug_print_lock ();
++ g_print ("GDBus-debug:Address: launchctl stdout:");
++ s = _g_dbus_hexdump (launchctl_stdout, strlen (launchctl_stdout) + 1, 2);
++ g_print ("\n%s", s);
++ g_free (s);
++ _g_dbus_debug_print_unlock ();
++ }
++
++ if (*launchctl_stdout != '\0')
++ {
++ gchar *lastchar;
++
++ lastchar = launchctl_stdout + strlen(launchctl_stdout) - 1;
++ if (*lastchar == '\n') *lastchar = '\0';
++ ret = g_strdup_printf ("unix:path=%s", launchctl_stdout);
++ }
++ else
++ {
++ g_set_error (error,
++ G_IO_ERROR,
++ G_IO_ERROR_FAILED,
++ _("Session D-Bus not running. Try running `launchctl load -w /Library/LaunchAgents/org.freedesktop.dbus-session.plist'."));
++ }
++ }
++ }
++ else
++ {
++ g_prefix_error (error, _("Error spawning command line `%s': "), command_line);
++ }
++ }
++
++ g_free (command_line);
++ g_free (launchctl_stdout);
++ g_free (launchctl_stderr);
++
++ return ret;
++}
++#endif
++
++/* ---------------------------------------------------------------------------------------------------- */
++
+ static gchar *
+ get_session_address_platform_specific (GError **error)
+ {
+@@ -1503,7 +1600,12 @@
+ * X11 autolaunching; on Windows this means a different autolaunching
+ * mechanism based on shared memory.
+ */
++
++#ifdef __APPLE__
++ return get_session_address_macports_specific (error);
++#else
+ return get_session_address_dbus_launch (error);
++#endif
+ }
+
+ /* ---------------------------------------------------------------------------------------------------- */
</ins></span></pre>
</div>
</div>
</body>
</html>