libxls: Update to 1.5.0-rc3

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

Module Name:	pkgsrc-wip
Committed By:	Sijmen J. Mulder <ik%sjmulder.nl@localhost>
Pushed By:	sjmulder
Date:		Thu Feb 7 22:06:30 2019 +0100
Changeset:	29e5dc58f35d7db7d7b338786fee22d08ce5e64d

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

Log Message:
libxls: Update to 1.5.0-rc3

With fixes upstreamed now compiles cleanly without patches on Debian 9,
NetBSD 8, CentOS 6, macOS Mohave, and Void Linux.

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

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, 7 insertions(+), 57 deletions(-)

diffs:
diff --git a/libxls/Makefile b/libxls/Makefile
index ef5b5cf812..88f1481e4c 100644
--- a/libxls/Makefile
+++ b/libxls/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD$
 
-DISTNAME=	libxls-1.5.0-rc2
-PKGNAME=	libxls-1.5.0rc2
+DISTNAME=	libxls-1.5.0-rc3
+PKGNAME=	libxls-1.5.0rc3
 CATEGORIES=	devel textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libxls/}
-GITHUB_RELEASE=	v1.5.0-rc2
+GITHUB_RELEASE=	v1.5.0-rc3
 
 MAINTAINER=	ik%sjmulder.nl@localhost
 HOMEPAGE=	https://github.com/libxls/libxls
diff --git a/libxls/distinfo b/libxls/distinfo
index 2fdf80f2f7..35acedd783 100644
--- a/libxls/distinfo
+++ b/libxls/distinfo
@@ -1,8 +1,6 @@
 $NetBSD$
 
-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
+SHA1 (libxls-1.5.0-rc3.tar.gz) = 4930ed2d6a42d51e09308a0bd53e4fa32e3c8476
+RMD160 (libxls-1.5.0-rc3.tar.gz) = 49042024cbb037ea82adbe66d35271637bb3ba00
+SHA512 (libxls-1.5.0-rc3.tar.gz) = b3873c318c4c0210132319f7e6fae28ca6de154dc06a001d9c21eb3a9701564162f65af3992c7698338eaea95d55489e8f8a9a46a258b1eeff1281bbacc3f87d
+Size (libxls-1.5.0-rc3.tar.gz) = 425992 bytes
diff --git a/libxls/patches/patch-Makefile.in b/libxls/patches/patch-Makefile.in
deleted file mode 100644
index 1b12176eed..0000000000
--- a/libxls/patches/patch-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index 5561801057..0000000000
--- a/libxls/patches/patch-src_xlstool.c
+++ /dev/null
@@ -1,26 +0,0 @@
- - 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)