summaryrefslogtreecommitdiff
path: root/x11/gnome-panel
diff options
context:
space:
mode:
authordrochner <drochner>2009-01-25 17:03:31 +0000
committerdrochner <drochner>2009-01-25 17:03:31 +0000
commitb4d0eb7d2d4f0fd313f941e28334f95ba7037797 (patch)
tree2edea3799825aa6589dc7e65a60359fb8e03fcd0 /x11/gnome-panel
parent1b99e7ae0ef2c83053f4f6e5437d6fda36908320 (diff)
downloadpkgsrc-b4d0eb7d2d4f0fd313f941e28334f95ba7037797.tar.gz
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
Diffstat (limited to 'x11/gnome-panel')
-rw-r--r--x11/gnome-panel/Makefile3
-rw-r--r--x11/gnome-panel/distinfo4
-rw-r--r--x11/gnome-panel/patches/patch-ab17
3 files changed, 18 insertions, 6 deletions
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 94adafa2f0d..382d67e8394 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.105 2009/01/14 09:11:47 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2009/01/25 17:03:31 drochner Exp $
#
DISTNAME= gnome-panel-2.24.3
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-panel/2.24/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 410d201e430..460d075def0 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.50 2009/01/14 09:11:47 wiz Exp $
+$NetBSD: distinfo,v 1.51 2009/01/25 17:03:31 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) = 961186c5db258557294fae4a280d13efdcfe1de1
+SHA1 (patch-ab) = 12778b25fc50bd2bd2bf348e732db1fd0efcd4fe
SHA1 (patch-ad) = c24a5d0a8c1c88d46edfa3e8fc3e4528637a8d31
SHA1 (patch-ae) = d85575dc403c67a4fcb0818904ab9b0517f7b8e0
diff --git a/x11/gnome-panel/patches/patch-ab b/x11/gnome-panel/patches/patch-ab
index e1e071ab9ed..858488497c8 100644
--- a/x11/gnome-panel/patches/patch-ab
+++ b/x11/gnome-panel/patches/patch-ab
@@ -1,8 +1,19 @@
-$NetBSD: patch-ab,v 1.4 2007/12/16 12:05:46 drochner Exp $
+$NetBSD: patch-ab,v 1.5 2009/01/25 17:03:31 drochner Exp $
---- applets/clock/calendar-client.c.orig 2007-12-01 20:23:22.000000000 +0100
+--- applets/clock/calendar-client.c.orig 2009-01-13 01:02:20.000000000 +0100
+++ applets/clock/calendar-client.c
-@@ -2025,7 +2025,7 @@ calendar_client_set_task_completed (Cale
+@@ -909,8 +909,8 @@ resolve_timezone_id (const char *tzid,
+
+ static gboolean
+ calendar_appointment_collect_occurrence (ECalComponent *component,
+- GTime occurrence_start,
+- GTime occurrence_end,
++ time_t occurrence_start,
++ time_t occurrence_end,
+ GSList **collect_loc)
+ {
+ CalendarOccurrence *occurrence;
+@@ -2124,7 +2124,7 @@ calendar_client_set_task_completed (Cale
{
struct icaltimetype completed_time;