diff options
| -rw-r--r-- | firefox.spec | 7 | ||||
| -rw-r--r-- | mozilla-1196777.patch | 28 |
2 files changed, 34 insertions, 1 deletions
diff --git a/firefox.spec b/firefox.spec index dffcbb7..15ef569 100644 --- a/firefox.spec +++ b/firefox.spec @@ -94,7 +94,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 46.0 -Release: 4%{?pre_tag}%{?dist} +Release: 5%{?pre_tag}%{?dist} URL: https://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -138,6 +138,7 @@ Patch305: mozilla-1245076.patch Patch306: mozilla-1245076-1.patch Patch400: mozilla-1255590.patch Patch401: mozilla-1266366-branch64.patch +Patch402: mozilla-1196777.patch # Debian patches Patch500: mozilla-440908.patch @@ -286,6 +287,7 @@ cd %{tarballdir} %patch306 -p1 -b .1245076-1 %patch400 -p1 -b .1255590 %patch401 -p1 -b .1266366-branch64 +%patch402 -p1 -b .1196777 # Debian extension patch %patch500 -p1 -b .440908 @@ -811,6 +813,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Thu Apr 28 2016 Martin Stransky <stransky@redhat.com> - 46.0-5 +- Added fix for rhbz#1322626 - wrong focused window + * Wed Apr 27 2016 Martin Stransky <stransky@redhat.com> - 46.0-4 - Added fix for rhbz#1315225 - ppc64le/aarch64 build fixes diff --git a/mozilla-1196777.patch b/mozilla-1196777.patch new file mode 100644 index 0000000..ba5e4b7 --- /dev/null +++ b/mozilla-1196777.patch @@ -0,0 +1,28 @@ +# HG changeset patch +# User Martin Stransky <stransky@redhat.com> +# Parent 4e3ad95d689a5beabf3c1f41d958794fe00e3767 +Bug 1196777 - Ask GDK to receive focus events, r=?karlt + +diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp +--- a/widget/gtk/nsWindow.cpp ++++ b/widget/gtk/nsWindow.cpp +@@ -142,17 +142,18 @@ const gint kEvents = GDK_EXPOSURE_MASK | + GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | + #if GTK_CHECK_VERSION(3,4,0) + GDK_SMOOTH_SCROLL_MASK | + GDK_TOUCH_MASK | + #endif + GDK_SCROLL_MASK | + GDK_POINTER_MOTION_MASK | +- GDK_PROPERTY_CHANGE_MASK; ++ GDK_PROPERTY_CHANGE_MASK | ++ GDK_FOCUS_CHANGE_MASK; + + /* utility functions */ + static bool is_mouse_in_window(GdkWindow* aWindow, + gdouble aMouseX, gdouble aMouseY); + static nsWindow *get_window_for_gtk_widget(GtkWidget *widget); + static nsWindow *get_window_for_gdk_window(GdkWindow *window); + static GtkWidget *get_gtk_widget_for_gdk_window(GdkWindow *window); + static GdkCursor *get_gtk_cursor(nsCursor aCursor); |