Update to Thunderbird 170.7 ESR
- Fixed MimeTypes in desktop file, remove bundled(chromium) - Annobin fix, -O1 only for older rhels on s390x Resolves: RHEL-138387
This commit is contained in:
Jan Horak
parent
b2ba7f1cca
commit
b851a16019
2
.gitignore
vendored
2
.gitignore
vendored
@ -177,3 +177,5 @@
|
||||
/thunderbird-langpacks-140.5.0esr-20251111.tar.xz
|
||||
/thunderbird-140.6.0esr.processed-source.tar.xz
|
||||
/thunderbird-langpacks-140.6.0esr-20251209.tar.xz
|
||||
/thunderbird-langpacks-140.7.0esr-20260112.tar.xz
|
||||
/thunderbird-140.7.0esr.processed-source.tar.xz
|
||||
|
||||
14
build-annobin-fix.patch
Normal file
14
build-annobin-fix.patch
Normal file
@ -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 += [
|
||||
4
sources
4
sources
@ -2,5 +2,5 @@ SHA512 (nss-3.112.0-1.el9_4.src.rpm) = 6386239e79f8095b05270b3c8b76ac9203b0df196
|
||||
SHA512 (cbindgen-vendor.tar.xz) = 2b8db32c0bca2fa27304ee4fd3a5cc38bc43a11500b23842747813d221e55719c51cf4c0e027e41857f58ce1e283ce97b69c2c7d1eae93ecbb08c2f729e2bf55
|
||||
SHA512 (nss-3.112.0-4.el8_2.src.rpm) = 59cca3df7a0ec6a731f4a36f8f560d496d240da0c16650f047ae686e683b883dc2630aedbe46a8b2cb21662c15f03f1efbe99da42055cc3a5418da4839e28da2
|
||||
SHA512 (nspr-4.36.0-2.el8_2.src.rpm) = fcc720afd2453a5110975fac9dd06f636491234780b62cbfcc235a485b4935e97c4f438292c686d27d9dc86b56f43399c024bee4fffcdff5f27c62d105310645
|
||||
SHA512 (thunderbird-140.6.0esr.processed-source.tar.xz) = 31fc9334e9750a80498a2747e376e9ba8ef7e272879b11e7427e24ffe48a050116f741b7d42b582e900df6b69604926882ddc5c0b2079ba8a4bf227d242a6570
|
||||
SHA512 (thunderbird-langpacks-140.6.0esr-20251209.tar.xz) = b0a1b5c21d7bce5d45a40d170adf5e5e9137de2aca6f853939941e55d0dbee7530f7782a1dab6dd6b7f8e8ead0a76cba1862d9d56d8619cf72788499a946b4bc
|
||||
SHA512 (thunderbird-langpacks-140.7.0esr-20260112.tar.xz) = 0892ff8633b5dd0a0cd521b3e3b7b0c5076379ab7f4f72b04be84906a3cdaf97e996cc5990c96b6e32299697d64c29fff222504843e514314040e84de50a6d28
|
||||
SHA512 (thunderbird-140.7.0esr.processed-source.tar.xz) = 412312ecefb33fbe949d048a498a8518adcc9bf54aa8bd406717f91112ebf21d84b59b08afeaeec93cb51dbaf84d1ff25d990e8f11bdb01524c460ae7418d578
|
||||
|
||||
@ -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
|
||||
|
||||
@ -35,7 +35,7 @@ function dist_to_rhel_minor(str, start)
|
||||
end
|
||||
match = string.match(str, ".el9")
|
||||
if match then
|
||||
return 7
|
||||
return 8
|
||||
end
|
||||
match = string.match(str, ".el10_%d+")
|
||||
if match then
|
||||
@ -43,7 +43,7 @@ function dist_to_rhel_minor(str, start)
|
||||
end
|
||||
match = string.match(str, ".el10")
|
||||
if match then
|
||||
return 1
|
||||
return 2
|
||||
end
|
||||
return -1
|
||||
end}
|
||||
@ -88,7 +88,7 @@ end}
|
||||
|
||||
%if 0%{?rhel} > 7 && 0%{?rhel} < 10
|
||||
%global use_gcc_ts 1
|
||||
%if (0%{?rhel} == 9 && %{rhel_minor_version} >= 6) || (0%{?rhel} == 8 && %{rhel_minor_version} >= 10)
|
||||
%if (0%{?rhel} == 9 && %{rhel_minor_version} >= 8) || (0%{?rhel} == 8 && %{rhel_minor_version} >= 10)
|
||||
# clang depends on gcc-toolset-14-gcc-c++
|
||||
%global gts_version 14
|
||||
%else
|
||||
@ -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
|
||||
@ -348,6 +349,7 @@ BuildRequires: gcc-toolset-%{gts_version}-runtime
|
||||
BuildRequires: gcc-toolset-%{gts_version}-binutils
|
||||
BuildRequires: gcc-toolset-%{gts_version}-gcc
|
||||
BuildRequires: gcc-toolset-%{gts_version}-gcc-plugin-annobin
|
||||
BuildRequires: gcc-toolset-%{gts_version}-gcc-c++
|
||||
# Do not explicitly require gcc-toolset-%%{gts_version}-gcc-c++ instead fail
|
||||
# when clang is upgraded to depend on a later toolset and adjust version.
|
||||
# ERROR: The target C compiler is version 13.3.1, while the target C++ compiler is version 8.5.0. Need to use the same compiler version.
|
||||
@ -378,7 +380,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)
|
||||
@ -1098,6 +1099,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
|
||||
@ -1163,9 +1165,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
|
||||
@ -1709,6 +1714,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
#===============================================================================
|
||||
|
||||
%changelog
|
||||
* Mon Jan 12 2026 Jan Horak <jhorak@redhat.com> - 140.7.0-1
|
||||
- Update to 140.7.0 ESR
|
||||
|
||||
* Tue Dec 9 2025 Jan Horak <jhorak@redhat.com> - 140.6.0-1
|
||||
- Update to 140.6.0 ESR
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user