aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorMike McQuaid2012-04-04 12:19:41 +1000
committerMike McQuaid2012-04-04 15:58:55 +1000
commit5a0afe3da0584614711d09725baf8219f9e8a4a4 (patch)
tree594b9fd2333f87b5074ad97d36538a16995d5cdf /Library/Formula
parent4864b1ba17e69ff22a2f058b70ac1a287825b199 (diff)
downloadhomebrew-5a0afe3da0584614711d09725baf8219f9e8a4a4.tar.bz2
Qt 4.8.1
Fixes #11406.
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/qt.rb18
1 files changed, 5 insertions, 13 deletions
diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb
index ba9d9a945..4f0d07fc0 100644
--- a/Library/Formula/qt.rb
+++ b/Library/Formula/qt.rb
@@ -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|