diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-07-29 07:40:26 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-07-29 07:55:25 -0700 |
| commit | fcfa05b134de4e8953658f4ccb81de3f0f43a9d4 (patch) | |
| tree | 1052b919ae88e0858f042040ab7e5b527359ec3c | |
| parent | 2ca8d664d735ae58056cb16dc28449b4dc04984d (diff) | |
| download | subsurface-fcfa05b134de4e8953658f4ccb81de3f0f43a9d4.tar.gz | |
Mac bundle: no more Marble
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rwxr-xr-x | packaging/macosx/make-package.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/packaging/macosx/make-package.sh b/packaging/macosx/make-package.sh index b227cd6d7..73fdefd2f 100755 --- a/packaging/macosx/make-package.sh +++ b/packaging/macosx/make-package.sh @@ -24,7 +24,7 @@ LIBRARY_PATH=${DIR}/install-root/lib make install # now adjust a few references that macdeployqt appears to miss EXECUTABLE=Subsurface.app/Contents/MacOS/Subsurface -for i in libssh libssrfmarblewidget libgit2 libGrantlee_TextDocument.dylib libGrantlee_Templates.dylib; do +for i in libssh libgit2 libGrantlee_TextDocument.dylib libGrantlee_Templates.dylib; do OLD=$(otool -L ${EXECUTABLE} | grep $i | cut -d\ -f1 | tr -d "\t") if [ ! -z ${OLD} ] ; then # copy the library into the bundle and make sure its id and the reference to it are correct @@ -46,12 +46,13 @@ for i in ${RPATH}; do install_name_tool -change @rpath/$i @executable_path/../Frameworks/$i ${EXECUTABLE} done -# and now replace @rpath references in libssrfmarblewidget -MARBLELIB=$(ls Subsurface.app/Contents/Frameworks/libssrfmarblewidget*dylib) -RPATH=$(otool -L ${MARBLELIB} | grep rpath | cut -d\ -f1 | tr -d "\t" | cut -b 8- ) -for i in ${RPATH}; do - install_name_tool -change @rpath/$i @executable_path/../Frameworks/$i ${MARBLELIB} -done +# no more Marble +# # and now replace @rpath references in libssrfmarblewidget +# MARBLELIB=$(ls Subsurface.app/Contents/Frameworks/libssrfmarblewidget*dylib) +# RPATH=$(otool -L ${MARBLELIB} | grep rpath | cut -d\ -f1 | tr -d "\t" | cut -b 8- ) +# for i in ${RPATH}; do +# install_name_tool -change @rpath/$i @executable_path/../Frameworks/$i ${MARBLELIB} +# done # next deal with libGrantlee LIBG=$(ls Subsurface.app/Contents/Frameworks/libGrantlee_Templates*dylib) |