From 0aadbf4ebdb12567ff5b777458e88394d0374365 Mon Sep 17 00:00:00 2001 From: Wolfgang Sanyer Date: Tue, 12 Jul 2022 20:40:50 +0000 Subject: [PATCH 01/29] protobuf 21.2 Note: Starting with [v21.0-rc1](https://github.com/protocolbuffers/protobuf/releases/tag/v21.0-rc1), protobuf is using a new versioning scheme. Signed-off-by: Wolfgang Sanyer --- Aliases/{protobuf@3.19 => protobuf@21.2} | 0 Formula/protobuf.rb | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename Aliases/{protobuf@3.19 => protobuf@21.2} (100%) diff --git a/Aliases/protobuf@3.19 b/Aliases/protobuf@21.2 similarity index 100% rename from Aliases/protobuf@3.19 rename to Aliases/protobuf@21.2 diff --git a/Formula/protobuf.rb b/Formula/protobuf.rb index 1551832fc793..b670ff402181 100644 --- a/Formula/protobuf.rb +++ b/Formula/protobuf.rb @@ -1,8 +1,8 @@ class Protobuf < Formula desc "Protocol buffers (Google's data interchange format)" homepage "https://github.com/protocolbuffers/protobuf/" - url "https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protobuf-all-3.19.4.tar.gz" - sha256 "ba0650be1b169d24908eeddbe6107f011d8df0da5b1a5a4449a913b10e578faf" + url "https://github.com/protocolbuffers/protobuf/releases/download/v21.2/protobuf-all-21.2.tar.gz" + sha256 "9ae699200f3a80c735f9dc3b20e46d447584266f4601403e8fe5b97005f204dd" license "BSD-3-Clause" livecheck do From 385c4d723386d39a8c153ebba807575681cf6588 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Thu, 14 Jul 2022 20:48:11 +0800 Subject: [PATCH 02/29] protobuf@3 3.20.1 (new formula) This is needed for `protoc-gen-grpc-web`. --- Aliases/protobuf@3.20 | 1 + Formula/protobuf@3.rb | 62 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 120000 Aliases/protobuf@3.20 create mode 100644 Formula/protobuf@3.rb diff --git a/Aliases/protobuf@3.20 b/Aliases/protobuf@3.20 new file mode 120000 index 000000000000..a2d0068c7446 --- /dev/null +++ b/Aliases/protobuf@3.20 @@ -0,0 +1 @@ +../Formula/protobuf@3.rb \ No newline at end of file diff --git a/Formula/protobuf@3.rb b/Formula/protobuf@3.rb new file mode 100644 index 000000000000..d3971c9f4030 --- /dev/null +++ b/Formula/protobuf@3.rb @@ -0,0 +1,62 @@ +class ProtobufAT3 < Formula + desc "Protocol buffers (Google's data interchange format)" + homepage "https://github.com/protocolbuffers/protobuf/" + url "https://github.com/protocolbuffers/protobuf/releases/download/v3.20.1/protobuf-all-3.20.1.tar.gz" + sha256 "3a400163728db996e8e8d21c7dfb3c239df54d0813270f086c4030addeae2fad" + license "BSD-3-Clause" + + keg_only :versioned_formula + + depends_on "python@3.10" => [:build, :test] + # The Python3.9 bindings can be removed when Python3.9 is made keg-only. + depends_on "python@3.9" => [:build, :test] + + uses_from_macos "zlib" + + def install + # Don't build in debug mode. See: + # https://github.com/Homebrew/homebrew/issues/9279 + # https://github.com/protocolbuffers/protobuf/blob/5c24564811c08772d090305be36fae82d8f12bbe/configure.ac#L61 + ENV.prepend "CXXFLAGS", "-DNDEBUG" + ENV.cxx11 + + system "./autogen.sh" if build.head? + system "./configure", "--disable-debug", "--disable-dependency-tracking", + "--prefix=#{prefix}", "--with-zlib" + system "make" + system "make", "install" + + # Install editor support and examples + pkgshare.install "editors/proto.vim", "examples" + elisp.install "editors/protobuf-mode.el" + + ENV.append_to_cflags "-I#{include}" + ENV.append_to_cflags "-L#{lib}" + + cd "python" do + ["3.9", "3.10"].each do |xy| + site_packages = prefix/Language::Python.site_packages("python#{xy}") + system "python#{xy}", *Language::Python.setup_install_args(prefix), + "--install-lib=#{site_packages}", + "--cpp_implementation" + end + end + end + + test do + testdata = <<~EOS + syntax = "proto3"; + package test; + message TestCase { + string name = 4; + } + message Test { + repeated TestCase case = 1; + } + EOS + (testpath/"test.proto").write testdata + system bin/"protoc", "test.proto", "--cpp_out=." + system Formula["python@3.9"].opt_bin/"python3", "-c", "import google.protobuf" + system Formula["python@3.10"].opt_bin/"python3", "-c", "import google.protobuf" + end +end From 9182b5a8918c0f35c2fbd05f3828ed58147f22c9 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:18 +0800 Subject: [PATCH 03/29] apache-arrow: revision bump (protobuf 21.2) --- Formula/apache-arrow.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Formula/apache-arrow.rb b/Formula/apache-arrow.rb index 51707b94bab3..04e915a30b1d 100644 --- a/Formula/apache-arrow.rb +++ b/Formula/apache-arrow.rb @@ -5,7 +5,7 @@ class ApacheArrow < Formula mirror "https://archive.apache.org/dist/arrow/arrow-8.0.0/apache-arrow-8.0.0.tar.gz" sha256 "ad9a05705117c989c116bae9ac70492fe015050e1b80fb0e38fde4b5d863aaa3" license "Apache-2.0" - revision 3 + revision 4 head "https://github.com/apache/arrow.git", branch: "master" bottle do @@ -77,11 +77,9 @@ def install args << "-DARROW_MIMALLOC=ON" unless Hardware::CPU.arm? - mkdir "build" do - system "cmake", "../cpp", *std_cmake_args, *args - system "make" - system "make", "install" - end + system "cmake", "-S", "cpp", "-B", "build", *std_cmake_args, *args + system "cmake", "--build", "build" + system "cmake", "--install", "build" end test do From b4d2eabad32a509bc4023e3b9e1e4ddf33048a7d Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:18 +0800 Subject: [PATCH 04/29] bear: revision bump (protobuf 21.2) --- Formula/bear.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Formula/bear.rb b/Formula/bear.rb index 96a644970502..163f4c12cc84 100644 --- a/Formula/bear.rb +++ b/Formula/bear.rb @@ -4,7 +4,7 @@ class Bear < Formula url "https://github.com/rizsotto/Bear/archive/3.0.19.tar.gz" sha256 "2fcfe2c6e029182cfc54ed26b3505c0ef12b0f43df03fb587f335afdc2ca9431" license "GPL-3.0-or-later" - revision 3 + revision 4 head "https://github.com/rizsotto/Bear.git", branch: "master" bottle do @@ -51,11 +51,9 @@ def install -DENABLE_FUNC_TESTS=OFF ] - mkdir "build" do - system "cmake", "..", *args, *std_cmake_args - system "make", "all" - system "make", "install" - end + system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args + system "cmake", "--build", "build" + system "cmake", "--install", "build" end test do From 662448746c008e4f9b644190b04db354a7ff7924 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:19 +0800 Subject: [PATCH 05/29] bloaty: revision bump (protobuf 21.2) Also, set `-DNDEBUG` to make sure we have a proper destructor for `InternalMetadata`. --- Formula/bloaty.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Formula/bloaty.rb b/Formula/bloaty.rb index a4ff054a7da1..9b91b550ddfa 100644 --- a/Formula/bloaty.rb +++ b/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 8 + revision 9 bottle do sha256 cellar: :any, arm64_monterey: "ba9f5939fc1a0b26f069c79e03e82c46172f3e7414cdd9a8575180535dd7ac74" @@ -22,8 +22,11 @@ class Bloaty < Formula depends_on "re2" def install - system "cmake", ".", *std_cmake_args - system "make", "install" + # https://github.com/protocolbuffers/protobuf/issues/9947 + ENV.append_to_cflags "-DNDEBUG" + system "cmake", "-S", ".", "-B", "build", *std_cmake_args + system "cmake", "--build", "build" + system "cmake", "--install", "build" end test do From 5302aefa9148e7fa863e75153404cd2f5396c14d Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:19 +0800 Subject: [PATCH 06/29] caffe: revision bump (protobuf 21.2) --- Formula/caffe.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Formula/caffe.rb b/Formula/caffe.rb index bfa61eea42cd..339e85e21725 100644 --- a/Formula/caffe.rb +++ b/Formula/caffe.rb @@ -4,7 +4,7 @@ class Caffe < Formula url "https://github.com/BVLC/caffe/archive/1.0.tar.gz" sha256 "71d3c9eb8a183150f965a465824d01fe82826c22505f7aa314f700ace03fa77f" license "BSD-2-Clause" - revision 39 + revision 40 livecheck do url :stable @@ -61,7 +61,7 @@ class Caffe < Formula def install ENV.cxx11 - args = std_cmake_args + %w[ + args = %w[ -DALLOW_LMDB_NOLOCK=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_docs=OFF @@ -77,8 +77,9 @@ def install ] args << "-DBLAS=Open" if OS.linux? - system "cmake", ".", *args - system "make", "install" + system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args + system "cmake", "--build", "build" + system "cmake", "--install", "build" pkgshare.install "models" end From a4ef62a55ebde590481cfc2de0a3f00483e58622 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:20 +0800 Subject: [PATCH 07/29] etcd-cpp-apiv3: revision bump (protobuf 21.2) --- Formula/etcd-cpp-apiv3.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/etcd-cpp-apiv3.rb b/Formula/etcd-cpp-apiv3.rb index 04dd0b0551e5..4fcfcda66c85 100644 --- a/Formula/etcd-cpp-apiv3.rb +++ b/Formula/etcd-cpp-apiv3.rb @@ -4,7 +4,7 @@ class EtcdCppApiv3 < Formula url "https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3/archive/refs/tags/v0.2.6.tar.gz" sha256 "ef2bee616031316bc4cbc416cf9932fd1b2273f5f8fe9c24d2b3602c14277e8a" license "BSD-3-Clause" - revision 3 + revision 4 bottle do sha256 cellar: :any, arm64_monterey: "0b3ff796f8f384c630d74fed859dc5b6e093f8a11611e18ba94f7cd94fb412a4" From b0f4c9d932312c8f5fd01ff25119ece91d56bcd9 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:20 +0800 Subject: [PATCH 08/29] fastnetmon: revision bump (protobuf 21.2) --- Formula/fastnetmon.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/fastnetmon.rb b/Formula/fastnetmon.rb index a629d8d0daa6..5a06e1ec45a0 100644 --- a/Formula/fastnetmon.rb +++ b/Formula/fastnetmon.rb @@ -4,7 +4,7 @@ class Fastnetmon < Formula url "https://github.com/pavel-odintsov/fastnetmon/archive/refs/tags/v1.2.2.tar.gz" sha256 "4de0fe9390673f7e2fc8f3f1e3696a1455ea659049430c4870fcf82600c2ea2d" license "GPL-2.0-only" - revision 2 + revision 3 bottle do sha256 cellar: :any, arm64_monterey: "b6c75424de702e5fc844e7d9784153cdbd94d5a6fabde0be51443600aa4e54fa" From 78899f0f8aaa3c27d89367718ceab44d49b73e4a Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:20 +0800 Subject: [PATCH 09/29] grpc: revision bump (protobuf 21.2) --- Formula/grpc.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/grpc.rb b/Formula/grpc.rb index e276d09a156b..729676f704e5 100644 --- a/Formula/grpc.rb +++ b/Formula/grpc.rb @@ -5,6 +5,7 @@ class Grpc < Formula tag: "v1.47.0", revision: "2717aa8c9b768de99c811628af4e8c30d6c2da4f" license "Apache-2.0" + revision 1 head "https://github.com/grpc/grpc.git", branch: "master" # The "latest" release on GitHub is sometimes for an older major/minor and From 78f73b847131611fe6f24abd50c7cad2250864dc Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:21 +0800 Subject: [PATCH 10/29] libphonenumber: revision bump (protobuf 21.2) --- Formula/libphonenumber.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/libphonenumber.rb b/Formula/libphonenumber.rb index a93bf3399c3b..419120f4d2a5 100644 --- a/Formula/libphonenumber.rb +++ b/Formula/libphonenumber.rb @@ -4,7 +4,7 @@ class Libphonenumber < Formula url "https://github.com/google/libphonenumber/archive/v8.12.44.tar.gz" sha256 "02337c60e3a055e0a4bc4e0a60e8ae31aa567adce59f266cfd37961fceea74c2" license "Apache-2.0" - revision 2 + revision 3 livecheck do url :stable From 63075df4aff1e2d9e768614e618ae87b2896a30e Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:21 +0800 Subject: [PATCH 11/29] libpulsar: revision bump (protobuf 21.2) --- Formula/libpulsar.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/libpulsar.rb b/Formula/libpulsar.rb index 2e4a6240780c..57383e10f512 100644 --- a/Formula/libpulsar.rb +++ b/Formula/libpulsar.rb @@ -5,6 +5,7 @@ class Libpulsar < Formula mirror "https://archive.apache.org/dist/pulsar/pulsar-2.10.1/apache-pulsar-2.10.1-src.tar.gz" sha256 "a8c8fbea39f1447ebc0c4e899198d0acb48dce05c69ceec78cf8e56856af6946" license "Apache-2.0" + revision 1 bottle do sha256 cellar: :any, arm64_monterey: "900dd29116523ff79477f4230d8c89089c1e1f531e788a3b07565ba751fabaa8" From b60435e78425c7e125a384b9421cd4b4bc11bb62 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:21 +0800 Subject: [PATCH 12/29] libtorch: revision bump (protobuf 21.2) --- Formula/libtorch.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/libtorch.rb b/Formula/libtorch.rb index 1d63399b6db2..266c86704078 100644 --- a/Formula/libtorch.rb +++ b/Formula/libtorch.rb @@ -7,6 +7,7 @@ class Libtorch < Formula tag: "v1.12.0", revision: "67ece03c8cd632cce9523cd96efde6f2d1cc8121" license "BSD-3-Clause" + revision 1 livecheck do url :stable From 2662cb0dae81221ff3da99af01efedcd8e629c3b Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:22 +0800 Subject: [PATCH 13/29] mavsdk: revision bump (protobuf 21.2) --- Formula/mavsdk.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/mavsdk.rb b/Formula/mavsdk.rb index 54d992fd2151..80ca14e36296 100644 --- a/Formula/mavsdk.rb +++ b/Formula/mavsdk.rb @@ -7,7 +7,7 @@ class Mavsdk < Formula tag: "v1.4.3", revision: "2d2d85c60123c7d071b1bf50354fc6c06c12115b" license "BSD-3-Clause" - revision 1 + revision 2 livecheck do url :stable From 4dcf64967bc0338a8e52757b800669a40ca10d57 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:22 +0800 Subject: [PATCH 14/29] monero: revision bump (protobuf 21.2) --- Formula/monero.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/monero.rb b/Formula/monero.rb index 22fa21d00b7f..83f01c4f4c0f 100644 --- a/Formula/monero.rb +++ b/Formula/monero.rb @@ -5,7 +5,7 @@ class Monero < Formula tag: "v0.17.3.2", revision: "424e4de16b98506170db7b0d7d87a79ccf541744" license "BSD-3-Clause" - revision 1 + revision 2 livecheck do url :stable From 10dd7c4f983ce79ed1e962b17e30030336ec3892 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:22 +0800 Subject: [PATCH 15/29] mosh: revision bump (protobuf 21.2) Also, set `-DNDEBUG` to ensure that we have a proper destructor for `InternalMetadata`. --- Formula/mosh.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Formula/mosh.rb b/Formula/mosh.rb index 23836b155ae6..b572daa076c8 100644 --- a/Formula/mosh.rb +++ b/Formula/mosh.rb @@ -2,7 +2,7 @@ class Mosh < Formula desc "Remote terminal application" homepage "https://mosh.org" license "GPL-3.0-or-later" - revision 18 + revision 19 stable do url "https://mosh.org/mosh-1.3.2.tar.gz" @@ -73,6 +73,9 @@ class Mosh < Formula def install ENV.cxx11 + # https://github.com/protocolbuffers/protobuf/issues/9947 + ENV.append_to_cflags "-DNDEBUG" + # teach mosh to locate mosh-client without referring # PATH to support launching outside shell e.g. via launcher inreplace "scripts/mosh.pl", "'mosh-client", "\'#{bin}/mosh-client" From 8d8a4a574f23c6ca0beb2ce13f392bf4bc59cbb1 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:22 +0800 Subject: [PATCH 16/29] mysql: revision bump (protobuf 21.2) --- Formula/mysql.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/mysql.rb b/Formula/mysql.rb index 6805cf469214..1f9849c27704 100644 --- a/Formula/mysql.rb +++ b/Formula/mysql.rb @@ -4,6 +4,7 @@ class Mysql < Formula url "https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.29.tar.gz" sha256 "fd34a84c65fc7b15609d55b1f5d128c4d5543a6b95fa638569c3277c5c7bb048" license "GPL-2.0-only" => { with: "Universal-FOSS-exception-1.0" } + revision 1 livecheck do url "https://dev.mysql.com/downloads/mysql/?tpl=files&os=src" From 812be72cbeecbef0cb1c61b9b6ea7445a2e6a25f Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:23 +0800 Subject: [PATCH 17/29] ncnn: revision bump (protobuf 21.2) --- Formula/ncnn.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/ncnn.rb b/Formula/ncnn.rb index 22551c81c741..c740fe409ee9 100644 --- a/Formula/ncnn.rb +++ b/Formula/ncnn.rb @@ -4,6 +4,7 @@ class Ncnn < Formula url "https://github.com/Tencent/ncnn/archive/refs/tags/20220701.tar.gz" sha256 "e222f2ac54cc52ed7b1f6edc83ce4bf8ea1dc729c81f6a1560e4196032ec88ca" license "BSD-3-Clause" + revision 1 head "https://github.com/Tencent/ncnn.git", branch: "master" bottle do From c5f12e347c3afcac965912190816c649e6fb87e0 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:23 +0800 Subject: [PATCH 18/29] netdata: revision bump (protobuf 21.2) Also, set `-DNDEBUG` to ensure we have a proper destructor for `InternalMetadata`. --- Formula/netdata.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Formula/netdata.rb b/Formula/netdata.rb index 83d429b56cf7..f9bb954f1e89 100644 --- a/Formula/netdata.rb +++ b/Formula/netdata.rb @@ -4,6 +4,7 @@ class Netdata < Formula url "https://github.com/netdata/netdata/releases/download/v1.35.1/netdata-v1.35.1.tar.gz" sha256 "587f6cce421015f8e0a527e3964a4de8cc17085c354498150bc3ade21606bbf9" license "GPL-3.0-or-later" + revision 1 livecheck do url :stable @@ -40,6 +41,9 @@ class Netdata < Formula end def install + # https://github.com/protocolbuffers/protobuf/issues/9947 + ENV.append_to_cflags "-DNDEBUG" + # We build judy as static library, so we don't need to install it # into the real prefix judyprefix = "#{buildpath}/resources/judy" From 952b722884905165781e320a2899ab2228f630fa Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:23 +0800 Subject: [PATCH 19/29] ola: revision bump (protobuf 21.2) Also, set `-DNDEBUG` to ensure we have a proper destructor for `InternalMetadata`. --- Formula/ola.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Formula/ola.rb b/Formula/ola.rb index bb7d7d8932e2..368e8ed6c1b0 100644 --- a/Formula/ola.rb +++ b/Formula/ola.rb @@ -4,7 +4,7 @@ class Ola < Formula url "https://github.com/OpenLightingProject/ola/releases/download/0.10.8/ola-0.10.8.tar.gz" sha256 "102aa3114562a2a71dbf7f77d2a0fb9fc47acc35d6248a70b6e831365ca71b13" license all_of: ["GPL-2.0-or-later", "LGPL-2.1-or-later"] - revision 5 + revision 6 head "https://github.com/OpenLightingProject/ola.git", branch: "master" bottle do @@ -37,6 +37,9 @@ class Ola < Formula end def install + # https://github.com/protocolbuffers/protobuf/issues/9947 + ENV.append_to_cflags "-DNDEBUG" + args = %W[ --disable-fatal-warnings --disable-dependency-tracking From fb15256ff48bb9fe40f2753c8fc1c3b5a432584e Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:24 +0800 Subject: [PATCH 20/29] opencv: revision bump (protobuf 21.2) --- Formula/opencv.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/opencv.rb b/Formula/opencv.rb index 77576a223309..9c4cc2658a5f 100644 --- a/Formula/opencv.rb +++ b/Formula/opencv.rb @@ -4,7 +4,7 @@ class Opencv < Formula url "https://github.com/opencv/opencv/archive/4.5.5.tar.gz" sha256 "a1cfdcf6619387ca9e232687504da996aaa9f7b5689986b8331ec02cb61d28ad" license "Apache-2.0" - revision 2 + revision 3 livecheck do url :stable From 773cc7d7b503c38f77f209083359433334163a0a Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:24 +0800 Subject: [PATCH 21/29] or-tools: revision bump (protobuf 21.2) --- Formula/or-tools.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/or-tools.rb b/Formula/or-tools.rb index 6729c5e071c7..5f6dc04185c1 100644 --- a/Formula/or-tools.rb +++ b/Formula/or-tools.rb @@ -2,7 +2,7 @@ class OrTools < Formula desc "Google's Operations Research tools" homepage "https://developers.google.com/optimization/" license "Apache-2.0" - revision 2 + revision 3 head "https://github.com/google/or-tools.git", branch: "stable" stable do From db950dd515a3e4ea0ce58e45f56a0e8a31f5fc53 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:24 +0800 Subject: [PATCH 22/29] osm-pbf: revision bump (protobuf 21.2) --- Formula/osm-pbf.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/osm-pbf.rb b/Formula/osm-pbf.rb index 2b4c73ed633c..8ec6ce8c0005 100644 --- a/Formula/osm-pbf.rb +++ b/Formula/osm-pbf.rb @@ -4,7 +4,7 @@ class OsmPbf < Formula url "https://github.com/openstreetmap/OSM-binary/archive/v1.5.0.tar.gz" sha256 "2abf3126729793732c3380763999cc365e51bffda369a008213879a3cd90476c" license "LGPL-3.0-or-later" - revision 3 + revision 4 bottle do sha256 cellar: :any, arm64_monterey: "7c54ae6cece29667791513344f8ca1f07412dbf7c0030eb000c835864dda96b7" From 39068cd146f99a212320d0caf0594a050196de53 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:24 +0800 Subject: [PATCH 23/29] percona-server: revision bump (protobuf 21.2) Conflict with `percona-xtrabackup` to avoid a `brew install` failure in CI. This needs a proper fix, but we use this for now to unblock the `protobuf` version bump. --- Formula/percona-server.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Formula/percona-server.rb b/Formula/percona-server.rb index 10900fb2acdb..64d65496fc2a 100644 --- a/Formula/percona-server.rb +++ b/Formula/percona-server.rb @@ -4,6 +4,7 @@ class PerconaServer < Formula url "https://downloads.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.28-20/source/tarball/percona-server-8.0.28-20.tar.gz" sha256 "88890e081d70901f938e39b688663d4514910773488fca42cd6de0f4371fb157" license "BSD-3-Clause" + revision 1 livecheck do url "https://www.percona.com/downloads/Percona-Server-LATEST/" @@ -44,8 +45,8 @@ class PerconaServer < Formula patch :DATA end - conflicts_with "mariadb", "mysql", - because: "percona, mariadb, and mysql install the same binaries" + conflicts_with "mariadb", "mysql", because: "percona, mariadb, and mysql install the same binaries" + conflicts_with "percona-xtrabackup", because: "both install a `kmip.h`" # https://bugs.mysql.com/bug.php?id=86711 # https://github.com/Homebrew/homebrew-core/pull/20538 From 724784a19be7b139445213309694b99e2a8cb631 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:25 +0800 Subject: [PATCH 24/29] percona-xtrabackup: revision bump (protobuf 21.2) Conflict with `percona-server` to avoid a `brew install` failure in CI. This needs a proper fix, but we use this for now to unblock the `protobuf` version bump. --- Formula/percona-xtrabackup.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Formula/percona-xtrabackup.rb b/Formula/percona-xtrabackup.rb index 82fb3977bbbd..beeaf7a6b2fd 100644 --- a/Formula/percona-xtrabackup.rb +++ b/Formula/percona-xtrabackup.rb @@ -3,6 +3,7 @@ class PerconaXtrabackup < Formula homepage "https://www.percona.com/software/mysql-database/percona-xtrabackup" url "https://downloads.percona.com/downloads/Percona-XtraBackup-LATEST/Percona-XtraBackup-8.0.28-21/source/tarball/percona-xtrabackup-8.0.28-21.tar.gz" sha256 "66d7f15f8e61d0231cbc814dff73fc6181ed9aa91d55b14a34a5b32b63e8ca02" + revision 1 livecheck do url "https://www.percona.com/downloads/Percona-XtraBackup-LATEST/" @@ -45,6 +46,8 @@ class PerconaXtrabackup < Formula depends_on "libaio" end + conflicts_with "percona-server", because: "both install a `kmip.h`" + fails_with :gcc do version "6" cause "The build requires GCC 7.1 or later." From 2e0d06a7d46381810c69eef687fadad932e90853 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:25 +0800 Subject: [PATCH 25/29] protobuf-c: revision bump (protobuf 21.2) Also, set `-DNDEBUG` to ensure that we have a proper destructor for `InternalMetadata`. --- Formula/protobuf-c.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Formula/protobuf-c.rb b/Formula/protobuf-c.rb index 72afe63dfbd2..0a8c17a6c5cc 100644 --- a/Formula/protobuf-c.rb +++ b/Formula/protobuf-c.rb @@ -4,6 +4,7 @@ class ProtobufC < Formula url "https://github.com/protobuf-c/protobuf-c/releases/download/v1.4.1/protobuf-c-1.4.1.tar.gz" sha256 "4cc4facd508172f3e0a4d3a8736225d472418aee35b4ad053384b137b220339f" license "BSD-2-Clause" + revision 1 bottle do sha256 cellar: :any, arm64_monterey: "537aa180b45b68c137ab083b1ff95d02e2080a83e3233c699d405811ee1f1fdf" @@ -20,6 +21,9 @@ class ProtobufC < Formula def install ENV.cxx11 + # https://github.com/protocolbuffers/protobuf/issues/9947 + ENV.append_to_cflags "-DNDEBUG" + system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" system "make", "install" end From d2b52c2c8b685f3df40d6e3e04f1101e1fb2a9a4 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:25 +0800 Subject: [PATCH 26/29] protoc-gen-grpc-web: revision bump (protobuf 21.2) This doesn't work with the latest `protobuf`, so depend on `protobuf@3`, which provides Protobuf 3.20.1. --- Formula/protoc-gen-grpc-web.rb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Formula/protoc-gen-grpc-web.rb b/Formula/protoc-gen-grpc-web.rb index cfddc92e0174..1880f7dfa2b1 100644 --- a/Formula/protoc-gen-grpc-web.rb +++ b/Formula/protoc-gen-grpc-web.rb @@ -6,6 +6,7 @@ class ProtocGenGrpcWeb < Formula url "https://github.com/grpc/grpc-web/archive/1.3.1.tar.gz" sha256 "d292df306b269ebf83fb53a349bbec61c07de4d628bd6a02d75ad3bd2f295574" license "Apache-2.0" + revision 1 bottle do sha256 cellar: :any, arm64_monterey: "e679f48db0744502049cda46308f89de294134b522ba731fcfc88486589e992d" @@ -19,14 +20,21 @@ class ProtocGenGrpcWeb < Formula depends_on "cmake" => :build depends_on "node" => :test depends_on "typescript" => :test - depends_on "protobuf" + depends_on "protobuf@3" def install bin.mkpath system "make", "install-plugin", "PREFIX=#{prefix}" + + # Remove these two lines when this formula depends on unversioned `protobuf`. + libexec.install bin/"protoc-gen-grpc-web" + (bin/"protoc-gen-grpc-web").write_env_script libexec/"protoc-gen-grpc-web", + PATH: "#{Formula["protobuf@3"].opt_bin}:${PATH}" end test do + ENV.prepend_path "PATH", Formula["protobuf@3"].opt_bin + # First use the plugin to generate the files. testdata = <<~EOS syntax = "proto3"; @@ -46,8 +54,8 @@ def install EOS (testpath/"test.proto").write testdata system "protoc", "test.proto", "--plugin=#{bin}/protoc-gen-grpc-web", - "--js_out=import_style=commonjs:.", - "--grpc-web_out=import_style=typescript,mode=grpcwebtext:." + "--js_out=import_style=commonjs:.", + "--grpc-web_out=import_style=typescript,mode=grpcwebtext:." # Now see if we can import them. testts = <<~EOS From 9fba7aa6a4d51e1b2edcf4f63ccffeed18e8ac24 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:25 +0800 Subject: [PATCH 27/29] rethinkdb: revision bump (protobuf 21.2) --- Formula/rethinkdb.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/rethinkdb.rb b/Formula/rethinkdb.rb index e731fe9ee1fe..0a81a8bc4a88 100644 --- a/Formula/rethinkdb.rb +++ b/Formula/rethinkdb.rb @@ -4,6 +4,7 @@ class Rethinkdb < Formula url "https://download.rethinkdb.com/repository/raw/dist/rethinkdb-2.4.2.tgz" sha256 "35e6a76a527d473a7d962515a0414dea6e09300fff368ae713964ce2494d9c0d" license "Apache-2.0" + revision 1 head "https://github.com/rethinkdb/rethinkdb.git", branch: "next" livecheck do From 02849f35384afaf887817d12e296d3e476d6356d Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:26 +0800 Subject: [PATCH 28/29] sysdig: revision bump (protobuf 21.2) --- Formula/sysdig.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/sysdig.rb b/Formula/sysdig.rb index 97e8ee9e345c..0f3842a4ed02 100644 --- a/Formula/sysdig.rb +++ b/Formula/sysdig.rb @@ -2,7 +2,7 @@ class Sysdig < Formula desc "System-level exploration and troubleshooting tool" homepage "https://sysdig.com/" license "Apache-2.0" - revision 2 + revision 3 stable do url "https://github.com/draios/sysdig/archive/0.29.3.tar.gz" From bfe2594c3e3d0dd2da8c9626ac4a5cd1d464d7b1 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Wed, 13 Jul 2022 21:50:26 +0800 Subject: [PATCH 29/29] torchvision: revision bump (protobuf 21.2) --- Formula/torchvision.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/torchvision.rb b/Formula/torchvision.rb index a860ca8727fd..c8c8b5ec245e 100644 --- a/Formula/torchvision.rb +++ b/Formula/torchvision.rb @@ -4,6 +4,7 @@ class Torchvision < Formula url "https://github.com/pytorch/vision/archive/refs/tags/v0.13.0.tar.gz" sha256 "2fe9139150800820d02c867a0b64b7c7fbc964d48d76fae235d6ef9215eabcf4" license "BSD-3-Clause" + revision 1 livecheck do url :stable