Patch to fix undefined var, bug #76447

9 files changed, 40 insertions, 16 deletions

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 <joem@gentoo.org>
+  +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/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) - <azarah@gentoo.org> (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