From: Joe McCann Date: Mon, 3 Jan 2005 21:48:03 +0000 (+0000) Subject: Patch to fix undefined var, bug #76447 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c998d1e71d94bd34dd7c727c885431a72ba7429d;p=gentoo.git Patch to fix undefined var, bug #76447 --- diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog index 05c94fda639f..0d176fb8e5aa 100644 --- a/dev-libs/libxml2/ChangeLog +++ b/dev-libs/libxml2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libxml2 -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.102 2004/12/11 04:52:13 obz Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.103 2005/01/03 21:48:03 joem Exp $ + + 03 Jan 2005; Joe McCann + +files/libxml2-2.6.16-xlattable.patch, libxml2-2.6.16.ebuild: + Patch to fix undefined var, bug #76447 *libxml2-2.6.16 (11 Dec 2004) diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index e7bb7ea32508..52456c828a1b 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -1,17 +1,18 @@ -MD5 b40c981bc48af5d494d9903c64395e8b libxml2-2.6.12.ebuild 1670 -MD5 f0f6380d15a534d1a56597a3488056d0 libxml2-2.6.15-r1.ebuild 1807 -MD5 5900215d6556e3e2aa098da214f3f302 libxml2-2.6.7.ebuild 1887 -MD5 ccde65d6bc06a978f0712b1f2534fb12 libxml2-2.6.16.ebuild 1698 -MD5 aded0bbec70dc0a90dc3cdb5d25d16da libxml2-2.6.11.ebuild 1662 -MD5 086f5dd9238430853ec8bfc5d82b47c4 libxml2-2.6.9.ebuild 1948 -MD5 0eededeaa59fa4582aa5176d034a9f19 libxml2-2.6.6.ebuild 1892 -MD5 9d15dd3d43b4583339ca583d0ce94195 ChangeLog 12226 +MD5 85b26125038106fc3e5a46d1a3bd1f49 ChangeLog 12377 +MD5 68188201e3bb40b622a32d291a6c2fbe libxml2-2.6.11.ebuild 1661 +MD5 fd5c4829b374de7478ad8f71d9266ca4 libxml2-2.6.12.ebuild 1668 +MD5 4afb16d8cb0b1a2206bb115b129c819c libxml2-2.6.15-r1.ebuild 1805 +MD5 864297613eab841b3e6896145930ed4d libxml2-2.6.6.ebuild 1890 +MD5 57aa74726020ca14a295679cf8be6259 libxml2-2.6.7.ebuild 1886 +MD5 c1428b305a81205bc7f99d81cbbe35bc libxml2-2.6.9.ebuild 1947 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 +MD5 ab54dd03cc61e429964234c09323d522 libxml2-2.6.16.ebuild 1758 +MD5 58ae52ba5b2d6b7aed29f8a08b324d2c files/digest-libxml2-2.6.11 68 +MD5 fa747ea5704458d21c71742d5bd870d4 files/digest-libxml2-2.6.12 68 +MD5 e7fb4717d64a8f4b7c4f35a6924bdbd4 files/digest-libxml2-2.6.15-r1 68 MD5 df8aa422d2ef75d0fbb2dfd7e3691d2c files/digest-libxml2-2.6.6 67 MD5 e1d3673ddc47844934e0894da13d7c31 files/digest-libxml2-2.6.7 67 MD5 02c6697e95e4ac68f27f42bc47bd211b files/digest-libxml2-2.6.9 67 MD5 6f985801b3703cf758165d018cad9132 files/libxml2-2.6.15-reverse_error.patch 670 -MD5 e7fb4717d64a8f4b7c4f35a6924bdbd4 files/digest-libxml2-2.6.15-r1 68 -MD5 58ae52ba5b2d6b7aed29f8a08b324d2c files/digest-libxml2-2.6.11 68 -MD5 fa747ea5704458d21c71742d5bd870d4 files/digest-libxml2-2.6.12 68 MD5 ff7efcdcc2a364b0eeca271ef52566f8 files/digest-libxml2-2.6.16 68 +MD5 3451360f628f1e2dc20813a52fbaa404 files/libxml2-2.6.16-xlattable.patch 537 diff --git a/dev-libs/libxml2/files/libxml2-2.6.16-xlattable.patch b/dev-libs/libxml2/files/libxml2-2.6.16-xlattable.patch new file mode 100644 index 000000000000..7fdd306debb2 --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.6.16-xlattable.patch @@ -0,0 +1,17 @@ +=================================================================== +RCS file: /cvs/gnome/libxml2/encoding.c,v +retrieving revision 1.87 +retrieving revision 1.88 +diff -u -r1.87 -r1.88 +--- encoding.c 2004/11/06 13:26:59 1.87 ++++ encoding.c 2004/11/11 20:42:04 1.88 +@@ -2335,7 +2335,7 @@ + unsigned int c; + + if ((out == NULL) || (outlen == NULL) || (inlen == NULL) || +- (in == NULL) || (xlattable == NULL)) ++ (in == NULL) || (unicodetable == NULL)) + return(-1); + outend = out + *outlen; + inend = in + *inlen; + diff --git a/dev-libs/libxml2/libxml2-2.6.11.ebuild b/dev-libs/libxml2/libxml2-2.6.11.ebuild index 93d63ac022e3..72ff1cac3a08 100644 --- a/dev-libs/libxml2/libxml2-2.6.11.ebuild +++ b/dev-libs/libxml2/libxml2-2.6.11.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.11.ebuild,v 1.8 2004/09/19 08:04:24 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.11.ebuild,v 1.9 2005/01/03 21:48:03 joem Exp $ inherit libtool gnome.org flag-o-matic gnuconfig diff --git a/dev-libs/libxml2/libxml2-2.6.12.ebuild b/dev-libs/libxml2/libxml2-2.6.12.ebuild index c78906921756..21ac0e2d5572 100644 --- a/dev-libs/libxml2/libxml2-2.6.12.ebuild +++ b/dev-libs/libxml2/libxml2-2.6.12.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.12.ebuild,v 1.2 2004/08/27 20:40:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.12.ebuild,v 1.3 2005/01/03 21:48:03 joem Exp $ inherit libtool gnome.org flag-o-matic gnuconfig diff --git a/dev-libs/libxml2/libxml2-2.6.15-r1.ebuild b/dev-libs/libxml2/libxml2-2.6.15-r1.ebuild index a165733e9a04..77863f1636d5 100644 --- a/dev-libs/libxml2/libxml2-2.6.15-r1.ebuild +++ b/dev-libs/libxml2/libxml2-2.6.15-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.15-r1.ebuild,v 1.10 2004/11/30 19:36:26 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.15-r1.ebuild,v 1.11 2005/01/03 21:48:03 joem Exp $ inherit libtool gnome.org flag-o-matic gnuconfig eutils diff --git a/dev-libs/libxml2/libxml2-2.6.16.ebuild b/dev-libs/libxml2/libxml2-2.6.16.ebuild index 70d1bf8031f1..488b2eef4e5e 100644 --- a/dev-libs/libxml2/libxml2-2.6.16.ebuild +++ b/dev-libs/libxml2/libxml2-2.6.16.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.16.ebuild,v 1.1 2004/12/11 04:52:13 obz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.16.ebuild,v 1.2 2005/01/03 21:48:03 joem Exp $ inherit libtool gnome.org flag-o-matic gnuconfig @@ -37,6 +37,9 @@ src_compile() { # (libgnomeprint for instance fails to compile with # fresh install, and existing) - (22 Dec 2002). + #see bug #76447 + epatch ${FILESDIR}/${P}-xlattable.patch + econf --with-zlib \ $(use_with python) \ $(use_with readline) \ diff --git a/dev-libs/libxml2/libxml2-2.6.6.ebuild b/dev-libs/libxml2/libxml2-2.6.6.ebuild index e622dc8a8fc3..93ef6c07004c 100644 --- a/dev-libs/libxml2/libxml2-2.6.6.ebuild +++ b/dev-libs/libxml2/libxml2-2.6.6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.6.ebuild,v 1.8 2004/08/27 20:40:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.6.ebuild,v 1.9 2005/01/03 21:48:03 joem Exp $ inherit libtool gnome.org flag-o-matic gnuconfig diff --git a/dev-libs/libxml2/libxml2-2.6.7.ebuild b/dev-libs/libxml2/libxml2-2.6.7.ebuild index 9742439b7409..aad651bd75fa 100644 --- a/dev-libs/libxml2/libxml2-2.6.7.ebuild +++ b/dev-libs/libxml2/libxml2-2.6.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.7.ebuild,v 1.10 2004/07/27 05:48:43 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.7.ebuild,v 1.11 2005/01/03 21:48:03 joem Exp $ inherit libtool gnome.org flag-o-matic gnuconfig diff --git a/dev-libs/libxml2/libxml2-2.6.9.ebuild b/dev-libs/libxml2/libxml2-2.6.9.ebuild index 1936b5cb6a2a..e56d2c1835dd 100644 --- a/dev-libs/libxml2/libxml2-2.6.9.ebuild +++ b/dev-libs/libxml2/libxml2-2.6.9.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.9.ebuild,v 1.6 2004/07/27 05:48:43 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.9.ebuild,v 1.7 2005/01/03 21:48:03 joem Exp $ inherit libtool gnome.org flag-o-matic gnuconfig