Update to 1.12.3 and fix a bug where Evolution crashes on startup for

first time users on 6.X.
This commit is contained in:
Joe Marcus Clarke 2008-01-08 02:59:16 +00:00
parent 074ffc9857
commit 51b64ee8cf
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=205228
3 changed files with 30 additions and 6 deletions

View file

@ -7,7 +7,7 @@
#
PORTNAME= evolution-data-server
PORTVERSION= 1.12.2
PORTVERSION= 1.12.3
CATEGORIES= databases gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}

View file

@ -1,3 +1,3 @@
MD5 (gnome2/evolution-data-server-1.12.2.tar.bz2) = 591170d71d7fe998236455c1a23860ca
SHA256 (gnome2/evolution-data-server-1.12.2.tar.bz2) = 63d43503cd2a991feafd5323f45d38a81e5b72eed667e5e3c50e97e3148cb4b8
SIZE (gnome2/evolution-data-server-1.12.2.tar.bz2) = 7447549
MD5 (gnome2/evolution-data-server-1.12.3.tar.bz2) = 9a04e379c34ad538764866dfd4eb2931
SHA256 (gnome2/evolution-data-server-1.12.3.tar.bz2) = e2d9038e3cd115ea5af2f3b7d381f5803c62d1ec36206e5a1bea0f823d25fab5
SIZE (gnome2/evolution-data-server-1.12.3.tar.bz2) = 7447166

View file

@ -1,5 +1,5 @@
--- calendar/libical/src/libical/icaltz-util.c.orig 2007-10-12 02:31:10.000000000 -0400
+++ calendar/libical/src/libical/icaltz-util.c 2007-11-03 12:22:24.000000000 -0400
--- calendar/libical/src/libical/icaltz-util.c.orig 2007-11-25 21:29:25.000000000 -0500
+++ calendar/libical/src/libical/icaltz-util.c 2008-01-07 20:24:12.000000000 -0500
@@ -23,6 +23,15 @@
#include <string.h>
#if defined(sun) && defined(__SVR4)
@ -16,3 +16,27 @@
#else
#include <byteswap.h>
#include <endian.h>
@@ -328,7 +337,10 @@ icaltzutil_fetch_timezone (const char *l
icalprop = icalproperty_new_tzname (types [zidx].zname);
icalcomponent_add_property (std_comp, icalprop);
- trans = transitions [stdidx] + types [zidx].gmtoff;
+ if (num_trans)
+ trans = transitions [stdidx] + types [zidx].gmtoff;
+ else
+ trans = types [zidx].gmtoff;
icaltime = icaltime_from_timet (trans, 0);
dtstart = icaltime;
dtstart.year = 1970;
@@ -369,7 +381,10 @@ icaltzutil_fetch_timezone (const char *l
icalprop = icalproperty_new_tzname (types [zidx].zname);
icalcomponent_add_property (dst_comp, icalprop);
- trans = transitions [dstidx] + types [zidx].gmtoff;
+ if (num_trans)
+ trans = transitions [dstidx] + types [zidx].gmtoff;
+ else
+ trans = types [zidx].gmtoff;
icaltime = icaltime_from_timet (trans, 0);
dtstart = icaltime;
dtstart.year = 1970;