From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 8 Oct 2017 23:19:30 +0000 (+0200)
Subject: - fix styles build
X-Git-Tag: auto/th/firefox-56.0-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffirefox.git;a=commitdiff_plain;h=66284f858df5075e26c7f237404610eb0d539490

- fix styles build
- fix unresolved symbols in external plugins (e.g. flash)
---

diff --git a/firefox.spec b/firefox.spec
index 519d800..87b1585 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -243,6 +243,8 @@ Patch7:		%{name}-middle_click_paste.patch
 Patch8:		%{name}-system-virtualenv.patch
 Patch9:		%{name}-Disable-Firefox-Health-Report.patch
 Patch10:	freetype.patch
+Patch11:	mozilla-1405267.patch
+Patch12:	rhbz-1497932.patch
 URL:		https://www.mozilla.org/firefox/
 BuildRequires:	OpenGL-devel
 BuildRequires:	alsa-lib-devel
@@ -2019,6 +2021,8 @@ echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Mak
 %patch8 -p2
 %patch9 -p1
 %patch10 -p2
+%patch11 -p1
+%patch12 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python,%{__python},' xpcom/typelib/xpt/tools/xpt.py xpcom/idl-parser/xpidl/xpidl.py
 
@@ -2100,6 +2104,8 @@ ac_add_options --with-system-nss
 ac_add_options --with-system-png
 ac_add_options --with-system-zlib
 ac_add_options --with-x
+# Workaround for mozbz#1341234
+ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"
 EOF
 
 %if %{with pgo}
@@ -2255,11 +2261,14 @@ fi
 %{_datadir}/%{name}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
 %{_libdir}/%{name}/browser/omni.ja
 
+%{_libdir}/%{name}/browser/features/activity-stream@mozilla.org.xpi
 %{_libdir}/%{name}/browser/features/aushelper@mozilla.org.xpi
 %{_libdir}/%{name}/browser/features/clicktoplay-rollout@mozilla.org.xpi
 %{_libdir}/%{name}/browser/features/e10srollout@mozilla.org.xpi
 %{_libdir}/%{name}/browser/features/firefox@getpocket.com.xpi
 %{_libdir}/%{name}/browser/features/followonsearch@mozilla.com.xpi
+%{_libdir}/%{name}/browser/features/formautofill@mozilla.org.xpi
+%{_libdir}/%{name}/browser/features/onboarding@mozilla.org.xpi
 %{_libdir}/%{name}/browser/features/screenshots@mozilla.org.xpi
 %{_libdir}/%{name}/browser/features/shield-recipe-client@mozilla.org.xpi
 %{_libdir}/%{name}/browser/features/webcompat@mozilla.org.xpi
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)