mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-16 11:04:01 +02:00
Code Issues Releases Wiki Activity

Add a cmake flag to disable binary attica resolvers for distros

Browse Source
This commit is contained in:
Leo Franchi
2012-05-25 12:35:28 -04:00
parent 26036a2021
commit fb5d21e401
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -25,6 +25,7 @@ option(BUILD_GUI "Build Tomahawk with GUI" ON)
option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF) option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF)
option(WITH_BREAKPAD "Build with breakpad integration" ON) option(WITH_BREAKPAD "Build with breakpad integration" ON)
option(WITH_CRASHREPORTER "Build with CrashReporter" ON) option(WITH_CRASHREPORTER "Build with CrashReporter" ON)
option(WITH_BINARY_ATTICA "Enable support for downloading binary resolvers automatically" ON)
option(LEGACY_KDE_INTEGRATION "Install tomahawk.protocol file, deprecated since 4.6.0" OFF) option(LEGACY_KDE_INTEGRATION "Install tomahawk.protocol file, deprecated since 4.6.0" OFF)
IF( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" ) IF( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" )

2
src/Config.h.in
View File

@@ -19,6 +19,8 @@
#cmakedefine WITH_BREAKPAD #cmakedefine WITH_BREAKPAD
#cmakedefine WITH_CRASHREPORTER #cmakedefine WITH_CRASHREPORTER
#cmakedefine WITH_BINARY_ATTICA
#cmakedefine LIBLASTFM_FOUND #cmakedefine LIBLASTFM_FOUND
#cmakedefine QCA2_FOUND #cmakedefine QCA2_FOUND

8
src/libtomahawk/AtticaManager.cpp
View File

@@ -22,6 +22,7 @@
#include "TomahawkSettingsGui.h" #include "TomahawkSettingsGui.h"
#include "Pipeline.h" #include "Pipeline.h"
#include "Source.h" #include "Source.h"
#include "config.h"
#include <attica/downloaditem.h> #include <attica/downloaditem.h>
@@ -373,7 +374,12 @@ AtticaManager::binaryResolversList( BaseJob* j )
platform = "linux-x64"; platform = "linux-x64";
#elif defined(Q_OS_LINUX) // Horrible assumption here... #elif defined(Q_OS_LINUX) // Horrible assumption here...
platform = "linux-x86"; platform = "linux-x86";
#endif #endif
// Override if no binary resolvers were requested
#ifndef WITH_BINARY_ATTICA
platform = QString();
#endif
foreach ( const Content& c, binaryResolvers ) foreach ( const Content& c, binaryResolvers )
{ {

2
src/libtomahawk/accounts/AccountModel.cpp
View File

@@ -522,7 +522,7 @@ AccountModel::setData( const QModelIndex& index, const QVariant& value, int role
box.setWindowTitle( tr( "Manual Install Required" ) ); box.setWindowTitle( tr( "Manual Install Required" ) );
box.setTextFormat( Qt::RichText ); box.setTextFormat( Qt::RichText );
box.setIcon( QMessageBox::Information ); box.setIcon( QMessageBox::Information );
box.setText( tr( "Unfortunately, automatic installation of this resolver is not yet available on Linux.<br /><br />" box.setText( tr( "Unfortunately, automatic installation of this resolver is not available or disabled for your platform.<br /><br />"
"Please use \"Install from file\" above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:<br /><br />http://www.tomahawk-player.org/resolvers/%1" ).arg( acct->accountServiceName() ) ); "Please use \"Install from file\" above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:<br /><br />http://www.tomahawk-player.org/resolvers/%1" ).arg( acct->accountServiceName() ) );
box.setStandardButtons( QMessageBox::Ok ); box.setStandardButtons( QMessageBox::Ok );
box.exec(); box.exec();