Fixes Homebrew/homebrew#11406.
This commit is contained in:
Mike McQuaid 2012-04-04 12:19:41 +10:00
parent eb41e815cc
commit 257f0d7b0e

View file

@ -2,12 +2,11 @@ require 'formula'
class Qt < Formula
homepage 'http://qt.nokia.com/'
url 'http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.8.0.tar.gz'
md5 'e8a5fdbeba2927c948d9f477a6abe904'
url 'http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.8.1.tar.gz'
md5 '7960ba8e18ca31f0c6e4895a312f92ff'
bottle do
url 'https://downloads.sf.net/project/machomebrew/Bottles/qt-4.8.0-bottle.tar.gz'
sha1 '2bfe00c5112b0d2a680cd01144701f8937846096'
sha1 'd523bfbc1c7e50cdd10b64b1b10db187ec7e7c2b' => :lion
end
head 'git://gitorious.org/qt/qt.git', :branch => 'master'
@ -29,13 +28,6 @@ class Qt < Formula
depends_on "d-bus" if ARGV.include? '--with-qtdbus'
depends_on 'sqlite' if MacOS.leopard?
def patches
# Fix compilation with llvm-gcc. Remove for 4.8.1.
[ "https://qt.gitorious.org/qt/qt/commit/448ab?format=patch",
# Fix Xcode 4 generation. Remove for 4.8.1.
"https://qt.gitorious.org/qt/qt/commit/b5871?format=patch" ]
end
def install
ENV.x11
ENV.append "CXXFLAGS", "-fvisibility=hidden"
@ -81,7 +73,7 @@ class Qt < Formula
args << "-release"
end
# Needed for Qt 4.8.0 due to attempting to link moc with gcc.
# Needed for Qt 4.8.1 due to attempting to link moc with gcc.
ENV['LD'] = ENV['CXX']
system "./configure", *args
@ -106,7 +98,7 @@ class Qt < Formula
ln_s lib, "Frameworks"
end
# The pkg-config files installed suggest that geaders can be found in the
# The pkg-config files installed suggest that headers can be found in the
# `include` directory. Make this so by creating symlinks from `include` to
# the Frameworks' Headers folders.
Pathname.glob(lib + '*.framework/Headers').each do |path|