Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--media-sound/amarok/ChangeLog14
-rw-r--r--media-sound/amarok/Manifest24
-rw-r--r--media-sound/amarok/amarok-1.3.1-r1.ebuild100
-rw-r--r--media-sound/amarok/amarok-1.3.1-r2.ebuild93
-rw-r--r--media-sound/amarok/amarok-1.3.2-r1.ebuild (renamed from media-sound/amarok/amarok-1.3.2.ebuild)4
-rw-r--r--media-sound/amarok/amarok-1.3.ebuild93
-rw-r--r--media-sound/amarok/files/amarok-1.3.1-gst-alsaagain.patch36
-rw-r--r--media-sound/amarok/files/amarok-1.3.1-gst-onlyoss.patch25
-rw-r--r--media-sound/amarok/files/amarok-1.3.1-qt-3.3.5.patch40
-rw-r--r--media-sound/amarok/files/amarok-1.3.2-playlist.patch23
-rw-r--r--media-sound/amarok/files/digest-amarok-1.31
-rw-r--r--media-sound/amarok/files/digest-amarok-1.3.1-r11
-rw-r--r--media-sound/amarok/files/digest-amarok-1.3.1-r21
-rw-r--r--media-sound/amarok/files/digest-amarok-1.3.2-r1 (renamed from media-sound/amarok/files/digest-amarok-1.3.2)0
14 files changed, 42 insertions, 413 deletions
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index bad266286285..c1adbf88934c 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,18 @@
# ChangeLog for media-sound/amarok
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.74 2005/09/20 21:43:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.75 2005/09/22 17:18:59 flameeyes Exp $
+
+*amarok-1.3.2-r1 (22 Sep 2005)
+
+ 22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+ -files/amarok-1.3.1-gst-alsaagain.patch,
+ -files/amarok-1.3.1-gst-onlyoss.patch, -files/amarok-1.3.1-qt-3.3.5.patch,
+ +files/amarok-1.3.2-playlist.patch, -amarok-1.3.ebuild,
+ -amarok-1.3.1-r1.ebuild, -amarok-1.3.1-r2.ebuild, -amarok-1.3.2.ebuild,
+ +amarok-1.3.2-r1.ebuild:
+ Added patch to fix crashes on startup with 1.3 series. Thanks to Mark
+ Kretschmann for the patch. Purged old 1.3 ebuilds as they are not stable
+ enough.
*amarok-1.3.2 (20 Sep 2005)
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index b328e0a39f37..043344d79c8d 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,28 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 5b6625e929c727689dc2d2177430564f amarok-1.3.2-r1.ebuild 2983
MD5 b0d327442408714d13042db2e69565fe ChangeLog 11667
-MD5 55daec9c79d8d3f5247ebb8113a57512 amarok-1.3.1-r2.ebuild 3024
-MD5 81f00c356bf82789fc54bdd49f627547 amarok-1.3.1-r1.ebuild 3225
-MD5 91f47828b3a009ecbaa2ef170520aa5f amarok-1.3.ebuild 3001
-MD5 0dc39f16679e62e2417257a0786dbf22 amarok-1.3.2.ebuild 2940
MD5 a62708867dd0a86debc654ed4ab63800 amarok-1.2.3.ebuild 2331
MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
MD5 25af04c1ed653efd29b66d9a0f2fc564 amarok-1.2.4.ebuild 2400
-MD5 2f8b18e60aedeb3c67252be88d60034d files/digest-amarok-1.3.1-r2 66
MD5 9966964d087dd7c05b7fa2efeff9b1ac files/digest-amarok-1.2.4 66
-MD5 f0419ae63b32ec21cade0de14b2c8334 files/amarok-1.3.1-qt-3.3.5.patch 1546
MD5 32030194ea3f2079d1db17aa160f63a2 files/amarok-gcc4.gz 522
-MD5 ec2d8b44a6a36ca4c78da27e9c09175e files/amarok-1.3.1-gst-onlyoss.patch 1083
-MD5 2f8b18e60aedeb3c67252be88d60034d files/digest-amarok-1.3.1-r1 66
-MD5 60980fa0862b2fc7960d57c1cd290769 files/digest-amarok-1.3.2 66
-MD5 83cd9605e8b745fee6ec51bded1eed2c files/amarok-1.3.1-gst-alsaagain.patch 1511
-MD5 4f4eae9cff4ef39fb98bf5109faf8113 files/digest-amarok-1.3 64
+MD5 2c87360717994ec4990d59d123e7fd2f files/amarok-1.3.2-playlist.patch 1090
+MD5 60980fa0862b2fc7960d57c1cd290769 files/digest-amarok-1.3.2-r1 66
MD5 55c15fa0003bd71db5f7e23d750c0b16 files/digest-amarok-1.2.3 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDMIKuj5H05b2HAEkRAh83AJ0ZPyAScdRKS019k9DU7tmq3y0/1wCcDRuf
-+WGTrCUHqfxalTYjZYE8t8s=
-=SPzu
------END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.3.1-r1.ebuild b/media-sound/amarok/amarok-1.3.1-r1.ebuild
deleted file mode 100644
index 871c4754b1dc..000000000000
--- a/media-sound/amarok/amarok-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3.1-r1.ebuild,v 1.2 2005/09/08 23:06:39 flameeyes Exp $
-
-inherit kde eutils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="amaroK - the audio player for KDE."
-HOMEPAGE="http://amarok.kde.org/"
-SRC_URI="mirror://sourceforge/amarok/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc -sparc ~x86"
-IUSE="arts flac gstreamer kde mp3 mysql noamazon opengl postgres xine xmms
-visualization vorbis musicbrainz"
-# kde: enables compilation of the konqueror sidebar plugin
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
- arts? ( kde-base/arts
- || ( ( kde-base/kdemultimedia-arts kde-base/akode )
- kde-base/kdemultimedia ) )
- xine? ( >=media-libs/xine-lib-1_rc4 )
- gstreamer? ( >=media-libs/gstreamer-0.8.8
- >=media-libs/gst-plugins-0.8.6 )
- musicbrainz? ( >=media-libs/tunepimp-0.3.0 )
- >=media-libs/taglib-1.4
- mysql? ( >=dev-db/mysql-4.0.16 )
- postgres? ( dev-db/postgresql )
- opengl? ( virtual/opengl )
- xmms? ( >=media-sound/xmms-1.2 )
- visualization? ( media-libs/libsdl
- >=media-plugins/libvisual-plugins-0.2 )"
-
-RDEPEND="${DEPEND}
- gstreamer? ( mp3? ( >=media-plugins/gst-plugins-mad-0.8.6 )
- vorbis? ( >=media-plugins/gst-plugins-ogg-0.8.6
- >=media-plugins/gst-plugins-vorbis-0.8.6 )
- flac? ( >=media-plugins/gst-plugins-flac-0.8.6 ) )"
-
-DEPEND="${DEPEND}
- >=dev-util/pkgconfig-0.9.0"
-
-need-kde 3.3
-
-PATCHES="${FILESDIR}/${P}-gst-onlyoss.patch"
-
-pkg_setup() {
- if use arts && ! use xine && ! use gstreamer; then
- ewarn "aRts support is deprecated, if you have problems please consider"
- ewarn "enabling support for Xine (preferred) or GStreamer"
- ewarn "(emerge amarok again with USE=\"xine\" or USE=\"gstreamer\")."
- ebeep 2
- fi
-
- if ! use arts && ! use xine && ! use gstreamer; then
- eerror "amaroK needs either aRts (deprecated), Xine (preferred) or GStreamer to work,"
- eerror "please try again with USE=\"arts\", USE=\"xine\" or USE=\"gstreamer\"."
- die
- fi
-
- # check whether kdelibs was compiled with arts support
- kde_pkg_setup
-}
-
-src_compile() {
- # amarok does not respect kde coding standards, and makes a lot of
- # assuptions regarding its installation directory. For this reason,
- # it must be installed in the KDE install directory.
- PREFIX="${KDEDIR}"
-
- local myconf="$(use_with arts) $(use_with xine) $(use_with gstreamer)
- $(use_enable mysql) $(use_enable postgres postgresql)
- $(use_with opengl) $(use_with xmms)
- $(use_with visualization libvisual)
- $(use_enable !noamazon amazon)"
-
- kde_src_compile
-}
-
-src_install() {
- kde_src_install
-
- # move the desktop file in /usr/share
- dodir /usr/share/applications/kde
- mv ${D}${KDEDIR}/share/applications/kde/amarok.desktop \
- ${D}/usr/share/applications/kde/amarok.desktop || die
-}
-
-pkg_postinst() {
- if use gstreamer; then
- einfo "From version 1.3.1, amaroK doesn't support anymore alsa output with"
- einfo "gstreamer engine."
- einfo "If you want to use alsa output, consider moving to xine engine instead."
- fi
-}
-
diff --git a/media-sound/amarok/amarok-1.3.1-r2.ebuild b/media-sound/amarok/amarok-1.3.1-r2.ebuild
deleted file mode 100644
index ec8329a23fc7..000000000000
--- a/media-sound/amarok/amarok-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3.1-r2.ebuild,v 1.2 2005/09/18 16:11:29 flameeyes Exp $
-
-inherit kde eutils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="amaroK - the audio player for KDE."
-HOMEPAGE="http://amarok.kde.org/"
-SRC_URI="mirror://sourceforge/amarok/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc -sparc ~x86"
-IUSE="arts flac gstreamer kde mp3 mysql noamazon opengl postgres xine xmms
-visualization vorbis musicbrainz"
-# kde: enables compilation of the konqueror sidebar plugin
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
- arts? ( kde-base/arts
- || ( ( kde-base/kdemultimedia-arts kde-base/akode )
- kde-base/kdemultimedia ) )
- xine? ( >=media-libs/xine-lib-1_rc4 )
- gstreamer? ( >=media-libs/gstreamer-0.8.8
- >=media-libs/gst-plugins-0.8.6 )
- musicbrainz? ( >=media-libs/tunepimp-0.3.0 )
- >=media-libs/taglib-1.4
- mysql? ( >=dev-db/mysql-4.0.16 )
- postgres? ( dev-db/postgresql )
- opengl? ( virtual/opengl )
- xmms? ( >=media-sound/xmms-1.2 )
- visualization? ( media-libs/libsdl
- >=media-plugins/libvisual-plugins-0.2 )"
-
-RDEPEND="${DEPEND}
- gstreamer? ( mp3? ( >=media-plugins/gst-plugins-mad-0.8.6 )
- vorbis? ( >=media-plugins/gst-plugins-ogg-0.8.6
- >=media-plugins/gst-plugins-vorbis-0.8.6 )
- flac? ( >=media-plugins/gst-plugins-flac-0.8.6 ) )"
-
-DEPEND="${DEPEND}
- >=dev-util/pkgconfig-0.9.0"
-
-need-kde 3.3
-
-PATCHES="${FILESDIR}/${P}-gst-alsaagain.patch
- ${FILESDIR}/${P}-qt-3.3.5.patch"
-
-pkg_setup() {
- if use arts && ! use xine && ! use gstreamer; then
- ewarn "aRts support is deprecated, if you have problems please consider"
- ewarn "enabling support for Xine (preferred) or GStreamer"
- ewarn "(emerge amarok again with USE=\"xine\" or USE=\"gstreamer\")."
- ebeep 2
- fi
-
- if ! use arts && ! use xine && ! use gstreamer; then
- eerror "amaroK needs either aRts (deprecated), Xine (preferred) or GStreamer to work,"
- eerror "please try again with USE=\"arts\", USE=\"xine\" or USE=\"gstreamer\"."
- die
- fi
-
- # check whether kdelibs was compiled with arts support
- kde_pkg_setup
-}
-
-src_compile() {
- # amarok does not respect kde coding standards, and makes a lot of
- # assuptions regarding its installation directory. For this reason,
- # it must be installed in the KDE install directory.
- PREFIX="${KDEDIR}"
-
- local myconf="$(use_with arts) $(use_with xine) $(use_with gstreamer)
- $(use_enable mysql) $(use_enable postgres postgresql)
- $(use_with opengl) $(use_with xmms)
- $(use_with visualization libvisual)
- $(use_enable !noamazon amazon)"
-
- kde_src_compile
-}
-
-src_install() {
- kde_src_install
-
- # move the desktop file in /usr/share
- dodir /usr/share/applications/kde
- mv ${D}${KDEDIR}/share/applications/kde/amarok.desktop \
- ${D}/usr/share/applications/kde/amarok.desktop || die
-}
-
diff --git a/media-sound/amarok/amarok-1.3.2.ebuild b/media-sound/amarok/amarok-1.3.2-r1.ebuild
index 91c0b12117b1..6c77717c480a 100644
--- a/media-sound/amarok/amarok-1.3.2.ebuild
+++ b/media-sound/amarok/amarok-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3.2.ebuild,v 1.1 2005/09/20 21:43:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3.2-r1.ebuild,v 1.1 2005/09/22 17:18:59 flameeyes Exp $
inherit kde eutils
@@ -46,6 +46,8 @@ DEPEND="${DEPEND}
need-kde 3.3
+PATCHES="${FILESDIR}/${P}-playlist.patch"
+
pkg_setup() {
if use arts && ! use xine && ! use gstreamer; then
ewarn "aRts support is deprecated, if you have problems please consider"
diff --git a/media-sound/amarok/amarok-1.3.ebuild b/media-sound/amarok/amarok-1.3.ebuild
deleted file mode 100644
index 2685e2a67f38..000000000000
--- a/media-sound/amarok/amarok-1.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3.ebuild,v 1.1 2005/08/15 09:21:55 flameeyes Exp $
-
-inherit kde eutils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="amaroK - the audio player for KDE."
-HOMEPAGE="http://amarok.kde.org/"
-SRC_URI="mirror://sourceforge/amarok/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc -sparc ~x86"
-IUSE="arts flac gstreamer kde mp3 mysql noamazon opengl postgres xine xmms visualization vorbis"
-# kde: enables compilation of the konqueror sidebar plugin
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
- arts? ( kde-base/arts
- || ( ( kde-base/kdemultimedia-arts kde-base/akode )
- kde-base/kdemultimedia ) )
- xine? ( >=media-libs/xine-lib-1_rc4 )
- gstreamer? ( >=media-libs/gstreamer-0.8.8
- >=media-libs/gst-plugins-0.8.6 )
- >=media-libs/tunepimp-0.3.0
- >=media-libs/taglib-1.4
- mysql? ( >=dev-db/mysql-4.0.16 )
- postgres? ( dev-db/postgresql )
- opengl? ( virtual/opengl )
- xmms? ( >=media-sound/xmms-1.2 )
- visualization? ( media-libs/libsdl
- >=media-plugins/libvisual-plugins-0.2 )"
-
-RDEPEND="${DEPEND}
- gstreamer? ( mp3? ( >=media-plugins/gst-plugins-mad-0.8.6 )
- vorbis? ( >=media-plugins/gst-plugins-ogg-0.8.6
- >=media-plugins/gst-plugins-vorbis-0.8.6 )
- flac? ( >=media-plugins/gst-plugins-flac-0.8.6 ) )"
-
-DEPEND="${DEPEND}
- >=dev-util/pkgconfig-0.9.0"
-
-need-kde 3.3
-
-pkg_setup() {
- if use arts && ! use xine && ! use gstreamer; then
- ewarn "aRts support is deprecated, if you have problems please consider"
- ewarn "enabling support for Xine or GStreamer"
- ewarn "(emerge amarok again with USE=\"xine\" or USE=\"gstreamer\")."
- ebeep 2
- fi
-
- if ! use arts && ! use xine && ! use gstreamer; then
- eerror "amaroK needs either aRts (deprecated), Xine or GStreamer to work,"
- eerror "please try again with USE=\"arts\", USE=\"xine\" or USE=\"gstreamer\"."
- die
- fi
-
- # check whether kdelibs was compiled with arts support
- kde_pkg_setup
-}
-
-src_unpack() {
- kde_src_unpack
- sed -i -e "s:postgresql/pgsql/libpq-fe.h:libpq-fe.h:" amarok/src/collectiondb.cpp
-}
-
-src_compile() {
- # amarok does not respect kde coding standards, and makes a lot of
- # assuptions regarding its installation directory. For this reason,
- # it must be installed in the KDE install directory.
- PREFIX="${KDEDIR}"
-
- local myconf="$(use_with arts) $(use_with xine) $(use_with gstreamer)
- $(use_enable mysql) $(use_enable postgres postgresql)
- $(use_with opengl) $(use_with xmms)
- $(use_with visualization libvisual)
- $(use_enable !noamazon amazon)"
-
- kde_src_compile
-}
-
-src_install() {
- kde_src_install
-
- # move the desktop file in /usr/share
- dodir /usr/share/applications/kde
- mv ${D}${KDEDIR}/share/applications/kde/amarok.desktop \
- ${D}/usr/share/applications/kde/amarok.desktop || die
-}
diff --git a/media-sound/amarok/files/amarok-1.3.1-gst-alsaagain.patch b/media-sound/amarok/files/amarok-1.3.1-gst-alsaagain.patch
deleted file mode 100644
index 8b52d7cc7706..000000000000
--- a/media-sound/amarok/files/amarok-1.3.1-gst-alsaagain.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur amarok-1.3.1/amarok/src/engine/gst/gstengine.cpp amarok-1.3.1-alsa/amarok/src/engine/gst/gstengine.cpp
---- amarok-1.3.1/amarok/src/engine/gst/gstengine.cpp 2005-09-04 22:47:19.000000000 +0200
-+++ amarok-1.3.1-alsa/amarok/src/engine/gst/gstengine.cpp 2005-09-11 14:02:18.000000000 +0200
-@@ -806,7 +806,6 @@
-
- if ( g_strrstr ( factory->details.klass, classname ) ) {
- name = g_strdup ( GST_OBJECT_NAME ( factory ) );
-- if ( name != "alsasink" )
- results << name;
- }
- }
-@@ -830,7 +829,7 @@
-
- destroyPipeline();
-
-- if ( GstConfig::soundOutput().isEmpty() || GstConfig::soundOutput() == "alsasink" ) {
-+ if ( GstConfig::soundOutput().isEmpty()) {
- QTimer::singleShot( 0, this, SLOT( errorNoOutput() ) );
- return false;
- }
-@@ -853,7 +852,6 @@
- }
-
- m_gst_audiobin = gst_bin_new( "audiobin" );
-- gst_bin_add( GST_BIN( m_gst_audiobin ), m_gst_audiosink );
-
- /* setting device property for AudioSink*/
- if ( GstConfig::useCustomSoundDevice() && !GstConfig::soundDevice().isEmpty() )
-@@ -872,6 +870,7 @@
- gst_element_link_many( m_gst_audioconvert, m_gst_equalizer, m_gst_identity,
- m_gst_volume, m_gst_audioscale, m_gst_audiosink, NULL );
-
-+ gst_bin_add( GST_BIN( m_gst_audiobin ), m_gst_audiosink );
- gst_element_set_state( m_gst_audiobin, GST_STATE_PAUSED );
-
- m_pipelineFilled = true;
diff --git a/media-sound/amarok/files/amarok-1.3.1-gst-onlyoss.patch b/media-sound/amarok/files/amarok-1.3.1-gst-onlyoss.patch
deleted file mode 100644
index 32afd7453d18..000000000000
--- a/media-sound/amarok/files/amarok-1.3.1-gst-onlyoss.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: gstengine.cpp
-===================================================================
---- amarok/src/engine/gst/gstengine.cpp (revision 458592)
-+++ amarok/src/engine/gst/gstengine.cpp (revision 458593)
-@@ -806,7 +806,7 @@
-
- if ( g_strrstr ( factory->details.klass, classname ) ) {
- name = g_strdup ( GST_OBJECT_NAME ( factory ) );
-- if ( name != "alsasink" )
-+ if ( name != "alsasink" && name != "autoaudiosink" && name != "gconfaudiosink")
- results << name;
- }
- }
-@@ -830,7 +830,10 @@
-
- destroyPipeline();
-
-- if ( GstConfig::soundOutput().isEmpty() || GstConfig::soundOutput() == "alsasink" ) {
-+ if ( GstConfig::soundOutput().isEmpty()
-+ || GstConfig::soundOutput() == "alsasink"
-+ || GstConfig::soundOutput() == "autoaudiosink"
-+ || GstConfig::soundOutput() == "gconfaudiosink") {
- QTimer::singleShot( 0, this, SLOT( errorNoOutput() ) );
- return false;
- }
diff --git a/media-sound/amarok/files/amarok-1.3.1-qt-3.3.5.patch b/media-sound/amarok/files/amarok-1.3.1-qt-3.3.5.patch
deleted file mode 100644
index 006656beafbf..000000000000
--- a/media-sound/amarok/files/amarok-1.3.1-qt-3.3.5.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: amarok/src/Options7.ui
-===================================================================
---- amarok/src/Options7.ui (revision 460630)
-+++ amarok/src/Options7.ui (revision 460631)
-@@ -74,7 +74,4 @@
- </image>
- </images>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
-- <includehint>dbsetup.h</includehint>
--</includehints>
- </UI>
-Index: amarok/src/podcastsettingsbase.ui
-===================================================================
---- amarok/src/podcastsettingsbase.ui (revision 460630)
-+++ amarok/src/podcastsettingsbase.ui (revision 460631)
-@@ -141,7 +141,7 @@
- <cstring>pushButton_ok</cstring>
- </property>
- <property name="text">
-- <string>O&amp;K</string>
-+ <string>&amp;OK</string>
- </property>
- <property name="autoDefault">
- <bool>true</bool>
-Index: amarok/src/firstrunwizard.ui
-===================================================================
---- amarok/src/firstrunwizard.ui (revision 460630)
-+++ amarok/src/firstrunwizard.ui (revision 460631)
-@@ -490,10 +490,5 @@
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
- <includehint>kactivelabel.h</includehint>
-- <includehint>kactivelabel.h</includehint>
-- <includehint>kactivelabel.h</includehint>
-- <includehint>kactivelabel.h</includehint>
-- <includehint>dbsetup.h</includehint>
-- <includehint>kactivelabel.h</includehint>
- </includehints>
- </UI>
diff --git a/media-sound/amarok/files/amarok-1.3.2-playlist.patch b/media-sound/amarok/files/amarok-1.3.2-playlist.patch
new file mode 100644
index 000000000000..77e2dffefc83
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.3.2-playlist.patch
@@ -0,0 +1,23 @@
+Index: amarok/src/playlist.cpp
+===================================================================
+--- amarok/src/playlist.cpp (Revision 462931)
++++ amarok/src/playlist.cpp (Revision 462933)
+@@ -214,7 +214,6 @@
+ setDropVisualizer( false ); //we handle the drawing for ourselves
+ setDropVisualizerWidth( 3 );
+ setItemsRenameable( true );
+- KListView::setSorting( NO_SORT ); //use base so we don't saveUndoState() too
+ setAcceptDrops( true );
+ setSelectionMode( QListView::Extended );
+ setAllColumnsShowFocus( true );
+@@ -304,6 +303,10 @@
+ engineStateChanged( EngineController::engine()->state() ); //initialise state of UI
+ paletteChange( palette() ); //sets up glowColors
+ restoreLayout( KGlobal::config(), "PlaylistColumnsLayout" );
++
++ // Sorting must be disabled when current.xml is being loaded. See BUG 113042
++ KListView::setSorting( NO_SORT ); //use base so we don't saveUndoState() too
++
+ columnOrderChanged();
+ //cause the column fractions to be updated, but in a safe way, ie no specific column
+ columnResizeEvent( header()->count(), 0, 0 );
diff --git a/media-sound/amarok/files/digest-amarok-1.3 b/media-sound/amarok/files/digest-amarok-1.3
deleted file mode 100644
index 1de53f58f628..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2dd100584795fb20c621fdbc96cbee1e amarok-1.3.tar.bz2 6730973
diff --git a/media-sound/amarok/files/digest-amarok-1.3.1-r1 b/media-sound/amarok/files/digest-amarok-1.3.1-r1
deleted file mode 100644
index b2089fc7ba53..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.3.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 31f504e5fe985bbdb3c99f0e72d08fa1 amarok-1.3.1.tar.bz2 6806647
diff --git a/media-sound/amarok/files/digest-amarok-1.3.1-r2 b/media-sound/amarok/files/digest-amarok-1.3.1-r2
deleted file mode 100644
index b2089fc7ba53..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.3.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 31f504e5fe985bbdb3c99f0e72d08fa1 amarok-1.3.1.tar.bz2 6806647
diff --git a/media-sound/amarok/files/digest-amarok-1.3.2 b/media-sound/amarok/files/digest-amarok-1.3.2-r1
index 8b0ffc479feb..8b0ffc479feb 100644
--- a/media-sound/amarok/files/digest-amarok-1.3.2
+++ b/media-sound/amarok/files/digest-amarok-1.3.2-r1