diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2011-10-21 11:09:36 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2011-10-21 11:09:36 +0000 |
| commit | 691f22b8c10938161d9755cad24b852e8a745351 (patch) | |
| tree | 1008c15fbd8b56445613dc63b3cfeac69418aed6 /app-misc/mc/files/mc-4.8.0-fix-nls.patch | |
| parent | Add java-ant_remove-taskdef()s --name parameter that removes only tasks of gi... (diff) | |
| download | historical-691f22b8c10938161d9755cad24b852e8a745351.tar.gz historical-691f22b8c10938161d9755cad24b852e8a745351.tar.bz2 historical-691f22b8c10938161d9755cad24b852e8a745351.zip | |
Fixed build failure in USE=-nls case by Nikos Chantziaras (bug #387949)
Package-Manager: portage-2.1.10.11/cvs/Linux x86_64
Diffstat (limited to 'app-misc/mc/files/mc-4.8.0-fix-nls.patch')
| -rw-r--r-- | app-misc/mc/files/mc-4.8.0-fix-nls.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/app-misc/mc/files/mc-4.8.0-fix-nls.patch b/app-misc/mc/files/mc-4.8.0-fix-nls.patch new file mode 100644 index 000000000000..d77c4cc459fd --- /dev/null +++ b/app-misc/mc/files/mc-4.8.0-fix-nls.patch @@ -0,0 +1,33 @@ +Fixes bug found by Nikos Chantziaras +https://bugs.gentoo.org/show_bug.cgi?id=387949 +Picked from upstream development branch. + +> main.c: In function 'main': +> main.c:384:44: error: expected expression before ';' token +> main.c:385:29: error: expected expression before ';' token + +commit 84320a33d8f9027c70a8d972b69b1ffc824c5a8d +Author: Andrew Borodin <aborodin@vmail.ru> +Date: Thu Oct 20 15:42:15 2011 +0400 + + Ticket #????: cleanup. + + Fixed build with --disable-nls option. + + Signed-off-by: Andrew Borodin <aborodin@vmail.ru> + +diff --git a/src/main.c b/src/main.c +index 9d442f2..e854719 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -381,8 +381,10 @@ main (int argc, char *argv[]) + + /* We had LC_CTYPE before, LC_ALL includs LC_TYPE as well */ + (void) setlocale (LC_ALL, ""); ++#ifdef ENABLE_NLS + (void) bindtextdomain ("mc", LOCALEDIR); + (void) textdomain ("mc"); ++#endif + + if (!events_init (&error)) + { |