diff options
| author |   Sam James <sam@gentoo.org> | 2022-03-28 06:43:52 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-03-28 06:44:21 +0100 |
| commit | f97a560be2de84ac8d5f911eb77e68e3036744e3 (patch) | |
| tree | 7cb4f54770ebfc0668b1a37adb32752ced8816ba /dev-util | |
| parent | app-containers/containerd: drop 1.5.9 (diff) | |
| download | gentoo-f97a560be2de84ac8d5f911eb77e68e3036744e3.tar.gz gentoo-f97a560be2de84ac8d5f911eb77e68e3036744e3.tar.bz2 gentoo-f97a560be2de84ac8d5f911eb77e68e3036744e3.zip | |
dev-util/meson: fix gtk-update-icon-cache check
Was checking for gtk4* twice.
Bug: https://bugs.gentoo.org/836294
Closes: https://bugs.gentoo.org/836293
Closes: https://bugs.gentoo.org/836281
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch | 29 | ||||
| -rw-r--r-- | dev-util/meson/meson-0.61.4-r1.ebuild (renamed from dev-util/meson/meson-0.61.4.ebuild) | 4 |
2 files changed, 33 insertions, 0 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 new file mode 100644 index 000000000000..7be12b7a98ac --- /dev/null +++ b/dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch @@ -0,0 +1,29 @@ +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 + diff --git a/dev-util/meson/meson-0.61.4.ebuild b/dev-util/meson/meson-0.61.4-r1.ebuild index 52bbb982abcc..bbc8938fb7ed 100644 --- a/dev-util/meson/meson-0.61.4.ebuild +++ b/dev-util/meson/meson-0.61.4-r1.ebuild @@ -35,6 +35,10 @@ DEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${P}-fix-gtk-update-icon-cache-check.patch +) + python_prepare_all() { local disable_unittests=( # ASAN and sandbox both want control over LD_PRELOAD |