Patch com_google_protobuf to remove 'deploy-env' error (#292)

Author: pcj

deps/BUILD.bazel

@@ -117,9 +117,7 @@ proto_dependency(
 proto_dependency(
     name = "bazel_gazelle",
     patch_args = ["-p1"],
-    patches = [
-        "@build_stack_rules_proto//third_party:bazel-gazelle-revert-1152.patch",
-    ],
+    patches = ["@build_stack_rules_proto//third_party:bazel-gazelle-revert-1152.patch"],
     repository_rule = "http_archive",
     sha256 = "fdfa7f0969e997d26378dd283fab89379403bd4379051da81f7268d5c04398f7",
     strip_prefix = "bazel-gazelle-06b821c9b085f3d7c21af06a33a990513351431c",
@@ -129,6 +127,8 @@ proto_dependency(
 
 proto_dependency(
     name = "com_google_protobuf",
+    patch_args = ["-p1"],
+    patches = ["@build_stack_rules_proto//third_party:com_google_protobuf.deploy-env.patch"],
     repository_rule = "http_archive",
     sha256 = "8b28fdd45bab62d15db232ec404248901842e5340299a57765e48abe8a80d930",
     strip_prefix = "protobuf-3.20.1",

deps/grpc_core_deps.bzl

@@ -86,6 +86,12 @@ def com_google_protobuf():
         urls = [
             "https://github.com/protocolbuffers/protobuf/archive/v3.20.1.tar.gz",
         ],
+        patches = [
+            "@build_stack_rules_proto//third_party:com_google_protobuf.deploy-env.patch",
+        ],
+        patch_args = [
+            "-p1",
+        ],
     )
 
 def rules_jvm_external():

deps/grpc_node_deps.bzl

@@ -87,6 +87,12 @@ def com_google_protobuf():
         urls = [
             "https://github.com/protocolbuffers/protobuf/archive/v3.20.1.tar.gz",
         ],
+        patches = [
+            "@build_stack_rules_proto//third_party:com_google_protobuf.deploy-env.patch",
+        ],
+        patch_args = [
+            "-p1",
+        ],
     )
 
 def rules_jvm_external():

deps/protobuf_core_deps.bzl

@@ -72,4 +72,10 @@ def com_google_protobuf():
         urls = [
             "https://github.com/protocolbuffers/protobuf/archive/v3.20.1.tar.gz",
         ],
+        patches = [
+            "@build_stack_rules_proto//third_party:com_google_protobuf.deploy-env.patch",
+        ],
+        patch_args = [
+            "-p1",
+        ],
     )

third_party/BUILD.bazel

@@ -3,11 +3,13 @@ filegroup(
     srcs = [
         "BUILD.bazel",
         "bazel-gazelle-revert-1152.patch",
+        "com_google_protobuf.deploy-env.patch",
         "zlib.BUILD",
     ],
     visibility = ["//:__pkg__"],
 )
 
 exports_files([
     "bazel-gazelle-revert-1152.patch",
+    "com_google_protobuf.deploy-env.patch",
 ])

third_party/com_google_protobuf.deploy-env.patch

@@ -0,0 +1,12 @@
+diff --git a/java/util/BUILD b/java/util/BUILD
+index 753fabb..8646e20 100644
+--- a/java/util/BUILD
++++ b/java/util/BUILD
+@@ -27,7 +27,6 @@ java_export(
+     pom_template = "pom_template.xml",
+     visibility = ["//java:__pkg__"],
+     runtime_deps = [":util"],
+-    deploy_env = ["//java/core"],
+ )
+ 
+ filegroup(