update to 2.28.1

This switches to the gnome-2.28 release branch.

5 files changed, 24 insertions, 64 deletions

diff --git a/mail/evolution/patches/patch-aa b/mail/evolution/patches/patch-aa
deleted file mode 100644
index fe039ffa01b..00000000000
--- a/mail/evolution/patches/patch-aa
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aa,v 1.25 2008/04/15 18:42:53 drochner Exp $
-
---- ./widgets/e-timezone-dialog/e-timezone-dialog.c.orig	2008-02-25 04:47:39.000000000 +0100
-+++ ./widgets/e-timezone-dialog/e-timezone-dialog.c
-@@ -84,8 +84,6 @@ struct _ETimezoneDialogPrivate {
- 
- #ifndef G_OS_WIN32 /* Declared properly in time.h already */
- extern char *tzname[2];
--extern long timezone;
--extern int daylight;
- #endif
- 
- static void e_timezone_dialog_class_init	(ETimezoneDialogClass *class);
-@@ -336,7 +334,6 @@ e_timezone_dialog_construct (ETimezoneDi
- 	return NULL;
- }
- 
--#if 0
- static int
- get_local_offset (void)
- {
-@@ -349,10 +346,11 @@ get_local_offset (void)
- 	t_gmt = mktime (&gmt);
- 	t_local = mktime (&local);
- 	diff = t_local - t_gmt;
-+	if (local.tm_isdst == 1)
-+		diff += 3600;
- 
- 	return diff;
- }
--#endif
- 
- static icaltimezone*
- get_local_timezone(void)
-@@ -360,7 +358,7 @@ get_local_timezone(void)
- 	icaltimezone *zone;
- 
- 	tzset();
--	zone =  icaltimezone_get_builtin_timezone_from_offset (-timezone, tzname[0]);
-+	zone =  icaltimezone_get_builtin_timezone_from_offset (-get_local_offset(), tzname[0]);
- 
- 	return zone;
- }
diff --git a/mail/evolution/patches/patch-ya b/mail/evolution/patches/patch-ya
index 8707ae7e005..9d552673315 100644
--- a/mail/evolution/patches/patch-ya
+++ b/mail/evolution/patches/patch-ya
@@ -1,8 +1,8 @@
-$NetBSD: patch-ya,v 1.1 2009/01/25 17:07:36 drochner Exp $
+$NetBSD: patch-ya,v 1.2 2009/10/24 12:57:56 drochner Exp $
 
---- calendar/gui/e-cal-model.h.orig	2009-01-25 16:27:52.000000000 +0100
+--- calendar/gui/e-cal-model.h.orig	2009-10-18 01:08:48.000000000 +0200
 +++ calendar/gui/e-cal-model.h
-@@ -114,7 +114,7 @@ typedef struct {
+@@ -118,7 +118,7 @@ typedef struct {
  						     ETableModel *source_model, gint row);
  
  	/* Signals */
@@ -10,4 +10,4 @@ $NetBSD: patch-ya,v 1.1 2009/01/25 17:07:36 drochner Exp $
 +	void (* time_range_changed) (ECalModel *model, gint64 start, gint64 end);
  	void (* row_appended) (ECalModel *model);
  	void (* comps_deleted) (ECalModel *model, gpointer list);
- 	void (* cal_view_progress) (ECalModel *model, const char *message, int progress, ECalSourceType type);
+ 	void (* cal_view_progress) (ECalModel *model, const gchar *message, gint progress, ECalSourceType type);
diff --git a/mail/evolution/patches/patch-yb b/mail/evolution/patches/patch-yb
index 6fc15e187b9..dc350a0b533 100644
--- a/mail/evolution/patches/patch-yb
+++ b/mail/evolution/patches/patch-yb
@@ -1,19 +1,19 @@
-$NetBSD: patch-yb,v 1.1 2009/01/25 17:07:36 drochner Exp $
+$NetBSD: patch-yb,v 1.2 2009/10/24 12:57:56 drochner Exp $
 
---- calendar/gui/e-cal-model.c.orig	2009-01-25 16:32:16.000000000 +0100
+--- calendar/gui/e-cal-model.c.orig	2009-10-18 02:54:18.000000000 +0200
 +++ calendar/gui/e-cal-model.c
-@@ -149,8 +149,8 @@ e_cal_model_class_init (ECalModelClass *
+@@ -163,8 +163,8 @@ e_cal_model_class_init (ECalModelClass *
  			      G_SIGNAL_RUN_LAST,
  			      G_STRUCT_OFFSET (ECalModelClass, time_range_changed),
  			      NULL, NULL,
--			      e_calendar_marshal_VOID__LONG_LONG,
+-			      e_marshal_VOID__LONG_LONG,
 -			      G_TYPE_NONE, 2, G_TYPE_LONG, G_TYPE_LONG);
-+			      e_calendar_marshal_VOID__INT64_INT64,
++			      e_marshal_VOID__INT64_INT64,
 +			      G_TYPE_NONE, 2, G_TYPE_INT64, G_TYPE_INT64);
  
  	signals[ROW_APPENDED] =
  		g_signal_new ("row_appended",
-@@ -1970,7 +1970,8 @@ e_cal_model_set_time_range (ECalModel *m
+@@ -2185,7 +2185,8 @@ e_cal_model_set_time_range (ECalModel *m
  	priv->start = start;
  	priv->end = end;
  
diff --git a/mail/evolution/patches/patch-yc b/mail/evolution/patches/patch-yc
index 1ef0078b48a..f6ceb86646a 100644
--- a/mail/evolution/patches/patch-yc
+++ b/mail/evolution/patches/patch-yc
@@ -1,11 +1,13 @@
-$NetBSD: patch-yc,v 1.1 2009/01/25 17:07:36 drochner Exp $
+$NetBSD: patch-yc,v 1.2 2009/10/24 12:57:56 drochner Exp $
 
---- calendar/gui/e-calendar-marshal.list.orig	2009-01-25 16:33:19.000000000 +0100
-+++ calendar/gui/e-calendar-marshal.list
-@@ -13,5 +13,5 @@ NONE:STRING,POINTER,POINTER
- NONE:POINTER,ENUM
- NONE:POINTER,STRING
- NONE:POINTER,POINTER
+--- e-util/e-marshal.list.orig	2009-10-23 12:08:30.000000000 +0200
++++ e-util/e-marshal.list
+@@ -41,7 +41,7 @@ NONE:INT,POINTER,INT,OBJECT,BOXED,UINT,U
+ NONE:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT
+ NONE:INT,POINTER,INT,OBJECT,UINT
+ NONE:INT,STRING
 -NONE:LONG,LONG
 +NONE:INT64,INT64
- NONE:STRING,INT,INT
+ NONE:OBJECT,BOOLEAN
+ NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN
+ NONE:OBJECT,OBJECT
diff --git a/mail/evolution/patches/patch-yd b/mail/evolution/patches/patch-yd
index 3f35c5ccdd1..47cb4e2b973 100644
--- a/mail/evolution/patches/patch-yd
+++ b/mail/evolution/patches/patch-yd
@@ -1,8 +1,8 @@
-$NetBSD: patch-yd,v 1.1 2009/01/25 17:07:36 drochner Exp $
+$NetBSD: patch-yd,v 1.2 2009/10/24 12:57:56 drochner Exp $
 
---- calendar/gui/e-day-view.c.orig	2009-01-25 16:34:41.000000000 +0100
+--- calendar/gui/e-day-view.c.orig	2009-10-18 01:08:48.000000000 +0200
 +++ calendar/gui/e-day-view.c
-@@ -473,10 +473,10 @@ e_day_view_class_init (EDayViewClass *cl
+@@ -469,11 +469,11 @@ e_day_view_class_init (EDayViewClass *cl
  }
  
  static void
@@ -10,6 +10,7 @@ $NetBSD: patch-yd,v 1.1 2009/01/25 17:07:36 drochner Exp $
 +time_range_changed_cb (ECalModel *model, gint64 st64, gint64 et64, gpointer user_data)
  {
  	EDayView *day_view = E_DAY_VIEW (user_data);
+ 	EDayViewTimeItem *eti;
 -	time_t lower;
 +	time_t start_time = st64, end_time = et64, lower;