Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=acb4a91fbb1f536af1c5499555b269fee010d16f
commit acb4a91fbb1f536af1c5499555b269fee010d16f Author: crazy <[email protected]> Date: Wed Jun 1 01:27:08 2016 +0200 xalan-c-1.11-2-x86_64 * Version bump * ( yes -2 is version bump ) diff --git a/source/devel-extra/xalan-c/1.11.0_pre797991-as-needed.patch b/source/devel-extra/xalan-c/1.11.0_pre797991-as-needed.patch deleted file mode 100644 index 966cf6b..0000000 --- a/source/devel-extra/xalan-c/1.11.0_pre797991-as-needed.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff -Naur src/xalanc/Makefile.in src/xalanc/Makefile.in ---- src/xalanc/Makefile.in 2009-07-27 00:23:08.411122528 +0200 -+++ 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 src/xalanc/Utils/MsgCreator/Makefile.in src/xalanc/Utils/MsgCreator/Makefile.in ---- src/xalanc/Utils/MsgCreator/Makefile.in 2009-07-27 00:23:08.431122558 +0200 -+++ 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 Tests/Makefile.in Tests/Makefile.in ---- Tests/Makefile.in 2009-07-27 00:23:08.514445103 +0200 -+++ 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/source/devel-extra/xalan-c/1.11.0_pre797991-bugfixes.patch b/source/devel-extra/xalan-c/1.11.0_pre797991-bugfixes.patch deleted file mode 100644 index e120943..0000000 --- a/source/devel-extra/xalan-c/1.11.0_pre797991-bugfixes.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp ---- src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp 2009-07-27 00:23:08.507787691 +0200 -+++ 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/source/devel-extra/xalan-c/FrugalBuild b/source/devel-extra/xalan-c/FrugalBuild index bed8dc4..972bbf5 100644 --- a/source/devel-extra/xalan-c/FrugalBuild +++ b/source/devel-extra/xalan-c/FrugalBuild @@ -5,31 +5,27 @@ pkgname=xalan-c realname=Xalan-C pkgver=1.11 -pkgextraver=pre797991 -pkgrel=1 +pkgrel=2 pkgdesc="Xalan C++ Parser" url="http://xml.apache.org/xalan-c/"; depends=('libstdc++' 'xerces-c>=2.8.0') groups=('devel-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://www.apache.org/dist/xml/xalan-c/source/|grep -om1 'Xalan-C\(.*\)-src.tar.gz'|sed 's/.*C_\(.*\).src.*/\1/;s/_/./g'" -source=(http://mirrors.kernel.org/gentoo/distfiles/Xalan-C_r797991-src.tar.gz \ - 1.11.0_pre797991-bugfixes.patch \ - 1.11.0_pre797991-as-needed.patch) +up2date="lynx -dump http://www.eu.apache.org/dist/xalan/xalan-c/sources/ | grep -m1 'src.tar.gz' | sed 's/.*_c-\(.*\)-.*tar.gz.*/\1/'" +source=(http://www.eu.apache.org/dist/xalan/xalan-c/sources/xalan_c-$pkgver-src.tar.gz) +sha1sums=('c9523543e6eb9f7b5676ac21b49ae06e7dbe96e8') -sha1sums=('c9079b5e00afd819306c6799848e5981b87ac2f2' \ - 'b2f0b11ac888f58e3a0d6774e2b10db8af7e6011' \ - '059e3578590904b437979a67980a7ee261a02a83') - -_F_cd_path="xml-xalan/c" -unset MAKEFLAGS +_F_cd_path="xalan-c-$pkgver/c" build() { + + Fcd + unset MAKEFLAGS export XERCESCROOT=/usr/include/xercesc - export XALANCROOT=$Fsrcdir/xml-xalan/c + export XALANCROOT=$Fsrcdir/xalan-c-$pkgver/c export LDFLAGS="${LDFLAGS} -pthread" - Fpatchall + ./runConfigure -plinux -cgcc -xg++ -rpthread -P/usr || Fdie make || Fdie Fmakeinstall _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
