From 491dd0de6282a4d4fe4e89d6836a714ccf6d540c Mon Sep 17 00:00:00 2001 From: Alex Wang Date: Fri, 16 Sep 2016 16:57:55 -0400 Subject: [PATCH 1/2] qt5: Change HEAD branch from 5.6 to dev Also remove patches fixing build error due to missing QtBase widget example targets. This has been fixed upstream, but not in the current stable release (5.6.1) --- Formula/qt5.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Formula/qt5.rb b/Formula/qt5.rb index fab7d5e5c7a6a..83d698f27671a 100644 --- a/Formula/qt5.rb +++ b/Formula/qt5.rb @@ -18,7 +18,7 @@ class Qt5 < Formula mirror "https://www.mirrorservice.org/sites/download.qt-project.org/official_releases/qt/5.6/5.6.1-1/single/qt-everywhere-opensource-src-5.6.1-1.tar.xz" sha256 "ce08a7eb54661705f55fb283d895a089b267c688fabe017062bd71b9231736db" - head "https://code.qt.io/qt/qt5.git", :branch => "5.6", :shallow => false + head "https://code.qt.io/qt/qt5.git", :branch => "dev", :shallow => false bottle do sha256 "2aaa410f2ab2fbbddbc8c3438e43bc9f4271774c794bcae8f935fb6b1b5a82ed" => :el_capitan @@ -43,9 +43,11 @@ class Qt5 < Formula # by logic introduced in and # corrected in . # Should land in either 5.6.2 and/or 5.7.1. - patch do - url "https://raw.githubusercontent.com/Homebrew/formula-patches/6ffd0e250d374193613a51beda8830dda9b67e56/qt5/QTBUG-54110.patch" - sha256 "2cf77b820f46f0c404284882b4a4a97bf005b680062842cdc53e107a821deeda" + unless build.head? + patch do + url "https://raw.githubusercontent.com/Homebrew/formula-patches/6ffd0e250d374193613a51beda8830dda9b67e56/qt5/QTBUG-54110.patch" + sha256 "2cf77b820f46f0c404284882b4a4a97bf005b680062842cdc53e107a821deeda" + end end keg_only "Qt 5 conflicts Qt 4" From c50d9fe12700d326a9b4ecded468a091ec04a66d Mon Sep 17 00:00:00 2001 From: Alex Wang Date: Fri, 16 Sep 2016 16:58:48 -0400 Subject: [PATCH 2/2] qt5: update stable to 5.7 --- Formula/qt5.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Formula/qt5.rb b/Formula/qt5.rb index 83d698f27671a..c51e2f71c03e1 100644 --- a/Formula/qt5.rb +++ b/Formula/qt5.rb @@ -14,9 +14,8 @@ def message; <<-EOS.undent class Qt5 < Formula desc "Version 5 of the Qt framework" homepage "https://www.qt.io/" - url "https://download.qt.io/official_releases/qt/5.6/5.6.1-1/single/qt-everywhere-opensource-src-5.6.1-1.tar.xz" - mirror "https://www.mirrorservice.org/sites/download.qt-project.org/official_releases/qt/5.6/5.6.1-1/single/qt-everywhere-opensource-src-5.6.1-1.tar.xz" - sha256 "ce08a7eb54661705f55fb283d895a089b267c688fabe017062bd71b9231736db" + url "http://download.qt.io/official_releases/qt/5.7/5.7.0/single/qt-everywhere-opensource-src-5.7.0.tar.gz" + sha256 "4661905915d6265243e17fe59852930a229cf5b054ce5af5f48b34da9112ab5f" head "https://code.qt.io/qt/qt5.git", :branch => "dev", :shallow => false