From b33e3c3bc1cd19f2a63d7df7e9f16057ebbe409a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 17 Jul 2023 22:34:45 -0400
Subject: [PATCH] icu: fix timezone stuff for thunderbird

---
 .../patches/standardize-vtzone-output.patch   | 33 +++++++++++++++++++
 srcpkgs/icu/template                          |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/icu/patches/standardize-vtzone-output.patch

diff --git a/srcpkgs/icu/patches/standardize-vtzone-output.patch b/srcpkgs/icu/patches/standardize-vtzone-output.patch
new file mode 100644
index 00000000000..7274f539991
--- /dev/null
+++ b/srcpkgs/icu/patches/standardize-vtzone-output.patch
@@ -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);
+     }
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 355865ce25d..271f7ea4fc9 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -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