Upgrade google-cloud-cpp to 0.10.0. (#6785)

With the new version we should not need the patch, so I removed it. We
also moved the repository from GoogleCloudPlatform to the googleapis/
GitHub organization, save a redirect in the download by fixing that.

3 files changed, 4 insertions, 148 deletions

diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL
index ca4078bf2..6c1b23391 100644
--- a/ports/google-cloud-cpp/CONTROL
+++ b/ports/google-cloud-cpp/CONTROL
@@ -1,4 +1,4 @@
 Source: google-cloud-cpp

-Version: 0.9.0

+Version: 0.10.0

 Build-Depends: grpc, curl[ssl], crc32c

 Description: C++ Client Libraries for Google Cloud Platform APIs.

diff --git a/ports/google-cloud-cpp/cmake-libcurl-find-config.patch b/ports/google-cloud-cpp/cmake-libcurl-find-config.patch
deleted file mode 100644
index 0c1d6dd6f..000000000
--- a/ports/google-cloud-cpp/cmake-libcurl-find-config.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff --git a/cmake/IncludeCurl.cmake b/cmake/IncludeCurl.cmake
-index 6ea7ca3e6..3c2db6b28 100644
---- a/cmake/IncludeCurl.cmake
-+++ b/cmake/IncludeCurl.cmake
-@@ -34,49 +34,57 @@ set_property(CACHE GOOGLE_CLOUD_CPP_CURL_PROVIDER
- if ("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "external")
-     include(external/curl)
- elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package")
--    # Search for libcurl, in CMake 3.5 this does not define a target, but it
--    # will in 3.12 (see https://cmake.org/cmake/help/git-
--    # stage/module/FindCURL.html for details).  Until then, define the target
--    # ourselves if it is missing.
--    find_package(CURL REQUIRED)
--    if (NOT TARGET CURL::libcurl)
--        add_library(CURL::libcurl UNKNOWN IMPORTED)
--        set_property(TARGET CURL::libcurl
--                     APPEND
--                     PROPERTY INTERFACE_INCLUDE_DIRECTORIES
--                              "${CURL_INCLUDE_DIR}")
--        set_property(TARGET CURL::libcurl
--                     APPEND
--                     PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
--    endif ()
--    # If the library is static, we need to explicitly link its dependencies.
--    # However, we should not do so for shared libraries, because the version of
--    # OpenSSL (for example) found by find_package() may be newer than the
--    # version linked against libcurl.
--    if ("${CURL_LIBRARY}" MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$")
--        find_package(OpenSSL REQUIRED)
--        find_package(ZLIB REQUIRED)
--        set_property(TARGET CURL::libcurl
--                     APPEND
--                     PROPERTY INTERFACE_LINK_LIBRARIES
--                              OpenSSL::SSL
--                              OpenSSL::Crypto
--                              ZLIB::ZLIB)
--        message(STATUS "CURL linkage will be static")
--        if (WIN32)
-+    # Search for libcurl, first using CONFIG mode, and retrying
-+    # using MODULE mode if that fails
-+    find_package(CURL CONFIG QUIET) # Deliberately quiet, so we can handle the result
-+    if(CURL_FOUND)
-+        message(STATUS "CURL library found via CONFIG mode")
-+    else()
-+        # CONFIG mode failed - fallback to MODULE mode
-+        # In CMake 3.5 this does not define a target, but it
-+        # will in 3.12 (see https://cmake.org/cmake/help/git-
-+        # stage/module/FindCURL.html for details).  Until then, define the target
-+        # ourselves if it is missing.
-+        find_package(CURL MODULE REQUIRED) # Use REQUIRED the second time to fail out
-+        if (NOT TARGET CURL::libcurl)
-+            add_library(CURL::libcurl UNKNOWN IMPORTED)
-             set_property(TARGET CURL::libcurl
-                          APPEND
--                         PROPERTY INTERFACE_LINK_LIBRARIES
--                                  crypt32
--                                  wsock32
--                                  ws2_32)
-+                         PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-+                                  "${CURL_INCLUDE_DIR}")
-+            set_property(TARGET CURL::libcurl
-+                         APPEND
-+                         PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
-         endif ()
--        if (APPLE)
-+        # If the library is static, we need to explicitly link its dependencies.
-+        # However, we should not do so for shared libraries, because the version of
-+        # OpenSSL (for example) found by find_package() may be newer than the
-+        # version linked against libcurl.
-+        if ("${CURL_LIBRARY}" MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$")
-+            find_package(OpenSSL REQUIRED)
-+            find_package(ZLIB REQUIRED)
-             set_property(TARGET CURL::libcurl
-                          APPEND
--                         PROPERTY INTERFACE_LINK_LIBRARIES ldap)
-+                         PROPERTY INTERFACE_LINK_LIBRARIES
-+                                  OpenSSL::SSL
-+                                  OpenSSL::Crypto
-+                                  ZLIB::ZLIB)
-+            message(STATUS "CURL linkage will be static")
-+            if (WIN32)
-+                set_property(TARGET CURL::libcurl
-+                             APPEND
-+                             PROPERTY INTERFACE_LINK_LIBRARIES
-+                                      crypt32
-+                                      wsock32
-+                                      ws2_32)
-+            endif ()
-+            if (APPLE)
-+                set_property(TARGET CURL::libcurl
-+                             APPEND
-+                             PROPERTY INTERFACE_LINK_LIBRARIES ldap)
-+            endif ()
-+        else()
-+            message(STATUS "CURL linkage will be non-static")
-         endif ()
--    else()
--        message(STATUS "CURL linkage will be non-static")
-     endif ()
- endif ()
-diff --git a/google/cloud/storage/config.cmake.in b/google/cloud/storage/config.cmake.in
-index a4d261815..640089e09 100644
---- a/google/cloud/storage/config.cmake.in
-+++ b/google/cloud/storage/config.cmake.in
-@@ -13,21 +13,25 @@
- # limitations under the License.
- 
- include(CMakeFindDependencyMacro)
--find_dependency(CURL)
-+# Search for libcurl, first using CONFIG mode, and retrying
-+# using MODULE mode if that fails
-+find_package(CURL CONFIG QUIET) # find_package so we can explicitly specify QUIET
-+if(NOT CURL_FOUND)
-+    find_dependency(CURL MODULE)
-+    # Some versions of FindCURL do not define CURL::libcurl, so we define it ourselves.
-+    if (NOT TARGET CURL::libcurl)
-+        add_library(CURL::libcurl UNKNOWN IMPORTED)
-+        set_property(TARGET CURL::libcurl
-+                     APPEND
-+                     PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIR}")
-+        set_property(TARGET CURL::libcurl
-+                     APPEND
-+                     PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
-+    endif ()
-+endif()
- find_dependency(Crc32c)
- find_dependency(google_cloud_cpp_common)
- find_dependency(OpenSSL)
- find_dependency(ZLIB)
- 
--# Some versions of FindCURL do not define CURL::libcurl, so we define it ourselves.
--if (NOT TARGET CURL::libcurl)
--    add_library(CURL::libcurl UNKNOWN IMPORTED)
--    set_property(TARGET CURL::libcurl
--                 APPEND
--                 PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIR}")
--    set_property(TARGET CURL::libcurl
--                 APPEND
--                 PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
--endif ()
--
- include("${CMAKE_CURRENT_LIST_DIR}/storage-targets.cmake")
diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake
index 289c51a01..84c5c0240 100644
--- a/ports/google-cloud-cpp/portfile.cmake
+++ b/ports/google-cloud-cpp/portfile.cmake
@@ -4,12 +4,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO GoogleCloudPlatform/google-cloud-cpp
-    REF v0.9.0
-    SHA512 b62051b9396efe8af8063d28ac958524b762a90c053f82030834bd38f018f0755487f6b39ceb5a0082d7cbf8784854c4effd81de27633086857330dc9bda182b
+    REPO googleapis/google-cloud-cpp
+    REF v0.10.0
+    SHA512 9a1774dcc39d1626c8a9cf8630fe3b3110df7e21e452c7b137e1911d10b304997571aadff5fc0216715729db4a29621066a5236a0b2cb027bba4ce3c56492fb3
     HEAD_REF master
-	PATCHES
-		cmake-libcurl-find-config.patch
 )
 
 vcpkg_configure_cmake(