Attachment #188983 for bug #222400

Lines 3-9 Link Here

(-)Makefile (-3 / +1 lines)
3		3
4	PORTNAME= xqilla	4	PORTNAME= xqilla
5	PORTVERSION= 2.3.3	5	PORTVERSION= 2.3.3
6	PORTEPOCH= 1	6	PORTEPOCH= 2
7	CATEGORIES= textproc	7	CATEGORIES= textproc
8	MASTER_SITES= SF/${PORTNAME}	8	MASTER_SITES= SF/${PORTNAME}
9	DISTNAME= XQilla-${PORTVERSION}	9	DISTNAME= XQilla-${PORTVERSION}
Lines 14-21 Link Here
14	LICENSE= APACHE20	14	LICENSE= APACHE20
15	LICENSE_FILE= ${WRKSRC}/LICENSE	15	LICENSE_FILE= ${WRKSRC}/LICENSE
16		16
17	BROKEN= fails to build
18
19	LIB_DEPENDS= libxerces-c.so:textproc/xerces-c3 \	17	LIB_DEPENDS= libxerces-c.so:textproc/xerces-c3 \
20	libtidy.so:www/tidy-lib	18	libtidy.so:www/tidy-lib
21		19




--- src/dom-api/impl/XPathDocumentImpl.cpp.orig	2017-09-03 19:24:35 UTC
+++ src/dom-api/impl/XPathDocumentImpl.cpp
@@ -62,7 +62,11 @@ DOMNode *XPathDocumentImpl::insertBefore
     if (thisNodeImpl->isReadOnly())
         throw DOMException(DOMException::NO_MODIFICATION_ALLOWED_ERR, 0, getMemoryManager());
 
+#if _XERCES_VERSION >= 30200
+    DOMNode* thisNode = fParent.fContainingNode;
+#else
     DOMNode* thisNode = castToNode(&fParent);
+#endif
     if (newChild->getOwnerDocument() != thisNode)
         throw DOMException(DOMException::WRONG_DOCUMENT_ERR, 0, getMemoryManager());
 




--- src/dom-api/impl/XPathNamespaceImpl.cpp.orig	2017-09-03 20:26:37 UTC
+++ src/dom-api/impl/XPathNamespaceImpl.cpp
@@ -33,7 +33,11 @@ XERCES_CPP_NAMESPACE_USE;
 
 XPathNamespaceImpl::XPathNamespaceImpl(const XMLCh* const nsPrefix, 
 		const XMLCh* const nsUri, DOMElement *owner, DOMDocument *docOwner) 
+#if _XERCES_VERSION >= 30200 
+	: fNode(this, docOwner)
+#else
 	: fNode(docOwner)
+#endif
 {
     DOMNodeImpl *argImpl = castToNodeImpl(this);
 
@@ -54,7 +58,13 @@ XPathNamespaceImpl::XPathNamespaceImpl(c
 }
 
 XPathNamespaceImpl::XPathNamespaceImpl(const XPathNamespaceImpl &other) 
-	: fNode(other.fNode), uri(other.uri), prefix(other.prefix)
+#if _XERCES_VERSION >= 30200 
+	: fNode(this, other.fNode),
+#else
+	: fNode(other.fNode), 
+
+#endif
+	  uri(other.uri), prefix(other.prefix)
 {
 }
 
@@ -196,7 +206,11 @@ short            XPathNamespaceImpl::com
 
     //if it is a custom node and bigger than us we must ask it for the order
     if(otherType > DOMXPathNamespace::XPATH_NAMESPACE_NODE) {
+#if _XERCES_VERSION >= 30200 
+        DOMNodeImpl tmp(const_cast<XPathNamespaceImpl *>(this), 0);
+#else
         DOMNodeImpl tmp(0);
+#endif
 #if _XERCES_VERSION >= 30000
         return tmp.reverseTreeOrderBitPattern(other->compareDocumentPosition(this));
 #else

Return to bug 222400

Line 0 Link Here

(-)files/patch-src_dom-api_impl_XPathDocumentImpl.cpp (+14 lines)
	1	--- src/dom-api/impl/XPathDocumentImpl.cpp.orig 2017-09-03 19:24:35 UTC
	2	+++ src/dom-api/impl/XPathDocumentImpl.cpp
	3	@@ -62,7 +62,11 @@ DOMNode *XPathDocumentImpl::insertBefore
	4	if (thisNodeImpl->isReadOnly())
	5	throw DOMException(DOMException::NO_MODIFICATION_ALLOWED_ERR, 0, getMemoryManager());
	6
	7	+#if _XERCES_VERSION >= 30200
	8	+ DOMNode* thisNode = fParent.fContainingNode;
	9	+#else
	10	DOMNode* thisNode = castToNode(&fParent);
	11	+#endif
	12	if (newChild->getOwnerDocument() != thisNode)
	13	throw DOMException(DOMException::WRONG_DOCUMENT_ERR, 0, getMemoryManager());
	14

Line 0 Link Here

(-)files/patch-src_dom-api_impl_XPathNamespaceImpl.cpp (+41 lines)
	1	--- src/dom-api/impl/XPathNamespaceImpl.cpp.orig 2017-09-03 20:26:37 UTC
	2	+++ src/dom-api/impl/XPathNamespaceImpl.cpp
	3	@@ -33,7 +33,11 @@ XERCES_CPP_NAMESPACE_USE;
	4
	5	XPathNamespaceImpl::XPathNamespaceImpl(const XMLCh* const nsPrefix,
	6	const XMLCh* const nsUri, DOMElement owner, DOMDocument docOwner)
	7	+#if _XERCES_VERSION >= 30200
	8	+ : fNode(this, docOwner)
	9	+#else
	10	: fNode(docOwner)
	11	+#endif
	12	{
	13	DOMNodeImpl *argImpl = castToNodeImpl(this);
	14
	15	@@ -54,7 +58,13 @@ XPathNamespaceImpl::XPathNamespaceImpl(c
	16	}
	17
	18	XPathNamespaceImpl::XPathNamespaceImpl(const XPathNamespaceImpl &other)
	19	- : fNode(other.fNode), uri(other.uri), prefix(other.prefix)
	20	+#if _XERCES_VERSION >= 30200
	21	+ : fNode(this, other.fNode),
	22	+#else
	23	+ : fNode(other.fNode),
	24	+
	25	+#endif
	26	+ uri(other.uri), prefix(other.prefix)
	27	{
	28	}
	29
	30	@@ -196,7 +206,11 @@ short XPathNamespaceImpl::com
	31
	32	//if it is a custom node and bigger than us we must ask it for the order
	33	if(otherType > DOMXPathNamespace::XPATH_NAMESPACE_NODE) {
	34	+#if _XERCES_VERSION >= 30200
	35	+ DOMNodeImpl tmp(const_cast<XPathNamespaceImpl *>(this), 0);
	36	+#else
	37	DOMNodeImpl tmp(0);
	38	+#endif
	39	#if _XERCES_VERSION >= 30000
	40	return tmp.reverseTreeOrderBitPattern(other->compareDocumentPosition(this));
	41	#else