reinit the tree, so we can have metadata

3 files changed, 220 insertions, 0 deletions

diff --git a/dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch b/dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch
new file mode 100644
index 000000000000..e8a9cc9d03b3
--- /dev/null
+++ b/dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch
@@ -0,0 +1,108 @@
+diff -Naur xml-xalan.orig/c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefile.in
+--- xml-xalan.orig/c/src/xalanc/Makefile.in	2009-07-27 00:23:08.411122528 +0200
++++ xml-xalan/c/src/xalanc/Makefile.in	2009-07-27 00:45:09.514777553 +0200
+@@ -174,7 +174,7 @@
+ 
+ "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'": ${XSL_OBJ_DIR}/XalanExe.o
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS}  $(XALAN_LIB) $(ALLLIBS) $^ -o $@	
++	${EXTRA_LINK_OPTIONS} $^ -o $@	$(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp                       
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
+@@ -182,7 +182,7 @@
+ 
+ "//'$(LOADSAMP)(${BATCH_TEST_UTIL_NAME})'": ${XSL_OBJ_DIR}/process.o
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@	
++	${EXTRA_LINK_OPTIONS} $^ -o $@ $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp                       
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
+@@ -192,7 +192,7 @@
+ 
+ $(XSL_BIN_DIR)/Xalan: ${XSL_OBJ_DIR}/XalanExe.o
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@	$(OTHER_LINK_PARAMETERS)
++	${EXTRA_LINK_OPTIONS} $^ -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ endif
+@@ -201,7 +201,7 @@
+ 
+ $(XSL_BIN_DIR)/testXSLT: ${XSL_OBJ_DIR}/process.o
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@	$(OTHER_LINK_PARAMETERS)
++	${EXTRA_LINK_OPTIONS} $^ -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
+@@ -209,7 +209,7 @@
+ 
+ $(XSL_BIN_DIR)/testXPath: ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	$(OTHER_LINK_PARAMETERS)
++	${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
+@@ -222,7 +222,7 @@
+ 
+ ${BATCH_TARGET}: $(ALL_OBJECTS)
+ 	@echo Building ${BATCH_TARGET}
+-	$(MAKE_SHARED) $(ALLLIBS) $^ -o $@
++	$(MAKE_SHARED) $^ -o $@ $(ALLLIBS)
+ 
+ else
+ 
+@@ -232,7 +232,7 @@
+ 	$(MAKE) -C Utils $@
+ 
+ $(XSL_LIB_DIR)/$(LIB): $(ALL_OBJECTS)
+-	$(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $(ALLLIBS) $^ -o $@ $(OTHER_LINK_LIB_PARAMETERS)
++	$(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $^ -o $@ $(OTHER_LINK_LIB_PARAMETERS) $(ALLLIBS)
+ ifeq ($(PLATFORM), OS390)
+ 	mv *.x  ${XSL_LIB_DIR}        
+ else
+diff -Naur xml-xalan.orig/c/src/xalanc/Utils/MsgCreator/Makefile.in xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in
+--- xml-xalan.orig/c/src/xalanc/Utils/MsgCreator/Makefile.in	2009-07-27 00:23:08.431122558 +0200
++++ xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in	2009-07-27 00:43:47.674693543 +0200
+@@ -29,7 +29,7 @@
+ 
+ $(XSL_BIN_DIR)/MsgCreator : $(MSG_CREATOR_OBJECTS)
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \
+-	${EXTRA_LINK_OPTIONS} $(LIBS) $(XERCES_LIB) $^ -o $@ $(LOC_OTHER_LINK_PARAMETERS)
++	${EXTRA_LINK_OPTIONS} $^ -o $@ $(LIBS) $(XERCES_LIB) $(LOC_OTHER_LINK_PARAMETERS)
+ 	
+ $(XSL_OBJ_DIR)/%.o : $(MSG_CREATOR_SRC)/%.cpp    
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+diff -Naur xml-xalan.orig/c/Tests/Makefile.in xml-xalan/c/Tests/Makefile.in
+--- xml-xalan.orig/c/Tests/Makefile.in	2009-07-27 00:23:08.514445103 +0200
++++ xml-xalan/c/Tests/Makefile.in	2009-07-27 00:45:50.541094978 +0200
+@@ -62,7 +62,7 @@
+ 
+ $(XSL_BIN_DIR)/ThreadTest: ${XSL_OBJ_DIR}/ThreadTest.o 
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS}  $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
++	${EXTRA_LINK_OPTIONS}  $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Threads/%.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
+@@ -70,7 +70,7 @@
+ 
+ $(XSL_BIN_DIR)/Conf: ${XSL_OBJ_DIR}/conf.o
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS}  $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
++	${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Conf/%.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
+@@ -92,7 +92,7 @@
+ 
+ $(XSL_BIN_DIR)/Perf: $(PERF_OBJECTS)
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS}  $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
++	${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ 	
+ ${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Performance/%.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
diff --git a/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch b/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch
new file mode 100644
index 000000000000..d86f1bd45f4b
--- /dev/null
+++ b/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch
@@ -0,0 +1,50 @@
+diff -Naur xml-xalan.orig/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp xml-xalan/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp
+--- xml-xalan.orig/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp	2009-07-27 00:23:08.507787691 +0200
++++ xml-xalan/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp	2009-07-27 00:53:50.781756249 +0200
+@@ -28,7 +28,7 @@
+ #include <xalanc/PlatformSupport/DOMStringHelper.hpp>
+ 
+ #include <cstring>
+-
++#include <cstdio>
+ #include <cerrno>
+ 
+ XALAN_CPP_NAMESPACE_BEGIN
+@@ -44,7 +44,7 @@
+ 
+ XalanNLSMessageLoader::~XalanNLSMessageLoader()
+ {
+-    if ((int)m_catalogHandle != -1)
++    if ((long)m_catalogHandle != -1)
+     {
+         catclose(m_catalogHandle);
+     }
+@@ -77,7 +77,7 @@
+     */
+     m_catalogHandle = catopen(fileName, 0);
+ 
+-    if (reinterpret_cast<int>(m_catalogHandle) == -1)
++    if (reinterpret_cast<long>(m_catalogHandle) == -1)
+     {
+         // Probably have to call panic here
+         // the user will get an error with retrieving messages
+@@ -87,8 +87,8 @@
+ 
+ bool
+ XalanNLSMessageLoader::loadMsg(
+-            XalanMessages::Codes    msgToLoad
+-            XalanDOMChar*           toFill
++            XalanMessages::Codes    msgToLoad,
++            XalanDOMChar*           toFill,
+             XalanSize_t             maxChars)
+ {
+     
+@@ -99,7 +99,7 @@
+         return bRetValue;
+     }
+ 
+-    if (static_cast<int>(m_catalogHandle) == -1)
++    if (reinterpret_cast<long>(m_catalogHandle) == -1)
+     {
+         // for transcoding to Unicode
+         const XalanDOMString    errorMsg("Message can't be retrieved: the message catalog is not open.", m_memoryManager );
diff --git a/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch b/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch
new file mode 100644
index 000000000000..46d9659b0f0a
--- /dev/null
+++ b/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch
@@ -0,0 +1,62 @@
+diff -urN xml-xalan.orig//c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefile.in
+--- xml-xalan.orig//c/src/xalanc/Makefile.in	2010-02-23 10:51:30.058353490 +0100
++++ xml-xalan/c/src/xalanc/Makefile.in	2010-02-23 10:52:53.251679288 +0100
+@@ -84,6 +84,10 @@
+ SAMPLES_DIR = ${XALANCROOT}/samples
+ TESTS_DIR = ${XALANCROOT}/Tests
+ 
++TESTXSLT_OBJS = ${XSL_OBJ_DIR}/process.o
++XALANEXE_OBJS = ${XSL_OBJ_DIR}/XalanExe.o
++TESTXPATH_OBJS = ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o
++
+ ALL_VPATH_CPP = \
+ $(XALANDOM_DIR):$(PLATFORMSUPPORT_DIR):$(DOMSUPPORT_DIR):$(XMLSUPPORT_DIR): \
+ $(XPATH_DIR):$(XERCESPARSERLIAISON_DIR):$(DEPRECATED_XERCESPARSERLIAISON_DIR):$(XALANSOURCETREE_DIR):$(XPATHCAPI_DIR): \
+@@ -169,6 +173,9 @@
+ 
+ compile:	 $(ALL_OBJECTS) 
+ 
++$(ALL_OBJECTS) $(TESTXSLT_OBJS) $(XALANEXE_OBJS) $(TESTXPATH_OBJS): locale
++locale: prepare
++
+ ifeq (${OS390BATCH},1)
+ XalanExe: lib  "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'"
+ 
+@@ -188,28 +195,28 @@
+ 
+ else # Not OS390BATCH
+ 
+-XalanExe: lib  $(XSL_BIN_DIR)/Xalan
++XalanExe: $(XSL_BIN_DIR)/Xalan
+ 
+-$(XSL_BIN_DIR)/Xalan: ${XSL_OBJ_DIR}/XalanExe.o
++$(XSL_BIN_DIR)/Xalan: lib ${XALANEXE_OBJS}
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS} $^ -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
++	${EXTRA_LINK_OPTIONS} ${XALANEXE_OBJS} -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ endif
+ 
+-testXSLT: lib  $(XSL_BIN_DIR)/testXSLT
++testXSLT: $(XSL_BIN_DIR)/testXSLT
+ 
+-$(XSL_BIN_DIR)/testXSLT: ${XSL_OBJ_DIR}/process.o
++$(XSL_BIN_DIR)/testXSLT: lib ${TESTXSLT_OBJS}
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS} $^ -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
++	${EXTRA_LINK_OPTIONS} ${TESTXSLT_OBJS} -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+ 
+-testXPath: lib  $(XSL_BIN_DIR)/testXPath
++testXPath: $(XSL_BIN_DIR)/testXPath
+ 
+-$(XSL_BIN_DIR)/testXPath: ${XSL_OBJ_DIR}/TestXPath.o ${XSL_OBJ_DIR}/NodeNameTreeWalker.o
++$(XSL_BIN_DIR)/testXPath: lib ${TESTXPATH_OBJS}
+ 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
+-	${EXTRA_LINK_OPTIONS} $(CXXFLAGS) $^ -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
++	${EXTRA_LINK_OPTIONS} $(CXXFLAGS) ${TESTXPATH_OBJS} -o $@	$(OTHER_LINK_PARAMETERS) $(XALAN_LIB) $(ALLLIBS)
+ ${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp
+ 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
+