Bug #102239, gcc4 patch.

(Portage version: 2.0.51.22-r2)

4 files changed, 52 insertions, 20 deletions

diff --git a/dev-libs/libmcal/ChangeLog b/dev-libs/libmcal/ChangeLog
index 2303dfa618a7..a41354ab26ef 100644
--- a/dev-libs/libmcal/ChangeLog
+++ b/dev-libs/libmcal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libmcal
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/ChangeLog,v 1.31 2005/08/13 23:19:36 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/ChangeLog,v 1.32 2005/09/03 19:01:41 robbat2 Exp $
+
+  03 Sep 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/libmcal-0.7-gcc4.patch, libmcal-0.7-r5.ebuild:
+  Bug #102239, gcc4 patch.
 
   13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> libmcal-0.7-r5.ebuild:
   Stable on ppc.
diff --git a/dev-libs/libmcal/Manifest b/dev-libs/libmcal/Manifest
index 39e99bcd0da5..be544a7069cb 100644
--- a/dev-libs/libmcal/Manifest
+++ b/dev-libs/libmcal/Manifest
@@ -1,24 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
-MD5 6245dd04bd27ffd863675d9f71529074 libmcal-0.7-r5.ebuild 1955
 MD5 54153ab860d8c06b01b0e00c03ce7aad libmcal-0.7-r3.ebuild 1871
-MD5 d89164920848a3dd2ce99c2e24dfd7e6 libmcal-0.7-r1.ebuild 791
+MD5 6245dd04bd27ffd863675d9f71529074 libmcal-0.7-r5.ebuild 1955
 MD5 e1f612bfb8da053586d4f9b087793578 libmcal-0.7-r2.ebuild 1788
-MD5 6b1830a007d5aec9befff931cec1659b ChangeLog 3937
 MD5 0d2106dd953946fad1542111a3946d62 libmcal-0.7.ebuild 691
+MD5 6b1830a007d5aec9befff931cec1659b ChangeLog 3937
+MD5 e00ad8f978088f0882898df41633554d libmcal-0.7-r6.ebuild 2001
+MD5 d89164920848a3dd2ce99c2e24dfd7e6 libmcal-0.7-r1.ebuild 791
+MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
+MD5 02b02066ed7c3b6049cd2f9edbdf8889 files/libmcal-0.7-gcc4.patch 1229
+MD5 33ec0e0ab40e02bedea5e6b2b8ec51bc files/digest-libmcal-0.7-r1 62
 MD5 e40f5b90c038f8c8703b83953b10012b files/digest-libmcal-0.7-r2 128
-MD5 33ec0e0ab40e02bedea5e6b2b8ec51bc files/digest-libmcal-0.7 62
 MD5 e40f5b90c038f8c8703b83953b10012b files/digest-libmcal-0.7-r3 128
+MD5 e40f5b90c038f8c8703b83953b10012b files/digest-libmcal-0.7-r5 128
+MD5 e40f5b90c038f8c8703b83953b10012b files/digest-libmcal-0.7-r6 128
 MD5 1c173be1ce6319004277a8847741746c files/libmcal-0.7-libdir.patch 888
 MD5 d438648eeab0ea0e90bdf8ea2f3321c6 files/libmcal-0.7-fpic.patch 1302
-MD5 e40f5b90c038f8c8703b83953b10012b files/digest-libmcal-0.7-r5 128
-MD5 33ec0e0ab40e02bedea5e6b2b8ec51bc files/digest-libmcal-0.7-r1 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFC/sGQgIKl8Uu19MoRApuMAJ4zFINhXc3+ypMi+IfguprMuDqEVACfR9DH
-yPYmggIM6g+RXiB1eeNlUtk=
-=Et84
------END PGP SIGNATURE-----
+MD5 33ec0e0ab40e02bedea5e6b2b8ec51bc files/digest-libmcal-0.7 62
diff --git a/dev-libs/libmcal/files/libmcal-0.7-gcc4.patch b/dev-libs/libmcal/files/libmcal-0.7-gcc4.patch
new file mode 100644
index 000000000000..8f65d11e5598
--- /dev/null
+++ b/dev-libs/libmcal/files/libmcal-0.7-gcc4.patch
@@ -0,0 +1,34 @@
+diff -urN ../libmcal-/icap/icap.c ./icap/icap.c
+--- ../libmcal/icap/icap.c	2003-01-28 18:31:33.000000000 +0100
++++ ./icap/icap.c	2005-08-12 15:04:36.000000000 +0200
+@@ -159,7 +159,7 @@
+ 	if (!reopen) {
+ 		if ((stream = calloc(1, sizeof(*stream))) == NULL)
+ 			goto fail;
+-		if ((DATA = calloc(1, sizeof(*DATA))) == NULL)
++		if ((stream->data = calloc(1, sizeof(*DATA))) == NULL)
+ 			goto fail;
+ 
+ 		/* Copy host. */
+diff -urN ../libmcal/mstore/mstore.c ./mstore/mstore.c
+--- ../libmcal/mstore/mstore.c	2005-08-12 15:30:52.000000000 +0200
++++ ./mstore/mstore.c	2005-08-12 15:31:38.000000000 +0200
+@@ -308,7 +308,7 @@
+ 	if (!reopen) {
+ 		if ((stream = calloc(1, sizeof(*stream))) == NULL)
+ 			goto fail;
+-		if ((DATA = calloc(1, sizeof(*DATA))) == NULL)
++		if ((stream->data = calloc(1, sizeof(*DATA))) == NULL)
+ 			goto fail;
+ 	}
+ 
+@@ -773,7 +773,7 @@
+         while((event=read_event(calfile))) {
+ 	  if (event->id == modified_event->id)
+ 	    {
+-	    (const CALEVENT*)event = modified_event;         
++	    event = modified_event;         
+ 	  /*is more required here to assign objects, a loop through all the properties*/
+ 	    /*    We actually only want to modify any individual property, not the whole thing..
+ 		  TODO */
+
diff --git a/dev-libs/libmcal/libmcal-0.7-r5.ebuild b/dev-libs/libmcal/libmcal-0.7-r5.ebuild
index 114d1a73e2dc..e5829eac9aa5 100644
--- a/dev-libs/libmcal/libmcal-0.7-r5.ebuild
+++ b/dev-libs/libmcal/libmcal-0.7-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/libmcal-0.7-r5.ebuild,v 1.6 2005/08/14 03:58:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/libmcal-0.7-r5.ebuild,v 1.7 2005/09/03 19:01:41 robbat2 Exp $
 
 inherit eutils multilib
 
@@ -17,7 +17,7 @@ IUSE="pam"
 
 DEPEND="pam? ( sys-libs/pam )"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
@@ -30,6 +30,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-fpic.patch
 	epatch ${FILESDIR}/${P}-libdir.patch
+	epatch ${FILESDIR}/${P}-gcc4.patch
 }
 
 src_compile() {