diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-02-13 15:07:28 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-02-13 15:07:28 +0800 |
| commit | 20b31eae9888213884bd46d7a486d5f33d3c0349 (patch) | |
| tree | bc642ee8c3099394f20174a96b41c15924aa410b /x11/gdm | |
| parent | 0886828c8676b379640dc69fcda660c530d4c850 (diff) | |
| download | marcuscom-ports-20b31eae9888213884bd46d7a486d5f33d3c0349.tar marcuscom-ports-20b31eae9888213884bd46d7a486d5f33d3c0349.tar.gz marcuscom-ports-20b31eae9888213884bd46d7a486d5f33d3c0349.tar.bz2 marcuscom-ports-20b31eae9888213884bd46d7a486d5f33d3c0349.tar.lz marcuscom-ports-20b31eae9888213884bd46d7a486d5f33d3c0349.tar.xz marcuscom-ports-20b31eae9888213884bd46d7a486d5f33d3c0349.tar.zst marcuscom-ports-20b31eae9888213884bd46d7a486d5f33d3c0349.zip | |
Attempt to fix the language chooser widget.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10442 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gdm')
| -rw-r--r-- | x11/gdm/Makefile | 3 | ||||
| -rw-r--r-- | x11/gdm/files/patch-gui_simple-greeter_Makefile.in | 11 | ||||
| -rw-r--r-- | x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c | 29 |
3 files changed, 42 insertions, 1 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 22f283607..c912af49f 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.106 2008/02/09 00:22:14 marcus Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.107 2008/02/13 06:30:31 marcus Exp $ # PORTNAME= gdm PORTVERSION= 2.21.7 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11/gdm/files/patch-gui_simple-greeter_Makefile.in b/x11/gdm/files/patch-gui_simple-greeter_Makefile.in new file mode 100644 index 000000000..56d49b99b --- /dev/null +++ b/x11/gdm/files/patch-gui_simple-greeter_Makefile.in @@ -0,0 +1,11 @@ +--- gui/simple-greeter/Makefile.in.orig 2008-02-13 01:57:37.000000000 -0500 ++++ gui/simple-greeter/Makefile.in 2008-02-13 01:57:44.000000000 -0500 +@@ -445,7 +445,7 @@ INCLUDES = \ + -DGDMCONFDIR=\"$(gdmconfdir)\" \ + -DDATADIR=\""$(datadir)"\" \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ +- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \ ++ -DLIBLOCALEDIR=\""$(prefix)/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 new file mode 100644 index 000000000..dcb0d2c55 --- /dev/null +++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c @@ -0,0 +1,29 @@ +--- gui/simple-greeter/gdm-languages.c.orig 2008-02-13 02:03:34.000000000 -0500 ++++ gui/simple-greeter/gdm-languages.c 2008-02-13 02:05:00.000000000 -0500 +@@ -347,7 +347,7 @@ select_dirs (const struct dirent *dirent + struct stat st; + char *path; + +- path = g_build_filename (LIBLOCALEDIR, 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; + } +@@ -367,7 +367,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) { + char *path; +@@ -389,7 +389,7 @@ collect_locales_from_directory (void) + } + + /* try to get additional information from LC_IDENTIFICATION */ +- path = g_build_filename (LIBLOCALEDIR, dirents[cnt]->d_name, "LC_IDENTIFICATION", NULL); ++ path = g_build_filename ("/usr/share/locale", dirents[cnt]->d_name, "LC_IDENTIFICATION", NULL); + res = g_file_test (path, G_FILE_TEST_IS_REGULAR); + if (res) { + GMappedFile *mapped; |