Merge branch 'master' of https://github.com/yurybura/vcpkg

4 files changed, 73 insertions, 9 deletions

diff --git a/ports/azure-storage-cpp/CONTROL b/ports/azure-storage-cpp/CONTROL
index 837aa8ae0..c68552bba 100644
--- a/ports/azure-storage-cpp/CONTROL
+++ b/ports/azure-storage-cpp/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-storage-cpp
-Version: 3.2.0
-Build-Depends: cpprestsdk, atlmfc
+Version: 3.2.1
+Build-Depends: cpprestsdk, atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), glibmm (!windows&!uwp), libxmlpp (!windows&!uwp), libuuid (!windows&!uwp)
 Description: Microsoft Azure Storage Client SDK for C++
   A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client. Microsoft Azure Storage team's blog - http://blogs.msdn.com/b/windowsazurestorage/
diff --git a/ports/azure-storage-cpp/glibmm-cmake.patch b/ports/azure-storage-cpp/glibmm-cmake.patch
new file mode 100644
index 000000000..4d3e4a8cd
--- /dev/null
+++ b/ports/azure-storage-cpp/glibmm-cmake.patch
@@ -0,0 +1,13 @@
+diff --git a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindGlibmm.cmake b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindGlibmm.cmake

+index 79a4bcb..fe130bd 100644

+--- a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindGlibmm.cmake

++++ b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindGlibmm.cmake

+@@ -36,7 +36,7 @@ find_path(GlibmmConfig_INCLUDE_DIR

+ )

+ 

+ find_library(Glibmm_LIBRARY

+-  NAMES glibmm-2.4

++  NAMES glibmm glibmm-2.4

+   PATHS 

+     ${Glibmm_PKGCONF_LIBRARY_DIRS} 

+     /usr

diff --git a/ports/azure-storage-cpp/portfile.cmake b/ports/azure-storage-cpp/portfile.cmake
index b5a4791c3..56dbc2ca3 100644
--- a/ports/azure-storage-cpp/portfile.cmake
+++ b/ports/azure-storage-cpp/portfile.cmake
@@ -7,22 +7,21 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-storage-cpp
-    REF v3.2.0
-    SHA512 841c548986de743b508edd149441727e76f66ba09a99454006d2742547267046833062501e79ff2138d6bcad37740f7009cce4590bbdf40b48b935b989959267
+    REF v3.2.1
+    SHA512 8d1e8de439e52f53eb28b77e8adf394468f4861c2c4c1f79ec1437c72e3fc0bc871e4e2662ee58090748915b0f12ce6736a7cc6ede619d332686b9fb6a026c9f
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
         ${CMAKE_CURRENT_LIST_DIR}/cmake.patch
         ${CMAKE_CURRENT_LIST_DIR}/static-builds.patch
         ${CMAKE_CURRENT_LIST_DIR}/support-cpprest-findpackage.patch
+        ${CMAKE_CURRENT_LIST_DIR}/glibmm-cmake.patch
+        ${CMAKE_CURRENT_LIST_DIR}/pplx-do-while.patch
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/Microsoft.WindowsAzure.Storage
     OPTIONS
+        -DCMAKE_FIND_FRAMEWORK=LAST
         -DBUILD_TESTS=OFF
         -DBUILD_SAMPLES=OFF
 )
@@ -32,7 +31,7 @@ vcpkg_install_cmake()
 file(INSTALL
     ${SOURCE_PATH}/LICENSE.txt
     DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure-storage-cpp RENAME copyright)
-file(REMOVE_RECURSE 
+file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/debug/include)
 
 vcpkg_copy_pdbs()
diff --git a/ports/azure-storage-cpp/pplx-do-while.patch b/ports/azure-storage-cpp/pplx-do-while.patch
new file mode 100644
index 000000000..0c2163442
--- /dev/null
+++ b/ports/azure-storage-cpp/pplx-do-while.patch
@@ -0,0 +1,52 @@
+diff --git a/Microsoft.WindowsAzure.Storage/includes/wascore/executor.h b/Microsoft.WindowsAzure.Storage/includes/wascore/executor.h

+index 756163d..6fbfd44 100644

+--- a/Microsoft.WindowsAzure.Storage/includes/wascore/executor.h

++++ b/Microsoft.WindowsAzure.Storage/includes/wascore/executor.h

+@@ -366,7 +366,7 @@ namespace azure { namespace storage { namespace core {

+             // TODO: Reduce usage of auto variable types

+ 

+             auto instance = std::make_shared<executor_impl>(command, options, context);

+-            return pplx::details::do_while([instance]() -> pplx::task<bool>

++            return details::_do_while([instance]() -> pplx::task<bool>

+             {

+                 // 0. Begin request 

+                 instance->validate_location_mode();

+diff --git a/Microsoft.WindowsAzure.Storage/includes/wascore/util.h b/Microsoft.WindowsAzure.Storage/includes/wascore/util.h

+index f3401f2..6a6aa48 100644

+--- a/Microsoft.WindowsAzure.Storage/includes/wascore/util.h

++++ b/Microsoft.WindowsAzure.Storage/includes/wascore/util.h

+@@ -127,6 +127,21 @@ namespace azure { namespace storage { namespace core {

+     };

+ #endif

+ 

++    namespace details

++    {

++        template<class F, class T = bool>

++        pplx::task<T> _do_while(F func)

++        {

++            pplx::task<T> first = func();

++            return first.then([=](bool guard) -> pplx::task<T> {

++                if (guard)

++                    return azure::storage::core::details::_do_while<F,T>(func);

++                else

++                    return first;

++            });

++        }

++    }

++

+ }}} // namespace azure::storage::core

+ 

+ #pragma pop_macro("max")

+diff --git a/Microsoft.WindowsAzure.Storage/src/util.cpp b/Microsoft.WindowsAzure.Storage/src/util.cpp

+index dd2250a..b8d1341 100644

+--- a/Microsoft.WindowsAzure.Storage/src/util.cpp

++++ b/Microsoft.WindowsAzure.Storage/src/util.cpp

+@@ -98,7 +98,7 @@ namespace azure { namespace storage {  namespace core {

+         auto obuffer = ostream.streambuf();

+         auto length_ptr = (length != std::numeric_limits<utility::size64_t>::max()) ? std::make_shared<utility::size64_t>(length) : nullptr;

+         auto total_ptr = std::make_shared<utility::size64_t>(0);

+-        return pplx::details::do_while([istream, obuffer, buffer_size, length_ptr, total_ptr, max_length] () -> pplx::task<bool>

++        return azure::storage::core::details::_do_while([istream, obuffer, buffer_size, length_ptr, total_ptr, max_length] () -> pplx::task<bool>

+         {

+             size_t read_length = buffer_size;

+             if ((length_ptr != nullptr) && (*length_ptr < read_length))