Source: https://unicode-org.atlassian.net/browse/ICU-22132?focusedCommentId=166752
Author: Sean Burke
License:
Fixes: https://bugzilla.mozilla.org/show_bug.cgi?id=1843007

diff --git a/icu4c/source/i18n/vtzone.cpp b/icu4c/source/i18n/vtzone.cpp
index 3035106701..5e738e11fa 100644
--- a/source/i18n/vtzone.cpp
+++ b/source/i18n/vtzone.cpp
@@ -1735,14 +1735,14 @@ VTimeZone::write(VTZWriter& writer, UErrorCode& status) const {
             }
         }
     } 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);
+            icutzprop->append(olsonzid);
+            icutzprop->append(u'[');
+            icutzprop->append(icutzver);
+            icutzprop->append(u']');
+            customProps.adoptElement(icutzprop.orphan(), status);
         }
         writeZone(writer, *tz, &customProps, status);
     }
pm.scm?id=df35583970a7f6e5e43d04e4e23588555604c4fa'>commit</a><a href='/guix/diff/gnu/packages/rpm.scm?id=df35583970a7f6e5e43d04e4e23588555604c4fa'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/rpm.scm'>
<input type='hidden' name='id' value='df35583970a7f6e5e43d04e4e23588555604c4fa'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=df35583970a7f6e5e43d04e4e23588555604c4fa'>root</a>/<a href='/guix/log/gnu?id=df35583970a7f6e5e43d04e4e23588555604c4fa'>gnu</a>/<a href='/guix/log/gnu/packages?id=df35583970a7f6e5e43d04e4e23588555604c4fa'>packages</a>/<a href='/guix/log/gnu/packages/rpm.scm?id=df35583970a7f6e5e43d04e4e23588555604c4fa'>rpm.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/rpm.scm?id=df35583970a7f6e5e43d04e4e23588555604c4fa&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-08-31 10:42:14 +0200'>2024-08-31</span></td><td><a href='/guix/commit/gnu/packages/rpm.scm?id=443b911e95308f3703612afd393e1e2f87835d39'>gnu: Remove unneeded libxml2 from native-inputs. (gtk-doc)</a><span class='msg-avail'>...<span class='msg-tooltip'>The gtk-doc wrapped binaries use XML_CATALOG_FILES to perform XML catalog
lookup and come with docbook-xsl within the variable which fixes the
docbook-xsl stylesheet lookup related failures with these packages.
This makes it unnecessary to include libxml2 as the cause of error was usually
with the gtk-doc binaries.

* gnu/packages/gnome.scm (gupnp-igd, dee, zeitgeist, libnma)[native-inputs]:
Remove libxml2.
* gnu/packages/rpm.scm (libmodulemd)[native-inputs]: Ditto.
* gnu/packages/security-token.scm (libu2f-host)[native-inputs]: Ditto.

Signed-off-by: Maxim Cournoyer &lt;maxim.cournoyer@gmail.com&gt;
</span></span></td><td>Bruno Victal</td></tr>