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.
(Portage version: 2.1.6.4/cvs/Linux 2.6.24-tuxonice-r9 i686)

5 files changed, 32 insertions, 86 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/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() {