[pkgsrc/trunk]: pkgsrc/x11/gnome-panel sync the patch to fix a 64-bit time_t ...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/196d2869ad8c
branches:  trunk
changeset: 554712:196d2869ad8c
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Feb 18 17:50:24 2009 +0000

description:
sync the patch to fix a 64-bit time_t problem with the version submitted
to upstream (no functional change, just avoid a typecast)

diffstat:

 x11/gnome-panel/distinfo         |   4 ++--
 x11/gnome-panel/patches/patch-ab |  22 ++++++++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diffs (56 lines):

diff -r ea1982e96e28 -r 196d2869ad8c x11/gnome-panel/distinfo
--- a/x11/gnome-panel/distinfo  Wed Feb 18 16:58:12 2009 +0000
+++ b/x11/gnome-panel/distinfo  Wed Feb 18 17:50:24 2009 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.51 2009/01/25 17:03:31 drochner Exp $
+$NetBSD: distinfo,v 1.52 2009/02/18 17:50:24 drochner Exp $
 
 SHA1 (gnome-panel-2.24.3.tar.bz2) = 46a115529c2e6ef5429e58e5389ad44660aff428
 RMD160 (gnome-panel-2.24.3.tar.bz2) = ac38a86fd844d4e7d27c9785dc27a0327d83809f
 Size (gnome-panel-2.24.3.tar.bz2) = 3354686 bytes
 SHA1 (patch-aa) = e19be3cb14a38e1ea98f368a1fd1f53e1a7d6513
-SHA1 (patch-ab) = 12778b25fc50bd2bd2bf348e732db1fd0efcd4fe
+SHA1 (patch-ab) = 681079355d2f10f4ae40fa90772f457a1fc42f41
 SHA1 (patch-ad) = c24a5d0a8c1c88d46edfa3e8fc3e4528637a8d31
 SHA1 (patch-ae) = d85575dc403c67a4fcb0818904ab9b0517f7b8e0
diff -r ea1982e96e28 -r 196d2869ad8c x11/gnome-panel/patches/patch-ab
--- a/x11/gnome-panel/patches/patch-ab  Wed Feb 18 16:58:12 2009 +0000
+++ b/x11/gnome-panel/patches/patch-ab  Wed Feb 18 17:50:24 2009 +0000
@@ -1,19 +1,33 @@
-$NetBSD: patch-ab,v 1.5 2009/01/25 17:03:31 drochner Exp $
+$NetBSD: patch-ab,v 1.6 2009/02/18 17:50:24 drochner Exp $
 
 --- applets/clock/calendar-client.c.orig       2009-01-13 01:02:20.000000000 +0100
 +++ applets/clock/calendar-client.c
-@@ -909,8 +909,8 @@ resolve_timezone_id (const char *tzid,
+@@ -909,11 +909,12 @@ resolve_timezone_id (const char *tzid,
  
  static gboolean
  calendar_appointment_collect_occurrence (ECalComponent  *component,
 -                                       GTime           occurrence_start,
 -                                       GTime           occurrence_end,
+-                                       GSList        **collect_loc)
 +                                       time_t           occurrence_start,
 +                                       time_t           occurrence_end,
-                                        GSList        **collect_loc)
++                                       gpointer         data)
  {
    CalendarOccurrence *occurrence;
-@@ -2124,7 +2124,7 @@ calendar_client_set_task_completed (Cale
++  GSList **collect_loc = data;
+ 
+   occurrence             = g_new0 (CalendarOccurrence, 1);
+   occurrence->start_time = occurrence_start;
+@@ -943,7 +944,7 @@ calendar_appointment_generate_ocurrences
+   e_cal_recur_generate_instances (ecal,
+                                 start,
+                                 end,
+-                                (ECalRecurInstanceFn) calendar_appointment_collect_occurrence,
++                                calendar_appointment_collect_occurrence,
+                                 &appointment->occurrences,
+                                 (ECalRecurResolveTimezoneFn) resolve_timezone_id,
+                                 source,
+@@ -2124,7 +2125,7 @@ calendar_client_set_task_completed (Cale
      {
        struct icaltimetype  completed_time;