From 9bb2319c418d6a625817765008645f53961461b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Tabin?= Date: Sun, 20 Jun 2021 11:23:07 +0200 Subject: [PATCH 1/7] Update to lizip 1.8.0 --- ports/libzip/portfile.cmake | 17 +++++++++-------- ports/libzip/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libzip.json | 5 +++++ 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ports/libzip/portfile.cmake b/ports/libzip/portfile.cmake index 23155a5e0a749d..686574100ca244 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,11 +11,12 @@ 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 + FEATURES + bzip2 ENABLE_BZIP2 + liblzma ENABLE_LZMA + openssl ENABLE_OPENSSL + wincrypto ENABLE_WINDOWS_CRYPTO + commoncrypto ENABLE_COMMONCRYPTO mbedtls ENABLE_MBEDTLS ) 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 2b77f92ecbdb86..c48e0609e36182 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..ab7326c202509d 100644 --- a/versions/l-/libzip.json +++ b/versions/l-/libzip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a3adaf767853bfd7f7f2d511f4e3ec9eb9fa0b46", + "version-semver": "1.8.0", + "port-version": 0 + }, { "git-tree": "519b00c1db73782b3527816055dffbcbdde805a0", "version-semver": "1.7.3", From 1ce9abb86a2f6e309feedf72fbe763539d3d4713 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Wed, 28 Jul 2021 10:15:41 +0800 Subject: [PATCH 2/7] update format libzip --- ports/libzip/portfile.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/libzip/portfile.cmake b/ports/libzip/portfile.cmake index 686574100ca244..9065e9121f198a 100644 --- a/ports/libzip/portfile.cmake +++ b/ports/libzip/portfile.cmake @@ -12,12 +12,12 @@ vcpkg_from_github( vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - bzip2 ENABLE_BZIP2 - liblzma ENABLE_LZMA - openssl ENABLE_OPENSSL - wincrypto ENABLE_WINDOWS_CRYPTO - commoncrypto ENABLE_COMMONCRYPTO - mbedtls ENABLE_MBEDTLS + bzip2 ENABLE_BZIP2 + liblzma ENABLE_LZMA + openssl ENABLE_OPENSSL + wincrypto ENABLE_WINDOWS_CRYPTO + commoncrypto ENABLE_COMMONCRYPTO + mbedtls ENABLE_MBEDTLS ) vcpkg_configure_cmake( From 23f29ab3d41277225cf265b942262fa2908751c7 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Wed, 28 Jul 2021 10:16:34 +0800 Subject: [PATCH 3/7] update version --- versions/l-/libzip.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libzip.json b/versions/l-/libzip.json index ab7326c202509d..c889621e6438c7 100644 --- a/versions/l-/libzip.json +++ b/versions/l-/libzip.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a3adaf767853bfd7f7f2d511f4e3ec9eb9fa0b46", + "git-tree": "8ab14b07f7092336b7de1041acfed67c42bc5ca2", "version-semver": "1.8.0", "port-version": 0 }, From 95592582e0b32a626e3c62267e3f4f0038cd61ce Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Wed, 28 Jul 2021 18:33:52 +0800 Subject: [PATCH 4/7] update patch --- ports/libzip/fix-findpackage.patch | 34 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ports/libzip/fix-findpackage.patch b/ports/libzip/fix-findpackage.patch index 7080a9ea01789f..9457c5114dcc6c 100644 --- a/ports/libzip/fix-findpackage.patch +++ b/ports/libzip/fix-findpackage.patch @@ -1,17 +1,17 @@ -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() - +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 93b46a6..e18d4d4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -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} ++ 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() + From 3b24eb58ced1ae08a5455c39cf9921dfcc170db7 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Wed, 28 Jul 2021 18:34:32 +0800 Subject: [PATCH 5/7] update version --- versions/l-/libzip.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libzip.json b/versions/l-/libzip.json index c889621e6438c7..645bd8eca7e64c 100644 --- a/versions/l-/libzip.json +++ b/versions/l-/libzip.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8ab14b07f7092336b7de1041acfed67c42bc5ca2", + "git-tree": "8ad457a79643096e1fd60bf1fef2a75eadb9a970", "version-semver": "1.8.0", "port-version": 0 }, From c379c3f95430abacc0b65e882fbc3257392c5376 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Wed, 28 Jul 2021 18:36:01 +0800 Subject: [PATCH 6/7] revert patch format --- ports/libzip/fix-findpackage.patch | 34 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/ports/libzip/fix-findpackage.patch b/ports/libzip/fix-findpackage.patch index 9457c5114dcc6c..8e187cb4a673ea 100644 --- a/ports/libzip/fix-findpackage.patch +++ b/ports/libzip/fix-findpackage.patch @@ -1,17 +1,17 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 93b46a6..e18d4d4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -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} -+ 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() - +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 93b46a6..e18d4d4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -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} ++ 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() + From d666512e3883abed4d02f81964c29962a2bc4e49 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Wed, 28 Jul 2021 18:36:30 +0800 Subject: [PATCH 7/7] update version --- versions/l-/libzip.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libzip.json b/versions/l-/libzip.json index 645bd8eca7e64c..7f27dd28347268 100644 --- a/versions/l-/libzip.json +++ b/versions/l-/libzip.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8ad457a79643096e1fd60bf1fef2a75eadb9a970", + "git-tree": "2dc6684aee5cd628c79fcd030452267a0bf2361b", "version-semver": "1.8.0", "port-version": 0 },