summaryrefslogtreecommitdiffstats
path: root/lxde
diff options
context:
space:
mode:
authorFlorian Franzmann2010-11-27 08:38:19 +0100
committerFlorian Franzmann2010-11-27 08:38:19 +0100
commitd67448d8246771ef7a8d387c51b7f7c98ab565c0 (patch)
tree56182a2341ed58d3e348e89fc1acb9040732fdf8 /lxde
parent1288ae002c0383205da8369745a171529fa7bbab (diff)
lxde/lxpanel: version 0.5.6
Diffstat (limited to 'lxde')
-rwxr-xr-xlxde/lxpanel/DETAILS4
-rw-r--r--lxde/lxpanel/HISTORY5
-rwxr-xr-xlxde/lxpanel/PRE_BUILD3
-rw-r--r--lxde/lxpanel/lxpanel-alarm.patch44
4 files changed, 54 insertions, 2 deletions
diff --git a/lxde/lxpanel/DETAILS b/lxde/lxpanel/DETAILS
index 0099e4cf6a..1c5689a074 100755
--- a/lxde/lxpanel/DETAILS
+++ b/lxde/lxpanel/DETAILS
@@ -1,8 +1,8 @@
SPELL=lxpanel
- VERSION=0.5.5
+ VERSION=0.5.6
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/lxde/${SOURCE}
- SOURCE_HASH=sha512:316186c7d882732bacf5c4d38f7eddbbbaa789824e8fac6c307f00b778638bc1ca587bdaf727fa4a5b11df9eb5c64be8b818ffe1cd746bf53f78e1b378f851f5
+ SOURCE_HASH=sha512:83e37b9555152f4da43f73236713137178f5a1c629be68946afaa10d5c8d0248f1376058f4b72bba6b08577ee759c55194f938a85c5d6cd0c31b3c18d112867f
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://lxde.sourceforge.net/
LICENSE[0]=GPL
diff --git a/lxde/lxpanel/HISTORY b/lxde/lxpanel/HISTORY
index 7de3cd522b..7dfee17249 100644
--- a/lxde/lxpanel/HISTORY
+++ b/lxde/lxpanel/HISTORY
@@ -1,3 +1,8 @@
+2010-11-27 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.5.6
+ * PRE_BUILD, lxpanel-alarm.patch: patch from gentoo to fix
+ compile error
+
2010-06-01 Bor Kraljič <pyrobor@ver.si>
* DETAILS: updated spell to 0.5.5
diff --git a/lxde/lxpanel/PRE_BUILD b/lxde/lxpanel/PRE_BUILD
new file mode 100755
index 0000000000..b944a94b81
--- /dev/null
+++ b/lxde/lxpanel/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/lxpanel-alarm.patch
diff --git a/lxde/lxpanel/lxpanel-alarm.patch b/lxde/lxpanel/lxpanel-alarm.patch
new file mode 100644
index 0000000000..18850cdf69
--- /dev/null
+++ b/lxde/lxpanel/lxpanel-alarm.patch
@@ -0,0 +1,44 @@
+From 4a974f2686d2fafdcda4a180b0483a7b17fd2d71 Mon Sep 17 00:00:00 2001
+From: Marty Jack <martyj@linux.local>
+Date: Thu, 22 Jul 2010 19:46:13 -0400
+Subject: [PATCH 3/3] Fix build issue with symbol "alarm" showing up on F14 (Bug3033293)
+
+---
+ src/plugins/batt/batt.c | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/plugins/batt/batt.c b/src/plugins/batt/batt.c
+index 288231f..05c0deb 100644
+--- a/src/plugins/batt/batt.c
++++ b/src/plugins/batt/batt.c
+@@ -95,7 +95,7 @@ typedef struct {
+ typedef struct {
+ char *command;
+ sem_t *lock;
+-} alarm;
++} Alarm;
+
+ static void destructor(Plugin *p);
+ static void update_display(lx_battery *lx_b, gboolean repaint);
+@@ -103,7 +103,7 @@ static void update_display(lx_battery *lx_b, gboolean repaint);
+ /* 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;
++ Alarm *a = (Alarm *) arg;
+
+ sem_wait(a->lock);
+ system(a->command);
+@@ -157,7 +157,7 @@ void update_display(lx_battery *lx_b, gboolean repaint) {
+ /* Run the alarm command if it isn't already running */
+ if (alarmCanRun) {
+
+- alarm *a = (alarm *) malloc(sizeof(alarm));
++ Alarm *a = (Alarm *) malloc(sizeof(Alarm));
+ a->command = lx_b->alarmCommand;
+ a->lock = &(lx_b->alarmProcessLock);
+
+--
+1.7.1.1
+
+