summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firefox.spec10
-rw-r--r--mozilla-1661192.patch25
2 files changed, 32 insertions, 3 deletions
diff --git a/firefox.spec b/firefox.spec
index 9755b25..36c98d4 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -110,7 +110,7 @@ ExcludeArch: s390x
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 81.0.1
-Release: 2%{?dist}
+Release: 3%{?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
@@ -177,6 +177,7 @@ Patch406: mozilla-1665329.patch
Patch407: mozilla-1667096.patch
Patch408: mozilla-1663844.patch
Patch409: mozilla-1640567.patch
+Patch410: mozilla-1661192.patch
# Wayland specific upstream patches
Patch574: firefox-pipewire-0-2.patch
@@ -387,6 +388,7 @@ This package contains results of tests executed during build.
%patch407 -p1 -b .1667096
%patch408 -p1 -b .1663844
%patch409 -p1 -b .1640567
+%patch410 -p1 -b .1661192
# Wayland specific upstream patches
%if 0%{?fedora} < 32
@@ -976,12 +978,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Thu Oct 1 2020 Martin Stransky <stransky@redhat.com> - 81.0.1-3
+- Added fix for mozbz#1661192
-* Thu Oct 1 2020 Martin Stransky <stransky@redhat.com> - 81.0.1-1
+* Thu Oct 1 2020 Martin Stransky <stransky@redhat.com> - 81.0.1-2
- Added fix for mozbz#1640567
- Enable PGO
-* Wed Sep 30 2020 Martin Stransky <stransky@redhat.com> - 81.0-10
+* Wed Sep 30 2020 Martin Stransky <stransky@redhat.com> - 81.0.1-1
- Updated to 81.0.1
* Wed Sep 30 2020 Martin Stransky <stransky@redhat.com> - 81.0-9
diff --git a/mozilla-1661192.patch b/mozilla-1661192.patch
new file mode 100644
index 0000000..fa3cd42
--- /dev/null
+++ b/mozilla-1661192.patch
@@ -0,0 +1,25 @@
+diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
+--- a/widget/gtk/nsWindow.cpp
++++ b/widget/gtk/nsWindow.cpp
+@@ -1600,9 +1600,11 @@
+ #endif
+ }
+
++ bool hasAnchorRect = true;
+ if (anchorRect.width == 0) {
+ LOG((" No anchor rect given, use aPosition for anchor"));
+ anchorRect.SetRect(aPosition->x, aPosition->y, 1, 1);
++ hasAnchorRect = false;
+ }
+ LOG((" anchor x %d y %d width %d height %d (absolute coords)\n",
+ anchorRect.x, anchorRect.y, anchorRect.width, anchorRect.height));
+@@ -1704,7 +1706,7 @@
+ nsPoint cursorOffset(0, 0);
+ #ifdef MOZ_WAYLAND
+ // Offset is already computed to the tooltips
+- if (popupFrame && mPopupType != ePopupTypeTooltip) {
++ if (hasAnchorRect && popupFrame && mPopupType != ePopupTypeTooltip) {
+ nsMargin margin(0, 0, 0, 0);
+ popupFrame->StyleMargin()->GetMargin(margin);
+ switch (popupFrame->GetPopupAlignment()) {
+
bgstack15