From b110b2a3cde27a494e8371369456737de0f738be Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sun, 4 Jul 2021 17:03:10 +0200 Subject: [PATCH] Backported patch with fmt 8.x build fixes. --- spdlog-fmt-8-fixes.patch | 21 +++++++++++++++++++++ spdlog.spec | 3 +++ 2 files changed, 24 insertions(+) create mode 100644 spdlog-fmt-8-fixes.patch diff --git a/spdlog-fmt-8-fixes.patch b/spdlog-fmt-8-fixes.patch new file mode 100644 index 0000000..bc72716 --- /dev/null +++ b/spdlog-fmt-8-fixes.patch @@ -0,0 +1,21 @@ +From 1f3bb8df568894d0f9c14785ffb4b41de484b641 Mon Sep 17 00:00:00 2001 +From: Evan Klitzke +Date: Wed, 23 Jun 2021 11:23:58 -0700 +Subject: [PATCH] Make spdlog_ex::spdlog_ex work with fmt 8.0.0 + +--- + include/spdlog/common-inl.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/spdlog/common-inl.h b/include/spdlog/common-inl.h +index c3e992224..5fa4e5d95 100644 +--- a/include/spdlog/common-inl.h ++++ b/include/spdlog/common-inl.h +@@ -56,7 +56,7 @@ SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg) + SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) + { + memory_buf_t outbuf; +- fmt::format_system_error(outbuf, last_errno, msg); ++ fmt::format_system_error(outbuf, last_errno, msg.c_str()); + msg_ = fmt::to_string(outbuf); + } diff --git a/spdlog.spec b/spdlog.spec index 141f271..ffab685 100644 --- a/spdlog.spec +++ b/spdlog.spec @@ -8,6 +8,9 @@ License: MIT URL: https://github.com/gabime/%{name} Source0: %{url}/archive/v%{version}.tar.gz +# https://github.com/gabime/spdlog/issues/1975 +Patch100: spdlog-fmt-8-fixes.patch + BuildRequires: catch-devel >= 2.8.0 BuildRequires: cmake BuildRequires: fmt-devel >= 7.0.0