[71642] trunk/dports/gnome/gdm
devans at macports.org
devans at macports.org
Sat Sep 18 13:36:34 PDT 2010
Revision: 71642
http://trac.macports.org/changeset/71642
Author: devans at macports.org
Date: 2010-09-18 13:36:30 -0700 (Sat, 18 Sep 2010)
Log Message:
-----------
gdm: update to version 2.30.5, dependencies, configuration, not universal.
Modified Paths:
--------------
trunk/dports/gnome/gdm/Portfile
trunk/dports/gnome/gdm/files/fgetpwent.diff
trunk/dports/gnome/gdm/files/patch-configure.diff
trunk/dports/gnome/gdm/files/patch-fink-gdm-modified.diff
Removed Paths:
-------------
trunk/dports/gnome/gdm/files/patch_config.h.in
Modified: trunk/dports/gnome/gdm/Portfile
===================================================================
--- trunk/dports/gnome/gdm/Portfile 2010-09-18 19:29:13 UTC (rev 71641)
+++ trunk/dports/gnome/gdm/Portfile 2010-09-18 20:36:30 UTC (rev 71642)
@@ -7,7 +7,7 @@
PortSystem 1.0
name gdm
-version 2.26.1
+version 2.30.5
set branch [join [lrange [split ${version} .] 0 1] .]
description The Gnome Display Manager is a re-implementation of the well known xdm program.
long_description \
@@ -18,23 +18,32 @@
platforms darwin
homepage http://www.gnome.org/
master_sites gnome:sources/${name}/${branch}/
-checksums md5 c2c15f8b741962f278fa7e790aaa9a2b \
- sha1 7c0b665c1235b903b58e5bfff8678e435529ff6c \
- rmd160 abba568b616d5837f6aeedf3d2759a349df66c9e
-depends_build port:p5-xml-parser \
- port:pkgconfig \
+checksums md5 dfafa14306e5ea091ea775f1445d227e \
+ sha1 c19cc6a6dd796bf5a0bd4a5702b47d25b238a209 \
+ rmd160 fe781bc67fdddfb8e447823425ac12c452e44c9e
+
+depends_build port:pkgconfig \
+ port:intltool \
port:gnome-doc-utils
-depends_lib port:gnome-panel \
- port:libxklavier
+depends_lib port:gconf \
+ port:libcanberra \
+ port:libxklavier \
+ port:upower \
+ port:gnome-panel
+depends_run port:gnome-session \
+ port:gnome-settings-daemon \
+ port:at-spi
+
use_bzip2 yes
patchfiles patch-fink-gdm-modified.diff \
patch-configure.diff \
patch-daemon-gdm-display-access-file.c.diff \
fgetpwent.diff
+
if {${os.major} <= 9 && ${os.platform} == "darwin"} {
patchfiles-append pam_location.diff
}
@@ -43,14 +52,21 @@
reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure
}
-configure.args --mandir=${prefix}/share/man \
- --x-includes=${prefix}/include \
+configure.args --x-includes=${prefix}/include \
--x-libraries=${prefix}/lib \
+ --without-console-kit \
--without-selinux \
+ --disable-schemas-install \
--disable-scrollkeeper
configure.ldflags-append "-lresolv"
+#
+# gnome-panel is not universal
+#
+
+universal_variant no
+
startupitem.create yes
startupitem.name gdm
startupitem.init XDG_DATA_DIRS=${prefix}/share
@@ -70,6 +86,9 @@
post-activate {
system "scrollkeeper-update"
+ system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
+ gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
+ system "${prefix}/bin/update-desktop-database -q ${prefix}/share/applications; true"
file mkdir ${prefix}/var/gdm
file attributes ${prefix}/var/gdm -owner gdm -group gdm
}
Modified: trunk/dports/gnome/gdm/files/fgetpwent.diff
===================================================================
--- trunk/dports/gnome/gdm/files/fgetpwent.diff 2010-09-18 19:29:13 UTC (rev 71641)
+++ trunk/dports/gnome/gdm/files/fgetpwent.diff 2010-09-18 20:36:30 UTC (rev 71642)
@@ -1,14 +1,16 @@
---- gui/simple-greeter/gdm-user-manager.c.orig 2008-11-19 09:38:43.000000000 +1100
-+++ gui/simple-greeter/gdm-user-manager.c 2009-01-17 02:26:07.000000000 +1100
-@@ -1274,17 +1274,11 @@
- GSList *old_users;
- GSList *new_users;
- GSList *list;
-- FILE *fp;
+--- gui/simple-greeter/gdm-user-manager.c.orig 2010-08-11 10:40:07.000000000 -0700
++++ gui/simple-greeter/gdm-user-manager.c 2010-09-18 11:24:59.000000000 -0700
+@@ -1703,7 +1703,6 @@
+ GSList **added_users,
+ GSList **removed_users)
+ {
+- FILE *fp;
+ GHashTableIter iter;
+ GHashTable *new_users_by_name;
+ GdmUser *user;
+@@ -1715,11 +1714,6 @@
+ g_object_unref);
- old_users = NULL;
- new_users = NULL;
-
errno = 0;
- fp = fopen (PATH_PASSWD, "r");
- if (fp == NULL) {
@@ -16,23 +18,26 @@
- goto out;
- }
- g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users);
- g_slist_foreach (old_users, (GFunc) g_object_ref, NULL);
-@@ -1297,7 +1291,7 @@
- }
- }
+ /* Make sure we keep users who are logged in no matter what. */
+ g_hash_table_iter_init (&iter, current_users_by_name);
+@@ -1771,9 +1765,9 @@
-- for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) {
-+ for (pwent = getpwent(); pwent != NULL; pwent = getpwent()) {
- GdmUser *user;
+ g_debug ("GdmUserManager: include_all is TRUE");
- user = NULL;
-@@ -1360,7 +1354,7 @@
+- for (pwent = fgetpwent (fp);
++ for (pwent = getpwent ();
+ pwent != NULL;
+- pwent = fgetpwent (fp)) {
++ pwent = getpwent ()) {
+
+ /* Skip users below MinimalUID... */
+ if (pwent->pw_uid < DEFAULT_MINIMAL_UID) {
+@@ -1848,7 +1842,7 @@
out:
/* Cleanup */
- fclose (fp);
+ setpwent();
- g_slist_foreach (new_users, (GFunc) g_object_thaw_notify, NULL);
- g_slist_foreach (new_users, (GFunc) g_object_unref, NULL);
+ g_hash_table_iter_init (&iter, new_users_by_name);
+ while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &user)) {
Modified: trunk/dports/gnome/gdm/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/gdm/files/patch-configure.diff 2010-09-18 19:29:13 UTC (rev 71641)
+++ trunk/dports/gnome/gdm/files/patch-configure.diff 2010-09-18 20:36:30 UTC (rev 71642)
@@ -1,6 +1,6 @@
---- configure.orig 2009-04-14 07:21:25.000000000 -0700
-+++ configure 2009-04-29 13:58:55.000000000 -0700
-@@ -26751,6 +26751,7 @@
+--- configure.orig 2010-08-11 10:40:14.000000000 -0700
++++ configure 2010-09-18 11:29:15.000000000 -0700
+@@ -27115,6 +27115,7 @@
fi
@@ -8,15 +8,15 @@
if test "x$have_pam" = "xyes"; then
pam_appl_h="$ac_pam_includes/security/pam_appl.h"
{ $as_echo "$as_me:$LINENO: checking for const pam_message" >&5
-@@ -31182,7 +31183,12 @@
+@@ -31847,7 +31848,12 @@
# 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"
++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"
+ X_CONFIG_OPTIONS="-audit 0"
+elif test -x /usr/X11/bin/Xserver; then
X_PATH="/usr/X11/bin"
Modified: trunk/dports/gnome/gdm/files/patch-fink-gdm-modified.diff
===================================================================
--- trunk/dports/gnome/gdm/files/patch-fink-gdm-modified.diff 2010-09-18 19:29:13 UTC (rev 71641)
+++ trunk/dports/gnome/gdm/files/patch-fink-gdm-modified.diff 2010-09-18 20:36:30 UTC (rev 71642)
@@ -1,55 +1,6 @@
-diff -Nurd -x'*~' gdm-2.24.1.orig/common/gdm-signal-handler.c gdm-2.24.1/common/gdm-signal-handler.c
---- common/gdm-signal-handler.c 2008-11-18 17:38:43.000000000 -0500
-+++ common/gdm-signal-handler.c 2009-01-20 16:53:43.000000000 -0500
-@@ -27,7 +27,9 @@
- #include <unistd.h>
- #include <string.h>
- #include <signal.h>
-+#if HAVE_EXECINFO_H
- #include <execinfo.h>
-+#endif
- #include <syslog.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
-@@ -160,6 +162,7 @@
- static void
- fallback_get_backtrace (void)
- {
-+#ifdef HAVE_EXECINFO_H
- void * frames[64];
- size_t size;
- char ** strings;
-@@ -173,9 +176,10 @@
- }
- free (strings);
- syslog (LOG_CRIT, "******************* END **********************************");
-- } else {
-- g_warning ("GDM crashed, but symbols couldn't be retrieved.");
-+ return;
- }
-+#endif
-+ g_warning ("GDM crashed, but symbols couldn't be retrieved.");
- }
-
-
-diff -Nurd -x'*~' gdm-2.24.1.orig/daemon/gdm-session-record.c gdm-2.24.1/daemon/gdm-session-record.c
---- daemon/gdm-session-record.c 2008-11-18 17:38:44.000000000 -0500
-+++ daemon/gdm-session-record.c 2009-01-20 16:29:30.000000000 -0500
-@@ -322,8 +322,10 @@
- #elif defined(HAVE_UT_UT_TIME)
- u->ut_time = session_record.ut_time;
- #endif
-+#ifdef HAVE_UT_UT_EXIT_E_TERMINATION
- u->ut_exit.e_termination = 0;
- u->ut_exit.e_exit = 0;
-+#endif
-
- pututxline (u);
-
-diff -Nurd -x'*~' gdm-2.24.1.orig/daemon/gdm-xdmcp-display-factory.c gdm-2.24.1/daemon/gdm-xdmcp-display-factory.c
---- daemon/gdm-xdmcp-display-factory.c 2008-11-18 17:38:44.000000000 -0500
-+++ daemon/gdm-xdmcp-display-factory.c 2009-01-20 22:48:05.000000000 -0500
-@@ -368,7 +368,7 @@
+--- daemon/gdm-xdmcp-display-factory.c.orig 2010-08-11 07:19:44.000000000 -0700
++++ daemon/gdm-xdmcp-display-factory.c 2010-09-18 11:29:15.000000000 -0700
+@@ -373,7 +373,7 @@
if (ai->ai_flags & AI_NUMERICHOST) {
g_string_append (str, "numhost ");
}
@@ -58,36 +9,3 @@
g_string_append (str, "numserv ");
}
if (ai->ai_flags & AI_V4MAPPED) {
-@@ -600,20 +597,22 @@
- return TRUE;
- }
-
-+#ifdef HAVE_TCPWRAPPERS
-+
-+/*
-+ * Avoids a warning, my tcpd.h file doesn't include this prototype, even
-+ * though the library does include the function and the manpage mentions it
-+ */
-+extern int hosts_ctl (char *daemon,
-+ char *client_name,
-+ char *client_addr,
-+ char *client_user);
-+#endif
-+
- static gboolean
- gdm_xdmcp_host_allow (GdmAddress *address)
- {
- #ifdef HAVE_TCPWRAPPERS
--
-- /*
-- * Avoids a warning, my tcpd.h file doesn't include this prototype, even
-- * though the library does include the function and the manpage mentions it
-- */
-- extern int hosts_ctl (char *daemon,
-- char *client_name,
-- char *client_addr,
-- char *client_user);
--
- char *client;
- char *host;
- gboolean ret;
Deleted: trunk/dports/gnome/gdm/files/patch_config.h.in
===================================================================
--- trunk/dports/gnome/gdm/files/patch_config.h.in 2010-09-18 19:29:13 UTC (rev 71641)
+++ trunk/dports/gnome/gdm/files/patch_config.h.in 2010-09-18 20:36:30 UTC (rev 71642)
@@ -1,9 +0,0 @@
---- config.h.in.org Tue Sep 28 21:08:36 2004
-+++ config.h.in Tue Sep 28 21:09:07 2004
-@@ -187,6 +187,3 @@
-
- /* Define to 1 if the X Window System is missing or not being used. */
- #undef X_DISPLAY_MISSING
--
--/* Define to `size_t' if <sys/types.h> does not define. */
--#undef socklen_t
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100918/91d4e123/attachment-0001.html>
More information about the macports-changes
mailing list