From 7e130731a332e3d5d593b52869e2f4e02da33f59 Mon Sep 17 00:00:00 2001 From: J0WI Date: Sat, 26 Oct 2019 17:04:12 +0200 Subject: testing/thunderbird: upgrade to 68.2.0 --- testing/thunderbird/APKBUILD | 113 ++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 72 deletions(-) (limited to 'testing/thunderbird/APKBUILD') diff --git a/testing/thunderbird/APKBUILD b/testing/thunderbird/APKBUILD index 191fcf8c8b..a610b5e845 100644 --- a/testing/thunderbird/APKBUILD +++ b/testing/thunderbird/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: Joseph Benden pkgname=thunderbird -pkgver=60.9.0 +pkgver=68.2.0 _pkgver=$pkgver _xulver=$pkgver pkgrel=0 pkgdesc="Thunderbird email client" url="https://www.thunderbird.net/" -arch="x86_64" +arch="x86_64 aarch64" # limited by rust and cargo license="GPL-3.0-or-later AND LGPL-2.1-or-later AND MPL-2.0" options="!check !strip" depends=" @@ -56,17 +56,16 @@ makedepends=" libtheora-dev libtool libvorbis-dev - libvpx-dev libxcomposite-dev libxt-dev - llvm-dev + llvm9-dev mesa-dev nasm nodejs nspr-dev nss-dev nss-static - paxmark + python2 python3-dev sed sqlite-dev @@ -77,38 +76,23 @@ makedepends=" " source="https://ftp.mozilla.org/pub/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz stab.h + + disable-ccache-stats.patch fix-fortify-system-wrappers.patch - fix-fortify-inline.patch fix-seccomp-bpf.patch fix-toolkit.patch fix-tools.patch mallinfo.patch - mozilla-build-arm.patch + disable-moz-stackwalk.patch + fix-musl.patch fix-rust-target.patch - fix-bug-1261392.patch fix-webrtc-glibcisms.patch - sandbox-membarrier.patch - rust-unitialized-field.patch - rust133.patch - 0003-Disable-ccache-stats.patch - rust-cssparser.patch + fix-sandbox-membarrier.patch thunderbird.desktop " _mozappdir=/usr/lib/$pkgname -# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) -# Note: These are for Arch Linux use ONLY. For your own distribution, please -# get your own set of keys. Feel free to contact foutrelis@archlinux.org for -# more information. -_google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM - -# Mozilla API keys (see https://location.services.mozilla.com/api) -# Note: These are for Arch Linux use ONLY. For your own distribution, please -# get your own set of keys. Feel free to contact heftig@archlinux.org for -# more information. -_mozilla_api_key=16674381-f021-49de-8622-3021c5942aff - # help our shared-object scanner to find the libs ldpath="$_mozappdir" sonameprefix="$pkgname:" @@ -129,14 +113,11 @@ prepare() { mkdir -p "$builddir"/objdir echo "ac_add_options BINDGEN_CFLAGS='-I/usr/include/nspr -I/usr/include/pixman-1'" >>objdir/.mozconfig - # add API keys - echo -n "${_google_api_key}" > $builddir/objdir/google-api-key - echo -n "${_mozilla_api_key}" > $builddir/objdir/mozilla-api-key - _clear_vendor_checksums cssparser } build() { + mkdir -p "$builddir"/objdir cd "$builddir"/objdir sed -e 's/checkImpl/checkFFImpl/g' -i ../js/src/vm/JSContext*.h @@ -158,18 +139,29 @@ build() { export CXXFLAGS="$CXXFLAGS -Wno-class-memaccess -Wno-multistatement-macros -Wno-ignored-qualifiers" export LDFLAGS="$LDFLAGS -Wno-subobject-linkage" - ../mach configure \ + case "$CARCH" in + x86_64) + # disable-elf-hack: exists only on arm, x86, x86_64 + _arch_config="--disable-elf-hack" + export RUST_TARGET="$CTARGET" + ;; + aarch64) + export RUST_TARGET="aarch64-unknown-linux-musl" + ;; + esac + + ../configure \ --prefix=/usr \ --libdir=/usr/lib \ + $_arch_config \ \ --disable-crashreporter \ - --disable-elf-hack \ --disable-gold \ - --enable-install-strip \ + --disable-install-strip \ --disable-jemalloc \ --disable-profiling \ --disable-pulseaudio \ - --enable-strip \ + --disable-strip \ --disable-tests \ --disable-updater \ --disable-debug \ @@ -180,22 +172,17 @@ build() { --enable-application=comm/mail \ --enable-default-toolkit=cairo-gtk3 \ --enable-official-branding \ - --enable-optimize="$CFLAGS -fno-ident -fmerge-all-constants -ffunction-sections -fdata-sections -Wno-maybe-uninitialized -Wno-implicit-fallthrough -Wno-unused-function" \ + --enable-optimize="$CFLAGS -O2 -fno-ident -fmerge-all-constants -ffunction-sections -fdata-sections -Wno-maybe-uninitialized -Wno-implicit-fallthrough -Wno-unused-function" \ --enable-release \ --enable-startup-notification \ --enable-system-ffi \ --enable-system-sqlite \ --enable-ffmpeg \ --enable-hardening \ - \ - --with-google-location-service-api-keyfile="${builddir}/objdir/google-api-key" \ - --with-google-safebrowsing-api-keyfile="${builddir}/objdir/google-api-key" \ - --with-mozilla-api-keyfile="${builddir}/objdir/mozilla-api-key" \ + --enable-rust-simd \ \ --with-system-bz2 \ - --with-system-hunspell \ --with-system-icu \ - --with-system-jpeg \ --with-system-libevent \ --with-system-nspr \ --with-system-nss \ @@ -205,9 +192,9 @@ build() { --without-ccache \ --with-clang-path=/usr/bin/clang \ --with-libclang-path=/usr/lib - #--with-system-libvpx # requires 1.7x to work, we've got 1.8.0 currently - - ../mach build -v + # FIXME: fix build with --with-system-libvpx and libvpx 1.8.0 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1525393 + make } package() { @@ -233,14 +220,6 @@ package() { install -m644 ${srcdir}/$pkgname.desktop ${pkgdir}/usr/share/applications/$pkgname.desktop - # thunderbird currently does not work with mprotect. disable it for now - local paxflags="-mp" - [ "$CARCH" = "x86" ] && paxflags="-msp" - - paxmark "$paxflags" "$pkgdir"/$_mozappdir/thunderbird-bin - paxmark "$paxflags" "$pkgdir"/$_mozappdir/plugin-container - paxmark "$paxflags" "$pkgdir"/$_mozappdir/pingsender - _vendorjs="$pkgdir/usr/lib/$pkgname/defaults/preferences/vendor.js" install -Dm644 /dev/stdin "$_vendorjs" <