From c7e1a11b6423614e612828afcb98bb31a21ea390 Mon Sep 17 00:00:00 2001
From: Fredrik Rinnestam <fredrik@crux.nu>
Date: Thu, 26 Jan 2017 22:03:42 +0100
Subject: [PATCH] thunderbird: updated to 45.7.0. Security fix:

https://www.mozilla.org/en-US/security/known-vulnerabilities/thunderbird/#thunderbird45.7
---
 thunderbird/.md5sum      |  3 +--
 thunderbird/Pkgfile      | 15 +++++++--------
 thunderbird/icu.m4.patch | 12 ------------
 3 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100644 thunderbird/icu.m4.patch

diff --git a/thunderbird/.md5sum b/thunderbird/.md5sum
index 059d12fcd..f36699865 100644
--- a/thunderbird/.md5sum
+++ b/thunderbird/.md5sum
@@ -1,5 +1,4 @@
-59fb1f33c7fd98901e45764f180e3300  icu.m4.patch
-efb6b195c9c27a654ba115d7eda4362e  thunderbird-45.6.0.source.tar.xz
+ac8bc081c601c96d683b94c79abda114  thunderbird-45.7.0.source.tar.xz
 6e75d01fea2602a9fc33028dc3441cfa  thunderbird-gcc6.patch
 9a78c5c35311cc20425913c5598bf2b9  thunderbird-install-dir.patch
 87f8666f06ba8c3668e39068050bb77a  thunderbird.desktop
diff --git a/thunderbird/Pkgfile b/thunderbird/Pkgfile
index 345b14aec..327e89c9e 100644
--- a/thunderbird/Pkgfile
+++ b/thunderbird/Pkgfile
@@ -1,20 +1,19 @@
-# Description: email client from the Mozilla project
-# URL:			http://www.mozillamessaging.com/en-US/thunderbird/
-# Maintainer:  Fredrik Rinnestam, fredrik at crux dot nu
-# Depends on:  python,unzip,zip,gtk,alsa-lib,xorg-libxt,libidl,nss,yasm,mesa3d,libjpeg-turbo
+# Description:	email client from the Mozilla project
+# URL:		http://www.mozillamessaging.com/en-US/thunderbird/
+# Maintainer:	Fredrik Rinnestam, fredrik at crux dot nu
+# Depends on:	python,unzip,zip,gtk,alsa-lib,xorg-libxt,libidl,nss,yasm,mesa3d,libjpeg-turbo,autoconf-2.13
 
 name=thunderbird
-version=45.6.0
-release=2
+version=45.7.0
+release=1
 source=(http://ftp.mozilla.org/pub/thunderbird/releases/$version/source/$name-$version.source.tar.xz
-	$name.desktop thunderbird-install-dir.patch thunderbird-gcc6.patch icu.m4.patch)
+	$name.desktop thunderbird-install-dir.patch thunderbird-gcc6.patch)
  
 build() {
 	cd $name-$version
 	sed -i '/^ftglyph.h/ i freetype/ftfntfmt.h' mozilla/config/system-headers
 	patch -p1 -i $SRC/thunderbird-install-dir.patch
 	patch -p1 -i $SRC/thunderbird-gcc6.patch
-	patch -p1 -i $SRC/icu.m4.patch
 	export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$name"
 	export CFLAGS="$CFLAGS -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
 	export CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
diff --git a/thunderbird/icu.m4.patch b/thunderbird/icu.m4.patch
deleted file mode 100644
index 72f91a3ea..000000000
--- a/thunderbird/icu.m4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN thunderbird-45.6.0-orig/mozilla/build/autoconf/icu.m4 thunderbird-45.6.0/mozilla/build/autoconf/icu.m4
---- thunderbird-45.6.0-orig/mozilla/build/autoconf/icu.m4	2017-01-13 17:50:15.826997189 +0100
-+++ thunderbird-45.6.0/mozilla/build/autoconf/icu.m4	2017-01-13 17:51:27.954485872 +0100
-@@ -73,7 +73,7 @@ if test -n "$USE_ICU"; then
-         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