pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Update libzippp to version 6.0



Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <youremailsarecrap%gmail.com@localhost>
Pushed By:	nros
Date:		Fri Dec 30 12:40:08 2022 +0100
Changeset:	01ee593e64aa971b88d7a1751a987786babe6f3c

Modified Files:
	libzippp/Makefile
	libzippp/buildlink3.mk
	libzippp/distinfo
Removed Files:
	libzippp/patches/patch-src_libzippp.cpp
	libzippp/patches/patch-src_libzippp.h

Log Message:
Update libzippp to version 6.0

Remove patches from upstream.
Update BUILDLINK_API_DEPENDS due
to the breaking changes below.

Upstream changes from release notes:

* Adds support for compression method
* Adds support for cancel option
* Adds support of writeable in-memory buffer
  (breaking change)
* Imporovment of custom error handling
  (breaking change)
* Fixes wrong inflated size
* Fixes progression hole
* Fixes memory leak when open failed
* Fixes compilation warnings

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

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

diffstat:
 libzippp/Makefile                       |  2 +-
 libzippp/buildlink3.mk                  |  2 +-
 libzippp/distinfo                       |  8 +++-----
 libzippp/patches/patch-src_libzippp.cpp | 26 --------------------------
 libzippp/patches/patch-src_libzippp.h   | 17 -----------------
 5 files changed, 5 insertions(+), 50 deletions(-)

diffs:
diff --git a/libzippp/Makefile b/libzippp/Makefile
index e40f71bdc5..e8975fa408 100644
--- a/libzippp/Makefile
+++ b/libzippp/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	libzippp-v5.1-1.8.0
+DISTNAME=	libzippp-v6.0-1.9.2
 PKGNAME=	${DISTNAME:C/-[0-9].*//:S,-v,-,}
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ctabin/}
diff --git a/libzippp/buildlink3.mk b/libzippp/buildlink3.mk
index 571bfb4023..3a7cef437c 100644
--- a/libzippp/buildlink3.mk
+++ b/libzippp/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	libzippp
 .if !defined(LIBZIPPP_BUILDLINK3_MK)
 LIBZIPPP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libzippp+=	libzippp>=5.0
+BUILDLINK_API_DEPENDS.libzippp+=	libzippp>=6.0
 BUILDLINK_PKGSRCDIR.libzippp?=		../../wip/libzippp
 
 .endif	# LIBZIPPP_BUILDLINK3_MK
diff --git a/libzippp/distinfo b/libzippp/distinfo
index ff8527727a..ca06cc1c6d 100644
--- a/libzippp/distinfo
+++ b/libzippp/distinfo
@@ -1,9 +1,7 @@
 $NetBSD$
 
-BLAKE2s (libzippp-v5.1-1.8.0.tar.gz) = c479139b93f02d750d6d67997be092fd1c96f3731177697e1c15680b0e227a64
-SHA512 (libzippp-v5.1-1.8.0.tar.gz) = 572278284e163ba9b7ab6e0bdffefe7dac4a32b5782790b6d7a9cdeacd839b8cd166dce853cb6ddf911d8eb0318cf40726a95cb08e51496392616303d6113853
-Size (libzippp-v5.1-1.8.0.tar.gz) = 28141 bytes
+BLAKE2s (libzippp-v6.0-1.9.2.tar.gz) = e3ac2524221972db52396b13cc707e2e26225a19ebd79adeddaa8b493253e384
+SHA512 (libzippp-v6.0-1.9.2.tar.gz) = 030dd6cb84ac3d8f5c201b3e7a181882c86323a8420fc91521b8f7a53908fc1e31cd8a057f2cca6aa0091434e48f3fc5603a927cc42677d1f5e7b55e79af28af
+Size (libzippp-v6.0-1.9.2.tar.gz) = 33198 bytes
 SHA1 (patch-CMakeLists.txt) = 871bb6a10ae774d56211b22cf12e43539f00f8de
 SHA1 (patch-Config.cmake.in) = 11b068c2134955cf502bff800b22dfdb4380baac
-SHA1 (patch-src_libzippp.cpp) = b579fae76ff2efb390d72224323f7ce142f04068
-SHA1 (patch-src_libzippp.h) = 586dbdfd93fd17e22d8cb2299f7ea556304170ed
diff --git a/libzippp/patches/patch-src_libzippp.cpp b/libzippp/patches/patch-src_libzippp.cpp
deleted file mode 100644
index 5f52295530..0000000000
--- a/libzippp/patches/patch-src_libzippp.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-Fix handling of error format
-From upstream:
-https://github.com/ctabin/libzippp/commit/22df3bb79597b0a9587a31143bf05006bca9c70d
-
---- src/libzippp.cpp.orig	2022-05-31 18:51:45.141506061 +0000
-+++ src/libzippp.cpp
-@@ -228,7 +228,7 @@ bool ZipArchive::open(OpenMode om, bool 
-         char* errorStr = new char[256];
-         zip_error_to_str(errorStr, 255, errorFlag, errno);
-         errorStr[255] = '\0';
--        LIBZIPPP_ERROR_DEBUG("Unable to open archive", errorStr)
-+        LIBZIPPP_ERROR_DEBUG("Unable to open archive: %s", errorStr)
-         delete[] errorStr;
-         errorStr = nullptr;
-         
-@@ -290,7 +290,7 @@ int ZipArchive::close(void) {
-             
-                 bufferLength = newLength;
-             } else {
--                LIBZIPPP_ERROR_DEBUG("can't read back from source", "changes were not pushed by in the buffer")
-+                LIBZIPPP_ERROR_DEBUG("can't read back from source: %s", "changes were not pushed by in the buffer")
-                 return srcOpen;
-             }
-         }
diff --git a/libzippp/patches/patch-src_libzippp.h b/libzippp/patches/patch-src_libzippp.h
deleted file mode 100644
index fea2df835f..0000000000
--- a/libzippp/patches/patch-src_libzippp.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Fix handling of error format
-From upstream:
-https://github.com/ctabin/libzippp/commit/22df3bb79597b0a9587a31143bf05006bca9c70d
-
---- src/libzippp.h.orig	2022-05-23 21:32:28.000000000 +0000
-+++ src/libzippp.h
-@@ -51,7 +51,7 @@ struct zip_source;
- #define LIBZIPPP_DEFAULT_PROGRESSION_PRECISION 0.5
- 
- // allow custom debug handling when errors occurs in libzippp
--#define LIBZIPPP_ERROR_DEBUG(str, errormsg) fprintf(stderr, str "\n", errormsg);
-+#define LIBZIPPP_ERROR_DEBUG(str, errormsg) fprintf(stderr, (str"\n"), (errormsg));
- 
- //libzip documentation
- //- http://www.nih.at/libzip/libzip.html


Home | Main Index | Thread Index | Old Index