in callbacks getting time_t arguments, use int64 rather than long

(there is nothing better in the glib2 signal/slot/marshaller framework),
now the calendar doesn't crash on startup (i386/current)
bump PKGREVISION

7 files changed, 93 insertions, 2 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 57f607d2574..1fb56a94c76 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.142 2009/01/13 13:24:03 wiz Exp $
+# $NetBSD: Makefile,v 1.143 2009/01/25 17:07:36 drochner Exp $
 
 DISTNAME=		evolution-2.24.3
+PKGREVISION=		1
 CATEGORIES=		mail time gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evolution/2.24/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 89ec9fde4a0..a80812dff55 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.63 2009/01/13 13:24:03 wiz Exp $
+$NetBSD: distinfo,v 1.64 2009/01/25 17:07:36 drochner Exp $
 
 SHA1 (evolution-2.24.3.tar.bz2) = 323d7d7dda3edb8fe30a1b1240d6cd968174fb14
 RMD160 (evolution-2.24.3.tar.bz2) = 07f84ec39c6b0a3f8b56f8721660a6e3f18dd061
 Size (evolution-2.24.3.tar.bz2) = 32652280 bytes
 SHA1 (patch-aa) = d490839edcbb4893086750e052ca41bfff487bfa
 SHA1 (patch-ab) = b56533feb1bf7d3c3eabf905a50a54e7f27f5b1c
+SHA1 (patch-ya) = d1ab90d374ca475c4b4b54bb7ad535434d3bdfeb
+SHA1 (patch-yb) = babd94b7d4dde36a0dfbaa392556d54c6e8868e6
+SHA1 (patch-yc) = 3ab94e66a4fe70088f1e86b035050540e1849558
+SHA1 (patch-yd) = 3b3f37a04803971a1a91b25c3b5fc5a914ae655d
+SHA1 (patch-ye) = 042586d68127bf4c70b2bfecd8e44df03c924792
diff --git a/mail/evolution/patches/patch-ya b/mail/evolution/patches/patch-ya
new file mode 100644
index 00000000000..8707ae7e005
--- /dev/null
+++ b/mail/evolution/patches/patch-ya
@@ -0,0 +1,13 @@
+$NetBSD: patch-ya,v 1.1 2009/01/25 17:07:36 drochner Exp $
+
+--- calendar/gui/e-cal-model.h.orig	2009-01-25 16:27:52.000000000 +0100
++++ calendar/gui/e-cal-model.h
+@@ -114,7 +114,7 @@ typedef struct {
+ 						     ETableModel *source_model, gint row);
+ 
+ 	/* Signals */
+-	void (* time_range_changed) (ECalModel *model, time_t start, time_t end);
++	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);
diff --git a/mail/evolution/patches/patch-yb b/mail/evolution/patches/patch-yb
new file mode 100644
index 00000000000..6fc15e187b9
--- /dev/null
+++ b/mail/evolution/patches/patch-yb
@@ -0,0 +1,25 @@
+$NetBSD: patch-yb,v 1.1 2009/01/25 17:07:36 drochner Exp $
+
+--- calendar/gui/e-cal-model.c.orig	2009-01-25 16:32:16.000000000 +0100
++++ calendar/gui/e-cal-model.c
+@@ -149,8 +149,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,
+-			      G_TYPE_NONE, 2, G_TYPE_LONG, G_TYPE_LONG);
++			      e_calendar_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
+ 	priv->start = start;
+ 	priv->end = end;
+ 
+-	g_signal_emit (G_OBJECT (model), signals[TIME_RANGE_CHANGED], 0, start, end);
++	g_signal_emit (G_OBJECT (model), signals[TIME_RANGE_CHANGED], 0,
++		       (gint64)start, (gint64)end);
+ 	redo_queries (model);
+ }
+ 
diff --git a/mail/evolution/patches/patch-yc b/mail/evolution/patches/patch-yc
new file mode 100644
index 00000000000..1ef0078b48a
--- /dev/null
+++ b/mail/evolution/patches/patch-yc
@@ -0,0 +1,11 @@
+$NetBSD: patch-yc,v 1.1 2009/01/25 17:07:36 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
+-NONE:LONG,LONG
++NONE:INT64,INT64
+ NONE:STRING,INT,INT
diff --git a/mail/evolution/patches/patch-yd b/mail/evolution/patches/patch-yd
new file mode 100644
index 00000000000..3f35c5ccdd1
--- /dev/null
+++ b/mail/evolution/patches/patch-yd
@@ -0,0 +1,17 @@
+$NetBSD: patch-yd,v 1.1 2009/01/25 17:07:36 drochner Exp $
+
+--- calendar/gui/e-day-view.c.orig	2009-01-25 16:34:41.000000000 +0100
++++ calendar/gui/e-day-view.c
+@@ -473,10 +473,10 @@ e_day_view_class_init (EDayViewClass *cl
+ }
+ 
+ static void
+-time_range_changed_cb (ECalModel *model, time_t start_time, time_t end_time, gpointer user_data)
++time_range_changed_cb (ECalModel *model, gint64 st64, gint64 et64, gpointer user_data)
+ {
+ 	EDayView *day_view = E_DAY_VIEW (user_data);
+-	time_t lower;
++	time_t start_time = st64, end_time = et64, lower;
+ 
+ 	g_return_if_fail (E_IS_DAY_VIEW (day_view));
+ 
diff --git a/mail/evolution/patches/patch-ye b/mail/evolution/patches/patch-ye
new file mode 100644
index 00000000000..cd19c6574db
--- /dev/null
+++ b/mail/evolution/patches/patch-ye
@@ -0,0 +1,19 @@
+$NetBSD: patch-ye,v 1.1 2009/01/25 17:07:36 drochner Exp $
+
+--- calendar/gui/e-week-view.c.orig	2009-01-25 16:40:31.000000000 +0100
++++ calendar/gui/e-week-view.c
+@@ -231,12 +231,13 @@ e_week_view_class_init (EWeekViewClass *
+ }
+ 
+ static void
+-time_range_changed_cb (ECalModel *model, time_t start_time, time_t end_time, gpointer user_data)
++time_range_changed_cb (ECalModel *model, gint64 st64, gint64 et64, gpointer user_data)
+ {
+ 	EWeekView *week_view = E_WEEK_VIEW (user_data);
+ 	GDate date, base_date;
+ 	gint day_offset, weekday, week_start_offset;
+ 	gboolean update_adjustment_value = FALSE;
++	time_t start_time = st64, end_time = et64;
+ 
+ 	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
+