From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jan 24 22:20:31 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6CE2216A40F for ; Wed, 24 Jan 2007 22:20:31 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 4EE7C13C43E for ; Wed, 24 Jan 2007 22:20:31 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l0OMKUoL006184 for ; Wed, 24 Jan 2007 22:20:31 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l0OMKUUw006183; Wed, 24 Jan 2007 22:20:30 GMT (envelope-from gnats) Resent-Date: Wed, 24 Jan 2007 22:20:30 GMT Resent-Message-Id: <200701242220.l0OMKUUw006183@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Martin Wilke Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C1B3316A407 for ; Wed, 24 Jan 2007 22:19:34 +0000 (UTC) (envelope-from miwi@miwi.homeunix.org) Received: from miwi.homeunix.org (dslb-082-083-152-018.pools.arcor-ip.net [82.83.152.18]) by mx1.freebsd.org (Postfix) with ESMTP id 2C88213C45A for ; Wed, 24 Jan 2007 22:19:33 +0000 (UTC) (envelope-from miwi@miwi.homeunix.org) Received: from miwi.homeunix.org (localhost [127.0.0.1]) by miwi.homeunix.org (8.13.8/8.13.8) with ESMTP id l0OMLirt035212; Wed, 24 Jan 2007 23:21:44 +0100 (CET) (envelope-from miwi@miwi.homeunix.org) Received: (from miwi@localhost) by miwi.homeunix.org (8.13.8/8.13.8/Submit) id l0OMLiEa035211; Wed, 24 Jan 2007 23:21:44 +0100 (CET) (envelope-from miwi) Message-Id: <200701242221.l0OMLiEa035211@miwi.homeunix.org> Date: Wed, 24 Jan 2007 23:21:44 +0100 (CET) From: Martin Wilke To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: thorsten.greiner@web.de Subject: ports/108322: [UPDATE] sysutils/xfce4-battery-plugin X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jan 2007 22:20:31 -0000 >Number: 108322 >Category: ports >Synopsis: [UPDATE] sysutils/xfce4-battery-plugin >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jan 24 22:20:30 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Martin Wilke >Release: FreeBSD 7.0-CURRENT i386 >Organization: >Environment: System: FreeBSD miwi.homeunix.org 7.0-CURRENT FreeBSD 7.0-CURRENT #201: Tue Jan 23 23:29:34 CET 2007 >Description: - Fix Display the correct battery level Found in xfce bugzilla: http://bugzilla.xfce.org/show_bug.cgi?id=2814 Added file(s): - files/patch-battery.c Port maintainer (thorsten.greiner@web.de) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- xfce4-battery-plugin-0.5.0_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/sysutils/xfce4-battery-plugin/Makefile,v retrieving revision 1.19 diff -u -u -r1.19 Makefile --- Makefile 22 Jan 2007 16:45:07 -0000 1.19 +++ Makefile 24 Jan 2007 22:18:56 -0000 @@ -7,6 +7,7 @@ PORTNAME= xfce4-battery-plugin PORTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= sysutils xfce MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/ DIST_SUBDIR= xfce4 Index: files/patch-battery.c =================================================================== RCS file: files/patch-battery.c diff -N files/patch-battery.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-battery.c 24 Jan 2007 21:52:15 -0000 @@ -0,0 +1,31 @@ +--- panel-plugin/battery.c.orig Wed Jan 24 20:42:09 2007 ++++ panel-plugin/battery.c Wed Jan 24 20:46:51 2007 +@@ -378,6 +378,7 @@ + rate = last_rate; + } + ++#ifdef __linux__ + charge = (((float)ccapacity)/((float)lcapacity))*100; + + if ( last_acline ) +@@ -389,6 +390,20 @@ + time_remaining = 0; + + last_acline = acline; ++ ++#elif __FreeBSD__ ++ charge = acpistate->percentage; ++ ++ if ( last_acline ) ++ time_remaining = acpistate->rtime; ++ else ++ time_remaining = acpistate->rtime; ++ ++ if ( time_remaining < 0 ) ++ time_remaining = 0; ++ ++ last_acline = acline; ++#endif + + } + #ifdef __linux__ --- xfce4-battery-plugin-0.5.0_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: