[arch-commits] Commit in lxpanel/trunk (2 files)

[Angel Velásquez]

    Date: Friday, October 8, 2010 @ 18:08:39
  Author: angvp
Revision: 94639

upgpkg: lxpanel 0.5.6-1
Updating to 0.5.6

Added:
  lxpanel/trunk/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch
Modified:
  lxpanel/trunk/PKGBUILD	(contents, properties)

------------------------------------------------------------+
 Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch |   43 +++++++++++
 PKGBUILD                                                   |   14 ++-
 2 files changed, 52 insertions(+), 5 deletions(-)

Added: Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch
===================================================================
--- Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch	                        (rev 0)
+++ Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch	2010-10-08 22:08:39 UTC (rev 94639)
@@ -0,0 +1,43 @@
+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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-08 20:46:55 UTC (rev 94638)
+++ PKGBUILD	2010-10-08 22:08:39 UTC (rev 94639)
@@ -1,20 +1,24 @@
+$Id$
+# Maintainer: Angel Velasquez <angvp at archlinux.org>
 # Maintainer: Juergen Hoetzel <juergen at archlinux.org>
 pkgname=lxpanel
-pkgver=0.5.5
-pkgrel=3
+pkgver=0.5.6
+pkgrel=1
 pkgdesc="Panel of the LXDE Desktop"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://lxde.org/"
 groups=('lxde')
 depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz Fix-failure-to-react-to-keyboard-map-changes-initiat.patch)
-md5sums=('6162b7e8d912a41f9c075fe982370bfb' 'aade0bd1c58be45930e881f987ade17a')
+source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz
+        Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch)
 optdepends=(pcmanfm)
+md5sums=('3c6b5498b5f4109c3913b10a66809fe6'
+         'afe03191cbeccfc702f9a04bffd62dbf')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	patch -p1 -i $srcdir/Fix-failure-to-react-to-keyboard-map-changes-initiat.patch
+	patch -p1 -i $srcdir/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch
 	./configure --sysconfdir=/etc --prefix=/usr 
 	make
 	make DESTDIR="$pkgdir" install


Property changes on: lxpanel/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
   + Id