| 1 |
commit: f97a560be2de84ac8d5f911eb77e68e3036744e3 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 28 05:43:52 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 28 05:44:21 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f97a560b |
| 7 |
|
| 8 |
dev-util/meson: fix gtk-update-icon-cache check |
| 9 |
|
| 10 |
Was checking for gtk4* twice. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/836294 |
| 13 |
Closes: https://bugs.gentoo.org/836293 |
| 14 |
Closes: https://bugs.gentoo.org/836281 |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
...on-0.61.4-fix-gtk-update-icon-cache-check.patch | 29 ++++++++++++++++++++++ |
| 18 |
...{meson-0.61.4.ebuild => meson-0.61.4-r1.ebuild} | 4 +++ |
| 19 |
2 files changed, 33 insertions(+) |
| 20 |
|
| 21 |
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 |
| 22 |
new file mode 100644 |
| 23 |
index 000000000000..7be12b7a98ac |
| 24 |
--- /dev/null |
| 25 |
+++ b/dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch |
| 26 |
@@ -0,0 +1,29 @@ |
| 27 |
+https://github.com/mesonbuild/meson/commit/dac212e1bba707b9ac67b48902d761ee7ca8fa04 |
| 28 |
+ |
| 29 |
+From dac212e1bba707b9ac67b48902d761ee7ca8fa04 Mon Sep 17 00:00:00 2001 |
| 30 |
+From: Antoine Jacoutot <ajacoutot@×××××.org> |
| 31 |
+Date: Wed, 23 Mar 2022 22:15:11 +0100 |
| 32 |
+Subject: [PATCH] gnome module: properly fallback to gtk-update-icon-cache |
| 33 |
+ |
| 34 |
+Commit a0cade8f introduced a typo and wrongly check for |
| 35 |
+gtk4-update-icon-cache twice. |
| 36 |
+If gtk4-update-icon-cache (gtk4) is not found, look for |
| 37 |
+gtk-update-icon-cache (gtk3) instead. |
| 38 |
+--- |
| 39 |
+ mesonbuild/modules/gnome.py | 2 +- |
| 40 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 41 |
+ |
| 42 |
+diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py |
| 43 |
+index 673a781a41d..501be9ae4da 100644 |
| 44 |
+--- a/mesonbuild/modules/gnome.py |
| 45 |
++++ b/mesonbuild/modules/gnome.py |
| 46 |
+@@ -371,7 +371,7 @@ def post_install(self, state: 'ModuleState', args: T.List['TYPE_var'], kwargs: ' |
| 47 |
+ prog = state.find_program('gtk4-update-icon-cache', required=False) |
| 48 |
+ found = isinstance(prog, build.Executable) or prog.found() |
| 49 |
+ if not found: |
| 50 |
+- prog = state.find_program('gtk4-update-icon-cache') |
| 51 |
++ prog = state.find_program('gtk-update-icon-cache') |
| 52 |
+ icondir = os.path.join(datadir_abs, 'icons', 'hicolor') |
| 53 |
+ script = state.backend.get_executable_serialisation([prog, '-q', '-t', '-f', icondir]) |
| 54 |
+ script.skip_if_destdir = True |
| 55 |
+ |
| 56 |
|
| 57 |
diff --git a/dev-util/meson/meson-0.61.4.ebuild b/dev-util/meson/meson-0.61.4-r1.ebuild |
| 58 |
similarity index 97% |
| 59 |
rename from dev-util/meson/meson-0.61.4.ebuild |
| 60 |
rename to dev-util/meson/meson-0.61.4-r1.ebuild |
| 61 |
index 52bbb982abcc..bbc8938fb7ed 100644 |
| 62 |
--- a/dev-util/meson/meson-0.61.4.ebuild |
| 63 |
+++ b/dev-util/meson/meson-0.61.4-r1.ebuild |
| 64 |
@@ -35,6 +35,10 @@ DEPEND=" |
| 65 |
) |
| 66 |
" |
| 67 |
|
| 68 |
+PATCHES=( |
| 69 |
+ "${FILESDIR}"/${P}-fix-gtk-update-icon-cache-check.patch |
| 70 |
+) |
| 71 |
+ |
| 72 |
python_prepare_all() { |
| 73 |
local disable_unittests=( |
| 74 |
# ASAN and sandbox both want control over LD_PRELOAD |
Archives