pkgsrc-WIP-changes archive

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

Update libzippp to version 5.1



Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%pkgsrc.org@localhost>
Pushed By:	nros
Date:		Wed Jun 1 09:30:05 2022 +0000
Changeset:	5fcfd507fe54d7287bfc7c3e22d991986a0f0bfd

Modified Files:
	libzippp/Makefile
	libzippp/PLIST
	libzippp/distinfo
Added Files:
	libzippp/patches/patch-src_libzippp.cpp
	libzippp/patches/patch-src_libzippp.h

Log Message:
Update libzippp to version 5.1

Update libzippp to version 5.1 .
Reason for update, keep up to date.
Add patches from upstream to fix errors
in build.

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

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

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

diffs:
diff --git a/libzippp/Makefile b/libzippp/Makefile
index 5fa40bf8ea..e40f71bdc5 100644
--- a/libzippp/Makefile
+++ b/libzippp/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	libzippp-v5.0-1.8.0
+DISTNAME=	libzippp-v5.1-1.8.0
 PKGNAME=	${DISTNAME:C/-[0-9].*//:S,-v,-,}
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ctabin/}
diff --git a/libzippp/PLIST b/libzippp/PLIST
index f3fcea2613..d2cee3495e 100644
--- a/libzippp/PLIST
+++ b/libzippp/PLIST
@@ -3,5 +3,5 @@ include/libzippp/libzippp.h
 lib/libzippp.so
 share/libzippp/libzipppConfig.cmake
 share/libzippp/libzipppConfigVersion.cmake
-share/libzippp/libzipppTargets-noconfig.cmake
+share/libzippp/libzipppTargets-release.cmake
 share/libzippp/libzipppTargets.cmake
diff --git a/libzippp/distinfo b/libzippp/distinfo
index b3f9d99cfe..ff8527727a 100644
--- a/libzippp/distinfo
+++ b/libzippp/distinfo
@@ -1,7 +1,9 @@
 $NetBSD$
 
-BLAKE2s (libzippp-v5.0-1.8.0.tar.gz) = 4bbc718e163a157cb21c8dd06b7a04926b8bc6ed4289f74411993ad506756d5d
-SHA512 (libzippp-v5.0-1.8.0.tar.gz) = 1eae6601f625832d7dbd78be7f28913d8d1c88a01712dfb9d035121a1c933d3589120a7d9b25a8734cc567ee4aef130cba2e3d11227a961cc3a7d864f9f4d6c7
-Size (libzippp-v5.0-1.8.0.tar.gz) = 27093 bytes
+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
 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
new file mode 100644
index 0000000000..5f52295530
--- /dev/null
+++ b/libzippp/patches/patch-src_libzippp.cpp
@@ -0,0 +1,26 @@
+$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
new file mode 100644
index 0000000000..fea2df835f
--- /dev/null
+++ b/libzippp/patches/patch-src_libzippp.h
@@ -0,0 +1,17 @@
+$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