From 7e28d60a06df357bd0345fc7d981b0edcbd858e0 Mon Sep 17 00:00:00 2001
From: Luis <lumaro@disroot.org>
Date: Fri, 3 Nov 2023 18:05:57 +0000
Subject: [PATCH] thunderbird: fix build with icu 74.1

---
 main/thunderbird/.checksums  |  1 +
 main/thunderbird/.pkgfiles   |  2 +-
 main/thunderbird/icu74.patch | 19 +++++++++++++++++++
 main/thunderbird/spkgbuild   | 17 +++++++----------
 4 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100644 main/thunderbird/icu74.patch

diff --git a/main/thunderbird/.checksums b/main/thunderbird/.checksums
index 72058656c..2abf11071 100644
--- a/main/thunderbird/.checksums
+++ b/main/thunderbird/.checksums
@@ -1,3 +1,4 @@
+86a253e2866eee913f57014012f91709  icu74.patch
 5f4491fa45920a7bd37bd269f825ed5d  libstdc++13.patch
 ae9bea223b505bf45462fe6f77502310  ppc-musttail.patch
 ca15712ea27103cd7a37ac753b50037d  system-wrappers.patch
diff --git a/main/thunderbird/.pkgfiles b/main/thunderbird/.pkgfiles
index 311273130..84ed8b3e5 100644
--- a/main/thunderbird/.pkgfiles
+++ b/main/thunderbird/.pkgfiles
@@ -1,4 +1,4 @@
-thunderbird-115.4.1-1
+thunderbird-115.4.1-2
 drwxr-xr-x root/root    etc/
 drwxr-xr-x root/root    etc/revdep.d/
 -rw-r--r-- root/root    etc/revdep.d/thunderbird.conf
diff --git a/main/thunderbird/icu74.patch b/main/thunderbird/icu74.patch
new file mode 100644
index 000000000..f5619c2a6
--- /dev/null
+++ b/main/thunderbird/icu74.patch
@@ -0,0 +1,19 @@
+diff --git a/intl/lwbrk/LineBreaker.cpp b/intl/lwbrk/LineBreaker.cpp
+index 440f219..79a5d6a 100644
+--- a/intl/lwbrk/LineBreaker.cpp
++++ b/intl/lwbrk/LineBreaker.cpp
+@@ -448,7 +448,13 @@ static int8_t GetClass(uint32_t u, LineBreakRule aLevel,
+       /* REGIONAL_INDICATOR = 39,           [RI] */ CLASS_CHARACTER,
+       /* E_BASE = 40,                       [EB] */ CLASS_BREAKABLE,
+       /* E_MODIFIER = 41,                   [EM] */ CLASS_CHARACTER,
+-      /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER};
++      /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER,
++      /* AKSARA = 43,                       [AK] */ CLASS_CHARACTER,
++      /* AKSARA_PREBASE = 44,               [AP] */ CLASS_CHARACTER,
++      /* AKSARA_START = 45,                 [AS] */ CLASS_CHARACTER,
++      /* VIRAMA_FINAL = 46,                 [VF] */ CLASS_CHARACTER,
++      /* VIRAMA = 47,                       [VI] */ CLASS_CHARACTER,
++  };
+ 
+   static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
+                 "Gecko vs ICU LineBreak class mismatch");
diff --git a/main/thunderbird/spkgbuild b/main/thunderbird/spkgbuild
index 59201641e..972c3effd 100755
--- a/main/thunderbird/spkgbuild
+++ b/main/thunderbird/spkgbuild
@@ -3,17 +3,21 @@
 
 name=thunderbird
 version=115.4.1
-release=1
+release=2
 source="https://archive.mozilla.org/pub/thunderbird/releases/$version/source/thunderbird-$version.source.tar.xz
 	system-wrappers.patch
 	libstdc++13.patch
 	ppc-musttail.patch
+	icu74.patch
 	"
 
 build() {
 	INITDIR=$PWD
 
 	cd $name-$version
+	
+	# Fix build with ICU 74.1
+	patch -Np1 -i $SRC/icu74.patch
 
 	# Fix building Thunderbird with rustc-1.68.x: 
 	patch -Np1 -i $SRC/libstdc++13.patch
@@ -34,6 +38,7 @@ build() {
 ac_add_options --disable-audio-backends
 ac_add_options --disable-crashreporter
 ac_add_options --disable-debug
+ac_add_options --disable-debug-symbols
 ac_add_options --disable-necko-wifi
 ac_add_options --disable-tests
 ac_add_options --disable-updater
@@ -44,6 +49,7 @@ ac_add_options --enable-install-strip
 ac_add_options --enable-official-branding
 ac_add_options --enable-optimize=-O2
 ac_add_options --enable-strip
+ac_add_options --enable-install-strip
 ac_add_options --enable-system-ffi
 ac_add_options --enable-system-pixman
 ac_add_options --prefix=/usr
@@ -62,15 +68,6 @@ EOF
 	export MOZ_NOSPAM=1
 	export CARGO_HOME=$INITDIR
 
-	# Remove an obsolete flag in python-3.11
-	grep -rl \"rU\" | xargs sed -i 's/"rU"/"r"/'
-
-	# Fix an issue with regular expressions in python-3.11
-	sed -e 's/?s)\./?s:.)/'               \
-	    -e '/?m)/{s/?m)/?m:/;s/\$"/$)"/}' \
-	    -e '/?s)%/{s/?s)/?s:/;s/?"/?)"/}' \
-	    -i xpcom/idl-parser/xpidl/xpidl.py
-
         SHELL=/bin/sh MACH_USE_SYSTEM_PYTHON=1 ./mach build
         SHELL=/bin/sh MACH_USE_SYSTEM_PYTHON=1 DESTDIR=$PKG ./mach install