From 97fa28e955097c7703809b3e56ebf59c89f75b16 Mon Sep 17 00:00:00 2001 From: Rhonda D'Vine Date: Fri, 12 Nov 2021 12:23:11 +0100 Subject: [PATCH] Revert "Fix FTBFS with clang (Closes: #756536)" This reverts commit 4608c09338cbda50a6076ae82e1d20849656775e. --- debian/changelog | 5 ----- debian/patches/clang-ftbfs.diff | 11 ----------- debian/patches/series | 1 - 3 files changed, 17 deletions(-) delete mode 100644 debian/patches/clang-ftbfs.diff diff --git a/debian/changelog b/debian/changelog index 5be8716..a8fb87c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,11 +7,6 @@ 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 - [ Rhonda D'Vine ] * Bump debhelper-compat to 13. diff --git a/debian/patches/clang-ftbfs.diff b/debian/patches/clang-ftbfs.diff deleted file mode 100644 index 262e99c..0000000 --- a/debian/patches/clang-ftbfs.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 9d52638..c8c0863 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 859407.diff fix_spelling_error_in_binary.diff -clang-ftbfs.diff -- 2.39.2