From 807160dda080518802a1bacb7002a721e08cda0d Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Thu, 1 Oct 2020 12:22:08 +0200
Subject: Added fix for mozbz#1640567, Enable PGO

---
 firefox.spec          | 17 +++++++++--------
 mozilla-1640567.patch | 18 ++++++++++++++++++
 2 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 mozilla-1640567.patch

diff --git a/firefox.spec b/firefox.spec
index 9dddf42..9755b25 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -4,10 +4,6 @@
 %global build_with_clang  0
 %global build_with_asan   0
 
-# Temporary disabled, filed as rhbz#1862012
-#%if 0%{?fedora} == 33
-#ExcludeArch: ppc64le
-#%endif
 # Disabled due to https://pagure.io/fedora-infrastructure/issue/7581
 ExcludeArch: s390x
 
@@ -39,9 +35,7 @@ ExcludeArch: s390x
 %global build_with_pgo    0
 %ifarch x86_64
 %if %{release_build}
-%if 0%{?fedora} < 33
-%global build_with_pgo    0
-%endif
+%global build_with_pgo    1
 %endif
 # Build PGO builds on Wayland backend
 %global pgo_wayland       0
@@ -116,7 +110,7 @@ ExcludeArch: s390x
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        81.0.1
-Release:        1%{?dist}
+Release:        2%{?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
@@ -182,6 +176,7 @@ Patch405:        mozilla-1665324.patch
 Patch406:        mozilla-1665329.patch
 Patch407:        mozilla-1667096.patch
 Patch408:        mozilla-1663844.patch
+Patch409:        mozilla-1640567.patch
 
 # Wayland specific upstream patches
 Patch574:        firefox-pipewire-0-2.patch
@@ -391,6 +386,7 @@ This package contains results of tests executed during build.
 %patch406 -p1 -b .1665329
 %patch407 -p1 -b .1667096
 %patch408 -p1 -b .1663844
+%patch409 -p1 -b .1640567
 
 # Wayland specific upstream patches
 %if 0%{?fedora} < 32
@@ -980,6 +976,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+
+* Thu Oct 1 2020 Martin Stransky <stransky@redhat.com> - 81.0.1-1
+- Added fix for mozbz#1640567
+- Enable PGO
+
 * Wed Sep 30 2020 Martin Stransky <stransky@redhat.com> - 81.0-10
 - Updated to 81.0.1
 
diff --git a/mozilla-1640567.patch b/mozilla-1640567.patch
new file mode 100644
index 0000000..c1f3f44
--- /dev/null
+++ b/mozilla-1640567.patch
@@ -0,0 +1,18 @@
+diff --git a/layout/xul/nsMenuPopupFrame.cpp b/layout/xul/nsMenuPopupFrame.cpp
+--- a/layout/xul/nsMenuPopupFrame.cpp
++++ b/layout/xul/nsMenuPopupFrame.cpp
+@@ -1422,11 +1422,9 @@
+           !GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
+         screenPoint = nsPoint(anchorRect.x, anchorRect.y);
+         mAnchorRect = anchorRect;
+-      } else
++      }
+ #endif
+-      {
+-        screenPoint = AdjustPositionForAnchorAlign(anchorRect, hFlip, vFlip);
+-      }
++      screenPoint = AdjustPositionForAnchorAlign(anchorRect, hFlip, vFlip);
+     } else {
+       // with no anchor, the popup is positioned relative to the root frame
+       anchorRect = rootScreenRect;
+
-- 
cgit