From 4ad8fc2a830382165cd2aed0cd31d6249e507999 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Mon, 25 Jul 2022 23:39:36 +0200
Subject: [PATCH] [Minizip] enable clang-cl builds (#25960)

* minizip enable clang-cl builds

* v db

* update scripts in port

* v db
---
 ports/minizip/0004-define.patch | 13 +++++++++++++
 ports/minizip/portfile.cmake    | 18 +++++++++---------
 ports/minizip/vcpkg.json        | 10 +++++++++-
 versions/baseline.json          |  2 +-
 versions/m-/minizip.json        |  5 +++++
 5 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 ports/minizip/0004-define.patch

diff --git a/ports/minizip/0004-define.patch b/ports/minizip/0004-define.patch
new file mode 100644
index 0000000000..f7bf5ff6f0
--- /dev/null
+++ b/ports/minizip/0004-define.patch
@@ -0,0 +1,13 @@
+diff --git a/contrib/minizip/iowin32.c b/contrib/minizip/iowin32.c
+index 274f39eb1..9736fbb0f 100644
+--- a/contrib/minizip/iowin32.c
++++ b/contrib/minizip/iowin32.c
+@@ -27,7 +27,7 @@
+ 
+ 
+ // see Include/shared/winapifamily.h in the Windows Kit
+-#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
++#if defined(WINAPI_FAMILY_ONE_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
+ #if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
+ #define IOWIN32_USING_WINRT_API 1
+ #endif
diff --git a/ports/minizip/portfile.cmake b/ports/minizip/portfile.cmake
index 5e5a56e38a..006df5863b 100644
--- a/ports/minizip/portfile.cmake
+++ b/ports/minizip/portfile.cmake
@@ -10,18 +10,18 @@ vcpkg_from_github(
         0001-remove-ifndef-NOUNCRYPT.patch
         0002-add-declaration-for-mkdir.patch
         0003-no-io64.patch
+        0004-define.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     bzip2 ENABLE_BZIP2
 )
 
-configure_file(${CMAKE_CURRENT_LIST_DIR}/minizipConfig.cmake.in  ${SOURCE_PATH}/cmake/minizipConfig.cmake.in COPYONLY)
-configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt  ${SOURCE_PATH}/CMakeLists.txt COPYONLY)
+configure_file("${CMAKE_CURRENT_LIST_DIR}/minizipConfig.cmake.in" "${SOURCE_PATH}/cmake/minizipConfig.cmake.in" COPYONLY)
+configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY)
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
         -DDISABLE_INSTALL_TOOLS=${VCPKG_TARGET_IS_IOS}
@@ -29,10 +29,10 @@ vcpkg_configure_cmake(
         -DDISABLE_INSTALL_HEADERS=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/minizip)
+vcpkg_cmake_config_fixup()
+vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/minizip")
 
 if ("bzip2" IN_LIST FEATURES)
     file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/minizip/*.h")
@@ -43,4 +43,4 @@ if ("bzip2" IN_LIST FEATURES)
     endforeach()
 endif()
 
-file(INSTALL ${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/minizip/vcpkg.json b/ports/minizip/vcpkg.json
index c8bc8dbb6d..31a55ac100 100644
--- a/ports/minizip/vcpkg.json
+++ b/ports/minizip/vcpkg.json
@@ -1,11 +1,19 @@
 {
   "name": "minizip",
   "version-semver": "1.2.11",
-  "port-version": 10,
+  "port-version": 11,
   "description": "Zip compression library",
   "homepage": "https://github.com/madler/zlib",
   "supports": "!uwp",
   "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     "zlib"
   ],
   "features": {
diff --git a/versions/baseline.json b/versions/baseline.json
index 16821979ad..541d6f05d3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4622,7 +4622,7 @@
     },
     "minizip": {
       "baseline": "1.2.11",
-      "port-version": 10
+      "port-version": 11
     },
     "minizip-ng": {
       "baseline": "3.0.5",
diff --git a/versions/m-/minizip.json b/versions/m-/minizip.json
index 5931b7c320..9c1239b4e6 100644
--- a/versions/m-/minizip.json
+++ b/versions/m-/minizip.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "528703ed8d2b78aeaa55695765535efafa24540b",
+      "version-semver": "1.2.11",
+      "port-version": 11
+    },
     {
       "git-tree": "c3bec48dc73b936a25a26a9ec1941aac9e39fcf1",
       "version-semver": "1.2.11",