brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Fix build with meson >= 47.0

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/reference/shell/meson.build
View File

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

3
docs/reference/st/meson.build
View File

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

2
meson.build
View File

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