From e9fc0bb67a8431e8f25aab5b8c415cd767e37147 Mon Sep 17 00:00:00 2001
From: Gus Grubba <mavlink@grubba.com>
Date: Sun, 2 Jul 2017 15:57:46 -0400
Subject: [PATCH] Deal with macdeployqt relocation issues

---
 QGCInstaller.pri | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/QGCInstaller.pri b/QGCInstaller.pri
index 1d54852f2..88d98e5c7 100644
--- a/QGCInstaller.pri
+++ b/QGCInstaller.pri
@@ -28,6 +28,9 @@ installer {
         # links to plugins will not be created correctly.
         QMAKE_POST_LINK += && mkdir -p $${DESTDIR}/package
         QMAKE_POST_LINK += && cd $${DESTDIR} && $$dirname(QMAKE_QMAKE)/macdeployqt $${TARGET}.app -appstore-compliant -verbose=2 -qmldir=$${BASEDIR}/src
+        # macdeploy is missing some relocations once in a while. "Fix" it:
+        QMAKE_POST_LINK += && python $$BASEDIR/tools/osxrelocator.py $${TARGET}.app/Contents @rpath @executable_path/../Frameworks -r > /dev/null 2>&1
+        # Create package
         QMAKE_POST_LINK += && cd $${OUT_PWD}
         QMAKE_POST_LINK += && hdiutil create -verbose -stretch 4g -layout SPUD -srcfolder $${DESTDIR}/$${TARGET}.app -volname $${TARGET} $${DESTDIR}/package/$${TARGET}.dmg
     }
-- 
2.22.0