From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1FE431580FD for ; Thu, 26 Dec 2024 02:38:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42A38E0798; Thu, 26 Dec 2024 02:38:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 26B72E0798 for ; Thu, 26 Dec 2024 02:38:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 29061335DC7 for ; Thu, 26 Dec 2024 02:38:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7CEDBAF5 for ; Thu, 26 Dec 2024 02:38:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1735180696.cdb103056a0cd04abbd8f176de4aca601c1e7b64.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/, dev-libs/spdlog/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/spdlog/files/spdlog-1.15.0-libfmt-11.1.0.patch dev-libs/spdlog/spdlog-1.15.0.ebuild X-VCS-Directories: dev-libs/spdlog/files/ dev-libs/spdlog/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: cdb103056a0cd04abbd8f176de4aca601c1e7b64 X-VCS-Branch: master Date: Thu, 26 Dec 2024 02:38:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f1589231-ad7f-4e92-9997-b19dad145f98 X-Archives-Hash: e44e13a1937ee4a4027c439422f88614 commit: cdb103056a0cd04abbd8f176de4aca601c1e7b64 Author: Sam James gentoo org> AuthorDate: Thu Dec 26 02:37:50 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu Dec 26 02:38:16 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb10305 dev-libs/spdlog: fix build w/ libfmt-11.1.0 Signed-off-by: Sam James gentoo.org> .../spdlog/files/spdlog-1.15.0-libfmt-11.1.0.patch | 35 ++++++++++++++++++++++ dev-libs/spdlog/spdlog-1.15.0.ebuild | 1 + 2 files changed, 36 insertions(+) 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 +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 +--- + 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 ++inline fmt::basic_string_view to_string_view(fmt::basic_format_arg fmt) { ++ return fmt; ++} ++#else + template + inline fmt::basic_string_view to_string_view(fmt::basic_format_string fmt) { + return fmt; + } ++#endif + #elif __cpp_lib_format >= 202207L + template + SPDLOG_CONSTEXPR_FUNC std::basic_string_view 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() {