aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMartin Fitzpatrick2013-09-23 12:59:21 +0100
committerMike McQuaid2013-09-27 15:25:16 +0100
commitcdbfe03fa1d1117aff68a5b26b60b2714d755cce (patch)
tree89cdccf83c137a0e7e8ae7deb1c2285e3507413b /Library
parent2b3949c9ec5ba83cc3d1fd373c54cc18720408d7 (diff)
downloadhomebrew-cdbfe03fa1d1117aff68a5b26b60b2714d755cce.tar.bz2
qt5: fix install_name_tool rules for PyQt.
Closes #22844. Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/qt5.rb13
1 files changed, 5 insertions, 8 deletions
diff --git a/Library/Formula/qt5.rb b/Library/Formula/qt5.rb
index fef9acb64..f55d005dc 100644
--- a/Library/Formula/qt5.rb
+++ b/Library/Formula/qt5.rb
@@ -5,12 +5,6 @@ class Qt5 < Formula
url 'http://download.qt-project.org/official_releases/qt/5.1/5.1.1/single/qt-everywhere-opensource-src-5.1.1.tar.gz'
sha1 '131b023677cd5207b0b0d1864f5d3ac37f10a5ba'
- bottle do
- sha1 'fdb63c4ba28c771c3bf3b839717433a9777ded31' => :mountain_lion
- sha1 'f36277bb155428bc7198b9d366131238bab847a2' => :lion
- sha1 '483f3669b0149448c6448b69077307745037dcb2' => :snow_leopard
- end
-
head 'git://gitorious.org/qt/qt5.git', :branch => 'stable'
keg_only "Qt 5 conflicts Qt 4 (which is currently much more widely used)."
@@ -67,12 +61,15 @@ class Qt5 < Formula
system "make install"
# Fix https://github.com/mxcl/homebrew/issues/20020 (upstream: https://bugreports.qt-project.org/browse/QTBUG-32417)
- system "install_name_tool", "-change", "#{pwd}/qt-everywhere-opensource-src-#{version}/qtwebkit/lib/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets", #old
+ system "install_name_tool", "-change", "#{pwd}/qtwebkit/lib/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets", #old
"#{lib}/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets", #new
"#{libexec}/QtWebProcess" # in this lib
- system "install_name_tool", "-change", "#{pwd}/qt-everywhere-opensource-src-#{version}/qtwebkit/lib/QtWebKit.framework/Versions/5/QtWebKit",
+ system "install_name_tool", "-change", "#{pwd}/qtwebkit/lib/QtWebKit.framework/Versions/5/QtWebKit",
"#{lib}/QtWebKit.framework/Versions/5/QtWebKit",
"#{prefix}/qml/QtWebKit/libqmlwebkitplugin.dylib"
+ system "install_name_tool", "-change", "#{pwd}/qtwebkit/lib/QtWebKit.framework/Versions/5/QtWebKit",
+ "#{lib}/QtWebKit.framework/Versions/5/QtWebKit",
+ "#{lib}/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets"
# Some config scripts will only find Qt in a "Frameworks" folder
cd prefix do