From df35c1f7d7babef240e85bb809cf03990a735b0b Mon Sep 17 00:00:00 2001
From: Carlos O'Ryan <coryan@users.noreply.github.com>
Date: Wed, 14 Nov 2018 18:20:54 -0500
Subject: Update google-cloud-cpp to 0.3.0. (#4719)

* Update google-cloud-cpp to 0.3.0.

A new release of google-cloud-cpp, with some improvements in packaging
that simplified the port files.

* [google-cloud-cpp] Fix OSX builds
---
 ports/google-cloud-cpp/include-protobuf.patch | 37 ++++++++++-----------------
 1 file changed, 13 insertions(+), 24 deletions(-)

(limited to 'ports/google-cloud-cpp/include-protobuf.patch')

diff --git a/ports/google-cloud-cpp/include-protobuf.patch b/ports/google-cloud-cpp/include-protobuf.patch
index 63602ad72..d0e3529c7 100644
--- a/ports/google-cloud-cpp/include-protobuf.patch
+++ b/ports/google-cloud-cpp/include-protobuf.patch
@@ -1,24 +1,13 @@
-diff --git a/bigtable/CMakeLists.txt b/bigtable/CMakeLists.txt
-index 1b8089f..771e1ec 100644
---- a/bigtable/CMakeLists.txt
-+++ b/bigtable/CMakeLists.txt
-@@ -69,6 +69,10 @@ set(PROTOBUF_IMPORT_DIRS "${PROJECT_THIRD_PARTY_DIR}/googleapis" "${PROJECT_SOUR
- if(GRPC_ROOT_DIR)
-     list(INSERT PROTOBUF_IMPORT_DIRS 0 "${GRPC_ROOT_DIR}/third_party/protobuf/src")
- endif(GRPC_ROOT_DIR)
-+find_path(PROTO_INCLUDE_DIR google/protobuf/descriptor.proto)
-+if(PROTO_INCLUDE_DIR)
-+    list(INSERT PROTOBUF_IMPORT_DIRS 0 "${PROTO_INCLUDE_DIR}")
-+endif()
- 
- # Get the destination directories based on the GNU recommendations.
- include(GNUInstallDirs)
-@@ -110,7 +114,7 @@ enable_testing()
- 
- # Capture the compiler version and the git revision into variables, then
- # generate a config file with the values.
--if (IS_DIRECTORY ${PROJECT_SOURCE_DIR}/.git)
-+if (IS_DIRECTORY ${PROJECT_SOURCE_DIR}/.git AND 0)
-     execute_process(COMMAND git rev-parse --short HEAD
-             OUTPUT_VARIABLE GIT_HEAD_LOG ERROR_VARIABLE GIT_HEAD_LOG)
- else ()
+--- a/google/cloud/bigtable/CMakeLists.txt	2018-11-09 10:56:34.029389338 -0500
++++ a/google/cloud/bigtable/CMakeLists.txt	2018-11-09 10:57:18.461259917 -0500
+@@ -53,6 +53,10 @@
+ # Configure the location of proto files, particulary the googleapis protos.
+ list(APPEND PROTOBUF_IMPORT_DIRS "${PROJECT_THIRD_PARTY_DIR}/googleapis"
+             "${PROJECT_SOURCE_DIR}")
++find_path(PROTO_INCLUDE_DIR google/protobuf/descriptor.proto)
++if(PROTO_INCLUDE_DIR)
++    list(INSERT PROTOBUF_IMPORT_DIRS 0 "${PROTO_INCLUDE_DIR}")
++endif()
+ 
+ # Include the functions to compile proto files.
+ include(CompileProtos)
-- 
cgit v1.2.3