Fixed build failure in USE=-nls case by Nikos Chantziaras (bug #387949)

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 44d88b55c2f0e6d929425f357ac67531a2f1b382..3f99d8e2251e9ebeb3a6d296bef0b3746b206c33 100644 (file)
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/mc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.225 2011/10/20 17:40:01 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.226 2011/10/21 11:09:36 slyfox Exp $
+
+  21 Oct 2011; Sergei Trofimovich <slyfox@gentoo.org> mc-4.8.0.ebuild,
+  +files/mc-4.8.0-fix-nls.patch:
+  Fixed build failure in USE=-nls case by Nikos Chantziaras (bug #387949)
 
 *mc-4.8.0 (20 Oct 2011)
 *mc-4.7.5.5 (20 Oct 2011)

diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 7827910cff5c283e269e23a1e06258ce5fa4de09..ba51049e53967e643ece0cf9e59bd8d2c8397cfd 100644 (file)
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX mc-4.8.0-fix-nls.patch 949 RMD160 24627543ec6744b1b1d710a306dce4d5782e360e SHA1 d70b0ec63f65b72e414efcac2cc04e75740848d1 SHA256 504856248f6c3ab21870c7555f31cdcd9ac509c883ab6cc2929440fb9d1e2216
 DIST mc-4.7.0.10.tar.bz2 2862849 RMD160 83a527a94a81f886eb7f80b8965554bf927cad65 SHA1 2bc13f963780eaddac2f675b9145656d759f974e SHA256 99136c447a718c6bd681cb0f7d3ab9df4f5494d35cb3682f01ccf004873e56fb
 DIST mc-4.7.0.3.tar.bz2 2793651 RMD160 ecda5e6befe4b1e0442044b732e7903b01ed73ae SHA1 2d319fc940283e4327cd5bc2f977b724461f1305 SHA256 71caeaf00606c45228362fb6a4d2f1b6d47b6c1056db46b975255aac5af45ef7
 DIST mc-4.7.5.2.tar.lzma 1943321 RMD160 8477450d0f2cddc356d93c5006fcfd278966f863 SHA1 fb44d01a80c5e4589aece205adccff5b5a5c34c1 SHA256 ca362c629ea984b635e38e0912ec3a7ceb44facc18f0c17c17d6a114c14e7c26
@@ -12,13 +13,13 @@ EBUILD mc-4.7.0.3.ebuild 1706 RMD160 47509be466b4c9cb659cbaee63ac3f4919802b30 SH
 EBUILD mc-4.7.5.2.ebuild 1932 RMD160 3b87f23cb58a5a5f9b72b4f201a235790733413b SHA1 4b941eaa1a692cbb2a80e8eccbffa15ded7732c6 SHA256 052230597b16113163c4aa7ccb068614fd1cdbe710ef9ff084f46e0a3375fcfc
 EBUILD mc-4.7.5.3.ebuild 2021 RMD160 c993e962d2a909d8bf70711bc4606833413f50fd SHA1 b51b3a2c4b30e38ec9f4a6db80d63b6622e7bc4d SHA256 69eb538e74a8910ba22449bb616dbbce1d1c3bd71d641d66133d389815eca4bf
 EBUILD mc-4.7.5.5.ebuild 2018 RMD160 0918ae22d12e861303f8a195a635e07c1d1c8d93 SHA1 f551966487ff962c8bbc449bdc9cec7ffc0f8ae6 SHA256 4781e7bb5fddc12f377a42103a05637e525cdae9fbe7d82114e187dbe76eb692
-EBUILD mc-4.8.0.ebuild 2078 RMD160 d69d5dc6a1bb5366759a9563f851c4984eb5399e SHA1 06f7f6537d9c21869597b4669ad03dbbc1477c2b SHA256 5fa925f404e771b65c7f5a2110b8eebee00aa347cfde4f7b40d2c6e5ca267bc0
-MISC ChangeLog 31948 RMD160 a7760a7faa5b992f10e8837ebbe6b1d99d5124df SHA1 370a7768f019cbf5a7f5b9af5091d2f74adb5dcf SHA256 4fcf5fea0e301c04b86f213f368b43cc69994b0af389db354f709e05ddd0bb28
+EBUILD mc-4.8.0.ebuild 2129 RMD160 d89babe5e2963e0321cbb837efb0a14880fdd643 SHA1 c55c2607670aac419a840bca667ae77bca3a6fa0 SHA256 02153fb918ef5288fbc4dfe181247f768b78edc9b9434a7710246dd2382f14a5
+MISC ChangeLog 32127 RMD160 66271c2cd15ccc89617a5d2cd4e47688a9e97062 SHA1 1b1de9cbc09fea6d3a6e97adae8ca5c18d7cba99 SHA256 3e63ca359ad67b5bad35148411f2ab50373735385b0a8c121e07808458972a86
 MISC metadata.xml 305 RMD160 319f6d3a222a3028d69dfb5ece59f4ae0343125a SHA1 705291c975a8b25ccc5a040d4fa7feab9190048e SHA256 e8245261e4eaebac2b2f5017c36165f9e733bc1e3619392b8f64c0d5392e7cd9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6gXdoACgkQcaHudmEf86ojMgCfff5bGLn21KOQ9uu7aKZZZQ1m
-BAIAni4UIZZ6KL52SCuoNe7EmQmxlCyO
-=l4a9
+iEYEARECAAYFAk6hUvoACgkQcaHudmEf86p7GACfcJ8QTS5Ek9zywyW0kaxVp7sz
+vHMAnjRWL99fPDGAcQexN/OB90odKABQ
+=qn6U
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..d77c4cc
--- /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))
+     {

diff --git a/app-misc/mc/mc-4.8.0.ebuild b/app-misc/mc/mc-4.8.0.ebuild
index 2da7cb5ed34e9b013025b93d9610b42672ce25ff..eecd5f5ea56f7423e12bd560fe174a2f7b58d5e6 100644 (file)
--- a/app-misc/mc/mc-4.8.0.ebuild
+++ b/app-misc/mc/mc-4.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.0.ebuild,v 1.1 2011/10/20 17:40:01 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.0.ebuild,v 1.2 2011/10/21 11:09:36 slyfox Exp $
 
 EAPI=4
 
@@ -39,6 +39,8 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=("${FILESDIR}/${PN}"-4.8.0-fix-nls.patch)
+
 src_configure() {
        local myscreen=ncurses
        use slang && myscreen=slang