diff options
| -rw-r--r-- | x11/gdm/Makefile | 4 | ||||
| -rw-r--r-- | x11/gdm/distinfo | 10 | ||||
| -rw-r--r-- | x11/gdm/patches/patch-aa | 18 |
3 files changed, 16 insertions, 16 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 6664f2ee0be..6f3f0b50832 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.140 2008/04/15 18:59:22 drochner Exp $ +# $NetBSD: Makefile,v 1.141 2008/05/29 17:21:45 drochner Exp $ # -DISTNAME= gdm-2.20.5 +DISTNAME= gdm-2.20.6 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.20/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index 0b3a93642a6..8eefe181843 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.55 2008/04/15 18:59:22 drochner Exp $ +$NetBSD: distinfo,v 1.56 2008/05/29 17:21:45 drochner Exp $ -SHA1 (gdm-2.20.5.tar.bz2) = 04d92b6b9a8c005b4a687d477b813bb4a357abd6 -RMD160 (gdm-2.20.5.tar.bz2) = 07863ad88823bff6229766a5f8e505f5c3099599 -Size (gdm-2.20.5.tar.bz2) = 3911717 bytes -SHA1 (patch-aa) = a0658aa32382ae45a0d253436d2104d4501daa07 +SHA1 (gdm-2.20.6.tar.bz2) = f86c0289641da6732957fb52fea05fefd595d5d2 +RMD160 (gdm-2.20.6.tar.bz2) = f507e3004488a908e357822e2fdc6ee4b04ad802 +Size (gdm-2.20.6.tar.bz2) = 3912940 bytes +SHA1 (patch-aa) = 0e919c36bed0901583b4a527d4e9461ab737a171 SHA1 (patch-ab) = 43b565fcbe2e172f5e319b3d111d475646f481e0 SHA1 (patch-ac) = 69b3539e50af0b32207b9ffeb7cb01645c9ece3c SHA1 (patch-ae) = c95265b55c968a0466e1ae50bbe58c121f05b027 diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa index 701de5f9e5d..9fe7b80395e 100644 --- a/x11/gdm/patches/patch-aa +++ b/x11/gdm/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.22 2007/11/30 20:08:38 drochner Exp $ +$NetBSD: patch-aa,v 1.23 2008/05/29 17:21:45 drochner Exp $ ---- configure.orig 2007-09-17 16:48:17.000000000 +0200 +--- configure.orig 2008-05-13 02:27:18.000000000 +0200 +++ configure -@@ -27195,7 +27195,9 @@ cat confdefs.h >>conftest.$ac_ext +@@ -27278,7 +27278,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <sys/statvfs.h> @@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.22 2007/11/30 20:08:38 drochner Exp $ _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in -@@ -33464,6 +33466,18 @@ case "$host" in +@@ -33554,6 +33556,18 @@ case "$host" in HOST_UTMP_LINE_REMOTE="" HOST_UTMP_PSEUDO_DEVICE="false" ;; @@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.22 2007/11/30 20:08:38 drochner Exp $ *) HOST_GDM_USER_PATH="/bin:/usr/bin" HOST_HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now" -@@ -33480,18 +33494,18 @@ esac +@@ -33570,18 +33584,18 @@ esac # allow user to override the host-specific default @@ -62,7 +62,7 @@ $NetBSD: patch-aa,v 1.22 2007/11/30 20:08:38 drochner Exp $ # On Solaris, the /usr/bin/Xserver script is used to decide whether to # use Xsun or Xorg, so this is used on Solaris. -@@ -33564,6 +33578,11 @@ elif test -x /usr/bin/X; then +@@ -33654,6 +33668,11 @@ elif test -x /usr/bin/X; then X_SERVER_PATH="/usr/bin" X_SERVER="/usr/bin/X" X_CONFIG_OPTIONS="-audit 0" @@ -74,11 +74,11 @@ $NetBSD: patch-aa,v 1.22 2007/11/30 20:08:38 drochner Exp $ else # what to do, what to do, this is wrong, but this just sets the # defaults, perhaps this user is cross compiling or some such -@@ -33573,6 +33592,7 @@ else +@@ -33663,6 +33682,7 @@ else GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin" X_CONFIG_OPTIONS="-audit 0" fi +X_CONFIG_OPTIONS="$X_SERVER_ARGS $X_CONFIG_OPTIONS" - # Don't add bindir to GDM_USER_PATH if it is already in the PATH. - # If it is /bin or /usr/bin, for example. + # Use Xephyr if it is available. It works better than Xnest since Xephyr + # supports the Xserver extensions, even if on a remote machine. |