[arch-commits] Commit in abook/trunk (PKGBUILD gcc5.patch)

[Evangelos Foutras]

    Date: Monday, September 7, 2015 @ 19:20:42
  Author: foutrelis
Revision: 245472

Fix build with GCC 5

Added:
  abook/trunk/gcc5.patch
Modified:
  abook/trunk/PKGBUILD

------------+
 PKGBUILD   |    3 +++
 gcc5.patch |   24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-07 16:12:59 UTC (rev 245471)
+++ PKGBUILD	2015-09-07 17:20:42 UTC (rev 245472)
@@ -14,12 +14,15 @@
 makedepends=('git')
 depends=('readline')
 source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68"
+        'gcc5.patch'
         'vcard.patch')
 sha1sums=('SKIP'
+          '5620fcf2442a4ecbf0cfef1515d936307378e307'
           '7f58e32814510ae491fadaa9f06d787ccd2ecfcd')
 
 prepare() {
 	cd "${srcdir}/${pkgname}"
+	patch -p1 -i ../gcc5.patch
 	patch -p1 -i ../vcard.patch
 }
 

Added: gcc5.patch
===================================================================
--- gcc5.patch	                        (rev 0)
+++ gcc5.patch	2015-09-07 17:20:42 UTC (rev 245472)
@@ -0,0 +1,24 @@
+diff -up abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1/database.c.gcc5 abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1/database.c
+--- abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1/database.c.gcc5	2014-11-28 16:29:52.000000000 +0100
++++ abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1/database.c	2015-02-11 16:02:15.837789303 +0100
+@@ -859,7 +859,7 @@ item_merge(list_item dest, list_item src
+  */
+ 
+ /* quick lookup by "standard" field number */
+-inline int
++extern inline int
+ field_id(int i)
+ {
+ 	assert((i >= 0) && (i < ITEM_FIELDS));
+diff -up abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1/database.h.gcc5 abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1/database.h
+--- abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1/database.h.gcc5	2014-11-28 16:29:52.000000000 +0100
++++ abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1/database.h	2015-02-11 16:02:23.465818915 +0100
+@@ -61,7 +61,7 @@ struct db_enumerator {
+ /*
+  * Field operations
+  */
+-inline int field_id(int i);
++extern 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)