From ce28d9322798438974431b416262b1d3ed89c89d Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Tue, 5 Nov 2019 19:20:00 -0800
Subject: [libzip]Update patch to avoid patch failure.

---
 ports/libzip/CONTROL                               |  2 +-
 .../libzip/avoid_computation_on_void_pointer.patch | 26 +++++++++++-----------
 ports/libzip/portfile.cmake                        |  6 ++---
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/ports/libzip/CONTROL b/ports/libzip/CONTROL
index bac06fac9..43adc2206 100644
--- a/ports/libzip/CONTROL
+++ b/ports/libzip/CONTROL
@@ -1,5 +1,5 @@
 Source: libzip
-Version: rel-1-5-2
+Version: rel-1-5-3
 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)
-- 
cgit v1.2.3


From 2918ff5c4042f6078f21463ae3ef5478ac4d1eb7 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Tue, 19 Nov 2019 21:35:38 -0800
Subject: [libzip]Fix the version in CONTROL file.

---
 ports/libzip/CONTROL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/libzip/CONTROL b/ports/libzip/CONTROL
index 43adc2206..a01feac85 100644
--- a/ports/libzip/CONTROL
+++ b/ports/libzip/CONTROL
@@ -1,5 +1,5 @@
 Source: libzip
-Version: rel-1-5-3
+Version: rel-1-5-2--1
 Homepage: https://github.com/nih-at/libzip
 Build-Depends: zlib
 Default-Features: openssl, bzip2
-- 
cgit v1.2.3