merge

3 files changed, 46 insertions, 1 deletions

diff --git a/firefox-redhat-default-prefs.js b/firefox-redhat-default-prefs.js
index 1c0be99..6fcee25 100644
--- a/firefox-redhat-default-prefs.js
+++ b/firefox-redhat-default-prefs.js
@@ -26,7 +26,7 @@ pref("plugins.notifyMissingFlash", false);
 pref("browser.display.use_system_colors", false);
 /* Allow sending credetials to all https:// sites */
 pref("network.negotiate-auth.trusted-uris", "https://");
-pref("spellchecker.dictionary_path","/usr/share/myspell");
+pref("spellchecker.dictionary_path","/usr/share/hunspell");
 /* Disable DoH by default */
 pref("network.trr.mode",                    5);
 /* Enable per-user policy dir, see mozbz#1583466 */
diff --git a/firefox.spec b/firefox.spec
index 5a6f4cb..cfe519b 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -243,6 +243,7 @@ Patch408:        mozilla-1663844.patch
 Patch415:        mozilla-1670333.patch
 Patch416:        D145094.diff
 Patch417:        D145541.diff
+Patch418:        mozilla-1767946-profilemanagersize.patch
 
 # PGO/LTO patches
 Patch600:        pgo.patch
@@ -484,6 +485,7 @@ This package contains results of tests executed during build.
 %patch415 -p1 -b .1670333
 %patch416 -p1 -b .D145094
 %patch417 -p1 -b .D145541
+%patch418 -p1 -b .mozilla-1767946-profilemanagersize
 
 # PGO patches
 %if %{build_with_pgo}
@@ -903,6 +905,13 @@ ln -s %{_datadir}/myspell %{buildroot}%{mozappdir}/dictionaries
 # Default
 %{__cp} %{SOURCE12} %{buildroot}%{mozappdir}/browser/defaults/preferences
 
+# Since Fedora 36 the location of dictionaries has changed to /usr/share/hunspell.
+# For backward spec compatibility we set the old path in previous versions.
+# TODO remove when Fedora 35 becomes obsolete
+%if 0%{?fedora} <= 35
+sed -ie 's|/usr/share/hunspell|/usr/share/myspell|g' %{buildroot}%{mozappdir}/browser/defaults/preferences/firefox-redhat-default-prefs.js
+%endif
+
 # Copy over run-mozilla.sh
 %{__cp} build/unix/run-mozilla.sh %{buildroot}%{mozappdir}
 
@@ -1053,6 +1062,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Wed May 18 2022 Martin Stransky <stransky@redhat.com>- 100.0.1-1
 - Updated to 100.0.1
 
+* Mon May 16 2022 Jan Horak <jhorak@redhat.com> - 100.0-6
+- Fix spellchecker.dictionary_path of F36+
+
+* Tue May 10 2022 Jan Horak <jhorak@redhat.com> - 100.0-5
+- Fix crashes on f36 multimonitor setup and too big profile manager
+
 * Mon May 9 2022 Martin Stransky <stransky@redhat.com>- 100.0-4
 - Added fix for mozbz#1767916.
 
diff --git a/mozilla-1767946-profilemanagersize.patch b/mozilla-1767946-profilemanagersize.patch
new file mode 100644
index 0000000..4469934
--- /dev/null
+++ b/mozilla-1767946-profilemanagersize.patch
@@ -0,0 +1,30 @@
+diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
+--- a/widget/gtk/nsWindow.cpp
++++ b/widget/gtk/nsWindow.cpp
+@@ -3787,11 +3787,12 @@
+     mPendingConfigures--;
+   }
+ 
+   // Don't fire configure event for scale changes, we handle that
+   // OnScaleChanged event. Skip that for toplevel windows only.
+-  if (mWindowType == eWindowType_toplevel) {
++  if (mWindowType == eWindowType_toplevel ||
++      mWindowType == eWindowType_dialog) {
+     MOZ_DIAGNOSTIC_ASSERT(mGdkWindow,
+                           "Getting configure for invisible window?");
+     if (mWindowScaleFactor != gdk_window_get_scale_factor(mGdkWindow)) {
+       LOG("  scale factor changed to %d,return early",
+           gdk_window_get_scale_factor(mGdkWindow));
+@@ -4864,10 +4865,11 @@
+   // Force scale factor recalculation
+   if (!mGdkWindow) {
+     mWindowScaleFactorChanged = true;
+     return;
+   }
++  LOG("OnScaleChanged -> %d\n", gdk_window_get_scale_factor(mGdkWindow));
+ 
+   // Gtk supply us sometimes with doubled events so stay calm in such case.
+   if (gdk_window_get_scale_factor(mGdkWindow) == mWindowScaleFactor) {
+     return;
+   }
+