Bump libzip to 1.6.1 and Patch Mingw compile errors

Author: dellis1972

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "external/libzip"]
 	path = external/libzip
 	url = https://github.com/nih-at/libzip.git
+[submodule "external/vcpkg"]
+	path = external/vcpkg
+	url = https://github.com/Microsoft/vcpkg

azure-pipelines.yml

@@ -14,6 +14,42 @@ variables:
 stages:
   - stage: Build
     jobs:
+    - job: buildWindows
+      pool:
+        vmImage: vs2017-win2016
+      steps:
+        - script: |
+            echo "Hello"
+            git submodule update --init --recursive
+            cd external/vcpkg
+            bootstrap-vcpkg.bat
+          displayName: "Build vcpkg"
+        - script: |
+            vcpkg integrate install
+        - script: |
+            vcpkg install zlib:x64-windows bzip2:x64-windows zlib:x86-windows bzip2:x86-windows
+        - script: |
+            vcpkg list
+        - script: |
+            cd ..\..
+          displayName: "Install Dependencies"
+        - script: |
+            mkdir build\Windows\64
+            cd build\Windows\64
+            cmake -DCMAKE_TOOLCHAIN_FILE=%cd%/../../../external/vcpkg/scripts/buildsystems/vcpkg.cmake ..\..\..\external\libzip -G "Visual Studio 15 2017 Win64" -DBUILD_SHARED_LIBS=on
+        - script: |
+            cmake --build . --config Release
+          displayName: "Build LibZip x64"
+        - script: |
+            cd ..\..\..
+        - script: |
+            mkdir build\Windows\32
+            cd build\Windows\32
+            cmake -DCMAKE_TOOLCHAIN_FILE=%cd%/../../../external/vcpkg/scripts/buildsystems/vcpkg.cmake ..\..\..\external\libzip -G "Visual Studio 15 2017" -DBUILD_SHARED_LIBS=on
+          displayName: "Generate Build"
+        - script: |
+            cmake --build . --config Release
+          displayName: "Build LibZip x86"
     - job: buildlinux
       pool:
         vmImage: ubuntu-16.04
@@ -36,14 +72,14 @@ stages:
           displayName: 'Build Linux x86'
         - task: ArchiveFiles@2
           inputs:
-            rootFolderOrFile: build/Linux/32/lib/libzip.so.5.0
+            rootFolderOrFile: build/Linux/32/lib/libzip.so.5.1
             includeRootFolder: false 
             archiveType: 7z
             replaceExistingArchive: true 
             archiveFile: $(Build.ArtifactStagingDirectory)/libzip-linux-x86.7z
         - task: ArchiveFiles@2
           inputs:
-            rootFolderOrFile: build/Linux/64/lib/libzip.so.5.0
+            rootFolderOrFile: build/Linux/64/lib/libzip.so.5.1
             includeRootFolder: false 
             archiveType: 7z
             replaceExistingArchive: true 
@@ -54,7 +90,9 @@ stages:
             artifactName: 'native'
             pathtoPublish: $(Build.ArtifactStagingDirectory)
     - job: build
-      dependsOn: buildlinux
+      dependsOn:
+        - buildlinux
+#        - buildWindows
       pool:
         vmImage: xcode9-macos10.13
       steps:
@@ -66,7 +104,14 @@ stages:
             git submodule update --init --recursive
         - bash: |
             HOSTOS=Darwin ./build_native
+          displayName: 'Build Darwin'
+        - bash: |
+            patch --verbose -d external/libzip -p1 -l < libzip-windows.patch
+          displayName: 'Apply Windows Patch'
+        - bash: |
             ./build_windows
+          displayName: 'Build Windows'
+        - bash: |
             mkdir -p build/Linux/64
             mkdir -p build/Linux/32
             find build/* | grep libzip
@@ -86,8 +131,8 @@ stages:
             archiveFilePatterns: $(Build.ArtifactStagingDirectory)/native/libzip-linux-x86.7z
             destinationFolder: build/Linux/32
         - bash: |
-            mv build/Linux/32/libzip.so.5.0 build/Linux/32/libzip.so
-            mv build/Linux/64/libzip.so.5.0 build/Linux/64/libzip.so
+            mv build/Linux/32/libzip.so.5.1 build/Linux/32/libzip.so
+            mv build/Linux/64/libzip.so.5.1 build/Linux/64/libzip.so
             rm $(Build.ArtifactStagingDirectory)/native/libzip-linux-*.7z
           displayName: 'Find libzip'
         - task: MSBuild@1

external/libzip

@@ -43,7 +43,7 @@
             <Link>libZipSharp.dll.config</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Include="build\Darwin\64\lib\libzip.5.0.dylib" PackagePath="runtimes\osx\native\libzip.dylib" Pack="true" />
+        <None Include="build\Darwin\64\lib\libzip.5.1.dylib" PackagePath="runtimes\osx\native\libzip.dylib" Pack="true" />
         <None Include="build\Windows\64\lib\libzip.dll" PackagePath="runtimes\win-x64\native\libzip.dll" Pack="true" />
         <None Include="build\Windows\32\lib\libzip.dll" PackagePath="runtimes\win-x86\native\libzip.dll" Pack="true" />
         <None Include="build\Linux\64\libzip.so" PackagePath="runtimes\linux-x64\native\libzip.so" Pack="true" />

external/vcpkg

@@ -2,12 +2,11 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
 index 92c4becc..e58b7db3 100644
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
-@@ -211,7 +211,7 @@ ENDIF()
- 
- ADD_LIBRARY(zip ${LIBZIP_SOURCES} ${LIBZIP_EXTRA_FILES} ${LIBZIP_OPTIONAL_FILES} ${LIBZIP_OPSYS_FILES})
- SET_TARGET_PROPERTIES(zip PROPERTIES VERSION 5.0 SOVERSION 5)
--TARGET_LINK_LIBRARIES(zip ${ZLIB_LIBRARY} ${OPTIONAL_LIBRARY})
-+TARGET_LINK_LIBRARIES(zip ${ZLIB_LIBRARY} ${OPTIONAL_LIBRARY} OpenSSL::Crypto -ldl -pthread)
+@@ -228,7 +228,7 @@ ENDIF()
+
+
+-TARGET_LINK_LIBRARIES(zip PRIVATE ${ZLIB_LIBRARIES} ${OPTIONAL_LIBRARY})
++TARGET_LINK_LIBRARIES(zip PRIVATE ${ZLIB_LIBRARY} ${OPTIONAL_LIBRARY} OpenSSL::Crypto -ldl -pthread)
  INSTALL(TARGETS zip
    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

libZipSharp.csproj

@@ -0,0 +1,29 @@
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index d5bf5804..d80c5b53 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -164,6 +164,8 @@ SET(LIBZIP_SOURCES
+ 
+ IF(WIN32)
+   SET(LIBZIP_OPSYS_FILES
++    zip_mkstempm.c
++    zip_random_win32.c
+     zip_source_win32handle.c
+     zip_source_win32utf8.c
+     zip_source_win32w.c
+diff --git a/lib/zip_random_win32.c b/lib/zip_random_win32.c
+index 16d0f647..ae273b31 100644
+--- a/lib/zip_random_win32.c
++++ b/lib/zip_random_win32.c
+@@ -72,9 +72,9 @@ zip_random_uint32(void) {
+     }
+     
+     if (!seeded) {
+-        srandom((unsigned int)time(NULL));
++        srand((unsigned int)time(NULL));
+     }
+     
+-    return (zip_uint32_t)random();
++    return (zip_uint32_t)rand();
+ }
+ #endif