<!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>[117912] users/devans/GNOME-3/unstable/dports/gnome/gdm</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/117912">117912</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-03-16 20:26:10 -0700 (Sun, 16 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/unstable: gdm, update m4/intltool.m4 and autoreconf to fix intltool configuration, patchfiles.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3unstabledportsgnomegdmPortfile">users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile</a></li>
<li><a href="#usersdevansGNOME3unstabledportsgnomegdmfilespatchdaemongdmsessionworkercdiff">users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3unstabledportsgnomegdmfilespatchconfigureacdiff">users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3unstabledportsgnomegdmfilespatchconfigurediff">users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.diff</a></li>
<li><a href="#usersdevansGNOME3unstabledportsgnomegdmfilespatchdaemongdmsessioncdiff">users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon-gdm-session.c.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#usersdevansGNOME3unstabledportsgnomegdm">users/devans/GNOME-3/unstable/dports/gnome/gdm/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3unstabledportsgnomegdm"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/unstable/dports/gnome/gdm</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/gnome/gdm:108265-114987
</span><span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gdm:114069-116236
</span><span class="cx">/users/rmstonecipher/gnome/gdm:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gdm:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/gnome/gdm:108265-117875
</span><span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gdm:114069-117876
</span><span class="cx">/users/rmstonecipher/gnome/gdm:102363-103172
</span><a id="usersdevansGNOME3unstabledportsgnomegdmPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile (117911 => 117912)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile 2014-03-17 01:38:55 UTC (rev 117911)
+++ users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile 2014-03-17 03:26:10 UTC (rev 117912)
</span><span class="lines">@@ -49,16 +49,25 @@
</span><span class="cx"> depends_run port:gnome-session \
</span><span class="cx"> port:gnome-settings-daemon
</span><span class="cx">
</span><del>-patchfiles patch-configure.diff \
- patch-daemon-gdm-session-worker.c.diff
</del><ins>+patchfiles patch-daemon-gdm-session-worker.c.diff \
+ patch-configure.ac.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><del>- reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure
- file attributes ${worksrcpath}/install-sh -permissions +x
</del><ins>+ reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure.ac
+ file attributes ${worksrcpath}/install-sh -permissions +x
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> use_parallel_build no
</span><span class="cx">
</span><ins>+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.args --enable-ipv6 \
</span><span class="cx"> --without-console-kit \
</span><span class="cx"> --disable-schemas-compile \
</span></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomegdmfilespatchconfigureacdifffromrev117876usersdevansGNOME3stabledportsgnomegdmfilespatchconfigureacdiff"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.ac.diff (from rev 117876, users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-configure.ac.diff) (0 => 117912)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.ac.diff (rev 0)
+++ users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.ac.diff 2014-03-17 03:26:10 UTC (rev 117912)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+--- configure.ac.orig 2014-03-15 07:56:54.000000000 -0700
++++ configure.ac 2014-03-15 08:00:06.000000000 -0700
+@@ -499,6 +499,7 @@
+ AC_CHECK_LIB(pam, pam_syslog, [AC_DEFINE(HAVE_PAM_SYSLOG, [], [Define to 1 if you have the pam_syslog function])])
+
+ dnl test whether struct pam_message is const (Linux) or not (Sun)
++ac_pam_includes="/usr/include"
+ if test "x$have_pam" = "xyes"; then
+ pam_appl_h="$ac_pam_includes/security/pam_appl.h"
+ AC_MSG_CHECKING(for const pam_message)
+@@ -1217,7 +1218,17 @@
+ # and /usr/X11 since they often symlink to each other, and configure
+ # should use the more stable location (the real directory) if possible.
+ #
+-if test -x /usr/X11/bin/Xserver; then
++if test -x @MP_PREFIX@/bin/Xquartz; then
++ X_PATH="@MP_PREFIX@/bin"
++ X_SERVER_PATH="@MP_PREFIX@/bin"
++ X_SERVER="@MP_PREFIX@/bin/Xquartz"
++ X_CONFIG_OPTIONS="-audit 0"
++elif test -x /opt/X11/bin/Xquartz; then
++ X_PATH="/opt/X11/bin"
++ X_SERVER_PATH="/opt/X11/bin"
++ X_SERVER="/opt/X11/bin/Xquartz"
++ X_CONFIG_OPTIONS="-audit 0"
++elif test -x /usr/X11/bin/Xserver; then
+ X_PATH="/usr/X11/bin"
+ X_SERVER_PATH="/usr/X11/bin"
+ X_SERVER="/usr/X11/bin/Xserver"
</ins></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomegdmfilespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.diff (117911 => 117912)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.diff 2014-03-17 01:38:55 UTC (rev 117911)
+++ users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.diff 2014-03-17 03:26:10 UTC (rev 117912)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>---- configure.orig 2013-10-16 07:46:13.000000000 -0700
-+++ configure 2013-11-08 21:31:12.000000000 -0800
-@@ -23256,6 +23256,7 @@
- fi
-
-
-+ac_pam_includes="/usr/include"
- if test "x$have_pam" = "xyes"; then
- pam_appl_h="$ac_pam_includes/security/pam_appl.h"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for const pam_message" >&5
-@@ -25473,7 +25474,17 @@
- # and /usr/X11 since they often symlink to each other, and configure
- # should use the more stable location (the real directory) if possible.
- #
--if test -x /usr/X11/bin/Xserver; then
-+if test -x @MP_PREFIX@/bin/Xquartz; then
-+ X_PATH="/opt/local/bin"
-+ X_SERVER_PATH="/opt/local/bin"
-+ X_SERVER="/opt/local/bin/Xquartz"
-+ X_CONFIG_OPTIONS="-audit 0"
-+elif test -x /opt/X11/bin/Xquartz; then
-+ X_PATH="/opt/X11/bin"
-+ X_SERVER_PATH="/opt/X11/bin"
-+ X_SERVER="/opt/X11/bin/Xquartz"
-+ X_CONFIG_OPTIONS="-audit 0"
-+elif test -x /usr/X11/bin/Xserver; then
- X_PATH="/usr/X11/bin"
- X_SERVER_PATH="/usr/X11/bin"
- X_SERVER="/usr/X11/bin/Xserver"
</del></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomegdmfilespatchdaemongdmsessionworkercdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff (117911 => 117912)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff 2014-03-17 01:38:55 UTC (rev 117911)
+++ users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff 2014-03-17 03:26:10 UTC (rev 117912)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- daemon/gdm-session-worker.c.orig 2013-12-18 13:49:21.000000000 -0800
-+++ daemon/gdm-session-worker.c 2013-12-18 13:52:29.000000000 -0800
-@@ -740,6 +740,33 @@
</del><ins>+--- daemon/gdm-session-worker.c.orig 2014-02-20 12:01:48.000000000 -0800
++++ daemon/gdm-session-worker.c 2014-03-16 20:16:54.000000000 -0700
+@@ -741,6 +741,33 @@
</ins><span class="cx"> return utf8;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomegdmfilespatchdaemongdmsessioncdiff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon-gdm-session.c.diff (117911 => 117912)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon-gdm-session.c.diff 2014-03-17 01:38:55 UTC (rev 117911)
+++ users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon-gdm-session.c.diff 2014-03-17 03:26:10 UTC (rev 117912)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>---- daemon/gdm-session.c.orig 2013-09-19 12:29:48.000000000 -0700
-+++ daemon/gdm-session.c 2013-11-08 21:16:43.000000000 -0800
-@@ -979,6 +979,9 @@
- #ifdef __linux__
- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_LINUX_UCRED);
- pid = (GPid) ((struct ucred *) native_credentials)->pid;
-+#elif defined (__APPLE__)
-+ native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_INVALID);
-+ pid = (GPid) (0);
- #elif defined (__FreeBSD__)
- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED);
- pid = (GPid) ((struct cmsgcred *) native_credentials)->cmcred_pid;
</del></span></pre>
</div>
</div>
</body>
</html>