Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[libzip] update to 1.11.3 #43573

Merged
merged 1 commit into from
Feb 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ports/libzip/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")

Expand Down
16 changes: 8 additions & 8 deletions ports/libzip/use-requires.patch
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -17,47 +17,47 @@ 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)
+list(APPEND REQUIRES zlib)
# 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)
+ list(APPEND REQUIRES bzip2)
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)
+ list(APPEND REQUIRES liblzma)
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)
+ list(APPEND REQUIRES libzstd)
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})
-string(REGEX REPLACE "-lBZip2::BZip2" "-lbz2" LIBS ${LIBS})
-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()
Expand Down
4 changes: 2 additions & 2 deletions ports/libzip/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5513,7 +5513,7 @@
"port-version": 0
},
"libzip": {
"baseline": "1.10.1",
"baseline": "1.11.3",
"port-version": 0
},
"libzippp": {
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libzip.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3c65a9b711fa88eb7e9680652f65a6c84f3af44c",
"version": "1.11.3",
"port-version": 0
},
{
"git-tree": "7f4b7231355f6774a5b6915dace3826173b76cee",
"version": "1.10.1",
Expand Down