Sun Jan 25 17:03:31 2009 UTC ()
fix mixup of time_t and int32 in arguments of a callback function,
keeps the calendar popup from crashing if a holiday calendar was
imported in evolution, bump PKGREVISION


(drochner)
diff -r1.105 -r1.106 pkgsrc/x11/gnome-panel/Makefile
diff -r1.50 -r1.51 pkgsrc/x11/gnome-panel/distinfo
diff -r1.4 -r1.5 pkgsrc/x11/gnome-panel/patches/patch-ab
cvs diff -r1.105 -r1.106 pkgsrc/x11/gnome-panel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gnome-panel/Attic/Makefile 2009/01/14 09:11:47 1.105
+++ pkgsrc/x11/gnome-panel/Attic/Makefile 2009/01/25 17:03:31 1.106
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.105 2009/01/14 09:11:47 wiz Exp $ 1# $NetBSD: Makefile,v 1.106 2009/01/25 17:03:31 drochner Exp $
2# 2#
3 3
4DISTNAME= gnome-panel-2.24.3 4DISTNAME= gnome-panel-2.24.3
 5PKGREVISION= 1
5CATEGORIES= x11 gnome 6CATEGORIES= x11 gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-panel/2.24/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-panel/2.24/}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= drochner@NetBSD.org 10MAINTAINER= drochner@NetBSD.org
10HOMEPAGE= http://www.gnome.org/ 11HOMEPAGE= http://www.gnome.org/
11COMMENT= GNOME2 panel application 12COMMENT= GNOME2 panel application
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15EGDIR= ${PREFIX}/share/examples/gnome-panel 16EGDIR= ${PREFIX}/share/examples/gnome-panel
16CONF_FILES+= ${PREFIX}/share/examples/gnome-panel/org.gnome.ClockApplet.Mechanism.conf \ 17CONF_FILES+= ${PREFIX}/share/examples/gnome-panel/org.gnome.ClockApplet.Mechanism.conf \
17 ${PKG_SYSCONFDIR}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf 18 ${PKG_SYSCONFDIR}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
cvs diff -r1.50 -r1.51 pkgsrc/x11/gnome-panel/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/gnome-panel/Attic/distinfo 2009/01/14 09:11:47 1.50
+++ pkgsrc/x11/gnome-panel/Attic/distinfo 2009/01/25 17:03:31 1.51
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.50 2009/01/14 09:11:47 wiz Exp $ 1$NetBSD: distinfo,v 1.51 2009/01/25 17:03:31 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) = 961186c5db258557294fae4a280d13efdcfe1de1 7SHA1 (patch-ab) = 12778b25fc50bd2bd2bf348e732db1fd0efcd4fe
8SHA1 (patch-ad) = c24a5d0a8c1c88d46edfa3e8fc3e4528637a8d31 8SHA1 (patch-ad) = c24a5d0a8c1c88d46edfa3e8fc3e4528637a8d31
9SHA1 (patch-ae) = d85575dc403c67a4fcb0818904ab9b0517f7b8e0 9SHA1 (patch-ae) = d85575dc403c67a4fcb0818904ab9b0517f7b8e0
cvs diff -r1.4 -r1.5 pkgsrc/x11/gnome-panel/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/x11/gnome-panel/patches/Attic/patch-ab 2007/12/16 12:05:46 1.4
+++ pkgsrc/x11/gnome-panel/patches/Attic/patch-ab 2009/01/25 17:03:31 1.5
@@ -1,13 +1,24 @@ @@ -1,13 +1,24 @@
1$NetBSD: patch-ab,v 1.4 2007/12/16 12:05:46 drochner Exp $ 1$NetBSD: patch-ab,v 1.5 2009/01/25 17:03:31 drochner Exp $
2 2
3--- applets/clock/calendar-client.c.orig 2007-12-01 20:23:22.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@@ -2025,7 +2025,7 @@ calendar_client_set_task_completed (Cale 5@@ -909,8 +909,8 @@ resolve_timezone_id (const char *tzid,
 6
 7 static gboolean
 8 calendar_appointment_collect_occurrence (ECalComponent *component,
 9- GTime occurrence_start,
 10- GTime occurrence_end,
 11+ time_t occurrence_start,
 12+ time_t occurrence_end,
 13 GSList **collect_loc)
 14 {
 15 CalendarOccurrence *occurrence;
 16@@ -2124,7 +2124,7 @@ calendar_client_set_task_completed (Cale
6 { 17 {
7 struct icaltimetype completed_time; 18 struct icaltimetype completed_time;
8  19
9- completed_time = icaltime_current_time_with_zone (client->priv->zone); 20- completed_time = icaltime_current_time_with_zone (client->priv->zone);
10+ completed_time = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ()); 21+ completed_time = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ());
11 if (!prop) 22 if (!prop)
12 { 23 {
13 icalcomponent_add_property (ical, 24 icalcomponent_add_property (ical,