Merge branch 'wip/hadess/gtk-doc-meson-regression' into 'master'

build: Fix build with newer meson

See merge request libfprint/libfprint!9
This commit is contained in:
Bastien Nocera 2018-07-20 10:36:28 +00:00
commit 9843c2d764
2 changed files with 1 additions and 2 deletions

View file

@ -8,7 +8,7 @@ variables:
before_script: before_script:
- dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES && rpm -Uvh --oldpackage https://kojipkgs.fedoraproject.org//packages/meson/0.46.1/2.fc29/noarch/meson-0.46.1-2.fc29.noarch.rpm - dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES
build: build:

View file

@ -54,7 +54,6 @@ gnome.gtkdoc('libfprint',
content_files: content_files, content_files: content_files,
expand_content_files: expand_content_files, expand_content_files: expand_content_files,
scan_args: [ scan_args: [
'--rebuild-types',
'--ignore-decorators=API_EXPORTED', '--ignore-decorators=API_EXPORTED',
'--ignore-headers=' + ' '.join(private_headers), '--ignore-headers=' + ' '.join(private_headers),
], ],