Package: lxpanel Version: 0.5.5-4 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu maverick ubuntu-patch
Hi, On Ubuntu, we fixed a FTBFS du to a variable name already used in one header. Patch included. Regards, Julien Lavergne -- System Information: Debian Release: squeeze/sid APT prefers lucid-updates APT policy: (500, 'lucid-updates'), (500, 'lucid-security'), (500, 'lucid-proposed'), (500, 'lucid') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-22-generic (SMP w/2 CPU cores) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru lxpanel-0.5.5/debian/patches/redefine-alarm-variable.patch lxpanel-0.5.5/debian/patches/redefine-alarm-variable.patch --- lxpanel-0.5.5/debian/patches/redefine-alarm-variable.patch 1970-01-01 01:00:00.000000000 +0100 +++ lxpanel-0.5.5/debian/patches/redefine-alarm-variable.patch 2010-06-01 00:37:33.000000000 +0200 @@ -0,0 +1,38 @@ +#http://dep.debian.net/deps/dep3/ +Description: A patch to rename alarm variable already defined in include header. + +Origin: Ubuntu +Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3007605&group_id=180858&atid=894871 +Author: Julien Lavergne <gi...@ubuntu.com> +Last-Update: 2010-05-26 + +--- lxpanel-0.5.5.orig/src/plugins/batt/batt.c ++++ lxpanel-0.5.5/src/plugins/batt/batt.c +@@ -95,15 +95,15 @@ typedef struct { + typedef struct { + char *command; + sem_t *lock; +-} alarm; ++} alarmStruct; + + static void destructor(Plugin *p); + static void update_display(lx_battery *lx_b, gboolean repaint); + +-/* alarmProcess takes the address of a dynamically allocated alarm struct (which ++/* alarmProcess takes the address of a dynamically allocated alarmStruct struct (which + it must free). It ensures that alarm commands do not run concurrently. */ + static void * alarmProcess(void *arg) { +- alarm *a = (alarm *) arg; ++ alarmStruct *a = (alarmStruct *) arg; + + sem_wait(a->lock); + system(a->command); +@@ -157,7 +157,7 @@ void update_display(lx_battery *lx_b, gb + /* Run the alarm command if it isn't already running */ + if (alarmCanRun) { + +- alarm *a = (alarm *) malloc(sizeof(alarm)); ++ alarmStruct *a = (alarmStruct *) malloc(sizeof(alarmStruct)); + a->command = lx_b->alarmCommand; + a->lock = &(lx_b->alarmProcessLock); + diff -Nru lxpanel-0.5.5/debian/patches/series lxpanel-0.5.5/debian/patches/series --- lxpanel-0.5.5/debian/patches/series 2010-05-25 17:24:02.000000000 +0200 +++ lxpanel-0.5.5/debian/patches/series 2010-05-31 23:54:53.000000000 +0200 @@ -6,3 +6,4 @@ missing_glades.patch default-config.patch g_locale_to_utf8.patch +redefine-alarm-variable.patch
