From f4730219a4d05726feaf766ae49af33fb56ccc66 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Wed, 13 May 2020 06:33:43 -0400
Subject: [nonprism/icedove]: upgrade to v68.8.0

---
 nonprism/icedove/PKGBUILD | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'nonprism')

diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD
index 2b68edf97..82cd6bdc5 100644
--- a/nonprism/icedove/PKGBUILD
+++ b/nonprism/icedove/PKGBUILD
@@ -12,18 +12,19 @@
 
 # parabola changes and rationale:
 #  - rebranded to icedove
-#  - removed nonfree search engines
 #  - added makedepends: quilt mozilla-searchplugins python2-blessings
 #  - added replaces, conflicts: thunderbird
 #  - disabled tests, they break in an environment without network access.
+#  - removed nonfree search engines
+#  - removed support for insecure chat protocols
 
 _pkgname=thunderbird
 pkgname=icedove
 replaces=("$_pkgname")
 epoch=1
-pkgver=68.6.0
+pkgver=68.8.0
 pkgrel=1
-pkgrel+=.parabola2.nonprism1
+pkgrel+=.parabola3.nonprism1
 _brandingver=68.6
 _brandingrel=1
 pkgdesc='Standalone mail and news reader based on Mozilla Thunderbird'
@@ -34,6 +35,7 @@ arch+=(i686 armv7h)
 license=(MPL GPL LGPL)
 depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib alsa-lib
          nss hunspell sqlite ttf-font icu)  # libvpx
+depends+=(icu-parabola libicudata.so=67)
 makedepends=(unzip zip diffutils python python2 yasm nasm mesa imake libpulse inetutils xorg-server-xvfb
              autoconf2.13 rust clang llvm gtk2 cbindgen nodejs)
 makedepends+=(quilt mozilla-searchplugins python2-blessings imagemagick)
@@ -41,19 +43,18 @@ 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)
-source+=(
-         https://repo.parabola.nu/other/icedove/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz{,.sig}
+source+=(https://repo.parabola.nu/other/icedove/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz{,.sig}
          libre-searchengines.patch
          mozilla-1338795-regression.patch)
 source_armv7h=(arm-wasm-vfp.patch)
-sha256sums=('4e3b8fdcfae12e7d49232a9c324e82d47ed94b371031f31baf69b2f7c2fb5b51'
+sha512sums=('1af899913454e97ba3b08a090f775c0ce65ae6d8c1d31171017f09355a0bb126516d4770b4a4a0e774419497c404fa70dcfcafdf767c9caba0bf1d658c0d9350'
             'SKIP'
-            'af8199a12ebe09189d143458bd1e2d0071aff3410ed121dc2329a448a56632f0'
-            '23693c60df02067981dbcad7c58c29e6e38a73b54fd00cfabd94f38e45062dfd'
+            'a3c9815491d9bed0440c60f35867a5b8a2a1343521f288035fcc46e651a11b926c75a9eca2d262b43d510a7a7119709b53637f1b00ddbbee8e5b0a4b33d7b8fd'
+            '5784493253f9b2b231a7f18d7c3c4a4bb9aec7ac4fa801772ac223342676e388ae0c094b95d89d92c1bd38c2f19feb6f51e074d0ea20228a256b6240ecf34832'
             'SKIP'
-            '072bba9d9ef4cfcb03b3776a15e52020e05c685add38329bd041f680026f5898'
-            'dbec24e57a445b1076a11fde00d0f5b8cd53ce314c2b9d3cd2a83bd84fc25375')
-sha256sums_armv7h=(bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966)
+            '3f3160441aa17a50b8bf9f95a0fed8e3428864901d7368409903289f069f51fa94e24b6140bf17981b91b55df77c7c29adb870dda9f1596a77ce1a54a62cac00'
+            'f4e892fc7af85877ef6cedd82313f6c0f335cb676cfb30badaa127c51aed00773212b99f1598f5709d6f481f12264463d6334bcde8e8da38ec1ea666622d28a1')
+sha512sums_armv7h=('c25883c4860e511a99d9fbfba5b824145c0862729101721605725f609ca2a41848b741dd100eff390f57031dc5f14af3ea30133de30f75cb20197c420ae20972')
 validpgpkeys=(14F26682D0916CDD81E37B6D61B7B526D98F0353) # Mozilla Software Releases <release@mozilla.com>
 validpgpkeys+=(BFA8008A8265677063B11BF47171986E4B745536) # Andreas Grapentin
 
@@ -198,6 +199,10 @@ END
 build() {
   cd $_pkgname-$pkgver
 
+  # clang-10: error: unknown argument: '-fvar-tracking-assignments'
+  CFLAGS="${CFLAGS/-fvar-tracking-assignments/}"
+  CXXFLAGS="${CXXFLAGS/-fvar-tracking-assignments/}"
+
   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
@@ -217,10 +222,6 @@ build() {
 }
 
 package() {
-  local _icu_ver
-  _icu_ver=$(pacman -S --print-format='%v' icu)
-  depends+=("icu>=${_icu_ver}" "icu<$((${_icu_ver%%.*} + 1))")
-
   cd $_pkgname-$pkgver
   DESTDIR="$pkgdir" ./mach install
 
@@ -294,4 +295,3 @@ END
     "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
 }
 
-# vim:set sw=2 et:
-- 
cgit v1.2.3