upstream gcc4 patch

(Portage version: 2.0.51.22-r1)

4 files changed, 39 insertions, 28 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 36d3084cccf8..c9dbb705952a 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,33 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 9086236a2a6872fa5dc89e2434eed5cf ChangeLog 6156
+MD5 e5e2dd7e8c0e613975275ddc9d74be6f evolution-data-server-1.0.1.ebuild 887
 MD5 98bdbed2d5ce2bec87868d9a46b5f3b0 evolution-data-server-1.0.2.ebuild 1065
+MD5 368efaf736537929d3c127b9608a1ae2 evolution-data-server-1.0.3.ebuild 983
+MD5 4f1c59c7610ff6bcd04eae2d1c044753 evolution-data-server-1.0.4.ebuild 985
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 1097e1ac343ae36a49a3da3824b3d624 evolution-data-server-1.2.0.ebuild 1249
-MD5 8f0d535918175320417782ad0939d531 ChangeLog 5967
-MD5 368efaf736537929d3c127b9608a1ae2 evolution-data-server-1.0.3.ebuild 983
-MD5 a3403c6784d7ed4349529e607a836411 evolution-data-server-1.2.1.ebuild 2366
 MD5 4dbe4199e9831b2797fb93b7a19c42fb evolution-data-server-1.2.0-r1.ebuild 2365
-MD5 e5e2dd7e8c0e613975275ddc9d74be6f evolution-data-server-1.0.1.ebuild 887
-MD5 4f1c59c7610ff6bcd04eae2d1c044753 evolution-data-server-1.0.4.ebuild 985
+MD5 a3403c6784d7ed4349529e607a836411 evolution-data-server-1.2.1.ebuild 2366
 MD5 d786b6026273913891147dc06bd53929 evolution-data-server-1.2.1-r1.ebuild 2417
-MD5 f0e10430c507a253942d0b5deb346a87 evolution-data-server-1.2.3.ebuild 2457
-MD5 bbc32ff03cbc0bac1c13b71aacbcdf80 files/digest-evolution-data-server-1.2.0-r1 81
-MD5 f198c2b5ab564c7e450ae07be5b1efc5 files/evolution-data-server-1.2.1-local-provider.patch 892
-MD5 c93bb2769f43f6e88e5fcb385a0ab498 files/evolution-data-server-1.0.2-amd64_mutex.patch 1114
-MD5 035a24e01dccf6365e41d4544b019f03 files/digest-evolution-data-server-1.2.3 82
-MD5 b916b7c2e1730287c5e37f6c1707ff04 files/digest-evolution-data-server-1.2.1-r1 81
-MD5 b916b7c2e1730287c5e37f6c1707ff04 files/digest-evolution-data-server-1.2.1 81
-MD5 ab9f8a22a7b870a6e1e2edc463949c82 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
-MD5 677d10afd2898cc22305dd302a01d2e7 files/digest-evolution-data-server-1.0.4 81
-MD5 dfc34218a032bcd275fc5fb09376abea files/digest-evolution-data-server-1.0.3 81
+MD5 9bc1777a3a1883db18df31801bfaedae evolution-data-server-1.2.3.ebuild 2521
+MD5 9d35355b61cdb08f0f918e3f106ce953 files/digest-evolution-data-server-1.0.1 81
 MD5 e72d151eb141e23240770c222c39e317 files/digest-evolution-data-server-1.0.2 81
+MD5 dfc34218a032bcd275fc5fb09376abea files/digest-evolution-data-server-1.0.3 81
+MD5 677d10afd2898cc22305dd302a01d2e7 files/digest-evolution-data-server-1.0.4 81
+MD5 c93bb2769f43f6e88e5fcb385a0ab498 files/evolution-data-server-1.0.2-amd64_mutex.patch 1114
 MD5 bbc32ff03cbc0bac1c13b71aacbcdf80 files/digest-evolution-data-server-1.2.0 81
-MD5 9d35355b61cdb08f0f918e3f106ce953 files/digest-evolution-data-server-1.0.1 81
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCqKnDKRy60XGEcJIRAtMXAJ9DLILhf3qYI855TgL9/BUz7+B00gCgsJIK
-xoi++r2XwROq7wT7mY8lhug=
-=3SGn
------END PGP SIGNATURE-----
+MD5 ab9f8a22a7b870a6e1e2edc463949c82 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
+MD5 bbc32ff03cbc0bac1c13b71aacbcdf80 files/digest-evolution-data-server-1.2.0-r1 81
+MD5 b916b7c2e1730287c5e37f6c1707ff04 files/digest-evolution-data-server-1.2.1 81
+MD5 9301f93589ecd825aa39e32465a707a3 files/evolution-data-server-1.2.3-gcc4.patch 558
+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
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;