[tepsonic] Initial import (#667226)
progdan
progdan at fedoraproject.org
Tue Jan 18 14:22:23 UTC 2011
commit 8e5a4dcaad3ee35799b55e2aa32767451381365f
Author: Dan Vrátil <vratil at progdansoft.com>
Date: Tue Jan 18 15:23:47 2011 +0100
Initial import (#667226)
.gitignore | 1 +
qxt.patch | 259 ++++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
tepsonic.spec | 86 +++++++++++++++++
translations.patch | 160 ++++++++++++++++++++++++++++++++
5 files changed, 507 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..6485321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/tepsonic-0.98.1-src.tar.gz
diff --git a/qxt.patch b/qxt.patch
new file mode 100644
index 0000000..6db2392
--- /dev/null
+++ b/qxt.patch
@@ -0,0 +1,259 @@
+diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
+index d47e8e5..db983f3 100644
+--- a/3rdparty/CMakeLists.txt
++++ b/3rdparty/CMakeLists.txt
+@@ -1 +1,3 @@
+-add_subdirectory(qxt)
++if (NOT UNIX OR APPLE)
++ add_subdirectory(qxt)
++endif (NOT UNIX OR APPLE)
+diff --git a/cmake/modules/FindQxt.cmake b/cmake/modules/FindQxt.cmake
+new file mode 100644
+index 0000000..ca3ebb6
+--- /dev/null
++++ b/cmake/modules/FindQxt.cmake
+@@ -0,0 +1,154 @@
++#############
++## basic FindQxt.cmake
++## This is an *EXTREMELY BASIC* cmake find/config file for
++## those times you have a cmake project and wish to use
++## libQxt.
++##
++## It should be noted that at the time of writing, that
++## I (mschnee) have an extremely limited understanding of the
++## way Find*.cmake files work, but I have attempted to
++## emulate what FindQt4.cmake and a few others do.
++##
++## To enable a specific component, set your QXT_USE_${modname}:
++## SET(QXT_USE_QXTCORE TRUE)
++## SET(QXT_USE_QXTGUI FALSE)
++## Currently available components:
++## QxtCore, QxtGui, QxtNetwork, QxtWeb, QxtSql
++## Auto-including directories are enabled with INCLUDE_DIRECTORIES(), but
++## can be accessed if necessary via ${QXT_INCLUDE_DIRS}
++##
++## To add the libraries to your build, TARGET_LINK_LIBRARIES(), such as...
++## TARGET_LINK_LIBRARIES(YourTargetNameHere ${QXT_LIBRARIES})
++## ...or..
++## TARGET_LINK_LIBRARIES(YourTargetNameHere ${QT_LIBRARIES} ${QXT_LIBRARIES})
++################### TODO:
++## The purpose of this cmake file is to find what components
++## exist, regardless of how libQxt was build or configured, thus
++## it should search/find all possible options. As I am not aware
++## that any module requires anything special to be used, adding all
++## modules to ${QXT_MODULES} below should be sufficient.
++## Eventually, there should be version numbers, but
++## I am still too unfamiliar with cmake to determine how to do
++## version checks and comparisons.
++## At the moment, this cmake returns a failure if you
++## try to use a component that doesn't exist. I don't know how to
++## set up warnings.
++## It would be nice having a FindQxt.cmake and a UseQxt.cmake
++## file like done for Qt - one to check for everything in advance
++
++##############
++
++###### setup
++SET(QXT_MODULES QxtGui QxtWeb QxtZeroConf QxtNetwork QxtSql QxtBerkeley QxtCore)
++SET(QXT_FOUND_MODULES)
++FOREACH(mod ${QXT_MODULES})
++ STRING(TOUPPER ${mod} U_MOD)
++ SET(QXT_${U_MOD}_INCLUDE_DIR NOTFOUND)
++ SET(QXT_${U_MOD}_LIB_DEBUG NOTFOUND)
++ SET(QXT_${U_MOD}_LIB_RELEASE NOTFOUND)
++ SET(QXT_FOUND_${U_MOD} FALSE)
++ENDFOREACH(mod)
++SET(QXT_QXTGUI_DEPENDSON QxtCore)
++SET(QXT_QXTWEB_DEPENDSON QxtCore QxtNetwork)
++SET(QXT_QXTZEROCONF_DEPENDSON QxtCore QxtNetwork)
++SET(QXT_QXTNETWORK_DEPENDSON QxtCore)
++SET(QXT_QXTQSQL_DEPENDSON QxtCore)
++SET(QXT_QXTBERKELEY_DEPENDSON QxtCore)
++
++FOREACH(mod ${QXT_MODULES})
++ STRING(TOUPPER ${mod} U_MOD)
++ FIND_PATH(QXT_${U_MOD}_INCLUDE_DIR ${mod}
++ PATH_SUFFIXES ${mod} include/${mod} Qxt/include/${mod} include/Qxt/${mod}
++ PATHS
++ ~/Library/Frameworks/
++ /Library/Frameworks/
++ /sw/
++ /usr/local/
++ /usr
++ /opt/local/
++ /opt/csw
++ /opt
++ "C:\\"
++ "C:\\Program Files\\"
++ "C:\\Program Files(x86)\\"
++ NO_DEFAULT_PATH
++ )
++ FIND_LIBRARY(QXT_${U_MOD}_LIB_RELEASE NAME ${mod}
++ PATH_SUFFIXES Qxt/lib64 Qxt/lib lib64 lib
++ PATHS
++ /sw
++ /usr/local
++ /usr
++ /opt/local
++ /opt/csw
++ /opt
++ "C:\\"
++ "C:\\Program Files"
++ "C:\\Program Files(x86)"
++ NO_DEFAULT_PATH
++ )
++ FIND_LIBRARY(QXT_${U_MOD}_LIB_DEBUG NAME ${mod}d
++ PATH_SUFFIXES Qxt/lib64 Qxt/lib lib64 lib
++ PATHS
++ /sw
++ /usr/local
++ /usr
++ /opt/local
++ /opt/csw
++ /opt
++ "C:\\"
++ "C:\\Program Files"
++ "C:\\Program Files(x86)"
++ NO_DEFAULT_PATH
++ )
++ IF (QXT_${U_MOD}_LIB_RELEASE)
++ SET(QXT_FOUND_MODULES "${QXT_FOUND_MODULES} ${mod}")
++ ENDIF (QXT_${U_MOD}_LIB_RELEASE)
++
++ IF (QXT_${U_MOD}_LIB_DEBUG)
++ SET(QXT_FOUND_MODULES "${QXT_FOUND_MODULES} ${mod}")
++ ENDIF (QXT_${U_MOD}_LIB_DEBUG)
++ENDFOREACH(mod)
++
++FOREACH(mod ${QXT_MODULES})
++ STRING(TOUPPER ${mod} U_MOD)
++ IF(QXT_${U_MOD}_INCLUDE_DIR AND QXT_${U_MOD}_LIB_RELEASE)
++ SET(QXT_FOUND_${U_MOD} TRUE)
++ ENDIF(QXT_${U_MOD}_INCLUDE_DIR AND QXT_${U_MOD}_LIB_RELEASE)
++ENDFOREACH(mod)
++
++
++##### find and include
++# To use a Qxt Library....
++# SET(QXT_FIND_COMPONENTS QxtCore, QxtGui)
++# ...and this will do the rest
++IF( QXT_FIND_COMPONENTS )
++ FOREACH( component ${QXT_FIND_COMPONENTS} )
++ STRING( TOUPPER ${component} _COMPONENT )
++ SET(QXT_USE_${_COMPONENT}_COMPONENT TRUE)
++ ENDFOREACH( component )
++ENDIF( QXT_FIND_COMPONENTS )
++
++SET(QXT_LIBRARIES "")
++SET(QXT_INCLUDE_DIRS "")
++
++# like FindQt4.cmake, in order of dependence
++FOREACH( module ${QXT_MODULES} )
++ STRING(TOUPPER ${module} U_MOD)
++ IF(QXT_USE_${U_MOD} OR QXT_DEPENDS_${U_MOD})
++ IF(QXT_FOUND_${U_MOD})
++ STRING(REPLACE "QXT" "" qxt_module_def "${U_MOD}")
++ ADD_DEFINITIONS(-DQXT_${qxt_module_def}_LIB)
++ SET(QXT_INCLUDE_DIRS ${QXT_INCLUDE_DIRS} ${QXT_${U_MOD}_INCLUDE_DIR})
++ INCLUDE_DIRECTORIES(${QXT_${U_MOD}_INCLUDE_DIR})
++ SET(QXT_LIBRARIES ${QXT_LIBRARIES} ${QXT_${U_MOD}_LIB_RELEASE})
++ ELSE(QXT_FOUND_${U_MOD})
++ MESSAGE("Could not find Qxt Module ${module}")
++ RETURN()
++ ENDIF(QXT_FOUND_${U_MOD})
++ FOREACH(dep QXT_${U_MOD}_DEPENDSON)
++ SET(QXT_DEPENDS_${dep} TRUE)
++ ENDFOREACH(dep)
++ ENDIF(QXT_USE_${U_MOD} OR QXT_DEPENDS_${U_MOD})
++ENDFOREACH(module)
++MESSAGE(STATUS "Found Qxt Libraries:${QXT_FOUND_MODULES}")
+diff --git a/player/CMakeLists.txt b/player/CMakeLists.txt
+index 3b4b6d5..ff2042e 100644
+--- a/player/CMakeLists.txt
++++ b/player/CMakeLists.txt
+@@ -15,17 +15,36 @@ find_package(Qt4 4.5 REQUIRED)
+ find_package(Taglib REQUIRED)
+ find_package(Phonon REQUIRED)
+
+-add_definitions(${TAGLIB_CFLAGS})
++# Use native libqxt on Linux and patched sources in /3rdparty/qxt on Mac an Win.
++if (UNIX AND NOT APPLE)
++ set(QXT_USE_QXTCORE TRUE)
++ set(QXT_USE_QXTGUI TRUE)
++ find_package(Qxt REQUIRED)
++ set(QXT_HEADERS "")
++ set(QXT_SOURCES "")
++else (UNIX AND NOT APPLE)
++ add_definitions(-DQXT_STATIC -DBUILD_QXT_GUI -DBUILD_QXT_CORE)
++ set(QXT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/qxt)
++ set(QXT_LIBRARIES qxt)
++ set(QXT_HEADERS "../3rdparty/qxt/qxtglobalshortcuts.h")
++ set(QXT_SOURCES "../3rdparty/qxt/qxtglobalshortcuts.cpp")
++endif (UNIX AND NOT APPLE)
++
++
++
++if (NOT DEFINED CMAKE_BUILD_TYPE)
++ set(CMAKE_BUILD_TYPE "Debug")
++endif (NOT DEFINED CMAKE_BUILD_TYPE)
+
+-add_definitions(-DQXT_STATIC -DBUILD_QXT_GUI -DBUILD_QXT_CORE)
+-set(QXT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/qxt)
+-set(QXT_LIBRARY qxt)
++add_definitions(${TAGLIB_CFLAGS})
+
+ # Make sure all Qt parts will be available
+ set(QT_USE_QTMAIN 1)
+ set(QT_USE_QTSQL 1)
+
+ include(${QT_USE_FILE})
++# this is mandatory for Apple builds to load plugin correctly
++add_definitions(-DQT_NO_DEBUG)
+
+ include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+@@ -33,7 +52,7 @@ include_directories(
+ ${PHONON_INCLUDES}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TAGLIB_INCLUDES}
+- ${QXT_INCLUDE_DIR}
++ ${QXT_INCLUDE_DIRS}
+ "collections"
+ "playlist"
+ "settings"
+@@ -72,7 +91,7 @@ set(player_HDRS
+ bookmarks/bookmarksbrowser.h
+ bookmarks/bookmarksmanager.h
+ bookmarks/addbookmarkdlg.h
+- ../3rdparty/qxt/qxtglobalshortcut.h
++ ${QXT_HEADERS}
+ )
+
+ set(player_SRCS
+@@ -112,7 +131,7 @@ set(player_SRCS
+ bookmarks/bookmarksitem.cpp
+ bookmarks/bookmarksmanager.cpp
+ bookmarks/addbookmarkdlg.cpp
+- ../3rdparty/qxt/qxtglobalshortcut.cpp
++ ${QXT_SOURCES}
+ )
+
+ set(player_QUIS
+@@ -200,7 +219,7 @@ add_executable(tepsonic
+ ${player_QMOC_SRCS}
+ ${player_SRCS}
+ ${TRANSLATIONS_BINARY}
+- ${APPLE_BUNDLE_SOURCES}
++ ${APPLE_BUNDLE_SOURCES}
+ )
+
+ target_link_libraries(tepsonic
+@@ -208,7 +227,7 @@ target_link_libraries(tepsonic
+ ${QT_QTSQL_LIBRARIES}
+ ${PHONON_LIBS}
+ ${TAGLIB_LIBRARIES}
+- ${QXT_LIBRARY}
++ ${QXT_LIBRARIES}
+ ${X11_LIBRARIES}
+ )
+
diff --git a/sources b/sources
index e69de29..b1d06ac 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+aba7189133005260fcf85046a5f6e80c tepsonic-0.98.1-src.tar.gz
diff --git a/tepsonic.spec b/tepsonic.spec
new file mode 100644
index 0000000..fc9f8e4
--- /dev/null
+++ b/tepsonic.spec
@@ -0,0 +1,86 @@
+Name: tepsonic
+Version: 0.98.1
+Release: 5%{?dist}
+Summary: A simple, fast and lightweight Qt audio player
+
+Group: Applications/Multimedia
+License: GPLv3+
+URL: http://www.tepsonic.org
+Source0: http://www.tepsonic.org/files/%{name}-%{version}-src.tar.gz
+# Use libqxt package instead of the qxt provided in sources
+Patch0: qxt.patch
+# Install languages to tepsonic_{lang}.qm and lastfmlib_{lang}.qm instead of tepsonic/{lang}.qm
+Patch1: translations.patch
+# !! Patches must be applied in this order!
+
+BuildRequires: cmake
+BuildRequires: pkgconfig
+BuildRequires: qt-devel
+BuildRequires: taglib-devel
+BuildRequires: desktop-file-utils
+BuildRequires: lastfmlib-devel
+BuildRequires: libqxt-devel
+BuildRequires: phonon-devel
+Requires: qt-sqlite
+Requires: qt-mysql
+
+%description
+A simple, small and fast Qt audio player with collections and all
+the other basic functions that every good audio player should have.
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .qxt
+%patch1 -p1 -b .translations
+# Fix binary installation permissions
+sed -i '/PERMISSIONS/d' player/CMakeLists.txt
+
+# Remove 3rdparty libraries
+rm -rf 3rdparty/*
+
+
+%build
+%cmake -DCMAKE_INSTALL_LIBRARY_DIR=%{_libdir}/%{name}
+make %{?_smp_mflags}
+
+
+%install
+make install DESTDIR=%{buildroot}
+desktop-file-install --dir=%{buildroot}/%{_datadir}/applications --add-category="AudioVideo" --remove-category="Application" %{name}.desktop
+
+# Remove all devel libraries, leave only libname.so.version
+rm -f %{buildroot}/%{_libdir}/%{name}/*.so
+
+%find_lang %{name} --with-qt --without-mo
+%find_lang lastfmscrobbler --with-qt --without-mo
+
+
+%files -f %{name}.lang -f lastfmscrobbler.lang
+%defattr(-,root,root,-)
+%doc LICENSE README
+%{_bindir}/*
+%{_libdir}/%{name}/*.so.*
+%{_datadir}/applications/*
+%{_datadir}/icons/*
+
+%changelog
+* Sun Jan 16 2011 Dan Vratil <vratil at progdansoft.com> 0.98.1-5
+- fixed phonon dependency
+
+* Sat Jan 15 2011 Dan Vratil <vratil at progdansoft.com> 0.98.1-4
+- remove gettext and phonon depenencies
+- fix install permissions and .desktop file
+- cosmetic improvements
+
+* Fri Jan 14 2011 Dan Vratil <vratil at progdansoft.com> 0.98.1-3
+- fixed paths in .spec
+- fixed license GPLv3 -> GPLv3+
+- patch CMakeLists.txt to use libqxt package instead of the qxt provided with sources
+
+* Sat Jan 08 2011 Dan Vratil <vratil at progdansoft.com> 0.98.1-2
+- added qt-mysql do Requires
+- fixed .spec file
+
+* Sat Jan 01 2011 Dan Vratil <vratil at progdansoft.com> 0.98.1-1
+- Initial release; based on .spec file from Petr Vaněk
diff --git a/translations.patch b/translations.patch
new file mode 100644
index 0000000..f562250
--- /dev/null
+++ b/translations.patch
@@ -0,0 +1,160 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 772b53d..d168191 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -72,7 +72,7 @@ if (PROFILING)
+ SET(CMAKE_CXX_FLAGS_COVERAGE "-ftest-coverage -fprofile-arcs -O0")
+ SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -pg")
+ SET(LINK_FLAGS "${LINK_FLAGS} -pg")
+- MESSAGE("Profiling enabled")
++ MESSAGE(STATUS "Profiling enabled")
+ endif (PROFILING)
+
+ # First player, then plugins, this is strict order!
+diff --git a/player/CMakeLists.txt b/player/CMakeLists.txt
+index ff2042e..bfa76c9 100644
+--- a/player/CMakeLists.txt
++++ b/player/CMakeLists.txt
+@@ -162,32 +162,25 @@ else (NOT DEFINED LANGS)
+ endif (NOT LANGS)
+ endif (NOT DEFINED LANGS)
+
+-message("Translations to build: ${LANGUAGES}")
++message(STATUS "Translations to build: ${LANGUAGES}")
+
+ qt4_wrap_ui(player_QUIS_HDRS ${player_QUIS})
+ qt4_wrap_cpp(player_QMOC_SRCS ${player_HDRS})
+ qt4_add_resources(player_RCCS_SRCS ${player_RCCS})
+ #Create translations
++set(TRANSLATIONS)
+ foreach (LANGUAGE ${LANGUAGES})
+ set (TS ${CMAKE_CURRENT_SOURCE_DIR}/ts/${LANGUAGE}.ts)
+- set (QM ${CMAKE_CURRENT_SOURCE_DIR}/ts/${LANGUAGE}.qm)
+- set (TRANSLATIONS ${TRANSLATIONS} ${TS})
+- set (TRANSLATIONS_BINARY ${TRANSLATIONS_BINARY} ${QM})
+- add_custom_command (
+- OUTPUT ${QM}
+- COMMAND ${QT_LRELEASE_EXECUTABLE} ${TS}
+- MAIN_DEPENDENCY ${TS})
++ set (QM ${CMAKE_CURRENT_SOURCE_DIR}/ts/tepsonic_${LANGUAGE}.qm)
++ set (TRANSLATIONS_BINARY ${TRANSLATIONS_BINARY} ${QM})
++ add_custom_command(OUTPUT ${QM}
++ PRE_BUILD
++ COMMAND ${QT_LRELEASE_EXECUTABLE}
++ ARGS ${TS} -qm ${QM})
++ add_custom_target(transl_${LANGUAGE} DEPENDS ${QM})
++ set (TRANSLATIONS ${TRANSLATIONS} transl_${LANGUAGE})
+ endforeach()
+
+-add_custom_target (
+- translations_qt
+- COMMAND ${QT_LUPDATE_EXECUTABLE} ${HEADERS} ${SOURCES} -ts ${TRANSLATIONS})
+-add_custom_command (
+- TARGET translations_qt
+- COMMAND ${QT_LRELEASE_EXECUTABLE} ${TRANSLATIONS})
+-
+-
+-
+ if (WIN32)
+ set(GUI_TYPE WIN32)
+ endif (WIN32)
+@@ -222,6 +215,8 @@ add_executable(tepsonic
+ ${APPLE_BUNDLE_SOURCES}
+ )
+
++add_dependencies(tepsonic ${TRANSLATIONS})
++
+ target_link_libraries(tepsonic
+ ${QT_LIBRARIES}
+ ${QT_QTSQL_LIBRARIES}
+@@ -258,7 +253,7 @@ endif (APPLEBUNDLE)
+
+ if (UNIX AND NOT APPLEBUNDLE)
+ install(FILES ${TRANSLATIONS_BINARY}
+- DESTINATION ${INSTALL_DATA_DIR}/tepsonic/locale/tepsonic
++ DESTINATION ${INSTALL_DATA_DIR}/tepsonic/locale/
+ )
+
+ install(FILES ../tepsonic.desktop
+diff --git a/player/main.cpp b/player/main.cpp
+index b414556..de6a796 100644
+--- a/player/main.cpp
++++ b/player/main.cpp
+@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
+ // mac's bundle. Special stuff again.
+ QString localeDir = QCoreApplication::applicationDirPath() + "/../Resources/";
+ #endif
+- translator.load(locale,localeDir);
++ translator.load("tepsonic_"+locale,localeDir);
+ tepsonic.installTranslator(&translator);
+
+ QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
+diff --git a/plugins/LastFmScrobbler/CMakeLists.txt b/plugins/LastFmScrobbler/CMakeLists.txt
+index ddf9c40..51653b3 100644
+--- a/plugins/LastFmScrobbler/CMakeLists.txt
++++ b/plugins/LastFmScrobbler/CMakeLists.txt
+@@ -71,15 +71,17 @@ endif (NOT DEFINED LANGS)
+ qt4_wrap_ui(lastfmscrobbler_QUIS_HDRS ${lastfmscrobbler_QUIS})
+ qt4_wrap_cpp(lastfmscrobbler_QMOC_SRCS ${lastfmscrobbler_HDRS})
+ #Create translations
++set(TRANSLATIONS)
+ foreach (LANGUAGE ${LANGUAGES})
+ set (TS ${CMAKE_CURRENT_SOURCE_DIR}/ts/${LANGUAGE}.ts)
+- set (QM ${CMAKE_CURRENT_SOURCE_DIR}/ts/${LANGUAGE}.qm)
+- set (TRANSLATIONS ${TRANSLATIONS} ${TS})
+- set (TRANSLATIONS_BINARY ${TRANSLATIONS_BINARY} ${QM})
+- add_custom_command (
+- OUTPUT ${QM}
+- COMMAND ${QT_LRELEASE_EXECUTABLE} ${TS}
+- MAIN_DEPENDENCY ${TS})
++ set (QM ${CMAKE_CURRENT_SOURCE_DIR}/ts/lastfmscrobbler_${LANGUAGE}.qm)
++ set (TRANSLATIONS_BINARY ${TRANSLATIONS_BINARY} ${QM})
++ add_custom_command (OUTPUT ${QM}
++ PRE_BUILD
++ COMMAND ${QT_LRELEASE_EXECUTABLE}
++ ARGS ${TS} -qm ${QM})
++ add_custom_target(lf_transl_${LANGUAGE} DEPENDS ${QM})
++ set (TRANSLATIONS ${TRANSLATIONS} lf_transl_${LANGUAGE})
+ endforeach()
+
+
+@@ -90,6 +92,8 @@ add_library(tepsonic_lastfmscrobbler SHARED
+ ${TRANSLATIONS_BINARY}
+ )
+
++add_dependencies(tepsonic_lastfmscrobbler ${TRANSLATIONS})
++
+ target_link_libraries(tepsonic_lastfmscrobbler
+ ${QT_LIBRARIES}
+ ${QT_QTNETWORK_LIBRARIES}
+@@ -107,7 +111,7 @@ if (NOT APPLEBUNDLE)
+ DESTINATION ${INSTALL_LIBRARY_DIR}/
+ )
+ install(FILES ${TRANSLATIONS_BINARY}
+- DESTINATION ${INSTALL_DATA_DIR}/tepsonic/locale/lastfmscrobbler
++ DESTINATION ${INSTALL_DATA_DIR}/tepsonic/locale/
+ )
+ else (NOT APPLEBUNDLE)
+ # no symlinks for apple bundle
+@@ -116,7 +120,7 @@ else (NOT APPLEBUNDLE)
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/tepsonic.app/Contents/plugins
+ )
+ install(FILES ${TRANSLATIONS_BINARY}
+- DESTINATION ${CMAKE_INSTALL_PREFIX}/tepsonic.app/Contents/Resources/lastfmscrobbler
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/tepsonic.app/Contents/Resources/
+ )
+ endif (NOT APPLEBUNDLE)
+
+diff --git a/plugins/LastFmScrobbler/src/lastfmscrobblerplugin.cpp b/plugins/LastFmScrobbler/src/lastfmscrobblerplugin.cpp
+index 5ca1e62..8efb89a 100644
+--- a/plugins/LastFmScrobbler/src/lastfmscrobblerplugin.cpp
++++ b/plugins/LastFmScrobbler/src/lastfmscrobblerplugin.cpp
+@@ -66,7 +66,7 @@ LastFmScrobblerPlugin::LastFmScrobblerPlugin()
+ QString localeDir = QCoreApplication::applicationDirPath() + "/../Resources/lastfmscrobbler";
+ #endif
+
+- _translator->load(locale,localeDir);
++ _translator->load("lastfmscrobbler_"+locale,localeDir);
+ qApp->installTranslator(_translator);
+
+ _scrobbler = NULL;
More information about the scm-commits
mailing list