<!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>[135380] 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/135380">135380</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-04-23 08:22:35 -0700 (Thu, 23 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: gnome-session, update to version 3.16.0, reconfigure using upstream autogen.sh for intltool 0.51 compatibility.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesessionPortfile">users/devans/GNOME-3/stable/dports/gnome/gnome-session/Portfile</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesessionfilesautogensh">users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/autogen.sh</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesessionfilespatchheaderguardtypodiff">users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-header-guard-typo.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomegnomesession">users/devans/GNOME-3/stable/dports/gnome/gnome-session/</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="usersdevansGNOME3stabledportsgnomegnomesession"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/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
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-session:116416-118152,122271-125737
</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
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-session:116416-118152,122271-125737,132287-134574
</span><span class="cx">/users/rmstonecipher/gnome/gnome-session:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegnomesessionPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-session/Portfile (135379 => 135380)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-session/Portfile 2015-04-23 15:22:33 UTC (rev 135379)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-session/Portfile 2015-04-23 15:22:35 UTC (rev 135380)
</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.14.0
</del><ins>+version 3.16.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,13 +18,16 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 1314231bc693ad9c6b334570c60d1f9bb011bc1f \
- sha256 b1e6e805478b863eda58e61ecd0e13961f63dd76e2d49692affc5a1d00f2c184
</del><ins>+checksums rmd160 0c7a029159dc7864c63a6348bf9b8c703430a2dd \
+ sha256 9b546d455edd9d681070a61c98a4164557f89ebbd66367a2aa528d807dfea99d
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="cx"> port:libxslt \
</span><del>- port:gnome-common
</del><ins>+ port:gnome-common \
+ port:autoconf \
+ port:automake \
+ port:libtool
</ins><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:gnome-desktop \
</span><span class="lines">@@ -45,16 +48,16 @@
</span><span class="cx"> port:mesa
</span><span class="cx">
</span><span class="cx"> patchfiles patch-gnome-session-main.c.diff \
</span><del>- patch-gnome-session-check-accelerated-helper.c.diff
</del><ins>+ patch-gnome-session-check-accelerated-helper.c.diff \
+ patch-header-guard-typo.diff
</ins><span class="cx">
</span><del>-# update m4/intltool.m4 and autoreconf
</del><ins>+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</ins><span class="cx">
</span><del>-pre-configure {
- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
</del><ins>+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-use_autoreconf yes
-autoreconf.args -fvi
</del><ins>+configure.cmd ./autogen.sh
</ins><span class="cx">
</span><span class="cx"> configure.cflags-append \
</span><span class="cx"> -Wno-format-nonliteral
</span><span class="lines">@@ -78,4 +81,4 @@
</span><span class="cx"> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomesessionfilesautogensh"></a>
<div class="addfile"><h4>Added: users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/autogen.sh (0 => 135380)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/autogen.sh (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/autogen.sh 2015-04-23 15:22:35 UTC (rev 135380)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="gnome-session"
+
+# (test -f $srcdir/configure.ac \
+# && test -f $srcdir/$PKG_NAME.doap) || {
+# echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+# echo " top-level $PKG_NAME directory"
+# exit 1
+# }
+
+which gnome-autogen.sh || {
+ echo "You need to install gnome-common."
+ exit 1
+}
+
+. gnome-autogen.sh
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnomesessionfilespatchgnomesessionmaincdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff (135379 => 135380)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff 2015-04-23 15:22:33 UTC (rev 135379)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff 2015-04-23 15:22:35 UTC (rev 135380)
</span><span class="lines">@@ -1,17 +1,6 @@
</span><del>---- gnome-session/main.c.orig 2014-03-18 13:31:47.000000000 -0700
-+++ gnome-session/main.c 2014-03-19 23:56:21.000000000 -0700
-@@ -31,6 +31,10 @@
-
- #include <glib-unix.h>
-
-+#ifdef __APPLE__
-+#include <gio/gio.h>
-+#endif
-+
- #include <dbus/dbus.h>
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-bindings.h>
-@@ -240,6 +244,14 @@
</del><ins>+--- gnome-session/main.c.orig 2015-01-05 10:34:39.000000000 -0800
++++ gnome-session/main.c 2015-01-30 08:42:20.000000000 -0800
+@@ -179,6 +179,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">@@ -26,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>-@@ -264,6 +276,7 @@
</del><ins>+@@ -203,6 +211,7 @@
</ins><span class="cx"> g_strerror (errno));
</span><span class="cx"> return FALSE;
</span><span class="cx"> }
</span><span class="lines">@@ -34,3 +23,21 @@
</span><span class="cx">
</span><span class="cx"> /* Should not be reached */
</span><span class="cx"> return TRUE;
</span><ins>+@@ -227,6 +236,17 @@
+ return g_spawn_check_exit_status (status, error);
+ }
+
++#ifdef __APPLE__
++
++static int
++rpmatch (const char *response)
++{
++ return (*response == 'y' || *response == 'Y' ? 1
++ : *response == 'n' || *response == 'N' ? 0 : -1);
++}
++
++#endif
++
+ int
+ main (int argc, char **argv)
+ {
</ins><span class="cx">Property changes on: users/devans/GNOME-3/stable/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
</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
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-gnome-session-main.c.diff:132287-134574
</span><span class="cx">/users/rmstonecipher/gnome/gnome-session/files/patch-gnome-session-main.c.diff:102363-103172
</span><a id="usersdevansGNOME3stabledportsgnomegnomesessionfilespatchheaderguardtypodifffromrev134574usersdevansGNOME3unstabledportsgnomegnomesessionfilespatchheaderguardtypodiff"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-header-guard-typo.diff (from rev 134574, users/devans/GNOME-3/unstable/dports/gnome/gnome-session/files/patch-header-guard-typo.diff) (0 => 135380)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-header-guard-typo.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-session/files/patch-header-guard-typo.diff 2015-04-23 15:22:35 UTC (rev 135380)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- gnome-session/gsm-fail-whale.h.orig 2015-01-29 16:22:48.000000000 -0800
++++ gnome-session/gsm-fail-whale.h 2015-01-29 16:23:08.000000000 -0800
+@@ -15,7 +15,7 @@
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+-#ifndef __GSM_FAIL_WHALE_H___
++#ifndef __GSM_FAIL_WHALE_H__
+ #define __GSM_FAIL_WHALE_H__
+
+ #include <glib.h>
</ins></span></pre>
</div>
</div>
</body>
</html>