Accepting request 972475 from devel:tools:building

OBS-URL: https://build.opensuse.org/request/show/972475
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/meson?expand=0&rev=82

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-0.61.3.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b
-size 2011631

meson-0.61.3.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmIvgwAACgkQwk5jG6ux
-/nCzgA/8CBfnDLv//YDnMk+ZKlGk+xM9lZ8l4G17hr5nHEjjpvU2pgguzm3iAcH9
-m4xJXrlrQW+SxaI+RdA9pE/BxR02OcHZ0iPGruzpjU5FvorPWUdUu+gLb5seqkH5
-YEnXVeaURGbWxOHDhjXPPi8dVSR8oBafYonJQfxjDyl3Cxp2QYuJv7kQ935BXNbR
-qiLqgG/M9m96SlYwysfzqKI5IMG7SGlaio6/srtYgp/+pZqyJDa6r397YrsRtY4F
-x8amOxppVamo4SYK+1X/3PhQNBMnaZGYm6LsQ+VZcTKmupiZuz1GWWMTJaCkWEaQ
-zZ24kITXSDMRPk8B8XAlM6cxzFT9MVzSjwmoy+fag5owwFrLPUuYKgI3bgTIYVv7
-o7EFz7lgklJkHZD7QXqzEom8E+aBFDZUL5wLDER7wrnMfH2PSNp4VkF3SuY/aT/P
-Dzn08CpcbotQEBunLWKO/q85JcQ6+42fMiDEHBJ+sK+J781ZJ7UlqwQ/GpeFhS3X
-b3p3VpXJQuk0XR2lJBeeQUn5L+F6OoXXsZm4UWQMgV/y7r+hVaLj8JRk8j7tAHle
-K27odVh3Pu58FTfgvIV37CEsf9tSdvw/yQnt9gFlYcJXmcpF+BB9c4Y5YqY+TxiZ
-x3wvkrGCT/LECfXaofSrOBXOtnyhFXC8KLx0AT5cxJVnIx3dNVw=
-=YiOR
------END PGP SIGNATURE-----

meson-0.61.4.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9
+size 2014265

meson-0.61.4.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmI+Im8ACgkQwk5jG6ux
+/nAx1A//ahO5t+1WhvVbNqUS4vqpkEi4SeG5oeg/K1LURjoNYUek3t+FGB1Yn278
+zwQ55vH9FNyT18LrV3LcKBKAAF0Ja+j7o+LQcG9zF6g31QOAzVW4ACF7TK5XXaMn
+1mSPuzlF1s81SP4SMpaTdAEk1XJfS0b913YPvBcxvkG5ti1/pdQ9ORuX37cax3XF
+OaWppWmkRKiNPOScZdLprOC+RrHitdaTyEmZ5idudy+HeqZ733yoGaBgel7hxdgn
+u9GVQJj2oKL2HR1Vaoc/iyd7khiXQHA3GqcDkGP4jWEFwaQ02l3mohGhq333325s
+9dO+tm4y29BZ5NFzaXm9B0sUqrEPHJggdl/+ylwzf5WtI30UTPYlF2u+UpIStVIX
+Ta+Xq/wtaUO5469IYX7CFHY0qNr0rGq+s3XpMjqdHk+Sjhuk2Ff6bSeky+3z29C8
+aWYW7cWFcHzPRTy0BX4S2ZC6gsuAnHgsoqOn05oPNbbKMMzlaR5O31ugQh2KYVVb
+N+ujIDzfyMQfq2acZ4SbX8gBmfOFC1KADqmUMc8MUVyDFLTiNCEFkzrJCOXFAeMb
+pUgFon6s+VimPxTUM+rdSqQdt6Mh5dU90dLiPV7rXvJx3rupCiJO8zu7ncI3+Dm2
+Nz6Rl05j+hAwctC23EIQNwoKYJafeYwuIHD0yd30vLG2ZaASxkw=
+=WxQj
+-----END PGP SIGNATURE-----

meson.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+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>
+
+- Update to 0.61.4:
+  * Fixes for the ninja backend
+  * Fixes for the rust module
+  * Fixes for the gnome module: Fix incorrect lookup of nonexistent
+    dependencies
+
 -------------------------------------------------------------------
 Tue Mar 15 14:31:51 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
 

meson.spec

@@ -28,7 +28,7 @@
 %{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim}
 %bcond_with     setuptools
 Name:           meson%{name_ext}
-Version:        0.61.3
+Version:        0.61.4
 Release:        0
 Summary:        Python-based build system
 License:        Apache-2.0
@@ -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