aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2011-07-28 14:36:10 +0100
committerMike McQuaid2011-07-28 14:36:34 +0100
commit1bd0cf572183c8ffbe7c91c10013945fa1154622 (patch)
treebb48c55db3ebec92ed295ad0e62024af3a460047 /Library
parent8368fe489bde47b8f201bfcfdf328944fdf7092b (diff)
downloadhomebrew-1bd0cf572183c8ffbe7c91c10013945fa1154622.tar.bz2
Fix Qt on Lion and update bottle.
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/qt.rb13
1 files changed, 8 insertions, 5 deletions
diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb
index 1b23d2353..4834b2e95 100644
--- a/Library/Formula/qt.rb
+++ b/Library/Formula/qt.rb
@@ -6,15 +6,18 @@ class Qt < Formula
md5 '49b96eefb1224cc529af6fe5608654fe'
homepage 'http://qt.nokia.com/'
bottle 'https://downloads.sourceforge.net/project/machomebrew/Bottles/qt-4.7.3-bottle.tar.gz'
- bottle_sha1 '6ab865b92db92cf2c49a332010f99566178d25cf'
+ bottle_sha1 'a50123be33c96cba97d4bcee61f3859c7d52000e'
head 'git://gitorious.org/qt/qt.git', :branch => 'master'
def patches
- # Fixes compilation on 10.7 or with llvm-gcc
- # Bug report: https://bugreports.qt.nokia.com/browse/QTBUG-20496
- # Merge request: https://qt.gitorious.org/qt/qt/merge_requests/1304
- "https://qt.gitorious.org/+kdab-developers/qt/kdab-for-upstream/commit/1537d131e59e4fb43001299cfbd747c521fa1888?format=patch"
+ [
+ # Fixes compilation on Lion or with llvm-gcc
+ # Should be unneeded in Qt 4.7.4.
+ "https://qt.gitorious.org/qt/qt/commit/91be1263b42a0a91daf3f905661e356e31482fd3?format=patch",
+ # Stop complaining about using Lion
+ "https://qt.gitorious.org/qt/qt/commit/1766bbdb53e1e20a1bbfb523bbbbe38ea7ab7b3d?format=patch"
+ ]
end
def options