hollalinux
/
slackbuilds
mirror of https://github.com/SlackBuildsOrg/slackbuilds.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

desktop/lxpanel: Patched to fix 'alarm' redefinition 

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
Robby Workman 2011-03-16 10:00:36 -05:00
parent a3e94aeac5
commit 026164b143
2 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
desktop/lxpanel/lxpanel-0.5.6-symbol-alarm.patch Normal file
View File

@ -0,0 +1,32 @@
@@ -, +, @@
src/plugins/batt/batt.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
--- a/src/plugins/batt/batt.c
+++ a/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);

10
desktop/lxpanel/lxpanel.SlackBuild
View File

@ -20,12 +20,12 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# modified by ponce <matteo.bernardini@gmail.com>
# Modified by ponce <matteo.bernardini@gmail.com>
PRGNAM=lxpanel
VERSION=0.5.6
BUILD=${BUILD:-1}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
@ -43,7 +43,7 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README"
DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@ -76,6 +76,8 @@ find . \
# fix a battery applet issue:
patch -p1 < $CWD/battery-applet.patch
# fix redefinition of alarm
patch -p1 < $CWD/lxpanel-0.5.6-symbol-alarm.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \