<!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>[136194] trunk/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/136194">136194</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-05-11 16:06:18 -0700 (Mon, 11 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gdm: update to version 3.16.1.1, reconfigure using upstream autogen.sh for intltool 0.51 compatibility.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegdmPortfile">trunk/dports/gnome/gdm/Portfile</a></li>
<li><a href="#trunkdportsgnomegdmfilespatchconfigureacdiff">trunk/dports/gnome/gdm/files/patch-configure.ac.diff</a></li>
<li><a href="#trunkdportsgnomegdmfilespatchdaemongdmsessionworkercdiff">trunk/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff</a></li>
<li><a href="#trunkdportsgnomegdmfilespatchdaemondiff">trunk/dports/gnome/gdm/files/patch-daemon.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegdmfilesautogensh">trunk/dports/gnome/gdm/files/autogen.sh</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomegdm">trunk/dports/gnome/gdm/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegdm"></a>
<div class="propset"><h4>Property changes: trunk/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">/users/devans/GNOME-3/stable/dports/gnome/gdm:108269-118732
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gdm:114069-118152
</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">/users/devans/GNOME-3/stable/dports/gnome/gdm:108269-136068
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gdm:114069-118152
</span><span class="cx">/users/rmstonecipher/gnome/gdm:102363-103172
</span><a id="trunkdportsgnomegdmPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gdm/Portfile (136193 => 136194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gdm/Portfile 2015-05-11 23:06:16 UTC (rev 136193)
+++ trunk/dports/gnome/gdm/Portfile 2015-05-11 23:06:18 UTC (rev 136194)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> PortGroup gobject_introspection 1.0
</span><span class="cx">
</span><span class="cx"> name gdm
</span><del>-version 3.11.90
</del><ins>+version 3.16.1.1
</ins><span class="cx"> license GPL-2
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description The Gnome Display Manager is a re-implementation of the well known xdm program.
</span><span class="lines">@@ -23,12 +23,15 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 98ccd8bfc99773264d73ef077c424b0518ae1df8 \
- sha256 51b54d428aeb1c55d91e992edd8c4603d6e528c888321d39cfc9d17039545482
</del><ins>+checksums rmd160 721bddd49ebd7ffada6823aadc32a525f0a17732 \
+ sha256 2d2409fdc0a53b080377730a7775bc3239f8584829ff327d3465def0b20433db
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><del>- port:itstool
</del><ins>+ port:itstool \
+ 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:gtk3 \
</span><span class="lines">@@ -50,27 +53,23 @@
</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-daemon.diff \
- patch-daemon-gdm-session-worker.c.diff \
- patch-configure.ac.diff
-
-post-patch {
- reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure.ac
-}
-
</del><span class="cx"> gobject_introspection yes
</span><span class="cx">
</span><span class="cx"> use_parallel_build no
</span><span class="cx">
</span><del>-# update m4/intltool.m4 and autoreconf
</del><ins>+patchfiles patch-configure.ac.diff \
+ patch-daemon.diff \
+ patch-daemon-gdm-session-worker.c.diff
</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}
+ reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure.ac
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-use_autoreconf yes
-autoreconf.args -fvi
</del><ins>+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</ins><span class="cx">
</span><ins>+configure.cmd ./autogen.sh
+
</ins><span class="cx"> configure.args --enable-ipv6 \
</span><span class="cx"> --without-console-kit \
</span><span class="cx"> --without-plymouth \
</span></span></pre></div>
<a id="trunkdportsgnomegdmfilesautogenshfromrev136068usersdevansGNOME3stabledportsgnomegdmfilesautogensh"></a>
<div class="copfile"><h4>Copied: trunk/dports/gnome/gdm/files/autogen.sh (from rev 136068, users/devans/GNOME-3/stable/dports/gnome/gdm/files/autogen.sh) (0 => 136194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gdm/files/autogen.sh (rev 0)
+++ trunk/dports/gnome/gdm/files/autogen.sh 2015-05-11 23:06:18 UTC (rev 136194)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+
+olddir=`pwd`
+cd $srcdir
+
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+ echo "*** No autoreconf found, please intall it ***"
+ exit 1
+fi
+
+INTLTOOLIZE=`which intltoolize`
+if test -z $INTLTOOLIZE; then
+ echo "*** No intltoolize found, please install the intltool package ***"
+ exit 1
+fi
+
+set -e
+
+intltoolize --force --copy --automake
+autoreconf --force --install --verbose
+
+cd $olddir
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
</ins></span></pre></div>
<a id="trunkdportsgnomegdmfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gdm/files/patch-configure.ac.diff (136193 => 136194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gdm/files/patch-configure.ac.diff 2015-05-11 23:06:16 UTC (rev 136193)
+++ trunk/dports/gnome/gdm/files/patch-configure.ac.diff 2015-05-11 23:06:18 UTC (rev 136194)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- configure.ac.orig 2014-02-21 05:24:30.000000000 -0800
</span><span class="cx"> +++ configure.ac 2014-03-28 08:44:04.000000000 -0700
</span><del>-@@ -496,6 +496,7 @@
</del><ins>+@@ -504,6 +504,7 @@
</ins><span class="cx"> AC_CHECK_LIB(pam, pam_syslog, [AC_DEFINE(HAVE_PAM_SYSLOG, [], [Define to 1 if you have the pam_syslog function])])
</span><span class="cx">
</span><span class="cx"> dnl test whether struct pam_message is const (Linux) or not (Sun)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> if test "x$have_pam" = "xyes"; then
</span><span class="cx"> pam_appl_h="$ac_pam_includes/security/pam_appl.h"
</span><span class="cx"> AC_MSG_CHECKING(for const pam_message)
</span><del>-@@ -1222,7 +1223,17 @@
</del><ins>+@@ -1239,7 +1240,17 @@
</ins><span class="cx"> # and /usr/X11 since they often symlink to each other, and configure
</span><span class="cx"> # should use the more stable location (the real directory) if possible.
</span><span class="cx"> #
</span></span></pre></div>
<a id="trunkdportsgnomegdmfilespatchdaemongdmsessionworkercdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff (136193 => 136194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff 2015-05-11 23:06:16 UTC (rev 136193)
+++ trunk/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff 2015-05-11 23:06:18 UTC (rev 136194)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- 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 @@
</del><ins>+--- daemon/gdm-session-worker.c.orig 2015-04-02 06:52:41.000000000 -0700
++++ daemon/gdm-session-worker.c 2015-05-02 12:56:03.000000000 -0700
+@@ -754,6 +754,33 @@
</ins><span class="cx"> return utf8;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgnomegdmfilespatchdaemondiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gdm/files/patch-daemon.diff (136193 => 136194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gdm/files/patch-daemon.diff 2015-05-11 23:06:16 UTC (rev 136193)
+++ trunk/dports/gnome/gdm/files/patch-daemon.diff 2015-05-11 23:06:18 UTC (rev 136194)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> diff -ur daemon.orig/gdm-server.c daemon/gdm-server.c
</span><del>---- daemon.orig/gdm-server.c 2014-03-19 14:39:09.000000000 -0700
-+++ daemon/gdm-server.c 2014-03-19 14:39:56.000000000 -0700
</del><ins>+--- daemon.orig/gdm-server.c 2015-04-02 06:52:39.000000000 -0700
++++ daemon/gdm-server.c 2015-05-04 12:11:56.000000000 -0700
</ins><span class="cx"> @@ -94,6 +94,7 @@
</span><span class="cx"> char *auth_file;
</span><span class="cx">
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> gboolean is_initial;
</span><span class="cx"> };
</span><del>-@@ -179,77 +180,16 @@
</del><ins>+@@ -179,83 +180,15 @@
</ins><span class="cx"> return g_strdup (server->priv->display_device);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -17,6 +17,12 @@
</span><span class="cx"> -gdm_server_ready (GdmServer *server)
</span><span class="cx"> -{
</span><span class="cx"> - g_debug ("GdmServer: Got USR1 from X server - emitting READY");
</span><ins>+-
+- gdm_run_script (GDMCONFDIR "/Init", GDM_USERNAME,
+- server->priv->display_name,
+- NULL, /* hostname */
+- server->priv->auth_file);
+-
</ins><span class="cx"> - g_signal_emit (server, signals[READY], 0);
</span><span class="cx"> -}
</span><span class="cx"> -
</span><span class="lines">@@ -27,7 +33,8 @@
</span><span class="cx"> -
</span><span class="cx"> static gboolean
</span><span class="cx"> -got_sigusr1 (gpointer user_data)
</span><del>--{
</del><ins>++on_sigusr1(gpointer user_data)
+ {
</ins><span class="cx"> - GPid pid = GPOINTER_TO_UINT (user_data);
</span><span class="cx"> - GSList *l;
</span><span class="cx"> -
</span><span class="lines">@@ -52,8 +59,7 @@
</span><span class="cx"> - sigemptyset (&sigusr1_mask);
</span><span class="cx"> - sigaddset (&sigusr1_mask, SIGUSR1);
</span><span class="cx"> - sigprocmask (SIG_SETMASK, &sigusr1_mask, NULL);
</span><del>-+on_sigusr1 (gpointer user_data)
-
</del><ins>+-
</ins><span class="cx"> - g_mutex_lock (&sigusr1_thread_mutex);
</span><span class="cx"> - sigusr1_thread_running = TRUE;
</span><span class="cx"> - g_cond_signal (&sigusr1_thread_cond);
</span><span class="lines">@@ -65,7 +71,8 @@
</span><span class="cx"> -
</span><span class="cx"> - if (sigwaitinfo (&sigusr1_mask, &info) == -1)
</span><span class="cx"> - continue;
</span><del>--
</del><ins>++ GdmServer *server = user_data;
+
</ins><span class="cx"> - g_idle_add (got_sigusr1, GUINT_TO_POINTER (info.si_pid));
</span><span class="cx"> - }
</span><span class="cx"> -
</span><span class="lines">@@ -74,10 +81,9 @@
</span><span class="cx"> -
</span><span class="cx"> -static void
</span><span class="cx"> -gdm_server_launch_sigusr1_thread_if_needed (void)
</span><del>- {
</del><ins>+-{
</ins><span class="cx"> - static GThread *sigusr1_thread;
</span><del>-+ GdmServer *server = user_data;
-
</del><ins>+-
</ins><span class="cx"> - if (sigusr1_thread == NULL) {
</span><span class="cx"> - sigusr1_thread = g_thread_new ("gdm SIGUSR1 catcher", sigusr1_thread_main, NULL);
</span><span class="cx"> + g_debug ("GdmServer: Got USR1 from X server - emitting READY");
</span><span class="lines">@@ -91,28 +97,37 @@
</span><span class="cx"> + return FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* We keep a connection (parent_dsp) open with the parent X server
-@@ -736,8 +676,6 @@
- g_signal_emit (server, signals [DIED], 0, num);
- }
</del><ins>+ static void
+@@ -709,12 +642,6 @@
+ g_object_unref (server);
+ }
</ins><span class="cx">
</span><ins>+-static void
+-prune_active_servers_list (GdmServer *server)
+-{
</ins><span class="cx"> - active_servers = g_slist_remove (active_servers, server);
</span><ins>+-}
</ins><span class="cx"> -
</span><del>- g_spawn_close_pid (server->priv->pid);
- server->priv->pid = -1;
-
-@@ -781,10 +719,6 @@
</del><ins>+ static gboolean
+ gdm_server_spawn (GdmServer *server,
+ const char *vtarg,
+@@ -752,15 +679,6 @@
</ins><span class="cx"> g_debug ("GdmServer: Starting X server process: %s", freeme);
</span><span class="cx"> g_free (freeme);
</span><span class="cx">
</span><span class="cx"> - active_servers = g_slist_append (active_servers, server);
</span><span class="cx"> -
</span><ins>+- g_object_weak_ref (G_OBJECT (server),
+- (GWeakNotify)
+- prune_active_servers_list,
+- server);
+-
</ins><span class="cx"> - gdm_server_launch_sigusr1_thread_if_needed ();
</span><span class="cx"> -
</span><span class="cx"> if (!g_spawn_async_with_pipes (NULL,
</span><span class="cx"> argv,
</span><span class="cx"> (char **)env->pdata,
</span><del>-@@ -1129,11 +1063,16 @@
</del><ins>+@@ -1096,11 +1014,16 @@
</ins><span class="cx"> static void
</span><span class="cx"> gdm_server_init (GdmServer *server)
</span><span class="cx"> {
</span><span class="lines">@@ -129,7 +144,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-@@ -1148,6 +1087,9 @@
</del><ins>+@@ -1115,6 +1038,9 @@
</ins><span class="cx">
</span><span class="cx"> g_return_if_fail (server->priv != NULL);
</span><span class="cx">
</span><span class="lines">@@ -139,10 +154,12 @@
</span><span class="cx"> gdm_server_stop (server);
</span><span class="cx">
</span><span class="cx"> g_free (server->priv->command);
</span><ins>+Only in daemon: gdm-server.c.orig
+Only in daemon: gdm-server.c.rej
</ins><span class="cx"> diff -ur daemon.orig/main.c daemon/main.c
</span><del>---- daemon.orig/main.c 2014-03-19 14:39:09.000000000 -0700
-+++ daemon/main.c 2014-03-19 14:40:05.000000000 -0700
-@@ -295,19 +295,6 @@
</del><ins>+--- daemon.orig/main.c 2015-04-02 06:52:42.000000000 -0700
++++ daemon/main.c 2015-05-04 11:58:58.000000000 -0700
+@@ -289,19 +289,6 @@
</ins><span class="cx"> return debug;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -162,7 +179,7 @@
</span><span class="cx"> int
</span><span class="cx"> main (int argc,
</span><span class="cx"> char **argv)
</span><del>-@@ -328,8 +315,6 @@
</del><ins>+@@ -322,8 +309,6 @@
</ins><span class="cx"> { NULL }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -171,3 +188,4 @@
</span><span class="cx"> bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
</span><span class="cx"> textdomain (GETTEXT_PACKAGE);
</span><span class="cx"> setlocale (LC_ALL, "");
</span><ins>+Only in daemon: main.c.orig
</ins></span></pre>
</div>
</div>
</body>
</html>