[arch-commits] Commit in xalan-c/repos (10 files)
Antonio Rojas
arojas at archlinux.org
Mon Jan 4 23:10:06 UTC 2016
Date: Tuesday, January 5, 2016 @ 00:10:05
Author: arojas
Revision: 155504
archrelease: copy trunk to community-i686, community-x86_64
Added:
xalan-c/repos/community-i686/PKGBUILD
(from rev 155503, xalan-c/trunk/PKGBUILD)
xalan-c/repos/community-x86_64/PKGBUILD
(from rev 155503, xalan-c/trunk/PKGBUILD)
Deleted:
xalan-c/repos/community-i686/1.11.0_pre797991-as-needed.patch
xalan-c/repos/community-i686/1.11.0_pre797991-bugfixes.patch
xalan-c/repos/community-i686/1.11.0_pre797991-parallel-build.patch
xalan-c/repos/community-i686/PKGBUILD
xalan-c/repos/community-x86_64/1.11.0_pre797991-as-needed.patch
xalan-c/repos/community-x86_64/1.11.0_pre797991-bugfixes.patch
xalan-c/repos/community-x86_64/1.11.0_pre797991-parallel-build.patch
xalan-c/repos/community-x86_64/PKGBUILD
--------------------------------------------------------+
/PKGBUILD | 62 ++++++++
community-i686/1.11.0_pre797991-as-needed.patch | 108 ---------------
community-i686/1.11.0_pre797991-bugfixes.patch | 50 ------
community-i686/1.11.0_pre797991-parallel-build.patch | 62 --------
community-i686/PKGBUILD | 38 -----
community-x86_64/1.11.0_pre797991-as-needed.patch | 108 ---------------
community-x86_64/1.11.0_pre797991-bugfixes.patch | 50 ------
community-x86_64/1.11.0_pre797991-parallel-build.patch | 62 --------
community-x86_64/PKGBUILD | 38 -----
9 files changed, 62 insertions(+), 516 deletions(-)
Deleted: community-i686/1.11.0_pre797991-as-needed.patch
===================================================================
--- community-i686/1.11.0_pre797991-as-needed.patch 2016-01-04 23:09:19 UTC (rev 155503)
+++ community-i686/1.11.0_pre797991-as-needed.patch 2016-01-04 23:10:05 UTC (rev 155504)
@@ -1,108 +0,0 @@
-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 $@ $<
Deleted: community-i686/1.11.0_pre797991-bugfixes.patch
===================================================================
--- community-i686/1.11.0_pre797991-bugfixes.patch 2016-01-04 23:09:19 UTC (rev 155503)
+++ community-i686/1.11.0_pre797991-bugfixes.patch 2016-01-04 23:10:05 UTC (rev 155504)
@@ -1,50 +0,0 @@
-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 );
Deleted: community-i686/1.11.0_pre797991-parallel-build.patch
===================================================================
--- community-i686/1.11.0_pre797991-parallel-build.patch 2016-01-04 23:09:19 UTC (rev 155503)
+++ community-i686/1.11.0_pre797991-parallel-build.patch 2016-01-04 23:10:05 UTC (rev 155504)
@@ -1,62 +0,0 @@
-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 $@ $<
-
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-01-04 23:09:19 UTC (rev 155503)
+++ community-i686/PKGBUILD 2016-01-04 23:10:05 UTC (rev 155504)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Roman Kyrylych <Roman.Kyrylych at gmail.com>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=xalan-c
-pkgver=1.11_pre1153059
-pkgrel=3
-pkgdesc="A XSLT processor for transforming XML documents"
-arch=('i686' 'x86_64')
-url="http://xml.apache.org/xalan-c"
-license=('APACHE')
-depends=('xerces-c')
-source=(http://mirrors.kernel.org/gentoo/distfiles/Xalan-C_r1153059-src.tar.gz
- 1.11.0_pre797991-as-needed.patch
- 1.11.0_pre797991-bugfixes.patch
- 1.11.0_pre797991-parallel-build.patch)
-md5sums=('98ea8584ccdbb9044757dda725f780bf'
- '7040fb617e26fbdadc423948d3a23558'
- 'fe7af1f3a9e02ad813481f0e1a84f16c'
- '633b4ab702cb0ea0cf1010cadef7ac4c')
-
-build() {
- export XALANCROOT=${srcdir}/xml-xalan/c
-
- cd ${srcdir}/xml-xalan/c
- patch -Np2 -i ${srcdir}/1.11.0_pre797991-as-needed.patch
- patch -Np2 -i ${srcdir}/1.11.0_pre797991-bugfixes.patch
- patch -Np2 -i ${srcdir}/1.11.0_pre797991-parallel-build.patch
-
- ./runConfigure -p linux -c gcc -x g++ -P/usr
- #./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${srcdir}/xml-xalan/c
- make DESTDIR=${pkgdir} install
-}
Copied: xalan-c/repos/community-i686/PKGBUILD (from rev 155503, xalan-c/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-01-04 23:10:05 UTC (rev 155504)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Roman Kyrylych <Roman.Kyrylych at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=xalan-c
+pkgver=1.11
+pkgrel=1
+epoch=1
+pkgdesc="A XSLT processor for transforming XML documents"
+arch=('i686' 'x86_64')
+url="http://xalan.apache.org/"
+license=('APACHE')
+depends=('xerces-c')
+source=("http://www.eu.apache.org/dist/xalan/xalan-c/sources/xalan_c-$pkgver-src.tar.gz"{,.asc})
+md5sums=('9227d3e7ab375da3c643934b33a585b8'
+ 'SKIP')
+validpgpkeys=('78C476CF17BB57E17475C80B828B1A23586A109E') # David N. Bertoni <david_n_bertoni at us.ibm.com>
+
+build() {
+ export XALANCROOT=${srcdir}/$pkgname-$pkgver/c
+ cd $pkgname-$pkgver/c
+
+ ./runConfigure -p linux -c gcc -x g++ -P/usr
+# ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver/c
+ make DESTDIR="$pkgdir" install
+}
Deleted: community-x86_64/1.11.0_pre797991-as-needed.patch
===================================================================
--- community-x86_64/1.11.0_pre797991-as-needed.patch 2016-01-04 23:09:19 UTC (rev 155503)
+++ community-x86_64/1.11.0_pre797991-as-needed.patch 2016-01-04 23:10:05 UTC (rev 155504)
@@ -1,108 +0,0 @@
-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 $@ $<
Deleted: community-x86_64/1.11.0_pre797991-bugfixes.patch
===================================================================
--- community-x86_64/1.11.0_pre797991-bugfixes.patch 2016-01-04 23:09:19 UTC (rev 155503)
+++ community-x86_64/1.11.0_pre797991-bugfixes.patch 2016-01-04 23:10:05 UTC (rev 155504)
@@ -1,50 +0,0 @@
-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 );
Deleted: community-x86_64/1.11.0_pre797991-parallel-build.patch
===================================================================
--- community-x86_64/1.11.0_pre797991-parallel-build.patch 2016-01-04 23:09:19 UTC (rev 155503)
+++ community-x86_64/1.11.0_pre797991-parallel-build.patch 2016-01-04 23:10:05 UTC (rev 155504)
@@ -1,62 +0,0 @@
-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 $@ $<
-
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-01-04 23:09:19 UTC (rev 155503)
+++ community-x86_64/PKGBUILD 2016-01-04 23:10:05 UTC (rev 155504)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Roman Kyrylych <Roman.Kyrylych at gmail.com>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=xalan-c
-pkgver=1.11_pre1153059
-pkgrel=3
-pkgdesc="A XSLT processor for transforming XML documents"
-arch=('i686' 'x86_64')
-url="http://xml.apache.org/xalan-c"
-license=('APACHE')
-depends=('xerces-c')
-source=(http://mirrors.kernel.org/gentoo/distfiles/Xalan-C_r1153059-src.tar.gz
- 1.11.0_pre797991-as-needed.patch
- 1.11.0_pre797991-bugfixes.patch
- 1.11.0_pre797991-parallel-build.patch)
-md5sums=('98ea8584ccdbb9044757dda725f780bf'
- '7040fb617e26fbdadc423948d3a23558'
- 'fe7af1f3a9e02ad813481f0e1a84f16c'
- '633b4ab702cb0ea0cf1010cadef7ac4c')
-
-build() {
- export XALANCROOT=${srcdir}/xml-xalan/c
-
- cd ${srcdir}/xml-xalan/c
- patch -Np2 -i ${srcdir}/1.11.0_pre797991-as-needed.patch
- patch -Np2 -i ${srcdir}/1.11.0_pre797991-bugfixes.patch
- patch -Np2 -i ${srcdir}/1.11.0_pre797991-parallel-build.patch
-
- ./runConfigure -p linux -c gcc -x g++ -P/usr
- #./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${srcdir}/xml-xalan/c
- make DESTDIR=${pkgdir} install
-}
Copied: xalan-c/repos/community-x86_64/PKGBUILD (from rev 155503, xalan-c/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-01-04 23:10:05 UTC (rev 155504)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Roman Kyrylych <Roman.Kyrylych at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=xalan-c
+pkgver=1.11
+pkgrel=1
+epoch=1
+pkgdesc="A XSLT processor for transforming XML documents"
+arch=('i686' 'x86_64')
+url="http://xalan.apache.org/"
+license=('APACHE')
+depends=('xerces-c')
+source=("http://www.eu.apache.org/dist/xalan/xalan-c/sources/xalan_c-$pkgver-src.tar.gz"{,.asc})
+md5sums=('9227d3e7ab375da3c643934b33a585b8'
+ 'SKIP')
+validpgpkeys=('78C476CF17BB57E17475C80B828B1A23586A109E') # David N. Bertoni <david_n_bertoni at us.ibm.com>
+
+build() {
+ export XALANCROOT=${srcdir}/$pkgname-$pkgver/c
+ cd $pkgname-$pkgver/c
+
+ ./runConfigure -p linux -c gcc -x g++ -P/usr
+# ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver/c
+ make DESTDIR="$pkgdir" install
+}
More information about the arch-commits
mailing list