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

[Gaetan Bisson]

    Date: Friday, April 15, 2016 @ 05:39:19
  Author: bisson
Revision: 264978

upstream update

Modified:
  abook/trunk/PKGBUILD
Deleted:
  abook/trunk/vcard.patch

-------------+
 PKGBUILD    |   24 ++++++++++++------------
 vcard.patch |   37 -------------------------------------
 2 files changed, 12 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-15 02:28:55 UTC (rev 264977)
+++ PKGBUILD	2016-04-15 03:39:19 UTC (rev 264978)
@@ -5,8 +5,8 @@
 # Contributor: damir <damir at archlinux.org>
 
 pkgname=abook
-pkgver=0.6.0pre2.20131110
-pkgrel=2
+pkgver=0.6.1
+pkgrel=1
 pkgdesc='Text-based addressbook designed for use with Mutt'
 url='http://abook.sourceforge.net/'
 arch=('i686' 'x86_64')
@@ -13,21 +13,21 @@
 license=('GPL2')
 makedepends=('git')
 depends=('readline')
-source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68"
-        'gcc5.patch'
-        'vcard.patch')
-sha1sums=('SKIP'
-          '5620fcf2442a4ecbf0cfef1515d936307378e307'
-          '7f58e32814510ae491fadaa9f06d787ccd2ecfcd')
+validpgpkeys=('3552E46F58F5FEC69A2CD85A5B4E2D0DD7F62B21')
+source=("http://abook.sourceforge.net/devel/${pkgname}-${pkgver}.tar.gz"{,.asc}
+        'gcc5.patch')
+sha1sums=('f404b31bd3134969fdc8b40a34b50dd35299e9c7' 'SKIP'
+          '5620fcf2442a4ecbf0cfef1515d936307378e307')
 
 prepare() {
-	cd "${srcdir}/${pkgname}"
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	aclocal && automake --add-missing && autoconf
+	sed 's/0.18/0.19/g' -i po/Makefile.in.in
 	patch -p1 -i ../gcc5.patch
-	patch -p1 -i ../vcard.patch
 }
 
 build() {
-	cd "${srcdir}/${pkgname}"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --prefix=/usr --mandir=/usr/share/man
 	make
 	cd po && make update-po
@@ -34,6 +34,6 @@
 }
 
 package() {
-	cd "${srcdir}/${pkgname}"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 }

Deleted: vcard.patch
===================================================================
--- vcard.patch	2016-04-15 02:28:55 UTC (rev 264977)
+++ vcard.patch	2016-04-15 03:39:19 UTC (rev 264978)
@@ -1,37 +0,0 @@
-diff -aur old/filter.c new/filter.c
---- old/filter.c	2013-10-10 16:04:46.230433845 -1000
-+++ new/filter.c	2013-10-10 16:40:07.014569795 -1000
-@@ -1557,8 +1557,9 @@
- 	"NICKNAME",		/* NICK */
- 	"URL",			/* URL */
- 	"NOTE",			/* NOTES */
-+	"BDAY",			/* ANNIVERSARY */
- 	"N",			/* NAME: special case/mapping in vcard_parse_line() */
--	NULL			/* not implemented: ANNIVERSARY, ITEM_FIELDS */
-+	NULL			/* not implemented: ITEM_FIELDS */
- };
- 
- enum {
-@@ -1673,7 +1674,7 @@
- 	// vCard(the country name)
- 	item_fput(item, COUNTRY, xstrdup(strsep(&value, ";")));
- 
--	if(*value) xfree(value);
-+	if(value) xfree(value);
- }
- 
- static void
-@@ -2052,6 +2053,13 @@
- 
- 	free(name);
- 
-+	if(db_fget(item, NICK))
-+	  fprintf(out, "NICKNAME:%s\r\n",
-+		  safe_str(db_fget(item, NICK)));
-+	if(db_fget(item, ANNIVERSARY))
-+	  fprintf(out, "BDAY:%s\r\n",
-+		  safe_str(db_fget(item, ANNIVERSARY)));
-+
- 	// see rfc6350 section 6.3.1
- 	if(db_fget(item, ADDRESS)) {
- 		fprintf(out, "ADR:;%s;%s;%s;%s;%s;%s\r\n",