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.

Sign up for GitHub

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 version 1.8.0 #18552

Closed
wants to merge 8 commits into from
Closed

[libzip] Update to version 1.8.0 #18552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9bb2319
Update to lizip 1.8.0
Jun 20, 2021
8e71661
Merge branch 'master' of https://github.com/Microsoft/vcpkg into upda…
JonLiu1993 Jul 28, 2021
1ce9abb
update format libzip
JonLiu1993 Jul 28, 2021
23f29ab
update version
JonLiu1993 Jul 28, 2021
9559258
update patch
JonLiu1993 Jul 28, 2021
3b24eb5
update version
JonLiu1993 Jul 28, 2021
c379c3f
revert patch format
JonLiu1993 Jul 28, 2021
d666512
update version
JonLiu1993 Jul 28, 2021
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
6 changes: 3 additions & 3 deletions ports/libzip/fix-findpackage.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
19 changes: 10 additions & 9 deletions ports/libzip/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
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
)

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(
Expand Down
3 changes: 1 addition & 2 deletions ports/libzip/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libzip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2dc6684aee5cd628c79fcd030452267a0bf2361b",
"version-semver": "1.8.0",
"port-version": 0
},
{
"git-tree": "519b00c1db73782b3527816055dffbcbdde805a0",
"version-semver": "1.7.3",
Expand Down