Attachment 188983 Details for Bug 222400 – svn-diff-xqilla

[patch] svn-diff-xqilla

svn-diff-textproc_xqilla (text/plain), 3.63 KB, created by Walter Schwarzenfeld on 2017-12-20 01:11:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2017-12-20 01:11:28 UTC

Size: 3.63 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 456770)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	xqilla
> PORTVERSION=	2.3.3
>-PORTEPOCH=	1
>+PORTEPOCH=	2
> CATEGORIES=	textproc
> MASTER_SITES=	SF/${PORTNAME}
> DISTNAME=	XQilla-${PORTVERSION}
>@@ -14,8 +14,6 @@
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BROKEN=		fails to build
>-
> LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3 \
> 		libtidy.so:www/tidy-lib
> 
>Index: files/patch-src_dom-api_impl_XPathDocumentImpl.cpp
>===================================================================
>--- files/patch-src_dom-api_impl_XPathDocumentImpl.cpp	(nonexistent)
>+++ files/patch-src_dom-api_impl_XPathDocumentImpl.cpp	(working copy)
>@@ -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());
>+ 
>
>Property changes on: files/patch-src_dom-api_impl_XPathDocumentImpl.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_dom-api_impl_XPathNamespaceImpl.cpp
>===================================================================
>--- files/patch-src_dom-api_impl_XPathNamespaceImpl.cpp	(nonexistent)
>+++ files/patch-src_dom-api_impl_XPathNamespaceImpl.cpp	(working copy)
>@@ -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
>
>Property changes on: files/patch-src_dom-api_impl_XPathNamespaceImpl.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 222400: 186466 | 188983