[Pkg-xfce-commits] r1539 - in goodies/xfce4-battery-plugin/debian: . patches

corsac at alioth.debian.org corsac at alioth.debian.org
Mon Jan 21 13:03:19 UTC 2008


Author: corsac
Date: 2008-01-21 13:03:19 +0000 (Mon, 21 Jan 2008)
New Revision: 1539

Added:
   goodies/xfce4-battery-plugin/debian/patches/05_fix-apm-kfreebsd-amd64.patch
Modified:
   goodies/xfce4-battery-plugin/debian/changelog
Log:
add patch to fix build on amd64


Modified: goodies/xfce4-battery-plugin/debian/changelog
===================================================================
--- goodies/xfce4-battery-plugin/debian/changelog	2008-01-20 15:27:27 UTC (rev 1538)
+++ goodies/xfce4-battery-plugin/debian/changelog	2008-01-21 13:03:19 UTC (rev 1539)
@@ -1,3 +1,11 @@
+xfce4-battery-plugin (0.5.0-4) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 05_fix-apm-kfreebsd-amd64 added: fix ftbfs on kfreebsd-amd64 where apm
+      doesn't exist. (Xfce 3811)
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 21 Jan 2008 13:39:27 +0100
+
 xfce4-battery-plugin (0.5.0-3) unstable; urgency=low
 
   [ Simon Huggins ]

Added: goodies/xfce4-battery-plugin/debian/patches/05_fix-apm-kfreebsd-amd64.patch
===================================================================
--- goodies/xfce4-battery-plugin/debian/patches/05_fix-apm-kfreebsd-amd64.patch	                        (rev 0)
+++ goodies/xfce4-battery-plugin/debian/patches/05_fix-apm-kfreebsd-amd64.patch	2008-01-21 13:03:19 UTC (rev 1539)
@@ -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__




More information about the Pkg-xfce-commits mailing list