Date: Friday, April 15, 2016 @ 05:39:57 Author: bisson Revision: 264979
archrelease: copy trunk to extra-i686, extra-x86_64 Added: abook/repos/extra-i686/PKGBUILD (from rev 264978, abook/trunk/PKGBUILD) abook/repos/extra-i686/gcc5.patch (from rev 264978, abook/trunk/gcc5.patch) abook/repos/extra-x86_64/PKGBUILD (from rev 264978, abook/trunk/PKGBUILD) abook/repos/extra-x86_64/gcc5.patch (from rev 264978, abook/trunk/gcc5.patch) Deleted: abook/repos/extra-i686/PKGBUILD abook/repos/extra-i686/gcc5.patch abook/repos/extra-i686/vcard.patch abook/repos/extra-x86_64/PKGBUILD abook/repos/extra-x86_64/gcc5.patch abook/repos/extra-x86_64/vcard.patch --------------------------+ /PKGBUILD | 78 +++++++++++++++++++++++++++++++++++++++++++++ /gcc5.patch | 48 +++++++++++++++++++++++++++ extra-i686/PKGBUILD | 39 ---------------------- extra-i686/gcc5.patch | 24 ------------- extra-i686/vcard.patch | 37 --------------------- extra-x86_64/PKGBUILD | 39 ---------------------- extra-x86_64/gcc5.patch | 24 ------------- extra-x86_64/vcard.patch | 37 --------------------- 8 files changed, 126 insertions(+), 200 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-04-15 03:39:19 UTC (rev 264978) +++ extra-i686/PKGBUILD 2016-04-15 03:39:57 UTC (rev 264979) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> -# Contributor: Thayer Williams <tha...@archlinux.org> -# Contributor: damir <da...@archlinux.org> - -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/extra-i686/PKGBUILD (from rev 264978, abook/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-04-15 03:39:57 UTC (rev 264979) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> +# Contributor: Thayer Williams <tha...@archlinux.org> +# Contributor: damir <da...@archlinux.org> + +pkgname=abook +pkgver=0.6.1 +pkgrel=1 +pkgdesc='Text-based addressbook designed for use with Mutt' +url='http://abook.sourceforge.net/' +arch=('i686' 'x86_64') +license=('GPL2') +makedepends=('git') +depends=('readline') +validpgpkeys=('3552E46F58F5FEC69A2CD85A5B4E2D0DD7F62B21') +source=("http://abook.sourceforge.net/devel/${pkgname}-${pkgver}.tar.gz"{,.asc} + 'gcc5.patch') +sha1sums=('f404b31bd3134969fdc8b40a34b50dd35299e9c7' 'SKIP' + '5620fcf2442a4ecbf0cfef1515d936307378e307') + +prepare() { + 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 +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man + make + cd po && make update-po +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Deleted: extra-i686/gcc5.patch =================================================================== --- extra-i686/gcc5.patch 2016-04-15 03:39:19 UTC (rev 264978) +++ extra-i686/gcc5.patch 2016-04-15 03:39:57 UTC (rev 264979) @@ -1,24 +0,0 @@ -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/extra-i686/gcc5.patch (from rev 264978, abook/trunk/gcc5.patch) =================================================================== --- extra-i686/gcc5.patch (rev 0) +++ extra-i686/gcc5.patch 2016-04-15 03:39:57 UTC (rev 264979) @@ -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) Deleted: extra-i686/vcard.patch =================================================================== --- extra-i686/vcard.patch 2016-04-15 03:39:19 UTC (rev 264978) +++ extra-i686/vcard.patch 2016-04-15 03:39:57 UTC (rev 264979) @@ -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", Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2016-04-15 03:39:19 UTC (rev 264978) +++ extra-x86_64/PKGBUILD 2016-04-15 03:39:57 UTC (rev 264979) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> -# Contributor: Thayer Williams <tha...@archlinux.org> -# Contributor: damir <da...@archlinux.org> - -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/extra-x86_64/PKGBUILD (from rev 264978, abook/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-04-15 03:39:57 UTC (rev 264979) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> +# Contributor: Thayer Williams <tha...@archlinux.org> +# Contributor: damir <da...@archlinux.org> + +pkgname=abook +pkgver=0.6.1 +pkgrel=1 +pkgdesc='Text-based addressbook designed for use with Mutt' +url='http://abook.sourceforge.net/' +arch=('i686' 'x86_64') +license=('GPL2') +makedepends=('git') +depends=('readline') +validpgpkeys=('3552E46F58F5FEC69A2CD85A5B4E2D0DD7F62B21') +source=("http://abook.sourceforge.net/devel/${pkgname}-${pkgver}.tar.gz"{,.asc} + 'gcc5.patch') +sha1sums=('f404b31bd3134969fdc8b40a34b50dd35299e9c7' 'SKIP' + '5620fcf2442a4ecbf0cfef1515d936307378e307') + +prepare() { + 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 +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man + make + cd po && make update-po +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Deleted: extra-x86_64/gcc5.patch =================================================================== --- extra-x86_64/gcc5.patch 2016-04-15 03:39:19 UTC (rev 264978) +++ extra-x86_64/gcc5.patch 2016-04-15 03:39:57 UTC (rev 264979) @@ -1,24 +0,0 @@ -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/extra-x86_64/gcc5.patch (from rev 264978, abook/trunk/gcc5.patch) =================================================================== --- extra-x86_64/gcc5.patch (rev 0) +++ extra-x86_64/gcc5.patch 2016-04-15 03:39:57 UTC (rev 264979) @@ -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) Deleted: extra-x86_64/vcard.patch =================================================================== --- extra-x86_64/vcard.patch 2016-04-15 03:39:19 UTC (rev 264978) +++ extra-x86_64/vcard.patch 2016-04-15 03:39:57 UTC (rev 264979) @@ -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",