[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Antonio Rojas via arch-commits]

Date: Friday, August 24, 2018 @ 06:37:15
  Author: arojas
Revision: 332903

liblastfm-qt5 is not optional (FS#59785)

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-24 06:32:24 UTC (rev 332902)
+++ PKGBUILD2018-08-24 06:37:15 UTC (rev 332903)
@@ -7,19 +7,18 @@
 pkgname=amarok
 pkgver=2.9.0.git20180816
 _commit=8f5ef80
-pkgrel=3
+pkgrel=4
 pkgdesc="The powerful music player for KDE"
 arch=(x86_64)
 url="http://amarok.kde.org/;
 license=(GPL2 LGPL2.1 FDL)
-depends=(mariadb taglib-extras libofa kcmutils kdnssd knewstuff kirigami2 
threadweaver ktexteditor qt5-webengine)
-makedepends=(extra-cmake-modules loudmouth libmtp libmygpo-qt5 gdk-pixbuf2 
libgpod git knotifyconfig liblastfm-qt5)
+depends=(mariadb taglib-extras libofa kcmutils kdnssd knewstuff kirigami2 
threadweaver ktexteditor qt5-webengine liblastfm-qt5)
+makedepends=(extra-cmake-modules loudmouth libmtp libmygpo-qt5 gdk-pixbuf2 
libgpod git knotifyconfig)
 optdepends=('libgpod: support for Apple iPod audio devices'
 'libmtp: support for portable media devices'
 'loudmouth: backend needed by mp3tunes for syncing'
 'ifuse: support for Apple iPod Touch and iPhone'
-'libmygpo-qt5: gpodder.net Internet Service'
-'liblastfm-qt5: Ampache service')
+'libmygpo-qt5: gpodder.net Internet Service')
 
#source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
 source=(git://git.kde.org/amarok.git#commit=$_commit)
 sha256sums=('SKIP')

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Antonio Rojas via arch-commits]

Date: Wednesday, August 22, 2018 @ 22:19:22
  Author: arojas
Revision: 332834

Restore liblastfm-qt5 as an optdepend

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-22 21:52:48 UTC (rev 332833)
+++ PKGBUILD2018-08-22 22:19:22 UTC (rev 332834)
@@ -7,18 +7,19 @@
 pkgname=amarok
 pkgver=2.9.0.git20180816
 _commit=8f5ef80
-pkgrel=2
+pkgrel=3
 pkgdesc="The powerful music player for KDE"
 arch=(x86_64)
 url="http://amarok.kde.org/;
 license=(GPL2 LGPL2.1 FDL)
 depends=(mariadb taglib-extras libofa kcmutils kdnssd knewstuff kirigami2 
threadweaver ktexteditor qt5-webengine)
-makedepends=(extra-cmake-modules loudmouth libmtp libmygpo-qt5 gdk-pixbuf2 
libgpod git knotifyconfig)
+makedepends=(extra-cmake-modules loudmouth libmtp libmygpo-qt5 gdk-pixbuf2 
libgpod git knotifyconfig liblastfm-qt5)
 optdepends=('libgpod: support for Apple iPod audio devices'
 'libmtp: support for portable media devices'
 'loudmouth: backend needed by mp3tunes for syncing'
 'ifuse: support for Apple iPod Touch and iPhone'
-'libmygpo-qt5: gpodder.net Internet Service')
+'libmygpo-qt5: gpodder.net Internet Service'
+'liblastfm-qt5: Ampache service')
 
#source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
 source=(git://git.kde.org/amarok.git#commit=$_commit)
 sha256sums=('SKIP')

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Antonio Rojas via arch-commits]

Date: Wednesday, August 22, 2018 @ 21:52:24
  Author: arojas
Revision: 332832

Drop liblastfm-qt5 dependency (FS#59761)

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-22 21:18:18 UTC (rev 332831)
+++ PKGBUILD2018-08-22 21:52:24 UTC (rev 332832)
@@ -7,12 +7,12 @@
 pkgname=amarok
 pkgver=2.9.0.git20180816
 _commit=8f5ef80
-pkgrel=1
+pkgrel=2
 pkgdesc="The powerful music player for KDE"
 arch=(x86_64)
 url="http://amarok.kde.org/;
 license=(GPL2 LGPL2.1 FDL)
-depends=(mariadb taglib-extras liblastfm-qt5 libofa kcmutils kdnssd knewstuff 
kirigami2 threadweaver ktexteditor qt5-webengine)
+depends=(mariadb taglib-extras libofa kcmutils kdnssd knewstuff kirigami2 
threadweaver ktexteditor qt5-webengine)
 makedepends=(extra-cmake-modules loudmouth libmtp libmygpo-qt5 gdk-pixbuf2 
libgpod git knotifyconfig)
 optdepends=('libgpod: support for Apple iPod audio devices'
 'libmtp: support for portable media devices'

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Antonio Rojas via arch-commits]

Date: Monday, April 23, 2018 @ 17:16:04
  Author: arojas
Revision: 322844

ffmpeg 4.0 rebuild

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-23 17:07:35 UTC (rev 322843)
+++ PKGBUILD2018-04-23 17:16:04 UTC (rev 322844)
@@ -6,7 +6,7 @@
 
 pkgname=amarok
 pkgver=2.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The powerful music player for KDE"
 arch=(x86_64)
 url="http://amarok.kde.org/;

[arch-commits] Commit in amarok/trunk (PKGBUILD amarok-plasma5.7.patch)

[Antonio Rojas via arch-commits]

Date: Wednesday, March 7, 2018 @ 07:28:13
  Author: arojas
Revision: 317957

Update to 2.9.0

Modified:
  amarok/trunk/PKGBUILD
Deleted:
  amarok/trunk/amarok-plasma5.7.patch

+
 PKGBUILD   |   45 +++--
 amarok-plasma5.7.patch |   18 --
 2 files changed, 15 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-06 21:53:21 UTC (rev 317956)
+++ PKGBUILD2018-03-07 07:28:13 UTC (rev 317957)
@@ -1,17 +1,17 @@
 # $Id$
 # Maintainer: Ronald van Haren 
+# Maintainer: Antonio Rojas 
 # Contributor: Andrea Scarpino 
 # Contributor: damir 
 
 pkgname=amarok
-pkgver=2.8.0
-pkgrel=19
+pkgver=2.9.0
+pkgrel=1
 pkgdesc="The powerful music player for KDE"
 arch=(x86_64)
 url="http://amarok.kde.org/;
-license=('GPL2' 'LGPL2.1' 'FDL')
-depends=('kdebase-runtime' 'mariadb' 'taglib-extras'
-'liblastfm' 'ffmpeg' 'libofa' 'qjson' 'qtscriptgenerator')
+license=(GPL2 LGPL2.1 FDL)
+depends=(kdebase-runtime mariadb taglib-extras liblastfm ffmpeg libofa qjson 
qtscriptgenerator)
 makedepends=('automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' 'libmygpo-qt' 
'qca-qt4')
 optdepends=('libgpod: support for Apple iPod audio devices'
 'libmtp: support for portable media devices'
@@ -18,35 +18,20 @@
 'loudmouth: backend needed by mp3tunes for syncing'
 'ifuse: support for Apple iPod Touch and iPhone'
 'libmygpo-qt: gpodder.net Internet Service'
-'gst-libav: MP3 codecs')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
-
taglib_version_detect.patch::"https://cgit.kde.org/amarok.git/patch/?id=fec8817c;
 
-
amarok-ffmpeg3.patch::"https://git.reviewboard.kde.org/r/126682/diff/raw/;
-
amarok-no-qtwebkit.patch::"https://cgit.kde.org/amarok.git/patch/?id=d65ce101;
-
amarok-plasma5.7.patch::"https://cgit.kde.org/amarok.git/patch/?id=9449ec56;)
-sha256sums=('f4b89b28f217a6d947e55fb0890de22fad8c404794c6beeb2dcaf2711b4f8ec6'
-'bd7034e51b6522e72e3961ca758630ad9b4db88557f795cf08956ea3dfee'
-'fbb18f1ff234716f6f8d3afd710b50f337453e536eb8288c3a9c4613edd6570f'
-'6880a314a437100a3496540f2f9a0f2d14a4ff61de07a42ba3f4beb1432b'
-'acc0fa104c99be046fa07b01a142f77c323b99943833d2e2139bfdcbec39e4a5')
+'gst-libav: MP3 codecs'
+'qca-qt4: Ampache support')
+source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+sha256sums=('e3678de79db36956bc8588b9905726ace1b9188e7fdf89eaea265f1cb03116fd'
+'SKIP')
+validpgpkeys=(D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker 

 
 prepare() {
-  mkdir build
-
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i ../taglib_version_detect.patch
-# Fix build against ffmpeg 3.0
-  patch -p1 -i ../amarok-ffmpeg3.patch
-# Disable applets that require qtwebkit
-  patch -p1 -i ../amarok-no-qtwebkit.patch
-# Fix tooltips MPRIS controls in Plasma 5.7
-  patch -p1 -i ../amarok-plasma5.7.patch
+  mkdir -p build
 }
 
 build() {
   cd build
-  cmake ../${pkgname}-${pkgver} \
--DCMAKE_BUILD_TYPE=Release \
+  cmake ../$pkgname-$pkgver \
 -DKDE4_BUILD_TESTS=OFF \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DWITH_NepomukCore=OFF \
@@ -55,7 +40,7 @@
   make
 }
 
-package(){
+package() {
   cd build
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 }

Deleted: amarok-plasma5.7.patch
===
--- amarok-plasma5.7.patch  2018-03-06 21:53:21 UTC (rev 317956)
+++ amarok-plasma5.7.patch  2018-03-07 07:28:13 UTC (rev 317957)
@@ -1,18 +0,0 @@
-diff --git a/src/dbus/mpris2/MediaPlayer2.cpp 
b/src/dbus/mpris2/MediaPlayer2.cpp
-index cbe1a2a..a1d1bda 100644
 a/src/dbus/mpris2/MediaPlayer2.cpp
-+++ b/src/dbus/mpris2/MediaPlayer2.cpp
-@@ -94,11 +94,7 @@ QString MediaPlayer2::Identity() const
- 
- QString MediaPlayer2::DesktopEntry() const
- {
--// Amarok desktop file is installed in $prefix/share/applications/kde4/
--// rather than in $prefix/share/applications. The standard way to
--// represent this dir is with a "kde4-" prefix. See:
--// 
http://standards.freedesktop.org/menu-spec/1.0/go01.html#term-desktop-file-id
--return QLatin1String("kde4-amarok");
-+return QLatin1String("amarok");
- }
- 
- QStringList MediaPlayer2::SupportedUriSchemes() const
-

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Antonio Rojas via arch-commits]

Date: Friday, December 22, 2017 @ 22:58:15
  Author: arojas
Revision: 313552

Add missing qca-qt4 makedepends (FS#56823)

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-22 22:29:46 UTC (rev 313551)
+++ PKGBUILD2017-12-22 22:58:15 UTC (rev 313552)
@@ -5,14 +5,14 @@
 
 pkgname=amarok
 pkgver=2.8.0
-pkgrel=18
+pkgrel=19
 pkgdesc="The powerful music player for KDE"
-arch=("x86_64")
+arch=(x86_64)
 url="http://amarok.kde.org/;
 license=('GPL2' 'LGPL2.1' 'FDL')
 depends=('kdebase-runtime' 'mariadb' 'taglib-extras'
 'liblastfm' 'ffmpeg' 'libofa' 'qjson' 'qtscriptgenerator')
-makedepends=('automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' 'libmygpo-qt')
+makedepends=('automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' 'libmygpo-qt' 
'qca-qt4')
 optdepends=("libgpod: support for Apple iPod audio devices"
 "libmtp: support for portable media devices"
 "loudmouth: backend needed by mp3tunes for syncing"

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Antonio Rojas via arch-commits]

Date: Wednesday, December 20, 2017 @ 19:07:51
  Author: arojas
Revision: 313414

Drop audiocd-kio4 optdepend

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-20 19:07:06 UTC (rev 313413)
+++ PKGBUILD2017-12-20 19:07:51 UTC (rev 313414)
@@ -5,7 +5,7 @@
 
 pkgname=amarok
 pkgver=2.8.0
-pkgrel=17
+pkgrel=18
 pkgdesc="The powerful music player for KDE"
 arch=("x86_64")
 url="http://amarok.kde.org/;
@@ -18,8 +18,7 @@
 "loudmouth: backend needed by mp3tunes for syncing"
 "ifuse: support for Apple iPod Touch and iPhone"
 "libmygpo-qt: gpodder.net Internet Service"
-"gst-libav: MP3 codecs"
-"audiocd-kio4: audio CD support")
+"gst-libav: MP3 codecs")
 
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
 taglib_version_detect.patch 
amarok-ffmpeg3.patch::"https://git.reviewboard.kde.org/r/126682/diff/raw/;
 amarok-no-qtwebkit.patch amarok-plasma5.7.patch)

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Antonio Rojas via arch-commits]

Date: Monday, December 18, 2017 @ 21:37:19
  Author: arojas
Revision: 313312

Remove clamz dependency

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-18 20:59:57 UTC (rev 313311)
+++ PKGBUILD2017-12-18 21:37:19 UTC (rev 313312)
@@ -5,7 +5,7 @@
 
 pkgname=amarok
 pkgver=2.8.0
-pkgrel=16
+pkgrel=17
 pkgdesc="The powerful music player for KDE"
 arch=("x86_64")
 url="http://amarok.kde.org/;
@@ -12,14 +12,12 @@
 license=('GPL2' 'LGPL2.1' 'FDL')
 depends=('kdebase-runtime' 'mariadb' 'taglib-extras'
 'liblastfm' 'ffmpeg' 'libofa' 'qjson' 'qtscriptgenerator')
-makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
- 'libmygpo-qt' 'mesa' 'clamz')
+makedepends=('automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' 'libmygpo-qt')
 optdepends=("libgpod: support for Apple iPod audio devices"
 "libmtp: support for portable media devices"
 "loudmouth: backend needed by mp3tunes for syncing"
 "ifuse: support for Apple iPod Touch and iPhone"
 "libmygpo-qt: gpodder.net Internet Service"
-"clamz: allow to download songs from Amazon.com"
 "gst-libav: MP3 codecs"
 "audiocd-kio4: audio CD support")
 
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Evangelos Foutras]

Date: Friday, May 26, 2017 @ 06:52:17
  Author: foutrelis
Revision: 296641

MariaDB 10.2.6 rebuild

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-26 06:41:26 UTC (rev 296640)
+++ PKGBUILD2017-05-26 06:52:17 UTC (rev 296641)
@@ -5,7 +5,7 @@
 
 pkgname=amarok
 pkgver=2.8.0
-pkgrel=15
+pkgrel=16
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org/;

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Antonio Rojas]

Date: Thursday, February 16, 2017 @ 07:48:33
  Author: arojas
Revision: 289039

Add audiocd-kio4 optdepend

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-16 07:34:53 UTC (rev 289038)
+++ PKGBUILD2017-02-16 07:48:33 UTC (rev 289039)
@@ -5,7 +5,7 @@
 
 pkgname=amarok
 pkgver=2.8.0
-pkgrel=14
+pkgrel=15
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org/;
@@ -20,7 +20,8 @@
 "ifuse: support for Apple iPod Touch and iPhone"
 "libmygpo-qt: gpodder.net Internet Service"
 "clamz: allow to download songs from Amazon.com"
-"gst-libav: MP3 codecs")
+"gst-libav: MP3 codecs"
+"audiocd-kio4: audio CD support")
 
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
 taglib_version_detect.patch 
amarok-ffmpeg3.patch::"https://git.reviewboard.kde.org/r/126682/diff/raw/;
 amarok-no-qtwebkit.patch amarok-plasma5.7.patch)

[arch-commits] Commit in amarok/trunk (PKGBUILD amarok-no-qtwebkit.patch)

[Antonio Rojas]

Date: Tuesday, February 7, 2017 @ 07:36:01
  Author: arojas
Revision: 288152

Also disable upcoming events applet (FS#52645)

Modified:
  amarok/trunk/PKGBUILD
  amarok/trunk/amarok-no-qtwebkit.patch

--+
 PKGBUILD |4 ++--
 amarok-no-qtwebkit.patch |   12 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-07 00:20:11 UTC (rev 288151)
+++ PKGBUILD2017-02-07 07:36:01 UTC (rev 288152)
@@ -5,7 +5,7 @@
 
 pkgname=amarok
 pkgver=2.8.0
-pkgrel=13
+pkgrel=14
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org/;
@@ -27,7 +27,7 @@
 sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937'
   '8b2752a0fe78621bdb9ccdb763919ea265b52b06'
   '819cb060cd9c63b576cc433f835cb4c175b07fd0'
-  '97748cc0aef26da17b268865bf6b0431153525ce'
+  '9f905eba9e5ead6d704f0cd28e389857c29dc15d'
   '9908c154bf583a1755acf59f9d2790aaff503162')
 
 prepare() {

Modified: amarok-no-qtwebkit.patch
===
--- amarok-no-qtwebkit.patch2017-02-07 00:20:11 UTC (rev 288151)
+++ amarok-no-qtwebkit.patch2017-02-07 07:36:01 UTC (rev 288152)
@@ -12,10 +12,10 @@
  
  include( KDE4Defaults )
 diff --git a/src/context/applets/CMakeLists.txt 
b/src/context/applets/CMakeLists.txt
-index f4d5456d9f..f4e4526c27 100644
+index f4d5456d9f..cad9036681 100644
 --- a/src/context/applets/CMakeLists.txt
 +++ b/src/context/applets/CMakeLists.txt
-@@ -1,11 +1,11 @@
+@@ -1,18 +1,18 @@
  add_subdirectory( albums )
  add_subdirectory( currenttrack )
 -add_subdirectory( info )
@@ -29,3 +29,11 @@
  
  if( QT_QTOPENGL_FOUND )
  add_subdirectory( analyzer )
+ endif()
+ 
+ if( LIBLASTFM_FOUND )
+-add_subdirectory( upcomingevents )
++#add_subdirectory( upcomingevents )
+ add_subdirectory( similarartists )
+ endif()
+ 

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Antonio Rojas]

Date: Wednesday, January 25, 2017 @ 21:44:50
  Author: arojas
Revision: 287445

qtscriptgenerator is a runtime dependency

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-25 19:54:28 UTC (rev 287444)
+++ PKGBUILD2017-01-25 21:44:50 UTC (rev 287445)
@@ -5,15 +5,15 @@
 
 pkgname=amarok
 pkgver=2.8.0
-pkgrel=12
+pkgrel=13
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org/;
 license=('GPL2' 'LGPL2.1' 'FDL')
 depends=('kdebase-runtime' 'mariadb' 'taglib-extras'
-'liblastfm' 'ffmpeg' 'libofa' 'qjson')
+'liblastfm' 'ffmpeg' 'libofa' 'qjson' 'qtscriptgenerator')
 makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
- 'libmygpo-qt' 'mesa' 'clamz' 'qtscriptgenerator')
+ 'libmygpo-qt' 'mesa' 'clamz')
 optdepends=("libgpod: support for Apple iPod audio devices"
 "libmtp: support for portable media devices"
 "loudmouth: backend needed by mp3tunes for syncing"

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Antonio Rojas]

Date: Monday, July 4, 2016 @ 07:39:05
  Author: arojas
Revision: 270929

ffmpeg 3.1 rebuild

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-04 06:18:28 UTC (rev 270928)
+++ PKGBUILD2016-07-04 07:39:05 UTC (rev 270929)
@@ -5,7 +5,7 @@
 
 pkgname=amarok
 pkgver=2.8.0
-pkgrel=9
+pkgrel=10
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org/;

[arch-commits] Commit in amarok/trunk (PKGBUILD amarok.install)

[Antonio Rojas]

Date: Wednesday, May 4, 2016 @ 21:19:12
  Author: arojas
Revision: 266877

Hooks

Modified:
  amarok/trunk/PKGBUILD
Deleted:
  amarok/trunk/amarok.install

+
 PKGBUILD   |3 +--
 amarok.install |   12 
 2 files changed, 1 insertion(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-04 18:15:22 UTC (rev 266876)
+++ PKGBUILD2016-05-04 19:19:12 UTC (rev 266877)
@@ -5,7 +5,7 @@
 
 pkgname=amarok
 pkgver=2.8.0
-pkgrel=8
+pkgrel=9
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org/;
@@ -21,7 +21,6 @@
 "libmygpo-qt: gpodder.net Internet Service"
 "clamz: allow to download songs from Amazon.com"
 "gst-libav: MP3 codecs")
-install="${pkgname}.install"
 
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
 taglib_version_detect.patch 
amarok-ffmpeg3.patch::"https://git.reviewboard.kde.org/r/126682/diff/raw/;)
 sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937'

Deleted: amarok.install
===
--- amarok.install  2016-05-04 18:15:22 UTC (rev 266876)
+++ amarok.install  2016-05-04 19:19:12 UTC (rev 266877)
@@ -1,12 +0,0 @@
-post_install() {
-   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-update-desktop-database -q
-}
-
-post_upgrade() {
-   post_install
-}
-
-post_remove() {
-   post_install
-}

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Antonio Rojas]

Date: Tuesday, February 16, 2016 @ 00:29:09
  Author: arojas
Revision: 259362

ffmpeg 3.0 rebuild

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-15 23:22:58 UTC (rev 259361)
+++ PKGBUILD2016-02-15 23:29:09 UTC (rev 259362)
@@ -5,7 +5,7 @@
 
 pkgname=amarok
 pkgver=2.8.0
-pkgrel=7
+pkgrel=8
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org/;
@@ -23,9 +23,10 @@
 "gst-libav: MP3 codecs")
 install="${pkgname}.install"
 
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
-taglib_version_detect.patch)
+taglib_version_detect.patch 
amarok-ffmpeg3.patch::"https://git.reviewboard.kde.org/r/126682/diff/raw/;)
 sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937'
-  '8b2752a0fe78621bdb9ccdb763919ea265b52b06')
+  '8b2752a0fe78621bdb9ccdb763919ea265b52b06'
+  '819cb060cd9c63b576cc433f835cb4c175b07fd0')
 
 prepare() {
   mkdir build
@@ -32,6 +33,8 @@
 
   cd ${pkgname}-${pkgver}
   patch -Np1 -i ../taglib_version_detect.patch
+# Fix build against ffmpeg 3.0
+  patch -p1 -i ../amarok-ffmpeg3.patch
 }
 
 build() {

[arch-commits] Commit in amarok/trunk (PKGBUILD taglib_version_detect.patch)

[Felix Yan]

Date: Monday, December 7, 2015 @ 15:57:57
  Author: fyan
Revision: 253394

fix taglib version detect (https://bugs.kde.org/show_bug.cgi?id=351013)

Added:
  amarok/trunk/taglib_version_detect.patch
Modified:
  amarok/trunk/PKGBUILD

-+
 PKGBUILD|9 +++--
 taglib_version_detect.patch |   26 ++
 2 files changed, 33 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 14:57:52 UTC (rev 253393)
+++ PKGBUILD2015-12-07 14:57:57 UTC (rev 253394)
@@ -22,11 +22,16 @@
 "clamz: allow to download songs from Amazon.com"
 "gst-libav: MP3 codecs")
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
+taglib_version_detect.patch)
+sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937'
+  '8b2752a0fe78621bdb9ccdb763919ea265b52b06')
 
 prepare() {
   mkdir build
+
+  cd ${pkgname}-${pkgver}
+  patch -p1 ../taglib_version_detect.patch
 }
 
 build() {

Added: taglib_version_detect.patch
===
--- taglib_version_detect.patch (rev 0)
+++ taglib_version_detect.patch 2015-12-07 14:57:57 UTC (rev 253394)
@@ -0,0 +1,26 @@
+diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+index 76b83ac..21a10a8 100644
+--- a/cmake/modules/FindTaglib.cmake
 b/cmake/modules/FindTaglib.cmake
+@@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE)
+ 
+   exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE 
_return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+ 
+-  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++  if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+  message(STATUS "TagLib version too old: version searched 
:${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+  set(TAGLIB_FOUND FALSE)
+-  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++  else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ 
+  exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE 
_return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+ 
+@@ -42,7 +42,7 @@ if(TAGLIBCONFIG_EXECUTABLE)
+ set(TAGLIB_FOUND TRUE)
+  endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+  string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+-  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
++  endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) 
+   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+ 
+ else(TAGLIBCONFIG_EXECUTABLE)

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Evangelos Foutras]

Date: Monday, December 7, 2015 @ 18:25:17
  Author: foutrelis
Revision: 253559

Fix patch command

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 17:18:35 UTC (rev 253558)
+++ PKGBUILD2015-12-07 17:25:17 UTC (rev 253559)
@@ -31,7 +31,7 @@
   mkdir build
 
   cd ${pkgname}-${pkgver}
-  patch -p1 ../taglib_version_detect.patch
+  patch -Np1 -i ../taglib_version_detect.patch
 }
 
 build() {

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Antonio Rojas]

Date: Monday, December 7, 2015 @ 18:53:16
  Author: arojas
Revision: 253565

C++11 ABI rebuild

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 17:51:15 UTC (rev 253564)
+++ PKGBUILD2015-12-07 17:53:16 UTC (rev 253565)
@@ -5,7 +5,7 @@
 
 pkgname=amarok
 pkgver=2.8.0
-pkgrel=6
+pkgrel=7
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org/;

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Antonio Rojas]

Date: Wednesday, April 15, 2015 @ 18:59:36
  Author: arojas
Revision: 237178

KDE4 docs move

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-15 16:47:30 UTC (rev 237177)
+++ PKGBUILD2015-04-15 16:59:36 UTC (rev 237178)
@@ -5,7 +5,7 @@
 
 pkgname=amarok
 pkgver=2.8.0
-pkgrel=5
+pkgrel=6
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org/;

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Tuesday, October 14, 2014 @ 18:45:10
  Author: andrea
Revision: 224342

gst-libav is needed to play MP3s (FS#41970)

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-14 16:43:36 UTC (rev 224341)
+++ PKGBUILD2014-10-14 16:45:10 UTC (rev 224342)
@@ -15,11 +15,12 @@
 makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
  'libmygpo-qt' 'mesa' 'clamz')
 optdepends=(libgpod: support for Apple iPod audio devices
-   libmtp: support for portable media devices
-   loudmouth: backend needed by mp3tunes for syncing
+libmtp: support for portable media devices
+loudmouth: backend needed by mp3tunes for syncing
 ifuse: support for Apple iPod Touch and iPhone
 libmygpo-qt: gpodder.net Internet Service
-clamz: allow to download songs from Amazon.com)
+clamz: allow to download songs from Amazon.com
+gst-libav: MP3 codecs)
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
 sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937')

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Felix Yan]

Date: Sunday, September 28, 2014 @ 10:01:04
  Author: fyan
Revision: 223616

upgpkg: amarok 2.8.0-5

kdelibs rebuild

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-28 07:53:15 UTC (rev 223615)
+++ PKGBUILD2014-09-28 08:01:04 UTC (rev 223616)
@@ -5,7 +5,7 @@
 
 pkgname=amarok
 pkgver=2.8.0
-pkgrel=4
+pkgrel=5
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org/;

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Bartłomiej Piotrowski]

Date: Monday, September 15, 2014 @ 11:33:32
  Author: bpiotrowski
Revision: 221748

upgpkg: amarok 2.8.0-4

rebuild against ffmpeg 2.4

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-15 08:43:56 UTC (rev 221747)
+++ PKGBUILD2014-09-15 09:33:32 UTC (rev 221748)
@@ -5,7 +5,7 @@
 
 pkgname=amarok
 pkgver=2.8.0
-pkgrel=3
+pkgrel=4
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org/;

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Saturday, April 19, 2014 @ 13:27:02
  Author: andrea
Revision: 211520

upgpkg: amarok 2.8.0-3

Drop nepomuk plugin

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-19 07:28:36 UTC (rev 211519)
+++ PKGBUILD2014-04-19 11:27:02 UTC (rev 211520)
@@ -5,7 +5,7 @@
 
 pkgname=amarok
 pkgver=2.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org/;
@@ -33,7 +33,9 @@
   cmake ../${pkgname}-${pkgver} \
 -DCMAKE_BUILD_TYPE=Release \
 -DKDE4_BUILD_TESTS=OFF \
--DCMAKE_INSTALL_PREFIX=/usr
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DWITH_NepomukCore=OFF \
+-DWITH_Soprano=OFF
   make
 }
 

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andreas Radke]

Date: Saturday, December 21, 2013 @ 19:12:28
  Author: andyrtr
Revision: 202413

upgpkg: amarok 2.8.0-2

libcrypgt rebuild

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-21 17:49:24 UTC (rev 202412)
+++ PKGBUILD2013-12-21 18:12:28 UTC (rev 202413)
@@ -5,7 +5,7 @@
 
 pkgname=amarok
 pkgver=2.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org/;

[arch-commits] Commit in amarok/trunk (PKGBUILD kde411.patch)

[Andrea Scarpino]

Date: Friday, August 16, 2013 @ 15:35:21
  Author: andrea
Revision: 193109

upgpkg: amarok 2.8.0-1

Upstream release

Modified:
  amarok/trunk/PKGBUILD
Deleted:
  amarok/trunk/kde411.patch

--+
 PKGBUILD |   14 --
 kde411.patch |   35 ---
 2 files changed, 4 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-16 11:02:03 UTC (rev 193108)
+++ PKGBUILD2013-08-16 13:35:21 UTC (rev 193109)
@@ -4,9 +4,8 @@
 # Contributor: damir da...@archlinux.org
 
 pkgname=amarok
-replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.7.1
-pkgrel=3
+pkgver=2.8.0
+pkgrel=1
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org/;
@@ -22,16 +21,11 @@
 libmygpo-qt: gpodder.net Internet Service
 clamz: allow to download songs from Amazon.com)
 install=${pkgname}.install
-source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
-'kde411.patch')
-sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d'
-  'c2fd0153ec622fccac47ebd31a1b0548c6222541')
+source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
+sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937')
 
 prepare() {
   mkdir build
-
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i ${srcdir}/kde411.patch
 }
 
 build() {

Deleted: kde411.patch
===
--- kde411.patch2013-08-16 11:02:03 UTC (rev 193108)
+++ kde411.patch2013-08-16 13:35:21 UTC (rev 193109)
@@ -1,35 +0,0 @@
-commit e899704b3db4af2ff228eb0d4dbbec05fb9a2448
-Author: Hrvoje Senjan hrvoje.sen...@gmail.com
-Date:   Mon Jun 10 09:26:37 2013 +0200
-
-Remove usage of (fake) Amarok-Mockup theme
-
-This is due to https://bugs.kde.org/show_bug.cgi?id=320855
-Amarok-Mockup is unused, as far i can see, and also makes Amarok crash 
with kdelibs master/4.11
-If it is still needed, or there is a better solution, i'll discard the 
review...
-
-From 6b85a2899a30db5acebee92182a67778499a8d9e Mon Sep 17 00:00:00 2001
-From: Hrvoje Senjan hrvoje.sen...@gmail.com
-Date: Sun, 9 Jun 2013 19:55:58 +0200
-Subject: [PATCH 1/1] Kill Amarok-Mockup
-
-BUG: 320855
-FIXED-IN: 2.8
-REVIEW: 110917
-
-diff --git a/src/context/ContextView.cpp b/src/context/ContextView.cpp
-index f61518f..152f8da 100644
 a/src/context/ContextView.cpp
-+++ b/src/context/ContextView.cpp
-@@ -78,11 +78,6 @@ ContextView::ContextView( Plasma::Containment *cont, 
Plasma::Corona *corona, QWi
- p.setColor( QPalette::Base, c );
- setPalette( p );
- 
--PERF_LOG( Accessing Plasma::Theme );
--// here we initialize all the Plasma paths to Amarok paths
--Plasma::Theme::defaultTheme()-setUseGlobalSettings( false );
--Theme::defaultTheme()-setThemeName( Amarok-Mockup );
--PERF_LOG( Access to Plasma::Theme complete )
- contextScene()-setAppletMimeType( text/x-amarokappletservicename );
- 
- cont-setPos( 0, 0 );

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Sven-Hendrik Haase]

Date: Monday, July 15, 2013 @ 20:17:47
  Author: svenstaro
Revision: 190105

upgpkg: amarok 2.7.1-3

ffmpeg 2.0 rebuild

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-15 17:59:27 UTC (rev 190104)
+++ PKGBUILD2013-07-15 18:17:47 UTC (rev 190105)
@@ -6,7 +6,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.7.1
-pkgrel=2
+pkgrel=3
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org/;

[arch-commits] Commit in amarok/trunk (PKGBUILD kde411.patch)

[Andrea Scarpino]

Date: Saturday, June 15, 2013 @ 09:43:42
  Author: andrea
Revision: 188523

upgpkg: amarok 2.7.1-2

Fix a crash on KDE 4.11

Added:
  amarok/trunk/kde411.patch
Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |   18 +-
 kde411.patch |   35 +++
 2 files changed, 48 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-15 07:20:50 UTC (rev 188522)
+++ PKGBUILD2013-06-15 07:43:42 UTC (rev 188523)
@@ -6,7 +6,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org/;
@@ -22,11 +22,19 @@
 libmygpo-qt: gpodder.net Internet Service
 clamz: allow to download songs from Amazon.com)
 install=${pkgname}.install
-source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d')
-   
+source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
+'kde411.patch')
+sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d'
+  'c2fd0153ec622fccac47ebd31a1b0548c6222541')
+
+prepare() {
+  mkdir build
+
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i ${srcdir}/kde411.patch
+}
+
 build() {
-  mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
 -DCMAKE_BUILD_TYPE=Release \

Added: kde411.patch
===
--- kde411.patch(rev 0)
+++ kde411.patch2013-06-15 07:43:42 UTC (rev 188523)
@@ -0,0 +1,35 @@
+commit e899704b3db4af2ff228eb0d4dbbec05fb9a2448
+Author: Hrvoje Senjan hrvoje.sen...@gmail.com
+Date:   Mon Jun 10 09:26:37 2013 +0200
+
+Remove usage of (fake) Amarok-Mockup theme
+
+This is due to https://bugs.kde.org/show_bug.cgi?id=320855
+Amarok-Mockup is unused, as far i can see, and also makes Amarok crash 
with kdelibs master/4.11
+If it is still needed, or there is a better solution, i'll discard the 
review...
+
+From 6b85a2899a30db5acebee92182a67778499a8d9e Mon Sep 17 00:00:00 2001
+From: Hrvoje Senjan hrvoje.sen...@gmail.com
+Date: Sun, 9 Jun 2013 19:55:58 +0200
+Subject: [PATCH 1/1] Kill Amarok-Mockup
+
+BUG: 320855
+FIXED-IN: 2.8
+REVIEW: 110917
+
+diff --git a/src/context/ContextView.cpp b/src/context/ContextView.cpp
+index f61518f..152f8da 100644
+--- a/src/context/ContextView.cpp
 b/src/context/ContextView.cpp
+@@ -78,11 +78,6 @@ ContextView::ContextView( Plasma::Containment *cont, 
Plasma::Corona *corona, QWi
+ p.setColor( QPalette::Base, c );
+ setPalette( p );
+ 
+-PERF_LOG( Accessing Plasma::Theme );
+-// here we initialize all the Plasma paths to Amarok paths
+-Plasma::Theme::defaultTheme()-setUseGlobalSettings( false );
+-Theme::defaultTheme()-setThemeName( Amarok-Mockup );
+-PERF_LOG( Access to Plasma::Theme complete )
+ contextScene()-setAppletMimeType( text/x-amarokappletservicename );
+ 
+ cont-setPos( 0, 0 );

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Thursday, May 16, 2013 @ 00:40:12
  Author: andrea
Revision: 185604

upgpkg: amarok 2.7.1-1

Upstream release

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-15 19:30:15 UTC (rev 185603)
+++ PKGBUILD2013-05-15 22:40:12 UTC (rev 185604)
@@ -5,8 +5,8 @@
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.7.0
-pkgrel=4
+pkgver=2.7.1
+pkgrel=1
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org/;
@@ -23,7 +23,7 @@
 clamz: allow to download songs from Amazon.com)
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-sha1sums=('d0ae4a2cb81a54ae94ca24fdb3aed88d7f3a921e')
+sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d')

 build() {
   mkdir build

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Sunday, March 3, 2013 @ 22:12:56
  Author: andrea
Revision: 179129

upgpkg: amarok 2.7.0-4

switch to mariadb

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-03 20:44:25 UTC (rev 179128)
+++ PKGBUILD2013-03-03 21:12:56 UTC (rev 179129)
@@ -6,12 +6,12 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.7.0
-pkgrel=3
+pkgrel=4
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org/;
 license=('GPL2' 'LGPL2.1' 'FDL')
-depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
+depends=('kdebase-runtime' 'mariadb' 'qtscriptgenerator' 'taglib-extras'
 'liblastfm' 'ffmpeg' 'libofa' 'qjson')
 makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
  'libmygpo-qt' 'mesa' 'clamz')

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Sunday, February 10, 2013 @ 11:05:39
  Author: andrea
Revision: 177846

ffmpeg rebuild

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-10 00:39:36 UTC (rev 177845)
+++ PKGBUILD2013-02-10 10:05:39 UTC (rev 177846)
@@ -6,7 +6,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.7.0
-pkgrel=2
+pkgrel=3
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org/;

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Friday, January 25, 2013 @ 15:44:55
  Author: andrea
Revision: 175976

upgpkg: amarok 2.7.0-2

Rebuilt to get liblastfm and clamz support

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-25 14:44:35 UTC (rev 175975)
+++ PKGBUILD2013-01-25 14:44:55 UTC (rev 175976)
@@ -6,27 +6,26 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
-url=http://amarok.kde.org;
+url=http://amarok.kde.org/;
 license=('GPL2' 'LGPL2.1' 'FDL')
 depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
 'liblastfm' 'ffmpeg' 'libofa' 'qjson')
 makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
- 'libmygpo-qt' 'mesa')
+ 'libmygpo-qt' 'mesa' 'clamz')
 optdepends=(libgpod: support for Apple iPod audio devices
libmtp: support for portable media devices
loudmouth: backend needed by mp3tunes for syncing
 ifuse: support for Apple iPod Touch and iPhone
-libmygpo-qt: gpodder.net Internet Service)
+libmygpo-qt: gpodder.net Internet Service
+clamz: allow to download songs from Amazon.com)
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
 sha1sums=('d0ae4a2cb81a54ae94ca24fdb3aed88d7f3a921e')

 build() {
-  cd ${srcdir}
-
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -37,6 +36,6 @@
 }
 
 package(){
-  cd ${srcdir}/build
+  cd build
   make DESTDIR=${pkgdir} install
 }

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Ronald van Haren]

Date: Saturday, January 19, 2013 @ 05:45:18
  Author: ronald
Revision: 175532

upgpkg: amarok 2.7.0-1

update to 2.7.0

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-19 10:24:22 UTC (rev 175531)
+++ PKGBUILD2013-01-19 10:45:18 UTC (rev 175532)
@@ -5,8 +5,8 @@
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.6.0
-pkgrel=3
+pkgver=2.7.0
+pkgrel=1
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
@@ -22,8 +22,8 @@
 libmygpo-qt: gpodder.net Internet Service)
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-sha1sums=('2cfcdabb67436418ba0012075ba105bbb630b48d')
-
+sha1sums=('d0ae4a2cb81a54ae94ca24fdb3aed88d7f3a921e')
+   
 build() {
   cd ${srcdir}
 

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Saturday, January 19, 2013 @ 10:32:29
  Author: andrea
Revision: 175686

Mesa is a makedeps (FS#32925); Disable tests (FS#33457)

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-19 14:56:44 UTC (rev 175685)
+++ PKGBUILD2013-01-19 15:32:29 UTC (rev 175686)
@@ -12,9 +12,9 @@
 url=http://amarok.kde.org;
 license=('GPL2' 'LGPL2.1' 'FDL')
 depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
-'liblastfm' 'ffmpeg' 'libofa' 'qjson' 'mesa')
+'liblastfm' 'ffmpeg' 'libofa' 'qjson')
 makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
- 'libmygpo-qt')
+ 'libmygpo-qt' 'mesa')
 optdepends=(libgpod: support for Apple iPod audio devices
libmtp: support for portable media devices
loudmouth: backend needed by mp3tunes for syncing
@@ -31,6 +31,7 @@
   cd build
   cmake ../${pkgname}-${pkgver} \
 -DCMAKE_BUILD_TYPE=Release \
+-DKDE4_BUILD_TESTS=OFF \
 -DCMAKE_INSTALL_PREFIX=/usr
   make
 }

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Ronald van Haren]

Date: Friday, November 30, 2012 @ 02:59:24
  Author: ronald
Revision: 172155

upgpkg: amarok 2.6.0-3

qjson rebuild

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-30 05:57:23 UTC (rev 172154)
+++ PKGBUILD2012-11-30 07:59:24 UTC (rev 172155)
@@ -6,13 +6,13 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.6.0
-pkgrel=1
+pkgrel=3
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
 license=('GPL2' 'LGPL2.1' 'FDL')
 depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
-'liblastfm' 'ffmpeg' 'libofa' 'qjson')
+'liblastfm' 'ffmpeg' 'libofa' 'qjson' 'mesa')
 makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
  'libmygpo-qt')
 optdepends=(libgpod: support for Apple iPod audio devices

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Ronald van Haren]

Date: Tuesday, August 14, 2012 @ 15:56:07
  Author: ronald
Revision: 165271

upgpkg: amarok 2.6.0-1

update to 2.6.0

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |   21 -
 1 file changed, 4 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-14 19:14:51 UTC (rev 165270)
+++ PKGBUILD2012-08-14 19:56:07 UTC (rev 165271)
@@ -5,8 +5,8 @@
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.5.0
-pkgrel=5
+pkgver=2.6.0
+pkgrel=1
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
@@ -21,25 +21,12 @@
 ifuse: support for Apple iPod Touch and iPhone
 libmygpo-qt: gpodder.net Internet Service)
 install=${pkgname}.install
-source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
-   toolbarfix.patch
-   amarok-2.5.0-ffmpeg-fixes.patch
-   contextviewfix.patch)
-sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2'
-  'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f'
-  '61193ccc48e9f99b4856eef27fe7a4aaf465feec'
-  'a95e3bfb177adacc268552ae479dd88b70f5f9e1')
+source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
+sha1sums=('2cfcdabb67436418ba0012075ba105bbb630b48d')
 
 build() {
   cd ${srcdir}
 
-  patch -Np0 -i ${srcdir}/toolbarfix.patch
-  patch -Np0 -i ${srcdir}/amarok-2.5.0-ffmpeg-fixes.patch
-
-  pushd ${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/contextviewfix.patch # FS#30448
-  popd
-
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Friday, July 6, 2012 @ 10:05:59
  Author: andrea
Revision: 163043

upgpkg: amarok 2.5.0-5

FFmpeg rebuild

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-07-06 13:03:30 UTC (rev 163042)
+++ PKGBUILD2012-07-06 14:05:59 UTC (rev 163043)
@@ -6,7 +6,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.5.0
-pkgrel=4
+pkgrel=5
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;

[arch-commits] Commit in amarok/trunk (PKGBUILD contextviewfix.patch)

[Ronald van Haren]

Date: Wednesday, June 27, 2012 @ 16:00:04
  Author: ronald
Revision: 162670

upgpkg: amarok 2.5.0-4

add contextviewfix.patch for FS#30448

Added:
  amarok/trunk/contextviewfix.patch
Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |   12 +---
 contextviewfix.patch |   14 ++
 2 files changed, 23 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-27 19:56:06 UTC (rev 162669)
+++ PKGBUILD2012-06-27 20:00:04 UTC (rev 162670)
@@ -6,7 +6,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.5.0
-pkgrel=3
+pkgrel=4
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
@@ -23,10 +23,12 @@
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
toolbarfix.patch
-   amarok-2.5.0-ffmpeg-fixes.patch)
+   amarok-2.5.0-ffmpeg-fixes.patch
+   contextviewfix.patch)
 sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2'
   'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f'
-  '61193ccc48e9f99b4856eef27fe7a4aaf465feec')
+  '61193ccc48e9f99b4856eef27fe7a4aaf465feec'
+  'a95e3bfb177adacc268552ae479dd88b70f5f9e1')
 
 build() {
   cd ${srcdir}
@@ -34,6 +36,10 @@
   patch -Np0 -i ${srcdir}/toolbarfix.patch
   patch -Np0 -i ${srcdir}/amarok-2.5.0-ffmpeg-fixes.patch
 
+  pushd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/contextviewfix.patch # FS#30448
+  popd
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \

Added: contextviewfix.patch
===
--- contextviewfix.patch(rev 0)
+++ contextviewfix.patch2012-06-27 20:00:04 UTC (rev 162670)
@@ -0,0 +1,14 @@
+diff --git 
a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp 
b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
+index a23305f..8fa6f9b 100644
+--- a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
 b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
+@@ -129,7 +129,8 @@ Context::VerticalToolbarContainment::updateGeometry()
+ if(!view())
+ return;
+ 
+-QRectF rect = view()-sceneRect();
++// mimic ContextView::resizeEvent(), nothing else seems to work, bug 
292895
++QRectF rect( view()-pos(), view()-maximumViewportSize() );
+ setGeometry( rect );
+ m_applets-setGeometry( rect );
+ m_applets-refresh();
\ No newline at end of file

[arch-commits] Commit in amarok/trunk (PKGBUILD amarok-2.5.0-ffmpeg-fixes.patch)

[Evangelos Foutras]

Date: Thursday, June 7, 2012 @ 09:33:51
  Author: foutrelis
Revision: 160957

upgpkg: amarok 2.5.0-3

FFmpeg 0.11 rebuild.

Added:
  amarok/trunk/amarok-2.5.0-ffmpeg-fixes.patch
Modified:
  amarok/trunk/PKGBUILD

-+
 PKGBUILD|9 ++---
 amarok-2.5.0-ffmpeg-fixes.patch |   19 +++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-07 12:57:33 UTC (rev 160956)
+++ PKGBUILD2012-06-07 13:33:51 UTC (rev 160957)
@@ -6,7 +6,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
@@ -22,14 +22,17 @@
 libmygpo-qt: gpodder.net Internet Service)
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
-   toolbarfix.patch)
+   toolbarfix.patch
+   amarok-2.5.0-ffmpeg-fixes.patch)
 sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2'
-  'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f')
+  'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f'
+  '61193ccc48e9f99b4856eef27fe7a4aaf465feec')
 
 build() {
   cd ${srcdir}
 
   patch -Np0 -i ${srcdir}/toolbarfix.patch
+  patch -Np0 -i ${srcdir}/amarok-2.5.0-ffmpeg-fixes.patch
 
   mkdir build
   cd build

Added: amarok-2.5.0-ffmpeg-fixes.patch
===
--- amarok-2.5.0-ffmpeg-fixes.patch (rev 0)
+++ amarok-2.5.0-ffmpeg-fixes.patch 2012-06-07 13:33:51 UTC (rev 160957)
@@ -0,0 +1,19 @@
+diff -upr amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp 
amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp
+--- amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp 2012-06-07 
16:12:22.0 +0300
 amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp  2012-06-07 
16:14:56.0 +0300
+@@ -136,7 +136,7 @@ MusicDNSAudioDecoder::run()
+ foreach( Meta::TrackPtr track, m_tracks )
+ {
+ //TODO replace with avformat_open_input since av_open_input_file is 
deprecated
+-if( av_open_input_file( pFormatCtx, ( const char * 
)track-playableUrl().toLocalFile().toAscii(), NULL, 0, NULL ) )
++if( avformat_open_input( pFormatCtx, ( const char * 
)track-playableUrl().toLocalFile().toAscii(), NULL, NULL ) )
+ {
+ warning()  QLatin1String( Unable to open input file:  ) + 
track-playableUrl().toLocalFile();
+ continue;
+@@ -259,4 +259,4 @@ MusicDNSAudioDecoder::run()
+ }
+ 
+ 
+-#include MusicDNSAudioDecoder.moc
+\ No newline at end of file
++#include MusicDNSAudioDecoder.moc

[arch-commits] Commit in amarok/trunk (PKGBUILD toolbarfix.patch)

[Ronald van Haren]

Date: Monday, January 30, 2012 @ 16:37:44
  Author: ronald
Revision: 148377

upgpkg: amarok 2.5.0-2

FS#28168; applets don't work

Added:
  amarok/trunk/toolbarfix.patch
Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++---
 toolbarfix.patch |   61 +
 2 files changed, 69 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-30 20:33:00 UTC (rev 148376)
+++ PKGBUILD2012-01-30 21:37:44 UTC (rev 148377)
@@ -6,7 +6,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
@@ -21,11 +21,16 @@
 ifuse: support for Apple iPod Touch and iPhone
 libmygpo-qt: gpodder.net Internet Service)
 install=${pkgname}.install
-source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2')
+source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
+   toolbarfix.patch)
+sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2'
+  'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f')
 
 build() {
   cd ${srcdir}
+
+  patch -Np0 -i ${srcdir}/toolbarfix.patch
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \

Added: toolbarfix.patch
===
--- toolbarfix.patch(rev 0)
+++ toolbarfix.patch2012-01-30 21:37:44 UTC (rev 148377)
@@ -0,0 +1,61 @@
+diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp 
amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp
+--- amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp 2011-12-15 
08:36:48.0 +0100
 amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp 2012-01-29 
20:20:01.901360205 +0100
+@@ -108,6 +108,17 @@ Context::AppletToolbar::appletRemoved( P
+ }
+ }
+ 
++void Context::AppletToolbar::setContainment( Containment * containment )
++{
++m_cont = containment;
++}
++
++Context::Containment *
++Context::AppletToolbar::containment() const
++{
++return m_cont;
++}
++
+ QSizeF
+ Context::AppletToolbar::sizeHint( Qt::SizeHint which, const QSizeF 
constraint ) const
+ {
+Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.orig
+Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.rej
+diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.h 
amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h
+--- amarok-2.5.0/src/context/toolbar/AppletToolbar.h   2011-12-15 
08:36:48.0 +0100
 amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h   2012-01-29 
20:17:52.414686784 +0100
+@@ -55,6 +55,9 @@ class AppletToolbar : public QGraphicsWi
+ 
+ void appletRemoved( Plasma::Applet* applet );
+ 
++void setContainment( Containment * containment );
++Containment* containment() const;
++
+ signals:
+ void showApplet( Plasma::Applet* );
+ void appletAddedToToolbar( Plasma::Applet* applet, int loc );
+Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.h.orig
+diff -rup amarok-2.5.0/src/context/ToolbarView.cpp 
amarok-2.5.0.new/src/context/ToolbarView.cpp
+--- amarok-2.5.0/src/context/ToolbarView.cpp   2011-12-15 08:36:48.0 
+0100
 amarok-2.5.0.new/src/context/ToolbarView.cpp   2012-01-29 
20:17:52.394686782 +0100
+@@ -74,7 +74,9 @@ Context::ToolbarView::ToolbarView( Plasm
+ setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+ 
+ // now we create the toolbar
+-m_toolbar = new AppletToolbar( containment );
++m_toolbar = new AppletToolbar(0);
++scene-addItem(m_toolbar.data());
++m_toolbar.data()-setContainment( qobject_castContext::Containment 
*(containment) );
+ m_toolbar.data()-setZValue( m_toolbar.data()-zValue() + 1000 );
+ m_toolbar.data()-setPos( TOOLBAR_X_OFFSET, 0 );
+ 
+@@ -96,7 +98,7 @@ Context::ToolbarView::ToolbarView( Plasm
+ 
+ Context::ToolbarView::~ToolbarView()
+ {
+-
++delete m_toolbar.data();
+ }
+ 
+ void
+Only in amarok-2.5.0.new/src/context: ToolbarView.cpp.orig

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Ronald van Haren]

Date: Friday, December 16, 2011 @ 15:03:50
  Author: ronald
Revision: 145091

upgpkg: amarok 2.5.0-1

update to 2.5.0

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-16 17:27:33 UTC (rev 145090)
+++ PKGBUILD2011-12-16 20:03:50 UTC (rev 145091)
@@ -1,11 +1,12 @@
 # $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
+# Maintainer: Ronald van Haren ron...@archlinux.org
+# Contributor: Andrea Scarpino and...@archlinux.org
 # Contributor: damir da...@archlinux.org
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.4.3
-pkgrel=3
+pkgver=2.5.0
+pkgrel=1
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
@@ -21,7 +22,7 @@
 libmygpo-qt: gpodder.net Internet Service)
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('24e8141bcbd065448911fa872c50197d')
+sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2')
 
 build() {
   cd ${srcdir}

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Saturday, November 12, 2011 @ 09:04:46
  Author: andrea
Revision: 142597

upgpkg: amarok 2.4.3-3

qt 4.7 rebuild

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-12 13:39:21 UTC (rev 142596)
+++ PKGBUILD2011-11-12 14:04:46 UTC (rev 142597)
@@ -5,7 +5,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.4.3
-pkgrel=2
+pkgrel=3
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Pierre Schmitz]

Date: Saturday, November 5, 2011 @ 05:40:54
  Author: pierre
Revision: 142097

ffmpeg rebuild

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-05 09:21:11 UTC (rev 142096)
+++ PKGBUILD2011-11-05 09:40:54 UTC (rev 142097)
@@ -5,7 +5,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;

[arch-commits] Commit in amarok/trunk (PKGBUILD amarok.install)

[Andrea Scarpino]

Date: Monday, August 1, 2011 @ 06:23:47
  Author: andrea
Revision: 134019

upgpkg: amarok 2.4.3-1
upstream release

Modified:
  amarok/trunk/PKGBUILD
  amarok/trunk/amarok.install

+
 PKGBUILD   |   11 +++
 amarok.install |1 +
 2 files changed, 4 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-01 08:37:20 UTC (rev 134018)
+++ PKGBUILD2011-08-01 10:23:47 UTC (rev 134019)
@@ -4,7 +4,7 @@
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.4.2
+pkgver=2.4.3
 pkgrel=1
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
@@ -20,15 +20,10 @@
 ifuse: support for Apple iPod Touch and iPhone
 libmygpo-qt: gpodder.net Internet Service)
 install=${pkgname}.install
-source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
-'fix-kwallet-lastfm.patch')
-md5sums=('18fba23496d0ee2aa4a1f4b462279922'
- '9eac712acbb24799290cdd42390656ac')
+source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
+md5sums=('24e8141bcbd065448911fa872c50197d')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 -i ${srcdir}/fix-kwallet-lastfm.patch
-
   cd ${srcdir}
   mkdir build
   cd build

Modified: amarok.install
===
--- amarok.install  2011-08-01 08:37:20 UTC (rev 134018)
+++ amarok.install  2011-08-01 10:23:47 UTC (rev 134019)
@@ -1,5 +1,6 @@
 post_install() {
xdg-icon-resource forceupdate --theme hicolor  /dev/null
+update-desktop-database -q
 }
 
 post_upgrade() {

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Sunday, July 24, 2011 @ 18:50:45
  Author: andrea
Revision: 132557

Upstream release

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |   19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-24 22:48:47 UTC (rev 132556)
+++ PKGBUILD2011-07-24 22:50:45 UTC (rev 132557)
@@ -4,8 +4,8 @@
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.4.1
-pkgrel=3
+pkgver=2.4.2
+pkgrel=1
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
@@ -20,11 +20,16 @@
 ifuse: support for Apple iPod Touch and iPhone
 libmygpo-qt: gpodder.net Internet Service)
 install=${pkgname}.install
-source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('4c65c5cd4d7bd267bdbef8e912fd6cb6')
+source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
+'fix-kwallet-lastfm.patch')
+md5sums=('18fba23496d0ee2aa4a1f4b462279922'
+ '9eac712acbb24799290cdd42390656ac')
 
 build() {
-  cd ${srcdir}
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p1 -i ${srcdir}/fix-kwallet-lastfm.patch
+
+  cd ${srcdir}
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -34,6 +39,6 @@
 }
 
 package(){
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
 }

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Monday, June 27, 2011 @ 16:27:37
  Author: andrea
Revision: 129446

upgpkg: amarok 2.4.1-3
rebuilt with kdelibs 4.6.3

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-27 20:09:55 UTC (rev 129445)
+++ PKGBUILD2011-06-27 20:27:37 UTC (rev 129446)
@@ -5,7 +5,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Tuesday, June 14, 2011 @ 02:48:07
  Author: andrea
Revision: 127380

upgpkg: amarok 2.4.1-2
libmtp rebuild

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-14 00:31:12 UTC (rev 127379)
+++ PKGBUILD2011-06-14 06:48:07 UTC (rev 127380)
@@ -5,7 +5,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Friday, May 6, 2011 @ 02:21:17
  Author: andrea
Revision: 122693

upstream release

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |   20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-06 06:20:55 UTC (rev 122692)
+++ PKGBUILD2011-05-06 06:21:17 UTC (rev 122693)
@@ -4,22 +4,24 @@
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.4.0
-pkgrel=4
-pkgdesc=A media player for KDE
+pkgver=2.4.1
+pkgrel=1
+pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
 license=('GPL2' 'LGPL2' 'FDL')
 depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
-'liblastfm' 'ffmpeg' 'libofa')
-makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth')
+'liblastfm' 'ffmpeg' 'libofa' 'qjson')
+makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
+ 'libmygpd-qt)
 optdepends=(libgpod: support for Apple iPod audio devices
-   libmtp: support for portable media devices
-   loudmouth: backend needed by mp3tunes for syncing
-ifuse: support for Apple iPod Touch and iPhone)
+   libmtp: support for portable media devices
+   loudmouth: backend needed by mp3tunes for syncing
+ifuse: support for Apple iPod Touch and iPhone
+libmygpod-qt: gpodder.net Internet Service)
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('bdb6ddc8e38d0982a0786ff8ac96d923')
+md5sums=('4c65c5cd4d7bd267bdbef8e912fd6cb6')
 
 build() {
   cd ${srcdir}

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Friday, May 6, 2011 @ 02:26:05
  Author: andrea
Revision: 122696

typo

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-06 06:22:53 UTC (rev 122695)
+++ PKGBUILD2011-05-06 06:26:05 UTC (rev 122696)
@@ -9,16 +9,16 @@
 pkgdesc=The powerful music player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
-license=('GPL2' 'LGPL2' 'FDL')
+license=('GPL2' 'LGPL2.1' 'FDL')
 depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
 'liblastfm' 'ffmpeg' 'libofa' 'qjson')
 makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
- 'libmygpd-qt)
+ 'libmygpo-qt')
 optdepends=(libgpod: support for Apple iPod audio devices
libmtp: support for portable media devices
loudmouth: backend needed by mp3tunes for syncing
 ifuse: support for Apple iPod Touch and iPhone
-libmygpod-qt: gpodder.net Internet Service)
+libmygpo-qt: gpodder.net Internet Service)
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
 md5sums=('4c65c5cd4d7bd267bdbef8e912fd6cb6')

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Thursday, March 17, 2011 @ 17:56:46
  Author: andrea
Revision: 115423

upgpkg: amarok 2.4.0-4
rebuilt upon mysql 5.5.10-2

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-17 21:55:50 UTC (rev 115422)
+++ PKGBUILD2011-03-17 21:56:46 UTC (rev 115423)
@@ -5,15 +5,14 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc=A media player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
 license=('GPL2' 'LGPL2' 'FDL')
 depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
 'liblastfm' 'ffmpeg' 'libofa')
-makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
-'docbook-xsl')
+makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth')
 optdepends=(libgpod: support for Apple iPod audio devices
libmtp: support for portable media devices
loudmouth: backend needed by mp3tunes for syncing

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Thursday, February 10, 2011 @ 02:34:55
  Author: andrea
Revision: 109496

added ifuse as optdependence (FS#22590)

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-10 07:34:49 UTC (rev 109495)
+++ PKGBUILD2011-02-10 07:34:55 UTC (rev 109496)
@@ -14,9 +14,10 @@
 'liblastfm' 'ffmpeg' 'libofa')
 makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
 'docbook-xsl')
-optdepends=(libgpod: support Apple iPod audio devices
+optdepends=(libgpod: support for Apple iPod audio devices
libmtp: support for portable media devices
-   loudmouth: backend needed by mp3tunes for syncing)
+   loudmouth: backend needed by mp3tunes for syncing
+ifuse: support for Apple iPod Touch and iPhone)
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
 md5sums=('bdb6ddc8e38d0982a0786ff8ac96d923')

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Friday, February 4, 2011 @ 17:01:15
  Author: andrea
Revision: 108927

upgpkg: amarok 2.4.0-2
Rebuilt upon mysql 5.5.8-8

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-04 22:00:09 UTC (rev 108926)
+++ PKGBUILD2011-02-04 22:01:15 UTC (rev 108927)
@@ -5,7 +5,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc=A media player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;

[arch-commits] Commit in amarok/trunk (PKGBUILD scanning-qt-regression.patch)

[Andrea Scarpino]

Date: Thursday, September 23, 2010 @ 13:52:22
  Author: andrea
Revision: 91173

add a patch to fix regression during scanning collection

Added:
  amarok/trunk/scanning-qt-regression.patch
Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |   27 -
 scanning-qt-regression.patch |   80 +
 2 files changed, 97 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-23 14:31:59 UTC (rev 91172)
+++ PKGBUILD2010-09-23 17:52:22 UTC (rev 91173)
@@ -5,7 +5,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc=A media player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
@@ -16,17 +16,24 @@
libmtp: support for portable media devices
loudmouth: backend needed by mp3tunes for syncing)
 install=${pkgname}.install
-source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('4e03dc009f8b44d9b8dfb5f6d1034081')
+source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
+   'scanning-qt-regression.patch')
+md5sums=('4e03dc009f8b44d9b8dfb5f6d1034081'
+   'a2effdfed3cf836c42264edbd2845441')
 
 build() {
-   cd ${srcdir}
-   mkdir build
-   cd build
-   cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
-   make
+  # Already fixed upstream see:
+  # https://bugs.kde.org/show_bug.cgi?id=251762
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/scanning-qt-regression.patch
+
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr
+  make
 }
 
 package(){

Added: scanning-qt-regression.patch
===
--- scanning-qt-regression.patch(rev 0)
+++ scanning-qt-regression.patch2010-09-23 17:52:22 UTC (rev 91173)
@@ -0,0 +1,80 @@
+From: Jeff Mitchell mitch...@kde.org
+Date: Wed, 22 Sep 2010 22:15:17 + (-0400)
+Subject: Re-add some tests for unprintable but also invalid chars. Apparently 
Qt's XML classes... 
+X-Git-Url: http://gitweb.kde.org?hp=fd2a40d970c57fa2102e95de1a60c59e37892638
+
+Re-add some tests for unprintable but also invalid chars. Apparently Qt's XML 
classes don't properly check for invalid chars when writing XML, even if you 
tell them to.
+
+Also switch to QXmlStreamWriter, as apparently going forward it is the more 
supported class.
+
+BUG: 251762
+---
+
+diff --git a/utilities/collectionscanner/CollectionScanner.cpp 
b/utilities/collectionscanner/CollectionScanner.cpp
+index 0a23a53..28c554b 100644
+--- a/utilities/collectionscanner/CollectionScanner.cpp
 b/utilities/collectionscanner/CollectionScanner.cpp
+@@ -37,13 +37,13 @@
+ #include QByteArray
+ #include QDBusReply
+ #include QDir
+-#include QDomDocument
+ #include QFile
+ #include QtDebug
+ #include QTextCodec
+ #include QTextStream
+ #include QTimer
+ #include QThread
++#include QXmlStreamWriter
+ 
+ //Taglib:
+ #include apetag.h
+@@ -814,8 +814,10 @@ CollectionScanner::readTags( const QString path, 
TagLib::AudioProperties::ReadS
+ void
+ CollectionScanner::writeElement( const QString name, const AttributeHash 
attributes )
+ {
+-QDomDocument doc; // A dummy. We don't really use DOM, but SAX2
+-QDomElement element = doc.createElement( name );
++QString text;
++QXmlStreamWriter writer( text );
++
++writer.writeStartElement( name );
+ 
+ QHashIteratorQString, QString it( attributes );
+ while( it.hasNext() )
+@@ -829,7 +831,15 @@ CollectionScanner::writeElement( const QString name, 
const AttributeHash attri
+ bool noCategory = false;
+ for( unsigned i = 0; i  len; i++ )
+ {
+-if( data[i].category() == QChar::NoCategory )
++if( data[i].category() == QChar::NoCategory ||
++data[i].category() == QChar::Other_Surrogate ||
++( 
++data[i].unicode()  20 
++data[i].unicode() != 9 
++data[i].unicode() != 10 
++data[i].unicode() != 13
++)
++)
+ {
+ noCategory = true;
+ break;
+@@ -838,15 +848,12 @@ CollectionScanner::writeElement( const QString name, 
const AttributeHash attri
+ 
+ if( noCategory )
+ continue;
+-
+-element.setAttribute( it.key(), it.value() );
++writer.writeAttribute( it.key(), it.value() );
+ }
+ 
+-QString text;
+-QTextStream stream( text, QIODevice::WriteOnly );
+-element.save( stream, 0 );
++writer.writeEndElement();
+ 
+-std::cout  text.toUtf8().data()  std::endl;
++std::cout  

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Thursday, September 16, 2010 @ 05:32:11
  Author: andrea
Revision: 90800

upstream release

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-16 06:06:08 UTC (rev 90799)
+++ PKGBUILD2010-09-16 09:32:11 UTC (rev 90800)
@@ -4,20 +4,20 @@
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.3.1
+pkgver=2.3.2
 pkgrel=1
 pkgdesc=A media player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
 license=('GPL2' 'LGPL2' 'FDL')
 depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras' 
'liblastfm')
-makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth')
+makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' 
'docbook-xsl')
 optdepends=(libgpod: support Apple iPod audio devices
libmtp: support for portable media devices
loudmouth: backend needed by mp3tunes for syncing)
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('6679adaf5cc757b1515a9f03cdcb6066')
+md5sums=('4e03dc009f8b44d9b8dfb5f6d1034081')
 
 build() {
cd ${srcdir}
@@ -25,12 +25,11 @@
cd build
cmake ../${pkgname}-${pkgver} \
  -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
  -DCMAKE_INSTALL_PREFIX=/usr
-   make || return 1
+   make
 }
 
 package(){
   cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 }

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Monday, May 31, 2010 @ 18:36:36
  Author: andrea
Revision: 81575

upgpkg: amarok 2.3.1-1
upstream release

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-31 20:15:23 UTC (rev 81574)
+++ PKGBUILD2010-05-31 22:36:36 UTC (rev 81575)
@@ -4,7 +4,7 @@
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.3.0
+pkgver=2.3.1
 pkgrel=1
 pkgdesc=A media player for KDE
 arch=(i686 x86_64)
@@ -17,7 +17,7 @@
loudmouth: backend needed by mp3tunes for syncing)
 install=${pkgname}.install
 
source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('fc672a2848e36b3b44eb81dd1466e4f4')
+md5sums=('6679adaf5cc757b1515a9f03cdcb6066')
 
 build() {
cd ${srcdir}

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Saturday, February 6, 2010 @ 08:13:26
  Author: andrea
Revision: 67339

upgpkg: amarok 2.2.2-4
rebuilt cause of new libmtp (FS#18174)

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-06 13:13:05 UTC (rev 67338)
+++ PKGBUILD2010-02-06 13:13:26 UTC (rev 67339)
@@ -5,7 +5,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.2.2
-pkgrel=3
+pkgrel=4
 pkgdesc=A media player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Friday, February 5, 2010 @ 16:21:26
  Author: andrea
Revision: 67229

undo

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-05 21:20:19 UTC (rev 67228)
+++ PKGBUILD2010-02-05 21:21:26 UTC (rev 67229)
@@ -5,7 +5,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.2.2
-pkgrel=4
+pkgrel=3
 pkgdesc=A media player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Sunday, January 17, 2010 @ 13:38:16
  Author: andrea
Revision: 63513

cleanup build

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |1 -
 1 file changed, 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-17 18:30:17 UTC (rev 63512)
+++ PKGBUILD2010-01-17 18:38:16 UTC (rev 63513)
@@ -31,7 +31,6 @@
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
-   -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined 
-Wl,--as-needed' \
-DCMAKE_INSTALL_PREFIX=/usr
make || return 1
make DESTDIR=${pkgdir} install || return 1

[arch-commits] Commit in amarok/trunk (PKGBUILD fix-photo-widget.patch)

[Andrea Scarpino]

Date: Wednesday, January 13, 2010 @ 20:09:10
  Author: andrea
Revision: 63019

upgpkg: amarok 2.2.2-2
applied a patch from upstream that fix the photo widget

Added:
  amarok/trunk/fix-photo-widget.patch
Modified:
  amarok/trunk/PKGBUILD

+
 PKGBUILD   |   12 +---
 fix-photo-widget.patch |   11 +++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-14 00:41:20 UTC (rev 63018)
+++ PKGBUILD2010-01-14 01:09:10 UTC (rev 63019)
@@ -5,7 +5,7 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc=A media player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
@@ -16,10 +16,16 @@
libmtp: support for portable media devices
loudmouth: backend needed by mp3tunes for syncing)
 install=${pkgname}.install
-source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('c2c4ae2f2ff7154a064b554cdee557a9')
+source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
+   'fix-photo-widget.patch')
+md5sums=('c2c4ae2f2ff7154a064b554cdee557a9'
+ '43f029e83500eb2edb773ad82d302a11')
 
 build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   # already fixed in 2.2.3
+   patch -Np1 -i ${srcdir}/fix-photo-widget.patch || return 1
+
cd ${srcdir}
mkdir build
cd build

Added: fix-photo-widget.patch
===
--- fix-photo-widget.patch  (rev 0)
+++ fix-photo-widget.patch  2010-01-14 01:09:10 UTC (rev 63019)
@@ -0,0 +1,11 @@
+--- a/src/context/engines/photos/PhotosEngine.cpp
 b/src/context/engines/photos/PhotosEngine.cpp
+@@ -156,7 +156,7 @@ void PhotosEngine::update()
+ // Show the information
+ if( !m_artist.isEmpty() )
+ {
+-setData( photos, message, i18n( Fetching ) );
++setData( photos, message, Fetching);
+ setData( photos, artist, m_artist );
+ }
+ else
\ No newline at end of file

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Monday, January 11, 2010 @ 19:46:51
  Author: andrea
Revision: 62780

upgpkg: amarok 2.2.2-1
upstream release; moved some depends as optional

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |   16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-12 00:34:03 UTC (rev 62779)
+++ PKGBUILD2010-01-12 00:46:51 UTC (rev 62780)
@@ -4,18 +4,20 @@
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.2.1.90
+pkgver=2.2.2
 pkgrel=1
 pkgdesc=A media player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
 license=('GPL2' 'LGPL2' 'FDL')
-depends=('mysql' 'kdebase-runtime' 'libmtp' 'libgpod' 'qtscriptgenerator'
-   'taglib-extras' 'liblastfm' 'loudmouth' 'qca')
-makedepends=('pkgconfig' 'automoc4' 'cmake')
-install=amarok.install
-source=(http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('0fb6c98618c91159a26e3f2e837ef132')
+depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras' 
'liblastfm' 'qca')
+makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth')
+optdepends=(libgpod: support Apple iPod audio devices
+   libmtp: support for portable media devices
+   loudmouth: backend needed by mp3tunes for syncing)
+install=${pkgname}.install
+source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
+md5sums=('c2c4ae2f2ff7154a064b554cdee557a9')
 
 build() {
cd ${srcdir}

[arch-commits] Commit in (amarok/trunk/PKGBUILD kbluetooth/trunk/PKGBUILD)

[Andrea Scarpino]

Date: Friday, January 8, 2010 @ 12:29:45
  Author: andrea
Revision: 62423

undo. I hate SVN and my stupidity

Modified:
  amarok/trunk/PKGBUILD
  kbluetooth/trunk/PKGBUILD

---+
 amarok/trunk/PKGBUILD |4 ++--
 kbluetooth/trunk/PKGBUILD |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Modified: amarok/trunk/PKGBUILD
===
--- amarok/trunk/PKGBUILD   2010-01-08 17:27:56 UTC (rev 62422)
+++ amarok/trunk/PKGBUILD   2010-01-08 17:29:45 UTC (rev 62423)
@@ -5,12 +5,12 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.2.1.90
-pkgrel=2
+pkgrel=1
 pkgdesc=A media player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
 license=('GPL2' 'LGPL2' 'FDL')
-depends=('mysql' 'kdebase-runtime=4.3.90' 'libmtp' 'libgpod' 
'qtscriptgenerator'
+depends=('mysql' 'kdebase-runtime' 'libmtp' 'libgpod' 'qtscriptgenerator'
'taglib-extras' 'liblastfm' 'loudmouth' 'qca')
 makedepends=('pkgconfig' 'automoc4' 'cmake')
 install=amarok.install

Modified: kbluetooth/trunk/PKGBUILD
===
--- kbluetooth/trunk/PKGBUILD   2010-01-08 17:27:56 UTC (rev 62422)
+++ kbluetooth/trunk/PKGBUILD   2010-01-08 17:29:45 UTC (rev 62423)
@@ -6,12 +6,12 @@
 pkgname=kbluetooth
 pkgver=4.0.4RC2
 _pkgver=RC2
-pkgrel=2
+pkgrel=1
 pkgdesc=A collection of Bluetooth utilities and modules for KDE based on 
BlueZ
 arch=('i686' 'x86_64')
 url=http://www.kde-apps.org/content/show.php/kbluetooth?content=112110;
 license=('GPL2')
-depends=('kdebase-workspace=4.3.90' 'bluez=4.59' 'obex-data-server=0.4.4')
+depends=('kdebase-workspace=4.3.0' 'bluez=4.55' 'obex-data-server=0.4.4')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'perl')
 optdepends=('python')
 replaces=('kdebluetooth')

[arch-commits] Commit in amarok/trunk (PKGBUILD fix-random-with-repeat.patch)

[Andrea Scarpino]

Date: Wednesday, December 16, 2009 @ 15:18:44
  Author: andrea
Revision: 61491

upgpkg: amarok 2.2.1.90-1
upstream beta release

Modified:
  amarok/trunk/PKGBUILD
Deleted:
  amarok/trunk/fix-random-with-repeat.patch

--+
 PKGBUILD |   18 +--
 fix-random-with-repeat.patch |  206 -
 2 files changed, 6 insertions(+), 218 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-16 19:41:39 UTC (rev 61490)
+++ PKGBUILD2009-12-16 20:18:44 UTC (rev 61491)
@@ -4,26 +4,20 @@
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.2.1
-pkgrel=2
+pkgver=2.2.1.90
+pkgrel=1
 pkgdesc=A media player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
 license=('GPL2' 'LGPL2' 'FDL')
-depends=('mysql=5.1.41' 'kdebase-runtime=4.3' 'libmtp=0.3.7' 
'libgpod=0.7.2'
-   'qtscriptgenerator=0.1.0' 'taglib-extras=1.0.1' 'liblastfm=0.3.0'
-   'loudmouth=1.4.3' 'qca')
+depends=('mysql' 'kdebase-runtime' 'libmtp' 'libgpod' 'qtscriptgenerator'
+   'taglib-extras' 'liblastfm' 'loudmouth' 'qca')
 makedepends=('pkgconfig' 'automoc4' 'cmake')
 install=amarok.install
-source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
-   'fix-random-with-repeat.patch')
-md5sums=('4f6f45f0c25f85f2a2a1fff169ac7193'
- '4932796051747035e67a6ff68b4ea561')
+source=(http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
+md5sums=('0fb6c98618c91159a26e3f2e837ef132')
 
 build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   patch -Np1 -i ${srcdir}/fix-random-with-repeat.patch || return 1
-
cd ${srcdir}
mkdir build
cd build

Deleted: fix-random-with-repeat.patch
===
--- fix-random-with-repeat.patch2009-12-16 19:41:39 UTC (rev 61490)
+++ fix-random-with-repeat.patch2009-12-16 20:18:44 UTC (rev 61491)
@@ -1,206 +0,0 @@
 amarok-2.2.1/src/playlist/navigators/RandomTrackNavigator.cpp~ 
2009-11-11 22:09:13.0 +0100
-+++ amarok-2.2.1/src/playlist/navigators/RandomTrackNavigator.cpp  
2009-11-20 13:24:12.310019258 +0100
-@@ -33,13 +33,15 @@
- Playlist::RandomTrackNavigator::RandomTrackNavigator()
- {
- m_model = Playlist::ModelStack::instance()-top();
-+
-+reset();
-+
- connect( model(), SIGNAL( insertedIds( const QListquint64 ) ),
-  this, SLOT( recvInsertedIds( const QListquint64 ) ) );
- connect( model(), SIGNAL( removedIds( const QListquint64 ) ),
-  this, SLOT( recvRemovedIds( const QListquint64 ) ) );
--connect( model(), SIGNAL( layoutChanged() ), this, SLOT( 
modelLayoutChanged() ) );
--
--reset();
-+connect( model(), SIGNAL( activeTrackChanged( const quint64 ) ),
-+ this, SLOT( recvActiveTrackChanged( const quint64 ) ) );
- }
- 
- void
-@@ -51,12 +53,6 @@
- {
- m_unplayedRows.append( t );
- }
--else
--{
--// insert a new, but played, track at a random position
--int pos = KRandom::random() % m_playedRows.size();
--m_playedRows.insert( pos, t );
--}
- }
- 
- std::random_shuffle( m_unplayedRows.begin(), m_unplayedRows.end() );
-@@ -75,7 +71,11 @@
- void
- Playlist::RandomTrackNavigator::recvActiveTrackChanged( const quint64 id )
- {
--if ( m_unplayedRows.contains( id ) )
-+if( m_replayedRows.contains( id ) )
-+{
-+m_playedRows.prepend( m_replayedRows.takeAt( m_replayedRows.indexOf( 
id ) ) );
-+}
-+else if( m_unplayedRows.contains( id ) )
- {
- m_playedRows.prepend( m_unplayedRows.takeAt( m_unplayedRows.indexOf( 
id ) ) );
- }
-@@ -86,7 +86,7 @@
- {
- if( !m_queue.isEmpty() )
- return m_queue.takeFirst();
--if( m_unplayedRows.isEmpty()  m_playedRows.isEmpty() )
-+if( m_model-tracks().isEmpty() )
- return 0;
- else if( m_unplayedRows.isEmpty()  !m_repeatPlaylist )
- return 0;
-@@ -94,8 +94,8 @@
- {
- if ( m_unplayedRows.isEmpty() )
- {
--m_unplayedRows = m_playedRows;
--m_playedRows.clear();
-+// reset when playlist finishes
-+reset();
- }
- 
- quint64 requestedTrack = 0;
-@@ -106,14 +106,22 @@
- // remove the id from the unplayed rows list
- m_unplayedRows.removeAll( requestedTrack );
- }
--else if ( !m_unplayedRows.isEmpty() )
-+else if ( !m_replayedRows.isEmpty() )
-+{
-+requestedTrack = m_replayedRows.takeFirst();
-+}
-+else if (!m_unplayedRows.isEmpty() )
-+{
- requestedTrack = m_unplayedRows.takeFirst();
-+}
- 
- if ( requestedTrack == m_model-activeId())
- {
- m_playedRows.prepend( 

[arch-commits] Commit in amarok/trunk (PKGBUILD fix-random-with-repeat.patch)

[Andrea Scarpino]

Date: Friday, November 20, 2009 @ 09:08:17
  Author: andrea
Revision: 59141

upgpkg: amarok 2.2.1-2
fix random mode when repeat mode is enabled

Added:
  amarok/trunk/fix-random-with-repeat.patch
Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |   13 +-
 fix-random-with-repeat.patch |  206 +
 2 files changed, 215 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-20 11:18:17 UTC (rev 59140)
+++ PKGBUILD2009-11-20 14:08:17 UTC (rev 59141)
@@ -5,20 +5,25 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc=A media player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
 license=('GPL2' 'LGPL2' 'FDL')
-depends=('mysql=5.1.37' 'kdebase-runtime=4.3' 'libmtp=0.3.7' 
'libgpod=0.7.2'
+depends=('mysql=5.1.41' 'kdebase-runtime=4.3' 'libmtp=0.3.7' 
'libgpod=0.7.2'
'qtscriptgenerator=0.1.0' 'taglib-extras=1.0.1' 'liblastfm=0.3.0'
'loudmouth=1.4.3' 'qca')
 makedepends=('pkgconfig' 'automoc4' 'cmake')
 install=amarok.install
-source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('4f6f45f0c25f85f2a2a1fff169ac7193')
+source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;
+   'fix-random-with-repeat.patch')
+md5sums=('4f6f45f0c25f85f2a2a1fff169ac7193'
+ '4932796051747035e67a6ff68b4ea561')
 
 build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -Np1 -i ${srcdir}/fix-random-with-repeat.patch || return 1
+
cd ${srcdir}
mkdir build
cd build

Added: fix-random-with-repeat.patch
===
--- fix-random-with-repeat.patch(rev 0)
+++ fix-random-with-repeat.patch2009-11-20 14:08:17 UTC (rev 59141)
@@ -0,0 +1,206 @@
+--- amarok-2.2.1/src/playlist/navigators/RandomTrackNavigator.cpp~ 
2009-11-11 22:09:13.0 +0100
 amarok-2.2.1/src/playlist/navigators/RandomTrackNavigator.cpp  
2009-11-20 13:24:12.310019258 +0100
+@@ -33,13 +33,15 @@
+ Playlist::RandomTrackNavigator::RandomTrackNavigator()
+ {
+ m_model = Playlist::ModelStack::instance()-top();
++
++reset();
++
+ connect( model(), SIGNAL( insertedIds( const QListquint64 ) ),
+  this, SLOT( recvInsertedIds( const QListquint64 ) ) );
+ connect( model(), SIGNAL( removedIds( const QListquint64 ) ),
+  this, SLOT( recvRemovedIds( const QListquint64 ) ) );
+-connect( model(), SIGNAL( layoutChanged() ), this, SLOT( 
modelLayoutChanged() ) );
+-
+-reset();
++connect( model(), SIGNAL( activeTrackChanged( const quint64 ) ),
++ this, SLOT( recvActiveTrackChanged( const quint64 ) ) );
+ }
+ 
+ void
+@@ -51,12 +53,6 @@
+ {
+ m_unplayedRows.append( t );
+ }
+-else
+-{
+-// insert a new, but played, track at a random position
+-int pos = KRandom::random() % m_playedRows.size();
+-m_playedRows.insert( pos, t );
+-}
+ }
+ 
+ std::random_shuffle( m_unplayedRows.begin(), m_unplayedRows.end() );
+@@ -75,7 +71,11 @@
+ void
+ Playlist::RandomTrackNavigator::recvActiveTrackChanged( const quint64 id )
+ {
+-if ( m_unplayedRows.contains( id ) )
++if( m_replayedRows.contains( id ) )
++{
++m_playedRows.prepend( m_replayedRows.takeAt( m_replayedRows.indexOf( 
id ) ) );
++}
++else if( m_unplayedRows.contains( id ) )
+ {
+ m_playedRows.prepend( m_unplayedRows.takeAt( m_unplayedRows.indexOf( 
id ) ) );
+ }
+@@ -86,7 +86,7 @@
+ {
+ if( !m_queue.isEmpty() )
+ return m_queue.takeFirst();
+-if( m_unplayedRows.isEmpty()  m_playedRows.isEmpty() )
++if( m_model-tracks().isEmpty() )
+ return 0;
+ else if( m_unplayedRows.isEmpty()  !m_repeatPlaylist )
+ return 0;
+@@ -94,8 +94,8 @@
+ {
+ if ( m_unplayedRows.isEmpty() )
+ {
+-m_unplayedRows = m_playedRows;
+-m_playedRows.clear();
++// reset when playlist finishes
++reset();
+ }
+ 
+ quint64 requestedTrack = 0;
+@@ -106,14 +106,22 @@
+ // remove the id from the unplayed rows list
+ m_unplayedRows.removeAll( requestedTrack );
+ }
+-else if ( !m_unplayedRows.isEmpty() )
++else if ( !m_replayedRows.isEmpty() )
++{
++requestedTrack = m_replayedRows.takeFirst();
++}
++else if (!m_unplayedRows.isEmpty() )
++{
+ requestedTrack = m_unplayedRows.takeFirst();
++}
+ 
+ if ( requestedTrack == m_model-activeId())
+ {
+ m_playedRows.prepend( requestedTrack );
+-if ( !m_unplayedRows.isEmpty() )
+-  

[arch-commits] Commit in amarok/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Monday, November 16, 2009 @ 21:41:08
  Author: andrea
Revision: 58904

upgpkg: amarok 2.2.1-1
upstream release

Modified:
  amarok/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-17 02:23:12 UTC (rev 58903)
+++ PKGBUILD2009-11-17 02:41:08 UTC (rev 58904)
@@ -4,19 +4,19 @@
 
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.2.0
-pkgrel=2
+pkgver=2.2.1
+pkgrel=1
 pkgdesc=A media player for KDE
 arch=(i686 x86_64)
 url=http://amarok.kde.org;
 license=('GPL2' 'LGPL2' 'FDL')
 depends=('mysql=5.1.37' 'kdebase-runtime=4.3' 'libmtp=0.3.7' 
'libgpod=0.7.2'
'qtscriptgenerator=0.1.0' 'taglib-extras=1.0.1' 'liblastfm=0.3.0'
-   'loudmouth=1.4.3')
+   'loudmouth=1.4.3' 'qca')
 makedepends=('pkgconfig' 'automoc4' 'cmake')
 install=amarok.install
 
source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;)
-md5sums=('5a0188c5eb7d343109b82964942d8eb5')
+md5sums=('4f6f45f0c25f85f2a2a1fff169ac7193')
 
 build() {
cd ${srcdir}