From 0887012a3f399079b9ca8fc1378ec7b3cd005e4e Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 19 Nov 2019 18:57:48 -0500 Subject: [google-cloud-cpp*]Upgrade to latest release (#8986) --- ports/google-cloud-cpp/CONTROL | 4 ++-- ports/google-cloud-cpp/portfile.cmake | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'ports/google-cloud-cpp') diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL index 2d17390ee..c593a3d6b 100644 --- a/ports/google-cloud-cpp/CONTROL +++ b/ports/google-cloud-cpp/CONTROL @@ -1,5 +1,5 @@ Source: google-cloud-cpp -Version: 0.14.0-1 -Build-Depends: grpc, curl[ssl], crc32c, googleapis +Version: 0.15.0 +Build-Depends: grpc, curl[ssl], crc32c, googleapis, google-cloud-cpp-common Description: C++ Client Libraries for Google Cloud Platform APIs. Homepage: https://github.com/googleapis/google-cloud-cpp diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 9ff87e810..aff9a25a5 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v0.14.0 - SHA512 f858a448dba27d8f12604a0b1a48c91a660b00a0fb22a7a0f737d3d4a9aac42210dc5221b24d729d577fe4e7da43fd392f1c6fab3923ffe1aae7dca7fd8d6f0e + REF v0.15.0 + SHA512 f8cc8f9d47a4df1d76ac7b0836fe107f2f199070a89ab5136f66aa1be5f08737495dbb3f4cf7f709ac0a1346648d869af639836b85b552c6791fa8bb85362a91 HEAD_REF master ) @@ -17,7 +17,7 @@ vcpkg_configure_cmake( OPTIONS -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF - -DBUILD_TESTING=OFF + -DBUILD_TESTING=OFF ) vcpkg_install_cmake(ADD_BIN_TO_PATH) -- cgit v1.2.3 From 314d59229dab8561f71e57d6a909d243fc39934f Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 10 Jan 2020 13:32:55 -0500 Subject: [google-cloud-cpp] Upgrade to v0.17.0 (#9576) * [google-cloud-cpp] Upgrade to v0.17.0 * Fix the x86-windows build. --- ports/google-cloud-cpp/0001-fix-x86-build.patch | 13 +++++++++++++ ports/google-cloud-cpp/CONTROL | 2 +- ports/google-cloud-cpp/portfile.cmake | 6 ++++-- 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 ports/google-cloud-cpp/0001-fix-x86-build.patch (limited to 'ports/google-cloud-cpp') diff --git a/ports/google-cloud-cpp/0001-fix-x86-build.patch b/ports/google-cloud-cpp/0001-fix-x86-build.patch new file mode 100644 index 000000000..ec3674cb7 --- /dev/null +++ b/ports/google-cloud-cpp/0001-fix-x86-build.patch @@ -0,0 +1,13 @@ +diff --git a/google/cloud/storage/parallel_upload.h b/google/cloud/storage/parallel_upload.h +index 44f542d..4fd97bd 100644 +--- a/google/cloud/storage/parallel_upload.h ++++ b/google/cloud/storage/parallel_upload.h +@@ -515,7 +515,7 @@ StatusOr> CreateUploadShards( + + std::size_t const wanted_num_streams = + (std::max)(1, +- (std::min)(max_streams, ++ (std::min)(max_streams, + div_ceil(file_size, min_stream_size))); + + std::uintmax_t const stream_size = diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL index c593a3d6b..d34d68968 100644 --- a/ports/google-cloud-cpp/CONTROL +++ b/ports/google-cloud-cpp/CONTROL @@ -1,5 +1,5 @@ Source: google-cloud-cpp -Version: 0.15.0 +Version: 0.17.0 Build-Depends: grpc, curl[ssl], crc32c, googleapis, google-cloud-cpp-common Description: C++ Client Libraries for Google Cloud Platform APIs. Homepage: https://github.com/googleapis/google-cloud-cpp diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index aff9a25a5..ff177b31c 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -5,9 +5,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v0.15.0 - SHA512 f8cc8f9d47a4df1d76ac7b0836fe107f2f199070a89ab5136f66aa1be5f08737495dbb3f4cf7f709ac0a1346648d869af639836b85b552c6791fa8bb85362a91 + REF v0.17.0 + SHA512 7bfa73db04fe8ff9344201eca8f56107fd895f18b3be44fca45a9f2d64224338980d04841de4418c5c1b7a8ac0768a60e93e5abbed9256567ca7b8bc2bf73cd9 HEAD_REF master + PATCHES + 0001-fix-x86-build.patch ) vcpkg_configure_cmake( -- cgit v1.2.3