From 1b5bdcc9ca5987be7aff55f66ea714e13dbc4d6d Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Thu, 13 Nov 2025 22:56:01 +0800 Subject: [PATCH] 140.5.0 (cherry picked from commit fd0d7bec2a19c87bab408a9ead64399307d10b33) --- ...xz => thunderbird-140.5.0esr.source.tar.xz | 4 +- thunderbird-langpacks-140.4.0esr.tar.xz | 3 -- ...=> thunderbird-langpacks-140.5.0esr.tar.xz | 4 +- thunderbird.spec | 47 +++---------------- 4 files changed, 11 insertions(+), 47 deletions(-) rename thunderbird-140.4.0esr.source.tar.xz => thunderbird-140.5.0esr.source.tar.xz (32%) delete mode 100644 thunderbird-langpacks-140.4.0esr.tar.xz rename cbindgen-vendor.tar.xz => thunderbird-langpacks-140.5.0esr.tar.xz (32%) diff --git a/thunderbird-140.4.0esr.source.tar.xz b/thunderbird-140.5.0esr.source.tar.xz similarity index 32% rename from thunderbird-140.4.0esr.source.tar.xz rename to thunderbird-140.5.0esr.source.tar.xz index fdd3572..1b8b6ad 100644 --- a/thunderbird-140.4.0esr.source.tar.xz +++ b/thunderbird-140.5.0esr.source.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0eb946d9e6d4b2adbfad0893a5c79caa11203a3906b0b5f26f0ccc4c9b28ff0 -size 754630692 +oid sha256:cb8d10693bbc04c4bfc539c4560779fb436b40326bf70df4c0823ac125b815e5 +size 747338592 diff --git a/thunderbird-langpacks-140.4.0esr.tar.xz b/thunderbird-langpacks-140.4.0esr.tar.xz deleted file mode 100644 index ec8a077..0000000 --- a/thunderbird-langpacks-140.4.0esr.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:353c33b014de36c96c334d4bc87310bf4bf2132049e00ede1842df2f77b6c855 -size 26157948 diff --git a/cbindgen-vendor.tar.xz b/thunderbird-langpacks-140.5.0esr.tar.xz similarity index 32% rename from cbindgen-vendor.tar.xz rename to thunderbird-langpacks-140.5.0esr.tar.xz index 6cb1e74..a06ecc2 100644 --- a/cbindgen-vendor.tar.xz +++ b/thunderbird-langpacks-140.5.0esr.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06f2195886fcc02f55890e8a234c4316cf856bfad9b6e9f6504e31fba43bed01 -size 9723244 +oid sha256:6125e0d72451edabd073db8ecd6c3a20319be70884bd164a12f35dbb2d8a69a3 +size 26199144 diff --git a/thunderbird.spec b/thunderbird.spec index e95baf7..b5d846f 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -26,7 +26,6 @@ %define system_ffi 1 %define build_langpacks 1 %bcond_with toolchain_clang -%global use_bundled_cbindgen 1 # We need to disable elfhack %global disable_elfhack 0 %define freetype_version 2.1.9 @@ -59,7 +58,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 140.4.0 +Version: 140.5.0 Release: 1 URL: https://www.mozilla.org/projects/thunderbird/ License: MPL-2.0 OR GPL-2.0-or-later OR LGPL-2.0-or-later @@ -68,7 +67,6 @@ Source0: https://ftp.mozilla.org/pub/thunderbird/releases/%{version}esr/s Source1: %{name}-langpacks-%{version}esr.tar.xz %endif Source3: create-thunderbird-langpacks.sh -Source4: cbindgen-vendor.tar.xz Source10: thunderbird-mozconfig @@ -96,6 +94,7 @@ Patch406: mozilla-1170092.patch BuildRequires: make BuildRequires: gcc-c++ +BuildRequires: rust-cbindgen BuildRequires: libnotify-devel >= %{libnotify_version} BuildRequires: libpng-devel BuildRequires: libjpeg-devel @@ -140,9 +139,6 @@ Obsoletes: thunderbird-lightning-gdata <= 1:3.3.0.14 BuildRequires: rust >= 1.80.0 BuildRequires: cargo >= 1.80.0 BuildRequires: clang-devel -%if !0%{?use_bundled_cbindgen} -BuildRequires: cbindgen -%endif BuildRequires: nodejs BuildRequires: nasm >= 1.13 @@ -287,25 +283,6 @@ find third_party -type f -iname "*.rs"|xargs chmod a-x %build %define _lto_cflags %{nil} -%if 0%{?use_bundled_cbindgen} - -mkdir -p my_rust_vendor -cd my_rust_vendor -%{__tar} xf %{SOURCE4} -cd - -mkdir -p .cargo -cat > .cargo/config.toml <thunderbird|' "$RPM_BUILD_ROOT%{ #=============================================================================== -%post -update-desktop-database &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - -#=============================================================================== %files -f %{name}.lang %defattr(-,root,root,-) %attr(755,root,root) %{_bindir}/thunderbird @@ -559,6 +521,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Thu Nov 13 2025 Funda Wang - 140.5.0-1 +- update to 140.5.0 +- build with system cbindgen +- drop useless post scripts, they will be done automaticaly by triggers + * Wed Oct 15 2025 Funda Wang - 140.4.0-1 - update to 140.4.0 -- Gitee