From cd096819d8a5727418f9aadf73b3877325e19e80 Mon Sep 17 00:00:00 2001 From: Jehan Date: Sun, 21 Jun 2020 20:49:50 +0200 Subject: [PATCH] build-aux: search various Glib/GIO utilities in .pc file. Some distributions are renaming Glib/GIO utilities for multi-arch reasons so pkg-config variables have been added to find the correct name of a tool. GTK+ should use these variables instead of searching in PATH. See glib#1796. --- build-aux/meson/post-install.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/build-aux/meson/post-install.py b/build-aux/meson/post-install.py index 5bdccbab91..4a4cc02fc4 100644 --- a/build-aux/meson/post-install.py +++ b/build-aux/meson/post-install.py @@ -15,7 +15,10 @@ if 'DESTDIR' not in os.environ: gtk_immodule_dir = os.path.join(gtk_moduledir, 'immodules') print('Compiling GSettings schemas...') - subprocess.call(['glib-compile-schemas', + glib_compile_schemas = subprocess.check_output(['pkg-config', + '--variable=glib_compile_schemas', + 'gio-2.0']).strip() + subprocess.call([glib_compile_schemas, os.path.join(gtk_datadir, 'glib-2.0', 'schemas')]) print('Updating icon cache...') @@ -24,8 +27,11 @@ if 'DESTDIR' not in os.environ: print('Updating module cache for print backends...') os.makedirs(gtk_printmodule_dir, exist_ok=True) - subprocess.call(['gio-querymodules', gtk_printmodule_dir]) + gio_querymodules = subprocess.check_output(['pkg-config', + '--variable=gio_querymodules', + 'gio-2.0']).strip() + subprocess.call([gio_querymodules, gtk_printmodule_dir]) print('Updating module cache for input methods...') os.makedirs(gtk_immodule_dir, exist_ok=True) - subprocess.call(['gio-querymodules', gtk_immodule_dir]) + subprocess.call([gio_querymodules, gtk_immodule_dir])