[libzip] Update to 1.8.0 (#21407)

* Update libzip to 1.8.0

* Update CI baseline

Co-authored-by: chausner <chausner@users.noreply.github.com>

ports/libzip/fix-dependency.patch

@@ -2,7 +2,7 @@ diff --git a/libzip-config.cmake.in b/libzip-config.cmake.in
 index 5b9aa55..0723f3c 100644
 --- a/libzip-config.cmake.in
 +++ b/libzip-config.cmake.in
-@@ -1,8 +1,17 @@
+@@ -1,8 +1,20 @@
  @PACKAGE_INIT@
  
  # only needed for static library, and doesn't work as-is
@@ -15,6 +15,9 @@ index 5b9aa55..0723f3c 100644
 +if(@ENABLE_LZMA@)
 +    find_dependency(LibLZMA)
 +endif()
++if(@ENABLE_ZSTD@)
++    find_dependency(Zstd)
++endif()
 +if(@ENABLE_OPENSSL@)
 +    find_dependency(OpenSSL)
 +endif()

ports/libzip/fix-findpackage.patch

@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 017f7cf0..9770c158 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -437,10 +437,10 @@ export(TARGETS zip
- if(LIBZIP_DO_INSTALL)
-   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}
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
-     )
-   install(EXPORT ${PROJECT_NAME}-targets NAMESPACE libzip:: FILE ${PROJECT_NAME}-targets.cmake
--    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
-     )
- endif()
- 

ports/libzip/portfile.cmake

@@ -1,27 +1,27 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nih-at/libzip
-    REF 66e496489bdae81bfda8b0088172871d8fda0032 #v1.7.3
-    SHA512 ae0cda3e9decf5a71bf1e0907a2a21b2c0d83e6e576faf4d9401d6954707ae298c1c09febbc5339f457ace3577fdd405a790c819ef24778990ca6bf1e9516d54
-    HEAD_REF v1.7.3
-    PATCHES 
-        fix-findpackage.patch
+    REF v1.8.0
+    SHA512 f7a78ff6d964a485b8fe3dfb7a61afae69984e67367e6de78c3cb10f15a0904800a1aeca9d33b63bc24ca926fff98638914343a35e7c3a4c3ec8b7594fc25fc1
+    HEAD_REF master
+    PATCHES
         fix-dependency.patch
 )
 
 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
+        zstd ENABLE_ZSTD
+        openssl ENABLE_OPENSSL
+        wincrypto ENABLE_WINDOWS_CRYPTO
+        commoncrypto ENABLE_COMMONCRYPTO
+        mbedtls ENABLE_MBEDTLS
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
         -DBUILD_DOC=OFF
@@ -31,18 +31,18 @@ vcpkg_configure_cmake(
         -DENABLE_GNUTLS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libzip)
 vcpkg_fixup_pkgconfig()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+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)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/libzip" "${CURRENT_PACKAGES_DIR}/debug/lib/libzip")
 
 # Remove debug include
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Copy copright information
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

ports/libzip/vcpkg.json

@@ -1,10 +1,17 @@
 {
   "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": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     "zlib"
   ],
   "default-features": [
@@ -19,7 +26,7 @@
       ]
     },
     "commoncrypto": {
-      "description": "AES( encryption) support using Apple's Common Crypto API"
+      "description": "AES (encryption) support using Apple's Common Crypto API"
     },
     "default-aes": {
       "description": "Use default AES",
@@ -70,6 +77,12 @@
     },
     "wincrypto": {
       "description": "AES (encryption) support using Windows Crypto API"
+    },
+    "zstd": {
+      "description": "Support Zstandard-compressed zip archives",
+      "dependencies": [
+        "zstd"
+      ]
     }
   }
 }

versions/baseline.json

@@ -4077,8 +4077,8 @@
       "port-version": 1
     },
     "libzip": {
-      "baseline": "1.7.3",
-      "port-version": 2
+      "baseline": "1.8.0",
+      "port-version": 0
     },
     "libzippp": {
       "baseline": "5.0-1.8.0",

versions/l-/libzip.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "aac0a6e50e8ada73d9bfeb5a5ce5e631fd37fce8",
+      "version-semver": "1.8.0",
+      "port-version": 0
+    },
     {
       "git-tree": "519b00c1db73782b3527816055dffbcbdde805a0",
       "version-semver": "1.7.3",