[gnome-mahjongg] meson: fixed postinstall options
- From: Alberto Ruiz <aruiz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-mahjongg] meson: fixed postinstall options
- Date: Thu, 3 Feb 2022 23:25:52 +0000 (UTC)
commit 686b7e33d13465086757d8e11b32c3cd1098cc95
Author: Günther Wagner <info gunibert de>
Date: Thu Nov 25 22:40:52 2021 +0100
meson: fixed postinstall options
Additionally i added a missing tileset. Probably an oversight as this was originally in
gnome-games-extra-data
data/meson.build | 30 +++++++-----------------------
meson.build | 2 +-
meson_options.txt | 2 --
3 files changed, 8 insertions(+), 26 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 8325c1b..0e0beb7 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -5,21 +5,15 @@ install_data ('icons' / 'hicolor' / 'scalable' / 'org.gnome.Mahjongg.svg',
install_data ('icons' / 'hicolor' / 'symbolic' / 'org.gnome.Mahjongg-symbolic.svg',
install_dir: hicolordir / 'symbolic' / 'apps')
-schemasdir = gio_dep.get_pkgconfig_variable(
- 'schemasdir',
- define_variable : [
- 'datadir',
- get_option('datadir')
- ]
-)
-
install_data ('org.gnome.Mahjongg.gschema.xml',
- install_dir: schemasdir)
+ install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
+)
install_data ('mahjongg.map', install_dir: join_paths (pkgdatadir, 'maps'))
install_data ('postmodern.svg', install_dir: join_paths (pkgdatadir, 'themes'))
install_data ('smooth.png', install_dir: join_paths (pkgdatadir, 'themes'))
install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
+install_data ('maya.png', install_dir: join_paths (pkgdatadir, 'themes'))
desktop_file = i18n.merge_file (
'desktop-file',
@@ -64,20 +58,10 @@ resources = gnome.compile_resources ('resources', 'org.gnome.Mahjongg.gresource.
source_dir: '.',
c_name: 'resources')
-# Compile GSettings schemas
-
-if get_option('compile-schemas').enabled()
- compileschemas = gio_dep.get_pkgconfig_variable('glib_compile_schemas')
- meson.add_install_script(compileschemas, get_option('prefix') / schemasdir)
-endif
-
-# Rebuild icon cache
-
-if get_option('update-icon-cache').enabled()
- updateiconcache = find_program('gtk-update-icon-cache')
- meson.add_install_script(updateiconcache.path(), '-t', '-f', get_option('prefix') / hicolordir /
'scalable')
- meson.add_install_script(updateiconcache.path(), '-t', '-f', get_option('prefix') / hicolordir /
'symbolic')
-endif
+gnome.post_install(
+ glib_compile_schemas: true,
+ gtk_update_icon_cache: true,
+)
# Make D-Bus activatable
service_conf = configuration_data()
diff --git a/meson.build b/meson.build
index be16c59..27e3b29 100644
--- a/meson.build
+++ b/meson.build
@@ -5,7 +5,7 @@ project ('gnome-mahjongg', ['vala', 'c'],
'warning_level=1',
'buildtype=debugoptimized',
],
- meson_version: '>= 0.49.0')
+ meson_version: '>= 0.57.0')
gnome = import ('gnome')
i18n = import ('i18n')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]