diff options
| author |   Markus Nigbur <pyrania@gentoo.org> | 2004-07-03 15:09:41 +0000 |
|---|---|---|
| committer | Markus Nigbur <pyrania@gentoo.org> | 2004-07-03 15:09:41 +0000 |
| commit | 63d42f866d11b71cdf1925ffc890584b35ecd6f3 (patch) | |
| tree | 45ab3728585a1786a756537f983d72979310e6f7 /x11-plugins/allin1 | |
| parent | Stable on alpha. (Manifest recommit) (diff) | |
| download | gentoo-2-63d42f866d11b71cdf1925ffc890584b35ecd6f3.tar.gz gentoo-2-63d42f866d11b71cdf1925ffc890584b35ecd6f3.tar.bz2 gentoo-2-63d42f866d11b71cdf1925ffc890584b35ecd6f3.zip | |
Fixed battery bar. See bug #55198.
Diffstat (limited to 'x11-plugins/allin1')
| -rw-r--r-- | x11-plugins/allin1/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-plugins/allin1/allin1-0.4.7.ebuild | 8 | ||||
| -rw-r--r-- | x11-plugins/allin1/files/allin1-0.4.7-pl1.patch | 39 |
3 files changed, 53 insertions, 2 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/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); |