* Fix strange crashes that occurred due to the greeter getting respawned on

  login.
* Fix multi-language support.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11770 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 54 insertions, 1 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index d2646e7dd..3a7d4272a 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,11 +3,12 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gdm/Makefile,v 1.137 2008/10/07 16:42:18 marcus Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.138 2008/11/19 19:30:42 marcus Exp $
 #
 
 PORTNAME=	gdm
 PORTVERSION=	2.24.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in b/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in
new file mode 100644
index 000000000..7febf5165
--- /dev/null
+++ b/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in
@@ -0,0 +1,7 @@
+--- data/greeter-autostart/gdm-simple-greeter.desktop.in.in.orig	2008-11-23 22:22:04.000000000 -0500
++++ data/greeter-autostart/gdm-simple-greeter.desktop.in.in	2008-11-23 22:22:09.000000000 -0500
+@@ -5,4 +5,3 @@ Exec=@LIBEXECDIR@/gdm-simple-greeter
+ OnlyShowIn=GNOME;
+ X-GNOME-Autostart-Phase=Application
+ X-GNOME-Autostart-Notify=true
+-X-GNOME-AutoRestart=true
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
new file mode 100644
index 000000000..9116dc917
--- /dev/null
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
@@ -0,0 +1,45 @@
+--- gui/simple-greeter/gdm-languages.c.orig	2008-11-22 17:16:42.000000000 -0500
++++ gui/simple-greeter/gdm-languages.c	2008-11-22 17:29:05.000000000 -0500
+@@ -168,13 +168,13 @@ gdm_parse_language_name (const char *nam
+                         *codesetp = NULL;
+                 }
+ 
+-                if (*codesetp != NULL) {
++/*                if (*codesetp != NULL) {
+                         char *codeset;
+ 
+                         codeset = normalize_codeset (*codesetp);
+                         g_free (*codesetp);
+                         *codesetp = codeset;
+-                }
++                }*/
+         }
+ 
+         if (modifierp != NULL) {
+@@ -353,7 +353,7 @@ add_locale (const char *language_name)
+         if (language_name_is_utf8 (language_name)) {
+                 name = g_strdup (language_name);
+         } else {
+-                name = g_strdup_printf ("%s.utf8", language_name);
++                name = g_strdup_printf ("%s.UTF-8", language_name);
+ 
+                 if (!language_name_is_utf8 (name)) {
+                         g_free (name);
+@@ -482,7 +482,7 @@ select_dirs (const struct dirent *dirent
+                                 struct stat st;
+                                 char       *path;
+ 
+-                                path = g_build_filename (GNOMELOCALEDIR, dirent->d_name, NULL);
++                                path = g_build_filename ("/usr/share/locale", dirent->d_name, NULL);
+                                 if (g_stat (path, &st) == 0) {
+                                         mode = st.st_mode;
+                                 }
+@@ -502,7 +502,7 @@ collect_locales_from_directory (void)
+         int             ndirents;
+         int             cnt;
+ 
+-        ndirents = scandir (GNOMELOCALEDIR, &dirents, select_dirs, alphasort);
++        ndirents = scandir ("/usr/share/locale", &dirents, select_dirs, alphasort);
+ 
+         for (cnt = 0; cnt < ndirents; ++cnt) {
+                 add_locale (dirents[cnt]->d_name);