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 | e61f4db20105c5723eb6650b5a3d969eb3251637 (patch) | |
| tree | f5f1bc42e87350d605aed2d380f9f905b46992ef /app-misc/mc | |
| parent | Add java-ant_remove-taskdef()s --name parameter that removes only tasks of gi... (diff) | |
| download | gentoo-2-e61f4db20105c5723eb6650b5a3d969eb3251637.tar.gz gentoo-2-e61f4db20105c5723eb6650b5a3d969eb3251637.tar.bz2 gentoo-2-e61f4db20105c5723eb6650b5a3d969eb3251637.zip | |
Fixed build failure in USE=-nls case by Nikos Chantziaras (bug #387949)
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'app-misc/mc')
| -rw-r--r-- | app-misc/mc/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/mc/files/mc-4.8.0-fix-nls.patch | 33 | ||||
| -rw-r--r-- | app-misc/mc/mc-4.8.0.ebuild | 4 |
3 files changed, 41 insertions, 2 deletions
diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog index 44d88b55c2f0..3f99d8e2251e 100644 --- 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/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)) + { diff --git a/app-misc/mc/mc-4.8.0.ebuild b/app-misc/mc/mc-4.8.0.ebuild index 2da7cb5ed34e..eecd5f5ea56f 100644 --- 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 |