Merge pull request Homebrew#264415 from Homebrew/protoc-gen-grpc-web-protobuf30

protoc-gen-grpc-web: add workaround patch for Protobuf 30+

Author: BrewTestBot

Formula/p/protoc-gen-grpc-web.rb

@@ -4,30 +4,36 @@ class ProtocGenGrpcWeb < Formula
   url "https://github.com/grpc/grpc-web/archive/refs/tags/2.0.2.tar.gz"
   sha256 "0f0c8c0c1104306d67dad678be7c14efe52a698795a58b2b72ab67a8bb100c15"
   license "Apache-2.0"
-  revision 1
+  revision 2
 
   livecheck do
     url :stable
     regex(/^v?(\d+(?:\.\d+)+)$/i)
   end
 
   bottle do
-    sha256 cellar: :any,                 arm64_tahoe:   "13178dfca8ddd03fc346eed87951e26ad6b16bbc6608e491c00f0476b2fd5f88"
-    sha256 cellar: :any,                 arm64_sequoia: "32448216f271a5d1a457d6c0217c99bf2cedf452c35e3562eafc1d0fb6599e05"
-    sha256 cellar: :any,                 arm64_sonoma:  "3aa8f7c66330e5e3fceb999a510908dc630dc6ffa48f7a723ca3e5d636db97ff"
-    sha256 cellar: :any,                 sonoma:        "64dc0d89e0174058722346d0899605d216a9e870b1f524f27302f1e56469f385"
-    sha256 cellar: :any_skip_relocation, arm64_linux:   "6ce007070940c0e439c96393516143e1a7a299a1ed7ecc4d6967948cbb773cb7"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:  "6d0104fa8cb7244505031d58e09c2027b25c001f75d5a5b1a8b6b92b3f423b5e"
+    sha256 cellar: :any,                 arm64_tahoe:   "9af493e95682f631439158b401f97298ce962cb800b7b9124669c771f4a8765d"
+    sha256 cellar: :any,                 arm64_sequoia: "eb6bb14dcfe3c1aa89abfdbb933c09f33626c2b6b4c5de5666986692e6364cc1"
+    sha256 cellar: :any,                 arm64_sonoma:  "b8856c973c1d821803a2616b22275f4c94b5ae4bb3390990e53044fad0a063b4"
+    sha256 cellar: :any,                 sonoma:        "ec9590373e9414070067925b83954e9920957c631ff740478eeb14775d9b9776"
+    sha256 cellar: :any_skip_relocation, arm64_linux:   "5b32d54f7a13da54578aa4fea781eeb4981343354d839caa42fe5ccaa1722d5a"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:  "a78f69a6baf9b44939f78c40f7b73ea85de1a4fd87f0cddd7f5958eb494fbd70"
   end
 
   depends_on "cmake" => :build
   depends_on "pkgconf" => :build
   depends_on "node" => :test
   depends_on "typescript" => :test
   depends_on "abseil"
-  depends_on "protobuf@29"
+  depends_on "protobuf"
   depends_on "protoc-gen-js"
 
+  # Workaround to build with Protobuf 30+. Issue ref: https://github.com/grpc/grpc-web/issues/1522
+  patch do
+    url "https://raw.githubusercontent.com/Homebrew/homebrew-core/d0b7cf85a11a9acfa1a422305948dff6621bbda9/Patches/protoc-gen-grpc-web/protobuf-30.diff"
+    sha256 "9c7e0ddf5ba68c179e7b8edc2c48de5b9b9d4801a6c8fd93ee199e27291aeebd"
+  end
+
   def install
     # Workarounds to build with latest `protobuf` which needs Abseil link flags and C++17
     ENV.append "LDFLAGS", Utils.safe_popen_read("pkgconf", "--libs", "protobuf").chomp
@@ -57,7 +63,7 @@ def install
         rpc RunTest(Test) returns (TestResult);
       }
     PROTO
-    protoc = Formula["protobuf@29"].bin/"protoc"
+    protoc = Formula["protobuf"].bin/"protoc"
     system protoc, "test.proto", "--plugin=#{bin}/protoc-gen-grpc-web",
                    "--js_out=import_style=commonjs:.",
                    "--grpc-web_out=import_style=typescript,mode=grpcwebtext:."

Formula/p/protoc-gen-js.rb

@@ -4,22 +4,22 @@ class ProtocGenJs < Formula
   url "https://github.com/protocolbuffers/protobuf-javascript/archive/refs/tags/v4.0.1.tar.gz"
   sha256 "123fac2e86109b24e80ccd356aa914e268bf5863ad1354d224d6ceaed6f5c45b"
   license "BSD-3-Clause"
-  revision 1
+  revision 2
   head "https://github.com/protocolbuffers/protobuf-javascript.git", branch: "main"
 
   bottle do
-    sha256 cellar: :any,                 arm64_tahoe:   "d2ec3f4def7537a0b7914930359c6be29fe8540c78813c9897f10f52794df587"
-    sha256 cellar: :any,                 arm64_sequoia: "5ba804ed8a353281249a393a64267a6e72f6bc549d59b81f1510b48bcc6bc0f4"
-    sha256 cellar: :any,                 arm64_sonoma:  "77ce1a096a808eef9f954067a31899ade43f1a640469182a99a8e5c907c4e77f"
-    sha256 cellar: :any,                 sonoma:        "ab22cb0f23d2cf77a1a72f3121e51621df025a53a9684164a06d108dafded777"
-    sha256 cellar: :any_skip_relocation, arm64_linux:   "da7bbee442bef8c90d5234a2999bea748a9836c3ba907831623146d1235a2068"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:  "b62043eda4656354f1e1982fe0313ff73c6f1da1ab6b52d1e296ab0469661801"
+    sha256 cellar: :any,                 arm64_tahoe:   "ca12ea6599efeedd3cf511a173e37da21b84df144d9735e2507255470d593bed"
+    sha256 cellar: :any,                 arm64_sequoia: "205d481940df0d700e1d9c4c3d558a0e99292c2dab5a3326c3f52d1b11f42946"
+    sha256 cellar: :any,                 arm64_sonoma:  "2bf6a22e1ec1b538178affd2df7b0076e7d9a3e4a26c8187640446a8822b92c6"
+    sha256 cellar: :any,                 sonoma:        "3eada4b863ae7e2981a9665904cb60d4253c81448f3897c52e5bb07c04b72a8b"
+    sha256 cellar: :any_skip_relocation, arm64_linux:   "c9fe1dc5f351a6ea94d9b632e1349255fed5ab8f388bb7509a9dac29c54f55b9"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:  "4ab4081275b0bafb529632cb95698ecdddf7f912b4a57135d561c6e6f421dd04"
   end
 
   depends_on "node" => :build
   depends_on "pkgconf" => :build
   depends_on "abseil"
-  depends_on "protobuf@29"
+  depends_on "protobuf"
 
   # We manually build rather than use Bazel as Bazel will build its own copy of Abseil
   # and Protobuf that get statically linked into binary. Check for any upstream changes at
@@ -40,7 +40,7 @@ def install
         string name = 2;
       }
     PROTO
-    system Formula["protobuf@29"].bin/"protoc", "--js_out=import_style=commonjs:.", "person.proto"
+    system Formula["protobuf"].bin/"protoc", "--js_out=import_style=commonjs:.", "person.proto"
     assert_path_exists testpath/"person_pb.js"
     refute_predicate (testpath/"person_pb.js").size, :zero?
   end