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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7597115AD33 for ; Wed, 10 May 2023 16:10:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA9D1E092E; Wed, 10 May 2023 16:10:10 +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 51E35E092F for ; Wed, 10 May 2023 16:10:10 +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 49D9F340C96 for ; Wed, 10 May 2023 16:10:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BAE87A68 for ; Wed, 10 May 2023 16:10:07 +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: <1683734988.c75626a840b049c50a500b3d29a54986ea2372da.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-libfmt-10.0.0.patch dev-libs/spdlog/spdlog-1.11.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: c75626a840b049c50a500b3d29a54986ea2372da X-VCS-Branch: master Date: Wed, 10 May 2023 16:10:07 +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: 1bdaddb9-d8d1-4580-a3a1-3bde70abcb51 X-Archives-Hash: 17d5c07e3e4ecf9274de514da6af4407 commit: c75626a840b049c50a500b3d29a54986ea2372da Author: Sam James gentoo org> AuthorDate: Wed May 10 16:09:19 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed May 10 16:09:48 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75626a8 Revert "dev-libs/spdlog: fix fails compile with libfmt-10.0.0" This reverts commit 03d7b984817fbf07c4d830f30e34ae20a79af7b4. Bug: https://bugs.gentoo.org/906069 Bug: https://bugs.gentoo.org/906071 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 deletions(-) diff --git a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch deleted file mode 100644 index 185fb12fb727..000000000000 --- a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 6759c44b79f8..ebda7ae2f4a2 100644 --- a/dev-libs/spdlog/spdlog-1.11.0.ebuild +++ b/dev-libs/spdlog/spdlog-1.11.0.ebuild @@ -31,7 +31,6 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-force_external_fmt.patch" - "${FILESDIR}/${PN}-libfmt-10.0.0.patch" ) src_prepare() {