From b6c6f5c165fc22a0efac852bdc8db0ee10fe20a1 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gmail.com>
Date: Tue, 23 Aug 2022 21:20:25 -0400
Subject: [PATCH] build: Use GNOME module post_install()

---
 build-aux/meson.build                 |  1 -
 build-aux/meson/meson_post_install.py | 15 ---------------
 meson.build                           |  8 ++++++--
 3 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 build-aux/meson.build
 delete mode 100644 build-aux/meson/meson_post_install.py

diff --git a/build-aux/meson.build b/build-aux/meson.build
deleted file mode 100644
index 1b429060d..000000000
--- a/build-aux/meson.build
+++ /dev/null
@@ -1 +0,0 @@
-meson.add_install_script('meson/meson_post_install.py', control_center_datadir)
diff --git a/build-aux/meson/meson_post_install.py b/build-aux/meson/meson_post_install.py
deleted file mode 100644
index f9119e1a7..000000000
--- a/build-aux/meson/meson_post_install.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import subprocess
-import sys
-
-gsettingsschemadir = os.path.join(sys.argv[1], 'glib-2.0', 'schemas')
-icondir = os.path.join(sys.argv[1], 'icons', 'hicolor')
-
-if not os.environ.get('DESTDIR'):
-    print('Compiling gsettings schemas...')
-    subprocess.call(['glib-compile-schemas', gsettingsschemadir])
-
-    print('Update icon cache...')
-    subprocess.call(['gtk-update-icon-cache', '-f', '-t', icondir])
diff --git a/meson.build b/meson.build
index 6a6cdf7d7..03e52be3e 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@ project(
   'gnome-control-center', 'c',
         version : '43.beta',
         license : 'GPL2+',
-  meson_version : '>= 0.53.0'
+  meson_version : '>= 0.57.0'
 )
 
 control_center_prefix = get_option('prefix')
@@ -281,7 +281,6 @@ install_subdir(
 top_inc = include_directories('.')
 shell_inc = include_directories('shell')
 
-subdir('build-aux')
 subdir('data/icons')
 subdir('po')
 subdir('panels')
@@ -296,6 +295,11 @@ if get_option('documentation')
   subdir('man')
 endif
 
+gnome.post_install(
+  glib_compile_schemas: true,
+  gtk_update_icon_cache: true,
+)
+
 configure_file(
   output: 'config.h',
   configuration: config_h
-- 
GitLab