From c95b6bfdc448295b66da22cfd35d34ed8302aa4d Mon Sep 17 00:00:00 2001
From: Jozef Izso <jozef.izso@gmail.com>
Date: Thu, 26 Apr 2018 15:23:44 +0200
Subject: [grpc] Update to v1.12.0 [protobuf] Update to v3.6.0.1

---
 ports/google-cloud-cpp/CONTROL                |  2 +-
 ports/google-cloud-cpp/include-protobuf.patch | 24 ++++++++++++++++++++++++
 ports/google-cloud-cpp/portfile.cmake         |  2 ++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 ports/google-cloud-cpp/include-protobuf.patch

(limited to 'ports/google-cloud-cpp')

diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL
index e44b2e5e6..663e2de3a 100644
--- a/ports/google-cloud-cpp/CONTROL
+++ b/ports/google-cloud-cpp/CONTROL
@@ -1,4 +1,4 @@
 Source: google-cloud-cpp
-Version: 0.1.0
+Version: 0.1.0-1
 Build-Depends: grpc, gtest
 Description: C++ Client Libraries for Google Cloud Platform APIs.
diff --git a/ports/google-cloud-cpp/include-protobuf.patch b/ports/google-cloud-cpp/include-protobuf.patch
new file mode 100644
index 000000000..63602ad72
--- /dev/null
+++ b/ports/google-cloud-cpp/include-protobuf.patch
@@ -0,0 +1,24 @@
+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 ()
diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake
index 701d94ae5..8ba1fffe5 100644
--- a/ports/google-cloud-cpp/portfile.cmake
+++ b/ports/google-cloud-cpp/portfile.cmake
@@ -11,6 +11,8 @@ vcpkg_from_github(
     REF v0.1.0
     SHA512 3947cc24ca1ed97309f055f17945afe2d6b22ae8f54f86d3395f8c491b7409d4b7bb12206889d04d07f51236e9fd5afd65b904c8c80521a3313588d8069545c2
     HEAD_REF master
+    PATCHES
+        "${CMAKE_CURRENT_LIST_DIR}/include-protobuf.patch"
 )
 
 set(GOOGLEAPIS_VERSION 92f10d7033c6fa36e1a5a369ab5aa8bafd564009)
-- 
cgit v1.2.3