[114306] trunk/dports/gnome/gnome-session

[devans at macports.org]

Revision: 114306
          https://trac.macports.org/changeset/114306
Author:   devans at macports.org
Date:     2013-12-04 15:38:40 -0800 (Wed, 04 Dec 2013)
Log Message:
-----------
gnome-session: check for session dbus address if DBUS_SESSION_BUS_ADDRESS is not set, closes #41506.

Modified Paths:
--------------
    trunk/dports/gnome/gnome-session/Portfile

Added Paths:
-----------
    trunk/dports/gnome/gnome-session/files/
    trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff

Modified: trunk/dports/gnome/gnome-session/Portfile
===================================================================
--- trunk/dports/gnome/gnome-session/Portfile	2013-12-04 22:48:02 UTC (rev 114305)
+++ trunk/dports/gnome/gnome-session/Portfile	2013-12-04 23:38:40 UTC (rev 114306)
@@ -5,6 +5,7 @@
 
 name                gnome-session
 version             3.8.4
+revision            1
 license             LGPL-2+
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         Session component for the GNOME 3 desktop.
@@ -42,6 +43,8 @@
                     port:xorg-xtrans \
                     port:mesa
 
+patchfiles          patch-gnome-session-main.c.diff
+
 configure.cflags-append \
                     -Wno-format-nonliteral
 

Added: trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff
===================================================================
--- trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff	                        (rev 0)
+++ trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff	2013-12-04 23:38:40 UTC (rev 114306)
@@ -0,0 +1,25 @@
+--- gnome-session/main.c.orig	2013-07-30 12:11:51.000000000 -0700
++++ gnome-session/main.c	2013-12-04 15:19:00.000000000 -0800
+@@ -226,6 +226,14 @@
+         if (g_getenv ("DBUS_SESSION_BUS_ADDRESS"))
+                 return TRUE;
+ 
++#ifdef __APPLE__
++        /* See if we can get the session DBus address */
++	if (!g_dbus_address_get_for_bus_sync (G_BUS_TYPE_SESSION, NULL, error)) {
++		g_critical("gsm error: %s", (*error)->message);
++		exit(1);
++	}
++	return TRUE;
++#else
+         /* Just a sanity check to prevent infinite recursion if
+          * dbus-launch fails to set DBUS_SESSION_BUS_ADDRESS 
+          */
+@@ -250,6 +258,7 @@
+                              g_strerror (errno));
+                 return FALSE;
+         }
++#endif
+ 
+         /* Should not be reached */
+         return TRUE;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131204/05385f38/attachment.html>