depends: libzip: update to 1.11.1

diff --git a/contrib/depends/packages/libzip.mk b/contrib/depends/packages/libzip.mk
index 79f5f6504ff18c53f8b2ff029e3d4d565cc7d01e..3b2b0d46954e17b60ec18a42927f3987c7e4d839 100644 (file)
--- a/contrib/depends/packages/libzip.mk
+++ b/contrib/depends/packages/libzip.mk
@@ -1,17 +1,33 @@
 package=libzip
-$(package)_version=1.10.1
+$(package)_version=1.11.1
 $(package)_download_path=https://libzip.org/download/
-$(package)_file_name=$(package)-$($(package)_version).tar.xz
-$(package)_sha256_hash=dc3c8d5b4c8bbd09626864f6bcf93de701540f761d76b85d7c7d710f4bd90318
+$(package)_file_name=$(package)-$($(package)_version).tar.gz
+$(package)_sha256_hash=c0e6fa52a62ba11efd30262290dc6970947aef32e0cc294ee50e9005ceac092a
 $(package)_dependencies=zlib
-$(package)_patches += no-clonefile.patch
+
+define $(package)_set_vars
+  $(package)_config_opts := -DENABLE_BZIP2=OFF
+  $(package)_config_opts += -DENABLE_LZMA=OFF
+  $(package)_config_opts += -DENABLE_ZSTD=OFF
+  $(package)_config_opts += -DENABLE_COMMONCRYPTO=OFF
+  $(package)_config_opts += -DENABLE_GNUTLS=OFF
+  $(package)_config_opts += -DENABLE_MBEDTLS=OFF
+  $(package)_config_opts += -DENABLE_OPENSSL=OFF
+  $(package)_config_opts += -DENABLE_WINDOWS_CRYPTO=OFF
+  $(package)_config_opts += -DBUILD_SHARED_LIBS=OFF
+  $(package)_config_opts += -DBUILD_TOOLS=OFF
+  $(package)_config_opts += -DBUILD_REGRESS=OFF
+  $(package)_config_opts += -DBUILD_OSSFUZZ=OFF
+  $(package)_config_opts += -DBUILD_EXAMPLES=OFF
+  $(package)_config_opts += -DBUILD_DOC=OFF
+endef
 
 define $(package)_preprocess_cmds
-    patch -p1 < $($(package)_patch_dir)/no-clonefile.patch
+    rm -rf regress ossfuzz
 endef
 
 define $(package)_config_cmds
-    $($(package)_cmake) -DZLIB_ROOT=$(host_prefix) -DENABLE_BZIP2=Off -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=$(host_prefix) .
+    $($(package)_cmake) .
 endef
 
 define $(package)_build_cmds
@@ -20,4 +36,4 @@ endef
 
 define $(package)_stage_cmds
     $(MAKE) DESTDIR=$($(package)_staging_dir) install
-endef
\ No newline at end of file
+endef

diff --git a/contrib/depends/patches/libzip/no-clonefile.patch b/contrib/depends/patches/libzip/no-clonefile.patch
deleted file mode 100644 (file)
index 9848680..0000000
--- a/contrib/depends/patches/libzip/no-clonefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -99,7 +99,6 @@ check_function_exists(_strtoi64 HAVE__STRTOI64)
- check_function_exists(_strtoui64 HAVE__STRTOUI64)
- check_function_exists(_unlink HAVE__UNLINK)
- check_function_exists(arc4random HAVE_ARC4RANDOM)
--check_function_exists(clonefile HAVE_CLONEFILE)
- check_function_exists(explicit_bzero HAVE_EXPLICIT_BZERO)
- check_function_exists(explicit_memset HAVE_EXPLICIT_MEMSET)
- check_function_exists(fchmod HAVE_FCHMOD)