commit: f1bcf6bb28188eb585f9cc7aff9d33a15588a11e Author: David Roman <droman <AT> ifae <DOT> es> AuthorDate: Thu May 29 14:28:16 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Sat Jul 26 07:34:19 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1bcf6bb
dev-libs/spdlog: drop 1.15.0-r1 Signed-off-by: David Roman <droman <AT> ifae.es> Part-of: https://github.com/gentoo/gentoo/pull/43097 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> dev-libs/spdlog/Manifest | 1 - .../files/spdlog-1.15.0-libfmt-11.1.0-fixups.patch | 69 ---------------------- .../spdlog/files/spdlog-1.15.0-libfmt-11.1.0.patch | 35 ----------- dev-libs/spdlog/spdlog-1.15.0-r1.ebuild | 56 ------------------ 4 files changed, 161 deletions(-) diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest index 984297c0cc8b..9cf54f14b423 100644 --- a/dev-libs/spdlog/Manifest +++ b/dev-libs/spdlog/Manifest @@ -1,4 +1,3 @@ -DIST spdlog-1.15.0.tar.gz 276012 BLAKE2B a9d15725f63d5426a13b6f13ba4281ab70b7f6166344d8d12900fe8ba63898280ffd852b16e48b81352c4632598438fbd02f1a78d6f17e06d66c4bdc309f4b37 SHA512 3dd98409f4625ae4d46ef5f59a2fc22a6e151a13dba9d37433363e5d84eab7cca73b379eeb637d8f9b1f0f5a42221c0cc9a2a70414dc2b6af6a162e19fba0647 DIST spdlog-1.15.1.tar.gz 275521 BLAKE2B 1c5c6330c7abd2f204ec345c0173fe997f0063b8da301494fda5c1424bdc7a7066cf8a3a75b217638211bb795550cf7ae87afa71c478f1568db10c5e1f58020e SHA512 d6575b5cd53638345078a1c6a886293892359a07ee6de45e23d0c805bb33f59350f33060bce38824e09ce84525b575acdae7b94fc6e82191f5fd576f6c9252b2 DIST spdlog-1.15.2.tar.gz 275744 BLAKE2B 4e78dfcd364f792d6ed829bd17a472ea469eede10075b58531f04dbc3926ded02dd6316bf0e9b8f15f7fd9fbc5c3e5c5bcf749f73e82361efd4914aaece84099 SHA512 4e86d79dea4f08b9e4755ada7c9395e03246d00cdc11df8951d32b5f5e823fec103091d11154f32b261a29574784b761efb32477ec6385ffdb2069413e2c91a0 DIST spdlog-1.15.3.tar.gz 277691 BLAKE2B fd49c90fa086c6472b0658b26547727af1142b1bb5210b2fbaa4854737592cb75c823de1d066b52189da7c95fe9c29981919c1a2927f15e45e1acb70171b4b7d SHA512 21c35f4091850ea3a0cd6a24867e06e943df70d76cd5a7ec0b15a33e0e9e0cc3584ed7930e1ac6f347e7e06f0e002d0e759884eaf05310014e24ea0e0419fcc4 diff --git a/dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0-fixups.patch b/dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0-fixups.patch deleted file mode 100644 index afada8092f37..000000000000 --- a/dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0-fixups.patch +++ /dev/null @@ -1,69 +0,0 @@ -https://github.com/gabime/spdlog/commit/7f8060d5b280eac9786f92ac74d263cc8359c5ed -https://github.com/gabime/spdlog/commit/96a8f6250cbf4e8c76387c614f666710a2fa9bad - -From 7f8060d5b280eac9786f92ac74d263cc8359c5ed Mon Sep 17 00:00:00 2001 -From: Christian Blichmann <[email protected]> -Date: Tue, 7 Jan 2025 23:59:12 +0100 -Subject: [PATCH] fix: Compatibility with external fmtlib 11.1.1 (#3312) - -Include fmtlib's `xchar` header to include `fmt::basic_format_string`. -Otherwise, compilation with an external fmtlib 11.1.1 fails with - -``` -In file included from include/spdlog/spdlog.h:12: -include/spdlog/common.h:369:49: error: no template named 'basic_format_string' in namespace 'fmt'; did you mean 'std::basic_format_string'? - 369 | inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_string<T, Args...> fmt) { - | ^~~~~ -``` - -Signed-off-by: Christian Blichmann <[email protected]> ---- - include/spdlog/fmt/fmt.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h -index 7fa6b0933..2f09c15ed 100644 ---- a/include/spdlog/fmt/fmt.h -+++ b/include/spdlog/fmt/fmt.h -@@ -27,4 +27,5 @@ - #else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib - #include <fmt/core.h> - #include <fmt/format.h> -+ #include <fmt/xchar.h> - #endif - -From 96a8f6250cbf4e8c76387c614f666710a2fa9bad Mon Sep 17 00:00:00 2001 -From: jdrouhard <[email protected]> -Date: Thu, 9 Jan 2025 16:58:46 -0600 -Subject: [PATCH] fix: remove unused to_string_view overload in fmt >= 11.1 - (#3314) - ---- - include/spdlog/common.h | 14 +------------- - 1 file changed, 1 insertion(+), 13 deletions(-) - -diff --git a/include/spdlog/common.h b/include/spdlog/common.h -index 2d73f8300..71ffd2403 100644 ---- a/include/spdlog/common.h -+++ b/include/spdlog/common.h -@@ -364,19 +364,7 @@ SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view - } - #endif - --#ifndef SPDLOG_USE_STD_FORMAT --#if FMT_VERSION >= 110100 --template <typename T, typename... Args> --inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_arg<T> fmt) { -- return fmt; --} --#else --template <typename T, typename... Args> --inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_string<T, Args...> fmt) { -- return fmt; --} --#endif --#elif __cpp_lib_format >= 202207L -+#if defined(SPDLOG_USE_STD_FORMAT) && __cpp_lib_format >= 202207L - template <typename T, typename... Args> - SPDLOG_CONSTEXPR_FUNC std::basic_string_view<T> to_string_view( - std::basic_format_string<T, Args...> fmt) SPDLOG_NOEXCEPT { diff --git a/dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0.patch b/dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0.patch deleted file mode 100644 index 12b8beb219fa..000000000000 --- a/dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://github.com/gabime/spdlog/pull/3301 - -From e693420a38b58d29a56b3ea921e15b175a5f2843 Mon Sep 17 00:00:00 2001 -From: Rui Chen <[email protected]> -Date: Wed, 25 Dec 2024 19:00:36 -0500 -Subject: [PATCH] fix: update to_string_view function for fmt 11.1 - -Signed-off-by: Rui Chen <[email protected]> ---- - include/spdlog/common.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/include/spdlog/common.h b/include/spdlog/common.h -index aca483c20..2d73f8300 100644 ---- a/include/spdlog/common.h -+++ b/include/spdlog/common.h -@@ -365,10 +365,17 @@ SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view - #endif - - #ifndef SPDLOG_USE_STD_FORMAT -+#if FMT_VERSION >= 110100 -+template <typename T, typename... Args> -+inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_arg<T> fmt) { -+ return fmt; -+} -+#else - template <typename T, typename... Args> - inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_string<T, Args...> fmt) { - return fmt; - } -+#endif - #elif __cpp_lib_format >= 202207L - template <typename T, typename... Args> - SPDLOG_CONSTEXPR_FUNC std::basic_string_view<T> to_string_view( - diff --git a/dev-libs/spdlog/spdlog-1.15.0-r1.ebuild b/dev-libs/spdlog/spdlog-1.15.0-r1.ebuild deleted file mode 100644 index 88d80aea6ddb..000000000000 --- a/dev-libs/spdlog/spdlog-1.15.0-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2025 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 ~loong ~mips 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" - "${FILESDIR}/${PN}-1.15.0-libfmt-11.1.0.patch" - "${FILESDIR}/${PN}-1.15.0-libfmt-11.1.0-fixups.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 -}
