upstream gcc4 patch

Package-Manager: portage-2.0.51.22-r1

4 files changed, 32 insertions, 2 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index ca7866073b03..e85a2612affe 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.42 2005/06/09 20:42:23 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.43 2005/06/10 02:27:15 halcy0n Exp $
+
+  10 Jun 2005; Mark Loeser <halcy0n@gentoo.org>
+  +files/evolution-data-server-1.2.3-gcc4.patch,
+  evolution-data-server-1.2.3.ebuild:
+  Adding upstream patch to fix compilation with gcc4
 
   09 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   evolution-data-server-1.2.1-r1.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 874a344bf3b7..22641d8054e7 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 f594dba31b026413a31e97c619dab9da ChangeLog 6155
 MD5 e5e2dd7e8c0e613975275ddc9d74be6f evolution-data-server-1.0.1.ebuild 887
 MD5 98bdbed2d5ce2bec87868d9a46b5f3b0 evolution-data-server-1.0.2.ebuild 1065
@@ -22,3 +25,10 @@ MD5 9301f93589ecd825aa39e32465a707a3 files/evolution-data-server-1.2.3-gcc4.patc
 MD5 b916b7c2e1730287c5e37f6c1707ff04 files/digest-evolution-data-server-1.2.1-r1 81
 MD5 035a24e01dccf6365e41d4544b019f03 files/digest-evolution-data-server-1.2.3 82
 MD5 f198c2b5ab564c7e450ae07be5b1efc5 files/evolution-data-server-1.2.1-local-provider.patch 892
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCqPqTCRZPokWLroQRAgR7AJwMpcD5/SksaIXS5Kbo7AcGDiS7ygCgoFNF
+JAzmRgx8MzCrleOEs5I8uF0=
+=9Uvd
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.2.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.2.3.ebuild
index 3492dae3eccb..ce7df3a35bfe 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.2.3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.2.3.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/gnome-extra/evolution-data-server/evolution-data-server-1.2.3.ebuild,v 1.1 2005/06/09 11:52:57 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.2.3.ebuild,v 1.2 2005/06/10 02:27:15 halcy0n Exp $
 
 inherit eutils gnome2
 
@@ -49,6 +49,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-1.2.0-gentoo_etc_services.patch
 	# fix local mailfolders (#87043)
 	epatch ${FILESDIR}/${PN}-1.2.1-local-provider.patch
+	# upstream gcc4 fix
+	epatch ${FILESDIR}/${PN}-1.2.3-gcc4.patch
 
 }
 
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.2.3-gcc4.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.2.3-gcc4.patch
new file mode 100644
index 000000000000..49a4ddeb6dc8
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.2.3-gcc4.patch
@@ -0,0 +1,13 @@
+diff -ur evolution-data-server-1.2.3-orig/calendar/libecal/e-cal.c evolution-data-server-1.2.3/calendar/libecal/e-cal.c
+--- evolution-data-server-1.2.3-orig/calendar/libecal/e-cal.c	2005-06-09 20:00:28.000000000 -0400
++++ evolution-data-server-1.2.3/calendar/libecal/e-cal.c	2005-06-09 20:02:10.000000000 -0400
+@@ -40,7 +40,8 @@
+ #include "e-cal-view-listener.h"
+ #include "e-cal.h"
+ 
+-
++static gboolean
++open_calendar (ECal *ecal, gboolean only_if_exists, GError **error, ECalendarStatus *status, gboolean needs_auth);
+ 
+ typedef struct {
+ 	GMutex *mutex;