From d13f8ac3a9dc12d1802ceacc44bc4fcc43ec7b3c Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sun, 20 Dec 2020 16:33:41 +0000 Subject: [PATCH] Call the newly installed gtk4-update-icon-cache Otherwise we rely on whatever it's inside the PATH. --- build-aux/meson/post-install.py | 48 +++++++++++++++++---------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/build-aux/meson/post-install.py b/build-aux/meson/post-install.py index 7616de7ba2..5238e3c809 100644 --- a/build-aux/meson/post-install.py +++ b/build-aux/meson/post-install.py @@ -1,20 +1,21 @@ #!/usr/bin/env python3 - -import os -import sys -import subprocess - -if 'DESTDIR' not in os.environ: - gtk_api_version = sys.argv[1] - gtk_abi_version = sys.argv[2] + +import os +import sys +import subprocess + +if 'DESTDIR' not in os.environ: + gtk_api_version = sys.argv[1] + gtk_abi_version = sys.argv[2] gtk_libdir = sys.argv[3] gtk_datadir = sys.argv[4] - - gtk_moduledir = os.path.join(gtk_libdir, 'gtk-' + gtk_api_version, gtk_abi_version) - gtk_printmodule_dir = os.path.join(gtk_moduledir, 'printbackends') - gtk_immodule_dir = os.path.join(gtk_moduledir, 'immodules') - - print('Compiling GSettings schemas...') + gtk_bindir = sys.argv[5] + + gtk_moduledir = os.path.join(gtk_libdir, 'gtk-' + gtk_api_version, gtk_abi_version) + gtk_printmodule_dir = os.path.join(gtk_moduledir, 'printbackends') + gtk_immodule_dir = os.path.join(gtk_moduledir, 'immodules') + + print('Compiling GSettings schemas...') glib_compile_schemas = subprocess.check_output(['pkg-config', '--variable=glib_compile_schemas', 'gio-2.0']).strip() @@ -22,13 +23,14 @@ if 'DESTDIR' not in os.environ: # pkg-config variables only available since GLib 2.62.0. glib_compile_schemas = 'glib-compile-schemas' subprocess.call([glib_compile_schemas, - os.path.join(gtk_datadir, 'glib-2.0', 'schemas')]) - - print('Updating icon cache...') - subprocess.call(['gtk4-update-icon-cache', '-q', '-t' ,'-f', - os.path.join(gtk_datadir, 'icons', 'hicolor')]) - - print('Updating module cache for print backends...') + os.path.join(gtk_datadir, 'glib-2.0', 'schemas')]) + + print('Updating icon cache...') + update_icon_cache = os.path.join(gtk_bindir, 'gtk4-update-icon-cache') + subprocess.call([update_icon_cache, '-q', '-t' ,'-f', + os.path.join(gtk_datadir, 'icons', 'hicolor')]) + + print('Updating module cache for print backends...') os.makedirs(gtk_printmodule_dir, exist_ok=True) gio_querymodules = subprocess.check_output(['pkg-config', '--variable=gio_querymodules', @@ -37,7 +39,7 @@ if 'DESTDIR' not in os.environ: # pkg-config variables only available since GLib 2.62.0. gio_querymodules = 'gio-querymodules' subprocess.call([gio_querymodules, gtk_printmodule_dir]) - - print('Updating module cache for input methods...') + + print('Updating module cache for input methods...') os.makedirs(gtk_immodule_dir, exist_ok=True) subprocess.call([gio_querymodules, gtk_immodule_dir])