From 9d9705236a000fcb4313e742867f19e79ef0e263 Mon Sep 17 00:00:00 2001 From: toge Date: Sat, 1 Feb 2025 15:57:30 +0900 Subject: [PATCH] [libzip] update to 1.11.3 --- ports/libzip/portfile.cmake | 4 ++-- ports/libzip/use-requires.patch | 16 ++++++++-------- ports/libzip/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/l-/libzip.json | 5 +++++ 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/ports/libzip/portfile.cmake b/ports/libzip/portfile.cmake index 18b491382ea02f..317b7acf227749 100644 --- a/ports/libzip/portfile.cmake +++ b/ports/libzip/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nih-at/libzip REF "v${VERSION}" - SHA512 1b0bffe579de5d2c52b23075f5351a5670e9f7a364c14a876ca3c490a85c0c9b1ebd9a97e729c5c7e71d496a3a0a8f28505bfadd7d8423954d3547a9a8f63841 + SHA512 cf7795ba52685bfc90cf4a3f993d29d6e27eabaca486098e04971fca31ab90a887194e6a77a5a9e19ade1a1d0855400c8108aa79724618f4204b1ba8d5e42c9d HEAD_REF master PATCHES fix-dependency.patch @@ -38,7 +38,7 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libzip) vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - + # Remove include directories from lib file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/libzip" "${CURRENT_PACKAGES_DIR}/debug/lib/libzip") diff --git a/ports/libzip/use-requires.patch b/ports/libzip/use-requires.patch index 3d4debe2d389bb..1c3dc43b12d26d 100644 --- a/ports/libzip/use-requires.patch +++ b/ports/libzip/use-requires.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b2e7724..0af7929 100644 +index 472a7a2..f9479be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -43,12 +43,14 @@ endif() +@@ -48,12 +48,14 @@ endif() if(ENABLE_GNUTLS) find_package(Nettle 3.0) find_package(GnuTLS) @@ -17,7 +17,7 @@ index b2e7724..0af7929 100644 endif() if(WIN32) if(ENABLE_WINDOWS_CRYPTO) -@@ -191,6 +193,7 @@ int main(int argc, char *argv[]) { }" HAVE_NULLABLE) +@@ -196,6 +198,7 @@ int main(int argc, char *argv[]) { unsigned long x = FICLONERANGE; }" HAVE_FICLO test_big_endian(WORDS_BIGENDIAN) find_package(ZLIB 1.1.2 REQUIRED) @@ -25,7 +25,7 @@ index b2e7724..0af7929 100644 # so developers on systems where zlib is named differently (Windows, sometimes) # can override the name used in the pkg-config file if (NOT ZLIB_LINK_LIBRARY_NAME) -@@ -227,6 +230,7 @@ if(ENABLE_BZIP2) +@@ -232,6 +235,7 @@ if(ENABLE_BZIP2) else() message(WARNING "-- bzip2 library not found; bzip2 support disabled") endif(BZIP2_FOUND) @@ -33,7 +33,7 @@ index b2e7724..0af7929 100644 endif(ENABLE_BZIP2) if(ENABLE_LZMA) -@@ -236,6 +240,7 @@ if(ENABLE_LZMA) +@@ -241,6 +245,7 @@ if(ENABLE_LZMA) else() message(WARNING "-- lzma library not found; lzma/xz support disabled") endif(LIBLZMA_FOUND) @@ -41,7 +41,7 @@ index b2e7724..0af7929 100644 endif(ENABLE_LZMA) if(ENABLE_ZSTD) -@@ -250,6 +255,7 @@ if(ENABLE_ZSTD) +@@ -255,6 +260,7 @@ if(ENABLE_ZSTD) else() message(WARNING "-- zstd library not found; zstandard support disabled") endif(zstd_FOUND) @@ -49,7 +49,7 @@ index b2e7724..0af7929 100644 endif(ENABLE_ZSTD) if (COMMONCRYPTO_FOUND) -@@ -347,15 +353,16 @@ foreach(LIB ${LIBS_PRIVATE}) +@@ -356,15 +362,16 @@ foreach(LIB ${LIBS_PRIVATE}) set(LIBS "${LIBS} -l${LIB}") endforeach() STRING(CONCAT zlib_link_name "-l" ${ZLIB_LINK_LIBRARY_NAME}) @@ -57,7 +57,7 @@ index b2e7724..0af7929 100644 -string(REGEX REPLACE "-lLibLZMA::LibLZMA" "-llzma" LIBS ${LIBS}) +string(REGEX REPLACE "-lBZip2::BZip2" "" LIBS ${LIBS}) +string(REGEX REPLACE "-lLibLZMA::LibLZMA" "" LIBS ${LIBS}) - if(ENABLE_ZSTD) + if(zstd_TARGET) - string(REGEX REPLACE "-l${zstd_TARGET}" "-lzstd" LIBS ${LIBS}) + string(REGEX REPLACE "-l${zstd_TARGET}" "" LIBS ${LIBS}) endif() diff --git a/ports/libzip/vcpkg.json b/ports/libzip/vcpkg.json index 7ff39ae3641b05..1b9e0cbfb0d1fd 100644 --- a/ports/libzip/vcpkg.json +++ b/ports/libzip/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libzip", - "version": "1.10.1", - "description": "A library for reading, creating, and modifying zip archives.", + "version": "1.11.3", + "description": "A C library for reading, creating, and modifying zip archives.", "homepage": "https://github.com/nih-at/libzip", "license": "BSD-3-Clause", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 9b16d64961a0aa..63f2f314d60b60 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5513,7 +5513,7 @@ "port-version": 0 }, "libzip": { - "baseline": "1.10.1", + "baseline": "1.11.3", "port-version": 0 }, "libzippp": { diff --git a/versions/l-/libzip.json b/versions/l-/libzip.json index 4e233d6ef19fa4..4c2b126505ac53 100644 --- a/versions/l-/libzip.json +++ b/versions/l-/libzip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c65a9b711fa88eb7e9680652f65a6c84f3af44c", + "version": "1.11.3", + "port-version": 0 + }, { "git-tree": "7f4b7231355f6774a5b6915dace3826173b76cee", "version": "1.10.1",