[gentoo-commits] gentoo-x86 commit in app-misc/mc/files: mc-4.8.0-fix-nls.patch

[gentoo-commits] gentoo-x86 commit in app-misc/mc/files: mc-4.8.0-fix-nls.patch

[Sergei Trofimovich (slyfox)]

slyfox      11/10/21 11:09:36

  Added:                mc-4.8.0-fix-nls.patch
  Log:
  Fixed build failure in USE=-nls case by Nikos Chantziaras (bug #387949)
  
  (Portage version: 2.1.10.11/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-misc/mc/files/mc-4.8.0-fix-nls.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/mc/files/mc-4.8.0-fix-nls.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/mc/files/mc-4.8.0-fix-nls.patch?rev=1.1&content-type=text/plain

Index: mc-4.8.0-fix-nls.patch
===================================================================
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))
     {