diff options
| -rw-r--r-- | firefox-mozconfig | 1 | ||||
| -rw-r--r-- | firefox.spec | 9 | ||||
| -rw-r--r-- | mozilla-1497534.patch | 28 |
3 files changed, 37 insertions, 1 deletions
diff --git a/firefox-mozconfig b/firefox-mozconfig index d64b691..a64bb3d 100644 --- a/firefox-mozconfig +++ b/firefox-mozconfig @@ -17,6 +17,7 @@ ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key ac_add_options --with-google-api-keyfile=../google-api-key ac_add_options --enable-release ac_add_options --enable-pie +ac_add_options --update-channel=release # Workaround for mozbz#1341234 ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)" diff --git a/firefox.spec b/firefox.spec index 4ccbecb..3718ac5 100644 --- a/firefox.spec +++ b/firefox.spec @@ -87,7 +87,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 63.0.1 -Release: 4%{?pre_tag}%{?dist} +Release: 5%{?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 @@ -154,6 +154,7 @@ Patch573: mozilla-1415078.patch Patch574: firefox-pipewire.patch Patch581: mozilla-1493081.patch Patch582: mozilla-1504689.patch +Patch583: mozilla-1497534.patch # Debian patches Patch500: mozilla-440908.patch @@ -366,6 +367,7 @@ This package contains results of tests executed during build. %endif %patch581 -p1 -b .mozilla-1493081 %patch582 -p1 -b .mozilla-1504689 +%patch583 -p1 -b .mozilla-1497534 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -912,6 +914,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Nov 6 2018 Martin Stransky <stransky@redhat.com> - 63.0.1-5 +- Added fix for mozbz#1497534 - titlebar appearance during D&D +- Added fix for mozbz#1502457- disable Contextual Feature + Recommender/shield studies by default. + * Mon Nov 5 2018 Martin Stransky <stransky@redhat.com> - 63.0.1-4 - Added clipboard fix (mozbz#1504689) diff --git a/mozilla-1497534.patch b/mozilla-1497534.patch new file mode 100644 index 0000000..066c919 --- /dev/null +++ b/mozilla-1497534.patch @@ -0,0 +1,28 @@ +diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h +--- a/widget/gtk/nsWindow.h ++++ b/widget/gtk/nsWindow.h +@@ -287,6 +287,7 @@ + // descendant windows + GtkWidget* GetMozContainerWidget(); + GdkWindow* GetGdkWindow() { return mGdkWindow; } ++ GtkWidget* GetGtkWidget() { return mShell; } + bool IsDestroyed() { return mIsDestroyed; } + + void DispatchDragEvent(mozilla::EventMessage aMsg, +diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp +--- a/widget/gtk/nsWindow.cpp ++++ b/widget/gtk/nsWindow.cpp +@@ -7480,5 +7480,10 @@ + } + } + +- return (gFocusWindow == window); +-} ++ GtkWidget* widget = window->GetGtkWidget(); ++ if (widget) { ++ return !(gtk_widget_get_state_flags(widget) & GTK_STATE_FLAG_BACKDROP); ++ } ++ ++ return false; ++} + |