Skip to content

Commit bc21c0d

Browse files
authored
Merge pull request #243852 from Homebrew/qt
qt: build bottles on Sequoia and Tahoe
2 parents 952b8ca + a0c5a1f commit bc21c0d

File tree

1 file changed

+20
-7
lines changed

1 file changed

+20
-7
lines changed

Formula/q/qt.rb

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ class Qt < Formula
2424
end
2525

2626
bottle do
27-
sha256 cellar: :any, arm64_sonoma: "fc1ad41a8b0ceb5f6047afd936719fb11ae7e253bba51b2b0335635c85b47737"
28-
sha256 cellar: :any, arm64_ventura: "9f859faa1731e2ecc5bbb169b3ed89b01f2b6549c7ce6f3b33c4b75eb0316bba"
29-
sha256 cellar: :any, sonoma: "95950612543fe870bae285a67027609f0bee2fc389cacccd036b5a794f1c4ce2"
30-
sha256 cellar: :any, ventura: "67063fcac412aeeda3ae3a911b109f2ad2b031761f264bbe0fdb9ad76a6d1b48"
31-
sha256 x86_64_linux: "e87e7711c808aa3c97e70c44f122bfdbd3d2ce695deb44282540cd67ed223cfc"
27+
rebuild 1
28+
sha256 cellar: :any, arm64_tahoe: "21254c8c796c8e2c9a0b29a465f45ea1d2831930847d9de1c30f2333befb9de4"
29+
sha256 cellar: :any, arm64_sequoia: "b51bc26874d98507975fb7bb8b5e43f0fa617c503f9b56923d0196016ea1894a"
30+
sha256 cellar: :any, arm64_sonoma: "3e783ecc24d44882a75c8ea62da58428b303d57ace8cd00ce351e8aa5160c25c"
31+
sha256 cellar: :any, sonoma: "e5f574692f7586ef2674b2a4bb5e24f6ccf77ee7cce15a827126a0142c723a22"
32+
sha256 x86_64_linux: "0b405353963f49dabb10fb0697ca5dae05d025ae37efb57d22e1aa66ecc381bc"
3233
end
3334

3435
depends_on "cmake" => [:build, :test]
35-
depends_on maximum_macos: [:sonoma, :build] # https://bugreports.qt.io/browse/QTBUG-128900
3636
depends_on "ninja" => :build
3737
depends_on "node" => :build
3838
depends_on "pkgconf" => [:build, :test]
@@ -167,6 +167,11 @@ def install
167167
# https://bugreports.qt.io/browse/QTBUG-113391
168168
ENV.runtime_cpu_detection
169169

170+
# Fix build with Xcode 26, metal and metallib have moved
171+
# https://bugreports.qt.io/browse/QTBUG-140206
172+
inreplace "qtwebengine/src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/metal/BUILD.gn",
173+
"mac_bin_path +", '"xcrun",'
174+
170175
# FIXME: GN requires clang in clangBasePath/bin
171176
inreplace "qtwebengine/src/3rdparty/chromium/build/toolchain/apple/toolchain.gni",
172177
'rebase_path("$clang_base_path/bin/", root_build_dir)', '""'
@@ -237,8 +242,16 @@ def install
237242

238243
cmake_args << "-DQT_FORCE_WARN_APPLE_SDK_AND_XCODE_CHECK=ON" if MacOS.version <= :monterey
239244

245+
# Cannoy deploy to version later than 14, due to functions obsoleted in macOS 15.0
246+
# https://bugreports.qt.io/browse/QTBUG-128900
247+
deploy = if MacOS.version >= :sequoia
248+
"14.0"
249+
else
250+
"#{MacOS.version}.0"
251+
end
252+
240253
%W[
241-
-DCMAKE_OSX_DEPLOYMENT_TARGET=#{MacOS.version}.0
254+
-DCMAKE_OSX_DEPLOYMENT_TARGET=#{deploy}
242255
-DQT_FEATURE_ffmpeg=OFF
243256
]
244257
else

0 commit comments

Comments
 (0)