Fixed battery bar. See bug #55198.

4 files changed, 57 insertions, 5 deletions

diff --git a/x11-plugins/allin1/ChangeLog b/x11-plugins/allin1/ChangeLog
index 084e6edd4582..eaa465f3a94b 100644
--- a/x11-plugins/allin1/ChangeLog
+++ b/x11-plugins/allin1/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/allin1
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/allin1/ChangeLog,v 1.5 2004/06/24 22:47:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/allin1/ChangeLog,v 1.6 2004/07/03 15:09:41 pyrania Exp $
+
+*allin1-0.4.7 (03 Jul 2004)
+
+  03 Jul 2004; <pyrania@gentoo.org> +files/allin1-0.4.7-pl1.patch,
+  allin1-0.4.7.ebuild:
+  Fixed battery bar. See bug #55198.
 
   13 Jun 2004; <pyrania@gentoo.org> :
   Version bump. Closing bug #50574.
diff --git a/x11-plugins/allin1/Manifest b/x11-plugins/allin1/Manifest
index 451a62ea0adf..dd07bd87a048 100644
--- a/x11-plugins/allin1/Manifest
+++ b/x11-plugins/allin1/Manifest
@@ -1,6 +1,7 @@
+MD5 a49f22d6243f83ce926b0060433db391 ChangeLog 842
 MD5 9ddbc8c8cfad1b1724a19e1f3c77c471 allin1-0.4.5.ebuild 693
-MD5 f359ab104cfc71429724d91539a9d4f9 allin1-0.4.7.ebuild 714
-MD5 efe52feb89a753a978d462fd17fa1f8e ChangeLog 686
+MD5 0e336ce6189e22320c35c769232b4864 allin1-0.4.7.ebuild 788
 MD5 f2cc4e1b504095866f5acafa054a241b metadata.xml 483
-MD5 5bb804feecc3bc0c1d9c960d64229a41 files/digest-allin1-0.4.5 63
 MD5 946adba16900786806e77135990f17e2 files/digest-allin1-0.4.7 63
+MD5 dfda45d12a9f226c0cefd5dbf30529fa files/allin1-0.4.7-pl1.patch 944
+MD5 5bb804feecc3bc0c1d9c960d64229a41 files/digest-allin1-0.4.5 63
diff --git a/x11-plugins/allin1/allin1-0.4.7.ebuild b/x11-plugins/allin1/allin1-0.4.7.ebuild
index 0a85812b639e..b71e97ddf750 100644
--- a/x11-plugins/allin1/allin1-0.4.7.ebuild
+++ b/x11-plugins/allin1/allin1-0.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/allin1/allin1-0.4.7.ebuild,v 1.2 2004/06/24 22:47:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/allin1/allin1-0.4.7.ebuild,v 1.3 2004/07/03 15:09:41 pyrania Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="All in one monitoring dockapp: RAM, CPU, Net, Power, df"
@@ -12,6 +12,12 @@ KEYWORDS="~x86 ~ppc"
 IUSE=""
 DEPEND="virtual/x11"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-pl1.patch
+}
+
 src_compile() {
 	make || die
 }
diff --git a/x11-plugins/allin1/files/allin1-0.4.7-pl1.patch b/x11-plugins/allin1/files/allin1-0.4.7-pl1.patch
new file mode 100644
index 000000000000..4f910bd273db
--- /dev/null
+++ b/x11-plugins/allin1/files/allin1-0.4.7-pl1.patch
@@ -0,0 +1,39 @@
+Index: allin1/src/battery.c
+diff -c allin1/src/battery.c:1.4 allin1/src/battery.c:1.5
+*** allin1/src/battery.c:1.4	Sun Mar 14 14:08:48 2004
+--- allin1/src/battery.c	Wed Jun 23 01:15:26 2004
+***************
+*** 45,51 ****
+    
+    int i;
+    FILE *f;
+!   char s[255];
+  
+    bm->ac_line_status = 1;
+    bm->battery_status = 0xff;
+--- 45,51 ----
+    
+    int i;
+    FILE *f;
+!   char s[255],*p;
+  
+    bm->ac_line_status = 1;
+    bm->battery_status = 0xff;
+***************
+*** 58,64 ****
+    while (!feof (f)) 
+    {
+      fgets (s, 254, f);
+!     sscanf (s, "%d.%d %d.%d %x %x %x %x %d",&i,&i,&i,&i,&i,
+  	&(bm->ac_line_status),&(bm->battery_status),&i,&(bm->battery_percentage));
+    }
+    fclose(f);
+--- 58,65 ----
+    while (!feof (f)) 
+    {
+      fgets (s, 254, f);
+!     p = strchr(s,' ');
+!     sscanf (p, "%d.%d %x %x %x %x %d",&i,&i,&i,
+  	&(bm->ac_line_status),&(bm->battery_status),&i,&(bm->battery_percentage));
+    }
+    fclose(f);