mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-07 06:36:55 +02:00
Code Issues Releases Wiki Activity

Fix launching .app on osx when a Qt from homebrew is installed

Browse Source
This commit is contained in:
Leo Franchi
2011-03-07 22:05:39 -05:00
parent e5e68b5eac
commit 28f2b0d5b7
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin/mac/build-release-osx.sh
View File

@@ -47,7 +47,9 @@ CREATEDMG='1'
header deposx header deposx
$ROOT/../admin/mac/deposx.sh $ROOT/../admin/mac/deposx.sh
header "Copying Sparkle pubkey" header "Copying Sparkle pubkey and framework, and qt.conf"
cp $ROOT/../admin/mac/sparkle_pub.pem Contents/Resources cp $ROOT/../admin/mac/sparkle_pub.pem Contents/Resources
cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
cp $ROOT/../admin/mac/qt.conf Contents/Resources
header Done! header Done!

4
admin/mac/deposx.sh
View File

@@ -61,7 +61,7 @@ function deposx_change
function deplib_change function deplib_change
{ {
install_name_tool -change /usr/local/Cellar/liblastfm/0.3.1/lib/liblastfm.0.dylib @executable_path/liblastfm.0.dylib $1 install_name_tool -change /usr/local/Cellar/liblastfm/0.3.3/lib/liblastfm.0.dylib @executable_path/liblastfm.0.dylib $1
install_name_tool -change /usr/local/Cellar/qjson/0.7.1/lib/libqjson.0.dylib @executable_path/libqjson.0.dylib $1 install_name_tool -change /usr/local/Cellar/qjson/0.7.1/lib/libqjson.0.dylib @executable_path/libqjson.0.dylib $1
install_name_tool -change /usr/local/lib/libechonest.1.1.dylib @executable_path/libechonest.1.1.dylib $1 install_name_tool -change /usr/local/lib/libechonest.1.1.dylib @executable_path/libechonest.1.1.dylib $1
install_name_tool -change /usr/local/lib/libclucene-core.0.9.23.dylib @executable_path/libclucene-core.0.9.23.dylib $1 install_name_tool -change /usr/local/lib/libclucene-core.0.9.23.dylib @executable_path/libclucene-core.0.9.23.dylib $1
@@ -100,7 +100,7 @@ do
done done
import_lib /usr/local/Cellar/qjson/0.7.1/lib/libqjson.0.dylib import_lib /usr/local/Cellar/qjson/0.7.1/lib/libqjson.0.dylib
import_lib /usr/local/Cellar/liblastfm/0.3.1/lib/liblastfm.0.dylib import_lib /usr/local/Cellar/liblastfm/0.3.3/lib/liblastfm.0.dylib
import_lib /usr/local/Cellar/gloox/1.0/lib/libgloox.8.dylib import_lib /usr/local/Cellar/gloox/1.0/lib/libgloox.8.dylib
import_lib /usr/local/Cellar/taglib/1.6.3/lib/libtag.1.dylib import_lib /usr/local/Cellar/taglib/1.6.3/lib/libtag.1.dylib
import_lib /usr/local/Cellar/libogg/1.2.0/lib/libogg.0.dylib import_lib /usr/local/Cellar/libogg/1.2.0/lib/libogg.0.dylib

2
admin/mac/qt.conf Normal file
View File

@@ -0,0 +1,2 @@
[Paths]
Plugins = PlugIns

2
src/CMakeLists.txt
View File

@@ -222,7 +222,7 @@ IF( APPLE )
IF(HAVE_SPARKLE) IF(HAVE_SPARKLE)
MESSAGE("Sparkle Found, installing framekwork in bundle") MESSAGE("Sparkle Found, installing framekwork in bundle")
INSTALL(DIRECTORY "${SPARKLE}/Versions/Current/Resources" DESTINATION "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/Frameworks/Sparkle.framework") INSTALL(DIRECTORY "${SPARKLE}/Versions/Current/Resources" DESTINATION "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/Frameworks/Sparkle.framework")
INSTALL(FILES "${CMAKE_SOURCE_DIR}/admin/mac/sparkle_pub.pem" DESTINATION "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/Resources")
ENDIF(HAVE_SPARKLE) ENDIF(HAVE_SPARKLE)
ENDIF( APPLE ) ENDIF( APPLE )