CVS commit: pkgsrc/devel/spdlog

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed May 17 08:20:06 UTC 2023

Modified Files:
        pkgsrc/devel/spdlog: distinfo
Added Files:
        pkgsrc/devel/spdlog/patches: patch-include_spdlog_common.h

Log Message:
spdlog: fix build with latest fmtlib using upstream patch


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/spdlog/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/spdlog/patches/patch-include_spdlog_common.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/spdlog/distinfo
diff -u pkgsrc/devel/spdlog/distinfo:1.13 pkgsrc/devel/spdlog/distinfo:1.14
--- pkgsrc/devel/spdlog/distinfo:1.13   Sat Nov 26 13:47:13 2022
+++ pkgsrc/devel/spdlog/distinfo        Wed May 17 08:20:06 2023
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.13 2022/11/26 13:47:13 nia Exp $
+$NetBSD: distinfo,v 1.14 2023/05/17 08:20:06 wiz Exp $
 
 BLAKE2s (spdlog-1.11.0.tar.gz) = b6fdf69002f5591045e8377fc02a20da4090676d786d9348cc5ed2404f26fc03
 SHA512 (spdlog-1.11.0.tar.gz) = 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412
 Size (spdlog-1.11.0.tar.gz) = 373033 bytes
 SHA1 (patch-CMakeLists.txt) = 7da54588522ca9cf4b1816d6f65a8f31eda43332
+SHA1 (patch-include_spdlog_common.h) = 75c8f06cf2fff2e505d96bc9c62010b17cd3fe60
 SHA1 (patch-include_spdlog_tweakme.h) = 0e3f16aaf013535331a11be523dd731503c12717

Added files:

Index: pkgsrc/devel/spdlog/patches/patch-include_spdlog_common.h
diff -u /dev/null pkgsrc/devel/spdlog/patches/patch-include_spdlog_common.h:1.1
--- /dev/null   Wed May 17 08:20:06 2023
+++ pkgsrc/devel/spdlog/patches/patch-include_spdlog_common.h   Wed May 17 08:20:06 2023
@@ -0,0 +1,28 @@
+$NetBSD: patch-include_spdlog_common.h,v 1.1 2023/05/17 08:20:06 wiz Exp $
+
+Fix build with newer fmtlib.
+https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05
+
+--- include/spdlog/common.h.orig       2022-11-02 21:13:08.000000000 +0000
++++ include/spdlog/common.h
+@@ -160,12 +160,19 @@ using format_string_t = fmt::format_stri
+ 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)