From 4a51420af34cd19900be1861067e307927cbce4b Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Tue, 13 Feb 2018 10:28:27 +0100
Subject: [PATCH] Added build fix for gcc8 by Tom Callaway

---
 firefox.spec                 |  7 ++++++-
 mozilla-fix-attr-order.patch | 28 ++++++++++++++++++++++++++++
 sources                      |  2 --
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 mozilla-fix-attr-order.patch

diff --git a/firefox.spec b/firefox.spec
index 403ef91..5628485 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -95,7 +95,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        58.0.1
-Release:        1%{?pre_tag}%{?dist}
+Release:        2%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@@ -131,6 +131,7 @@ Patch36:        build-missing-xlocale-h.patch
 Patch37:        build-jit-atomic-always-lucky.patch
 # Fixing missing cacheFlush when JS_CODEGEN_NONE is used (s390x)
 Patch38:        build-cacheFlush-missing.patch
+Patch39:        mozilla-fix-attr-order.patch
 
 # Fedora specific patches
 Patch215:        firefox-enable-addons.patch
@@ -308,6 +309,7 @@ This package contains results of tests executed during build.
 #%patch35 -p1 -b .ppc-jit
 #%endif
 %patch37 -p1 -b .jit-atomic-lucky
+%patch39 -p1 -b .fix-attr-order
 
 %patch3  -p1 -b .arm
 
@@ -873,6 +875,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Feb 13 2018 Martin Stransky <stransky@redhat.com> - 58.0.1-2
+- Added build fix for gcc8 by Tom Callaway
+
 * Tue Jan 30 2018 Martin Stransky <stransky@redhat.com> - 58.0.1-1
 - Update to 58.0.1
 
diff --git a/mozilla-fix-attr-order.patch b/mozilla-fix-attr-order.patch
new file mode 100644
index 0000000..aef2d25
--- /dev/null
+++ b/mozilla-fix-attr-order.patch
@@ -0,0 +1,28 @@
+diff -up mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c.fix-attr-order mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c
+--- mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c.fix-attr-order	2018-02-03 11:59:21.173058184 -0500
++++ mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c	2018-02-03 11:59:44.727509671 -0500
+@@ -115,8 +115,8 @@ static int32_t WeightedAverage(int16_t*
+ // undefined behavior, so not a good idea; this just makes UBSan ignore the
+ // violation, so that our old code can continue to do what it's always been
+ // doing.)
+-static inline int32_t OverflowingMulS16ByS32ToS32(int16_t a, int32_t b)
+-    RTC_NO_SANITIZE("signed-integer-overflow") {
++RTC_NO_SANITIZE("signed-integer-overflow") static inline int32_t OverflowingMulS16ByS32ToS32(int16_t a, int32_t b)
++{
+   return a * b;
+ }
+ 
+diff -up mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c.fix-attr-order mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c
+--- mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c.fix-attr-order	2018-02-03 12:00:01.033129964 -0500
++++ mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c	2018-02-03 12:00:45.758088456 -0500
+@@ -209,8 +209,8 @@ void WebRtcIsacfix_NormLatticeFilterMa(s
+ // Left shift of an int32_t that's allowed to overflow. (It's still undefined
+ // behavior, so not a good idea; this just makes UBSan ignore the violation, so
+ // that our old code can continue to do what it's always been doing.)
+-static inline int32_t OverflowingLShiftS32(int32_t x, int shift)
+-    RTC_NO_SANITIZE("shift") {
++RTC_NO_SANITIZE("shift") static inline int32_t OverflowingLShiftS32(int32_t x, int shift)
++{
+   return x << shift;
+ }
+ 
diff --git a/sources b/sources
index 300b0dc..1702bba 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,2 @@
-SHA512 (firefox-58.0.source.tar.xz) = 17a2c520973c68c5dd130bcb27407b1c20b03f74c97aeb486e86d422ab5c012e549787ae53275d6840b9d324f261ae282b98f61764ee5e0a6df1cc3e3c9e2632
-SHA512 (firefox-langpacks-58.0-20180123.tar.xz) = 6781bf0a5d68bdaa513f85404b8d9111bef8d2aa6d12e1b5fa8db2e4f44fce2d2642b9b5a70a6fc92f0cb96167f6895e17505bdc212aea987240cfb018f340f5
 SHA512 (firefox-58.0.1.source.tar.xz) = 65a6a68f95dac93fc68c4e240742b172a6417e7fafca2671ab13f398329ba0ef3195bbaaecea2d9f8b2992217cfaa7912af6c0351a1efe4cf2d2bba838ecd711
 SHA512 (firefox-langpacks-58.0.1-20180130.tar.xz) = 8f2dd980ce26dc9c18283b6e7200064804862a206082aea14772dc95f2a232b701679b7bff2d665f81ee96bbfa8b561ab51ab87ce3e82313e6e6197fcc804ed6