gentoo auto-resync : 27:12:2024 - 06:30:34

3 files changed, 38 insertions, 1 deletions

diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 1539acf99d46..acd7f98ad275 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,10 +1,11 @@
 AUX spdlog-1.12.0-fix-tests.patch 554 BLAKE2B 233cadf694bbfea4aa538d3b1f5241682aaa74fccbcce94441180f5ce3374332ac77ae6c08461a118861924d84056d2075fcd8fcc7beccc81e41b1101909e223 SHA512 b78640666c940ac49f0db375544c22b6778a8e2c38208530c7a8b2fb7ed70526a212efc49a94f3498b82f9681039e97c304f956010c16913ca052369dbe56935
+AUX spdlog-1.15.0-libfmt-11.1.0.patch 1151 BLAKE2B f6d23df7a3f24d44cc4db0926a04c9dde1efc3c67d9f14f76ddb675f71fb0ac585d4a2ee3d513516e9fd25f7bc672aed06328a7cc5d9aa2dae319e267fa81d60 SHA512 61f43cdd72544c6f694226cd37d4bf56478234d4a6539536ce97aa371c3adea8012e8a4a3d66eb3435761cccbb8cbbef2872ca4214388df2d645265f04078043
 AUX spdlog-force_external_fmt.patch 539 BLAKE2B 326f40d3d496e7373a77476d5aba237d8ad7828e5d21ccfc1e4183a74e3f7f2df1f61a2188a5cf0dc4c08ef9692c5de4a4589fae75c1daa4a9987d4be3f168f6 SHA512 257c7f7f56e66b88a16238a2c81887f2d5ba9692c18bf5fc371b95f44936018ec7c4a0abd0e54f38cb6a7957f82a1b95af9d238fa7fa16631f0be1980d76f692
 DIST spdlog-1.13.0.tar.gz 264003 BLAKE2B 8ffeec847f082a0932f406ab44b4653661fdbe95a15f7b736367ee6d8f45ab36ca2182a9e9c6fba5c0688ab5436c16932b130541a8532cc2e5f4980e6340b929 SHA512 44fcb414ad9fbbe2a6d72c29143eeeae477b687ed30ae870d661b032a029ad4214ef43e7ef6350d02791d05504492978ade2d6733fab12ce4884d8f0bc4c6340
 DIST spdlog-1.14.1.tar.gz 270896 BLAKE2B 70ac5142acfd765c649f2e34286bae3b5082db284dd1ca7c3d7424a53dd658f7d308bef0b5e0c89192fc3931f1fe5efdba91e460c7b3df836dffc22b66f821fa SHA512 d8f36a3d65a43d8c64900e46137827aadb05559948b2f5a389bea16ed1bfac07d113ee11cf47970913298d6c37400355fe6895cda8fa6dcf6abd9da0d8f199e9
 DIST spdlog-1.15.0.tar.gz 276012 BLAKE2B a9d15725f63d5426a13b6f13ba4281ab70b7f6166344d8d12900fe8ba63898280ffd852b16e48b81352c4632598438fbd02f1a78d6f17e06d66c4bdc309f4b37 SHA512 3dd98409f4625ae4d46ef5f59a2fc22a6e151a13dba9d37433363e5d84eab7cca73b379eeb637d8f9b1f0f5a42221c0cc9a2a70414dc2b6af6a162e19fba0647
 EBUILD spdlog-1.13.0-r2.ebuild 1148 BLAKE2B c05d4caa5a789fe2bf54195224f9360c4b473e8b2a433791089a4e99d12081bff664457b51c3006536de953f753871786570d8d12d9d27115c6cbdeefffcde77 SHA512 88869a4cf396b4e9841a1b5f0639daa3eccb346b93159f07405e0dd34c13252adee0ef44fe8fa9cb121dbffcaa3780573938d13b1e4e4c8464d7e3bdef5b5252
 EBUILD spdlog-1.14.1.ebuild 1137 BLAKE2B 46c6ef72a1660cf3d2c079cdc62c245fa76d864ba37a63fbd40cf7f3ad5a34c18d5eb4a5a9d229efa568b14bf1bb371b0c3a9d51d69303fe0884f28baab88640 SHA512 6a2a27f48a6ad2cf686f7d225d6861da42f5a514c9458c63a79fade8c72adb867358de6c626e9d46c410165ccbebaab057d714cdf49a7df6864c5a89a63ef2e6
-EBUILD spdlog-1.15.0.ebuild 1145 BLAKE2B 808cceb57e793f4e2c3b6b19b2aee7475a03832c7a9f4d1f6bf730fb44e014214bd255447ca13c3b445af5baef9cb1017f21f4fba94a2d2e6ed85bbc50c30503 SHA512 6eea547bbd7f2df46d7212434a308b9ab36cce082c4049de916e58b6dd04376706e8dc48c5b3b4644a32b4963fb8530b198c3d769b6812e3afa1731deed16576
+EBUILD spdlog-1.15.0.ebuild 1193 BLAKE2B ced27389bbf637c627049ae45c0d5b2e7d537025c0503e48a7f80d6e90fd28f9aa937b687ab1bd315862405f1e2d79e3cb4ae85e4909985a5485eeb09d20a89f SHA512 45da07e59f47e37097efa478937b51494e3bf924937923c7cede0d554eb27185e0c00d867b65601ea4299fc6c27836508a9be4333a86093163d9cbdffdcfe14d
 EBUILD spdlog-9999.ebuild 1148 BLAKE2B c05d4caa5a789fe2bf54195224f9360c4b473e8b2a433791089a4e99d12081bff664457b51c3006536de953f753871786570d8d12d9d27115c6cbdeefffcde77 SHA512 88869a4cf396b4e9841a1b5f0639daa3eccb346b93159f07405e0dd34c13252adee0ef44fe8fa9cb121dbffcaa3780573938d13b1e4e4c8464d7e3bdef5b5252
 MISC metadata.xml 615 BLAKE2B ab757ecbeac9856b7cc207e721f93bf96edd010dcc7a3e71a28e15809e1973a52ade211133302cd19378016c2384daacef574334e2d50afa8a950c210f69d1be SHA512 ad2a893a3644ac81cbd21c89cadb9676e4fb5024a706ecdc21356012a2981eca9729f8e066b4dcb34be95995c7984f1061f8007171b2d8c46953207ee71a91f0
diff --git a/dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0.patch b/dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0.patch
new file mode 100644
index 000000000000..12b8beb219fa
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0.patch
@@ -0,0 +1,35 @@
+https://github.com/gabime/spdlog/pull/3301
+
+From e693420a38b58d29a56b3ea921e15b175a5f2843 Mon Sep 17 00:00:00 2001
+From: Rui Chen <rui@chenrui.dev>
+Date: Wed, 25 Dec 2024 19:00:36 -0500
+Subject: [PATCH] fix: update to_string_view function for fmt 11.1
+
+Signed-off-by: Rui Chen <rui@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(
+
diff --git a/dev-libs/spdlog/spdlog-1.15.0.ebuild b/dev-libs/spdlog/spdlog-1.15.0.ebuild
index 7698d11bc9a0..85cc51616b1c 100644
--- a/dev-libs/spdlog/spdlog-1.15.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.15.0.ebuild
@@ -34,6 +34,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-force_external_fmt.patch"
+	"${FILESDIR}/${PN}-1.15.0-libfmt-11.1.0.patch"
 )
 
 multilib_src_prepare() {