CVS commit: pkgsrc/devel/spdlog

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Dec 30 02:08:56 UTC 2024

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

Log Message:
devel/spdlog: Fix build with fmtlib-1.11.1

Patch from upstream git repository.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/spdlog/distinfo
cvs rdiff -u -r0 -r1.3 \
    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.20 pkgsrc/devel/spdlog/distinfo:1.21
--- pkgsrc/devel/spdlog/distinfo:1.20   Sun Nov 10 19:57:53 2024
+++ pkgsrc/devel/spdlog/distinfo        Mon Dec 30 02:08:55 2024
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.20 2024/11/10 19:57:53 adam Exp $
+$NetBSD: distinfo,v 1.21 2024/12/30 02:08:55 ryoon Exp $
 
 BLAKE2s (spdlog-1.15.0.tar.gz) = d0c6576303a65066af746b2f0b0ecef666c28e744eb8caf3e421d952fc239ca1
 SHA512 (spdlog-1.15.0.tar.gz) = 3dd98409f4625ae4d46ef5f59a2fc22a6e151a13dba9d37433363e5d84eab7cca73b379eeb637d8f9b1f0f5a42221c0cc9a2a70414dc2b6af6a162e19fba0647
 Size (spdlog-1.15.0.tar.gz) = 276012 bytes
 SHA1 (patch-CMakeLists.txt) = 558c2e168aba82b3a1b442eb756e1fd23213d2fd
+SHA1 (patch-include_spdlog_common.h) = 9f459fea25807ab6336af15531c95e5acd432d19
 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.3
--- /dev/null   Mon Dec 30 02:08:56 2024
+++ pkgsrc/devel/spdlog/patches/patch-include_spdlog_common.h   Mon Dec 30 02:08:56 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-include_spdlog_common.h,v 1.3 2024/12/30 02:08:56 ryoon Exp $
+
+From: Upstream 276ee5f5c0eb13626bd367b006ace5eae9526d8a
+
+--- include/spdlog/common.h.orig       2024-11-09 15:01:30.000000000 +0000
++++ include/spdlog/common.h
+@@ -365,10 +365,17 @@ SPDLOG_CONSTEXPR_FUNC spdlog::wstring_vi
+ #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(