Permalink
Browse files

qt: use upstreamed Mavericks patches.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
  • Loading branch information...
jensenb authored and MikeMcQuaid committed Dec 12, 2013
1 parent 59db735 commit 872a4c3a161bd7ac26196635978728e8a0f9620b
Showing with 2 additions and 56 deletions.
  1. +2 −56 Formula/qt.rb
View
@@ -10,17 +10,12 @@ class Qt < Formula
# bunch of people to get Qt working on Mavericks and 4.8.5 needs too many
# patches to compile any time soon (January-ish):
# http://permalink.gmane.org/gmane.comp.lib.qt.devel/13812
url 'https://github.com/qtproject/qt/archive/157da36977213237939df14608753bb3ec280f0b.tar.gz'
sha1 '145b8eb6a6c2ccc1cc58ddcb03a1d33b153e0c15'
url 'https://github.com/qtproject/qt/archive/f44310c25b372f494586dbb5b305f7e81ca63000.tar.gz'
sha1 '51548326463068912fb4d9de04b0f6b2e267d064'
# It would be nice if this was a real version number but unfortunately
# that will mess with the bottles.
version '4.8.5'
resource 'libWebKitSystemInterfaceMavericks' do
url 'http://trac.webkit.org/export/157771/trunk/WebKitLibraries/libWebKitSystemInterfaceMavericks.a'
sha1 'fc5ebf85f637f9da9a68692df350e441c8ef5d7e'
version '157771'
end
end
head 'git://gitorious.org/qt/qt.git', :branch => '4.8'
@@ -44,51 +39,6 @@ class Qt < Formula
odie 'qt: --with-demos-examples is no longer supported' if build.include? 'with-demos-examples'
odie 'qt: --with-debug-and-release is no longer supported' if build.include? 'with-debug-and-release'
def patches
p = []
if MacOS.version >= :mavericks
# Patches to fix compilation on Mavericks (http://github.com/mxcl/homebrew/pull/23793)
unless build.head?
p += [
# Change Iff4d919d: Added a patch to let the WebKit's QNetworkReplyHandler.cpp compile at Mac OS X 10.9 Mavericks
# (https://codereview.qt-project.org/#change,70438)
'https://gist.github.com/jensenb/aafb2c2d1e0fcce2994f/raw/ec13ef2a8b4adc7b9695e6d49876d826f89802ae/Change_Iff4d919d',
# Change Ied51c868: Added a patch to let the WebKit's qgraphicswebview.cpp compile at Mac OS X 10.9 Mavericks
# (https://codereview.qt-project.org/#change,70439)
'https://gist.github.com/jensenb/aafb2c2d1e0fcce2994f/raw/8834e194a0f4e0c99ef64064f6a86ddcb617f444/Change_Ied51c868',
# Change Ic6330613: Added a patch to let the WebKit's NotificationPresenterClientQt.cpp compile at Mac OS X 10.9 Mavericks
# (https://codereview.qt-project.org/#change,70440)
'https://gist.github.com/jensenb/aafb2c2d1e0fcce2994f/raw/9ee8460814204faa5cf5b1317fba5d1b14a563eb/Change_Ic6330613',
# Change I2ad84441: Added a patch to let the WebKit's .pro file find the lib for Mavericks. This is needed to compile at Mac OS X 10.9 Mavericks
# (https://codereview.qt-project.org/#change,70442)
'https://gist.github.com/jensenb/aafb2c2d1e0fcce2994f/raw/f73ea1979f4595fc463b2deb77987b389748e289/Change_I2ad84441',
# Change I4c697a87: Added a patch to let the WebKit's platform/Timer.h compile at Mac OS X 10.9 Mavericks
# (https://codereview.qt-project.org/#change,70443)
'https://gist.github.com/jensenb/aafb2c2d1e0fcce2994f/raw/9d5305f6bb01cf445893d09bf399097a53706d6a/Change+I4c697a87',
# Change I31ad9a7a: Added a patch to let the WebKit's platform/Timer.cpp compile at Mac OS X 10.9 Mavericks
# (https://codereview.qt-project.org/#change,70444)
'https://gist.github.com/jensenb/aafb2c2d1e0fcce2994f/raw/2f9a348e575f63d435c3d32a9c70c4c2d687542c/Change_I31ad9a7a',
# Change Ieb30c115: Backported fix for WebKit libc++ support on OS X Mavricks
# (https://codereview.qt-project.org/#change,70929)
'https://gist.github.com/jensenb/aafb2c2d1e0fcce2994f/raw/ebdc1fbf8d1b9a65e797124fb64b709a7d71107d/Change_Ieb30c115',
]
end
p += [
# Change Change I8fd619af: Added a patch to let the CLucene's FieldCachImpl.cpp compile at Mac OS X 10.9 Mavericks
# (https://codereview.qt-project.org/#change,70437)
'https://gist.github.com/jensenb/aafb2c2d1e0fcce2994f/raw/6d2597c4c61cca04ed56472fd1fd793798526ce6/Change_I8fd619af',
# Change Iaedaff7c: Enable building with clang / libc++ on OS X 10.9 Mavericks
# (https://codereview.qt-project.org/#change,70930)
'https://gist.github.com/jensenb/aafb2c2d1e0fcce2994f/raw/cc0a38d67cb36b650a275af3825731ce1f2ba35c/Change_Iaedaff7c',
# Change I04e1471d: Return the correct system font on OS X Mavericks.
# (https://codereview.qt-project.org/#change,62261)
'https://gist.github.com/mhemeryck/7487365/raw/adc0ba7a9b33b113ab3d15f545082703a51d3ccd/Change_I04e1471d',
]
end
p
end
def install
ENV.universal_binary if build.universal?
@@ -144,10 +94,6 @@ def install
args << '-developer-build' if build.include? 'developer'
if MacOS.version >= :mavericks
(buildpath/'src/3rdparty/webkit/WebKitLibraries').install resource('libWebKitSystemInterfaceMavericks')
end
system "./configure", *args
system "make"
ENV.j1

0 comments on commit 872a4c3

Please sign in to comment.