summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2021-01-19 19:07:34 +0100
committerMartin Stransky <stransky@redhat.com>2021-01-19 19:07:34 +0100
commit9c6d6274ed5a1a08941f7951b97a9c3d4f6ba0c8 (patch)
tree17fc91ac6e392efe2c17bdf82719cb0b0a854645
parentMerge branch 'master' into f33 (diff)
parentFixed mzbz#164294 regression (diff)
downloadlibrewolf-fedora-ff-9c6d6274ed5a1a08941f7951b97a9c3d4f6ba0c8.tar.gz
librewolf-fedora-ff-9c6d6274ed5a1a08941f7951b97a9c3d4f6ba0c8.tar.bz2
librewolf-fedora-ff-9c6d6274ed5a1a08941f7951b97a9c3d4f6ba0c8.zip
Merge branch 'master' into f33
-rw-r--r--firefox-wayland-fix-mzbz-1642949-regression.patch12
-rw-r--r--firefox.spec7
2 files changed, 18 insertions, 1 deletions
diff --git a/firefox-wayland-fix-mzbz-1642949-regression.patch b/firefox-wayland-fix-mzbz-1642949-regression.patch
new file mode 100644
index 0000000..bfe6820
--- /dev/null
+++ b/firefox-wayland-fix-mzbz-1642949-regression.patch
@@ -0,0 +1,12 @@
+diff -up firefox-84.0.2/widget/gtk/WindowSurfaceWayland.cpp.old firefox-84.0.2/widget/gtk/WindowSurfaceWayland.cpp
+--- firefox-84.0.2/widget/gtk/WindowSurfaceWayland.cpp.old 2021-01-18 21:39:44.724484655 +0100
++++ firefox-84.0.2/widget/gtk/WindowSurfaceWayland.cpp 2021-01-18 21:40:59.905703810 +0100
+@@ -906,6 +906,8 @@ void WindowSurfaceWayland::CacheImageSur
+ size.width, size.height));
+ }
+ #endif
++ } else {
++ mDelayedImageCommits.AppendElement(lastSurf);
+ }
+ }
+
diff --git a/firefox.spec b/firefox.spec
index eca22bc..f28489b 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -147,7 +147,7 @@ ExcludeArch: s390x
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 84.0.2
-Release: 6%{?pre_tag}%{?dist}
+Release: 7%{?pre_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
@@ -224,6 +224,7 @@ Patch420: mozilla-1678680.patch
Patch421: mozilla-1680505.patch
Patch422: mozilla-1631061.patch
Patch423: mozilla-1681107.patch
+Patch424: firefox-wayland-fix-mzbz-1642949-regression.patch
# Upstream patches from mozbz#1672944
Patch450: pw1.patch
@@ -453,6 +454,7 @@ This package contains results of tests executed during build.
%patch421 -p1 -b .1680505
#%patch422 -p1 -b .1631061
%patch423 -p1 -b .1681107
+%patch424 -p1 -b .fix-mzbz-1642949-regression
%patch500 -p1 -b .ffvpx
@@ -1035,6 +1037,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Tue Jan 19 2021 Martin Stransky <stransky@redhat.com> - 84.0.2-7
+- Fixed mzbz#164294 regression.
+
* Fri Jan 15 2021 Martin Stransky <stransky@redhat.com> - 84.0.2-6
- Added WebRender fix (mozbz#1681107).
bgstack15