Added patch to rename internal 'kill' function that on some

setups conflicts with glibc definition. No point in creating a new
package revision since the change is really trivial. Closes bug #248626.
Removed old, unused, stale patches.
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.24-tuxonice-r9 i686

6 files changed, 35 insertions, 100 deletions

diff --git a/x11-plugins/wmcalendar/ChangeLog b/x11-plugins/wmcalendar/ChangeLog
index 6fafb663ab59..e282ba603ca1 100644
--- a/x11-plugins/wmcalendar/ChangeLog
+++ b/x11-plugins/wmcalendar/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/wmcalendar
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/ChangeLog,v 1.17 2008/11/17 23:10:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/ChangeLog,v 1.18 2009/01/22 15:47:56 s4t4n Exp $
+
+  22 Jan 2009; Michele Noberasco <s4t4n@gentoo.org> wmcalendar-0.5.2.ebuild,
+  +files/wmcalendar-0.5.2-rename_kill_func.patch:
+  Added patch to rename internal 'kill' function that on some
+  setups conflicts with glibc definition. No point in creating a new
+  package revision since the change is really trivial. Closes bug #248626.
+  -files/wmcalendar-0.5.0.makefile.patch, -files/wmcalendar-0.5.0-gcc4.patch:
+  Removed old, unused, stale patches.
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/wmcalendar-0.5.0.makefile.patch:
diff --git a/x11-plugins/wmcalendar/Manifest b/x11-plugins/wmcalendar/Manifest
index f60e2b9763eb..da07501e949f 100644
--- a/x11-plugins/wmcalendar/Manifest
+++ b/x11-plugins/wmcalendar/Manifest
@@ -1,17 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX wmcalendar-0.5.0-gcc4.patch 1946 RMD160 09b35fc5d923f6c18e5baec4d887f86a30780006 SHA1 76db2d0dc4215657bad60113e98651974420d13b SHA256 8ed047190c35f9fc6d62b7e1301401947fa8906ea6e563d0165b3abf5e2443cb
-AUX wmcalendar-0.5.0.makefile.patch 983 RMD160 a5280bcf948457bb53fb5e30765a70bbaa85af5d SHA1 a7738fcb9578728aa9de1bc582cdf559d91957e2 SHA256 68a0a690659ee10f59df981889056d0f5e36b1fc0f875b0096c6e3e57928c9bc
 AUX wmcalendar-0.5.2-exit-sin-and-cos.patch 2394 RMD160 d32530f55a87bd7c485284ff5b05128e66d1825f SHA1 b5144e1e65465cf85a00bd7db607d02d4a708848 SHA256 4e2ade7013f86b42250ff3534aa7e3a0960f315ab77ffe92213a6cb802385b61
+AUX wmcalendar-0.5.2-rename_kill_func.patch 710 RMD160 2fc73d59cc6dc3acb35648d9f3c34c539c64ef71 SHA1 086c12f3b9cbdcf56d92f66f11b74f2f13e1b61e SHA256 631f8e5575aae903b158366b1cb867124eee9c2afd57e9f7b8e05b50b55c7916
 DIST wmcalendar-0.5.2.tar.gz 42720 RMD160 9daf0cae0c8eb5c651083783b7cac368f9528543 SHA1 b6ca855bd73f516a271df077696035507dbad76d SHA256 1915fe5b9af9de400650db4e9e4fa5934115902e8906144bf266b2f3503e0c00
-EBUILD wmcalendar-0.5.2.ebuild 895 RMD160 2144df1a07391daed9634303e8eab9e3505be873 SHA1 42b3e6c517adff4fc7020f132ea3e1e18c9a68b8 SHA256 9b3a1b7d6bafad2e4f13507f95d3566207dbe8775017169acb434ccb69e9b726
-MISC ChangeLog 2383 RMD160 9581e276dcb0a566c7d50993a1f43a16c9c0f92d SHA1 82f2a6242028e6c9bf251c3a4ed96429c578f334 SHA256 0edcaad333e37c5c3fa3581c623bd5f2f98686a05b2e6103dbde0360daae9fef
+EBUILD wmcalendar-0.5.2.ebuild 944 RMD160 0e5fd4552e3f9d720eed99453b137317f81b831e SHA1 89aa590669acabb73cd11aad1031ac4220c5df92 SHA256 285be193c8a4dc57330ac4506a301e7b67b5c7330f07ec471ebd792a34ff348b
+MISC ChangeLog 2829 RMD160 63a8e53cd357ace8f7fd531a319149ad7fb94dfc SHA1 11cc0dbadb061363a64789b5f83bb54b26f734d6 SHA256 aec5d530548f9e36382122c8a9d032967dc0f0b76dc38f91da416a073247e634
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkh+e0ACgkQAiZjviIA2Xi2xQCgtCVCqpWfvZSUYfApGnY6GsLn
-eysAoKZ7iAZJ0fXHL73tM0t6clqQcuSi
-=FZBN
------END PGP SIGNATURE-----
diff --git a/x11-plugins/wmcalendar/files/wmcalendar-0.5.0-gcc4.patch b/x11-plugins/wmcalendar/files/wmcalendar-0.5.0-gcc4.patch
deleted file mode 100644
index a362b93ccf7f..000000000000
--- a/x11-plugins/wmcalendar/files/wmcalendar-0.5.0-gcc4.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-*** wmcalendar-0.5.0/Src/calendar.c.old	Thu Nov 24 13:04:35 2005
---- wmcalendar-0.5.0/Src/calendar.c	Thu Nov 24 13:50:16 2005
-***************
-*** 105,111 ****
-  		prop = icalcomponent_get_first_property(d, ICAL_TRANSP_PROPERTY ); 
-  		reocc = icalcomponent_get_first_property(d, ICAL_RRULE_PROPERTY); 
-  		if(prop) 
-! 		    (const char*)transp = icalproperty_get_value_as_string(prop);
-  		if(!strcmp(transp, "OPAQUE"))
-  		    value = 1;
-  		else if(!strcmp(transp, "TRANSPARENT"))
---- 105,111 ----
-  		prop = icalcomponent_get_first_property(d, ICAL_TRANSP_PROPERTY ); 
-  		reocc = icalcomponent_get_first_property(d, ICAL_RRULE_PROPERTY); 
-  		if(prop) 
-! 		    transp = (char *)icalproperty_get_value_as_string(prop);
-  		if(!strcmp(transp, "OPAQUE"))
-  		    value = 1;
-  		else if(!strcmp(transp, "TRANSPARENT"))
-***************
-*** 117,123 ****
-  		/* get desciption */
-  		prop = icalcomponent_get_first_property(d,     ICAL_SUMMARY_PROPERTY); 
-  		if(prop) {
-! 		    (const char*)text = icalproperty_get_value_as_string(prop);
-  		    addCalObj(t1, t2, value, text, d);
-  		    if(get_debug())printf("read: %d.%d.%d - %d.%d.%d %s\n", t1.day, t1.month,
-  				    t1.year, t2.day, t2.month, t2.year, text);
---- 117,123 ----
-  		/* get desciption */
-  		prop = icalcomponent_get_first_property(d,     ICAL_SUMMARY_PROPERTY); 
-  		if(prop) {
-! 		    text = (char *)icalproperty_get_value_as_string(prop);
-  		    addCalObj(t1, t2, value, text, d);
-  		    if(get_debug())printf("read: %d.%d.%d - %d.%d.%d %s\n", t1.day, t1.month,
-  				    t1.year, t2.day, t2.month, t2.year, text);
-***************
-*** 321,327 ****
-  	free(calRoot->text);
-  	free(calRoot->comp);
-  	free(calRoot);
-! 	(struct calObj*)calRoot = help;
-      }
-      for(i = 0; i < 32; i++)
-  	datetype[i][1] = 0;
---- 321,327 ----
-  	free(calRoot->text);
-  	free(calRoot->comp);
-  	free(calRoot);
-! 	calRoot = help;
-      }
-      for(i = 0; i < 32; i++)
-  	datetype[i][1] = 0;
diff --git a/x11-plugins/wmcalendar/files/wmcalendar-0.5.0.makefile.patch b/x11-plugins/wmcalendar/files/wmcalendar-0.5.0.makefile.patch
deleted file mode 100644
index d0094df320f9..000000000000
--- a/x11-plugins/wmcalendar/files/wmcalendar-0.5.0.makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur wmcalendar-0.5.0/Src/Makefile /wmcalendar-0.5.0/Src/Makefile
---- a/wmcalendar-0.5.0/Src/Makefile	2003-07-15 17:19:26.000000000 +0200
-+++ b/wmcalendar-0.5.0/Src/Makefile	2003-09-17 08:36:48.000000000 +0200
-@@ -1,4 +1,7 @@
--CC     = gcc
-+ifndef CC
-+	CC = gcc
-+endif
-+	
- INCLUDES  = `pkg-config --cflags gtk+-2.0` -I. 
- LFLAGS = `pkg-config --libs gtk+-2.0`
- 
-@@ -6,7 +9,7 @@
- #INCLUDES = `gtk12-config --cflags` -I. 
- #LFLAGS = `gtk12-config --libs`
- X11BASE = /usr/X11R6
--CFLAGS =  $(INCLUDES) -DICON_TYPE=$(ICON_TYPE)
-+MY_CFLAGS =  $(CFLAGS) $(INCLUDES) -DICON_TYPE=$(ICON_TYPE)
- INCDIR = -I$(X11BASE)/include/X11 -I$(X11BASE)/include -I$/usr/include -I$/usr/local/include
- DESTDIR= /usr/local
- LIBDIR = -L/usr/lib -L${X11BASE}/lib -L/usr/local/lib
-@@ -24,7 +27,7 @@
- 		calendar.o
- 
- .c.o:
--	$(CC) $(CFLAGS) -D`uname -s` -DHAVE_SYS_TIME_H -c $< -o $*.o $(INCDIR)
-+	$(CC) $(MY_CFLAGS) -D`uname -s` -DHAVE_SYS_TIME_H -c $< -o $*.o $(INCDIR)
- 
- 
- all:	wmCalendar.o wmCalendar 
diff --git a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-rename_kill_func.patch b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-rename_kill_func.patch
new file mode 100644
index 000000000000..9a22a176dd71
--- /dev/null
+++ b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-rename_kill_func.patch
@@ -0,0 +1,20 @@
+--- calendar.c	2009-01-22 16:36:23.000000000 +0100
++++ calendar.c.new	2009-01-22 16:36:07.000000000 +0100
+@@ -48,7 +48,7 @@
+ 
+ 
+ 
+-void kill (GtkWidget * widget)
++void close_app (GtkWidget * widget)
+ {
+     gtk_widget_destroy ((GtkWidget*)gtk_widget_get_toplevel(widget));
+     gtk_main_quit ();
+@@ -193,7 +193,7 @@
+ 	gtk_signal_connect(GTK_OBJECT (event_box), "button_press_event",
+ 			   GTK_SIGNAL_FUNC (move), NULL);
+ 	gtk_signal_connect(GTK_OBJECT (event_box2), "button_press_event",
+-			   (GtkSignalFunc) kill, GTK_OBJECT(dayView));
++			   (GtkSignalFunc) close_app, GTK_OBJECT(dayView));
+ 
+ 	gtk_widget_realize(dayView);
+ 	//	gtk_window_set_position(GTK_WINDOW (dayView),GTK_WIN_POS_CENTER_ON_PARENT);
diff --git a/x11-plugins/wmcalendar/wmcalendar-0.5.2.ebuild b/x11-plugins/wmcalendar/wmcalendar-0.5.2.ebuild
index b2961c89f957..4c1511038ab2 100644
--- a/x11-plugins/wmcalendar/wmcalendar-0.5.2.ebuild
+++ b/x11-plugins/wmcalendar/wmcalendar-0.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/wmcalendar-0.5.2.ebuild,v 1.3 2008/06/28 06:44:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/wmcalendar-0.5.2.ebuild,v 1.4 2009/01/22 15:47:56 s4t4n Exp $
 
 inherit eutils toolchain-funcs
 
@@ -27,6 +27,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-exit-sin-and-cos.patch
+	epatch "${FILESDIR}"/${P}-rename_kill_func.patch
 }
 
 src_compile() {