[PR PATCH] meson: patch gtk-update-icon-cache detection

[PR PATCH] meson: patch gtk-update-icon-cache detection

[paper42]

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

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

https://github.com/paper42/void-packages meson-gtk-update-icon-cache
https://github.com/void-linux/void-packages/pull/36434

meson: patch gtk-update-icon-cache detection
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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/36434.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-gtk-update-icon-cache-36434.patch --]
[-- Type: text/x-diff, Size: 2498 bytes --]

From faf4e6e199b167ceadddbebf474e5347fafd49fb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 31 Mar 2022 20:44:27 +0200
Subject: [PATCH] meson: patch gtk-update-icon-cache detection

---
 ...me-fallback-to-gtk-update-icon-cache.patch | 26 +++++++++++++++++++
 srcpkgs/meson/template                        |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create 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
new file mode 100644
index 000000000000..56a3f7cf3410
--- /dev/null
+++ b/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch
@@ -0,0 +1,26 @@
+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 2f9ccaaa4691..adfa2d52f7ab 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
 version=0.61.4
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"

Re: [PR PATCH] [Merged]: meson: patch gtk-update-icon-cache detection

[paper42]

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

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

meson: patch gtk-update-icon-cache detection
https://github.com/void-linux/void-packages/pull/36434

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

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

<!--
#### 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
-->