diff options
| author |   Sandro Bonazzola <sanchan@gentoo.org> | 2006-10-09 18:46:52 +0000 |
|---|---|---|
| committer | Sandro Bonazzola <sanchan@gentoo.org> | 2006-10-09 18:46:52 +0000 |
| commit | d5ad7aa499311ba29b70fee22fd4fba05bc4aece (patch) | |
| tree | 3c6c1eae1fa8a357a819dffef8a6f6079651cfbf /dev-libs | |
| parent | Bump. (diff) | |
| download | gentoo-2-d5ad7aa499311ba29b70fee22fd4fba05bc4aece.tar.gz gentoo-2-d5ad7aa499311ba29b70fee22fd4fba05bc4aece.tar.bz2 gentoo-2-d5ad7aa499311ba29b70fee22fd4fba05bc4aece.zip | |
Fix bug #150543. Patch provided by opensolaris.org, ported from popt-1.7 and adapted for gentoo. Original patch available here: http://cvs.opensolaris.org/source/xref/jds/Solaris/patches/popt-01-xgettext.diff
(Portage version: 2.1.2_pre2-r5)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/popt/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/popt/files/popt-1.10.4-nls.patch | 11 | ||||
| -rw-r--r-- | dev-libs/popt/popt-1.10.4-r1.ebuild | 3 |
3 files changed, 20 insertions, 2 deletions
diff --git a/dev-libs/popt/ChangeLog b/dev-libs/popt/ChangeLog index d84999d9d7bb..daf561f5402a 100644 --- a/dev-libs/popt/ChangeLog +++ b/dev-libs/popt/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/popt # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.34 2006/10/01 15:40:04 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.35 2006/10/09 18:46:52 sanchan Exp $ + + 09 Oct 2006; Sandro Bonazzola <sanchan@gentoo.org> + +files/popt-1.10.4-nls.patch, popt-1.10.4-r1.ebuild: + Fix bug #150543. Patch provided by opensolaris.org, ported from popt-1.7 and + adapted for gentoo. Original patch available here: + http://cvs.opensolaris.org/source/xref/jds/Solaris/patches/popt-01-xgettext.diff 01 Oct 2006; Guy Martin <gmsoft@gentoo.org> popt-1.10.4-r1.ebuild: Stable on hppa. diff --git a/dev-libs/popt/files/popt-1.10.4-nls.patch b/dev-libs/popt/files/popt-1.10.4-nls.patch new file mode 100644 index 000000000000..a1f59d3b63d4 --- /dev/null +++ b/dev-libs/popt/files/popt-1.10.4-nls.patch @@ -0,0 +1,11 @@ +--- popt-1.10.4.orig/configure.ac 2006-10-09 20:27:18.326914000 +0200 ++++ popt-1.10.4/configure.ac 2006-10-09 20:28:14.826914000 +0200 +@@ -101,7 +101,7 @@ + [ : ] ) + AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") + +-if test ! -f ../rpm.c ++if /bin/false + then + AC_MSG_CHECKING(for GNU xgettext) + xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || AC_MSG_ERROR([ diff --git a/dev-libs/popt/popt-1.10.4-r1.ebuild b/dev-libs/popt/popt-1.10.4-r1.ebuild index 7ba8729f9a30..cd76be887fb3 100644 --- a/dev-libs/popt/popt-1.10.4-r1.ebuild +++ b/dev-libs/popt/popt-1.10.4-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/dev-libs/popt/popt-1.10.4-r1.ebuild,v 1.8 2006/10/01 15:40:04 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.10.4-r1.ebuild,v 1.9 2006/10/09 18:46:52 sanchan Exp $ inherit flag-o-matic autotools @@ -23,6 +23,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${P}-lib64.patch + use nls || epatch "${FILESDIR}"/${P}-nls.patch eautoreconf } |