meson: patch gtk-update-icon-cache detection
This commit is contained in:
parent
e6e52b0676
commit
faf4e6e199
2 changed files with 27 additions and 1 deletions
srcpkgs/meson
|
@ -0,0 +1,26 @@
|
|||
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
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'meson'
|
||||
pkgname=meson
|
||||
version=0.61.4
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=python3-module
|
||||
hostmakedepends="python3-devel python3-setuptools"
|
||||
depends="ninja python3-setuptools"
|
||||
|
|
Loading…
Reference in a new issue