Date: Monday, September 7, 2015 @ 21:56:38
Author: foutrelis
Revision: 245502
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
abook/repos/staging-i686/
abook/repos/staging-i686/PKGBUILD
(from rev 245501, abook/trunk/PKGBUILD)
abook/repos/staging-i686/gcc5.patch
(from rev 245501, abook/trunk/gcc5.patch)
abook/repos/staging-i686/vcard.patch
(from rev 245501, abook/trunk/vcard.patch)
abook/repos/staging-x86_64/
abook/repos/staging-x86_64/PKGBUILD
(from rev 245501, abook/trunk/PKGBUILD)
abook/repos/staging-x86_64/gcc5.patch
(from rev 245501, abook/trunk/gcc5.patch)
abook/repos/staging-x86_64/vcard.patch
(from rev 245501, abook/trunk/vcard.patch)
----------------------------+
staging-i686/PKGBUILD | 39 +++++++++++++++++++++++++++++++++++++++
staging-i686/gcc5.patch | 24 ++++++++++++++++++++++++
staging-i686/vcard.patch | 37 +++++++++++++++++++++++++++++++++++++
staging-x86_64/PKGBUILD | 39 +++++++++++++++++++++++++++++++++++++++
staging-x86_64/gcc5.patch | 24 ++++++++++++++++++++++++
staging-x86_64/vcard.patch | 37 +++++++++++++++++++++++++++++++++++++
6 files changed, 200 insertions(+)
Copied: abook/repos/staging-i686/PKGBUILD (from rev 245501,
abook/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-09-07 19:56:38 UTC (rev 245502)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Gaetan Bisson <[email protected]>
+# Contributor: Daniel J Griffiths <[email protected]>
+# Contributor: Thayer Williams <[email protected]>
+# Contributor: damir <[email protected]>
+
+pkgname=abook
+pkgver=0.6.0pre2.20131110
+pkgrel=2
+pkgdesc='Text-based addressbook designed for use with Mutt'
+url='http://abook.sourceforge.net/'
+arch=('i686' 'x86_64')
+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')
+
+prepare() {
+ cd "${srcdir}/${pkgname}"
+ patch -p1 -i ../gcc5.patch
+ patch -p1 -i ../vcard.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}"
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+ cd po && make update-po
+}
+
+package() {
+ cd "${srcdir}/${pkgname}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: abook/repos/staging-i686/gcc5.patch (from rev 245501,
abook/trunk/gcc5.patch)
===================================================================
--- staging-i686/gcc5.patch (rev 0)
+++ staging-i686/gcc5.patch 2015-09-07 19:56:38 UTC (rev 245502)
@@ -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)
Copied: abook/repos/staging-i686/vcard.patch (from rev 245501,
abook/trunk/vcard.patch)
===================================================================
--- staging-i686/vcard.patch (rev 0)
+++ staging-i686/vcard.patch 2015-09-07 19:56:38 UTC (rev 245502)
@@ -0,0 +1,37 @@
+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",
Copied: abook/repos/staging-x86_64/PKGBUILD (from rev 245501,
abook/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-09-07 19:56:38 UTC (rev 245502)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Gaetan Bisson <[email protected]>
+# Contributor: Daniel J Griffiths <[email protected]>
+# Contributor: Thayer Williams <[email protected]>
+# Contributor: damir <[email protected]>
+
+pkgname=abook
+pkgver=0.6.0pre2.20131110
+pkgrel=2
+pkgdesc='Text-based addressbook designed for use with Mutt'
+url='http://abook.sourceforge.net/'
+arch=('i686' 'x86_64')
+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')
+
+prepare() {
+ cd "${srcdir}/${pkgname}"
+ patch -p1 -i ../gcc5.patch
+ patch -p1 -i ../vcard.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}"
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+ cd po && make update-po
+}
+
+package() {
+ cd "${srcdir}/${pkgname}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: abook/repos/staging-x86_64/gcc5.patch (from rev 245501,
abook/trunk/gcc5.patch)
===================================================================
--- staging-x86_64/gcc5.patch (rev 0)
+++ staging-x86_64/gcc5.patch 2015-09-07 19:56:38 UTC (rev 245502)
@@ -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)
Copied: abook/repos/staging-x86_64/vcard.patch (from rev 245501,
abook/trunk/vcard.patch)
===================================================================
--- staging-x86_64/vcard.patch (rev 0)
+++ staging-x86_64/vcard.patch 2015-09-07 19:56:38 UTC (rev 245502)
@@ -0,0 +1,37 @@
+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",
