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

[Gaetan Bisson]

    Date: Sunday, September 29, 2013 @ 06:45:26
  Author: bisson
Revision: 195247

fix vcard issues

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

-------------+
 PKGBUILD    |   13 ++++++++++---
 vcard.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-29 04:15:46 UTC (rev 195246)
+++ PKGBUILD	2013-09-29 04:45:26 UTC (rev 195247)
@@ -5,7 +5,7 @@
 # Contributor: damir <damir at archlinux.org>
 
 pkgname=abook
-pkgver=0.6.0pre2.20130724
+pkgver=0.6.0pre2.20130928
 pkgrel=1
 pkgdesc='Text-based addressbook designed for use with Mutt'
 url='http://abook.sourceforge.net/'
@@ -13,9 +13,16 @@
 license=('GPL2')
 makedepends=('git')
 depends=('readline')
-source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68")
-sha1sums=('SKIP')
+source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68"
+        'vcard.patch')
+sha1sums=('SKIP'
+          'ac71e84812c5d57cb8ddaf5b03b7c25cbdf4c3db')
 
+prepare() {
+	cd "${srcdir}/${pkgname}"
+	patch -p1 -i ../vcard.patch
+}
+
 build() {
 	cd "${srcdir}/${pkgname}"
 	./configure --prefix=/usr --mandir=/usr/share/man

Added: vcard.patch
===================================================================
--- vcard.patch	                        (rev 0)
+++ vcard.patch	2013-09-29 04:45:26 UTC (rev 195247)
@@ -0,0 +1,26 @@
+diff -Naur old/filter.c new/filter.c
+--- old/filter.c	2013-08-22 20:49:06.229337260 -1000
++++ new/filter.c	2013-08-22 20:49:13.552700987 -1000
+@@ -1673,7 +1673,7 @@
+ 	// vCard(the country name)
+ 	item_fput(item, COUNTRY, xstrdup(strsep(&value, ";")));
+ 
+-	if(*value) xfree(value);
++	if(value) xfree(value);
+ }
+ 
+ static void
+@@ -2052,6 +2052,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, "BIRTHDAY:%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",