From 9cfeba33cc2c73a80dec6242a6b27bce1fdeeb02 Mon Sep 17 00:00:00 2001 From: EWouters <6179932+EWouters@users.noreply.github.com> Date: Fri, 1 Sep 2023 21:46:14 +0200 Subject: [PATCH] Ports/libzip: Update libzip to version 1.10.1 --- Ports/AvailablePorts.md | 2 +- Ports/libzip/package.sh | 4 ++-- .../0001-Disable-some-unneeded-options.patch | 18 ++++++++++-------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 6586fe45242..dd8e6313d5c 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -184,7 +184,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`libwebp`](libwebp/) | libwebp | 1.3.1 | https://github.com/webmproject/libwebp | | [`libxml2`](libxml2/) | libxml2 | 2.11.5 | http://www.xmlsoft.org/ | | [`libyaml`](libyaml/) | libyaml | 0.2.5 | https://pyyaml.org/wiki/LibYAML | -| [`libzip`](libzip/) | libzip | 1.8.0 | https://libzip.org/ | +| [`libzip`](libzip/) | libzip | 1.10.1 | https://libzip.org/ | | [`links`](links/) | Links web browser | 2.26 | http://links.twibright.com/ | | [`lite-xl`](lite-xl/) | Lite-XL | 2.1.0 | https://lite-xl.com/ | | [`llvm`](llvm/) | LLVM | 16.0.6 | https://llvm.org/ | diff --git a/Ports/libzip/package.sh b/Ports/libzip/package.sh index 14cf60d0740..a5c00f0b832 100755 --- a/Ports/libzip/package.sh +++ b/Ports/libzip/package.sh @@ -1,8 +1,8 @@ #!/usr/bin/env -S bash ../.port_include.sh port='libzip' -version='1.8.0' +version='1.10.1' files=( - "https://libzip.org/download/libzip-${version}.tar.gz#30ee55868c0a698d3c600492f2bea4eb62c53849bcf696d21af5eb65f3f3839e" + "https://libzip.org/download/libzip-${version}.tar.gz#9669ae5dfe3ac5b3897536dc8466a874c8cf2c0e3b1fdd08d75b273884299363" ) useconfigure='true' depends=( diff --git a/Ports/libzip/patches/0001-Disable-some-unneeded-options.patch b/Ports/libzip/patches/0001-Disable-some-unneeded-options.patch index de15d64f274..21766e12ec6 100644 --- a/Ports/libzip/patches/0001-Disable-some-unneeded-options.patch +++ b/Ports/libzip/patches/0001-Disable-some-unneeded-options.patch @@ -10,11 +10,11 @@ Co-Authored-By: Panagiotis Vasilopoulos 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 93b46a6..6b8d4ed 100644 +index b2e77241a2fbbb91c9057af038a3dea280b4ae7a..3e8899da4ed9871f0a1bc097e96925a9ad2e0766 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -9,20 +9,24 @@ project(libzip - VERSION 1.8.0 +@@ -9,22 +9,26 @@ project(libzip + VERSION 1.10.1 LANGUAGES C) -option(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON) @@ -34,15 +34,17 @@ index 93b46a6..6b8d4ed 100644 +option(ENABLE_MBEDTLS "Enable use of mbed TLS" OFF) +option(ENABLE_OPENSSL "Enable use of OpenSSL" OFF) +option(ENABLE_WINDOWS_CRYPTO "Enable use of Windows cryptography libraries" OFF) ++ ++option(ENABLE_BZIP2 "Enable use of BZip2" OFF) ++option(ENABLE_LZMA "Enable use of LZMA" OFF) ++option(ENABLE_ZSTD "Enable use of Zstandard" OFF) + + option(ENABLE_FDOPEN "Enable zip_fdopen, which is not allowed in Microsoft CRT secure libraries" ON) -option(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" ON) -option(BUILD_REGRESS "Build regression tests" ON) -option(BUILD_EXAMPLES "Build examples" ON) -option(BUILD_DOC "Build documentation" ON) -+option(ENABLE_BZIP2 "Enable use of BZip2" OFF) -+option(ENABLE_LZMA "Enable use of LZMA" OFF) -+option(ENABLE_ZSTD "Enable use of Zstandard" OFF) -+ +option(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" OFF) +option(BUILD_REGRESS "Build regression tests" OFF) +option(BUILD_EXAMPLES "Build examples" OFF) @@ -50,7 +52,7 @@ index 93b46a6..6b8d4ed 100644 include(CheckFunctionExists) include(CheckIncludeFiles) -@@ -54,10 +58,10 @@ if(WIN32) +@@ -56,10 +60,10 @@ if(WIN32) endif() endif()