[pkgsrc/trunk]: pkgsrc/mail/evolution-data-server Fix conflict between implem...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/298c754ed827
branches:  trunk
changeset: 358293:298c754ed827
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Feb 09 00:19:15 2017 +0000

description:
Fix conflict between implementation and prototype.

diffstat:

 mail/evolution-data-server/distinfo                                                   |   3 +-
 mail/evolution-data-server/patches/patch-camel_providers_imapx_camel-imapx-tokens.txt |  13 ++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diffs (34 lines):

diff -r d5a84bc009bc -r 298c754ed827 mail/evolution-data-server/distinfo
--- a/mail/evolution-data-server/distinfo       Thu Feb 09 00:18:36 2017 +0000
+++ b/mail/evolution-data-server/distinfo       Thu Feb 09 00:19:15 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.85 2016/01/31 07:01:55 richard Exp $
+$NetBSD: distinfo,v 1.86 2017/02/09 00:19:15 joerg Exp $
 
 SHA1 (evolution-data-server-2.32.3.tar.bz2) = cbf32c3438c4f1650b35b87007a337ebc1c56cec
 RMD160 (evolution-data-server-2.32.3.tar.bz2) = adc8b07aef41a89d16fc426541c12190a3688b8f
@@ -13,6 +13,7 @@
 SHA1 (patch-calendar_libecal_e-cal.c) = 0478b795b298bbab23db39f7a63bd3529691dd95
 SHA1 (patch-calendar_libedata-cal_e-cal-backend-intervaltree.c) = af78b5854666325a9dd1229702968c093805ec03
 SHA1 (patch-calendar_libegdbus_Makefile.in) = ac5aabae5160967c498f12c0f29be3e206e03622
+SHA1 (patch-camel_providers_imapx_camel-imapx-tokens.txt) = 8a62d2064d9bda5f9f79eb9473e71734560c3983
 SHA1 (patch-cc) = a59bbc664a96f467888cae89cb00eb9a9033a925
 SHA1 (patch-cd) = 6e366e65e68cd0c5a8eafa67c7f9152c6521de12
 SHA1 (patch-ce) = 1da2a3773ff89319bc79bbb7375e8259f0be89e4
diff -r d5a84bc009bc -r 298c754ed827 mail/evolution-data-server/patches/patch-camel_providers_imapx_camel-imapx-tokens.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/evolution-data-server/patches/patch-camel_providers_imapx_camel-imapx-tokens.txt     Thu Feb 09 00:19:15 2017 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-camel_providers_imapx_camel-imapx-tokens.txt,v 1.1 2017/02/09 00:19:15 joerg Exp $
+
+--- camel/providers/imapx/camel-imapx-tokens.txt.orig  2017-02-08 22:29:05.083115118 +0000
++++ camel/providers/imapx/camel-imapx-tokens.txt
+@@ -1,7 +1,7 @@
+ /* This contains all of the keywords we care about.  These
+    can be converted to an id very efficiently */
+ struct _imapx_keyword {const gchar *name; camel_imapx_id_t id; };
+-struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register unsigned int len);
++struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register size_t len);
+ %%
+ ALERT,          IMAPX_ALERT
+ APPENDUID,    IMAPX_APPENDUID