Skip to content

Commit 8664490

Browse files
BrewTestBotBrewTestBot
authored
Merge pull request Homebrew#192986 from Homebrew/icu4c-alias
icu4c@74 74.2 (new formula), icu4c@75: alias as `icu4c` and link on Linux
2 parents d081614 + 36c7e7d commit 8664490

File tree

12 files changed

+109
-115
lines changed

12 files changed

+109
-115
lines changed

‎Aliases/icu4c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../Formula/i/[email protected]

‎Aliases/icu4c@74‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Formula/b/[email protected]‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,22 @@ class BoostAT176 < Formula
44
url "https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2"
55
sha256 "f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41"
66
license "BSL-1.0"
7-
revision 5
7+
revision 6
88

99
bottle do
10-
rebuild 1
11-
sha256 cellar: :any, arm64_sequoia: "c7c8cc8bd09779df0a40a6fe16d8e612f6a5d174dd88acbde286318467d209a3"
12-
sha256 cellar: :any, arm64_sonoma: "07110e60f42479e7799caf5df0804f6b81b9ca3030c07cdfef75c472378caf28"
13-
sha256 cellar: :any, arm64_ventura: "2f8a3286570c5712de16e37aa64be508ff50db5769b969b103f60516f947366e"
14-
sha256 cellar: :any, sonoma: "7d651936577579b8db24bd0a653ffc318c2e8a7067a6ae59f6a79f1ba1daddde"
15-
sha256 cellar: :any, ventura: "f414216de17cfe464e62e35ad1d5ee7b66a9cd0bf730d6a6dc44c02653231843"
16-
sha256 cellar: :any_skip_relocation, x86_64_linux: "8d7e35e3faf5fa529284cba3dd88b3a247417deca04bef1dd0debc28962ef649"
10+
sha256 cellar: :any, arm64_sequoia: "5fa1820397b30bc594fc77f937a99af346f8e41340d532a13f59e31c7076f0ea"
11+
sha256 cellar: :any, arm64_sonoma: "bf2654e857a043032de6fe7fc6c8388a52ee86338dbbfdedc28617bac22f2df4"
12+
sha256 cellar: :any, arm64_ventura: "3966bc23fe94abc372ddb6b2c1d07846ee9c1b2c99793a125c73f36c5f43d0af"
13+
sha256 cellar: :any, sonoma: "f570c9d3c4e1d1cef19a21761de8b2dc6748445da6dc067457d5e950c023dd1a"
14+
sha256 cellar: :any, ventura: "5879acd1c2d7f1067f365f9cb705ffd0aeb5dec9a8346ce3ec770e4220ddeb2c"
15+
sha256 cellar: :any_skip_relocation, x86_64_linux: "c6c27b35876867779cfab02b6db3f56595494935da83e1b8c5a3bd4401c4aeae"
1716
end
1817

1918
keg_only :versioned_formula
2019

2120
deprecate! date: "2023-12-14", because: :versioned_formula
2221

23-
depends_on "icu4c"
22+
depends_on "icu4c@74"
2423

2524
uses_from_macos "bzip2"
2625
uses_from_macos "zlib"
@@ -46,7 +45,7 @@ def install
4645
end
4746

4847
# libdir should be set by --prefix but isn't
49-
icu4c_prefix = Formula["icu4c"].opt_prefix
48+
icu4c_prefix = Formula["icu4c@74"].opt_prefix
5049
bootstrap_args = %W[
5150
--prefix=#{prefix}
5251
--libdir=#{lib}

‎Formula/c/couchdb.rb‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ class Couchdb < Formula
55
mirror "https://archive.apache.org/dist/couchdb/source/3.4.2/apache-couchdb-3.4.2.tar.gz"
66
sha256 "d27ff2a13356000296a98ab884caf3d175927cf21727963ff90fab3a747544cf"
77
license "Apache-2.0"
8+
revision 1
89

910
bottle do
10-
sha256 cellar: :any, arm64_sequoia: "a44013c2e27ebd990529024fa539da1c241d1b564708f540411907242fc5d04e"
11-
sha256 cellar: :any, arm64_sonoma: "3c71a671a3a1a93c061cb3dff96b55e7fb5f4a5f717f7eeb58a35ca69a3b88ba"
12-
sha256 cellar: :any, arm64_ventura: "bb06b7e504e850bb18aa0bfbe7676811b0b081363356f2c36629fe5e072cbc65"
13-
sha256 cellar: :any, sonoma: "ea1169647969d3ccc96527f2a4d0970c5f43c66717851ec15cf44883d13bc40c"
14-
sha256 cellar: :any, ventura: "870870e63980b33d41cb6e10fb26402192a7b08d440e08850eccdb7ef270f715"
15-
sha256 cellar: :any_skip_relocation, x86_64_linux: "d3f8e5d5559495f2050887c017496bca4b0b28ee6da6db5ff35547aff7b506b4"
11+
sha256 cellar: :any, arm64_sequoia: "1500ffea5ffb4a8cb8256b8854f01f76e7684cabe18e8ce920ab655d16c25186"
12+
sha256 cellar: :any, arm64_sonoma: "c094486ec804d2d93cc3e0c7cffa2f403bdf91dc141b14d3970d81276cff0607"
13+
sha256 cellar: :any, arm64_ventura: "3b31f2fe9e0bb4ced33661ce033b0191a3463c38cf15374e941f689688eead5a"
14+
sha256 cellar: :any, sonoma: "2ab357abc3419335515cea1523ba073424335726381c8607cc499318bc425272"
15+
sha256 cellar: :any, ventura: "1745ccc788a6d72add9b3905c21f213f6bf654b6735bc77fb34fd75c0f8ea577"
16+
sha256 cellar: :any_skip_relocation, x86_64_linux: "9f571fe632ce980aabe811d1913de2884cd300ee30f251300b1c6a512e290970"
1617
end
1718

1819
depends_on "autoconf" => :build
@@ -21,7 +22,7 @@ class Couchdb < Formula
2122
depends_on "erlang" => :build
2223
depends_on "libtool" => :build
2324
depends_on "pkg-config" => :build
24-
depends_on "icu4c"
25+
depends_on "icu4c@75"
2526
depends_on "openssl@3"
2627

2728
uses_from_macos "ncurses"

‎Formula/g/gnustep-base.rb‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ class GnustepBase < Formula
44
url "https://github.com/gnustep/libs-base/releases/download/base-1_30_0/gnustep-base-1.30.0.tar.gz"
55
sha256 "00b5bc4179045b581f9f9dc3751b800c07a5d204682e3e0eddd8b5e5dee51faa"
66
license "GPL-2.0-or-later"
7+
revision 1
78

89
livecheck do
910
url :stable
@@ -17,14 +18,12 @@ class GnustepBase < Formula
1718
end
1819

1920
bottle do
20-
sha256 cellar: :any, arm64_sequoia: "8430a86df0234c7051da2d855d23d787d43d0c9ecdfad49c3fb317aa070bcc43"
21-
sha256 cellar: :any, arm64_sonoma: "c147affcd59c6d9d1537d51569073c60905367407198c99bc6bd6baf38f21f08"
22-
sha256 cellar: :any, arm64_ventura: "d673128135ac72b65c4ac7968125c90c890362d2eb7f95f85d343c00e3b4a370"
23-
sha256 cellar: :any, arm64_monterey: "a4302e0cbe7837a2b73ec760a82c3ccce8d2f999922570103f443e1346e78210"
24-
sha256 cellar: :any, sonoma: "454142aa68dc511e98e55a83934874c5b5e7a8bdcaedd2ddd9c961ec67455e59"
25-
sha256 cellar: :any, ventura: "1e0b3e5f607789b19eef999082ac660ab341c1d301c1bb7de4dd7b51c7b9e644"
26-
sha256 cellar: :any, monterey: "73c8784c0168881336f054d764103ef3ade4400c749c15facf7560d5a59a2ae2"
27-
sha256 cellar: :any_skip_relocation, x86_64_linux: "703eade0a2484596b5dc6e4cee9b8b1b4d80c72d21de83a459d9189db28edc4a"
21+
sha256 cellar: :any, arm64_sequoia: "e6779e9ab227fc0a4263a177698054336437ea08f985c3605aed692361e5bce1"
22+
sha256 cellar: :any, arm64_sonoma: "2d3546948a52c7946960bc75fe46a14c0cfef1eb6382e7059bde3abc6289b331"
23+
sha256 cellar: :any, arm64_ventura: "323d0c1ec262b559b455d4cb6b25a637f60768716b5982e1fd1d65ba047476c5"
24+
sha256 cellar: :any, sonoma: "b00d56e75fba957c5fb343384b214e345bd38e307da422d136351ff73496b1e7"
25+
sha256 cellar: :any, ventura: "4c41b940447d94a2cbbe1a67eb838f4a99b6d20547f0574b87d5030d1fb79a35"
26+
sha256 cellar: :any_skip_relocation, x86_64_linux: "9528f61500db30bc0eb553baa434d504b624406cf0da2090d8070d532cab339c"
2827
end
2928

3029
depends_on "gnustep-make" => :build

‎Formula/i/icu4c.rb‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎Formula/i/[email protected]‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
class Icu4cAT74 < Formula
2+
desc "C/C++ and Java libraries for Unicode and globalization"
3+
homepage "https://icu.unicode.org/home"
4+
url "https://github.com/unicode-org/icu/releases/download/release-74-2/icu4c-74_2-src.tgz"
5+
version "74.2"
6+
sha256 "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c"
7+
license "ICU"
8+
9+
livecheck do
10+
url :stable
11+
regex(/^release[._-]v?(74(?:[.-]\d+)+)$/i)
12+
strategy :git do |tags, regex|
13+
tags.filter_map { |tag| tag[regex, 1]&.tr("-", ".") }
14+
end
15+
end
16+
17+
bottle do
18+
sha256 cellar: :any, arm64_sequoia: "d9b0dc95a406d340373bf75d6d013cc53e8815d0c0b550e584b4006a7aba12f0"
19+
sha256 cellar: :any, arm64_sonoma: "2216fec75032a12c4a442448ca23fed421eb94374e2e9994e6db0c51eae60ed2"
20+
sha256 cellar: :any, arm64_ventura: "1870714606c1792b9ca84cb9c07028c745575c8f3219c629f56c27b1b333ce25"
21+
sha256 cellar: :any, sonoma: "715c3ec07d1056f609f7b670fa6b8767aa508d4e8e4f93b2ae15a635b77715c4"
22+
sha256 cellar: :any, ventura: "81c9ad51d30a5b4d33c4b2a1c89d46d27bc4e6c8f1ffe8f723bf2c8d1bb27901"
23+
sha256 cellar: :any_skip_relocation, x86_64_linux: "99595c8a778c7b3161baed663fb738a28213e9e31797aa558f6c5bb5ab239c3d"
24+
end
25+
26+
keg_only :versioned_formula
27+
28+
def install
29+
args = %w[
30+
--disable-samples
31+
--disable-tests
32+
--enable-static
33+
--with-library-bits=64
34+
]
35+
36+
cd "source" do
37+
system "./configure", *args, *std_configure_args
38+
system "make"
39+
system "make", "install"
40+
end
41+
end
42+
43+
test do
44+
if File.exist? "/usr/share/dict/words"
45+
system bin/"gendict", "--uchars", "/usr/share/dict/words", "dict"
46+
else
47+
(testpath/"hello").write "hello\nworld\n"
48+
system bin/"gendict", "--uchars", "hello", "dict"
49+
end
50+
end
51+
end

‎Formula/i/[email protected]‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@ class Icu4cAT75 < Formula
1515
end
1616

1717
bottle do
18-
sha256 cellar: :any, arm64_sequoia: "a7e245c13a6a784dbdfc1b0e52abab9f159d684f8ae6d9293c585bd21b441e75"
19-
sha256 cellar: :any, arm64_sonoma: "3da9b88cf2f84e5f37d964400a7a8e1a2042d3dda33acf7eb9c2d81e785e0532"
20-
sha256 cellar: :any, arm64_ventura: "760542f48a7cc4e7aff89d5a9c3030fe549e51753a5f7167d838f48fa9a8df38"
21-
sha256 cellar: :any, sonoma: "b8d525ce3c6f163981641f69920b6ed92cf4bfef7dab84979dc8f49777d7ea3b"
22-
sha256 cellar: :any, ventura: "e040d0d6cb994165a20ce9fdcc691ea15043b1c583c9af9a18e7a2ac63aaabcf"
23-
sha256 cellar: :any_skip_relocation, x86_64_linux: "ab60784f7aee6a4a7827bbff1cf524c1c357a76be2898fdbf144ffa1df145eff"
18+
rebuild 1
19+
sha256 cellar: :any, arm64_sequoia: "55042c6a0fb92e96cd620d6550426eba88121760f1ffc26eb88e535eafffdb02"
20+
sha256 cellar: :any, arm64_sonoma: "a2a2f7ee32720e5365d536d6d0c110d596ffd2e0e9c47b05e13aee3853e3802d"
21+
sha256 cellar: :any, arm64_ventura: "e6fcf7a0d4a9c4ba533e2e325d09742d623841b9c66ac0aaeff853dec98229d0"
22+
sha256 cellar: :any, sonoma: "26198a2f44a3a179d025608288108480d9bab3b1a8ee53aef0e8469be78ea7a1"
23+
sha256 cellar: :any, ventura: "4de74b9cdfbf91930651b09a81a67037a1ff571a2a7ef79ab5eb971b3cd6d279"
24+
sha256 cellar: :any_skip_relocation, x86_64_linux: "e7ca9ed261455d9f114079bb46b3175c57265a5e254f9d33404c10a70e5523b5"
2425
end
2526

26-
# TODO: Switch keg_only reason after renaming `icu4c` formula to `icu4c@74` and updating alias to `icu4c@75`
27-
# keg_only :provided_by_macos, "macOS provides libicucore.dylib (but nothing else)"
28-
keg_only :versioned_formula
27+
keg_only :shadowed_by_macos, "macOS provides libicucore.dylib (but nothing else)"
2928

3029
def install
30+
odie "Major version bumps need a new formula!" if version.major.to_s != name[/@(\d+)$/, 1]
31+
3132
args = %w[
3233
--disable-samples
3334
--disable-tests

‎Formula/r/r.rb‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,20 @@ class R < Formula
44
url "https://cran.r-project.org/src/base/R-4/R-4.4.1.tar.gz"
55
sha256 "b4cb675deaaeb7299d3b265d218cde43f192951ce5b89b7bb1a5148a36b2d94d"
66
license "GPL-2.0-or-later"
7+
revision 1
78

89
livecheck do
910
url "https://cran.rstudio.com/banner.shtml"
1011
regex(%r{href=(?:["']?|.*?/)R[._-]v?(\d+(?:\.\d+)+)\.t}i)
1112
end
1213

1314
bottle do
14-
sha256 arm64_sequoia: "7f675736071affe0f4ebfdab80e61e2ebd1f7bd2c82140586774230ad4746f72"
15-
sha256 arm64_sonoma: "a9e3b6d8ce9d2606b9f182d30145c530dfdd52803359729465b616f8dcae0847"
16-
sha256 arm64_ventura: "31534a8b13f93bbd484c6392792736ca9fdc91fe6a9e428747e9291fe49b6778"
17-
sha256 arm64_monterey: "781dc303ccb6041cbee79a17a1dc3ae5ffbacd59b5d52a04983751256dd68ae4"
18-
sha256 sonoma: "2a65df982cbc7a23f7f69b6853dc402461fc99cb2d31b7771e50a4f3995ab7dc"
19-
sha256 ventura: "3f1da54c8747815a8047de3d393c7957fd3d58b411c6a00b2dab1d64a19be7d9"
20-
sha256 monterey: "8b7216892a5d60604fe4a909c2f096ce2ef78bec581fa00177eb7600451aa159"
21-
sha256 x86_64_linux: "3405da8715d5f8069e3c12842a2a3b2e22d554541a91bcd756802ed0f9cfaa3a"
15+
sha256 arm64_sequoia: "50d67d0462dc443afb81fe07a7354825e73a62192adf1a35f37742fafc4b4446"
16+
sha256 arm64_sonoma: "53a1032ae31eef2374f1ad115b6ed0cce3f7ebfbbba6106f5a32a8190f4bc041"
17+
sha256 arm64_ventura: "8720cedee9fbb721e3dac00343d5adc2b90019f8377f24c278892d7b722f9b26"
18+
sha256 sonoma: "daed6a9f27e6c7f880e650864aeab63396b133b5f72f8728ead3918307c4b5c0"
19+
sha256 ventura: "f0cac12a91a2da9d213ad9a61695fd44fddcbf2b4c3c50e1a071129014c46c5c"
20+
sha256 x86_64_linux: "d9e7d4e6de074f15026e411b6e56b5836cb499082b266865513120c2a0eaa7f1"
2221
end
2322

2423
depends_on "pkg-config" => :build

‎Formula/u/unar.rb‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@ class Unar < Formula
44
url "https://github.com/MacPaw/XADMaster/archive/refs/tags/v1.10.8.tar.gz"
55
sha256 "652953d7988b3c33f4f52b61c357afd1a7c2fc170e5e6e2219f4432b0c4cd39f"
66
license "LGPL-2.1-or-later"
7-
revision 2
7+
revision 3
88
head "https://github.com/MacPaw/XADMaster.git", branch: "master"
99

1010
bottle do
11-
sha256 cellar: :any, arm64_sequoia: "48c1c1e8275ea52a2a50421d11ae0bed44735352053a9b3dca74c7c20cc71200"
12-
sha256 cellar: :any, arm64_sonoma: "4ff0ed25737fd69dffc7640a2185da60dd1be3c047ce7a2f32dcd2ee5de147af"
13-
sha256 cellar: :any, arm64_ventura: "fce2da0774b12aa7fc18741f7748002e40fa27bfa9325c7107531a88eabebee1"
14-
sha256 cellar: :any, arm64_monterey: "c1f23406296141da895b5531199c4f093b265a75fa8db09139b7a74e7b56c367"
15-
sha256 cellar: :any, sonoma: "454a5e3f0fc4143b931eb1b03c9c8c9368eebe6e34918c60e4a1a86c837d6759"
16-
sha256 cellar: :any, ventura: "0ee3354104fa64d42e96c430eca72b4e29df3ccc3c96ec9b32a3156a91485b3a"
17-
sha256 cellar: :any, monterey: "e31763ef73cf0f606908700d15066e9a5375055c651cffa074bb6f1246d28100"
18-
sha256 cellar: :any_skip_relocation, x86_64_linux: "afd209d4979e519ce8757b6e3223541907a8ac00e6d377302be151bc01dff5f8"
11+
sha256 cellar: :any, arm64_sequoia: "4f1958e4685c8f612da2716e61aa50bf3ef09aa9f0f24fb053dbf87ff13543a5"
12+
sha256 cellar: :any, arm64_sonoma: "32926d24931d2431fc1de377976d2be0e3bb9d081c41b96ffb88ac01c79abcd0"
13+
sha256 cellar: :any, arm64_ventura: "b38a14f5b704caecf2f1cdbddbd3850f4f47500710a38843e28ac4a3da066c9c"
14+
sha256 cellar: :any, sonoma: "f2e10ae563fdc2433297285c858ecd768a74de3d4dfc85d64a2fe083c5980b9f"
15+
sha256 cellar: :any, ventura: "f5f982cfeeb2e0fb4830116fd4fa99eaeff3102afd7d972efe5c66a167d1e8d8"
16+
sha256 cellar: :any_skip_relocation, x86_64_linux: "f862f808fa584872c7e7e8de2430327cd2745634f0529d2fbc5d8fc54468b03a"
1917
end
2018

2119
depends_on xcode: :build
@@ -26,7 +24,7 @@ class Unar < Formula
2624

2725
on_linux do
2826
depends_on "gnustep-base"
29-
depends_on "icu4c"
27+
depends_on "icu4c@75"
3028
depends_on "libobjc2"
3129
depends_on "wavpack"
3230
end

0 commit comments

Comments
 (0)