diff --git a/admin/mac/build-release-osx.sh b/admin/mac/build-release-osx.sh index 200a64026..a399398a1 100755 --- a/admin/mac/build-release-osx.sh +++ b/admin/mac/build-release-osx.sh @@ -47,7 +47,9 @@ CREATEDMG='1' header deposx $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 -R /Library/Frameworks/Sparkle.framework Contents/Frameworks + cp $ROOT/../admin/mac/qt.conf Contents/Resources header Done! diff --git a/admin/mac/deposx.sh b/admin/mac/deposx.sh index 3500895ce..31966f9ed 100755 --- a/admin/mac/deposx.sh +++ b/admin/mac/deposx.sh @@ -61,7 +61,7 @@ function deposx_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/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 @@ -100,7 +100,7 @@ do done 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/taglib/1.6.3/lib/libtag.1.dylib import_lib /usr/local/Cellar/libogg/1.2.0/lib/libogg.0.dylib diff --git a/admin/mac/qt.conf b/admin/mac/qt.conf new file mode 100644 index 000000000..64d729736 --- /dev/null +++ b/admin/mac/qt.conf @@ -0,0 +1,2 @@ +[Paths] +Plugins = PlugIns diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f194f5c9a..54b36cac8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -222,7 +222,7 @@ IF( APPLE ) IF(HAVE_SPARKLE) MESSAGE("Sparkle Found, installing framekwork in bundle") 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( APPLE )