mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-12 00:54:20 +02:00
Code Issues Releases Wiki Activity

Fix sparkle. Again. No, undefined macros are not fun when #ifed.

Browse Source
This commit is contained in:
Leo Franchi
2011-08-15 01:44:55 -04:00
parent b8394003e8
commit a8513d41ea
4 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
admin/mac/Info.plist
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
@@ -23,42 +23,42 @@
<key>CFBundleName</key> <key>CFBundleName</key>
<string>Tomahawk</string> <string>Tomahawk</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>10.5.0</string> <string>10.5.0</string>
<key>SUFeedURL</key> <key>SUFeedURL</key>
<string>http://download.tomahawk-player.org/sparkle/update.php</string> <string>http://download.tomahawk-player.org/sparkle/update.php</string>
<key>SUPublicDSAKeyFile</key> <key>SUPublicDSAKeyFile</key>
<string>sparkle_pub.pem</string> <string>sparkle_pub.pem</string>
<key>SUEnableSystemProfiling</key> <key>SUEnableSystemProfiling</key>
<string>YES</string> <true/>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
<array> <array>
<dict> <dict>
<key>CFBundleURLName</key> <key>CFBundleURLName</key>
<string>Tomahawk URL</string> <string>Tomahawk URL</string>
<key>CFBundleURLSchemes</key> <key>CFBundleURLSchemes</key>
<array> <array>
<string>tomahawk</string> <string>tomahawk</string>
</array> </array>
</dict> </dict>
</array> </array>
<key>CFBundleDocumentTypes</key> <key>CFBundleDocumentTypes</key>
<array> <array>
<dict> <dict>
<key>CFBundleTypeExtensions</key> <key>CFBundleTypeExtensions</key>
<array> <array>
<string>xspf</string> <string>xspf</string>
</array> </array>
<key>CFBundleTypeIconFile</key> <key>CFBundleTypeIconFile</key>
<string>Generic.icns</string> <string>Generic.icns</string>
<key>CFBundleTypeMIMETypes</key> <key>CFBundleTypeMIMETypes</key>
<array> <array>
<string>application/xspf+xml</string> <string>application/xspf+xml</string>
</array> </array>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>XSPF Playlist</string> <string>XSPF Playlist</string>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </dict>
</array> </array>
</dict> </dict>
</plist> </plist>

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

@@ -39,6 +39,8 @@ VERSION=$1
mv Contents/Resources/tomahawkSources.icns Contents/Resources/Tomahawk.icns mv Contents/Resources/tomahawkSources.icns Contents/Resources/Tomahawk.icns
cp $ROOT/../admin/mac/qt.conf Contents/Resources/qt.conf cp $ROOT/../admin/mac/qt.conf Contents/Resources/qt.conf
header "Copying Sparkle framework"
cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
header "Creating DMG" header "Creating DMG"
cd .. cd ..

1
src/mac/tomahawkapp_mac.mm
View File

@@ -20,6 +20,7 @@
#include "macdelegate.h" #include "macdelegate.h"
#include "macshortcuthandler.h" #include "macshortcuthandler.h"
#include "config.h"
#import <AppKit/NSApplication.h> #import <AppKit/NSApplication.h>
#import <Foundation/NSAutoreleasePool.h> #import <Foundation/NSAutoreleasePool.h>

2
thirdparty/libportfwd/src/portfwd.cpp vendored
View File

@@ -113,7 +113,7 @@ Portfwd::get_status()
// Q_ASSERT(urls->controlURL_CIF != NULL); // Q_ASSERT(urls->controlURL_CIF != NULL);
// get connection speed // get connection speed
UPNP_GetLinkLayerMaxBitRates( UPNP_GetLinkLayerMaxBitRates(
urls->controlURL_CIF, data->CIF.servicetype, &m_downbps, &m_upbps); urls->controlURL_CIF, data->first.servicetype, &m_downbps, &m_upbps);
// get external IP adress // get external IP adress
char ip[16]; char ip[16];