mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-06 21:20:33 +02:00
d4097d3563
Suggested by Deltafire. * gnu/packages/patches/icu4c-icu-22132-fix-vtimezone.patch: Rename to... * gnu/packages/patches/icu4c-22132-standardize-vtzone-output.patch: ... this. * gnu/packages/patches/icu4c-20548-dateinterval-timezone.patch: New file. * gnu/packages/patches/icu4c-dayperiod-fractional-seconds.patch: New file. * gnu/packages/patches/icu4c-23069-rosh-hashanah-postponement.patch * gnu/packages/patches/icu4c-dtitvfmt-adopt-calendar.patch * gnu/packages/patches/icu4c-wasi-workaround.patch: New files. * gnu/packages/patches/icu4c-double-conversion.patch: New file. * gnu/local.mk (dist_patch_DATA): Update accordingly. * gnu/packages/icu4c.scm (icu4c-77) [source]: Apply patches. Fixes: #3166 Change-Id: I9ce64a81f763e5c9ff2940a2d844a0b44d2800a8
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
Retrieved from: <https://raw.githubusercontent.com/mozilla-firefox/firefox/refs/heads/main/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff>
|
|
|
|
diff --git a/source/i18n/vtzone.cpp b/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);
|
|
}
|