<!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>[114678] users/devans/GNOME-3/stable/dports/gnome/gnome-session</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/114678">114678</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2013-12-13 12:20:40 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable/dports: gnome-session, sync with trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesessionPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-session/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/</li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesessionfilespatchgnomesessioncheckacceleratedhelpercdiff">users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesessionfilespatchgnomesessionmaincdiff">users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsgnomegnomesessionPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-session/Portfile (114677 => 114678)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name gnome-session
</span><span class="cx"> version 3.8.4
</span><ins>+revision 1
</ins><span class="cx"> license LGPL-2+
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Session component for the GNOME 3 desktop.
</span><span class="lines">@@ -26,6 +27,7 @@
</span><span class="cx"> port:libxslt
</span><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><ins>+ port:gnome-desktop \
</ins><span class="cx"> port:gtk3 \
</span><span class="cx"> port:dbus-glib \
</span><span class="cx"> port:upower \
</span><span class="lines">@@ -41,6 +43,9 @@
</span><span class="cx"> port:xorg-xtrans \
</span><span class="cx"> port:mesa
</span><span class="cx">
</span><ins>+patchfiles patch-gnome-session-main.c.diff \
+ patch-gnome-session-check-accelerated-helper.c.diff
+
</ins><span class="cx"> configure.cflags-append \
</span><span class="cx"> -Wno-format-nonliteral
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomesessionfilespatchgnomesessioncheckacceleratedhelpercdiff"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff (0 => 114678)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+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;
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomesessionfilespatchgnomesessionmaincdiff"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff (0 => 114678)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+--- 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;
</ins></span></pre>
</div>
</div>
</body>
</html>