diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-10 14:38:26 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-10 14:38:26 -0300 |
commit | f5e137fdf748b757bacfc50577e5d48a693d31c4 (patch) | |
tree | c75bdfef17b69eff3b8bb20b285c880d7f9183c0 /community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch | |
parent | 300b3ee60aef9cfa0a32f5c69aa5e25ad637285f (diff) | |
parent | dd5222c4ae447eb7a6bda08ec5a3c2339852dc16 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chntpw/PKGBUILD
community/hardinfo/PKGBUILD
community/obconf/obconf.install
community/xplc/PKGBUILD
community/zziplib/PKGBUILD
core/rp-pppoe/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/icon-naming-utils/PKGBUILD
extra/lxmenu-data/PKGBUILD
extra/openbox/PKGBUILD
extra/phonon-xine/PKGBUILD
extra/qt/PKGBUILD
extra/zope-interface/PKGBUILD
libre/pacman/PKGBUILD
libre/pacman/pacman.conf.mips64el
libre/pacman/rePKGBUILD
testing/coreutils/PKGBUILD
testing/net-tools/PKGBUILD
Diffstat (limited to 'community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch')
-rw-r--r-- | community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch b/community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch new file mode 100644 index 000000000..e3da3d897 --- /dev/null +++ b/community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch @@ -0,0 +1,43 @@ +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 + |