From 9af036fc0ef9dd4bf23c48c7dc8da372442d9056 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Thu, 14 Dec 2017 19:06:12 -0800
Subject: [cpprestsdk] Update to 2.10.1

---
 ports/cpprestsdk/CONTROL        | 2 +-
 ports/cpprestsdk/portfile.cmake | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ports/cpprestsdk')

diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL
index 48b7a26e0..bfc2c7fe4 100644
--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@@ -1,5 +1,5 @@
 Source: cpprestsdk
-Version: 2.10.0
+Version: 2.10.1
 Build-Depends: zlib, openssl (windows), boost (windows), websocketpp (windows)
 Description: C++11 JSON, REST, and OAuth library
   The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services.
diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake
index 6f339c48a..be7423997 100644
--- a/ports/cpprestsdk/portfile.cmake
+++ b/ports/cpprestsdk/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/cpprestsdk
-    REF v2.10.0
-    SHA512 78e7a38c21db5b563d08cb082bfa96360ac44c66f2189a614d3d2bb71655fd82d931f138590d2dba2d6a4c0884ae37a5be34ea3b753c3517bd68ce490daf60b4
+    REF v2.10.1
+    SHA512 f6a93e5e87e27db724ccc028326b1dce243617cb0ae0d101b2cea700c4f264c073cb0e8a9d88a14be165e16ef2f1f43a17e49278087bc8cf372e623a1b6a9c47
     HEAD_REF master
 )
 
-- 
cgit v1.2.3


From b79395c4adf076dc57db2f7c1b0c38db4cc94f72 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Tue, 5 Dec 2017 13:01:50 -0800
Subject: Update downstream libraries to use modularized boost

---
 ports/cpprestsdk/CONTROL            |  4 ++--
 ports/cpprestsdk/portfile.cmake     |  6 ++++++
 ports/cpprestsdk/undef-minmax.patch | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 ports/cpprestsdk/undef-minmax.patch

(limited to 'ports/cpprestsdk')

diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL
index bfc2c7fe4..5dcd880f0 100644
--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@@ -1,5 +1,5 @@
 Source: cpprestsdk
-Version: 2.10.1
-Build-Depends: zlib, openssl (windows), boost (windows), websocketpp (windows)
+Version: 2.10.1-1
+Build-Depends: zlib, openssl (windows), boost-system (windows), boost-date-time (windows), boost-regex (windows), websocketpp (windows)
 Description: C++11 JSON, REST, and OAuth library
   The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services.
diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake
index be7423997..ca22f2a5c 100644
--- a/ports/cpprestsdk/portfile.cmake
+++ b/ports/cpprestsdk/portfile.cmake
@@ -16,6 +16,11 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
         -DWEBSOCKETPP_CONFIG_VERSION=${WEBSOCKETPP_PATH})
 endif()
 
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES "${CMAKE_CURRENT_LIST_DIR}/undef-minmax.patch"
+)
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/Release
     PREFER_NINJA
@@ -25,6 +30,7 @@ vcpkg_configure_cmake(
         -DBUILD_SAMPLES=OFF
         -DCPPREST_EXCLUDE_WEBSOCKETS=OFF
         -DCPPREST_EXPORT_DIR=share/cpprestsdk
+        -DWERROR=OFF
     OPTIONS_DEBUG
         -DCPPREST_INSTALL_HEADERS=OFF
 )
diff --git a/ports/cpprestsdk/undef-minmax.patch b/ports/cpprestsdk/undef-minmax.patch
new file mode 100644
index 000000000..4dc3bc019
--- /dev/null
+++ b/ports/cpprestsdk/undef-minmax.patch
@@ -0,0 +1,14 @@
+diff --git a/Release/src/http/client/http_client_winrt.cpp b/Release/src/http/client/http_client_winrt.cpp
+index 697f48a..4ada65a 100644
+--- a/Release/src/http/client/http_client_winrt.cpp
++++ b/Release/src/http/client/http_client_winrt.cpp
+@@ -28,6 +28,9 @@ using namespace std;
+ using namespace Platform;
+ using namespace Microsoft::WRL;
+ 
++#undef min
++#undef max
++
+ namespace web
+ {
+ namespace http
-- 
cgit v1.2.3