pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/textproc/xqilla
Module Name: pkgsrc
Committed By: wiz
Date: Sun Oct 1 09:45:51 UTC 2017
Modified Files:
pkgsrc/textproc/xqilla: Makefile PLIST distinfo
Added Files:
pkgsrc/textproc/xqilla/patches:
patch-src_dom-api_impl_XPathDocumentImpl.cpp
patch-src_dom-api_impl_XPathNamespaceImpl.cpp
Removed Files:
pkgsrc/textproc/xqilla/patches:
patch-include_xqilla_framework_XPath2MemoryManager.hpp
patch-src_items_DatatypeFactoryTemplate.hpp
Log Message:
xqilla: update to 2.3.3.
version 2.3.3 (2015.07.07):
* Fixed a localization bug parsing floating point numbers.
* Added Visual Studio 2012 projects.
* Added Visual Studio 2008 projects.
* Removed Visual Studio 2005 and 2003 projects.
* Modified to build against Xerces-C 3.1.3.
version 2.3.2 (2015.07.07):
* XQilla can now be built with Visual Studios 2013.
version 2.3.1 (2015.05.18):
* Modified to build against Xerces-C 3.1.2.
* Added Visual Studio 2010 projects.
* Fixed a bug that could cause incorrect query results when combining
nested expressions and functions.
* Fixed a crash that could happen when XQilla is built with Visual
Studio 2010 or higher.
version 2.3.0 (2011.09.09):
* Added support for XQuery 3.0 version declarations.
* Updated to support XQuery 3.0 higher order functions, including
partial function application, function coercion, and function item
SequenceType checking.
* Implemented XQuery 3.0 FLWOR clause ordering.
* Implemented XQuery 3.0 FLWOR count clause.
* Implemented XQuery 3.0 extended typeswitch syntax.
* Implemented XQuery 3.0 namespace test and constructor.
* Implemented XQuery 3.0 private functions.
* Updated to the latest W3C XQuery Full Text syntax.
* Implemented Unicode word bounding and sentence bounding for XQuery
Full Text tokenization.
* Implemented XQuery Full Text case options.
* Implemented XQuery 1.0 second edition semantics for module import.
* Added the xqilla:explain() function to return the query plan of an
expression.
* Added xqilla:words() and xqilla:sentences() to perform Unicode word
and sentance boundary detection.
* Added xqilla:drop().
* Rewrote a number of the built-in XQuery functions in XQuery itself.
* Implemented constant time indexing into materialized sequences.
* Improved the efficiency of the tail call optimization code.
* Optimized boolean operators.
* Optimized DOMDocument::evaluate() calls.
* Fixed various bugs in static typing.
* Fixed various memory leaks in the DOM 3 API, and regular expressions.
* Fixed a bug that caused a crash when using huge integers.
* Modified to build against Xerces-C 3.1.1
* Added Visual Studio 2010 support.
* Build fix for AIX 5.3.
* Build fix for the clang++ compiler.
* Build fix for GCC 4.6.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/xqilla/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/textproc/xqilla/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/xqilla/distinfo
cvs rdiff -u -r1.1 -r0 \
pkgsrc/textproc/xqilla/patches/patch-include_xqilla_framework_XPath2MemoryManager.hpp
cvs rdiff -u -r0 -r1.1 \
pkgsrc/textproc/xqilla/patches/patch-src_dom-api_impl_XPathDocumentImpl.cpp \
pkgsrc/textproc/xqilla/patches/patch-src_dom-api_impl_XPathNamespaceImpl.cpp
cvs rdiff -u -r1.1.1.1 -r0 \
pkgsrc/textproc/xqilla/patches/patch-src_items_DatatypeFactoryTemplate.hpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/textproc/xqilla/Makefile
diff -u pkgsrc/textproc/xqilla/Makefile:1.2 pkgsrc/textproc/xqilla/Makefile:1.3
--- pkgsrc/textproc/xqilla/Makefile:1.2 Thu Oct 25 06:57:09 2012
+++ pkgsrc/textproc/xqilla/Makefile Sun Oct 1 09:45:50 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/10/25 06:57:09 asau Exp $
+# $NetBSD: Makefile,v 1.3 2017/10/01 09:45:50 wiz Exp $
-DISTNAME= XQilla-2.2.4
+DISTNAME= XQilla-2.3.3
PKGNAME= ${DISTNAME:tl}
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xqilla/}
@@ -10,7 +10,7 @@ HOMEPAGE= http://xqilla.sourceforge.net/
COMMENT= XQuery and XPath 2 processor
LICENSE= apache-2.0
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++11
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-xerces=${BUILDLINK_PREFIX.xerces-c}
Index: pkgsrc/textproc/xqilla/PLIST
diff -u pkgsrc/textproc/xqilla/PLIST:1.1.1.1 pkgsrc/textproc/xqilla/PLIST:1.2
--- pkgsrc/textproc/xqilla/PLIST:1.1.1.1 Wed Feb 23 08:34:14 2011
+++ pkgsrc/textproc/xqilla/PLIST Sun Oct 1 09:45:50 2017
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/02/23 08:34:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/10/01 09:45:50 wiz Exp $
bin/xqilla
include/xqc.h
include/xqilla/ast/ASTNode.hpp
include/xqilla/ast/ASTNodeImpl.hpp
-include/xqilla/ast/ConstantFoldingFunction.hpp
include/xqilla/ast/ContextTuple.hpp
include/xqilla/ast/ConvertFunctionArg.hpp
+include/xqilla/ast/CountTuple.hpp
include/xqilla/ast/ForTuple.hpp
include/xqilla/ast/LetTuple.hpp
include/xqilla/ast/LocationInfo.hpp
@@ -15,7 +15,6 @@ include/xqilla/ast/StaticAnalysis.hpp
include/xqilla/ast/StaticType.hpp
include/xqilla/ast/TupleNode.hpp
include/xqilla/ast/WhereTuple.hpp
-include/xqilla/ast/XPath1Compat.hpp
include/xqilla/ast/XQAnalyzeString.hpp
include/xqilla/ast/XQApplyTemplates.hpp
include/xqilla/ast/XQAtomize.hpp
@@ -34,13 +33,13 @@ include/xqilla/ast/XQEffectiveBooleanVal
include/xqilla/ast/XQElementConstructor.hpp
include/xqilla/ast/XQFunction.hpp
include/xqilla/ast/XQFunctionCall.hpp
+include/xqilla/ast/XQFunctionCoercion.hpp
include/xqilla/ast/XQFunctionConversion.hpp
include/xqilla/ast/XQFunctionDeref.hpp
include/xqilla/ast/XQFunctionRef.hpp
include/xqilla/ast/XQGlobalVariable.hpp
include/xqilla/ast/XQIf.hpp
include/xqilla/ast/XQInlineFunction.hpp
-include/xqilla/ast/XQInstanceOf.hpp
include/xqilla/ast/XQLiteral.hpp
include/xqilla/ast/XQMap.hpp
include/xqilla/ast/XQNamespaceBinding.hpp
@@ -49,6 +48,7 @@ include/xqilla/ast/XQNav.hpp
include/xqilla/ast/XQOperator.hpp
include/xqilla/ast/XQOrderingChange.hpp
include/xqilla/ast/XQPIConstructor.hpp
+include/xqilla/ast/XQPartialApply.hpp
include/xqilla/ast/XQPredicate.hpp
include/xqilla/ast/XQQuantified.hpp
include/xqilla/ast/XQReturn.hpp
@@ -60,7 +60,6 @@ include/xqilla/ast/XQTypeswitch.hpp
include/xqilla/ast/XQValidate.hpp
include/xqilla/ast/XQVariable.hpp
include/xqilla/axis/NodeTest.hpp
-include/xqilla/axis/SelfAxis.hpp
include/xqilla/context/Collation.hpp
include/xqilla/context/ContextHelpers.hpp
include/xqilla/context/DynamicContext.hpp
@@ -149,34 +148,36 @@ include/xqilla/fulltext/Match.hpp
include/xqilla/fulltext/TokenInfo.hpp
include/xqilla/fulltext/TokenStore.hpp
include/xqilla/fulltext/Tokenizer.hpp
+include/xqilla/functions/BuiltInModules.hpp
+include/xqilla/functions/EXSLTMathFunction.hpp
include/xqilla/functions/ExternalFunction.hpp
include/xqilla/functions/FuncFactory.hpp
+include/xqilla/functions/FuncFactoryTemplate.hpp
include/xqilla/functions/FunctionAbs.hpp
+include/xqilla/functions/FunctionAcos.hpp
include/xqilla/functions/FunctionAdjustDateTimeToTimezone.hpp
include/xqilla/functions/FunctionAdjustDateToTimezone.hpp
include/xqilla/functions/FunctionAdjustTimeToTimezone.hpp
include/xqilla/functions/FunctionAnalyzeString.hpp
-include/xqilla/functions/FunctionAvg.hpp
+include/xqilla/functions/FunctionAsin.hpp
+include/xqilla/functions/FunctionAtan.hpp
include/xqilla/functions/FunctionBaseURI.hpp
-include/xqilla/functions/FunctionBoolean.hpp
+include/xqilla/functions/FunctionCaseFold.hpp
include/xqilla/functions/FunctionCeiling.hpp
-include/xqilla/functions/FunctionCodepointEqual.hpp
include/xqilla/functions/FunctionCodepointsToString.hpp
include/xqilla/functions/FunctionCollection.hpp
include/xqilla/functions/FunctionCompare.hpp
include/xqilla/functions/FunctionConcat.hpp
-include/xqilla/functions/FunctionConstructor.hpp
include/xqilla/functions/FunctionContains.hpp
+include/xqilla/functions/FunctionCos.hpp
include/xqilla/functions/FunctionCount.hpp
include/xqilla/functions/FunctionCurrentDate.hpp
include/xqilla/functions/FunctionCurrentDateTime.hpp
include/xqilla/functions/FunctionCurrentTime.hpp
-include/xqilla/functions/FunctionData.hpp
include/xqilla/functions/FunctionDateTime.hpp
include/xqilla/functions/FunctionDayFromDate.hpp
include/xqilla/functions/FunctionDayFromDateTime.hpp
include/xqilla/functions/FunctionDaysFromDuration.hpp
-include/xqilla/functions/FunctionDeepEqual.hpp
include/xqilla/functions/FunctionDefaultCollation.hpp
include/xqilla/functions/FunctionDistinctValues.hpp
include/xqilla/functions/FunctionDoc.hpp
@@ -184,35 +185,28 @@ include/xqilla/functions/FunctionDocAvai
include/xqilla/functions/FunctionDocument.hpp
include/xqilla/functions/FunctionDocumentURI.hpp
include/xqilla/functions/FunctionEmpty.hpp
-include/xqilla/functions/FunctionEncodeForUri.hpp
include/xqilla/functions/FunctionEndsWith.hpp
include/xqilla/functions/FunctionError.hpp
-include/xqilla/functions/FunctionEscapeHtmlUri.hpp
-include/xqilla/functions/FunctionExactlyOne.hpp
-include/xqilla/functions/FunctionExists.hpp
-include/xqilla/functions/FunctionFalse.hpp
+include/xqilla/functions/FunctionExp.hpp
+include/xqilla/functions/FunctionExplain.hpp
include/xqilla/functions/FunctionFloor.hpp
include/xqilla/functions/FunctionFunctionArity.hpp
include/xqilla/functions/FunctionFunctionName.hpp
+include/xqilla/functions/FunctionHead.hpp
include/xqilla/functions/FunctionHoursFromDateTime.hpp
include/xqilla/functions/FunctionHoursFromDuration.hpp
include/xqilla/functions/FunctionHoursFromTime.hpp
include/xqilla/functions/FunctionId.hpp
include/xqilla/functions/FunctionIdref.hpp
include/xqilla/functions/FunctionImplicitTimezone.hpp
-include/xqilla/functions/FunctionInScopePrefixes.hpp
-include/xqilla/functions/FunctionIndexOf.hpp
-include/xqilla/functions/FunctionInsertBefore.hpp
-include/xqilla/functions/FunctionIriToUri.hpp
include/xqilla/functions/FunctionLang.hpp
include/xqilla/functions/FunctionLast.hpp
include/xqilla/functions/FunctionLocalNameFromQName.hpp
include/xqilla/functions/FunctionLocalname.hpp
+include/xqilla/functions/FunctionLog.hpp
include/xqilla/functions/FunctionLookup.hpp
include/xqilla/functions/FunctionLowerCase.hpp
include/xqilla/functions/FunctionMatches.hpp
-include/xqilla/functions/FunctionMax.hpp
-include/xqilla/functions/FunctionMin.hpp
include/xqilla/functions/FunctionMinutesFromDateTime.hpp
include/xqilla/functions/FunctionMinutesFromDuration.hpp
include/xqilla/functions/FunctionMinutesFromTime.hpp
@@ -220,7 +214,6 @@ include/xqilla/functions/FunctionMonthFr
include/xqilla/functions/FunctionMonthFromDateTime.hpp
include/xqilla/functions/FunctionMonthsFromDuration.hpp
include/xqilla/functions/FunctionName.hpp
-include/xqilla/functions/FunctionNamespaceURIForPrefix.hpp
include/xqilla/functions/FunctionNamespaceURIFromQName.hpp
include/xqilla/functions/FunctionNamespaceUri.hpp
include/xqilla/functions/FunctionNilled.hpp
@@ -229,53 +222,49 @@ include/xqilla/functions/FunctionNormali
include/xqilla/functions/FunctionNormalizeUnicode.hpp
include/xqilla/functions/FunctionNot.hpp
include/xqilla/functions/FunctionNumber.hpp
-include/xqilla/functions/FunctionOneOrMore.hpp
include/xqilla/functions/FunctionParseHTML.hpp
include/xqilla/functions/FunctionParseJSON.hpp
include/xqilla/functions/FunctionParseXML.hpp
-include/xqilla/functions/FunctionPartialApply.hpp
include/xqilla/functions/FunctionPosition.hpp
+include/xqilla/functions/FunctionPower.hpp
include/xqilla/functions/FunctionPrefixFromQName.hpp
include/xqilla/functions/FunctionQName.hpp
include/xqilla/functions/FunctionRegexGroup.hpp
-include/xqilla/functions/FunctionRemove.hpp
include/xqilla/functions/FunctionReplace.hpp
-include/xqilla/functions/FunctionResolveQName.hpp
include/xqilla/functions/FunctionResolveURI.hpp
-include/xqilla/functions/FunctionReverse.hpp
include/xqilla/functions/FunctionRoot.hpp
include/xqilla/functions/FunctionRound.hpp
include/xqilla/functions/FunctionRoundHalfToEven.hpp
include/xqilla/functions/FunctionSecondsFromDateTime.hpp
include/xqilla/functions/FunctionSecondsFromDuration.hpp
include/xqilla/functions/FunctionSecondsFromTime.hpp
+include/xqilla/functions/FunctionSentences.hpp
include/xqilla/functions/FunctionSerializeJSON.hpp
+include/xqilla/functions/FunctionSignature.hpp
+include/xqilla/functions/FunctionSin.hpp
+include/xqilla/functions/FunctionSqrt.hpp
include/xqilla/functions/FunctionStartsWith.hpp
include/xqilla/functions/FunctionStaticBaseURI.hpp
include/xqilla/functions/FunctionString.hpp
-include/xqilla/functions/FunctionStringJoin.hpp
include/xqilla/functions/FunctionStringLength.hpp
include/xqilla/functions/FunctionStringToCodepoints.hpp
-include/xqilla/functions/FunctionSubsequence.hpp
include/xqilla/functions/FunctionSubstring.hpp
-include/xqilla/functions/FunctionSubstringAfter.hpp
-include/xqilla/functions/FunctionSubstringBefore.hpp
-include/xqilla/functions/FunctionSum.hpp
+include/xqilla/functions/FunctionTail.hpp
+include/xqilla/functions/FunctionTan.hpp
include/xqilla/functions/FunctionTime.hpp
include/xqilla/functions/FunctionTimezoneFromDate.hpp
include/xqilla/functions/FunctionTimezoneFromDateTime.hpp
include/xqilla/functions/FunctionTimezoneFromTime.hpp
include/xqilla/functions/FunctionTokenize.hpp
include/xqilla/functions/FunctionTrace.hpp
-include/xqilla/functions/FunctionTranslate.hpp
-include/xqilla/functions/FunctionTrue.hpp
include/xqilla/functions/FunctionUnordered.hpp
include/xqilla/functions/FunctionUnparsedText.hpp
include/xqilla/functions/FunctionUpperCase.hpp
+include/xqilla/functions/FunctionWords.hpp
include/xqilla/functions/FunctionYearFromDate.hpp
include/xqilla/functions/FunctionYearFromDateTime.hpp
include/xqilla/functions/FunctionYearsFromDuration.hpp
-include/xqilla/functions/FunctionZeroOrOne.hpp
+include/xqilla/functions/RegExpFunction.hpp
include/xqilla/functions/XQUserFunction.hpp
include/xqilla/functions/XQillaFunction.hpp
include/xqilla/items/ATAnySimpleType.hpp
@@ -344,11 +333,11 @@ include/xqilla/operators/NotEquals.hpp
include/xqilla/operators/Or.hpp
include/xqilla/operators/OrderComparison.hpp
include/xqilla/operators/Plus.hpp
-include/xqilla/operators/Range.hpp
include/xqilla/operators/UnaryMinus.hpp
include/xqilla/operators/Union.hpp
include/xqilla/optimizer/ASTCopier.hpp
include/xqilla/optimizer/ASTReleaser.hpp
+include/xqilla/optimizer/ASTToXML.hpp
include/xqilla/optimizer/ASTVisitor.hpp
include/xqilla/optimizer/Optimizer.hpp
include/xqilla/optimizer/PartialEvaluator.hpp
@@ -358,14 +347,12 @@ include/xqilla/optimizer/StaticTyper.hpp
include/xqilla/parser/QName.hpp
include/xqilla/runtime/ClosureResult.hpp
include/xqilla/runtime/EmptyResult.hpp
-include/xqilla/runtime/LazySequenceResult.hpp
include/xqilla/runtime/Result.hpp
include/xqilla/runtime/ResultBuffer.hpp
include/xqilla/runtime/ResultBufferImpl.hpp
include/xqilla/runtime/ResultImpl.hpp
include/xqilla/runtime/Sequence.hpp
include/xqilla/runtime/SequenceResult.hpp
-include/xqilla/runtime/SingleResult.hpp
include/xqilla/runtime/TupleResult.hpp
include/xqilla/schema/AnyAtomicTypeDatatypeValidator.hpp
include/xqilla/schema/DocumentCache.hpp
@@ -389,15 +376,16 @@ include/xqilla/update/UReplace.hpp
include/xqilla/update/UReplaceValueOf.hpp
include/xqilla/update/UTransform.hpp
include/xqilla/utils/ContextUtils.hpp
+include/xqilla/utils/DelayedModule.hpp
include/xqilla/utils/NumUtils.hpp
-include/xqilla/utils/PrintAST.hpp
-include/xqilla/utils/UCANormalizer.hpp
include/xqilla/utils/UTF8Str.hpp
+include/xqilla/utils/UnicodeTransformer.hpp
include/xqilla/utils/XMLChCompare.hpp
include/xqilla/utils/XPath2NSUtils.hpp
include/xqilla/utils/XPath2Utils.hpp
include/xqilla/utils/XQillaPlatformUtils.hpp
include/xqilla/utils/XStr.hpp
+include/xqilla/utils/utf8proc.h
include/xqilla/xerces/XercesConfiguration.hpp
include/xqilla/xqilla-dom3.hpp
include/xqilla/xqilla-simple.hpp
Index: pkgsrc/textproc/xqilla/distinfo
diff -u pkgsrc/textproc/xqilla/distinfo:1.3 pkgsrc/textproc/xqilla/distinfo:1.4
--- pkgsrc/textproc/xqilla/distinfo:1.3 Wed Nov 4 02:00:16 2015
+++ pkgsrc/textproc/xqilla/distinfo Sun Oct 1 09:45:50 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 02:00:16 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/10/01 09:45:50 wiz Exp $
-SHA1 (XQilla-2.2.4.tar.gz) = edd1681a6bb9d310b6aaca6af0584eb96df3b8eb
-RMD160 (XQilla-2.2.4.tar.gz) = ec4268452c98d7c87e8bf7dccaf0ebc7ff19f167
-SHA512 (XQilla-2.2.4.tar.gz) = 2071377519846d131fc7dc5b97ddf653763e898921490278200be1be48464d67e6466af2a447b266f952a2af2b1eac2febc33c0d4aca0cbefe9672ced42d5f14
-Size (XQilla-2.2.4.tar.gz) = 15667750 bytes
-SHA1 (patch-include_xqilla_framework_XPath2MemoryManager.hpp) = 48cdc1773056e8e709774fce1babfbe0c4cc2e09
-SHA1 (patch-src_items_DatatypeFactoryTemplate.hpp) = 6d9ef8eb7b31d5fa8ffa7c85fe20dd45a32f90c3
+SHA1 (XQilla-2.3.3.tar.gz) = efe2f55f035d639c2b45bb9d03ee814b0d46a20e
+RMD160 (XQilla-2.3.3.tar.gz) = 826ad38f21c5268cc325cd52f3fc7b3843bd3729
+SHA512 (XQilla-2.3.3.tar.gz) = 5a27416eaf1d7120c42dbd5c737e112954d4e3782de5ff4c77e29f1bcd1a5712cdc5a76f707d9c3323526a361e46df98d8ee1ca87c760d389d85598a8265054f
+Size (XQilla-2.3.3.tar.gz) = 16170903 bytes
+SHA1 (patch-src_dom-api_impl_XPathDocumentImpl.cpp) = 095c9d2f0b9c1b1155e16fd2c61741779e701117
+SHA1 (patch-src_dom-api_impl_XPathNamespaceImpl.cpp) = 068d250381d96cd906457830960a0494f891c566
Added files:
Index: pkgsrc/textproc/xqilla/patches/patch-src_dom-api_impl_XPathDocumentImpl.cpp
diff -u /dev/null pkgsrc/textproc/xqilla/patches/patch-src_dom-api_impl_XPathDocumentImpl.cpp:1.1
--- /dev/null Sun Oct 1 09:45:51 2017
+++ pkgsrc/textproc/xqilla/patches/patch-src_dom-api_impl_XPathDocumentImpl.cpp Sun Oct 1 09:45:50 2017
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_dom-api_impl_XPathDocumentImpl.cpp,v 1.1 2017/10/01 09:45:50 wiz Exp $
+
+Xerces-C 3.2.0 removed castToNode (which relied on undefined
+behaviour) with a cleaner way of getting information about a node's
+containing node: a new fContainingNode member.
+https://sourceforge.net/p/xqilla/bugs/48/
+
+--- src/dom-api/impl/XPathDocumentImpl.cpp.orig 2015-05-18 17:38:59.000000000 +0000
++++ 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());
+
Index: pkgsrc/textproc/xqilla/patches/patch-src_dom-api_impl_XPathNamespaceImpl.cpp
diff -u /dev/null pkgsrc/textproc/xqilla/patches/patch-src_dom-api_impl_XPathNamespaceImpl.cpp:1.1
--- /dev/null Sun Oct 1 09:45:51 2017
+++ pkgsrc/textproc/xqilla/patches/patch-src_dom-api_impl_XPathNamespaceImpl.cpp Sun Oct 1 09:45:50 2017
@@ -0,0 +1,48 @@
+$NetBSD: patch-src_dom-api_impl_XPathNamespaceImpl.cpp,v 1.1 2017/10/01 09:45:50 wiz Exp $
+
+Xerces-C 3.2.0 removed castToNode (which relied on undefined
+behaviour) with a cleaner way of getting information about a node's
+containing node: a new fContainingNode member.
+https://sourceforge.net/p/xqilla/bugs/48/
+
+--- src/dom-api/impl/XPathNamespaceImpl.cpp.orig 2015-05-18 17:39:00.000000000 +0000
++++ 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
Home |
Main Index |
Thread Index |
Old Index