Qt 4.8.0.

1 files changed, 11 insertions, 30 deletions

diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb
index e8ae29724..8ac2b6111 100644
--- a/Library/Formula/qt.rb
+++ b/Library/Formula/qt.rb
@@ -2,24 +2,14 @@ require 'formula'
 require 'hardware'
 
 class Qt < Formula
-  url 'http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz'
-  md5 '9831cf1dfa8d0689a06c2c54c5c65aaf'
+  url 'http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.8.0.tar.gz'
+  md5 'e8a5fdbeba2927c948d9f477a6abe904'
   homepage 'http://qt.nokia.com/'
-  bottle 'https://downloads.sf.net/project/machomebrew/Bottles/qt-4.7.4-bottle.tar.gz'
-  bottle_sha1 '3195cddb76c0d13b4500dc75cc55f20f00c10ef1'
+  bottle 'https://downloads.sf.net/project/machomebrew/Bottles/qt-4.8.0-bottle.tar.gz'
+  bottle_sha1 'd03b56811d2cac933b6103bd4c8ac636dea3b877'
 
   head 'git://gitorious.org/qt/qt.git', :branch => 'master'
 
-  def patches
-    [
-      # Stop complaining about using Lion
-      "https://qt.gitorious.org/qt/qt/commit/1766bbdb53e1e20a1bbfb523bbbbe38ea7ab7b3d?format=patch",
-      # Fixes typo in WebKit, this can be removed when upgrading to Qt 4.8
-      # see https://bugs.webkit.org/show_bug.cgi?id=47284 for details
-      DATA
-    ]
-  end
-
   def options
     [
       ['--with-qtdbus', "Enable QtDBus module."],
@@ -34,6 +24,13 @@ class Qt < Formula
   depends_on 'sqlite' if MacOS.leopard?
 
   def install
+    # Needed for Qt 4.8.0 due to attempting to link moc with gcc.
+    ENV['LD'] = ENV['CXX']
+
+    inreplace "src/corelib/tools/qstring.cpp",
+      "# ifdef __SSE4_2__",
+      "# if defined(__SSE4_2__) && defined(_SIDD_UWORD_OPS)"
+
     ENV.x11
     ENV.append "CXXFLAGS", "-fvisibility=hidden"
     args = ["-prefix", prefix,
@@ -115,19 +112,3 @@ class Qt < Formula
     EOS
   end
 end
-
-__END__
-diff --git a/src/3rdparty/webkit/WebCore/platform/network/qt/SocketStreamHandlePrivate.h b/src/3rdparty/webkit/WebCore/platform/network/qt/SocketStreamHandlePrivate.h
-index 235f1b1..d074f42 100644
---- a/src/3rdparty/webkit/WebCore/platform/network/qt/SocketStreamHandlePrivate.h
-+++ b/src/3rdparty/webkit/WebCore/platform/network/qt/SocketStreamHandlePrivate.h
-@@ -57 +57 @@ public slots:
--    void socketSentdata();
-+    void socketSentData();
-diff --git a/src/3rdparty/webkit/WebCore/platform/network/qt/SocketStreamHandleQt.cpp b/src/3rdparty/webkit/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
-index e666ff7..d7a7fcc 100644
---- a/src/3rdparty/webkit/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
-+++ b/src/3rdparty/webkit/WebCore/platform/network/qt/SocketStreamHandleQt.cpp
-@@ -113 +113 @@ void SocketStreamHandlePrivate::close()
--void SocketStreamHandlePrivate::socketSentdata()
-+void SocketStreamHandlePrivate::socketSentData()