Fix crash when headers are click with right mouse button, patch from upstream wrt #246115, thanks to Carles Escrig for reporting.

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

4 files changed, 170 insertions, 2 deletions

diff --git a/media-sound/quodlibet/ChangeLog b/media-sound/quodlibet/ChangeLog
index 7f4523af5794..6308c63c6cb0 100644
--- a/media-sound/quodlibet/ChangeLog
+++ b/media-sound/quodlibet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/quodlibet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.66 2009/05/12 17:49:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.67 2009/05/13 07:29:43 ssuominen Exp $
+
+*quodlibet-2.0-r3 (13 May 2009)
+
+  13 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +quodlibet-2.0-r3.ebuild, +files/quodlibet-2.0-click.patch:
+  Fix crash when headers are click with right mouse button, patch from
+  upstream wrt #246115, thanks to Carles Escrig for reporting.
 
   12 May 2009; Samuli Suominen <ssuominen@gentoo.org>
   quodlibet-2.0-r2.ebuild:
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index e15d70c04c7e..56a7c3b95181 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1,5 +1,7 @@
+AUX quodlibet-2.0-click.patch 809 RMD160 7d3225627b7e8e372061e132644f5528dd770b2f SHA1 1aaefc23d61e95af30b9db853be0138da159c1d6 SHA256 408fb3bc7d27bab0d4035288e89ff07ef8162e5f5de3f25067b691ad35af6e82
 AUX quodlibet-2.0-python26.patch 998 RMD160 b9d5eb6f8a80cad840ee432e256b2d4041c40283 SHA1 3a2a0bc9e97fad56ab8b948c0895ba9825574aa9 SHA256 f024e0c6054b96ef396695d3709cd2174b82081b3a494f95accf0a2c5b21c6f2
 DIST quodlibet-2.0.tar.gz 842921 RMD160 f2276a52abb947741c1c519d696de66a92b7c6de SHA1 93d378234feae798c65452085add0b46a2440be4 SHA256 1c1e28a58e0a52055fc0f0ecb833088be6b9bcfbebb6c8ef9ff9e11ea3f1393a
 EBUILD quodlibet-2.0-r2.ebuild 4777 RMD160 54f3996a5cd8ebde3db79ec758c3a918fb2e0f35 SHA1 5a881770636d7d6169c96d760fbc78926669d345 SHA256 92fd9ca42523e8ebc35c727ef6d6b8ba501eab2e7b1daced796d8d922c484339
-MISC ChangeLog 11627 RMD160 735b753b462e6110be93458d4643aa431f1e404f SHA1 b8ba09bc6925456bde7f3e01a94a427f65d4da8d SHA256 7a5c0f3e20acc97b0b08bead1c9a5039c85fbb83b057d34be128f366b68440c5
+EBUILD quodlibet-2.0-r3.ebuild 4765 RMD160 9756bea259c67267a20398477b0be48c994fa55a SHA1 7178407b5bf51db1722bb00dedd7507c118aec0d SHA256 5571fbb429f78252a77589e9245cbf849260fa0dcacaecfd5871d54c1ea7448a
+MISC ChangeLog 11911 RMD160 7585c1072bad1999d31a5b22af9fd833fd69b1e2 SHA1 b93a7ae06485c28616a0185b5265ddde07c2ae8a SHA256 636145e538e6e8cf1e2eda17557100ff3d40fd9d39e9741e27045d33bf934337
 MISC metadata.xml 859 RMD160 aa77d424dd4dc782f9a8f40bb9cc73f2e4fa8cbc SHA1 9499ad7f2e2f79373401c829a928b94044f4c6a2 SHA256 cbb835079f0c1ec0f238956b82bacad9c3ece15c29ed5b80f696d4defd3b5c61
diff --git a/media-sound/quodlibet/files/quodlibet-2.0-click.patch b/media-sound/quodlibet/files/quodlibet-2.0-click.patch
new file mode 100644
index 000000000000..51c375540811
--- /dev/null
+++ b/media-sound/quodlibet/files/quodlibet-2.0-click.patch
@@ -0,0 +1,17 @@
+Crash when right clicked on headers. Fixed in upstream subversion.
+
+http://code.google.com/p/quodlibet/issues/detail?id=14
+http://bugs.gentoo.org/show_bug.cgi?id=246115
+
+diff -ur quodlibet-2.0.orig/quodlibet/qltk/songlist.py quodlibet-2.0/quodlibet/qltk/songlist.py
+--- quodlibet-2.0.orig/quodlibet/qltk/songlist.py	2008-09-14 06:19:55.000000000 +0300
++++ quodlibet-2.0/quodlibet/qltk/songlist.py	2009-05-13 10:16:23.000000000 +0300
+@@ -815,7 +815,7 @@
+             menu.append(item)
+             submenu = gtk.Menu()
+             item.set_submenu(submenu)
+-            for header in sorted(zip(map(tag, group), group)):
++            for header in sorted(zip(map(util.tag, group), group)):
+                 add_header_toggle(submenu, header, header[1] in current_set)
+ 
+         sep = gtk.SeparatorMenuItem()
diff --git a/media-sound/quodlibet/quodlibet-2.0-r3.ebuild b/media-sound/quodlibet/quodlibet-2.0-r3.ebuild
new file mode 100644
index 000000000000..2142e4ae3718
--- /dev/null
+++ b/media-sound/quodlibet/quodlibet-2.0-r3.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-2.0-r3.ebuild,v 1.1 2009/05/13 07:29:43 ssuominen Exp $
+
+EAPI=2
+NEED_PYTHON=2.4.4
+
+inherit distutils python eutils
+
+DESCRIPTION="Quod Libet is a GTK+-based audio player written in Python."
+HOMEPAGE="http://code.google.com/p/quodlibet/"
+SRC_URI="http://quodlibet.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+# Enable gstreamer by default, bug 254729
+IUSE="aac alsa dbus esd flac gnome +gstreamer hal ipod mad musepack oss
+trayicon tta vorbis wma xine"
+
+COMMON_DEPEND=">=dev-python/pygtk-2.12"
+
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/mutagen-1.14
+	gstreamer? (
+		>=media-libs/gst-plugins-good-0.10.2
+		>=dev-python/gst-python-0.10.2
+		mad? ( >=media-plugins/gst-plugins-mad-0.10.2 )
+		vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10.2
+			>=media-plugins/gst-plugins-ogg-0.10.2 )
+		flac? ( >=media-plugins/gst-plugins-flac-0.10.2 )
+		aac? ( >=media-plugins/gst-plugins-faad-0.10.1 )
+		musepack? ( >=media-plugins/gst-plugins-musepack-0.10.3 )
+		wma? ( >=media-plugins/gst-plugins-ffmpeg-0.10.1
+			>=media-libs/gst-plugins-ugly-0.10.2 )
+		tta? ( >=media-libs/gst-plugins-bad-0.10.3 )
+
+		alsa? ( >=media-plugins/gst-plugins-alsa-0.10.2 )
+		oss? ( >=media-plugins/gst-plugins-oss-0.10.2 )
+		esd? ( >=media-plugins/gst-plugins-esd-0.10.2 )
+	)
+	xine? ( >=media-libs/xine-lib-1.1
+		dev-python/ctypes )
+	gnome? ( dev-python/gnome-python-extras
+		>=media-plugins/gst-plugins-gconf-0.10.3
+		>=media-plugins/gst-plugins-gnomevfs-0.10.2
+		dev-python/feedparser )
+	hal? ( sys-apps/hal )
+	dbus? ( >=dev-python/dbus-python-0.71 )
+	ipod? ( >=media-libs/libgpod-0.5.2[python] )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool"
+
+PDEPEND="trayicon? ( media-plugins/quodlibet-trayicon )"
+
+pkg_setup() {
+	if ! use gstreamer && ! use xine; then
+		eerror "You must have either gstreamer or xine USE flag enabled."
+		die "No backend USE flags enabled."
+	fi
+}
+
+src_prepare() {
+	# The backend is configured as gstbe by default.
+	if use gstreamer && use xine; then
+		elog ""
+		elog "You have both backend USE flags (gstreamer and xine) enabled."
+		elog "Gstreamer is considered to be more stable of the two, so we have"
+		elog "selected it as your default backend."
+	elif use gstreamer; then
+		elog "Gstreamer backend selected."
+	else
+		sed -i -e "s,^          \"backend\": \"gstbe\",          \"backend\": \"xinebe\"," quodlibet/config.py && \
+			elog "Xine backend selected."
+	fi
+	elog "You can change the backend by editing the ~/.${PN}/config file."
+
+	# no gst-plugins-gconf, attempt to guess the proper pipeline value. Bug #133043, #146728.
+	if ! use gnome; then
+		local sinktype="alsasink"
+
+		use esd  && sinktype="esdsink"
+		use oss  && sinktype="osssink"
+		use alsa && sinktype="alsasink"
+
+		elog "Setting the default pipeline to ${sinktype}"
+
+		sed -i -e "s,^          \"pipeline\": \"\",          \"pipeline\": \"${sinktype}\"," quodlibet/config.py
+	fi
+	epatch "${FILESDIR}/${P}-python26.patch" #240188
+	epatch "${FILESDIR}/${P}-click.patch"
+}
+
+src_install() {
+	${python} setup.py install --prefix="${D}/usr" --no-compile "$@" || die
+
+	DDOCS="CHANGELOG KNOWN_BUGS MAINTAINERS PKG-INFO CONTRIBUTORS TODO NEWS"
+	DDOCS="${DDOCS} Change* MANIFEST* README* AUTHORS"
+
+	python_version
+	for ext in png svg; do
+		for prog in quodlibet exfalso; do
+			dosym /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/images/${prog}.${ext} /usr/share/pixmaps/${prog}.${ext}
+		done
+	done
+
+	for doc in ${DDOCS}; do
+		[ -s "$doc" ] && dodoc $doc
+	done
+}
+
+pkg_postinst() {
+	if ! use mad; then
+		elog ""
+		elog "You do not have the 'mad' USE flag enabled."
+		elog "gst-plugins-mad, which is required for mp3 playback, may"
+		elog "not be installed. For mp3 support, enable the 'mad'"
+		elog "USE flag and emerge =media-sound/${P}."
+	fi
+
+	if ! use gnome; then
+		elog ""
+		elog "You do not have the 'gnome' USE flag enabled."
+		elog "media-plugins/gst-plugins-gnomevfs may not be installed,"
+		elog "so the proper pipeline won't be automatically selected."
+		elog "We've tried to select the proper pipeline based on your"
+		elog "USE flags, but if we guessed wrong you may have to set"
+		elog "'pipeline = ' in your ~/.quodlibet/config file to one"
+		elog "of the following: alsasink, osssink, esdsink. To enable"
+		elog "automatic selection of the proper pipeline, enable the"
+		elog "'gnome' USE flag and emerge =media-sound/${P}."
+	fi
+
+	elog ""
+	elog "Installing Quod Libet from an ebuild is not supported"
+	elog "upstream. If you encounter any problems, file bugs on"
+	elog "bugs.gentoo.org. DO NOT USE THE UPSTREAM BUG SYSTEM."
+	elog ""
+
+	distutils_pkg_postinst
+}