diff --git a/build-aux/meson/postinstall.py b/build-aux/meson/postinstall.py index 6a3ea97..cfa1e2d 100755 --- a/build-aux/meson/postinstall.py +++ b/build-aux/meson/postinstall.py @@ -9,13 +9,6 @@ destdir = environ.get('DESTDIR', '') # Package managers set this so we don't need to run if not destdir: - print('Updating icon cache...') - call(['gtk-update-icon-cache', '-qtf', path.join(datadir, 'icons', 'hicolor')]) - print('Updating desktop database...') call(['update-desktop-database', '-q', path.join(datadir, 'applications')]) - print('Compiling GSettings schemas...') - call(['glib-compile-schemas', path.join(datadir, 'glib-2.0', 'schemas')]) - - diff --git a/meson.build b/meson.build index 5623ddf..0b6195d 100644 --- a/meson.build +++ b/meson.build @@ -1,12 +1,13 @@ project('koto', 'c', version: '0.1.0', - meson_version: '>= 0.50.0', + meson_version: '>= 0.57.0', default_options: [ 'warning_level=2', 'c_std=gnu11', ], ) i18n = import('i18n') +gnome = import('gnome') config_h = configuration_data() config_h.set_quoted('PACKAGE_VERSION', meson.project_version()) @@ -17,11 +18,15 @@ configure_file( configuration: config_h, ) add_project_arguments([ - '-I' + meson.build_root(), + '-I' + meson.current_build_dir(), ], language: 'c') subdir('data') subdir('src') subdir('po') +gnome.post_install( + glib_compile_schemas: true, + gtk_update_icon_cache: true +) meson.add_install_script('build-aux/meson/postinstall.py') diff --git a/src/koto-window.h b/src/koto-window.h index bab11e8..e6aa68c 100644 --- a/src/koto-window.h +++ b/src/koto-window.h @@ -17,7 +17,7 @@ #pragma once -#include +#include G_BEGIN_DECLS