From f28e8b06635bd630937b740a51cdb9d6b896c385 Mon Sep 17 00:00:00 2001 From: sjmulder Date: Wed, 19 Apr 2023 14:36:14 +0000 Subject: [PATCH] textproc/libxlsxwriter: Update to 1.1.5 Changes: - Added support for writing a workbook to a memory buffer instead of to a file via the output_buffer parameter of workbook_new_opt(). - Add support for using in-memory data instead of temporary files on systems where fmemopen() and open_memstream() are supported. This requires the USE_MEM_FILE compilation option. --- textproc/libxlsxwriter/Makefile | 4 +-- textproc/libxlsxwriter/PLIST | 4 +-- textproc/libxlsxwriter/distinfo | 9 +++--- .../patches/patch-test_cpp_Makefile | 29 ------------------- 4 files changed, 8 insertions(+), 38 deletions(-) delete mode 100644 textproc/libxlsxwriter/patches/patch-test_cpp_Makefile diff --git a/textproc/libxlsxwriter/Makefile b/textproc/libxlsxwriter/Makefile index 3a0af62292bc..663c611e1e05 100644 --- a/textproc/libxlsxwriter/Makefile +++ b/textproc/libxlsxwriter/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2021/11/19 22:13:32 sjmulder Exp $ +# $NetBSD: Makefile,v 1.19 2023/04/19 14:36:14 sjmulder Exp $ -DISTNAME= libxlsxwriter-1.1.4 +DISTNAME= libxlsxwriter-1.1.5 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GITHUB:=jmcnamara/} GITHUB_TAG= RELEASE_${PKGVERSION_NOREV} diff --git a/textproc/libxlsxwriter/PLIST b/textproc/libxlsxwriter/PLIST index 847a9ce4dcc7..e8e551ddc5ff 100644 --- a/textproc/libxlsxwriter/PLIST +++ b/textproc/libxlsxwriter/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2021/11/19 22:13:32 sjmulder Exp $ +@comment $NetBSD: PLIST,v 1.7 2023/04/19 14:36:14 sjmulder Exp $ include/xlsxwriter.h include/xlsxwriter/app.h include/xlsxwriter/chart.h @@ -32,5 +32,5 @@ include/xlsxwriter/worksheet.h include/xlsxwriter/xmlwriter.h lib/libxlsxwriter.a lib/libxlsxwriter.so -lib/libxlsxwriter.so.4 +lib/libxlsxwriter.so.5 lib/pkgconfig/xlsxwriter.pc diff --git a/textproc/libxlsxwriter/distinfo b/textproc/libxlsxwriter/distinfo index 9fcb20ac526f..671a677a2ede 100644 --- a/textproc/libxlsxwriter/distinfo +++ b/textproc/libxlsxwriter/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.18 2021/11/19 22:13:32 sjmulder Exp $ +$NetBSD: distinfo,v 1.19 2023/04/19 14:36:14 sjmulder Exp $ -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 +BLAKE2s (libxlsxwriter-1.1.5.tar.gz) = 26a0b4a2c1f9bb51d5e9670ac06fe433240d99f0e95060391c50a56fc9c9aedf +SHA512 (libxlsxwriter-1.1.5.tar.gz) = bd7db0fcf25ebf492b4d8f7da8fdb6cc79400d7d0fa5856ddae259cb24817034fc97d4828cbde42434f41198dcfb6732ac63c756abd962689f4249ca64bf19c6 +Size (libxlsxwriter-1.1.5.tar.gz) = 21541446 bytes diff --git a/textproc/libxlsxwriter/patches/patch-test_cpp_Makefile b/textproc/libxlsxwriter/patches/patch-test_cpp_Makefile deleted file mode 100644 index 9ec0dbc0eb36..000000000000 --- a/textproc/libxlsxwriter/patches/patch-test_cpp_Makefile +++ /dev/null @@ -1,29 +0,0 @@ -$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)