audio/last.fm: Updated for version 1.5.1.31879

4 files changed, 15 insertions, 10 deletions

diff --git a/audio/last.fm/README b/audio/last.fm/README
index 6df6d2e6ca..28787dc2ec 100644
--- a/audio/last.fm/README
+++ b/audio/last.fm/README
@@ -3,4 +3,4 @@ share your music tastes, listen to personalised radio streams,
 and discover new music and people.
 Last.fm is open source software and contains no spyware or adware.
 
-This requires qt4, libsamplerate, and fftw.
+This requires libsamplerate, and fftw.
diff --git a/audio/last.fm/last.fm.SlackBuild b/audio/last.fm/last.fm.SlackBuild
index 3328db50cb..b84f839e55 100644
--- a/audio/last.fm/last.fm.SlackBuild
+++ b/audio/last.fm/last.fm.SlackBuild
@@ -18,10 +18,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e # Exit on most errors
@@ -40,23 +43,23 @@ patch -p1 < $CWD/patches/no-fingerprint-lib.diff
 patch -p1 < $CWD/patches/reduce-linkage.diff
 patch -p1 < $CWD/patches/volumeslider_h-qt45.patch
 
-lrelease-qt4 i18n/*.ts
+lrelease i18n/*.ts
 
-qmake-qt4 -config release
+qmake -config release INCLUDEPATH="/usr/lib${LIBDIRSUFFIX}/glib-2.0/include "
 
 make
 
 #Last.fm doesn't have a nice installer, so we need to package it manually.
-mkdir -p $PKG/usr/lib/$PRGNAM/i18n $PKG/usr/bin $PKG/usr/man/man1 \
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/i18n $PKG/usr/bin $PKG/usr/man/man1 \
  	 $PKG/usr/share/applications $PKG/usr/share/pixmaps
-cp -R bin/* $PKG/usr/lib/$PRGNAM
-cat $CWD/$PRGNAM.script > $PKG/usr/bin/$PRGNAM
+cp -R bin/* $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
+sed -e "s/@LIBDIR@/lib${LIBDIRSUFFIX}/" $CWD/$PRGNAM.script > $PKG/usr/bin/$PRGNAM
 chmod +x $PKG/usr/bin/$PRGNAM
-install -m 644 i18n/*.qm $PKG/usr/lib/$PRGNAM/i18n
+install -m 644 i18n/*.qm $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/i18n
 gzip -9c $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-( cd $PKG/usr/share/pixmaps ; ln -s ../../lib/last.fm/data/app_55.png lastfm.png )
+( cd $PKG/usr/share/pixmaps ; ln -s ../../lib${LIBDIRSUFFIX}/last.fm/data/app_55.png lastfm.png )
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
@@ -74,4 +77,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/last.fm/last.fm.info b/audio/last.fm/last.fm.info
index 3965775b46..d850644677 100644
--- a/audio/last.fm/last.fm.info
+++ b/audio/last.fm/last.fm.info
@@ -2,7 +2,9 @@ PRGNAM="last.fm"
 VERSION="1.5.1.31879"
 HOMEPAGE="http://last.fm/"
 DOWNLOAD="http://static.last.fm/client/src/last.fm-1.5.1.31879.tar.bz2"
+DOWNLOAD_x86_64=""
 MD5SUM="21358960da6a68337c8afad79d268b5b"
+MD5SUM_x86_64=""
 MAINTAINER="Michael Johnson"
 EMAIL="youngmug@animeneko.net"
 APPROVED="rworkman"
diff --git a/audio/last.fm/last.fm.script b/audio/last.fm/last.fm.script
index 2437842206..ffe2b44829 100644
--- a/audio/last.fm/last.fm.script
+++ b/audio/last.fm/last.fm.script
@@ -1,3 +1,3 @@
 #!/bin/sh
-cd /usr/lib/last.fm
+cd /usr/@LIBDIR@/last.fm
 sh last.fm.sh "$@"