[gtk/wip/Jehan/gio-querymodules-pkg-config: 26/27] build-aux: search various Glib/GIO utilities in .pc file.



commit 87dfcd815244bdd39306bedf0db13f2146811254
Author: Jehan <jehan girinstud io>
Date:   Sun Jun 21 20:22:06 2020 +0200

    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 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/build-aux/meson/post-install.py b/build-aux/meson/post-install.py
index 986fd23025..bdbc8a32c9 100644
--- a/build-aux/meson/post-install.py
+++ b/build-aux/meson/post-install.py
@@ -27,7 +27,10 @@ if 'DESTDIR' not in os.environ:
                 shutil.copyfile(installed_lib, installed_lib_dst)
 
     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...')
@@ -43,4 +46,7 @@ if 'DESTDIR' not in os.environ:
     # Untested!
     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])


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]