Added patch to fix bug 168417 - Segfault when enabled in the default theme

(Portage version: 2.1.2-r10)

4 files changed, 112 insertions, 12 deletions

diff --git a/x11-plugins/gkrellm-bluez/ChangeLog b/x11-plugins/gkrellm-bluez/ChangeLog
index e29971336054..9bcecc3ac2ad 100644
--- a/x11-plugins/gkrellm-bluez/ChangeLog
+++ b/x11-plugins/gkrellm-bluez/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/gkrellm-bluez
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bluez/ChangeLog,v 1.1 2007/02/23 18:18:58 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bluez/ChangeLog,v 1.2 2007/03/09 15:40:49 lack Exp $
+
+*gkrellm-bluez-0.2-r1 (09 Mar 2007)
+
+  09 Mar 2007; Jim Ramsay <lack@gentoo.org>
+  +files/gkrellm-bluez-0.2-notheme.patch, -gkrellm-bluez-0.2.ebuild,
+  +gkrellm-bluez-0.2-r1.ebuild:
+  Added patch to fix bug 168417 - Segfault when enabled in the default theme
 
 *gkrellm-bluez-0.2 (23 Feb 2007)
 
diff --git a/x11-plugins/gkrellm-bluez/files/digest-gkrellm-bluez-0.2 b/x11-plugins/gkrellm-bluez/files/digest-gkrellm-bluez-0.2-r1
index 3341289db477..3341289db477 100644
--- a/x11-plugins/gkrellm-bluez/files/digest-gkrellm-bluez-0.2
+++ b/x11-plugins/gkrellm-bluez/files/digest-gkrellm-bluez-0.2-r1
diff --git a/x11-plugins/gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch b/x11-plugins/gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch
new file mode 100644
index 000000000000..6a9841652dd2
--- /dev/null
+++ b/x11-plugins/gkrellm-bluez/files/gkrellm-bluez-0.2-notheme.patch
@@ -0,0 +1,91 @@
+diff -u --new-file gkrellm-bluez-0.2-orig/src/decal_net_leds.xpm gkrellm-bluez-0.2/src/decal_net_leds.xpm
+--- gkrellm-bluez-0.2-orig/src/decal_net_leds.xpm	1969-12-31 18:00:00.000000000 -0600
++++ gkrellm-bluez-0.2/src/decal_net_leds.xpm	2007-03-08 09:07:50.000000000 -0600
+@@ -0,0 +1,66 @@
++/* XPM */
++static char * decal_net_leds_xpm[] = {
++"10 12 51 1",
++" 	c None",
++".	c #222323",
++"+	c #3A3A3A",
++"@	c #4C4F4F",
++"#	c #3E3F3F",
++"$	c #262727",
++"%	c #334735",
++"&	c #335E4F",
++"*	c #337568",
++"=	c #2C857C",
++"-	c #259790",
++";	c #1EA8A4",
++">	c #18B5B4",
++",	c #20A39E",
++"'	c #2A786D",
++")	c #314E3E",
++"!	c #526E55",
++"~	c #48846F",
++"{	c #3F9988",
++"]	c #36B0A2",
++"^	c #2CC8BF",
++"/	c #22E0DA",
++"(	c #1BF1EF",
++"_	c #25D8D2",
++":	c #3AA595",
++"<	c #4E765F",
++"[	c #141414",
++"}	c #272929",
++"|	c #3D3F3F",
++"1	c #2D2E2E",
++"2	c #171717",
++"3	c #5D421D",
++"4	c #84612F",
++"5	c #AD8643",
++"6	c #D0A456",
++"7	c #CDA255",
++"8	c #BA914B",
++"9	c #A68040",
++"0	c #936E37",
++"a	c #805F2E",
++"b	c #6E5125",
++"c	c #7F643C",
++"d	c #A48350",
++"e	c #CDA666",
++"f	c #F1C479",
++"g	c #EEC277",
++"h	c #DAB16D",
++"i	c #C6A062",
++"j	c #B39058",
++"k	c #A0814F",
++"l	c #8F7345",
++".+@@@@@@#$",
++".+@@@@@@#$",
++".+@@@@@@#$",
++"%&*=-;>,')",
++"!~{]^/(_:<",
++"%&*=-;>,')",
++"[}||||||12",
++"[}||||||12",
++"[}||||||12",
++"34567890ab",
++"cdefghijkl",
++"34567890ab"};
+diff -u --new-file gkrellm-bluez-0.2-orig/src/gkrellm-bluez-chart.c gkrellm-bluez-0.2/src/gkrellm-bluez-chart.c
+--- gkrellm-bluez-0.2-orig/src/gkrellm-bluez-chart.c	2006-11-14 13:50:24.000000000 -0600
++++ gkrellm-bluez-0.2/src/gkrellm-bluez-chart.c	2007-03-08 09:13:29.000000000 -0600
+@@ -22,6 +22,8 @@
+ 
+ #include "gkrellm-bluez-chart.h"
+ 
++#include "decal_net_leds.xpm"
++
+ #define DECAL_NET_LEDS      "decal_net_leds"
+ 
+ #define GRID_RESOLUTION_MIN 0
+@@ -237,7 +239,7 @@
+ 
+     /* Check for theme_dir/net/decal_net_leds.png.
+      */
+-    gkrellm_load_piximage(DECAL_NET_LEDS, NULL,
++    gkrellm_load_piximage(DECAL_NET_LEDS, decal_net_leds_xpm,
+ 			  &decal_net_led_piximage, NET_STYLE_NAME);
+     
+     w = gdk_pixbuf_get_width(decal_net_led_piximage->pixbuf);
diff --git a/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2.ebuild b/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r1.ebuild
index 5e200c1d3e9a..4beee1f93971 100644
--- a/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2.ebuild
+++ b/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r1.ebuild
@@ -1,28 +1,30 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2.ebuild,v 1.1 2007/02/23 18:18:58 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r1.ebuild,v 1.1 2007/03/09 15:40:49 lack Exp $
 
-inherit multilib
+inherit gkrellm-plugin
 
 DESCRIPTION="GKrellm plugin for monitoring bluetooth (Linux BlueZ) adapters"
 SRC_URI="mirror://sourceforge/gkrellm-bluez/${P}.tar.gz"
 HOMEPAGE="http://gkrellm-bluez.sourceforge.net"
 
-RDEPEND="=app-admin/gkrellm-2*
-	net-wireless/bluez-libs"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+RDEPEND="net-wireless/bluez-libs"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 IUSE=""
 SLOT="0"
 
-src_compile() {
-	econf --disable-static || die
-	emake || die
+PLUGIN_SO="src/.libs/gkrellmbluez.so"
+PLUGIN_DOCS="THEMING NEWS"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-notheme.patch || die "Patch failed"
 }
 
-src_install () {
-	einstall || die
+src_compile() {
+	econf --disable-static || die "Config failed"
+	emake || die "Make failed"
 }
+