diff options
| author | EWouters <6179932+EWouters@users.noreply.github.com> | 2022-06-03 17:46:51 +0200 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2022-06-08 11:40:31 +0100 |
| commit | 7f0d4eef766301e44fa469e435d0ea2884a611a4 (patch) | |
| tree | 71679c4584bf20be3aabfff74ce734bb6c47a4ca /Ports | |
| parent | 582192ce9134a74cda1adab9ead1336a3e562d5f (diff) | |
| download | serenity-7f0d4eef766301e44fa469e435d0ea2884a611a4.zip | |
Ports/libzip: Update libzip to version 1.8.0
Diffstat (limited to 'Ports')
| -rw-r--r-- | Ports/AvailablePorts.md | 2 | ||||
| -rwxr-xr-x | Ports/libzip/package.sh | 14 | ||||
| -rw-r--r-- | Ports/libzip/patches/0001-Disable-some-unneeded-options.patch | 16 |
3 files changed, 17 insertions, 15 deletions
diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index b8a81f5cf5..ec05160e1c 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -127,7 +127,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`libvorbis`](libvorbis/) | libvorbis | 1.3.7 | https://github.com/xiph/vorbis | | [`libxml2`](libxml2/) | libxml2 | 2.9.14 | http://www.xmlsoft.org/ | | [`libyaml`](libyaml/) | libyaml | 0.2.5 | https://pyyaml.org/wiki/LibYAML | -| [`libzip`](libzip/) | libzip | 1.7.3 | https://libzip.org/ | +| [`libzip`](libzip/) | libzip | 1.8.0 | https://libzip.org/ | | [`links`](links/) | Links web browser | 2.25 | http://links.twibright.com/ | | [`llvm`](llvm/) | LLVM | 14.0.1 | https://llvm.org/ | | [`lua`](lua/) | Lua | 5.3.6 | https://www.lua.org/ | diff --git a/Ports/libzip/package.sh b/Ports/libzip/package.sh index 3d01f4fe51..e2de01fc63 100755 --- a/Ports/libzip/package.sh +++ b/Ports/libzip/package.sh @@ -1,12 +1,12 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=libzip -useconfigure=true -version=1.7.3 -depends=("zlib") -workdir=libzip-${version} +port='libzip' +version='1.8.0' +files="https://libzip.org/download/libzip-${version}.tar.gz libzip-${version}.tar.gz 30ee55868c0a698d3c600492f2bea4eb62c53849bcf696d21af5eb65f3f3839e" +auth_type='sha256' +useconfigure='true' configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt") -files="https://libzip.org/download/libzip-${version}.tar.gz libzip-${version}.tar.gz 0e2276c550c5a310d4ebf3a2c3dfc43fb3b4602a072ff625842ad4f3238cb9cc" -auth_type=sha256 +depends=("zlib") +workdir="libzip-${version}" configure() { run cmake "${configopts[@]}" diff --git a/Ports/libzip/patches/0001-Disable-some-unneeded-options.patch b/Ports/libzip/patches/0001-Disable-some-unneeded-options.patch index cbe5bc10aa..b0bdb4f126 100644 --- a/Ports/libzip/patches/0001-Disable-some-unneeded-options.patch +++ b/Ports/libzip/patches/0001-Disable-some-unneeded-options.patch @@ -6,15 +6,15 @@ Subject: [PATCH] Disable some unneeded options Co-Authored-By: Manuel Palenzuela <manuelpalenzuelamerino@gmail.com> Co-Authored-By: Panagiotis Vasilopoulos <hello@alwayslivid.com> --- - CMakeLists.txt | 30 +++++++++++++++++------------- - 1 file changed, 17 insertions(+), 13 deletions(-) + CMakeLists.txt | 32 ++++++++++++++++++-------------- + 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 017f7cf..3d8cc9f 100644 +index 93b46a6..6b8d4ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -9,19 +9,23 @@ project(libzip - VERSION 1.7.3 +@@ -9,20 +9,24 @@ project(libzip + VERSION 1.8.0 LANGUAGES C) -option(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON) @@ -28,6 +28,7 @@ index 017f7cf..3d8cc9f 100644 -option(ENABLE_BZIP2 "Enable use of BZip2" ON) -option(ENABLE_LZMA "Enable use of LZMA" ON) +-option(ENABLE_ZSTD "Enable use of Zstandard" ON) +option(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" OFF) +option(ENABLE_GNUTLS "Enable use of GnuTLS" OFF) +option(ENABLE_MBEDTLS "Enable use of mbed TLS" OFF) @@ -40,6 +41,7 @@ index 017f7cf..3d8cc9f 100644 -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) @@ -48,8 +50,8 @@ index 017f7cf..3d8cc9f 100644 include(CheckFunctionExists) include(CheckIncludeFiles) -@@ -62,10 +66,10 @@ else() - set(WINDOWS_CRYPTO_FOUND FALSE) +@@ -54,10 +58,10 @@ if(WIN32) + endif() endif() -option(BUILD_SHARED_LIBS "Build shared libraries" ON) |