Hello community, here is the log from the commit of package lxpanel for openSUSE:Factory checked in at Fri Aug 13 02:41:33 CEST 2010. -------- --- lxpanel/lxpanel.changes 2010-07-20 15:29:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/lxpanel/lxpanel.changes 2010-08-12 00:11:32.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 11 22:09:59 UTC 2010 - andrea@opensuse.org + +- added lxpanel-0.5.6-fix-alarm.patch that fix a compilation + error because of a conflicting type alarm + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- lxpanel-0.5.6-fix-alarm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxpanel.spec ++++++ --- /var/tmp/diff_new_pack.QW4jfo/_old 2010-08-13 02:41:07.000000000 +0200 +++ /var/tmp/diff_new_pack.QW4jfo/_new 2010-08-13 02:41:07.000000000 +0200 @@ -20,12 +20,15 @@ Name: lxpanel Version: 0.5.6 -Release: 1 +Release: 2 Summary: Lightweight X11 desktop panel based on fbpanel Group: System/GUI/LXDE License: GPL Url: http://www.lxde.org/ Source0: %name-%version.tar.bz2 +# PATCH-FIX-UPSTREAM lxpanel-0.5.6-fix-alarm.patch andrea@opensuse.org +# this patch fix a compilation error due to a conflicting "alarm" type +Patch0: %name-0.5.6-fix-alarm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: alsa-devel intltool pkg-config update-desktop-files BuildRequires: docbook-utils gtk2-devel menu-cache-devel python-xml @@ -62,6 +65,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" ++++++ lxpanel-0.5.6-fix-alarm.patch ++++++
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] 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.6.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org