-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
icu: fix timezone stuff for thunderbird
- Loading branch information
1 parent
6360fdb
commit b33e3c3
Showing
2 changed files
with
34 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters