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 C1728158013 for ; Sun, 3 Dec 2023 01:09:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E64A42BC018; Sun, 3 Dec 2023 01:09:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 C683E2BC018 for ; Sun, 3 Dec 2023 01:09:31 +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 D09AF335CAF for ; Sun, 3 Dec 2023 01:09:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35FED119 for ; Sun, 3 Dec 2023 01:09:29 +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: <1701565544.2556ee17fb54aea6c0b6d766f239db009f7b57fc.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch dev-util/meson/meson-1.3.0-r1.ebuild dev-util/meson/meson-1.3.0.ebuild X-VCS-Directories: dev-util/meson/files/ dev-util/meson/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2556ee17fb54aea6c0b6d766f239db009f7b57fc X-VCS-Branch: master Date: Sun, 3 Dec 2023 01:09:29 +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: 38e2c375-455f-44d5-a95b-087ff6c7477b X-Archives-Hash: e5e64f1a26c0013fda5ecfcab72f00de commit: 2556ee17fb54aea6c0b6d766f239db009f7b57fc Author: Eli Schwartz gmail com> AuthorDate: Sun Dec 3 00:53:47 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Dec 3 01:05:44 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2556ee17 dev-util/meson: backport fix for broken configure_file output This broke portage itself. Bug: https://github.com/mesonbuild/meson/pull/12532 Bug: https://bugs.gentoo.org/919072 Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> ...-convert-boolean-values-for-cmake-formats.patch | 31 ++++++++++++++++++++++ .../{meson-1.3.0.ebuild => meson-1.3.0-r1.ebuild} | 3 +++ 2 files changed, 34 insertions(+) diff --git a/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch b/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch new file mode 100644 index 000000000000..394b1bbb7c1b --- /dev/null +++ b/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch @@ -0,0 +1,31 @@ +From 9016e6958bb83feb9a724f20d8badb116bf7c5f2 Mon Sep 17 00:00:00 2001 +From: Jan200101 +Date: Tue, 21 Nov 2023 08:42:56 +0100 +Subject: [PATCH] Only convert boolean values for cmake formats + +This caused a regression with mesondefine where + `conf_data.set("FOO", true)` +turned into + `#define FOO 1` +instead of + `#define FOO` +--- + mesonbuild/utils/universal.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/utils/universal.py b/mesonbuild/utils/universal.py +index 26194628c..93e64c0a2 100644 +--- a/mesonbuild/utils/universal.py ++++ b/mesonbuild/utils/universal.py +@@ -1210,7 +1210,7 @@ def do_replacement(regex: T.Pattern[str], line: str, + var, _ = confdata.get(varname) + if isinstance(var, str): + var_str = var +- elif isinstance(var, bool): ++ elif variable_format.startswith("cmake") and isinstance(var, bool): + var_str = str(int(var)) + elif isinstance(var, int): + var_str = str(var) +-- +2.41.0 + diff --git a/dev-util/meson/meson-1.3.0.ebuild b/dev-util/meson/meson-1.3.0-r1.ebuild similarity index 96% rename from dev-util/meson/meson-1.3.0.ebuild rename to dev-util/meson/meson-1.3.0-r1.ebuild index 429bfd5ba7d3..1621828da199 100644 --- a/dev-util/meson/meson-1.3.0.ebuild +++ b/dev-util/meson/meson-1.3.0-r1.ebuild @@ -54,6 +54,9 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.2.1-python-path.patch + + # backport fix for broken configure_file() + "${FILESDIR}"/0001-Only-convert-boolean-values-for-cmake-formats.patch ) python_prepare_all() {