Merge branch 'master' into f26

3 files changed, 49 insertions, 1 deletions

diff --git a/firefox.spec b/firefox.spec
index e38f2a7..1c7028f 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -99,7 +99,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        56.0
-Release:        3%{?pre_tag}%{?dist}
+Release:        4%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -149,6 +149,7 @@ Patch225:        mozilla-1005640-accept-lang.patch
 #ARM run-time patch
 Patch226:        rhbz-1354671.patch
 Patch229:        firefox-nss-version.patch
+Patch230:        rhbz-1497932.patch
 
 # Upstream patches
 Patch402:        mozilla-1196777.patch
@@ -159,6 +160,7 @@ Patch411:        mozilla-1321521-2.patch
 Patch412:        mozilla-1337988.patch
 Patch413:        mozilla-1353817.patch
 Patch414:        mozilla-1341234.patch
+Patch415:        mozilla-1405267.patch
 
 # Debian patches
 Patch500:        mozilla-440908.patch
@@ -334,6 +336,7 @@ This package contains results of tests executed during build.
 %ifarch aarch64
 %patch226 -p1 -b .1354671
 %endif
+%patch230 -p1 -b .1497932
 
 %patch402 -p1 -b .1196777
 %patch406 -p1 -b .256180
@@ -345,6 +348,7 @@ This package contains results of tests executed during build.
 %endif
 %patch413 -p1 -b .1353817
 %patch414 -p1 -b .1341234
+%patch415 -p1 -b .1405267
 
 # Debian extension patch
 %patch500 -p1 -b .440908
@@ -867,6 +871,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Oct 4 2017 Martin Stransky <stransky@redhat.com> - 56.0-4
+- Fixed rhbz#1497932 - Plug-Ins for example flash fails
+  because of unresolved symbols
+
 * Fri Sep 29 2017 Martin Stransky <stransky@redhat.com> - 56.0-3
 - Enabled second arches.
 
diff --git a/mozilla-1405267.patch b/mozilla-1405267.patch
new file mode 100644
index 0000000..27fb5ea
--- /dev/null
+++ b/mozilla-1405267.patch
@@ -0,0 +1,19 @@
+diff -up firefox-56.0/widget/gtk/mozgtk/mozgtk.c.1405267 firefox-56.0/widget/gtk/mozgtk/mozgtk.c
+--- firefox-56.0/widget/gtk/mozgtk/mozgtk.c.1405267	2017-09-14 22:16:02.000000000 +0200
++++ firefox-56.0/widget/gtk/mozgtk/mozgtk.c	2017-10-04 09:16:58.512697973 +0200
+@@ -96,6 +96,7 @@ STUB(gdk_window_get_update_area)
+ STUB(gdk_window_get_user_data)
+ STUB(gdk_window_get_visual)
+ STUB(gdk_window_get_width)
++STUB(gdk_window_get_window_type)
+ STUB(gdk_window_hide)
+ STUB(gdk_window_input_shape_combine_region)
+ STUB(gdk_window_invalidate_rect)
+@@ -520,7 +521,6 @@ STUB(gdk_display_get_device_manager)
+ STUB(gdk_error_trap_pop_ignored)
+ STUB(gdk_event_get_source_device)
+ STUB(gdk_window_get_type)
+-STUB(gdk_window_get_window_type)
+ STUB(gdk_x11_window_get_xid)
+ STUB(gdk_x11_display_get_type)
+ STUB(gdk_wayland_display_get_type)
diff --git a/rhbz-1497932.patch b/rhbz-1497932.patch
new file mode 100644
index 0000000..d6e7886
--- /dev/null
+++ b/rhbz-1497932.patch
@@ -0,0 +1,21 @@
+diff -up firefox-56.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-56.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium
+diff -up firefox-56.0/media/webrtc/trunk/Makefile.old firefox-56.0/media/webrtc/trunk/Makefile
+diff -up firefox-56.0/widget/gtk/mozgtk/mozgtk.c.old firefox-56.0/widget/gtk/mozgtk/mozgtk.c
+--- firefox-56.0/widget/gtk/mozgtk/mozgtk.c.old	2017-10-04 09:21:56.155553585 +0200
++++ firefox-56.0/widget/gtk/mozgtk/mozgtk.c	2017-10-04 09:22:35.562427061 +0200
+@@ -61,7 +61,6 @@ STUB(gdk_screen_get_height_mm)
+ STUB(gdk_screen_get_n_monitors)
+ STUB(gdk_screen_get_monitor_at_window)
+ STUB(gdk_screen_get_monitor_geometry)
+-STUB(gdk_screen_get_monitor_workarea)
+ STUB(gdk_screen_get_monitor_height_mm)
+ STUB(gdk_screen_get_number)
+ STUB(gdk_screen_get_resolution)
+@@ -550,6 +549,7 @@ STUB(gtk_render_line)
+ STUB(gtk_render_option)
+ STUB(gtk_render_slider)
+ STUB(gtk_scale_new)
++STUB(gdk_screen_get_monitor_workarea)
+ STUB(gtk_scrollbar_new)
+ STUB(gtk_style_context_add_class)
+ STUB(gtk_style_context_add_region)