aboutsummaryrefslogtreecommitdiff
path: root/textproc/xalan-c/files
diff options
context:
space:
mode:
authorVolker Stolz <vs@FreeBSD.org>2005-03-08 10:18:49 +0000
committerVolker Stolz <vs@FreeBSD.org>2005-03-08 10:18:49 +0000
commitbfa84448efa1678898ff0f776b1b76519fefa4c9 (patch)
tree65eacd8e4cd85f745f5a6c9a8601809c37701454 /textproc/xalan-c/files
parent8deea0a6c74605ef4e36fc058f66945935dcc1e2 (diff)
downloadports-bfa84448efa1678898ff0f776b1b76519fefa4c9.tar.gz
ports-bfa84448efa1678898ff0f776b1b76519fefa4c9.zip
- Update to 1.9.0
- Optionally use icu.32 instead of icu2.x PR: ports/78436 Submitted by: maintainer
Notes
Notes: svn path=/head/; revision=130603
Diffstat (limited to 'textproc/xalan-c/files')
-rw-r--r--textproc/xalan-c/files/patch-aa124
-rw-r--r--textproc/xalan-c/files/patch-ab21
2 files changed, 130 insertions, 15 deletions
diff --git a/textproc/xalan-c/files/patch-aa b/textproc/xalan-c/files/patch-aa
index 6a2fbce6e96a..1cdf74f67e4f 100644
--- a/textproc/xalan-c/files/patch-aa
+++ b/textproc/xalan-c/files/patch-aa
@@ -1,12 +1,112 @@
-Xalan-C CVS: xml-xalan/c/src/xalanc/PlatformSupport/XalanArrayAllocator.hpp?r1=1.6&r2=1.7
---- src/xalanc/PlatformSupport/XalanArrayAllocator.hpp.orig Mon Dec 13 21:34:54 2004
-+++ src/xalanc/PlatformSupport/XalanArrayAllocator.hpp Mon Dec 13 21:35:22 2004
-@@ -170,7 +170,7 @@
- ListEntryType& theNewEntry = m_list.back();
-
- // Resize the vector to the appropriate size...
-- theNewEntry.second.resize(theBlockSize, VectorType::value_type(0));
-+ theNewEntry.second.resize(theBlockSize, value_type(0));
-
- // Set the number of free spaces accordingly...
- theNewEntry.first = theBlockSize - theCount;
+--- ./src/xalanc/ICUBridge/ICUFormatNumberFunctor.hpp.orig Sat Mar 5 17:46:13 2005
++++ ./src/xalanc/ICUBridge/ICUFormatNumberFunctor.hpp Sat Mar 5 17:46:23 2005
+@@ -120,6 +120,8 @@ struct DecimalFormatCacheStruct
+ private:
+
+ DecimalFormatCacheStruct();
++
++public:
+ DecimalFormatCacheStruct(const DecimalFormatCacheStruct& other);
+
+ };
+--- ./src/xalanc/TestXSLT/process.cpp.orig Sat Dec 25 10:53:35 2004
++++ ./src/xalanc/TestXSLT/process.cpp Sat Dec 25 12:05:48 2004
+@@ -628,7 +628,7 @@
+ }
+ else if(FormatterListener::OUTPUT_METHOD_TEXT == outputType)
+ {
+- formatter = new FormatterToText( theManager, resultWriter, mimeEncoding);
++ formatter = new FormatterToText( resultWriter, mimeEncoding, true, true, theManager);
+ }
+ else if(FormatterListener::OUTPUT_METHOD_HTML == outputType)
+ {
+@@ -656,14 +656,15 @@
+
+ FormatterToHTML* const fToHTML =
+ new FormatterToHTML(
+- theManager,
+ resultWriter,
+ mimeEncoding,
+ mediatype,
+ doctypeSystem,
+ doctypePublic,
+ outputIndent,
+- indentAmount);
++ indentAmount,
++ true, false,
++ theManager);
+
+ fToHTML->setPrefixResolver(&prefixResolver);
+
+--- ./src/xalanc/XMLSupport/FormatterToText.hpp.orig Sat Dec 25 10:50:53 2004
++++ ./src/xalanc/XMLSupport/FormatterToText.hpp Sat Dec 25 10:50:57 2004
+@@ -221,7 +221,9 @@
+ private:
+
+ // These are not implemented.
++#if 0
+ FormatterToText(const FormatterToText&);
++#endif
+
+ FormatterToText&
+ operator=(const FormatterToText&);
+--- ./src/xalanc/XPath/ElementPrefixResolverProxy.hpp.orig Sat Dec 25 09:51:20 2004
++++ ./src/xalanc/XPath/ElementPrefixResolverProxy.hpp Sat Dec 25 09:51:28 2004
+@@ -86,7 +86,9 @@
+
+ private:
+ //notimplemented
++#if 0
+ ElementPrefixResolverProxy(const ElementPrefixResolverProxy&);
++#endif
+
+ const XalanElement* const m_namespaceContext;
+
+--- ./src/xalanc/XPath/NameSpace.hpp.orig Sat Dec 25 10:17:01 2004
++++ ./src/xalanc/XPath/NameSpace.hpp Sat Dec 25 10:17:15 2004
+@@ -191,7 +191,9 @@
+ }
+
+ private:
++#if 0
+ NameSpace(const NameSpace&);
++#endif
+
+ XalanDOMString m_prefix;
+
+--- ./src/xalanc/XPath/XalanQNameByValue.hpp.orig Sat Dec 25 10:30:57 2004
++++ ./src/xalanc/XPath/XalanQNameByValue.hpp Sat Dec 25 10:31:09 2004
+@@ -290,7 +290,9 @@
+
+ private:
+ // not implemented
++#if 0
+ XalanQNameByValue(const XalanQNameByValue& theSource);
++#endif
+ void
+ initialize(
+ const XalanDOMChar* qname,
+--- ./src/xalanc/XSLT/FunctionSystemProperty.hpp.orig Sat Dec 25 10:29:12 2004
++++ ./src/xalanc/XSLT/FunctionSystemProperty.hpp Sat Dec 25 10:30:13 2004
+@@ -73,7 +73,9 @@
+
+ private:
+
++#if 0
+ FunctionSystemProperty(const FunctionSystemProperty&);
++#endif
+
+ // Not implemented...
+ FunctionSystemProperty&
+--- ./src/xalanc/XSLT/TopLevelArg.hpp.orig Sat Dec 25 10:26:41 2004
++++ ./src/xalanc/XSLT/TopLevelArg.hpp Sat Dec 25 10:27:01 2004
+@@ -147,7 +147,9 @@
+
+ private:
+ // not implemented
++#if 0
+ TopLevelArg(const TopLevelArg& theSource);
++#endif
+
+ XalanQNameByValue m_qname;
+
diff --git a/textproc/xalan-c/files/patch-ab b/textproc/xalan-c/files/patch-ab
index 13175c5aec07..41f310e184fb 100644
--- a/textproc/xalan-c/files/patch-ab
+++ b/textproc/xalan-c/files/patch-ab
@@ -1,6 +1,6 @@
---- src/xalanc/Makefile.in.orig Mon Dec 13 22:00:00 2004
-+++ src/xalanc/Makefile.in Mon Dec 13 22:01:57 2004
-@@ -253,7 +253,7 @@
+--- src/xalanc/Makefile.in.orig Mon Mar 7 17:31:00 2005
++++ src/xalanc/Makefile.in Mon Mar 7 17:31:57 2005
+@@ -259,22 +259,10 @@ endif ## OS390
$(MKINSTALLDIRS) $(DESTDIR)/$(includedir)/xalanc
for hdir in $(ALL_HEADERS_DIRS); do \
$(MKINSTALLDIRS) $(DESTDIR)/$(includedir)/xalanc/$$hdir; \
@@ -9,3 +9,18 @@
$(DESTDIR)/$(includedir)/xalanc/$$hdir \
2> /dev/null; \
done
+-ifdef XALAN_USE_ICU
+- $(INSTALL_PROGRAM) $(ICUROOT)/lib/$(ICU_LIBI18N_LIB) \
+- $(DESTDIR)/$(libdir)
+- ifneq ($PLATFORM), OS390)
+- rm -f $(DESTIDR)/$(libdir)/$(ICU_LIBI18N_LINK_NAME) && \
+- $(LN) -fs $(ICU_LIBI18N_LIB) \
+- $(DESTDIR)/$(libdir)/$(ICU_LIBI18N_LINK_NAME)
+- rm -f $(DESTDIR)/$(libdir)/$(ICU_LIBI18N_SO_NAME) && \
+- $(LN) -fs $(ICU_LIBI18N_LIB) \
+- $(DESTDIR)/$(libdir)/$(ICU_LIBI18N_SO_NAME)
+- endif ## OS390
+-endif
+
+ clean: prepare doClean
+