diff --git a/ports/libzip/fix-findpackage.patch b/ports/libzip/fix-findpackage.patch index 7080a9ea01789f..8e187cb4a673ea 100644 --- a/ports/libzip/fix-findpackage.patch +++ b/ports/libzip/fix-findpackage.patch @@ -1,9 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 017f7cf0..9770c158 100644 +index 93b46a6..e18d4d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -437,10 +437,10 @@ export(TARGETS zip - if(LIBZIP_DO_INSTALL) +@@ -437,10 +437,10 @@ if(LIBZIP_DO_INSTALL) + # installation install(FILES ${PROJECT_BINARY_DIR}/zipconf.h DESTINATION include) install(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} diff --git a/ports/libzip/portfile.cmake b/ports/libzip/portfile.cmake index 23155a5e0a749d..9065e9121f198a 100644 --- a/ports/libzip/portfile.cmake +++ b/ports/libzip/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nih-at/libzip - REF 66e496489bdae81bfda8b0088172871d8fda0032 #v1.7.3 - SHA512 ae0cda3e9decf5a71bf1e0907a2a21b2c0d83e6e576faf4d9401d6954707ae298c1c09febbc5339f457ace3577fdd405a790c819ef24778990ca6bf1e9516d54 - HEAD_REF v1.7.3 + REF 26ba5523db09213f532821875542dba7afa04b65 #v1.8.0 + SHA512 caa4610e10a45260d8f06e4e728b231f0fcfacd90d3091a096b273997b7505857a78a8013d0571c3b25543d894eb049d1e7f5385e910066e464b3d208390570f + HEAD_REF master PATCHES fix-findpackage.patch fix-dependency.patch @@ -11,12 +11,13 @@ vcpkg_from_github( vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS - bzip2 ENABLE_BZIP2 - liblzma ENABLE_LZMA - openssl ENABLE_OPENSSL - wincrypto ENABLE_WINDOWS_CRYPTO - commoncrypto ENABLE_COMMONCRYPTO - mbedtls ENABLE_MBEDTLS + FEATURES + bzip2 ENABLE_BZIP2 + liblzma ENABLE_LZMA + openssl ENABLE_OPENSSL + wincrypto ENABLE_WINDOWS_CRYPTO + commoncrypto ENABLE_COMMONCRYPTO + mbedtls ENABLE_MBEDTLS ) vcpkg_configure_cmake( diff --git a/ports/libzip/vcpkg.json b/ports/libzip/vcpkg.json index eb56141f86d935..7fc9d36dc45b39 100644 --- a/ports/libzip/vcpkg.json +++ b/ports/libzip/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libzip", - "version-semver": "1.7.3", - "port-version": 2, + "version-semver": "1.8.0", "description": "A library for reading, creating, and modifying zip archives.", "homepage": "https://github.com/nih-at/libzip", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a5bfbc3b0d6c39..a89fb1195f6366 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3781,8 +3781,8 @@ "port-version": 0 }, "libzip": { - "baseline": "1.7.3", - "port-version": 2 + "baseline": "1.8.0", + "port-version": 0 }, "libzippp": { "baseline": "4.1-1.8.0", diff --git a/versions/l-/libzip.json b/versions/l-/libzip.json index 1d40ee0934a3da..7f27dd28347268 100644 --- a/versions/l-/libzip.json +++ b/versions/l-/libzip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2dc6684aee5cd628c79fcd030452267a0bf2361b", + "version-semver": "1.8.0", + "port-version": 0 + }, { "git-tree": "519b00c1db73782b3527816055dffbcbdde805a0", "version-semver": "1.7.3",