From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1698685-garchives=archives.gentoo.org@lists.gentoo.org>
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 B2555158232
for <garchives@archives.gentoo.org>; Tue, 10 Dec 2024 08:37:45 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id CADD8E0C78;
Tue, 10 Dec 2024 08:37:44 +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 9E91CE0C78
for <gentoo-commits@lists.gentoo.org>; Tue, 10 Dec 2024 08:37:44 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 smtp.gentoo.org (Postfix) with ESMTPS id A39A9343146
for <gentoo-commits@lists.gentoo.org>; Tue, 10 Dec 2024 08:37:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 49DC61EC5
for <gentoo-commits@lists.gentoo.org>; Tue, 10 Dec 2024 08:37:12 +0000 (UTC)
From: "Petr Vaněk" <arkamar@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Petr Vaněk" <arkamar@gentoo.org>
Message-ID: <1733819793.bc01402b312ede7b9609225e18c6cc5ada6601d9.arkamar@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/, sci-libs/cantera/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-libs/cantera/cantera-3.0.1-r2.ebuild sci-libs/cantera/files/cantera-3.0.1_add_fmt11_support.patch
X-VCS-Directories: sci-libs/cantera/files/ sci-libs/cantera/
X-VCS-Committer: arkamar
X-VCS-Committer-Name: Petr Vaněk
X-VCS-Revision: bc01402b312ede7b9609225e18c6cc5ada6601d9
X-VCS-Branch: master
Date: Tue, 10 Dec 2024 08:37:12 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 77cdfe4e-2b74-4830-991d-61b4ef492865
X-Archives-Hash: f8403f4fd043c244c1b6ec606a1b0e95
commit: bc01402b312ede7b9609225e18c6cc5ada6601d9
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun Dec 8 18:22:25 2024 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 08:36:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc01402b
sci-libs/cantera: 3.0.1-r2, fix build against fmt11
Closes: https://bugs.gentoo.org/945800
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/39638
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
sci-libs/cantera/cantera-3.0.1-r2.ebuild | 3 +-
.../files/cantera-3.0.1_add_fmt11_support.patch | 46 ++++++++++++++++++++++
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/sci-libs/cantera/cantera-3.0.1-r2.ebuild b/sci-libs/cantera/cantera-3.0.1-r2.ebuild
index 9a7d0ecd45b5..ffa880c04646 100644
--- a/sci-libs/cantera/cantera-3.0.1-r2.ebuild
+++ b/sci-libs/cantera/cantera-3.0.1-r2.ebuild
@@ -45,7 +45,7 @@ DEPEND="
${RDEPEND}
dev-cpp/eigen:3
dev-libs/boost:=
- <dev-libs/libfmt-11
+ dev-libs/libfmt
python? (
$(python_gen_cond_dep '
dev-python/cython[${PYTHON_USEDEP}]
@@ -68,6 +68,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}/${PN}-3.0.0_env.patch"
"${FILESDIR}/${P}_fix_fmt_with_c++20.patch"
+ "${FILESDIR}/${P}_add_fmt11_support.patch"
)
pkg_setup() {
diff --git a/sci-libs/cantera/files/cantera-3.0.1_add_fmt11_support.patch b/sci-libs/cantera/files/cantera-3.0.1_add_fmt11_support.patch
new file mode 100644
index 000000000000..7e0d5333a105
--- /dev/null
+++ b/sci-libs/cantera/files/cantera-3.0.1_add_fmt11_support.patch
@@ -0,0 +1,46 @@
+This is upstream patch with removed changes for "doc/sphinx/develop/compiling/dependencies.md" file
+Upstream issue: https://github.com/Cantera/cantera/issues/1735
+Gentoo issue: https://bugs.gentoo.org/945800
+
+From c8f190928fd7a074944f0f4c58661f84a282a35e Mon Sep 17 00:00:00 2001
+From: Ray Speth <speth@mit.edu>
+Date: Wed, 24 Jul 2024 20:12:18 -0400
+Subject: [PATCH] Add support for fmt 11.0
+
+Resolves #1735
+---
+ SConstruct | 2 +-
+ doc/sphinx/develop/compiling/dependencies.md | 2 +-
+ include/cantera/base/fmt.h | 8 ++++++++
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 3863fe3a32..0b607ac891 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -216,7 +216,7 @@ config_options = [
+ options with spaces, for example, "cxx_flags='-g -Wextra -O3 --std=c++14'"
+ """,
+ {
+- "cl": "/EHsc /std:c++17",
++ "cl": "/EHsc /std:c++17 /utf-8",
+ "default": "-std=c++17"
+ }),
+ Option(
+diff --git a/include/cantera/base/fmt.h b/include/cantera/base/fmt.h
+index 1e0b3a0423..6b4d734fe3 100644
+--- a/include/cantera/base/fmt.h
++++ b/include/cantera/base/fmt.h
+@@ -42,4 +42,12 @@ void fmt_append(fmt::memory_buffer& b, const std::string& tmpl, Args... args) {
+ }
+ #endif
+
++#if FMT_VERSION > 100000
++ #if CT_USE_SYSTEM_FMT
++ #include <fmt/ranges.h>
++ #else
++ #include <fmt/join.h>
++ #endif
++#endif
++
+ #endif