ModernDesktopInitiative/koto
4
0
Fork 0
Code Issues 17 Pull requests Projects Releases Packages Wiki Activity Actions

Bump meson requirement to 0.57, drop most of postinstall for new gnome module functions

Browse source
This commit is contained in:
Joshua Strobl 2021-02-16 23:18:23 +02:00
parent 304c7635da
commit 8948a8ec9f
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
build-aux/meson/postinstall.py
View file

@ -9,13 +9,6 @@ destdir = environ.get('DESTDIR', '')
# Package managers set this so we don't need to run # Package managers set this so we don't need to run
if not destdir: if not destdir:
print('Updating icon cache...')
call(['gtk-update-icon-cache', '-qtf', path.join(datadir, 'icons', 'hicolor')])
print('Updating desktop database...') print('Updating desktop database...')
call(['update-desktop-database', '-q', path.join(datadir, 'applications')]) call(['update-desktop-database', '-q', path.join(datadir, 'applications')])
print('Compiling GSettings schemas...')
call(['glib-compile-schemas', path.join(datadir, 'glib-2.0', 'schemas')])

9
meson.build
View file

@ -1,12 +1,13 @@
project('koto', 'c', project('koto', 'c',
version: '0.1.0', version: '0.1.0',
meson_version: '>= 0.50.0', meson_version: '>= 0.57.0',
default_options: [ 'warning_level=2', default_options: [ 'warning_level=2',
'c_std=gnu11', 'c_std=gnu11',
], ],
) )
i18n = import('i18n') i18n = import('i18n')
gnome = import('gnome')
config_h = configuration_data() config_h = configuration_data()
config_h.set_quoted('PACKAGE_VERSION', meson.project_version()) config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
@ -17,11 +18,15 @@ configure_file(
configuration: config_h, configuration: config_h,
) )
add_project_arguments([ add_project_arguments([
'-I' + meson.build_root(), '-I' + meson.current_build_dir(),
], language: 'c') ], language: 'c')
subdir('data') subdir('data')
subdir('src') subdir('src')
subdir('po') subdir('po')
gnome.post_install(
glib_compile_schemas: true,
gtk_update_icon_cache: true
)
meson.add_install_script('build-aux/meson/postinstall.py') meson.add_install_script('build-aux/meson/postinstall.py')

2
src/koto-window.h
View file

@ -17,7 +17,7 @@
#pragma once #pragma once
#include <gtk/gtk.h> #include <gtk-3.0/gtk/gtk.h>
G_BEGIN_DECLS G_BEGIN_DECLS