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 (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0B543158649 for ; Wed, 10 May 2023 15:22:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54143E08FE; Wed, 10 May 2023 15:22:16 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 3B07EE08FE for ; Wed, 10 May 2023 15:22:16 +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 4A20834097F for ; Wed, 10 May 2023 15:22:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3BE31D for ; Wed, 10 May 2023 15:22:13 +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: <1683732064.03d7b984817fbf07c4d830f30e34ae20a79af7b4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/files/, dev-libs/spdlog/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch dev-libs/spdlog/spdlog-1.11.0.ebuild X-VCS-Directories: dev-libs/spdlog/ dev-libs/spdlog/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 03d7b984817fbf07c4d830f30e34ae20a79af7b4 X-VCS-Branch: master Date: Wed, 10 May 2023 15:22:13 +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: 2444e94b-ee8a-4fb8-93ee-2433418468c4 X-Archives-Hash: a697796843cd78d5f291f1eee4398957 commit: 03d7b984817fbf07c4d830f30e34ae20a79af7b4 Author: jinqiang zhang 0x0 ee> AuthorDate: Wed May 10 15:15:00 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed May 10 15:21:04 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03d7b984 dev-libs/spdlog: fix fails compile with libfmt-10.0.0 Closes: https://bugs.gentoo.org/906069 Signed-off-by: jinqiang zhang 0x0.ee> Closes: https://github.com/gentoo/gentoo/pull/30974 Signed-off-by: Sam James gentoo.org> dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch | 30 ++++++++++++++++++++++++ dev-libs/spdlog/spdlog-1.11.0.ebuild | 1 + 2 files changed, 31 insertions(+) diff --git a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch new file mode 100644 index 000000000000..185fb12fb727 --- /dev/null +++ b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch @@ -0,0 +1,30 @@ +Bug: https://bugs.gentoo.org/906069 +Upstream: https://github.com/gabime/spdlog/pull/2694 + +Fixing spdlog-1.11.0 fails compile with libfmt-10.0.0 + +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; + template + using remove_cvref_t = typename std::remove_cv::type>::type; + ++template ++#if FMT_VERSION >= 90101 ++using fmt_runtime_string = fmt::runtime_format_string; ++#else ++using fmt_runtime_string = fmt::basic_runtime; ++#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 is only convertible to basic_format_string but not basic_string_view + template + struct is_convertible_to_basic_format_string + : std::integral_constant>::value || std::is_same, fmt::basic_runtime>::value> ++ std::is_convertible>::value || std::is_same, fmt_runtime_string>::value> + {}; + + # if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) diff --git a/dev-libs/spdlog/spdlog-1.11.0.ebuild b/dev-libs/spdlog/spdlog-1.11.0.ebuild index ebda7ae2f4a2..6759c44b79f8 100644 --- a/dev-libs/spdlog/spdlog-1.11.0.ebuild +++ b/dev-libs/spdlog/spdlog-1.11.0.ebuild @@ -31,6 +31,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-force_external_fmt.patch" + "${FILESDIR}/${PN}-libfmt-10.0.0.patch" ) src_prepare() {