Fixing collision with the alarm structure, patch thanks to Ángel Velásquez <angvp@archlinux.org> bug #339029

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 54 insertions, 4 deletions

diff --git a/lxde-base/lxpanel/ChangeLog b/lxde-base/lxpanel/ChangeLog
index fac63e0f3485..fd0e120b3059 100644
--- a/lxde-base/lxpanel/ChangeLog
+++ b/lxde-base/lxpanel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for lxde-base/lxpanel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.21 2010/07/29 14:44:12 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.22 2010/10/12 16:54:17 vostorga Exp $
+
+  12 Oct 2010; Víctor Ostorga <vostorga@gentoo.org> lxpanel-0.5.6.ebuild,
+  +files/lxpanel-0.5.6-symbol-alarm.patch:
+  Fixing collision with the alarm structure, patch thanks to Ángel
+  Velásquez <angvp@archlinux.org> bug #339029
 
 *lxpanel-0.5.6 (29 Jul 2010)
 
diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest
index 2982398fa01c..828115ee4400 100644
--- a/lxde-base/lxpanel/Manifest
+++ b/lxde-base/lxpanel/Manifest
@@ -1,5 +1,6 @@
 AUX lxpanel-0.5.1-sandbox.patch 833 RMD160 83957b8e65104c12c2220027faf24d846fe4b3b9 SHA1 24f5f2c737e56f5bc457fa49426c5115e9d15498 SHA256 1df1574a0faf8d02465f7673f7967b14b2d0bd33f8ac9c5769888ef6c4272489
 AUX lxpanel-0.5.3-battery.patch 347 RMD160 c39c2cff83876216b4876b050456a1efb179c8e0 SHA1 516be1c204212a28521a40c7df9b303d59e31481 SHA256 9b47b25cee0ef6c3fe7d9af11500db6d9e8821a0ddc53cae2f28d722501945e9
+AUX lxpanel-0.5.6-symbol-alarm.patch 1461 RMD160 5ed09d071a349b7554400ea73d16f6aacdc4ad8d SHA1 6b111b32eb1ae9ee869df8ff0ac4c23b8ccbfbb8 SHA256 afafb59ea3e537147ff4d81feb5ec2a3a18eaa628f992c5a44321fa29b85e6af
 DIST lxpanel-0.5.3.tar.gz 929896 RMD160 1ecd5d0d004a1965e0ecdd95531d3743785f8825 SHA1 1ef57049b7d6f699178a6796afb19fec86c107f0 SHA256 69976816ac4ebee8c7dc56df322701e1de9f90ac558a702c12eb3f2e37563ebe
 DIST lxpanel-0.5.4.1.tar.gz 1020003 RMD160 1cd7351fc8add3b7b7336dca4eebbee8f79b9c19 SHA1 c0130528b21e6be22b24eeeb4a525df0c52b2447 SHA256 c0fae92a71f44e0379de4b0f48696756591be2a4688615e877da8bde12889ed9
 DIST lxpanel-0.5.5.tar.gz 1056736 RMD160 18988b6dc8a4dcf476559064aba61480f8143990 SHA1 f3354f13f926226742b65c406988ba7c97009d79 SHA256 729c3dc52e343fe15dfde40475875c2b3670b3b37958c6c1e4c936242cdc2e9b
@@ -7,6 +8,6 @@ DIST lxpanel-0.5.6.tar.gz 1074786 RMD160 5e5ebdd185d06fe0d1965ec2ed12ffecf0984b7
 EBUILD lxpanel-0.5.3.ebuild 1173 RMD160 c201d345299f59587beccf3aa0318599206a4227 SHA1 0358b53d465662fc95842828e88421e9f6fc1b7a SHA256 92f8409e0b2fb6b1fdf37b6435d8cbe5100482fda21a7b092077cbfb6e884297
 EBUILD lxpanel-0.5.4.1.ebuild 1145 RMD160 5804481d311d7659e50d062468f6c1bc91ccf0f8 SHA1 c69950e14acf0a21bc0ab11c4a3c07e7ee3c6035 SHA256 c24bc187d04570f3a75f753fd43e6df762eb2532fdc1bda6d057ebbfbc4832a1
 EBUILD lxpanel-0.5.5.ebuild 1167 RMD160 6d866e255385610cc2ad58e859e6699d8d831f4b SHA1 42024f5aea108f732efa83e0d067683475bbb30c SHA256 339fddae5296096ef9f33f48037388ad7465f52745ae0826add6003d31da294e
-EBUILD lxpanel-0.5.6.ebuild 1173 RMD160 47df0cc4f66baca864bcfecd32a64b9fa770c5f5 SHA1 c292a2f57050e9104a9d2584571de365602d1d09 SHA256 dcda105602750380b2e1ff445fac159814e4754044c17aebff3cc5f2a4979de9
-MISC ChangeLog 2974 RMD160 ee38f0bf66aca2a42176fe2d28a0404187e7d51d SHA1 499c599c860ed55cbaec3c7f1e6c22656cac99c7 SHA256 1ec0c801d0d43722d5f85c81ad710d46b278fdca9a01920fd98148c909f225e3
+EBUILD lxpanel-0.5.6.ebuild 1219 RMD160 54669a02c82688e3466a513389e0c7ce0b203565 SHA1 cd6f52f5f2b249fb2870e4ff71431a4d2ae50dbf SHA256 45de718c2dd7f41d7ddcc5db0f2c169428125333d1d21fc66bf3a182a5f81be7
+MISC ChangeLog 3208 RMD160 aacc113de8dda5b2e2fd8350e00da1fb63a6392f SHA1 d99853bd3a11ce6d8a8d0ee0ae358fb7220ccbbe SHA256 84f20620c8d449c4f30c9b9ba32f942375e4b30ac502b16f5c03ba3125b93d48
 MISC metadata.xml 159 RMD160 35036c133a5c9c7edccc3cdfed5789092f884048 SHA1 bdf1b7cc6ffbdd223b6f05aa072e857dfc981c4f SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb
diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.6-symbol-alarm.patch b/lxde-base/lxpanel/files/lxpanel-0.5.6-symbol-alarm.patch
new file mode 100644
index 000000000000..e3da3d89776c
--- /dev/null
+++ b/lxde-base/lxpanel/files/lxpanel-0.5.6-symbol-alarm.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
+
diff --git a/lxde-base/lxpanel/lxpanel-0.5.6.ebuild b/lxde-base/lxpanel/lxpanel-0.5.6.ebuild
index e6534012689f..0d9088bc3004 100644
--- a/lxde-base/lxpanel/lxpanel-0.5.6.ebuild
+++ b/lxde-base/lxpanel/lxpanel-0.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.6.ebuild,v 1.1 2010/07/29 14:44:12 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.6.ebuild,v 1.2 2010/10/12 16:54:17 vostorga Exp $
 
 EAPI="2"
 inherit eutils autotools
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.5.1-sandbox.patch
+	epatch "${FILESDIR}"/${P}-symbol-alarm.patch
 	eautoreconf
 }