diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | firefox.spec | 16 | ||||
| -rw-r--r-- | mozilla-1625431.patch | 20 | ||||
| -rw-r--r-- | sources | 2 |
4 files changed, 13 insertions, 26 deletions
@@ -399,3 +399,4 @@ firefox-3.6.4.source.tar.bz2 /firefox-langpacks-76.0.1-20200508.tar.xz /firefox-77.0.source.tar.xz /firefox-langpacks-77.0-20200529.tar.xz +/firefox-langpacks-77.0-20200602.tar.xz diff --git a/firefox.spec b/firefox.spec index 1b59f4a..b9e470c 100644 --- a/firefox.spec +++ b/firefox.spec @@ -87,7 +87,7 @@ ExcludeArch: s390x %if %{?system_nss} %global nspr_version 4.21 %global nspr_build_version %{nspr_version} -%global nss_version 3.51.1 +%global nss_version 3.52 %global nss_build_version %{nss_version} %endif @@ -118,12 +118,12 @@ ExcludeArch: s390x Summary: Mozilla Firefox Web browser Name: firefox Version: 77.0 -Release: 1%{?nss_tag}%{?dist} +Release: 2%{?nss_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz %if %{with langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20200529.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20200602.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source10: firefox-mozconfig @@ -187,7 +187,6 @@ Patch574: firefox-pipewire-0-2.patch Patch575: firefox-pipewire-0-3.patch #VA-API patches -Patch579: mozilla-1625431.patch Patch584: firefox-disable-ffvpx-with-vapi.patch Patch585: firefox-vaapi-extra-frames.patch Patch586: mozilla-1619882-1.patch @@ -398,7 +397,6 @@ This package contains results of tests executed during build. %patch575 -p1 -b .firefox-pipewire-0-3 %endif -%patch579 -p1 -b .mozilla-1625431 %patch584 -p1 -b .firefox-disable-ffvpx-with-vapi %patch585 -p1 -b .firefox-vaapi-extra-frames %patch586 -p1 -b .mozilla-1619882-1 @@ -516,6 +514,8 @@ echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> . chmod -x third_party/rust/itertools/src/lib.rs chmod a-x third_party/rust/gfx-backend-vulkan/src/*.rs chmod a-x third_party/rust/gfx-hal/src/*.rs +chmod a-x third_party/rust/ash/src/extensions/ext/*.rs +chmod a-x third_party/rust/ash/src/extensions/khr/*.rs #--------------------------------------------------------------------- @@ -607,6 +607,9 @@ MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fsanitize=address -Dxmalloc=myxmalloc" MOZ_LINK_FLAGS="$MOZ_LINK_FLAGS -fsanitize=address -ldl" %endif +# We don't wantfirefox to use CK_GCM_PARAMS_V3 in nss +MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -DNSS_PKCS11_3_0_STRICT" + %if !%{build_with_clang} echo "export CFLAGS=\"$MOZ_OPT_FLAGS\"" >> .mozconfig echo "export CXXFLAGS=\"$MOZ_OPT_FLAGS\"" >> .mozconfig @@ -980,6 +983,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Jun 2 2020 Martin Stransky <stransky@redhat.com> - 77.0-2 +- Rebuild with updated langpacks (rhbz#1843028). + * Fri May 29 2020 Martin Stransky <stransky@redhat.com> - 77.0-1 - Updated to Firefox 77.0 diff --git a/mozilla-1625431.patch b/mozilla-1625431.patch deleted file mode 100644 index c0e6d3a..0000000 --- a/mozilla-1625431.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp ---- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp -+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp -@@ -172,6 +172,15 @@ - MediaResult FFmpegVideoDecoder<LIBAV_VER>::InitVAAPIDecoder() { - FFMPEG_LOG("Initialising VA-API FFmpeg decoder"); - -+ auto layersBackend = mImageAllocator -+ ? mImageAllocator->GetCompositorBackendType() -+ : layers::LayersBackend::LAYERS_BASIC; -+ if (layersBackend != layers::LayersBackend::LAYERS_OPENGL && -+ layersBackend != layers::LayersBackend::LAYERS_WR) { -+ FFMPEG_LOG("VA-API works with HW accelerated backend only!"); -+ return NS_ERROR_NOT_AVAILABLE; -+ } -+ - if (!mLib->IsVAAPIAvailable()) { - FFMPEG_LOG("libva library or symbols are missing."); - return NS_ERROR_NOT_AVAILABLE; - @@ -1,3 +1,3 @@ SHA512 (firefox-77.0.source.tar.xz) = 5d530d936786019a27c6bd057e01c303f58728d11927ba5c40be6f23718c206d4d1691a91c3d46bd5dce3050d32f728bb7c94d6385819a744af44aa18cbc561b -SHA512 (firefox-langpacks-77.0-20200529.tar.xz) = aab611b401936cb1545e020f07b16a45385eb76f61f03a0ba21456a70e6dc743cd48a3522dd65930317f6549269b5a1c9a2e85a22499d6d415329fef44130ae8 SHA512 (cbindgen-vendor.tar.xz) = bf970984f1228bf2e82cb745b24ed8c14e60fcf309358129630a212f969a53ad5bbaa8cb9e0c553e3b6eefe0813efc712000ea6b4a7578c8d80f39fdaf85997a +SHA512 (firefox-langpacks-77.0-20200602.tar.xz) = 6367833082a55d6939168a459287d53ee64873a17cd16ff8a1091a632ba493ce77a7caa97fc61f2c0ab04ffb3f2007b7017e31fc0fd11e0c3b85883d56c17130 |