From 55ed2f6ed8cd11f1918e52889c4dc4d008c1420c Mon Sep 17 00:00:00 2001
From: Larry-Hu <v-daih@microsoft.com>
Date: Thu, 31 May 2018 00:33:33 -0700
Subject: [PATCH 1/2] Fix warning C4643 in clockutils

---
 ports/clockutils/CONTROL                |  2 +-
 ports/clockutils/fix-warningC4643.patch | 29 +++++++++++++++++++++++++
 ports/clockutils/portfile.cmake         |  5 +++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 ports/clockutils/fix-warningC4643.patch

diff --git a/ports/clockutils/CONTROL b/ports/clockutils/CONTROL
index 59950365d..5a3325350 100644
--- a/ports/clockutils/CONTROL
+++ b/ports/clockutils/CONTROL
@@ -1,3 +1,3 @@
 Source: clockutils
-Version: 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-1
+Version: 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-2
 Description: A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed.
diff --git a/ports/clockutils/fix-warningC4643.patch b/ports/clockutils/fix-warningC4643.patch
new file mode 100644
index 000000000..49bc32386
--- /dev/null
+++ b/ports/clockutils/fix-warningC4643.patch
@@ -0,0 +1,29 @@
+diff --git a/include/clockUtils/sockets/TcpSocket.h b/include/clockUtils/sockets/TcpSocket.h
+index 6e0d9c8..3bb97a9 100644
+--- a/include/clockUtils/sockets/TcpSocket.h
++++ b/include/clockUtils/sockets/TcpSocket.h
+@@ -57,9 +57,6 @@
+ 	#define INVALID_SOCKET -1
+ #endif
+ 
+-namespace std {
+-	class thread;
+-} /* namespace std */
+ namespace clockUtils {
+ 	enum class ClockError;
+ namespace sockets {
+diff --git a/include/clockUtils/sockets/UdpSocket.h b/include/clockUtils/sockets/UdpSocket.h
+index 31eeeb5..c5da451 100644
+--- a/include/clockUtils/sockets/UdpSocket.h
++++ b/include/clockUtils/sockets/UdpSocket.h
+@@ -60,10 +60,6 @@
+ 	#define INVALID_SOCKET -1
+ #endif
+ 
+-namespace std {
+-	class thread;
+-} /* namespace std */
+-
+ namespace clockUtils {
+ 	enum class ClockError;
+ namespace sockets {
diff --git a/ports/clockutils/portfile.cmake b/ports/clockutils/portfile.cmake
index 33f0b1f83..433cc0b0a 100644
--- a/ports/clockutils/portfile.cmake
+++ b/ports/clockutils/portfile.cmake
@@ -14,6 +14,11 @@ else()
     SET(SHARED_FLAG OFF)
 endif()
 
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES "${CURRENT_PORT_DIR}/fix-warningC4643.patch"
+)
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS

From 0a3f7be8b237efde93343b248e3b23ed9d5b13cd Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 31 May 2018 13:52:01 -0700
Subject: [PATCH 2/2] [clockutils] Use vcpkg_from_github()

---
 ports/clockutils/portfile.cmake | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/ports/clockutils/portfile.cmake b/ports/clockutils/portfile.cmake
index 433cc0b0a..28a1de440 100644
--- a/ports/clockutils/portfile.cmake
+++ b/ports/clockutils/portfile.cmake
@@ -1,12 +1,14 @@
 include(vcpkg_common_functions)
-set(VERSION 3651f232c27074c4ceead169e223edf5f00247c5)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/clockUtils-${VERSION})
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/ClockworkOrigins/clockUtils/archive/${VERSION}.tar.gz"
-    FILENAME "clockUtils-${VERSION}.tar.gz"
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ClockworkOrigins/clockUtils
+    REF 3651f232c27074c4ceead169e223edf5f00247c5
     SHA512 ddb70cae9ced25de77a2df1854dac15e58a77347042ba3ee9c691f85f49edbc6539c84929a7477d429fb9161ba24c57d24d767793b8b1180216d5ddfc5d3ed6a
+    HEAD_REF dev-1.2
+    PATCHES
+        "${CURRENT_PORT_DIR}/fix-warningC4643.patch"
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
     SET(SHARED_FLAG ON)
@@ -14,11 +16,6 @@ else()
     SET(SHARED_FLAG OFF)
 endif()
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CURRENT_PORT_DIR}/fix-warningC4643.patch"
-)
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS