From 1459dbfa51d5147b41182cb84cca94166a517925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miodrag=20Milanovi=C4=87?= <mmicko@gmail.com>
Date: Tue, 3 Jul 2018 09:59:02 +0200
Subject: [PATCH] Fix for python3 compile, fixes issue 3715 (#3827)

* Fix for python3 compile, fixes issue 3715

* [python3] Use PATCHES of vcpkg_from_github
---
 .../python3/0005-Fix-DefaultWindowsSDKVersion.patch  | 12 ++++++++++++
 ports/python3/CONTROL                                |  2 +-
 ports/python3/portfile.cmake                         |  5 +----
 3 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 ports/python3/0005-Fix-DefaultWindowsSDKVersion.patch

diff --git a/ports/python3/0005-Fix-DefaultWindowsSDKVersion.patch b/ports/python3/0005-Fix-DefaultWindowsSDKVersion.patch
new file mode 100644
index 0000000000..13f7b39e09
--- /dev/null
+++ b/ports/python3/0005-Fix-DefaultWindowsSDKVersion.patch
@@ -0,0 +1,12 @@
+diff --git a/PCbuild/python.props b/PCbuild/python.props
+--- a/PCbuild/python.props
++++ b/PCbuild/python.props
+@@ -76,7 +76,7 @@
+    -->
+    <_RegistryVersion>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</_RegistryVersion>
+    <_RegistryVersion Condition="$(_RegistryVersion) == ''">$(Registry:HKEY_LOCAL_MACHINE\WOW6432Node\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</_RegistryVersion>
+-    <DefaultWindowsSDKVersion>10.0.15063.0</DefaultWindowsSDKVersion>
++    <DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion>
+    <DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.14393'">10.0.14393.0</DefaultWindowsSDKVersion>
+    <DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.10586'">10.0.10586.0</DefaultWindowsSDKVersion>
+    <DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.10240'">10.0.10240.0</DefaultWindowsSDKVersion>
diff --git a/ports/python3/CONTROL b/ports/python3/CONTROL
index c8331f8cf6..26a0bce938 100644
--- a/ports/python3/CONTROL
+++ b/ports/python3/CONTROL
@@ -1,3 +1,3 @@
 Source: python3
-Version: 3.6.4-1
+Version: 3.6.4-2
 Description: The Python programming language as an embeddable library
\ No newline at end of file
diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake
index 16b3a3db3d..576a35e8a6 100644
--- a/ports/python3/portfile.cmake
+++ b/ports/python3/portfile.cmake
@@ -16,12 +16,9 @@ vcpkg_from_github(
     REF v${PYTHON_VERSION}
     SHA512 32cca5e344ee66f08712ab5533e5518f724f978ec98d985f7612d0bd8d7f5cac25625363c9eead192faf1806d4ea3393515f72ba962a2a0bed26261e56d8c637
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${TEMP_SOURCE_PATH}
     PATCHES
         ${CMAKE_CURRENT_LIST_DIR}/0004-Fix-iomodule-for-RS4-SDK.patch
+        ${CMAKE_CURRENT_LIST_DIR}/0005-Fix-DefaultWindowsSDKVersion.patch
 )
 
 # We need per-triplet directories because we need to patch the project files differently based on the linkage