Fix compilatio with GCC 3.4: label at end of compound statement.

Fix a mismatch between prototype and implementation in favour
of matching the local return variable's type.

5 files changed, 62 insertions, 1 deletions

diff --git a/mail/evolution14/distinfo b/mail/evolution14/distinfo
index a74fd1b801c..8d44e813539 100644
--- a/mail/evolution14/distinfo
+++ b/mail/evolution14/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:22 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/12/07 15:21:34 joerg Exp $
 
 SHA1 (evolution-1.4.6.tar.bz2) = 35d7273762b1f17fb8ad845af593a1ee07f94115
 RMD160 (evolution-1.4.6.tar.bz2) = 85a47ad2a7ef8fcaf77b0be1123b365b1ecab541
@@ -13,3 +13,7 @@ SHA1 (patch-ah) = a4b15e3405e4f6a432392a30bf489abd4e94a181
 SHA1 (patch-ai) = 0f49dc487d5cc697521bb59a45e9c8e2eda10491
 SHA1 (patch-aj) = 9b098568fd94c0597a216b8b9cf89eaef3307a4b
 SHA1 (patch-ak) = faeb4e0b3943ed8aeb2bc91e1d7cac8722918b4d
+SHA1 (patch-al) = c4f27b8d4037c37c829e01e10b5f25a6582cf903
+SHA1 (patch-am) = 38512ba206ace126f88ac1f2d58e94da1fc37151
+SHA1 (patch-an) = d1149865ba6e65b2621dc457d5b1dfdfdbc06548
+SHA1 (patch-ao) = 91f8b1133c6ff201691fe27af9ea0bc6d2fe37a4
diff --git a/mail/evolution14/patches/patch-al b/mail/evolution14/patches/patch-al
new file mode 100644
index 00000000000..716e17ceecd
--- /dev/null
+++ b/mail/evolution14/patches/patch-al
@@ -0,0 +1,12 @@
+$NetBSD: patch-al,v 1.1 2005/12/07 15:21:34 joerg Exp $
+
+--- e-util/e-component-listener.c.orig	2005-12-06 19:02:49.000000000 +0000
++++ e-util/e-component-listener.c
+@@ -53,6 +53,7 @@ connection_listen_cb (gpointer object, g
+ 			g_object_unref (cl);
+ 			break;
+ 		default :
++			break;
+ 		}
+ 	}
+ }
diff --git a/mail/evolution14/patches/patch-am b/mail/evolution14/patches/patch-am
new file mode 100644
index 00000000000..02114008934
--- /dev/null
+++ b/mail/evolution14/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2005/12/07 15:21:34 joerg Exp $
+
+--- calendar/cal-client/cal-client.h.orig	2005-12-06 21:42:53.000000000 +0000
++++ calendar/cal-client/cal-client.h
+@@ -213,7 +213,7 @@ CalClientResult cal_client_update_object
+ CalClientResult cal_client_remove_object (CalClient *client, const char *uid);
+ CalClientResult cal_client_remove_object_with_mod (CalClient *client, const char *uid, CalObjModType mod);
+ 
+-CalClientSendResult cal_client_send_object (CalClient *client, icalcomponent *icalcomp, 
++CalClientResult cal_client_send_object (CalClient *client, icalcomponent *icalcomp, 
+ 					    icalcomponent **new_icalcomp, GList **users,
+ 					    char error_msg[256]);
+ 
diff --git a/mail/evolution14/patches/patch-an b/mail/evolution14/patches/patch-an
new file mode 100644
index 00000000000..432de78125b
--- /dev/null
+++ b/mail/evolution14/patches/patch-an
@@ -0,0 +1,12 @@
+$NetBSD: patch-an,v 1.1 2005/12/07 15:21:34 joerg Exp $
+
+--- mail/message-browser.c.orig	2005-12-06 23:22:49.000000000 +0000
++++ mail/message-browser.c
+@@ -345,6 +345,7 @@ on_key_press (GtkWidget *widget, GdkEven
+ 		message_browser_close (NULL, mb, NULL);
+ 		return TRUE;	
+ 	default:
++		break;
+ 	}
+ 	
+ 	return FALSE;
diff --git a/mail/evolution14/patches/patch-ao b/mail/evolution14/patches/patch-ao
new file mode 100644
index 00000000000..43e2c8d1392
--- /dev/null
+++ b/mail/evolution14/patches/patch-ao
@@ -0,0 +1,20 @@
+$NetBSD: patch-ao,v 1.1 2005/12/07 15:21:34 joerg Exp $
+
+--- calendar/gui/e-day-view.c.orig	2005-12-06 22:12:29.000000000 +0000
++++ calendar/gui/e-day-view.c
+@@ -3236,6 +3236,7 @@ e_day_view_on_main_canvas_scroll (GtkWid
+ 		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_on_time_canvas_scroll (GtkWid
+ 		e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);
+ 		return TRUE;
+ 	default:
++		break;
+ 	}
+ 
+ 	return FALSE;