diff options
| author | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2019-11-21 11:38:34 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-21 11:38:34 -0800 |
| commit | c53db2c90c789267ca2f1c70c8f64fd238943369 (patch) | |
| tree | 96f463754b0f7f699b37a40f31c7d21b190aaeb4 | |
| parent | 1978de60ff01b3f2d805f8a3ba5396c2565d844b (diff) | |
| parent | 2918ff5c4042f6078f21463ae3ef5478ac4d1eb7 (diff) | |
| download | vcpkg-c53db2c90c789267ca2f1c70c8f64fd238943369.tar.gz vcpkg-c53db2c90c789267ca2f1c70c8f64fd238943369.zip | |
[libzip] Fix patch not applying (#8918)
* [libzip]Update patch to avoid patch failure.
* [libzip]Fix the version in CONTROL file.
| -rw-r--r-- | ports/libzip/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libzip/avoid_computation_on_void_pointer.patch | 26 | ||||
| -rw-r--r-- | ports/libzip/portfile.cmake | 6 |
3 files changed, 16 insertions, 18 deletions
diff --git a/ports/libzip/CONTROL b/ports/libzip/CONTROL index bac06fac9..a01feac85 100644 --- a/ports/libzip/CONTROL +++ b/ports/libzip/CONTROL @@ -1,5 +1,5 @@ Source: libzip -Version: rel-1-5-2 +Version: rel-1-5-2--1 Homepage: https://github.com/nih-at/libzip Build-Depends: zlib Default-Features: openssl, bzip2 diff --git a/ports/libzip/avoid_computation_on_void_pointer.patch b/ports/libzip/avoid_computation_on_void_pointer.patch index cbd38bfa9..a655063f4 100644 --- a/ports/libzip/avoid_computation_on_void_pointer.patch +++ b/ports/libzip/avoid_computation_on_void_pointer.patch @@ -1,13 +1,13 @@ -diff --git a/lib/zip_source_winzip_aes_encode.c b/lib/zip_source_winzip_aes_encode.c
-
---- a/lib/zip_source_winzip_aes_encode.c
-+++ b/lib/zip_source_winzip_aes_encode.c
-@@ -163,7 +163,7 @@ winzip_aes_encrypt(zip_source_t *src, void *ud, void *data, zip_uint64_t length,
- /* TODO: return partial read? */
- return -1;
- }
-- buffer_n += _zip_buffer_read(ctx->buffer, data + ret, length - (zip_uint64_t)ret);
-+ buffer_n += _zip_buffer_read(ctx->buffer, (zip_uint8_t *)data + ret, length - (zip_uint64_t)ret);
- }
-
- return (zip_int64_t)(buffer_n + (zip_uint64_t)ret);
+diff --git a/lib/zip_source_winzip_aes_encode.c b/lib/zip_source_winzip_aes_encode.c +index c428c9a..4e5f753 100644 +--- a/lib/zip_source_winzip_aes_encode.c ++++ b/lib/zip_source_winzip_aes_encode.c +@@ -163,7 +163,7 @@ winzip_aes_encrypt(zip_source_t *src, void *ud, void *data, zip_uint64_t length, + /* TODO: return partial read? */ + return -1; + } +- buffer_n += _zip_buffer_read(ctx->buffer, data + ret, length - (zip_uint64_t)ret); ++ buffer_n += _zip_buffer_read(ctx->buffer, (zip_uint8_t *)data + ret, length - (zip_uint64_t)ret); + } + + return (zip_int64_t)(buffer_n + (zip_uint64_t)ret); diff --git a/ports/libzip/portfile.cmake b/ports/libzip/portfile.cmake index 92ef4109b..7478937f4 100644 --- a/ports/libzip/portfile.cmake +++ b/ports/libzip/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nih-at/libzip @@ -33,6 +32,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +vcpkg_copy_pdbs() # Remove include directories from lib file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/libzip ${CURRENT_PACKAGES_DIR}/debug/lib/libzip) @@ -41,6 +41,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/libzip ${CURRENT_PACKAGES_DIR}/d file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Copy copright information -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libzip RENAME copyright) - -vcpkg_copy_pdbs() +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |