pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Update libzippp to version 6.1

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%pkgsrc.org@localhost>
Pushed By:	nros
Date:		Wed Jul 5 09:39:40 2023 +0200
Changeset:	6d02e34768ff89feb69a7327e6d6a003e2900988

Modified Files:
	libzippp/Makefile
	libzippp/PLIST
	libzippp/buildlink3.mk
	libzippp/distinfo
	libzippp/patches/patch-CMakeLists.txt
Removed Files:
	libzippp/patches/patch-Config.cmake.in

Log Message:
Update libzippp to version 6.1

Update libzippp to version 6.1

Changes from release notes:
* Renaming of the method fromWriteableBuffer to fromWritableBuffer
* Fixes for packaging on GNU/Unix like systems
* If any error on close avoid to force progress percentage to 100%
* Set compression method in addData
* Fix GCC compile warnings
* Adds support for compression level
* Fixes toolchain options override in CMake
* Fixes read of zero-file length

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

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

diffstat:
 libzippp/Makefile                      |  8 +++++---
 libzippp/PLIST                         |  9 +++++----
 libzippp/buildlink3.mk                 |  2 +-
 libzippp/distinfo                      |  9 ++++-----
 libzippp/patches/patch-CMakeLists.txt  | 31 +++++++++++--------------------
 libzippp/patches/patch-Config.cmake.in | 20 --------------------
 6 files changed, 26 insertions(+), 53 deletions(-)

diffs:
diff --git a/libzippp/Makefile b/libzippp/Makefile
index e8975fa408..b35305ef9f 100644
--- a/libzippp/Makefile
+++ b/libzippp/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	libzippp-v6.0-1.9.2
+DISTNAME=	libzippp-v6.1-1.9.2
 PKGNAME=	${DISTNAME:C/-[0-9].*//:S,-v,-,}
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ctabin/}
@@ -12,13 +12,15 @@ COMMENT=	Libzip c++ wrapper
 LICENSE=	modified-bsd
 
 WRKSRC=		${WRKDIR}/libzippp-${DISTNAME}
-USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=ON
 CMAKE_ARGS+=	-DLIBZIPPP_ENABLE_ENCRYPTION=ON
+CMAKE_ARGS+=	-DLIBZIPPP_CMAKE_CONFIG_MODE=ON
+CMAKE_ARGS+=	-DLIBZIPPP_GNUINSTALLDIRS=ON
 
-CMAKE_USE_GNU_INSTALL_DIRS=	NO
+PKGCONFIG_OVERRIDE=	libzippp.pc.in
 
 .include "../../archivers/libzip/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libzippp/PLIST b/libzippp/PLIST
index d2cee3495e..7e75085c87 100644
--- a/libzippp/PLIST
+++ b/libzippp/PLIST
@@ -1,7 +1,8 @@
 @comment $NetBSD$
 include/libzippp/libzippp.h
+lib/cmake/libzippp/libzipppConfig.cmake
+lib/cmake/libzippp/libzipppConfigVersion.cmake
+lib/cmake/libzippp/libzipppTargets-release.cmake
+lib/cmake/libzippp/libzipppTargets.cmake
 lib/libzippp.so
-share/libzippp/libzipppConfig.cmake
-share/libzippp/libzipppConfigVersion.cmake
-share/libzippp/libzipppTargets-release.cmake
-share/libzippp/libzipppTargets.cmake
+lib/pkgconfig/libzippp.pc
diff --git a/libzippp/buildlink3.mk b/libzippp/buildlink3.mk
index 3a7cef437c..ccdc7f3182 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>=6.0
+BUILDLINK_API_DEPENDS.libzippp+=	libzippp>=6.1
 BUILDLINK_PKGSRCDIR.libzippp?=		../../wip/libzippp
 
 .endif	# LIBZIPPP_BUILDLINK3_MK
diff --git a/libzippp/distinfo b/libzippp/distinfo
index ca06cc1c6d..33c6036473 100644
--- a/libzippp/distinfo
+++ b/libzippp/distinfo
@@ -1,7 +1,6 @@
 $NetBSD$
 
-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
+BLAKE2s (libzippp-v6.1-1.9.2.tar.gz) = 7c8e1c69905fc4865898d3d4cc80b613743480009de98d165841e9af40a8bccc
+SHA512 (libzippp-v6.1-1.9.2.tar.gz) = 895e3d773719953b04f2cfa96dfba30fd75ae1567961f5b69137f63291e80a12e3bf75e041a2b371a34f42670ad6deb02d32f6f74d0d6a1a36fd8531cee765d9
+Size (libzippp-v6.1-1.9.2.tar.gz) = 34285 bytes
+SHA1 (patch-CMakeLists.txt) = b84eb979ab5fff927660d0f0a3a5e1c48b4a3402
diff --git a/libzippp/patches/patch-CMakeLists.txt b/libzippp/patches/patch-CMakeLists.txt
index 35435e01e1..359bf7154f 100644
--- a/libzippp/patches/patch-CMakeLists.txt
+++ b/libzippp/patches/patch-CMakeLists.txt
@@ -1,24 +1,15 @@
 $NetBSD$
 
-* Use cmake files installed by libzip instead of FindLIBZIP.cmake
+* Fix typos
 
---- CMakeLists.txt.orig	2021-08-03 09:01:25.000000000 +0000
+--- CMakeLists.txt.orig	2023-04-30 19:12:15.000000000 +0000
 +++ CMakeLists.txt
-@@ -22,7 +22,7 @@ option(LIBZIPPP_ENABLE_ENCRYPTION "Build
- 
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
- 
--find_package(LIBZIP MODULE REQUIRED)
-+find_package(libzip REQUIRED)
- 
- add_library(libzippp "src/libzippp.cpp")
- add_library(libzippp::libzippp ALIAS libzippp) # Convenience alias
-@@ -93,7 +93,7 @@ if(LIBZIPPP_INSTALL)
-   )
- 
-   install(
--    FILES ${PROJECT_CONFIG_FILE} ${PROJECT_VERSION_FILE} cmake/FindLIBZIP.cmake
-+    FILES ${PROJECT_CONFIG_FILE} ${PROJECT_VERSION_FILE}
-     DESTINATION ${configInstallDestination}
-   )
- 
+@@ -152,7 +152,7 @@ if(LIBZIPPP_INSTALL)
+     )
+     configure_file(libzippp.pc.in generated/libzippp.pc @ONLY)
+     install(
+-      FILES ${CMAKE_CURRENT_BINARYDIR}/generated/libzipp.pc
++      FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/libzippp.pc
+       DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+     )
+   endif()
diff --git a/libzippp/patches/patch-Config.cmake.in b/libzippp/patches/patch-Config.cmake.in
deleted file mode 100644
index cfa56d3ff6..0000000000
--- a/libzippp/patches/patch-Config.cmake.in
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-* Use cmake files installed by libzip instead of FindLIBZIP.cmake
-
---- Config.cmake.in.orig	2022-01-13 19:47:41.330833533 +0000
-+++ Config.cmake.in
-@@ -1,10 +1,10 @@
- @PACKAGE_INIT@
- 
--find_package(LIBZIP QUIET)
--if(NOT LIBZIP_FOUND)
-+find_package(libzip QUIET)
-+if(NOT libzip_FOUND)
-     list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
-     include(CMakeFindDependencyMacro)
--    find_dependency(LIBZIP REQUIRED)
-+    find_dependency(libzip REQUIRED)
- endif()
- 
- include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
Home | Main Index | Thread Index | Old Index