From 63db5e05ccc407dcb64001df6b27abdb0e2f4886 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Fri, 26 Feb 2016 11:43:36 +0100
Subject: [PATCH] Disabled gcc6 NULL pointer optimization (rhbz#1311886) again

---
 thunderbird.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/thunderbird.spec b/thunderbird.spec
index fc34cec..3e5e6f8 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -64,7 +64,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        38.6.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -331,6 +331,8 @@ MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
                       %{__sed} -e 's/-Wall//')
 #rhbz#1037353
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security"
+# Disable null pointer gcc6 optimization (rhbz#1311886)
+MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fno-delete-null-pointer-checks"
 # Use hardened build?
 %if %{?hardened_build}
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
@@ -596,6 +598,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Fri Feb 26 2016 Martin Stransky <stransky@redhat.com> - 38.6.0-6
+- Disabled gcc6 NULL pointer optimization (rhbz#1311886) again
+  due to unfixed various TB parts
+
 * Thu Feb 25 2016 Martin Stransky <stransky@redhat.com> - 38.6.0-5
 - Added upstream gcc6 fix (mozbz#1167145)