diff options
| author | Cédric Tabin <tabin.cedric@gmail.com> | 2020-09-24 20:44:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-24 11:44:22 -0700 |
| commit | d961529d7ffd822390b229dbd8ad29a94630dda0 (patch) | |
| tree | fee8e7442f3d026b60d9ab4382bae26e8e1fb610 | |
| parent | dfd60fa63b9e4ee6e473fed455553678acefddd6 (diff) | |
| download | vcpkg-d961529d7ffd822390b229dbd8ad29a94630dda0.tar.gz vcpkg-d961529d7ffd822390b229dbd8ad29a94630dda0.zip | |
[libzip] Update to libzip 1.7.3 (#13625)
* Update to libzip 1.7.3
* [libzip] Update CONTROL
Co-authored-by: Cédric Tabin <cedric.tabin@gmail.com>
Co-authored-by: wangli28 <wangli28@beyondsoft.com>
| -rw-r--r-- | ports/libzip/CONTROL | 3 | ||||
| -rw-r--r-- | ports/libzip/fix-findpackage.patch | 32 | ||||
| -rw-r--r-- | ports/libzip/portfile.cmake | 6 |
3 files changed, 11 insertions, 30 deletions
diff --git a/ports/libzip/CONTROL b/ports/libzip/CONTROL index 8a3d15137..d0f5e7fa0 100644 --- a/ports/libzip/CONTROL +++ b/ports/libzip/CONTROL @@ -1,6 +1,5 @@ Source: libzip -Version: 1.7.1 -Port-Version: 1 +Version: 1.7.3 Homepage: https://github.com/nih-at/libzip Build-Depends: zlib Default-Features: bzip2,default-aes diff --git a/ports/libzip/fix-findpackage.patch b/ports/libzip/fix-findpackage.patch index 94ef7d93a..7080a9ea0 100644 --- a/ports/libzip/fix-findpackage.patch +++ b/ports/libzip/fix-findpackage.patch @@ -1,35 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6e35082..d90c0c4 100644 +index 017f7cf0..9770c158 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -482,7 +482,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE("${PROJECT_NAME}.cmake.in" "${PROJECT_BINARY_DIR}/ - IF(LIBZIP_DO_INSTALL) - INSTALL(EXPORT ${PROJECT_NAME}-targets - FILE ${PROJECT_NAME}-targets.cmake +@@ -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 ) - ENDIF() - -@@ -494,7 +494,7 @@ EXPORT(TARGETS zip - IF(LIBZIP_DO_INSTALL) - INSTALL(FILES ${PROJECT_BINARY_DIR}/zipconf.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - INSTALL(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-version.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() - -diff --git a/libzip.cmake.in b/libzip.cmake.in -index 462439b..6caf754 100644 ---- a/libzip.cmake.in -+++ b/libzip.cmake.in -@@ -1,7 +1,7 @@ - @PACKAGE_INIT@ - - # Provide all our library targets to users. --include("@PACKAGE_CMAKE_INSTALL_LIBDIR@/cmake/libzip/libzip-targets.cmake") -+include("@PACKAGE_CMAKE_INSTALL_LIBDIR@/../share/libzip/libzip-targets.cmake") + endif() - get_filename_component(LIBZIP_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) - set(LIBZIP_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") diff --git a/ports/libzip/portfile.cmake b/ports/libzip/portfile.cmake index 131c3ccfc..eb42311b8 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 dcd9a0bfe1ac2893d7f62bafb19f0a4d7b08c0f7 #v1.7.1 - SHA512 33ad594398f79544636464d6ae0892553a212dc833b508820f81f10823c3a5c4016288d05953176fb8d52919414edd28f26da6037b93129a58826abdcb501d18 - HEAD_REF master + REF 66e496489bdae81bfda8b0088172871d8fda0032 #v1.7.3 + SHA512 ae0cda3e9decf5a71bf1e0907a2a21b2c0d83e6e576faf4d9401d6954707ae298c1c09febbc5339f457ace3577fdd405a790c819ef24778990ca6bf1e9516d54 + HEAD_REF v1.7.3 PATCHES fix-findpackage.patch ) |