[136194] trunk/dports/gnome/gdm
devans at macports.org
devans at macports.org
Mon May 11 16:06:19 PDT 2015
Revision: 136194
https://trac.macports.org/changeset/136194
Author: devans at macports.org
Date: 2015-05-11 16:06:18 -0700 (Mon, 11 May 2015)
Log Message:
-----------
gdm: update to version 3.16.1.1, reconfigure using upstream autogen.sh for intltool 0.51 compatibility.
Modified Paths:
--------------
trunk/dports/gnome/gdm/Portfile
trunk/dports/gnome/gdm/files/patch-configure.ac.diff
trunk/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff
trunk/dports/gnome/gdm/files/patch-daemon.diff
Added Paths:
-----------
trunk/dports/gnome/gdm/files/autogen.sh
Property Changed:
----------------
trunk/dports/gnome/gdm/
Property changes on: trunk/dports/gnome/gdm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/gdm:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gdm:108269-118732
/users/devans/GNOME-3/unstable/dports/gnome/gdm:114069-118152
/users/rmstonecipher/gnome/gdm:102363-103172
+ /branches/mld-qt-481/dports/gnome/gdm:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gdm:108269-136068
/users/devans/GNOME-3/unstable/dports/gnome/gdm:114069-118152
/users/rmstonecipher/gnome/gdm:102363-103172
Modified: trunk/dports/gnome/gdm/Portfile
===================================================================
--- 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)
@@ -8,7 +8,7 @@
PortGroup gobject_introspection 1.0
name gdm
-version 3.11.90
+version 3.16.1.1
license GPL-2
set branch [join [lrange [split ${version} .] 0 1] .]
description The Gnome Display Manager is a re-implementation of the well known xdm program.
@@ -23,12 +23,15 @@
use_xz yes
-checksums rmd160 98ccd8bfc99773264d73ef077c424b0518ae1df8 \
- sha256 51b54d428aeb1c55d91e992edd8c4603d6e528c888321d39cfc9d17039545482
+checksums rmd160 721bddd49ebd7ffada6823aadc32a525f0a17732 \
+ sha256 2d2409fdc0a53b080377730a7775bc3239f8584829ff327d3465def0b20433db
depends_build port:pkgconfig \
port:intltool \
- port:itstool
+ port:itstool \
+ port:autoconf \
+ port:automake \
+ port:libtool
depends_lib port:desktop-file-utils \
port:gtk3 \
@@ -50,27 +53,23 @@
depends_run port:gnome-session \
port:gnome-settings-daemon
-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
-}
-
gobject_introspection yes
use_parallel_build no
-# update m4/intltool.m4 and autoreconf
+patchfiles patch-configure.ac.diff \
+ patch-daemon.diff \
+ patch-daemon-gdm-session-worker.c.diff
-pre-configure {
- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+post-patch {
+ xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+ reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure.ac
}
-use_autoreconf yes
-autoreconf.args -fvi
+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
+configure.cmd ./autogen.sh
+
configure.args --enable-ipv6 \
--without-console-kit \
--without-plymouth \
Copied: trunk/dports/gnome/gdm/files/autogen.sh (from rev 136068, users/devans/GNOME-3/stable/dports/gnome/gdm/files/autogen.sh)
===================================================================
--- 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)
@@ -0,0 +1,28 @@
+#!/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" "$@"
Modified: trunk/dports/gnome/gdm/files/patch-configure.ac.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
--- configure.ac.orig 2014-02-21 05:24:30.000000000 -0800
+++ configure.ac 2014-03-28 08:44:04.000000000 -0700
-@@ -496,6 +496,7 @@
+@@ -504,6 +504,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)
@@ -8,7 +8,7 @@
if test "x$have_pam" = "xyes"; then
pam_appl_h="$ac_pam_includes/security/pam_appl.h"
AC_MSG_CHECKING(for const pam_message)
-@@ -1222,7 +1223,17 @@
+@@ -1239,7 +1240,17 @@
# and /usr/X11 since they often symlink to each other, and configure
# should use the more stable location (the real directory) if possible.
#
Modified: trunk/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
return utf8;
}
Modified: trunk/dports/gnome/gdm/files/patch-daemon.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
diff -ur daemon.orig/gdm-server.c daemon/gdm-server.c
---- 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
+--- 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 @@
char *auth_file;
@@ -9,7 +9,7 @@
gboolean is_initial;
};
-@@ -179,77 +180,16 @@
+@@ -179,83 +180,15 @@
return g_strdup (server->priv->display_device);
}
@@ -17,6 +17,12 @@
-gdm_server_ready (GdmServer *server)
-{
- g_debug ("GdmServer: Got USR1 from X server - emitting READY");
+-
+- gdm_run_script (GDMCONFDIR "/Init", GDM_USERNAME,
+- server->priv->display_name,
+- NULL, /* hostname */
+- server->priv->auth_file);
+-
- g_signal_emit (server, signals[READY], 0);
-}
-
@@ -27,7 +33,8 @@
-
static gboolean
-got_sigusr1 (gpointer user_data)
--{
++on_sigusr1(gpointer user_data)
+ {
- GPid pid = GPOINTER_TO_UINT (user_data);
- GSList *l;
-
@@ -52,8 +59,7 @@
- sigemptyset (&sigusr1_mask);
- sigaddset (&sigusr1_mask, SIGUSR1);
- sigprocmask (SIG_SETMASK, &sigusr1_mask, NULL);
-+on_sigusr1 (gpointer user_data)
-
+-
- g_mutex_lock (&sigusr1_thread_mutex);
- sigusr1_thread_running = TRUE;
- g_cond_signal (&sigusr1_thread_cond);
@@ -65,7 +71,8 @@
-
- if (sigwaitinfo (&sigusr1_mask, &info) == -1)
- continue;
--
++ GdmServer *server = user_data;
+
- g_idle_add (got_sigusr1, GUINT_TO_POINTER (info.si_pid));
- }
-
@@ -74,10 +81,9 @@
-
-static void
-gdm_server_launch_sigusr1_thread_if_needed (void)
- {
+-{
- static GThread *sigusr1_thread;
-+ GdmServer *server = user_data;
-
+-
- if (sigusr1_thread == NULL) {
- sigusr1_thread = g_thread_new ("gdm SIGUSR1 catcher", sigusr1_thread_main, NULL);
+ g_debug ("GdmServer: Got USR1 from X server - emitting READY");
@@ -91,28 +97,37 @@
+ return FALSE;
}
- /* We keep a connection (parent_dsp) open with the parent X server
-@@ -736,8 +676,6 @@
- g_signal_emit (server, signals [DIED], 0, num);
- }
+ static void
+@@ -709,12 +642,6 @@
+ g_object_unref (server);
+ }
+-static void
+-prune_active_servers_list (GdmServer *server)
+-{
- active_servers = g_slist_remove (active_servers, server);
+-}
-
- g_spawn_close_pid (server->priv->pid);
- server->priv->pid = -1;
-
-@@ -781,10 +719,6 @@
+ static gboolean
+ gdm_server_spawn (GdmServer *server,
+ const char *vtarg,
+@@ -752,15 +679,6 @@
g_debug ("GdmServer: Starting X server process: %s", freeme);
g_free (freeme);
- active_servers = g_slist_append (active_servers, server);
-
+- g_object_weak_ref (G_OBJECT (server),
+- (GWeakNotify)
+- prune_active_servers_list,
+- server);
+-
- gdm_server_launch_sigusr1_thread_if_needed ();
-
if (!g_spawn_async_with_pipes (NULL,
argv,
(char **)env->pdata,
-@@ -1129,11 +1063,16 @@
+@@ -1096,11 +1014,16 @@
static void
gdm_server_init (GdmServer *server)
{
@@ -129,7 +144,7 @@
}
static void
-@@ -1148,6 +1087,9 @@
+@@ -1115,6 +1038,9 @@
g_return_if_fail (server->priv != NULL);
@@ -139,10 +154,12 @@
gdm_server_stop (server);
g_free (server->priv->command);
+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 2014-03-19 14:39:09.000000000 -0700
-+++ daemon/main.c 2014-03-19 14:40:05.000000000 -0700
-@@ -295,19 +295,6 @@
+--- 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;
}
@@ -162,7 +179,7 @@
int
main (int argc,
char **argv)
-@@ -328,8 +315,6 @@
+@@ -322,8 +309,6 @@
{ NULL }
};
@@ -171,3 +188,4 @@
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
textdomain (GETTEXT_PACKAGE);
setlocale (LC_ALL, "");
+Only in daemon: main.c.orig
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150511/720a5c43/attachment-0001.html>
More information about the macports-changes
mailing list