Re: [PR PATCH] [Updated] meson: update to 0.64.0rc2.

[paper42 <paper42@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 547 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages meson-0.64
https://github.com/void-linux/void-packages/pull/40250

meson: update to 0.64.0rc2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

~~only the xreader build seems to break with this update~~ fixed in rc2

A patch file from https://github.com/void-linux/void-packages/pull/40250.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-0.64-40250.patch --]
[-- Type: text/x-diff, Size: 2318 bytes --]

From 4fdc7cb347bd67bdddbd3ca013573a9c07eb80df Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 31 Oct 2022 10:43:35 +0100
Subject: [PATCH 1/2] meson: update to 0.64.0

---
 srcpkgs/meson/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 5dab33e8c011..a9992ecf5382 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.63.2
-revision=2
+version=0.64.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -13,8 +13,8 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
-distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=16222f17ef76be0542c91c07994f9676ae879f46fc21c0c786a21ef2cb518bbf
+distfiles="https://github.com/mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
+checksum=c5e27e091c2a35b9049e152a6535045ebbd057253aeb67856de6ecbb7b917bab
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

From e77f04bb5f0792a3754da683525123fdd66dea5e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 31 Oct 2022 12:06:46 +0100
Subject: [PATCH 2/2] common: build-style/meson: use meson setup

WARNING: Running the setup command as `meson [options]` instead of `meson setup [options]` is ambiguous and deprecated.

meson setup works since 0.42 and this deprecation warning was introduced
in 0.64
---
 common/build-style/meson.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/build-style/meson.sh b/common/build-style/meson.sh
index a7bd901e9760..e983c5f42c2f 100644
--- a/common/build-style/meson.sh
+++ b/common/build-style/meson.sh
@@ -103,7 +103,7 @@ do_configure() {
 	export AR="gcc-ar"
 
 	# unbuffered output for continuous logging
-	PYTHONUNBUFFERED=1 ${meson_cmd} \
+	PYTHONUNBUFFERED=1 ${meson_cmd} setup \
 		--prefix=/usr \
 		--libdir=/usr/lib${XBPS_TARGET_WORDSIZE} \
 		--libexecdir=/usr/libexec \