From 24f4d02c345f196823326db5900774aeb2046d2a Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Thu, 19 Mar 2009 08:26:42 +0000 Subject: [PATCH] - update to gdm-2.20.10 lots of small bug fixes some translations updates --- x11/gnome/gdm/Makefile | 7 +++---- x11/gnome/gdm/distinfo | 10 +++++----- x11/gnome/gdm/patches/patch-config_Makefile_in | 8 ++++---- x11/gnome/gdm/patches/patch-config_Xsession_in | 10 +++++----- x11/gnome/gdm/patches/patch-daemon_slave_c | 12 ++++++------ .../gdm/patches/patch-utils_gdm-ssh-session | 18 ++++++------------ 6 files changed, 29 insertions(+), 36 deletions(-) diff --git a/x11/gnome/gdm/Makefile b/x11/gnome/gdm/Makefile index ae624081d24..02e16a736da 100644 --- a/x11/gnome/gdm/Makefile +++ b/x11/gnome/gdm/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.53 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.54 2009/03/19 08:26:42 ajacoutot Exp $ COMMENT= GNOME display manager GNOME_PROJECT= gdm -GNOME_VERSION= 2.20.9 -PKGNAME= ${DISTNAME}p7 +GNOME_VERSION= 2.20.10 HOMEPAGE= http://www.gnome.org/projects/gdm/ @@ -20,7 +19,7 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glade-2.0 glib-2.0 \ glitz gmodule-2.0 gnomecanvas-2 gobject-2.0 gsf-1 \ gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ - pcre pixman-1 png pthread util wrap xml2 z + pcre pixman-1 png util wrap xml2 z BUILD_DEPENDS= :gnome-doc-utils->=0.3.2:x11/gnome/doc-utils \ :rarian-*:textproc/rarian \ diff --git a/x11/gnome/gdm/distinfo b/x11/gnome/gdm/distinfo index d292ec8a6af..34d10653a3b 100644 --- a/x11/gnome/gdm/distinfo +++ b/x11/gnome/gdm/distinfo @@ -1,5 +1,5 @@ -MD5 (gnome/gdm-2.20.9.tar.bz2) = vccmX3ey4m6Q1IrFEhNuVA== -RMD160 (gnome/gdm-2.20.9.tar.bz2) = kj7CwU6xU8yTwikSILD1DxR9zTI= -SHA1 (gnome/gdm-2.20.9.tar.bz2) = uCahTx97uxbQ9MMsZZ60mf76+VY= -SHA256 (gnome/gdm-2.20.9.tar.bz2) = xcmjuBj4RlbPCH2pMSEGuapcydRPqLT0W9BHmWUbtc0= -SIZE (gnome/gdm-2.20.9.tar.bz2) = 4034232 +MD5 (gnome/gdm-2.20.10.tar.bz2) = mBx+5/vkUwYeCVq1KjUT+A== +RMD160 (gnome/gdm-2.20.10.tar.bz2) = S7UDddMGOBQ7R7eIRAXpmZ4wTaU= +SHA1 (gnome/gdm-2.20.10.tar.bz2) = QunlIYQ5M1LwBfFzWEOjD3ZK7xg= +SHA256 (gnome/gdm-2.20.10.tar.bz2) = XUouWXOneIccm/uR12WAdHpO9Adx/UNoFppYaLstsSc= +SIZE (gnome/gdm-2.20.10.tar.bz2) = 3940077 diff --git a/x11/gnome/gdm/patches/patch-config_Makefile_in b/x11/gnome/gdm/patches/patch-config_Makefile_in index 65e87785f55..b9e59cb3c5c 100644 --- a/x11/gnome/gdm/patches/patch-config_Makefile_in +++ b/x11/gnome/gdm/patches/patch-config_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-config_Makefile_in,v 1.12 2009/02/04 18:50:02 ajacoutot Exp $ ---- config/Makefile.in.orig Wed Dec 10 23:26:32 2008 -+++ config/Makefile.in Wed Feb 4 18:33:48 2009 -@@ -715,18 +715,6 @@ install-data-hook: gdm.conf gdm.conf-custom Xsession I +$OpenBSD: patch-config_Makefile_in,v 1.13 2009/03/19 08:26:42 ajacoutot Exp $ +--- config/Makefile.in.orig Thu Mar 19 06:00:25 2009 ++++ config/Makefile.in Thu Mar 19 09:01:36 2009 +@@ -709,18 +709,6 @@ install-data-hook: gdm.conf gdm.conf-custom Xsession I chmod 755 $(DESTDIR)$(gnomercdir); \ fi diff --git a/x11/gnome/gdm/patches/patch-config_Xsession_in b/x11/gnome/gdm/patches/patch-config_Xsession_in index 51975df765e..7a67b093d51 100644 --- a/x11/gnome/gdm/patches/patch-config_Xsession_in +++ b/x11/gnome/gdm/patches/patch-config_Xsession_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-config_Xsession_in,v 1.9 2008/12/18 19:38:26 ajacoutot Exp $ ---- config/Xsession.in.orig Wed Sep 3 20:36:08 2008 -+++ config/Xsession.in Thu Dec 18 18:58:16 2008 +$OpenBSD: patch-config_Xsession_in,v 1.10 2009/03/19 08:26:42 ajacoutot Exp $ +--- config/Xsession.in.orig Thu Mar 19 05:59:27 2009 ++++ config/Xsession.in Thu Mar 19 09:01:36 2009 @@ -23,6 +23,8 @@ # based on: # $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $ @@ -10,7 +10,7 @@ $OpenBSD: patch-config_Xsession_in,v 1.9 2008/12/18 19:38:26 ajacoutot Exp $ command="$@" # this will go into the .xsession-errors along with all other echo's -@@ -220,6 +222,9 @@ if [ "x$command" = "xdefault" ] ; then +@@ -202,6 +204,9 @@ if [ "x$command" = "xdefault" ] ; then command="/etc/X11/xinit/Xclients" elif [ -x /etc/X11/Xclients ]; then command="/etc/X11/Xclients" @@ -20,7 +20,7 @@ $OpenBSD: patch-config_Xsession_in,v 1.9 2008/12/18 19:38:26 ajacoutot Exp $ else if [ -n "$zenity" ] ; then disptext=`gettextfunc "System has no Xclients file, so starting a failsafe xterm session. Windows will have focus only if the mouse pointer is above them. To get out of this mode type 'exit' in the window."` -@@ -231,12 +236,17 @@ if [ "x$command" = "xdefault" ] ; then +@@ -213,12 +218,17 @@ if [ "x$command" = "xdefault" ] ; then fi fi diff --git a/x11/gnome/gdm/patches/patch-daemon_slave_c b/x11/gnome/gdm/patches/patch-daemon_slave_c index ea336d6ec97..e6914d099f8 100644 --- a/x11/gnome/gdm/patches/patch-daemon_slave_c +++ b/x11/gnome/gdm/patches/patch-daemon_slave_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-daemon_slave_c,v 1.11 2009/01/28 16:39:01 ajacoutot Exp $ ---- daemon/slave.c.orig Wed Dec 10 23:25:43 2008 -+++ daemon/slave.c Wed Jan 28 14:49:12 2009 -@@ -2854,7 +2854,7 @@ gdm_slave_greeter (void) +$OpenBSD: patch-daemon_slave_c,v 1.12 2009/03/19 08:26:42 ajacoutot Exp $ +--- daemon/slave.c.orig Thu Mar 19 05:59:27 2009 ++++ daemon/slave.c Thu Mar 19 09:01:37 2009 +@@ -2857,7 +2857,7 @@ gdm_slave_greeter (void) exec_command (LIBEXECDIR "/gdmlogin", NULL); @@ -10,7 +10,7 @@ $OpenBSD: patch-daemon_slave_c,v 1.11 2009/01/28 16:39:01 ajacoutot Exp $ gdm_errorgui_error_box (d, GTK_MESSAGE_ERROR, -@@ -3582,6 +3582,7 @@ session_child_run (struct passwd *pwent, +@@ -3594,6 +3594,7 @@ session_child_run (struct passwd *pwent, GString *fullexec = NULL; const char *shell = NULL; const char *greeter; @@ -18,7 +18,7 @@ $OpenBSD: patch-daemon_slave_c,v 1.11 2009/01/28 16:39:01 ajacoutot Exp $ gint result; gchar **argv = NULL; -@@ -3801,8 +3802,7 @@ session_child_run (struct passwd *pwent, +@@ -3815,8 +3816,7 @@ session_child_run (struct passwd *pwent, if (setusercontext (NULL, pwent, pwent->pw_uid, LOGIN_SETLOGIN | LOGIN_SETPATH | LOGIN_SETPRIORITY | LOGIN_SETRESOURCES | diff --git a/x11/gnome/gdm/patches/patch-utils_gdm-ssh-session b/x11/gnome/gdm/patches/patch-utils_gdm-ssh-session index 9528092eedf..484c51775ff 100644 --- a/x11/gnome/gdm/patches/patch-utils_gdm-ssh-session +++ b/x11/gnome/gdm/patches/patch-utils_gdm-ssh-session @@ -1,14 +1,8 @@ -$OpenBSD: patch-utils_gdm-ssh-session,v 1.1 2008/10/14 12:15:37 ajacoutot Exp $ ---- utils/gdm-ssh-session.orig Tue Oct 14 13:19:28 2008 -+++ utils/gdm-ssh-session Tue Oct 14 13:20:15 2008 -@@ -1,8 +1,8 @@ --#!/bin/bash -+#!/bin/sh - - ZENITY=`which zenity` - TARGETHOST=`$ZENITY --title "Host to connect to" --entry --text "Enter the name of the host you want to log in to"` - # @@@ should probably get a user name too; +$OpenBSD: patch-utils_gdm-ssh-session,v 1.2 2009/03/19 08:26:42 ajacoutot Exp $ +--- utils/gdm-ssh-session.orig Thu Mar 19 09:00:37 2009 ++++ utils/gdm-ssh-session Thu Mar 19 09:01:23 2009 +@@ -13,3 +13,4 @@ fi # for now can bet set using the $USERNAME@ convention # @@@ should it do an ssh-add so the user doesn't have to enter its passphrase again? --ssh -A -X -T -n "$TARGETHOST" /etc/X11/Xsession -+ssh -A -Y -T -n "$TARGETHOST" /etc/X11/xdm/Xsession + ssh -A -X -T -n "$TARGETHOST" -p "$TARGETPORT" /etc/X11/Xsession ++ssh -A -Y -T -n "$TARGETHOST" -p "$TARGETPORT" /etc/X11/xdm/Xsession