Added patch to fix compilation problems with Xalan-C-1.11

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 133 insertions, 5 deletions

diff --git a/dev-libs/xml-security-c/ChangeLog b/dev-libs/xml-security-c/ChangeLog
index 181f6c774168..133ba6c1f595 100644
--- a/dev-libs/xml-security-c/ChangeLog
+++ b/dev-libs/xml-security-c/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/xml-security-c
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xml-security-c/ChangeLog,v 1.1 2009/07/24 05:16:43 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xml-security-c/ChangeLog,v 1.2 2009/07/27 09:54:18 dev-zero Exp $
+
+  27 Jul 2009; Tiziano Müller <dev-zero@gentoo.org>
+  xml-security-c-1.5.1.ebuild, +files/1.5.1-xalan-c-1.11-compat.patch:
+  Added patch to fix compilation problems with Xalan-C-1.11
 
 *xml-security-c-1.5.1 (24 Jul 2009)
 
diff --git a/dev-libs/xml-security-c/Manifest b/dev-libs/xml-security-c/Manifest
index 3cc95df18085..7f5c2acc8fac 100644
--- a/dev-libs/xml-security-c/Manifest
+++ b/dev-libs/xml-security-c/Manifest
@@ -1,5 +1,6 @@
 AUX 1.5.1-parallel_build.patch 631 RMD160 e42186615618834a43674e71abb309d46a5ad0e7 SHA1 7d49e2b1725c0ed44e2f61743af1ee720c4ce4c2 SHA256 5985d4b938482cc6ae77c7bc172629c8db19d52af3891fae3db57d3668aba8e7
+AUX 1.5.1-xalan-c-1.11-compat.patch 4253 RMD160 7de24ada79101939d358d61a2678cfd4acb25b83 SHA1 891f87019832759168fb34231b4045f03b410ae3 SHA256 0d831873096732a83ad0f6d8adcce2f14e9d08c3a89c9932680f4aa5066f2853
 DIST xml-security-c-1.5.1.tar.gz 957928 RMD160 eadeb25398d6a0fa6cd22d531470bc1dea1632d3 SHA1 e51d3dca7f32cfcc2090d4d20cf8a1d032d95d79 SHA256 f31d7efbc1a2d708e82fb7237dca29e4e5552d8a4ca510cfe94c9998055b801f
-EBUILD xml-security-c-1.5.1.ebuild 1055 RMD160 726588a254db34a1d575c6829d74a74e7670f62f SHA1 2f45cebb99ece80c042c4e8edd06bc22b3ca7e76 SHA256 490d0a5f7aaeaa37162e71dd8a092ddfd4f40d7748a330a37fe4ae296fa64334
-MISC ChangeLog 1406 RMD160 8eae8d2f454329b6746997f2f877288c69eee7b0 SHA1 0baa510a919caf8b251c1d7239ff7f0d91e4af60 SHA256 a533d4a303384f91290a00ea78b16de95a1cd47579ac54a6474143f14c6084a7
+EBUILD xml-security-c-1.5.1.ebuild 1105 RMD160 88f18c56c6bbc2a0e998915ba757474913b1636d SHA1 04c20f8a18b0eaebaa6c43ea06ae072e23e5dff7 SHA256 07baa59909cdc2f2ca899ed0be0d5a45927bd97b9318c00d4d25885afa457ed4
+MISC ChangeLog 1591 RMD160 556aa106ba86e2fdaa5c328a7b3e2fc46283ba56 SHA1 e66b91a5dd03991714deb8a320c2af407d40859a SHA256 239c2e055a4daea47c91d9ada30cf60726ec435b7c4496e5998d63cc4d706962
 MISC metadata.xml 276 RMD160 4b34094c4f5f930768d5f21f2206192c7a22a216 SHA1 ab4ba1fa7738db06567d9730e386967586a17793 SHA256 dcf353b030366f8e1ce5b6a0daefcdd5286b7a1d44920a8fd1f0cfa2b0222d56
diff --git a/dev-libs/xml-security-c/files/1.5.1-xalan-c-1.11-compat.patch b/dev-libs/xml-security-c/files/1.5.1-xalan-c-1.11-compat.patch
new file mode 100644
index 000000000000..b5d142415845
--- /dev/null
+++ b/dev-libs/xml-security-c/files/1.5.1-xalan-c-1.11-compat.patch
@@ -0,0 +1,122 @@
+diff -Naur xml-security-c-1.5.1.orig/src/canon/XSECC14n20010315.cpp xml-security-c-1.5.1/src/canon/XSECC14n20010315.cpp
+--- xml-security-c-1.5.1.orig/src/canon/XSECC14n20010315.cpp	2009-07-27 09:23:51.228693118 +0200
++++ xml-security-c-1.5.1/src/canon/XSECC14n20010315.cpp	2009-07-27 11:37:12.697101082 +0200
+@@ -36,6 +36,7 @@
+ // Xerces includes
+ #include <xercesc/dom/DOMNamedNodeMap.hpp>
+ #include <xercesc/util/XMLUniDefs.hpp>
++#include <xercesc/dom/DOMElement.hpp>
+ 
+ XERCES_CPP_NAMESPACE_USE
+ 
+@@ -61,7 +62,7 @@
+ XALAN_USING_XALAN(NodeRefList)
+ XALAN_USING_XALAN(XercesDocumentWrapper)
+ XALAN_USING_XALAN(XercesWrapperNavigator)
+-
++XALAN_USING_XALAN(c_wstr)
+ 
+ #endif
+ 
+@@ -450,21 +451,27 @@
+ 
+ 	// We use Xalan to process the Xerces DOM tree and get the XPath nodes
+ 
++#if XALAN_VERSION_MAJOR == 1 && XALAN_VERSION_MINOR > 10
++	XercesParserLiaison theParserLiaison;
++	XercesDOMSupport theDOMSupport(theParserLiaison);
++#else
+ 	XercesDOMSupport theDOMSupport;
+ #if defined XSEC_XERCESPARSERLIAISON_REQS_DOMSUPPORT
+ 	XercesParserLiaison theParserLiaison(theDOMSupport);
+ #else
+ 	XercesParserLiaison theParserLiaison;
+ #endif
++#endif // XALAN_VERSION_MAJOR == 1 && XALAN_VERSION_MINOR > 10
+ 
+ 	if (mp_doc == 0) {
+ 		throw XSECException(XSECException::UnsupportedFunction,
+ 			"XPath selection only supported in C14n for full documents");
+ 	}
+-	XalanDocument* theDoc = theParserLiaison.createDocument(mp_doc);
+ 
+-	XalanElement * xe = theDoc->createElement(XalanDOMString("ns"));
+-	xe->setAttribute(/*XalanDOMString(""), */XalanDOMString("xmlns:ietf"), XalanDOMString("http://www.ietf.org"));
++	DOMElement* theXercesNode = mp_doc->createElement(c_wstr(XalanDOMString("ns")));
++	theXercesNode->setAttribute(c_wstr(XalanDOMString("xmlns:ietf")), c_wstr(XalanDOMString("http://www.ietf.org")));
++
++	XalanDocument* theDoc = theParserLiaison.createDocument(mp_doc);
+ 
+ 	// Set up the XPath evaluator
+ 
+@@ -505,7 +512,7 @@
+ 		theDOMSupport,
+ 		theContextNode,
+ 		expr,
+-		xe));
++		theDoc->getElementById(XalanDOMString("ns"))));
+ 
+ #else
+ 
+@@ -514,7 +521,7 @@
+ 		theDOMSupport,
+ 		theContextNode,
+ 		expr,
+-		xe));
++		theDoc->getElementById(XalanDOMString("ns"))));
+ 		//theDoc->getDocumentElement()));
+ #endif
+ 
+diff -Naur xml-security-c-1.5.1.orig/src/transformers/TXFMXPath.cpp xml-security-c-1.5.1/src/transformers/TXFMXPath.cpp
+--- xml-security-c-1.5.1.orig/src/transformers/TXFMXPath.cpp	2009-07-27 09:23:51.254551633 +0200
++++ xml-security-c-1.5.1/src/transformers/TXFMXPath.cpp	2009-07-27 11:40:30.923733630 +0200
+@@ -283,8 +283,12 @@
+ 	setXPathNS(document, XPathAtts, addedNodes, formatter, mp_nse);
+ 
+ 	XPathProcessorImpl	xppi;					// The processor
+-	XercesDOMSupport	xds;
+ 	XercesParserLiaison xpl;
++#if XALAN_VERSION_MAJOR == 1 && XALAN_VERSION_MINOR > 10
++	XercesDOMSupport	xds(xpl);
++#else
++	XercesDOMSupport	xds;
++#endif
+ 	XPathEvaluator		xpe;
+ 	XPathFactoryDefault xpf;
+ 	XPathConstructionContextDefault xpcc;
+diff -Naur xml-security-c-1.5.1.orig/src/transformers/TXFMXPathFilter.cpp xml-security-c-1.5.1/src/transformers/TXFMXPathFilter.cpp
+--- xml-security-c-1.5.1.orig/src/transformers/TXFMXPathFilter.cpp	2009-07-27 09:23:51.254551633 +0200
++++ xml-security-c-1.5.1/src/transformers/TXFMXPathFilter.cpp	2009-07-27 11:39:11.073713584 +0200
+@@ -183,8 +183,12 @@
+ 	setXPathNS(document, expr->mp_NSMap, addedNodes, mp_formatter, mp_nse);
+ 
+ 	XPathProcessorImpl	xppi;					// The processor
+-	XercesDOMSupport	xds;
+ 	XercesParserLiaison xpl;
++#if XALAN_VERSION_MAJOR == 1 && XALAN_VERSION_MINOR > 10
++	XercesDOMSupport	xds(xpl);
++#else
++	XercesDOMSupport	xds;
++#endif
+ 	XPathEvaluator		xpe;
+ 	XPathFactoryDefault xpf;
+ 	XPathConstructionContextDefault xpcc;
+diff -Naur xml-security-c-1.5.1.orig/src/transformers/TXFMXSL.cpp xml-security-c-1.5.1/src/transformers/TXFMXSL.cpp
+--- xml-security-c-1.5.1.orig/src/transformers/TXFMXSL.cpp	2009-07-27 09:23:51.257885228 +0200
++++ xml-security-c-1.5.1/src/transformers/TXFMXSL.cpp	2009-07-27 11:42:31.867031516 +0200
+@@ -102,11 +102,15 @@
+ 
+ TXFMXSL::TXFMXSL(DOMDocument *doc) : 
+ 	TXFMBase(doc),
++#if XALAN_VERSION_MAJOR == 1 && XALAN_VERSION_MINOR > 10
++xds(xpl)
++#else
+ #if defined XSEC_XERCESPARSERLIAISON_REQS_DOMSUPPORT
+ xpl(xds) 
+ #else
+ xpl()
+ #endif
++#endif
+ {
+ 
+ 	// Zeroise all the pointers
diff --git a/dev-libs/xml-security-c/xml-security-c-1.5.1.ebuild b/dev-libs/xml-security-c/xml-security-c-1.5.1.ebuild
index 2c6c662b67f9..1eacba471651 100644
--- a/dev-libs/xml-security-c/xml-security-c-1.5.1.ebuild
+++ b/dev-libs/xml-security-c/xml-security-c-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xml-security-c/xml-security-c-1.5.1.ebuild,v 1.1 2009/07/24 05:16:43 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xml-security-c/xml-security-c-1.5.1.ebuild,v 1.2 2009/07/27 09:54:18 dev-zero Exp $
 
 EAPI="2"
 
@@ -22,7 +22,8 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}/${PV}-parallel_build.patch"
+		"${FILESDIR}/${PV}-parallel_build.patch" \
+		"${FILESDIR}/${PV}-xalan-c-1.11-compat.patch"
 
 	# script checks for autoconf for no reason
 	sed -i \