[107006] trunk/dports/devel/glib2-devel/files/ patch-get-launchd-dbus-session-address.diff

[devans at macports.org]

Revision: 107006
          https://trac.macports.org/changeset/107006
Author:   devans at macports.org
Date:     2013-06-13 23:12:48 -0700 (Thu, 13 Jun 2013)
Log Message:
-----------
glib2-devel: reformat patch to fix build.

Modified Paths:
--------------
    trunk/dports/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff

Modified: trunk/dports/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff	2013-06-14 05:01:26 UTC (rev 107005)
+++ trunk/dports/devel/glib2-devel/files/patch-get-launchd-dbus-session-address.diff	2013-06-14 06:12:48 UTC (rev 107006)
@@ -1,12 +1,12 @@
---- gio/gdbusaddress.c.orig	2013-02-24 13:02:01.000000000 -0800
-+++ gio/gdbusaddress.c	2013-05-17 08:00:11.000000000 -0700
+--- gio/gdbusaddress.c.orig	2013-05-27 10:01:46.000000000 -0700
++++ gio/gdbusaddress.c	2013-06-13 22:48:22.000000000 -0700
 @@ -1426,13 +1426,116 @@
  
  /* ---------------------------------------------------------------------------------------------------- */
  
 +/*
 + * MacPorts specific D-Bus implementation
-+ * 
++ *
 + * When building under MacPorts on darwin
 + * plaforms (including Mac OS X), the
 + * symbols G_OS_UNIX and __APPLE__ are
@@ -14,7 +14,7 @@
 + *
 + * 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
 + *
@@ -32,14 +32,14 @@
 +  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 ();
@@ -67,11 +67,11 @@
 +                    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);
@@ -106,7 +106,7 @@
  {
    gchar *ret;
  #if defined (G_OS_UNIX) || defined(G_OS_WIN32)
-   /* need to handle OS X in a different way since `dbus-launch --autolaunch' probably won't work there */
+   /* need to handle OS X in a different way since 'dbus-launch --autolaunch' probably won't work there */
 +
 +#ifdef __APPLE__
 +  ret = get_session_address_macports_specific (error);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130613/99e4108c/attachment.html>