Fix building against libxml2[icu], bug #356095 by Joaquim Uchoa. Thanks a lot to yury fedorchenko for the patch.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 69 insertions, 11 deletions

diff --git a/x11-libs/gtkmathview/ChangeLog b/x11-libs/gtkmathview/ChangeLog
index f860e0164e6b..4e9558af0e38 100644
--- a/x11-libs/gtkmathview/ChangeLog
+++ b/x11-libs/gtkmathview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtkmathview
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview/ChangeLog,v 1.36 2011/02/04 11:20:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview/ChangeLog,v 1.37 2011/03/06 13:13:51 pacho Exp $
+
+  06 Mar 2011; Pacho Ramos <pacho@gentoo.org> gtkmathview-0.8.0.ebuild,
+  +files/gtkmathview-0.8.0-fix-template.patch:
+  Fix building against libxml2[icu], bug #356095 by Joaquim Uchoa. Thanks a lot
+  to yury fedorchenko for the patch.
 
   04 Feb 2011; Pacho Ramos <pacho@gentoo.org> gtkmathview-0.8.0.ebuild,
   metadata.xml:
diff --git a/x11-libs/gtkmathview/Manifest b/x11-libs/gtkmathview/Manifest
index af2161f9e212..c7d070d8e197 100644
--- a/x11-libs/gtkmathview/Manifest
+++ b/x11-libs/gtkmathview/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX gtkmathview-0.8.0-cond-t1.patch 1270 RMD160 3a3cbeaa1882162116cb3e5b0ccb57f23341c6a8 SHA1 ef2e8ade3890fa682c47318483482fc3971261e5 SHA256 731894b852a8f692a3a1778bf6666a43e6afaa38e30b73d90272ae56d65bf709
+AUX gtkmathview-0.8.0-fix-template.patch 2209 RMD160 25dd051d49106f0bd2406a75fc6a5a657fd44980 SHA1 2d08f502427fec1b4e82b687018f61e04c52f680 SHA256 b5c43c185ec0920882eb8f27e46082baf32c0e9583c62bfc28d1c6a2ca4e0a7b
 AUX gtkmathview-0.8.0-gcc43.patch 2006 RMD160 bef4b3a2d9f93aa302b445c7a3157e3c1c786860 SHA1 6818e6d50d6bb739e0bcb9c89c879aebb730bee5 SHA256 3915f9f0d58e4eb5294b817bb5323cd9954676ff1044db3683fbaee94200688b
 AUX gtkmathview-0.8.0-gcc44.patch 259 RMD160 280e790b97442bee1c0f31d24961ebb5cea91762 SHA1 ea57cf665803d3bc901677d0a4df581a5676d433 SHA256 5972d8a65f1dc4253f83d082d3afc5d9dc36aa1d365bd66a0114834200d5adf5
 DIST gtkmathview-0.8.0.tar.gz 987328 RMD160 6ed60ee9253fd0fdd9bc595a9178ede5100e1644 SHA1 dc6db75a64b8dcde05185c3c54eec310dd7b14d6 SHA256 1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43
-EBUILD gtkmathview-0.8.0.ebuild 1521 RMD160 8bc0ff5f5b5f54a981958a79a1273bc5edbad02b SHA1 213f8bd50ad888433a3f6de8ffa2512d5fee64d8 SHA256 49ed228791c8e0f982c89ae7b271c8621d3abc368f0a5e95692bb65a0522acec
-MISC ChangeLog 5082 RMD160 963df2a7bad1aad8829a6e5034a374847b226be9 SHA1 05801f2baa5895f2ac71436d726d0d4730b53ba7 SHA256 33a8058d7f0180137c2a835ebd6f75f710bbcb93e0508966e749138d0bc75844
+EBUILD gtkmathview-0.8.0.ebuild 1624 RMD160 98399d419c3bfc611d84953eb8f9b1ab73d297e5 SHA1 267c172447b3e30f2efdad68d99b35d85927749f SHA256 65ac644fee9742e7136c467326f3f6c8eb12168002bf23cfc24e9b2c50a0e13e
+MISC ChangeLog 5319 RMD160 bdd332dbd44836c9bbccadf34c28a23604db2a33 SHA1 4baacbbc8f52920a81d6503d6e7aea8964cbc098 SHA256 cd746cc8976f632c2f73c0ded8ff5531a81716f90cfab2b6fb01b1b5de3a8e96
 MISC metadata.xml 322 RMD160 93188106c96393134a42147325102285f84c2a34 SHA1 f2230e9e3e79fc0c31eb1e4eccf8cc79c095bb8a SHA256 704cac33a6aa221b157f52cbb9fd95cd46b8ba27e0b29a00f91f50c07e5200f5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1L4QgACgkQCaWpQKGI+9RmfQCeJbZRi2m3nuHU8PvTNtrxgzGn
-vBUAnjcmiDQ2EtaW15mlrFQxZc422WuP
-=UQYi
+iEYEARECAAYFAk1ziJUACgkQCaWpQKGI+9T4HACeNjI32WsGPOGYh2EzQ1i3IyED
+8qMAnjnhdWhb8KVJx2vLLlsFxhw5w8G9
+=dYjZ
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-fix-template.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-fix-template.patch
new file mode 100644
index 000000000000..3f566f7bf5f7
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-fix-template.patch
@@ -0,0 +1,49 @@
+diff -urN gtkmathview-0.8.0_old/src/widget/gtkmathview_common.h gtkmathview-0.8.0/src/widget/gtkmathview_common.h
+--- gtkmathview-0.8.0_old/src/widget/gtkmathview_common.h	2011-03-01 12:17:35.000000000 +0300
++++ gtkmathview-0.8.0/src/widget/gtkmathview_common.h	2011-03-01 12:25:00.000000000 +0300
+@@ -22,6 +22,20 @@
+ 
+ #include <gtk/gtkwidget.h>
+ 
++#if GTKMATHVIEW_USES_CUSTOM_READER
++#include "c_customXmlReader.h"
++#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##custom_reader
++#elif GTKMATHVIEW_USES_LIBXML2_READER
++#include <libxml/xmlreader.h>
++#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2_reader
++#elif GTKMATHVIEW_USES_LIBXML2
++#include <libxml/tree.h>
++#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2
++#elif GTKMATHVIEW_USES_GMETADOM
++#include <gdome.h>
++#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##gmetadom
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
+@@ -45,24 +59,16 @@
+   typedef void*                     GtkMathViewReaderData;
+ 
+ #if GTKMATHVIEW_USES_CUSTOM_READER
+-#include "c_customXmlReader.h"
+-#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##custom_reader
+   typedef void*                     GtkMathViewModelId;
+   typedef const char*               GtkMathViewModelString;
+ #elif GTKMATHVIEW_USES_LIBXML2_READER
+-#include <libxml/xmlreader.h>
+-#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2_reader
+   typedef void*                     GtkMathViewModelId;
+   typedef const xmlChar*            GtkMathViewModelString;
+ #elif GTKMATHVIEW_USES_LIBXML2
+-#include <libxml/tree.h>
+-#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2
+   typedef xmlElement*               GtkMathViewModelId;
+   typedef xmlDoc*                   GtkMathViewModelDocument;
+   typedef const xmlChar*            GtkMathViewModelString;
+ #elif GTKMATHVIEW_USES_GMETADOM
+-#include <gdome.h>
+-#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##gmetadom
+   typedef GdomeElement*             GtkMathViewModelId;
+   typedef GdomeDocument*            GtkMathViewModelDocument;
+   typedef GdomeDOMString*           GtkMathViewModelString;
diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0.ebuild
index 9a2a1a8e9007..2a84eee0e289 100644
--- a/x11-libs/gtkmathview/gtkmathview-0.8.0.ebuild
+++ b/x11-libs/gtkmathview/gtkmathview-0.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/x11-libs/gtkmathview/gtkmathview-0.8.0.ebuild,v 1.12 2011/02/04 11:20:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview/gtkmathview-0.8.0.ebuild,v 1.13 2011/03/06 13:13:51 pacho Exp $
 
 EAPI="3"
 
@@ -18,13 +18,13 @@ IUSE="gtk mathml svg t1lib"
 
 RDEPEND=">=dev-libs/glib-2.2.1:2
 	>=dev-libs/popt-1.7
-	>=dev-libs/libxml2-2.6.7
+	>=dev-libs/libxml2-2.6.7:2
 	gtk? ( >=x11-libs/gtk+-2.2.1:2
-		>=media-libs/t1lib-5
+		>=media-libs/t1lib-5:5
 		>=dev-libs/gmetadom-0.1.8
 		x11-libs/pango )
 	mathml? ( media-fonts/texcm-ttf )
-	t1lib?	( >=media-libs/t1lib-5 )"
+	t1lib?	( >=media-libs/t1lib-5:5 )"
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig"
 
@@ -32,6 +32,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-gcc44.patch \
 		"${FILESDIR}"/${P}-cond-t1.patch
+
+	# Fix building against libxml2[icu], bug #356095
+	epatch "${FILESDIR}"/${P}-fix-template.patch
 }
 
 src_configure() {