thunderbird: added sed 4.3 patch

This commit is contained in:
Fredrik Rinnestam 2017-01-13 18:47:46 +01:00
parent 1287bba8a9
commit 1970bd8049
3 changed files with 67 additions and 51 deletions

View File

@ -1,3 +1,4 @@
59fb1f33c7fd98901e45764f180e3300 icu.m4.patch
efb6b195c9c27a654ba115d7eda4362e thunderbird-45.6.0.source.tar.xz efb6b195c9c27a654ba115d7eda4362e thunderbird-45.6.0.source.tar.xz
6e75d01fea2602a9fc33028dc3441cfa thunderbird-gcc6.patch 6e75d01fea2602a9fc33028dc3441cfa thunderbird-gcc6.patch
9a78c5c35311cc20425913c5598bf2b9 thunderbird-install-dir.patch 9a78c5c35311cc20425913c5598bf2b9 thunderbird-install-dir.patch

View File

@ -5,16 +5,19 @@
name=thunderbird name=thunderbird
version=45.6.0 version=45.6.0
release=1 release=2
source=(http://ftp.mozilla.org/pub/thunderbird/releases/$version/source/$name-$version.source.tar.xz 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() { build() {
cd $name-$version cd $name-$version
sed -i '/^ftglyph.h/ i freetype/ftfntfmt.h' mozilla/config/system-headers 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-install-dir.patch
patch -p1 -i $SRC/thunderbird-gcc6.patch patch -p1 -i $SRC/thunderbird-gcc6.patch
patch -p1 -i $SRC/icu.m4.patch
export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$name" 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 cat <<- EOF > .mozconfig
mk_add_options MOZ_MAKE_FLAGS="$MAKEFLAGS -s" mk_add_options MOZ_MAKE_FLAGS="$MAKEFLAGS -s"

12
thunderbird/icu.m4.patch Normal file
View File

@ -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