summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLogan Rathbone <poprocks@gmail.com>2023-01-03 16:51:18 +0000
committerLogan Rathbone <poprocks@gmail.com>2023-01-03 16:51:18 +0000
commit41f51c2b872409b4dfae2938bfb5c5c3ee065f1b (patch)
treedd987a74ff9a165a4f642b0aa0476ecc991db505
parentdocs: Fix incorrect markup (diff)
parentbuild: Use GNOME module post_install() (diff)
downloadzenity-41f51c2b872409b4dfae2938bfb5c5c3ee065f1b.tar.gz
zenity-41f51c2b872409b4dfae2938bfb5c5c3ee065f1b.tar.bz2
zenity-41f51c2b872409b4dfae2938bfb5c5c3ee065f1b.zip
Merge branch 'use-gnome.post_install' into 'master'
build: Use GNOME module post_install() See merge request GNOME/zenity!20
-rw-r--r--meson.build6
-rw-r--r--meson_post_install.py15
2 files changed, 4 insertions, 17 deletions
diff --git a/meson.build b/meson.build
index a17f9fdf..7c993e09 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
project('zenity', 'c',
version: '3.43.0',
- meson_version: '>=0.53.0',
+ meson_version: '>=0.57.0',
license: 'LGPL-2.1-or-later'
)
@@ -110,4 +110,6 @@ subdir('data')
subdir('po')
subdir('help')
-meson.add_install_script('meson_post_install.py')
+gnome.post_install(
+ gtk_update_icon_cache: true,
+)
diff --git a/meson_post_install.py b/meson_post_install.py
deleted file mode 100644
index 2654e49d..00000000
--- a/meson_post_install.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import subprocess
-
-prefix = os.environ.get('MESON_INSTALL_PREFIX', '/usr/local')
-datadir = os.path.join(prefix, 'share')
-
-# Packaging tools define DESTDIR and this isn't needed for them
-if 'DESTDIR' not in os.environ:
- print('Updating icon cache...')
- icon_cache_dir = os.path.join(datadir, 'icons', 'hicolor')
- if not os.path.exists(icon_cache_dir):
- os.makedirs(icon_cache_dir)
- subprocess.call(['gtk-update-icon-cache', '-qtf', icon_cache_dir])
bgstack15