[113333] trunk/dports/gnome/gdm
devans at macports.org
devans at macports.org
Wed Nov 13 09:49:19 PST 2013
Revision: 113333
https://trac.macports.org/changeset/113333
Author: devans at macports.org
Date: 2013-11-13 09:49:19 -0800 (Wed, 13 Nov 2013)
Log Message:
-----------
gdm: merge version 3.10.0.1 from GNOME-3 test branch.
Modified Paths:
--------------
trunk/dports/gnome/gdm/Portfile
trunk/dports/gnome/gdm/files/patch-configure.diff
Added Paths:
-----------
trunk/dports/gnome/gdm/files/patch-daemon-gdm-session.c.diff
Removed Paths:
-------------
trunk/dports/gnome/gdm/files/fgetpwent.diff
trunk/dports/gnome/gdm/files/pam_location.diff
trunk/dports/gnome/gdm/files/patch-daemon-gdm-display-access-file.c.diff
trunk/dports/gnome/gdm/files/patch-fink-gdm-modified.diff
Property Changed:
----------------
trunk/dports/gnome/gdm/
Property changes on: trunk/dports/gnome/gdm
___________________________________________________________________
Added: 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-113174
/users/rmstonecipher/gnome/gdm:102363-103172
Modified: trunk/dports/gnome/gdm/Portfile
===================================================================
--- trunk/dports/gnome/gdm/Portfile 2013-11-13 17:20:56 UTC (rev 113332)
+++ trunk/dports/gnome/gdm/Portfile 2013-11-13 17:49:19 UTC (rev 113333)
@@ -7,59 +7,63 @@
PortSystem 1.0
name gdm
-version 2.32.1
+version 3.10.0.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.
long_description \
The Gnome Display Manager is a re-implementation of the well \
known xdm program. It displays a X11-based graphical login screen.
-maintainers devans openmaintainer
+maintainers nomaintainer
categories gnome
platforms darwin
homepage http://www.gnome.org/
master_sites gnome:sources/${name}/${branch}/
-use_bzip2 yes
+use_xz yes
-checksums rmd160 70526a3ddec3ff8a1313243641bf807a2218f3ae \
- sha256 7ba9cb2a8efb9856994467b14e4837a281fcf6d9dc9a267ea38a9aae1ec55abc
+checksums rmd160 3e4839d56165e2f68451374d89d70986f5e247a1 \
+ sha256 549a42009af9c79a4e07632e405dcb71ba2e876e766cff02471511ad641b6ae7
depends_build port:pkgconfig \
port:intltool \
- port:gnome-doc-utils
+ port:itstool
-depends_lib port:gconf \
+depends_lib port:desktop-file-utils \
+ port:gtk3 \
+ port:accountsservice \
+ port:nss \
port:libcanberra \
- port:libxklavier \
- port:libpanel-applet2
+ port:upower \
+ port:fontconfig \
+ port:gobject-introspection \
+ port:iso-codes \
+ port:xorg-libX11 \
+ port:xorg-libXau \
+ port:xorg-libXrandr \
+ port:xorg-libXdmcp \
+ port:xorg-libXi \
+ port:xorg-libXinerama \
+ port:xorg-libXevie
depends_run port:gnome-session \
port:gnome-settings-daemon
-
-patchfiles patch-fink-gdm-modified.diff \
- patch-configure.diff \
- patch-daemon-gdm-display-access-file.c.diff \
- fgetpwent.diff
+
+patchfiles patch-configure.diff \
+ patch-daemon-gdm-session.c.diff
-if {${os.major} <= 9 && ${os.platform} == "darwin"} {
- patchfiles-append pam_location.diff
-}
-
post-patch {
reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure
file attributes ${worksrcpath}/install-sh -permissions +x
}
-configure.args --x-includes=${prefix}/include \
- --x-libraries=${prefix}/lib \
+use_parallel_build no
+
+configure.args --enable-ipv6 \
--without-console-kit \
- --without-selinux \
- --disable-schemas-install \
- --disable-scrollkeeper
+ --disable-schemas-compile \
+ --disable-silent-rules
-configure.ldflags-append "-lresolv"
-
startupitem.create yes
startupitem.name gdm
startupitem.init XDG_DATA_DIRS=${prefix}/share
@@ -72,17 +76,17 @@
xinstall ${filespath}/macports-gdm-util ${destroot}${prefix}/bin
}
+universal_variant no
+
pre-activate {
addgroup gdm
adduser gdm gid=[existsgroup gdm] realname=GNOME\ Display\ Manager
}
post-activate {
- system "scrollkeeper-update"
- system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
- 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 ${prefix}/share/applications"
+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
file mkdir ${prefix}/var/gdm
file attributes ${prefix}/var/gdm -owner gdm -group gdm
}
Deleted: trunk/dports/gnome/gdm/files/fgetpwent.diff
===================================================================
--- trunk/dports/gnome/gdm/files/fgetpwent.diff 2013-11-13 17:20:56 UTC (rev 113332)
+++ trunk/dports/gnome/gdm/files/fgetpwent.diff 2013-11-13 17:49:19 UTC (rev 113333)
@@ -1,43 +0,0 @@
---- gui/simple-greeter/gdm-user-manager.c.orig 2011-03-28 09:48:50.000000000 -0700
-+++ gui/simple-greeter/gdm-user-manager.c 2013-07-06 14:00:57.000000000 -0700
-@@ -2161,7 +2161,6 @@
- GSList **added_users,
- GSList **removed_users)
- {
-- FILE *fp;
- GHashTableIter iter;
- GHashTable *new_users_by_name;
- GdmUser *user;
-@@ -2173,11 +2172,6 @@
- g_object_unref);
-
- errno = 0;
-- fp = fopen (PATH_PASSWD, "r");
-- if (fp == NULL) {
-- g_warning ("Unable to open %s: %s", PATH_PASSWD, g_strerror (errno));
-- goto out;
-- }
-
- /* Make sure we keep users who are logged in no matter what. */
- g_hash_table_iter_init (&iter, current_users_by_name);
-@@ -2229,9 +2223,9 @@
-
- g_debug ("GdmUserManager: include_all is TRUE");
-
-- for (pwent = fgetpwent (fp);
-+ for (pwent = getpwent ();
- pwent != NULL;
-- pwent = fgetpwent (fp)) {
-+ pwent = getpwent ()) {
-
- /* Skip users below MinimalUID... */
- if (pwent->pw_uid < FALLBACK_MINIMAL_UID) {
-@@ -2306,7 +2300,7 @@
- out:
- /* Cleanup */
-
-- fclose (fp);
-+ setpwent();
-
- g_hash_table_iter_init (&iter, new_users_by_name);
- while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &user)) {
Deleted: trunk/dports/gnome/gdm/files/pam_location.diff
===================================================================
--- trunk/dports/gnome/gdm/files/pam_location.diff 2013-11-13 17:20:56 UTC (rev 113332)
+++ trunk/dports/gnome/gdm/files/pam_location.diff 2013-11-13 17:49:19 UTC (rev 113333)
@@ -1,24 +0,0 @@
-diff -Nurd -x'*~' gdm-2.24.1.orig/daemon/gdm-session-worker.c gdm-2.24.1/daemon/gdm-session-worker.c
---- daemon/gdm-session-worker.c 2008-11-18 17:38:44.000000000 -0500
-+++ daemon/gdm-session-worker.c 2009-01-20 22:14:05.000000000 -0500
-@@ -32,7 +32,7 @@
- #include <grp.h>
- #include <pwd.h>
-
--#include <security/pam_appl.h>
-+#include <pam/pam_appl.h>
-
- #include <glib.h>
- #include <glib/gi18n.h>
-diff -Nurd -x'*~' gdm-2.24.1.orig/gui/simple-greeter/gdm-greeter-login-window.c gdm-2.24.1/gui/simple-greeter/gdm-greeter-login-window.c
---- gui/simple-greeter/gdm-greeter-login-window.c 2008-11-18 17:49:12.000000000 -0500
-+++ gui/simple-greeter/gdm-greeter-login-window.c 2009-01-20 22:14:20.000000000 -0500
-@@ -68,7 +68,7 @@
- #include "gdm-user-chooser-widget.h"
-
- #ifdef HAVE_PAM
--#include <security/pam_appl.h>
-+#include <pam/pam_appl.h>
- #define PW_ENTRY_SIZE PAM_MAX_RESP_SIZE
- #else
- #define PW_ENTRY_SIZE GDM_MAX_PASS
Modified: trunk/dports/gnome/gdm/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/gdm/files/patch-configure.diff 2013-11-13 17:20:56 UTC (rev 113332)
+++ trunk/dports/gnome/gdm/files/patch-configure.diff 2013-11-13 17:49:19 UTC (rev 113333)
@@ -1,6 +1,6 @@
---- configure.orig 2011-03-28 09:55:35.000000000 -0700
-+++ configure 2013-07-06 14:00:57.000000000 -0700
-@@ -21438,6 +21438,7 @@
+--- configure.orig 2013-10-16 07:46:13.000000000 -0700
++++ configure 2013-11-08 21:31:12.000000000 -0800
+@@ -23256,6 +23256,7 @@
fi
@@ -8,16 +8,21 @@
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
-@@ -23540,7 +23541,12 @@
+@@ -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 /opt/local/bin/Xquartz; 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"
Deleted: trunk/dports/gnome/gdm/files/patch-daemon-gdm-display-access-file.c.diff
===================================================================
--- trunk/dports/gnome/gdm/files/patch-daemon-gdm-display-access-file.c.diff 2013-11-13 17:20:56 UTC (rev 113332)
+++ trunk/dports/gnome/gdm/files/patch-daemon-gdm-display-access-file.c.diff 2013-11-13 17:49:19 UTC (rev 113333)
@@ -1,13 +0,0 @@
---- daemon/gdm-display-access-file.c.orig 2009-04-29 14:30:54.000000000 -0700
-+++ daemon/gdm-display-access-file.c 2009-04-29 14:32:16.000000000 -0700
-@@ -56,6 +56,10 @@
- #define O_BINARY 0
- #endif
-
-+#ifndef HOST_NAME_MAX
-+#define HOST_NAME_MAX 256
-+#endif
-+
- static void gdm_display_access_file_finalize (GObject * object);
-
- enum
Copied: trunk/dports/gnome/gdm/files/patch-daemon-gdm-session.c.diff (from rev 113174, users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-daemon-gdm-session.c.diff)
===================================================================
--- trunk/dports/gnome/gdm/files/patch-daemon-gdm-session.c.diff (rev 0)
+++ trunk/dports/gnome/gdm/files/patch-daemon-gdm-session.c.diff 2013-11-13 17:49:19 UTC (rev 113333)
@@ -0,0 +1,12 @@
+--- 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;
Deleted: trunk/dports/gnome/gdm/files/patch-fink-gdm-modified.diff
===================================================================
--- trunk/dports/gnome/gdm/files/patch-fink-gdm-modified.diff 2013-11-13 17:20:56 UTC (rev 113332)
+++ trunk/dports/gnome/gdm/files/patch-fink-gdm-modified.diff 2013-11-13 17:49:19 UTC (rev 113333)
@@ -1,11 +0,0 @@
---- 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 ");
- }
-- if (ai->ai_flags & AI_NUMERICSERV) {
-+ if (ai->ai_flags & NI_NUMERICSERV) {
- g_string_append (str, "numserv ");
- }
- if (ai->ai_flags & AI_V4MAPPED) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131113/7fa0f23e/attachment.html>
More information about the macports-changes
mailing list