From: Jim Ramsay <lack@gentoo.org>
Date: Fri, 9 Mar 2007 15:40:49 +0000 (+0000)
Subject: Added patch to fix bug 168417 - Segfault when enabled in the default theme
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9062a74cb67be807d48ba317c767ae6a2177d438;p=gentoo.git

Added patch to fix bug 168417 - Segfault when enabled in the default theme
Package-Manager: portage-2.1.2-r10
---

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/Manifest b/x11-plugins/gkrellm-bluez/Manifest
index 4ff636a3bb3d..c1be7d09cae6 100644
--- a/x11-plugins/gkrellm-bluez/Manifest
+++ b/x11-plugins/gkrellm-bluez/Manifest
@@ -1,16 +1,20 @@
+AUX gkrellm-bluez-0.2-notheme.patch 2115 RMD160 5a617bb6e4e93da654e846640b062c88fcde03f9 SHA1 a3ea84fd2d5f829b69ade61d1dd814315546d6e5 SHA256 274278c6c81ae77b13c219f883df43d5ed020e05b2ef54eebf06ccb1e3ef6631
+MD5 5ec4d8980c3d5885be487b42e393c570 files/gkrellm-bluez-0.2-notheme.patch 2115
+RMD160 5a617bb6e4e93da654e846640b062c88fcde03f9 files/gkrellm-bluez-0.2-notheme.patch 2115
+SHA256 274278c6c81ae77b13c219f883df43d5ed020e05b2ef54eebf06ccb1e3ef6631 files/gkrellm-bluez-0.2-notheme.patch 2115
 DIST gkrellm-bluez-0.2.tar.gz 330247 RMD160 20b88c6214db9757d8d4e3a55874cd58f0f3f4f8 SHA1 7375a552e38fdae5bfb071e16adc57280cb03206 SHA256 cfaeecb7f9d15d6a35a6faa60cab33e2fe6eb5ab05352f6ea343b063a5a6d476
-EBUILD gkrellm-bluez-0.2.ebuild 680 RMD160 dc55798a6dcd21bb4fa96a19e5132afa2325a98f SHA1 cdf937e6e2c2bfdb394b181bd2362af349ec1b4c SHA256 10445d4c9a8e52d58804700916e44364584149b1ef76d1ccbe7ff660aa029a9e
-MD5 f24daaf1d0419ea18af89bc092353959 gkrellm-bluez-0.2.ebuild 680
-RMD160 dc55798a6dcd21bb4fa96a19e5132afa2325a98f gkrellm-bluez-0.2.ebuild 680
-SHA256 10445d4c9a8e52d58804700916e44364584149b1ef76d1ccbe7ff660aa029a9e gkrellm-bluez-0.2.ebuild 680
-MISC ChangeLog 377 RMD160 62090e4ecb756fd56cb135df16462e01cc47c5fe SHA1 324de241a663b238cbc569b8c48a075e7442f840 SHA256 fc05b34143d62816e43c676e413133961e52f0e0792440f36e61bbb4aa28c05f
-MD5 910fd6348267aeafdcf9a37267a4975f ChangeLog 377
-RMD160 62090e4ecb756fd56cb135df16462e01cc47c5fe ChangeLog 377
-SHA256 fc05b34143d62816e43c676e413133961e52f0e0792440f36e61bbb4aa28c05f ChangeLog 377
+EBUILD gkrellm-bluez-0.2-r1.ebuild 780 RMD160 0c9645f516ed616535a402e7be236861a31252e0 SHA1 ec8f21cab7414c1759da406f3847f306561c93dc SHA256 b4101cf9b1ed86289232efc330a8544a78097461f99664f0a3b1736419a821a8
+MD5 9a5a6e49fa7ea8a43b09d89dea480b6f gkrellm-bluez-0.2-r1.ebuild 780
+RMD160 0c9645f516ed616535a402e7be236861a31252e0 gkrellm-bluez-0.2-r1.ebuild 780
+SHA256 b4101cf9b1ed86289232efc330a8544a78097461f99664f0a3b1736419a821a8 gkrellm-bluez-0.2-r1.ebuild 780
+MISC ChangeLog 637 RMD160 a255d83621eaff0697c9a303223c792325fa2fd6 SHA1 b66e8266fbdcea39ae4638fb2ad0ac8e406f92a8 SHA256 41259ed2534b34937ee1ade9c9e6ccf12594ddf9fc67c19e689c6737a568ab2d
+MD5 0896ba797f0c2fbb3df4cdbd18361a77 ChangeLog 637
+RMD160 a255d83621eaff0697c9a303223c792325fa2fd6 ChangeLog 637
+SHA256 41259ed2534b34937ee1ade9c9e6ccf12594ddf9fc67c19e689c6737a568ab2d ChangeLog 637
 MISC metadata.xml 254 RMD160 415926d9875e8fe9b0d03e74435ad2521fac159c SHA1 172a4c3880766b1bb7e75f4f2b4ed0b62c1d2d6c SHA256 dafc7e6c5cb681b9d6ecbe2ff4280bb987d3533c30bb334b4845faee02aa7279
 MD5 599b71bb15dd853af7b7733ed80c5d79 metadata.xml 254
 RMD160 415926d9875e8fe9b0d03e74435ad2521fac159c metadata.xml 254
 SHA256 dafc7e6c5cb681b9d6ecbe2ff4280bb987d3533c30bb334b4845faee02aa7279 metadata.xml 254
-MD5 4d06298e711a6ec0bf1df420bdfe40be files/digest-gkrellm-bluez-0.2 253
-RMD160 a657c38951443cf9ed4eb7ec675559f7219a9932 files/digest-gkrellm-bluez-0.2 253
-SHA256 8fa1596c19e1ed5807f5459a97c341d258b4bc202d61b666be5a782791ee450a files/digest-gkrellm-bluez-0.2 253
+MD5 4d06298e711a6ec0bf1df420bdfe40be files/digest-gkrellm-bluez-0.2-r1 253
+RMD160 a657c38951443cf9ed4eb7ec675559f7219a9932 files/digest-gkrellm-bluez-0.2-r1 253
+SHA256 8fa1596c19e1ed5807f5459a97c341d258b4bc202d61b666be5a782791ee450a files/digest-gkrellm-bluez-0.2-r1 253
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
similarity index 100%
rename from x11-plugins/gkrellm-bluez/files/digest-gkrellm-bluez-0.2
rename to 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
similarity index 54%
rename from x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2.ebuild
rename to 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"
 }
+