diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-07-19 15:25:25 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-07-19 15:25:25 +0000 |
| commit | e8bb5194d73857776c36feae69c13e0f4cb5da84 (patch) | |
| tree | 5c8eaa61e8fc735a67739ff6791d08ea4ed4ffa3 | |
| parent | Stable on hppa. (diff) | |
| download | gentoo-2-e8bb5194d73857776c36feae69c13e0f4cb5da84.tar.gz gentoo-2-e8bb5194d73857776c36feae69c13e0f4cb5da84.tar.bz2 gentoo-2-e8bb5194d73857776c36feae69c13e0f4cb5da84.zip | |
Minor build fix from upstream.
(Portage version: 2.1.1_pre2-r8)
| -rw-r--r-- | app-editors/nano/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/nano/files/nano-1.3.12-fix2.patch | 15 | ||||
| -rw-r--r-- | app-editors/nano/nano-1.3.12-r1.ebuild | 3 |
3 files changed, 22 insertions, 2 deletions
diff --git a/app-editors/nano/ChangeLog b/app-editors/nano/ChangeLog index 1a6dd18c2554..ad4531f783c6 100644 --- a/app-editors/nano/ChangeLog +++ b/app-editors/nano/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/nano # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.120 2006/07/17 04:36:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.121 2006/07/19 15:25:24 vapier Exp $ + + 19 Jul 2006; Mike Frysinger <vapier@gentoo.org> + +files/nano-1.3.12-fix2.patch, nano-1.3.12-r1.ebuild: + Minor build fix from upstream. 17 Jul 2006; Mike Frysinger <vapier@gentoo.org> +files/gentoo.nanorc, nano-1.3.12-r1.ebuild: diff --git a/app-editors/nano/files/nano-1.3.12-fix2.patch b/app-editors/nano/files/nano-1.3.12-fix2.patch new file mode 100644 index 000000000000..1c6ba22f3ab3 --- /dev/null +++ b/app-editors/nano/files/nano-1.3.12-fix2.patch @@ -0,0 +1,15 @@ +diff -ru nano-1.3.12/src/rcfile.c nano-1.3.12-fix2/src/rcfile.c +--- nano-1.3.12/src/rcfile.c 2006-06-07 22:50:56.000000000 -0400 ++++ nano-1.3.12-fix2/src/rcfile.c 2006-07-18 19:22:30.000000000 -0400 +@@ -834,9 +834,11 @@ + rcfile_error(N_("Unknown flag \"%s\""), option); + } + ++#ifdef ENABLE_COLOR + if (endsyntax != NULL && endcolor == NULL) + rcfile_error(N_("Syntax \"%s\" has no color commands"), + endsyntax->desc); ++#endif + + free(buf); + fclose(rcstream); diff --git a/app-editors/nano/nano-1.3.12-r1.ebuild b/app-editors/nano/nano-1.3.12-r1.ebuild index f6ce1269802c..198a0e47de8d 100644 --- a/app-editors/nano/nano-1.3.12-r1.ebuild +++ b/app-editors/nano/nano-1.3.12-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.3.12-r1.ebuild,v 1.3 2006/07/17 04:36:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.3.12-r1.ebuild,v 1.4 2006/07/19 15:25:24 vapier Exp $ #ECVS_SERVER="savannah.gnu.org:/cvsroot/nano" #ECVS_MODULE="nano" @@ -29,6 +29,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${P}-path.patch epatch "${FILESDIR}"/${P}-scroll.patch + epatch "${FILESDIR}"/${P}-fix2.patch } src_compile() { |