Fixed rhbz#1321355 - broken flash plugin

2 files changed, 11 insertions, 10 deletions

diff --git a/firefox-gtk3-20.patch b/firefox-gtk3-20.patch
index c128b23..fe7220a 100644
--- a/firefox-gtk3-20.patch
+++ b/firefox-gtk3-20.patch
@@ -1,6 +1,6 @@
 diff -up firefox-45.0.1/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.1/widget/gtk/gtk3drawing.c
 --- firefox-45.0.1/widget/gtk/gtk3drawing.c.gtk3-20	2016-03-15 23:37:46.000000000 +0100
-+++ firefox-45.0.1/widget/gtk/gtk3drawing.c	2016-03-17 11:24:09.290483042 +0100
++++ firefox-45.0.1/widget/gtk/gtk3drawing.c	2016-03-21 18:40:24.585222036 +0100
 @@ -17,32 +17,78 @@
  
  #include <math.h>
@@ -1288,7 +1288,7 @@ diff -up firefox-45.0.1/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.1/widget/g
      gMenuBarWidget = NULL;
 diff -up firefox-45.0.1/widget/gtk/gtkdrawing.h.gtk3-20 firefox-45.0.1/widget/gtk/gtkdrawing.h
 --- firefox-45.0.1/widget/gtk/gtkdrawing.h.gtk3-20	2016-03-15 23:37:46.000000000 +0100
-+++ firefox-45.0.1/widget/gtk/gtkdrawing.h	2016-03-17 11:24:09.290483042 +0100
++++ firefox-45.0.1/widget/gtk/gtkdrawing.h	2016-03-21 18:40:24.585222036 +0100
 @@ -67,6 +67,13 @@ typedef enum {
    MOZ_GTK_TAB_SELECTED        = 1 << 10
  } GtkTabFlags;
@@ -1328,13 +1328,12 @@ diff -up firefox-45.0.1/widget/gtk/gtkdrawing.h.gtk3-20 firefox-45.0.1/widget/gt
  }
  #endif /* __cplusplus */
 diff -up firefox-45.0.1/widget/gtk/mozgtk/mozgtk.c.gtk3-20 firefox-45.0.1/widget/gtk/mozgtk/mozgtk.c
---- firefox-45.0.1/widget/gtk/mozgtk/mozgtk.c.gtk3-20	2016-03-15 23:37:46.000000000 +0100
-+++ firefox-45.0.1/widget/gtk/mozgtk/mozgtk.c	2016-03-17 11:24:09.294483057 +0100
-@@ -502,6 +503,11 @@ STUB(gtk_window_set_type_hint)
+--- firefox-45.0.1/widget/gtk/mozgtk/mozgtk.c.gtk3-20	2016-03-21 18:40:24.547221968 +0100
++++ firefox-45.0.1/widget/gtk/mozgtk/mozgtk.c	2016-03-29 11:30:02.660681032 +0200
+@@ -503,6 +503,10 @@ STUB(gtk_window_set_type_hint)
  STUB(gtk_window_set_wmclass)
  STUB(gtk_window_unfullscreen)
  STUB(gtk_window_unmaximize)
-+STUB(gtk_widget_path_iter_get_state)
 +STUB(gtk_widget_get_preferred_height_and_baseline_for_width)
 +STUB(gtk_entry_get_text_area)
 +STUB(gtk_check_menu_item_get_type)
@@ -1342,7 +1341,7 @@ diff -up firefox-45.0.1/widget/gtk/mozgtk/mozgtk.c.gtk3-20 firefox-45.0.1/widget
  #endif
  
  #ifdef GTK3_SYMBOLS
-@@ -549,6 +555,7 @@ STUB(gtk_style_context_get_border_color)
+@@ -550,6 +554,7 @@ STUB(gtk_style_context_get_border_color)
  STUB(gtk_style_context_get_color)
  STUB(gtk_style_context_get_margin)
  STUB(gtk_style_context_get_padding)
@@ -1350,7 +1349,7 @@ diff -up firefox-45.0.1/widget/gtk/mozgtk/mozgtk.c.gtk3-20 firefox-45.0.1/widget
  STUB(gtk_style_context_has_class)
  STUB(gtk_style_context_new)
  STUB(gtk_style_context_remove_class)
-@@ -576,6 +583,13 @@ STUB(gtk_color_chooser_get_type)
+@@ -577,6 +582,14 @@ STUB(gtk_color_chooser_get_type)
  STUB(gtk_color_chooser_set_rgba)
  STUB(gtk_color_chooser_get_rgba)
  STUB(gtk_color_chooser_set_use_alpha)
@@ -1358,6 +1357,7 @@ diff -up firefox-45.0.1/widget/gtk/mozgtk/mozgtk.c.gtk3-20 firefox-45.0.1/widget
 +STUB(gtk_widget_path_copy)
 +STUB(gtk_widget_path_iter_set_object_name)
 +STUB(gtk_widget_path_iter_add_class)
++STUB(gtk_widget_path_iter_get_state)
 +STUB(gtk_style_context_set_parent)
 +STUB(gtk_widget_path_unref)
 +STUB(gtk_button_get_type)
@@ -1366,7 +1366,7 @@ diff -up firefox-45.0.1/widget/gtk/mozgtk/mozgtk.c.gtk3-20 firefox-45.0.1/widget
  #ifdef GTK2_SYMBOLS
 diff -up firefox-45.0.1/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-45.0.1/widget/gtk/nsLookAndFeel.cpp
 --- firefox-45.0.1/widget/gtk/nsLookAndFeel.cpp.gtk3-20	2016-03-15 23:37:46.000000000 +0100
-+++ firefox-45.0.1/widget/gtk/nsLookAndFeel.cpp	2016-03-17 13:47:31.437687080 +0100
++++ firefox-45.0.1/widget/gtk/nsLookAndFeel.cpp	2016-03-21 18:40:24.586222037 +0100
 @@ -232,14 +232,18 @@ nsLookAndFeel::NativeGetColor(ColorID aI
      case eColorID_activeborder:
          // active window border
@@ -1591,7 +1591,7 @@ diff -up firefox-45.0.1/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-45.0.1/widg
      gboolean supports_menubar_drag = FALSE;
 diff -up firefox-45.0.1/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20 firefox-45.0.1/widget/gtk/nsNativeThemeGTK.cpp
 --- firefox-45.0.1/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20	2016-03-15 23:37:46.000000000 +0100
-+++ firefox-45.0.1/widget/gtk/nsNativeThemeGTK.cpp	2016-03-17 11:24:09.291483046 +0100
++++ firefox-45.0.1/widget/gtk/nsNativeThemeGTK.cpp	2016-03-21 18:40:24.586222037 +0100
 @@ -1548,9 +1548,6 @@ nsNativeThemeGTK::GetMinimumWidgetSize(n
    case NS_THEME_RADIO_CONTAINER:
    case NS_THEME_CHECKBOX_LABEL:
diff --git a/firefox.spec b/firefox.spec
index ae06f98..afa3381 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -799,6 +799,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %changelog
 * Tue Mar 22 2016 Martin Stransky <stransky@redhat.com> - 45.0.1-4
+- Fixed rhbz#1321355 - broken flash plugin
 - Added /etc/firefox/pref dir for easy configuration
 
 * Mon Mar 21 2016 Martin Stransky <stransky@redhat.com> - 45.0.1-3