From cee1831fb203b73304695fb9a570730fda061fad Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 30 Nov 2024 18:42:52 +0000 Subject: [PATCH 1/2] Update dependency spdlog to v1.15.0 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 976cce47..52d59c41 100644 --- a/conanfile.py +++ b/conanfile.py @@ -19,7 +19,7 @@ class SupercellWxConan(ConanFile): "libxml2/2.12.7", "openssl/3.3.2", "re2/20240702", - "spdlog/1.14.1", + "spdlog/1.15.0", "sqlite3/3.47.1", "vulkan-loader/1.3.243.0", "zlib/1.3.1") From 372712745c248673956e97507d4d080abdcca985 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sat, 30 Nov 2024 15:42:15 -0600 Subject: [PATCH 2/2] Updating includes for fmt 11.x --- scwx-qt/source/scwx/qt/manager/font_manager.cpp | 1 + scwx-qt/source/scwx/qt/settings/settings_variable.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/scwx-qt/source/scwx/qt/manager/font_manager.cpp b/scwx-qt/source/scwx/qt/manager/font_manager.cpp index 20f5f9a6..72779f67 100644 --- a/scwx-qt/source/scwx/qt/manager/font_manager.cpp +++ b/scwx-qt/source/scwx/qt/manager/font_manager.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include namespace scwx diff --git a/scwx-qt/source/scwx/qt/settings/settings_variable.cpp b/scwx-qt/source/scwx/qt/settings/settings_variable.cpp index a5387937..6eda8437 100644 --- a/scwx-qt/source/scwx/qt/settings/settings_variable.cpp +++ b/scwx-qt/source/scwx/qt/settings/settings_variable.cpp @@ -5,6 +5,7 @@ #include #include #include +#include namespace scwx {