AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

build-aux: fallback to default glib-compile-schemas & gio-querymodules.

Browse Source 
The pkg-config variables have been added in GLib 2.62.0. Let's fallback
to default names for these tools in such case (`pkg-config` still
returns a 0 return value, but with empty output for absent variables).
This commit is contained in:
Jehan 2020-06-28 12:48:27 +02:00
parent cd096819d8
commit 2fb755e0c9
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build-aux/meson/post-install.py
View File

@ -18,6 +18,9 @@ if 'DESTDIR' not in os.environ:
glib_compile_schemas = subprocess.check_output(['pkg-config', glib_compile_schemas = subprocess.check_output(['pkg-config',
'--variable=glib_compile_schemas', '--variable=glib_compile_schemas',
'gio-2.0']).strip() 'gio-2.0']).strip()
if not os.path.exists(glib_compile_schemas):
# pkg-config variables only available since GLib 2.62.0.
glib_compile_schemas = 'glib-compile-schemas'
subprocess.call([glib_compile_schemas, subprocess.call([glib_compile_schemas,
os.path.join(gtk_datadir, 'glib-2.0', 'schemas')]) os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])
@ -30,6 +33,9 @@ if 'DESTDIR' not in os.environ:
gio_querymodules = subprocess.check_output(['pkg-config', gio_querymodules = subprocess.check_output(['pkg-config',
'--variable=gio_querymodules', '--variable=gio_querymodules',
'gio-2.0']).strip() 'gio-2.0']).strip()
if not os.path.exists(gio_querymodules):
# pkg-config variables only available since GLib 2.62.0.
gio_querymodules = 'gio-querymodules'
subprocess.call([gio_querymodules, gtk_printmodule_dir]) subprocess.call([gio_querymodules, gtk_printmodule_dir])
print('Updating module cache for input methods...') print('Updating module cache for input methods...')