Merge pull request #245 from PatTheMav/macos-10.14-qt-fix

CI: Fix QT 5.10 not building under macOS 10.13+
This commit is contained in:
Stéphane Lepin 2018-10-19 17:32:19 +02:00 committed by GitHub
commit a561c60f7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -18,7 +18,7 @@ class Qt < Formula
option "with-docs", "Build documentation" option "with-docs", "Build documentation"
option "with-examples", "Build examples" option "with-examples", "Build examples"
deprecated_option "with-mysql" => "with-mysql-client" deprecated_option "with-mysql" => "with-mysql-client"
# OS X 10.7 Lion is still supported in Qt 5.5, but is no longer a reference # OS X 10.7 Lion is still supported in Qt 5.5, but is no longer a reference
@ -44,6 +44,23 @@ class Qt < Formula
sha256 "48ff18be2f4050de7288bddbae7f47e949512ac4bcd126c2f504be2ac701158b" sha256 "48ff18be2f4050de7288bddbae7f47e949512ac4bcd126c2f504be2ac701158b"
end end
# Fix compile error on macOS 10.13 around QFixed:
# https://github.com/Homebrew/homebrew-core/issues/27095
# https://bugreports.qt.io/browse/QTBUG-67545
patch do
url "https://raw.githubusercontent.com/z00m1n/formula-patches/0de0e229/qt/QTBUG-67545.patch"
sha256 "4a115097c7582c7dce4207f5500d13feb8c990eb8a05a43f41953985976ebe6c"
end
# Fix compile error on macOS 10.13 caused by qtlocation dependency
# mapbox-gl-native using Boost 1.62.0 does not build with C++ 17:
# https://github.com/Homebrew/homebrew-core/issues/27095
# https://bugreports.qt.io/browse/QTBUG-67810
patch do
url "https://raw.githubusercontent.com/z00m1n/formula-patches/a1a1f0dd/qt/QTBUG-67810.patch"
sha256 "8ee0bf71df1043f08ebae3aa35036be29c4d9ebff8a27e3b0411a6bd635e9382"
end
# Remove for > 5.10.0 # Remove for > 5.10.0
# Fix "error: 'loadFileURL:allowingReadAccessToURL:' is only available on # Fix "error: 'loadFileURL:allowingReadAccessToURL:' is only available on
# macOS 10.11 or newer [-Werror,-Wunguarded-availability]" # macOS 10.11 or newer [-Werror,-Wunguarded-availability]"
@ -71,6 +88,7 @@ class Qt < Formula
-no-rpath -no-rpath
-pkg-config -pkg-config
-dbus-runtime -dbus-runtime
-no-assimp
] ]
args << "-nomake" << "examples" if build.without? "examples" args << "-nomake" << "examples" if build.without? "examples"