diff options
author | Viorel Munteanu <ceamac@gentoo.org> | 2023-01-20 19:31:39 +0200 |
---|---|---|
committer | Viorel Munteanu <ceamac@gentoo.org> | 2023-01-20 19:31:39 +0200 |
commit | 790b5499bb54945aed1bcb70e3bae3c31a202f20 (patch) | |
tree | f5f9bc98dd43fb7df1389277b7ab7a0dc2ce8c18 /dev-libs | |
parent | app-laptop/tuxedo-control-center-bin: update EAPI 7 -> 8 (diff) | |
download | gentoo-790b5499bb54945aed1bcb70e3bae3c31a202f20.tar.gz gentoo-790b5499bb54945aed1bcb70e3bae3c31a202f20.tar.bz2 gentoo-790b5499bb54945aed1bcb70e3bae3c31a202f20.zip |
dev-libs/xalan-c: drop 1.11.0_pre1153059
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/xalan-c/Manifest | 1 | ||||
-rw-r--r-- | dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch | 105 | ||||
-rw-r--r-- | dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch | 49 | ||||
-rw-r--r-- | dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch | 61 | ||||
-rw-r--r-- | dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild | 92 |
5 files changed, 0 insertions, 308 deletions
diff --git a/dev-libs/xalan-c/Manifest b/dev-libs/xalan-c/Manifest index 6ea0a59902b7..dc2282749ca2 100644 --- a/dev-libs/xalan-c/Manifest +++ b/dev-libs/xalan-c/Manifest @@ -1,3 +1,2 @@ -DIST Xalan-C_r1153059-src.tar.gz 1573651 BLAKE2B 5e684b80bc962776c1e0102a97023ee3a9b9357b6fc05e02687971d5d879b01a5dc426fd6ab2af68a7ad6ec48a799d70fd912a4e3a30d8e3a22a954d84d21f59 SHA512 2382c1343ae97d0196d84053139758d3b3b7574bcd835b754e34acdc6ab708a58fc23d2f27d41870c768c78a1de7be1bb6031cc78d205b6024f1ad7cd6fca653 DIST xalan_c-1.12.tar.gz 1130924 BLAKE2B c2f0fb98d39e516d5219ab0e075517c2c916b451bfce6d90399899870a8a73fb59f8d2465f58bd97208d19c5a7a18df5a49ece156d8dfe47bf57fc875793fb43 SHA512 a9f72f0e8e199ee2cfb4c19ecf390d5007f597aad96a53f55bc475805190302c7e0d800d776b7fb20fe8e2dddb6391e70aa3a8861a2303370135e8b0a5fd15fc DIST xalan_c-1.12.tar.gz.asc 488 BLAKE2B 1e5d7091ca184ac7e2897fe52417b01d9618ab0435f2bcc7748d563287ad81692e61bee92ec9bc71e5c21c11bc8245a4ec09ff7e6ed44a4b3113264b096ba277 SHA512 1c532367d5a3f16622cda3eaca05eac648b415a9de8685cf43f5e62683db30b396e669b6952f5bbe161327b8171cd1e54ad4dbefa54122243aa01298d53d400d 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 deleted file mode 100644 index 791da1cd7e75..000000000000 --- a/dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch +++ /dev/null @@ -1,105 +0,0 @@ ---- a/src/xalanc/Makefile.in -+++ b/src/xalanc/Makefile.in -@@ -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 ---- a/src/xalanc/Utils/MsgCreator/Makefile.in -+++ b/src/xalanc/Utils/MsgCreator/Makefile.in -@@ -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 $@ $< ---- a/Tests/Makefile.in -+++ b/Tests/Makefile.in -@@ -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 deleted file mode 100644 index 8b7f618bb8b1..000000000000 --- a/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp -+++ b/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp -@@ -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 deleted file mode 100644 index da2c79572984..000000000000 --- a/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- a/src/xalanc/Makefile.in -+++ b/src/xalanc/Makefile.in -@@ -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/xalan-c-1.11.0_pre1153059.ebuild b/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild deleted file mode 100644 index 8d8eda0a2222..000000000000 --- a/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="XSLT processor for transforming XML into HTML, text, or other XML types" -HOMEPAGE="https://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" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen )" - -S="${WORKDIR}/xml-xalan/c" - -PATCHES=( - "${FILESDIR}"/1.11.0_pre797991-as-needed.patch - "${FILESDIR}"/1.11.0_pre797991-bugfixes.patch - "${FILESDIR}"/1.11.0_pre797991-parallel-build.patch -) - -src_prepare() { - default - - # - 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" - export XALANCROOT="${S}" - - local target="linux" - local transcoder="default" - local mloader=$(usex nls nls inmem) - local thread=$(usex threads pthread none) - - ./runConfigure -p ${target} -c "$(tc-getCC)" -x "$(tc-getCXX)" \ - -m ${mloader} -t ${transcoder} \ - -r ${thread} > configure.vars || die "runConfigure failed" - - eval $(grep export configure.vars) - - default -} - -src_compile() { - default - - if use doc; then - mkdir build || die - cd xdocs || die - doxygen DoxyfileXalan || die - HTML_DOCS=( build/docs/apiDocs/. ) - - # clean doxygen cruft - find "${S}"/build \( -iname '*.map' -o -iname '*.md5' \) -delete || die - fi -} - -src_install() { - default - - if use examples; then - docinto examples - dodoc -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." -} |