mirror of
https://gitlab.freedesktop.org/libfprint/libfprint.git
synced 2026-06-11 18:38:07 +00:00
d/p/fix_ftbfs_meson.patch: Fix FTBFS with newer meson
This commit is contained in:
Vendored
+2
-1
@@ -21,8 +21,9 @@ libfprint (1:0.8.1-1) UNRELEASED; urgency=medium
|
|||||||
is now deprecated
|
is now deprecated
|
||||||
* debian/rules: Simplify the installation of the udev rules file
|
* debian/rules: Simplify the installation of the udev rules file
|
||||||
* Ship the API doc in a new libfprint-doc package
|
* Ship the API doc in a new libfprint-doc package
|
||||||
|
* d/p/fix_ftbfs_meson.patch: Fix FTBFS with newer meson
|
||||||
|
|
||||||
-- Laurent Bigonville <bigon@debian.org> Mon, 16 Jul 2018 16:29:17 +0200
|
-- Laurent Bigonville <bigon@debian.org> Sun, 12 Aug 2018 17:41:03 +0200
|
||||||
|
|
||||||
libfprint (1:0.7.0-1) unstable; urgency=medium
|
libfprint (1:0.7.0-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
|||||||
Vendored
+33
@@ -0,0 +1,33 @@
|
|||||||
|
From c9abbec48a2c1db5a88a9fb60fc350514af3dcf2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Bastien Nocera <hadess@hadess.net>
|
||||||
|
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
|
||||||
|
|
||||||
Vendored
+1
@@ -1,4 +1,5 @@
|
|||||||
# Upstream backports
|
# Upstream backports
|
||||||
|
fix_ftbfs_meson.patch
|
||||||
|
|
||||||
# Debian specifics
|
# Debian specifics
|
||||||
kFreeBSD_FTBFS_add_ETIME_definition.patch
|
kFreeBSD_FTBFS_add_ETIME_definition.patch
|
||||||
|
|||||||
Reference in New Issue
Block a user