<!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>[153408] trunk/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/153408">153408</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-09-29 15:27:07 -0700 (Thu, 29 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnome-session: update to version 3.22.0, dependencies, rebase patches.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomesessionPortfile">trunk/dports/gnome/gnome-session/Portfile</a></li>
<li><a href="#trunkdportsgnomegnomesessionfilespatchconfigureacdiff">trunk/dports/gnome/gnome-session/files/patch-configure.ac.diff</a></li>
<li><a href="#trunkdportsgnomegnomesessionfilespatchgnomesessionmaincdiff">trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomesessionfilespatchgnomesessioncheckacceleratedglhelpercdiff">trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-gl-helper.c.diff</a></li>
<li><a href="#trunkdportsgnomegnomesessionfilespatchtoolsMakefileamdiff">trunk/dports/gnome/gnome-session/files/patch-tools-Makefile.am.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomesessionfilespatchgnomesessioncheckacceleratedhelpercdiff">trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomegnomesession">trunk/dports/gnome/gnome-session/</a></li>
<li><a href="#trunkdportsgnomegnomesessionfilespatchgnomesessionmaincdiff">trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegnomesession"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/gnome-session</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gnome-session:108269-118732,119139-150099
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-session:116416-118152,122271-125737,132287-134574,138925-140553,144983-147190
</span><span class="cx">/users/rmstonecipher/gnome/gnome-session:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gnome-session:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gnome-session:108269-118732,119139-153407
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-session:116416-118152,122271-125737,132287-134574,138925-140553,144983-147190,150440-152882
</span><span class="cx">/users/rmstonecipher/gnome/gnome-session:102363-103172
</span><a id="trunkdportsgnomegnomesessionPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-session/Portfile (153407 => 153408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-session/Portfile 2016-09-29 22:24:22 UTC (rev 153407)
+++ trunk/dports/gnome/gnome-session/Portfile 2016-09-29 22:27:07 UTC (rev 153408)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gnome-session
</span><del>-version 3.20.2
</del><ins>+version 3.22.0
</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">@@ -18,8 +18,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 d4606cee3b2caaf5592cb44adc93ad242ddd71c9 \
- sha256 025f97e0b9f5431890598d6130040e1e7071771cc29e1d29d8e2e7c84d95f6da
</del><ins>+checksums rmd160 1199446839822e2b4b9d33931cc0d4c0d37f8510 \
+ sha256 ec5c5e133c8ff1c044802eb887f4911183c45ca2d9de4ce29c6f10768ddc8e42
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:gnome-desktop \
</span><span class="cx"> port:metacity \
</span><del>- port:gnome-panel \
</del><span class="cx"> port:gtk3 \
</span><span class="cx"> port:dbus-glib \
</span><span class="cx"> port:json-glib \
</span><span class="lines">@@ -50,8 +49,9 @@
</span><span class="cx"> depends_run port:gnome-themes-standard
</span><span class="cx">
</span><span class="cx"> patchfiles patch-configure.ac.diff \
</span><ins>+ patch-tools-Makefile.am.diff \
</ins><span class="cx"> patch-gnome-session-main.c.diff \
</span><del>- patch-gnome-session-check-accelerated-helper.c.diff \
</del><ins>+ patch-gnome-session-check-accelerated-gl-helper.c.diff \
</ins><span class="cx"> patch-header-guard-typo.diff
</span><span class="cx">
</span><span class="cx"> # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span></span></pre></div>
<a id="trunkdportsgnomegnomesessionfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-session/files/patch-configure.ac.diff (153407 => 153408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-session/files/patch-configure.ac.diff 2016-09-29 22:24:22 UTC (rev 153407)
+++ trunk/dports/gnome/gnome-session/files/patch-configure.ac.diff 2016-09-29 22:27:07 UTC (rev 153408)
</span><span class="lines">@@ -1,11 +1,20 @@
</span><del>---- configure.ac.orig 2015-05-02 11:15:33.000000000 -0700
-+++ configure.ac 2015-05-02 11:18:36.000000000 -0700
-@@ -97,7 +97,8 @@
</del><ins>+--- configure.ac.orig 2016-06-20 12:41:43.000000000 -0700
++++ configure.ac 2016-06-23 13:19:03.000000000 -0700
+@@ -86,7 +86,7 @@
+ PKG_CHECK_MODULES(XEXT, xext xau)
+
+ PKG_CHECK_MODULES(GL_TEST, xcomposite gl glib-2.0)
+-PKG_CHECK_MODULES(GLES_TEST, egl glesv2)
++dnl PKG_CHECK_MODULES(GLES_TEST, egl glesv2)
+
+ dnl ====================================================================
+ dnl Check for gconf
+@@ -96,7 +96,8 @@
</ins><span class="cx"> [enable_gconf=$enableval],
</span><span class="cx"> [enable_gconf=auto])
</span><span class="cx">
</span><span class="cx"> -PKG_CHECK_MODULES(GCONF, gconf-2.0, [have_gconf=yes], [have_gconf=no])
</span><del>-+#PKG_CHECK_MODULES(GCONF, gconf-2.0, [have_gconf=yes], [have_gconf=no])
</del><ins>++dnl PKG_CHECK_MODULES(GCONF, gconf-2.0, [have_gconf=yes], [have_gconf=no])
</ins><span class="cx"> +have_gconf=no
</span><span class="cx">
</span><span class="cx"> if test x$enable_gconf = xauto ; then
</span></span></pre></div>
<a id="trunkdportsgnomegnomesessionfilespatchgnomesessioncheckacceleratedglhelpercdifffromrev153407usersdevansGNOME3stabledportsgnomegnomesessionfilespatchgnomesessioncheckacceleratedglhelpercdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-gl-helper.c.diff (from rev 153407, users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-gl-helper.c.diff) (0 => 153408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-gl-helper.c.diff (rev 0)
+++ trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-gl-helper.c.diff 2016-09-29 22:27:07 UTC (rev 153408)
</span><span class="lines">@@ -0,0 +1,122 @@
</span><ins>+--- tools/gnome-session-check-accelerated-gl-helper.c.orig 2016-08-18 11:09:18.000000000 -0700
++++ tools/gnome-session-check-accelerated-gl-helper.c 2016-08-19 21:58:54.000000000 -0700
+@@ -91,6 +91,75 @@
+
+ #include "gnome-session-check-accelerated-common.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;
+@@ -481,26 +550,42 @@
+ _print_error ("No X display.");
+ goto out;
+ }
+-
++/*
++ * Mac OS X always fails these checks due to the following
++ * - No composite extension
++ * - No GLX_EXT_texture_from_pixmap support
++ * This is mainly for gnome-shell which we don't support yet.
++ * For now, print the error but allow gnome-session to
++ * continue to start up. We'll deal with any consequences
++ * down the line.
++ */
+ if (!_has_composite (display)) {
+ _print_error ("No composite extension.");
++#ifndef __APPLE__
+ goto out;
++#endif
+ }
+
+ renderer = _get_hardware_gl (display);
+ if (!renderer) {
+ _print_error ("No hardware 3D support.");
++#ifndef __APPLE__
+ goto out;
++#endif
+ }
+
+ if (!_has_texture_from_pixmap (display)) {
+ _print_error ("No GLX_EXT_texture_from_pixmap support.");
++#ifndef __APPLE__
+ goto out;
++#endif
+ }
+
+ if (!_is_max_texture_size_big_enough (display)) {
+ _print_error ("GL_MAX_{TEXTURE,RENDERBUFFER}_SIZE is too small.");
++#ifndef __APPLE__
+ goto out;
++#endif
+ }
+
+ ret = has_llvmpipe ? HELPER_SOFTWARE_RENDERING : HELPER_ACCEL;
</ins></span></pre></div>
<a id="trunkdportsgnomegnomesessionfilespatchgnomesessioncheckacceleratedglhelpercdiff"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-gl-helper.c.diff</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<span class="cx">/branches/mld-qt-481/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-gl-helper.c.diff:119039-144981
</span><span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-gl-helper.c.diff:108269-118732,119139-150099,152884-153407
</span><span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff:108269-113174,114678-116652
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-gl-helper.c.diff:116416-118152,122271-125737,132287-134574,138925-140553,144983-147190,150440-152882
</span><span class="cx">/users/rmstonecipher/gnome/gnome-session/files/patch-gnome-session-check-accelerated-gl-helper.c.diff:102363-103172
</span><span class="cx">/users/rmstonecipher/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff:102363-103172
</span><a id="trunkdportsgnomegnomesessionfilespatchgnomesessioncheckacceleratedhelpercdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff (153407 => 153408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff 2016-09-29 22:24:22 UTC (rev 153407)
+++ trunk/dports/gnome/gnome-session/files/patch-gnome-session-check-accelerated-helper.c.diff 2016-09-29 22:27:07 UTC (rev 153408)
</span><span class="lines">@@ -1,120 +0,0 @@
</span><del>---- tools/gnome-session-check-accelerated-helper.c.orig 2013-10-04 19:29:25.000000000 -0700
-+++ tools/gnome-session-check-accelerated-helper.c 2013-12-20 12:45:20.000000000 -0800
-@@ -86,6 +86,75 @@
-
- #include "gnome-session-check-accelerated-common.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;
-@@ -427,24 +496,41 @@
- goto out;
- }
-
-+/*
-+ * Mac OS X always fails these checks due to the following
-+ * - No composite extension
-+ * - No GLX_EXT_texture_from_pixmap support
-+ * This is mainly for gnome-shell which we don't support yet.
-+ * For now, print the error but allow gnome-session to
-+ * continue to start up. We'll deal with any consequences
-+ * down the line.
-+ */
- if (!_has_composite (display)) {
- _print_error ("No composite extension.");
-+#ifndef __APPLE__
- goto out;
-+#endif
- }
-
- if (!_has_hardware_gl (display)) {
- _print_error ("No hardware 3D support.");
-+#ifndef __APPLE__
- goto out;
-+#endif
- }
-
- if (!_has_texture_from_pixmap (display)) {
- _print_error ("No GLX_EXT_texture_from_pixmap support.");
-+#ifndef __APPLE__
- goto out;
-+#endif
- }
-
- if (!_is_max_texture_size_big_enough (display)) {
- _print_error ("GL_MAX_{TEXTURE,RENDERBUFFER}_SIZE is too small.");
-+#ifndef __APPLE__
- goto out;
-+#endif
- }
-
- if (has_llvmpipe) {
</del></span></pre></div>
<a id="trunkdportsgnomegnomesessionfilespatchgnomesessionmaincdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff (153407 => 153408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff 2016-09-29 22:24:22 UTC (rev 153407)
+++ trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff 2016-09-29 22:27:07 UTC (rev 153408)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- gnome-session/main.c.orig 2016-01-21 07:05:18.000000000 -0800
</span><span class="cx"> +++ gnome-session/main.c 2016-01-22 22:47:15.000000000 -0800
</span><del>-@@ -180,6 +180,14 @@
</del><ins>+@@ -182,6 +182,14 @@
</ins><span class="cx"> if (g_getenv ("DBUS_SESSION_BUS_ADDRESS"))
</span><span class="cx"> return TRUE;
</span><span class="cx">
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> /* Just a sanity check to prevent infinite recursion if
</span><span class="cx"> * dbus-launch fails to set DBUS_SESSION_BUS_ADDRESS
</span><span class="cx"> */
</span><del>-@@ -204,6 +212,7 @@
</del><ins>+@@ -206,6 +214,7 @@
</ins><span class="cx"> g_strerror (errno));
</span><span class="cx"> return FALSE;
</span><span class="cx"> }
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">
</span><span class="cx"> /* Should not be reached */
</span><span class="cx"> return TRUE;
</span><del>-@@ -265,6 +274,17 @@
</del><ins>+@@ -267,6 +276,17 @@
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">Property changes on: trunk/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff:108269-113174,114678-118732,119139-147323
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff:132287-134574,144983-147190
</span><span class="cx">/users/rmstonecipher/gnome/gnome-session/files/patch-gnome-session-main.c.diff:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff:108269-113174,114678-118732,119139-153407
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff:132287-134574,144983-147190,150440-152882
</span><span class="cx">/users/rmstonecipher/gnome/gnome-session/files/patch-gnome-session-main.c.diff:102363-103172
</span><a id="trunkdportsgnomegnomesessionfilespatchtoolsMakefileamdifffromrev153407usersdevansGNOME3stabledportsgnomegnomesessionfilespatchtoolsMakefileamdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/gnome/gnome-session/files/patch-tools-Makefile.am.diff (from rev 153407, users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-tools-Makefile.am.diff) (0 => 153408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-session/files/patch-tools-Makefile.am.diff (rev 0)
+++ trunk/dports/gnome/gnome-session/files/patch-tools-Makefile.am.diff 2016-09-29 22:27:07 UTC (rev 153408)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+--- tools/Makefile.am.orig 2016-05-26 14:04:18.000000000 -0700
++++ tools/Makefile.am 2016-06-23 14:07:01.000000000 -0700
+@@ -1,8 +1,7 @@
+ bin_PROGRAMS = gnome-session-quit gnome-session-inhibit
+ libexec_PROGRAMS = \
+ gnome-session-check-accelerated \
+- gnome-session-check-accelerated-gl-helper \
+- gnome-session-check-accelerated-gles-helper
++ gnome-session-check-accelerated-gl-helper
+
+ if BUILD_SESSION_SELECTOR
+ bin_PROGRAMS += gnome-session-selector
+@@ -44,19 +43,19 @@
+ gnome_session_inhibit_LDADD = \
+ $(GNOME_SESSION_LIBS)
+
+-gnome_session_check_accelerated_gles_helper_SOURCES = \
+- gnome-session-check-accelerated-common.h \
+- gnome-session-check-accelerated-gles-helper.c
+-
+-gnome_session_check_accelerated_gles_helper_CPPFLAGS = \
+- -DPKGDATADIR=\""$(pkgdatadir)"\" \
+- $(GLES_TEST_CFLAGS) \
+- $(GTK3_CFLAGS)
+-
+-gnome_session_check_accelerated_gles_helper_LDADD = \
+- $(GLES_TEST_LIBS) \
+- $(GTK3_LIBS) \
+- $(X11_LIBS)
++# gnome_session_check_accelerated_gles_helper_SOURCES = \
++# gnome-session-check-accelerated-common.h \
++# gnome-session-check-accelerated-gles-helper.c
++#
++#gnome_session_check_accelerated_gles_helper_CPPFLAGS = \
++# -DPKGDATADIR=\""$(pkgdatadir)"\" \
++# $(GLES_TEST_CFLAGS) \
++# $(GTK3_CFLAGS)
++#
++#gnome_session_check_accelerated_gles_helper_LDADD = \
++# $(GLES_TEST_LIBS) \
++# $(GTK3_LIBS) \
++# $(X11_LIBS)
+
+ gnome_session_check_accelerated_gl_helper_SOURCES = \
+ gnome-session-check-accelerated-common.h \
</ins></span></pre>
</div>
</div>
</body>
</html>