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

2016-04-14 Thread 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
===
--- PKGBUILD2016-04-15 02:28:55 UTC (rev 264977)
+++ PKGBUILD2016-04-15 03:39:19 UTC (rev 264978)
@@ -5,8 +5,8 @@
 # Contributor: damir 
 
 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(, ";")));
- 
--  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",

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

2013-11-10 Thread 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
===
--- PKGBUILD2013-11-10 20:21:49 UTC (rev 199321)
+++ PKGBUILD2013-11-11 01:52:46 UTC (rev 199322)
@@ -5,7 +5,7 @@
 # Contributor: damir da...@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

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

2013-09-28 Thread 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
===
--- PKGBUILD2013-09-29 04:15:46 UTC (rev 195246)
+++ PKGBUILD2013-09-29 04:45:26 UTC (rev 195247)
@@ -5,7 +5,7 @@
 # Contributor: damir da...@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,