--- libical-1.0.old/scripts/mkderivedvalues.pl +++ libical-1.0/scripts/mkderivedvalues.pl @@ -63,7 +63,7 @@ print "typedef enum icalvalue_kind {\n"; print " ICAL_ANY_VALUE=$idx,\n"; - foreach $value (keys %h) { + foreach $value (sort keys %h) { $idx++; my $ucv = join("",map {uc(lc($_));} split(/-/,$value)); @@ -132,7 +132,7 @@ my $count = scalar(keys %h) + 1; print "static const struct icalvalue_kind_map value_map[$count]={\n"; - foreach $value (keys %h) { + foreach $value (sort keys %h) { $idx++; my $ucv = join("",map {uc(lc($_));} split(/-/,$value)); @@ -148,7 +148,7 @@ } -foreach $value (keys %h) { +foreach $value (sort keys %h) { my $autogen = $h{$value}->{C}->[0]; my $type = $h{$value}->{C}->[1]; --- libical-1.0.old/src/libical/icaltimezone.c +++ libical-1.0/src/libical/icaltimezone.c @@ -1686,7 +1686,7 @@ icalerror_assert (builtin_timezones == NULL, "Parsing zones.tab file multiple times"); - builtin_timezones = icalarray_new (sizeof (icaltimezone), 32); + builtin_timezones = icalarray_new (sizeof (icaltimezone), 1024); #ifndef USE_BUILTIN_TZDATA filename_len = strlen ((char *) icaltzutil_get_zone_directory()) + strlen (ZONES_TAB_SYSTEM_FILENAME)