diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-12-06 23:00:44 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-12-06 23:00:44 +0000 |
| commit | 7bca469461eed6cd6237e61db814e5697e6b7bb5 (patch) | |
| tree | 8854965fe29a19f914c1f5b1b69fe70beec036f9 /x11 | |
| parent | Fix NOPORTDOCS. (diff) | |
Fix the language list in GDM.
PR: 141136
Submitted by: MOROHOSHI Akihiko <moro@remus.dti.ne.jp>
Notes
Notes:
svn path=/head/; revision=245306
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gdm/Makefile | 2 | ||||
| -rw-r--r-- | x11/gdm/files/patch-gui_simple-greeter_Makefile.in | 2 | ||||
| -rw-r--r-- | x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c | 18 |
3 files changed, 2 insertions, 20 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 0d362dad07d7..61e666cd0f02 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -8,7 +8,7 @@ PORTNAME= gdm PORTVERSION= 2.28.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gdm/files/patch-gui_simple-greeter_Makefile.in b/x11/gdm/files/patch-gui_simple-greeter_Makefile.in index 56d49b99bf92..e8a958e66ac4 100644 --- a/x11/gdm/files/patch-gui_simple-greeter_Makefile.in +++ b/x11/gdm/files/patch-gui_simple-greeter_Makefile.in @@ -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 --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c index 675925aa926b..83a029a19632 100644 --- a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c +++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c @@ -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); |