mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
dev-libs/spdlog: fix build w/ libfmt-11.1.0
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
35
dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0.patch
Normal file
35
dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0.patch
Normal file
@@ -0,0 +1,35 @@
|
||||
https://github.com/gabime/spdlog/pull/3301
|
||||
|
||||
From e693420a38b58d29a56b3ea921e15b175a5f2843 Mon Sep 17 00:00:00 2001
|
||||
From: Rui Chen <rui@chenrui.dev>
|
||||
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 <rui@chenrui.dev>
|
||||
---
|
||||
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(
|
||||
|
||||
@@ -34,6 +34,7 @@ RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-force_external_fmt.patch"
|
||||
"${FILESDIR}/${PN}-1.15.0-libfmt-11.1.0.patch"
|
||||
)
|
||||
|
||||
multilib_src_prepare() {
|
||||
|
||||
Reference in New Issue
Block a user