From 244f6936aac2921d8429a46a37de876e5f34b602 Mon Sep 17 00:00:00 2001
From: Ikey Doherty <ikey@serpentos.com>
Date: Sat, 18 Jan 2025 07:38:00 +0000
Subject: [PATCH] thunderbird: Update to v128.6.0

 - Unset RUSTFLAGS, always did conflict but now Thunderbird fails to configure
 - Forcibly enable Rust components (system tray pls)

Signed-off-by: Ikey Doherty <ikey@serpentos.com>
---
 t/thunderbird/manifest.x86_64.bin   | Bin 857 -> 856 bytes
 t/thunderbird/manifest.x86_64.jsonc |   4 ++--
 t/thunderbird/pkg/mozconfig         |   1 +
 t/thunderbird/stone.yaml            |   7 ++++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/t/thunderbird/manifest.x86_64.bin b/t/thunderbird/manifest.x86_64.bin
index a40e4e7af00e05f31fd94ec6593e1e0051840738..ebc3006a68831e2e37b61ccf9f55a1628db5c2c8 100644
GIT binary patch
delta 749
zcmV<J0uue%2G|CWCw~|K00000016blJ_osdHD)#d003S90RaLiwJ-f(6bW@00Hz~y
zCZJl)1M)&~Y(@U2EKNH(9&o7F(d%$)JKN8l4or@wXmPxp9B2z|0A>JY0CYZVZjQmD
zqeI<Hc|PxL`@OzdtLU}T@~#40LB?@(Udf4xn+_^XpQ1=4Qjw-8SpyFBp+FtWO#v?B
zrsh$j^S4O53BVmV=K?k2x~B6&J8q6uF0PkN?1ADIO{o@vdFZdye?uS-g)Zym9p{6V
zbR}NwUCp6|T-a<RheKH})0+AFX4ui@L+z6#0U#UN#SdSd<u}fUInx-1#t4?K-H2W*
z#%h*yUYV0&0Th3f6tdybd?)?>Or2}a7qxD)L!J$?GFb1S-5gu*Vh^!Ib-f|3%;3>*
z{sy~%QM}?HH^c|XgDl_D^#eupE_y9(cx1Cc&adJ8k&<Yx8)J_z`ss*9uX4Ygq0%oL
z>Ux_@V;7h!ykIZ=mO5{Z;QA}lEg0K9SK^&4ew*Rb3}SygcC*0-q`*^bzDJ311q!a9
z?hU_YF(1|zNV=%@%CZH3q@ZzF1QA0eBS{Kr46r5;x^)gowz~UGwM<IB1%Z}eSc@_B
zNIucwwwC)zJ^~dkeFq88HdsYsU+if~vD~Hw6s$-=F}EUjntUK`x&ACdx3Xeqm89w4
z87qHW2?&2mVAb8*dt@DFd291(r31*m`(lSQV_IwA3P#3sd9$@9zWYAwAbZ@ghgoa*
z04scwebgUe&D4drfOriM{n-d~bXgEQGuUhi9ingK*KrGw<H12>GR2qfp8D3Xznnqj
zCtxMjylnoWk$*rvv{3QCc*Os@!Yz>&V0h$-Uu9)BA2s>sMEzhD`s-E+vne0k;AfXM
zj|txWa85w~vMJ*8A6ujz1genPthDCgLK9AE#{gIw#*S=HJSf7-$bXl$?;5;g60n1+
f_ra|X^0+|^Gl+sP_Ezj8i<b!4CFf-xCIC<a9j#+G

delta 766
zcmV<a0s;Nl2H6IXCx00L00000016Z@CL9zDTRJfS003S90RaLiwJ-f(6bXG80G8u%
zCZJl)17b(wwHY2wS(<ioJm65Tqu1fqcDA289he+V(c-WRs8AVg0A>JY0NC6dgGWb)
zx|#BP-rM$jeX~~4YnA0)1-OEY<8U0R^GZ%k+;mWB`V^&UT9KwGSA!1qL4i7!n*v<M
z&CFv)=WmgA6M#E#&IPXNywHxDW0i~RjVAU$af_xji@-eeSL(kZkcUE-_41DMK})(4
zFZOQc&_XV3Hj=}ktT)n{`TJ(r$>ziClP3Wnf7!(kUp>lnzVl%oX$(Vy1WVU$M6VTN
zHA_0L98~}r7-uj!gpw8I7v;8XOQ!?~j#LZTFloMPzduvwn)5}i+w72MgRBhJduTVu
z*1On4EKyx=h$}OAGMvA`E?^X|ILQ40@*vB%bp1dPy++(FdM$03WV1ldpW*zGYBbl4
zf3e3G{ggzbSGnKLQ0W&Ab-m36<_a&^OTVSgJ0rOMigXLccF&b~CyU=^_;ds@9=q9K
z15)5AHs7PfxB>-NQ1^yEvzQNS3)C*Ey|QdK27slYfm8$$LnR|g3TX_mCJ?%H4oSAU
z`)##CO1=bvOE8qhxbz@j(E+xW{Um#Ve+rkrgOq0rYf<O`$G+Ipl47}03n-Yf!eVYk
z?lk*A+;ZJn3X95$omG;iW4EpRaU~!qfmMI+?2$Fj;@0QYN)M2I_rVTnjA_@x6{L*m
z^k!;LeC>VFK{niD4YStp16KGX`>21ynyCwK0r4Ur`m-76=&~?)X0X{3JVf8vf3M><
zAa?^n%w&ph-97caVgGW)+0jJ6+Eg>y+zTWBfqJxX@po~=|8<2~A}PSw$P>TJY<AR!
zpA+?kRp`H46=tt|V1u8#v^-{b^TRm;`pZUv&wXr_@*t>U%%;*J4;P4Vsx~gb(r8@B
w*2KditepLKHpyjp#Ux+>RRFda7~@fc7-tj*DeNuXM-~?mv0Ki|JWK$f27(lDivR!s

diff --git a/t/thunderbird/manifest.x86_64.jsonc b/t/thunderbird/manifest.x86_64.jsonc
index 3d51c6338..f5b599684 100644
--- a/t/thunderbird/manifest.x86_64.jsonc
+++ b/t/thunderbird/manifest.x86_64.jsonc
@@ -156,6 +156,6 @@
 		}
 	},
 	"source-name": "thunderbird",
-	"source-release": "15",
-	"source-version": "128.5.2"
+	"source-release": "16",
+	"source-version": "128.6.0"
 }
diff --git a/t/thunderbird/pkg/mozconfig b/t/thunderbird/pkg/mozconfig
index 7dcad1aac..4c7ce8897 100644
--- a/t/thunderbird/pkg/mozconfig
+++ b/t/thunderbird/pkg/mozconfig
@@ -12,6 +12,7 @@ ac_add_options --enable-official-branding
 ac_add_options --enable-optimize
 ac_add_options --enable-release
 ac_add_options --enable-rust-simd
+ac_add_options --enable-thunderbird-rust
 ac_add_options --enable-update-channel=release
 ac_add_options --enable-pulseaudio
 ac_add_options --enable-system-ffi
diff --git a/t/thunderbird/stone.yaml b/t/thunderbird/stone.yaml
index 99166fa22..843bd4d78 100644
--- a/t/thunderbird/stone.yaml
+++ b/t/thunderbird/stone.yaml
@@ -4,11 +4,11 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 name        : thunderbird
-version     : 128.5.2
-release     : 15
+version     : 128.6.0
+release     : 16
 homepage    : https://www.thunderbird.net/
 upstreams   :
-    - https://releases.mozilla.org/pub/thunderbird/releases/128.5.2esr/source/thunderbird-128.5.2esr.source.tar.xz : ef932fe30fcc3f90f465feffcf641147d678ec3ecda220f317046e715a905547
+    - https://releases.mozilla.org/pub/thunderbird/releases/128.6.0esr/source/thunderbird-128.6.0esr.source.tar.xz : 1ab6155cd756f905d9b3a85b47b106e5a32626a3eec006c263b811772c4682f3
 summary     : Thunderbird Email Client
 description : |
     Thunderbird Email Client
@@ -47,6 +47,7 @@ environment : |
     export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=pip
     # Not working with libc++ 18, reevaluate with LLVM 19
     export CXXFLAGS="${CXXFLAGS} -stdlib=libstdc++"
+    unset RUSTFLAGS
 setup       : |
     %patch %(pkgdir)/icu74.patch
     %install_file %(pkgdir)/mozconfig .