Add a cmake flag to disable binary attica resolvers for distros

CMakeLists.txt

@@ -25,6 +25,7 @@ option(BUILD_GUI "Build Tomahawk with GUI" ON)
 option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF)
 option(WITH_BREAKPAD "Build with breakpad integration" 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)
 
 IF( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" )

src/Config.h.in

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

src/libtomahawk/AtticaManager.cpp

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

src/libtomahawk/accounts/AccountModel.cpp

@@ -522,7 +522,7 @@ AccountModel::setData( const QModelIndex& index, const QVariant& value, int role
             box.setWindowTitle( tr( "Manual Install Required" ) );
             box.setTextFormat( Qt::RichText );
             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() ) );
             box.setStandardButtons( QMessageBox::Ok );
             box.exec();