libxls: Update to 1.5.0-rc2 and fix issues

[Sijmen J. Mulder <ik%sjmulder.nl@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Sijmen J. Mulder <ik%sjmulder.nl@localhost>
Pushed By:	sjmulder
Date:		Wed Feb 6 00:48:32 2019 +0100
Changeset:	1a93a980d469abe6ff3c56997cd5031cf2b43939

Modified Files:
	libxls/Makefile
	libxls/distinfo
Added Files:
	libxls/patches/patch-Makefile.in
	libxls/patches/patch-src_xlstool.c

Log Message:
libxls: Update to 1.5.0-rc2 and fix issues

 - Explicitly ignore fwrite return value to fix warning.
 - Support NetBSD's iconv() prototype to fix warning.
 - Remove -Werror, it's too fragile.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1a93a980d469abe6ff3c56997cd5031cf2b43939

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libxls/Makefile                    |  6 +++---
 libxls/distinfo                    | 10 ++++++----
 libxls/patches/patch-Makefile.in   | 22 ++++++++++++++++++++++
 libxls/patches/patch-src_xlstool.c | 26 ++++++++++++++++++++++++++
 4 files changed, 57 insertions(+), 7 deletions(-)

diffs:
diff --git a/libxls/Makefile b/libxls/Makefile
index 47b389f0f6..ef5b5cf812 100644
--- a/libxls/Makefile
+++ b/libxls/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD$
 
-DISTNAME=	libxls-1.5.0-rc1
-PKGNAME=	libxls-1.5.0rc1
+DISTNAME=	libxls-1.5.0-rc2
+PKGNAME=	libxls-1.5.0rc2
 CATEGORIES=	devel textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libxls/}
-GITHUB_RELEASE=	v1.5.0-rc1
+GITHUB_RELEASE=	v1.5.0-rc2
 
 MAINTAINER=	ik%sjmulder.nl@localhost
 HOMEPAGE=	https://github.com/libxls/libxls
diff --git a/libxls/distinfo b/libxls/distinfo
index 041ef2dd1d..2fdf80f2f7 100644
--- a/libxls/distinfo
+++ b/libxls/distinfo
@@ -1,6 +1,8 @@
 $NetBSD$
 
-SHA1 (libxls-1.5.0-rc1.tar.gz) = ab5a670a6aa0aa4900776a8b73f8f718dac7aefb
-RMD160 (libxls-1.5.0-rc1.tar.gz) = ac24250b357562956f38260aefa7e8d333f7fef2
-SHA512 (libxls-1.5.0-rc1.tar.gz) = d0c75ba60bc63ac9040f2085ba7392476890f4089ecce7b46c14717b64eb2250a4a125514dae52ecae265b84c18ead1d474fd539e54da03cdf543a9814a6dd00
-Size (libxls-1.5.0-rc1.tar.gz) = 409013 bytes
+SHA1 (libxls-1.5.0-rc2.tar.gz) = 8907c36364ef9689cfe2c5ee2e7a6cb187a4b3e3
+RMD160 (libxls-1.5.0-rc2.tar.gz) = 8075af2f59656be1de2ea75e49f84adb5d3cabc6
+SHA512 (libxls-1.5.0-rc2.tar.gz) = e7571afbeee1e15909e2d5a0ae339547bb30c5a3dffa25f52c94506ab352e4f1e6a96b14fae8e5f2043aed16cd77d948fb9a8792447144d28b044fc178560db9
+Size (libxls-1.5.0-rc2.tar.gz) = 408999 bytes
+SHA1 (patch-Makefile.in) = 76239d2f1aa4f0deae9192b4460eb32d0ca7feed
+SHA1 (patch-src_xlstool.c) = 395ab0144c1fb165326fbae2b3da9ac5d5e79764
diff --git a/libxls/patches/patch-Makefile.in b/libxls/patches/patch-Makefile.in
new file mode 100644
index 0000000000..1b12176eed
--- /dev/null
+++ b/libxls/patches/patch-Makefile.in
@@ -0,0 +1,22 @@
+Remove -Werror, it's too fragile.
+
+--- Makefile.in
++++ Makefile.in
+@@ -614,7 +614,7 @@
+ libxlsreader_la_LDFLAGS = -version-info $(VERSION_INFO) $(LIBXLS_LIBS) \
+ 	@EXTRA_LDFLAGS@ $(am__append_2)
+ libxlsreader_la_CFLAGS = -Wall -Wextra -Wstrict-prototypes \
+-	-Wno-unused-parameter -Werror -pedantic-errors $(am__append_1)
++	-Wno-unused-parameter -pedantic-errors $(am__append_1)
+ test_libxls_SOURCES = test/test.c
+ test_libxls_LDADD = libxlsreader.la
+ test2_libxls_SOURCES = test/test2.c
+@@ -624,7 +624,7 @@
+ # Force C++ linking for fuzz target
+ nodist_EXTRA_fuzz_xls_SOURCES = dummy.cxx
+ fuzz_xls_SOURCES = fuzz/fuzz_xls.c
+-fuzz_xls_CFLAGS = -Wall -Werror -pedantic-errors -std=c99
++fuzz_xls_CFLAGS = -Wall -pedantic-errors -std=c99
+ fuzz_xls_LDADD = libxlsreader.la @LIB_FUZZING_ENGINE@
+ fuzz_xls_LDFLAGS = -static
+ all: config.h
diff --git a/libxls/patches/patch-src_xlstool.c b/libxls/patches/patch-src_xlstool.c
new file mode 100644
index 0000000000..5561801057
--- /dev/null
+++ b/libxls/patches/patch-src_xlstool.c
@@ -0,0 +1,26 @@
+ - Explicity ignore fwrite return value.
+ - Support NetBSD's iconv() prototype.
+
+--- src/xlstool.c
++++ src/xlstool.c
+@@ -124,7 +124,7 @@ static const DWORD colors[] =
+ void dumpbuf(BYTE* fname,long size,BYTE* buf)
+ {
+     FILE *f = fopen((char *)fname, "wb");
+-    fwrite (buf, 1, size, f);
++    (void)fwrite (buf, 1, size, f);
+     fclose(f);
+ 
+ }
+@@ -220,7 +220,11 @@ static char* unicode_decode_iconv(const char *s, size_t len, size_t *newlen, con
+             out_ptr = outbuf;
+             while(inlenleft)
+             {
++#if defined(__NetBSD__) || defined(__sun)
++                st = iconv(ic, &src_ptr, &inlenleft, (char **)&out_ptr,(size_t *) &outlenleft);
++#else
+                 st = iconv(ic, (char **)&src_ptr, &inlenleft, (char **)&out_ptr,(size_t *) &outlenleft);
++#endif
+                 if(st == (size_t)(-1))
+                 {
+                     if(errno == E2BIG)