From 207d42015f9ab410a4166163e1e45ec9ce3bcbef Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Fri, 20 Jan 2017 12:41:19 +0100
Subject: [PATCH] Added mozbz#1329272 build fix

---
 mozilla-1329272.patch | 29 +++++++++++++++++++++++++++++
 thunderbird-mozconfig |  1 -
 thunderbird.spec      | 10 ++++------
 3 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 mozilla-1329272.patch

diff --git a/mozilla-1329272.patch b/mozilla-1329272.patch
new file mode 100644
index 0000000..ab0b26b
--- /dev/null
+++ b/mozilla-1329272.patch
@@ -0,0 +1,29 @@
+From 66fc64a75617ffc68f16780f60e39c1f368dfd41 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Mon, 9 Jan 2017 14:37:33 +0100
+Subject: [PATCH] bug 1329272: add bracket for sed 4.3 compliance, r=glandium
+
+---
+ build/autoconf/icu.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
+index 4f46345f435a..794ddcdf4e52 100644
+--- a/build/autoconf/icu.m4
++++ b/build/autoconf/icu.m4
+@@ -67,11 +67,11 @@ if test -n "$USE_ICU"; then
+         if test ! -d "$icudir"; then
+             AC_MSG_ERROR([Cannot find the ICU directory])
+         fi
+     fi
+ 
+-    version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
++    version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
+     if test x"$version" = x; then
+        AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
+     fi
+     MOZ_ICU_VERSION="$version"
+ 
+-- 
+2.11.0
+
diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig
index 9685f84..6358b19 100644
--- a/thunderbird-mozconfig
+++ b/thunderbird-mozconfig
@@ -30,7 +30,6 @@ ac_add_options --enable-gio
 ac_add_options --disable-gnomevfs
 ac_add_options --disable-gstreamer
 ac_add_options --enable-pie
-ac_add_options --without-system-icu
 
 # lightning related
 ac_add_options --enable-calendar
diff --git a/thunderbird.spec b/thunderbird.spec
index 56cf361..27fd9c2 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -109,6 +109,7 @@ Patch402:       rhbz-1014858.patch
 
 # NSS 3.28.1 patch
 Patch500:       mozilla-1290037.patch
+Patch501:       mozilla-1329272.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -156,8 +157,7 @@ BuildRequires:  mesa-libGL-devel
 BuildRequires:  libvpx-devel >= %{libvpx_version}
 Requires:       libvpx >= %{libvpx_version}
 BuildRequires:  pulseaudio-libs-devel
-# Disabled due to build failure
-#BuildRequires:  libicu-devel
+BuildRequires:  libicu-devel
 BuildRequires:  GConf2-devel
 Requires:       mozilla-filesystem
 BuildRequires:  yasm
@@ -229,6 +229,7 @@ cd mozilla
 %patch304 -p1 -b .1245783
 # NSS 3.28.1 patch
 %patch500 -p1 -b .1290037
+%patch501 -p1 -b .1329272
 cd ..
 
 %patch105 -p1 -b .bad-langs
@@ -617,10 +618,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
-* Fri Jan 20 2017 Martin Stransky <stransky@redhat.com> - 45.6.0-5
-- Disabled system ICU due to build errors.
-
-* Fri Jan 20 2017 Martin Stransky <stransky@redhat.com> - 45.6.0-4
+* Fri Jan 20 2017 Martin Stransky <stransky@redhat.com> - 45.6.0-6
 - Rebuilt for new nss 3.28.1 (mozbz#1290037)
 
 * Fri Jan  6 2017 Jan Horak <jhorak@redhat.com> - 45.6.0-3