[64722] trunk/dports/textproc/zorba

[nox at macports.org]

Revision: 64722
          http://trac.macports.org/changeset/64722
Author:   nox at macports.org
Date:     2010-03-15 06:10:01 -0700 (Mon, 15 Mar 2010)
Log Message:
-----------
Fix compilation of zorba with xercesc 3.1

Zorba compiles just fine now but 6 tests are failing.

Modified Paths:
--------------
    trunk/dports/textproc/zorba/Portfile

Added Paths:
-----------
    trunk/dports/textproc/zorba/files/
    trunk/dports/textproc/zorba/files/patch-SchemaValidatorFilter-resolveQName.diff
    trunk/dports/textproc/zorba/files/patch-XMLValid-NoSubforBlock.diff

Modified: trunk/dports/textproc/zorba/Portfile
===================================================================
--- trunk/dports/textproc/zorba/Portfile	2010-03-15 12:54:17 UTC (rev 64721)
+++ trunk/dports/textproc/zorba/Portfile	2010-03-15 13:10:01 UTC (rev 64722)
@@ -40,6 +40,10 @@
 
 patch.dir       ${worksrcpath}/..
 
+patchfiles \
+    patch-SchemaValidatorFilter-resolveQName.diff \
+    patch-XMLValid-NoSubforBlock.diff
+
 post-patch {
     # Do not install dependencies' libraries
     reinplace s/APPLE/FALSE/ ${patch.dir}/src/CMakeLists.txt
@@ -116,7 +120,7 @@
 build.args ..
 use_parallel_build yes
 
-test.env DYLD_FALLBACK_LIBRARY_PATH=${worksrcpath}/src
+test.env DYLD_LIBRARY_PATH=${worksrcpath}/src
 test.run yes
 
 destroot.args ..

Added: trunk/dports/textproc/zorba/files/patch-SchemaValidatorFilter-resolveQName.diff
===================================================================
--- trunk/dports/textproc/zorba/files/patch-SchemaValidatorFilter-resolveQName.diff	                        (rev 0)
+++ trunk/dports/textproc/zorba/files/patch-SchemaValidatorFilter-resolveQName.diff	2010-03-15 13:10:01 UTC (rev 64722)
@@ -0,0 +1,42 @@
+http://sourceforge.net/tracker/?func=detail&aid=2947458&group_id=226244&atid=1067586
+http://tinyurl.com/xerces-resolveQName
+
+--- src/types/schema/SchemaValidatorFilter.h.orig	2010-03-13 17:12:58.000000000 +0100
++++ src/types/schema/SchemaValidatorFilter.h	2010-03-13 17:15:24.000000000 +0100
+@@ -214,12 +214,16 @@
+     return 0;
+   }
+ 
++#if _XERCES_VERSION < 30100
++
+   virtual unsigned int resolveQName(
+         const XMLCh *const qName,
+         XERCES_CPP_NAMESPACE_QUALIFIER XMLBuffer &prefixBufToFill,
+         const short mode,
+         int &prefixColonPos);
+ 
++#endif
++
+   virtual void scanDocument(
+         const XERCES_CPP_NAMESPACE_QUALIFIER InputSource &src)
+   {
+--- src/types/schema/SchemaValidatorFilter.cpp.orig	2010-03-13 17:12:53.000000000 +0100
++++ src/types/schema/SchemaValidatorFilter.cpp	2010-03-13 17:15:01.000000000 +0100
+@@ -1034,6 +1034,8 @@
+ 
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+ 
++#if _XERCES_VERSION < 30100
++
+ unsigned int SchemaValidatorFilter::resolveQName(
+     const XMLCh *const qName,
+     XMLBuffer &prefixBuf,
+@@ -1105,6 +1107,8 @@
+   }
+ }
+ 
++#endif
++
+ 
+ bool SchemaValidatorFilter::switchGrammar(const XMLCh* uri)
+ {

Added: trunk/dports/textproc/zorba/files/patch-XMLValid-NoSubforBlock.diff
===================================================================
--- trunk/dports/textproc/zorba/files/patch-XMLValid-NoSubforBlock.diff	                        (rev 0)
+++ trunk/dports/textproc/zorba/files/patch-XMLValid-NoSubforBlock.diff	2010-03-15 13:10:01 UTC (rev 64722)
@@ -0,0 +1,40 @@
+See http://svn.apache.org/viewvc?view=revision&revision=803624
+
+--- src/types/schema/XercSchemaValidator.cpp.orig	2010-03-13 18:14:51.000000000 +0100
++++ src/types/schema/XercSchemaValidator.cpp	2010-03-13 18:24:42.000000000 +0100
+@@ -597,7 +597,11 @@
+                         else {
+                             // the type is derived from ancestor
+                             if (((SchemaElementDecl*)elemDef)->getBlockSet() == SchemaSymbols::XSD_RESTRICTION) {
++#if _XERCES_VERSION < 30100
+                                 emitError(XMLValid::NoSubforBlock, fXsiType->getRawName(), elemDef->getFullName());
++#else
++                                emitError(XMLValid::ElemNoSubforBlock, fXsiType->getRawName(), elemDef->getFullName());
++#endif
+                                 fErrorOccurred = true;
+                             }
+                             if (elemDef->hasAttDefs()) {
+@@ -659,7 +663,11 @@
+                                 else {
+                                     int derivationMethod = typeInfo->getDerivedBy();
+                                     if ((((SchemaElementDecl*)elemDef)->getBlockSet() & derivationMethod) != 0) {
++#if _XERCES_VERSION < 30100
+                                         emitError(XMLValid::NoSubforBlock, fXsiType->getRawName(), elemDef->getFullName());
++#else
++                                        emitError(XMLValid::ElemNoSubforBlock, fXsiType->getRawName(), elemDef->getFullName());
++#endif
+                                         fErrorOccurred = true;
+                                     }
+                                 }
+@@ -700,7 +708,11 @@
+                             else {
+                                 // the type is derived from ancestor
+                                 if (((SchemaElementDecl*)elemDef)->getBlockSet() == SchemaSymbols::XSD_RESTRICTION) {
++#if _XERCES_VERSION < 30100
+                                     emitError(XMLValid::NoSubforBlock, fXsiType->getRawName(), elemDef->getFullName());
++#else
++                                    emitError(XMLValid::ElemNoSubforBlock, fXsiType->getRawName(), elemDef->getFullName());
++#endif
+                                     fErrorOccurred = true;
+                                 }
+                                 if (elemDef->hasAttDefs()) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100315/cd369208/attachment-0001.html>