From 0ed8d4aafd09cd40808d0437ae2119eb9720e7a1 Mon Sep 17 00:00:00 2001 From: Laurent Bigonville Date: Sun, 12 Aug 2018 17:38:06 +0200 Subject: [PATCH] d/p/fix_ftbfs_meson.patch: Fix FTBFS with newer meson --- debian/changelog | 3 ++- debian/patches/fix_ftbfs_meson.patch | 33 ++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix_ftbfs_meson.patch diff --git a/debian/changelog b/debian/changelog index b0d66c74..0e2d4cec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,8 +21,9 @@ libfprint (1:0.8.1-1) UNRELEASED; urgency=medium is now deprecated * debian/rules: Simplify the installation of the udev rules file * Ship the API doc in a new libfprint-doc package + * d/p/fix_ftbfs_meson.patch: Fix FTBFS with newer meson - -- Laurent Bigonville Mon, 16 Jul 2018 16:29:17 +0200 + -- Laurent Bigonville Sun, 12 Aug 2018 17:41:03 +0200 libfprint (1:0.7.0-1) unstable; urgency=medium diff --git a/debian/patches/fix_ftbfs_meson.patch b/debian/patches/fix_ftbfs_meson.patch new file mode 100644 index 00000000..0fdb189c --- /dev/null +++ b/debian/patches/fix_ftbfs_meson.patch @@ -0,0 +1,33 @@ +From c9abbec48a2c1db5a88a9fb60fc350514af3dcf2 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Fri, 20 Jul 2018 12:22:50 +0200 +Subject: build: Fix build with newer meson + +The gtk-doc meson helper regressed in that it didn't expect the +libfprint.types file to not exist, as earlier versions did. Remove +the --rebuild-types call so that it is not generated, and meson carries +on compiling the rest of the library. + +See https://gitlab.gnome.org/GNOME/gtk-doc/issues/48 +See https://github.com/mesonbuild/meson/issues/3892 +See https://bugzilla.redhat.com/show_bug.cgi?id=1604585 +--- + .gitlab-ci.yml | 2 +- + doc/meson.build | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/doc/meson.build b/doc/meson.build +index 48358c8..c2c1b77 100644 +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -54,7 +54,6 @@ gnome.gtkdoc('libfprint', + content_files: content_files, + expand_content_files: expand_content_files, + scan_args: [ +- '--rebuild-types', + '--ignore-decorators=API_EXPORTED', + '--ignore-headers=' + ' '.join(private_headers), + ], +-- +cgit v1.1 + diff --git a/debian/patches/series b/debian/patches/series index 15f33bb4..4b37fc7b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,5 @@ # Upstream backports +fix_ftbfs_meson.patch # Debian specifics kFreeBSD_FTBFS_add_ETIME_definition.patch