Attachment 186466 Details for Bug 222400 – Build with Xerces-C 3.1 or 3.2

[patch] Build with Xerces-C 3.1 or 3.2

0004-textproc-xqilla-Patch-to-replace-use-of-internal-Xer.patch (text/plain), 3.10 KB, created by Roger Leigh on 2017-09-17 13:28:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roger Leigh

Created: 2017-09-17 13:28:53 UTC

Size: 3.10 KB

patch

obsolete

>From bf7b04fea8ed260fdf62299ce8a6e08a09b69bd5 Mon Sep 17 00:00:00 2001
>From: Roger Leigh <rleigh@codelibre.net>
>Date: Sat, 2 Sep 2017 09:41:05 +0100
>Subject: [PATCH 04/13] textproc/xqilla: Patch to replace use of internal
> Xerces casts with new public methods
>
>---
> .../patch-src_dom-api_impl_XPathDocumentImpl.cpp   | 14 ++++++++
> .../patch-src_dom-api_impl_XPathNamespaceImpl.cpp  | 41 ++++++++++++++++++++++
> 2 files changed, 55 insertions(+)
> create mode 100644 textproc/xqilla/files/patch-src_dom-api_impl_XPathDocumentImpl.cpp
> create mode 100644 textproc/xqilla/files/patch-src_dom-api_impl_XPathNamespaceImpl.cpp
>
>diff --git a/textproc/xqilla/files/patch-src_dom-api_impl_XPathDocumentImpl.cpp b/textproc/xqilla/files/patch-src_dom-api_impl_XPathDocumentImpl.cpp
>new file mode 100644
>index 000000000000..27839ca27557
>--- /dev/null
>+++ b/textproc/xqilla/files/patch-src_dom-api_impl_XPathDocumentImpl.cpp
>@@ -0,0 +1,14 @@
>+--- 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());
>+ 
>diff --git a/textproc/xqilla/files/patch-src_dom-api_impl_XPathNamespaceImpl.cpp b/textproc/xqilla/files/patch-src_dom-api_impl_XPathNamespaceImpl.cpp
>new file mode 100644
>index 000000000000..041e925009df
>--- /dev/null
>+++ b/textproc/xqilla/files/patch-src_dom-api_impl_XPathNamespaceImpl.cpp
>@@ -0,0 +1,41 @@
>+--- 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
>-- 
>2.14.1
>

Actions: View | Diff

Attachments on bug 222400: 186466 | 188983