.gitignore

@@ -526,5 +526,3 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
 /thunderbird-langpacks-146.0-20251215.tar.xz
 /thunderbird-146.0.1.source.tar.xz
 /thunderbird-langpacks-146.0.1-20251218.tar.xz
-/thunderbird-147.0.source.tar.xz
-/thunderbird-langpacks-147.0-20260114.tar.xz

D275955.1765540580.diff

@@ -0,0 +1,17 @@
+diff --git a/parser/htmlaccel/htmlaccelEnabled.h b/parser/htmlaccel/htmlaccelEnabled.h
+--- a/parser/htmlaccel/htmlaccelEnabled.h
++++ b/parser/htmlaccel/htmlaccelEnabled.h
+@@ -26,11 +26,11 @@
+ inline bool htmlaccelEnabled() {
+ #if !defined(__clang__) && defined(__GNUC__) && __GNUC__ < 12
+   // __GNUC__ is stuck at 4 in clang, so we need to check __clang__ above.
+   // GCC 12 or newer is required for __builtin_shuffle.
+   return false;
+-#elif defined(__aarch64__) && defined(__LITTLE_ENDIAN__)
++#elif defined(__aarch64__) && defined(__ORDER_LITTLE_ENDIAN__)
+ #  define MOZ_MAY_HAVE_HTMLACCEL 1
+   return true;
+ #elif defined(__x86_64__)
+ #  define MOZ_MAY_HAVE_HTMLACCEL 1
+   bool ret = mozilla::supports_bmi();
+

build-botan-target.patch

@@ -1,12 +1,12 @@
-diff -up thunderbird-147.0/comm/third_party/openpgp.configure.build-botan thunderbird-147.0/comm/third_party/openpgp.configure
---- thunderbird-147.0/comm/third_party/openpgp.configure.build-botan	2026-01-08 22:45:29.000000000 +0100
-+++ thunderbird-147.0/comm/third_party/openpgp.configure	2026-01-14 15:43:34.946025500 +0100
-@@ -348,7 +348,7 @@ with only_when(in_tree_librnp):
+diff -up thunderbird-145.0/comm/third_party/openpgp.configure.botan-target thunderbird-145.0/comm/third_party/openpgp.configure
+--- thunderbird-145.0/comm/third_party/openpgp.configure.botan-target	2025-11-20 08:03:14.726358898 +0100
++++ thunderbird-145.0/comm/third_party/openpgp.configure	2025-11-20 08:03:20.083354878 +0100
+@@ -320,7 +320,7 @@ with only_when(in_tree_librnp):
  
              botan_flags = [
                  "--cc-bin={}".format(cxx_compiler.compiler),
--                "--cc-abi-flags={}".format(" ".join(abi_flags)),
-+                #"--cc-abi-flags={}".format(" ".join(abi_flags)),
+-                "--cc-abi-flags=--target={}".format(target.alias),
++                #"--cc-abi-flags=--target={}".format(target.alias),
                  "--cpu={}".format(target.cpu),
                  "--os={}".format(botan_os),
                  "--with-build-dir={}".format(botan_objdir),

sources

@@ -1,3 +1,3 @@
 SHA512 (cbindgen-vendor.tar.xz) = 4127d3060577284eea29d697ccc2394742674f6094b7f497a95a0c3b8aa9e0494b720de8858ad31d4a6b0cd1b9586454f3c52c8088163c2709883d882e0136db
-SHA512 (thunderbird-147.0.source.tar.xz) = d04a135f23572123d5cca41c2611704aa06cb81e0226c89c267dc527f59fb0d9d5d8b8a49cd126626c2fd934624c9d2420ae71dd10a912b3011f3342fbaf7511
-SHA512 (thunderbird-langpacks-147.0-20260114.tar.xz) = e97f2894c0bbea00c35e5d8f0046d1d7112efb17d3af5d8a6f964c54352f9f6edbcbd4d41cc2595cb63e1116ae78680c9d42e65dc0eb0ff17e4a9d4ad97ec7ab
+SHA512 (thunderbird-146.0.1.source.tar.xz) = 8a3b2de246c7c597574fce596836c7ef7b24bd21573feb15c308003f34b82335ad865aa0f81b24d1669c8023c0448c0e273a63019aab13356b023c2e8adc2c47
+SHA512 (thunderbird-langpacks-146.0.1-20251218.tar.xz) = 8ab3ebbd63e4526381dd61555831170ee59099fa84dc3b92d37aedadcabd0cad39e84ab0592071396b34e13735c2850c93e32dbffdb99d354eb5cf298212fe1f

thunderbird-146.0.1-fix_resize_crash.patch

@@ -0,0 +1,64 @@
+From 70d247a0101ecae5f92fe8a433bac67fe6b58937 Mon Sep 17 00:00:00 2001
+From: Martin Stransky <stransky@redhat.com>
+Date: Fri, 5 Dec 2025 12:21:44 +0000
+Subject: [PATCH] Bug 1998188 Allow only one recursion of AppWindow::Center()
+ r=emilio, a=dsmith
+
+Differential Revision: https://phabricator.services.mozilla.com/D275039
+---
+ xpfe/appshell/AppWindow.cpp | 16 ++++++++++++----
+ xpfe/appshell/AppWindow.h   |  3 +++
+ 2 files changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/xpfe/appshell/AppWindow.cpp b/xpfe/appshell/AppWindow.cpp
+index 797eef016b5f8..65a52b94d9fe7 100644
+--- a/xpfe/appshell/AppWindow.cpp
++++ b/xpfe/appshell/AppWindow.cpp
+@@ -751,8 +751,8 @@
+   return NS_OK;
+ }
+ 
+-NS_IMETHODIMP AppWindow::Center(nsIAppWindow* aRelative, bool aScreen,
+-                                bool aAlert) {
++nsresult AppWindow::CenterImpl(nsIAppWindow* aRelative, bool aScreen,
++                               bool aAlert, bool aAllowCenteringForSizeChange) {
+   DesktopIntRect rect;
+   bool screenCoordinates = false, windowCoordinates = false;
+   nsresult result;
+@@ -820,12 +820,20 @@
+   SetPositionDesktopPix(newPos.x, newPos.y);
+ 
+   // If moving the window caused it to change size, re-do the centering.
+-  if (GetSize() != ourDevSize) {
+-    return Center(aRelative, aScreen, aAlert);
++  // Allow only one recursion here.
++  if (GetSize() != ourDevSize && aAllowCenteringForSizeChange) {
++    return CenterImpl(aRelative, aScreen, aAlert,
++                      /* aAllowCenteringForSizeChange */ false);
+   }
+   return NS_OK;
+ }
+ 
++NS_IMETHODIMP AppWindow::Center(nsIAppWindow* aRelative, bool aScreen,
++                                bool aAlert) {
++  return CenterImpl(aRelative, aScreen, aAlert,
++                    /* aAllowCenteringForSizeChange */ true);
++}
++
+ NS_IMETHODIMP AppWindow::Repaint(bool aForce) {
+   // XXX First Check In
+   NS_ASSERTION(false, "Not Yet Implemented");
+diff --git a/xpfe/appshell/AppWindow.h b/xpfe/appshell/AppWindow.h
+index 6ffce77706295..29ba62607f66b 100644
+--- a/xpfe/appshell/AppWindow.h
++++ b/xpfe/appshell/AppWindow.h
+@@ -374,6 +374,9 @@ class AppWindow final : public nsIBaseWindow,
+                       const Maybe<LayoutDeviceIntSize>& aSize, bool aRepaint);
+   nsresult MoveResize(const Maybe<DesktopPoint>& aPosition,
+                       const Maybe<DesktopSize>& aSize, bool aRepaint);
++  nsresult CenterImpl(nsIAppWindow* aRelative, bool aScreen, bool aAlert,
++                      bool aAllowCenteringForSizeChange);
++
+   nsCOMPtr<nsIXULStore> mLocalStore;
+   bool mIsWidgetInFullscreen = false;
+ };

thunderbird.spec

@@ -91,13 +91,13 @@ ExcludeArch: armv7hl
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        147.0
-Release:        1%{?dist}
+Version:        146.0.1
+Release:        3%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPL-2.0 OR GPL-2.0-or-later OR LGPL-2.0-or-later
 Source0:        https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}%{?pre_version}-20260114.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?pre_version}-20251218.tar.xz
 %endif
 Source3:        get-calendar-langpacks.sh
 Source4:        cbindgen-vendor.tar.xz
@@ -136,9 +136,6 @@ Patch79:        firefox-gcc-13-build.patch
 Patch82:        build-s390x-protobuf-musttail.patch
 # Build failure on rawhide of wrongly defined SYS_SECCOMP
 Patch83:        build-seccomp.patch
-Patch84:        build-minimal-lexical.patch
-Patch85:        build-libcubeb.patch
-Patch86:        build-missing-gitmodules.patch
 
 # PPC fix
 
@@ -149,8 +146,10 @@ Patch402:       mozilla-526293.patch
 Patch406:        mozilla-1170092.patch
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1998188
 # this is the Firefox patch, manually rediffed against 146.0.1
+Patch407:       thunderbird-146.0.1-fix_resize_crash.patch
 # https://bugzilla.mozilla.org/show_bug.cgi?id=2008377
 # fix crash on aarch64
+Patch408:        D275955.1765540580.diff
 
 # Bundled expat backported patches
 
@@ -307,7 +306,7 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 #FIXME %%patch -P 416 -p1 -b .SIOCGSTAMP
 %patch -P36 -p1 -b .build-botan
 %if 0%{?fedora} > 43
-%patch -P37 -p1 -b .build-c11-threads-avail
+#%patch -P37 -p1 -b .build-c11-threads-avail
 %endif
 %patch -P 418 -p1 -b .mozbz-1512162
 # most likely fixed
@@ -315,6 +314,8 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 
 %patch -P 402 -p1 -b .526293
 %patch -P 406 -p1 -b .1170092-etc-conf
+%patch -P 407 -p1 -b .1998188-resize-crash
+%patch -P 408 -p1 -b .aarch64-crash
 
 %patch -P 422 -p1 -b .0001-GLIBCXX-fix-for-GCC-12
 
@@ -326,9 +327,6 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 %patch -P79 -p1 -b .firefox-gcc-13-build
 %patch -P82 -p1 -b .build-s390x-protobuf-musttail
 %patch -P83 -p1 -b .build-seccomp
-%patch -P84 -p1 -b .minimal-lexical
-%patch -P85 -p1 -b .libcubeb
-%patch -P86 -p1 -b .missing-gitmodules
 
 #patch -P 1200 -p1 -b .rustflags-commasplit
 
@@ -777,9 +775,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
-* Wed Jan 14 2026 Jan Horak <jhorak@redhat.com> - 147.0-1
-- Update to 147.0
-
 * Fri Jan 02 2026 Adam Williamson <awilliam@redhat.com> - 146.0.1-3
 - Port aarch64 crash fix from Firefox (upstream #2005469 / #2008377)