Add patch from upstream to fix playlist encoding problems.

(Portage version: 2.1.1)

4 files changed, 98 insertions, 1 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index b6217aec859e..68659c00e3dd 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.162 2006/09/05 22:19:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.163 2006/09/15 09:48:01 flameeyes Exp $
+
+*amarok-1.4.3-r1 (15 Sep 2006)
+
+  15 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.3-playlist-encoding.patch, +amarok-1.4.3-r1.ebuild:
+  Add patch from upstream to fix playlist encoding problems.
 
   05 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.3.ebuild:
   Disable libmtp for now, avoid automagic dependency.
diff --git a/media-sound/amarok/amarok-1.4.3-r1.ebuild b/media-sound/amarok/amarok-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..4a6018f9347c
--- /dev/null
+++ b/media-sound/amarok/amarok-1.4.3-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.3-r1.ebuild,v 1.1 2006/09/15 09:48:01 flameeyes Exp $
+
+LANGS="az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja ka
+km ko lt ms nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tg th tr uk uz
+zh_CN zh_TW"
+LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv"
+
+USE_KEG_PACKAGING=1
+
+inherit kde eutils flag-o-matic
+
+PKG_SUFFIX=""
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${P/_/-}"
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+
+SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="aac kde mysql noamazon opengl postgres
+xmms visualization ipod ifp real njb"
+# kde: enables compilation of the konqueror sidebar plugin
+
+DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
+	>=media-libs/xine-lib-1.1.2_pre20060328-r8
+	>=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.4* )
+	ipod? ( media-libs/libgpod )
+	aac? ( media-libs/libmp4v2 )
+	ifp? ( media-libs/libifp )
+	real? ( media-video/realplayer )
+	njb? ( >=media-libs/libnjb-2.2.4 )"
+
+RDEPEND="${DEPEND}
+	dev-lang/ruby"
+
+DEPEND="${DEPEND}
+	>=dev-util/pkgconfig-0.9.0"
+
+PATCHES="${FILESDIR}/${P}-playlist-encoding.patch"
+
+need-kde 3.3
+
+src_compile() {
+	append-flags -fno-inline
+
+	# Extra, unsupported engines are forcefully disabled.
+	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
+				  $(use_with opengl) $(use_with xmms)
+				  $(use_with visualization libvisual)
+				  $(use_enable !noamazon amazon)
+				  $(use_with ipod libgpod)
+				  $(use_with aac mp4v2)
+				  $(use_with ifp)
+				  $(use_with real helix)
+				  $(use_with njb libnjb)
+				  --without-musicbrainz
+				  --without-libmtp
+				  --with-xine
+				  --without-mas
+				  --without-nmm"
+
+	kde_src_compile
+}
diff --git a/media-sound/amarok/files/amarok-1.4.3-playlist-encoding.patch b/media-sound/amarok/files/amarok-1.4.3-playlist-encoding.patch
new file mode 100644
index 000000000000..301aa8100aaf
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.4.3-playlist-encoding.patch
@@ -0,0 +1,12 @@
+Index: amarok/src/playlist.cpp
+===================================================================
+--- amarok/src/playlist.cpp	(Revision 583705)
++++ amarok/src/playlist.cpp	(Revision 583706)
+@@ -3188,6 +3188,7 @@
+     stream << "</playlist>\n";
+ 
+     QTextStream fstream( &file );
++    fstream.setEncoding( QTextStream::UnicodeUTF8 );
+     fstream << buffer;
+ }
+ 
diff --git a/media-sound/amarok/files/digest-amarok-1.4.3-r1 b/media-sound/amarok/files/digest-amarok-1.4.3-r1
new file mode 100644
index 000000000000..08960adff75d
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.4.3-r1
@@ -0,0 +1,3 @@
+MD5 b0b4f8952ad23705c70815d50fd0af52 amarok-1.4.3.tar.bz2 17175603
+RMD160 287d6652868f50023d8602941fdc99aed5296d22 amarok-1.4.3.tar.bz2 17175603
+SHA256 e9f6d8728d1c49467a2b72232c7ce907621e8e3792aa7dd9f206985b1450a847 amarok-1.4.3.tar.bz2 17175603