build: Fix build with meson >= 47.0

With meson >= 47.0, building gnome-shell will fail
when --rebuild-types is used as an option for gtk-doc,
so stop using that option and bump the meson requirement.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191
This commit is contained in:
Pascal Nowack 2018-08-06 14:21:02 +02:00
parent afe5703710
commit 9f4aa6ebf2
3 changed files with 3 additions and 5 deletions

View File

@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
join_paths(meson.build_root(), 'src')
],
scan_args: [
'--ignore-headers=' + ' '.join(private_headers + exclude_directories),
'--rebuild-types'
'--ignore-headers=' + ' '.join(private_headers + exclude_directories)
],
install: true
)

View File

@ -17,8 +17,7 @@ gnome.gtkdoc('st',
],
scan_args: [
'--ignore-headers=' + ' '.join(private_headers),
'--rebuild-sections',
'--rebuild-types'
'--rebuild-sections'
],
install: true
)

View File

@ -1,6 +1,6 @@
project('gnome-shell', 'c',
version: '3.29.90',
meson_version: '>= 0.42.0',
meson_version: '>= 0.47.0',
license: 'GPLv2+'
)