qt5 5.0.1

* Removes block on building with clang
* Backports patch 655ba57 from qtbase.git the prevented the build
* Removes -fast flag for configure, no longer existant

Closes #17617.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>

1 files changed, 43 insertions, 8 deletions

diff --git a/Library/Formula/qt5.rb b/Library/Formula/qt5.rb
index 3ac3d6c4b..f282e0f0c 100644
--- a/Library/Formula/qt5.rb
+++ b/Library/Formula/qt5.rb
@@ -2,17 +2,13 @@ require 'formula'
 
 class Qt5 < Formula
   homepage 'http://qt-project.org/'
-  url 'http://releases.qt-project.org/qt5/5.0.0/single/qt-everywhere-opensource-src-5.0.0.tar.gz'
-  sha1 '42f4b11389fe1361352cdd04f258f0d6f175ebfd'
+  url 'http://releases.qt-project.org/qt5/5.0.1/single/qt-everywhere-opensource-src-5.0.1.tar.gz'
+  sha1 'fda04435b1d4069dc189ab4d22ed7a36fe6fa3e9'
 
   head 'git://gitorious.org/qt/qt5.git', :branch => 'master'
 
   keg_only "Qt 5 conflicts Qt 4 (which is currently much more widely used)."
 
-  fails_with :clang do
-    build 425
-  end
-
   option :universal
   option 'with-qtdbus', 'Enable QtDBus module'
   option 'with-demos-examples', 'Enable Qt demos and examples'
@@ -25,11 +21,16 @@ class Qt5 < Formula
   depends_on "d-bus" if build.include? 'with-qtdbus'
   depends_on "mysql" if build.include? 'with-mysql'
 
+  def patches
+    # http://qt.gitorious.org/qt/qtbase/commit/655ba5?format=patch
+    # Inlined to fix paths.
+    DATA
+  end
+
   def install
     args = ["-prefix", prefix,
             "-system-libpng", "-system-zlib",
-            "-confirm-license", "-opensource",
-            "-fast" ]
+            "-confirm-license", "-opensource"]
 
     args << "-L#{MacOS::X11.prefix}/lib" << "-I#{MacOS::X11.prefix}/include" if MacOS::X11.installed?
 
@@ -102,3 +103,37 @@ class Qt5 < Formula
     EOS
   end
 end
+
+__END__
+From 655ba5755696df8e2594bca9f7696ab621f5afc3 Mon Sep 17 00:00:00 2001
+From: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
+Date: Tue, 5 Feb 2013 13:39:33 +0100
+Subject: [PATCH] Cocoa QPA: Fix compilation error
+
+The error appeared with latest clang as of Feb. 5, 2013.
+
+Apple LLVM version 4.2 (clang-425.0.24) (based on LLVM 3.2svn)
+Target: x86_64-apple-darwin12.2.0
+
+Change-Id: I8df8cccc941ac03a7a997bdd5afe095b7b6f65d3
+Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
+---
+ src/plugins/platforms/cocoa/qcocoawindow.h |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/qtbase/src/plugins/platforms/cocoa/qcocoawindow.h b/qtbase/src/plugins/platforms/cocoa/qcocoawindow.h
+index 3b5be0a..324a43c 100644
+--- a/qtbase/src/plugins/platforms/cocoa/qcocoawindow.h
++++ b/qtbase/src/plugins/platforms/cocoa/qcocoawindow.h
+@@ -49,7 +49,8 @@
+
+ #include "qcocoaglcontext.h"
+ #include "qnsview.h"
+-class QT_PREPEND_NAMESPACE(QCocoaWindow);
++
++QT_FORWARD_DECLARE_CLASS(QCocoaWindow)
+
+ @interface QNSWindow : NSWindow {
+     @public QCocoaWindow *m_cocoaPlatformWindow;
+--
+1.7.1