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

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

4 files changed, 57 insertions, 2 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/Manifest b/x11-plugins/gkrellm-volume/Manifest
index db895c01cf4b..57881f623645 100644
--- a/x11-plugins/gkrellm-volume/Manifest
+++ b/x11-plugins/gkrellm-volume/Manifest
@@ -1,4 +1,6 @@
+AUX gkrellm-volume-2.1.13-reenable.patch 463 RMD160 053d8393bc4b49be11fe7a206ddb46e3135ecf9f SHA1 cc503883083a4047e4057dd319ad5abed0c00aaf SHA256 072a45be3209535b313e6b8162d8c015593375c43b5e15cf18ba6eed86f880b2
 DIST gkrellm-volume-2.1.13.tar.gz 42087 RMD160 4ebc28a6a97f5d31d73927509ab956422e9a79de SHA1 e9ea9bdd8eac53e8d99baf7705e76c28d8c4f2c3 SHA256 85fa0ac0d242725f81316efba171315323822117d2e24d67273c3356e1b15a43
+EBUILD gkrellm-volume-2.1.13-r1.ebuild 767 RMD160 e6a1be6e2d630a2fff4a2af40cc2a8711fc5b3dc SHA1 e4c4f4a2bde2ea92b78dce99a8f5754c69e00d29 SHA256 31c9fd51a7b83d73779b06735baa2f177c8fed53f2f902dba7a42feee8093965
 EBUILD gkrellm-volume-2.1.13.ebuild 684 RMD160 9300556b49a2c5df642fb90c4f5a96f4ff175a60 SHA1 2eaba35d17b8764c851a28b03fef6cc9379213b3 SHA256 bd1e612671d87ab332633a9ae0cd59fbb51f2ac032c842d20ba6ec54f93b4254
-MISC ChangeLog 4220 RMD160 a1f0e743244d08c8ac6a2144319a1ef0ee990628 SHA1 44f5107a87ce9a79abe700a366fe972415342e45 SHA256 917467cf0dba109902d1f35cd945ba6d23b77909fc42ee1394d9661a8c8fd888
+MISC ChangeLog 4471 RMD160 44f66c9637800e02c93e9ccc10d62d99effa6207 SHA1 93dbdd80e8f12dd38bb64c0cca29a0b42f6e6167 SHA256 b3681cfce43385a27fc1e78e6632abf8f9d940ac4e77f23f31f3880693266032
 MISC metadata.xml 254 RMD160 415926d9875e8fe9b0d03e74435ad2521fac159c SHA1 172a4c3880766b1bb7e75f4f2b4ed0b62c1d2d6c SHA256 dafc7e6c5cb681b9d6ecbe2ff4280bb987d3533c30bb334b4845faee02aa7279
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"
+}