forked from pool/meson
Dominique Leuenberger
97136d1db7
- 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
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
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
|