Skip to content

Commit 9b5b0d3

Browse files
authored
Merge pull request #275888 from Homebrew/remove-sassc
gtk4 libadwaita: remove `sassc` usage
2 parents 90de926 + 221c04a commit 9b5b0d3

2 files changed

Lines changed: 27 additions & 15 deletions

File tree

Formula/g/gtk4.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ class Gtk4 < Formula
1313
end
1414

1515
bottle do
16-
sha256 arm64_tahoe: "629aad16613de3d3c52a7b319e2b3b523c1cc107484b6967f860e2140aeff6eb"
17-
sha256 arm64_sequoia: "05ed86ffb535047afa7e3f178358ddcd0e8c411df5be5b6711f8cdfab0749209"
18-
sha256 arm64_sonoma: "c1ed38af4735867e2f71f58aa72b1931240159fc0f6fce94faee9489efa904e4"
19-
sha256 sonoma: "b4e793432f03c317c8adc9cd518dea27394a301c755f45cebcdda8e568acd3c2"
20-
sha256 arm64_linux: "9933655624b796b21e1f5f3dcf3da514877f72d9603a83a6ea415a3e2949cced"
21-
sha256 x86_64_linux: "4977c56351fea5ee4954229a0906a56cb249ad2055133877ace71056dd97c10e"
16+
rebuild 1
17+
sha256 arm64_tahoe: "df9fccdfab031083ad3665e2611c20b8dd7ae9197cc3f27117b8d78fcdad6b9b"
18+
sha256 arm64_sequoia: "46d06f694632df98a45eeea8f11683941e6a2e81e63e88a49dae6b8c19057b91"
19+
sha256 arm64_sonoma: "1822fa25451d8fc9b38118d0af2691882c41715c833adf83328a82cd95c23f4a"
20+
sha256 sonoma: "ff5108a4cc81b600710f5cf01fb3bb97b798f782a0f85fd02e847e145e747daa"
21+
sha256 arm64_linux: "85b73eb5727ad76f794ed01225587c2792a6338a60dccb61c75627a6143854c4"
22+
sha256 x86_64_linux: "446dc5d917d848b6398529a78bb602f375e8c5cbd7fc2d571b70afd04aa7ba04"
2223
end
2324

2425
depends_on "docbook" => :build
@@ -29,7 +30,6 @@ class Gtk4 < Formula
2930
depends_on "meson" => :build
3031
depends_on "ninja" => :build
3132
depends_on "pkgconf" => [:build, :test]
32-
depends_on "sassc" => :build
3333
depends_on "cairo"
3434
depends_on "fontconfig"
3535
depends_on "fribidi"

Formula/lib/libadwaita.rb

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,28 @@ class Libadwaita < Formula
1616
end
1717

1818
bottle do
19-
sha256 arm64_tahoe: "3645d495faea2cceea3cd940960b46b1b3434baef1479c7b0da742200090dfbf"
20-
sha256 arm64_sequoia: "d25dd8ba4179c910c19c30833b85bc1430424e58c49792c757976619e80c8b44"
21-
sha256 arm64_sonoma: "76d48cee7aa9ac7fdc568f62c5313bc799595975b022b75d465b6b75e06fa25f"
22-
sha256 sonoma: "4a95fd1f17a61d71bf5dd4903f1a5a231d7a52b3395cd979af7ceaf17891e3ea"
23-
sha256 arm64_linux: "2aec703ee231963bd077303d01830b39801b52aa450e5d5b4c84a34bc350ee41"
24-
sha256 x86_64_linux: "a117edaf5c71c53a95ceafe9e025c4690ca7bbaa321210bf560d66121fc41dff"
19+
rebuild 1
20+
sha256 arm64_tahoe: "881a99482118b9c5d55e837dd18d30deb5437d72b324811a0640a8503c782308"
21+
sha256 arm64_sequoia: "8dd8ff82c9cffee0d1fa58f4e6e8e545b663006dc28dd1978e33490cf26de70c"
22+
sha256 arm64_sonoma: "3a60b46ebe1d02f32d5c0ee9e470947b1483c6685d03af04f2dbfd7cc6a1707d"
23+
sha256 sonoma: "3551f415600001e6fa2c2a1817c5922c94bf9fb566ea8aeffe411d183845c4f5"
24+
sha256 arm64_linux: "180e9facf4cc6736ce704e76437ba47d6e060f99024739017d29ceaaeead8b85"
25+
sha256 x86_64_linux: "af35c9ad4b433af1531f9e9a8376a2a29295357f3a8f3aa50ebccdb7042c5d9d"
2526
end
2627

28+
depends_on "dart-sass" => :build
2729
depends_on "gettext" => :build
2830
depends_on "gobject-introspection" => :build
2931
depends_on "meson" => :build
3032
depends_on "ninja" => :build
3133
depends_on "pkgconf" => [:build, :test]
32-
depends_on "sassc" => :build
3334
depends_on "vala" => :build
3435

3536
depends_on "appstream"
3637
depends_on "fribidi"
3738
depends_on "glib"
3839
depends_on "graphene"
3940
depends_on "gtk4"
40-
depends_on "libsass"
4141
depends_on "pango"
4242

4343
uses_from_macos "python" => :build
@@ -46,7 +46,19 @@ class Libadwaita < Formula
4646
depends_on "gettext"
4747
end
4848

49+
# Fix style without closed parentheses
50+
patch do
51+
url "https://gitlab.gnome.org/GNOME/libadwaita/-/commit/ad0214cd1f6fb79d743b252d35f2657f875480e8.diff"
52+
sha256 "b7d8c4920805bf62253738e4d2a7e56bd8c9f4468f082b7c7f8819132a333ea5"
53+
end
54+
4955
def install
56+
# Replace deprecated `sassc` with `sass` in the meson build file
57+
inreplace "src/stylesheet/meson.build" do |s|
58+
s.gsub! "'sassc'", "'sass'"
59+
s.gsub! "'-a', '-M', '-t', 'compact'", "'--style', 'compressed'"
60+
end
61+
5062
system "meson", "setup", "build", "-Dtests=false", *std_meson_args
5163
system "meson", "compile", "-C", "build", "--verbose"
5264
system "meson", "install", "-C", "build"

0 commit comments

Comments
 (0)