From d99727306c052458b2b55e888da10b76ea0ff91c Mon Sep 17 00:00:00 2001
From: Patrick Huebner <phuebner86@gmail.com>
Date: Sun, 10 Nov 2013 19:20:40 +1100
Subject: [PATCH] OP-1103 Fixes packaging issues for OSX. Using this version I
 had no problem to run GCS on 10.9 Mavericks

---
 package/osx/libraries | 86 +++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/package/osx/libraries b/package/osx/libraries
index 63db1f32f..6515255ef 100755
--- a/package/osx/libraries
+++ b/package/osx/libraries
@@ -3,9 +3,9 @@
 APP="${1?}"
 PLUGINS="${APP}/Contents/Plugins"
 OP_PLUGINS="${APP}/Contents/Plugins/OpenPilot"
-QT_LIBS="QtDeclarative QtXmlPatterns QtGui QtTest QtCore QtSvg QtSql QtOpenGL QtNetwork QtXml QtDBus QtScript phonon"
+QT_LIBS="QtDeclarative QtXmlPatterns QtGui QtTest QtCore QtSvg QtSql QtOpenGL QtNetwork QtXml QtScript"
 QT_DIR=$(otool -L "${APP}/Contents/MacOS/OpenPilot GCS" | sed -n -e 's/\/QtCore\.framework.*//p' | sed -n -E 's:^.::p')
-QT_EXTRA="accessible/libqtaccessiblewidgets.dylib bearer/libqgenericbearer.dylib codecs/libqcncodecs.dylib codecs/libqjpcodecs.dylib codecs/libqkrcodecs.dylib codecs/libqtwcodecs.dylib graphicssystems/libqtracegraphicssystem.dylib imageformats/libqgif.dylib imageformats/libqico.dylib imageformats/libqjpeg.dylib imageformats/libqmng.dylib imageformats/libqtiff.dylib imageformats/libqsvg.dylib qmltooling/libqmldbg_inspector.dylib qmltooling/libqmldbg_tcp.dylib graphicssystems/libqglgraphicssystem.dylib sqldrivers/libqsqlodbc.dylib sqldrivers/libqsqlpsql.dylib sqldrivers/libqsqlite.dylib imageformats/libqtga.dylib iconengines/libqsvgicon.dylib"
+QT_EXTRA="accessible/libqtaccessiblewidgets.dylib bearer/libqgenericbearer.dylib imageformats/libqgif.dylib imageformats/libqico.dylib imageformats/libqjpeg.dylib imageformats/libqmng.dylib imageformats/libqtiff.dylib imageformats/libqsvg.dylib qmltooling/libqmldbg_tcp.dylib sqldrivers/libqsqlodbc.dylib sqldrivers/libqsqlpsql.dylib sqldrivers/libqsqlite.dylib imageformats/libqtga.dylib iconengines/libqsvgicon.dylib"
 
 OSG_EXTRA="libosgViewer.90.dylib"
 
@@ -24,7 +24,7 @@ fi
 echo "Qt library directory is \"${QT_DIR}\""
 
 echo "Running macdeployqt"
-macdeployqt "${APP}"
+macdeployqt "${APP}" -no-strip 
 
 echo "Processing Qt libraries in ${APP}"
 for f in "${PLUGINS}/"*.dylib "${OP_PLUGINS}/"*.dylib
@@ -33,56 +33,56 @@ do
     [ ! -L "${f}" ] && for g in $QT_LIBS
     do
         install_name_tool -change \
-            "${QT_DIR}${g}.framework/Versions/4/${g}" \
-            @executable_path/../Frameworks/${g}.framework/Versions/4/${g} \
+            "${QT_DIR}${g}.framework/Versions/5/${g}" \
+            @executable_path/../Frameworks/${g}.framework/Versions/5/${g} \
             "${f}"
     done
 done
 
-echo "Copying other libraries that were missed"
+#echo "Copying other libraries that were missed"
 # should be redundant but some libs missed by main app and macdeployqt
-for f in ${QT_LIBS}
-do
-    echo "Copying ${f}"
-    cp -a "${QT_FRAMEWORKS}/${f}.framework" "${APP}/Contents/Frameworks/"
+#for f in ${QT_LIBS}
+#do
+    #echo "Copying ${f}"
+    #cp -a "${QT_FRAMEWORKS}/${f}.framework" "${APP}/Contents/Frameworks/"
 
-    echo "Changing package identification of ${f}"
-    install_name_tool -id \
-        @executable_path/../Frameworks/${f}.framework/Versions/4/${f} \
-        "${APP}/Contents/Frameworks/${f}.framework/Versions/4/${f}"
+    #echo "Changing package identification of ${f}"
+    #install_name_tool -id \
+        #@executable_path/../Frameworks/${f}.framework/Versions/5/${f} \
+        #"${APP}/Contents/Frameworks/${f}.framework/Versions/5/${f}"
 
-    rm "${APP}/Contents/Frameworks/${f}.framework/${f}"
+    #rm "${APP}/Contents/Frameworks/${f}.framework/${f}"
 
-    echo "Changing package linkages"
-    for g in $QT_LIBS
-    do
-        install_name_tool -change \
-            "${QT_DIR}${g}.framework/Versions/4/${g}" \
-            @executable_path/../Frameworks/${g}.framework/Versions/4/${g} \
-            "${APP}/Contents/Frameworks/${f}.framework/Versions/4/${f}"
-    done
-done
+    #echo "Changing package linkages"
+    #for g in $QT_LIBS
+    #do
+        #install_name_tool -change \
+            #"${QT_DIR}${g}.framework/Versions/5/${g}" \
+            #@executable_path/../Frameworks/${g}.framework/Versions/5/${g} \
+            #"${APP}/Contents/Frameworks/${f}.framework/Versions/5/${f}"
+    #done
+#done
 
-for f in ${QT_EXTRA}
-do
-    echo "Copying package ${f}"
-    d=$(dirname ${f})
-    [ ! -d "${APP}/Contents/Plugins/${d}" ] && mkdir "${APP}/Contents/Plugins/${d}"
-    cp "${QT_PLUGINS}/${f}" "${APP}/Contents/Plugins/${f}"
-    echo "Changing package identification of ${f}"
-    install_name_tool -id \
-        @executable_path/../Plugins/${f} \
-        "${PLUGINS}/${f}"
+#for f in ${QT_EXTRA}
+#do
+    #echo "Copying package ${f}"
+    #d=$(dirname ${f})
+    #[ ! -d "${APP}/Contents/Plugins/${d}" ] && mkdir "${APP}/Contents/Plugins/${d}"
+    #cp "${QT_PLUGINS}/${f}" "${APP}/Contents/Plugins/${f}"
+    #echo "Changing package identification of ${f}"
+    #install_name_tool -id \
+        #@executable_path/../Plugins/${f} \
+        #"${PLUGINS}/${f}"
 
-    echo "Changing package linkages"
-    for g in $QT_LIBS
-    do
-        install_name_tool -change \
-            "${QT_DIR}${g}.framework/Versions/4/${g}" \
-            @executable_path/../Frameworks/${g}.framework/Versions/4/${g} \
-            "${APP}/Contents/Plugins/${f}"
-    done
-done
+    #echo "Changing package linkages"
+    #for g in $QT_LIBS
+    #do
+        #install_name_tool -change \
+            #"${QT_DIR}${g}.framework/Versions/5/${g}" \
+            #@executable_path/../Frameworks/${g}.framework/Versions/5/${g} \
+            #"${APP}/Contents/Plugins/${f}"
+    #done
+#done
 
 echo "Copying SDL"
 cp -a "/Library/Frameworks/SDL.framework" "${APP}/Contents/Frameworks/"