ports/141136: [PATCH] x11/gdm: cannot select language

[MOROHOSHI Akihiko]

>Number:         141136
>Category:       ports
>Synopsis:       [PATCH] x11/gdm: cannot select language
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 03 13:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     MOROHOSHI Akihiko
>Release:        8.0
>Organization:
>Environment:
>Description:
Cannot select language on GDM and locale is set to "C" anyway.
>How-To-Repeat:
a) Try to select language on GDM.
b) cd $PORTSDIR/x11/gdm
make configure
cd $WRKSRC/gui/simple-greeter
make test-languages
./test-languages <-- this shows no language!
>Fix:
Patch attached.

Patch attached with submission follows:

diff -urN gdm.orig/files/patch-gui_simple-greeter_Makefile.in gdm/files/patch-gui_simple-greeter_Makefile.in
--- gdm.orig/files/patch-gui_simple-greeter_Makefile.in	2009-01-10 14:21:55.000000000 +0900
+++ gdm/files/patch-gui_simple-greeter_Makefile.in	2009-12-03 21:51:39.000000000 +0900
@@ -5,7 +5,7 @@
  	-DDATADIR=\""$(datadir)"\"		 	\
  	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
 -	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"	\
-+	-DLIBLOCALEDIR=\""$(prefix)/share/locale"\"	\
++	-DLIBLOCALEDIR=\""/usr/share/locale"\"	\
  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
  	-DGLADEDIR=\""$(pkgdatadir)"\" 	\
  	-DLIBEXECDIR=\""$(libexecdir)"\" 		\
diff -urN gdm.orig/files/patch-gui_simple-greeter_gdm-languages.c gdm/files/patch-gui_simple-greeter_gdm-languages.c
--- gdm.orig/files/patch-gui_simple-greeter_gdm-languages.c	2009-11-29 21:08:19.000000000 +0900
+++ gdm/files/patch-gui_simple-greeter_gdm-languages.c	2009-12-03 21:51:20.000000000 +0900
@@ -1,5 +1,5 @@
---- gui/simple-greeter/gdm-languages.c.orig	2009-07-20 03:09:09.000000000 +0200
-+++ gui/simple-greeter/gdm-languages.c	2009-07-20 10:02:41.000000000 +0200
+--- gui/simple-greeter/gdm-languages.c.orig	2009-10-20 07:12:45.000000000 +0900
++++ gui/simple-greeter/gdm-languages.c	2009-12-03 21:41:05.000000000 +0900
 @@ -168,13 +168,13 @@ gdm_parse_language_name (const char *nam
                          *codesetp = NULL;
                  }
@@ -16,15 +16,6 @@
          }
  
          if (modifierp != NULL) {
-@@ -314,7 +314,7 @@ language_name_has_translations (const ch
-         const char  *name;
-         gboolean     has_translations;
- 
--        path = g_build_filename (GNOMELOCALEDIR, language_name, "LC_MESSAGES", NULL);
-+        path = g_build_filename ("/usr/share/locale", language_name, "LC_MESSAGES", NULL);
- 
-         has_translations = FALSE;
-         dir = g_dir_open (path, 0, NULL);
 @@ -352,7 +352,7 @@ add_locale (const char *language_name)
          if (language_name_is_utf8 (language_name)) {
                  name = g_strdup (language_name);
@@ -34,12 +25,3 @@
  
                  if (!language_name_is_utf8 (name)) {
                          g_free (name);
-@@ -501,7 +501,7 @@ collect_locales_from_directory (void)
-         int             ndirents;
-         int             cnt;
- 
--        ndirents = scandir (LIBLOCALEDIR, &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);


>Release-Note:
>Audit-Trail:
>Unformatted: