grpc 1.55.0 protobuf 22.5

Aliases/grpc@1.55

@@ -0,0 +1 @@
+../Formula/grpc.rb

Formula/apache-arrow.rb

@@ -5,6 +5,7 @@ class ApacheArrow < Formula
   mirror "https://archive.apache.org/dist/arrow/arrow-12.0.0/apache-arrow-12.0.0.tar.gz"
   sha256 "ddd8347882775e53af7d0965a1902b7d8fcd0a030fd14f783d4f85e821352d52"
   license "Apache-2.0"
+  revision 1
   head "https://github.com/apache/arrow.git", branch: "main"
 
   bottle do
@@ -24,10 +25,10 @@ class ApacheArrow < Formula
   depends_on "brotli"
   depends_on "bzip2"
   depends_on "glog"
-  depends_on "grpc"
+  depends_on "grpc@1.54"
   depends_on "lz4"
   depends_on "openssl@1.1"
-  depends_on "protobuf"
+  depends_on "protobuf@21"
   depends_on "rapidjson"
   depends_on "re2"
   depends_on "snappy"

Formula/bear.rb

@@ -4,7 +4,7 @@ class Bear < Formula
   url "https://github.com/rizsotto/Bear/archive/3.1.2.tar.gz"
   sha256 "5f94e98480bd8576a64cd1d59649f34b09b4e02a81f1d983c92af1113e061fc3"
   license "GPL-3.0-or-later"
-  revision 1
+  revision 2
   head "https://github.com/rizsotto/Bear.git", branch: "master"
 
   bottle do

Formula/bloaty.rb

@@ -4,7 +4,7 @@ class Bloaty < Formula
   url "https://github.com/google/bloaty/releases/download/v1.1/bloaty-1.1.tar.bz2"
   sha256 "a308d8369d5812aba45982e55e7c3db2ea4780b7496a5455792fb3dcba9abd6f"
   license "Apache-2.0"
-  revision 10
+  revision 11
 
   bottle do
     sha256 cellar: :any,                 arm64_ventura:  "485449be09072bf5044e7a8252cf4385d3f1b4365a7907fb5cea4646dbfae409"
@@ -19,7 +19,7 @@ class Bloaty < Formula
   depends_on "cmake" => :build
   depends_on "pkg-config" => :build
   depends_on "capstone"
-  depends_on "protobuf"
+  depends_on "protobuf@21"
   depends_on "re2"
 
   def install

Formula/brpc.rb

@@ -4,6 +4,7 @@ class Brpc < Formula
   url "https://dlcdn.apache.org/brpc/1.5.0/apache-brpc-1.5.0-src.tar.gz"
   sha256 "8afa1367d0c0ddb471decc8660ab7bdbfd45a027f7dfb6d18303990954f70105"
   license "Apache-2.0"
+  revision 1
   head "https://github.com/apache/brpc.git", branch: "master"
 
   bottle do
@@ -20,7 +21,7 @@ class Brpc < Formula
   depends_on "gflags"
   depends_on "leveldb"
   depends_on "openssl@3"
-  depends_on "protobuf"
+  depends_on "protobuf@21"
 
   def install
     args = %w[
@@ -62,10 +63,12 @@ def install
         return 0;
       }
     EOS
+    protobuf = Formula["protobuf@21"]
     flags = %W[
       -I#{include}
+      -I#{protobuf.opt_include}
       -L#{lib}
-      -L#{Formula["protobuf"].opt_lib}
+      -L#{protobuf.opt_lib}
       -lbrpc
       -lprotobuf
     ]

Formula/dvc.rb

@@ -6,6 +6,7 @@ class Dvc < Formula
   url "https://files.pythonhosted.org/packages/b4/2f/7bbbc279bffe43a8fb050da1626bf52f2b0f605ecb96744b767453700752/dvc-2.58.2.tar.gz"
   sha256 "d40fff99b76719d1d524f103ad9dc64141bb363492abb9b8a61c6e70efe5a4dc"
   license "Apache-2.0"
+  revision 1
 
   bottle do
     sha256 cellar: :any,                 arm64_ventura:  "4d056f5d2e70b919e8d939fb4ab6d524a8a96ed2ac6ffc0cc3fed2f8397949ff"
@@ -24,7 +25,7 @@ class Dvc < Formula
   depends_on "cffi"
   depends_on "numpy"
   depends_on "openssl@1.1"
-  depends_on "protobuf"
+  depends_on "protobuf@21"
   depends_on "pycparser"
   depends_on "pygit2"
   depends_on "pygments"
@@ -777,6 +778,13 @@ def install
     virtualenv_install_with_resources
 
     generate_completions_from_executable(bin/"dvc", "completion", "-s", shells: [:bash, :zsh])
+
+    # Remove the lines below when we depend on unversioned protobuf.
+    # This is needed because protobuf@21 is keg-only.
+    odie "`.pth` file writing can be removed!" if deps.none? { |d| d.name.start_with?("protobuf@") }
+    site_packages = Language::Python.site_packages("python3")
+    protobuf = Formula["protobuf@21"].opt_prefix
+    (libexec/site_packages/"homebrew-protobuf.pth").write protobuf/site_packages
   end
 
   test do

Formula/etcd-cpp-apiv3.rb

@@ -4,6 +4,7 @@ class EtcdCppApiv3 < Formula
   url "https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3/archive/refs/tags/v0.14.3.tar.gz"
   sha256 "5faf1ca697f9889c269a2a0cb2237d8121959f72bf6eca4f61dffdcb9c6d9d46"
   license "BSD-3-Clause"
+  revision 1
 
   bottle do
     sha256 cellar: :any,                 arm64_ventura:  "a66eb265d53f20608fb1eb5667d94c78d45d3ecda60644327695dabe553f4700"
@@ -20,9 +21,9 @@ class EtcdCppApiv3 < Formula
 
   depends_on "boost"
   depends_on "cpprestsdk"
-  depends_on "grpc"
+  depends_on "grpc@1.54"
   depends_on "openssl@1.1"
-  depends_on "protobuf"
+  depends_on "protobuf@21"
 
   fails_with gcc: "5"
 
@@ -55,15 +56,15 @@ def install
     system ENV.cxx, "test.cc", "-std=c++17",
                     "-I#{Formula["boost"].include}",
                     "-I#{Formula["cpprestsdk"].include}",
-                    "-I#{Formula["grpc"].include}",
+                    "-I#{Formula["grpc@1.54"].include}",
                     "-I#{Formula["openssl@1.1"].include}",
-                    "-I#{Formula["protobuf"].include}",
+                    "-I#{Formula["protobuf@21"].include}",
                     "-I#{include}",
                     "-L#{Formula["boost"].lib}",
                     "-L#{Formula["cpprestsdk"].lib}",
-                    "-L#{Formula["grpc"].lib}",
+                    "-L#{Formula["grpc@1.54"].lib}",
                     "-L#{Formula["openssl@1.1"].lib}",
-                    "-L#{Formula["protobuf"].lib}",
+                    "-L#{Formula["protobuf@21"].lib}",
                     "-L#{lib}",
                     "-lboost_random-mt",
                     "-lboost_chrono-mt",

Formula/fastnetmon.rb

@@ -4,6 +4,7 @@ class Fastnetmon < Formula
   url "https://github.com/pavel-odintsov/fastnetmon/archive/refs/tags/v1.2.5.tar.gz"
   sha256 "d92a1f16e60b6ab6f5c5e023a215570e9352ce9d0c9a9d7209416f8cd0227ae6"
   license "GPL-2.0-only"
+  revision 1
 
   bottle do
     sha256 cellar: :any,                 arm64_ventura:  "43e1dcf0484a87c3db4a424bac3e2965b22290b7a3178532f803584e479fb20a"
@@ -19,7 +20,7 @@ class Fastnetmon < Formula
   depends_on "abseil"
   depends_on "boost"
   depends_on "capnp"
-  depends_on "grpc"
+  depends_on "grpc@1.54"
   depends_on "hiredis"
   depends_on "log4cpp"
   depends_on macos: :big_sur # We need C++ 20 available for build which is available from Big Sur

Formula/grpc.rb

@@ -2,8 +2,8 @@ class Grpc < Formula
   desc "Next generation open source RPC library and framework"
   homepage "https://grpc.io/"
   url "https://github.com/grpc/grpc.git",
-      tag:      "v1.54.2",
-      revision: "8871dab19b4ab5389e28474d25cfeea61283265c"
+      tag:      "v1.55.0",
+      revision: "0bf4a618b17a3f0ed61c22364913c7f66fc1c61a"
   license "Apache-2.0"
   head "https://github.com/grpc/grpc.git", branch: "master"
 

Formula/grpc@1.54.rb

@@ -0,0 +1,104 @@
+class GrpcAT154 < Formula
+  desc "Next generation open source RPC library and framework"
+  homepage "https://grpc.io/"
+  url "https://github.com/grpc/grpc.git",
+      tag:      "v1.54.2",
+      revision: "8871dab19b4ab5389e28474d25cfeea61283265c"
+  license "Apache-2.0"
+
+  # The "latest" release on GitHub is sometimes for an older major/minor and
+  # there's sometimes a notable gap between when a version is tagged and
+  # released, so we have to check the releases page instead.
+  livecheck do
+    url "https://github.com/grpc/grpc/releases?q=prerelease%3Afalse"
+    regex(%r{href=["']?[^"' >]*?/tag/v?(1\.54(?:\.\d+)+)["' >]}i)
+    strategy :page_match
+  end
+
+  keg_only :versioned_formula
+
+  depends_on "autoconf" => :build
+  depends_on "automake" => :build
+  depends_on "cmake" => :build
+  depends_on "libtool" => :build
+  depends_on "pkg-config" => :test
+  depends_on "abseil"
+  depends_on "c-ares"
+  depends_on "openssl@1.1"
+  depends_on "protobuf@21"
+  depends_on "re2"
+
+  uses_from_macos "zlib"
+
+  on_macos do
+    depends_on "llvm" => :build if DevelopmentTools.clang_build_version <= 1100
+  end
+
+  fails_with :clang do
+    build 1100
+    cause "Requires C++17 features not yet implemented"
+  end
+
+  fails_with gcc: "5" # C++17
+
+  def install
+    ENV.llvm_clang if OS.mac? && (DevelopmentTools.clang_build_version <= 1100)
+    mkdir "cmake/build" do
+      args = %W[
+        ../..
+        -DCMAKE_CXX_STANDARD=17
+        -DCMAKE_CXX_STANDARD_REQUIRED=TRUE
+        -DCMAKE_INSTALL_RPATH=#{rpath}
+        -DBUILD_SHARED_LIBS=ON
+        -DgRPC_BUILD_TESTS=OFF
+        -DgRPC_INSTALL=ON
+        -DgRPC_ABSL_PROVIDER=package
+        -DgRPC_CARES_PROVIDER=package
+        -DgRPC_PROTOBUF_PROVIDER=package
+        -DgRPC_SSL_PROVIDER=package
+        -DgRPC_ZLIB_PROVIDER=package
+        -DgRPC_RE2_PROVIDER=package
+      ] + std_cmake_args
+
+      system "cmake", *args
+      system "make", "install"
+
+      args = %W[
+        ../..
+        -DCMAKE_INSTALL_RPATH=#{rpath}
+        -DBUILD_SHARED_LIBS=ON
+        -DgRPC_BUILD_TESTS=ON
+      ] + std_cmake_args
+      system "cmake", *args
+      system "make", "grpc_cli"
+      bin.install "grpc_cli"
+      lib.install Dir[shared_library("libgrpc++_test_config", "*")]
+
+      if OS.mac?
+        # These are installed manually, so need to be relocated manually as well
+        MachO::Tools.add_rpath(bin/"grpc_cli", rpath)
+        MachO::Tools.add_rpath(lib/shared_library("libgrpc++_test_config"), rpath)
+      end
+    end
+  end
+
+  test do
+    (testpath/"test.cpp").write <<~EOS
+      #include <grpc/grpc.h>
+      int main() {
+        grpc_init();
+        grpc_shutdown();
+        return GRPC_STATUS_OK;
+      }
+    EOS
+    ENV.prepend_path "PKG_CONFIG_PATH", lib/"pkgconfig"
+    ENV.prepend_path "PKG_CONFIG_PATH", Formula["protobuf@21"].opt_lib/"pkgconfig"
+    ENV.prepend_path "PKG_CONFIG_PATH", Formula["openssl@1.1"].opt_lib/"pkgconfig"
+    pkg_config_flags = shell_output("pkg-config --cflags --libs libcares protobuf re2 grpc++").chomp.split
+    system ENV.cc, "test.cpp", "-L#{Formula["abseil"].opt_lib}", *pkg_config_flags, "-o", "test"
+    system "./test"
+
+    output = shell_output("#{bin}/grpc_cli ls localhost:#{free_port} 2>&1", 1)
+    assert_match "Received an error when querying services endpoint.", output
+  end
+end

Formula/libphonenumber.rb

@@ -4,6 +4,7 @@ class Libphonenumber < Formula
   url "https://github.com/google/libphonenumber/archive/v8.13.13.tar.gz"
   sha256 "5722d25b41ef621849f765121233dcedeb4bca7df87355a21053f893ba7a9a69"
   license "Apache-2.0"
+  revision 1
 
   livecheck do
     url :stable
@@ -26,7 +27,7 @@ class Libphonenumber < Formula
   depends_on "abseil"
   depends_on "boost"
   depends_on "icu4c"
-  depends_on "protobuf"
+  depends_on "protobuf@21"
   depends_on "re2"
 
   fails_with gcc: "5" # For abseil and C++17
@@ -66,7 +67,8 @@ def install
         }
       }
     EOS
-    system ENV.cxx, "-std=c++17", "test.cpp", "-L#{lib}", "-lphonenumber", "-o", "test"
+    system ENV.cxx, "-std=c++17", "-I#{Formula["protobuf@21"].opt_include}", "test.cpp",
+                    "-L#{lib}", "-lphonenumber", "-o", "test"
     system "./test"
   end
 end

Formula/libpulsar.rb

@@ -5,6 +5,7 @@ class Libpulsar < Formula
   mirror "https://archive.apache.org/dist/pulsar/pulsar-client-cpp-3.2.0/apache-pulsar-client-cpp-3.2.0.tar.gz"
   sha256 "e1d007d140906e4e7fc2b47414d551f3c7024bd9d35c8be1bbde3078dc2bddbc"
   license "Apache-2.0"
+  revision 1
 
   bottle do
     sha256 cellar: :any,                 arm64_ventura:  "08ede2fa1b7e6995c97083b329757c147144b3d46534e174f191a89010048f52"
@@ -20,7 +21,7 @@ class Libpulsar < Formula
   depends_on "pkg-config" => :build
   depends_on "boost"
   depends_on "openssl@1.1"
-  depends_on "protobuf"
+  depends_on "protobuf@21"
   depends_on "snappy"
   depends_on "zstd"
 
@@ -30,8 +31,8 @@ def install
     system "cmake", ".", *std_cmake_args,
                     "-DBUILD_TESTS=OFF",
                     "-DBoost_INCLUDE_DIRS=#{Formula["boost"].include}",
-                    "-DProtobuf_INCLUDE_DIR=#{Formula["protobuf"].include}",
-                    "-DProtobuf_LIBRARIES=#{Formula["protobuf"].lib/shared_library("libprotobuf")}"
+                    "-DProtobuf_INCLUDE_DIR=#{Formula["protobuf@21"].include}",
+                    "-DProtobuf_LIBRARIES=#{Formula["protobuf@21"].lib/shared_library("libprotobuf")}"
     system "make", "pulsarShared", "pulsarStatic"
     system "make", "install"
   end
@@ -46,7 +47,9 @@ def install
       }
     EOS
 
-    system ENV.cxx, "-std=gnu++11", "test.cc", "-L#{lib}", "-lpulsar", "-o", "test"
+    # Protobuf include can be removed when this depends on unversioned protobuf.
+    system ENV.cxx, "-std=gnu++11", "-I#{Formula["protobuf@21"].opt_include}",
+                    "test.cc", "-L#{lib}", "-lpulsar", "-o", "test"
     system "./test"
   end
 end

Formula/mavsdk.rb

@@ -7,6 +7,7 @@ class Mavsdk < Formula
       tag:      "v1.4.15",
       revision: "8b9b5b810c08ecf582ba0a4bffdb76b35d0a8007"
   license "BSD-3-Clause"
+  revision 1
 
   livecheck do
     url :stable
@@ -29,10 +30,10 @@ class Mavsdk < Formula
   depends_on "abseil"
   depends_on "c-ares"
   depends_on "curl"
-  depends_on "grpc"
+  depends_on "grpc@1.54"
   depends_on "jsoncpp"
   depends_on "openssl@1.1"
-  depends_on "protobuf"
+  depends_on "protobuf@21"
   depends_on "re2"
   depends_on "tinyxml2"
 

Formula/monero.rb

@@ -5,6 +5,7 @@ class Monero < Formula
       tag:      "v0.18.2.2",
       revision: "e06129bb4d1076f4f2cebabddcee09f1e9e30dcc"
   license "BSD-3-Clause"
+  revision 1
 
   livecheck do
     url :stable
@@ -29,7 +30,7 @@ class Monero < Formula
   depends_on "libsodium"
   depends_on "libusb"
   depends_on "openssl@1.1"
-  depends_on "protobuf"
+  depends_on "protobuf@21"
   depends_on "readline"
   depends_on "unbound"
   depends_on "zeromq"