[pkgsrc/trunk]: pkgsrc/textproc/libxlsxwriter textproc/libxlsxwriter: Update ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/52bd28e23637
branches:  trunk
changeset: 769786:52bd28e23637
user:      sjmulder <sjmulder%pkgsrc.org@localhost>
date:      Fri Nov 19 22:13:32 2021 +0000

description:
textproc/libxlsxwriter: Update to 1.1.4

Changes:
 - Added support for Worksheet tables. Tables in Excel are a way of
   grouping a range of cells into a single entity that has common
   formatting or that can be referenced from formulas. Tables can have
   column headers, autofilters, total rows, column formulas and default
   formatting. See working_with_tables and tables.c.
 - Added support for adding a macro button to a worksheet. See macro.c.

Package changes:
 - Fixed test target (missing py.test version suffix).

diffstat:

 textproc/libxlsxwriter/Makefile                        |   8 +++-
 textproc/libxlsxwriter/PLIST                           |   5 +-
 textproc/libxlsxwriter/buildlink3.mk                   |   4 +-
 textproc/libxlsxwriter/distinfo                        |   9 +++--
 textproc/libxlsxwriter/patches/patch-test_cpp_Makefile |  29 ++++++++++++++++++
 5 files changed, 45 insertions(+), 10 deletions(-)

diffs (120 lines):

diff -r eb3d30fbea26 -r 52bd28e23637 textproc/libxlsxwriter/Makefile
--- a/textproc/libxlsxwriter/Makefile   Fri Nov 19 21:55:21 2021 +0000
+++ b/textproc/libxlsxwriter/Makefile   Fri Nov 19 22:13:32 2021 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2021/08/10 12:05:40 sjmulder Exp $
+# $NetBSD: Makefile,v 1.18 2021/11/19 22:13:32 sjmulder Exp $
 
-DISTNAME=      libxlsxwriter-1.1.3
+DISTNAME=      libxlsxwriter-1.1.4
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jmcnamara/}
 GITHUB_TAG=    RELEASE_${PKGVERSION_NOREV}
@@ -15,15 +15,19 @@
 TEST_TARGET=   test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
+# C++ is used for tests
+USE_LANGUAGES= c c++
 USE_TOOLS+=    gmake
 
 .include "../../lang/python/pyversion.mk"
 
+MAKE_ENV+=     V=1
 MAKE_ENV+=     OPT_LEVEL=
 # Prefer non-bundled dependencies
 MAKE_ENV+=     USE_SYSTEM_MINIZIP=1
 MAKE_ENV+=     USE_STANDARD_TMPFILE=1
 MAKE_ENV+=     USE_OPENSSL_MD5=1
+MAKE_ENV+=     PYTEST=py.test-${PYVERSSUFFIX}
 
 # minizip has C++ style comments
 BUILDLINK_TRANSFORM+=  rm:-ansi
diff -r eb3d30fbea26 -r 52bd28e23637 textproc/libxlsxwriter/PLIST
--- a/textproc/libxlsxwriter/PLIST      Fri Nov 19 21:55:21 2021 +0000
+++ b/textproc/libxlsxwriter/PLIST      Fri Nov 19 22:13:32 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2021/08/09 07:05:23 sjmulder Exp $
+@comment $NetBSD: PLIST,v 1.6 2021/11/19 22:13:32 sjmulder Exp $
 include/xlsxwriter.h
 include/xlsxwriter/app.h
 include/xlsxwriter/chart.h
@@ -16,6 +16,7 @@
 include/xlsxwriter/relationships.h
 include/xlsxwriter/shared_strings.h
 include/xlsxwriter/styles.h
+include/xlsxwriter/table.h
 include/xlsxwriter/theme.h
 include/xlsxwriter/third_party/emyg_dtoa.h
 include/xlsxwriter/third_party/ioapi.h
@@ -31,5 +32,5 @@
 include/xlsxwriter/xmlwriter.h
 lib/libxlsxwriter.a
 lib/libxlsxwriter.so
-lib/libxlsxwriter.so.3
+lib/libxlsxwriter.so.4
 lib/pkgconfig/xlsxwriter.pc
diff -r eb3d30fbea26 -r 52bd28e23637 textproc/libxlsxwriter/buildlink3.mk
--- a/textproc/libxlsxwriter/buildlink3.mk      Fri Nov 19 21:55:21 2021 +0000
+++ b/textproc/libxlsxwriter/buildlink3.mk      Fri Nov 19 22:13:32 2021 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.11 2021/08/09 07:05:23 sjmulder Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2021/11/19 22:13:32 sjmulder Exp $
 
 BUILDLINK_TREE+=       libxlsxwriter
 
 .if !defined(LIBXLSXWRITER_BUILDLINK3_MK)
 LIBXLSXWRITER_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libxlsxwriter+=  libxlsxwriter>=1.1.2
+BUILDLINK_API_DEPENDS.libxlsxwriter+=  libxlsxwriter>=1.1.4
 BUILDLINK_PKGSRCDIR.libxlsxwriter?=    ../../textproc/libxlsxwriter
 
 .include "../../archivers/minizip/buildlink3.mk"
diff -r eb3d30fbea26 -r 52bd28e23637 textproc/libxlsxwriter/distinfo
--- a/textproc/libxlsxwriter/distinfo   Fri Nov 19 21:55:21 2021 +0000
+++ b/textproc/libxlsxwriter/distinfo   Fri Nov 19 22:13:32 2021 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.17 2021/10/26 11:22:17 nia Exp $
+$NetBSD: distinfo,v 1.18 2021/11/19 22:13:32 sjmulder Exp $
 
-BLAKE2s (libxlsxwriter-1.1.3.tar.gz) = 59a1715302fb640d2310468dcb6cb0e87d3a28c038672bae807bfc71e0d395b2
-SHA512 (libxlsxwriter-1.1.3.tar.gz) = 1b7bf114c89801da214a29c84d7886786dcc6d6123c410938660597f92ab75c14d3110c9c95368cbbc075e7b707908397d41bbbaf5d0d059a4792bc8787b5f17
-Size (libxlsxwriter-1.1.3.tar.gz) = 19166983 bytes
+BLAKE2s (libxlsxwriter-1.1.4.tar.gz) = 8481f135c9687c7e25d697da2dec34a6cc1d0c426caa806a09e599b26244cf45
+SHA512 (libxlsxwriter-1.1.4.tar.gz) = fad36f7882fcb21b87e13cf603022cfad3f14e6f955a06e2771712facd0fe12f83f4d1655dc1a744724bda1ac83af7e7bf1393457c5507d8983f63002ab294b5
+Size (libxlsxwriter-1.1.4.tar.gz) = 20442200 bytes
+SHA1 (patch-test_cpp_Makefile) = a714517948a453daeb6cbb6740ca46d2af05bac7
diff -r eb3d30fbea26 -r 52bd28e23637 textproc/libxlsxwriter/patches/patch-test_cpp_Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/libxlsxwriter/patches/patch-test_cpp_Makefile    Fri Nov 19 22:13:32 2021 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-test_cpp_Makefile,v 1.1 2021/11/19 22:13:32 sjmulder Exp $
+
+- Respect LDFLAGS in C++ tests
+- Link libraries required by libxlsxwriter.a with USE_SYSTEM_MINIZIP
+  or USE_OPENSSL_MD5 set.
+
+--- test/cpp/Makefile.orig     2021-10-09 13:44:36.000000000 +0000
++++ test/cpp/Makefile
+@@ -24,6 +24,14 @@ EXES = $(patsubst %.cpp,%,$(SRCS))
+ LIBXLSXWRITER = ../../src/libxlsxwriter.a
+ LIBS = $(LIBXLSXWRITER) -lz
+ 
++ifdef USE_SYSTEM_MINIZIP
++LIBS += -lminizip
++endif
++
++ifdef USE_OPENSSL_MD5
++LIBS += -lcrypto
++endif
++
+ all : $(LIBXLSXWRITER) $(EXES)
+ 
+ $(LIBXLSXWRITER):
+@@ -34,4 +42,4 @@ clean :
+ 
+ # Executable targets.
+ %: %.cpp $(LIBXLSXWRITER)
+-      $(Q)$(CXX) -I$(INC_DIR) $(CXXFLAGS) $< -o $@ $(LIBS)
++      $(Q)$(CXX) -I$(INC_DIR) $(CXXFLAGS) $(LDFLAGS) $< -o $@ $(LIBS)