Patch to not crash gkrellm when disabling/reenabling this plugin (Bug #284504)

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 54 insertions, 1 deletions

diff --git a/x11-plugins/gkrellm-volume/ChangeLog b/x11-plugins/gkrellm-volume/ChangeLog
index 6ba98ca127cf..e4f079c7d3aa 100644
--- a/x11-plugins/gkrellm-volume/ChangeLog
+++ b/x11-plugins/gkrellm-volume/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/gkrellm-volume
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/ChangeLog,v 1.30 2010/03/12 00:41:48 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/ChangeLog,v 1.31 2010/07/29 14:17:44 lack Exp $
+
+*gkrellm-volume-2.1.13-r1 (29 Jul 2010)
+
+  29 Jul 2010; Jim Ramsay <lack@gentoo.org>
+  +gkrellm-volume-2.1.13-r1.ebuild,
+  +files/gkrellm-volume-2.1.13-reenable.patch:
+  Patch to not crash gkrellm when disabling/reenabling this plugin (Bug
+  #284504)
 
   12 Mar 2010; Sebastian Pipping <sping@gentoo.org>
   gkrellm-volume-2.1.13.ebuild:
diff --git a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch
new file mode 100644
index 000000000000..a3e3218dc02f
--- /dev/null
+++ b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch
@@ -0,0 +1,14 @@
+diff --git a/volume.c b/volume.c
+index 18418d1..58708d4 100644
+--- a/volume.c
++++ b/volume.c
+@@ -74,6 +74,9 @@ static void remove_all_mixers() {
+ static Slider *add_slider(Mixer *m, int dev) {
+   Slider *result,*s;
+   if (dev < 0 || dev >= mixer_get_nr_devices(m->mixer)) return NULL;
++  for (s = m->Sliderz ; s != NULL; s = s->next)
++    if (s->dev == dev)
++      return s;
+   result = malloc(sizeof(Slider));
+   result->mixer = m->mixer;
+   result->parent = m;
diff --git a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r1.ebuild b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r1.ebuild
new file mode 100644
index 000000000000..7671cae1a036
--- /dev/null
+++ b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r1.ebuild,v 1.1 2010/07/29 14:17:44 lack Exp $
+
+EAPI="3"
+inherit gkrellm-plugin eutils
+
+IUSE="alsa"
+DESCRIPTION="A mixer control plugin for gkrellm"
+HOMEPAGE="http://gkrellm.luon.net/volume.php"
+SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="alsa? ( media-libs/alsa-lib )"
+
+S=${WORKDIR}/${PN}
+
+PLUGIN_SO=volume.so
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-reenable.patch"
+}
+
+src_compile() {
+	local myconf=""
+	use alsa && myconf="${myconf} enable_alsa=1"
+	make ${myconf} || die "make failed"
+}