diff options
Diffstat (limited to 'nonprism/icedove/PKGBUILD')
| -rw-r--r-- | nonprism/icedove/PKGBUILD | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD index 45350a1d5..1a0a43ec8 100644 --- a/nonprism/icedove/PKGBUILD +++ b/nonprism/icedove/PKGBUILD @@ -21,10 +21,10 @@ _pkgname=thunderbird pkgname=icedove replaces=("$_pkgname") epoch=1 -pkgver=68.2.2 -pkgrel=2 +pkgver=68.6.0 +pkgrel=1 pkgrel+=.parabola1.nonprism1 -_brandingver=68.2 +_brandingver=68.6 _brandingrel=1 pkgdesc='Standalone mail and news reader based on Mozilla Thunderbird' pkgdesc+=', without support for unsafe and dangerous for privacy protocols' @@ -40,26 +40,28 @@ makedepends+=(quilt mozilla-searchplugins python2-blessings imagemagick) optdepends=('libcanberra: sound support') options=(!emptydirs !makeflags) source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz{,.asc} - $pkgname.desktop - thunderbird-rust-1.39.patch) + $pkgname.desktop) source+=( https://repo.parabola.nu/other/icedove/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz{,.sig} - libre-searchengines.patch) -sha256sums=('c17edbcde0e9e7599cda16b69b130039f69113b498ea394057cedfae153f0dd3' + libre-searchengines.patch + mozilla-1338795-regression.patch) +source_armv7h=(arm-wasm-vfp.patch) +sha256sums=('4e3b8fdcfae12e7d49232a9c324e82d47ed94b371031f31baf69b2f7c2fb5b51' 'SKIP' 'af8199a12ebe09189d143458bd1e2d0071aff3410ed121dc2329a448a56632f0' - '08834ef1c2dd685edd40dea20dfa9d4b889f5c387385ac329a162eeff6cf90be' - 'b36792a6fcbe68841bc842723222c88ecf1f54f7f75bd634b216b61f3ae422f2' + '23693c60df02067981dbcad7c58c29e6e38a73b54fd00cfabd94f38e45062dfd' 'SKIP' - '072bba9d9ef4cfcb03b3776a15e52020e05c685add38329bd041f680026f5898') + '072bba9d9ef4cfcb03b3776a15e52020e05c685add38329bd041f680026f5898' + 'dbec24e57a445b1076a11fde00d0f5b8cd53ce314c2b9d3cd2a83bd84fc25375') +sha256sums_armv7h=(bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966) validpgpkeys=(14F26682D0916CDD81E37B6D61B7B526D98F0353) # Mozilla Software Releases <release@mozilla.com> validpgpkeys+=(BFA8008A8265677063B11BF47171986E4B745536) # Andreas Grapentin prepare() { cd $_pkgname-$pkgver - patch -p1 -i ../thunderbird-rust-1.39.patch # Fix build with rust 1.39 (Gentoo) - + # see https://labs.parabola.nu/issues/2267 + patch -Np1 -i "$srcdir"/mozilla-1338795-regression.patch cat >.mozconfig <<END ac_add_options --enable-application=comm/mail @@ -104,10 +106,15 @@ ac_add_options --disable-tests END if [[ $CARCH = arm* ]]; then + patch -Np1 -i "$srcdir"/arm-wasm-vfp.patch + sed -i '/--enable-linker=gold/d' .mozconfig sed -i '/--enable-hardening/d' .mozconfig sed -i '/--enable-optimize/d' .mozconfig + LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" + export LDFLAGS + cat >> .mozconfig <<END ac_add_options --disable-webrtc ac_add_options --disable-elf-hack @@ -117,6 +124,8 @@ END if [[ $CARCH = i686 ]]; then sed -i 's/--enable-linker=gold/--enable-linker=bfd/' .mozconfig + LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" + export LDFLAGS fi # perform rebranding @@ -188,11 +197,15 @@ build() { if [[ $CARCH = armv7h ]]; then export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" + sed -i "s/\(cargo_rustc_flags += -C lto\)/#\1/" config/rules.mk + sed -i "s/debug_info = '2'/debug_info = '1'/" build/moz.configure/toolchain.configure + export MOZ_MAKE_FLAGS=-j1 fi if [[ $CARCH = i686 ]]; then - sed -i 's/\(cargo_rustc_flags += -C lto\)/#\1/' config/rules.mk - export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" + sed -i "s/\(cargo_rustc_flags += -C lto\)/#\1/" config/rules.mk + sed -i "s/debug_info = '2'/debug_info = '1'/" build/moz.configure/toolchain.configure + export MOZ_MAKE_FLAGS=-j1 fi ./mach configure |