diff --git a/Aliases/grpc@1.55 b/Aliases/grpc@1.55 new file mode 120000 index 0000000000000..38c64db3edb25 --- /dev/null +++ b/Aliases/grpc@1.55 @@ -0,0 +1 @@ +../Formula/grpc.rb \ No newline at end of file diff --git a/Aliases/protobuf@21 b/Aliases/protobuf@22 similarity index 100% rename from Aliases/protobuf@21 rename to Aliases/protobuf@22 diff --git a/Formula/apache-arrow.rb b/Formula/apache-arrow.rb index 72cf9c72820f6..b20b6caf7847e 100644 --- a/Formula/apache-arrow.rb +++ b/Formula/apache-arrow.rb @@ -5,16 +5,17 @@ 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 - sha256 cellar: :any, arm64_ventura: "06b36477eb25d47f58296d3d00754c2025f67e7b1da1a9673a0febc939ab21c9" - sha256 cellar: :any, arm64_monterey: "96aef5732ff86467cdfacf3b66d6b8d0b3412f7b9499cb928accdd75e975544b" - sha256 cellar: :any, arm64_big_sur: "c01884742161c162f855194560e893de4ff00fe25a7ea9c63f1026c581eebe28" - sha256 cellar: :any, ventura: "bd23809237af9dee7f93e1360a14457dc144362cc4e4dd9abe0b8d968e2a7fd3" - sha256 cellar: :any, monterey: "0204082a92c98a1959b1ee877633eb7d91fb6c66c7021623eb2ae738808dad70" - sha256 cellar: :any, big_sur: "bea0b5461b74e1ffa5974d4da9902b59ed4f4f802e55245fb342c848493ed653" - sha256 x86_64_linux: "d64c0672b094200d9cbc3a43fc2581fd7e181ce509757074bcb6c93671d49bd8" + sha256 cellar: :any, arm64_ventura: "3bb8574e52dd8e94c636d09aab08174a5822ea14927917f4a400a7e00b48fdd2" + sha256 cellar: :any, arm64_monterey: "8c19f90473b224648a25b1d23e974f039f621495d9f18ca991ea7673f402ec10" + sha256 cellar: :any, arm64_big_sur: "1889a94c0ca7010102563ab31f1a8ec9375fa55f00ca219f8612d3b739f8a3a9" + sha256 cellar: :any, ventura: "56567213d0de5e3e81c4793021104b014664369bcf4aa29307a402fb5ec2dd1c" + sha256 cellar: :any, monterey: "4e134c301e0535fc4b59d7d4b6bc33a4d791c838f5d3feb52ce6bedbd366f917" + sha256 cellar: :any, big_sur: "00dfa2cef14924fa86ffeb6b14044faa9036227e046d6cfb3ef6387b01096d5b" + sha256 x86_64_linux: "bcded666d0bc385253af82203b23386c2d589446bbc9cfe02e7e237f0f508ba9" end depends_on "boost" => :build @@ -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" diff --git a/Formula/bear.rb b/Formula/bear.rb index 07f095356b99a..a54e48ed59578 100644 --- a/Formula/bear.rb +++ b/Formula/bear.rb @@ -4,17 +4,17 @@ 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 - sha256 arm64_ventura: "43988803985f93907776b0b7175ec5768e8f3571625bfbf46e48955b52837244" - sha256 arm64_monterey: "83d37bab8ac9f9dea185c6333aed9628007f74c18d9a3fffb79d1d778702aad7" - sha256 arm64_big_sur: "82f2f9479bc8ecbd06cac77a7b022f7735a88ce0e06d27b7eef074fae03a5dfb" - sha256 ventura: "ae1832fe68e746b871db88b59c49f078d3dacab288330df57224187771ac5531" - sha256 monterey: "535442a3b12aaf45a54590310a17a5f22c2cacb4279e63c8dc705808c68f1121" - sha256 big_sur: "2ed1231d31c6e7d70da9a193e23f9d9d14f53bd98eb9f4fc64a17b3a1c6fa1c7" - sha256 x86_64_linux: "ca24be7b535bf242c8fddc2d37f1f9725e750ad7ce012c3213baff01208daafa" + sha256 arm64_ventura: "4761cb3feac7ee1f179f7cbfbe18229d0535c38595839d421f998bfbfdf095b3" + sha256 arm64_monterey: "8a23fe11970ad452d83d71f29c2194709426873f0c6d7ef7fd0ee9562c56f9ea" + sha256 arm64_big_sur: "cd6ee26972e7e93f8a5dbc5dc1e09a2ebfe77e073837234bc3214ef33b23e87e" + sha256 ventura: "a39807fa3fa6421b7b2a1697cb6c9f732d6cef2ff5ba2360d1751c9d0cd54c32" + sha256 monterey: "3d5e2a6c0bdba60107b1929d7dafd7ec3a2433f5959084f3fd007c7c2166320e" + sha256 big_sur: "47f543dc49ea615d900f7d9a308214d9f24a2a781d8e6e7e343d1bea7027cfca" + sha256 x86_64_linux: "418f95aa196441ca6be9fc073d00ff10472a7f83412eddb0a5e108fb1d29b570" end depends_on "cmake" => :build diff --git a/Formula/bloaty.rb b/Formula/bloaty.rb index 66548c9f83b43..3fb7b57ea2346 100644 --- a/Formula/bloaty.rb +++ b/Formula/bloaty.rb @@ -4,22 +4,22 @@ 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" - sha256 cellar: :any, arm64_monterey: "6f7fe502951cf3d07307e67df4b5813ab9aeacf75582fbf4ae6ed9faf54defb7" - sha256 cellar: :any, arm64_big_sur: "2f1d101a8d32c7ae3a27cf35d2ba3244e9497e9d87a8d3166905ba5794d0ca9e" - sha256 cellar: :any, ventura: "6af103ce721c668c67e36cfabb7ac5ba83bb5d5579b03bb53cb75e11847ae79f" - sha256 cellar: :any, monterey: "1d3dd26f8b27220c07b0afeff8b33ee47b105362c99378f731295a3207e6e3b7" - sha256 cellar: :any, big_sur: "d5a19327b5539c53a956e006f3cca6d40227757eec2eac6d32a76f95241342d5" - sha256 cellar: :any_skip_relocation, x86_64_linux: "56b54d53756f1662d6c73b914b42140c96fc6e6478555452701423551805cc8d" + sha256 cellar: :any, arm64_ventura: "4495349a4b0331629ac46de5a8a461836ecdd4b1a27eb5772ea5c98b4b270ce8" + sha256 cellar: :any, arm64_monterey: "0f849a28b11456ec1e5c6fb584d0fb5f53dd807d561bc245d2dd4c4777297f66" + sha256 cellar: :any, arm64_big_sur: "e1420ed24daf16f96617888b99cf922f2676e1416063d99fa7e27f2210db0c34" + sha256 cellar: :any, ventura: "cd795586df3be027eca2283693b463ffaebaff45b37a39ad7487591f6ff3d9b2" + sha256 cellar: :any, monterey: "a4ce535ff5879ed2aa0f8e64b1aa0688c4cb8be53ea9bad732bfe71e7b5a6a88" + sha256 cellar: :any, big_sur: "228ff25d82384bea9cc586adcedb89d24122e3533c4ef27fb6b0e4079d304dc1" + sha256 cellar: :any_skip_relocation, x86_64_linux: "97b2cab488d1f284a4a3160176a4ccb45a5924459b62c4fecd1c4e9dc73d943d" end depends_on "cmake" => :build depends_on "pkg-config" => :build depends_on "capstone" - depends_on "protobuf" + depends_on "protobuf@21" depends_on "re2" def install diff --git a/Formula/brpc.rb b/Formula/brpc.rb index a72fc79ba6644..ae5a153ea4b3c 100644 --- a/Formula/brpc.rb +++ b/Formula/brpc.rb @@ -4,23 +4,24 @@ 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 - sha256 cellar: :any, arm64_ventura: "00fe5c27d0397666f3d0138a0fad86edb9208a5581180b267a446c084fccf01f" - sha256 cellar: :any, arm64_monterey: "5575f56fe530af83fd95ede301598bb876c3e1e5902ccb091f61d0f8ae7b2f71" - sha256 cellar: :any, arm64_big_sur: "47938b0cb1fa818fe8c50148c0098379d5c5becc5e833cf1a5738a36c3642b63" - sha256 cellar: :any, ventura: "c9e41524b326940f8033de8b3945713b43cb20ac56f12d6934e7d1fc231e16ec" - sha256 cellar: :any, monterey: "73c668678e7a6d1779edec5ab0806a1b3e6fe82c0929225c2243091a139df0bc" - sha256 cellar: :any, big_sur: "fa99288bacf30a725ff3289cc53959b3a9e56e325f2bb5171e82858810c60d23" - sha256 cellar: :any_skip_relocation, x86_64_linux: "b7cd87ea0fea8043f1b8d792e03cbb10f17b46d055155570c77e7d3edfe35ee1" + sha256 cellar: :any, arm64_ventura: "1c075c56a2de92f802881875fea1734d63719f491f925ca9623e3d75b99293b2" + sha256 cellar: :any, arm64_monterey: "2e72aa583dc38d463318c54318800ab334e4d8880720c9f8835461e96a9bcced" + sha256 cellar: :any, arm64_big_sur: "77d272b5f9f6601bbd9ef7489fc374dec749345beae026ca9216a850d99f1a85" + sha256 cellar: :any, ventura: "7dcc503d9307030e9c1c2bc57b4a361fc018b22a13fbb1d002a935dab6e66f96" + sha256 cellar: :any, monterey: "f3dffdcfb518f908ab18d95921bec72fcc4897d569d315c273b3e5fef4777b26" + sha256 cellar: :any, big_sur: "20f3c293101cc84726a8cd7770e8bf8138207e10d68675af63377aef62b62d32" + sha256 cellar: :any_skip_relocation, x86_64_linux: "e5c6a6661ec461a171a2590a98d7062f0b029a5a91dac68672c36884a3234674" end depends_on "cmake" => :build 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 ] diff --git a/Formula/dvc.rb b/Formula/dvc.rb index 71b305e1e6ee6..fa8492b736397 100644 --- a/Formula/dvc.rb +++ b/Formula/dvc.rb @@ -6,15 +6,16 @@ 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" - sha256 cellar: :any, arm64_monterey: "76306f21bcab3bd36fbad4d512754b13fbcbfad2762d7dbb4db9739dbccd1061" - sha256 cellar: :any, arm64_big_sur: "bdff562b0fe2b3d61e9cf388387df9e59042bdb4a340463748dd69ffb04d3046" - sha256 cellar: :any, ventura: "704644d7dc42803246adaeccc1a390eb8d07f8e04a4564e344f2afd6186dbc31" - sha256 cellar: :any, monterey: "f4f30cdbaefc9c134237d13cb27dfd024d9b82653775a71bc1b04ab565f34f10" - sha256 cellar: :any, big_sur: "9f8feb9c2761180812bb99a0125a076cd7a0a95593e779ef55aa186bd5366f31" - sha256 cellar: :any_skip_relocation, x86_64_linux: "d947511d413baabfffe3227c91d73a500f6b0bba313b10f6336d8f61a6742f8f" + sha256 cellar: :any, arm64_ventura: "419bb9b33c60e2a4d2e9453cdaecb666541c620abbf34b5eff81610786f3bc8a" + sha256 cellar: :any, arm64_monterey: "af9a6ed6b76836b855740c4d20e7a4af2f683e72086fca24ef51a5c88fc8f809" + sha256 cellar: :any, arm64_big_sur: "c0afb3902b25de478fc385b5627a099b2e956808e3ca226bf4706fd62e7a0878" + sha256 cellar: :any, ventura: "06a7a1b7da15e80cba6cc7d43ed86897081b771c6bed0ffdfa9b0526c0fd7440" + sha256 cellar: :any, monterey: "832223bda81b67acf1e62e797ee789a672c7549560b3882fdf99ec26c98ff6d7" + sha256 cellar: :any, big_sur: "209172f1e61368df3d0ab0f7dc6859525571d2fc602c7c0f17732b3b762812be" + sha256 cellar: :any_skip_relocation, x86_64_linux: "9f93d59ce2b8b10d0418d53968dd730f71caa7cd2e3a75ab415b07dc744e6b2c" end depends_on "openjdk" => :build # for hydra-core @@ -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 diff --git a/Formula/etcd-cpp-apiv3.rb b/Formula/etcd-cpp-apiv3.rb index 520ebad58b307..afdf81b6d4981 100644 --- a/Formula/etcd-cpp-apiv3.rb +++ b/Formula/etcd-cpp-apiv3.rb @@ -4,15 +4,16 @@ 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" - sha256 cellar: :any, arm64_monterey: "5bebcf17b8df90d2cfc90b1a136ac39fa81c49b362b493949601130ef926059b" - sha256 cellar: :any, arm64_big_sur: "339483fb805bea56ef51dadebf06dd36b21716287b5ef047941156960044b7d7" - sha256 cellar: :any, ventura: "0c25968475ce8a9f4f67bc50f1d51fb541d5484c73832ea3fe89861778c30380" - sha256 cellar: :any, monterey: "22b18124875b0e35c1d53fce4a4479c3003610d99f068733c2d44196361149ba" - sha256 cellar: :any, big_sur: "e8cf1cd115c4f3d1082c52a9a5b64e90a0e7e3d67284543dbb80b8d1ebf89073" - sha256 cellar: :any_skip_relocation, x86_64_linux: "0fddf5e334ee799945fa92391ecd73d665ca527f0d9a3e776a57625cebbf6932" + sha256 cellar: :any, arm64_ventura: "72f6a58af9bbba15c9c386cfcfc39420a632a6d6b7d554c33fe7b6906edfa4d2" + sha256 cellar: :any, arm64_monterey: "5782a8b3685b84fd52e9f4aba54e8f089fd6b69c368035d8498c01cfaaac9cf2" + sha256 cellar: :any, arm64_big_sur: "f3708d358a76f4cdf3671b6245a929d2643cc1d057e8308a054ec645c5ff2999" + sha256 cellar: :any, ventura: "4f46dc2ed85f3edeffd69b56d091ba6164315bff89c969cc71ffbf1b45f9ebab" + sha256 cellar: :any, monterey: "2fe00b8bedfd2717b6d8801a37a164f86ed2e501f64dcc9e70579876ddeb9d5d" + sha256 cellar: :any, big_sur: "d7deaacbe3e66017739e94e33c093bba386d72051726475e7d44a6120286debf" + sha256 cellar: :any_skip_relocation, x86_64_linux: "e7bbe7c8f1aee56a8a73a65aeef4a4d181f7fa8051fae1cb879714d05ef7e872" end depends_on "cmake" => :build @@ -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", diff --git a/Formula/fastnetmon.rb b/Formula/fastnetmon.rb index 5f99d7a063544..7f415fc1d4f02 100644 --- a/Formula/fastnetmon.rb +++ b/Formula/fastnetmon.rb @@ -4,22 +4,23 @@ 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" - sha256 cellar: :any, arm64_monterey: "6deebc385d74a2ba2859e99990542a97b4444af96fd46bf993d11e82ad2d7f2e" - sha256 cellar: :any, arm64_big_sur: "82518226cbafbdeae623d4da79167ae1640333019118e77978b3e611b342fd96" - sha256 cellar: :any, ventura: "641731f22269ae6b6fddc9d9ffe3f5206b5a2ad731b7129ad79912c19b7454d5" - sha256 cellar: :any, monterey: "ab08938beedc3e5009295df1ab54ad0b55819fcda7174c2ed71b3eae75e833d3" - sha256 cellar: :any, big_sur: "00743ebd3a2956810999f4c6c80e364703ff462497af91d7fdcb16632211d109" - sha256 cellar: :any_skip_relocation, x86_64_linux: "c6c73f1cff009733f76e39e5861cc8f0aa510b29e1cc24a53d38dbd36500ddb5" + sha256 cellar: :any, arm64_ventura: "766d36f3912a3cee0e95d22b5e97fc813f3484fc145c180cfc7eaa150ab30cf5" + sha256 cellar: :any, arm64_monterey: "f399e55f4f1dfbee466c82f27128cbc37aa2df1164491afc34af2e87d6908116" + sha256 cellar: :any, arm64_big_sur: "1bf91512a6addb3b71d57879bb0439baa15d8a6c704e60fb5070d238b003224a" + sha256 cellar: :any, ventura: "10a9772b6dba1cd001609150c112c469da2859258b34b6922887b5309782bdac" + sha256 cellar: :any, monterey: "5631cf00a21e09c5d6f82e51597cd64e82fb16073cfe9f46d4573b2e95668511" + sha256 cellar: :any, big_sur: "ed20ea53d33be8086144019a0aca53493eb97a49b90b9a1100eec8ca1bd8f419" + sha256 cellar: :any_skip_relocation, x86_64_linux: "f16861d43e05722b63ff4acc2257893bdd584cd5ca0cadbca684abf72ae934e2" end depends_on "cmake" => :build 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 diff --git a/Formula/grpc.rb b/Formula/grpc.rb index 98f9024ab76af..5341c96499f8f 100644 --- a/Formula/grpc.rb +++ b/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" @@ -17,13 +17,13 @@ class Grpc < Formula end bottle do - sha256 cellar: :any, arm64_ventura: "113b1b52327a106a48363218acc4bb6aa58f71d4ec46ed4213532a9112315a4c" - sha256 cellar: :any, arm64_monterey: "23084d61c550cb9c983d680adea410fb330911e9969edb6a572ff1de1d6bba21" - sha256 cellar: :any, arm64_big_sur: "37ee9d93c2013ed3d214e75341c78680df542c31619b85f1efab07d8f5f6ea2a" - sha256 cellar: :any, ventura: "fffcf4d8a4d803ab69bbd17453c2bd2ccecf72a2e25f6705cd288c05d47bab00" - sha256 cellar: :any, monterey: "b14ca5cefdeb0c9a43025183ae3cd3333f8ee19d14403d2f49ab776d130ca4fa" - sha256 cellar: :any, big_sur: "a1b242a141aba0c69e8bf30f0a451767cf5dbbcf08b549d391a7a1af8471d7d4" - sha256 cellar: :any_skip_relocation, x86_64_linux: "5db33e4adbf9a799057495c471d4186011745285e04fb66979f2c0fe914ee322" + sha256 cellar: :any, arm64_ventura: "b41fdfbc1060cac273c8b07c212b2fa247429885da8c01c4b643f41f15abf6a8" + sha256 cellar: :any, arm64_monterey: "7eed80b256121aac9024e9370983e15dad205f879b7ba39552eb20fdd059d419" + sha256 cellar: :any, arm64_big_sur: "27b95daeb7f92a7c5ef1a33bff46b2bb99868a94bf72142abb5a0c2c10d1763c" + sha256 cellar: :any, ventura: "f4fe6ef8b2f20a0afefca2a20c4c063d08375e1dd2dec283ed1dadcd28d911de" + sha256 cellar: :any, monterey: "d82f9409256e54701a1c01a729d8b2aa2e6d0cd77cf1732c82b59af999d0e2fb" + sha256 cellar: :any, big_sur: "50614291803ccd3628e4a41ea7350906516bcc9ad7eb2766819f226e773e3d8b" + sha256 cellar: :any_skip_relocation, x86_64_linux: "0a43bc9ddd4623e705b703bcbff5d1c0a60b319487f2cb0b77ebab1dd7105f51" end depends_on "autoconf" => :build diff --git a/Formula/grpc@1.54.rb b/Formula/grpc@1.54.rb new file mode 100644 index 0000000000000..09e05bd529f46 --- /dev/null +++ b/Formula/grpc@1.54.rb @@ -0,0 +1,114 @@ +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 + + bottle do + sha256 cellar: :any, arm64_ventura: "709ef74670286413abda1811a0ad355dbcbf0acdad9bfc6b9ca18961b2d1eb15" + sha256 cellar: :any, arm64_monterey: "9192db44aa60c8cdc1a9d64418f4eeea3c229dc152ab9cf370628ed5d567583b" + sha256 cellar: :any, arm64_big_sur: "0fd8c82f65fcd972b9112af1afab693bb98b412aeed694f772fd9557b25bdd77" + sha256 cellar: :any, ventura: "b511af9c7d1a114532e1b95926ec9a82736872a938aff47badafb3dd915b1190" + sha256 cellar: :any, monterey: "f0772015864308bd9a33d4398d2d4cce79f89665dd4ea6242886e6fd3520bd2e" + sha256 cellar: :any, big_sur: "b9a371b3579217575d6350a15a95739b7e3ff5d6bdfaf2fa5d1c5b8febf7358b" + sha256 cellar: :any_skip_relocation, x86_64_linux: "b45a0c6157ade4f84545f06e6531a686634e20d47459a526293da06fc5d5f6d8" + 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 + 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 diff --git a/Formula/libphonenumber.rb b/Formula/libphonenumber.rb index 591ccf0686f63..464f64c81274d 100644 --- a/Formula/libphonenumber.rb +++ b/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 @@ -11,13 +12,13 @@ class Libphonenumber < Formula end bottle do - sha256 cellar: :any, arm64_ventura: "b294944a5b2430474328e0ffa37218643ec3c0fc451fe5e74147c338869e4b2a" - sha256 cellar: :any, arm64_monterey: "6b3987fe58a8abcc887b3a78eff60ccb2152931f59dd62cdfe08543f97be8dac" - sha256 cellar: :any, arm64_big_sur: "4eee5a71fdf7fe11ebc6738f837a5dcaaca701ad9e84f37167097b45755f647e" - sha256 cellar: :any, ventura: "f37c6dbde556677478a4623427fa0932b4ec7d0b7735ebde793cf2f56b2bc28a" - sha256 cellar: :any, monterey: "56946c9807f5418240c1cb6c2f5e8522bba8beb8421f5bf0e0cd35dbf6bbccd5" - sha256 cellar: :any, big_sur: "aa30b926630fe02b83a311763df5d77eef79d7a7beb1e7c70809033ae2e63f7d" - sha256 cellar: :any_skip_relocation, x86_64_linux: "1082f9a98ebc7606635480071a6325cd56c26805926a6754c2292d92370f67fb" + sha256 cellar: :any, arm64_ventura: "7c0b8f693d69b7678017abeed947f6625d34f690f22cc7f49771c903fb59e56c" + sha256 cellar: :any, arm64_monterey: "dd107252d059d6a9d76122354596e1dbbdc49edf8b233a303060aec6106d9ba3" + sha256 cellar: :any, arm64_big_sur: "157ad87da9a616e7e3deb1c4a423a30b4fe438efb26d5452612afad1c6459d58" + sha256 cellar: :any, ventura: "87f2a81987f5a63a4f074f80db42edc73cc278d878f2f6913e6008e6c4dcf711" + sha256 cellar: :any, monterey: "f88524b034bbeda2202ab49cb17c9dd7959cb4fa59179c0d0dc539d4d8e4112e" + sha256 cellar: :any, big_sur: "6243915d7671e1f511b93b2e05ff07ccc365d6f04d800acd3a7a71ae6cf94122" + sha256 cellar: :any_skip_relocation, x86_64_linux: "d4c008edd4d0b040f9c71dae7901575ded54acc71c1e3891a811c6903f21dc81" end depends_on "cmake" => :build @@ -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 diff --git a/Formula/libpulsar.rb b/Formula/libpulsar.rb index ce079b04f3f6c..eb9f8a6f11593 100644 --- a/Formula/libpulsar.rb +++ b/Formula/libpulsar.rb @@ -5,22 +5,23 @@ 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" - sha256 cellar: :any, arm64_monterey: "9d2db5a1e841da4ae5556eeca15d813423774970371b23c0430d5b77cb7a55c1" - sha256 cellar: :any, arm64_big_sur: "1bb7b9ec67b7e26d425f8da1a09eb74efd3054b95a282b375d879d79e3777fdb" - sha256 cellar: :any, ventura: "6887a1bbc19062cd165ac280ac7347eef293700921a43402b89c36b1dd85b95a" - sha256 cellar: :any, monterey: "becdc27e25e162aba19399ed54bc335c1a8a54bedd468b4873117d217ffe52d0" - sha256 cellar: :any, big_sur: "d70e5b0be002d89bce8dedb66669df7a96968dd310a26ea921a0cfcf19326b3f" - sha256 cellar: :any_skip_relocation, x86_64_linux: "9dca420007636ef7bf1d9696c1c8ae1ecc994552d52d02b1068f2b9a88402cd5" + sha256 cellar: :any, arm64_ventura: "169f1433c214fdfa10e8808e43ed32386757d96548bf924c258b308e7c74c393" + sha256 cellar: :any, arm64_monterey: "0fdbffe2f65165b26c76185a88a51fbd84e6950bf0b3a7332286ff88f0ef27ed" + sha256 cellar: :any, arm64_big_sur: "5442a5dcaae7047accf6f9b8f908acc69e80803c49388e5f20c3e6f49144d6ee" + sha256 cellar: :any, ventura: "7e155912bcc95a35ce33acff4d972ea6e59bd782adc8007dcf1d9b39a6d73bcc" + sha256 cellar: :any, monterey: "0e4e702f0f3d5ec80dad5424533beae9c74d8bcae8367a8b343e787af46a7341" + sha256 cellar: :any, big_sur: "16cd7366e60750cac6d1db34d0d3c0a20bdcf1e252108520470cdcca006c0162" + sha256 cellar: :any_skip_relocation, x86_64_linux: "e205197114ec20279a3aca87796a81b06a28bd949a44e630be5a8cff0f011c34" end depends_on "cmake" => :build 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 diff --git a/Formula/mavsdk.rb b/Formula/mavsdk.rb index 0a9a27d9dca11..d3b47a91f9811 100644 --- a/Formula/mavsdk.rb +++ b/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 @@ -14,13 +15,13 @@ class Mavsdk < Formula end bottle do - sha256 cellar: :any, arm64_ventura: "8926a197f17b16bd649d3567d124a3db1c52d58cc295414d0b55512cd604b248" - sha256 cellar: :any, arm64_monterey: "b98242e6457b71093987cb09081adf57267bf9a85d1f83fdc680afa5d610538b" - sha256 cellar: :any, arm64_big_sur: "1304c06a519d1b894cf42e599cdde1f5e1b108b24ef055fd147419d32fd3199f" - sha256 cellar: :any, ventura: "e4535f34547b03aef7b36e70bd26b3e66a4837c83bfb5f1ea6902a720a7082c0" - sha256 cellar: :any, monterey: "2343d24865618770c6fbe023f6f177d3e4a606c019c563640c721a4476242241" - sha256 cellar: :any, big_sur: "7f70be2c2776667148eb5b95fb5deea196d1a14bee5875a2fa0a31407d452546" - sha256 cellar: :any_skip_relocation, x86_64_linux: "08d5d1d23046754fe8f0fb705cf67531f545c077026d858b92d903acacf242ab" + sha256 cellar: :any, arm64_ventura: "be9f699efc5201875525ffcbc4b4f4fda3d944e28ce7f9a8f0819cba3a2696e6" + sha256 cellar: :any, arm64_monterey: "4346e6eaa56444916d389b3b9a12fa887e0238a4b0c163c5dafc57fa1c649d97" + sha256 cellar: :any, arm64_big_sur: "6c3028c9d496064aa88adb3a33ded28ba49aa9ce13ea53d8ecf01e346c83d1de" + sha256 cellar: :any, ventura: "1103c71dbe6317c4e07c03dcf8d01481a23747ca02acb12e86e00112fa6fbbfc" + sha256 cellar: :any, monterey: "dee23eba423cf88387aac08c381f30a7b78b34a39356e7e6e1b3632a877f3a57" + sha256 cellar: :any, big_sur: "340ca228711f3cd9059127c9855e25fad1ee2fec9af4a1fdf0d93d82749522dc" + sha256 cellar: :any_skip_relocation, x86_64_linux: "6bddc4e94dd52ba46706bbfec28f9b694cbbbc7ca564ba1045fd6389ed0c101b" end depends_on "cmake" => :build @@ -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" diff --git a/Formula/monero.rb b/Formula/monero.rb index 34eb016c35ce0..31be59cfe60c8 100644 --- a/Formula/monero.rb +++ b/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 @@ -12,14 +13,13 @@ class Monero < Formula end bottle do - rebuild 1 - sha256 cellar: :any, arm64_ventura: "503eb1905ee3c346f3e9073a694bddf94c767c1be0ca81b22ff241a73ecc81da" - sha256 cellar: :any, arm64_monterey: "c7e220747fa368e4c8fb524f27c2a7d3c5fbac60df2b93df6255b73f046678d0" - sha256 cellar: :any, arm64_big_sur: "3c30abd8621a3620e8699741b9bdfcb4b12dcd2d34bfa70503631312c37da81a" - sha256 cellar: :any, ventura: "0ce807fb8a3029ae96f1a681cbfb73ee73a785075eceade84d18027551a23112" - sha256 cellar: :any, monterey: "5452415a3701f17fc32afaf9bb30cd7e1a459324d78cea42f99942fce996a225" - sha256 cellar: :any, big_sur: "b6e210f67bc9554771c01842429be151d8f9a6c2d9d7cc844164f7de63e72669" - sha256 cellar: :any_skip_relocation, x86_64_linux: "add9c33637ac9e3b3843a516dcfb141d0082ebe90700384c3a08d8390e3149d0" + sha256 cellar: :any, arm64_ventura: "aeb944e6f1d6151805257139fbabfee79a99b7f5d82f03ef8fbbd4d8ce9242ac" + sha256 cellar: :any, arm64_monterey: "7845ad54160a43e4b227d361d7641c80845772f4d59955db1643891b4c6d9ba3" + sha256 cellar: :any, arm64_big_sur: "17f4238c70bde49fe64f84e21522c03e0776c29c5039bfc96940e9fed846277e" + sha256 cellar: :any, ventura: "008753881f30a313b282608e481c31ce4d2edb377eb5a1605672d5d58812e3b8" + sha256 cellar: :any, monterey: "25533c83b05e1d1405c6879c2b70f4aee91566d9263eece346b6186e1ccc3da4" + sha256 cellar: :any, big_sur: "f19d7b064966e87d5efc86ff93f11974113c695fdd140ad6252b55db3f1cf7fd" + sha256 cellar: :any_skip_relocation, x86_64_linux: "f90d56e09feafcf4e8cf6734b0fbe2a4b353e32e55712a96ec4634f895610dd5" end depends_on "cmake" => :build @@ -29,7 +29,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" diff --git a/Formula/mosh.rb b/Formula/mosh.rb index a882df532210e..8d0ac04f57de7 100644 --- a/Formula/mosh.rb +++ b/Formula/mosh.rb @@ -4,16 +4,16 @@ class Mosh < Formula url "https://github.com/mobile-shell/mosh/releases/download/mosh-1.4.0/mosh-1.4.0.tar.gz" sha256 "872e4b134e5df29c8933dff12350785054d2fd2839b5ae6b5587b14db1465ddd" license "GPL-3.0-or-later" + revision 1 bottle do - rebuild 2 - sha256 cellar: :any, arm64_ventura: "1e37122ddf9eec43006108b5ebda33cbaacdf1806cb9e36f55a51e9d63127ab9" - sha256 cellar: :any, arm64_monterey: "d1ee93489325ff25e04fb13721dbb9e1b6c00fee6bcd60d29bccf03175222e4b" - sha256 cellar: :any, arm64_big_sur: "570b3ac2282ed39584f61c70029d7613360e3b91f985282ccb3fc75b4a0af61b" - sha256 cellar: :any, ventura: "ab239b2556be43b941fd4e78db5fabf44531df964c0cb079351bb0e85a0a5f3e" - sha256 cellar: :any, monterey: "3cb8d2d82216e9e9c5c2f41586ccaa7d8c576031741b443213dbce184db65f79" - sha256 cellar: :any, big_sur: "ef136ae9e3ee88e154e4907753d5f3ad6d5cf2ec6102f5a13e195d4445b089e4" - sha256 cellar: :any_skip_relocation, x86_64_linux: "dbae285ac8d5c5a52d2e3ef4be2ed7277e64bff69b48d37778e7401c6e930c7c" + sha256 cellar: :any, arm64_ventura: "0546a5e9cadb4d0e3959383c9c751b53c3cd53d643f3c4e0eb83802d7eea1aed" + sha256 cellar: :any, arm64_monterey: "83f89191a353e41ed16c771a240dcc3f474558807a6796edb1c5c3930cadaa41" + sha256 cellar: :any, arm64_big_sur: "ca391cf3436bbe61806a2107f3b4229fdee1d077bc4b91117afaa8b8ace5f361" + sha256 cellar: :any, ventura: "5f5a943e524f95b4d71221748ac6997a59ce2ba419a28a417f0fa1247f9084f0" + sha256 cellar: :any, monterey: "529d7ca3089ed1ce09c2fba2cbec952aa08e3245d8ea360341fa961d1bad6ed9" + sha256 cellar: :any, big_sur: "2cc0d541e3b5e2ac9238a6bb6d3677c97e5a863b8bdc6894f1ed6501264093a7" + sha256 cellar: :any_skip_relocation, x86_64_linux: "7b3819088a3a5963d0e428e5c102c1ece212e854f0416c74072e1f96f70056b7" end head do @@ -38,6 +38,8 @@ def install # https://github.com/protocolbuffers/protobuf/issues/9947 ENV.append_to_cflags "-DNDEBUG" + # Keep C++ standard in sync with abseil.rb + ENV.append "CXXFLAGS", "-std=c++17" # teach mosh to locate mosh-client without referring # PATH to support launching outside shell e.g. via launcher diff --git a/Formula/mysql.rb b/Formula/mysql.rb index df7b4e84788e8..d8284ce8e55d8 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.33.tar.gz" sha256 "ae31e6368617776b43c82436c3736900067fada1289032f3ac3392f7380bcb58" 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" @@ -11,14 +12,13 @@ class Mysql < Formula end bottle do - rebuild 1 - sha256 arm64_ventura: "b9d6f2a868be5713ca576e63d358878ee19b4a91b4a6c26b1f99c865b766cc59" - sha256 arm64_monterey: "ade87b6d6130e02940c52c10a490b99449a4c9aaf9e10c89f32c63411f3a0283" - sha256 arm64_big_sur: "2af33fc6f8908d4d78d9559a1e038ac8cdc12d0bd414dbb3dce9083e1c79ec0a" - sha256 ventura: "092aceed2b25c147deef0f661b0768fb1bfd626b7861b304473e08f172026949" - sha256 monterey: "b39c891a9ff6619ab7e0de2c72a6de303f34963ced4763bc1a574f7a35d75b85" - sha256 big_sur: "687450c06de0e61f744f331eddd950836c2851714e3bf6a818bee8bcffa587d7" - sha256 x86_64_linux: "3c548b7e0e6ad61fac3a35b8eb9a853226065557e7c462f079f6a17827d267a1" + sha256 arm64_ventura: "f7a6d1f41c3f9da796ed974929455fac311e53baffb10588e7ac9a728f66d780" + sha256 arm64_monterey: "e56237aaf6493250711b258801426999d89a6c6d084599200e118e1d09cb90e5" + sha256 arm64_big_sur: "506cda6ea66d32ce95c9ec89cd9d8cecdad66bf4db23c8a27ab57809f2d51af6" + sha256 ventura: "a0bf848998c389fd819578a220f2d2175c62f4f6d8219d86ca8830a4caf363a8" + sha256 monterey: "c036e82326b69740b9f95ba10c3f2d28d85628114716c9d4451891e41f34e27b" + sha256 big_sur: "d8a3991c09e3dfdb7045fd95a5fe0d85fdb5832661709ea3ab9655de35f3e539" + sha256 x86_64_linux: "0670d39b9a7430ed582062701fed1906de8d91836254c16e01a327ed8864ad0e" end depends_on "cmake" => :build @@ -28,7 +28,7 @@ class Mysql < Formula depends_on "libfido2" depends_on "lz4" depends_on "openssl@1.1" - depends_on "protobuf" + depends_on "protobuf@21" depends_on "zlib" # Zlib 1.2.12+ depends_on "zstd" diff --git a/Formula/ncnn.rb b/Formula/ncnn.rb index 8863db47d1d65..45213bf6899c3 100644 --- a/Formula/ncnn.rb +++ b/Formula/ncnn.rb @@ -4,20 +4,21 @@ class Ncnn < Formula url "https://github.com/Tencent/ncnn/archive/refs/tags/20230517.tar.gz" sha256 "71c1960e5fbbe68d2c3cf572cbf4dd08bb387ef20d2c560c074c5969c6b44bde" license "BSD-3-Clause" + revision 1 head "https://github.com/Tencent/ncnn.git", branch: "master" bottle do - sha256 cellar: :any, arm64_ventura: "5af4099898dfcadbe0f9f77e986f903e0149b94c6a51428a1c6887fd6aeaedb1" - sha256 cellar: :any, arm64_monterey: "8b71e538cea7613bc1fd6c8194437f7333df907ecc0b3a8bfb907ca64e6cb639" - sha256 cellar: :any, arm64_big_sur: "5de4da4ff1a9dd3ef6d5e8e7b944b5ec47cec8b9ded385bffd731c42f402b004" - sha256 cellar: :any, ventura: "e820a43c3d41d9a5a2dc956904df36abf508dd6d1af84d40163e75e1ec2d8618" - sha256 cellar: :any, monterey: "2141833163a3df75c996dae3871dcbefb861d79f598321261d35bd21a38c46d4" - sha256 cellar: :any, big_sur: "586cd554e69238a29eb0fd3728f008482ab6a4ae35334083360acfb1f0467c9f" - sha256 cellar: :any_skip_relocation, x86_64_linux: "2e7c1437475510e52a9795fb49680aa144b9dc5569bbdb28861e45e040678b9c" + sha256 cellar: :any, arm64_ventura: "ed2692c1a67318b5218593d057af9153a48b9df731d0e1058c004728ea9c4cba" + sha256 cellar: :any, arm64_monterey: "24c3b2a927d6a37089bf356074d3482223cfb8f3dc8ab5a82994a6d7cf40386f" + sha256 cellar: :any, arm64_big_sur: "a49e000aaa89bdb6ba2f9444aa6fe044f8c7cc2d3aeade99f7897be99d423f37" + sha256 cellar: :any, ventura: "4c2d84274d55fa4bc0df27d32fe5c23a8b944fbc70a5b000fc77fd97dbb0219f" + sha256 cellar: :any, monterey: "67fe161648c66a67498703f993417cb86444d08818401f7010addcdd3c1935b5" + sha256 cellar: :any, big_sur: "15d8f63b196d40b59d473380a1bf8a77300368f33c9fad1b0c36a66f1dfc8f03" + sha256 cellar: :any_skip_relocation, x86_64_linux: "9b93d162a55925582e4ac57ed0b3a935d62962337f0a3d55d38018bb3a82e6a8" end depends_on "cmake" => :build - depends_on "protobuf" + depends_on "protobuf@21" on_macos do depends_on "glslang" => :build @@ -27,9 +28,9 @@ class Ncnn < Formula end def install - ENV.cxx11 - args = std_cmake_args + %w[ + -DCMAKE_CXX_STANDARD=11 + -DCMAKE_CXX_STANDARD_REQUIRED=ON -DNCNN_SHARED_LIB=ON -DNCNN_BUILD_BENCHMARK=OFF -DNCNN_BUILD_EXAMPLES=OFF diff --git a/Formula/netdata.rb b/Formula/netdata.rb index 7d6178776b238..f03373e694fc8 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.39.1/netdata-v1.39.1.tar.gz" sha256 "92eaca53211cacc866a4d2a9c00a431d8e212399d15f15bdd819c8f1a0c1e8dd" license "GPL-3.0-or-later" + revision 1 livecheck do url :stable @@ -11,13 +12,13 @@ class Netdata < Formula end bottle do - sha256 arm64_ventura: "7b52823ecbc85e4597c129bdc677489111f22a307a42fc501fa7c7d764ec5e24" - sha256 arm64_monterey: "e700ea435c407e5677e4c08dd232cebafb56d9c92afcf6940ac03526d1e07a22" - sha256 arm64_big_sur: "b71d7a9029f2b43a7b5e8afc9e0a8952f772622139642d5b2ea0c2189b8e70e8" - sha256 ventura: "ac945c4ad8bc6b04c9aa233ee2e58a5f79c3ef0975fe5cfd0d77d9d7634b9dd3" - sha256 monterey: "0687167d6ee3d9e11ecd1b567e7f2b0ed32a572d83981e146b5c13eb6d49864d" - sha256 big_sur: "ef8dfbdf42ed181591338f6eafa4aeddde641f221e87138e0a1ba7131761e474" - sha256 x86_64_linux: "11e2b8d4651a8fefbc7de94e1249b1ac5303d504e5d06ad0533b65306c44e362" + sha256 arm64_ventura: "00b8ad57eadb73b6d47562088d95bce37d452166f6c0848e028565b304553e47" + sha256 arm64_monterey: "20a1103ef17f0e65c24c26c7242aedf8248df90193e5009e24dabe60202ab817" + sha256 arm64_big_sur: "c14020ba33c3666582a41eedb205c7ee0cabf8a6265c6d4f3095a5210988d2fb" + sha256 ventura: "d47c43dba07e6d9a65c20224176e688ed2cca3f8fbc56c4ced5dd3ea63650605" + sha256 monterey: "3b959dc540f77de5da88306bad9f62034ea6a8a0370616ee8cf5b67d2d0a1375" + sha256 big_sur: "1bda435003f2ed3c5040fe7bc6adc137b97f51bfd3632c1cce26c333021fef5b" + sha256 x86_64_linux: "06c08720b1be2243edfbb79bdd75ded1d85f2756ed704dd481664d53d7d27d55" end depends_on "autoconf" => :build diff --git a/Formula/ola.rb b/Formula/ola.rb index 956f21014ffef..777afee8efb06 100644 --- a/Formula/ola.rb +++ b/Formula/ola.rb @@ -1,19 +1,22 @@ class Ola < Formula + include Language::Python::Shebang + desc "Open Lighting Architecture for lighting control information" homepage "https://www.openlighting.org/ola/" url "https://github.com/OpenLightingProject/ola/releases/download/0.10.9/ola-0.10.9.tar.gz" sha256 "44073698c147fe641507398253c2e52ff8dc7eac8606cbf286c29f37939a4ebf" license all_of: ["GPL-2.0-or-later", "LGPL-2.1-or-later"] + revision 1 head "https://github.com/OpenLightingProject/ola.git", branch: "master" bottle do - sha256 arm64_ventura: "088b059188475214389d952efb6c53c52ecbf09765e7bb9a861bd45bd60c4a33" - sha256 arm64_monterey: "dfac4651c419b77a336a1c54703d273556ce977942bd78fdc4a51e4c1d354a07" - sha256 arm64_big_sur: "094361072bfbc2edaf6180c1d4bc679096bfefd38562a02a301176510f6f329d" - sha256 ventura: "ffed4857b650f63697aae34fe23bbb11d9334b5787d1d2dbad430eae0abd639f" - sha256 monterey: "872aa05d050ab475bffe9f4e3f5188cc7bab102804149bc8f4edde254ca99dd3" - sha256 big_sur: "4a5fef50aaf6ff9ae879e748c7adc4281c5df248dabc3f9aef925286570b909f" - sha256 x86_64_linux: "1bfba400da5d6a62cab3685d8f99aec29794a616fb413c26a1eb4d95547db195" + sha256 arm64_ventura: "70bc041b7b093dad97457e7384ab334b35d2cfebe15f6f51616493a93f83a246" + sha256 arm64_monterey: "e98135ba113896d907f982ceec5c7d5329f7daa5e095ca488dbd951c5b0334a6" + sha256 arm64_big_sur: "6436e1d0108fee7e8771adbfc66a3780c3b02cd087f09c4631a43c2e8492ab12" + sha256 ventura: "48c24b257ef8381f901a81817e4a757aea056371b48f92ca4af5edf037a6ca29" + sha256 monterey: "9199cced2f2c365923d088d367d47828bf3abb839825b42c5f1bc17651b1a1e4" + sha256 big_sur: "133412d65cfe02c454d4a7c172af8c7dd5a0f31c1b62d26705c8063a8c4acc7c" + sha256 x86_64_linux: "339101088570b59af916d7586451a29b82bc443f42ea694249558b38a135f3ba" end depends_on "autoconf" => :build @@ -24,7 +27,7 @@ class Ola < Formula depends_on "libmicrohttpd" depends_on "libusb" depends_on "numpy" - depends_on "protobuf" + depends_on "protobuf@21" depends_on "python@3.11" uses_from_macos "bison" => :build @@ -34,11 +37,20 @@ def python3 "python3.11" end + # Remove when we use unversioned protobuf + def extra_python_path + Formula["protobuf@21"].opt_prefix/Language::Python.site_packages(python3) + end + def install # https://github.com/Homebrew/homebrew-core/pull/123791 # remove when the above PR is merged ENV.append_to_cflags "-DNDEBUG" + # protobuf@21 is keg-only. + # Remove when we use unversioned protobuf + ENV.prepend_path "PYTHONPATH", extra_python_path + args = %W[ --disable-fatal-warnings --disable-silent-rules @@ -53,9 +65,22 @@ def install system "autoreconf", "--force", "--install", "--verbose" system "./configure", *std_configure_args, *args system "make", "install" + + rewrite_shebang detected_python_shebang, *bin.children + end + + # Remove when we use unversioned protobuf + def caveats + <<~EOS + To use the bundled Python libraries: + export PYTHONPATH=#{extra_python_path} + EOS end test do + # `protobuf@21` is keg-only. + # Remove when we use unversioned protobuf + ENV.prepend_path "PYTHONPATH", extra_python_path system bin/"ola_plugin_state", "-h" system python3, "-c", "from ola.ClientWrapper import ClientWrapper" end diff --git a/Formula/opencv.rb b/Formula/opencv.rb index 133650b588534..7fd70bcef760b 100644 --- a/Formula/opencv.rb +++ b/Formula/opencv.rb @@ -4,7 +4,7 @@ class Opencv < Formula url "https://github.com/opencv/opencv/archive/refs/tags/4.7.0.tar.gz" sha256 "8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973" license "Apache-2.0" - revision 4 + revision 5 livecheck do url :stable @@ -12,13 +12,13 @@ class Opencv < Formula end bottle do - sha256 arm64_ventura: "1e871ece3dc430e549bbcc447d8d1328b23d795490cd84d0a2eebd91d2f8fd1f" - sha256 arm64_monterey: "cdb96aec242b81bf2e30ab2c8617d5257b6cac6e9f14b7062d8987753e96e1c3" - sha256 arm64_big_sur: "7997f935e9bb9c4da396da9525b4a49064ee61fc5bed4047e02a861cd1c86448" - sha256 ventura: "3f23d35114213313f1a50bfd7a9a2fb9fcbfb77389da9f26a9be04c52b7aabdb" - sha256 monterey: "760d86445e552c1cfc71e5a8aa9bcb9ff7a57da0e1e3506db10012d0542e5485" - sha256 big_sur: "007ec12d18aa36dcae633756a51f3c6b2572404c89d4478e3352bf315ec2ffff" - sha256 x86_64_linux: "4fd2242c95c330f71b4d1eea91ebe1057dc54149dd90b00319b73321c9b7e25b" + sha256 arm64_ventura: "9825122dcdf6de79220259b509cf501fc745f7c88e45a5177155e85e7abf8a10" + sha256 arm64_monterey: "7221fa3d925e294aac6c88f92cfc0c56442c254325fcac9ec18eaa5270e48696" + sha256 arm64_big_sur: "ae1a6e7c0f2ac71f4fa2fea05e4a4398afb40d0b86b753a7caad17c1a05a72c4" + sha256 ventura: "e979c2ef984c3d4c274cf47adf0fc48a6ffb4ad9878cf2b5a40e349a16bc167e" + sha256 monterey: "36700a9b1f13ba3c0d2228e35a6f8f4b128b132d7b4a5594f21ef9a2fb46f116" + sha256 big_sur: "82dfe3779ef489ffd00d6019641ec65b300fc9ef471246e7628fac20ef175756" + sha256 x86_64_linux: "840ad633897dc1de63adc4add071097fd2de966274d8788c7a57650fe0d4fdb2" end depends_on "cmake" => :build @@ -35,7 +35,7 @@ class Opencv < Formula depends_on "openblas" depends_on "openexr" depends_on "openjpeg" - depends_on "protobuf" + depends_on "protobuf@21" depends_on "python@3.11" depends_on "tbb" depends_on "vtk" @@ -115,7 +115,7 @@ def install -DOPENEXR_ILMIMF_LIBRARY=#{Formula["openexr"].opt_lib}/libIlmImf.so -DOPENEXR_ILMTHREAD_LIBRARY=#{Formula["openexr"].opt_lib}/libIlmThread.so -DPNG_LIBRARY=#{Formula["libpng"].opt_lib}/libpng.so - -DPROTOBUF_LIBRARY=#{Formula["protobuf"].opt_lib}/libprotobuf.so + -DPROTOBUF_LIBRARY=#{Formula["protobuf@21"].opt_lib}/libprotobuf.so -DTIFF_LIBRARY=#{Formula["libtiff"].opt_lib}/libtiff.so -DWITH_V4L=OFF -DZLIB_LIBRARY=#{Formula["zlib"].opt_lib}/libz.so diff --git a/Formula/opencv@3.rb b/Formula/opencv@3.rb index 908317dfdd3fa..5c5e10e07448c 100644 --- a/Formula/opencv@3.rb +++ b/Formula/opencv@3.rb @@ -4,16 +4,15 @@ class OpencvAT3 < Formula url "https://github.com/opencv/opencv/archive/3.4.16.tar.gz" sha256 "5e37b791b2fe42ed39b52d9955920b951ee42d5da95f79fbc9765a08ef733399" license "BSD-3-Clause" - revision 7 + revision 8 bottle do - sha256 arm64_ventura: "db7ecf45b5f00ecd3bb10e83f952776462ef52085378084b4bd0bb66406bad15" - sha256 arm64_monterey: "e7a3c56cb0ead7a4bfade94cfd211fcb25a47f451f3ba2b9ee5468560e80ccfe" - sha256 arm64_big_sur: "93b5bb59ffb01e5932736a52fbb64622a795eac8ea5f9adcfa3baa361b266873" - sha256 ventura: "fd48a658c028cb8ab3d7ad6178f232761094364928e0b5617e3eb26dd2bc4302" - sha256 monterey: "8fef23dbc414d781ecfb5b32b4d1bd02688b36f396504473d7e73510b8cd61f6" - sha256 big_sur: "fe56d006dee8c246f739e8e041191c58d6172bd5f7b0d720df2ebeb3940b54f2" - sha256 x86_64_linux: "2441d8be14fa5f6a079d0a5b2b13ed3625c9b7da48e8da9564e7a4b41d34f774" + sha256 arm64_ventura: "6f02e702023aba86299a0855320b048d8b2cb38d2f2db8b9863fab711ce37443" + sha256 arm64_monterey: "b65d48ce13028f465e7390acc42b0e2612b0f56a759096edb768b6a6afc5ffc9" + sha256 arm64_big_sur: "1f97bd97bc0e4e1424b96b6a5dfffcc6aadf77aaffae941ac32e1a305ddd65ed" + sha256 ventura: "c37cf890505c0ce7f10418fa26b7b322dfb6258b92947ac2558c0250ef637b2d" + sha256 monterey: "3100a54f3d904cef3073f96bee539bc74f819d3c29d7fb5cc562681fe0274208" + sha256 big_sur: "e4f685c3450065769c0695a518d3a597ef004fe560806bce52f4948af1a29481" end keg_only :versioned_formula @@ -30,7 +29,7 @@ class OpencvAT3 < Formula depends_on "libtiff" depends_on "numpy" depends_on "openexr" - depends_on "protobuf" + depends_on "protobuf@21" depends_on "python@3.10" depends_on "tbb" depends_on "webp" @@ -66,8 +65,6 @@ def python3 end def install - ENV.cxx11 - resource("contrib").stage buildpath/"opencv_contrib" # Reset PYTHONPATH, workaround for https://github.com/Homebrew/homebrew-science/pull/4885 @@ -78,6 +75,7 @@ def install libdirs.each { |l| (buildpath/"3rdparty"/l).rmtree } args = std_cmake_args + %W[ + -DCMAKE_CXX_STANDARD=11 -DCMAKE_OSX_DEPLOYMENT_TARGET= -DBUILD_JASPER=OFF -DBUILD_JPEG=OFF diff --git a/Formula/opentelemetry-cpp.rb b/Formula/opentelemetry-cpp.rb index 4fa73f65a8904..2207ba09f015c 100644 --- a/Formula/opentelemetry-cpp.rb +++ b/Formula/opentelemetry-cpp.rb @@ -4,24 +4,15 @@ class OpentelemetryCpp < Formula url "https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.8.2.tar.gz" sha256 "20fa97e507d067e9e2ab0c1accfc334f5a4b10d01312e55455dc3733748585f4" license "Apache-2.0" + revision 1 head "https://github.com/open-telemetry/opentelemetry-cpp.git", branch: "main" - bottle do - sha256 cellar: :any_skip_relocation, arm64_ventura: "cbeb1ac7f62d885b1da78d5dd696aba5a64419b633a4632bd697a86bdf75296f" - sha256 cellar: :any_skip_relocation, arm64_monterey: "53a1cabdf23d90daf3eb90b93255ff789ecc82799ab22eed6abf649e6eeb404b" - sha256 cellar: :any_skip_relocation, arm64_big_sur: "165e17e92ff42b8c44c227ed26347fc9c91d178d51f059756980af066c1ca23c" - sha256 cellar: :any_skip_relocation, ventura: "265f8a37577dac9e432aae815243499794c458c6b33a58c5a73769f13e600a98" - sha256 cellar: :any_skip_relocation, monterey: "5c33a21581e4041b8a53e0b5ea8b52d8eff4f070694294578af5cf2d01b8a64a" - sha256 cellar: :any_skip_relocation, big_sur: "3aa32ff2ea64217b303a7634842c9d43049bfe6525e779c6c7d058e63fa67ff5" - sha256 cellar: :any_skip_relocation, x86_64_linux: "cea05e8a8cf47639e53aa33adcb3b65d7e111fe468f7e58971de30421cd89611" - end - depends_on "cmake" => :build depends_on "boost" - depends_on "grpc" + depends_on "grpc@1.54" depends_on "nlohmann-json" depends_on "prometheus-cpp" - depends_on "protobuf" + depends_on "protobuf@21" uses_from_macos "curl" def install diff --git a/Formula/or-tools.rb b/Formula/or-tools.rb index b6f4cf1fb8411..b1ea1c5f69647 100644 --- a/Formula/or-tools.rb +++ b/Formula/or-tools.rb @@ -4,6 +4,7 @@ class OrTools < Formula url "https://github.com/google/or-tools/archive/v9.6.tar.gz" sha256 "bc4b07dc9c23f0cca43b1f5c889f08a59c8f2515836b03d4cc7e0f8f2c879234" license "Apache-2.0" + revision 1 head "https://github.com/google/or-tools.git", branch: "stable" livecheck do @@ -12,13 +13,13 @@ class OrTools < Formula end bottle do - sha256 cellar: :any, arm64_ventura: "0d822b8c261e0bbb33c58f3c783c56beebf2a1cd606654926f267630573de915" - sha256 cellar: :any, arm64_monterey: "15cbd9f44e5c07072cc5ca8cf3e1e29a266d7366a73af937e6c9e67a37c765ba" - sha256 cellar: :any, arm64_big_sur: "367007d1964b818761c6b51b404cb75a86c05e98e83dc59c01bcb9e10b8dd500" - sha256 cellar: :any, ventura: "c2f440e0ff49ee1a51fd920ae42d4e9d37e31594befcac47911d602ade0e9a90" - sha256 cellar: :any, monterey: "2ac4b800fd5e041fc47d2e8b1d7449048f18a2ee7171e90cc5de9dd3a50fcd8b" - sha256 cellar: :any, big_sur: "6fe28066976797a12e7fa15ac47f1ee8640483dc2057f454506baf52b9073689" - sha256 cellar: :any_skip_relocation, x86_64_linux: "a96970f1b7cc4b252dfc0fc79740500afb8fcb70fb0d8b3ae50c2c565efbf49b" + sha256 cellar: :any, arm64_ventura: "03667fcef74df82288519510fa09a9233c7b4ccea32dc7990da8b9d446de66a2" + sha256 cellar: :any, arm64_monterey: "87015bad81a137a3bdb8e73884cca022d2c3322fe0276190f676079bcb2a82c4" + sha256 cellar: :any, arm64_big_sur: "ba58c8993d3731bb172d9ab6dca7cdd755ab4878e9fc777f4dc0b93bf47dc733" + sha256 cellar: :any, ventura: "35a34d1f76fd577ea466205874de9b249984a67902c614fa87d151cfa6479946" + sha256 cellar: :any, monterey: "ecc9b9ae1176fc12aecd238c36bba1bc53d91abddd607ab3f7c2b61b0f25f4a3" + sha256 cellar: :any, big_sur: "34a7c0a846c18550ad7ee7228c1b19edc923aa67c7811e2fec6e2e164c4d7b57" + sha256 cellar: :any_skip_relocation, x86_64_linux: "ec8228719f2f644bef95cef3a0678ff5b72f51d35bdbea097561a649fc92b25b" end depends_on "cmake" => :build @@ -31,7 +32,7 @@ class OrTools < Formula depends_on "eigen" depends_on "openblas" depends_on "osi" - depends_on "protobuf" + depends_on "protobuf@21" depends_on "re2" uses_from_macos "zlib" @@ -56,22 +57,23 @@ def install end test do + # manual protobuf includes can be removed when this uses unversioned protobuf. # Linear Solver & Glop Solver - system ENV.cxx, "-std=c++17", pkgshare/"simple_lp_program.cc", + system ENV.cxx, "-std=c++17", "-I#{Formula["protobuf@21"].opt_include}", pkgshare/"simple_lp_program.cc", "-I#{include}", "-L#{lib}", "-lortools", *shell_output("pkg-config --cflags --libs absl_check absl_log").chomp.split, "-o", "simple_lp_program" system "./simple_lp_program" # Routing Solver - system ENV.cxx, "-std=c++17", pkgshare/"simple_routing_program.cc", + system ENV.cxx, "-std=c++17", "-I#{Formula["protobuf@21"].opt_include}", pkgshare/"simple_routing_program.cc", "-I#{include}", "-L#{lib}", "-lortools", *shell_output("pkg-config --cflags --libs absl_check absl_log").chomp.split, "-o", "simple_routing_program" system "./simple_routing_program" # Sat Solver - system ENV.cxx, "-std=c++17", pkgshare/"simple_sat_program.cc", + system ENV.cxx, "-std=c++17", "-I#{Formula["protobuf@21"].opt_include}", pkgshare/"simple_sat_program.cc", "-I#{include}", "-L#{lib}", "-lortools", *shell_output("pkg-config --cflags --libs absl_log absl_raw_hash_set").chomp.split, "-o", "simple_sat_program" diff --git a/Formula/osm-pbf.rb b/Formula/osm-pbf.rb index 481eae1bdfe1e..0a74bac4dd837 100644 --- a/Formula/osm-pbf.rb +++ b/Formula/osm-pbf.rb @@ -4,21 +4,20 @@ 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 4 + revision 5 bottle do - sha256 cellar: :any, arm64_ventura: "83186e7dc2a8237fb480072b716ca0a3d274002bef9f1cda3bbaa00917324b78" - sha256 cellar: :any, arm64_monterey: "0b4a492003e5dd41f96fbc40ca087cc64f7651992b65b7028434bf3c4c20eb74" - sha256 cellar: :any, arm64_big_sur: "b7db0864c304ea5d04094b88c0fa078d49424fa98950aed10f40ed596ef9b194" - sha256 cellar: :any, ventura: "e24048c59c71a33485bfdf59a13e220318a590618ea076650753e3fd052c10b2" - sha256 cellar: :any, monterey: "c9c32991c08e164406494c12a5c3c9ad3b46ee249386cb5777068b1d1b12e80b" - sha256 cellar: :any, big_sur: "2a1309dd7c2a7634add17179732f452415febfb6b2a39b8f498b57f4d8ee222d" - sha256 cellar: :any, catalina: "6cea77ead1d01a4516a2a8e20a38a0dde0024eade075fa0738ba0f6910bb5df6" - sha256 cellar: :any_skip_relocation, x86_64_linux: "1467f12dbe00979de9bfc47c37b59d2b918938a78ae9d476091902f886685f44" + sha256 cellar: :any, arm64_ventura: "76cb439da420f4f46f3c05790353b1bd5c6fb41f1660be72c20debaefb8f21c4" + sha256 cellar: :any, arm64_monterey: "2686e5c465cae1bf9dcfe5b566300ce59333a308a2001f46081d216304f8d30b" + sha256 cellar: :any, arm64_big_sur: "c1a4fd86fc7b23fe2534bd50d1c17d8c929081f4861970bef9c91771a1fd85fe" + sha256 cellar: :any, ventura: "6999adc180bc02399df196b0d130f9e084d3ef8a8f604210e71157eef0cce1f1" + sha256 cellar: :any, monterey: "e838c398a9a89da23a363c48432999a1a7e9a696af1cae28f43df55eeb92eeb7" + sha256 cellar: :any, big_sur: "be7f0cf8535457feecb3dec2cfc76bf74f88de4efa73a77c1c5114c25ac4309b" + sha256 cellar: :any_skip_relocation, x86_64_linux: "167796ef8b8d49e257eb7909e314b4156b2b9865f44a2b23bd1c7b0cbea5fc3f" end depends_on "cmake" => :build - depends_on "protobuf" + depends_on "protobuf@21" uses_from_macos "zlib" diff --git a/Formula/percona-server.rb b/Formula/percona-server.rb index 3a3c897c53c65..0877f80529ec2 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.32-24/source/tarball/percona-server-8.0.32-24.tar.gz" sha256 "2867706e914597cb3a5161751573c5463caf8343684ed7eeafcad1eb8f2d081e" license "BSD-3-Clause" + revision 1 livecheck do url "https://www.percona.com/downloads/Percona-Server-LATEST/" @@ -11,13 +12,13 @@ class PerconaServer < Formula end bottle do - sha256 arm64_ventura: "0fa7b89ba29abcc92aa45e3a6316803474031f64b8dec1589741ab2381726736" - sha256 arm64_monterey: "f5166caa3dc0d43d05890f6c14c728ea043ef16a7a1cd3dcc335f0101c90ed38" - sha256 arm64_big_sur: "7d5ef676fc7d5fca3b01afd54a53354d423b8f129dbc6ba1850b2a8241de0a6e" - sha256 ventura: "f209115a52851008f5351d8924594e63e89f5249ac14e3ad845a5dd729397158" - sha256 monterey: "44e586b8a541ba5bd90c624d703c1d0bc68e95bcc45b0d3fb3225c68652ab5bd" - sha256 big_sur: "14198a25437f94849b286605cb332ed9094cfef05a28d3e612a2e4625cad47fe" - sha256 x86_64_linux: "6cc85893376bd28e65251ff6f079236ead3e3a36c5037fed15131e29789ccd27" + sha256 arm64_ventura: "a921bfbdeaaa0097c32a57dc5f49a694cd343365e18b68fe83589eb03c7c0188" + sha256 arm64_monterey: "b93ade94d601edb0a5e9e24277abf2e156925746475f48500541909256ae773f" + sha256 arm64_big_sur: "1f10e90e616d9100a5a4e8f2cf9bc61180e01f5bcaea2fa51e187c9609071891" + sha256 ventura: "2a77772db022cf314e9ecf0c44dbe9bb3c9ae8039c2082dc27d966462b333145" + sha256 monterey: "d4731c7e181d23049b9420a428af96d90e81100942b75e8d554b790d970fbb29" + sha256 big_sur: "137193691364e3a6a623e438134868c9943ac81d88572a201f90bd3068d8b4a9" + sha256 x86_64_linux: "eabc7ec42e913019e8fcf991f0ec941c4307e24a6065503646fa700169c52030" end depends_on "cmake" => :build @@ -28,7 +29,7 @@ class PerconaServer < Formula depends_on "lz4" depends_on "openldap" # Needs `ldap_set_urllist_proc`, not provided by LDAP.framework depends_on "openssl@1.1" - depends_on "protobuf" + depends_on "protobuf@21" depends_on "zlib" # Zlib 1.2.13+ depends_on "zstd" diff --git a/Formula/percona-xtrabackup.rb b/Formula/percona-xtrabackup.rb index a3a95a54c578a..dec5f48e73a7e 100644 --- a/Formula/percona-xtrabackup.rb +++ b/Formula/percona-xtrabackup.rb @@ -4,6 +4,7 @@ class PerconaXtrabackup < Formula url "https://downloads.percona.com/downloads/Percona-XtraBackup-LATEST/Percona-XtraBackup-8.0.32-26/source/tarball/percona-xtrabackup-8.0.32-26.tar.gz" sha256 "2a1c23497ffd5905d6dc20bdb5a801d1b8baeb3245ec11ed115dee0d78b7a5e2" license "GPL-2.0-only" + revision 1 livecheck do url "https://www.percona.com/downloads/Percona-XtraBackup-LATEST/" @@ -11,13 +12,13 @@ class PerconaXtrabackup < Formula end bottle do - sha256 arm64_ventura: "213057e7ab263f7402e043de19f842bf2f3d853c3c00c4dc056329a8f7a29934" - sha256 arm64_monterey: "790e4db0ac54d1200fd238fce5b946ace4438909be6b5e8845cc2207ebe1265f" - sha256 arm64_big_sur: "18102135559be1f0fa2a32c93eff9ffbf460d97bb73096d718b58328227368a3" - sha256 ventura: "d1b8bfd0e0766772df60dfb7c6a0e89733d868275886ecc446a6be6471aa4be4" - sha256 monterey: "fe19f49104c57642c34354cb5c3b392c115d02dfca3cf3a01102788b2e21dd0f" - sha256 big_sur: "4e85279de1c8a5658a3448d3c4a12a50e829b0421307454ad1659e061a68f14a" - sha256 x86_64_linux: "b583a9d1f88a0fd85a876a19e8058960e2bed4639c6478a148c27f0e23a0ec8a" + sha256 arm64_ventura: "773fe388c6889bd73c9bc9e4f1d7412ecc5275e8be206784e8516fa840852d8a" + sha256 arm64_monterey: "a08039d4a3e0c5ea1ae17b23769f8e2ead1798669fd8fff1b91e4356f11297bb" + sha256 arm64_big_sur: "3638453f0c6cedec4953ab325480f15805b215c2bfddf3a3c7d0ca5facb90a60" + sha256 ventura: "4a12748dbff1f7766d5ab717384961b35a1580307dda71ac1853187a349a299c" + sha256 monterey: "0466a6a332683d146a316a174dd21dbcde2c657eefe8bc30e3c5ef03d9b4d3a0" + sha256 big_sur: "826b289bdc606752354383079e7664f97134928693d35d9f2919a039c621d466" + sha256 x86_64_linux: "29af2876a9ec091f4e03fb045b12cfb23647a5d50d8546c56cb4dbd1fa7f43af" end depends_on "cmake" => :build @@ -31,7 +32,7 @@ class PerconaXtrabackup < Formula depends_on "lz4" depends_on "mysql" depends_on "openssl@1.1" - depends_on "protobuf" + depends_on "protobuf@21" depends_on "zstd" uses_from_macos "vim" => :build # needed for xxd @@ -114,16 +115,12 @@ def install (buildpath/"boost").install resource("boost") cmake_args << "-DWITH_BOOST=#{buildpath}/boost" - cmake_args.concat std_cmake_args - # Remove conflicting manpages rm (Dir["man/*"] - ["man/CMakeLists.txt"]) - mkdir "build" do - system "cmake", "..", *cmake_args - system "make" - system "make", "install" - end + system "cmake", "-S", ".", "-B", "build", *cmake_args, *std_cmake_args + system "cmake", "--build", "build" + system "cmake", "--install", "build" # remove conflicting library that is already installed by mysql rm lib/"libmysqlservices.a" diff --git a/Formula/protobuf-c.rb b/Formula/protobuf-c.rb index a382e1122b3ca..efc0aba3680e6 100644 --- a/Formula/protobuf-c.rb +++ b/Formula/protobuf-c.rb @@ -4,21 +4,20 @@ 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 + revision 2 bottle do - sha256 cellar: :any, arm64_ventura: "51daa29261e512d3a61089e74942c0d085f6bbccfbf8c4e8828856344b797fb2" - sha256 cellar: :any, arm64_monterey: "201a08aabe9bc83897b908019d7dd8aba6dcddf46224eb15bbccdd5f70f6a21b" - sha256 cellar: :any, arm64_big_sur: "48ea3989f31b6f44c8170479f5115064ed32ccd4ccf6784ea4ad254697d4f53e" - sha256 cellar: :any, ventura: "06eadf1c5ac5bcc4eb1416751163864d7724a4c77703540cde2f9f31ad26a452" - sha256 cellar: :any, monterey: "eeb51fce7f9a32e9c64ed31ffaa0c9e1fe747b0e047065fcd7e69cc6361b039c" - sha256 cellar: :any, big_sur: "06b3fc06f5fe8b09353ac6aa106373833d897a960bb607a6caf84ba0043634ac" - sha256 cellar: :any, catalina: "5c3d841771a3527b3c118abb738b2ab04345de884588cf313d8ed14fe8514288" - sha256 cellar: :any_skip_relocation, x86_64_linux: "4fd6aa2c3972f3b24248fb0a75638c61dc658cd0c2bc3005b088715e68f6a106" + sha256 cellar: :any, arm64_ventura: "7faeb770aed57e27102f2376d93ae7e82834d3dc672bdea3eeebe50354d800e9" + sha256 cellar: :any, arm64_monterey: "0fea195abfb08ff10fc8faf4a0fd286941f0c369d951ba20b7457290ae8f4286" + sha256 cellar: :any, arm64_big_sur: "6dbb3f8ed1db69f358fdd832d757c169883263ba5d756d1423ac0c826fa9a49e" + sha256 cellar: :any, ventura: "d362d2c2f4aff740a5ac295916fcf8782b2067c9aa293c2ee849e6d1abbd42c2" + sha256 cellar: :any, monterey: "8573b374486e464c8da48089d5ace6a0eda71405040acc555dc89b54466263ab" + sha256 cellar: :any, big_sur: "8b022f6ff09f41d5ca48781fbe0168ba6420ffe4d24be3bb00d4256ab344f098" + sha256 cellar: :any_skip_relocation, x86_64_linux: "68cbaee2214be0208918ae530369e455627e6f7ffe8cb3f9f662ff78131be7ed" end depends_on "pkg-config" => :build - depends_on "protobuf" + depends_on "protobuf@21" # https://github.com/protobuf-c/protobuf-c/issues/544 def install ENV.cxx11 @@ -42,6 +41,6 @@ def install } EOS (testpath/"test.proto").write testdata - system Formula["protobuf"].opt_bin/"protoc", "test.proto", "--c_out=." + system Formula["protobuf@21"].opt_bin/"protoc", "test.proto", "--c_out=." end end diff --git a/Formula/protobuf.rb b/Formula/protobuf.rb index 17f56a876b06f..26744bd953c9f 100644 --- a/Formula/protobuf.rb +++ b/Formula/protobuf.rb @@ -1,19 +1,9 @@ class Protobuf < Formula desc "Protocol buffers (Google's data interchange format)" - homepage "https://github.com/protocolbuffers/protobuf/" + homepage "https://protobuf.dev/" + url "https://github.com/protocolbuffers/protobuf/releases/download/v22.5/protobuf-22.5.tar.gz" + sha256 "26859db86e2516bf447b5c73ad484c72016376dad179d96591d489911e09cdc2" license "BSD-3-Clause" - head "https://github.com/protocolbuffers/protobuf.git", branch: "main" - - stable do - url "https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protobuf-all-21.12.tar.gz" - sha256 "2c6a36c7b5a55accae063667ef3c55f2642e67476d96d355ff0acb13dbb47f09" - - # Fix build with Python 3.11. Remove in the next release. - patch do - url "https://github.com/protocolbuffers/protobuf/commit/da973aff2adab60a9e516d3202c111dbdde1a50f.patch?full_index=1" - sha256 "911925e427a396fa5e54354db8324c0178f5c602b3f819f7d471bb569cc34f53" - end - end livecheck do url :stable @@ -21,19 +11,26 @@ class Protobuf < Formula end bottle do - rebuild 3 - sha256 cellar: :any, arm64_ventura: "1f239e8ef2f5a5e28123ab34e9d8fb909f7a0495f296a7fbdd734751afb5150b" - sha256 cellar: :any, arm64_monterey: "8cf9ff7c773a6bcf16a18328c5337d0488795b292d24bdc3e2d7d3313d988c27" - sha256 cellar: :any, arm64_big_sur: "dbbfa2c402ab0551e6d7adc70be7e600e44b104db1453a8d9031bb7045ff6193" - sha256 cellar: :any, ventura: "a36fb3face5989e81d7385f7e6099dcf21a6f3aa85bab22d7427849f36484a31" - sha256 cellar: :any, monterey: "0443caf078d379396097e5f9786dab3da5b925fb5ec02da68e5383fda7dcc155" - sha256 cellar: :any, big_sur: "6ac6c0e00be578a155a05cdce3c9afc206e7b2a418c61ec9caa80ceb2d61f8c6" - sha256 cellar: :any_skip_relocation, x86_64_linux: "b915e53de62350858e1aa087cbf753a01655704b1e2991ec8098fc4c017be9f7" + sha256 cellar: :any, arm64_ventura: "f93b1ff92035a29f7440afb2fa544cf0d4e7f4bd2132666dbdb2ffd5a030ef57" + sha256 cellar: :any, arm64_monterey: "71c70490362c17d144fa49a0fe9adf79898303cc41378a851442cdb00795a6ec" + sha256 cellar: :any, arm64_big_sur: "27431a5cbc23a0f9d755c34b5d4f2b88e5e4257ab6c34d1709ad4f86f4410153" + sha256 cellar: :any, ventura: "b44e22503221d74441c4d8f1712f3a53ed6c0f6a4f56a4ea101b163398a6ca9b" + sha256 cellar: :any, monterey: "6ccf9bf10da42b5d8100cab7ab1fc6494b87182db4a8af818e235574efafd609" + sha256 cellar: :any, big_sur: "924b69c32c6f6e8659f6c3d8eca264472e31079fdfe062c54aab879497c7c2cb" + sha256 cellar: :any_skip_relocation, x86_64_linux: "fbc46502e4a2f3eb17198723e33f6a3a45b23a5a7877a3ae14fe644ec09ccbb7" + end + + head do + url "https://github.com/protocolbuffers/protobuf.git", branch: "main" + depends_on "jsoncpp" end depends_on "cmake" => :build depends_on "python@3.10" => [:build, :test] depends_on "python@3.11" => [:build, :test] + depends_on "abseil" + # TODO: Add the dependency below in Protobuf 24+. Also remove `head` block. + # TODO: depends_on "jsoncpp" uses_from_macos "zlib" @@ -44,13 +41,21 @@ def pythons end def install + odie "Dependencies need adjusting!" if build.stable? && version >= "24" + # Keep `CMAKE_CXX_STANDARD` in sync with the same variable in `abseil.rb`. + abseil_cxx_standard = 17 cmake_args = %w[ + -DBUILD_SHARED_LIBS=ON -Dprotobuf_BUILD_LIBPROTOC=ON + -Dprotobuf_BUILD_SHARED_LIBS=ON -Dprotobuf_INSTALL_EXAMPLES=ON -Dprotobuf_BUILD_TESTS=OFF - ] + std_cmake_args + -Dprotobuf_ABSL_PROVIDER=package + -Dprotobuf_JSONCPP_PROVIDER=package + ] + cmake_args << "-DCMAKE_CXX_STANDARD=#{abseil_cxx_standard}" - system "cmake", "-S", ".", "-B", "build", "-Dprotobuf_BUILD_SHARED_LIBS=ON", *cmake_args + system "cmake", "-S", ".", "-B", "build", *cmake_args, *std_cmake_args system "cmake", "--build", "build" system "cmake", "--install", "build" @@ -62,6 +67,9 @@ def install ENV["PROTOC"] = bin/"protoc" cd "python" do + # Keep C++ standard in sync with `abseil.rb`. + inreplace "setup.py", "extra_compile_args.append('-std=c++14')", + "extra_compile_args.append('-std=c++#{abseil_cxx_standard}')" pythons.each do |python| pyext_dir = prefix/Language::Python.site_packages(python)/"google/protobuf/pyext" with_env(LDFLAGS: "-Wl,-rpath,#{rpath(source: pyext_dir)} #{ENV.ldflags}".strip) do @@ -69,14 +77,6 @@ def install end end end - - system "cmake", "-S", ".", "-B", "static", - "-Dprotobuf_BUILD_SHARED_LIBS=OFF", - "-DCMAKE_POSITION_INDEPENDENT_CODE=ON", - "-DWITH_PROTOC=#{bin}/protoc", - *cmake_args - system "cmake", "--build", "static" - lib.install buildpath.glob("static/*.a") end test do diff --git a/Formula/protobuf@21.rb b/Formula/protobuf@21.rb new file mode 100644 index 0000000000000..b33ee441c0bed --- /dev/null +++ b/Formula/protobuf@21.rb @@ -0,0 +1,96 @@ +class ProtobufAT21 < Formula + desc "Protocol buffers (Google's data interchange format)" + homepage "https://protobuf.dev/" + url "https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protobuf-all-21.12.tar.gz" + sha256 "2c6a36c7b5a55accae063667ef3c55f2642e67476d96d355ff0acb13dbb47f09" + license "BSD-3-Clause" + + bottle do + sha256 cellar: :any, arm64_ventura: "d0909077ab9abd27d47a7990c7bcea6622805421de263ff5a5366beef171bf74" + sha256 cellar: :any, arm64_monterey: "4f147f89429d04ac3ed6c2c8265b0c1915e00fe220e54725e6b0619de22bb4b7" + sha256 cellar: :any, arm64_big_sur: "8f82f5c9e0fd457a11bbd8d5932a7beab5b816d1dd295ccf2a700f845b29e015" + sha256 cellar: :any, ventura: "3f04c152bc512c647617a667557ba211f3cbabb49a0029c04214488ce52840c6" + sha256 cellar: :any, monterey: "d273a25298c6bb40374e7741ef20047d62b975fbb55840aa88b63f6d0e687e3d" + sha256 cellar: :any, big_sur: "76f714caba9825918e0456538f14b8945f7a595b71e205a662ae9ce4f3515dbc" + sha256 cellar: :any_skip_relocation, x86_64_linux: "57404e662da5768d45c06790cd227171205fcc0e1f775d4e1f2a91cad8ec45cc" + end + + keg_only :versioned_formula + + depends_on "cmake" => :build + depends_on "python@3.10" => [:build, :test] + depends_on "python@3.11" => [:build, :test] + uses_from_macos "zlib" + + def pythons + deps.map(&:to_formula) + .select { |f| f.name.match?(/^python@\d\.\d+$/) } + .map { |f| f.opt_libexec/"bin/python" } + end + + # Fix build with python@3.11 + patch do + url "https://github.com/protocolbuffers/protobuf/commit/da973aff2adab60a9e516d3202c111dbdde1a50f.patch?full_index=1" + sha256 "911925e427a396fa5e54354db8324c0178f5c602b3f819f7d471bb569cc34f53" + end + + def install + cmake_args = %w[ + -Dprotobuf_BUILD_LIBPROTOC=ON + -Dprotobuf_INSTALL_EXAMPLES=ON + -Dprotobuf_BUILD_TESTS=OFF + ] + + system "cmake", "-S", ".", "-B", "build", + "-DBUILD_SHARED_LIBS=ON", + "-Dprotobuf_BUILD_SHARED_LIBS=ON", + *cmake_args, *std_cmake_args + system "cmake", "--build", "build" + system "cmake", "--install", "build" + + pkgshare.install "editors/proto.vim" + elisp.install "editors/protobuf-mode.el" + + ENV.append_to_cflags "-I#{include}" + ENV.append_to_cflags "-L#{lib}" + ENV["PROTOC"] = bin/"protoc" + + cd "python" do + pythons.each do |python| + pyext_dir = prefix/Language::Python.site_packages(python)/"google/protobuf/pyext" + with_env(LDFLAGS: "-Wl,-rpath,#{rpath(source: pyext_dir)} #{ENV.ldflags}".strip) do + system python, *Language::Python.setup_install_args(prefix, python), "--cpp_implementation" + end + end + end + + system "cmake", "-S", ".", "-B", "static", + "-Dprotobuf_BUILD_SHARED_LIBS=OFF", + "-DCMAKE_POSITION_INDEPENDENT_CODE=ON", + "-DWITH_PROTOC=#{bin}/protoc", + *cmake_args, *std_cmake_args + system "cmake", "--build", "static" + lib.install buildpath.glob("static/*.a") + 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=." + + pythons.each do |python| + with_env(PYTHONPATH: (prefix/Language::Python.site_packages(python)).to_s) do + system python, "-c", "import google.protobuf" + end + end + end +end diff --git a/Formula/pytorch.rb b/Formula/pytorch.rb index cdae4cd129aaf..293eb88ac7580 100644 --- a/Formula/pytorch.rb +++ b/Formula/pytorch.rb @@ -7,6 +7,7 @@ class Pytorch < Formula tag: "v2.0.0", revision: "c263bd43e8e8502d4726643bc6fd046f0130ac0e" license "BSD-3-Clause" + revision 1 livecheck do url :stable @@ -14,11 +15,10 @@ class Pytorch < Formula end bottle do - sha256 cellar: :any, arm64_ventura: "84c92920a975f10018036fe317f6e5f769c1808cb3830f8b6703466d1de36b16" - sha256 cellar: :any, arm64_monterey: "865be2629122148a2255efe8a91509aa08077538671af6f5ad0414c9ec0d510d" - sha256 cellar: :any, ventura: "6f18ba97503ae41b3fe200edd20676d0dff3c31a0687c15cd2982f41b157a978" - sha256 cellar: :any, monterey: "5d44adc32a12d071ac534ecf2d69e7b7b55e68f580160c80faf69d1886646991" - sha256 cellar: :any_skip_relocation, x86_64_linux: "efba91ed3399ef15b48808adfa00a95b76b15ffb8e2094e175748d1dab95a258" + sha256 cellar: :any, arm64_ventura: "5d7f8b5a6b68b843e4d378f06edcf04fc4eb3e6a67bd31a30aaff0d22cbbc2a4" + sha256 cellar: :any, arm64_monterey: "4dcc2fe35ee17d0332467402b41f7e141c4685c6e44adb69923b5d12fac2cb42" + sha256 cellar: :any, monterey: "3a6099a1d604fca547bd5c1e83022699d871b878f0c8da55afb56289b8ecff08" + sha256 cellar: :any_skip_relocation, x86_64_linux: "7ef4ba460cda2220b94ff2a5e327da87cba35c92cb6788353c0ddb42d26cb45c" end depends_on "cmake" => :build @@ -31,7 +31,7 @@ class Pytorch < Formula depends_on "numpy" depends_on "openblas" depends_on "openssl@1.1" - depends_on "protobuf" + depends_on "protobuf@21" depends_on "pybind11" depends_on "python-typing-extensions" depends_on "pyyaml" diff --git a/Formula/rethinkdb.rb b/Formula/rethinkdb.rb index ff2d833938d23..453a671388360 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.3.tgz" sha256 "c3788c7a270fbb49e3da45787b6be500763c190fb059e39b7def9454f9a4674f" license "Apache-2.0" + revision 1 head "https://github.com/rethinkdb/rethinkdb.git", branch: "next" livecheck do @@ -12,18 +13,18 @@ class Rethinkdb < Formula end bottle do - sha256 cellar: :any, arm64_ventura: "ae30957e7551311117601bde58ab4ebca32462d2d954c1e080d14caacee958bc" - sha256 cellar: :any, arm64_monterey: "59858581f1766561f3ab4981d3cc9ddab96e9ff04309a5de27c9a4a2b4e7ffc5" - sha256 cellar: :any, arm64_big_sur: "896cd6b4cc6cacf34ca3cee6506b601f277c14f6aebd94893ef7a01cb7f27707" - sha256 cellar: :any, ventura: "ae34d8f985b6653bce595c4bf9ff78b9efbe6b66b3457faa853fac44def55ef8" - sha256 cellar: :any, monterey: "15280636e59a10ea79b5eed7216b98233b92843041075c6034033a3de89571f4" - sha256 cellar: :any, big_sur: "8c37c99dc3bf4ea3151fc0019e202e79645952955a9a537eed894ae9de7a92b2" - sha256 cellar: :any_skip_relocation, x86_64_linux: "9b283e13c64f5da913686092cb2d0de922170d13104d37a6e953e192324dc6e6" + sha256 cellar: :any, arm64_ventura: "72b8273491916ba72470b87d1c720ba14ecf911217d611bd178c33acec60da6e" + sha256 cellar: :any, arm64_monterey: "c5c84f69aa7d97dd781577b3cb1b4485380ef78fe38b2706dfb8009b8903af1f" + sha256 cellar: :any, arm64_big_sur: "0a2b28e9debc607035bb95f0560d89566eea2e802da8332910a23daef0565cca" + sha256 cellar: :any, ventura: "48e426908edc78f998b71065b928795dcba3139df4dfd50bc7a7ab13e703c07e" + sha256 cellar: :any, monterey: "f214cf1e1218a07ee4a2656cddfd1e51648a876c1f152ecd1b27943a880cc31b" + sha256 cellar: :any, big_sur: "0bf444d7ad09a8625effecb7ebe807def916f4a55f82eeff34221cdf71f14e5e" + sha256 cellar: :any_skip_relocation, x86_64_linux: "759fd09fa49fc269b4ee299c9bdd1e446c669e5f8d12a7be4a7217cb4cccf4c6" end depends_on "boost" => :build depends_on "openssl@1.1" - depends_on "protobuf" + depends_on "protobuf@21" uses_from_macos "python" => :build uses_from_macos "curl" diff --git a/Formula/sysdig.rb b/Formula/sysdig.rb index cd799489a5097..dbe18057b0019 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 1 + revision 2 stable do url "https://github.com/draios/sysdig/archive/refs/tags/0.31.5.tar.gz" @@ -30,13 +30,13 @@ class Sysdig < Formula end bottle do - sha256 arm64_ventura: "a7dbbaaa73d3e72c849a0d1c600db4af64c32efd50e72a92be91f1dc841d5541" - sha256 arm64_monterey: "c4e71ab34ad98f927b5b2adddce3b607758fecb63a6a8d2b8e6eab740bd2f00f" - sha256 arm64_big_sur: "039d010b447f0a330f84a041fb5c5293c42d12a9933d0ffacce1f209c0d63ddd" - sha256 ventura: "3b7cf7c8297294d080205ffa4a23311ea7110acd592a3451eb33a1e91a94d203" - sha256 monterey: "a7eecbb515fe22f8cdabf452195a5bc49dd7bab1302335c992d74aa863c413d0" - sha256 big_sur: "f0fb5a56fcc9cb39f965b7ff17f9aa9b84b84cbbcfb274420b7260c5f3d23a34" - sha256 cellar: :any_skip_relocation, x86_64_linux: "60a0b84ad26f9af2cffccd12bc5800f657ce27b699ccfc9c8c18d641cb7a0262" + sha256 arm64_ventura: "39c7c73704c6d452d3f55c0a75730f9bb619d056f16346e9be6fdfa861bd2e37" + sha256 arm64_monterey: "6719522a45637ccc9f60eb0183c1b82cca8d79d29a0cb47fc05e6d9e2040f159" + sha256 arm64_big_sur: "cfc8b30beb8502a8b720ae63fbe875ed569ec6cb715f5831fcda9dd1ccf0e744" + sha256 ventura: "0663e7e4084b17a60c8abfc1a665f4af07c454bc75067a863c178d6656e1b20f" + sha256 monterey: "1438c18dbe55cdb740eb280783de76cf142c2bdfdaec098da3e05d74396eb287" + sha256 big_sur: "ac5d7f78144bdaf37bbd0a75f91be56b23cc1a9f039b710ad19ab288fecd73e6" + sha256 cellar: :any_skip_relocation, x86_64_linux: "4ad96be3ba961f9db78e50790eb0d7228fad94937dd43cca87722715b35f15da" end head do @@ -65,9 +65,9 @@ class Sysdig < Formula on_linux do depends_on "libb64" => :build depends_on "elfutils" - depends_on "grpc" + depends_on "grpc@1.54" depends_on "jq" - depends_on "protobuf" + depends_on "protobuf@21" end fails_with gcc: "5" # C++17 diff --git a/Formula/torchvision.rb b/Formula/torchvision.rb index fc95353e1feff..d644d37005607 100644 --- a/Formula/torchvision.rb +++ b/Formula/torchvision.rb @@ -6,6 +6,7 @@ class Torchvision < Formula url "https://github.com/pytorch/vision/archive/refs/tags/v0.15.1.tar.gz" sha256 "689d23d4ebb0c7e54e8651c89b17155b64341c14ae4444a04ca7dc6f2b6a0a43" license "BSD-3-Clause" + revision 1 livecheck do url :stable @@ -13,11 +14,10 @@ class Torchvision < Formula end bottle do - sha256 cellar: :any, arm64_ventura: "735349685ae524165144dd5a09a95f18b6a52d3b5a13a7fa125c39ca641c8d6b" - sha256 cellar: :any, arm64_monterey: "8e73afd6cb21a3e3f150019692f0d15f73ed6cdfdb761c9db991a253f550ee35" - sha256 cellar: :any, ventura: "c10438faefe4981f7e0e6f810912dd50a377edb079a98b2e9c00780a00d7942c" - sha256 cellar: :any, monterey: "b940f3823c61c90bc43973c2bcb715e7b340774d636292415e4169abfc756b8c" - sha256 cellar: :any_skip_relocation, x86_64_linux: "9dbae25770408ecd4d8049423dec2d1a5c4d4bfbe07f74b568c6305487cd5c80" + sha256 cellar: :any, arm64_ventura: "7a548e74f474b3e0abf348d4310e5378d7c94dd9d619ed0e29d1cfdd75b18069" + sha256 cellar: :any, arm64_monterey: "55abcc4df58d879e5c37e1d93c4477a85f6374146d4f8172bd59c0f252b9dc20" + sha256 cellar: :any, monterey: "b008fcf1d9e255b7262731c596caa6de6a0d0101db1592daa7658204c21616d1" + sha256 cellar: :any_skip_relocation, x86_64_linux: "761810f80255cee80f2f99e23349104f3b96bf4f6a8ccd936cac024ef6c301da" end depends_on "cmake" => :build diff --git a/Formula/trzsz.rb b/Formula/trzsz.rb index fda1afbbe04a0..6229f348da4f6 100644 --- a/Formula/trzsz.rb +++ b/Formula/trzsz.rb @@ -6,18 +6,19 @@ class Trzsz < Formula url "https://files.pythonhosted.org/packages/0c/e5/00c95527d18445cbd3b3b2c5c28a383c94c9ac5291e886796004727b25aa/trzsz-1.1.2.tar.gz" sha256 "dfc9606fb7ae76490c8559ec297b307a788688351ab57108f6a733105b206052" license "MIT" + revision 1 bottle do - sha256 cellar: :any_skip_relocation, arm64_ventura: "dfdc64f012d48589793eb056c5954466c3f6e5f985a7f7bff2457635aa662349" - sha256 cellar: :any_skip_relocation, arm64_monterey: "68ef45a8aaff53589d071386578eaf07d50e9987b6f8409441f9233ac1463d7f" - sha256 cellar: :any_skip_relocation, arm64_big_sur: "3a81db10a9ddd489f4442fd5149ba633e94b8345260b09d3e71fd7f943203404" - sha256 cellar: :any_skip_relocation, ventura: "97e7c7fade42b12f7556d135f2d2e3a20bed81e3b968d819a4df6b16b9fc9426" - sha256 cellar: :any_skip_relocation, monterey: "265059568e4003ec1e189751fe3ba196066b4c048d024d96b2c03fc44a09bbae" - sha256 cellar: :any_skip_relocation, big_sur: "28ed2c288e251407f7850123c623d874815d8607c7c84fd3bb8ca66a558bff2c" - sha256 cellar: :any_skip_relocation, x86_64_linux: "7183da3e45ab5a3bcd18085b5286493adb00260829ebaddec0c791545250527e" + sha256 cellar: :any_skip_relocation, arm64_ventura: "76660eb076b8dfcfdd44b0d75c890df839c6d16f2ceaad329fdc95cec35b1e78" + sha256 cellar: :any_skip_relocation, arm64_monterey: "2121245d8531a88d2217c27dc57167d2cd742a7d8c35c210401149fde31d956e" + sha256 cellar: :any_skip_relocation, arm64_big_sur: "d5426432b5c1d5908e35aea907d84fee26f6751b02873664526a018e904aa882" + sha256 cellar: :any_skip_relocation, ventura: "9ba16263135208082786ad514b610c3885ed1e182fcd00cea92a2b9a5217e0bf" + sha256 cellar: :any_skip_relocation, monterey: "c356460dba20cd46ab39c3f84badb3f2ec20ee7a9351b8d75257b73e879cebdb" + sha256 cellar: :any_skip_relocation, big_sur: "1d70c0ddddb92fb0865667724f020213cc3e98f2533acd5faedfe1b101b359ea" + sha256 cellar: :any_skip_relocation, x86_64_linux: "2577c4d9b51bed22a190a2d1a3682791f2fe7baf04ebfc71b78b1c77c142722c" end - depends_on "protobuf" + depends_on "protobuf@21" depends_on "python@3.11" resource "iterm2" do @@ -50,6 +51,13 @@ def install bin.install_symlink libexec/"bin/trz" bin.install_symlink libexec/"bin/tsz" bin.install_symlink libexec/"bin/trzsz-iterm2" + + # 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 diff --git a/Formula/vineyard.rb b/Formula/vineyard.rb index 013369e0d21d3..53ba19b2c6de4 100644 --- a/Formula/vineyard.rb +++ b/Formula/vineyard.rb @@ -6,15 +6,16 @@ class Vineyard < Formula url "https://github.com/v6d-io/v6d/releases/download/v0.15.0/v6d-0.15.0.tar.gz" sha256 "3281afac3f348c4409676adf8328c6de8b73ed35e71539e6dd779d4af5bc16dd" license "Apache-2.0" + revision 1 bottle do - sha256 arm64_ventura: "35d7ebd917bc4b14c6347de008de7225777c33d8b2220b8e79f70baa8578ad02" - sha256 arm64_monterey: "d7e20d53081aebdcc76b5fec950284484cc2b5dbdce66a4517642ccc1e335e7a" - sha256 arm64_big_sur: "1a0cf1323b2137935c157810e4c1ef5214d78cf3541c3a2a6a0d0f70a2bcec27" - sha256 ventura: "4b4da462193a395f8cc367e2cbf1774a51bcd054dd5469147aa134ea3d99a802" - sha256 monterey: "3ac17f74c68a446aa91f4e3d5ff1e9d35191e1d59a589e8428140f0c6ee9bd6b" - sha256 big_sur: "99d8db4350b817445c7dc064dae0f98d80b2719f889860b054e020907b0bf7e4" - sha256 x86_64_linux: "505f26c19a8d6d4a1e57c8f3a0af92218e7b8478a3071377acf682486e1c5743" + sha256 arm64_ventura: "7eabf89fb79249989d4f4a76ef27b85788717553c080d4d5e7af94a5088435dc" + sha256 arm64_monterey: "56222d85174b7e601fffa4ed1562c993b02b2219727426f7eaa7bafb6cb3fe39" + sha256 arm64_big_sur: "253c97750fe4a9df80e1a722531a0b4d4f70887c5652dbb58da80a3a80b5d096" + sha256 ventura: "d0cbe06dba96ec1c81c9c41b288e353f22d65c161a0395c6771bcc49504992bb" + sha256 monterey: "e67cd9db59de6c57e02c4f881240f3ee530f77d6074c2b537e8cc7f13a331579" + sha256 big_sur: "7c5b5c44f1bf2d3ca442e1792d377a2baebd76ec3c6272c918cbee7bab5ac90a" + sha256 x86_64_linux: "e06825a3f5942e14c822017cc2337eb2685c565ffe25c045c9d3d6b697b345ca" end depends_on "cmake" => :build diff --git a/Formula/wownero.rb b/Formula/wownero.rb index e98232e5641c6..77eb1243ed9f3 100644 --- a/Formula/wownero.rb +++ b/Formula/wownero.rb @@ -5,6 +5,7 @@ class Wownero < Formula tag: "v0.11.0.3", revision: "e921c3b8a35bc497ef92c4735e778e918b4c4f99" license "BSD-3-Clause" + revision 1 # The `strategy` code below can be removed if/when this software exceeds # version 10.0.0. Until then, it's used to omit a malformed tag that would @@ -23,13 +24,13 @@ class Wownero < Formula end bottle do - sha256 cellar: :any, arm64_ventura: "f8f3c23fb5186a037c01c9f4d82742b4d3098d7dd9349949d9f001fab182746d" - sha256 cellar: :any, arm64_monterey: "bbb5a81c9ab36cc09cf1c0cad43110da66a6c0cd9ade96647041172e7285829d" - sha256 cellar: :any, arm64_big_sur: "6e9eba687f435c197c4c0bd7d2c045091ef80e1eba8c29866e357bd83e7befdd" - sha256 cellar: :any, ventura: "9dfd70c7f9af50e125581d3f5bda6247b20966c05ec91b587a3e8db3b70c5b55" - sha256 cellar: :any, monterey: "894e203b6cfe46ae4cd8d3755311da1fe871939152960b997e77a573fd5ad8be" - sha256 cellar: :any, big_sur: "212b37c687062e20c8e6cf6058b82faf0958b89b322763f30d32fb5ec3c02d39" - sha256 cellar: :any_skip_relocation, x86_64_linux: "47eedd4c62b8c3c0f0a18f3080a82691d9becab292588658d76fcacd1b2ef65d" + sha256 cellar: :any, arm64_ventura: "2bf3e20f48c0b92b2bfc74feaee831b3849c56239a0d9e1da6a54f49e36da19b" + sha256 cellar: :any, arm64_monterey: "deb50ecc4a6e3bc42672a7ebd5ed49fef415d2590735fc9cef2e883627f3a669" + sha256 cellar: :any, arm64_big_sur: "face536fbc52d85877bd7a680e37b45488e79b8f5be491a89846ca78157eb88d" + sha256 cellar: :any, ventura: "7952e31288138949ede6b78adce699ccee81cf289ac0e4854da9f6eab8fefd4e" + sha256 cellar: :any, monterey: "8d9ae5c1457454103f82e0c25f8748dd18e3b1cfc4200cb8e286104690696b41" + sha256 cellar: :any, big_sur: "88f65079dab113125350e18dff96884cf3d00502cad966debd73e1a002520975" + sha256 cellar: :any_skip_relocation, x86_64_linux: "414dc04013fed7567286ef00d8c066dca39c37404c06d7d7863cfb798dddf8a4" end depends_on "cmake" => :build @@ -40,7 +41,7 @@ class Wownero < 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" @@ -48,15 +49,13 @@ class Wownero < Formula conflicts_with "monero", because: "both install a wallet2_api.h header" def install - args = std_cmake_args - # Need to help CMake find `readline` when not using /usr/local prefix - args << "-DReadline_ROOT_DIR=#{Formula["readline"].opt_prefix}" + args = %W[-DReadline_ROOT_DIR=#{Formula["readline"].opt_prefix}] # Build a portable binary (don't set -march=native) - args << "-DARCH=default" + args << "-DARCH=default" if build.bottle? - system "cmake", "-S", ".", "-B", "build", *args + system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args system "cmake", "--build", "build" system "cmake", "--install", "build" end