rpms/lxpanel/F-13 lxpanel-0.5.6-Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch, NONE, 1.1 lxpanel.spec, 1.34, 1.35

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/lxpanel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv641/F-13

Modified Files:
	lxpanel.spec 
Added Files:
	lxpanel-0.5.6-Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch 
Log Message:
add patch to fix build issue on F14

lxpanel-0.5.6-Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch:
 batt.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE lxpanel-0.5.6-Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch ---
>From 4a974f2686d2fafdcda4a180b0483a7b17fd2d71 Mon Sep 17 00:00:00 2001
From: Marty Jack <martyj at 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



Index: lxpanel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/F-13/lxpanel.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- lxpanel.spec	21 Jul 2010 12:58:17 -0000	1.34
+++ lxpanel.spec	23 Jul 2010 23:37:49 -0000	1.35
@@ -12,6 +12,9 @@ URL:            http://lxde.org/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
 # https://bugzilla.redhat.com/show_bug.cgi?id=564746
 Patch0:         lxpanel-0.5.5-dsofix.patch
+# http://sourceforge.net/tracker/?func=detail&aid=3033293&group_id=180858&atid=894869
+# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxpanel;a=commit;h=4a974f2686d2fafdcda4a180b0483a7b17fd2d71
+Patch1:         lxpanel-0.5.6-Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch 
 # distro specific patches
 Patch100:       lxpanel-0.5.4-default.patch
 Patch101:       lxpanel-0.3.8.1-nm-connection-editor.patch
@@ -49,6 +52,7 @@ developing applications that use %{name}
 %prep
 %setup -q
 %patch0 -p1 -b .dsofix
+%patch1 -p1 -b .fix-build-issue
 
 %patch100 -p1 -b .default
 %patch101 -p1 -b .system-config-network