Make the SPEC RHEL 10 aware, fix compilation and update to final 128
This commit is contained in:
Tomas Popela
parent
15c2e87d6c
commit
bdfbf8f05e
2
.gitignore
vendored
2
.gitignore
vendored
@ -443,3 +443,5 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
|
||||
/thunderbird-langpacks-115.12.1-20240618.tar.xz
|
||||
/thunderbird-128.0b4.processed-source.tar.xz
|
||||
/thunderbird-langpacks-128.0b4-20240627.tar.xz
|
||||
/thunderbird-128.0esr.processed-source.tar.xz
|
||||
/thunderbird-langpacks-128.0esr-20240710.tar.xz
|
||||
|
||||
24
build-ffvpx.patch
Normal file
24
build-ffvpx.patch
Normal file
@ -0,0 +1,24 @@
|
||||
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)
|
||||
4
sources
4
sources
@ -2,5 +2,5 @@ SHA512 (cbindgen-vendor.tar.xz) = 0c7a40033ccd38dadd30ad064feef390444af4562be07d
|
||||
SHA512 (nspr-4.35.0-1.el8_1.src.rpm) = 5123a443fcc42602e31104999be339ae899eb7b1f1e2f1ea87ba4f283eb894d08ab568e421dba1df4770f23be91ff88aa6a0748bce7feef31ed88bee5bdecb2c
|
||||
SHA512 (nss-3.90.0-2.el8_1.src.rpm) = 850cd6a343e62d34ad28ac356db03371f0b1f018274901cc700cc4f8138c9929eb159bbb1ebe167f727a69f6499423a54581ca65ed655ee468f1cae8450df85c
|
||||
SHA512 (nss-3.90.0-3.el9_0.src.rpm) = f321b9c1bda0b09eee564e2903023435851a4ff2e55bdd5b03012ca51be7999b18d85061f874065d0b25913721eb574f49746a3111f8f1cdd5b21268dddd8367
|
||||
SHA512 (thunderbird-128.0b4.processed-source.tar.xz) = c026d4daf41779a9cb989814895aea617ace3962a43524f5fef376c8f962ecf247c2f70824ade6b97d37859dd230e8fd08d46347a893412878adf1c65f7b03d8
|
||||
SHA512 (thunderbird-langpacks-128.0b4-20240627.tar.xz) = b6be6f5d8031bda0d3f47ea0884c46fa2136498e1ed8aed1407bf373474a450133a51ead9c3f372990ee1d7a1b3c1d04ae77b34f39d0a8c8d5896dfc94a63503
|
||||
SHA512 (thunderbird-128.0esr.processed-source.tar.xz) = 665840529672b3470da716b5c8345479f75a63c64a96f25f1b2455f5b7765f37a931e536a52caeb8e9b8d6dfeb929dbd66d091d561dbbb14f189462ee74b5c40
|
||||
SHA512 (thunderbird-langpacks-128.0esr-20240710.tar.xz) = 8e7de402bc320aef22c64ccc1f6049edfdc2a9dc1770558604aad1dbaca08e52d8278695d92106cbfccc80e09b21621cfb93c4457aaca96d50a117d2b006cb6c
|
||||
|
||||
@ -54,7 +54,7 @@ end}
|
||||
%global _build_id_links none
|
||||
%endif
|
||||
%endif
|
||||
%if 0%{?rhel} == 9
|
||||
%if 0%{?rhel} >= 9
|
||||
%if %{rhel_minor_version} <= 0
|
||||
#FIXME 1
|
||||
%global bundle_nss 0
|
||||
@ -122,7 +122,7 @@ end}
|
||||
%define mozappdir %{_libdir}/thunderbird
|
||||
%global langpackdir %{mozappdir}/extensions
|
||||
%define bundled_install_path %{mozappdir}/bundled
|
||||
%global pre_version b4
|
||||
%global pre_version esr
|
||||
# Workaround the dreaded "upstream source file changed content" rpminspect failure.
|
||||
# If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g.
|
||||
# thunderbird-102.8.0.b2.processed-source.tar.xz
|
||||
@ -142,7 +142,7 @@ Release: 1%{?dist}
|
||||
URL: http://www.mozilla.org/projects/thunderbird/
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
|
||||
%if 0%{?rhel} == 9
|
||||
%if 0%{?rhel} >= 9
|
||||
ExcludeArch: %{ix86}
|
||||
%endif
|
||||
%if 0%{?rhel} == 8
|
||||
@ -168,7 +168,7 @@ ExcludeArch: aarch64 s390 ppc ppc64
|
||||
#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}-20240627.tar.xz
|
||||
Source1: thunderbird-langpacks-%{version}%{?pre_version}-20240710.tar.xz
|
||||
%endif
|
||||
Source2: cbindgen-vendor.tar.xz
|
||||
Source3: process-official-tarball
|
||||
@ -196,6 +196,7 @@ Patch06: build-ppc64-abiv2.patch
|
||||
Patch07: build-rhel7-nasm-dwarf.patch
|
||||
Patch08: build-tb-rnp-openssl.patch
|
||||
Patch09: disable-openpgp-in-thunderbird.patch
|
||||
Patch10: build-ffvpx.patch
|
||||
|
||||
# -- Upstreamed patches --
|
||||
Patch51: mozilla-bmo1170092.patch
|
||||
@ -292,7 +293,7 @@ BuildRequires: rustfmt >= %{rust_version}
|
||||
BuildRequires: rust >= %{rust_version}
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} == 9
|
||||
%if 0%{?rhel} >= 9
|
||||
BuildRequires: cargo
|
||||
BuildRequires: clang clang-libs llvm llvm-devel
|
||||
BuildRequires: gcc
|
||||
@ -332,12 +333,14 @@ BuildRequires: xmlto
|
||||
BuildRequires: zlib-devel
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} == 8 && %{rhel_minor_version} < 6
|
||||
%if 0%{use_dts}
|
||||
%if 0%{?rhel} == 8 && %{rhel_minor_version} < 6
|
||||
%ifarch aarch64
|
||||
BuildRequires: gcc-toolset-12-gcc-plugin-annobin
|
||||
BuildRequires: gcc-toolset-12-gcc-plugin-annobin
|
||||
%endif
|
||||
%endif
|
||||
BuildRequires: gcc-toolset-13
|
||||
%endif
|
||||
BuildRequires: gcc-toolset-13
|
||||
|
||||
%if %{?use_openssl_for_librnp}
|
||||
BuildRequires: pkgconfig(openssl)
|
||||
@ -907,7 +910,7 @@ echo "use_nodejs_scl %{?use_nodejs_scl}"
|
||||
echo "use_llvm_ts %{?use_llvm_ts}"
|
||||
echo "use_python3_scl %{?use_python3_scl}"
|
||||
echo "--------------------------------------------"
|
||||
clang -print-search-dirs
|
||||
#clang -print-search-dirs
|
||||
|
||||
%setup -q
|
||||
|
||||
@ -933,6 +936,7 @@ clang -print-search-dirs
|
||||
%if !%{?use_openssl_for_librnp}
|
||||
%patch -P9 -p1 -b .disable-openpgp-in-thunderbird
|
||||
%endif
|
||||
%patch -P10 -p1 -b .build-ffvpx
|
||||
|
||||
# -- Upstreamed patches --
|
||||
%patch -P51 -p1 -b .mozilla-bmo1170092
|
||||
@ -1021,7 +1025,7 @@ echo "ac_add_options --with-google-safebrowsing-api-keyfile=`pwd`/google-api-key
|
||||
|
||||
# May result in empty --with-libclang-path= in earlier versions.
|
||||
# So far this is needed only for c8s/c9s.
|
||||
%if (0%{?rhel} == 8) || (0%{?rhel} == 9)
|
||||
%if 0%{?rhel} >= 8
|
||||
# Clang 17 upstream's detection fails, tell it where to look.
|
||||
echo "ac_add_options --with-libclang-path=`llvm-config --libdir`" >> .mozconfig
|
||||
%endif
|
||||
@ -1120,7 +1124,10 @@ set +e
|
||||
source scl_source enable gcc-toolset-12
|
||||
%endif
|
||||
%endif
|
||||
# FIXME This is definitely wrong, but I need things going on RHEL 10
|
||||
%if 0%{?rhel} < 10
|
||||
source scl_source enable gcc-toolset-13
|
||||
%endif
|
||||
%if 0%{?use_dts}
|
||||
source scl_source enable devtoolset-%{dts_version}
|
||||
%endif
|
||||
@ -1511,6 +1518,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
#===============================================================================
|
||||
|
||||
%changelog
|
||||
* Wed Jul 10 2024 Tomas Popela <tpopela@redhat.com> - 128.0-1
|
||||
- Update to 128.0 final
|
||||
|
||||
* Thu Jun 27 2024 Jan Horak <jhorak@redhat.com> - 128.0b4-1
|
||||
- Update to 128.0b4
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user