diff options
Diffstat (limited to 'dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch')
-rw-r--r-- | dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch new file mode 100644 index 000000000000..03ef4e591048 --- /dev/null +++ b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch @@ -0,0 +1,40 @@ +Bug: https://bugs.gentoo.org/906069 +Upstream: https://github.com/gabime/spdlog/pull/2694 + +Fixing spdlog-1.11.0 fails compile with libfmt-10.0.0 + +https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05 + +From 0ca574ae168820da0268b3ec7607ca7b33024d05 Mon Sep 17 00:00:00 2001 +From: H1X4 <10332146+H1X4Dev@users.noreply.github.com> +Date: Fri, 31 Mar 2023 20:39:32 +0300 +Subject: [PATCH] fix build for master fmt (non-bundled) (#2694) + +* fix build for master fmt (non-bundled) + +* update fmt_runtime_string macro + +* fix build of updated macro +--- a/include/spdlog/common.h ++++ b/include/spdlog/common.h +@@ -173,12 +173,19 @@ using format_string_t = fmt::format_string<Args...>; + template<class T> + using remove_cvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type; + ++template <typename Char> ++#if FMT_VERSION >= 90101 ++using fmt_runtime_string = fmt::runtime_format_string<Char>; ++#else ++using fmt_runtime_string = fmt::basic_runtime<Char>; ++#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<Char> is only convertible to basic_format_string<Char> but not basic_string_view<Char> + template<class T, class Char = char> + struct is_convertible_to_basic_format_string + : std::integral_constant<bool, +- std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt::basic_runtime<Char>>::value> ++ std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt_runtime_string<Char>>::value> + {}; + + # if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) |