thunderbird: added sed 4.3 patch

3 files changed, 67 insertions, 51 deletions

diff --git a/thunderbird/.md5sum b/thunderbird/.md5sum
index c0a2fe7a4..059d12fcd 100644
--- a/thunderbird/.md5sum
+++ b/thunderbird/.md5sum
@@ -1,3 +1,4 @@
+59fb1f33c7fd98901e45764f180e3300  icu.m4.patch
 efb6b195c9c27a654ba115d7eda4362e  thunderbird-45.6.0.source.tar.xz
 6e75d01fea2602a9fc33028dc3441cfa  thunderbird-gcc6.patch
 9a78c5c35311cc20425913c5598bf2b9  thunderbird-install-dir.patch
diff --git a/thunderbird/Pkgfile b/thunderbird/Pkgfile
index a04953b0d..345b14aec 100644
--- a/thunderbird/Pkgfile
+++ b/thunderbird/Pkgfile
@@ -1,66 +1,69 @@
 # Description: email client from the Mozilla project
-# URL:         http://www.mozillamessaging.com/en-US/thunderbird/
+# 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
 
 name=thunderbird
 version=45.6.0
-release=1
+release=2
 source=(http://ftp.mozilla.org/pub/thunderbird/releases/$version/source/$name-$version.source.tar.xz
-    	$name.desktop thunderbird-install-dir.patch thunderbird-gcc6.patch)
+	$name.desktop thunderbird-install-dir.patch thunderbird-gcc6.patch icu.m4.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
-    export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$name"
+	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"
 
 cat <<- EOF > .mozconfig
-    mk_add_options MOZ_MAKE_FLAGS="$MAKEFLAGS -s"
-    ac_add_options --prefix=/usr
-    ac_add_options --enable-application=mail
-    ac_add_options --with-system-jpeg
-    ac_add_options --with-system-zlib
-    ac_add_options --with-system-bz2
-    ac_add_options --with-system-mng
-    ac_add_options --with-system-png
-    ac_add_options --with-system-nspr
-    ac_add_options --with-system-nss
-    ac_add_options --enable-system-ffi
-    ac_add_options --enable-system-pixman
-    #ac_add_options --enable-system-sqlite
-    ac_add_options --enable-system-cairo
-    ac_add_options --with-pthreads
-    ac_add_options --enable-optimize="$CFLAGS"
-    ac_add_options --enable-official-branding
-    ac_add_options --enable-shared
-    ac_add_options --enable-single-profile
-    ac_add_options --enable-calendar
-    ac_add_options --enable-pie
-    ac_add_options --disable-gstreamer
-    ac_add_options --disable-tests
-    ac_add_options --disable-mochitest
-    ac_add_options --disable-dbus
-    ac_add_options --disable-debug
-    ac_add_options --disable-installer
-    ac_add_options --disable-updater
-    ac_add_options --disable-profilesharing
-    ac_add_options --disable-crashreporter
-    ac_add_options --disable-necko-wifi
-    ac_add_options --disable-libnotify
-    ac_add_options --disable-pulseaudio
-    ac_add_options --with-distribution-id=nu.crux
-    ac_add_options --disable-gconf
-    ac_add_options --disable-elf-hack
+	mk_add_options MOZ_MAKE_FLAGS="$MAKEFLAGS -s"
+	ac_add_options --prefix=/usr
+	ac_add_options --enable-application=mail
+	ac_add_options --with-system-jpeg
+	ac_add_options --with-system-zlib
+	ac_add_options --with-system-bz2
+	ac_add_options --with-system-mng
+	ac_add_options --with-system-png
+	ac_add_options --with-system-nspr
+	ac_add_options --with-system-nss
+	ac_add_options --enable-system-ffi
+	ac_add_options --enable-system-pixman
+	#ac_add_options --enable-system-sqlite
+	ac_add_options --enable-system-cairo
+	ac_add_options --with-pthreads
+	ac_add_options --enable-optimize="$CFLAGS"
+	ac_add_options --enable-official-branding
+	ac_add_options --enable-shared
+	ac_add_options --enable-single-profile
+	ac_add_options --enable-calendar
+	ac_add_options --enable-pie
+	ac_add_options --disable-gstreamer
+	ac_add_options --disable-tests
+	ac_add_options --disable-mochitest
+	ac_add_options --disable-dbus
+	ac_add_options --disable-debug
+	ac_add_options --disable-installer
+	ac_add_options --disable-updater
+	ac_add_options --disable-profilesharing
+	ac_add_options --disable-crashreporter
+	ac_add_options --disable-necko-wifi
+	ac_add_options --disable-libnotify
+	ac_add_options --disable-pulseaudio
+	ac_add_options --with-distribution-id=nu.crux
+	ac_add_options --disable-gconf
+	ac_add_options --disable-elf-hack
 EOF
-    make -f client.mk build
-    make -f client.mk DESTDIR=$PKG install
+	make -f client.mk build
+	make -f client.mk DESTDIR=$PKG install
 
-    mkdir -p $PKG/usr/share/pixmaps
-    ln -s /usr/lib/thunderbird/chrome/icons/default/default48.png $PKG/usr/share/pixmaps/thunderbird_default48.png
-    install -D -m 0644 $SRC/$name.desktop $PKG/usr/share/applications/$name.desktop
+	mkdir -p $PKG/usr/share/pixmaps
+	ln -s /usr/lib/thunderbird/chrome/icons/default/default48.png $PKG/usr/share/pixmaps/thunderbird_default48.png
+	install -D -m 0644 $SRC/$name.desktop $PKG/usr/share/applications/$name.desktop
 
-    find $PKG -iname '*README*' -delete
-    rm -r $PKG/usr/{include,lib/thunderbird-devel,share/idl}
+	find $PKG -iname '*README*' -delete
+	rm -r $PKG/usr/{include,lib/thunderbird-devel,share/idl}
 }
diff --git a/thunderbird/icu.m4.patch b/thunderbird/icu.m4.patch
new file mode 100644
index 000000000..72f91a3ea
--- /dev/null
+++ b/thunderbird/icu.m4.patch
@@ -0,0 +1,12 @@
+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