From 48cc56081d023dd3e73c890f94aec07d250b2753 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 28 Sep 2022 11:24:51 -0400 Subject: [PATCH] meson: Remove post-install script GTK depends on Meson >= 0.60 so it was never used. --- build-aux/meson/post-install.py | 45 --------------------------------- meson.build | 19 ++++---------- 2 files changed, 5 insertions(+), 59 deletions(-) delete mode 100644 build-aux/meson/post-install.py diff --git a/build-aux/meson/post-install.py b/build-aux/meson/post-install.py deleted file mode 100644 index f57ae5e321..0000000000 --- a/build-aux/meson/post-install.py +++ /dev/null @@ -1,45 +0,0 @@ -#!/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] - gtk_libdir = sys.argv[3] - gtk_datadir = sys.argv[4] - 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_mediamodule_dir = os.path.join(gtk_moduledir, 'media') - - print('Compiling GSettings schemas...') - glib_compile_schemas = subprocess.check_output(['pkg-config', - '--variable=glib_compile_schemas', - '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, - 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', - '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]) - - print('Updating module cache for media backends...') - os.makedirs(gtk_mediamodule_dir, exist_ok=True) - subprocess.call([gio_querymodules, gtk_mediamodule_dir]) diff --git a/meson.build b/meson.build index f27dfb6f82..23e932334c 100644 --- a/meson.build +++ b/meson.build @@ -885,20 +885,11 @@ subdir('po') subdir('docs/reference') if not meson.is_cross_build() - if meson.version().version_compare('>=0.57.0') - gnome.post_install( - glib_compile_schemas: true, - gio_querymodules: gio_module_dirs, - gtk_update_icon_cache: get_option('demos'), - ) - else - meson.add_install_script('build-aux/meson/post-install.py', - gtk_api_version, - gtk_binary_version, - gtk_libdir, - gtk_datadir, - gtk_bindir) - endif + gnome.post_install( + glib_compile_schemas: true, + gio_querymodules: gio_module_dirs, + gtk_update_icon_cache: get_option('demos'), + ) else message('Not executing post-install steps automatically when cross compiling') endif