[PR PATCH] meson: update to 0.62.1.

[PR PATCH] meson: update to 0.62.1.

[paper42]

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

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages meson-0.62.1
https://github.com/void-linux/void-packages/pull/37138

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

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

@Johnnynator would you be fine with me adopting this package?

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 486301d525bef8078b20f4da70adec8f3490c467 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 13:49:39 +0200
Subject: [PATCH] meson: update to 0.62.1.

---
 ...me-fallback-to-gtk-update-icon-cache.patch | 26 -------------------
 srcpkgs/meson/template                        |  6 ++---
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch

diff --git a/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch b/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch
deleted file mode 100644
index 56a3f7cf3410..000000000000
--- a/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From dac212e1bba707b9ac67b48902d761ee7ca8fa04 Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot <ajacoutot@gnome.org>
-Date: Wed, 23 Mar 2022 22:15:11 +0100
-Subject: [PATCH] gnome module: properly fallback to gtk-update-icon-cache
-
-Commit a0cade8f introduced a typo and wrongly check for
-gtk4-update-icon-cache twice.
-If gtk4-update-icon-cache (gtk4) is not found, look for
-gtk-update-icon-cache (gtk3) instead.
----
- mesonbuild/modules/gnome.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
-index 673a781a41d..501be9ae4da 100644
---- a/mesonbuild/modules/gnome.py
-+++ b/mesonbuild/modules/gnome.py
-@@ -371,7 +371,7 @@ def post_install(self, state: 'ModuleState', args: T.List['TYPE_var'], kwargs: '
-             prog = state.find_program('gtk4-update-icon-cache', required=False)
-             found = isinstance(prog, build.Executable) or prog.found()
-             if not found:
--                prog = state.find_program('gtk4-update-icon-cache')
-+                prog = state.find_program('gtk-update-icon-cache')
-             icondir = os.path.join(datadir_abs, 'icons', 'hicolor')
-             script = state.backend.get_executable_serialisation([prog, '-q', '-t', '-f', icondir])
-             script.skip_if_destdir = True
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 2a4453076e8f..6f9cd7e57c75 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,6 +1,6 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.62.0
+version=0.62.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
@@ -9,12 +9,12 @@ checkdepends="glib-devel gobject-introspection ninja
  gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python-devel
  cross-arm-linux-gnueabihf"
 short_desc="Super fast build system"
-maintainer="John <me@johnnynator.dev>"
+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=06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb
+checksum=a0f5caa1e70da12d5e63aa6a9504273759b891af36c8d87de381a4ed1380e845
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

Re: [PR PATCH] [Updated] meson: update to 0.62.1.

[paper42]

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

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

https://github.com/paper42/void-packages meson-0.62.1
https://github.com/void-linux/void-packages/pull/37138

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

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

@Johnnynator would you be fine with me adopting this package?

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 60d7b1b53d15626fb8c582271b377c88841b8d80 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 13:49:39 +0200
Subject: [PATCH] meson: update to 0.62.2.

---
 ...me-fallback-to-gtk-update-icon-cache.patch | 26 -------------------
 srcpkgs/meson/template                        |  9 +++----
 2 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch

diff --git a/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch b/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch
deleted file mode 100644
index 56a3f7cf3410..000000000000
--- a/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From dac212e1bba707b9ac67b48902d761ee7ca8fa04 Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot <ajacoutot@gnome.org>
-Date: Wed, 23 Mar 2022 22:15:11 +0100
-Subject: [PATCH] gnome module: properly fallback to gtk-update-icon-cache
-
-Commit a0cade8f introduced a typo and wrongly check for
-gtk4-update-icon-cache twice.
-If gtk4-update-icon-cache (gtk4) is not found, look for
-gtk-update-icon-cache (gtk3) instead.
----
- mesonbuild/modules/gnome.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
-index 673a781a41d..501be9ae4da 100644
---- a/mesonbuild/modules/gnome.py
-+++ b/mesonbuild/modules/gnome.py
-@@ -371,7 +371,7 @@ def post_install(self, state: 'ModuleState', args: T.List['TYPE_var'], kwargs: '
-             prog = state.find_program('gtk4-update-icon-cache', required=False)
-             found = isinstance(prog, build.Executable) or prog.found()
-             if not found:
--                prog = state.find_program('gtk4-update-icon-cache')
-+                prog = state.find_program('gtk-update-icon-cache')
-             icondir = os.path.join(datadir_abs, 'icons', 'hicolor')
-             script = state.backend.get_executable_serialisation([prog, '-q', '-t', '-f', icondir])
-             script.skip_if_destdir = True
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 2a4453076e8f..d4c6c4d29670 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,6 +1,6 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.62.0
+version=0.62.2
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
@@ -9,12 +9,12 @@ checkdepends="glib-devel gobject-introspection ninja
  gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python-devel
  cross-arm-linux-gnueabihf"
 short_desc="Super fast build system"
-maintainer="John <me@johnnynator.dev>"
+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=06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb
+checksum=a7669e4c4110b06b743d57cc5d6432591a6677ef2402139fe4f3d42ac13380b0
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
@@ -24,8 +24,7 @@ fi
 post_patch() {
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
 		vsed -e 's/test_pch_with_address_sanitizer/_&/' \
-			-e 's/test_generate_gir_with_address_sanitizer/_&/' \
-			-i run_unittests.py
+			-i unittests/linuxliketests.py
 	fi
 }
 

Re: [PR PATCH] [Merged]: meson: update to 0.62.2.

[paper42]

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

There's a merged pull request on the void-packages repository

meson: update to 0.62.2.
https://github.com/void-linux/void-packages/pull/37138

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

@Johnnynator would you be fine with me adopting this package?

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->