aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@gnome.org>2022-03-23 22:15:11 +0100
committerXavier Claessens <xclaesse@gmail.com>2022-03-23 17:54:12 -0400
commitdac212e1bba707b9ac67b48902d761ee7ca8fa04 (patch)
treebebf0610c3e34b3422dcbd4342cde57a87a72585
parentc65abc568c48b37db2267bfb25322c850ba014a9 (diff)
downloadmeson-dac212e1bba707b9ac67b48902d761ee7ca8fa04.zip
meson-dac212e1bba707b9ac67b48902d761ee7ca8fa04.tar.gz
meson-dac212e1bba707b9ac67b48902d761ee7ca8fa04.tar.bz2
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.
-rw-r--r--mesonbuild/modules/gnome.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 673a781..501be9a 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -371,7 +371,7 @@ class GnomeModule(ExtensionModule):
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