<!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>[150851] 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/150851">150851</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-07-29 21:11:56 -0700 (Fri, 29 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/unstable: gdm, update to version 3.21.4, configure fails due to want of libsystemd.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3unstabledportsgnomegdmPortfile">users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile</a></li>
<li><a href="#usersdevansGNOME3unstabledportsgnomegdmfilespatchconfigureacdiff">users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.ac.diff</a></li>
<li><a href="#usersdevansGNOME3unstabledportsgnomegdmfilespatchdaemondiff">users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3unstabledportsgnomegdmPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile (150850 => 150851)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile 2016-07-30 04:09:51 UTC (rev 150850)
+++ users/devans/GNOME-3/unstable/dports/gnome/gdm/Portfile 2016-07-30 04:11:56 UTC (rev 150851)
</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.17.2
</del><ins>+version 3.21.4
</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">@@ -22,8 +22,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 e4400a3c51aef042856f8060e66e1c023f46b224 \
- sha256 ad6182d188451bbd8c48f12a3d99df2e2d03fedb18beaf003ec047bea5e5661d
</del><ins>+checksums rmd160 7fbb6c666a5868cdf50be0d87e44d63987028259 \
+ sha256 f42d7629d6b6689b6c6aad044622b7518a02479522610a45f3effe4d3f7fb8d3
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomegdmfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.ac.diff (150850 => 150851)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.ac.diff 2016-07-30 04:09:51 UTC (rev 150850)
+++ users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-configure.ac.diff 2016-07-30 04:11:56 UTC (rev 150851)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.ac.orig 2014-02-21 05:24:30.000000000 -0800
-+++ configure.ac 2014-03-28 08:44:04.000000000 -0700
-@@ -510,6 +510,7 @@
</del><ins>+--- configure.ac.orig 2016-06-20 11:19:45.000000000 -0700
++++ configure.ac 2016-06-23 14:31:03.000000000 -0700
+@@ -501,6 +501,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,15 +8,15 @@
</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>-@@ -1245,7 +1246,17 @@
</del><ins>+@@ -1182,7 +1183,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 class="cx"> -if test -x /usr/X11/bin/Xserver; then
</span><del>-+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"
</del><ins>++if test -x /opt/local/bin/Xquartz; then
++ X_PATH="/opt/local/bin"
++ X_SERVER_PATH="/opt/local/bin"
++ X_SERVER="/opt/local/bin/Xquartz"
</ins><span class="cx"> + X_CONFIG_OPTIONS="-audit 0"
</span><span class="cx"> +elif test -x /opt/X11/bin/Xquartz; then
</span><span class="cx"> + X_PATH="/opt/X11/bin"
</span></span></pre></div>
<a id="usersdevansGNOME3unstabledportsgnomegdmfilespatchdaemondiff"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon.diff (150850 => 150851)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon.diff 2016-07-30 04:09:51 UTC (rev 150850)
+++ users/devans/GNOME-3/unstable/dports/gnome/gdm/files/patch-daemon.diff 2016-07-30 04:11:56 UTC (rev 150851)
</span><span class="lines">@@ -1,7 +1,6 @@
</span><del>-diff -ur daemon.orig/gdm-server.c daemon/gdm-server.c
---- 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
-@@ -94,6 +94,7 @@
</del><ins>+--- daemon/gdm-server.c.orig 2016-04-26 11:43:59.000000000 -0700
++++ daemon/gdm-server.c 2016-06-23 14:29:43.000000000 -0700
+@@ -92,6 +92,7 @@
</ins><span class="cx"> char *auth_file;
</span><span class="cx">
</span><span class="cx"> guint child_watch_id;
</span><span class="lines">@@ -9,8 +8,8 @@
</span><span class="cx">
</span><span class="cx"> gboolean is_initial;
</span><span class="cx"> };
</span><del>-@@ -179,83 +180,15 @@
- return g_strdup (server->priv->display_device);
</del><ins>+@@ -129,83 +130,15 @@
+ return NULL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> -static void
</span><span class="lines">@@ -33,8 +32,7 @@
</span><span class="cx"> -
</span><span class="cx"> static gboolean
</span><span class="cx"> -got_sigusr1 (gpointer user_data)
</span><del>-+on_sigusr1(gpointer user_data)
- {
</del><ins>+-{
</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">@@ -71,8 +69,7 @@
</span><span class="cx"> -
</span><span class="cx"> - if (sigwaitinfo (&sigusr1_mask, &info) == -1)
</span><span class="cx"> - continue;
</span><del>-+ GdmServer *server = user_data;
-
</del><ins>+-
</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">@@ -81,9 +78,11 @@
</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>++on_sigusr1(gpointer user_data)
+ {
</ins><span class="cx"> - static GThread *sigusr1_thread;
</span><del>--
</del><ins>++ GdmServer *server = user_data;
+
</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">@@ -98,7 +97,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-@@ -709,12 +642,6 @@
</del><ins>+@@ -663,12 +596,6 @@
</ins><span class="cx"> g_object_unref (server);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -111,7 +110,7 @@
</span><span class="cx"> static gboolean
</span><span class="cx"> gdm_server_spawn (GdmServer *server,
</span><span class="cx"> const char *vtarg,
</span><del>-@@ -752,15 +679,6 @@
</del><ins>+@@ -706,15 +633,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="lines">@@ -127,7 +126,7 @@
</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>-@@ -1096,11 +1014,16 @@
</del><ins>+@@ -1050,11 +968,16 @@
</ins><span class="cx"> static void
</span><span class="cx"> gdm_server_init (GdmServer *server)
</span><span class="cx"> {
</span><span class="lines">@@ -144,7 +143,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-@@ -1115,6 +1038,9 @@
</del><ins>+@@ -1069,6 +992,9 @@
</ins><span class="cx">
</span><span class="cx"> g_return_if_fail (server->priv != NULL);
</span><span class="cx">
</span><span class="lines">@@ -154,38 +153,3 @@
</span><span class="cx"> gdm_server_stop (server);
</span><span class="cx">
</span><span class="cx"> g_free (server->priv->command);
</span><del>-Only in daemon: gdm-server.c.orig
-Only in daemon: gdm-server.c.rej
-diff -ur daemon.orig/main.c daemon/main.c
---- 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 @@
- return debug;
- }
-
--/* SIGUSR1 is used by the X server to tell us that we're ready, so
-- * block it. We'll unblock it in the worker thread in gdm-server.c
-- */
--static void
--block_sigusr1 (void)
--{
-- sigset_t mask;
--
-- sigemptyset (&mask);
-- sigaddset (&mask, SIGUSR1);
-- sigprocmask (SIG_BLOCK, &mask, NULL);
--}
--
- int
- main (int argc,
- char **argv)
-@@ -322,8 +309,6 @@
- { NULL }
- };
-
-- block_sigusr1 ();
--
- bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
- textdomain (GETTEXT_PACKAGE);
- setlocale (LC_ALL, "");
-Only in daemon: main.c.orig
</del></span></pre>
</div>
</div>
</body>
</html>