From b370802d35faf4f50fafac5fd85396de039c8768 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Wed, 16 Jun 2010 14:42:28 +0200
Subject: maj lxpanel#0.5.5-1

---
 extra/lxpanel/.footprint                  |  1 +
 extra/lxpanel/.md5sum                     |  3 ++-
 extra/lxpanel/Pkgfile                     |  5 +++--
 extra/lxpanel/lxpanel-0.5.5-batt-01.patch | 29 +++++++++++++++++++++++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 extra/lxpanel/lxpanel-0.5.5-batt-01.patch

(limited to 'extra')

diff --git a/extra/lxpanel/.footprint b/extra/lxpanel/.footprint
index 9402ea71a..8ee95c6dd 100644
--- a/extra/lxpanel/.footprint
+++ b/extra/lxpanel/.footprint
@@ -30,6 +30,7 @@ drwxr-xr-x	root/root	usr/share/lxpanel/images/
 -rw-r--r--	root/root	usr/share/lxpanel/images/capslock-off.png
 -rw-r--r--	root/root	usr/share/lxpanel/images/capslock-on.png
 -rw-r--r--	root/root	usr/share/lxpanel/images/clock.png
+-rw-r--r--	root/root	usr/share/lxpanel/images/cpufreq-icon.png
 -rw-r--r--	root/root	usr/share/lxpanel/images/file-manager.png
 -rw-r--r--	root/root	usr/share/lxpanel/images/gnome-logout.png
 -rw-r--r--	root/root	usr/share/lxpanel/images/gnome-netstatus-0-24.png
diff --git a/extra/lxpanel/.md5sum b/extra/lxpanel/.md5sum
index 630a5039d..0d039d4d9 100644
--- a/extra/lxpanel/.md5sum
+++ b/extra/lxpanel/.md5sum
@@ -1,2 +1,3 @@
-bdc0db6f692a7e13024cb17f9710bd6e  lxpanel-0.5.4.1.tar.gz
+c8074072e0b57be67a063d133cd29329  lxpanel-0.5.5-batt-01.patch
+6162b7e8d912a41f9c075fe982370bfb  lxpanel-0.5.5.tar.gz
 92c98cc3d1f14ed4827360803a85290b  volume.png
diff --git a/extra/lxpanel/Pkgfile b/extra/lxpanel/Pkgfile
index 46ffda9f9..1248a6d93 100644
--- a/extra/lxpanel/Pkgfile
+++ b/extra/lxpanel/Pkgfile
@@ -6,15 +6,16 @@
 # Depends on: gtk, menu-cache, alsa-lib
 
 name=lxpanel
-version=0.5.4.1
+version=0.5.5
 release=1
 
 source=(http://downloads.sourceforge.net/lxde/files/$name-$version.tar.gz\
-	volume.png)
+	lxpanel-0.5.5-batt-01.patch volume.png)
 
 
 build() {
 cd $name-$version
+patch -Np1 -i ../lxpanel-0.5.5-batt-01.patch
 ./configure --prefix=/usr
 make
 make DESTDIR=$PKG install
diff --git a/extra/lxpanel/lxpanel-0.5.5-batt-01.patch b/extra/lxpanel/lxpanel-0.5.5-batt-01.patch
new file mode 100644
index 000000000..2c4d3d10d
--- /dev/null
+++ b/extra/lxpanel/lxpanel-0.5.5-batt-01.patch
@@ -0,0 +1,29 @@
+--- lxpanel-0.5.5/src/plugins/batt/batt.c	2010-02-06 20:45:38.000000000 +0100
++++ lxpanel-0.5.5/src/plugins/batt/batt.c.new	2010-06-16 14:19:56.000000000 +0200
+@@ -95,7 +95,7 @@
+ typedef struct {
+     char *command;
+     sem_t *lock;
+-} alarm;
++} lx_alarm;
+ 
+ static void destructor(Plugin *p);
+ static void update_display(lx_battery *lx_b, gboolean repaint);
+@@ -103,7 +103,7 @@
+ /* alarmProcess takes the address of a dynamically allocated alarm struct (which
+    it must free). It ensures that alarm commands do not run concurrently. */
+ static void * alarmProcess(void *arg) {
+-    alarm *a = (alarm *) arg;
++    lx_alarm *a = (lx_alarm *) arg;
+ 
+     sem_wait(a->lock);
+     system(a->command);
+@@ -157,7 +157,7 @@
+ 	/* Run the alarm command if it isn't already running */
+ 	if (alarmCanRun) {
+ 	    
+-	    alarm *a = (alarm *) malloc(sizeof(alarm));
++	    lx_alarm *a = (lx_alarm *) malloc(sizeof(lx_alarm));
+ 	    a->command = lx_b->alarmCommand;
+ 	    a->lock = &(lx_b->alarmProcessLock);
+ 	    
-- 
cgit v1.2.3-54-g00ecf