From 2a8d2f71d1d9963368e0ef3d641d75979a689d12 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 4 Jul 2024 08:06:08 +0100 Subject: gentoo auto-resync : 04:07:2024 - 08:06:07 --- dev-libs/Manifest.gz | Bin 100204 -> 100196 bytes dev-libs/libxml2/Manifest | 2 + dev-libs/libxml2/libxml2-2.13.1.ebuild | 187 +++++++++++++++++++++ dev-libs/libxslt/Manifest | 7 +- ...-1.1.41-deprecated-xmlCharEncodingHandler.patch | 93 ++++++++++ ...extensions-xmlCheckFilename-older-libxml2.patch | 40 +++++ .../files/libxslt-1.1.41-libxml2-2.13.patch | 171 +++++++++++++++++++ dev-libs/libxslt/libxslt-1.1.41.ebuild | 129 ++++++++++++++ dev-libs/libxslt/libxslt-9999.ebuild | 15 +- dev-libs/mathjax/Manifest | 2 +- dev-libs/mathjax/metadata.xml | 8 +- dev-libs/nettle/Manifest | 4 +- dev-libs/nettle/nettle-3.10.ebuild | 2 +- dev-libs/nettle/nettle-3.9.1-r1.ebuild | 2 +- dev-libs/rocksdb/Manifest | 2 + dev-libs/rocksdb/rocksdb-9.3.1.ebuild | 80 +++++++++ dev-libs/spdlog/Manifest | 9 +- dev-libs/spdlog/files/spdlog-fmt-10.patch | 121 ------------- dev-libs/spdlog/files/spdlog-musl-1.2.4.patch | 30 ---- dev-libs/spdlog/metadata.xml | 4 + dev-libs/spdlog/spdlog-1.11.0-r3.ebuild | 55 ------ dev-libs/spdlog/spdlog-1.11.0-r4.ebuild | 56 ------ dev-libs/spdlog/spdlog-1.14.1.ebuild | 54 ++++++ 23 files changed, 790 insertions(+), 283 deletions(-) create mode 100644 dev-libs/libxml2/libxml2-2.13.1.ebuild create mode 100644 dev-libs/libxslt/files/libxslt-1.1.41-deprecated-xmlCharEncodingHandler.patch create mode 100644 dev-libs/libxslt/files/libxslt-1.1.41-extensions-xmlCheckFilename-older-libxml2.patch create mode 100644 dev-libs/libxslt/files/libxslt-1.1.41-libxml2-2.13.patch create mode 100644 dev-libs/libxslt/libxslt-1.1.41.ebuild create mode 100644 dev-libs/rocksdb/rocksdb-9.3.1.ebuild delete mode 100644 dev-libs/spdlog/files/spdlog-fmt-10.patch delete mode 100644 dev-libs/spdlog/files/spdlog-musl-1.2.4.patch delete mode 100644 dev-libs/spdlog/spdlog-1.11.0-r3.ebuild delete mode 100644 dev-libs/spdlog/spdlog-1.11.0-r4.ebuild create mode 100644 dev-libs/spdlog/spdlog-1.14.1.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 10461e175bbc..eec017d3c7d9 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index d3dcff67515a..c47914d85442 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -5,6 +5,7 @@ DIST libxml2-2.12.5.tar.xz 2643452 BLAKE2B b63ade8b18d98701e95b79ac2199bfc4ca89c DIST libxml2-2.12.6.tar.xz 2643124 BLAKE2B 677589cf063b109018aafc04a1564242ba1a9d88b2c511f583d4aa511c13aff15254a9d5f6ea2c294902338b0c0207ff59c51298e128981d57f86367ddc1a803 SHA512 19d6901c0f189813e8bd20ffdfbb29d8545ca30154d1f3cc82624d64e4db3cfbe8eef7e8ccc1e195289f1bf94bb50fefcf11a95badb0ddeb845b4e4ea5a819ac DIST libxml2-2.12.7.tar.xz 2641980 BLAKE2B 19abc2a7824212b1de3ceb1e8e3bbb39cb5feb31f8f6e1b1701a8255f34aadbbd01631e8011fd1207d2e711372a893034a99cb4aaa779a1df22d49d339dbfc76 SHA512 88b5f3e0a7c6704926e662a46ba0606d901efbcd70a36bd39fe034e29ee42d66d7296358761e04272c9696192a1380bda55852b2a0b14a05a7a083a08e125f5f DIST libxml2-2.12.8.tar.xz 2643728 BLAKE2B d26fe61e913e73c923eb8140a9080d6b70078ce45e94fe61d1ca1b8919d5b86feb7f14156f5a8b06ea06a03a96a242ce3a32e8d61169cfa8bde587888438627b SHA512 59baac9a82a734045112be6da12bbbe80a71575145424c2225e4bd9f8d54e53c674dcbc9576eb55f646632335702e7f0b1928f96a851159ace9b26f677fd3d77 +DIST libxml2-2.13.1.tar.xz 2579424 BLAKE2B 93cbd3943b0a7a7a07036a3ce01740c37049b44c20f43aaee96ef9a36e86bc108914950d7532740be87995b8eb5c1e6fbb4464c6af0a20233c8a1a206b9a5b83 SHA512 28d280eb5e2f3af9df5adcccced730602e6951fd181b8d00256dbb2138abfe32a4b145fdc00ed8c77a6d322e0929bcb3d5128ad4622877d7f8a059d4b6e011a6 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe @@ -14,5 +15,6 @@ EBUILD libxml2-2.12.5.ebuild 5248 BLAKE2B 5bfa07ebbef8b985c246b28b9d56dcca2f9cbd EBUILD libxml2-2.12.6.ebuild 5248 BLAKE2B 5bfa07ebbef8b985c246b28b9d56dcca2f9cbd881a7933dcc29fea023ed850c9d3630611651b0214f59f2b7ddb6dc0759f37f72c34a09e429e8b7284d339051a SHA512 53766010d7b0f9d9bbd35b9c3df96f777c44b2d003cba8a3d17d075c0fc0ddc7347688980ec597c11623156544896fc4e64870dec56b625a1c36eacdc2a40a0c EBUILD libxml2-2.12.7.ebuild 5249 BLAKE2B 7ed075e1fb2fcb860e28da0e0d653bccac730180ba61755c76b90db227fdff3194b1504ddfe89a350d72a41b12aaba9854c638412be9e56b5b5949665ee00394 SHA512 a1dbcf241e782a54f04227e61082d6d8706879321ae63bd1f9b3d9e5a0e424e2d58a7ebb7b2c1223bcaebfab5c90f7c7d25ba638a1a12c7d4f5ebb1dce88a82b EBUILD libxml2-2.12.8.ebuild 5256 BLAKE2B 8e512b8c1bff1c1799f73004a96bacab4679bd3d1dde1f50adb23bac04c49718946d9dc4f5b07182a6b920a2a07257b1692d990cfb5a0608bc71f0fe4ed7a693 SHA512 26894b5fd0dc9a8f5afb162373aaff979ad2901ee9912d869773035082a7b337efe9fe034732009a4326bcbad4e5a0f9048792b0fafd9d7fb3bbc5ed4b393cbd +EBUILD libxml2-2.13.1.ebuild 4906 BLAKE2B 61247853a173e8294c8a6c33dab565acdf761693d9cf098aae9364d11db17168386c84a2e9649b1f140912d1d75c7c9b8abb999097a0a926c267eb61039e46d1 SHA512 184005fcf8fb255e04fdf006b49f4a736dccef59e39adc986de04b133b85cdc69bd1e51acc15ff9cdb30d52195dc55d684676eb1a41d23184582e3486281a1d4 EBUILD libxml2-9999.ebuild 4906 BLAKE2B 61247853a173e8294c8a6c33dab565acdf761693d9cf098aae9364d11db17168386c84a2e9649b1f140912d1d75c7c9b8abb999097a0a926c267eb61039e46d1 SHA512 184005fcf8fb255e04fdf006b49f4a736dccef59e39adc986de04b133b85cdc69bd1e51acc15ff9cdb30d52195dc55d684676eb1a41d23184582e3486281a1d4 MISC metadata.xml 519 BLAKE2B 528be4ec79b54eaed229c84c96656266acffaa2ab68c7b1e6daecdee77bb1109ea56babceff0459125e04326425be28f436a78f697c363920102b94aca25179d SHA512 85804c662dd019e6c4cad05bb691b2058c9b93c190c57a7b4cc2674bee71a805da41159184c1bae9954700e52b41bb104a2d1e66ea4d1799463626befb691d11 diff --git a/dev-libs/libxml2/libxml2-2.13.1.ebuild b/dev-libs/libxml2/libxml2-2.13.1.ebuild new file mode 100644 index 000000000000..e3b042b80914 --- /dev/null +++ b/dev-libs/libxml2/libxml2-2.13.1.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Note: Please bump in sync with dev-libs/libxslt + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" +inherit python-r1 multilib-minimal + +XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" +XSTS_NAME_1="xmlschema2002-01-16" +XSTS_NAME_2="xmlschema2004-01-14" +XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" +XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" +XMLCONF_TARBALL="xmlts20130923.tar.gz" + +DESCRIPTION="XML C parser and toolkit" +HOMEPAGE="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2" + inherit autotools git-r3 +else + inherit gnome.org libtool + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +SRC_URI+=" + test? ( + ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} + ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} + https://www.w3.org/XML/Test/${XMLCONF_TARBALL} + ) +" +S="${WORKDIR}/${PN}-${PV%_rc*}" + +LICENSE="MIT" +SLOT="2" +IUSE="examples icu lzma +python readline static-libs test" +RESTRICT="!test? ( test )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + virtual/libiconv + >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] + icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:= ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +if [[ ${PV} == 9999 ]] ; then + BDEPEND+=" dev-build/gtk-doc-am" +fi + +MULTILIB_CHOST_TOOLS=( + /usr/bin/xml2-config +) + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + else + local tarname=${P/_rc/-rc}.tar.xz + + # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR}, + # as they are needed as tarballs in ${S}/xstc instead and not unpacked + unpack ${tarname} + + if [[ -n ${PATCHSET_VERSION} ]] ; then + unpack ${PN}-${PATCHSET_VERSION}.tar.xz + fi + fi + + cd "${S}" || die + + if use test ; then + cp "${DISTDIR}/${XSTS_TARBALL_1}" \ + "${DISTDIR}/${XSTS_TARBALL_2}" \ + "${S}"/xstc/ \ + || die "Failed to install test tarballs" + unpack ${XMLCONF_TARBALL} + fi +} + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + eautoreconf + else + # Please do not remove, as else we get references to PORTAGE_TMPDIR + # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. + elibtoolize + fi +} + +multilib_src_configure() { + libxml2_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_with icu) \ + $(use_with lzma) \ + $(use_enable static-libs static) \ + $(multilib_native_use_with readline) \ + $(multilib_native_use_with readline history) \ + "$@" + } + + # Build python bindings separately + libxml2_configure --without-python + + multilib_is_native_abi && use python && + python_foreach_impl run_in_build_dir libxml2_configure --with-python +} + +libxml2_py_emake() { + pushd "${BUILD_DIR}"/python >/dev/null || die + + emake top_builddir="${NATIVE_BUILD_DIR}" "$@" + + popd >/dev/null || die +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use python ; then + NATIVE_BUILD_DIR="${BUILD_DIR}" + python_foreach_impl run_in_build_dir libxml2_py_emake all + fi +} + +multilib_src_test() { + ln -s "${S}"/xmlconf || die + + emake check + + multilib_is_native_abi && use python && + python_foreach_impl run_in_build_dir libxml2_py_emake check +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + multilib_is_native_abi && use python && + python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install + + # Hack until automake release is made for the optimise fix + # https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097 + multilib_is_native_abi && use python && python_foreach_impl python_optimize +} + +multilib_src_install_all() { + einstalldocs + + if ! use examples ; then + rm -rf "${ED}"/usr/share/doc/${PF}/examples || die + rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die + fi + + rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not + # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. + if [[ -n "${ROOT}" ]]; then + elog "Skipping XML catalog creation for stage building (bug #208887)." + else + # Need an XML catalog, so no-one writes to a non-existent one + CATALOG="${EROOT}/etc/xml/catalog" + + # We don't want to clobber an existing catalog though, + # only ensure that one is there + # + if [[ ! -e "${CATALOG}" ]]; then + [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" + "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" + einfo "Created XML catalog in ${CATALOG}" + fi + fi +} diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest index eb319aa326eb..211bd3511d30 100644 --- a/dev-libs/libxslt/Manifest +++ b/dev-libs/libxslt/Manifest @@ -1,5 +1,10 @@ AUX libxslt-1.1.39-libxml2-2.11-tests.patch 911 BLAKE2B b9240d9720044ec75fff2ca73abb5b5192f8a0262d5cc51cd5e3bc5b8e07af45486a257d4eb5098cf0c7263d1324a7a9995cce38210245d5b53afc5fe7f4d224 SHA512 26f8664c3cc2bf2579eb236cb771d9fbc0ee528472a44ea55e7975fa0182e63c12a1b7d30c9c01b2e848f9ec91dded5ec4a59c60a7eea2bb283bd120c3e0fedc +AUX libxslt-1.1.41-deprecated-xmlCharEncodingHandler.patch 3803 BLAKE2B 54246d50bddf4287b535e55d6d65c790fd027d8d1c290ec77483ea998ae4bb85e27b5440ca8198850128a226a901477580bdc1ecaa3245ccaab9fa4c62712033 SHA512 e80f48c80e68a46697c45b501c426815ed21199eedfc1093f9885689e9a1321192d4ebb546cda62c1290508bbc2ddb8862d6875c00b8e08663eaea76bec8bbff +AUX libxslt-1.1.41-extensions-xmlCheckFilename-older-libxml2.patch 1189 BLAKE2B cbc164f593c4e46a959d801d5d81502e4599aa9456a7a4b72686325f36f96b75892df519118222ec79335da91dff5aafe695cadf37fd3f31cc43a6828f761afd SHA512 4fbb4969505837c7ca842b2192270a40aca14f69ba74dc763253a1c5f9475ad8e904e06b109181ca80bc7bb719b6fb5055d791a15e1c24e9da0007435464aef1 +AUX libxslt-1.1.41-libxml2-2.13.patch 5457 BLAKE2B 4fa71f28d253592be63e0b8b93002d359b21b40f15fe043c7602ee593600f91dfefa86ae4076096b09fa5df9834e58b62fd5ee4bc997967388c10aa3acfa12d5 SHA512 e1e546efbe08ebf37b02d55770d3b11efd6b97646cc7a8d3b23b06b438cf8c2ee8c3d892037e41fe7dca46a4d20cbc9dc0f2591b924d94c93456726672aa71c2 DIST libxslt-1.1.39.tar.xz 1578216 BLAKE2B 7c87b769d345fc99a966bea6b4e94533fa211dc3a987ce013a03eefb05dde73ef75526bdecf7d32d8c77112232096fb22d8ec4f0a781b9f59d0422a2db75df01 SHA512 c0c99dc63f8b2acb6cc3ad7ad684ffa2a427ee8d1740495cbf8a7c9b9c8679f96351b4b676c73ccc191014db4cb4ab42b9a0070f6295565f39dbc665c5c16f89 +DIST libxslt-1.1.41.tar.xz 1573868 BLAKE2B 2228a4074f257edd4fa0ebb2a713b035b780b19398ba9208dedb0d0cec6777129c9bb08a80494b657a4238bea228bd752761118a0022f56d71cc1302838b1733 SHA512 b9f94d1c00dfb9f731c6c424a0d3f07fb0a37935048b26618e5405c3890d1d40c832420117de4d5363a90ab4809f77f6e566013ce7858cc88e0905709ca0f6fe EBUILD libxslt-1.1.39.ebuild 3077 BLAKE2B 4237046549c25493c3a7f12bedfbed3daf8782f169e191b0d0df609ba76880b49e1b746228013ba4cb2b7c5c4b6819b3408e8a58f06a9699fbd1ed11e524834e SHA512 a47042c01fda8dec62bc52d11322b749dcfee9586b8f9d0ea8b65b5a60bb1a2902d5e5501b7bfeba6372176c64f462df76ef830a4398737c01bc9ddc7c837c05 -EBUILD libxslt-9999.ebuild 2858 BLAKE2B ca04bff5151ae6882095cf1787ed9ff6e730b95c347c8b8b042a95698fcc62d9e50900b87c6dd693f811ee5fb930d2b7fb7810d4b5c050049ce8685fe377b715 SHA512 4836fdb88d8dc56da5b2de3dca921ee892467e553870fe413da73eeb19f7791c86db614ee529659ed5b05213987ddadb2cc39ad7361aa3e6675a40cfb56887b9 +EBUILD libxslt-1.1.41.ebuild 3110 BLAKE2B 62da5f36ed393452e6c6ca85ae1f0052700f89199f272148ca8be836c3a3a4abbd926aec3d80f9e1b31d9d68304571df141d74c4497557aa9dc74dbd7937eaec SHA512 74c37c33e87c75ed33b3daf530c35558cad43eb739fe70617bbec09feded1038fb061f7a01593002f4a6aa88c4f73957dd8e75c815e8a2714a61938b21337563 +EBUILD libxslt-9999.ebuild 3110 BLAKE2B 62da5f36ed393452e6c6ca85ae1f0052700f89199f272148ca8be836c3a3a4abbd926aec3d80f9e1b31d9d68304571df141d74c4497557aa9dc74dbd7937eaec SHA512 74c37c33e87c75ed33b3daf530c35558cad43eb739fe70617bbec09feded1038fb061f7a01593002f4a6aa88c4f73957dd8e75c815e8a2714a61938b21337563 MISC metadata.xml 519 BLAKE2B 19c44d930c1d6af33c7cd756ddd74fb29f93d37dc4953956011e8ff5a563caa119b8848ef8e47ca0e71ced4134b7dfc9092c89a14cf1000148e0383c01183ddc SHA512 6c5e8dcd014d9203f0f50ba2e11d3fd52d89f226ef2f4d1d39143347a8de4433e1f6fa30881f87701695438da263c13dad59230c957002aea2950da01eb66c00 diff --git a/dev-libs/libxslt/files/libxslt-1.1.41-deprecated-xmlCharEncodingHandler.patch b/dev-libs/libxslt/files/libxslt-1.1.41-deprecated-xmlCharEncodingHandler.patch new file mode 100644 index 000000000000..86c779c3c7cf --- /dev/null +++ b/dev-libs/libxslt/files/libxslt-1.1.41-deprecated-xmlCharEncodingHandler.patch @@ -0,0 +1,93 @@ +https://gitlab.gnome.org/GNOME/libxslt/-/commit/8d456f03b6b6661edfb0a3f1bc5abdc9597f60e7 + +From 8d456f03b6b6661edfb0a3f1bc5abdc9597f60e7 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Tue, 2 Jul 2024 22:27:02 +0200 +Subject: [PATCH] utils: Don't use deprecated xmlCharEncodingHandler member + +--- + libxslt/xsltutils.c | 44 ++++++++++++++++++++------------------------ + 1 file changed, 20 insertions(+), 24 deletions(-) + +diff --git a/libxslt/xsltutils.c b/libxslt/xsltutils.c +index 3705d28f..d493905b 100644 +--- a/libxslt/xsltutils.c ++++ b/libxslt/xsltutils.c +@@ -1750,13 +1750,12 @@ xsltSaveResultToFilename(const char *URL, xmlDocPtr result, + + XSLT_GET_IMPORT_PTR(encoding, style, encoding) + if (encoding != NULL) { +- xmlCharEncodingHandlerPtr encoder; ++ xmlCharEncodingHandlerPtr encoder = NULL; + +- encoder = xmlFindCharEncodingHandler((char *)encoding); +- if ((encoder != NULL) && +- (xmlStrEqual((const xmlChar *)encoder->name, +- (const xmlChar *) "UTF-8"))) +- encoder = NULL; ++ /* Don't use UTF-8 dummy encoder */ ++ if ((xmlStrcasecmp(encoding, BAD_CAST "UTF-8") != 0) && ++ (xmlStrcasecmp(encoding, BAD_CAST "UTF8") != 0)) ++ encoder = xmlFindCharEncodingHandler((char *) encoding); + buf = xmlOutputBufferCreateFilename(URL, encoder, compression); + } else { + buf = xmlOutputBufferCreateFilename(URL, NULL, compression); +@@ -1793,13 +1792,12 @@ xsltSaveResultToFile(FILE *file, xmlDocPtr result, xsltStylesheetPtr style) { + + XSLT_GET_IMPORT_PTR(encoding, style, encoding) + if (encoding != NULL) { +- xmlCharEncodingHandlerPtr encoder; ++ xmlCharEncodingHandlerPtr encoder = NULL; + +- encoder = xmlFindCharEncodingHandler((char *)encoding); +- if ((encoder != NULL) && +- (xmlStrEqual((const xmlChar *)encoder->name, +- (const xmlChar *) "UTF-8"))) +- encoder = NULL; ++ /* Don't use UTF-8 dummy encoder */ ++ if ((xmlStrcasecmp(encoding, BAD_CAST "UTF-8") != 0) && ++ (xmlStrcasecmp(encoding, BAD_CAST "UTF8") != 0)) ++ encoder = xmlFindCharEncodingHandler((char *) encoding); + buf = xmlOutputBufferCreateFile(file, encoder); + } else { + buf = xmlOutputBufferCreateFile(file, NULL); +@@ -1837,13 +1835,12 @@ xsltSaveResultToFd(int fd, xmlDocPtr result, xsltStylesheetPtr style) { + + XSLT_GET_IMPORT_PTR(encoding, style, encoding) + if (encoding != NULL) { +- xmlCharEncodingHandlerPtr encoder; ++ xmlCharEncodingHandlerPtr encoder = NULL; + +- encoder = xmlFindCharEncodingHandler((char *)encoding); +- if ((encoder != NULL) && +- (xmlStrEqual((const xmlChar *)encoder->name, +- (const xmlChar *) "UTF-8"))) +- encoder = NULL; ++ /* Don't use UTF-8 dummy encoder */ ++ if ((xmlStrcasecmp(encoding, BAD_CAST "UTF-8") != 0) && ++ (xmlStrcasecmp(encoding, BAD_CAST "UTF8") != 0)) ++ encoder = xmlFindCharEncodingHandler((char *) encoding); + buf = xmlOutputBufferCreateFd(fd, encoder); + } else { + buf = xmlOutputBufferCreateFd(fd, NULL); +@@ -1880,13 +1877,12 @@ xsltSaveResultToString(xmlChar **doc_txt_ptr, int * doc_txt_len, + + XSLT_GET_IMPORT_PTR(encoding, style, encoding) + if (encoding != NULL) { +- xmlCharEncodingHandlerPtr encoder; ++ xmlCharEncodingHandlerPtr encoder = NULL; + +- encoder = xmlFindCharEncodingHandler((char *)encoding); +- if ((encoder != NULL) && +- (xmlStrEqual((const xmlChar *)encoder->name, +- (const xmlChar *) "UTF-8"))) +- encoder = NULL; ++ /* Don't use UTF-8 dummy encoder */ ++ if ((xmlStrcasecmp(encoding, BAD_CAST "UTF-8") != 0) && ++ (xmlStrcasecmp(encoding, BAD_CAST "UTF8") != 0)) ++ encoder = xmlFindCharEncodingHandler((char *) encoding); + buf = xmlAllocOutputBuffer(encoder); + if (buf == NULL) + xmlCharEncCloseFunc(encoder); +-- +GitLab diff --git a/dev-libs/libxslt/files/libxslt-1.1.41-extensions-xmlCheckFilename-older-libxml2.patch b/dev-libs/libxslt/files/libxslt-1.1.41-extensions-xmlCheckFilename-older-libxml2.patch new file mode 100644 index 000000000000..bdf39460af2a --- /dev/null +++ b/dev-libs/libxslt/files/libxslt-1.1.41-extensions-xmlCheckFilename-older-libxml2.patch @@ -0,0 +1,40 @@ +https://gitlab.gnome.org/GNOME/libxslt/-/commit/a85bd17ec52793b33074f0f785c3d989feb20170 + +From a85bd17ec52793b33074f0f785c3d989feb20170 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Fri, 21 Jun 2024 15:07:18 +0200 +Subject: [PATCH] extensions: Readd call to xmlCheckFilename with older libxml2 + +Fix spurious warning with libxml2 before 2.13.0 caused by 014b2892. + +Fixes #113. +--- + libxslt/extensions.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/libxslt/extensions.c b/libxslt/extensions.c +index 05cdf354..d3d61543 100644 +--- a/libxslt/extensions.c ++++ b/libxslt/extensions.c +@@ -415,6 +415,19 @@ xsltExtModuleRegisterDynamic(const xmlChar * URI) + module_filename, URI); + #endif + ++#if LIBXML_VERSION < 21300 ++ if (1 != xmlCheckFilename(module_filename)) { ++ ++#ifdef WITH_XSLT_DEBUG_EXTENSIONS ++ xsltGenericDebug(xsltGenericDebugContext, ++ "xmlCheckFilename failed for plugin: %s\n", module_filename); ++#endif ++ ++ xmlFree(ext_name); ++ return (-1); ++ } ++#endif ++ + /* attempt to open the module */ + m = xmlModuleOpen(module_filename, 0); + if (NULL == m) { +-- +GitLab diff --git a/dev-libs/libxslt/files/libxslt-1.1.41-libxml2-2.13.patch b/dev-libs/libxslt/files/libxslt-1.1.41-libxml2-2.13.patch new file mode 100644 index 000000000000..99b89ae08f74 --- /dev/null +++ b/dev-libs/libxslt/files/libxslt-1.1.41-libxml2-2.13.patch @@ -0,0 +1,171 @@ +https://gitlab.gnome.org/GNOME/libxslt/-/issues/116 +https://gitlab.gnome.org/GNOME/libxslt/-/commit/081cd6e97a620d035ed7df35e998e2d288bc7862 + +From 081cd6e97a620d035ed7df35e998e2d288bc7862 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Mon, 1 Jul 2024 13:21:14 +0200 +Subject: [PATCH] transform: Handle filesystem paths after libxml2 changes + +After changes in libxml2 2.13, base URIs and resolved URIs can be +filesystem paths. + +Check for invalid URIs and remove fragment before resolving URI in +xsltDocumentFunction. + +Handle filesystem paths in xsltCheckRead. + +Should fix #116. +--- + libxslt/functions.c | 64 ++++++++++++++++++++++++++------------------- + libxslt/security.c | 13 +++++++++ + 2 files changed, 50 insertions(+), 27 deletions(-) + +diff --git a/libxslt/functions.c b/libxslt/functions.c +index 0c9dec43..d54f8f48 100644 +--- a/libxslt/functions.c ++++ b/libxslt/functions.c +@@ -96,11 +96,10 @@ xsltXPathFunctionLookup (void *vctxt, + ************************************************************************/ + + static void +-xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, xmlChar* URI) ++xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, ++ const xmlChar* URI, const xmlChar *fragment) + { + xsltTransformContextPtr tctxt; +- xmlURIPtr uri; +- xmlChar *fragment = NULL; + xsltDocumentPtr idoc; /* document info */ + xmlDocPtr doc; + xmlXPathContextPtr xptrctxt = NULL; +@@ -115,26 +114,7 @@ xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, xmlChar* URI) + goto out_fragment; + } + +- uri = xmlParseURI((const char *) URI); +- if (uri == NULL) { +- xsltTransformError(tctxt, NULL, NULL, +- "document() : failed to parse URI\n"); +- goto out_fragment; +- } +- +- /* +- * check for and remove fragment identifier +- */ +- fragment = (xmlChar *)uri->fragment; +- if (fragment != NULL) { +- xmlChar *newURI; +- uri->fragment = NULL; +- newURI = xmlSaveUri(uri); +- idoc = xsltLoadDocument(tctxt, newURI); +- xmlFree(newURI); +- } else +- idoc = xsltLoadDocument(tctxt, URI); +- xmlFreeURI(uri); ++ idoc = xsltLoadDocument(tctxt, URI); + + if (idoc == NULL) { + if ((URI == NULL) || +@@ -194,7 +174,6 @@ out_fragment: + if (resObj == NULL) + resObj = xmlXPathNewNodeSet(NULL); + valuePush(ctxt, resObj); +- xmlFree(fragment); + } + + /** +@@ -210,7 +189,8 @@ xsltDocumentFunction(xmlXPathParserContextPtr ctxt, int nargs) + { + xmlXPathObjectPtr obj, obj2 = NULL; + xmlChar *base = NULL, *URI; +- ++ xmlChar *newURI = NULL; ++ xmlChar *fragment = NULL; + + if ((nargs < 1) || (nargs > 2)) { + xsltTransformError(xsltXPathGetTransformContext(ctxt), NULL, NULL, +@@ -292,7 +272,32 @@ xsltDocumentFunction(xmlXPathParserContextPtr ctxt, int nargs) + valuePush(ctxt, xmlXPathNewNodeSet(NULL)); + } else { + xsltTransformContextPtr tctxt; ++ xmlURIPtr uri; ++ const xmlChar *url; ++ + tctxt = xsltXPathGetTransformContext(ctxt); ++ ++ url = obj->stringval; ++ ++ uri = xmlParseURI((const char *) url); ++ if (uri == NULL) { ++ xsltTransformError(tctxt, NULL, NULL, ++ "document() : failed to parse URI '%s'\n", url); ++ valuePush(ctxt, xmlXPathNewNodeSet(NULL)); ++ goto error; ++ } ++ ++ /* ++ * check for and remove fragment identifier ++ */ ++ fragment = (xmlChar *)uri->fragment; ++ if (fragment != NULL) { ++ uri->fragment = NULL; ++ newURI = xmlSaveUri(uri); ++ url = newURI; ++ } ++ xmlFreeURI(uri); ++ + if ((obj2 != NULL) && (obj2->nodesetval != NULL) && + (obj2->nodesetval->nodeNr > 0) && + IS_XSLT_REAL_NODE(obj2->nodesetval->nodeTab[0])) { +@@ -313,7 +318,8 @@ xsltDocumentFunction(xmlXPathParserContextPtr ctxt, int nargs) + (xmlNodePtr) tctxt->style->doc); + } + } +- URI = xmlBuildURI(obj->stringval, base); ++ ++ URI = xmlBuildURI(url, base); + if (base != NULL) + xmlFree(base); + if (URI == NULL) { +@@ -326,10 +332,14 @@ xsltDocumentFunction(xmlXPathParserContextPtr ctxt, int nargs) + valuePush(ctxt, xmlXPathNewNodeSet(NULL)); + } + } else { +- xsltDocumentFunctionLoadDocument( ctxt, URI ); ++ xsltDocumentFunctionLoadDocument(ctxt, URI, fragment); + xmlFree(URI); + } + } ++ ++error: ++ xmlFree(newURI); ++ xmlFree(fragment); + xmlXPathFreeObject(obj); + if (obj2 != NULL) + xmlXPathFreeObject(obj2); +diff --git a/libxslt/security.c b/libxslt/security.c +index 001ee6e4..3a66594f 100644 +--- a/libxslt/security.c ++++ b/libxslt/security.c +@@ -422,6 +422,19 @@ xsltCheckRead(xsltSecurityPrefsPtr sec, + xmlURIPtr uri; + xsltSecurityCheck check; + ++ if (xmlStrstr(URL, BAD_CAST "://") == NULL) { ++ check = xsltGetSecurityPrefs(sec, XSLT_SECPREF_READ_FILE); ++ if (check != NULL) { ++ ret = check(sec, ctxt, (const char *) URL); ++ if (ret == 0) { ++ xsltTransformError(ctxt, NULL, NULL, ++ "Local file read for %s refused\n", URL); ++ return(0); ++ } ++ } ++ return(1); ++ } ++ + uri = xmlParseURI((const char *)URL); + if (uri == NULL) { + xsltTransformError(ctxt, NULL, NULL, +-- +GitLab diff --git a/dev-libs/libxslt/libxslt-1.1.41.ebuild b/dev-libs/libxslt/libxslt-1.1.41.ebuild new file mode 100644 index 000000000000..57f23538af3d --- /dev/null +++ b/dev-libs/libxslt/libxslt-1.1.41.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Note: Please bump this in sync with dev-libs/libxml2. + +PYTHON_COMPAT=( python3_{10..12} ) +inherit python-r1 multilib-minimal + +DESCRIPTION="XSLT libraries and tools" +HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxslt" + inherit autotools git-r3 +else + inherit libtool gnome.org + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="crypt debug examples python static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +BDEPEND=">=virtual/pkgconfig-1" +RDEPEND=" + >=dev-libs/libxml2-2.13:2[${MULTILIB_USEDEP}] + crypt? ( >=dev-libs/libgcrypt-1.5.3:=[${MULTILIB_USEDEP}] ) + python? ( + ${PYTHON_DEPS} + >=dev-libs/libxml2-2.13:2[${MULTILIB_USEDEP},python,${PYTHON_USEDEP}] + ) +" +DEPEND="${RDEPEND}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/xslt-config +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libxslt/xsltconfig.h +) + +PATCHES=( + "${FILESDIR}"/${P}-extensions-xmlCheckFilename-older-libxml2.patch + "${FILESDIR}"/${P}-libxml2-2.13.patch + "${FILESDIR}"/${P}-deprecated-xmlCharEncodingHandler.patch +) + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + eautoreconf + else + # Prefix always needs elibtoolize if not eautoreconf'd. + elibtoolize + fi +} + +multilib_src_configure() { + libxslt_configure() { + ECONF_SOURCE="${S}" econf \ + --without-python \ + $(use_with crypt crypto) \ + $(use_with debug) \ + $(use_enable static-libs static) \ + "$@" + } + + # Build Python bindings separately + libxslt_configure --without-python + + if multilib_is_native_abi && use python ; then + NATIVE_BUILD_DIR="${BUILD_DIR}" + python_foreach_impl run_in_build_dir libxslt_configure --with-python + fi +} + +libxslt_py_emake() { + pushd "${BUILD_DIR}"/python >/dev/null || die + + emake top_builddir="${NATIVE_BUILD_DIR}" "$@" + + popd >/dev/null || die +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use python ; then + python_foreach_impl run_in_build_dir libxslt_py_emake all + fi +} + +multilib_src_test() { + default + + if multilib_is_native_abi && use python ; then + python_foreach_impl run_in_build_dir libxslt_py_emake check + fi +} + +multilib_src_install() { + # "default" does not work here - docs are installed by multilib_src_install_all + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use python; then + python_foreach_impl run_in_build_dir libxslt_py_emake \ + DESTDIR="${D}" \ + install + + # Hack until automake release is made for the optimise fix + # https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097 + python_foreach_impl python_optimize + fi +} + +multilib_src_install_all() { + einstalldocs + + if ! use examples ; then + rm -rf "${ED}"/usr/share/doc/${PF}/tutorial{,2} || die + rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die + fi + + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/dev-libs/libxslt/libxslt-9999.ebuild b/dev-libs/libxslt/libxslt-9999.ebuild index 22acdc53723a..57f23538af3d 100644 --- a/dev-libs/libxslt/libxslt-9999.ebuild +++ b/dev-libs/libxslt/libxslt-9999.ebuild @@ -25,9 +25,12 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" BDEPEND=">=virtual/pkgconfig-1" RDEPEND=" - >=dev-libs/libxml2-2.9.11:2[${MULTILIB_USEDEP}] - crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) + >=dev-libs/libxml2-2.13:2[${MULTILIB_USEDEP}] + crypt? ( >=dev-libs/libgcrypt-1.5.3:=[${MULTILIB_USEDEP}] ) + python? ( + ${PYTHON_DEPS} + >=dev-libs/libxml2-2.13:2[${MULTILIB_USEDEP},python,${PYTHON_USEDEP}] + ) " DEPEND="${RDEPEND}" @@ -39,6 +42,12 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/libxslt/xsltconfig.h ) +PATCHES=( + "${FILESDIR}"/${P}-extensions-xmlCheckFilename-older-libxml2.patch + "${FILESDIR}"/${P}-libxml2-2.13.patch + "${FILESDIR}"/${P}-deprecated-xmlCharEncodingHandler.patch +) + src_prepare() { default diff --git a/dev-libs/mathjax/Manifest b/dev-libs/mathjax/Manifest index 8bfbe9ca56ee..5f6b7cb6c95c 100644 --- a/dev-libs/mathjax/Manifest +++ b/dev-libs/mathjax/Manifest @@ -6,4 +6,4 @@ EBUILD mathjax-2.7.7-r1.ebuild 2048 BLAKE2B d9970a08756f46c2910acf0e514d11376c52 EBUILD mathjax-2.7.7.ebuild 1405 BLAKE2B b1b6a47d751d07cd35c8cc9386e3c67c78cf70ff8f7b8406aeb06a46359128d306e7f18ca08fa5ef24d96d767c7d44e60212a9ea2bf4f9c51d6eea2a760fbd6e SHA512 d8b70496fcf5a8ea511174c0b2a47411b263e8a0d4e95f796f73e3f839beb1ba1b10ebbf75a0677c28cb6c13ea60593db1f07f66f9fdc9da2910420c486ab1da EBUILD mathjax-3.2.2-r1.ebuild 1271 BLAKE2B dea7c302234bd829f5b1e0d65519e88d2e628d1dd84cc2f93a39cd0eb5d16f3ee571eee86df28f275bb1a802c0560b1cc0305d751eed46b6a5de86bc4c7c51c2 SHA512 0a143af5a9da849d2cf6f3c9391ac09e6d54cfa0f6c793a9fbc3b4f09312e97233f15e1dd07aeca0b7afedf9efd55e7cade83c6d1d0b802c5ff3875601b08e8e EBUILD mathjax-3.2.2-r2.ebuild 1787 BLAKE2B d65b7bf929895e7a6bef4e533faf8b6bd9936dfb4ac1769083b985a778514b10ab90edad9c90632b307230293baa709ac5a49838df11c44c69e36486b66743ce SHA512 3147bacebf83fb870294ff901ec05529014cfa2b824a5032569edfef984e47fa9659c06ca0285fa37030d588699c930f44a74038b07bfd7ed7c565a0b97e6e0e -MISC metadata.xml 1241 BLAKE2B 19291ba751c642a7d9043974dc0fd212bd33dde4673f9add753d421dfc5f035b2e94af9fdc1052e235f7b43a18b8dcc70defb34915423e89338440475b1bfdd6 SHA512 3c2f52648b99a4262520733961d784595fbef8ffe8eef7ec24d82fbbbf4afd74239d6ae91889690eb10748a59ca2b28cdcdc05ce4589ee852a22c4bb2a0a13a5 +MISC metadata.xml 1087 BLAKE2B d29a8ade7189e19a422ffd9dbdc53dff2fbda38f185cb7bd7abb6101aae93326a7b8f68731277804e5cc30d79ef54568e329ee89821fe9a7b025bef2426c60c1 SHA512 2140a39e4253469caf772921e82b323560966cbee3c2ee5af763ffc1c2f439585f267ffa85d17b3b426270c495af0eec81a21c795500fc6c76f2ecada3f7d8e5 diff --git a/dev-libs/mathjax/metadata.xml b/dev-libs/mathjax/metadata.xml index de8e9f370f4b..d816f6fd3178 100644 --- a/dev-libs/mathjax/metadata.xml +++ b/dev-libs/mathjax/metadata.xml @@ -1,14 +1,10 @@ - - eschwartz93@gmail.com + + eschwartz@gentoo.org Eli Schwartz - - proxy-maint@gentoo.org - Proxy Maintainers - MathJax is an open-source JavaScript display engine for LaTeX and diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest index 2f5ba553c86a..01889bb6ae7c 100644 --- a/dev-libs/nettle/Manifest +++ b/dev-libs/nettle/Manifest @@ -4,7 +4,7 @@ DIST nettle-3.8.1.tar.gz 2406251 BLAKE2B 22b4ec81645b579504356597ba87b637e462856 DIST nettle-3.8.1.tar.gz.sig 374 BLAKE2B e2bfce4aaa1be114fb9bf8724f25db75c69c3b98538df46e9b1428ce615f7db3b9e9f9240d232fddac195db4568439b3f58989c20beca82aa6db79f4956db547 SHA512 978304b1faa5adc3b0d6ea7e9597af6154ad5d6e328913ac19184ece94771fdb2a7d5ce0af535ae8d28cb6ccd94fb3d4ef2613c0356df9e08b5d4c26ea646e09 DIST nettle-3.9.1.tar.gz 2396741 BLAKE2B e3ceaefa19491e58f26b900beaf8b4e746feb2357c7677f5c050f257f4a23c304773446b6283a42a82cf9640e16522b8a71c47f137759f1df23cdeee4625d142 SHA512 5939c4b43cf9ff6c6272245b85f123c81f8f4e37089fa4f39a00a570016d837f6e706a33226e4bbfc531b02a55b2756ff312461225ed88de338a73069e031ced DIST nettle-3.9.1.tar.gz.sig 374 BLAKE2B 41c37cc0ea649445c7e4bbe2d0e9ab1c6f7bb50000adef2c2ee4828e7efdd2d7c6d823d64209f251cb7d82ce85e73768430a435ee7f1d5a3732e744987918d0c SHA512 fe6f4c9746e7dbc10f61843673de95d2faea209b1caea5c7bf69b81d3f6b2248a4907012b2baf0d65e54682f835cff465482db37615b789017ce0a9e7e267d7d -EBUILD nettle-3.10.ebuild 3295 BLAKE2B c0fd90d2b496227a53431fdc93ff1bdec98e6c3a726d042097abdcd650c3538eef05cd0da0ee927a8bd2ac72a148bb118b72abe0d066a127df9d1fb05ab28bab SHA512 3d5888cd83ee6116a12cbe9d6a015eb9fad7319990a716988dc17cdd83619554db0f294ff6eda298efa4ea75df4e2df0e3e52f509df24078828152f02bf236d2 +EBUILD nettle-3.10.ebuild 3291 BLAKE2B 0a85b07033ed8a3b07eb21ecf59030c62484495dec65a808b9050eb3a84da344d40355117a2888778affa0c4ce0886f7d95a1ac151ecd96eabbfa6b708f2bf2c SHA512 5cdd9235c92be05b834d3277fdee431fbfd72362b4c43f8cf1386719f1ec023c02a39865059697cea9ec189a18a0457caa2435d410f393ba240a5a97fcf125f0 EBUILD nettle-3.8.1.ebuild 2623 BLAKE2B 60ea85fbaedf21cb3c7a056d08eb46eb1ce1e487e5ef5c69f2e0baef1d312cd514580a48e6f5b0b99b9762e2f9cc01e82dc8ef5d30aabe4b00c1f60313fc93b5 SHA512 3c6ded7aa546c6436a3c1399285928d1192b25e8dfef7c41084eb04987e31cb12860f51e10627aaea03f80d6d394a45b46ce43e37092f6fad6f06c2382b48a30 -EBUILD nettle-3.9.1-r1.ebuild 3113 BLAKE2B 57b7050e5d17abee26bcaf7a8acaaa392133457a01ab67c8b483a4f3c814602479e1d0489ae13b2cad07c687b567ae5768d0a48680be3a0b3edf994145c30143 SHA512 cfe542893db48ffbfa9b5e649dbe716099339c787657ed1e53095ce0268c5a39b75348294c7f45261029ad93908fdeee25e929b9a3bcd8464e6d5c2c497929fb +EBUILD nettle-3.9.1-r1.ebuild 3109 BLAKE2B 57a2fb5bdf3aa656607ed1c12b578c06f517060903b7f4cf34a9c342e943f9ddf4679c3191a8dbb9f5b5ca1ea6e0f87a18b1e0635e9611ba5b98bd967cdc8531 SHA512 97fd1f6e3b17890e0551d6f02d05ce836ce557bdbe4e20483832dd108c0ea4ff0fdbe94fa32a425013c3b7a5c440579af5a74c2c18aeba40001a1174ea2ae939 MISC metadata.xml 401 BLAKE2B 8840ace8e513d9ee82322e82f348b15c94ed9ece2b102bc2bb977041e518f56f5f6b068318771759b1895d47db084026ae443841a9f305cf965c37121ef0100b SHA512 b2c4a89887b5882fc8e04a83e047d2f9bdc60e2f1799fd724c83275acd1f7b9b4c1c08c4c3ada810f5d30cf3c6048cd8043c7792dd909969b7e4bf4da66b42c8 diff --git a/dev-libs/nettle/nettle-3.10.ebuild b/dev-libs/nettle/nettle-3.10.ebuild index b79aa1e683e3..08c8eb463c22 100644 --- a/dev-libs/nettle/nettle-3.10.ebuild +++ b/dev-libs/nettle/nettle-3.10.ebuild @@ -89,7 +89,7 @@ multilib_src_configure() { ) # https://git.lysator.liu.se/nettle/nettle/-/issues/7 - if use cpu_flags_ppc_altivec && ! tc-cpp-is-true "defined(__VSX__) && __VSX__ == 1" "${CPPFLAGS}" "${CFLAGS}" ; then + if use cpu_flags_ppc_altivec && ! tc-cpp-is-true "defined(__VSX__) && __VSX__ == 1" ${CPPFLAGS} ${CFLAGS} ; then ewarn "cpu_flags_ppc_altivec is enabled, but nettle's asm requires >=P7." ewarn "Disabling, sorry! See bug #920234." myeconfargs+=( --disable-power-altivec ) diff --git a/dev-libs/nettle/nettle-3.9.1-r1.ebuild b/dev-libs/nettle/nettle-3.9.1-r1.ebuild index 5f20798db8f1..55e95a1e59f5 100644 --- a/dev-libs/nettle/nettle-3.9.1-r1.ebuild +++ b/dev-libs/nettle/nettle-3.9.1-r1.ebuild @@ -84,7 +84,7 @@ multilib_src_configure() { ) # https://git.lysator.liu.se/nettle/nettle/-/issues/7 - if use cpu_flags_ppc_altivec && ! tc-cpp-is-true "defined(__VSX__) && __VSX__ == 1" "${CPPFLAGS}" "${CFLAGS}" ; then + if use cpu_flags_ppc_altivec && ! tc-cpp-is-true "defined(__VSX__) && __VSX__ == 1" ${CPPFLAGS} ${CFLAGS} ; then ewarn "cpu_flags_ppc_altivec is enabled, but nettle's asm requires >=P7." ewarn "Disabling, sorry! See bug #920234." myeconfargs+=( --disable-power-altivec ) diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest index 38aa559f969e..846110c10009 100644 --- a/dev-libs/rocksdb/Manifest +++ b/dev-libs/rocksdb/Manifest @@ -5,10 +5,12 @@ DIST rocksdb-6.14.6.tar.gz 6397194 BLAKE2B 43ad8e7e9fdf0c6c75ff03370f2107899bbce DIST rocksdb-7.9.2.tar.gz 12058713 BLAKE2B 76a840565fccdc800eaad055da7698f7a5fc6e217187e078d60420c61cde1236c427cc4ae7d557c69ee5c358cd1ebc7fc4ed52063c04965fcc2c3c35774e9f59 SHA512 9cf2a359cedb21ca70fc921e54f19c406fd9aa2a739ad1627842fad2dec0e7dedbfe52aa8e85fbfbe7005c00ca1e7e7013f728d4d9938f3cebdf794504b431cb DIST rocksdb-8.10.0.tar.gz 13316582 BLAKE2B 63f5a13c285dcc830d9d31623435af5d8385a1ecad2b4bbf433cdc9f1e8032218a24f06220199fab4deb385d3964890fc5de6bfdbadd5cd304826aeca600b246 SHA512 524e3e70ed2b1d2e6c61a7b401946e50473cc95684ce4efc6250062f5bc945e443e96f7907fcc3ee1ab98c71179a8b56a654383cf2c0bbe1bb20907ab1ac7523 DIST rocksdb-8.11.3.tar.gz 13345436 BLAKE2B 8d8069c030ee345090ebec15528342d776d7a74d6b72808a054511aad169acaa89c5fee530e73b3faba9152aadc4d26f1edc4586e31ddf5501d2899b5d6500ec SHA512 df701e8f3a94efe351c5dfec691635b6cff9b5902e8d5bd714caa7389bbbfd8ce7f7e91f1549978b47b934449fb3b77581dfcc2811a7727be049709a330ca71e +DIST rocksdb-9.3.1.tar.gz 13512627 BLAKE2B 9ab5fca82221a9d8ac2898fb20f1398a61435a6b76632a83f9ab35ffd0e2856f7b6dddc35ef6af5f2eeb6d87d1cd13872110d86effe37a712863d1731aa5b063 SHA512 3d1dbbb8b0dbf94a9780aaf6bc1f02a75d20a403d94602e0adddcba2af72564efa6bc6bd7fcbec0b02083d677c29806359801ca2b5832f916b300a5fdb3af832 EBUILD rocksdb-6.14.6-r2.ebuild 1198 BLAKE2B 269f96e8c312b1ce45dff8463c5bb3e5a415a2d7760b27a68c55ee043107d84e46bdeda36458346f90650a4be16abaa57871fc09039e224e0cd9645ae1bcdf9a SHA512 2e631eacab520f835bbd4ea4219b615ca4a81e229dc2428189a7ab88d79c0fc6a5bd5a897cf8ed0e9092ff5e9f634f90ddbc4ed2fa19afdad8d13debaf45a490 EBUILD rocksdb-6.14.6-r3.ebuild 1908 BLAKE2B 1d08d4967163e8ddbf063b0e1d19493249d8eeadf155eeb01f28c0c4bca1db3c254ccff73e29e1d991bbe5b4fa353665a190bff6b1b7d85ba3467cb6e3d5de95 SHA512 cd254ef55f854d49384549e9c93dfc7031b0488f2605f0699181ae61a089ae359627676fb602acf38d65dce8bac0e01455e54356ad08b9d24faacf749ba34f6e EBUILD rocksdb-7.9.2-r1.ebuild 1929 BLAKE2B d866717be53f421b481a7e9110bd9f5309302b8eac3b649a24a6e24d563217bf13066cad38b1906b31d3a5cbedba2fa9e5a84ae3b6ba38664d15802559fa5c26 SHA512 c7f3cea80e5fda4bd2dea5a89003b37e1aae15a9077cb9f060dac5d2f490936ecfda8e6eeaeb7549ba08df3765785a4261a33851c939125e776e740eafef9371 EBUILD rocksdb-7.9.2.ebuild 1280 BLAKE2B bff5eeafa4c995e5c1d225bf63302da8ed4b62fe274244ba6c46636a860b8845dd855c44e16139779208915d7635d2c6b73d63a9f51c67ca16c161870bc9210f SHA512 6a2f471ee4c75ac3bdad16de3b1716453823c710375aca71360be608290571f86a08fe3e13b84a4da0420bb1fe7e06ec24627014d1bb7eec8b95b53f34d6c976 EBUILD rocksdb-8.10.0.ebuild 1884 BLAKE2B 4fb69ed884eefba6a56c59bc5fbd3a464aba47b257c3cdf03ce02e216f66dccd0b5007e0f8b237f40b9e0ecfa06385ac860a0df3765cca5744a66c65bb5591b9 SHA512 14906f019eb0812f20dce57331cd20d74da1ebcd1e722f6e9a3984c18f712899aecb7874d8a7f6b2f5702ea6e8b6a7d0e6d9b3239915293accba64e452a5f8bb EBUILD rocksdb-8.11.3.ebuild 1884 BLAKE2B 4fb69ed884eefba6a56c59bc5fbd3a464aba47b257c3cdf03ce02e216f66dccd0b5007e0f8b237f40b9e0ecfa06385ac860a0df3765cca5744a66c65bb5591b9 SHA512 14906f019eb0812f20dce57331cd20d74da1ebcd1e722f6e9a3984c18f712899aecb7874d8a7f6b2f5702ea6e8b6a7d0e6d9b3239915293accba64e452a5f8bb +EBUILD rocksdb-9.3.1.ebuild 1884 BLAKE2B 4fb69ed884eefba6a56c59bc5fbd3a464aba47b257c3cdf03ce02e216f66dccd0b5007e0f8b237f40b9e0ecfa06385ac860a0df3765cca5744a66c65bb5591b9 SHA512 14906f019eb0812f20dce57331cd20d74da1ebcd1e722f6e9a3984c18f712899aecb7874d8a7f6b2f5702ea6e8b6a7d0e6d9b3239915293accba64e452a5f8bb MISC metadata.xml 571 BLAKE2B b743b9af4854469178c2b496356c8359167e52c5c39a9fe2df88910afabccf71f7f3cfcb72558af72025b804ca4d5eb930291e7653b3a720ed91b11968e8d28c SHA512 e53decfd517254b09eb7d59bcfffb699ad7459a17159218bb04a0a06b2d459e9f68f2132dd111da4d98afad331090c1545d300853252a23c15fb8786b02d29c5 diff --git a/dev-libs/rocksdb/rocksdb-9.3.1.ebuild b/dev-libs/rocksdb/rocksdb-9.3.1.ebuild new file mode 100644 index 000000000000..c5a5cce5e1d8 --- /dev/null +++ b/dev-libs/rocksdb/rocksdb-9.3.1.ebuild @@ -0,0 +1,80 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Embeddable, persistent key-value store for fast storage" +HOMEPAGE="http://rocksdb.org https://github.com/facebook/rocksdb/" +SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="jemalloc numa static-libs tbb test" + +RESTRICT="!test? ( test )" + +DEPEND=" + app-arch/bzip2:= + app-arch/lz4:= + app-arch/snappy:= + app-arch/zstd:= + dev-cpp/gflags:= + sys-libs/liburing:= + sys-libs/zlib:= + sys-process/numactl + jemalloc? ( dev-libs/jemalloc:= ) + tbb? ( dev-cpp/tbb:= ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + sed -i -e 's/liburing.a/uring/' cmake/modules/Finduring.cmake || die + sed -i -e '/find_program(CCACHE_FOUND ccache)/d' CMakeLists.txt || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DFAIL_ON_WARNINGS=OFF + -DPORTABLE=1 + -DROCKSDB_BUILD_SHARED=$(usex static-libs OFF ON) + -DWITH_ALL_TESTS=$(usex test) + -DWITH_ASAN=OFF + -DWITH_BENCHMARK=OFF + -DWITH_BENCHMARK_TOOLS=OFF + -DWITH_BZ2=ON + -DWITH_CORE_TOOLS=ON + -DWITH_DYNAMIC_EXTENSION=ON + -DWITH_EXAMPLES=OFF + -DWITH_FALLOCATE=ON + -DWITH_GFLAGS=ON + -DWITH_IOSTATS_CONTEXT=ON + -DWITH_JEMALLOC=$(usex jemalloc ON OFF) + -DWITH_JNI=OFF + -DWITH_LIBURING=ON + -DWITH_LZ4=ON + -DWITH_MD_LIBRARY=ON + -DWITH_NUMA=$(usex numa) + -DWITH_SNAPPY=ON + -DWITH_TBB=$(usex tbb) + -DWITH_TOOLS=ON + -DWITH_TRACE_TOOLS=ON + -DWITH_TSAN=OFF + -DWITH_ZLIB=ON + -DWITH_ZSTD=ON + ) + # -DWITH_TESTS option works only with debug build, needs to be set here + # to not be overriden by cmake.eclass + CMAKE_BUILD_TYPE=$(usex test Debug RelWithDebInfo) cmake_src_configure +} + +src_install() { + cmake_src_install + + if ! use static-libs; then + rm "${ED}"/usr/$(get_libdir)/*.a || die + fi +} diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest index 6c3dfc4e3291..751aff0f3404 100644 --- a/dev-libs/spdlog/Manifest +++ b/dev-libs/spdlog/Manifest @@ -1,14 +1,11 @@ AUX spdlog-1.12.0-fix-tests.patch 554 BLAKE2B 233cadf694bbfea4aa538d3b1f5241682aaa74fccbcce94441180f5ce3374332ac77ae6c08461a118861924d84056d2075fcd8fcc7beccc81e41b1101909e223 SHA512 b78640666c940ac49f0db375544c22b6778a8e2c38208530c7a8b2fb7ed70526a212efc49a94f3498b82f9681039e97c304f956010c16913ca052369dbe56935 -AUX spdlog-fmt-10.patch 5199 BLAKE2B 1e2593faf291f2f366897fd2eb1764b442627a86ced6195454f283e9e2a17807386f55d5c33f31dccdabcda0bf4bd6aab60388a4f6cc281e3506344984a90a3e SHA512 8af2a62939eb39de667af8d7082230b696243510648577abc786ea5b8e9ee87a830e2e5972bc92431c692cd508c76eec592374b1fa599dea4cd52ac0dbfd4496 AUX spdlog-force_external_fmt.patch 539 BLAKE2B 326f40d3d496e7373a77476d5aba237d8ad7828e5d21ccfc1e4183a74e3f7f2df1f61a2188a5cf0dc4c08ef9692c5de4a4589fae75c1daa4a9987d4be3f168f6 SHA512 257c7f7f56e66b88a16238a2c81887f2d5ba9692c18bf5fc371b95f44936018ec7c4a0abd0e54f38cb6a7957f82a1b95af9d238fa7fa16631f0be1980d76f692 -AUX spdlog-musl-1.2.4.patch 1428 BLAKE2B 22d1c0ada761c52f29e1a4dff0c16140741d78f878d14fc78fbfde9dbf7a73fe08e3b0bfa22c9e0ccfa4f631459bb6349c6a33f0e6ba5f646c2e56e731831bbe SHA512 8cc281e126eb0246a13880487a667e8672eb190810698b0737dd1211153e3b158e13a0bba8c57f8e72f5f3f0532b856c9ef9ab6c5825c694cb96c02877a73151 -DIST spdlog-1.11.0.tar.gz 373033 BLAKE2B a05a535ba55641ecb3bf484eeff902f266bf3967cfbd619234ab0ca2d0c15bddb27b73ce43c33623d02fb046f621933cd52cf39f377f354182d9cdab33340f28 SHA512 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412 DIST spdlog-1.12.0.tar.gz 251037 BLAKE2B 3170f1e680fc4652ed8ddc0f74627aec22149f028def599fc5ed4db3a942d840006963789577f2e3df0e2b8ca1d98a881f3b96be5e1174fdf0acea15b3676d6e SHA512 db9a4f13b6c39ffde759db99bcdfe5e2dbe4231e73b29eb906a3fa78d6b8ec66920b8bd4371df17ae21b7b562472a236bc4435678f3af92b6496be090074181d DIST spdlog-1.13.0.tar.gz 264003 BLAKE2B 8ffeec847f082a0932f406ab44b4653661fdbe95a15f7b736367ee6d8f45ab36ca2182a9e9c6fba5c0688ab5436c16932b130541a8532cc2e5f4980e6340b929 SHA512 44fcb414ad9fbbe2a6d72c29143eeeae477b687ed30ae870d661b032a029ad4214ef43e7ef6350d02791d05504492978ade2d6733fab12ce4884d8f0bc4c6340 -EBUILD spdlog-1.11.0-r3.ebuild 1066 BLAKE2B 2f9e5013ded134257381f8be7a545677ff1950018cbee2d6e56a1c668890c0d5c2a1f606473cfed9858155ee1e7ba15fc147bd0c0a2f54480be35d58525989ab SHA512 07fa9eb7b51213654f012761aa0d3c107499bcf9f07371b5fdfcccfefba5d378cb825bea61c618c8284759091030cd995fc454e132b541c8bf95cad043d78689 -EBUILD spdlog-1.11.0-r4.ebuild 1180 BLAKE2B 1553c6ad46a09283746e4b4e4c62f28e50e1f5a8af44fc40b20da9cdd0ddb0ed25095454ca22edb9b6ed2303b14d0bd92ce27401a9731a041af99bcf14e5936a SHA512 490b12a8cc566e7fec04b528dcbeb035a1a5ac62068c11a41fb106ba0125b4ed8a0cc5fe12a13bc74cc4e591505ca4bbef9e292b3d47d2d6de1f3f468f540696 +DIST spdlog-1.14.1.tar.gz 270896 BLAKE2B 70ac5142acfd765c649f2e34286bae3b5082db284dd1ca7c3d7424a53dd658f7d308bef0b5e0c89192fc3931f1fe5efdba91e460c7b3df836dffc22b66f821fa SHA512 d8f36a3d65a43d8c64900e46137827aadb05559948b2f5a389bea16ed1bfac07d113ee11cf47970913298d6c37400355fe6895cda8fa6dcf6abd9da0d8f199e9 EBUILD spdlog-1.12.0-r2.ebuild 1106 BLAKE2B 3c56c2e447e6812acbaaed28f1544501a23a60b8a398f4172af6ba03b1564bb2211120eee98353d5b97fe11a2ee28c8b4dfa756171170e55cf89f0ef2a3dbb59 SHA512 fc12e864b6d4d4b159fb61572eadfb7872aab7108621359a277e872268511c5e48bc2cb10feb1b29b1f3c8f8ec3baae4be98cd176b50c513f81f05494b6b5a41 EBUILD spdlog-1.12.0-r3.ebuild 1190 BLAKE2B 24771d7f021dbdf6fd70ef37c567fb8da71ff62bcb1b3e6c5a1f981deada76453a4d8a1c518948ae44b06acd242bc33397eeaa63495f91b2efd74722276cb1df SHA512 394c5a964278fcdeb199956fb37c1de9d23727d59733f4f35ec603b5759093f41815c24fe33990a77cb0d7ea2fedeea8fe4f7ae48c38bd5a7496bc3cb7d491f4 EBUILD spdlog-1.13.0-r2.ebuild 1154 BLAKE2B c15cb279b3eec7d6fc2df15ad7e2053bf0377b2599a1843679e1811aef16c87bdc91d77d59e0bfcdbea4ff5841d7ad38b8150051b1ee20656f9d72fad3b15e80 SHA512 26b977f7e86e887249481022a50ff03e7950fecf5e473ddd04e908a2b21925b27edab6454582eed87fb467ceb7166fb5574ea987340683f4311c60a3700493bd +EBUILD spdlog-1.14.1.ebuild 1145 BLAKE2B 0c98d6e3d229bd63d402abbec51aa817fe3a5c477f9fb55067eba11dfb4341e7618fa2e1d009d746401f3d96f0e3c08aa7ca91fc7c24010b69b7fa0fe2afba32 SHA512 53803237ccff1773130036959036d47867f465ab66d37599c3a0bfe125434de8a65db6c36eaf942e61e4e7e421e89c877d1cc88a805ea5f262053a0946d620ca EBUILD spdlog-9999.ebuild 1154 BLAKE2B c15cb279b3eec7d6fc2df15ad7e2053bf0377b2599a1843679e1811aef16c87bdc91d77d59e0bfcdbea4ff5841d7ad38b8150051b1ee20656f9d72fad3b15e80 SHA512 26b977f7e86e887249481022a50ff03e7950fecf5e473ddd04e908a2b21925b27edab6454582eed87fb467ceb7166fb5574ea987340683f4311c60a3700493bd -MISC metadata.xml 475 BLAKE2B cd5f474d10b31fb435f603c876f20d7a13c892eb6b10b4f135855fcd3c2da9ee5d9679ccf384de61472f36df06af8f49ac19c302a27fd0112b07a7da2dba1504 SHA512 89ddbd67b6fd5a54f035d068d71eac904b677d2370f9e15842eb442bc7e4ec9f579df8db2090480c3673d558371c6d7ca3a8f7b36c316ac54d47e4baa018381c +MISC metadata.xml 615 BLAKE2B ab757ecbeac9856b7cc207e721f93bf96edd010dcc7a3e71a28e15809e1973a52ade211133302cd19378016c2384daacef574334e2d50afa8a950c210f69d1be SHA512 ad2a893a3644ac81cbd21c89cadb9676e4fb5024a706ecdc21356012a2981eca9729f8e066b4dcb34be95995c7984f1061f8007171b2d8c46953207ee71a91f0 diff --git a/dev-libs/spdlog/files/spdlog-fmt-10.patch b/dev-libs/spdlog/files/spdlog-fmt-10.patch deleted file mode 100644 index 5ee44c41ea6a..000000000000 --- a/dev-libs/spdlog/files/spdlog-fmt-10.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff --git a/include/spdlog/sinks/daily_file_sink.h b/include/spdlog/sinks/daily_file_sink.h -index f6f1bb1d..90af9676 100644 ---- a/include/spdlog/sinks/daily_file_sink.h -+++ b/include/spdlog/sinks/daily_file_sink.h -@@ -13,6 +13,9 @@ - #include - #include - -+#include -+#include -+#include - #include - #include - #include -@@ -46,46 +49,15 @@ struct daily_filename_calculator - */ - struct daily_filename_format_calculator - { -- static filename_t calc_filename(const filename_t &filename, const tm &now_tm) -+ static filename_t calc_filename(const filename_t &file_path, const tm &now_tm) - { --#ifdef SPDLOG_USE_STD_FORMAT -- // adapted from fmtlib: https://github.com/fmtlib/fmt/blob/8.0.1/include/fmt/chrono.h#L522-L546 -- -- filename_t tm_format; -- tm_format.append(filename); -- // By appending an extra space we can distinguish an empty result that -- // indicates insufficient buffer size from a guaranteed non-empty result -- // https://github.com/fmtlib/fmt/issues/2238 -- tm_format.push_back(' '); -- -- const size_t MIN_SIZE = 10; -- filename_t buf; -- buf.resize(MIN_SIZE); -- for (;;) -- { -- size_t count = strftime(buf.data(), buf.size(), tm_format.c_str(), &now_tm); -- if (count != 0) -- { -- // Remove the extra space. -- buf.resize(count - 1); -- break; -- } -- buf.resize(buf.size() * 2); -- } -- -- return buf; -+#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) -+ std::wstringstream stream; - #else -- // generate fmt datetime format string, e.g. {:%Y-%m-%d}. -- filename_t fmt_filename = fmt::format(SPDLOG_FMT_STRING(SPDLOG_FILENAME_T("{{:{}}}")), filename); -- -- // MSVC doesn't allow fmt::runtime(..) with wchar, with fmtlib versions < 9.1.x --# if defined(_MSC_VER) && defined(SPDLOG_WCHAR_FILENAMES) && FMT_VERSION < 90101 -- return fmt::format(fmt_filename, now_tm); --# else -- return fmt::format(SPDLOG_FMT_RUNTIME(fmt_filename), now_tm); --# endif -- -+ std::stringstream stream; - #endif -+ stream << std::put_time(&now_tm, file_path.c_str()); -+ return stream.str(); - } - - private: -diff --git a/include/spdlog/logger.h b/include/spdlog/logger.h -index 71544e84..1d802f32 100644 ---- a/include/spdlog/logger.h -+++ b/include/spdlog/logger.h -@@ -369,9 +369,9 @@ protected: - { - memory_buf_t buf; - #ifdef SPDLOG_USE_STD_FORMAT -- fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward(args)...)); -+ fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(args...)); - #else -- fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(std::forward(args)...)); -+ fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(args...)); - #endif - - details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size())); -@@ -395,10 +395,9 @@ protected: - // format to wmemory_buffer and convert to utf8 - wmemory_buf_t wbuf; - # ifdef SPDLOG_USE_STD_FORMAT -- fmt_lib::vformat_to( -- std::back_inserter(wbuf), fmt, fmt_lib::make_format_args(std::forward(args)...)); -+ fmt_lib::vformat_to(std::back_inserter(wbuf), fmt, fmt_lib::make_format_args(args...)); - # else -- fmt::vformat_to(std::back_inserter(wbuf), fmt, fmt::make_format_args(std::forward(args)...)); -+ fmt::vformat_to(std::back_inserter(wbuf), fmt, fmt::make_format_args(args...)); - # endif - - memory_buf_t buf; -diff --git a/include/spdlog/common.h b/include/spdlog/common.h -index e69201a8..5f671c5c 100644 ---- a/include/spdlog/common.h -+++ b/include/spdlog/common.h -@@ -173,12 +173,19 @@ using format_string_t = fmt::format_string; - template - using remove_cvref_t = typename std::remove_cv::type>::type; - -+template -+#if FMT_VERSION >= 90101 -+using fmt_runtime_string = fmt::runtime_format_string; -+#else -+using fmt_runtime_string = fmt::basic_runtime; -+#endif -+ - // clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here, - // in addition, fmt::basic_runtime is only convertible to basic_format_string but not basic_string_view - template - struct is_convertible_to_basic_format_string - : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> -+ std::is_convertible>::value || std::is_same, fmt_runtime_string>::value> - {}; - - # if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) diff --git a/dev-libs/spdlog/files/spdlog-musl-1.2.4.patch b/dev-libs/spdlog/files/spdlog-musl-1.2.4.patch deleted file mode 100644 index cd1240d36f46..000000000000 --- a/dev-libs/spdlog/files/spdlog-musl-1.2.4.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/906954 -https://github.com/gabime/spdlog/commit/287a00d364990edbb621fe5e392aeb550135fb96 - -From 287a00d364990edbb621fe5e392aeb550135fb96 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 3 Jan 2023 09:54:50 -0800 -Subject: [PATCH] Do not use LFS64 functions on linux/musl (#2589) - -On musl, off_t is 64bit always ( even on 32bit platforms ), therefore -using LFS64 funcitons is not needed on such platforms. Moreover, musl -has stopped providing aliases for these functions [1] which means it -wont compile on newer musl systems. Therefore only use it on 32bit -glibc/linux platforms and exclude musl like cygwin or OSX - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=246f1c811448f37a44b41cd8df8d0ef9736d95f4 -Signed-off-by: Khem Raj ---- a/include/spdlog/details/os-inl.h -+++ b/include/spdlog/details/os-inl.h -@@ -236,8 +236,8 @@ SPDLOG_INLINE size_t filesize(FILE *f) - # else - int fd = ::fileno(f); - # endif --// 64 bits(but not in osx or cygwin, where fstat64 is deprecated) --# if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64)) -+// 64 bits(but not in osx, linux/musl or cygwin, where fstat64 is deprecated) -+# if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64)) - struct stat64 st; - if (::fstat64(fd, &st) == 0) - { - diff --git a/dev-libs/spdlog/metadata.xml b/dev-libs/spdlog/metadata.xml index b07153ebc2ef..ad30e5ed64da 100644 --- a/dev-libs/spdlog/metadata.xml +++ b/dev-libs/spdlog/metadata.xml @@ -5,6 +5,10 @@ davidroman96@gmail.com David Roman + + gonegrier.duarte@gmail.com + Gonçalo Negrier Duarte + proxy-maint@gentoo.org Proxy Maintainers diff --git a/dev-libs/spdlog/spdlog-1.11.0-r3.ebuild b/dev-libs/spdlog/spdlog-1.11.0-r3.ebuild deleted file mode 100644 index 508bcb7398b0..000000000000 --- a/dev-libs/spdlog/spdlog-1.11.0-r3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Fast C++ logging library" -HOMEPAGE="https://github.com/gabime/spdlog" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/gabime/${PN}" -else - SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86" -fi - -LICENSE="MIT" -SLOT="0/1" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND=" - virtual/pkgconfig -" - -DEPEND=" - dev-libs/libfmt -" - -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-force_external_fmt.patch" - "${FILESDIR}/${PN}-fmt-10.patch" - "${FILESDIR}/${PN}-musl-1.2.4.patch" -) - -src_prepare() { - cmake_src_prepare - rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt" -} - -src_configure() { - local mycmakeargs=( - -DSPDLOG_BUILD_BENCH=no - -DSPDLOG_BUILD_EXAMPLE=no - -DSPDLOG_FMT_EXTERNAL=yes - -DSPDLOG_BUILD_SHARED=yes - -DSPDLOG_BUILD_TESTS=$(usex test) - ) - - cmake_src_configure -} diff --git a/dev-libs/spdlog/spdlog-1.11.0-r4.ebuild b/dev-libs/spdlog/spdlog-1.11.0-r4.ebuild deleted file mode 100644 index 02a505623954..000000000000 --- a/dev-libs/spdlog/spdlog-1.11.0-r4.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -DESCRIPTION="Fast C++ logging library" -HOMEPAGE="https://github.com/gabime/spdlog" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/gabime/${PN}" -else - SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -fi - -LICENSE="MIT" -SLOT="0/1" -IUSE="test static-libs" -RESTRICT="!test? ( test )" - -BDEPEND=" - virtual/pkgconfig -" - -DEPEND=" - >=dev-libs/libfmt-9.1.0-r2[${MULTILIB_USEDEP}] -" - -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-force_external_fmt.patch" - "${FILESDIR}/${PN}-fmt-10.patch" - "${FILESDIR}/${PN}-musl-1.2.4.patch" -) - -multilib_src_prepare() { - cmake_src_prepare - rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt" -} - -multilib_src_configure() { - local mycmakeargs=( - -DSPDLOG_BUILD_BENCH=no - -DSPDLOG_BUILD_EXAMPLE=no - -DSPDLOG_FMT_EXTERNAL=yes - -DSPDLOG_BUILD_SHARED=$(usex static-libs) - -DSPDLOG_BUILD_TESTS=$(usex test) - ) - - cmake_src_configure -} diff --git a/dev-libs/spdlog/spdlog-1.14.1.ebuild b/dev-libs/spdlog/spdlog-1.14.1.ebuild new file mode 100644 index 000000000000..df8bbe09c730 --- /dev/null +++ b/dev-libs/spdlog/spdlog-1.14.1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="Fast C++ logging library" +HOMEPAGE="https://github.com/gabime/spdlog" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gabime/${PN}" +else + SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +IUSE="test static-libs" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + test? ( + >=dev-cpp/catch-3.4.0 + ) +" +DEPEND=" + dev-libs/libfmt:=[${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-force_external_fmt.patch" +) + +multilib_src_prepare() { + cmake_src_prepare + rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt" +} + +multilib_src_configure() { + local mycmakeargs=( + -DSPDLOG_BUILD_BENCH=no + -DSPDLOG_BUILD_EXAMPLE=no + -DSPDLOG_FMT_EXTERNAL=yes + -DSPDLOG_BUILD_SHARED=$(usex static-libs) + -DSPDLOG_BUILD_TESTS=$(usex test) + ) + + cmake_src_configure +} -- cgit v1.2.3