Skip to content

Commit

Permalink
icu: fix timezone stuff for thunderbird
Browse files Browse the repository at this point in the history
  • Loading branch information
classabbyamp committed Jul 18, 2023
1 parent dbd5762 commit 807db97
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 1 deletion.
33 changes: 33 additions & 0 deletions srcpkgs/icu/patches/standardize-vtzone-output.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
Patch-Source: https://github.com/chimera-linux/cports/blob/c48ec38c2d88f6e5962299583a8f862159c89349/main/icu/patches/standardize-vtzone-output.patch
https://bugzilla.mozilla.org/show_bug.cgi?id=1790071
https://unicode-org.atlassian.net/browse/ICU-22132
needed for thunderbird
--
diff --git a/intl/icu/source/i18n/vtzone.cpp b/intl/icu/source/i18n/vtzone.cpp
--- a/source/i18n/vtzone.cpp
+++ b/source/i18n/vtzone.cpp
@@ -1735,14 +1735,17 @@ VTimeZone::write(VTZWriter& writer, UErr
}
}
} else {
- UnicodeString icutzprop;
- UVector customProps(nullptr, uhash_compareUnicodeString, status);
+ UVector customProps(uprv_deleteUObject, uhash_compareUnicodeString, status);
if (olsonzid.length() > 0 && icutzver.length() > 0) {
- icutzprop.append(olsonzid);
- icutzprop.append(u'[');
- icutzprop.append(icutzver);
- icutzprop.append(u']');
- customProps.addElement(&icutzprop, status);
+ LocalPointer<UnicodeString> icutzprop(new UnicodeString(ICU_TZINFO_PROP), status);
+ if (U_FAILURE(status)) {
+ return;
+ }
+ icutzprop->append(olsonzid);
+ icutzprop->append(u'[');
+ icutzprop->append(icutzver);
+ icutzprop->append(u']');
+ customProps.adoptElement(icutzprop.orphan(), status);
}
writeZone(writer, *tz, &customProps, status);
}
2 changes: 1 addition & 1 deletion srcpkgs/icu/template
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# next soname bump.
pkgname=icu
version=73.2
revision=1
revision=2
build_wrksrc=source
build_style=gnu-configure
# use archive data instead of .so data for correct cross-compiling
Expand Down

0 comments on commit 807db97

Please sign in to comment.