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

Merge branch 'stable-0.8'

Browse Source 
Conflicts:
	src/crashreporter/main.cpp
This commit is contained in:
Dominik Schmidt
2014-10-21 21:41:00 +02:00
parent 73f4c774c3 bb4ad2684c
commit 712c288182
5 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -33,8 +33,8 @@ ENDIF()
SET( TOMAHAWK_VERSION_MAJOR 0 ) SET( TOMAHAWK_VERSION_MAJOR 0 )
SET( TOMAHAWK_VERSION_MINOR 8 ) SET( TOMAHAWK_VERSION_MINOR 8 )
SET( TOMAHAWK_VERSION_PATCH 99 ) SET( TOMAHAWK_VERSION_PATCH 0 )
#SET( TOMAHAWK_VERSION_RC 0 ) SET( TOMAHAWK_VERSION_RC 1 )
SET( TOMAHAWK_TRANSLATION_LANGUAGES ar bg bn_IN ca cs de en el es fi fr hi_IN hu gl it ja lt pl pt_BR ro ru sv tr zh_CN zh_TW ) SET( TOMAHAWK_TRANSLATION_LANGUAGES ar bg bn_IN ca cs de en el es fi fr hi_IN hu gl it ja lt pl pt_BR ro ru sv tr zh_CN zh_TW )

12
CMakeModules/AddAppIconMacro.cmake
View File

@@ -12,8 +12,8 @@ SET(WINDRES_EXECUTABLE ${CMAKE_RC_COMPILER})
# adds application icon to target source list # adds application icon to target source list
# for detailed documentation see the top of FindKDE4Internal.cmake # for detailed documentation see the top of FindKDE4Internal.cmake
macro (KDE4_ADD_APP_ICON appsources pattern) macro (TOMAHAWK_ADD_APP_ICON appsources outfilename pattern)
set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${appsources}) set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${outfilename})
if (WIN32) if (WIN32)
if(NOT WINCE) if(NOT WINCE)
@@ -86,9 +86,9 @@ macro (KDE4_ADD_APP_ICON appsources pattern)
if (_icon) if (_icon)
# first, get the basename of our app icon # first, get the basename of our app icon
add_custom_command(OUTPUT ${_outfilename}.icns ${outfilename}.tiff add_custom_command(OUTPUT ${_outfilename}.icns ${_outfilename}.tiff
COMMAND ${SIPS_EXECUTABLE} -s format tiff ${_icon} --out ${outfilename}.tiff COMMAND ${SIPS_EXECUTABLE} -s format tiff ${_icon} --out ${_outfilename}.tiff
COMMAND ${TIFF2ICNS_EXECUTABLE} ${outfilename}.tiff ${_outfilename}.icns COMMAND ${TIFF2ICNS_EXECUTABLE} ${_outfilename}.tiff ${_outfilename}.icns
DEPENDS ${_icon} DEPENDS ${_icon}
) )
@@ -111,4 +111,4 @@ macro (KDE4_ADD_APP_ICON appsources pattern)
message(STATUS "Unable to find the sips and tiff2icns utilities - application will not have an application icon!") message(STATUS "Unable to find the sips and tiff2icns utilities - application will not have an application icon!")
endif(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE) endif(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
endif(Q_WS_MAC) endif(Q_WS_MAC)
endmacro (KDE4_ADD_APP_ICON) endmacro (TOMAHAWK_ADD_APP_ICON)

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

@@ -35,8 +35,6 @@ VERSION=$1
cd Tomahawk.app cd Tomahawk.app
header "Renaming icon"
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" header "Copying Sparkle framework"

1
src/crashreporter/main.cpp
View File

@@ -33,7 +33,6 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
// code taken from http://stackoverflow.com/questions/20734831/compress-string-with-gzip-using-qcompress // code taken from http://stackoverflow.com/questions/20734831/compress-string-with-gzip-using-qcompress
static const quint32 crc_32_tab[] = { /* CRC polynomial 0xedb88320 */ static const quint32 crc_32_tab[] = { /* CRC polynomial 0xedb88320 */
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,

2
src/tomahawk/CMakeLists.txt
View File

@@ -146,7 +146,7 @@ IF( BUILD_GUI )
qt_wrap_ui( tomahawkUI_H ${tomahawkUI} ) qt_wrap_ui( tomahawkUI_H ${tomahawkUI} )
ENDIF() ENDIF()
kde4_add_app_icon( tomahawkSources "${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon-*.png" ) tomahawk_add_app_icon( tomahawkSources Tomahawk "${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon-*.png" )
qt_add_resources( RC_SRCS "../../resources.qrc" ) qt_add_resources( RC_SRCS "../../resources.qrc" )
SET( final_src ${final_src} ${tomahawkUI_H} ${tomahawkMoc} ${tomahawkSources} ${RC_SRCS} ) SET( final_src ${final_src} ${tomahawkUI_H} ${tomahawkMoc} ${tomahawkSources} ${RC_SRCS} )