summaryrefslogtreecommitdiff
path: root/dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch')
-rw-r--r--dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch b/dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch
deleted file mode 100644
index 7be12b7a98ac..000000000000
--- a/dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://github.com/mesonbuild/meson/commit/dac212e1bba707b9ac67b48902d761ee7ca8fa04
-
-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
-