Add patch from upstream to fix playlist encoding problems.

Package-Manager: portage-2.1.1

5 files changed, 116 insertions, 8 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/Manifest b/media-sound/amarok/Manifest
index 6b6662e5841d..9a50c00e80ba 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -25,6 +25,10 @@ AUX amarok-1.4.2-libmtp.patch 2111 RMD160 0f6482fd622663b0748923faf8dc5a431cde14
 MD5 fe65d93cecf89f11a19b64c29cc3a163 files/amarok-1.4.2-libmtp.patch 2111
 RMD160 0f6482fd622663b0748923faf8dc5a431cde1409 files/amarok-1.4.2-libmtp.patch 2111
 SHA256 a0fad26a2dc2ddf8bd8950ad0ca6e55271afa5d6ab5c7bc0d7a37af004ad4ca1 files/amarok-1.4.2-libmtp.patch 2111
+AUX amarok-1.4.3-playlist-encoding.patch 365 RMD160 5add54202bcc34ad1d695b938c075dd030bf6705 SHA1 9d2eacaf4d8f35cf88e3a2358258ca83c1d35fee SHA256 71ac78fbac11d404017ab1c9a942b0b72ac24638739498ca6f761298a906b11d
+MD5 0e211053265ad86a0f6656c07463b43a files/amarok-1.4.3-playlist-encoding.patch 365
+RMD160 5add54202bcc34ad1d695b938c075dd030bf6705 files/amarok-1.4.3-playlist-encoding.patch 365
+SHA256 71ac78fbac11d404017ab1c9a942b0b72ac24638739498ca6f761298a906b11d files/amarok-1.4.3-playlist-encoding.patch 365
 DIST amarok-1.3.8.tar.bz2 8728423 RMD160 14c5e38a515b4ebb11dd93f74511fa2f6247809b SHA1 08fbf6637593c41bf33f580633f75e343d4053e4 SHA256 6159837fd52c56bd00855cdd8ae8ba85f803572571ebb86efb01bf36e898a0a1
 DIST amarok-1.4.0a.tar.bz2 13045009 RMD160 47ae8f9e23aec02f825fe3791eae63520f56394e SHA1 0274e7d7b780ab10c0d1357fe852d895d86dd409 SHA256 46d298226ff855c68b1d179d900441fd3c2329f42a938c3fc842a218ab762344
 DIST amarok-1.4.1.tar.bz2 13509939 RMD160 d9df29c2a2a7b81aabb73c66b83190f0bc109094 SHA1 ecabf7fd15ac45d29ccd1b9309f093ecda8acfab SHA256 dbe4397d041a77f7ded063f50d5cfd2faf0e9efce9b4483589f751c20ff89ccd
@@ -46,14 +50,18 @@ EBUILD amarok-1.4.2-r1.ebuild 2222 RMD160 edb0a4827f550dfc96b5733ea27e558dcbe560
 MD5 be6d7f712f5bbe6c6d76d3cea8cf8ae7 amarok-1.4.2-r1.ebuild 2222
 RMD160 edb0a4827f550dfc96b5733ea27e558dcbe56046 amarok-1.4.2-r1.ebuild 2222
 SHA256 e77b389ad2cb62d970ea5842cd91a2b1421f8c0459fac4856c61b213742c00df amarok-1.4.2-r1.ebuild 2222
+EBUILD amarok-1.4.3-r1.ebuild 2147 RMD160 d7458da208628de0978f86a84497fe09d67bace5 SHA1 e2c424c808aa009bec925032465b9061b437cbc9 SHA256 d3b84db65f2770902d2c3902e3bea02caab6979c5ff7f5dd1387794fcb81296e
+MD5 e83439bf6c44109ce92934092ed72a49 amarok-1.4.3-r1.ebuild 2147
+RMD160 d7458da208628de0978f86a84497fe09d67bace5 amarok-1.4.3-r1.ebuild 2147
+SHA256 d3b84db65f2770902d2c3902e3bea02caab6979c5ff7f5dd1387794fcb81296e amarok-1.4.3-r1.ebuild 2147
 EBUILD amarok-1.4.3.ebuild 2092 RMD160 1286336ddf5fd7f9a04af7698f87a7b814d089bc SHA1 ce84a9464b389e244ca8e5cb75f6434b082521fc SHA256 198c4b72f6dcc1c09e559c9fcc4b8f115e41bd3184332b64792f4e50171206e8
 MD5 c4c646a01fbe7da07868d7fd9a81795a amarok-1.4.3.ebuild 2092
 RMD160 1286336ddf5fd7f9a04af7698f87a7b814d089bc amarok-1.4.3.ebuild 2092
 SHA256 198c4b72f6dcc1c09e559c9fcc4b8f115e41bd3184332b64792f4e50171206e8 amarok-1.4.3.ebuild 2092
-MISC ChangeLog 26300 RMD160 8ae9dd8e72712145dd348878834ef1b3106e995c SHA1 627d3df243509d179b2403155805f09d8e3734d4 SHA256 426faf1b3bd18efeacf05372fffa58524b7b3a4947fde2ed8f99bf65405a7ac7
-MD5 75e19f49ad070f2148ca8f9b817fddea ChangeLog 26300
-RMD160 8ae9dd8e72712145dd348878834ef1b3106e995c ChangeLog 26300
-SHA256 426faf1b3bd18efeacf05372fffa58524b7b3a4947fde2ed8f99bf65405a7ac7 ChangeLog 26300
+MISC ChangeLog 26519 RMD160 b48cb71697135ea36598618f0ee35a183f7ffe1e SHA1 9b87e6f57dff06b1065444c7e7e0680586ae024c SHA256 bc185a2cf03cb27958bc095d42fd0908b2d5c8fd6986a0dd0eb13a19e6a3fca6
+MD5 2df232fa3297e414b7c880ccac93b67b ChangeLog 26519
+RMD160 b48cb71697135ea36598618f0ee35a183f7ffe1e ChangeLog 26519
+SHA256 bc185a2cf03cb27958bc095d42fd0908b2d5c8fd6986a0dd0eb13a19e6a3fca6 ChangeLog 26519
 MISC metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e SHA1 d41658ffae344562e8579d219bd3f746d4cba624 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26
 MD5 986cc6d7e9a21474e34336045796ffaa metadata.xml 266
 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e metadata.xml 266
@@ -73,10 +81,13 @@ SHA256 5b69a6996c41aa97863f57c7ecffaf1500a0495f22f99752fdc424cf6be655b7 files/di
 MD5 ecfb45bf9511daa1e0894c64f2ff6112 files/digest-amarok-1.4.3 247
 RMD160 8eb0e628f823ab06d97dab32bc6a1e3476c37871 files/digest-amarok-1.4.3 247
 SHA256 30a763884b75f16b9a733b1eeb468f2316f2b6ae1e7500459463fee5cbd94493 files/digest-amarok-1.4.3 247
+MD5 ecfb45bf9511daa1e0894c64f2ff6112 files/digest-amarok-1.4.3-r1 247
+RMD160 8eb0e628f823ab06d97dab32bc6a1e3476c37871 files/digest-amarok-1.4.3-r1 247
+SHA256 30a763884b75f16b9a733b1eeb468f2316f2b6ae1e7500459463fee5cbd94493 files/digest-amarok-1.4.3-r1 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE/fgIAiZjviIA2XgRAi/hAKCN/M8d1+v94/0+HF8u2uIp/+x0hQCg3MAr
-I6dt7PKAvar9EW0LdUKC12I=
-=h60f
+iD8DBQFFCnbiAiZjviIA2XgRAoNWAJ4hTQlhp07B6i2AAYyKHVYUZKGbrQCbBfwF
+S1Hx2vYDg10oGOsO9hdfCo8=
+=aH2y
 -----END PGP SIGNATURE-----
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