extra/thunderbird to 60.0-3

extra/thunderbird/PKGBUILD

@@ -7,15 +7,14 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - mozconfig changes for ARM
-#  - remove rust makedepend
+#  - revert change for clang that breaks gcc build on ARM
 
 buildarch=12
 highmem=1
-noautobuild=1
 
 pkgname=thunderbird
 pkgver=60.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Standalone mail and news reader from mozilla.org"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -27,9 +26,11 @@ makedepends=(unzip zip diffutils python2 yasm mesa imake gconf libpulse inetutil
 optdepends=('libcanberra: sound support')
 options=(!emptydirs !makeflags)
 source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz
-        $pkgname.desktop)
+        $pkgname.desktop
+        https://hg.mozilla.org/mozilla-central/raw-rev/537f4d1d837a)
 sha256sums=('bd7da88dcc03c448a4e975b5a1d3e9bf466ec9151b1059392bcdb50955a22056'
-            'e44c55501f650a4e80b9c353b81f33e07ca65808db831eff6ca616aded233827')
+            'e44c55501f650a4e80b9c353b81f33e07ca65808db831eff6ca616aded233827'
+            '9fa42f3a4ccd255b56f4157119c08ff19df9f972aa25af4cbb685e3683139c24')
 
 # 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
@@ -55,9 +56,9 @@ ac_add_options --enable-calendar
 
 ac_add_options --prefix=/usr
 ac_add_options --enable-release
-ac_add_options --enable-linker=gold
-ac_add_options --enable-hardening
-ac_add_options --enable-optimize
+#ac_add_options --enable-linker=gold
+#ac_add_options --enable-hardening
+#ac_add_options --enable-optimize
 ac_add_options --enable-rust-simd
 
 # Branding
@@ -69,6 +70,9 @@ ac_add_options --with-distribution-id=org.archlinux
 ac_add_options --with-google-api-keyfile=${PWD@Q}/google-api-key
 ac_add_options --with-mozilla-api-keyfile=${PWD@Q}/mozilla-api-key
 
+# ALARM
+ac_add_options --disable-webrtc
+
 # System libraries
 ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
@@ -88,6 +92,16 @@ ac_add_options --enable-startup-notification
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 END
+
+  if [[ $CARCH == "armv7h" ]]; then
+    echo "ac_add_options --disable-elf-hack" >> .mozconfig
+    echo 'ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns"' >> .mozconfig
+  elif [[ $CARCH == "aarch64" ]]; then
+    echo 'ac_add_options --enable-optimize="-O2"' >> .mozconfig
+  fi
+
+  patch -Rp1 -i ../537f4d1d837a
+  LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 }
 
 build() {
@@ -104,7 +118,10 @@ package() {
   _vendorjs="$pkgdir/usr/lib/$pkgname/defaults/preferences/vendor.js"
   install -Dm644 /dev/stdin "$_vendorjs" <<END
 // Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
+pref("intl.locale.requested", "");
+
+// Use system-provided dictionaries
+pref("spellchecker.dictionary_path", "/usr/share/hunspell");
 
 // Disable default mailer checking.
 pref("mail.shell.checkDefaultMail", false);
@@ -127,10 +144,12 @@ app.distributor.channel=$pkgname
 app.partner.archlinux=archlinux
 END
 
-  for i in 16 22 24 32 48 256; do
+  for i in 16 22 24 32 48 64 128 256; do
     install -Dm644 comm/mail/branding/thunderbird/default${i}.png \
       "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
   done
+  install -Dm644 comm/mail/branding/thunderbird/TB-symbolic.svg \
+    "$pkgdir/usr/share/icons/hicolor/symbolic/apps/thunderbird-symbolic.svg"
 
   install -Dm644 ../$pkgname.desktop \
     "$pkgdir/usr/share/applications/$pkgname.desktop"