* [gentoo-commits] repo/gentoo:master commit in: dev-libs/xalan-c/files/, dev-libs/xalan-c/
@ 2020-02-18 19:11 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2020-02-18 19:11 UTC (permalink / raw
To: gentoo-commits
commit: 315334b53166562660a4cce84d8e001ca018824b
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 18 19:11:10 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Feb 18 19:11:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=315334b5
dev-libs/xalan-c: Port to EAPI 7
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../xalan-c/files/1.11.0_pre797991-as-needed.patch | 15 +++---
.../xalan-c/files/1.11.0_pre797991-bugfixes.patch | 5 +-
.../files/1.11.0_pre797991-parallel-build.patch | 5 +-
dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild | 63 +++++++++-------------
4 files changed, 36 insertions(+), 52 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
index e8a9cc9d03b..791da1cd7e7 100644
--- 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
@@ -1,6 +1,5 @@
-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
+--- a/src/xalanc/Makefile.in
++++ b/src/xalanc/Makefile.in
@@ -174,7 +174,7 @@
"//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'": ${XSL_OBJ_DIR}/XalanExe.o
@@ -64,9 +63,8 @@ diff -Naur xml-xalan.orig/c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefi
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
+--- 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)
@@ -76,9 +74,8 @@ diff -Naur xml-xalan.orig/c/src/xalanc/Utils/MsgCreator/Makefile.in xml-xalan/c/
$(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
+--- a/Tests/Makefile.in
++++ b/Tests/Makefile.in
@@ -62,7 +62,7 @@
$(XSL_BIN_DIR)/ThreadTest: ${XSL_OBJ_DIR}/ThreadTest.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
index d86f1bd45f4..8b7f618bb8b 100644
--- a/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch
+++ b/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch
@@ -1,6 +1,5 @@
-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
+--- a/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp
++++ b/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp
@@ -28,7 +28,7 @@
#include <xalanc/PlatformSupport/DOMStringHelper.hpp>
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
index 46d9659b0f0..da2c7957298 100644
--- 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
@@ -1,6 +1,5 @@
-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
+--- a/src/xalanc/Makefile.in
++++ b/src/xalanc/Makefile.in
@@ -84,6 +84,10 @@
SAMPLES_DIR = ${XALANCROOT}/samples
TESTS_DIR = ${XALANCROOT}/Tests
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
index 894d99b5b6b..8d8eda0a222 100644
--- a/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild
+++ b/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=7
-inherit toolchain-funcs eutils multilib
+inherit toolchain-funcs
DESCRIPTION="XSLT processor for transforming XML into HTML, text, or other XML types"
-HOMEPAGE="http://xml.apache.org/xalan-c/"
+HOMEPAGE="https://xml.apache.org/xalan-c/"
SRC_URI="mirror://gentoo/Xalan-C_r${PV#*_pre}-src.tar.gz"
LICENSE="Apache-2.0"
@@ -15,22 +15,19 @@ 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 )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
S="${WORKDIR}/xml-xalan/c"
-pkg_setup() {
-# export ICUROOT="/usr"
- export XALANCROOT="${S}"
-}
+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() {
- epatch \
- "${FILESDIR}/1.11.0_pre797991-as-needed.patch" \
- "${FILESDIR}/1.11.0_pre797991-bugfixes.patch" \
- "${FILESDIR}/1.11.0_pre797991-parallel-build.patch"
+ default
# - do not run configure in runConfigure
# - echo the export commands instead exporting the vars
@@ -47,19 +44,12 @@ src_prepare() {
src_configure() {
export XERCESCROOT="/usr"
+ export XALANCROOT="${S}"
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 mloader=$(usex nls nls inmem)
+ local thread=$(usex threads pthread none)
./runConfigure -p ${target} -c "$(tc-getCC)" -x "$(tc-getCXX)" \
-m ${mloader} -t ${transcoder} \
@@ -73,24 +63,23 @@ src_configure() {
src_compile() {
default
- if use doc ; then
- mkdir build
- cd "${S}/xdocs"
- doxygen DoxyfileXalan
+ 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 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/*
+ if use examples; then
+ docinto examples
+ dodoc -r samples/.
fi
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/xalan-c/files/, dev-libs/xalan-c/
@ 2022-12-19 19:27 Viorel Munteanu
0 siblings, 0 replies; 4+ messages in thread
From: Viorel Munteanu @ 2022-12-19 19:27 UTC (permalink / raw
To: gentoo-commits
commit: a13a3325342f5ef87384302b272577725e659c7c
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 18:51:12 2022 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 19:27:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a13a3325
dev-libs/xalan-c: Fix threads test
The threads run and finish ok, but the counter used in the testing
application is not synchronized correctly; it seems the mutex they used
doesn't really work. So replace it by a std::mutex.
Closes: https://bugs.gentoo.org/887197
Closes: https://github.com/gentoo/gentoo/pull/28714
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
.../xalan-c/files/xalan-c-1.12-fix-threads.patch | 51 ++++++++++++++++++++++
dev-libs/xalan-c/xalan-c-1.12-r2.ebuild | 1 +
2 files changed, 52 insertions(+)
diff --git a/dev-libs/xalan-c/files/xalan-c-1.12-fix-threads.patch b/dev-libs/xalan-c/files/xalan-c-1.12-fix-threads.patch
new file mode 100644
index 000000000000..4a8e0e582621
--- /dev/null
+++ b/dev-libs/xalan-c/files/xalan-c-1.12-fix-threads.patch
@@ -0,0 +1,51 @@
+xercesc::XMLMutex doesn't work, replace it by std::mutex
+Bug: https://bugs.gentoo.org/887197
+
+--- a/Tests/Threads/ThreadTest.cpp
++++ b/Tests/Threads/ThreadTest.cpp
+@@ -49,6 +49,7 @@
+
+ #if defined(XALAN_USE_THREAD_STD)
+ #include <thread>
++#include <mutex>
+ #elif defined(XALAN_USE_THREAD_WINDOWS)
+
+ #include <process.h>
+@@ -95,8 +96,8 @@
+
+
+
+-typedef xercesc::XMLMutex XMLMutexType;
+-typedef xercesc::XMLMutexLock XMLMutexLockType;
++typedef std::mutex XMLMutexType;
++typedef std::lock_guard<std::mutex> XMLMutexLockType;
+
+
+
+@@ -121,7 +122,7 @@
+
+ XMLMutexType m_mutex;
+
+- long m_counter;
++ volatile long m_counter;
+ };
+
+
+@@ -143,7 +144,7 @@
+ void
+ SynchronizedCounter::increment()
+ {
+- const XMLMutexLockType theLock(&m_mutex);
++ const XMLMutexLockType theLock(m_mutex);
+
+ if (m_counter < LONG_MAX)
+ {
+@@ -156,7 +157,7 @@
+ void
+ SynchronizedCounter::decrement()
+ {
+- const XMLMutexLockType theLock(&m_mutex);
++ const XMLMutexLockType theLock(m_mutex);
+
+ if (m_counter > 0)
+ {
diff --git a/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild b/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild
index cd8b913943ee..74e63f8e818f 100644
--- a/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild
+++ b/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild
@@ -43,6 +43,7 @@ BDEPEND+="
PATCHES=(
"${FILESDIR}"/${P}-fix-lto.patch
+ "${FILESDIR}"/${P}-fix-threads.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/xalan-c/files/, dev-libs/xalan-c/
@ 2023-01-20 17:34 Viorel Munteanu
0 siblings, 0 replies; 4+ messages in thread
From: Viorel Munteanu @ 2023-01-20 17:34 UTC (permalink / raw
To: gentoo-commits
commit: 790b5499bb54945aed1bcb70e3bae3c31a202f20
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 17:31:39 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 17:31:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=790b5499
dev-libs/xalan-c: drop 1.11.0_pre1153059
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
dev-libs/xalan-c/Manifest | 1 -
.../xalan-c/files/1.11.0_pre797991-as-needed.patch | 105 ---------------------
.../xalan-c/files/1.11.0_pre797991-bugfixes.patch | 49 ----------
.../files/1.11.0_pre797991-parallel-build.patch | 61 ------------
dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild | 92 ------------------
5 files changed, 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."
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/xalan-c/files/, dev-libs/xalan-c/
@ 2024-07-12 21:31 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-07-12 21:31 UTC (permalink / raw
To: gentoo-commits
commit: 919d935a4f5068b50598db0ac2beae8460d8f667
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 12 21:30:12 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 12 21:30:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=919d935a
dev-libs/xalan-c: fix build w/ icu-75
Closes: https://bugs.gentoo.org/934471
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/xalan-c/files/xalan-c-1.12-icu-75.patch | 15 +++++++++++++++
dev-libs/xalan-c/xalan-c-1.12-r2.ebuild | 1 +
dev-libs/xalan-c/xalan-c-9999.ebuild | 3 ++-
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/dev-libs/xalan-c/files/xalan-c-1.12-icu-75.patch b/dev-libs/xalan-c/files/xalan-c-1.12-icu-75.patch
new file mode 100644
index 000000000000..0e272187d0e2
--- /dev/null
+++ b/dev-libs/xalan-c/files/xalan-c-1.12-icu-75.patch
@@ -0,0 +1,15 @@
+>= ICU 75 needs C++17, see https://bugs.gentoo.org/934471.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,9 +32,9 @@ if (POLICY CMP0067)
+ cmake_policy(SET CMP0067 NEW)
+ endif(POLICY CMP0067)
+
+-# Try C++14, then fall back to C++11 and C++98. Used for feature tests
++# Try C++17, then fall back to C++14, then C++11, and C++98. Used for feature tests
+ # for optional features.
+-set(CMAKE_CXX_STANDARD 14)
++set(CMAKE_CXX_STANDARD 17)
+
+ # Use folders (for IDE project grouping)
+ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
diff --git a/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild b/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild
index 6a2473fc1c7f..beb96a63de6f 100644
--- a/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild
+++ b/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild
@@ -44,6 +44,7 @@ BDEPEND+="
PATCHES=(
"${FILESDIR}"/${P}-fix-lto.patch
"${FILESDIR}"/${P}-fix-threads.patch
+ "${FILESDIR}"/${P}-icu-75.patch
)
src_configure() {
diff --git a/dev-libs/xalan-c/xalan-c-9999.ebuild b/dev-libs/xalan-c/xalan-c-9999.ebuild
index 88309b909407..13753c18e646 100644
--- a/dev-libs/xalan-c/xalan-c-9999.ebuild
+++ b/dev-libs/xalan-c/xalan-c-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
else
inherit verify-sig
SRC_URI="
- mirror://apache/xalan/xalan-c/sources/${MY_PN}-${PV}.tar.gz
+ https://dlcdn.apache.org/xalan/xalan-c/sources/${MY_PN}-${PV}.tar.gz
verify-sig? ( https://dlcdn.apache.org/xalan/xalan-c/sources/${MY_PN}-${PV}.tar.gz.asc )
"
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/apache-xalan-c.asc
@@ -43,6 +43,7 @@ BDEPEND+="
PATCHES=(
"${FILESDIR}"/${PN}-1.12-fix-lto.patch
+ "${FILESDIR}"/${PN}-1.12-icu-75.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-07-12 21:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-12 21:31 [gentoo-commits] repo/gentoo:master commit in: dev-libs/xalan-c/files/, dev-libs/xalan-c/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-01-20 17:34 Viorel Munteanu
2022-12-19 19:27 Viorel Munteanu
2020-02-18 19:11 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox