Keep icons constant when adding a stream to a playlist. Patch from upstream wrt #270564, thanks to Marc Arens for reporting.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 64 insertions, 2 deletions

diff --git a/media-sound/sonata/ChangeLog b/media-sound/sonata/ChangeLog
index a0a07f8fa71b..9123ee0dba77 100644
--- a/media-sound/sonata/ChangeLog
+++ b/media-sound/sonata/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/sonata
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sonata/ChangeLog,v 1.42 2009/05/22 03:06:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonata/ChangeLog,v 1.43 2009/05/25 12:26:32 ssuominen Exp $
+
+*sonata-1.6.2-r1 (25 May 2009)
+
+  25 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +sonata-1.6.2-r1.ebuild, +files/sonata-1.6.2-keep_icons_constant.patch:
+  Keep icons constant when adding a stream to a playlist. Patch from
+  upstream wrt #270564, thanks to Marc Arens for reporting.
 
   22 May 2009; Samuli Suominen <ssuominen@gentoo.org> -sonata-1.6.ebuild,
   sonata-1.6.2.ebuild:
diff --git a/media-sound/sonata/Manifest b/media-sound/sonata/Manifest
index 0f00915b86f7..4dc97d6de27d 100644
--- a/media-sound/sonata/Manifest
+++ b/media-sound/sonata/Manifest
@@ -1,6 +1,8 @@
+AUX sonata-1.6.2-keep_icons_constant.patch 847 RMD160 e8adabb69f246bb38a392432efd38141573b7c54 SHA1 18e73d04e6e4494b0f8c4cc812cc5081fca2a7c6 SHA256 79ba8b8efb1129a61b387eef21bbffc36f2b37998938c0a59c583cefcba8cad9
 DIST sonata-1.5.3.tar.bz2 272361 RMD160 d6639c8f006bbe55be6939b4d112614ca6919304 SHA1 1876519fb25d1e406bda7c606ec457f847f7e86d SHA256 51385686c421478cec1bb7afef6044f3f6f9ed622ab2a5968f47486a29e95712
 DIST sonata-1.6.2.tar.bz2 315918 RMD160 418eef732cc171d21e301261aa0c6b7751d03ab3 SHA1 33cb3458014b4901eb312bff76c24be125ed7d0a SHA256 7460ac04ac4d6e301578c27496125c1c13b2748e91cdd73ff39f2adcd9680dd2
 EBUILD sonata-1.5.3.ebuild 953 RMD160 7ebaa93bd0fee05e4f4116e342ef2a7525141aa7 SHA1 ce8f8c72fb46e34b796a09bf55c32b0bf951f57a SHA256 aa82ef4a5f20f533fefec798820b7556bde648f5e2ed7bbfee3cbe81e7b9f671
+EBUILD sonata-1.6.2-r1.ebuild 1004 RMD160 b529e701f64475fd5ebe0216dd76c460d9b97ddc SHA1 845b49b22746194785b6ee387c39cb72c7574e3b SHA256 dcd70941c602420c0bca3d53f01571d0925dd69578c8630de1710400105d08de
 EBUILD sonata-1.6.2.ebuild 922 RMD160 6f43f509cf3adab2c02022aae6ed79939b0f2061 SHA1 472ee56d4736ac71a3fe207847aac75ab9e1622f SHA256 9f1cad3a8cb31112d191bedff7eed6779547763c12446062f436caa386e0f9a2
-MISC ChangeLog 5750 RMD160 6b8ec11aba435a864153af0105643ee496b2ec1d SHA1 c4117168aceaaed8a6b3c2b4a0f5df2339ee497f SHA256 91dc958a8533fe051c2ea154996dbae0fd740dcec7b27462388a5e8bff7121ce
+MISC ChangeLog 6040 RMD160 28c73a578ebe3c81e4f34a130af08aa21e4e81c5 SHA1 fe89722cb6083123809c2796e2a724ec258103de SHA256 08d04daa67f6eb7a198d8288d9884cca7c4d72b13834e17807fc9aa7ddbc5f6b
 MISC metadata.xml 604 RMD160 b3c6878298e4db65bb63b220331b22a90bb8d124 SHA1 2a260a620992418e1ef8cc984cfae5e9dc91cd2e SHA256 7a89230c369a0e20a8ee39b0f06f952bd186fef3a4c60f97ae15e28f714b8129
diff --git a/media-sound/sonata/files/sonata-1.6.2-keep_icons_constant.patch b/media-sound/sonata/files/sonata-1.6.2-keep_icons_constant.patch
new file mode 100644
index 000000000000..95b539340ebb
--- /dev/null
+++ b/media-sound/sonata/files/sonata-1.6.2-keep_icons_constant.patch
@@ -0,0 +1,16 @@
+Fix from upstream. Keep icons constant when adding a stream to a playlist.
+http://bugs.gentoo.org/show_bug.cgi?id=270564
+http://developer.berlios.de/bugs/?func=detailbug&bug_id=15722&group_id=7323
+
+diff -ur sonata-1.6.2.orig/sonata/artwork.py sonata-1.6.2/sonata/artwork.py
+--- sonata-1.6.2.orig/sonata/artwork.py	2009-04-02 06:57:29.000000000 +0300
++++ sonata-1.6.2/sonata/artwork.py	2009-05-25 14:14:48.000000000 +0300
+@@ -228,6 +228,8 @@
+ 		# Search through the rows in the library to see
+ 		# if we match the currently playing song:
+ 		play_artist, play_album = library_get_data(cache_key, 'artist', 'album')
++		if play_artist is None and play_album is None:
++			return
+ 		for row in self.lib_model:
+ 			artist, album, path = library_get_data(row[1], 'artist', 'album', 'path')
+ 			if unicode(play_artist).lower() == unicode(artist).lower() \
diff --git a/media-sound/sonata/sonata-1.6.2-r1.ebuild b/media-sound/sonata/sonata-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..3ac57ae55527
--- /dev/null
+++ b/media-sound/sonata/sonata-1.6.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonata/sonata-1.6.2-r1.ebuild,v 1.1 2009/05/25 12:26:32 ssuominen Exp $
+
+EAPI=2
+inherit distutils eutils
+
+DESCRIPTION="an elegant GTK+ music client for the Music Player Daemon (MPD)."
+HOMEPAGE="http://sonata.berlios.de/"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dbus lyrics taglib +trayicon"
+
+RDEPEND=">=virtual/python-2.5
+	>=dev-python/pygtk-2.12
+	>=x11-libs/gtk+-2:2[jpeg]
+	>=dev-python/python-mpd-0.2.1
+	dbus? ( dev-python/dbus-python )
+	lyrics? ( dev-python/zsi )
+	taglib? ( >=dev-python/tagpy-0.93 )
+	trayicon? ( dev-python/egg-python )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS="CHANGELOG README TODO TRANSLATORS"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-keep_icons_constant.patch
+}
+
+src_install() {
+	distutils_src_install
+	rm -rf "${D}"/usr/share/sonata
+}