gcc 3.4 fix

4 files changed, 70 insertions, 11 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 5bd27f060951..e0f4d75f2604 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/evolution
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.1 2004/05/30 02:43:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.2 2004/05/30 03:45:42 lv Exp $
+
+  29 May 2004; Travis Tilley <lv@gentoo.org> +files/evolution-gcc34.patch,
+  evolution-1.4.6.ebuild:
+  gcc 3.4 fix
 
 *evolution-1.4.5 (29 May 2004)
 
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 0c3b45b68cf3..00dcba6fb752 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,14 +1,15 @@
-MD5 aca50541100957cc2f8517964d7b5e19 ChangeLog 15982
-MD5 3bf8231d7fa901075989b9b16f0dab16 evolution-1.2.4.ebuild 6395
-MD5 1cd446c1a132c731a57d5796bfb08c17 evolution-1.4.5.ebuild 5803
-MD5 f2267d45ab6c42bff07e398f0489146f evolution-1.4.6.ebuild 5572
+MD5 2760dcbcfa6c7762e0ab79ba66b50420 evolution-1.2.4.ebuild 6399
+MD5 80525487ea6e6e8e9fc943437e97c545 evolution-1.4.5.ebuild 5807
+MD5 efb04a62238edeb4df52ae775dc601a6 evolution-1.4.6.ebuild 5613
+MD5 25bf95ed3776402ff8415bdf335e6c1d ChangeLog 16572
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
+MD5 a3a0071b78894fc80b10a0ec765647f5 files/evolution-1.4.4-alpha.patch 1799
+MD5 6174a41481c88eb948a8e119cf93ea94 files/evolution-1.4.5-nztimezone.patch 1852
+MD5 d863019d9fb9a8f74c5090de0f1ceee4 files/evolution-1.4.5-gtk-2.4.patch 26799
+MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
+MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
 MD5 3137288dd17e357d0972dab00e4f6b6d files/digest-evolution-1.2.4 1230
 MD5 49463c08f32ee1df0970196b6c4cef2b files/digest-evolution-1.4.5 132
 MD5 fe0cafc4040da525377526f4a1fa297f files/digest-evolution-1.4.6 132
-MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
+MD5 cb7b54de75a41e58aaeab248e92fc823 files/evolution-gcc34.patch 1895
 MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
-MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
-MD5 a3a0071b78894fc80b10a0ec765647f5 files/evolution-1.4.4-alpha.patch 1799
-MD5 d863019d9fb9a8f74c5090de0f1ceee4 files/evolution-1.4.5-gtk-2.4.patch 26799
-MD5 6174a41481c88eb948a8e119cf93ea94 files/evolution-1.4.5-nztimezone.patch 1852
diff --git a/mail-client/evolution/evolution-1.4.6.ebuild b/mail-client/evolution/evolution-1.4.6.ebuild
index d8405492cda6..f44dcd66cea9 100644
--- a/mail-client/evolution/evolution-1.4.6.ebuild
+++ b/mail-client/evolution/evolution-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.4.6.ebuild,v 1.1 2004/05/30 02:43:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.4.6.ebuild,v 1.2 2004/05/30 03:45:42 lv Exp $
 
 # kde before gnome2, otherwise kde_src_install will override gnome2_src_install
 use kde && inherit kde
@@ -83,6 +83,7 @@ src_unpack() {
 	# the patch upstream
 	#epatch ${FILESDIR}/evolution-1.4.4-alpha.patch
 
+	epatch ${FILESDIR}/evolution-gcc34.patch
 }
 
 ##### Compile evolution specific db3 for static linking #####
diff --git a/mail-client/evolution/files/evolution-gcc34.patch b/mail-client/evolution/files/evolution-gcc34.patch
new file mode 100644
index 000000000000..af750674d2bf
--- /dev/null
+++ b/mail-client/evolution/files/evolution-gcc34.patch
@@ -0,0 +1,53 @@
+diff -Nurd evolution-1.4.6-old/calendar/cal-client/cal-client.c evolution-1.4.6/calendar/cal-client/cal-client.c
+--- evolution-1.4.6-old/calendar/cal-client/cal-client.c	2004-05-23 03:14:19.266120688 -0500
++++ evolution-1.4.6/calendar/cal-client/cal-client.c	2004-05-23 03:14:34.210848744 -0500
+@@ -2886,7 +2886,7 @@
+ 	return cal_client_remove_object_with_mod (client, uid, CALOBJ_MOD_ALL);
+ }
+ 
+-CalClientResult
++CalClientSendResult
+ cal_client_send_object (CalClient *client, icalcomponent *icalcomp, 
+ 			icalcomponent **new_icalcomp, GList **users,
+ 			char error_msg[256])
+diff -Nurd evolution-1.4.6-old/calendar/gui/e-day-view.c evolution-1.4.6/calendar/gui/e-day-view.c
+--- evolution-1.4.6-old/calendar/gui/e-day-view.c	2004-05-23 03:14:19.238124944 -0500
++++ evolution-1.4.6/calendar/gui/e-day-view.c	2004-05-23 03:14:40.862837488 -0500
+@@ -3236,6 +3236,7 @@
+ 		e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
+ 		return TRUE;
+ 	default:
++		break;
+ 	}
+ 
+ 	return FALSE;
+@@ -3256,6 +3257,7 @@
+ 		e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
+ 		return TRUE;
+ 	default:
++		break;
+ 	}
+ 
+ 	return FALSE;
+diff -Nurd evolution-1.4.6-old/e-util/e-component-listener.c evolution-1.4.6/e-util/e-component-listener.c
+--- evolution-1.4.6-old/e-util/e-component-listener.c	2004-05-23 03:14:19.227126616 -0500
++++ evolution-1.4.6/e-util/e-component-listener.c	2004-05-23 03:14:30.000488816 -0500
+@@ -53,6 +53,7 @@
+ 			g_object_unref (cl);
+ 			break;
+ 		default :
++			break;
+ 		}
+ 	}
+ }
+diff -Nurd evolution-1.4.6-old/mail/message-browser.c evolution-1.4.6/mail/message-browser.c
+--- evolution-1.4.6-old/mail/message-browser.c	2004-05-23 03:14:19.055152760 -0500
++++ evolution-1.4.6/mail/message-browser.c	2004-05-23 03:14:44.330310352 -0500
+@@ -345,6 +345,7 @@
+ 		message_browser_close (NULL, mb, NULL);
+ 		return TRUE;	
+ 	default:
++		break;
+ 	}
+ 	
+ 	return FALSE;