diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-01-08 02:59:16 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-01-08 02:59:16 +0000 |
| commit | 51b64ee8cf1aae604108f512f497d3231bb2718c (patch) | |
| tree | 4c594a45d61f950c24eb999d729fe86168a0c171 /databases/evolution-data-server/files | |
| parent | - Update to 0.10 (diff) | |
Update to 1.12.3 and fix a bug where Evolution crashes on startup for
first time users on 6.X.
Diffstat (limited to 'databases/evolution-data-server/files')
| -rw-r--r-- | databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c index ce16a3911fbd..c183e3b79a94 100644 --- a/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c +++ b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c @@ -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; |