From 86b13784682df13231f422c4e8297f7edd8540f3 Mon Sep 17 00:00:00 2001 From: Steven Peters Date: Wed, 5 Dec 2018 11:22:12 -0800 Subject: [PATCH] qt 5.12.0 Closes #34850. Signed-off-by: FX Coudert --- Formula/qt.rb | 60 ++++++--------------------------------------------- 1 file changed, 7 insertions(+), 53 deletions(-) diff --git a/Formula/qt.rb b/Formula/qt.rb index f64f09b5fd..73595cc0f7 100644 --- a/Formula/qt.rb +++ b/Formula/qt.rb @@ -3,35 +3,13 @@ class Qt < Formula desc "Cross-platform application and UI framework" homepage "https://www.qt.io/" - revision 1 + url "https://download.qt.io/official_releases/qt/5.12/5.12.0/single/qt-everywhere-src-5.12.0.tar.xz" + mirror "https://qt.mirror.constant.com/archive/qt/5.12/5.12.0/single/qt-everywhere-src-5.12.0.tar.xz" + mirror "https://ftp.osuosl.org/pub/blfs/conglomeration/qt5/qt-everywhere-src-5.12.0.tar.xz" + sha256 "356f42d9087718f22f03d13d0c2cdfb308f91dc3cf0c6318bed33f2094cd9d6c" + head "https://code.qt.io/qt/qt5.git", :branch => "5.12", :shallow => false - stable do - url "https://download.qt.io/official_releases/qt/5.11/5.11.2/single/qt-everywhere-src-5.11.2.tar.xz" - mirror "https://qt.mirror.constant.com/archive/qt/5.11/5.11.2/single/qt-everywhere-src-5.11.2.tar.xz" - mirror "https://ftp.osuosl.org/pub/blfs/conglomeration/qt5/qt-everywhere-src-5.11.2.tar.xz" - sha256 "c6104b840b6caee596fa9a35bc5f57f67ed5a99d6a36497b6fe66f990a53ca81" - - # Restore `.pc` files for framework-based build of Qt 5 on macOS, partially - # reverting - # Core formulae known to fail without this patch (as of 2016-10-15): - # * gnuplot (with `--with-qt` option) - # * mkvtoolnix (with `--with-qt` option, silent build failure) - # * poppler (with `--with-qt` option) - patch do - url "https://raw.githubusercontent.com/Homebrew/formula-patches/e8fe6567/qt5/restore-pc-files.patch" - sha256 "48ff18be2f4050de7288bddbae7f47e949512ac4bcd126c2f504be2ac701158b" - end - - # Chromium build failures with Xcode 10, fixed upstream: - # https://bugs.chromium.org/p/chromium/issues/detail?id=840251 - # https://bugs.chromium.org/p/chromium/issues/detail?id=849689 - patch do - url "https://raw.githubusercontent.com/Homebrew/formula-patches/962f0f/qt/xcode10.diff" - sha256 "c064398411c69f2e1c516c0cd49fcd0755bc29bb19e65c5694c6d726c43389a6" - end - end - bottle do sha256 "84a1a758d7881f9a446fd76fe4360ce7c5508c48761a74032a361996df1f79ec" => :mojave sha256 "ad85f42e73648dc47c8c903e0045e6b8cf62c99888144c73893a0226f2a5b51e" => :high_sierra @@ -40,15 +18,8 @@ class Qt < Formula keg_only "Qt 5 has CMake issues when linked" - option "with-examples", "Build examples" - option "without-proprietary-codecs", "Don't build with proprietary codecs (e.g. mp3)" - - deprecated_option "with-mysql" => "with-mysql-client" - depends_on "pkg-config" => :build depends_on :xcode => :build - depends_on "mysql-client" => :optional - depends_on "postgresql" => :optional def install args = %W[ @@ -61,31 +32,14 @@ class Qt < Formula -qt-libjpeg -qt-freetype -qt-pcre + -nomake examples -nomake tests -no-rpath -pkg-config -dbus-runtime + -proprietary-codecs ] - args << "-nomake" << "examples" if build.without? "examples" - - if build.with? "mysql-client" - args << "-plugin-sql-mysql" - (buildpath/"brew_shim/mysql_config").write <<~EOS - #!/bin/sh - if [ x"$1" = x"--libs" ]; then - mysql_config --libs | sed "s/-lssl -lcrypto//" - else - exec mysql_config "$@" - fi - EOS - chmod 0755, "brew_shim/mysql_config" - args << "-mysql_config" << buildpath/"brew_shim/mysql_config" - end - - args << "-plugin-sql-psql" if build.with? "postgresql" - args << "-proprietary-codecs" if build.with? "proprietary-codecs" - system "./configure", *args system "make" ENV.deparallelize