From: Rhonda D'Vine Date: Thu, 4 Nov 2021 10:18:00 +0000 (+0100) Subject: Fix FTBFS with clang (Closes: #756536) X-Git-Tag: debian/0.6.1-2~10 X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=4608c09338cbda50a6076ae82e1d20849656775e;p=pkg%2Fabook.git Fix FTBFS with clang (Closes: #756536) --- diff --git a/debian/changelog b/debian/changelog index a477bfd..3e06926 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,11 @@ abook (0.6.1-2) unstable; urgency=low [ Bastian Germann ] * Complete debian/copyright (Closes: #995843, #979098) + [ Arthur Marble ] + * Fix FTBFS with clang (Closes: #756536) + - Fixed undefined reference error + changed inline int field_id to int field_id + -- Denis Briand Sat, 05 Aug 2017 01:49:29 +0200 abook (0.6.1-1) unstable; urgency=medium diff --git a/debian/patches/clang-ftbfs.diff b/debian/patches/clang-ftbfs.diff new file mode 100644 index 0000000..262e99c --- /dev/null +++ b/debian/patches/clang-ftbfs.diff @@ -0,0 +1,11 @@ +--- a/database.h ++++ b/database.h +@@ -60,7 +60,7 @@ struct db_enumerator { + /* + * Field operations + */ +-inline int field_id(int i); ++static inline int field_id(int i); + abook_field *find_standard_field(char *key, int do_declare); + abook_field *real_find_field(char *key, abook_field_list *list, int *nb); + #define find_field(key, list) real_find_field(key, list, NULL) diff --git a/debian/patches/series b/debian/patches/series index c8c0863..9d52638 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 859407.diff fix_spelling_error_in_binary.diff +clang-ftbfs.diff