rpms/thunderbird
6
0
Fork 0
Code Issues Pull Requests Releases Activity

AlmaLinux changes

Browse Source 
Add gcc-toolset-%{gts_version}-gcc-c++ to BR
This commit is contained in:
Eduard Abdullin 2025-10-21 07:29:46 +00:00 committed by root
commit 46d8dceaeb
7 changed files with 19 additions and 656 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -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.3.0esr.processed-source.tar.xz
SOURCES/thunderbird-langpacks-140.3.0esr-20250912.tar.xz
SOURCES/thunderbird-140.4.0esr.processed-source.tar.xz
SOURCES/thunderbird-langpacks-140.4.0esr-20251013.tar.xz

4
.thunderbird.metadata
View File

@ -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
9b383ae5bfea0f73296a8bc99e1c1b3bf116bc03 SOURCES/thunderbird-140.3.0esr.processed-source.tar.xz
c87ae7f3f983dc99c9430a2e130c851a7c55e133 SOURCES/thunderbird-langpacks-140.3.0esr-20250912.tar.xz
a9ee21c5a1c914e16c778da25383aa6b6d4a1b9f SOURCES/thunderbird-140.4.0esr.processed-source.tar.xz
11d24d1b3a0f5f19c97012a9cc6da7650e73276e SOURCES/thunderbird-langpacks-140.4.0esr-20251013.tar.xz

24
SOURCES/build-ffvpx.patch
View File

@ -1,24 +0,0 @@
diff -up thunderbird-128.0/media/ffvpx/libavcodec/av1dec.c.build-ffvpx thunderbird-128.0/media/ffvpx/libavcodec/av1dec.c
--- thunderbird-128.0/media/ffvpx/libavcodec/av1dec.c.build-ffvpx 2024-06-24 22:43:40.000000000 +0200
+++ thunderbird-128.0/media/ffvpx/libavcodec/av1dec.c 2024-07-10 11:20:23.200948767 +0200
@@ -887,7 +887,7 @@ static av_cold int av1_decode_init(AVCod
ff_cbs_fragment_reset(&s->current_obu);
}
- s->dovi.logctx = avctx;
+ s->dovi.logctx = (AVContext *) avctx;
s->dovi.dv_profile = 10; // default for AV1
sd = ff_get_coded_side_data(avctx, AV_PKT_DATA_DOVI_CONF);
if (sd && sd->size > 0)
diff -up thunderbird-128.0/media/ffvpx/libavcodec/libdav1d.c.build-ffvpx thunderbird-128.0/media/ffvpx/libavcodec/libdav1d.c
--- thunderbird-128.0/media/ffvpx/libavcodec/libdav1d.c.build-ffvpx 2024-07-10 12:46:57.005539959 +0200
+++ thunderbird-128.0/media/ffvpx/libavcodec/libdav1d.c 2024-07-10 12:47:19.067507705 +0200
@@ -289,7 +289,7 @@ static av_cold int libdav1d_init(AVCodec
c->delay = res > 1 ? res : 0;
#endif
- dav1d->dovi.logctx = c;
+ dav1d->dovi.logctx = (AVContext *) c;
dav1d->dovi.dv_profile = 10; // default for AV1
sd = ff_get_coded_side_data(c, AV_PKT_DATA_DOVI_CONF);
if (sd && sd->size > 0)

507
SOURCES/firefox-system-nss-replace-xyber-with-mlkem.patch
View File

File diff suppressed because one or more lines are too long

1
SOURCES/process-official-tarball
View File

@ -18,6 +18,7 @@ rm -vf ./process-tarball-dir/*/mobile/android/android-components/components/brow
rm -vf ./process-tarball-dir/*/mobile/android/android-components/components/feature/addons/src/main/res/values-ur/strings.xml
rm -vf ./process-tarball-dir/*/third_party/webkit/PerformanceTests/Speedometer3/resources/editors/dist/assets/codemirror-521de7ab.js
rm -vf ./process-tarball-dir/*/third_party/python/pip/pip-24.0.dist-info/AUTHORS.txt
rm -vf ./process-tarball-dir/*/dom/locks/test/crashtests/1908240.js
rm -vf ./process-tarball-dir/*/comm/third_party/rust/idna/tests/IdnaTestV2.txt
rm -vr ./process-tarball-dir/*/comm/third_party/rust/wast/tests/parse-fail/confusing*
rm -vr ./process-tarball-dir/*/third_party/rust/wast/tests/parse-fail/confusing*

105
SOURCES/thunderbird-system-nss-replace-xyber-with-mlkem.patch
View File

File diff suppressed because one or more lines are too long

30
SPECS/thunderbird.spec
View File

@ -137,8 +137,8 @@ end}
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 140.3.0
Release: 1%{?dist}.alma.1
Version: 140.4.0
Release: 2%{?dist}.alma.1
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}-20250912.tar.xz
Source1: thunderbird-langpacks-%{version}%{?pre_version}-20251013.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball
@ -192,14 +192,9 @@ Patch05: build-rhel7-lower-node-min-version.patch
Patch06: build-ppc64-abiv2.patch
Patch07: build-rhel7-nasm-dwarf.patch
Patch09: disable-openpgp-in-thunderbird.patch
Patch10: build-ffvpx.patch
# Due to some failed rpminspect unicode test we had to remove some test files from the tarball
# To remove the files checksum from .cargo-checksums we need to add this patch
Patch11: rust-file-removal.patch
# Patch a few and third_party/rust/neqo-crypto/ like in Firefox.
Patch12: firefox-system-nss-replace-xyber-with-mlkem.patch
# Thunderbird has a copy of third_party/rust/neqo-crypto/ in comm/third_party/rust/neqo-crypto/
Patch13: thunderbird-system-nss-replace-xyber-with-mlkem.patch
Patch14: build-cargo-lock-version.patch
Patch15: build-system-nss.patch
Patch16: build-tb-system-nss.patch
@ -1087,12 +1082,7 @@ echo "--------------------------------------------"
%if !%{?use_openssl_for_librnp}
%patch -P9 -p1 -b .disable-openpgp-in-thunderbird
%endif
#patch -P10 -p1 -b .build-ffvpx
%patch -P11 -p1 -b .rust-file-removal
%if 0%{?rhel} == 10
#patch -P12 -p1 -b .firefox-system-nss-replace-xyber-with-mlkem
#patch -P13 -p1 -b .thunderbird-system-nss-replace-xyber-with-mlkem
%endif
%patch -P14 -p1 -b .cargo-lock-version
%patch -P15 -p1 -b .build-system-nss
%patch -P16 -p1 -b .tb-build-system-nss
@ -1179,7 +1169,10 @@ echo "ac_add_options --with-librnp-backend=openssl" >> .mozconfig
echo "ac_add_options --disable-webrtc" >> .mozconfig
echo "ac_add_options --disable-lto" >> .mozconfig
%endif
echo "ac_add_options --disable-lto" >> .mozconfig
%if 0%{?rhel} < 10
echo "ac_add_options --disable-lto" >> .mozconfig
%endif
# AV1 requires newer nasm that was rebased in 8.4
%if 0%{?rhel} == 7 || (0%{?rhel} == 8 && %{rhel_minor_version} < 4)
@ -1374,7 +1367,7 @@ MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
# __global_ldflags that normally sets this.
MOZ_LINK_FLAGS="$MOZ_LINK_FLAGS -L%{_libdir}"
%endif
%ifarch %{ix86} %{s390x}
%ifarch %{ix86} s390x
export RUSTFLAGS="-Cdebuginfo=0"
echo 'export RUSTFLAGS="-Cdebuginfo=0"' >> .mozconfig
%endif
@ -1397,6 +1390,8 @@ echo "export CXX=g++" >> .mozconfig
echo "export AR=\"gcc-ar\"" >> .mozconfig
echo "export NM=\"gcc-nm\"" >> .mozconfig
echo "export RANLIB=\"gcc-ranlib\"" >> .mozconfig
#Workaround for rust SIGABRT/SIGSEGV
echo "export MALLOC_MMAP_MAX_=0" >> .mozconfig
MOZ_SMP_FLAGS=-j1
# On x86_64 architectures, Mozilla can build up to 4 jobs at once in parallel,
@ -1685,10 +1680,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
* Wed Sep 24 2025 Eduard Abdullin <eabdullin@almalinux.org> - 140.3.0-1.alma.1
* Tue Oct 21 2025 Eduard Abdullin <eabdullin@almalinux.org> - 140.4.0-2.alma.1
- AlmaLinux changes
- Add gcc-toolset-%{gts_version}-gcc-c++ to BR
* Mon Oct 13 2025 Jan Horak <jhorak@redhat.com> - 140.4.0-2
- Update to 140.4.0 ESR
* Fri Sep 12 2025 Jan Horak <jhorak@redhat.com> - 140.3.0-1
- Update to 140.3.0 ESR