From f6fd15e0418aea97c7ee77672468561cdac302e5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 26 Aug 2023 15:57:31 +0100 Subject: gentoo auto-resync : 26:08:2023 - 15:57:31 --- dev-libs/xerces-c/Manifest | 5 +- .../files/xerces-c-3.2.2-fix-XERCESC-2163.patch | 25 +++++ dev-libs/xerces-c/xerces-c-3.2.4-r2.ebuild | 116 +++++++++++++++++++++ dev-libs/xerces-c/xerces-c-3.2.4.ebuild | 114 -------------------- dev-libs/xerces-c/xerces-c-9999.ebuild | 2 + 5 files changed, 146 insertions(+), 116 deletions(-) create mode 100644 dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch create mode 100644 dev-libs/xerces-c/xerces-c-3.2.4-r2.ebuild delete mode 100644 dev-libs/xerces-c/xerces-c-3.2.4.ebuild (limited to 'dev-libs/xerces-c') diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest index 3d6f0aa240ba..5b6e9cb1643f 100644 --- a/dev-libs/xerces-c/Manifest +++ b/dev-libs/xerces-c/Manifest @@ -1,5 +1,6 @@ AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19b39b9a67b88fc1d5ddfce5203b1c226f80ca8e1b6cc06897f3ce8eee11eb1bd923c702b8ce SHA512 030808e28a2095ecc143e4b5add8577eceb599e43eca6a59ed874d64a042b263245116e539791dca697f74e9336b23561321b16417e42d5b56c5b21597e1c3eb +AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 737 BLAKE2B e0bdf1021d574b20f29793a757772b9229610ed7f7abf81f13f841c765f05a70e90286f58a904653a05c33274a193408a09b71cf733dbc7ed9c5b19e9c0f4e31 SHA512 8825f9387d7900c2486ecc0d196a3df67333fe27ae9ca83683a56ea57b79248d3da62f5a553664e2d348fb9ad05b651566eada56d26157b471e76b95a81df9a8 DIST xerces-c-3.2.4.tar.xz 4260560 BLAKE2B 5d9fed1e9a461f8b348f3259216c5181bd03d2b5d8790cad88621d601065d0d79f8766ae70ed0aa7afe05005e2bcaf37a88da25b17f0e028bf074a31cea5fe71 SHA512 4d58d25b59b4528ad1f2d60681ddd6d2a4dba945613cee9ce978605f006da03703ea85a1bd89f781eeb3ad4dbdadf485a310f29d4c07036b0322f0755f87fddf -EBUILD xerces-c-3.2.4.ebuild 2767 BLAKE2B 30de0974c3e594e7c7e4da25a679d8f11a681a52d5d46fdfcb970c64cd18fce4406d1e7fe6e0f54ca6b975fe6fc4a1c6dd63b0fbe7181da1f7cb951f0ae2aa1c SHA512 831efcdfd284e40b46a42aa1fcab470183fcac1db9bcbf70836289939f04d5fd2e49380bd1e380f104a059a9a26b5223a0569ab48fdd6285dd85ba6eda09dcea -EBUILD xerces-c-9999.ebuild 2774 BLAKE2B 24ba776119a45cde34513f7c50960670a2b3d68fd347bc55e18a77aeb281b7b60f1f6c901636783d32bf7b5a2e2343c5acd060acccf087e647de1b00768c3cf6 SHA512 a527bafc30dc2448f6e084590165bcc54a0f8ee9d8002e4958db2cf0c84ef481a46c4c91d5aa33956c1b2713f560b38aa15ae3883e469ee08a97219f9cc84ed2 +EBUILD xerces-c-3.2.4-r2.ebuild 2829 BLAKE2B 6e6639f71d0945462f22670d022c2f72a815f19bc9020de5966681c2f699972f8416d26ba5e1e901e7f551236f1db759b9a74036e1a8820c3b2005d056809d6d SHA512 5536ce6ffef882ae679540980af51b37828321fd01a9c8b1d3698db62faf9d321f9d1cc494dd3ff392ff465c59f0b71e2335e23e046418eb1e6389ada73f18aa +EBUILD xerces-c-9999.ebuild 2836 BLAKE2B 0a9fc4b1e8148c1c298559ae94d3b91bdeb985fd08b3d218c3cddf6e7fac6d1d9e4342f063dc4cb2b4a66f0461f9fa2d5166531fbbbedabdb951e80afb9dd90c SHA512 9d91d6626b872e28b13502c1708bdb6f1ce578214e1f7066272242592c1e110ff99224ca2ffa40a23e9c6202e66611201ee51922a70946666e623e4de4eaad2c MISC metadata.xml 639 BLAKE2B 478311dd96d2a5938161f66cbcd3e0bbdb51bc5680c2bc9aaddcfef3921d356bb568fcf3047d181d54f3cf2560b547dcca3e964e064506c8bfccad9291c6d0da SHA512 8c8fd2d5a525000a06fb08b0cd20c4aefd6c9fb6554e7e8586bfc7a58be2884a629417035e0863950246bf12b756466c0453e2768a31678da002d029dceacb73 diff --git a/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch b/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch new file mode 100644 index 000000000000..50db010bf5ee --- /dev/null +++ b/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/673548 +https://bugs.gentoo.org/738140 +https://bugs.gentoo.org/913045 + +https://issues.apache.org/jira/browse/XERCESC-2163 +https://github.com/apache/xerces-c/pull/7 + +From db7a8b0cd2a163de1e3ef8c950cf9e708b0b5f98 Mon Sep 17 00:00:00 2001 +From: Craig Andrews +Date: Wed, 2 Jan 2019 15:01:21 -0500 +Subject: [PATCH] build: Install XercesMessages_en_US.cat to + /usr/share/xerces-c/msg + +Fixes XERCESC-2163 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1198,7 +1198,7 @@ if(XERCES_USE_MSGLOADER_ICONV) + + install( + FILES "${RESTARGET}" +- DESTINATION "${CMAKE_INSTALL_PREFIX}/msg" ++ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/xerces-c/msg" + COMPONENT "runtime") + endif() + diff --git a/dev-libs/xerces-c/xerces-c-3.2.4-r2.ebuild b/dev-libs/xerces-c/xerces-c-3.2.4-r2.ebuild new file mode 100644 index 000000000000..c48e8dc9931c --- /dev/null +++ b/dev-libs/xerces-c/xerces-c-3.2.4-r2.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake prefix + +DESCRIPTION="A validating XML parser written in a portable subset of C++" +HOMEPAGE="https://xerces.apache.org/xerces-c/" + +if [[ ${PV} == *9999 ]] ; then + ESVN_REPO_URI="https://svn.apache.org/repos/asf/xerces/c/trunk" + inherit subversion +else + SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="cpu_flags_x86_sse2 curl doc examples iconv icu static-libs test threads" + +RESTRICT="!test? ( test )" + +RDEPEND=" + curl? ( net-misc/curl ) + icu? ( dev-libs/icu:0= ) + virtual/libiconv" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( app-doc/doxygen ) + test? ( dev-lang/perl )" + +DOCS=( CREDITS KEYS NOTICE README ) + +PATCHES=( "${FILESDIR}"/${PN}-3.2.2-fix-XERCESC-2163.patch ) + +pkg_setup() { + export ICUROOT="${EPREFIX}/usr" + + if use iconv && use icu; then + ewarn "This package can use iconv or icu for loading messages" + ewarn "and transcoding, but not both. ICU takes precedence." + fi +} + +src_configure() { + # 'cfurl' is only available on OSX and 'socket' isn't supposed to work. + # But the docs aren't clear about it, so we would need some testing... + local netaccessor + if use curl; then + netaccessor="curl" + elif use elibc_Darwin; then + netaccessor="cfurl" + else + netaccessor="socket" + fi + + local msgloader + if use icu; then + msgloader="icu" + elif use iconv; then + msgloader="iconv" + else + msgloader="inmemory" + fi + + local transcoder + if use icu; then + transcoder="icu" + elif use elibc_Darwin; then + transcoder="macosunicodeconverter" + else + transcoder="gnuiconv" + fi + + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + -Dnetwork-accessor="${netaccessor}" + -Dmessage-loader="${msgloader}" + -Dtranscoder="${transcoder}" + -Dthreads:BOOL="$(usex threads)" + -Dsse2:BOOL="$(usex cpu_flags_x86_sse2)" + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + use doc && cmake_build doc-style createapidocs doc-xml +} + +src_install() { + cmake_src_install + + # package provides .pc files + find "${D}" -name '*.la' -delete || die + + if use examples; then + # clean out object files, executables, Makefiles + # and the like before installing examples + find samples/ \( -type f -executable -o -iname 'runConfigure' -o -iname '*.o' \ + -o -iname '.libs' -o -iname 'Makefile*' \) -exec rm -rf '{}' + || die + docinto examples + dodoc -r samples/. + docompress -x /usr/share/doc/${PF}/examples + fi + + # To make sure an appropriate NLS msg file is around when using + # the iconv msgloader ICU has the messages compiled in. + if use iconv && ! use icu; then + doenvd "$(prefixify_ro "${FILESDIR}/50xerces-c")" + fi +} diff --git a/dev-libs/xerces-c/xerces-c-3.2.4.ebuild b/dev-libs/xerces-c/xerces-c-3.2.4.ebuild deleted file mode 100644 index f1046bbeb48f..000000000000 --- a/dev-libs/xerces-c/xerces-c-3.2.4.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake prefix - -DESCRIPTION="A validating XML parser written in a portable subset of C++" -HOMEPAGE="https://xerces.apache.org/xerces-c/" - -if [[ ${PV} == *9999 ]] ; then - ESVN_REPO_URI="https://svn.apache.org/repos/asf/xerces/c/trunk" - inherit subversion -else - SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cpu_flags_x86_sse2 curl doc examples iconv icu static-libs test threads" - -RESTRICT="!test? ( test )" - -RDEPEND=" - curl? ( net-misc/curl ) - icu? ( dev-libs/icu:0= ) - virtual/libiconv" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( app-doc/doxygen ) - test? ( dev-lang/perl )" - -DOCS=( CREDITS KEYS NOTICE README ) - -pkg_setup() { - export ICUROOT="${EPREFIX}/usr" - - if use iconv && use icu; then - ewarn "This package can use iconv or icu for loading messages" - ewarn "and transcoding, but not both. ICU takes precedence." - fi -} - -src_configure() { - # 'cfurl' is only available on OSX and 'socket' isn't supposed to work. - # But the docs aren't clear about it, so we would need some testing... - local netaccessor - if use curl; then - netaccessor="curl" - elif use elibc_Darwin; then - netaccessor="cfurl" - else - netaccessor="socket" - fi - - local msgloader - if use icu; then - msgloader="icu" - elif use iconv; then - msgloader="iconv" - else - msgloader="inmemory" - fi - - local transcoder - if use icu; then - transcoder="icu" - elif use elibc_Darwin; then - transcoder="macosunicodeconverter" - else - transcoder="gnuiconv" - fi - - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - -Dnetwork-accessor="${netaccessor}" - -Dmessage-loader="${msgloader}" - -Dtranscoder="${transcoder}" - -Dthreads:BOOL="$(usex threads)" - -Dsse2:BOOL="$(usex cpu_flags_x86_sse2)" - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - use doc && cmake_build doc-style createapidocs doc-xml -} - -src_install() { - cmake_src_install - - # package provides .pc files - find "${D}" -name '*.la' -delete || die - - if use examples; then - # clean out object files, executables, Makefiles - # and the like before installing examples - find samples/ \( -type f -executable -o -iname 'runConfigure' -o -iname '*.o' \ - -o -iname '.libs' -o -iname 'Makefile*' \) -exec rm -rf '{}' + || die - docinto examples - dodoc -r samples/. - docompress -x /usr/share/doc/${PF}/examples - fi - - # To make sure an appropriate NLS msg file is around when using - # the iconv msgloader ICU has the messages compiled in. - if use iconv && ! use icu; then - doenvd "$(prefixify_ro "${FILESDIR}/50xerces-c")" - fi -} diff --git a/dev-libs/xerces-c/xerces-c-9999.ebuild b/dev-libs/xerces-c/xerces-c-9999.ebuild index 0fdc2749c78a..4b24ee3df5d8 100644 --- a/dev-libs/xerces-c/xerces-c-9999.ebuild +++ b/dev-libs/xerces-c/xerces-c-9999.ebuild @@ -33,6 +33,8 @@ BDEPEND=" DOCS=( CREDITS KEYS NOTICE README ) +PATCHES=( "${FILESDIR}"/${PN}-3.2.2-fix-XERCESC-2163.patch ) + pkg_setup() { export ICUROOT="${EPREFIX}/usr" -- cgit v1.2.3