diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-02-06 15:45:13 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-02-06 15:45:13 -0800 |
| commit | 3d0ace31e359cc7ceaf1391da05ecbdc3d611f2c (patch) | |
| tree | 7ca7358ac661e690bbe9d30fe187594dc9c4f26e | |
| parent | c9d434dfbc985be918295cabe7b37fae7732b9c8 (diff) | |
| download | vcpkg-3d0ace31e359cc7ceaf1391da05ecbdc3d611f2c.tar.gz vcpkg-3d0ace31e359cc7ceaf1391da05ecbdc3d611f2c.zip | |
[cpprestsdk] Update to 2.10.2
| -rw-r--r-- | ports/cpprestsdk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/cpprestsdk/portfile.cmake | 9 | ||||
| -rw-r--r-- | ports/cpprestsdk/undef-minmax.patch | 14 |
3 files changed, 3 insertions, 22 deletions
diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL index 5dcd880f0..663781d40 100644 --- a/ports/cpprestsdk/CONTROL +++ b/ports/cpprestsdk/CONTROL @@ -1,5 +1,5 @@ Source: cpprestsdk -Version: 2.10.1-1 +Version: 2.10.2 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 ca22f2a5c..46686bb0a 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.1 - SHA512 f6a93e5e87e27db724ccc028326b1dce243617cb0ae0d101b2cea700c4f264c073cb0e8a9d88a14be165e16ef2f1f43a17e49278087bc8cf372e623a1b6a9c47 + REF v2.10.2 + SHA512 267a928f770a668874f9b7e381e8977ffa3478c9292df4ed93d4235d20f0e89b1bfe4cfc82945d3f28fe2746a4fe6089009c4839dac5db130494bb3a395dd198 HEAD_REF master ) @@ -16,11 +16,6 @@ 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 diff --git a/ports/cpprestsdk/undef-minmax.patch b/ports/cpprestsdk/undef-minmax.patch deleted file mode 100644 index 4dc3bc019..000000000 --- a/ports/cpprestsdk/undef-minmax.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 |