Tue Apr 5 14:26:38 UTC 2011

7 files changed, 176 insertions, 0 deletions

diff --git a/community/lastfm-client/PKGBUILD b/community/lastfm-client/PKGBUILD
new file mode 100644
index 000000000..85f5530ac
--- /dev/null
+++ b/community/lastfm-client/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 34579 2010-12-09 22:20:48Z mherych $
+# Maintainer: Mateusz Herych <heniekk@gmail.com>
+
+pkgname=lastfm-client
+pkgver=1.5.4.26862
+pkgrel=4
+pkgdesc="The Last.fm client"
+arch=('i686' 'x86_64')
+url="http://www.last.fm/tools/downloads/"
+license=('GPL')
+depends=('libpng' 'libjpeg' 'libxinerama' 'libxi' 'fontconfig' 'alsa-lib' 'libxcursor' 'libsm' 'libxrandr' 'qt' 'fftw' 'libsamplerate' 'libmad')
+optdepends=('libgpod: iPod support')
+source=(http://ftp.de.debian.org/debian/pool/main/l/lastfm/lastfm_$pkgver+dfsg.orig.tar.gz
+        lastfm.desktop
+        build-fixes.diff
+        set-firstrun-status.diff
+        set-locale.diff
+        makefile-qt45.patch
+        qt46.diff)
+md5sums=('c7991fd2636ca25e68ff476578b506a6'
+         '9c5e444704d49cff7b1dc916f290bad0'
+         'ae0e4a94af0d9e38172f064642a32e20'
+         '494d7c336b09c7d579dad3cc7d7bc627'
+         '1aeec4db77dc7cbc8e4660f127485599'
+         'bea1168abcacef30832bb1e88a25b5f3'
+         '8f9af912aa7eb84ef8d941bccdf6ee66')
+
+build() {
+   cd "$srcdir/lastfm-$pkgver+dfsg"
+   patch -Np1 -i ../build-fixes.diff
+   patch -Np1 -i ../set-locale.diff
+   patch -Np1 -i ../set-firstrun-status.diff 
+   patch -Np1 -i ../qt46.diff
+   ./configure
+   MAKEFLAGS=-j1 make src/Makefile
+   patch -Np1 -i ../makefile-qt45.patch
+   MAKEFLAGS=-j1 make
+   (   make || (mv build/fplib/libfplib_debug.a build/fplib/libfplib.a && make ) )
+}
+
+package() {
+        cd "$srcdir/lastfm-$pkgver+dfsg"
+	mkdir -p $pkgdir/opt $pkgdir/usr/bin
+	cp -rp bin/ $pkgdir/opt/last.fm
+	mkdir -p $pkgdir/opt $pkgdir/usr/bin
+	cp -rp  bin/ $pkgdir/opt/last.fm
+	printf "#!/bin/sh\nexec /opt/last.fm/last.fm.sh\n" > $pkgdir/usr/bin/lastfm
+	chmod +x $pkgdir/usr/bin/lastfm
+	install -D -m 644 $srcdir/lastfm.desktop $pkgdir/usr/share/applications/lastfm.desktop
+}
diff --git a/community/lastfm-client/build-fixes.diff b/community/lastfm-client/build-fixes.diff
new file mode 100644
index 000000000..5e7553434
--- /dev/null
+++ b/community/lastfm-client/build-fixes.diff
@@ -0,0 +1,12 @@
+--- a/LastFM.pro
++++ b/LastFM.pro
+@@ -41,8 +41,7 @@
+     SUBDIRS -= src/Twiddly \
+                src/Bootstrapper/ITunesDevice
+ 
+-    SUBDIRS += src/output/alsa-playback \
+-               src/output/portAudio
++    SUBDIRS += src/output/alsa-playback
+ }
+ 
+ 
diff --git a/community/lastfm-client/lastfm.desktop b/community/lastfm-client/lastfm.desktop
new file mode 100644
index 000000000..1658c5997
--- /dev/null
+++ b/community/lastfm-client/lastfm.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Name=Last.fm
+Name[de]=Last.fm
+GenericName=Client for the Last.fm Network
+GenericName[de]=Client für das Last.fm-Netzwerk
+GenericName[pl]=Klient sieci Last.fm
+Exec=lastfm
+Icon=lastfm
+Categories=AudioVideo;Player;
+Terminal=false
+Type=Application
+Encoding=UTF-8
+StartupNotify=false
+Icon=/opt/last.fm/data/icons/as.png
diff --git a/community/lastfm-client/makefile-qt45.patch b/community/lastfm-client/makefile-qt45.patch
new file mode 100644
index 000000000..c7db8aca7
--- /dev/null
+++ b/community/lastfm-client/makefile-qt45.patch
@@ -0,0 +1,12 @@
+Index: lastfm-1.5.1.31879.dfsg/src/Makefile
+===================================================================
+--- lastfm-1.5.1.31879.dfsg.orig/src/Makefile
++++ lastfm-1.5.1.31879.dfsg/src/Makefile
+@@ -959,6 +959,7 @@ compiler_uic_clean:
+ ../build/ui_playcontrols.h: playcontrols.ui \
+ 		volumeslider.h
+ 	/usr/bin/uic playcontrols.ui -o ../build/ui_playcontrols.h
++	sed -i "s/phonon\/Phonon::VolumeSlider/volumeslider.h/" ../build/ui_playcontrols.h
+ 
+ ../build/ui_failedlogindialog.h: failedlogindialog.ui
+ 	/usr/bin/uic failedlogindialog.ui -o ../build/ui_failedlogindialog.h
diff --git a/community/lastfm-client/qt46.diff b/community/lastfm-client/qt46.diff
new file mode 100644
index 000000000..b2370abee
--- /dev/null
+++ b/community/lastfm-client/qt46.diff
@@ -0,0 +1,57 @@
+Fix some text/icon display issues with Qt 4.6
+--- a/src/libUnicorn/draglabel.cpp
++++ b/src/libUnicorn/draglabel.cpp
+@@ -324,6 +324,11 @@
+     {
+         rect.setHeight( fm.height() );
+     }
++    // Qt 4.6 seems to have problems with the width too
++    if ( fm.width( d.m_text ) > rect.width() )
++    {
++        rect.setWidth( fm.width( d.m_text ) );
++    }
+ 
+     // boundingRect sometimes returns negative values so make sure it's at 0, 0
+     rect.moveTo( 0, 0 );
+--- a/src/settingsdialog.cpp
++++ b/src/settingsdialog.cpp
+@@ -140,29 +140,29 @@
+         UnicornUtils::qtLanguageToLfmLangCode( QLocale::Japanese ) );
+ 
+     // Add icons to sidebar
+-    pixmap.load( MooseUtils::dataPath( "/icons/options_account.png" ) );
++    //pixmap.load( MooseUtils::dataPath( "/icons/options_account.png" ) );
+     //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
+-    ui.pageList->item( 0 )->setIcon( pixmap );
++    ui.pageList->item( 0 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_account.png" ) ) );
+ 
+-    pixmap.load( MooseUtils::dataPath( "/icons/options_radio.png" ) );
++    //pixmap.load( MooseUtils::dataPath( "/icons/options_radio.png" ) );
+     //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
+-    ui.pageList->item( 1 )->setIcon( pixmap );
++    ui.pageList->item( 1 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_radio.png" ) ) );
+ 
+     #ifdef HIDE_RADIO
+         ui.pageList->setItemHidden( ui.pageList->item( 1 ), true );
+     #endif // HIDE_RADIO
+ 
+-    pixmap.load( MooseUtils::dataPath( "/icons/options_scrobbling.png" ) );
++    //pixmap.load( MooseUtils::dataPath( "/icons/options_scrobbling.png" ) );
+     //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
+-    ui.pageList->item( 2 )->setIcon( pixmap );
++    ui.pageList->item( 2 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_scrobbling.png" ) ) );
+ 
+-    pixmap.load( MooseUtils::dataPath( "/icons/options_connection.png" ) );
++    //pixmap.load( MooseUtils::dataPath( "/icons/options_connection.png" ) );
+     //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
+-    ui.pageList->item( 3 )->setIcon( pixmap );
++    ui.pageList->item( 3 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_connection.png" ) ) );
+ 
+-    pixmap.load( MooseUtils::dataPath( "/icons/options_mediadevices.png" ) );
++    //pixmap.load( MooseUtils::dataPath( "/icons/options_mediadevices.png" ) );
+     //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
+-    ui.pageList->item( 4 )->setIcon( pixmap );
++    ui.pageList->item( 4 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_mediadevices.png" ) ) );
+ 
+     #ifdef Q_WS_X11
+     ui.pageList->setRowHidden( 4, true );
diff --git a/community/lastfm-client/set-firstrun-status.diff b/community/lastfm-client/set-firstrun-status.diff
new file mode 100644
index 000000000..61457fed2
--- /dev/null
+++ b/community/lastfm-client/set-firstrun-status.diff
@@ -0,0 +1,11 @@
+--- a/src/configwizard.cpp
++++ b/src/configwizard.cpp
+@@ -750,7 +750,7 @@
+ 
+             nextButtonClicked();
+         #else
+-            m_pageOffset += 7;
++            m_pageOffset += 8;
+             BaseWizard::nextButtonClicked();
+         #endif
+ 
diff --git a/community/lastfm-client/set-locale.diff b/community/lastfm-client/set-locale.diff
new file mode 100644
index 000000000..3b81e6cbb
--- /dev/null
+++ b/community/lastfm-client/set-locale.diff
@@ -0,0 +1,20 @@
+--- a/src/libUnicorn/Settings.h
++++ b/src/libUnicorn/Settings.h
+@@ -226,6 +226,17 @@
+         QString langCode = customAppLanguage();
+         if ( langCode.isEmpty() )
+         {
++            #ifdef LINUX
++            // Now check the environment including LC_MESSAGES
++            // This fixes Debian bug #432232
++            if ( langCode.isEmpty() )
++                langCode = qgetenv( "LC_ALL" );
++            if ( langCode.isEmpty() )
++                langCode = qgetenv( "LC_MESSAGES" );
++            if ( langCode.isEmpty() )
++                langCode = qgetenv( "LANG" );
++            #endif
++
+             // If none found, use system locale
+             #ifdef Q_WS_MAC
+             QLocale::Language qtLang = UnicornUtils::osxLanguageCode();