diff --git a/firefox.spec b/firefox.spec index c13f247..0540539 100644 --- a/firefox.spec +++ b/firefox.spec @@ -163,7 +163,7 @@ ExcludeArch: i686 Summary: Mozilla Firefox Web browser Name: firefox Version: 105.0.1 -Release: 1%{?pre_tag}%{?dist} +Release: 2%{?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 @@ -242,6 +242,7 @@ Patch402: mozilla-1196777.patch Patch407: mozilla-1667096.patch Patch408: mozilla-1663844.patch Patch415: mozilla-1670333.patch +Patch416: mozilla-1791856.patch # PGO/LTO patches Patch600: pgo.patch @@ -499,6 +500,7 @@ This package contains results of tests executed during build. %patch407 -p1 -b .1667096 %patch408 -p1 -b .1663844 %patch415 -p1 -b .1670333 +%patch416 -p1 -b .1791856 # PGO patches %if %{build_with_pgo} @@ -1088,6 +1090,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Fri Sep 30 Martin Stransky - 105.0.1-2 +- Added fix for mozilla#1791856 / rhbz#2130087 + * Thu Sep 22 2022 Martin Stransky - 105.0.1-1 - Updated to 105.0.1 - Excluded i686 due to https://bugzilla.mozilla.org/show_bug.cgi?id=1792159, diff --git a/mozilla-1791856.patch b/mozilla-1791856.patch new file mode 100644 index 0000000..c7623be --- /dev/null +++ b/mozilla-1791856.patch @@ -0,0 +1,30 @@ +diff -up firefox-105.0.1/widget/gtk/nsWindow.cpp.old firefox-105.0.1/widget/gtk/nsWindow.cpp +--- firefox-105.0.1/widget/gtk/nsWindow.cpp.old 2022-09-30 10:23:00.424784507 +0200 ++++ firefox-105.0.1/widget/gtk/nsWindow.cpp 2022-09-30 10:24:36.345005046 +0200 +@@ -1949,26 +1949,6 @@ void nsWindow::NativeMoveResizeWaylandPo + bool needsPositionUpdate = newBounds.TopLeft() != mBounds.TopLeft(); + bool needsSizeUpdate = newBounds.Size() != mLastSizeRequest; + +- if (needsPositionUpdate) { +- // See Bug 1735095 +- // Font scale causes rounding errors which we can't handle by move-to-rect. +- // The font scale should not be used, but let's handle it somehow to +- // avoid endless move calls. +- if (StaticPrefs::layout_css_devPixelsPerPx() > 0 || +- gfxPlatformGtk::GetFontScaleFactor() != 1) { +- bool roundingError = (abs(newBounds.x - mBounds.x) < 2 && +- abs(newBounds.y - mBounds.y) < 2); +- if (roundingError) { +- // Keep the window where it is. +- GdkPoint topLeft = DevicePixelsToGdkPointRoundDown(mBounds.TopLeft()); +- LOG(" apply rounding error workaround, move to %d, %d", topLeft.x, +- topLeft.y); +- gtk_window_move(GTK_WINDOW(mShell), topLeft.x, topLeft.y); +- needsPositionUpdate = false; +- } +- } +- } +- + if (needsSizeUpdate) { + // Wayland compositor changed popup size request from layout. + // Set the constraints to use them in nsMenuPopupFrame::SetPopupPosition().