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

[Gaetan Bisson]

    Date: Monday, November 11, 2013 @ 02:52:46
  Author: bisson
Revision: 199322

improve vcard patch as suggested by upstream

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

-------------+
 PKGBUILD    |    4 ++--
 vcard.patch |   23 +++++++++++++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-10 20:21:49 UTC (rev 199321)
+++ PKGBUILD	2013-11-11 01:52:46 UTC (rev 199322)
@@ -5,7 +5,7 @@
 # Contributor: damir <damir at archlinux.org>
 
 pkgname=abook
-pkgver=0.6.0pre2.20130928
+pkgver=0.6.0pre2.20131110
 pkgrel=1
 pkgdesc='Text-based addressbook designed for use with Mutt'
 url='http://abook.sourceforge.net/'
@@ -16,7 +16,7 @@
 source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68"
         'vcard.patch')
 sha1sums=('SKIP'
-          'ac71e84812c5d57cb8ddaf5b03b7c25cbdf4c3db')
+          '7f58e32814510ae491fadaa9f06d787ccd2ecfcd')
 
 prepare() {
 	cd "${srcdir}/${pkgname}"

Modified: vcard.patch
===================================================================
--- vcard.patch	2013-11-10 20:21:49 UTC (rev 199321)
+++ vcard.patch	2013-11-11 01:52:46 UTC (rev 199322)
@@ -1,7 +1,18 @@
-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 @@
+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, ";")));
  
@@ -10,7 +21,7 @@
  }
  
  static void
-@@ -2052,6 +2052,13 @@
+@@ -2052,6 +2053,13 @@
  
  	free(name);
  
@@ -18,7 +29,7 @@
 +	  fprintf(out, "NICKNAME:%s\r\n",
 +		  safe_str(db_fget(item, NICK)));
 +	if(db_fget(item, ANNIVERSARY))
-+	  fprintf(out, "BIRTHDAY:%s\r\n",
++	  fprintf(out, "BDAY:%s\r\n",
 +		  safe_str(db_fget(item, ANNIVERSARY)));
 +
  	// see rfc6350 section 6.3.1