[arch-commits] Commit in abook/repos (3 files)

[Evangelos Foutras]

    Date: Saturday, May 16, 2020 @ 14:10:41
  Author: foutrelis
Revision: 384756

archrelease: copy trunk to staging-x86_64

Added:
  abook/repos/staging-x86_64/
  abook/repos/staging-x86_64/PKGBUILD
    (from rev 384755, abook/trunk/PKGBUILD)
  abook/repos/staging-x86_64/gcc5.patch
    (from rev 384755, abook/trunk/gcc5.patch)

------------+
 PKGBUILD   |   39 +++++++++++++++++++++++++++++++++++++++
 gcc5.patch |   24 ++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

Copied: abook/repos/staging-x86_64/PKGBUILD (from rev 384755, abook/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2020-05-16 14:10:41 UTC (rev 384756)
@@ -0,0 +1,39 @@
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Thayer Williams <thayer at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=abook
+pkgver=0.6.1
+pkgrel=6
+pkgdesc='Text-based addressbook designed for use with Mutt'
+url='http://abook.sourceforge.net/'
+arch=('x86_64')
+license=('GPL2')
+makedepends=('git')
+depends=('readline')
+validpgpkeys=('3552E46F58F5FEC69A2CD85A5B4E2D0DD7F62B21')
+source=("http://abook.sourceforge.net/devel/${pkgname}-${pkgver}.tar.gz"{,.asc}
+        'gcc5.patch')
+sha256sums=('f0a90df8694fb34685ecdd45d97db28b88046c15c95e7b0700596028bd8bc0f9'
+            'SKIP'
+            '1eb89bc9ec6d4baed8a44d1ac9a8fb57742423e0699f26f354e810dfc63052cb')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	aclocal && automake --add-missing && autoconf
+	sed 's/0.18/0.20/g' -i po/Makefile.in.in
+	patch -p1 -i ../gcc5.patch
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure --prefix=/usr --mandir=/usr/share/man
+	make
+	cd po && make update-po
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}

Copied: abook/repos/staging-x86_64/gcc5.patch (from rev 384755, abook/trunk/gcc5.patch)
===================================================================
--- staging-x86_64/gcc5.patch	                        (rev 0)
+++ staging-x86_64/gcc5.patch	2020-05-16 14:10:41 UTC (rev 384756)
@@ -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)