--- last.fm-1.3.0.62.orig/LastFM.pro +++ last.fm-1.3.0.62/LastFM.pro @@ -26,6 +26,5 @@ linux* { SUBDIRS -= src/LastFMHelper \ src/mediadevices/itunes - SUBDIRS += src/output/alsa-playback \ - src/output/portAudio + SUBDIRS += src/output/alsa-playback } --- last.fm-1.3.0.62.orig/src/container.cpp +++ last.fm-1.3.0.62/src/container.cpp @@ -523,9 +523,9 @@ this, SLOT( gotoProfile() ) ); connect( ui.actionSettings, SIGNAL( triggered() ), this, SLOT( showSettingsDialog() ) ); + #ifndef Q_WS_X11 connect( ui.actionGetPlugin, SIGNAL( triggered() ), this, SLOT( getPlugin() ) ); - #ifndef Q_WS_X11 connect( ui.actionCheckForUpdates, SIGNAL( triggered() ), this, SLOT( checkForUpdates() ) ); #endif --- last.fm-1.3.0.62.orig/src/controlinterface.cpp +++ last.fm-1.3.0.62/src/controlinterface.cpp @@ -79,6 +79,7 @@ m_parent->restoreWindow(); } +#ifndef Q_WS_X11 if ( request.contains( "container://checkScrobblerCache" ) ) { const QString user = request.split( "checkScrobblerCache/" ).at( 1 ); @@ -94,6 +95,7 @@ LOGL( 3, "Calling container for media device addition" ); m_parent->addMediaDevice( request.split( "addMediaDevice/" ).at( 1 ) ); } +#endif } } --- last.fm-1.3.0.62.orig/src/mediadevices/mediadevice.cpp +++ last.fm-1.3.0.62/src/mediadevices/mediadevice.cpp @@ -20,9 +20,11 @@ ***************************************************************************/ #include <QtGui> +#ifndef LINUX #include <QSqlQuery> #include <QSqlResult> #include <QSqlError> +#endif #include "mediadevice.h" #include "containerutils.h" @@ -58,7 +60,9 @@ MediaDevices::~MediaDevices() { +#ifndef LINUX m_db.close(); +#endif delete m_http; } --- last.fm-1.3.0.62.orig/src/mediadevices/mediadevice.h +++ last.fm-1.3.0.62/src/mediadevices/mediadevice.h @@ -23,7 +23,9 @@ #define MEDIADEVICE_H #include "interfaces/MediaDeviceInterface.h" +#ifndef LINUX #include <QSqlDatabase> +#endif #include <QFile> #include "http.h" @@ -51,7 +53,9 @@ void headerReceived( const QHttpResponseHeader &resp ); private: +#ifndef LINUX QSqlDatabase m_db; +#endif MediaDeviceInterface* m_gpod; QString m_savePath; --- last.fm-1.3.0.62.orig/src/settingsdialog.cpp +++ last.fm-1.3.0.62/src/settingsdialog.cpp @@ -70,6 +70,9 @@ QWidget* scrobWidget = new QWidget(); ui_scrobbling.setupUi( scrobWidget ); +#ifdef Q_WS_X11 + ui_scrobbling.groupBox->hide(); +#endif ui.pageStack->addWidget( scrobWidget ); QWidget* connWidget = new QWidget(); @@ -79,7 +82,9 @@ QWidget* mediadeviceWidget = new QWidget(); ui_mediadevices.setupUi( mediadeviceWidget ); ui_mediadevices.deviceWidget->header()->setResizeMode( QHeaderView::ResizeToContents ); +#ifndef Q_WS_X11 ui.pageStack->addWidget( mediadeviceWidget ); +#endif #ifndef WIN32 ui_connection.crashReportCheck->hide(); @@ -132,9 +137,13 @@ //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation ); ui.pageList->item( 3 )->setIcon( pixmap ); +#ifndef Q_WS_X11 pixmap.load( dataPath( "/icons/options_mediadevices.png" ) ); //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation ); ui.pageList->item( 4 )->setIcon( pixmap ); +#else + delete ui.pageList->takeItem( 4 ); +#endif #ifdef HIDE_RADIO // Need to disable this as the language choice is hardcoded at startup @@ -205,7 +214,9 @@ populateRadio(); populateScrobbling(); populateConnection(); +#ifndef Q_WS_X11 populateMediaDevices(); +#endif foreach (ExtensionInterface *i, extensions) i->populateSettings(); --- last.fm-1.3.0.62.orig/src/settingsdialog_scrobbling.ui +++ last.fm-1.3.0.62/src/settingsdialog_scrobbling.ui @@ -185,6 +185,19 @@ </layout> </widget> </item> + <item> + <spacer> + <property name="orientation" > + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" > + <size> + <width>20</width> + <height>0</height> + </size> + </property> + </spacer> + </item> </layout> </widget> <customwidgets> --- last.fm-1.3.0.62.orig/src/src.pro +++ last.fm-1.3.0.62/src/src.pro @@ -184,6 +184,8 @@ RestStateWidget.cpp unix:!mac { + QT -= sql + FORMS += wizarddialog_mac.ui \ wizardshell_mac.ui \ searchextension/search_win.ui