From df5638ba6116b47d5994fa8ee38abc50365318ef Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 2 Dec 2024 13:01:51 -0500 Subject: [PATCH 01/16] batt: align indent style to match other formulae --- Formula/b/batt.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/b/batt.rb b/Formula/b/batt.rb index 783fb5c960f48..381f81b03ac09 100644 --- a/Formula/b/batt.rb +++ b/Formula/b/batt.rb @@ -2,8 +2,8 @@ class Batt < Formula desc "Control and limit battery charging on Apple Silicon MacBooks" homepage "https://github.com/charlie0129/batt" url "https://github.com/charlie0129/batt.git", - tag: "v0.3.3", - revision: "18ce7dfbb6579b98c64d76c8be146f227c7d4be9" + tag: "v0.3.3", + revision: "18ce7dfbb6579b98c64d76c8be146f227c7d4be9" license "GPL-2.0-only" bottle do From 2214e9a3239373f0ad241b1a658bc3c66d8b6217 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 2 Dec 2024 12:56:12 -0500 Subject: [PATCH 02/16] binaryen: remove GCC 6 reference --- Formula/b/binaryen.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Formula/b/binaryen.rb b/Formula/b/binaryen.rb index 577fbf90c15b0..5f2949ee889e8 100644 --- a/Formula/b/binaryen.rb +++ b/Formula/b/binaryen.rb @@ -23,11 +23,6 @@ class Binaryen < Formula depends_on "cmake" => :build depends_on macos: :mojave # needs std::variant - fails_with :gcc do - version "6" - cause "needs std::variant" - end - def install system "cmake", "-S", ".", "-B", "build", *std_cmake_args, "-DBUILD_TESTS=false" system "cmake", "--build", "build" From 7cdceba38cb771bc7ad62751ada03ab38715a039 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 2 Dec 2024 12:57:15 -0500 Subject: [PATCH 03/16] burst: remove GCC 6 reference --- Formula/b/burst.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Formula/b/burst.rb b/Formula/b/burst.rb index 3a4f76f512cc5..f06088a6babd8 100644 --- a/Formula/b/burst.rb +++ b/Formula/b/burst.rb @@ -14,11 +14,6 @@ class Burst < Formula depends_on "cmake" => [:build, :test] depends_on "boost" - fails_with :gcc do - version "6" - cause "Requires C++14 constexpr" - end - def install system "cmake", "-S", ".", "-B", "build", "-DBURST_TESTING=OFF", From 9e61d9e587bb834e8d2aa9fe4b2f109ba260ff66 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 2 Dec 2024 12:55:13 -0500 Subject: [PATCH 04/16] clickhouse-odbc: remove GCC 6 reference --- Formula/c/clickhouse-odbc.rb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Formula/c/clickhouse-odbc.rb b/Formula/c/clickhouse-odbc.rb index c2e0d937fba0b..a521bf53bf2ab 100644 --- a/Formula/c/clickhouse-odbc.rb +++ b/Formula/c/clickhouse-odbc.rb @@ -39,10 +39,6 @@ class ClickhouseOdbc < Formula depends_on "unixodbc" end - fails_with :gcc do - version "6" - end - # build patch for utf8proc, no needed for newer version, as folly got removed per https://github.com/ClickHouse/clickhouse-odbc/pull/456 patch do url "https://raw.githubusercontent.com/Homebrew/formula-patches/c76519fcbfa664cd37a8901deb76403b1af1bec1/clickhouse-odbc/1.2.1.20220905-Utf8Proc.patch" @@ -72,7 +68,7 @@ def install end test do - (testpath/"my.odbcinst.ini").write <<~EOS + (testpath/"my.odbcinst.ini").write <<~INI [ODBC Drivers] ClickHouse ODBC Test Driver A = Installed ClickHouse ODBC Test Driver W = Installed @@ -88,9 +84,9 @@ def install Driver = #{lib/shared_library("libclickhouseodbcw")} Setup = #{lib/shared_library("libclickhouseodbcw")} UsageCount = 1 - EOS + INI - (testpath/"my.odbc.ini").write <<~EOS + (testpath/"my.odbc.ini").write <<~INI [ODBC Data Sources] ClickHouse ODBC Test DSN A = ClickHouse ODBC Test Driver A ClickHouse ODBC Test DSN W = ClickHouse ODBC Test Driver W @@ -104,7 +100,7 @@ def install Driver = ClickHouse ODBC Test Driver W Description = DSN for ClickHouse ODBC Test Driver (Unicode) Url = https://default:password@example.com:8443/query?database=default - EOS + INI ENV["ODBCSYSINI"] = testpath ENV["ODBCINSTINI"] = "my.odbcinst.ini" From fcd1e36c97188db4578e08af02b9c00b7e161e0e Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 2 Dec 2024 12:56:41 -0500 Subject: [PATCH 05/16] halide: remove GCC 6 reference --- Formula/h/halide.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Formula/h/halide.rb b/Formula/h/halide.rb index 21ac6b969e75d..b574d91a52e27 100644 --- a/Formula/h/halide.rb +++ b/Formula/h/halide.rb @@ -31,11 +31,6 @@ class Halide < Formula depends_on "llvm" depends_on "python@3.13" - fails_with :gcc do - version "6" - cause "Requires C++17" - end - # Check wabt version in `dependencies/wasm/CMakeLists.txt`. # TODO: Ask upstream to support usage of a system-provided wabt. # TODO: Do we really need a git checkout here? From 0fa20fb2fc90178b05659c76a4fdb244edcd19ab Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 2 Dec 2024 12:51:51 -0500 Subject: [PATCH 06/16] lua-language-server: remove GCC 5 reference --- Formula/l/lua-language-server.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/Formula/l/lua-language-server.rb b/Formula/l/lua-language-server.rb index 93570c133f9c5..b8f1b8abc619a 100644 --- a/Formula/l/lua-language-server.rb +++ b/Formula/l/lua-language-server.rb @@ -19,8 +19,6 @@ class LuaLanguageServer < Formula depends_on "ninja" => :build - fails_with gcc: 5 # For C++17 - def install ENV.cxx11 From 3a7bf42603f2d257843271ffbf9d05d2f7b61423 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 2 Dec 2024 12:59:11 -0500 Subject: [PATCH 07/16] mysql@8.0: remove GCC 6 reference --- Formula/m/mysql@8.0.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Formula/m/mysql@8.0.rb b/Formula/m/mysql@8.0.rb index ad033ac6158fe..4396299dda20a 100644 --- a/Formula/m/mysql@8.0.rb +++ b/Formula/m/mysql@8.0.rb @@ -44,11 +44,6 @@ class MysqlAT80 < Formula depends_on "libtirpc" end - fails_with :gcc do - version "6" - cause "Requires C++17" - end - # Patch out check for Homebrew `boost`. # This should not be necessary when building inside `brew`. # https://github.com/Homebrew/homebrew-test-bot/pull/820 From 427176ba3b22fc04bc9c82c3f1612fb893e12609 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 2 Dec 2024 12:53:06 -0500 Subject: [PATCH 08/16] nghttp2: use fails_with block --- Formula/n/nghttp2.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Formula/n/nghttp2.rb b/Formula/n/nghttp2.rb index 592c3880ed0e3..ae8b46c8db4c9 100644 --- a/Formula/n/nghttp2.rb +++ b/Formula/n/nghttp2.rb @@ -47,7 +47,10 @@ class Nghttp2 < Formula cause "Requires C++20 support" end - fails_with gcc: "11" + fails_with :gcc do + version "11" + cause "Requires C++20 support" + end def install ENV.llvm_clang if OS.mac? && DevelopmentTools.clang_build_version <= 1400 From 70009b6e464908773fb9523a5badafec21a3ed49 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 2 Dec 2024 13:03:33 -0500 Subject: [PATCH 09/16] portablegl: align indent style to match other formulae --- Formula/p/portablegl.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/p/portablegl.rb b/Formula/p/portablegl.rb index f1db6e9905667..25a37b9b0fd18 100644 --- a/Formula/p/portablegl.rb +++ b/Formula/p/portablegl.rb @@ -2,8 +2,8 @@ class Portablegl < Formula desc "Implementation of OpenGL 3.x-ish in clean C" homepage "https://github.com/rswinkle/PortableGL" url "https://github.com/rswinkle/PortableGL.git", - tag: "0.98.0", - revision: "79fe2816009bca0f8f5f06c21930531e854edb89" + tag: "0.98.0", + revision: "79fe2816009bca0f8f5f06c21930531e854edb89" license "MIT" head "https://github.com/rswinkle/PortableGL.git", branch: "master" From cab0d850a124354caca64208c39fbfe7f20dec03 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 2 Dec 2024 13:03:49 -0500 Subject: [PATCH 10/16] quotatool: align indent style to match other formulae --- Formula/q/quotatool.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/q/quotatool.rb b/Formula/q/quotatool.rb index 12604119f2384..563fad6f765ba 100644 --- a/Formula/q/quotatool.rb +++ b/Formula/q/quotatool.rb @@ -2,8 +2,8 @@ class Quotatool < Formula desc "Edit disk quotas from the command-line" homepage "https://quotatool.ekenberg.se/" url "https://github.com/ekenberg/quotatool.git", - tag: "v1.6.5", - revision: "62180fb1cc7d5d4e90cbbb578cba6bcc967c7ca8" + tag: "v1.6.5", + revision: "62180fb1cc7d5d4e90cbbb578cba6bcc967c7ca8" license "GPL-2.0-or-later" bottle do From 1fcc64beefa6241c5ec4c4cd06dbea603aab9317 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 2 Dec 2024 12:58:13 -0500 Subject: [PATCH 11/16] rocksdb: remove GCC 6 reference --- Formula/r/rocksdb.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Formula/r/rocksdb.rb b/Formula/r/rocksdb.rb index 6f3529a260198..25d05625f36da 100644 --- a/Formula/r/rocksdb.rb +++ b/Formula/r/rocksdb.rb @@ -24,11 +24,6 @@ class Rocksdb < Formula uses_from_macos "bzip2" uses_from_macos "zlib" - fails_with :gcc do - version "6" - cause "Requires C++17 compatible compiler. See https://github.com/facebook/rocksdb/issues/9388" - end - def install args = %W[ -DPORTABLE=ON @@ -95,7 +90,7 @@ def install assert_match "rocksdb_dump:", shell_output("#{bin}/rocksdb_dump --help 2>&1", 1) assert_match "rocksdb_undump:", shell_output("#{bin}/rocksdb_undump --help 2>&1", 1) - db = testpath / "db" + db = testpath/"db" %w[no snappy zlib bzip2 lz4 zstd].each_with_index do |comp, idx| key = "key-#{idx}" value = "value-#{idx}" From 563af082922d50601b371c1cee205545633d49d6 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 2 Dec 2024 13:02:56 -0500 Subject: [PATCH 12/16] rubyfmt: align indent style to match other formulae --- Formula/r/rubyfmt.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/r/rubyfmt.rb b/Formula/r/rubyfmt.rb index 0e3011853c9b8..aa4836a51d850 100644 --- a/Formula/r/rubyfmt.rb +++ b/Formula/r/rubyfmt.rb @@ -2,8 +2,8 @@ class Rubyfmt < Formula desc "Ruby autoformatter" homepage "https://github.com/fables-tales/rubyfmt" url "https://github.com/fables-tales/rubyfmt.git", - tag: "v0.10.0", - revision: "e00d2ab89fd4b0b85a7897fac393c1ad987136de" + tag: "v0.10.0", + revision: "e00d2ab89fd4b0b85a7897fac393c1ad987136de" license "MIT" head "https://github.com/fables-tales/rubyfmt.git", branch: "trunk" From 0ac82350b472c0554975494f02f5f87a9557c2ee Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 2 Dec 2024 12:59:42 -0500 Subject: [PATCH 13/16] spidermonkey@91: remove GCC 6 reference --- Formula/s/spidermonkey@91.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Formula/s/spidermonkey@91.rb b/Formula/s/spidermonkey@91.rb index 0d0d897262d64..7d241feadbcc7 100644 --- a/Formula/s/spidermonkey@91.rb +++ b/Formula/s/spidermonkey@91.rb @@ -36,12 +36,6 @@ class SpidermonkeyAT91 < Formula uses_from_macos "m4" => :build uses_from_macos "zlib" - # From python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py - fails_with :gcc do - version "6" - cause "Only GCC 7.1 or newer is supported" - end - def install # Help the build script detect ld64 as it expects logs from LD_PRINT_OPTIONS=1 with -Wl,-version if DevelopmentTools.clang_build_version >= 1500 From 8f307fc2777b7f82b29f78bab882d37db4798a09 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 2 Dec 2024 13:03:10 -0500 Subject: [PATCH 14/16] tilt: align indent style to match other formulae --- Formula/t/tilt.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/t/tilt.rb b/Formula/t/tilt.rb index 2d9034fa86059..feac290fe7320 100644 --- a/Formula/t/tilt.rb +++ b/Formula/t/tilt.rb @@ -2,8 +2,8 @@ class Tilt < Formula desc "Define your dev environment as code. For microservice apps on Kubernetes" homepage "https://tilt.dev/" url "https://github.com/tilt-dev/tilt.git", - tag: "v0.33.21", - revision: "3e9bfda3db8f49d91e008d7ce1fda26a1f3adca0" + tag: "v0.33.21", + revision: "3e9bfda3db8f49d91e008d7ce1fda26a1f3adca0" license "Apache-2.0" head "https://github.com/tilt-dev/tilt.git", branch: "master" From 19321d10a0483bdb9f69be164dc6a0d39977f7f3 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 2 Dec 2024 11:40:05 -0500 Subject: [PATCH 15/16] wakatime-cli: align indent style to match other formulae --- Formula/w/wakatime-cli.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/w/wakatime-cli.rb b/Formula/w/wakatime-cli.rb index e00e46fdfa06f..2eba856bc1c62 100644 --- a/Formula/w/wakatime-cli.rb +++ b/Formula/w/wakatime-cli.rb @@ -2,8 +2,8 @@ class WakatimeCli < Formula desc "Command-line interface to the WakaTime api" homepage "https://wakatime.com/" url "https://github.com/wakatime/wakatime-cli.git", - tag: "v1.106.0", - revision: "c41e9c23d428e27517e528442be78aa02ce64918" + tag: "v1.106.0", + revision: "c41e9c23d428e27517e528442be78aa02ce64918" license "BSD-3-Clause" version_scheme 1 From 3cbdd6d341b7ec865060f3d01ad27fa0fc714bea Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 2 Dec 2024 11:37:04 -0500 Subject: [PATCH 16/16] xcdiff: align indent style to match other formulae --- Formula/x/xcdiff.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Formula/x/xcdiff.rb b/Formula/x/xcdiff.rb index 15a59f392488a..eacbe47c40d01 100644 --- a/Formula/x/xcdiff.rb +++ b/Formula/x/xcdiff.rb @@ -2,8 +2,8 @@ class Xcdiff < Formula desc "Tool to diff xcodeproj files" homepage "https://github.com/bloomberg/xcdiff" url "https://github.com/bloomberg/xcdiff.git", - tag: "0.12.0", - revision: "8ae8a1074662dfbef271140bfb4ae424b331dde9" + tag: "0.12.0", + revision: "8ae8a1074662dfbef271140bfb4ae424b331dde9" license "Apache-2.0" head "https://github.com/bloomberg/xcdiff.git", branch: "main" @@ -16,6 +16,7 @@ class Xcdiff < Formula sha256 cellar: :any_skip_relocation, ventura: "066813b4a4cf35c7a0b07f4927abcebd97dee931d0c3f0cd19a57eae07eb7864" sha256 cellar: :any_skip_relocation, monterey: "3e462aeba27a92ed9e1c7c532891ed6eef0d73f27396c389acd2855a9462ca9d" end + depends_on :macos depends_on xcode: "14.1"