[114678] users/devans/GNOME-3/stable/dports/gnome/gnome-session

[devans at macports.org]

Revision: 114678
          https://trac.macports.org/changeset/114678
Author:   devans at macports.org
Date:     2013-12-13 12:20:40 -0800 (Fri, 13 Dec 2013)
Log Message:
-----------
GNOME-3/stable/dports: gnome-session, sync with trunk.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/gnome-session/Portfile

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/
    users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff
    users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-session/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-session/Portfile	2013-12-13 19:58:33 UTC (rev 114677)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-session/Portfile	2013-12-13 20:20:40 UTC (rev 114678)
@@ -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.
@@ -26,6 +27,7 @@
                     port:libxslt
  
 depends_lib         port:desktop-file-utils \
+                    port:gnome-desktop \
                     port:gtk3 \
                     port:dbus-glib \
                     port:upower \
@@ -41,6 +43,9 @@
                     port:xorg-xtrans \
                     port:mesa
 
+patchfiles          patch-gnome-session-main.c.diff \
+                    patch-gnome-session-check-accelerated-helper.c.diff
+
 configure.cflags-append \
                     -Wno-format-nonliteral
 

Added: users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff	2013-12-13 20:20:40 UTC (rev 114678)
@@ -0,0 +1,79 @@
+diff -ur tools.orig/gnome-session-check-accelerated-helper.c tools/gnome-session-check-accelerated-helper.c
+--- tools.orig/gnome-session-check-accelerated-helper.c	2013-03-05 19:59:51.000000000 -0800
++++ tools/gnome-session-check-accelerated-helper.c	2013-12-04 20:17:43.000000000 -0800
+@@ -84,6 +84,75 @@
+ #include <GL/gl.h>
+ #include <GL/glx.h>
+ 
++#ifdef __APPLE__
++#include <Availability.h>
++#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
++
++static const int line_size = 128;
++
++static ssize_t
++getdelim (char **lineptr, size_t *n, int delim, FILE *stream);
++
++static ssize_t
++getline (char **lineptr, size_t *n, FILE *stream);
++
++static ssize_t
++getdelim (char **lineptr, size_t *n, int delim, FILE *stream)
++{
++  int indx = 0;
++  int c;
++
++  /* Sanity checks.  */
++  if (lineptr == NULL || n == NULL || stream == NULL)
++    return -1;
++
++  /* Allocate the line the first time.  */
++  if (*lineptr == NULL)
++    {
++      *lineptr = malloc (line_size);
++      if (*lineptr == NULL)
++        return -1;
++      *n = line_size;
++    }
++
++  /* Clear the line.  */
++  memset (*lineptr, '\0', *n);
++
++  while ((c = getc (stream)) != EOF)
++    {
++      /* Check if more memory is needed.  */
++      if (indx >= *n)
++        {
++          *lineptr = realloc (*lineptr, *n + line_size);
++          if (*lineptr == NULL)
++            {
++              return -1;
++            }
++          /* Clear the rest of the line.  */
++          memset(*lineptr + *n, '\0', line_size);
++          *n += line_size;
++        }
++
++      /* Push the result in the line.  */
++      (*lineptr)[indx++] = c;
++
++      /* Bail out.  */
++      if (c == delim)
++        {
++          break;
++        }
++    }
++  return (c == EOF) ? -1 : indx;
++}
++
++static ssize_t
++getline (char **lineptr, size_t *n, FILE *stream)
++{
++  return getdelim (lineptr, n, '\n', stream);
++}
++#endif
++#endif
++
+ #define SIZE_UNSET 0
+ #define SIZE_ERROR -1
+ static int max_texture_size = SIZE_UNSET;

Added: users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff	2013-12-13 20:20:40 UTC (rev 114678)
@@ -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/20131213/ec6ca1dc/attachment.html>