Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=9e8e055f0ce34832f9131a1259fa9cc1d1a768d0
commit 9e8e055f0ce34832f9131a1259fa9cc1d1a768d0
Author: bouleetbil <bouleet...@frogdev.info>
Date: Fri May 6 19:02:25 2011 +0200
lxpanel-0.5.6-2-x86_64
*rebuild with latest xcb-util
diff --git a/source/x11-extra/lxpanel/FrugalBuild
b/source/x11-extra/lxpanel/FrugalBuild
index 0c316eb..5d62c8c 100644
--- a/source/x11-extra/lxpanel/FrugalBuild
+++ b/source/x11-extra/lxpanel/FrugalBuild
@@ -3,10 +3,10 @@
pkgname=lxpanel
pkgver=0.5.6
-pkgrel=1
+pkgrel=2
pkgdesc="lxpanel is a light-weight X11 desktop panel for lxde"
depends=('wireless_tools' 'gtk+2>=2.20.0-2' 'alsa-lib' 'libxpm' 'libxdamage'
'freetype2' \
- 'libxau' 'libxdmcp' 'libxext' 'libxml2' 'menu-cache>=0.3.2'
'lxmenu-data')
+ 'libxau' 'libxdmcp' 'libxext' 'libxml2' 'menu-cache>=0.3.2'
'lxmenu-data' 'xcb-util>=0.3.8')
rodepends=('pcmanfm' 'lxsession-lite' 'gtk+2-engines' 'gtk+2-theme-frugalware')
makedepends=('intltool')
options=('scriptlet')
@@ -14,7 +14,9 @@ groups=('x11-extra' 'lxde-desktop')
archs=('i686' 'x86_64' 'ppc')
_F_sourceforge_dirname="lxde"
Finclude sourceforge
+source=($source alarm.diff)
url="http://lxde.org/";
-sha1sums=('fc5483e6016ac52c38b38274cca7661f2aa828ab')
+sha1sums=('fc5483e6016ac52c38b38274cca7661f2aa828ab' \
+ '6f4019131d41d843803e1c92b817e9d2da29bb36')
# optimization OK
diff --git a/source/x11-extra/lxpanel/alarm.diff
b/source/x11-extra/lxpanel/alarm.diff
new file mode 100644
index 0000000..18850cd
--- /dev/null
+++ b/source/x11-extra/lxpanel/alarm.diff
@@ -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
+
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
