[gnome-disk-utility] meson: Use gnome.post_install
- From: Kai Lüke <kailueke src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility] meson: Use gnome.post_install
- Date: Fri, 18 Mar 2022 21:00:26 +0000 (UTC)
commit c2909d6a9eb86b0c994c31972258695dba92a9cd
Author: Maximiliano Sandoval R <msandova gnome org>
Date: Thu Mar 3 00:05:18 2022 +0100
meson: Use gnome.post_install
.gitlab-ci.yml | 2 +-
data/meson.build | 2 +-
meson.build | 16 +++++-----------
meson_post_install.py | 15 ---------------
4 files changed, 7 insertions(+), 28 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c86ae768..28f105d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ variables:
libnotify-devel libsecret-devel libpwquality-devel
libudisks2-devel xz-devel systemd-devel meson gcc
glibc-devel libhandy1-devel gettext git gobject-introspection-devel
- vala
+ vala desktop-file-utils
OPTIONS: -Dman=false
flatpak:
diff --git a/data/meson.build b/data/meson.build
index 38fb5207..b63cb888 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -31,7 +31,7 @@ configure_file(
install_data(
'org.gnome.Disks.gschema.xml',
- install_dir: gio_schemasdir,
+ install_dir: join_paths(gdu_datadir, 'glib-2.0', 'schemas')
)
info = 'org.gnome.DiskUtility.appdata.xml'
diff --git a/meson.build b/meson.build
index 0daf7f82..18a26583 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project(
version: '42.0',
license: 'GPL2.0',
default_options: 'buildtype=debugoptimized',
- meson_version: '>= 0.50.0',
+ meson_version: '>= 0.59.0',
)
gdu_name = meson.project_name()
@@ -83,12 +83,6 @@ udisk_dep = dependency('udisks2', version: '>= 2.7.6')
m_dep = cc.find_library('m')
-gio_schemasdir = dependency('gio-2.0').get_pkgconfig_variable(
- 'schemasdir',
- define_variable: ['datadir', gdu_prefix / gdu_datadir],
- default: gdu_prefix / gdu_datadir / 'glib-2.0/schemas',
-)
-
# *** Check for logind ***
logind = get_option('logind')
enable_logind = (logind != 'none')
@@ -121,10 +115,10 @@ configure_file(
configuration: config_h,
)
-meson.add_install_script(
- 'meson_post_install.py',
- gdu_datadir,
- gio_schemasdir,
+gnome.post_install(
+ gtk_update_icon_cache: true,
+ glib_compile_schemas: true,
+ update_desktop_database: true,
)
output = '\n gnome-disk-utility ' + gdu_version + '\n'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]