mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mac bundle: no more Marble

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-07-29 07:40:26 -07:00
parent 2ca8d664d7
commit fcfa05b134
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
packaging/macosx/make-package.sh
View file

@ -24,7 +24,7 @@ LIBRARY_PATH=${DIR}/install-root/lib make install
# now adjust a few references that macdeployqt appears to miss # now adjust a few references that macdeployqt appears to miss
EXECUTABLE=Subsurface.app/Contents/MacOS/Subsurface 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") OLD=$(otool -L ${EXECUTABLE} | grep $i | cut -d\ -f1 | tr -d "\t")
if [ ! -z ${OLD} ] ; then if [ ! -z ${OLD} ] ; then
# copy the library into the bundle and make sure its id and the reference to it are correct # 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} install_name_tool -change @rpath/$i @executable_path/../Frameworks/$i ${EXECUTABLE}
done done
# and now replace @rpath references in libssrfmarblewidget # no more Marble
MARBLELIB=$(ls Subsurface.app/Contents/Frameworks/libssrfmarblewidget*dylib) # # and now replace @rpath references in libssrfmarblewidget
RPATH=$(otool -L ${MARBLELIB} | grep rpath | cut -d\ -f1 | tr -d "\t" | cut -b 8- ) # MARBLELIB=$(ls Subsurface.app/Contents/Frameworks/libssrfmarblewidget*dylib)
for i in ${RPATH}; do # RPATH=$(otool -L ${MARBLELIB} | grep rpath | cut -d\ -f1 | tr -d "\t" | cut -b 8- )
install_name_tool -change @rpath/$i @executable_path/../Frameworks/$i ${MARBLELIB} # for i in ${RPATH}; do
done # install_name_tool -change @rpath/$i @executable_path/../Frameworks/$i ${MARBLELIB}
# done
# next deal with libGrantlee # next deal with libGrantlee
LIBG=$(ls Subsurface.app/Contents/Frameworks/libGrantlee_Templates*dylib) LIBG=$(ls Subsurface.app/Contents/Frameworks/libGrantlee_Templates*dylib)