From e7064bd664b3772011ab238c8bcbae49034f3180 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 23 Jan 2026 08:35:44 +0000 Subject: [PATCH] Import from CS git --- .gitignore | 4 ++-- .thunderbird.metadata | 4 ++-- SOURCES/build-annobin-fix.patch | 14 ++++++++++++++ SOURCES/thunderbird.desktop | 2 +- SPECS/thunderbird.spec | 17 ++++++++++++----- 5 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 SOURCES/build-annobin-fix.patch diff --git a/.gitignore b/.gitignore index 776cd93..393da95 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,5 @@ SOURCES/cbindgen-vendor.tar.xz SOURCES/nspr-4.36.0-2.el8_2.src.rpm SOURCES/nss-3.112.0-1.el9_4.src.rpm SOURCES/nss-3.112.0-4.el8_2.src.rpm -SOURCES/thunderbird-140.6.0esr.processed-source.tar.xz -SOURCES/thunderbird-langpacks-140.6.0esr-20251209.tar.xz +SOURCES/thunderbird-140.7.0esr.processed-source.tar.xz +SOURCES/thunderbird-langpacks-140.7.0esr-20260112.tar.xz diff --git a/.thunderbird.metadata b/.thunderbird.metadata index d4bb3e9..99b831d 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -2,5 +2,5 @@ bc4adac8f38f5103d8f88564a1545063dd8d6402 SOURCES/cbindgen-vendor.tar.xz 0d0ddbd2a73340b3cbc977997f57222946b1e775 SOURCES/nspr-4.36.0-2.el8_2.src.rpm fd3879b176634d66f8ef64d18fdaeec98e140c23 SOURCES/nss-3.112.0-1.el9_4.src.rpm c3f0aaef37972107442e2796efad71be3a98ce3c SOURCES/nss-3.112.0-4.el8_2.src.rpm -ab767e5b54fba95763688dff619dbca1242d684b SOURCES/thunderbird-140.6.0esr.processed-source.tar.xz -049156e2a11453644a8b203f0f9bfa5ab2ef6a71 SOURCES/thunderbird-langpacks-140.6.0esr-20251209.tar.xz +a4c777243a785021342bb4cff1cfba440a7b94b0 SOURCES/thunderbird-140.7.0esr.processed-source.tar.xz +1f374d2cd806d8556e34d0949ec90108999dc415 SOURCES/thunderbird-langpacks-140.7.0esr-20260112.tar.xz diff --git a/SOURCES/build-annobin-fix.patch b/SOURCES/build-annobin-fix.patch new file mode 100644 index 0000000..4c14119 --- /dev/null +++ b/SOURCES/build-annobin-fix.patch @@ -0,0 +1,14 @@ +diff -up thunderbird-140.5.0/comm/third_party/rnp/moz.build.annobin-fix thunderbird-140.5.0/comm/third_party/rnp/moz.build +--- thunderbird-140.5.0/comm/third_party/rnp/moz.build.annobin-fix 2025-12-15 09:23:29.339518965 +0100 ++++ thunderbird-140.5.0/comm/third_party/rnp/moz.build 2025-12-15 09:24:18.638422349 +0100 +@@ -42,6 +42,10 @@ COMPILE_FLAGS["WARNINGS_CFLAGS"] += [ + "-Wno-unused-parameter", + "-Wno-missing-field-initializers", + ] ++COMPILE_FLAGS["OS_CFLAGS"] += [ ++ "-fstack-clash-protection", ++ "-fstack-protector-strong", ++] + + if CONFIG["CC_TYPE"] == "clang-cl": + CXXFLAGS += [ diff --git a/SOURCES/thunderbird.desktop b/SOURCES/thunderbird.desktop index 1945d1e..43395a0 100644 --- a/SOURCES/thunderbird.desktop +++ b/SOURCES/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 diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index 6decbc9..1bdc1c4 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -137,7 +137,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 140.6.0 +Version: 140.7.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -165,7 +165,7 @@ ExcludeArch: %{ix86} #Source0: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.processed-source.tar.xz Source0: thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz %if %{with langpacks} -Source1: thunderbird-langpacks-%{version}%{?pre_version}-20251209.tar.xz +Source1: thunderbird-langpacks-%{version}%{?pre_version}-20260112.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -200,6 +200,7 @@ Patch14: build-cargo-lock-version.patch Patch15: build-system-nss.patch Patch16: build-tb-system-nss.patch Patch17: build-workaround-s390x.patch +Patch18: build-annobin-fix.patch # -- Upstreamed patches -- Patch51: mozilla-bmo1170092.patch @@ -377,7 +378,6 @@ Provides: bundled(bergamot-translator) Provides: bundled(brotli) Provides: bundled(bspatch) Provides: bundled(cfworker) -Provides: bundled(chromium) Provides: bundled(cld2) Provides: bundled(content) Provides: bundled(content_analysis_sdk) @@ -1097,6 +1097,7 @@ echo "--------------------------------------------" %patch -P14 -p1 -b .cargo-lock-version %patch -P15 -p1 -b .build-system-nss %patch -P16 -p1 -b .tb-build-system-nss +%patch -P18 -p1 -b .annobin-fix # -- Upstreamed patches -- %patch -P51 -p1 -b .mozilla-bmo1170092 @@ -1161,9 +1162,12 @@ echo "ac_add_options --enable-debug" >> .mozconfig echo "ac_add_options --disable-optimize" >> .mozconfig %else %global optimize_flags "none" -%ifarch s390x -%global optimize_flags "-g -O1" +%if 0%{?rhel} < 10 + %ifarch s390x + %global optimize_flags "-g -O1" + %endif %endif + %ifarch ppc64le aarch64 %global optimize_flags "-g -O2" %endif @@ -1707,6 +1711,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Mon Jan 12 2026 Jan Horak - 140.7.0-1 +- Update to 140.7.0 ESR + * Tue Dec 9 2025 Jan Horak - 140.6.0-1 - Update to 140.6.0 ESR