Accepting request 972473 from GNOME:Next

- Add 34daa53a.patch: gnome module: properly fallback to
  gtk-update-icon-cache.

OBS-URL: https://build.opensuse.org/request/show/972473
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=222

34daa53a.patch

@@ -0,0 +1,26 @@
+From 34daa53aa6e6714f906f20bcc17f5300c21abcde 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

meson.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr 25 07:08:30 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add 34daa53a.patch: gnome module: properly fallback to
+  gtk-update-icon-cache.
+
 -------------------------------------------------------------------
 Sat Apr 23 11:35:57 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
 

meson.spec

@@ -37,6 +37,8 @@ URL:            https://mesonbuild.com/
 Source:         https://github.com/%{_name}/meson/releases/download/%{version}/meson-%{version}.tar.gz
 Source1:        https://github.com/%{_name}/meson/releases/download/%{version}/meson-%{version}.tar.gz.asc
 Source2:        meson.keyring
+# PATCH-FIX-UPSTREAM 34daa53a.patch dimstar@opensuse.org -- gnome module: properly fallback to gtk-update-icon-cache
+Patch0:         https://github.com/mesonbuild/meson/commit/34daa53a.patch
 # PATCH-FIX-OPENSUSE meson-test-installed-bin.patch dimstar@opensuse.org -- We want the test suite to run against /usr/bin/meson coming from our meson package.
 Patch1:         meson-test-installed-bin.patch
 # PATCH-FEATURE-OPENSUSE meson-distutils.patch tchvatal@suse.com -- build and install using distutils instead of full setuptools
@@ -159,6 +161,7 @@ This package provides support for meson.build files in Vim.
 
 %prep
 %setup -q -n meson-%{version}
+%patch0 -p1
 %patch1 -p1
 %if !%{with setuptools}
 %patch2 -p1