diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-libs/xalan-c | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-libs/xalan-c')
-rw-r--r-- | dev-libs/xalan-c/Manifest | 1 | ||||
-rw-r--r-- | dev-libs/xalan-c/files/1.10.0-as-needed.patch | 78 | ||||
-rw-r--r-- | dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch | 108 | ||||
-rw-r--r-- | dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch | 50 | ||||
-rw-r--r-- | dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch | 62 | ||||
-rw-r--r-- | dev-libs/xalan-c/files/xalan-c-1.10.0+gcc-4.3.patch | 50 | ||||
-rw-r--r-- | dev-libs/xalan-c/metadata.xml | 5 | ||||
-rw-r--r-- | dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild | 107 |
8 files changed, 461 insertions, 0 deletions
diff --git a/dev-libs/xalan-c/Manifest b/dev-libs/xalan-c/Manifest new file mode 100644 index 000000000000..4ae6b7ac3371 --- /dev/null +++ b/dev-libs/xalan-c/Manifest @@ -0,0 +1 @@ +DIST Xalan-C_r1153059-src.tar.gz 1573651 SHA256 518d012f550004c760e225bcfb4a040ec93d0797a2d45a6fa25994a9b23636fa SHA512 2382c1343ae97d0196d84053139758d3b3b7574bcd835b754e34acdc6ab708a58fc23d2f27d41870c768c78a1de7be1bb6031cc78d205b6024f1ad7cd6fca653 WHIRLPOOL ba18f4a6e0b461875792df40d660e9f92bbff102cfe7ed6d8a2b940a2b04696166b6389752c9b2de48ef1c9e3806aef3014524d8abd7e53f0c6852b1e537ffaa diff --git a/dev-libs/xalan-c/files/1.10.0-as-needed.patch b/dev-libs/xalan-c/files/1.10.0-as-needed.patch new file mode 100644 index 000000000000..60fa962b5b79 --- /dev/null +++ b/dev-libs/xalan-c/files/1.10.0-as-needed.patch @@ -0,0 +1,78 @@ +diff -uprN xml-xalan/c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefile.in +--- xml-xalan/c/src/xalanc/Makefile.in 2007-03-31 14:54:16.106346968 -0400 ++++ xml-xalan/c/src/xalanc/Makefile.in 2007-03-31 14:57:37.159195728 -0400 +@@ -172,7 +172,7 @@ XalanExe: lib "//'$(LOADSAMP)(${BATCH_X + + "//'$(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 $@ $< + +@@ -180,7 +180,7 @@ testXSLT: lib "//'$(LOADSAMP)(${BATCH_T + + "//'$(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 $@ $< + +@@ -190,7 +190,7 @@ XalanExe: lib $(XSL_BIN_DIR)/Xalan + + $(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 $@ $(XALAN_LIB) $(ALLLIBS) $(OTHER_LINK_PARAMETERS) + ${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp + $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< + endif +@@ -199,7 +199,7 @@ testXSLT: lib $(XSL_BIN_DIR)/testXSLT + + $(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 $@ $(XALAN_LIB) $(ALLLIBS) $(OTHER_LINK_PARAMETERS) + ${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp + $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< + +@@ -207,7 +207,7 @@ testXPath: lib $(XSL_BIN_DIR)/testXPath + + $(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} $^ -o $@ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $(OTHER_LINK_PARAMETERS) + ${XSL_OBJ_DIR}/%.o:$(TESTXPATH_DIR)/%.cpp + $(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $< + +@@ -220,7 +220,7 @@ locale: + + ${BATCH_TARGET}: $(ALL_OBJECTS) + @echo Building ${BATCH_TARGET} +- $(MAKE_SHARED) $(ALLLIBS) $^ -o $@ ++ $(MAKE_SHARED) $^ -o $@ $(ALLLIBS) + + else + +@@ -230,7 +230,7 @@ locale: + $(MAKE) -C Utils $@ + + $(XSL_LIB_DIR)/$(LIB): $(ALL_OBJECTS) +- $(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $(ALLLIBS) $^ -o $@ $(OTHER_LINK_LIB_PARAMERES) ++ $(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $^ -o $@ $(ALLLIBS) $(OTHER_LINK_LIB_PARAMERES) + ifeq ($(PLATFORM), OS390) + mv *.x ${XSL_LIB_DIR} + else +diff -uprN xml-xalan/c/src/xalanc/MsgCreator/Makefile.in xml-xalan/c/src/xalanc/MsgCreator/Makefile.in +--- xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in 2007-03-31 15:10:07.927334556 -0400 ++++ xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in 2007-03-31 15:10:35.038804580 -0400 +@@ -29,7 +29,7 @@ MSG_CREATOR_SRC=$(XALANCROOT)/src/xalanc + + $(XSL_BIN_DIR)/MsgCreator : $(MSG_CREATOR_OBJECTS) + ${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} ${LIBRARY_SEARCH_PATHS} \ +- ${EXTRA_LINK_OPTIONS} $(XERCES_LIB) $^ -o $@ $(LOC_OTHER_LINK_PARAMETERS) ++ ${EXTRA_LINK_OPTIONS} $^ -o $@ $(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 --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 $@ $< + diff --git a/dev-libs/xalan-c/files/xalan-c-1.10.0+gcc-4.3.patch b/dev-libs/xalan-c/files/xalan-c-1.10.0+gcc-4.3.patch new file mode 100644 index 000000000000..e08ef961ea39 --- /dev/null +++ b/dev-libs/xalan-c/files/xalan-c-1.10.0+gcc-4.3.patch @@ -0,0 +1,50 @@ +--- XalanDOMString.cpp 2008-03-21 09:50:39.000000000 +0100 ++++ xalan-c-1.10.0/work/xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.cpp 2008-03-21 09:51:06.000000000 +0100 +@@ -26,6 +26,7 @@ + + + #include <cstdlib> ++#include <cstring> + + + +--- FormatterToHTML.cpp 2008-03-21 09:56:31.000000000 +0100 ++++ xalan-c-1.10.0/work/xml-xalan/c/src/xalanc/XMLSupport/FormatterToHTML.cpp 2008-03-21 09:56:54.000000000 +0100 +@@ -26,6 +26,7 @@ + + + #include <cassert> ++#include <cstring> + + + +--- ElemNumber.cpp 2008-03-21 10:09:56.000000000 +0100 ++++ xalan-c-1.10.0/work/xml-xalan/c/src/xalanc/XSLT/ElemNumber.cpp 2008-03-21 10:10:15.000000000 +0100 +@@ -14,6 +14,7 @@ + * limitations under the License. + */ + #include "ElemNumber.hpp" ++#include <cstring> + + + +--- DirectoryEnumerator.hpp 2008-03-21 10:19:13.000000000 +0100 ++++ xalan-c-1.10.0/work/xml-xalan/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp 2008-03-21 10:19:41.000000000 +0100 +@@ -36,6 +36,7 @@ + + #include <functional> + #include <iterator> ++#include <cstring> + + + #include "xercesc/framework/MemoryManager.hpp" +--- XalanExe.cpp 2008-03-21 12:11:08.000000000 +0100 ++++ xalan-c-1.10.0/work/xml-xalan/c/src/xalanc/XalanExe/XalanExe.cpp 2008-03-21 12:11:44.000000000 +0100 +@@ -19,6 +19,7 @@ + + + #include <cstdlib> ++#include <cstring> + #if defined(XALAN_CLASSIC_IOSTREAMS) + #include <iostream.h> + #else diff --git a/dev-libs/xalan-c/metadata.xml b/dev-libs/xalan-c/metadata.xml new file mode 100644 index 000000000000..8434377a6047 --- /dev/null +++ b/dev-libs/xalan-c/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>cpp</herd> +</pkgmetadata> diff --git a/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild b/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild new file mode 100644 index 000000000000..acbb8a191dbe --- /dev/null +++ b/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit toolchain-funcs eutils flag-o-matic multilib + +DESCRIPTION="XSLT processor for transforming XML into HTML, text, or other XML types" +HOMEPAGE="http://xml.apache.org/xalan-c/" +SRC_URI="mirror://gentoo/Xalan-C_r${PV#*_pre}-src.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" +IUSE="doc examples nls threads" + +RDEPEND=">=dev-libs/xerces-c-2.8.0" +# icu? ( dev-libs/icu )" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" + +S="${WORKDIR}/xml-xalan/c" + +pkg_setup() { +# export ICUROOT="/usr" + export XALANCROOT="${S}" +} + +src_prepare() { + epatch \ + "${FILESDIR}/1.11.0_pre797991-as-needed.patch" \ + "${FILESDIR}/1.11.0_pre797991-bugfixes.patch" \ + "${FILESDIR}/1.11.0_pre797991-parallel-build.patch" + + # - do not run configure in runConfigure + # - echo the export commands instead exporting the vars + # - remove -O3 + # - make sure our {C,CXX}FLAGS get respected + sed -i \ + -e '/\/configure/d' \ + -e 's/^export \([a-zA-Z_]*\)/echo export \1=\\"$\1\\"/' \ + -e 's/\(debugflag\)="-O.\? /\1="/' \ + -e 's/^\(CXXFLAGS\)="$compileroptions/\1="${\1}/' \ + -e 's/^\(CFLAGS\)="$compileroptions/\1="${\1}/' \ + runConfigure || die "sed failed" +} + +src_configure() { + export XERCESCROOT="/usr" + + local target="linux" + # add more if needed, see xerces-c-2.8.0-r1 ebuild + + local mloader="inmem" + use nls && mloader="nls" +# use icu && mloader="icu" + + local transcoder="default" +# use icu && transcoder="icu" + + local thread="none" + use threads && thread="pthread" + + local bitstobuild="32" + $(has_m64) && bitstobuild="64" + + ./runConfigure -p ${target} -c "$(tc-getCC)" -x "$(tc-getCXX)" \ + -m ${mloader} -t ${transcoder} \ + -r ${thread} -b ${bitstobuild} > configure.vars || die "runConfigure failed" + + eval $(grep export configure.vars) + + default +} + +src_compile() { + default + + if use doc ; then + mkdir build + cd "${S}/xdocs" + doxygen DoxyfileXalan + fi +} + +src_install() { + default + + if use doc ; then + dodir /usr/share/doc/${PF} + dohtml -r build/docs/apiDocs/* + fi + + if use examples ; then + insinto /usr/share/doc/${PF}/examples + doins -r samples/* + fi +} + +pkg_postinst() { + ewarn "If you are upgrading you should run" + ewarn " revdep-rebuild --library=libxalan-c.so.110" + ewarn "if using portage or" + ewarn " reconcilio --library libxalan-c.so.110" + ewarn "if using paludis as your package manager." +} |