diff --git a/.gitignore b/.gitignore index bfb8e53..c0c1b3b 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,5 @@ /thunderbird-102.5.0.processed-source.tar.xz /thunderbird-langpacks-102.5.0-20221111.tar.xz /thunderbird-langpacks-102.5.0-20221115.tar.xz +/thunderbird-102.6.0.processed-source.tar.xz +/thunderbird-langpacks-102.6.0-20221209.tar.xz diff --git a/cbindgen-already-covers.patch b/cbindgen-already-covers.patch deleted file mode 100644 index ab98649..0000000 --- a/cbindgen-already-covers.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up thunderbird-102.1.0/gfx/webrender_bindings/webrender_ffi.h.cbindgen-covers thunderbird-102.1.0/gfx/webrender_bindings/webrender_ffi.h ---- thunderbird-102.1.0/gfx/webrender_bindings/webrender_ffi.h.cbindgen-covers 2022-08-04 12:47:06.970587140 +0200 -+++ thunderbird-102.1.0/gfx/webrender_bindings/webrender_ffi.h 2022-08-04 12:47:13.642579587 +0200 -@@ -73,7 +73,6 @@ struct WrPipelineInfo; - struct WrPipelineIdAndEpoch; - using WrPipelineIdEpochs = nsTArray; - --const uint64_t ROOT_CLIP_CHAIN = ~0; - - } // namespace wr - } // namespace mozilla diff --git a/firefox-nss-version.patch b/firefox-nss-version.patch index 7b7c859..73eafc6 100644 --- a/firefox-nss-version.patch +++ b/firefox-nss-version.patch @@ -1,13 +1,11 @@ -diff -up firefox-102.2.0/build/moz.configure/nss.configure.nss-version firefox-102.2.0/build/moz.configure/nss.configure ---- firefox-102.2.0/build/moz.configure/nss.configure.nss-version 2022-08-23 18:17:14.699869558 +0200 -+++ firefox-102.2.0/build/moz.configure/nss.configure 2022-08-23 18:15:33.790051448 +0200 +--- thunderbird-102.6.0/build/moz.configure/nss.configure.firefox-nss-version 2022-12-09 19:00:45.849518718 +0100 ++++ thunderbird-102.6.0/build/moz.configure/nss.configure 2022-12-09 19:02:47.739198796 +0100 @@ -9,7 +9,7 @@ system_lib_option("--with-system-nss", h imply_option("--with-system-nspr", True, when="--with-system-nss") nss_pkg = pkg_check_modules( -- "NSS", "nss >= 3.79.1", when="--with-system-nss", config=False +- "NSS", "nss >= 3.79.2", when="--with-system-nss", config=False + "NSS", "nss >= 3.79", when="--with-system-nss", config=False ) set_config("MOZ_SYSTEM_NSS", True, when="--with-system-nss") -diff -up firefox-102.2.0/.nss-version firefox-102.2.0/ diff --git a/sources b/sources index c78b2d1..ae6ce1e 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (nss-3.79.0-6.el8_1.src.rpm) = 5887d0f306045adf7c6f3389840fff2e2732e5a15ec5e22cf885e578105b54d9e753c237e7730c2d3f0990728b10123c653e8d18a8b8dd0174bfb5b443eab7ef SHA512 (nspr-4.34.0-3.el8_1.src.rpm) = fe4715694c297cd8cefa577946358a90103bde73e78a3fdf13d202a3791736e8a48fbece09ee3d15f6d81ae051e26d96400b03bb6bf8630715746c5e1a643543 SHA512 (cbindgen-vendor.tar.xz) = 590e27b6c093a5c1bd839ca39c68537097d0849087a4a385ee6d7b180e9ceadbbb8974fa997f5f75af03e2c243a2f232d0d4c4c46e253ea464521b76c6886067 -SHA512 (thunderbird-102.5.0.processed-source.tar.xz) = ea8f193382a637eaf78afd181d267f9f476b6ca722b055beb6a2f31e34d84d056ee66f2ab863c34a76b3aa3ec93cc995267bb5aeeaa2c6100f71cba473cf0aa5 -SHA512 (thunderbird-langpacks-102.5.0-20221115.tar.xz) = 6d9f92c2386ac219bed63c3bc59b5bcfd3b468f2360c6a18dd163897da5d9538c50afacfa16b636439497f8b846805866f457c59958b878305d6ecf72d772bde +SHA512 (thunderbird-102.6.0.processed-source.tar.xz) = 1d0701ba8ec1741192eaf93281658b4dcaf04e47e02800e8e3b7778e001a23ac429efeafa772ce23d0e625fb3b2725c4382d137dcbd6fc69f84dd3de49d9c335 +SHA512 (thunderbird-langpacks-102.6.0-20221209.tar.xz) = e70a700995db2ba2c65f28a93216bf1c617d5fa913643b4c906eaa87f2d40b12d9f22004581a4f19021de83b53bc704508f2a8bb423f99f8de5123eef1868c7d diff --git a/thunderbird.spec b/thunderbird.spec index c4b2d3e..a6fc565 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -162,8 +162,8 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 102.5.0 -Release: 3%{?dist} +Version: 102.6.0 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -184,7 +184,7 @@ ExcludeArch: aarch64 s390 ppc #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}.processed-source.tar.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}-20221115.tar.xz +Source1: thunderbird-langpacks-%{version}-20221209.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -229,7 +229,6 @@ Patch226: rhbz-1354671.patch Patch228: disable-openh264-download.patch Patch229: firefox-nss-addon-hack.patch Patch230: disable-openpgp-in-thunderbird.patch -Patch231: cbindgen-already-covers.patch # Upstream patches Patch415: mozilla-1670333.patch @@ -615,7 +614,6 @@ echo "use_rustts %{?use_rustts}" %endif %patch228 -p1 -b .disable-openh264-download %patch229 -p1 -b .firefox-nss-addon-hack -%patch231 -p1 -b .cbindgen-already-covers %patch415 -p1 -b .1670333 %patch416 -p1 -b .mozilla-bmo1005535 @@ -1284,6 +1282,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Fri Dec 09 2022 Eike Rathke - 102.6.0-1 +- Update to 102.6.0 build1 + * Tue Nov 29 2022 Jan Horak - 102.5.0-3 - Use openssl for the librnp crypto backend to enable the openpgp encryption