Fix FTBFS with clang

diff --git a/debian/changelog b/debian/changelog
index 434bcd960eb978d6d7558e69e426b035031e5fc0..25752b218ad1663b34bc34e5b0a652c8e15de4f0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 abook (0.6.0~pre2-4) unstable; urgency=low
 
+  [ Rhonda D'Vine ]
   * Add -std=gnu89 to CFLAGS as suggested by Martin Michlmayr to fix FTBFS
     with gcc-5, thanks (closes: #777764)
 
+  [ Arthur Marble ]
+  * Fix FTBFS with clang (closes: #756536)
+    - Fixed undefined reference error
+      changed inline int field_id to int field_id
+
  -- 
 
 abook (0.6.0~pre2-3) unstable; urgency=low

diff --git a/debian/patches/04_clang-ftbfs b/debian/patches/04_clang-ftbfs
new file mode 100644 (file)
index 0000000..9839737
--- /dev/null
+++ b/debian/patches/04_clang-ftbfs
@@ -0,0 +1,18 @@
+Author: Arthur Marble <arthur@info9.net>       vim:ft=diff:
+Description: Fix FTBFS with clang
+   - Fixed undefined reference error
+     changed inline int field_id to int field_id
+
+Index: VCS/database.h
+===================================================================
+--- VCS.orig/database.h        2015-06-30 19:54:40.542707520 +0200
++++ VCS/database.h     2015-06-30 19:54:40.542707520 +0200
+@@ -60,7 +60,7 @@
+ /*
+  * 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 c89c5aea5686724458af0f872b94c50cf20b1daf..886a3e511ba988b75f1bdcc1aa623293cb715666 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 02_fix-manpage
 03_datafile-f-switch
+04_clang-ftbfs