<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/aa9089b3a2d5e0a54ad446d71f53467cec9687c6">https://github.com/macports/macports-ports/commit/aa9089b3a2d5e0a54ad446d71f53467cec9687c6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new aa9089b glib2: search for dbus socket in correct location
</span>aa9089b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit aa9089b3a2d5e0a54ad446d71f53467cec9687c6
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Dec 26 11:00:13 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> glib2: search for dbus socket in correct location
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/57784
</span>---
devel/glib2/Portfile | 3 ++-
.../glib2/files/patch-get-launchd-dbus-session-address.diff | 13 +++++++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/Portfile b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e1d2b2d..0b515c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,6 +9,7 @@ name glib2
</span> conflicts glib2-devel
set my_name glib
version 2.58.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 7951a41129225b9d38d7df72069f73560a9e86a0 \
sha256 97d6a9d926b6aa3dfaadad3077cfb43eec74432ab455dff14250c769d526d7d6 \
size 4906444
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +90,7 @@ configure.python /usr/bin/python
</span> configure.env-append PERL_PATH=${configure.perl}
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" gio/gdbusprivate.c gio/xdgmime/xdgmime.c glib/gi18n-lib.h glib/gi18n.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" gio/gdbusprivate.c gio/xdgmime/xdgmime.c glib/gi18n-lib.h glib/gi18n.h gio/gdbusaddress.c
</span> reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/glib/gutils.c
reinplace "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" ${worksrcpath}/glib/gutils.c ${worksrcpath}/glib/gspawn.c
reinplace "s|#! */usr/bin/env python|#!${configure.python}|g" ${worksrcpath}/glib/gtester-report
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-get-launchd-dbus-session-address.diff b/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e8be97..bb94bfe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- gio/gdbusaddress.c.orig 2018-02-06 09:44:20.000000000 -0600
+++ gio/gdbusaddress.c 2018-02-16 05:49:36.000000000 -0600
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1524,6 +1524,103 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1528,6 +1528,103 @@
</span>
/* ---------------------------------------------------------------------------------------------------- */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +104,7 @@
</span> static gchar *
get_session_address_platform_specific (GError **error)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1552,7 +1649,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1556,7 +1653,12 @@
</span> * X11 autolaunching; on Windows this means a different autolaunching
* mechanism based on shared memory.
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,3 +117,12 @@
</span> }
/* ---------------------------------------------------------------------------------------------------- */
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1628,7 +1730,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = g_strdup (g_getenv ("DBUS_SYSTEM_BUS_ADDRESS"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ret == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ret = g_strdup ("unix:path=/var/run/dbus/system_bus_socket");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ret = g_strdup ("unix:path=@PREFIX@/var/run/dbus/system_bus_socket");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>