$ git diff --patch-with-stat --summary a822123f0ccd4fd552ef9ad62715741772ad123b..c2f34717ff5a5a988f56004b0bff41cb255b88f9

 .abf.yml                   | 102 ++++++++++++++++++++++-----------------------
 rustflags-commasplit.patch |  76 +++++++++++++++++++++++++++++++++
 thunderbird.spec           |  36 ++++++++++------
 3 files changed, 150 insertions(+), 64 deletions(-)
 create mode 100644 rustflags-commasplit.patch

diff --git a/.abf.yml b/.abf.yml
index 3f9c528..e1a99f0 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,54 +1,54 @@
 sources:
-  ar.xpi: 376151f157557dfcfc1d13350bde16336a9d30f1
-  ast.xpi: cd8487700e5adf88bc2d363fbfde40b061801644
-  be.xpi: 15ce80ffaa5fa7986f956198d2ba736c22738fdb
-  bg.xpi: f7bc6e0afacad98278d6d1c47deeb3d19bf35716
-  br.xpi: 91b80381584bb3b0421fe5a860c2ecc2128bc4ad
-  ca.xpi: e42551d1ae30b128dc6fd1ddba092f72db0dabca
+  ar.xpi: e127dbe359b79b3ede4b0907b97898f83b7ab9b7
+  ast.xpi: d1ee4a561238dc4c1d469ebdcc2a5eb391274c56
+  be.xpi: 416f56fec4a23c61ca5648e7f7c5fbf5cf148065
+  bg.xpi: 6f452a79901a2b4ee49b4220cb6b0d78a10d1863
+  br.xpi: 9a6374c18801fdc64325bca268d5bfc2d08d7281
+  ca.xpi: c1b70d9846e547f6f9240d8e6ccdddb245d67461
   cbindgen-vendor.tar.xz: 8faf49463f1705b8604b2d121dc844aad7e37eae
-  cs.xpi: bfaf7655ebd1992902fa85722907f1abbd44cdf3
-  da.xpi: 0fa22a87de5eca3253f895ab43a3702837d7bff1
-  de.xpi: a9ae17869aba5cc48a7b815b88557f95b40a8337
-  el.xpi: afbd642a232ce6b217d3caf68945574b4a34c69d
-  en-GB.xpi: 30f3158ac4bb8f6cba383c65384be764e6d34218
-  en-US.xpi: c54ce842a69467c0f8cea6152a6b5eb85f40554b
-  es-AR.xpi: ad68112a9d1b77c1cc0dea5b0be334689995d88b
-  es-ES.xpi: f60b2a9e2877feb0209c2d5cb0d72d69d241c562
-  et.xpi: 7cedaa793a9f6f5571ac6f8e5697ef28ca9c87c4
-  eu.xpi: 4bbff39ac949db2a6ffb80cb221774eef62781fa
-  fi.xpi: 769635682722cf55a3f42491e6afd7cecce546ca
-  fr.xpi: feae3e544a45db633d4542301bbd8a852292f2f2
-  fy-NL.xpi: 163f306721ca1dce117fddc4b0262fafca629361
-  ga-IE.xpi: 67b57d733e8490c5b828c22c8f32a62df5d2ca1c
-  gd.xpi: bda8c57ae4d34ea6134aeab92b4627974d3dc24f
-  gl.xpi: 70544df4f6a08cd64a94bccf444561f13d9f6483
-  he.xpi: 25351e6facda3c01499f6de9c572739f797d8f47
-  hr.xpi: 196bc25a5e2673d82c024fe1b4f8938b50b207fb
-  hu.xpi: 5d508b082abfdf6e748f9fff19b2331396c26786
-  hy-AM.xpi: e45ab56f4d21381371f372830ae5e75ead3bd1bd
-  id.xpi: e3cadb61921ace6edae9890d5c61120eb8ab0cb4
-  is.xpi: 53788de46102738eb61d8cc529dcfbbfcb36c416
-  it.xpi: 69a275c1f38e269256f27ea3f77fe3ee2ee60d19
-  ja.xpi: ce2e974e8cb025de773543c28904393a836898ea
-  ko.xpi: 4b29070debd3967f27c7e3c009c8b28b7426f6c7
-  lt.xpi: ed9f227f59fe94e4239f17f42ec1cbfeeb49cee9
-  nb-NO.xpi: fdd864addece13867cffae2f02d588fc40f1aafc
-  nl.xpi: 16e0b3db329affa3394502485d5839fc6115781d
-  nn-NO.xpi: 745aa23c5f78d149a83fd695c091ff71e66a824b
+  cs.xpi: fb5e602315d8fb82bef1c90a25f30c2bb7227d78
+  da.xpi: 8c4c05be07722a4ea6be0b8980b1fccada749475
+  de.xpi: 54078bcb004db4114444b6acfaf5360e57f9aada
+  el.xpi: 5357aee4218ab24797be42c2d9d94dcce82af2e6
+  en-GB.xpi: 17cfcae0771d82d5ff3774fe4280f8dbb2068e62
+  en-US.xpi: 499a9c239f479eafc696dde1d03a3a212955be1f
+  es-AR.xpi: d07b2d4b63fa88065c3666bdea105dec9734eff2
+  es-ES.xpi: 36977932a0dd567891f9727a902863bd9eb5490f
+  et.xpi: 1aa8e5a9ddee9e45f5a5c566275292ea71f2ebde
+  eu.xpi: f06f6ac56bb90a460accc2788e03b146ede168e6
+  fi.xpi: 7a7e976c2d0b1a4ff63975411ec359d53caa88ec
+  fr.xpi: 33cdf27cae349e5263a5f6e2664ac600d76b0535
+  fy-NL.xpi: 9e43ccd4ebcf7c11154091e813753a4e54cca6c9
+  ga-IE.xpi: 918a0ba8deb5e225a8182f450a8264b8e473556f
+  gd.xpi: 59fbbf52cd4b1e4587ef7b5c4083884841619156
+  gl.xpi: 20f02cc290b7df957c9aee9e329392b10d03f88b
+  he.xpi: af3b68fa568ac30a86fe99d034d6d310ddad0f96
+  hr.xpi: 25dd43a3c65dd87fb313bf80318648da6d5b7f66
+  hu.xpi: 751eec57d5379fe5eff2077c156d9e2a95ec6c18
+  hy-AM.xpi: ffae88ee806373afdd23ff8d94f166b646683063
+  id.xpi: 27b3ef5ad075f36f8aa1dc4bf64a1f455b7a9e0e
+  is.xpi: 971150e0554cb3094c977cbe5c829b9cfb95a6cf
+  it.xpi: e38656e1429dec40bd8fbb2ab5f82004e25f0c68
+  ja.xpi: 38f954acdcb48b251765fb533a9521c44ce94aac
+  ko.xpi: 08603e38173dd4798789f285295099f7c0074eb9
+  lt.xpi: 0dde6cee59f49292edb69436da8385bb9702363a
+  nb-NO.xpi: 9aaa0fd8e32bc62d92acca5e98a9dbb8233b3ec9
+  nl.xpi: 3ad980acf7af3ea07a0d1acf1b1b073f8075ae0f
+  nn-NO.xpi: b244e669285f2c401b583bc88d750491ae902088
   pa-IN.xpi: 6aee55e1bc6519ba0f38731ffb937123059e7add
-  pl.xpi: 9c0128b1c37d9418e9ba99a98f3809e278af208b
-  pt-BR.xpi: 3edd07f37bef65965ddd2590df98c4284e78bd4d
-  pt-PT.xpi: dfdf99b47beaa9fbb2905d5d41fbb807c7185181
-  ro.xpi: 3ac3ac250e3aef71ce6fc9f42b91e57cd56a92c1
-  ru.xpi: 5f6cfee70dc8cd526d874f07d1ceb43e12858e9b
-  sk.xpi: aeb1a4d7e5f807bde23b77e06b9d84d02f327352
-  sl.xpi: e457a46f4a66751a7e42a9283a5ca689ccce6dd4
-  sq.xpi: 464eefd068206ed465ba3410e9c16dfc70176a31
-  sr.xpi: 238ad82518a9dadb4778d272ca91d3a75c6225da
-  sv-SE.xpi: cfee4f31bb36a2c9609e568b7afbaed6ff5097a2
-  thunderbird-115.8.0.source.tar.xz: e0b8a464fc83fae3c9300bf4f87cb95d320e5fe1
-  tr.xpi: 315f9d6c52b5993c59a10ed04bb7b9375f05c703
-  uk.xpi: 3fc86a8e9f5a7db11e0d817e6d1436d86f435f09
-  vi.xpi: 828870f265646b179f11cb3cfa7900df5e7c9cfe
-  zh-CN.xpi: d77331ebd8c5f5bbfcd234fe9de96e6475985beb
-  zh-TW.xpi: 7477b08e6a57bb9e234dec0d4c096e822173fb93
+  pl.xpi: e85181898ba6c3c32353cd0c95bc922281bb6d12
+  pt-BR.xpi: e8ae5e57bfdd698a87d4b9ec683344e433bcb0db
+  pt-PT.xpi: 99e1618db396410727961fcc619fe9cf83893812
+  ro.xpi: 5cde63250bc6302f8f5e9ac26db0ca1c958fc622
+  ru.xpi: 2f937cbabad5e0b9b237524dfa77e9772ab0257f
+  sk.xpi: 6594371f5aacc4620536f0e65e916d1fef590179
+  sl.xpi: e98934311adb00e717f2cc621f0406cea47e1170
+  sq.xpi: da752011f69796141429d6af88aa2a718d9fdbf8
+  sr.xpi: 0de8301d6400dd40fafeca6c72c35560cfd8b10d
+  sv-SE.xpi: ced44f0d5b757870831d2b8081ea6f3787cd9bff
+  thunderbird-115.10.0.source.tar.xz: a6db7548af51381027b548b4d0b43a505dd444aa
+  tr.xpi: 9db60eac07978ab49161349c181bfe5c5e7c825e
+  uk.xpi: 91e1df801fd12c36392a40c31ce5a64dd7c272be
+  vi.xpi: 8ccbd4f75d6d136561a9517fb7232858e5306bac
+  zh-CN.xpi: f50e3d61cb3ac874ac6f61c5443e30a7946fa061
+  zh-TW.xpi: f6068c6bc0917409b37d8c82b5190c2ad427d8de
diff --git a/rustflags-commasplit.patch b/rustflags-commasplit.patch
new file mode 100644
index 0000000..0669bd8
--- /dev/null
+++ b/rustflags-commasplit.patch
@@ -0,0 +1,76 @@
+--- thunderbird-102.10.0/build/moz.configure/rust.configure.rustflags-commasplit	2023-03-21 06:16:03.000000000 -0700
++++ thunderbird-102.10.0/build/moz.configure/rust.configure	2023-04-05 08:57:29.403219120 -0700
+@@ -593,7 +593,7 @@
+ 
+ # ==============================================================
+ 
+-option(env="RUSTFLAGS", nargs=1, help="Rust compiler flags")
++option(env="RUSTFLAGS", nargs=1, help="Rust compiler flags", comma_split=False)
+ set_config("RUSTFLAGS", depends("RUSTFLAGS")(lambda flags: flags))
+ 
+ 
+--- thunderbird-102.10.0/python/mozbuild/mozbuild/configure/options.py.rustflags-commasplit	2023-03-21 06:16:09.000000000 -0700
++++ thunderbird-102.10.0/python/mozbuild/mozbuild/configure/options.py	2023-04-05 08:57:31.270193468 -0700
+@@ -191,6 +191,10 @@
+       to instantiate an option indirectly. Set this to a positive integer to
+       force the script to look into a deeper stack frame when inferring the
+       `category`.
++    - `comma_split` specifies whether the value string should be split on
++      commas. The default is True. Setting it False is necessary for things
++      like compiler flags which should be a single string that may contain
++      commas.
+     """
+ 
+     __slots__ = (
+@@ -205,6 +209,7 @@
+         "possible_origins",
+         "category",
+         "define_depth",
++        "comma_split",
+     )
+ 
+     def __init__(
+@@ -218,6 +223,7 @@
+         category=None,
+         help=None,
+         define_depth=0,
++        comma_split=True,
+     ):
+         if not name and not env:
+             raise InvalidOptionError(
+@@ -335,9 +341,10 @@
+         self.choices = choices
+         self.help = help
+         self.category = category or _infer_option_category(define_depth)
++        self.comma_split = comma_split
+ 
+     @staticmethod
+-    def split_option(option):
++    def split_option(option, comma_split=True):
+         """Split a flag or variable into a prefix, a name and values
+ 
+         Variables come in the form NAME=values (no prefix).
+@@ -350,7 +357,13 @@
+ 
+         elements = option.split("=", 1)
+         name = elements[0]
+-        values = tuple(elements[1].split(",")) if len(elements) == 2 else ()
++        if len(elements) == 2:
++            if comma_split:
++                values = tuple(elements[1].split(","))
++            else:
++                values = (elements[1],)
++        else:
++            values = ()
+         if name.startswith("--"):
+             name = name[2:]
+             if not name.islower():
+@@ -426,7 +439,7 @@
+                 % (option, origin, ", ".join(self.possible_origins))
+             )
+ 
+-        prefix, name, values = self.split_option(option)
++        prefix, name, values = self.split_option(option, self.comma_split)
+         option = self._join_option(prefix, name)
+ 
+         assert name in (self.name, self.env)
diff --git a/thunderbird.spec b/thunderbird.spec
index 738259a..788e469 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -24,15 +24,11 @@
 # FIXME: Bug in nsExtensionManager.js prevents using x86_64 as arch
 # FIXME: I tried to modify nsExtensionManager.js.in, but it
 # FIXME: complained that I had modified it
-%ifarch %{ix86}
-%define tbarch x86
-%else # ix86
 %ifarch %{x86_64}
 %define tbarch x86_64
 %else # x86_64
 %define tbarch %{_arch}
 %endif # x86_64
-%endif # ix86
 
 # use bundled cbindgen
 # currently enabled as updating all rust deps would take eons
@@ -204,7 +200,7 @@
 
 Summary:	Full-featured email, RSS, and newsgroup client
 Name:		thunderbird
-Version:	115.8.0
+Version:	115.10.0
 Release:	1
 License:	MPL
 Group:		Networking/Mail
@@ -252,6 +248,7 @@ Source401:	thunderbird-l10n-template.in
 Patch201:       mozilla-thunderbird-default-mailer.patch
 # Mandriva patches (Patch300+)
 Patch304:       mozilla-thunderbird-run-mozilla.patch
+Patch305:	rustflags-commasplit.patch
 # OpenSuse patches (Patch400+)
 
 BuildRequires:	gzip
@@ -366,15 +363,11 @@ done
 %build
 %global optflags %{optflags} -g0 -fno-exceptions
 
-%ifarch %ix86 %x86_64
-%global optflags %{optflags} -g0 -fno-exceptions -Wno-format-security
-%global ldflags %{ldflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-# still requires gcc
-export CXX=g++
-export CC=gcc
-%else
+%global optflags %{optflags} -Wno-error=c++11-narrowing-const-reference
 %global optflags %{optflags} -Qunused-arguments -g0 -fno-lto
-%endif
+# botan cant detect clang with cc/c++
+export CXX=clang++
+export CC=clang
 
 %set_build_flags
 
@@ -443,6 +436,23 @@ export MOZ_ALLOW_DOWNGRADE=1
 export MACH_USE_SYSTEM_PYTHON=1
 export MACH_NO_WRITE_TIMES=1
 
+#
+# fix build with llvm 18
+#
+sed -e "/match cursor.kind()/a                                    \
+        CXCursor_LinkageSpec => return Err(ParseError::Recurse)," \
+    -i third_party/rust/bindgen/ir/item.rs                        &&
+
+cat >> Cargo.toml << EOF &&
+[patch.crates-io.bindgen_0_64_0]
+package = "bindgen"
+version = "0.64.0"
+path = "third_party/rust/bindgen"
+EOF
+
+sed -r '/name = "bindgen"/,+5 s/^source|^checksum/#&/' \
+    -i Cargo.lock
+
 %build_py ./mach build
 
 #===============================================================================