[spdlog] Update to 1.12.0 (#32457)

* [spdlog] Update to 1.12.0.

* [spdlog] Update baseline.
This commit is contained in:
Pierre Wendling 2023-07-10 12:54:41 -04:00 committed by GitHub
parent cc80359416
commit 12e5fc3aed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 60 deletions

View File

@ -1,39 +0,0 @@
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
---
include/spdlog/common.h | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/include/spdlog/common.h b/include/spdlog/common.h
index e69201a81..5f671c5c6 100644
--- 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)

View File

@ -1,13 +0,0 @@
diff --git a/bench/bench.cpp b/bench/bench.cpp
index 8a46837a6..ae47f047c 100644
--- a/bench/bench.cpp
+++ b/bench/bench.cpp
@@ -15,7 +15,7 @@
#if defined(SPDLOG_USE_STD_FORMAT)
# include <format>
#elif defined(SPDLOG_FMT_EXTERNAL)
-# include <fmt/locale.h>
+# include <fmt/format.h>
#else
# include "spdlog/fmt/bundled/format.h"
#endif

View File

@ -2,11 +2,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO gabime/spdlog REPO gabime/spdlog
REF "v${VERSION}" REF "v${VERSION}"
SHA512 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412 SHA512 db9a4f13b6c39ffde759db99bcdfe5e2dbe4231e73b29eb906a3fa78d6b8ec66920b8bd4371df17ae21b7b562472a236bc4435678f3af92b6496be090074181d
HEAD_REF v1.x HEAD_REF v1.x
PATCHES
fmt-header.patch # https://github.com/gabime/spdlog/pull/2545
fmt-10-support.patch # Upstream patch: https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05
) )
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

View File

@ -1,7 +1,6 @@
{ {
"name": "spdlog", "name": "spdlog",
"version-semver": "1.11.0", "version-semver": "1.12.0",
"port-version": 1,
"description": "Very fast, header only, C++ logging library", "description": "Very fast, header only, C++ logging library",
"homepage": "https://github.com/gabime/spdlog", "homepage": "https://github.com/gabime/spdlog",
"license": "MIT", "license": "MIT",

View File

@ -7709,8 +7709,8 @@
"port-version": 3 "port-version": 3
}, },
"spdlog": { "spdlog": {
"baseline": "1.11.0", "baseline": "1.12.0",
"port-version": 1 "port-version": 0
}, },
"spectra": { "spectra": {
"baseline": "1.0.1", "baseline": "1.0.1",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "41cf31aa350a44644863d7777489501d240f248c",
"version-semver": "1.12.0",
"port-version": 0
},
{ {
"git-tree": "67656948712582d93d9096cc08871a3270908d38", "git-tree": "67656948712582d93d9096cc08871a3270908d38",
"version-semver": "1.11.0", "version-semver": "1.11.0",