Wed Feb 18 17:50:24 2009 UTC ()
sync the patch to fix a 64-bit time_t problem with the version submitted
to upstream (no functional change, just avoid a typecast)


(drochner)
diff -r1.51 -r1.52 pkgsrc/x11/gnome-panel/distinfo
diff -r1.5 -r1.6 pkgsrc/x11/gnome-panel/patches/patch-ab
cvs diff -r1.51 -r1.52 pkgsrc/x11/gnome-panel/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/gnome-panel/Attic/distinfo 2009/01/25 17:03:31 1.51
+++ pkgsrc/x11/gnome-panel/Attic/distinfo 2009/02/18 17:50:24 1.52
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.51 2009/01/25 17:03:31 drochner Exp $ 1$NetBSD: distinfo,v 1.52 2009/02/18 17:50:24 drochner Exp $
2 2
3SHA1 (gnome-panel-2.24.3.tar.bz2) = 46a115529c2e6ef5429e58e5389ad44660aff428 3SHA1 (gnome-panel-2.24.3.tar.bz2) = 46a115529c2e6ef5429e58e5389ad44660aff428
4RMD160 (gnome-panel-2.24.3.tar.bz2) = ac38a86fd844d4e7d27c9785dc27a0327d83809f 4RMD160 (gnome-panel-2.24.3.tar.bz2) = ac38a86fd844d4e7d27c9785dc27a0327d83809f
5Size (gnome-panel-2.24.3.tar.bz2) = 3354686 bytes 5Size (gnome-panel-2.24.3.tar.bz2) = 3354686 bytes
6SHA1 (patch-aa) = e19be3cb14a38e1ea98f368a1fd1f53e1a7d6513 6SHA1 (patch-aa) = e19be3cb14a38e1ea98f368a1fd1f53e1a7d6513
7SHA1 (patch-ab) = 12778b25fc50bd2bd2bf348e732db1fd0efcd4fe 7SHA1 (patch-ab) = 681079355d2f10f4ae40fa90772f457a1fc42f41
8SHA1 (patch-ad) = c24a5d0a8c1c88d46edfa3e8fc3e4528637a8d31 8SHA1 (patch-ad) = c24a5d0a8c1c88d46edfa3e8fc3e4528637a8d31
9SHA1 (patch-ae) = d85575dc403c67a4fcb0818904ab9b0517f7b8e0 9SHA1 (patch-ae) = d85575dc403c67a4fcb0818904ab9b0517f7b8e0
cvs diff -r1.5 -r1.6 pkgsrc/x11/gnome-panel/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/x11/gnome-panel/patches/Attic/patch-ab 2009/01/25 17:03:31 1.5
+++ pkgsrc/x11/gnome-panel/patches/Attic/patch-ab 2009/02/18 17:50:24 1.6
@@ -1,24 +1,38 @@ @@ -1,24 +1,38 @@
1$NetBSD: patch-ab,v 1.5 2009/01/25 17:03:31 drochner Exp $ 1$NetBSD: patch-ab,v 1.6 2009/02/18 17:50:24 drochner Exp $
2 2
3--- applets/clock/calendar-client.c.orig 2009-01-13 01:02:20.000000000 +0100 3--- applets/clock/calendar-client.c.orig 2009-01-13 01:02:20.000000000 +0100
4+++ applets/clock/calendar-client.c 4+++ applets/clock/calendar-client.c
5@@ -909,8 +909,8 @@ resolve_timezone_id (const char *tzid, 5@@ -909,11 +909,12 @@ resolve_timezone_id (const char *tzid,
6  6
7 static gboolean 7 static gboolean
8 calendar_appointment_collect_occurrence (ECalComponent *component, 8 calendar_appointment_collect_occurrence (ECalComponent *component,
9- GTime occurrence_start, 9- GTime occurrence_start,
10- GTime occurrence_end, 10- GTime occurrence_end,
 11- GSList **collect_loc)
11+ time_t occurrence_start, 12+ time_t occurrence_start,
12+ time_t occurrence_end, 13+ time_t occurrence_end,
13 GSList **collect_loc) 14+ gpointer data)
14 { 15 {
15 CalendarOccurrence *occurrence; 16 CalendarOccurrence *occurrence;
16@@ -2124,7 +2124,7 @@ calendar_client_set_task_completed (Cale 17+ GSList **collect_loc = data;
 18
 19 occurrence = g_new0 (CalendarOccurrence, 1);
 20 occurrence->start_time = occurrence_start;
 21@@ -943,7 +944,7 @@ calendar_appointment_generate_ocurrences
 22 e_cal_recur_generate_instances (ecal,
 23 start,
 24 end,
 25- (ECalRecurInstanceFn) calendar_appointment_collect_occurrence,
 26+ calendar_appointment_collect_occurrence,
 27 &appointment->occurrences,
 28 (ECalRecurResolveTimezoneFn) resolve_timezone_id,
 29 source,
 30@@ -2124,7 +2125,7 @@ calendar_client_set_task_completed (Cale
17 { 31 {
18 struct icaltimetype completed_time; 32 struct icaltimetype completed_time;
19  33
20- completed_time = icaltime_current_time_with_zone (client->priv->zone); 34- completed_time = icaltime_current_time_with_zone (client->priv->zone);
21+ completed_time = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ()); 35+ completed_time = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ());
22 if (!prop) 36 if (!prop)
23 { 37 {
24 icalcomponent_add_property (ical, 38 icalcomponent_add_property (ical,