Fixing build failures

Signed-off-by: Adam Williamson <awilliam@redhat.com>

.gitignore

@@ -510,3 +510,21 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
 /thunderbird-langpacks-128.13.0esr-20250723.tar.xz
 /thunderbird-140.1.0esr.source.tar.xz
 /thunderbird-langpacks-140.1.0esr-20250731.tar.xz
+/thunderbird-140.2.1esr.source.tar.xz
+/thunderbird-langpacks-140.2.1esr-20250904.tar.xz
+/thunderbird-langpacks-140.3.0esr-20250924.tar.xz
+/thunderbird-140.3.0esr.source.tar.xz
+/thunderbird-143.0.1.source.tar.xz
+/thunderbird-langpacks-143.0.1-20251002.tar.xz
+/thunderbird-144.0.source.tar.xz
+/thunderbird-langpacks-144.0-20251016.tar.xz
+/thunderbird-144.0.1.source.tar.xz
+/thunderbird-langpacks-144.0.1-20251021.tar.xz
+/thunderbird-145.0.source.tar.xz
+/thunderbird-langpacks-145.0-20251119.tar.xz
+/thunderbird-146.0.source.tar.xz
+/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

build-botan-target.patch

@@ -0,0 +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):
+ 
+             botan_flags = [
+                 "--cc-bin={}".format(cxx_compiler.compiler),
+-                "--cc-abi-flags={}".format(" ".join(abi_flags)),
++                #"--cc-abi-flags={}".format(" ".join(abi_flags)),
+                 "--cpu={}".format(target.cpu),
+                 "--os={}".format(botan_os),
+                 "--with-build-dir={}".format(botan_objdir),

build-seccomp.patch

@@ -0,0 +1,11 @@
+diff -up thunderbird-145.0/security/sandbox/chromium/sandbox/linux/system_headers/linux_seccomp.h.seccomp thunderbird-145.0/security/sandbox/chromium/sandbox/linux/system_headers/linux_seccomp.h
+--- thunderbird-145.0/security/sandbox/chromium/sandbox/linux/system_headers/linux_seccomp.h.seccomp	2025-12-09 13:42:31.378958842 +0100
++++ thunderbird-145.0/security/sandbox/chromium/sandbox/linux/system_headers/linux_seccomp.h	2025-12-09 13:42:37.886937626 +0100
+@@ -6,6 +6,7 @@
+ #define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SECCOMP_H_
+ 
+ #include <stdint.h>
++#include <signal.h>
+ #include <sys/ioctl.h>
+ 
+ #include "build/build_config.h"

gen_cbindgen-vendor.sh

@@ -12,7 +12,7 @@ to be used with 'cargo vendor' commmand.
 """
 
 [dependencies]
-cbindgen = "0.26.0"
+cbindgen = "0.29.1"
 
 [[bin]]
 name = "dummy"

net.thunderbird.Thunderbird.appdata.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>net.thunderbird.Thunderbird.appdata.xml</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <name>Thunderbird</name>
+  <summary>Thunderbird is a free and open source email, newsfeed, chat, and calendaring client</summary>
+  <description>
+    <!-- From https://www.thunderbird.net/en-US/about/  -->
+    <p>
+      Thunderbird is a free and open source email, newsfeed, chat, and
+      calendaring client, that’s easy to set up and customize. One of the core
+      principles of Thunderbird is the use and promotion of open standards -
+      this focus is a rejection of our world of closed platforms and services
+      that can’t communicate with each other. We want our users to have freedom
+      and choice in how they communicate.
+    </p>
+    <p>
+      Thunderbird is an open source project, which means anyone can contribute
+      ideas, designs, code, and time helping fellow users.
+    </p>
+  </description>
+  <categories>
+    <category>Calendar</category>
+    <category>Email</category>
+    <category>Office</category>
+  </categories>
+
+  <url type="homepage">https://www.thunderbird.net/</url>
+  <url type="bugtracker">https://bugzilla.mozilla.org/</url>
+  <url type="faq">https://support.mozilla.org/kb/thunderbird-faq/</url>
+  <url type="help">https://support.mozilla.org/products/thunderbird/</url>
+  <url type="donation">https://www.thunderbird.net/donate/</url>
+  <url type="translate">https://www.thunderbird.net/participate/</url>
+
+  <project_group>Mozilla</project_group>
+  <project_license>MPL-2.0</project_license>
+  <developer_name>Thunderbird Project</developer_name>
+
+  <screenshots>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/thunderbird/flatpak-screenshots/main/image_1.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/thunderbird/flatpak-screenshots/main/image_2.png</image>
+    </screenshot>
+  </screenshots>
+
+  <mimetypes>
+    <mimetype>message/rfc822</mimetype>
+    <mimetype>x-scheme-handler/mailto</mimetype>
+    <mimetype>text/calendar</mimetype>
+    <mimetype>text/vcard</mimetype>
+    <mimetype>text/x-vcard</mimetype>
+  </mimetypes>
+  <releases>
+    <release version="__VERSION__" date="__DATE__"/>
+  </releases>
+  <update_contact>jhorak@redhat.com</update_contact>
+</component>

net.thunderbird.Thunderbird.desktop

@@ -8,7 +8,7 @@ TryExec=thunderbird
 Icon=thunderbird
 Terminal=false
 Type=Application
-MimeType=message/rfc822;x-scheme-handler/mailto;
+MimeType=message/rfc822;x-scheme-handler/mailto;text/calendar;text/vcard;text/x-vcard;x-scheme-handler/webcal;x-scheme-handler/webcals;x-scheme-handler/mid;
 StartupNotify=true
 Categories=Network;Email;
 Name[cs]=Poštovní klient Thunderbird

sources

@@ -1,3 +1,3 @@
-SHA512 (thunderbird-140.1.0esr.source.tar.xz) = f12e2dbda3c4558d06f59af25ff7b374d34e241b9c085236d0d0646dc331f62df85dbe2aa8ae5ff356fa5d0e4b4d73415a10e0e6f5c5ee8bd58305a43aa44c06
-SHA512 (thunderbird-langpacks-140.1.0esr-20250731.tar.xz) = 8afe455efff10664a62a4fdf8969621803275e129cae15af1cb2d8b8f02a7432adba8f58dda8bf7429ad2898962c985754430c4bfe6e4066d09d2ef35a191be5
-SHA512 (cbindgen-vendor.tar.xz) = 08d9e2aeb8a0fafd6794d36811a1b4886d01b0745bf68dbb5e25fbf6ed1a8000238eac195aec16eac6e9968ad913d80350c1293595fab63325b9c1ff507d199f
+SHA512 (cbindgen-vendor.tar.xz) = 4127d3060577284eea29d697ccc2394742674f6094b7f497a95a0c3b8aa9e0494b720de8858ad31d4a6b0cd1b9586454f3c52c8088163c2709883d882e0136db
+SHA512 (thunderbird-147.0.source.tar.xz) = d04a135f23572123d5cca41c2611704aa06cb81e0226c89c267dc527f59fb0d9d5d8b8a49cd126626c2fd934624c9d2420ae71dd10a912b3011f3342fbaf7511
+SHA512 (thunderbird-langpacks-147.0-20260114.tar.xz) = e97f2894c0bbea00c35e5d8f0046d1d7112efb17d3af5d8a6f964c54352f9f6edbcbd4d41cc2595cb63e1116ae78680c9d42e65dc0eb0ff17e4a9d4ad97ec7ab

thunderbird.desktop

@@ -1,30 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Thunderbird
-GenericName=Email
-Comment=Send and Receive Email
-Exec=thunderbird %u
-TryExec=thunderbird
-Icon=thunderbird
-Terminal=false
-Type=Application
-MimeType=message/rfc822;x-scheme-handler/mailto;
-StartupNotify=true
-Categories=Network;Email;
-Name[cs]=Poštovní klient Thunderbird
-Name[ca]=Client de correu Thunderbird
-Name[fi]=Thunderbird-sähköposti
-Name[fr]=Messagerie Thunderbird
-Name[pl]=Klient poczty Thunderbird
-Name[pt_BR]=Cliente de E-mail Thunderbird
-Name[sv]=E-postklienten Thunderbird
-Comment[ca]=Llegiu i escriviu correu
-Comment[cs]=Čtení a psaní pošty
-Comment[de]=Emails lesen und verfassen
-Comment[fi]=Lue ja kirjoita sähköposteja
-Comment[fr]=Lire et écrire des courriels
-Comment[it]=Leggere e scrivere email
-Comment[ja]=メールの読み書き
-Comment[pl]=Czytanie i wysyłanie e-maili
-Comment[pt_BR]=Ler e escrever suas mensagens
-Comment[sv]=Läs och skriv e-post

thunderbird.sh.in

@@ -59,6 +59,9 @@ export GNOME_DISABLE_CRASH_DIALOG
 ##
 export G_SLICE=always-malloc
 
+# Flatpak specific environment variables
+%FLATPAK_ENV_VARS%
+
 ##
 ## Allow downgrade because during distro upgrade the build time can be
 ## older in newer version than the previous one.

thunderbird.spec

@@ -66,7 +66,7 @@ ExcludeArch: armv7hl
 %define mozappdir    %{_libdir}/thunderbird
 
 %define official_branding 1
-%define pre_version esr
+#define pre_version 
 
 %define enable_mozilla_crashreporter 0
 
@@ -91,13 +91,13 @@ ExcludeArch: armv7hl
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        140.1.0
+Version:        147.0
 Release:        1%{?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}-20250731.tar.xz
+Source1:        thunderbird-langpacks-%{version}%{?pre_version}-20260114.tar.xz
 %endif
 Source3:        get-calendar-langpacks.sh
 Source4:        cbindgen-vendor.tar.xz
@@ -105,13 +105,13 @@ Source4:        cbindgen-vendor.tar.xz
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
 Source12:       thunderbird-redhat-default-prefs.js
-Source20:       thunderbird.desktop
 Source21:       thunderbird.sh.in
 Source25:       thunderbird-symbolic.svg
 Source28:       thunderbird-wayland.sh.in
 Source29:       thunderbird-wayland.desktop
 Source32:       node-stdout-nonblocking-wrapper
 Source33:       net.thunderbird.Thunderbird.desktop
+Source34:       net.thunderbird.Thunderbird.appdata.xml
 
 #Patch416:       firefox-SIOCGSTAMP.patch
 Patch418:       mozilla-1512162.patch
@@ -123,6 +123,8 @@ Patch425:       build-disable-elfhack.patch
 # Build patches
 Patch32:        build-rust-ppc64le.patch
 Patch35:        build-ppc-jit.patch
+Patch36:        build-botan-target.patch
+Patch37:        build-c11-threads-avail.patch
 # Fixing missing cacheFlush when JS_CODEGEN_NONE is used (s390x)
 Patch40:        build-aarch64-skia.patch
 Patch44:        build-arm-libopus.patch
@@ -132,6 +134,11 @@ Patch78:        firefox-i686-build.patch
 Patch79:        firefox-gcc-13-build.patch
 # PROTOBUF_MUSTTAIL return ...  error: cannot tail-call: target is not able to optimize the call into a sibling call
 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
 
@@ -140,6 +147,10 @@ Patch82:        build-s390x-protobuf-musttail.patch
 # Upstream patches
 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
+# https://bugzilla.mozilla.org/show_bug.cgi?id=2008377
+# fix crash on aarch64
 
 # Bundled expat backported patches
 
@@ -166,6 +177,7 @@ BuildRequires:  nss-devel >= %{nss_version}
 Requires:       nspr >= %{nspr_build_version}
 Requires:       nss >= %{nss_build_version}
 %endif
+BuildRequires:  libappstream-glib
 BuildRequires:  libnotify-devel >= %{libnotify_version}
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
@@ -181,16 +193,9 @@ BuildRequires:  libXt-devel
 BuildRequires:  libXrender-devel
 BuildRequires:  hunspell-devel
 BuildRequires:  llvm
-%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
+BuildRequires:  llvm-devel
 BuildRequires:  clang
 BuildRequires:  clang-libs
-BuildRequires:  llvm-devel
-%global llvm_suffix -20
-%else
-BuildRequires:  clang
-BuildRequires:  clang-libs
-BuildRequires:  llvm-devel
-%endif
 %if "%toolchain" == "clang"
 BuildRequires:  lld
 %endif
@@ -207,7 +212,6 @@ BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  libicu-devel
 BuildRequires:  perl-interpreter
 Requires:       mozilla-filesystem
-BuildRequires:  yasm
 BuildRequires:  dbus-glib-devel
 Obsoletes:      thunderbird-lightning
 Provides:       thunderbird-lightning
@@ -301,6 +305,10 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 #%patch -P 226 -p1 -b .1354671
 %endif
 #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
+%endif
 %patch -P 418 -p1 -b .mozbz-1512162
 # most likely fixed
 #%%patch -P 419 -p1 -b .bindgen
@@ -317,6 +325,10 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 %patch -P78 -p1 -b .firefox-i686
 %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
 
@@ -421,11 +433,7 @@ echo 'export MOZ_APP_REMOTINGNAME=thunderbird' >> .mozconfig
 # https://bugzilla.redhat.com/show_bug.cgi?id=2239046
 # with clang 17 upstream's detection fails, so let's just tell it
 # where to look
-%if 0%{?fedora} >= 42
-echo "ac_add_options --with-libclang-path=`llvm-config-20 --libdir`" >> .mozconfig
-%else
 echo "ac_add_options --with-libclang-path=`llvm-config --libdir`" >> .mozconfig
-%endif
 
 # Remove executable bit to make brp-mangle-shebangs happy.
 find third_party -type f  -iname "*.rs"|xargs chmod a-x
@@ -472,12 +480,13 @@ MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
                       %{__sed} -e 's/-Wall//')
 # Thunderbird is not supposed to build with exceptions globally enabled
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | sed -e 's/-fexceptions//')
-%if 0%{?fedora} < 30
-MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security"
-%else
+#rhbz#1037063
+# -Werror=format-security causes build failures when -Wno-format is explicitly given
+# for some sources
+# Explicitly force the hardening flags for Firefox so it passes the checksec test;
+# See also https://fedoraproject.org/wiki/Changes/Harden_All_Packages
 # Workaround for mozbz#1531309
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//')
-%endif
 %if %{?debug_build}
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//')
 %endif
@@ -599,6 +608,13 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/thunderbird
 %{__cat} %{SOURCE21} | %{__sed} -e 's,__PREFIX__,%{_prefix},g' > \
         $RPM_BUILD_ROOT/%{_bindir}/thunderbird
 %{__chmod} 755 $RPM_BUILD_ROOT/%{_bindir}/thunderbird
+
+%if 0%{?flatpak}
+sed -i -e 's|%FLATPAK_ENV_VARS%|export TMPDIR="$XDG_CACHE_HOME/tmp"|' %{buildroot}%{_bindir}/thunderbird
+%else
+sed -i -e 's|%FLATPAK_ENV_VARS%||' %{buildroot}%{_bindir}/thunderbird
+%endif
+
 # Enable wayland by default on f40+
 # Overridable for rhbz#2283993 https://bugzilla.mozilla.org/show_bug.cgi?id=1898476
 %if 0%{?fedora} >= %{only_wayland}
@@ -679,8 +695,13 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 
 # Register as an application to be visible in the software center
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
-%{__cp} -p comm/mail/branding/%{name}/net.thunderbird.Thunderbird.appdata.xml $RPM_BUILD_ROOT%{_datadir}/metainfo/net.thunderbird.Thunderbird.appdata.xml
-sed -i -e 's|<icon .*|<icon type="stock">thunderbird</icon>|' "$RPM_BUILD_ROOT%{_datadir}/metainfo/net.thunderbird.Thunderbird.appdata.xml"
+%{__sed} -e "s/__VERSION__/%{version}/" \
+         -e "s/__DATE__/$(date '+%Y-%m-%d')/" \
+         %{SOURCE34} > %{buildroot}%{_datadir}/metainfo/net.thunderbird.Thunderbird.appdata.xml
+#===============================================================================
+
+%check
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
 
 #===============================================================================
 
@@ -703,11 +724,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/thunderbird
 %{_datadir}/metainfo/*.appdata.xml
-%if 0%{?fedora} < %{only_wayland}
-%attr(644,root,root) %{_datadir}/applications/mozilla-thunderbird.desktop
-%else
 %attr(644,root,root) %{_datadir}/applications/net.thunderbird.Thunderbird.desktop
-%endif
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/*
 %dir %{_datadir}/mozilla/extensions/%{thunderbird_app_id}
@@ -760,6 +777,47 @@ 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)
+
+* Mon Dec 22 2025 Adam Williamson <awilliam@redhat.com> - 146.0.1-2
+- Backport fix for resize crash bug (RHBZ #2423824 upstream #1998188)
+
+* Thu Dec 18 2025 Jan Horak <jhorak@redhat.com> - 146.0.1-1
+- Update to 146.0.1
+
+* Mon Dec 15 2025 Jan Horak <jhorak@redhat.com> - 146.0-1
+- Update to 146.0
+
+* Wed Nov 19 2025 Jan Horak <jhorak@redhat.com> - 145.0-1
+- Update to 145.0
+
+* Thu Nov 06 2025 Jan Horak <jhorak@redhat.com> - 144.0.1-2
+- Fixing sigsegv on rawhide
+
+* Tue Oct 21 2025 Jan Horak <jhorak@redhat.com> - 144.0.1-1
+- Update to 144.0.1
+
+* Thu Oct 16 2025 Jan Horak <jhorak@redhat.com> - 144.0-1
+- Update to 144.0
+
+* Thu Oct  2 2025 Jan Horak <jhorak@redhat.com> - 143.0.1-1
+- Update to 143.0.1
+
+* Thu Sep 25 2025 Dominik Mierzejewski <dominik@greysector.net> - 140.3.0-2
+- Drop unused yasm from build dependencies
+  See: https://fedoraproject.org/wiki/Changes/DeprecateYASM
+  Resolves: rhbz#2390538
+
+* Wed Sep 24 2025 Jan Horak <jhorak@redhat.com> - 140.3.0-1
+- Update to 140.3.0 ESR
+
+* Thu Sep  4 2025 Jan Horak <jhorak@redhat.com> - 140.2.1-1
+- Update to 140.2.1 ESR
+
 * Wed Jul 23 2025 Eike Rathke <erack@redhat.com> - 128.13.0-1
 - Update to 128.13.0