diff options
| author | Mike Arthur | 2009-11-05 12:16:37 +0000 |
|---|---|---|
| committer | Max Howell | 2009-11-07 18:22:34 +0000 |
| commit | 10e6dd25d9caf3b1052ef20ff0bf013ad14cabb4 (patch) | |
| tree | d161798f6fb3eeff45c6c69d8d77d11155004894 /Library | |
| parent | 944da17839f8e35bc5678984a5a3142d66fc9890 (diff) | |
| download | homebrew-10e6dd25d9caf3b1052ef20ff0bf013ad14cabb4.tar.bz2 | |
Update Qt MD5 and fix X11 png dependency.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/qt.rb | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb index e34be1bb6..a8940ca7a 100644 --- a/Library/Formula/qt.rb +++ b/Library/Formula/qt.rb @@ -2,9 +2,13 @@ require 'formula' class Qt <Formula url 'http://get.qt.nokia.com/qt/source/qt-mac-opensource-src-4.5.3.tar.gz' - md5 'c549d6c0c2e0723377cb955c78a1b680' + md5 '484e3739fdc51540218ed92f4b732881' homepage 'http://www.qtsoftware.com' + if not File.exist? "/usr/X11R6/lib" + depends_on 'libpng' + end + def install if version == '4.5.3' # Reported 6 months ago (at 4.5.0-rc1), still not fixed in the this release! :( @@ -17,9 +21,16 @@ class Qt <Formula "-nomake", "demos", "-nomake", "examples", "-no-qt3support", "-release", "-cocoa", "-confirm-license", "-opensource", - "-I/usr/X11R6/include", "-L/usr/X11R6/lib", "-fast"] - + + if File.exist? "/usr/X11R6/lib" + conf_args << "-L/usr/X11R6/lib" + conf_args << "-I/usr/X11R6/include" + else + conf_args << "-L#{Formula.factory('libpng').lib}" + conf_args << "-I#{Formula.factory('libpng').include}" + end + if MACOS_VERSION >= 10.6 conf_args << '-arch' << 'x86_64' else @@ -36,7 +47,7 @@ class Qt <Formula # wtf are these anyway? `rm -r #{bin}/Assistant_adp.app #{bin}/pixeltool.app #{bin}/qhelpconverter.app` # we specified no debug already! :P - `rm #{lib}/libQtUiTools_debug.a` + `rm #{lib}/libQtUiTools_debug.a #{lib}/pkgconfig/QtUiTools_debug.pc` # meh `rm #{prefix}/q3porting.xml` end |