From 5ded2fac5fdb350de61600ce31654e7f3f9fbbdf Mon Sep 17 00:00:00 2001
From: Yannic Bonenberger <contact@yannic-bonenberger.com>
Date: Mon, 20 Jul 2020 11:58:32 +0200
Subject: [PATCH] Upgrade protobuf to 4.0.0-rc1, part 1/3

This change includes the third_party changes neccessary to upgrade
protobuf to 4.0.0-rc1.

Note that the bump of protobuf's major version was neccessary because of
a breaking change in PHP which Bazel isn't affected by.

Working towards making Bazel compatible with #11694
---
 third_party/protobuf/4.0.0-rc1.patch | 40 ++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 third_party/protobuf/4.0.0-rc1.patch

diff --git a/third_party/protobuf/4.0.0-rc1.patch b/third_party/protobuf/4.0.0-rc1.patch
new file mode 100644
index 00000000000000..f9ce7ef8aeb29c
--- /dev/null
+++ b/third_party/protobuf/4.0.0-rc1.patch
@@ -0,0 +1,40 @@
+diff --git a/BUILD b/BUILD
+index 224c8fce1..cde9d9d5e 100644
+--- a/BUILD
++++ b/BUILD
+@@ -50,7 +50,7 @@ GTEST_MAIN = select({
+ # ZLIB configuration
+ ################################################################################
+ 
+-ZLIB_DEPS = ["@zlib//:zlib"]
++ZLIB_DEPS = ["@io_bazel//third_party/zlib"]
+ 
+ ################################################################################
+ # Protobuf Runtime Library
+@@ -845,7 +845,7 @@ py_proto_library(
+     py_extra_srcs = glob(["python/**/__init__.py"]),
+     py_libs = [
+         ":python_srcs",
+-        "@six//:six",
++        "@io_bazel//third_party/py/six",
+     ],
+     srcs_version = "PY2AND3",
+     visibility = ["//visibility:public"],
+diff --git a/java/util/BUILD b/java/util/BUILD
+index cfdb28e2e..3705fdbe3 100644
+--- a/java/util/BUILD
++++ b/java/util/BUILD
+@@ -11,10 +11,10 @@ java_library(
+     ],
+     visibility = ["//visibility:public"],
+     deps = [
+-        "//external:error_prone_annotations",
+-        "//external:gson",
+-        "//external:guava",
+         "//java/core",
+         "//java/lite",
++        "@io_bazel//third_party:error_prone_annotations",
++        "@io_bazel//third_party:guava",
++        "@io_bazel//third_party:gson",
+     ],
+ )