Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=84425607b4b22cd3b383c76429418a539876af70

commit 84425607b4b22cd3b383c76429418a539876af70
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Mon Jul 25 11:23:50 2011 +0200

lxpanel-0.5.7-1-x86_64
*version bump

diff --git a/source/x11-extra/lxpanel/FrugalBuild 
b/source/x11-extra/lxpanel/FrugalBuild
index 5d62c8c..f8c3bb5 100644
--- a/source/x11-extra/lxpanel/FrugalBuild
+++ b/source/x11-extra/lxpanel/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: bouleetbil <bouleet...@frogdev.info>

pkgname=lxpanel
-pkgver=0.5.6
-pkgrel=2
+pkgver=0.5.7
+pkgrel=1
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' 
'xcb-util>=0.3.8')
@@ -14,9 +14,7 @@ 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' \
-          '6f4019131d41d843803e1c92b817e9d2da29bb36')
+sha1sums=('276168fb4560899e83a6a340448c961d63333717')

# optimization OK
diff --git a/source/x11-extra/lxpanel/alarm.diff 
b/source/x11-extra/lxpanel/alarm.diff
deleted file mode 100644
index 18850cd..0000000
--- a/source/x11-extra/lxpanel/alarm.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-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

Reply via email to