Revision bump, with patch to gix gcc4 compilation issues. Closes bug #113489

(Portage version: 2.0.51.22-r3)

5 files changed, 111 insertions, 1 deletions

diff --git a/x11-plugins/wmcalendar/ChangeLog b/x11-plugins/wmcalendar/ChangeLog
index f4c6ed11df21..c5d38af12c78 100644
--- a/x11-plugins/wmcalendar/ChangeLog
+++ b/x11-plugins/wmcalendar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/wmcalendar
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/ChangeLog,v 1.8 2005/11/07 16:04:20 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/ChangeLog,v 1.9 2005/11/29 15:49:35 s4t4n Exp $
+
+*wmcalendar-0.5.0-r1 (29 Nov 2005)
+
+  29 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmcalendar-0.5.0-r1.ebuild:
+  Revision bump, adding patch to fix gcc4 compilation issues. Closes bug #113489.
 
   07 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmcalendar-0.5.0.ebuild:
   Removed INSTALL and COPYING from dodoc.
diff --git a/x11-plugins/wmcalendar/Manifest b/x11-plugins/wmcalendar/Manifest
index 7c83f738e3b3..93eb6cbe3b6c 100644
--- a/x11-plugins/wmcalendar/Manifest
+++ b/x11-plugins/wmcalendar/Manifest
@@ -1,5 +1,8 @@
 MD5 6f929f951ceb06f7c88ecfe929602cd0 wmcalendar-0.5.0.ebuild 1038
+MD5 900f506a3f9967f9f722c3327fd36e2f wmcalendar-0.5.0-r1.ebuild 1003
 MD5 b67f3e5505cbdd71f6f55ec69d0ab6e5 ChangeLog 1063
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 e1445dfb0ac0d0dd189f22956e61de10 files/digest-wmcalendar-0.5.0 67
+MD5 640aec240870d92effe62468fe764ea0 files/wmcalendar-0.5.0-gcc4.patch 1946
 MD5 54f3e7d4eb228c47d0712426fff78d15 files/wmcalendar-0.5.0.makefile.patch 980
+MD5 e1445dfb0ac0d0dd189f22956e61de10 files/digest-wmcalendar-0.5.0-r1 67
diff --git a/x11-plugins/wmcalendar/files/digest-wmcalendar-0.5.0-r1 b/x11-plugins/wmcalendar/files/digest-wmcalendar-0.5.0-r1
new file mode 100644
index 000000000000..ebd6d55b2126
--- /dev/null
+++ b/x11-plugins/wmcalendar/files/digest-wmcalendar-0.5.0-r1
@@ -0,0 +1 @@
+MD5 bde2dfcbc8b94f9bbc60e45fc06b79b1 wmcalendar-0.5.0.tar.gz 42896
diff --git a/x11-plugins/wmcalendar/files/wmcalendar-0.5.0-gcc4.patch b/x11-plugins/wmcalendar/files/wmcalendar-0.5.0-gcc4.patch
new file mode 100644
index 000000000000..a362b93ccf7f
--- /dev/null
+++ b/x11-plugins/wmcalendar/files/wmcalendar-0.5.0-gcc4.patch
@@ -0,0 +1,53 @@
+*** 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/wmcalendar-0.5.0-r1.ebuild b/x11-plugins/wmcalendar/wmcalendar-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..06cd77fb0873
--- /dev/null
+++ b/x11-plugins/wmcalendar/wmcalendar-0.5.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalendar/wmcalendar-0.5.0-r1.ebuild,v 1.1 2005/11/29 15:49:35 s4t4n Exp $
+
+inherit eutils
+
+IUSE=""
+
+DESCRIPTION="wmCalendar is a calendar dockapp for Windowmaker."
+
+HOMEPAGE="http://wmcalendar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+DEPEND="virtual/x11
+	>=dev-libs/libical-0.24_rc4
+	>=dev-util/pkgconfig-0.15.0
+	>=x11-libs/gtk+-2.2.1-r1
+	>=sys-apps/sed-4.0.9"
+
+S=${WORKDIR}/${P}/Src
+
+src_unpack()
+{
+	unpack ${A}
+	cd ${WORKDIR}
+
+	# default Makefile overwrites CC and CFLAGS variables so we patch it
+	epatch ${FILESDIR}/${P}.makefile.patch
+
+	# Fix compilation issues with gcc >= 4
+	epatch ${FILESDIR}/${P}-gcc4.patch
+
+	# remove unneeded SYSTEM variable from Makefile, fixing bug #105730
+	cd ${S}
+	sed -i -e "s:\$(SYSTEM)::" Makefile
+
+}
+
+src_install()
+{
+	dodir /usr/bin /usr/man/man1
+	make DESTDIR=${D}/usr install || die
+	cd .. && dodoc BUGS CHANGES HINTS README TODO || die
+}