Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (59f5e225460ff2feae241201ee8da3cddd184d6b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (59f5e225460ff2feae241201ee8da3cddd184d6b)
  • Date: Fri, 3 Jan 2025 02:04:18 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

libs/spdlog/HISTORY | 4 ++++
libs/spdlog/PRE_BUILD | 4 ++++
libs/spdlog/patches/0001-fmt-1.11.patch | 32
++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+)

New commits:
commit 59f5e225460ff2feae241201ee8da3cddd184d6b
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

libs/spdlog: added upstream patch to fix building with fmt 1.11.x

diff --git a/libs/spdlog/HISTORY b/libs/spdlog/HISTORY
index a6d3da6..332cf25 100644
--- a/libs/spdlog/HISTORY
+++ b/libs/spdlog/HISTORY
@@ -1,3 +1,7 @@
+2025-01-02 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD, patches/0001-fmt-1.11.patch: added upstream patch to fix
building
+ with fmt 1.11.x
+
2024-12-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.15.0

diff --git a/libs/spdlog/PRE_BUILD b/libs/spdlog/PRE_BUILD
new file mode 100755
index 0000000..f80ee7d
--- /dev/null
+++ b/libs/spdlog/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+apply_patch_dir patches
diff --git a/libs/spdlog/patches/0001-fmt-1.11.patch
b/libs/spdlog/patches/0001-fmt-1.11.patch
new file mode 100644
index 0000000..be0dd4f
--- /dev/null
+++ b/libs/spdlog/patches/0001-fmt-1.11.patch
@@ -0,0 +1,32 @@
+From 276ee5f5c0eb13626bd367b006ace5eae9526d8a Mon Sep 17 00:00:00 2001
+From: Rui Chen <rui AT chenrui.dev>
+Date: Thu, 26 Dec 2024 02:13:57 -0500
+Subject: [PATCH] fix: update to_string_view function for fmt 11.1 (#3301)
+
+Signed-off-by: Rui Chen <rui AT 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(


  • [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (59f5e225460ff2feae241201ee8da3cddd184d6b), Pavel Vinogradov, 01/02/2025

Archive powered by MHonArc 2.6.24.

Top of Page