From 770a72f4469adae6060922175fe92dc9d7eec5f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sat, 19 Nov 2022 01:51:27 +0100 Subject: [PATCH] build: Replace custom post-install script Since meson 0.57, the gnome module includes a function we can use instead. https://gitlab.gnome.org/GNOME/mutter/-/issues/2518 Part-of: --- meson.build | 7 +++++-- meson/meson-postinstall.sh | 10 ---------- 2 files changed, 5 insertions(+), 12 deletions(-) delete mode 100755 meson/meson-postinstall.sh diff --git a/meson.build b/meson.build index 66a2eb796..6a310376e 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('mutter', 'c', version: '43.1', - meson_version: '>= 0.55.0', + meson_version: '>= 0.58.0', license: 'GPLv2+' ) @@ -640,7 +640,10 @@ if have_documentation subdir('doc/reference') endif -meson.add_install_script('meson/meson-postinstall.sh') +gnome.post_install( + glib_compile_schemas: true, +) + meson.add_dist_script('meson/check-version.py', meson.project_version(), 'NEWS') summary('prefix', prefix, section: 'Directories') diff --git a/meson/meson-postinstall.sh b/meson/meson-postinstall.sh deleted file mode 100755 index 4500dcb01..000000000 --- a/meson/meson-postinstall.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# Package managers set this so we don't need to run -if [ -z "$DESTDIR" ]; then - echo Compiling GSettings schemas... - glib-compile-schemas ${MESON_INSTALL_PREFIX}/share/glib-2.0/schemas - - echo Updating desktop database... - update-desktop-database -q ${MESON_INSTALL_PREFIX}/share/applications -fi