diff options
| author | Mike McQuaid | 2012-07-26 21:06:01 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2012-07-26 21:06:57 +0100 |
| commit | 94cb77d22c04ff4bd7e7f6cc54b2cd54494271a0 (patch) | |
| tree | 64caceff7ac7b90e27a269a76edd230b7df57315 /Library | |
| parent | affc4c88ff92a8ff83b468fa8e5a9892e98a80e2 (diff) | |
| download | homebrew-94cb77d22c04ff4bd7e7f6cc54b2cd54494271a0.tar.bz2 | |
Qt: Fix on Mountain Lion but disable QtWebKit.
Partial fix for #13368.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/qt.rb | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb index f156ef977..49182aaec 100644 --- a/Library/Formula/qt.rb +++ b/Library/Formula/qt.rb @@ -12,10 +12,8 @@ class Qt < Formula head 'git://gitorious.org/qt/qt.git', :branch => 'master' - depends_on :x11 - fails_with :clang do - build 318 + build 421 end def options @@ -37,19 +35,27 @@ class Qt < Formula # https://bugreports.qt-project.org/browse/QTBUG-23258 if MacOS.leopard? "http://bugreports.qt-project.org/secure/attachment/26712/Patch-Qt-4.8-for-10.5" + # add support for Mountain Lion + elsif MacOS.mountain_lion? + [ "https://qt.gitorious.org/qt/qt/commit/422f1b?format=patch", + "https://qt.gitorious.org/qt/qt/commit/665355?format=patch" ] end + end def install ENV.append "CXXFLAGS", "-fvisibility=hidden" args = ["-prefix", prefix, - "-system-libpng", "-system-zlib", - "-L#{MacOS.x11_prefix}/lib", "-I#{MacOS.x11_prefix}/include", + "-system-zlib", "-confirm-license", "-opensource", "-cocoa", "-fast" ] # See: https://github.com/mxcl/homebrew/issues/issue/744 args << "-system-sqlite" if MacOS.leopard? + + # TODO: Fix on Mountain Lion so WebKit can be built. + args << "-no-webkit" if MacOS.mountain_lion? + args << "-plugin-sql-mysql" if (HOMEBREW_CELLAR+"mysql").directory? if ARGV.include? '--with-qtdbus' |