From 34727c11598ccb0af7684f4e7eb09287aa4aa864 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@anakreon.cz>
Date: Tue, 2 Feb 2016 15:50:58 +0100
Subject: [PATCH] GCC 6.0 build patch, Disabled mozilla crashreporter to catch
 Gtk3 crashes

---
 firefox-gcc-6.0.patch | 13 +++++++++++++
 firefox.spec          | 11 +++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 firefox-gcc-6.0.patch

diff --git a/firefox-gcc-6.0.patch b/firefox-gcc-6.0.patch
new file mode 100644
index 0000000..b2f6644
--- /dev/null
+++ b/firefox-gcc-6.0.patch
@@ -0,0 +1,13 @@
+diff -up firefox-44.0/nsprpub/config/make-system-wrappers.pl.back firefox-44.0/nsprpub/config/make-system-wrappers.pl
+--- firefox-44.0/nsprpub/config/make-system-wrappers.pl.back	2016-01-24 00:23:49.000000000 +0100
++++ firefox-44.0/nsprpub/config/make-system-wrappers.pl	2016-02-02 14:58:45.064112655 +0100
+@@ -19,7 +19,9 @@ while (<STDIN>) {
+     open OUT, ">$output_dir/$_";
+     print OUT "#pragma GCC system_header\n";  # suppress include_next warning
+     print OUT "#pragma GCC visibility push(default)\n";
++    print OUT "#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n";
+     print OUT "#include_next \<$_\>\n";
++    print OUT "#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n";
+     print OUT "#pragma GCC visibility pop\n";
+     close OUT;
+ }
diff --git a/firefox.spec b/firefox.spec
index 1907e52..500b20b 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -70,14 +70,15 @@
 %define enable_mozilla_crashreporter       0
 %if !%{debug_build}
 %ifarch %{ix86} x86_64
-%define enable_mozilla_crashreporter       1
+# Temporary disable to catch Gtk3 crashes in Fedora (mozbz#1239962)
+%define enable_mozilla_crashreporter       0
 %endif
 %endif
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        44.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
@@ -104,6 +105,7 @@ Patch20:        firefox-build-prbool.patch
 Patch21:        firefox-ppc64le.patch
 Patch24:        firefox-debug.patch
 Patch25:        rhbz-1219542-s390-build.patch
+Patch26:        firefox-gcc-6.0.patch
 
 # Fedora specific patches
 # Unable to install addons from https pages
@@ -248,6 +250,7 @@ cd %{tarballdir}
 %ifarch s390
 %patch25 -p1 -b .rhbz-1219542-s390
 %endif
+%patch26 -p1 -b .gcc-6.0
 
 %patch3  -p2 -b .arm
 
@@ -759,6 +762,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Feb 2 2016 Martin Stransky <stransky@redhat.com> - 44.0-5
+- GCC 6.0 build patch
+- Disabled mozilla crashreporter to catch Gtk3 crashes
+
 * Mon Feb 1 2016 Martin Stransky <stransky@redhat.com> - 44.0-4
 - Removed pulseaudio hard dependency (rhbz#1303620)