rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branch 'alma-origin/c8' into HEAD

Browse Source
This commit is contained in:
Stepan Oksanichenko 2022-06-01 15:28:21 +00:00
commit cfd8f3e52e
4 changed files with 10 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.firefox.metadata
View File

@ -1,5 +1,5 @@
c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz
d13ae0300c2295a2762eeeea2556ca847e55799c SOURCES/firefox-91.9.1esr.processed-source.tar.xz
253fb25c2ea809ca7505c4b164723038f2a5e718 SOURCES/firefox-langpacks-91.9.1esr-20220520.tar.xz
72b64cbe7b2aa6dbf64c1db0d122a57b06189e66 SOURCES/firefox-91.10.0esr.processed-source.tar.xz
72ea5a3b4889eb3b12f37b14fad621f7b417c9fc SOURCES/firefox-langpacks-91.10.0esr-20220524.tar.xz
b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm

4
.gitignore vendored
View File

@ -1,5 +1,5 @@
SOURCES/cbindgen-vendor.tar.xz
SOURCES/firefox-91.9.1esr.processed-source.tar.xz
SOURCES/firefox-langpacks-91.9.1esr-20220520.tar.xz
SOURCES/firefox-91.10.0esr.processed-source.tar.xz
SOURCES/firefox-langpacks-91.10.0esr-20220524.tar.xz
SOURCES/nspr-4.32.0-1.el8_1.src.rpm
SOURCES/nss-3.67.0-7.el8_1.src.rpm

52
SOURCES/mozilla-s390x-skia-gradient.patch
View File

@ -1,52 +0,0 @@
# HG changeset patch
# Parent acf59ea86dd1d878b43920832093f082dcfc61c0
diff -r acf59ea86dd1 gfx/skia/skia/src/shaders/gradients/Sk4fLinearGradient.cpp
--- a/gfx/skia/skia/src/shaders/gradients/Sk4fLinearGradient.cpp Mon Mar 09 08:26:10 2020 +0100
+++ b/gfx/skia/skia/src/shaders/gradients/Sk4fLinearGradient.cpp Fri Mar 27 13:30:28 2020 +0100
@@ -7,7 +7,7 @@
#include "include/core/SkPaint.h"
#include "src/shaders/gradients/Sk4fLinearGradient.h"
-
+#include "src/core/SkEndian.h"
#include <cmath>
#include <utility>
@@ -28,6 +28,9 @@
while (n >= 4) {
DstTraits<premul>::store4x(c0, c1, c2, c3, dst, bias0, bias1);
+#ifdef SK_CPU_BENDIAN
+ SkEndianSwap32s(dst, 4);
+#endif
dst += 4;
c0 = c0 + dc4;
@@ -37,12 +40,23 @@
n -= 4;
}
if (n & 2) {
- DstTraits<premul>::store(c0, dst++, bias0);
- DstTraits<premul>::store(c1, dst++, bias1);
+ DstTraits<premul>::store(c0, dst, bias0);
+#ifdef SK_CPU_BENDIAN
+ *dst = SkEndianSwap32(*dst);
+#endif
+ ++dst;
+ DstTraits<premul>::store(c1, dst, bias1);
+#ifdef SK_CPU_BENDIAN
+ *dst = SkEndianSwap32(*dst);
+#endif
+ ++dst;
c0 = c0 + dc2;
}
if (n & 1) {
DstTraits<premul>::store(c0, dst, bias0);
+#ifdef SK_CPU_BENDIAN
+ *dst = SkEndianSwap32(*dst);
+#endif
}
}

9
SPECS/firefox.spec
View File

@ -137,7 +137,7 @@ end}
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 91.9.1
Version: 91.10.0
Release: 1%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -162,7 +162,7 @@ ExcludeArch: aarch64 s390 ppc
# Link to official tarball: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%%{version}%%{?pre_version}.source.tar.xz
Source0: firefox-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
%if %{build_langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20220520.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20220524.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
@ -208,7 +208,7 @@ Patch510: mozilla-bmo1554971.patch
Patch511: mozilla-bmo1602730.patch
Patch512: mozilla-bmo849632.patch
Patch513: mozilla-bmo998749.patch
Patch514: mozilla-s390x-skia-gradient.patch
#Patch514: mozilla-s390x-skia-gradient.patch
Patch515: mozilla-bmo1626236.patch
Patch518: D110204-fscreen.diff
Patch519: expat-CVE-2022-25235.patch
@ -1269,6 +1269,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Tue May 24 2022 Eike Rathke <erack@redhat.com> - 91.10.0-1
- Update to 91.10.0 build1
* Fri May 20 2022 Jan Horak <jhorak@redhat.com> - 91.9.1-1
- Update to 91.9.1 build1