CVS commit: pkgsrc/textproc/libxlsxwriter

["Sijmen J. Mulder" <sjmulder%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sjmulder
Date:           Mon May  6 08:58:16 UTC 2019

Modified Files:
        pkgsrc/textproc/libxlsxwriter: Makefile distinfo
        pkgsrc/textproc/libxlsxwriter/patches: patch-src_Makefile

Log Message:
textproc/libxlsxwriter: update to 0.8.6

Upstream changes:
 - Fixed issue where images that started in hidden rows/columns weren't
   placed correctly in the worksheet.
 - Fixed the mime-type reported by system file(1). The mime-type
   reported by "file --mime-type"/magic was incorrect for XlsxWriter
   files since it expected the [Content_types] to be the first file in
   the zip container.

Package changes:
 - Fixed libxlsxwriter.so not picking up libz.so from buildlink.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/libxlsxwriter/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/libxlsxwriter/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/libxlsxwriter/patches/patch-src_Makefile

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

Modified files:

Index: pkgsrc/textproc/libxlsxwriter/Makefile
diff -u pkgsrc/textproc/libxlsxwriter/Makefile:1.3 pkgsrc/textproc/libxlsxwriter/Makefile:1.4
--- pkgsrc/textproc/libxlsxwriter/Makefile:1.3  Thu Apr 25 07:33:24 2019
+++ pkgsrc/textproc/libxlsxwriter/Makefile      Mon May  6 08:58:16 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2019/04/25 07:33:24 maya Exp $
+# $NetBSD: Makefile,v 1.4 2019/05/06 08:58:16 sjmulder Exp $
 
-DISTNAME=      libxlsxwriter-0.8.5
-PKGREVISION=   1
+DISTNAME=      libxlsxwriter-0.8.6
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jmcnamara/}
 GITHUB_TAG=    RELEASE_${PKGVERSION_NOREV}

Index: pkgsrc/textproc/libxlsxwriter/distinfo
diff -u pkgsrc/textproc/libxlsxwriter/distinfo:1.2 pkgsrc/textproc/libxlsxwriter/distinfo:1.3
--- pkgsrc/textproc/libxlsxwriter/distinfo:1.2  Mon Feb 11 18:30:47 2019
+++ pkgsrc/textproc/libxlsxwriter/distinfo      Mon May  6 08:58:16 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2019/02/11 18:30:47 leot Exp $
+$NetBSD: distinfo,v 1.3 2019/05/06 08:58:16 sjmulder Exp $
 
-SHA1 (libxlsxwriter-0.8.5.tar.gz) = e924e0f71011b8b11bf7105d980d0b1fb7569dcd
-RMD160 (libxlsxwriter-0.8.5.tar.gz) = 1f92138d9ef1bc2b8a590e669c6bb3378aff0f9c
-SHA512 (libxlsxwriter-0.8.5.tar.gz) = 5bc0c5bb15f54bc554b9ac97c283d2d6fded938e1184effdcbed89eeb0341ba097064be1c1eff700e446899d74b4a5dc41c5ecb24ccf7bf94e405c3c433f55b4
-Size (libxlsxwriter-0.8.5.tar.gz) = 13983145 bytes
-SHA1 (patch-src_Makefile) = cdc266a37bb162ffddddc26b244cbb9ef8b5ce9f
+SHA1 (libxlsxwriter-0.8.6.tar.gz) = e1e1d292882d229f766711e2b3cf4d4f0fa888d4
+RMD160 (libxlsxwriter-0.8.6.tar.gz) = ddbbbf70e93dc9ebaa674e453b7b4e39df1eccc2
+SHA512 (libxlsxwriter-0.8.6.tar.gz) = 60822dc5f87531edc97cf774e234f25229a605d4430061c24b95c387318e6e05dde1b0f2f433cea14c6f84ee901c1dffe0d174bfd7e2a8459f59bcee900097db
+Size (libxlsxwriter-0.8.6.tar.gz) = 13987986 bytes
+SHA1 (patch-src_Makefile) = af5047178ce52cb37dfb8c4317f7602f8bfca1c7

Index: pkgsrc/textproc/libxlsxwriter/patches/patch-src_Makefile
diff -u pkgsrc/textproc/libxlsxwriter/patches/patch-src_Makefile:1.1 pkgsrc/textproc/libxlsxwriter/patches/patch-src_Makefile:1.2
--- pkgsrc/textproc/libxlsxwriter/patches/patch-src_Makefile:1.1        Wed Jan 30 12:55:13 2019
+++ pkgsrc/textproc/libxlsxwriter/patches/patch-src_Makefile    Mon May  6 08:58:16 2019
@@ -1,9 +1,13 @@
-$NetBSD: patch-src_Makefile,v 1.1 2019/01/30 12:55:13 leot Exp $
+$NetBSD: patch-src_Makefile,v 1.2 2019/05/06 08:58:16 sjmulder Exp $
 
-Fix hardcoded prefix for macOS build.
+ - Fix hardcoded prefix for macOS build.
 
-Upstream PR:
-https://github.com/jmcnamara/libxlsxwriter/pull/210
+   PR: https://github.com/jmcnamara/libxlsxwriter/pull/210
+
+ - Use LDFLAGS when linking to make sure correct (builtin or not) zlib
+   is used.
+
+   PR: https://github.com/jmcnamara/libxlsxwriter/pull/224
 
 --- src/Makefile
 +++ src/Makefile
@@ -16,3 +20,21 @@ https://github.com/jmcnamara/libxlsxwrit
  endif
  
  # Check for MinGW/MinGW64/Cygwin environments.
+@@ -130,7 +130,7 @@ ARCH = -m32
+ endif
+ 
+ $(LIBXLSXWRITER_SO) : $(SOBJS)
+-      $(Q)$(CC) $(SOFLAGS) $(ARCH) -o $@ $(MINIZIP_SO) $(TMPFILEPLUS_SO) $^ $(LIBS)
++      $(Q)$(CC) $(LDFLAGS) $(SOFLAGS) $(ARCH) -o $@ $(MINIZIP_SO) $(TMPFILEPLUS_SO) $^ $(LIBS)
+ 
+ # The test library.
+ $(LIBXLSXWRITER_TO) : $(TOBJS)
+@@ -144,7 +144,7 @@ test_compile : $(OBJS)
+       $(Q)$(CC) -I$(INC_DIR) $(CFLAGS) $(CXXFLAGS) -c $<
+ 
+ %.so : %.c $(HDRS)
+-      $(Q)$(CC) $(FPIC) -I$(INC_DIR) $(CFLAGS) $(CXXFLAGS) -c $< -o $@
++      $(Q)$(CC) $(FPIC) -I$(INC_DIR) $(LDFLAGS) $(CFLAGS) $(CXXFLAGS) -c $< -o $@
+ 
+ %.to : %.c $(HDRS)
+       $(Q)$(CC) -g -O3 -DTESTING -I$(INC_DIR) $(CFLAGS) $(CXXFLAGS) -c $< -o $@