Last active
October 2, 2017 14:46
-
-
Save samueljackson92/6e60e71e38d8e5d67a73ef16368e9db7 to your computer and use it in GitHub Desktop.
Git patch for fixing the Mantid installer package script on OSX Sierra.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/MantidPlot/make_package.rb.in b/MantidPlot/make_package.rb.in | |
index acdb31e30f..672bf3f3b6 100755 | |
--- a/MantidPlot/make_package.rb.in | |
+++ b/MantidPlot/make_package.rb.in | |
@@ -72,7 +72,7 @@ library_filenames = ["libboost_regex-mt.dylib", | |
"libTKGeomBase.dylib", | |
"libqwt.dylib", | |
"libqwtplot3d.dylib", | |
- "libqscintilla2.dylib", | |
+ "libqscintilla2_qt4.dylib", | |
"libmxml.dylib", | |
"libhdf5.dylib", | |
"libhdf5_hl.dylib", | |
@@ -194,7 +194,7 @@ search_patterns.each do |pattern| | |
end | |
#We'll use macdeployqt to fix qt dependencies. | |
-Qt_Executables = "-executable=Contents/MacOS/mantidqtpython.so -executable=Contents/MacOS/libqwtplot3d.dylib -executable=Contents/MacOS/libqwt.dylib -executable=Contents/MacOS/libqscintilla2.dylib" | |
+Qt_Executables = "-executable=Contents/MacOS/mantidqtpython.so -executable=Contents/MacOS/libqwtplot3d.dylib -executable=Contents/MacOS/libqwt.dylib -executable=Contents/MacOS/libqscintilla2_qt4.dylib" | |
if( "@MAKE_VATES@" == "ON" ) | |
list = ["Contents/Libraries/vtkParaViewWebCorePython.so", | |
"Contents/Libraries/vtkPVAnimationPython.so", | |
@@ -268,7 +268,7 @@ end | |
pyqt4_patterns = ["**/PyQt4/*.so"] | |
change_id(pyqt4_patterns, "Contents/MacOS/PyQt4/") | |
-QtLinkingDir = find_linking_directories(pyqt4_patterns, 'Qt.*.framework/Versions/\d/Qt.*', '/usr/local/opt/qt/lib') | |
+QtLinkingDir = find_linking_directories(pyqt4_patterns, 'Qt.*.framework/Versions/\d/Qt.*', '/usr/local/opt/qt@4/lib') | |
if QtLinkingDir.uniq != [QtLinkingDir[0]] | |
p "Error updating PyQt4 dynamic linking!" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment