Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

42 files changed, 1447 insertions, 1326 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 2f7936603..eb7983dd3 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -1,3 +1,7 @@
+# $Id$
+# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
+# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 # Maintainer: Andreas Grapentin <andreas@grapentin.org>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
@@ -5,86 +9,127 @@
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: vando <facundo@esdebian.org>
-# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 # Contributor: Figue <ffigue at gmail>
-# Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
 
-_pgo=false
+# parabola changes and rationale:
+#  - based on the PKGBUILD of iceweasel, sans rebranding
+
 
 _pkgname=firefox
 pkgname=icecat
 _pkgver=52.3.0-gnu1
 pkgver=${_pkgver//-/_}
-pkgrel=7
-
-pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox."
-arch=(i686 x86_64 armv7h)
+pkgrel=8
+pkgdesc="GNU Icecat - a libre standalone web browser based on Mozilla Firefox."
+arch=(x86_64 i686 armv7h)
 license=(MPL GPL LGPL)
-depends=(alsa-lib dbus-glib desktop-file-utils ffmpeg gtk2 gtk3 hicolor-icon-theme hunspell libvpx libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
+url="http://www.gnu.org/software/gnuzilla/"
+depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg
+         nss hunspell sqlite ttf-font libpulse libvpx icu)
 depends_x86_64=("icu>=60" "icu<61")
 depends_i686=("icu>=60" "icu<61")
 depends_armv7h=("icu>=60" "icu<61")
-makedepends=(autoconf2.13 diffutils gconf imake inetutils libpulse mesa mozilla-searchplugins python2 unzip yasm zip)
-options=(!emptydirs !makeflags debug)
-replaces=("$_pkgname")
-conflicts=("$_pkgname")
-provides=("$_pkgname")
-if $_pgo; then
-  makedepends+=(xorg-server-xvfb)
-  options+=(!ccache)
-fi
+makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb
+             autoconf2.13 rust clang llvm jack mozilla-searchplugins)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'upower: Battery API')
-url="http://www.gnu.org/software/gnuzilla/"
-install=$pkgname.install
+options=(!emptydirs !makeflags !strip)
+replaces=("$_pkgname")
+conflicts=("$_pkgname")
 source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{,.sig}
-        mozconfig
-        libre.patch
-        gnu_headshadow.png
         $pkgname.desktop
-        $pkgname-install-dir.patch
-        vendor.js
+        $pkgname-install-dir.patch no-crmf.diff
         $pkgname-fixed-loading-icon.png
-        mozilla-8904705.patch
-        mozilla-8909448.patch
+        mozilla-8904705.patch mozilla-8909448.patch
         disable-crypto-hardening-settings.patch
         disable-spoofSource-referer.patch
-        no-crmf.patch
-        no-neon.patch)
+        gnu_headshadow.png
+        libre.patch)
 sha256sums=('699ab2b41d4428ef5e360f3f33d98bc52723315cedac20bb03619846ca895302'
             'SKIP'
-            '04952e0910c7c0d24faaa1ffa486dc3dae9f2c52548ff977858bec08ccb400f3'
-            '76a657a90371e637e7c4b371b71a15c85acafcece6277455e9ede84ffe104d3e'
-            '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '52df9ffeb52166ed4abd9a132ee4a9017b9c4980f0725ba383610ccfb06d4745'
             '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47'
-            '977aa49b940f1da049cefa2878a63ac6669a78e63e9d55bb11db7b8f8fb64c33'
+            'cf224d69e89f37f92202061669014b99fbf7b1fec38fd8ba9f957711fa095729'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213'
             'dc4feddbf22ea11ae2513c68b7f3fc9047850d055a7f30d31a7ee94d7d5de12a'
             '8ed42e75b577d57e4b07f1d70137cb8e82f757abb616f1cfea694a041ad5679e'
             'bb1fc90d117c4a7810e202d23ff44a2dac11b675336533054b5a70dd8606df38'
             'c50043266e69f5844e6dce9ea7193af79587dcaa66806932d7867281a176f03e'
-            'cf224d69e89f37f92202061669014b99fbf7b1fec38fd8ba9f957711fa095729'
-            '6d0c1c9ca28b20d206ce24ca84f4d4e3f5d062a2e9cb7445fcb6c2cfea959b4a')
-validpgpkeys=(
-              'A57369A8BABC2542B5A0368C3C76EED7D7E04784' # Ruben Rodriguez
-)
+            '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
+            '76a657a90371e637e7c4b371b71a15c85acafcece6277455e9ede84ffe104d3e')
+validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez
 
 prepare() {
-  export GNU_BUILD="gnuzilla-release"
+  mkdir path
+  ln -s /usr/bin/python2 path/python
+
+  cd "$srcdir/$pkgname-${pkgver%_*}"
+  patch -Np1 -i ../$pkgname-install-dir.patch
+
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
+  patch -Np1 -i ../no-crmf.diff
+
+  cat >.mozconfig <<END
+. \$topsrcdir/browser/config/mozconfig
+
+ac_add_options --prefix=/usr
+ac_add_options --enable-release
+ac_add_options --enable-gold
+ac_add_options --enable-pie
+ac_add_options --enable-optimize="-O2"
+
+ac_add_options --enable-default-toolkit=cairo-gtk3
+
+# Branding
+ac_add_options --enable-official-branding
+ac_add_options --with-app-basename=icecat
+ac_add_options --with-app-name=icecat
+ac_add_options --enable-update-channel=release
+ac_add_options --with-distribution-id=org.gnu
+
+# System libraries
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-icu
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+
+# Features
+ac_add_options --enable-alsa
+ac_add_options --enable-startup-notification
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-safe-browsing
+ac_add_options --disable-url-classifier
+ac_add_options --disable-eme
+END
 
-  mv $pkgname-${pkgver%_*} "$srcdir/$GNU_BUILD"
-  cd "$srcdir/$GNU_BUILD"
+  if [[ "$CARCH" == arm* ]]; then
+    sed -i \
+        -e '/enable-gold/s/^/#/' \
+        -e '/enable-pie/s/^/#/' \
+        -e '/enable-optimize/d' \
+      .mozconfig
+
+    cat >> .mozconfig << END
+ac_add_options --disable-webrtc
+ac_add_options --disable-elf-hack
+ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns"
+END
+  fi
 
   # Put gnu_headshadow.png in the source code
   install -m644 "$srcdir/gnu_headshadow.png" \
     browser/base/content/abouthome
 
-  # Install to /usr/lib/$pkgname
-  patch -Np1 -i "$srcdir/$pkgname-install-dir.patch"
 
   # Patch and remove anything that's left
   patch -Np1 -i "$srcdir/libre.patch"
@@ -92,18 +137,6 @@ prepare() {
   sed -i '\|abouthome/snippet|d
          ' browser/base/jar.mn
 
-  # Load our build config, disable SafeSearch
-  cp "$srcdir/mozconfig" .mozconfig
-
-  mkdir "$srcdir/path"
-
-  # WebRTC build tries to execute "python" and expects Python 2
-  ln -s /usr/bin/python2 "$srcdir/path/python"
-
-  # Configure script misdetects the preprocessor without an optimization level
-  # https://bugs.archlinux.org/task/34644
-  sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
-
   # Fix tab loading icon (doesn't work with libpng 1.6)
   # https://bugzilla.mozilla.org/show_bug.cgi?id=841734
   cp "$srcdir/$pkgname-fixed-loading-icon.png" \
@@ -125,91 +158,103 @@ prepare() {
   # Disable spoofSource referer since it breaks referer function used by some sites
   # https://labs.parabola.nu/issues/1073
   patch -Np1 -i "$srcdir/disable-spoofSource-referer.patch"
-
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
-  patch -Np1 -i "$srcdir/no-crmf.patch"
-
-  # ARM-specific changes:
-  if [[ "$CARCH" == arm* ]]; then
-      sed -i '/ac_add_options --enable-rust/d' .mozconfig
-      echo "ac_add_options --disable-ion" >> .mozconfig
-      echo "ac_add_options --disable-elf-hack" >> .mozconfig
-      echo "ac_add_options --disable-webrtc" >> .mozconfig
-
-      # Disable gold linker, reduce memory consumption at link time
-      sed -i '/ac_add_options --enable-gold/d' .mozconfig
-      LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
-      echo "ac_add_options --disable-tests" >> .mozconfig
-      echo "ac_add_options --disable-debug" >> .mozconfig
-
-      echo "ac_add_options --disable-neon" >> .mozconfig
-      patch -Np0 -i ../no-neon.patch
-  fi
 }
 
 build() {
-  export GNU_BUILD="gnuzilla-release"
-
-  cd "$srcdir/$GNU_BUILD"
+  cd "$srcdir/$pkgname-${pkgver%_*}"
 
   # _FORTIFY_SOURCE causes configure failures
   CPPFLAGS+=" -O2"
 
-  # Hardening
-  LDFLAGS+=" -Wl,-z,now"
-
-  # GCC 6
-  CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
-  CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
-
   export PATH="$srcdir/path:$PATH"
-  export PYTHON="/usr/bin/python2"
-
-  if $_pgo; then
-    # Do PGO
-    xvfb-run -a -s "-extension GLX -screen 0 1280x1024x24" \
-      make -f client.mk build MOZ_PGO=1
-  else
-    make -f client.mk build
-  fi
+
+  # Do PGO
+  #xvfb-run -a -n 95 -s "-extension GLX -screen 0 1280x1024x24" \
+  #  make -f client.mk build MOZ_PGO=1
+  make -f client.mk build
 }
 
 package() {
-  export GNU_BUILD="gnuzilla-release"
-
-  cd "$srcdir/$GNU_BUILD"
+  cd "$srcdir/$pkgname-${pkgver%_*}"
   make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
 
-  # fix permissions on extensions folders
-  chmod 755 "$pkgdir"/usr/lib/$pkgname/browser/extensions/*/icons
+  _vendorjs="$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
+  install -Dm644 /dev/stdin "$_vendorjs" <<END
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
 
-  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
+// Disable default browser checking.
+pref("browser.shell.checkDefaultBrowser", false);
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);
+
+// Disable "alt" as a shortcut key to open full menu bar. Conflicts with "alt" as a modifier
+pref("ui.key.menuAccessKeyFocuses", false);
+
+// Make sure that Firefox Social stuff are empty
+pref("social.whitelist", "");
+pref("social.directories", "");
+
+// Disable the GeoLocation API for content
+pref("geo.enabled", false);
+
+// Make sure that the request URL of the GeoLocation backend is empty
+pref("geo.wifi.uri", "");
+
+// Disable the least secure encryption protocols
+pref("security.ssl3.ecdhe_ecdsa_rc4_128_sha", false);
+pref("security.ssl3.ecdhe_rsa_rc4_128_sha", false);
+pref("security.ssl3.rsa_rc4_128_md5", false);
+pref("security.ssl3.rsa_rc4_128_sha", false);
+END
+
+  _distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"
+  install -Dm644 /dev/stdin "$_distini" <<END
+[Global]
+id=parabola
+version=1.0
+about=Icecat for Parabola GNU/Linux-libre
+
+[Preferences]
+app.distributor=parabola
+app.distributor.channel=$pkgname
+app.partner.parabola=parabola
+END
 
-  brandingdir=browser/branding/official
-  icondir="$pkgdir/usr/share/icons/hicolor"
   for i in 16 22 24 32 48 256; do
-    install -Dm644 "$brandingdir/default$i.png" \
-      "$icondir/${i}x${i}/apps/$pkgname.png"
+    install -Dm644 "browser/branding/official/default$i.png" \
+      "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
   done
-  install -Dm644 "$brandingdir/content/icon64.png" \
-    "$icondir/64x64/apps/$pkgname.png"
-  install -Dm644 "$brandingdir/mozicon128.png" \
-    "$icondir/128x128/apps/$pkgname.png"
-  install -Dm644 "$brandingdir/content/about-logo.png" \
-    "$icondir/192x192/apps/$pkgname.png"
-  install -Dm644 "$brandingdir/content/about-logo@2x.png" \
-    "$icondir/384x384/apps/$pkgname.png"
-
-  install -d "$pkgdir/usr/share/applications"
-  install -m644 "$srcdir/$pkgname.desktop" \
-    "$pkgdir/usr/share/applications"
+  install -Dm644 "browser/branding/official/content/icon64.png" \
+    "$pkgdir/usr/share/icons/hicolor/64x64/apps/$pkgname.png"
+  install -Dm644 "browser/branding/official/mozicon128.png" \
+    "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png"
+  install -Dm644 "browser/branding/official/content/about-logo.png" \
+    "$pkgdir/usr/share/icons/hicolor/192x192/apps/$pkgname.png"
+  install -Dm644 "browser/branding/official/content/about-logo@2x.png" \
+    "$pkgdir/usr/share/icons/hicolor/384x384/apps/$pkgname.png"
+
+  install -Dm644 ../$pkgname.desktop \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
+
+  # fix permissions on extensions folders
+  chmod 755 "$pkgdir"/usr/lib/$pkgname/browser/extensions/*/icons
 
   # Use system-provided dictionaries
-  rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation}
-  ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
-  ln -s /usr/share/hyphen   "$pkgdir/usr/lib/$pkgname/hyphenation"
+  rm -r "$pkgdir"/usr/lib/$pkgname/dictionaries
+  ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
+  ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation"
+
+  # Install a wrapper to avoid confusion about binary path
+  install -Dm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" <<END
+#!/bin/sh
+exec /usr/lib/$pkgname/$pkgname "\$@"
+END
 
-  # Replace duplicate binary with symlink
+  # Replace duplicate binary with wrapper
   # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
+  ln -srf "$pkgdir/usr/bin/$pkgname" \
+    "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
 }
diff --git a/libre/icecat/icecat.install b/libre/icecat/icecat.install
deleted file mode 100644
index 1a1f4b16b..000000000
--- a/libre/icecat/icecat.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
deleted file mode 100644
index 2021d1553..000000000
--- a/libre/icecat/mozconfig
+++ /dev/null
@@ -1,45 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-ac_add_options --enable-release
-ac_add_options --enable-gold
-ac_add_options --enable-pie
-ac_add_options --enable-optimize="-O2"
-
-ac_add_options --enable-default-toolkit=cairo-gtk3
-
-# IceCat
-ac_add_options --enable-official-branding
-ac_add_options --with-distribution-id=org.gnu
-ac_add_options --with-app-basename=icecat
-ac_add_options --with-app-name=icecat
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-icu
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-# system cairo without layers acceleration results in choppy video playback
-#ac_add_options --enable-system-cairo
-ac_add_options --enable-system-pixman
-
-# Features
-ac_add_options --enable-startup-notification
-ac_add_options --enable-alsa
-ac_add_options --disable-updater
-ac_add_options --disable-crashreporter
-
-STRIP_FLAGS="--strip-debug"
-
-# Parabola features
-ac_add_options --disable-safe-browsing
-ac_add_options --disable-url-classifier
-ac_add_options --disable-eme
diff --git a/libre/icecat/no-crmf.patch b/libre/icecat/no-crmf.diff
index 3edb053ef..3edb053ef 100644
--- a/libre/icecat/no-crmf.patch
+++ b/libre/icecat/no-crmf.diff
diff --git a/libre/icecat/no-libnotify.patch b/libre/icecat/no-libnotify.patch
deleted file mode 100644
index 8d5845743..000000000
--- a/libre/icecat/no-libnotify.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git i/toolkit/system/gnome/moz.build w/toolkit/system/gnome/moz.build
-index 0ecde07..206d6eb 100644
---- i/toolkit/system/gnome/moz.build
-+++ w/toolkit/system/gnome/moz.build
-@@ -5,9 +5,7 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- SOURCES += [
--    'nsAlertsIconListener.cpp',
-     'nsGnomeModule.cpp',
--    'nsSystemAlertsService.cpp',
- ]
- 
- if CONFIG['MOZ_ENABLE_GCONF']:
-diff --git i/toolkit/system/gnome/nsGnomeModule.cpp w/toolkit/system/gnome/nsGnomeModule.cpp
-index 6ecebcc..2f193a3 100644
---- i/toolkit/system/gnome/nsGnomeModule.cpp
-+++ w/toolkit/system/gnome/nsGnomeModule.cpp
-@@ -20,8 +20,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService)
- NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init)
- NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPackageKitService, Init)
- #endif
--#include "nsSystemAlertsService.h"
--NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init)
- 
- #ifdef MOZ_ENABLE_GCONF
- NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID);
-@@ -31,7 +29,6 @@ NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID);
- NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID);
- NS_DEFINE_NAMED_CID(NS_PACKAGEKITSERVICE_CID);
- #endif
--NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID);
- 
- static const mozilla::Module::CIDEntry kGnomeCIDs[] = {
- #ifdef MOZ_ENABLE_GCONF
-@@ -42,7 +39,6 @@ static const mozilla::Module::CIDEntry kGnomeCIDs[] = {
-   { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor },
-   { &kNS_PACKAGEKITSERVICE_CID, false, nullptr, nsPackageKitServiceConstructor },
- #endif
--  { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor },
-   { nullptr }
- };
- 
-@@ -55,7 +51,6 @@ static const mozilla::Module::ContractIDEntry kGnomeContracts[] = {
-   { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID },
-   { NS_PACKAGEKITSERVICE_CONTRACTID, &kNS_PACKAGEKITSERVICE_CID },
- #endif
--  { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID },
-   { nullptr }
- };
- 
diff --git a/libre/icecat/no-neon.patch b/libre/icecat/no-neon.patch
deleted file mode 100644
index 12b0e64c1..000000000
--- a/libre/icecat/no-neon.patch
+++ /dev/null
@@ -1,123 +0,0 @@
---- configure.orig	2015-08-07 06:32:41.988366320 -0600
-+++ configure	2015-08-08 18:23:31.316475879 -0600
-@@ -7137,14 +7137,7 @@
- rm -f conftest*
-   echo "$ac_t"""$result"" 1>&6
-   if test "$result" = "yes"; then
--      cat >> confdefs.pytmp <<\EOF
--    (''' HAVE_ARM_SIMD ''', ' 1 ')
--EOF
--cat >> confdefs.h <<\EOF
--#define HAVE_ARM_SIMD 1
--EOF
--
--      HAVE_ARM_SIMD=1
-+      HAVE_ARM_SIMD=
-   fi
- 
-   echo $ac_n "checking ARM version support in compiler""... $ac_c" 1>&6
-@@ -7176,27 +7169,13 @@
- rm -f conftest*
-   echo "$ac_t"""$result"" 1>&6
-   if test "$result" = "yes"; then
--      cat >> confdefs.pytmp <<\EOF
--    (''' HAVE_ARM_NEON ''', ' 1 ')
--EOF
--cat >> confdefs.h <<\EOF
--#define HAVE_ARM_NEON 1
--EOF
-+      HAVE_ARM_NEON=
- 
--      HAVE_ARM_NEON=1
--
--                  if test -n "$ARM_ARCH"; then
-+      if test -n "$ARM_ARCH"; then
-           if test "$ARM_ARCH" -lt 7; then
-               BUILD_ARM_NEON=
-           else
--              cat >> confdefs.pytmp <<\EOF
--    (''' BUILD_ARM_NEON ''', ' 1 ')
--EOF
--cat >> confdefs.h <<\EOF
--#define BUILD_ARM_NEON 1
--EOF
--
--              BUILD_ARM_NEON=1
-+              BUILD_ARM_NEON=
-           fi
-       fi
-   fi
---- js/src/configure.orig	2015-08-07 06:33:02.108365042 -0600
-+++ js/src/configure	2015-08-08 18:24:00.676479200 -0600
-@@ -6267,14 +6267,7 @@
- rm -f conftest*
-   echo "$ac_t"""$result"" 1>&6
-   if test "$result" = "yes"; then
--      cat >> confdefs.pytmp <<\EOF
--    (''' HAVE_ARM_SIMD ''', ' 1 ')
--EOF
--cat >> confdefs.h <<\EOF
--#define HAVE_ARM_SIMD 1
--EOF
--
--      HAVE_ARM_SIMD=1
-+      HAVE_ARM_SIMD=
-   fi
- 
-   echo $ac_n "checking ARM version support in compiler""... $ac_c" 1>&6
-@@ -6306,27 +6299,13 @@
- rm -f conftest*
-   echo "$ac_t"""$result"" 1>&6
-   if test "$result" = "yes"; then
--      cat >> confdefs.pytmp <<\EOF
--    (''' HAVE_ARM_NEON ''', ' 1 ')
--EOF
--cat >> confdefs.h <<\EOF
--#define HAVE_ARM_NEON 1
--EOF
--
--      HAVE_ARM_NEON=1
-+      HAVE_ARM_NEON=
- 
-                   if test -n "$ARM_ARCH"; then
-           if test "$ARM_ARCH" -lt 7; then
-               BUILD_ARM_NEON=
-           else
--              cat >> confdefs.pytmp <<\EOF
--    (''' BUILD_ARM_NEON ''', ' 1 ')
--EOF
--cat >> confdefs.h <<\EOF
--#define BUILD_ARM_NEON 1
--EOF
--
--              BUILD_ARM_NEON=1
-+              BUILD_ARM_NEON=
-           fi
-       fi
-   fi
---- mozglue/build/arm.h.orig	2015-08-08 18:21:03.686458059 -0600
-+++ mozglue/build/arm.h	2015-08-08 18:21:16.781459724 -0600
-@@ -69,12 +69,6 @@
- #    endif
- #  endif
- 
--  // When using -mfpu=neon, gcc generates neon instructions.
--
--#  if defined(__ARM_NEON__)
--#    define MOZILLA_PRESUME_NEON 1
--#  endif
--
-   // Currently we only have CPU detection for Linux via /proc/cpuinfo
- #  if defined(__linux__) || defined(ANDROID)
- #    define MOZILLA_ARM_HAVE_CPUID_DETECTION 1
---- build/gyp.mozbuild.orig	2015-08-08 20:00:38.026946903 -0600
-+++ build/gyp.mozbuild	2015-08-08 20:00:45.321915167 -0600
-@@ -40,7 +40,7 @@
- 
-      # turn off mandatory use of NEON and instead use NEON detection
-     'arm_neon': 0,
--    'arm_neon_optional': 1,
-+    'arm_neon_optional': 0,
- 
-     'moz_widget_toolkit_gonk': 0,
-     'moz_webrtc_omx': 0,
diff --git a/libre/icecat/remove-google-play-services-support.patch b/libre/icecat/remove-google-play-services-support.patch
deleted file mode 100644
index f184b15ad..000000000
--- a/libre/icecat/remove-google-play-services-support.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Nur a/configure b/configure
---- a/configure	2015-08-23 17:05:16.000000000 -0300
-+++ b/configure	2015-08-25 17:13:48.155780403 -0300
-@@ -18883,46 +18883,6 @@
- 
- 
- 
--if test -n "$MOZ_NATIVE_DEVICES" ; then
--    
--
--    echo $ac_n "checking for google play services""... $ac_c" 1>&6
--echo "configure:18891: checking for google play services" >&5
--    GOOGLE_PLAY_SERVICES_LIB="${ANDROID_SDK_ROOT}/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar"
--    GOOGLE_PLAY_SERVICES_RES="${ANDROID_SDK_ROOT}/extras/google/google_play_services/libproject/google-play-services_lib/res"
--    
--    
--    if ! test -e $GOOGLE_PLAY_SERVICES_LIB ; then
--        { echo "configure: error: You must download Google Play Services to build with native video casting support enabled.  Run the Android SDK tool and install Google Play Services under Extras.  See http://developer.android.com/google/play-services/setup.html for more info. (looked for $GOOGLE_PLAY_SERVICES_LIB) " 1>&2; echo "configure: error: You must download Google Play Services to build with native video casting support enabled.  Run the Android SDK tool and install Google Play Services under Extras.  See http://developer.android.com/google/play-services/setup.html for more info. (looked for $GOOGLE_PLAY_SERVICES_LIB) " 1>&5; exit 1; }
--    fi
--    echo "$ac_t""$GOOGLE_PLAY_SERVICES_LIB" 1>&6
--
--    ANDROID_APPCOMPAT_LIB="$ANDROID_COMPAT_DIR_BASE/v7/appcompat/libs/android-support-v7-appcompat.jar"
--    ANDROID_APPCOMPAT_RES="$ANDROID_COMPAT_DIR_BASE/v7/appcompat/res"
--    echo $ac_n "checking for v7 appcompat library""... $ac_c" 1>&6
--echo "configure:18904: checking for v7 appcompat library" >&5
--    if ! test -e $ANDROID_APPCOMPAT_LIB ; then
--        { echo "configure: error: You must download the v7 app compat Android support library when targeting Android with native video casting support enabled.  Run the Android SDK tool and install Android Support Library under Extras.  See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_APPCOMPAT_LIB)" 1>&2; echo "configure: error: You must download the v7 app compat Android support library when targeting Android with native video casting support enabled.  Run the Android SDK tool and install Android Support Library under Extras.  See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_APPCOMPAT_LIB)" 1>&5; exit 1; }
--    fi
--    echo "$ac_t""$ANDROID_APPCOMPAT_LIB" 1>&6
--    
--    
--
--    ANDROID_MEDIAROUTER_LIB="$ANDROID_COMPAT_DIR_BASE/v7/mediarouter/libs/android-support-v7-mediarouter.jar"
--    ANDROID_MEDIAROUTER_RES="$ANDROID_COMPAT_DIR_BASE/v7/mediarouter/res"
--    echo $ac_n "checking for v7 mediarouter library""... $ac_c" 1>&6
--echo "configure:18915: checking for v7 mediarouter library" >&5
--    if ! test -e $ANDROID_MEDIAROUTER_LIB ; then
--        { echo "configure: error: You must download the v7 media router Android support library when targeting Android with native video casting support enabled.  Run the Android SDK tool and install Android Support Library under Extras.  See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_MEDIAROUTER_LIB)" 1>&2; echo "configure: error: You must download the v7 media router Android support library when targeting Android with native video casting support enabled.  Run the Android SDK tool and install Android Support Library under Extras.  See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_MEDIAROUTER_LIB)" 1>&5; exit 1; }
--    fi
--    echo "$ac_t""$ANDROID_MEDIAROUTER_LIB" 1>&6
--    
--    
--fi
--
--
--
--
- if test "$MOZ_ENABLE_GTK" -o "$MOZ_ENABLE_QT"
- then
-     succeeded=no
-@@ -29180,13 +29140,6 @@
-     (''' MOZ_OFFICIAL_BRANDING ''', r''' $MOZ_OFFICIAL_BRANDING ''')
-     (''' MOZ_BRANDING_DIRECTORY ''', r''' $MOZ_BRANDING_DIRECTORY ''')
-     (''' MOZ_DISTRIBUTION_ID ''', r''' $MOZ_DISTRIBUTION_ID ''')
--    (''' MOZ_NATIVE_DEVICES ''', r''' $MOZ_NATIVE_DEVICES ''')
--    (''' GOOGLE_PLAY_SERVICES_LIB ''', r''' $GOOGLE_PLAY_SERVICES_LIB ''')
--    (''' GOOGLE_PLAY_SERVICES_RES ''', r''' $GOOGLE_PLAY_SERVICES_RES ''')
--    (''' ANDROID_APPCOMPAT_LIB ''', r''' $ANDROID_APPCOMPAT_LIB ''')
--    (''' ANDROID_APPCOMPAT_RES ''', r''' $ANDROID_APPCOMPAT_RES ''')
--    (''' ANDROID_MEDIAROUTER_LIB ''', r''' $ANDROID_MEDIAROUTER_LIB ''')
--    (''' ANDROID_MEDIAROUTER_RES ''', r''' $ANDROID_MEDIAROUTER_RES ''')
-     (''' _PANGOCHK_CFLAGS ''', list(r''' $_PANGOCHK_CFLAGS '''.split()))
-     (''' _PANGOCHK_LIBS ''', list(r''' $_PANGOCHK_LIBS '''.split()))
-     (''' MOZ_PANGO_CFLAGS ''', list(r''' $MOZ_PANGO_CFLAGS '''.split()))
diff --git a/libre/icecat/vendor.js b/libre/icecat/vendor.js
deleted file mode 100644
index 32fddb8db..000000000
--- a/libre/icecat/vendor.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default browser checking.
-pref("browser.shell.checkDefaultBrowser", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);
-
-// Disable "alt" as a shortcut key to open full menu bar. Conflicts with "alt" as a modifier
-pref("ui.key.menuAccessKeyFocuses", false);
-
-// Make sure that Firefox Social stuff are empty
-pref("social.whitelist", "");
-pref("social.directories", "");
-
-// Disable the GeoLocation API for content
-pref("geo.enabled", false);
-
-// Make sure that the request URL of the GeoLocation backend is empty
-pref("geo.wifi.uri", "");
-
-// Disable the least secure encryption protocols
-pref("security.ssl3.ecdhe_ecdsa_rc4_128_sha", false);
-pref("security.ssl3.ecdhe_rsa_rc4_128_sha", false);
-pref("security.ssl3.rsa_rc4_128_md5", false);
-pref("security.ssl3.rsa_rc4_128_sha", false);
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index 8f0bbd3d0..fbdcebd6f 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -7,10 +7,10 @@ pkgbase=$_pkgbase-l10n
 _calbase=iceowl
 
 epoch=1
-pkgver=52.5.2
+pkgver=52.6.0
 pkgrel=1
 # look here: https://developer.mozilla.org/en-US/docs/Mozilla/Calendar/Calendar_Versions
-_calver=5.4.5.2
+_calver=5.4.6
 
 arch=('any')
 
@@ -147,121 +147,121 @@ EOF
 sha256sums=('49b419449431d8d64e20427a2e7105e3ac1ffc41e677a5f9a8eb276f5b82df4a'
             'acc2cf95661be7cb8928fca89e08d0681685409ff2428e4e3d25baf1af427b38'
             'e6edcc7c478d73ca5a17e4889acd302d55201ec5c29de545d3f44165201923db'
-            'd7a8692d263db8627443b2d8c1ecd4d06364829d0e9f8a890e94f2a25d0a3421'
-            'e3b74cd07dd62ee3eedfb590ca213adce7f9143ca2a4862cafebf735622128bc'
-            'b70bf171595b5a3bb92ba490929fa5a6e476444cc3c245661e28f20ba39dc62a'
-            '7a900ef8aa8701fcb24f7bed71b852d1d359cfe5f7f4e8a9db509e1d62ea3c3d'
-            '48b69b2f1c5b17fde1843b8e53f55488fcac27baa0f6637db91ed3cc6c328508'
-            '773eb2acfe8d92f4b9cea7aef0873359737352553483714be07b63012ec8ba4d'
-            'f0219905296688e1ec94b8f96054764caf7c00562e7ac2eb5893c03b2e324aae'
-            '482fcce244877679d63fd1068acdfe9d366e7c3f498924fe59f0e928ea596952'
-            'cea442f2be7885835acac51de212777c5490e20df393b7e00d2757100bcfe45d'
-            'e128e9a350135337412841457c3b78c4854958bea828b5d7d5e42c3eea6c94d4'
-            'ff985a3332b7e2fdd4e725bd128cda9b1ee56d9c14fe5f7e8311c445564c42d2'
-            '0b6f1f21a5b69b1c2a0bc9fe1f32f45151f1bae9972f18917d75b7d09251355a'
-            'e7595d5a39c6da2b1ea5f6ce1942eaede35a7f6c5856db869be7f49bc41fe86d'
-            '43a67f8ca8e69dc06a9c69b1dc1eb5d4301f4508287c42b3f6d36a1dc71b75b9'
-            'ed5b96993d7fb83b6974d344df537ea59bd0cc82314182a6ae813dded45387fb'
-            '2e616795cf3fab562732eb05138d8382dc5d702990c9d92ad09b6b3a3f0c73fe'
-            '2dc7a0690039a04b08b07fc9330100b66854b68b2b4d1a85a72e3079e1fe61b8'
-            'cacd00e442583cb57a7a0ca248ee3c4fbd3bda507f67bfa10310c59eec4061a1'
-            '5846914c053b7ee356679505f5b62360993bfb15cf0da5ec128b1039f7af3edf'
-            'c1257f1b837efdea8c467b88081067cc3b8e356c8b3f44eee4f4db59380608ce'
-            '707393f05f86ea10041d31ff9d61760ce9369bcbf984999663483e451598ca0d'
-            '0f470c47ec52274b7d494ff92969af52a3974e49c7065376afc06f21cff39e77'
-            '660031e37fab05c0320aef1aa8a0695b7ad7ceb9618428f4b89074e76cd5b4cb'
-            '24fb9d5228673397ef95906e36cff233bde2ffa4d76c7ad595eb1f5e0b77cfb8'
-            '910a1d603b14190034342cefbba9f3033d1203fa4f676c4c3e29675fc6c249b7'
-            '97bdca96b8ec2dba4d8cd352efc72096a81d9af5b32abed7da99f2ea0ae679f4'
-            '10d5bbe2cf22e3946cc67a8b9255c328740d61f292942990ffcf7c113edf5b7d'
-            'f0e0400623dc851dbfab041b25046d8ba670709475a869d8afb8169c83ace57e'
-            '78510bacb950a5791ceeccaa41feb5c09053bf685fdaba8eb4c3e260b0c57ca1'
-            '8dc22d30716cb406e443d725ce826d47e5a917484f88a2dbdd6e0bb98a984bad'
-            'be1f111bc6d0589c89fea611b9a7b30393f564405e41d0403b628ee4204e72e6'
-            '7fc49a2ed9f7dd1b1c983219312bf571bcbc4b435d2965c61749ec63f96fbbc8'
-            'a32ed2c27a4e3eb559db3a95e4e7bae1f51598b37c5a14598dce46d8ca19fe9f'
-            '6a256f33a0b2efb1799227d70df8595dc34249693bee4f4bdd0c9da305c241a2'
-            'e5449c5269a5afb66b716f6d090fda62749ec7717d84bfbda0dfab5e7c1af7f7'
-            'f21feabf91cada47ae535564d232321281a10e0f41409586bcd75e50a71066ec'
-            'b37355ad80efd2efcc1841dba2622eda5d1394fee894a72490fd22511493decf'
-            'd36ef43362b6018f541fcb09b81675c8475338b044f1a498ba3c34250b30c682'
-            'd9a3575b7ece3402873cb08a715ea790ba2069de8e12b401cacdd311028ae1f0'
-            '6e4d03c494ab3d97905d56354e6c38365c8a881d4d96a8b3f2510f91c58cad2e'
-            '011474c4243c2329df60b8a6f48e1a8f31dcc835d09e9814a316cb13424b2b2d'
-            '1282e8bd498578a2e173f9050d943ab1b46e756cd383255613ed6c53c8174a3e'
-            '9b64fbfc1e7390934002b738ebc9b772617fc765732fc51718d6218b0ff07f43'
-            '697765a1ee4cd86e4ecab8ac9588bbe949e15be238f35f59af1eb87ec4bebf04'
-            'f8fc5945970e06506041e0b141ad375397c409d824b4cbf8821237e100bb9f0e'
-            '6bc9e3949da3e6f72a488adcb55be1396141894d22b28d2b8275b31ff8f552f1'
-            '2673fc5e4fc529f034fae08798f10a056d512256ba5c6f2ffdfcf6ea83bfb28d'
-            '99f2609c7104a79ea5cb115d204ebdccdd62d831b8402f05e6462d379d52f2da'
-            '27d4ab4e421a621f12692c4c2292898faa1dc4cd03de7f3b469fc870d0966bdf'
-            '19563fcf14343996feae7ba2306e3b81e6433e6d7132a568c2efbda517dc183e'
-            '0f59d39cd46814960b3f0cb8cf343d91589ceb4db9f107cdcd99d18a34f791bf'
-            'c4690c86853e9ae0872de07ed96a6b71e564ce5baa6d03f79524cd62226898ba'
-            'bd67efbe342167fdcbb4438591487c6dd1c9ca46e9ad3fda4bf238638dd48f3a'
-            '6368e1d090b810ed49b3ebe2634f7703c54798028b01c67da022069652ab657f'
-            'fc98e7d8d5f6c97efa2dc40133a70170a3df05aa497719ce8c3befa1fd6d68fc'
-            '51616ae863d2885f7ce669df80d1e388496935497d598308d26808446b9489d4'
-            '1878c3fe119d2007baea3a6759bc950fbaefe93fc372d3b92c6ed64b2a946859'
-            'dd7a1dfb847f59cb104c30365ed1b4d661145a6bbbb2beaa02b36cf36122bd12'
-            '678218c48d874d5e308301343d8bad97cf6827e0fc0ca34d5ea1b0ac58beaeeb'
-            '529ce11312a84c63e5906d4008d08327ef591fbcedd935ddf56f93ac1b1b20db'
-            '5515a58cd0b691a1d0dee964d931279b8729cd59f3ee45b23f594f5d1df04240'
-            '6f6eb33c9c031b73c194f4996c2bd5b9398da096289d2eefe628529299ca70ce'
-            '2cf40947dec980d24583eb5ef57f9461848fdcb7e5fd6d534d670735a7bb4120'
-            '67b63e5333f7ae7ea04ce6663c4ddcfd0e2ea220e7a584b3963d242cc7a8529f'
-            '8ebcd3cca7db1e7c7cc3f41551fc83f2f8a2b13099da6b25ee30f884d7151f18'
-            '1d058eed9225d995bb7ee6d9a3aa6218dcbda86fac340cb9fb2cfe45da895eaa'
-            'f8dff411870edda5723264b5036de51c3570b96c38a31f23b495b0eb74df25c0'
-            'c9908b06b105741c350c04c61d85cb14971826e2c6b58272386b7ba86bd5a63a'
-            '1fcbb01397b921033ea5a70395d67dd7e143d7911cd03890c7780a23be15347d'
-            'c98eabaf8ad597139f4ebedb99baa9d8197783ea0afbc069c91310f4d5524f6f'
-            '7628e4678c52354a052cc46737d99d404c0beaac9498209846b485e0c29cad52'
-            '464ec41a13bb5ddff649a9a4813fce151e1316f4c1c51986ad60235751e17d46'
-            '3e48f9ea89318840b0ebbaf6391463274b06a2d48f2294299a4359cec3be0a1b'
-            '34f36e0198c433a9fd54ee3e7b764bccf2d85b740e935e7bc6831277028c834b'
-            '0c7ec0d8f73f6068ddf9690f606bee09f0526d00f7c5bd228af01b761d53dda1'
-            'd4ed63ff20ac403335b03e5b54bf180bfdd977380822f8d26452a84da114585b'
-            '68d98489e93122e1c5594a940dd64008eba76b33db395318ded2817b34ca8012'
-            '6137cd4bf89307079e89e1013347b3d87f9f98a58ed4deab8547f0e996e771ec'
-            '7a665dd51bd4220e26c3595699da7a74f77616f95f42e2dfcc962801b64700bb'
-            '29eeb5eb7ac50d0fdbb650c03baab11c0d49554977e73ac6950ea07ac7f6e71c'
-            '463490cfb5c2318dcf86806b88f01fab3c2be50f6c31e6d92ccb629ce1d4919a'
-            '1c5ca321aae5b19e6e3ab65aaaa20f1299b70c945a0f1b0fee44469432a8ce6b'
-            '9f8aa33583cfb8eb0fc3098b96a5257a392d982b26643539782b7877922c843e'
-            '6585c958190e613a81665c0b43670e2ace1645250e7238cf0a58d470f6416a19'
-            '6d854e679ab9f9e0f080e94648f68366d32a021b77f630820ae164bd9e348380'
-            'a1f6c96ed3c3acc684bcc629121f428962b5e111a80d445479371ae6c85511a4'
-            '162ef60b8a2f7e7f348d8a559ded2a325ae8c81d58d6574885754e049ae5cb39'
-            'ae9cf45b3edd150110cefe9a4f043e6226b459f339c7c719576e16f00d677e6c'
-            '6dc69a5ab79f59aac8e5930fc4ba0e914e0e65ca35b7a192fe4d1635bd9e9f43'
-            'f29c6c77394b3fa7e6e28678873d6b6eca548ec608ff1cf5c6bbe9ebdb577f8d'
-            '137125c20dca51d5a54354237f0b79e88fe15fdf6dfd731422fd72556263dcd6'
-            '25fe4075b7b5280035f5304844e69189978d47b7b89e9d1ea7eeb26c452c1cc3'
-            'eecd8b8c525531fd8aefb45bd5ae5a1cc97dec025f23b2ba9d17f04d66da8173'
-            'a21ee4e5abda073457761c2b402967628ae12acbfe45fe3774ec9ab8524e0c60'
-            'e64bb7b3a59d21bcb3746611e9b8ea468aa8b2b15039a86275ee8b69cf05b285'
-            '0cff484e6bcfca7607d35a32eb56a7d098b39a78268b1c57384cbe79124ffe11'
-            '716bf7a0f9a12d088be1e4ddd07f2a3861eb7a646dbf0ad1fea1be3187aa5049'
-            'd2a6d2fc9408bc5b7fcbc52857c794147c67e82291ba551adfd94f3184bd03f9'
-            'f458ec4d93120dc015302c67ecf8a3fb70bedf42803637805a739a43d187cda8'
-            '9380589f63f01e660eecd035b1742f740b3b4b0e6394fae5e9b27c2909ef36c1'
-            'e7d418562df152cb220227432d87e5808675a859267a1238924af67acd073d9d'
-            '617db320c9f49e2f6f8d75f7dd9bec27c990cbffc2631192bc1c46c8dc3f77ee'
-            'd563fbb8db8bbe94e19ab2a24c28f4b272690454175b9955f8e0f84fc08f8ffd'
-            'fbf49d3894882e9472a8add1d2c34acb27158f7e56d54260f36092a6dadf5ecb'
-            '66e0ed6938917713280892a263b3158494f2d7a112ae9d742d94b47140091d9e'
-            'b9b980ff76af72bdae112232b3d8d6e0150b879c970ec3ab9ac321c03891198d'
-            'dfed225bdb5490b547ccd7f088342f32e5e2b28214c6a7490cba5c189bbf149b'
-            '5c25dd2777a874bf32523a3ab54e828dcfc7b244fb77f897a641ffb91d12b1b6'
-            '0289d22b1263c1138134f5b6d286a3a42bd450eefe297cbe0c62f76cfacaddd6'
-            '5ecee09e88112d5cdf53710b8dbd6c2f235f54030b7bd8df9c4344ba853730bc'
-            '0d2f1e4068a42f31f58b92fe273685225bdabbda121e57936e0c73c5c18a40e3'
-            '4a6161e32135462974add9714d0115711037af844b5a0bad35474d983392736f'
-            '240595758975b80c2a205ae4526055307e61f74e5ce1aa58cffaded88f41600a'
-            'cba84306d2f318605e644bd2a0e4896b53746b9143af79ebfbc91a665af4b43e'
-            '69c6202ceb23bf912e99d776203c7f1c22ff4604e87bb819f78f5e6f9a28e2a9'
-            'e4fa82d51fcf24bc83c325c2c520eece28267db26b8b701b46070362f9916400'
-            '861584c71533159d58936c40ab60b1fcfd071a4b568fa8a779374e1b7984e2dc'
-            '9ab05de50ba2458284ebedb4c85216a4f366c8aa40f39bfe6d47b24bb127ad51')
+            '55e64e6c9e2bc68534a0f5f764eb2ef4086303b070f8d803dece82704f399513'
+            '0b314dd55a998b7e3eee263574cb19d9734665442501e857df7a55cc2f30d035'
+            '7edd520802282b882262e0a7293826344a7e623f03638d8f11aef3445a3eab3a'
+            '53881a6e47aa85f8c9dee2ea5640b584a89c24ec7a148ceed92f7771819043e8'
+            '449f75f58d54c2ac097fc3911adfba0b1adc30bf04e68effba513ffec48966bd'
+            '0bf7bc12b7e217b24e9e7c73ee5939c1e2aae421bb4ad35598c24efaab85bf90'
+            '42d182ce3aa536d7f5aeb121ec11fb69d26abaf21c6d422a4fd03589881d56b2'
+            'dbe0aaf939100edb0e6bb4a31ca6f5e0ca4a2b4fe6951dfea390ca9722e52c6f'
+            '4ad2f6cb36fbbb79f1047f6a0c7cbc9af75e183edd5b1919715df99448e857da'
+            'd766b200e8afb84dd5c0ed310017f133d24e9b8a3eca85088542f5bd9a3d9c69'
+            '5c0285a388c74e4c820f46e6ba9fd630d7158a7f5ef1596e64a71c6637de1d3b'
+            'd74cb1748bd00542cf10011d7e2043a983047d2818eb0e172317de6b883742c8'
+            '99911c91b663be3f80b3cbeafce21b6da88d7da3a14c2f059dfa2baeefab8136'
+            '6760261974dfc672462999d93e5e3106341aca6ec2242c9df6e1627844c074f5'
+            '4286ea2d0558955c61bd702c505c3f4eaf9c45faf08c665ea7c9f76693a5e584'
+            '3d272187fc15c4ca63bfc55e62fa4933c35f8cc8bdaaa399fc71a5598a9e6032'
+            'c2cf23f90605b361b59c937432b8952558d8dc7e150a6adbae7461b29f42d2f7'
+            '0dc7d44e5243543ef8de54b0b62035e8b1b6ad9ac9b387d6757508ef118830de'
+            '579ed278c3ece9219e13d0fec7cf82f539f9c723eb10d3e5ac5a8db75173d0d5'
+            '6a2713f347f661fb649e0774734be067861f7cf525e797b7fc16b58cf8fc44fe'
+            '0ac03603f1ef5bb78ad236ccbf0f64c84a0e618b232bd7e8286171e3462e63d9'
+            '38b60d92d47508c60d6744c74e883156117b71149cdcdd6fdb34f8e70f6b4ffe'
+            'e9a5630c9e969d4d1406bea35fa5a0c975eea76d8390e7188266f4d66c3b0a05'
+            '7f6e9cfaa767f5fafc0ffd1e2ab59c9c9829e2b190e7792fcfcb4b24871ed9c0'
+            'edca35f0cace634c4205318bf5cc9e6d5750f52d0c364c121a6af4ffb7964d72'
+            'c61d791319f70ee25e63543ccf5a7424d9d9448372d27cd6e37d5a03f8e585ba'
+            'eb65776bfdc74d6514797f873bcc9788e1686d3a9734519b91b0c2341d139945'
+            '0632f2147d968f28b547f89f5d9a3631f62b524df903b68ea70a7d10935721c7'
+            'c42e3f869dc63829f4b329e5b4c3059aee83fe854399efb25312519dc678fd4f'
+            '632ed706b6329f37a07893839fde5f28374eaa8f081adacd9ea61fce499393ff'
+            '56d9a510c44002f7b502bb3e039240ac6c0805c5a191ca36c1c8e474cf2fc105'
+            'd58327d3a7e0b4350de1bed41570fd6d15549ecde6164bfea001a2d7962f66a9'
+            'b747614bd710f3bdd4129a74580d336c57239340e145ec920f7800dcbb2a641c'
+            'f510ae7d391b8bbd1ae0b5efb6c85d5cc4d4db30037903c4233c05d61c8fa748'
+            'bad22df9a08bf5c1f056d3d5f3ae773808ebeb23d3c8a8db8772c9ed76975e12'
+            'd43d9b45b6f6bf0377269dcb0021771537a64a4db4a43667a263d3096a74a8b7'
+            'ca875e0d846f32f37d1a3a4aaaecb99824e1d019d78e45773cb9349c1455fb1b'
+            '06c5182fd71af5a82c15618e55c3430d88e0133a0ea85bb4628ddc5f82288067'
+            '9e3be13e562547bda6d79619b69cbc3791f862958c417bde2742408be7dfb919'
+            '2acdb4e1d744894fef9ec9dd8ce24a627406430c90926e20d3122c076ee75c08'
+            '4e3816609544cdcca192261c9ab442c2ea1741a2eced94e35c5d5e785879b3b8'
+            '49518daa016db7b8172b877ca516a61a5f502baaa75fc3df6711a015784d7c5f'
+            'c3e55ed6c0cec5db5b69c47ab3f491d264b10e39116bf13c4a0d167533633f50'
+            'af6c350e63fcacf0fff2e255cf68244f2ba83b5ef3defde198ab22daa9a38d0d'
+            'c1f2bea891a8ef69cb014deb6b3e772f260af8ef32ea99fed0446189997066ec'
+            'e74e11774e75061809a42b0a6d3870ed89c7a92f860e2cfe49b9ce21803f0a4f'
+            '0dcde6e40a6061601a7e5cd8906c7f69ec1cc572109c860f687d6ce055a348ee'
+            'a08ef5be8e99b3662959da1e1ad6a9091fc8d2b9b01a80517d6e4b955a1ed79b'
+            '52f5f70a6d03922a3879d2b84cd21e6164c6d9aeacdbefa52e0771af8e8d1ac6'
+            'b6d61eced132dd3c5a065ed664809745cbce5aa2cecde2994aa70078dab98e24'
+            '453b5c38c81f739a42b3627ae516a2c0e2acc2eceb73b1e0fcc1e4942e6e6580'
+            'a4d8729dba9c8ec2fc972c8cc9661e9c078bc6570992affce230905bcd4edb4c'
+            '2fd2e4459f4f618c204e0f755dc462246ce24217cb39ac521711ce1c8c21482e'
+            '502414f98b68cfbd410695c45c41e844a921d94fa4d384533e1b90b89ebab3ff'
+            '0ae83e6c21304bb71232b1465f91b8c099bf84755a9cbedac24a5c9d1e57a925'
+            '2211e581242118c6b54ec6989c5e8c14a030f6be51b8baaaaaf18c613581c925'
+            '1e30e4ec4fd1ec382d2e3dc8d6800899bc4a55a93da2a4908a939585fc505e96'
+            '6469dc582837e4a04728a90a82648dc923bb6807eb796a30a76f0b7d62871fb8'
+            '21042be687b28b18d4176061c34439de11b2ef88c163fde7a4cc79d5694dcd3e'
+            '4c0ff4cc287e3a1a34556e0458876fcbca50284241538865c1224d91d84443ea'
+            '3d042800e62e7579950261bb432e2eb54c98742a1166eba81c237637d02a15bb'
+            '66f4190e81f5835d2565d620efe1485d0790618ea46037889fc153790a4a5b92'
+            '0370377a056b2b15044c620568d7d3054280b82e6e97d70137090e4e3bb399a8'
+            '0c78198b546285b55760a18080e910fa6f94a9fdc0ba602f4fbad10b4300914c'
+            '621d466c4b5aac0d75ce7ec2d00aa903d51c70b36ee0ce697dc10cd4bb63a734'
+            '05ff57f88ac30eb0703589bfeccdceeb56862201497fa660e6a77b059a1b395e'
+            '4c7b9074a13944e83213f8a0dc5e78b42873a746fad470c45530042b6b1182c1'
+            'c3312f9c39a26ed486ca2170d6caf54bcd52e3583907422203a634656e436d19'
+            'bb1f4414756a814df14ab766e53d8de9cfe0b64d3c1da5ba3a847bc346c2eacf'
+            '92ce5d5d825330b019d75a39dbb680fe24766fb33beff6913be52529efce1397'
+            'c9c79cfd48255df07f435b426b5db3992e1c530eab07ac2776879e8703e78273'
+            '3d2006c4a1bd842e348b2bb9cfaa6919581815dbbfbbccceb8969d0468d80481'
+            '7463d77c26ea74fcc515728a42be12d2397b7945e9fb081a8ce6b4c7b8fbd6b0'
+            '7b0934713466e97ed63be38d94c5d5dc307959986120aba1e4e97873262c4f6d'
+            'b23a2135a91881b059e539fb32c739973ffa4d52295126f403e5bd1e9206c9ce'
+            'c8439aed2a9e7cce0d91840f6135fa8a479f6b530015a8442e0c7f59fb20570c'
+            '5431362ea1bdf889482c72d40d66e251a56f4062263c1e9bbb2789f3ac32c3fd'
+            '52e761bc3a67a93d75e87b31ddcf48d0b60bc103163c6a687154550bece1b7cb'
+            'e7ae629d7a6c4feae9d05f1125842bdb02c39072fd43c72f5f0c84a83e0ab272'
+            '05a8234c05519683c0bdf8939f20559a8cd1d145d19972a40ee79ccb515a2158'
+            'daca9d315187be83ea83228d090b6cb9e2ebc5233a159cfe61a4460cf2e37164'
+            '4b5e98dd348b2f0aa87b5f12e33f640a5bf6e03784885c834bdd3b771b2f407a'
+            '0c2d8cbbf044ba9e542b6e6aa9f46ae370d00e00921041a9aa4acc2758f4ecb7'
+            '761e4adf218258affca042e37bc248bcc2180ebd0eb6cc4a5955f44a8f1aea9a'
+            'da2df716d3db1899ccd7d2d6ca862d7a422d22ba8279b711e4a06f2fc6175b0d'
+            'b0b4cdb22302cc809e451f741fa28d41c81cb463fc5e0d0a7bd03b41efb4ae3e'
+            'e232716f0bafc6795c40fe64d90f13d8d0e37a4bc90604c08ca85740cbe9104f'
+            '93315ae1e2bf138dcc61e9579521057ea00c1d7e81e32784846b1f9583333ada'
+            '3f0724f1a90cd9e12916bb945b155f9284897bb86590e7ac36791b8baab88eb2'
+            'aba0545ffb583025682af5a7542b312060d7c947c01c3a8eead032860bdc3680'
+            '54ca51a71b33fa0997ea923dc58abb4d7079253d1ff1c6bcbbad034d9a3d4069'
+            'b4090b526e3448362fa1cca3c6856032825aa09b4658ced08fe125b6ea9ff77e'
+            '9249afd7d32bea432c2efe9a55a4f1e0a1a409e6ed74a683b12ef05bd380831d'
+            '8839a59cb9f97ad7cb07c8eab01e2eb5c0464755680d2efffad32eacf5b9e3c9'
+            '76faad271f92f170841d7f204457da50c3ac3051ca59c509567b300d29459fd1'
+            '9a5823e4714149acf21b7efe7be63dd4554cdbeab3e27b7c8cde9679ee6df9ed'
+            '4a96971036904ccd5ecc42f79d2ca07923b281bca4beb3c675e4b65837f22af4'
+            'da60decca4e1ba61e34fec274e3a0b9f7582360fa04981975b414188888003ff'
+            '2fa80eac543efa1db0b2d385249d87127e684f4d2a8042ef3a78d2ca3b289aa4'
+            '2bee6b8060fccea9c26f4a48f9c50119e1884ef7bc8443ee0c94117f57b6a17a'
+            '43aaa06b042159d2a0523b1be039afd3f5dec1621a47b805ca08410f0b916ae7'
+            'f37e0cbb219dc93d326c85ff46f4ba19c3890327c74575f62dbccf64020982a5'
+            '06535e6356904cbe82da3d8e90e499c3efd17a22f72660aef17e3ea64331747c'
+            'c0460d9176fe844a8d60f443dc143cea791eaeb9aa645742224090bb6e5d2d3d'
+            '7f0b5529af81dd17fb1d0c3cf19fd3e32dbae7c4d69fbc18195c2a6ed91a876d'
+            '1be95d4349465045b25490fe4cb01d5d191cf2f59cb37533ca1e863a1ee3c040'
+            '5d542d45d30a2853ef338b4262642337112c5a610b80f30f03227f4dbaa075ed'
+            'd1089c58229e5317886af28f22947680b1aa889780e5e493904b239bde05e9a3'
+            '6328b79a60d8ca4cf50cb8c60c181997905c082bb9a57ec5cc835a140900889f'
+            '818100b9bbde350fba5b390d26882fe0df6b73d03570a3a93ba67d801b95f602'
+            'cf9c9915cd9f664be4fdc29adbecf4ab232ce0c8385e7edc3cb4725df5ae5e58'
+            '106eaa26ca05cd066d039f50f3b3dec7d607546c81a9dc8afc7d51d24fc084e0'
+            '8ecca130278fad732e5f407a0a0c3148ca28dee9460a23b6fc57b795abb2d459'
+            '88cc378401d57341869d8fed417f2e0ed3f96099fa02235df6d7b4c534683fe4'
+            '41a908b69568f1095f06e7edad15306d30e8aaa8f974da7c53774de7795b0c01'
+            'c7b9e0801867721b7f2e53a6c4f5b7de0567c72173afaddf715dfcf3325cc6f6'
+            'd928ae2d6f18815be709fa131cc264e8564c47019f62bdd9d3c5750143151a75'
+            '23407cd0a3bedfd8b9042a66080886a10cb2bee683b4c4b16bc6bceee87d875b')
diff --git a/libre/icedove/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch b/libre/icedove/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
new file mode 100644
index 000000000..cf2e0eb9b
--- /dev/null
+++ b/libre/icedove/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
@@ -0,0 +1,48 @@
+From bbd48a5613c872883616884cfaf41665b0e4ec9b Mon Sep 17 00:00:00 2001
+From: Ralph Giles <giles@mozilla.com>
+Date: Fri, 10 Feb 2017 12:58:18 -0800
+Subject: [PATCH] Bug 1338655 - Don't try to build mp4parse bindings. r=froydnj
+
+We use the cheddar crate to generate a C header file
+for our mp4parse_capi wrapper crate. Currently we
+do this at code check-in time via update-rust.sh.
+
+Cargo 0.18 and later will try to execute a build.rs
+file in the crate source tree regardless of whether
+it's specified in Cargo.toml so patching out that
+line just results in 'crate cheddar not found'.
+
+This change restores the old behaviour by substituting
+a 'build = false' line instead.
+
+We do have syntex vendored, but we don't currently build
+it by default, so I prefer this solution to just vendoring
+cheddar and generating the header at build time. The syntex
+crate is quite large and adds significantly to our compile
+time.
+
+MozReview-Commit-ID: InJRRODWAdP
+
+--HG--
+extra : rebase_source : 29378fcbc86015ce6cc22dc66d38a43ddbac204e
+---
+ media/libstagefright/binding/mp4parse-cargo.patch     | 5 +++--
+ media/libstagefright/binding/mp4parse_capi/Cargo.toml | 2 ++
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
+index aee7ee947151a27c..d7e3f55119d3f4b6 100644
+--- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml
++++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
+@@ -18,6 +18,8 @@ exclude = [
+   "*.mp4",
+ ]
+ 
++build = false
++
+ [dependencies]
+ byteorder = "1.0.0"
+ "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
+-- 
+2.12.2
+
diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD
index 3f7ba7576..e2eeb878c 100644
--- a/libre/icedove/PKGBUILD
+++ b/libre/icedove/PKGBUILD
@@ -1,204 +1,261 @@
+# $Id$
+# Contributor (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
+# Contributor (Arch): Alexander Baldeck <alexander@archlinux.org>
+# Contributor (Arch): Dale Blount <dale@archlinux.org>
+# Contributor (Arch): Anders Bostrom <anders.bostrom@home.se>
 # Maintainer: Andreas Grapentin <andreas@grapentin.org>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 # Contributor: Luke R. <g4jc@openmailbox.org>
 # Contributor: Isaac David <isacdaavid@isacdaavid.info>
 
-_oldname=thunderbird
-pkgname=icedove
+# parabola changes and rationale:
+#  - rebranded to icedove
+#  - added makedepends: quilt mozilla-searchplugins python2-blessings
+#  - added replaces, conflicts, provides: thunderbird
+#  - disabled tests, they break in an environment without network access.
 
+_pkgname=thunderbird
+pkgname=icedove
 epoch=1
-pkgver=52.5.2
+pkgver=52.6.0
 pkgrel=1
-_brandingver=52.1
-_brandingrel=1
-arch=(i686 x86_64 armv7h)
-
-pkgdesc="Icedove, the libre standalone mail and news reader based on Mozilla Thunderbird."
-url="https://wiki.parabola.nu/$pkgname"
+_bver=52.1
+_brel=1
+pkgdesc="Libre standalone mail and news reader based on Mozilla Thunderbird"
+arch=(x86_64 i686 armv7h)
 license=(MPL GPL LGPL)
-
-depends=(alsa-lib dbus-glib gtk2 gtk3 hunspell libvpx libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
+url="https://wiki.parabola.nu/$pkgname"
+depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib alsa-lib ffmpeg
+         nss hunspell sqlite ttf-font icu libvpx)
 depends_x86_64=("icu>=60" "icu<61")
 depends_i686=("icu>=60" "icu<61")
 depends_armv7h=("icu>=60" "icu<61")
-makedepends=(autoconf2.13 diffutils gconf imake inetutils libpulse mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip)
-makedepends_i686=(cargo)
-makedepends_x86_64=("${makedepends_i686[@]}")
-optdepends=('libcanberra: for sound support')
-replaces=("$pkgname-libre" "$_oldname")
-conflicts=("$pkgname-libre" "$_oldname")
+makedepends=(unzip zip diffutils python2 yasm mesa imake gconf libpulse inetutils xorg-server-xvfb
+             autoconf2.13 rust clang llvm quilt mozilla-searchplugins python2-blessings)
+optdepends=('libcanberra: sound support')
+replaces=("$_oldname")
+conflicts=("$_oldname")
 provides=("$_oldname")
 options=(!emptydirs !makeflags)
-install=$pkgname.install
-
-_parabolarepo=https://repo.parabola.nu/other/icedove
-source=("https://ftp.mozilla.org/pub/$_oldname/releases/$pkgver/source/$_oldname-$pkgver.source.tar.xz"
-        "$_parabolarepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz"
-        "$_parabolarepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz.sig"
-        mozconfig
-        $pkgname.desktop
-        $pkgname-install-dir.patch
-        changing-the-default-search-engine.patch
-        vendor.js
-        rust-target-i586-to-i686.patch
-        mp4parse-bindings.patch
-        libre-searchengines.patch
-        no-neon.patch
-        no-crmf.patch)
-sha256sums=('7772e1865cd4cbaac82ea05374d0ae51f754f47c6160c9b83919da483d620ee5'
+source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz
+        0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
+        no-crmf.diff rust-i686.patch fix-wifi-scanner.diff
+        $pkgname.desktop $pkgname-install-dir.patch
+        https://repo.parabola.nu/other/icedove/${pkgname}_$_bver-$_brel.branding.tar.xz{,.sig}
+        libre.patch)
+sha256sums=('16215fb5a3765c7e5a40eadc1f3aed6918294f6d8ef1552d2aa37656055045a8'
+            '413cd6d366d78f325d80ebebccfd0afa0d266b40b2e54b66ba2fa03c15f3ea67'
+            '9bb0ec0d1b267f8cc1f08fbd82666459a21e4c171d52b8314b80979c948d96ce'
+            'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269'
+            '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8'
+            'af8199a12ebe09189d143458bd1e2d0071aff3410ed121dc2329a448a56632f0'
+            'a3f2431a6e9eb01d3e20dfa5110e769180b4a752ea834c1162088aa90d99e8f3'
             '246418976524fbead5b99e6227f97322f8d4c45e0edf9ce75561ae8eccdefc65'
             'SKIP'
-            'cafd1cf384791e8e3284f52370b2913a8b05935ecfd10d2a19c6dd5a8c219b62'
-            '0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a'
-            '36e0a5ac0e994bfc939b4ac69a1a4aa365210e9dd5b49317d647c683817b2c5d'
-            'ff3474b7d8f7ad245a324c14f01daf05834462b4f0144fbc50f055ebb573dac8'
-            '058b58074368b57acf8a6df9a9ffac848b7d7b39f5abd84cb2039bcee42b73e2'
-            '069fab4b99dd51d7d004124d0052ea7b864cf060ea943348d290ba6aae50b0ab'
-            '45a9e651278e39df39d17a679ac9ad81255cd51b530ba23b8e55e4d39c3b35d0'
-            '0db12bef46e0ad68dbdf6ce0c767956d6758b073531012a850e7975eda3fc7fe'
-            '59f40d8b2480aa67bf76f4f119826b6828a6a59cc040caf1ab5a6e19eef44c6e'
-            'a7317caba56e89932bd9e3b9352d94701dd9a419685057f238b1ded8dc0adcd7')
+            '4a09569394f1b4e154fdcd53f2947b7be7f065baaa31c964629dff9117fdf49b')
 validpgpkeys=(BFA8008A8265677063B11BF47171986E4B745536) # Andreas Grapentin
 
 prepare() {
-  cd "$srcdir/$_oldname-$pkgver"
+  mkdir path
+  ln -s /usr/bin/python2 path/python
 
-  local brandingdir="$srcdir/$pkgname-$_brandingver"
+  cd $_pkgname-$pkgver
+  patch -Np1 -i ../$pkgname-install-dir.patch
 
-  # Prepare branding for the Icedove packages
-  mkdir -v mail/branding/$pkgname
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
+  patch -d mozilla -Np1 < ../fix-wifi-scanner.diff
 
-  # copy the branding files
-  cp -va $brandingdir/$pkgname-branding/* mail/branding/$pkgname
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
+  patch -Np1 -i ../no-crmf.diff
+
+  # Build with the rust targets we actually ship
+  patch -d mozilla -Np1 < ../rust-i686.patch
+
+  # https://bugs.archlinux.org/task/53890
+  patch -d mozilla -Np1 < ../0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
+
+  cat >.mozconfig <<END
+ac_add_options --enable-application=mail
+ac_add_options --enable-calendar
+
+ac_add_options --prefix=/usr
+ac_add_options --enable-release
+ac_add_options --enable-gold
+ac_add_options --enable-pie
+ac_add_options --enable-optimize="-O2"
+ac_add_options --enable-rust
+
+# Branding
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=mail/branding/icedove
+ac_add_options --enable-update-channel=release
+ac_add_options --with-distribution-id=nu.parabola
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-icu
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-pixman
+
+# Features
+ac_add_options --enable-alsa
+ac_add_options --disable-jack
+ac_add_options --enable-startup-notification
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-safe-browsing
+ac_add_options --disable-url-classifier
+ac_add_options --disable-eme
+ac_add_options --disable-tests
+END
+
+  if [[ "$CARCH" == arm* ]]; then
+    sed -i \
+        -e '/enable-gold/s/^/#/' \
+        -e '/enable-pie/s/^/#/' \
+        -e '/enable-optimize/s/^/#/' \
+        -e '/enable-rust/d' \
+      .mozconfig
+
+    cat >> .mozconfig << END
+ac_add_options --disable-webrtc
+ac_add_options --disable-elf-hack
+ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns"
+END
+  fi
+
+  # perform rebranding
+  local brandingdir="$srcdir/$pkgname-$_bver"
+  mkdir -v mail/branding/$pkgname
+  cp -va $srcdir/$pkgname-$_bver/$pkgname-branding/* mail/branding/$pkgname
 
-  # patch
-  export QUILT_PATCHES=$brandingdir/patches
+  export QUILT_PATCHES=$srcdir/$pkgname-$_bver/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
   export QUILT_DIFF_ARGS='--no-timestamps'
-
   quilt push -av
 
-  # install the icons
-  for i in 16 22 24 32 48 64 128 256; do
-    install -Dm644 $brandingdir/app-icons/$pkgname$i.png \
-      mail/branding/$pkgname/mailicon$i.png
-  done
-  for i in 48 64; do
-    install -Dm644 $brandingdir/app-icons/$pkgname$i.png \
-      mail/branding/$pkgname/content/icon$i.png
-  done
-  cp -av $brandingdir/preview.png mail/themes/linux/mail/preview.png
-
-  # install to /usr/lib/icedove
-  patch -Np1 -i "$srcdir/$pkgname-install-dir.patch"
-
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
-  patch -Np1 -i "$srcdir/no-crmf.patch"
-
-  # Fix rust build
-  patch -Np1 -i "$srcdir/rust-target-i586-to-i686.patch"
-  patch -Np1 -i "$srcdir/mp4parse-bindings.patch"
-
-  # Fix freedom issues
-  patch -Np1 -i "$srcdir/libre-searchengines.patch"
-
-  # Remove url-classifier from package-manifest.in to build and disable Phishing Protection
+  # Patch and remove anything that's left
+  patch -Np1 -i "$srcdir/libre.patch"
   sed -i '\|Phishing Protection|d
           \|UrlClassifier|d
           \|URLClassifier|d
           \|url-classifier|d
          ' mail/installer/package-manifest.in
-
-  # Replace common URLs
   sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://directory.fsf.org/wiki/Icedove");|g;
           \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|https://directory.fsf.org/wiki/Icedove");|g;
           \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://directory.fsf.org/wiki/Icedove");|g;
           \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://directory.fsf.org/wiki/Icedove");|g;
          ' mail/app/profile/all-thunderbird.js
 
-  cp -v "$srcdir/mozconfig" .mozconfig
-
-  # make sure we use python2
-  mkdir "$srcdir/path"
-  ln -s /usr/bin/python2 "$srcdir/path/python"
-
-  # Change the default search engine using our system-provided searchplugins
-  patch -Np1 -i "$srcdir/changing-the-default-search-engine.patch"
+  for i in 16 22 24 32 48 64 128 256; do
+    install -Dm644 $srcdir/$pkgname-$_bver/app-icons/$pkgname$i.png \
+      mail/branding/$pkgname/mailicon$i.png
+  done
+  for i in 48 64; do
+    install -Dm644 $srcdir/$pkgname-$_bver/app-icons/$pkgname$i.png \
+      mail/branding/$pkgname/content/icon$i.png
+  done
+  cp -av $srcdir/$pkgname-$_bver/preview.png \
+    mail/themes/linux/mail/preview.png
 
   # Load our searchplugins
   rm -rv mail/locales/en-US/searchplugins
   cp -av /usr/lib/mozilla/searchplugins mail/locales/en-US/
-
-  # ARM-specific changes:
-  if [[ "$CARCH" == arm* ]]; then
-    # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=850984
-    sed -i 's/\^\[:space:\]\*/^[[:space:]]*/' mozilla/{,js/src/}configure
-
-    patch -Np0 -i ../no-neon.patch
-    sed -i '/ac_add_options --enable-gold/d' .mozconfig
-    cat >> .mozconfig <<- EOF
-	ac_add_options --disable-elf-hack
-	ac_add_options --disable-neon
-	ac_add_options --disable-ion
-	ac_add_options --disable-webrtc
-	ac_add_options --disable-debug
-	ac_add_options --disable-debug-symbols
-	EOF
-  fi
 }
 
 build() {
-  cd "$srcdir/$_oldname-$pkgver"
+  cd $_pkgname-$pkgver
 
   # _FORTIFY_SOURCE causes configure failures
   CPPFLAGS+=" -O2"
 
-  # Hardening
-  LDFLAGS+=" -Wl,-z,now"
-
-  # GCC 6
-  CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
-  CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
-
   export PATH="$srcdir/path:$PATH"
-  export PYTHON="/usr/bin/python2"
 
+  # Do PGO
+  #xvfb-run -a -n 95 -s "-extension GLX -screen 0 1280x1024x24" \
+  #  make -f client.mk build MOZ_PGO=1
   make -f client.mk build
 }
 
 package() {
-  cd "$srcdir/$_oldname-$pkgver"
-
+  cd $_pkgname-$pkgver
   make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
 
-  install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$pkgname/defaults/preferences/vendor.js"
+  _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);
+
+// Disable default mailer checking.
+pref("mail.shell.checkDefaultMail", false);
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);
 
-  local brandingdir="$srcdir/$pkgname-$_brandingver"
+// Disable Social API for content
+pref("social.remote-install.enabled", false);
+pref("social.toast-notifications.enabled", false);
 
-  # Install Icedove menu icon
-  install -Dm644 $brandingdir/$pkgname.xpm "$pkgdir/usr/share/pixmaps/$pkgname.xpm"
+// Make sure that whitelisted and directory installs are empty
+pref("social.whitelist", "");
+pref("social.directories", "");
+
+// Disable the GeoLocation API for content
+pref("geo.enabled", false);
+
+// Pointing the "Help -> What's new" menu entry to mozilla.debian.net
+pref("mailnews.start_page.override_url", "http://wiki.debian.org/Icedove/WhatsNew45");
+END
+
+  _distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"
+  install -Dm644 /dev/stdin "$_distini" <<END
+[Global]
+id=parabola
+version=1.0
+about=Icedove for Parabola GNU/Linux-libre
+
+[Preferences]
+app.distributor=parabola
+app.distributor.channel=$pkgname
+app.partner.parabola=parabola
+END
 
-  # Install Icedove icons
-  local icondir="$pkgdir/usr/share/icons/hicolor"
   for i in 16 22 24 32 48 64 128 256; do
-    install -Dm644 "$brandingdir/app-icons/$pkgname$i.png" \
-      "$icondir/${i}x${i}/apps/$pkgname.png"
+    install -Dm644 "$srcdir/$pkgname-$_bver/app-icons/$pkgname$i.png" \
+      "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
   done
-  install -Dm644 "$brandingdir/app-icons/${pkgname}big.svg" \
-    "$icondir/scalable/apps/$pkgname.svg"
+  install -Dm644 "$srcdir/$pkgname-$_bver/app-icons/${pkgname}big.svg" \
+    "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg"
+  install -Dm644 $srcdir/$pkgname-$_bver/$pkgname.xpm \
+    "$pkgdir/usr/share/pixmaps/$pkgname.xpm"
+
 
-  # Install Icedove desktop
-  install -d "$pkgdir/usr/share/applications"
-  install -m644 "$srcdir/$pkgname.desktop" \
-    "$pkgdir/usr/share/applications"
+  install -Dm644 ../$pkgname.desktop \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
 
   # Use system-provided dictionaries
-  rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation}
-  ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
-  ln -s /usr/share/hyphen   "$pkgdir/usr/lib/$pkgname/hyphenation"
+  rm -r "$pkgdir"/usr/lib/$pkgname/dictionaries
+  ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
+  ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation"
+
+  # Install a wrapper to avoid confusion about binary path
+  install -Dm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" <<END
+#!/bin/sh
+exec /usr/lib/$pkgname/$pkgname "\$@"
+END
 
-  # Replace duplicate binary with symlink
+  # Replace duplicate binary with wrapper
   # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
+  ln -srf "$pkgdir/usr/bin/$pkgname" \
+    "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
 }
diff --git a/libre/icedove/changing-the-default-search-engine.patch b/libre/icedove/changing-the-default-search-engine.patch
deleted file mode 100644
index c30366ad9..000000000
--- a/libre/icedove/changing-the-default-search-engine.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/mail/locales/en-US/chrome/messenger-region/region.properties b/mail/locales/en-US/chrome/messenger-region/region.properties
-index fcc870d..f810450 100644
---- a/mail/locales/en-US/chrome/messenger-region/region.properties
-+++ b/mail/locales/en-US/chrome/messenger-region/region.properties
-@@ -3,12 +3,12 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- # Default search engine
--browser.search.defaultenginename=Bing
-+browser.search.defaultenginename=searx
- 
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Bing
--browser.search.order.2=Yahoo
--browser.search.order.3=
-+browser.search.order.1=searx
-+browser.search.order.2=DuckDuckGo HTML
-+browser.search.order.3=DuckDuckGo Lite
- 
- # To make mapit buttons to disappear in the addressbook, specify empty string.  For example:
- # mail.addr_book.mapit_url.format=
-@@ -23,14 +23,12 @@ browser.search.order.3=
- # @ZI == zip code
- # @CO == country
- # Default map service:
--mail.addr_book.mapit_url.format=https://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
-+mail.addr_book.mapit_url.format=https://nominatim.openstreetmap.org/search.php?polygon=1&q=@A1%2C@A2%2C@CI%2C@ST%2C@ZI%2C@CO
- # List of available map services (up to 5 can be defined here):
--mail.addr_book.mapit_url.1.name=Google Maps
--mail.addr_book.mapit_url.1.format=https://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
--mail.addr_book.mapit_url.2.name=OpenStreetMap
--mail.addr_book.mapit_url.2.format=https://nominatim.openstreetmap.org/search.php?polygon=1&q=@A1%2C@A2%2C@CI%2C@ST%2C@ZI%2C@CO
-+mail.addr_book.mapit_url.1.name=OpenStreetMap
-+mail.addr_book.mapit_url.1.format=https://nominatim.openstreetmap.org/search.php?polygon=1&q=@A1%2C@A2%2C@CI%2C@ST%2C@ZI%2C@CO
- 
--mailnews.messageid_browser.url=http://groups.google.com/search?as_umsgid=%mid
-+mailnews.messageid_browser.url=
- 
- # Recognize non-standard versions of "Re:" in subjects from localized versions of MS Outlook et al.
- # Specify a comma-separated list without spaces. For example: mailnews.localizedRe=AW,SV
diff --git a/libre/icedove/fix-wifi-scanner.diff b/libre/icedove/fix-wifi-scanner.diff
new file mode 100644
index 000000000..f8fdd6c42
--- /dev/null
+++ b/libre/icedove/fix-wifi-scanner.diff
@@ -0,0 +1,16 @@
+ netwerk/wifi/nsWifiScannerDBus.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git c/netwerk/wifi/nsWifiScannerDBus.cpp i/netwerk/wifi/nsWifiScannerDBus.cpp
+index 182553e18fa6e104..6fa0a0b023d3e45f 100644
+--- c/netwerk/wifi/nsWifiScannerDBus.cpp
++++ i/netwerk/wifi/nsWifiScannerDBus.cpp
+@@ -62,7 +62,7 @@ nsWifiScannerDBus::SendMessage(const char* aInterface,
+       return NS_ERROR_FAILURE;
+     }
+   } else if (!strcmp(aFuncCall, "GetAll")) {
+-    const char* param = "";
++    const char* param = "org.freedesktop.NetworkManager.AccessPoint";
+     if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, &param)) {
+       return NS_ERROR_FAILURE;
+     }
diff --git a/libre/icedove/glibc-2.26-fix.diff b/libre/icedove/glibc-2.26-fix.diff
new file mode 100644
index 000000000..48733ab89
--- /dev/null
+++ b/libre/icedove/glibc-2.26-fix.diff
@@ -0,0 +1,258 @@
+From 6a0b7c8ecf0734ba1bcdccf8e0ee97e721fd5420 Mon Sep 17 00:00:00 2001
+Message-Id: <6a0b7c8ecf0734ba1bcdccf8e0ee97e721fd5420.1505113337.git.jan.steffens@gmail.com>
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Sat, 19 Aug 2017 20:14:25 +0200
+Subject: [PATCH] Fix use of struct ucontext (squash 2 commits)
+
+Needed for building with glibc 2.26.
+
+Bug 1385667: Use ucontext_t consistently in breakpad-client. r=ted
+MozReview-Commit-ID: AJhzJdNXP0f
+
+Bug 1394149: Fix remaining uses of ucontext in breakpad-client. r=ted
+MozReview-Commit-ID: 5tP7fXsI7dQ
+---
+ .../linux/dump_writer_common/ucontext_reader.cc    | 30 +++++++++++-----------
+ .../linux/dump_writer_common/ucontext_reader.h     | 10 ++++----
+ .../linux/handler/exception_handler.cc             | 10 ++++----
+ .../linux/handler/exception_handler.h              |  2 +-
+ .../linux/microdump_writer/microdump_writer.cc     |  2 +-
+ .../linux/minidump_writer/minidump_writer.cc       |  2 +-
+ 6 files changed, 28 insertions(+), 28 deletions(-)
+
+diff --git a/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.cc b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.cc
+index 999960912e459e1b..303c0ebd32b663c4 100644
+--- a/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.cc
++++ b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.cc
+@@ -40,15 +40,15 @@ namespace google_breakpad {
+ 
+ #if defined(__i386__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_ESP];
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_EIP];
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+                                     const struct _libc_fpstate* fp) {
+   const greg_t* regs = uc->uc_mcontext.gregs;
+ 
+@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+ 
+ #elif defined(__x86_64)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_RSP];
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_RIP];
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+                                     const struct _libc_fpstate* fpregs) {
+   const greg_t* regs = uc->uc_mcontext.gregs;
+ 
+@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+ 
+ #elif defined(__ARM_EABI__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.arm_sp;
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.arm_pc;
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
+   out->context_flags = MD_CONTEXT_ARM_FULL;
+ 
+   out->iregs[0] = uc->uc_mcontext.arm_r0;
+@@ -184,41 +184,41 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
+ 
+ #elif defined(__aarch64__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.sp;
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.pc;
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+                                     const struct fpsimd_context* fpregs) {
+   out->context_flags = MD_CONTEXT_ARM64_FULL;
+ 
+   out->cpsr = static_cast<uint32_t>(uc->uc_mcontext.pstate);
+   for (int i = 0; i < MD_CONTEXT_ARM64_REG_SP; ++i)
+     out->iregs[i] = uc->uc_mcontext.regs[i];
+   out->iregs[MD_CONTEXT_ARM64_REG_SP] = uc->uc_mcontext.sp;
+   out->iregs[MD_CONTEXT_ARM64_REG_PC] = uc->uc_mcontext.pc;
+ 
+   out->float_save.fpsr = fpregs->fpsr;
+   out->float_save.fpcr = fpregs->fpcr;
+   my_memcpy(&out->float_save.regs, &fpregs->vregs,
+       MD_FLOATINGSAVEAREA_ARM64_FPR_COUNT * 16);
+ }
+ 
+ #elif defined(__mips__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.pc;
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
+ #if _MIPS_SIM == _ABI64
+   out->context_flags = MD_CONTEXT_MIPS64_FULL;
+ #elif _MIPS_SIM == _ABIO32
+diff --git a/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.h b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.h
+index c533e28ba7441e83..039752a2dfb6e589 100644
+--- a/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.h
++++ b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.h
+@@ -41,21 +41,21 @@ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext structs.
+ struct UContextReader {
+-  static uintptr_t GetStackPointer(const struct ucontext* uc);
++  static uintptr_t GetStackPointer(const ucontext_t* uc);
+ 
+-  static uintptr_t GetInstructionPointer(const struct ucontext* uc);
++  static uintptr_t GetInstructionPointer(const ucontext_t* uc);
+ 
+   // Juggle a arch-specific ucontext into a minidump format
+   //   out: the minidump structure
+   //   info: the collection of register structures.
+ #if defined(__i386__) || defined(__x86_64)
+-  static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+                              const struct _libc_fpstate* fp);
+ #elif defined(__aarch64__)
+-  static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+                              const struct fpsimd_context* fpregs);
+ #else
+-  static void FillCPUContext(RawContextCPU *out, const ucontext *uc);
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
+ #endif
+ };
+ 
+diff --git a/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc
+index 71a51a763938e39d..12df9bc96ec45fea 100644
+--- a/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc
++++ b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc
+@@ -439,44 +439,44 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) {
+   // Fill in all the holes in the struct to make Valgrind happy.
+   memset(&g_crash_context_, 0, sizeof(g_crash_context_));
+   memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t));
+-  memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext));
++  memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t));
+ #if defined(__aarch64__)
+-  struct ucontext* uc_ptr = (struct ucontext*)uc;
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
+   struct fpsimd_context* fp_ptr =
+       (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
+   if (fp_ptr->head.magic == FPSIMD_MAGIC) {
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of struct ucontext
++  // In case of MIPS Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+-  struct ucontext* uc_ptr = (struct ucontext*)uc;
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+     memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs,
+            sizeof(g_crash_context_.float_state));
+   }
+ #endif
+   g_crash_context_.tid = syscall(__NR_gettid);
+   if (crash_handler_ != NULL) {
+     if (crash_handler_(&g_crash_context_, sizeof(g_crash_context_),
+                        callback_context_)) {
+       return true;
+     }
+   }
+   return GenerateDump(&g_crash_context_);
+ }
+ 
+ // This is a public interface to HandleSignal that allows the client to
+ // generate a crash dump. This function may run in a compromised context.
+ bool ExceptionHandler::SimulateSignalDelivery(int sig) {
+   siginfo_t siginfo = {};
+   // Mimic a trusted signal to allow tracing the process (see
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  struct ucontext context;
++  ucontext_t context;
+   getcontext(&context);
+   return HandleSignal(sig, &siginfo, &context);
+ }
+diff --git a/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.h b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.h
+index 711586fec7ddae59..be1880170e2826b0 100644
+--- a/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.h
++++ b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.h
+@@ -191,7 +191,7 @@ class ExceptionHandler {
+   struct CrashContext {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+-    struct ucontext context;
++    ucontext_t context;
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of struct
+diff --git a/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.cc b/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.cc
+index ff20bf36584c876b..a0b90e08fc5f0cff 100644
+--- a/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.cc
++++ b/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.cc
+@@ -571,7 +571,7 @@ class MicrodumpWriter {
+ 
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+-  const struct ucontext* const ucontext_;
++  const ucontext_t* const ucontext_;
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+diff --git a/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc
+index 0650bb95c179464a..6b5304bcd605ca3a 100644
+--- a/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc
++++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc
+@@ -1247,7 +1247,7 @@ class MinidumpWriter {
+   const int fd_;  // File descriptor where the minidum should be written.
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+-  const struct ucontext* const ucontext_;  // also from the signal handler
++  const ucontext_t* const ucontext_;  // also from the signal handler
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+-- 
+2.14.1
+
diff --git a/libre/icedove/icedove-install-dir.patch b/libre/icedove/icedove-install-dir.patch
index ac58bc982..0e3ba7f58 100644
--- a/libre/icedove/icedove-install-dir.patch
+++ b/libre/icedove/icedove-install-dir.patch
@@ -1,5 +1,6 @@
---- a/mozilla/config/baseconfig.mk
-+++ b/mozilla/config/baseconfig.mk
+diff -upr comm-esr31.orig/mozilla/config/baseconfig.mk comm-esr31/mozilla/config/baseconfig.mk
+--- comm-esr31.orig/mozilla/config/baseconfig.mk	2014-07-22 09:44:22.000000000 +0300
++++ comm-esr31/mozilla/config/baseconfig.mk	2014-07-22 09:46:45.000000000 +0300
 @@ -4,7 +4,7 @@
  # whether a normal build is happening or whether the check is running.
  includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
diff --git a/libre/icedove/icedove.desktop b/libre/icedove/icedove.desktop
index 1ba43e0b3..df3502947 100644
--- a/libre/icedove/icedove.desktop
+++ b/libre/icedove/icedove.desktop
@@ -55,7 +55,7 @@ GenericName[uk]=Поштова програма
 GenericName[vi]=Phần mềm khách quản lý thư điện tử
 GenericName[zh_CN]=邮件新闻客户端
 GenericName[zh_TW]=郵件用戶端
-Exec=icedove %u
+Exec=/usr/lib/icedove/icedove %u
 Terminal=false
 Type=Application
 Icon=icedove
@@ -116,7 +116,7 @@ Name[uk]=Написати нового листа
 Name[vi]=Viết thư mới
 Name[zh_CN]=编写新消息
 Name[zh_TW]=寫一封新訊息
-Exec=icedove -compose
+Exec=/usr/lib/icedove/icedove -compose
 
 [Desktop Action OpenAddressBook]
 Name=Open address book
@@ -170,4 +170,4 @@ Name[uk]=Відкрити адресну книгу
 Name[vi]=Mở sổ địa chỉ
 Name[zh_CN]=打开通讯录
 Name[zh_TW]=開啟通訊錄
-Exec=icedove -addressbook
+Exec=/usr/lib/icedove/icedove -addressbook
diff --git a/libre/icedove/icedove.install b/libre/icedove/icedove.install
deleted file mode 100644
index 4d4a283db..000000000
--- a/libre/icedove/icedove.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/libre/icedove/libre-searchengines.patch b/libre/icedove/libre.patch
index 181655d4e..e601388bb 100644
--- a/libre/icedove/libre-searchengines.patch
+++ b/libre/icedove/libre.patch
@@ -361,3 +361,43 @@
          ]
        }
      }
+diff --git a/mail/locales/en-US/chrome/messenger-region/region.properties b/mail/locales/en-US/chrome/messenger-region/region.properties
+index fcc870d..f810450 100644
+--- a/mail/locales/en-US/chrome/messenger-region/region.properties
++++ b/mail/locales/en-US/chrome/messenger-region/region.properties
+@@ -3,12 +3,12 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+ # Default search engine
+-browser.search.defaultenginename=Bing
++browser.search.defaultenginename=searx
+ 
+ # Search engine order (order displayed in the search bar dropdown)s
+-browser.search.order.1=Bing
+-browser.search.order.2=Yahoo
+-browser.search.order.3=
++browser.search.order.1=searx
++browser.search.order.2=DuckDuckGo HTML
++browser.search.order.3=DuckDuckGo Lite
+ 
+ # To make mapit buttons to disappear in the addressbook, specify empty string.  For example:
+ # mail.addr_book.mapit_url.format=
+@@ -23,14 +23,12 @@ browser.search.order.3=
+ # @ZI == zip code
+ # @CO == country
+ # Default map service:
+-mail.addr_book.mapit_url.format=https://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
++mail.addr_book.mapit_url.format=https://nominatim.openstreetmap.org/search.php?polygon=1&q=@A1%2C@A2%2C@CI%2C@ST%2C@ZI%2C@CO
+ # List of available map services (up to 5 can be defined here):
+-mail.addr_book.mapit_url.1.name=Google Maps
+-mail.addr_book.mapit_url.1.format=https://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
+-mail.addr_book.mapit_url.2.name=OpenStreetMap
+-mail.addr_book.mapit_url.2.format=https://nominatim.openstreetmap.org/search.php?polygon=1&q=@A1%2C@A2%2C@CI%2C@ST%2C@ZI%2C@CO
++mail.addr_book.mapit_url.1.name=OpenStreetMap
++mail.addr_book.mapit_url.1.format=https://nominatim.openstreetmap.org/search.php?polygon=1&q=@A1%2C@A2%2C@CI%2C@ST%2C@ZI%2C@CO
+ 
+-mailnews.messageid_browser.url=http://groups.google.com/search?as_umsgid=%mid
++mailnews.messageid_browser.url=
+ 
+ # Recognize non-standard versions of "Re:" in subjects from localized versions of MS Outlook et al.
+ # Specify a comma-separated list without spaces. For example: mailnews.localizedRe=AW,SV
diff --git a/libre/icedove/mozconfig b/libre/icedove/mozconfig
deleted file mode 100644
index 54decf725..000000000
--- a/libre/icedove/mozconfig
+++ /dev/null
@@ -1,44 +0,0 @@
-ac_add_options --enable-application=mail
-
-ac_add_options --prefix=/usr
-ac_add_options --enable-release
-ac_add_options --enable-gold
-ac_add_options --enable-pie
-ac_add_options --enable-optimize="-O2"
-ac_add_options --enable-rust
-
-# Icedove
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=mail/branding/icedove
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-icu
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-pixman
-
-# Features
-ac_add_options --enable-startup-notification
-ac_add_options --enable-alsa
-ac_add_options --disable-updater
-ac_add_options --disable-crashreporter
-ac_add_options --enable-calendar
-
-ac_add_options --disable-tests
-
-STRIP_FLAGS="--strip-debug"
-
-# Parabola features
-ac_add_options --with-distribution-id=nu.parabola
-ac_add_options --disable-safe-browsing
-ac_add_options --disable-url-classifier
-ac_add_options --disable-eme
-
-# vim:set ft=sh:
diff --git a/libre/icedove/mp4parse-bindings.patch b/libre/icedove/mp4parse-bindings.patch
deleted file mode 100644
index d0a2da27c..000000000
--- a/libre/icedove/mp4parse-bindings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml
-+++ b/mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml
-@@ -18,6 +18,8 @@ exclude = [
-   "*.mp4",
- ]
- 
-+build = false
-+
- [dependencies]
- byteorder = "1.0.0"
- "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
diff --git a/nonprism/icedove/no-crmf.patch b/libre/icedove/no-crmf.diff
index 73e545de0..4d74a1af2 100644
--- a/nonprism/icedove/no-crmf.patch
+++ b/libre/icedove/no-crmf.diff
@@ -12,7 +12,7 @@ diff -u -rN thunderbird-52.1.1/mozilla/config/external/nss/crmf/moz.build thunde
 diff -u -rN thunderbird-52.1.1/mozilla/old-configure thunderbird-52.1.1-nocrmf/mozilla/old-configure
 --- thunderbird-52.1.1/mozilla/old-configure	2017-05-09 23:35:35.000000000 +0200
 +++ thunderbird-52.1.1-nocrmf/mozilla/old-configure	2017-06-14 01:50:28.726873231 +0200
-@@ -10692,9 +10692,7 @@
+@@ -10693,9 +10693,7 @@
  
  fi
  
@@ -27,7 +27,7 @@ diff -u -rN thunderbird-52.1.1/mozilla/old-configure.in thunderbird-52.1.1-nocrm
 --- thunderbird-52.1.1/mozilla/old-configure.in	2017-05-09 23:35:22.000000000 +0200
 +++ thunderbird-52.1.1-nocrmf/mozilla/old-configure.in	2017-06-14 01:50:50.953507079 +0200
 @@ -2126,9 +2126,7 @@
-     AM_PATH_NSS(3.28.4, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+     AM_PATH_NSS(3.28.6, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
  fi
  
 -if test -n "$MOZ_SYSTEM_NSS"; then
diff --git a/libre/icedove/no-neon.patch b/libre/icedove/no-neon.patch
deleted file mode 100644
index af8bf198d..000000000
--- a/libre/icedove/no-neon.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- mozilla/configure.orig	2016-04-19 12:42:57.280811615 -0600
-+++ mozilla/configure	2016-04-19 12:44:20.697690476 -0600
-@@ -7389,14 +7389,7 @@
- rm -f conftest*
-   echo "$ac_t"""$result"" 1>&6
-   if test "$result" = "yes"; then
--      cat >> confdefs.pytmp <<\EOF
--    (''' HAVE_ARM_SIMD ''', ' 1 ')
--EOF
--cat >> confdefs.h <<\EOF
--#define HAVE_ARM_SIMD 1
--EOF
--
--      HAVE_ARM_SIMD=1
-+      HAVE_ARM_SIMD=
-   fi
- 
-   echo $ac_n "checking ARM version support in compiler""... $ac_c" 1>&6
-@@ -7428,27 +7421,13 @@
- rm -f conftest*
-   echo "$ac_t"""$result"" 1>&6
-   if test "$result" = "yes"; then
--      cat >> confdefs.pytmp <<\EOF
--    (''' HAVE_ARM_NEON ''', ' 1 ')
--EOF
--cat >> confdefs.h <<\EOF
--#define HAVE_ARM_NEON 1
--EOF
--
--      HAVE_ARM_NEON=1
-+      HAVE_ARM_NEON=
- 
-                   if test -n "$ARM_ARCH"; then
-           if test "$ARM_ARCH" -lt 7; then
-               BUILD_ARM_NEON=
-           else
--              cat >> confdefs.pytmp <<\EOF
--    (''' BUILD_ARM_NEON ''', ' 1 ')
--EOF
--cat >> confdefs.h <<\EOF
--#define BUILD_ARM_NEON 1
--EOF
--
--              BUILD_ARM_NEON=1
-+              BUILD_ARM_NEON=
-           fi
-       fi
-   fi
---- mozilla/js/src/configure.orig	2016-04-07 15:33:39.000000000 -0600
-+++ mozilla/js/src/configure	2016-04-19 12:44:20.697690476 -0600
-@@ -6578,14 +6578,7 @@
- rm -f conftest*
-   echo "$ac_t"""$result"" 1>&6
-   if test "$result" = "yes"; then
--      cat >> confdefs.pytmp <<\EOF
--    (''' HAVE_ARM_SIMD ''', ' 1 ')
--EOF
--cat >> confdefs.h <<\EOF
--#define HAVE_ARM_SIMD 1
--EOF
--
--      HAVE_ARM_SIMD=1
-+      HAVE_ARM_SIMD=
-   fi
- 
-   echo $ac_n "checking ARM version support in compiler""... $ac_c" 1>&6
-@@ -6617,27 +6610,13 @@
- rm -f conftest*
-   echo "$ac_t"""$result"" 1>&6
-   if test "$result" = "yes"; then
--      cat >> confdefs.pytmp <<\EOF
--    (''' HAVE_ARM_NEON ''', ' 1 ')
--EOF
--cat >> confdefs.h <<\EOF
--#define HAVE_ARM_NEON 1
--EOF
--
--      HAVE_ARM_NEON=1
-+      HAVE_ARM_NEON=
- 
-                   if test -n "$ARM_ARCH"; then
-           if test "$ARM_ARCH" -lt 7; then
-               BUILD_ARM_NEON=
-           else
--              cat >> confdefs.pytmp <<\EOF
--    (''' BUILD_ARM_NEON ''', ' 1 ')
--EOF
--cat >> confdefs.h <<\EOF
--#define BUILD_ARM_NEON 1
--EOF
--
--              BUILD_ARM_NEON=1
-+              BUILD_ARM_NEON=
-           fi
-       fi
-   fi
diff --git a/libre/icedove/rust-i686.patch b/libre/icedove/rust-i686.patch
new file mode 100644
index 000000000..85512e143
--- /dev/null
+++ b/libre/icedove/rust-i686.patch
@@ -0,0 +1,16 @@
+ build/moz.configure/rust.configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git c/build/moz.configure/rust.configure i/build/moz.configure/rust.configure
+index cd86b24153debb1b..44911715e25d95e3 100644
+--- c/build/moz.configure/rust.configure
++++ i/build/moz.configure/rust.configure
+@@ -81,7 +81,7 @@ def rust_target(rust_compiler, rustc, target, cross_compiling):
+             # OpenBSD
+             ('x86_64', 'OpenBSD'): 'x86_64-unknown-openbsd',
+             # Linux
+-            ('x86', 'Linux'): 'i586-unknown-linux-gnu',
++            ('x86', 'Linux'): 'i686-unknown-linux-gnu',
+             # Linux
+             ('x86_64', 'Linux'): 'x86_64-unknown-linux-gnu',
+             # OS X and iOS
diff --git a/libre/icedove/rust-target-i586-to-i686.patch b/libre/icedove/rust-target-i586-to-i686.patch
deleted file mode 100644
index f22f4fa0f..000000000
--- a/libre/icedove/rust-target-i586-to-i686.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mozilla/build/moz.configure/rust.configure
-+++ b/mozilla/build/moz.configure/rust.configure
-@@ -105,7 +105,7 @@ def rust_target(rust_compiler, rustc, ta
-             # OpenBSD
-             ('x86_64', 'OpenBSD'): 'x86_64-unknown-openbsd',
-             # Linux
--            ('x86', 'Linux'): 'i586-unknown-linux-gnu',
-+            ('x86', 'Linux'): 'i686-unknown-linux-gnu',
-             # Linux
-             ('x86_64', 'Linux'): 'x86_64-unknown-linux-gnu',
-             # OS X and iOS
diff --git a/libre/icedove/vendor.js b/libre/icedove/vendor.js
deleted file mode 100644
index 2da68d2bb..000000000
--- a/libre/icedove/vendor.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default mailer checking.
-pref("mail.shell.checkDefaultMail", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);
-
-// Disable Social API for content
-pref("social.remote-install.enabled", false);
-pref("social.toast-notifications.enabled", false);
-
-// Make sure that whitelisted and directory installs are empty
-pref("social.whitelist", "");
-pref("social.directories", "");
-
-// Disable the GeoLocation API for content
-pref("geo.enabled", false);
-
-// Pointing the "Help -> What's new" menu entry to mozilla.debian.net
-pref("mailnews.start_page.override_url", "http://wiki.debian.org/Icedove/WhatsNew45");
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index cea3611ae..8bc637044 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -30,7 +30,7 @@ _pkgname=firefox
 pkgname=iceweasel
 epoch=1
 pkgver=58.0
-pkgrel=4
+pkgrel=5
 _bver=58.0
 _brel=1
 pkgdesc="Libre standalone web browser based on Mozilla Firefox"
@@ -51,7 +51,6 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
 options=(!emptydirs !makeflags !strip)
 replaces=("$_pkgname")
 conflicts=("$_pkgname")
-provides=("$_pkgname")
 source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
         $pkgname.desktop
         $pkgname-install-dir.patch no-crmf.diff
@@ -488,6 +487,10 @@ pref("dom.webkitBlink.dirPicker.enabled", false);
 // https://bugzilla.mozilla.org/show_bug.cgi?id=907707
 // https://wicg.github.io/directory-upload/proposal.html
 pref("dom.input.dirpicker", false);
+
+// fix alsa sound sandbox issue for iceweasel-58
+// https://labs.parabola.nu/issues/1628
+pref("security.sandbox.content.syscall_whitelist", "16");
 END
 
   _distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"
diff --git a/nonprism/icedove/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch b/nonprism/icedove/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
new file mode 100644
index 000000000..cf2e0eb9b
--- /dev/null
+++ b/nonprism/icedove/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
@@ -0,0 +1,48 @@
+From bbd48a5613c872883616884cfaf41665b0e4ec9b Mon Sep 17 00:00:00 2001
+From: Ralph Giles <giles@mozilla.com>
+Date: Fri, 10 Feb 2017 12:58:18 -0800
+Subject: [PATCH] Bug 1338655 - Don't try to build mp4parse bindings. r=froydnj
+
+We use the cheddar crate to generate a C header file
+for our mp4parse_capi wrapper crate. Currently we
+do this at code check-in time via update-rust.sh.
+
+Cargo 0.18 and later will try to execute a build.rs
+file in the crate source tree regardless of whether
+it's specified in Cargo.toml so patching out that
+line just results in 'crate cheddar not found'.
+
+This change restores the old behaviour by substituting
+a 'build = false' line instead.
+
+We do have syntex vendored, but we don't currently build
+it by default, so I prefer this solution to just vendoring
+cheddar and generating the header at build time. The syntex
+crate is quite large and adds significantly to our compile
+time.
+
+MozReview-Commit-ID: InJRRODWAdP
+
+--HG--
+extra : rebase_source : 29378fcbc86015ce6cc22dc66d38a43ddbac204e
+---
+ media/libstagefright/binding/mp4parse-cargo.patch     | 5 +++--
+ media/libstagefright/binding/mp4parse_capi/Cargo.toml | 2 ++
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
+index aee7ee947151a27c..d7e3f55119d3f4b6 100644
+--- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml
++++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
+@@ -18,6 +18,8 @@ exclude = [
+   "*.mp4",
+ ]
+ 
++build = false
++
+ [dependencies]
+ byteorder = "1.0.0"
+ "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
+-- 
+2.12.2
+
diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD
index d99655052..33b6b509a 100644
--- a/nonprism/icedove/PKGBUILD
+++ b/nonprism/icedove/PKGBUILD
@@ -1,123 +1,161 @@
+# $Id$
+# Contributor (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
+# Contributor (Arch): Alexander Baldeck <alexander@archlinux.org>
+# Contributor (Arch): Dale Blount <dale@archlinux.org>
+# Contributor (Arch): Anders Bostrom <anders.bostrom@home.se>
 # Maintainer: Andreas Grapentin <andreas@grapentin.org>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 # Contributor: Luke R. <g4jc@openmailbox.org>
 # Contributor: Isaac David <isacdaavid@isacdaavid.info>
 
-_oldname=thunderbird
-pkgname=icedove
+# parabola changes and rationale:
+#  - rebranded to icedove
+#  - removed nonfree search engines
+#  - added makedepends: quilt mozilla-searchplugins python2-blessings
+#  - added replaces, conflicts, provides: thunderbird
+#  - disabled tests, they break in an environment without network access.
 
+_pkgname=thunderbird
+pkgname=icedove
 epoch=1
-pkgver=52.5.2
+pkgver=52.6.0
 pkgrel=1.nonprism1
-_brandingver=52.1
-_brandingrel=1
-arch=(i686 x86_64 armv7h)
-
-pkgdesc="Icedove, the libre standalone mail and news reader based on Mozilla Thunderbird, without support for unsafe and dangerous for privacy protocols"
-url="https://wiki.parabola.nu/$pkgname"
+_bver=52.1
+_brel=1
+pkgdesc="Libre standalone mail and news reader based on Mozilla Thunderbird, without support for unsafe and dangerous for privacy protocols"
+arch=(x86_64 i686 armv7h)
 license=(MPL GPL LGPL)
-
-depends=(alsa-lib dbus-glib gtk2 gtk3 hunspell libvpx libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
+url="https://wiki.parabola.nu/$pkgname"
+depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib alsa-lib ffmpeg
+         nss hunspell sqlite ttf-font icu libvpx)
 depends_x86_64=("icu>=60" "icu<61")
 depends_i686=("icu>=60" "icu<61")
 depends_armv7h=("icu>=60" "icu<61")
-makedepends=(autoconf2.13 diffutils gconf imake inetutils libpulse mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip)
-makedepends_i686=(cargo)
-makedepends_x86_64=("${makedepends_i686[@]}")
-optdepends=('libcanberra: for sound support')
-replaces=("$pkgname-libre" "$_oldname")
-conflicts=("$pkgname-libre" "$_oldname")
+makedepends=(unzip zip diffutils python2 yasm mesa imake gconf libpulse inetutils xorg-server-xvfb
+             autoconf2.13 rust clang llvm quilt mozilla-searchplugins python2-blessings)
+optdepends=('libcanberra: sound support')
+replaces=("$_oldname")
+conflicts=("$_oldname")
 provides=("$_oldname")
 options=(!emptydirs !makeflags)
-install=$pkgname.install
-
-_parabolarepo=https://repo.parabola.nu/other/icedove
-source=("https://ftp.mozilla.org/pub/$_oldname/releases/$pkgver/source/$_oldname-$pkgver.source.tar.xz"
-        "$_parabolarepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz"
-        "$_parabolarepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz.sig"
-        mozconfig
-        $pkgname.desktop
-        $pkgname-install-dir.patch
-        changing-the-default-search-engine.patch
-        vendor.js
-        rust-target-i586-to-i686.patch
-        mp4parse-bindings.patch
-        libre-searchengines.patch
-        no-neon.patch
-        no-crmf.patch)
-sha256sums=('7772e1865cd4cbaac82ea05374d0ae51f754f47c6160c9b83919da483d620ee5'
+source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz
+        0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
+        no-crmf.diff rust-i686.patch fix-wifi-scanner.diff
+        $pkgname.desktop $pkgname-install-dir.patch
+        https://repo.parabola.nu/other/icedove/${pkgname}_$_bver-$_brel.branding.tar.xz{,.sig}
+        libre.patch)
+sha256sums=('16215fb5a3765c7e5a40eadc1f3aed6918294f6d8ef1552d2aa37656055045a8'
+            '413cd6d366d78f325d80ebebccfd0afa0d266b40b2e54b66ba2fa03c15f3ea67'
+            '9bb0ec0d1b267f8cc1f08fbd82666459a21e4c171d52b8314b80979c948d96ce'
+            'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269'
+            '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8'
+            'af8199a12ebe09189d143458bd1e2d0071aff3410ed121dc2329a448a56632f0'
+            'a3f2431a6e9eb01d3e20dfa5110e769180b4a752ea834c1162088aa90d99e8f3'
             '246418976524fbead5b99e6227f97322f8d4c45e0edf9ce75561ae8eccdefc65'
             'SKIP'
-            'cafd1cf384791e8e3284f52370b2913a8b05935ecfd10d2a19c6dd5a8c219b62'
-            '0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a'
-            '36e0a5ac0e994bfc939b4ac69a1a4aa365210e9dd5b49317d647c683817b2c5d'
-            'ff3474b7d8f7ad245a324c14f01daf05834462b4f0144fbc50f055ebb573dac8'
-            '058b58074368b57acf8a6df9a9ffac848b7d7b39f5abd84cb2039bcee42b73e2'
-            '069fab4b99dd51d7d004124d0052ea7b864cf060ea943348d290ba6aae50b0ab'
-            '45a9e651278e39df39d17a679ac9ad81255cd51b530ba23b8e55e4d39c3b35d0'
-            '0db12bef46e0ad68dbdf6ce0c767956d6758b073531012a850e7975eda3fc7fe'
-            '59f40d8b2480aa67bf76f4f119826b6828a6a59cc040caf1ab5a6e19eef44c6e'
-            'a7317caba56e89932bd9e3b9352d94701dd9a419685057f238b1ded8dc0adcd7')
+            '4a09569394f1b4e154fdcd53f2947b7be7f065baaa31c964629dff9117fdf49b')
 validpgpkeys=(BFA8008A8265677063B11BF47171986E4B745536) # Andreas Grapentin
 
 prepare() {
-  cd "$srcdir/$_oldname-$pkgver"
+  mkdir path
+  ln -s /usr/bin/python2 path/python
 
-  local brandingdir="$srcdir/$pkgname-$_brandingver"
+  cd $_pkgname-$pkgver
+  patch -Np1 -i ../$pkgname-install-dir.patch
 
-  # Prepare branding for the Icedove packages
-  mkdir -v mail/branding/$pkgname
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
+  patch -d mozilla -Np1 < ../fix-wifi-scanner.diff
 
-  # copy the branding files
-  cp -va $brandingdir/$pkgname-branding/* mail/branding/$pkgname
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
+  patch -Np1 -i ../no-crmf.diff
+
+  # Build with the rust targets we actually ship
+  patch -d mozilla -Np1 < ../rust-i686.patch
+
+  # https://bugs.archlinux.org/task/53890
+  patch -d mozilla -Np1 < ../0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
+
+  cat >.mozconfig <<END
+ac_add_options --enable-application=mail
+ac_add_options --enable-calendar
+
+ac_add_options --prefix=/usr
+ac_add_options --enable-release
+ac_add_options --enable-gold
+ac_add_options --enable-pie
+ac_add_options --enable-optimize="-O2"
+ac_add_options --enable-rust
+
+# Branding
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=mail/branding/icedove
+ac_add_options --enable-update-channel=release
+ac_add_options --with-distribution-id=nu.parabola
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-icu
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-pixman
+
+# Features
+ac_add_options --enable-alsa
+ac_add_options --disable-jack
+ac_add_options --enable-startup-notification
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-safe-browsing
+ac_add_options --disable-url-classifier
+ac_add_options --disable-eme
+ac_add_options --disable-tests
+END
+
+  if [[ "$CARCH" == arm* ]]; then
+    sed -i \
+        -e '/enable-gold/s/^/#/' \
+        -e '/enable-pie/s/^/#/' \
+        -e '/enable-optimize/s/^/#/' \
+        -e '/enable-rust/d' \
+      .mozconfig
+
+    cat >> .mozconfig << END
+ac_add_options --disable-webrtc
+ac_add_options --disable-elf-hack
+ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns"
+END
+  fi
+
+  # perform rebranding
+  local brandingdir="$srcdir/$pkgname-$_bver"
+  mkdir -v mail/branding/$pkgname
+  cp -va $srcdir/$pkgname-$_bver/$pkgname-branding/* mail/branding/$pkgname
 
-  # patch
-  export QUILT_PATCHES=$brandingdir/patches
+  export QUILT_PATCHES=$srcdir/$pkgname-$_bver/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
   export QUILT_DIFF_ARGS='--no-timestamps'
-
   quilt push -av
 
-  # install the icons
-  for i in 16 22 24 32 48 64 128 256; do
-    install -Dm644 $brandingdir/app-icons/$pkgname$i.png \
-      mail/branding/$pkgname/mailicon$i.png
-  done
-  for i in 48 64; do
-    install -Dm644 $brandingdir/app-icons/$pkgname$i.png \
-      mail/branding/$pkgname/content/icon$i.png
-  done
-  cp -av $brandingdir/preview.png mail/themes/linux/mail/preview.png
-
-  # install to /usr/lib/icedove
-  patch -Np1 -i "$srcdir/$pkgname-install-dir.patch"
-
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
-  patch -Np1 -i "$srcdir/no-crmf.patch"
-
-  # Fix rust build
-  patch -Np1 -i "$srcdir/rust-target-i586-to-i686.patch"
-  patch -Np1 -i "$srcdir/mp4parse-bindings.patch"
-
-  # Fix freedom issues
-  patch -Np1 -i "$srcdir/libre-searchengines.patch"
-
-  # Remove url-classifier from package-manifest.in to build and disable Phishing Protection
+  # Patch and remove anything that's left
+  patch -Np1 -i "$srcdir/libre.patch"
   sed -i '\|Phishing Protection|d
           \|UrlClassifier|d
           \|URLClassifier|d
           \|url-classifier|d
          ' mail/installer/package-manifest.in
-
-  # Replace common URLs
   sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://directory.fsf.org/wiki/Icedove");|g;
           \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|https://directory.fsf.org/wiki/Icedove");|g;
           \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://directory.fsf.org/wiki/Icedove");|g;
           \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://directory.fsf.org/wiki/Icedove");|g;
          ' mail/app/profile/all-thunderbird.js
-
-  # Remove support for unsafe and dangerous for privacy protocols
   sed -i '\|facebook|d
           \|gtalk|d
           \|odnoklassniki|d
@@ -135,88 +173,106 @@ prepare() {
          ' mail/installer/package-manifest.in
   rm -rv chat/protocols/{facebook,gtalk,twitter,yahoo}
 
-  cp -v "$srcdir/mozconfig" .mozconfig
-
-  # make sure we use python2
-  mkdir "$srcdir/path"
-  ln -s /usr/bin/python2 "$srcdir/path/python"
-
-  # Change the default search engine using our system-provided searchplugins
-  patch -Np1 -i "$srcdir/changing-the-default-search-engine.patch"
+  for i in 16 22 24 32 48 64 128 256; do
+    install -Dm644 $srcdir/$pkgname-$_bver/app-icons/$pkgname$i.png \
+      mail/branding/$pkgname/mailicon$i.png
+  done
+  for i in 48 64; do
+    install -Dm644 $srcdir/$pkgname-$_bver/app-icons/$pkgname$i.png \
+      mail/branding/$pkgname/content/icon$i.png
+  done
+  cp -av $srcdir/$pkgname-$_bver/preview.png \
+    mail/themes/linux/mail/preview.png
 
   # Load our searchplugins
   rm -rv mail/locales/en-US/searchplugins
   cp -av /usr/lib/mozilla/searchplugins mail/locales/en-US/
-
-  # ARM-specific changes:
-  if [[ "$CARCH" == arm* ]]; then
-    # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=850984
-    sed -i 's/\^\[:space:\]\*/^[[:space:]]*/' mozilla/{,js/src/}configure
-
-    patch -Np0 -i ../no-neon.patch
-    sed -i '/ac_add_options --enable-gold/d' .mozconfig
-    cat >> .mozconfig <<- EOF
-	ac_add_options --disable-elf-hack
-	ac_add_options --disable-neon
-	ac_add_options --disable-ion
-	ac_add_options --disable-webrtc
-	ac_add_options --disable-debug
-	ac_add_options --disable-debug-symbols
-	EOF
-  fi
 }
 
 build() {
-  cd "$srcdir/$_oldname-$pkgver"
+  cd $_pkgname-$pkgver
 
   # _FORTIFY_SOURCE causes configure failures
   CPPFLAGS+=" -O2"
 
-  # Hardening
-  LDFLAGS+=" -Wl,-z,now"
-
-  # GCC 6
-  CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
-  CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
-
   export PATH="$srcdir/path:$PATH"
-  export PYTHON="/usr/bin/python2"
 
+  # Do PGO
+  #xvfb-run -a -n 95 -s "-extension GLX -screen 0 1280x1024x24" \
+  #  make -f client.mk build MOZ_PGO=1
   make -f client.mk build
 }
 
 package() {
-  cd "$srcdir/$_oldname-$pkgver"
-
+  cd $_pkgname-$pkgver
   make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
 
-  install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$pkgname/defaults/preferences/vendor.js"
+  _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);
+
+// Disable default mailer checking.
+pref("mail.shell.checkDefaultMail", false);
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);
 
-  local brandingdir="$srcdir/$pkgname-$_brandingver"
+// Disable Social API for content
+pref("social.remote-install.enabled", false);
+pref("social.toast-notifications.enabled", false);
 
-  # Install Icedove menu icon
-  install -Dm644 $brandingdir/$pkgname.xpm "$pkgdir/usr/share/pixmaps/$pkgname.xpm"
+// Make sure that whitelisted and directory installs are empty
+pref("social.whitelist", "");
+pref("social.directories", "");
+
+// Disable the GeoLocation API for content
+pref("geo.enabled", false);
+
+// Pointing the "Help -> What's new" menu entry to mozilla.debian.net
+pref("mailnews.start_page.override_url", "http://wiki.debian.org/Icedove/WhatsNew45");
+END
+
+  _distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"
+  install -Dm644 /dev/stdin "$_distini" <<END
+[Global]
+id=parabola
+version=1.0
+about=Icedove for Parabola GNU/Linux-libre
+
+[Preferences]
+app.distributor=parabola
+app.distributor.channel=$pkgname
+app.partner.parabola=parabola
+END
 
-  # Install Icedove icons
-  local icondir="$pkgdir/usr/share/icons/hicolor"
   for i in 16 22 24 32 48 64 128 256; do
-    install -Dm644 "$brandingdir/app-icons/$pkgname$i.png" \
-      "$icondir/${i}x${i}/apps/$pkgname.png"
+    install -Dm644 "$srcdir/$pkgname-$_bver/app-icons/$pkgname$i.png" \
+      "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
   done
-  install -Dm644 "$brandingdir/app-icons/${pkgname}big.svg" \
-    "$icondir/scalable/apps/$pkgname.svg"
+  install -Dm644 "$srcdir/$pkgname-$_bver/app-icons/${pkgname}big.svg" \
+    "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg"
+  install -Dm644 $srcdir/$pkgname-$_bver/$pkgname.xpm \
+    "$pkgdir/usr/share/pixmaps/$pkgname.xpm"
+
 
-  # Install Icedove desktop
-  install -d "$pkgdir/usr/share/applications"
-  install -m644 "$srcdir/$pkgname.desktop" \
-    "$pkgdir/usr/share/applications"
+  install -Dm644 ../$pkgname.desktop \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
 
   # Use system-provided dictionaries
-  rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation}
-  ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
-  ln -s /usr/share/hyphen   "$pkgdir/usr/lib/$pkgname/hyphenation"
+  rm -r "$pkgdir"/usr/lib/$pkgname/dictionaries
+  ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
+  ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation"
+
+  # Install a wrapper to avoid confusion about binary path
+  install -Dm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" <<END
+#!/bin/sh
+exec /usr/lib/$pkgname/$pkgname "\$@"
+END
 
-  # Replace duplicate binary with symlink
+  # Replace duplicate binary with wrapper
   # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
+  ln -srf "$pkgdir/usr/bin/$pkgname" \
+    "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
 }
diff --git a/nonprism/icedove/changing-the-default-search-engine.patch b/nonprism/icedove/changing-the-default-search-engine.patch
deleted file mode 100644
index c30366ad9..000000000
--- a/nonprism/icedove/changing-the-default-search-engine.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/mail/locales/en-US/chrome/messenger-region/region.properties b/mail/locales/en-US/chrome/messenger-region/region.properties
-index fcc870d..f810450 100644
---- a/mail/locales/en-US/chrome/messenger-region/region.properties
-+++ b/mail/locales/en-US/chrome/messenger-region/region.properties
-@@ -3,12 +3,12 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- # Default search engine
--browser.search.defaultenginename=Bing
-+browser.search.defaultenginename=searx
- 
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Bing
--browser.search.order.2=Yahoo
--browser.search.order.3=
-+browser.search.order.1=searx
-+browser.search.order.2=DuckDuckGo HTML
-+browser.search.order.3=DuckDuckGo Lite
- 
- # To make mapit buttons to disappear in the addressbook, specify empty string.  For example:
- # mail.addr_book.mapit_url.format=
-@@ -23,14 +23,12 @@ browser.search.order.3=
- # @ZI == zip code
- # @CO == country
- # Default map service:
--mail.addr_book.mapit_url.format=https://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
-+mail.addr_book.mapit_url.format=https://nominatim.openstreetmap.org/search.php?polygon=1&q=@A1%2C@A2%2C@CI%2C@ST%2C@ZI%2C@CO
- # List of available map services (up to 5 can be defined here):
--mail.addr_book.mapit_url.1.name=Google Maps
--mail.addr_book.mapit_url.1.format=https://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
--mail.addr_book.mapit_url.2.name=OpenStreetMap
--mail.addr_book.mapit_url.2.format=https://nominatim.openstreetmap.org/search.php?polygon=1&q=@A1%2C@A2%2C@CI%2C@ST%2C@ZI%2C@CO
-+mail.addr_book.mapit_url.1.name=OpenStreetMap
-+mail.addr_book.mapit_url.1.format=https://nominatim.openstreetmap.org/search.php?polygon=1&q=@A1%2C@A2%2C@CI%2C@ST%2C@ZI%2C@CO
- 
--mailnews.messageid_browser.url=http://groups.google.com/search?as_umsgid=%mid
-+mailnews.messageid_browser.url=
- 
- # Recognize non-standard versions of "Re:" in subjects from localized versions of MS Outlook et al.
- # Specify a comma-separated list without spaces. For example: mailnews.localizedRe=AW,SV
diff --git a/nonprism/icedove/fix-wifi-scanner.diff b/nonprism/icedove/fix-wifi-scanner.diff
new file mode 100644
index 000000000..f8fdd6c42
--- /dev/null
+++ b/nonprism/icedove/fix-wifi-scanner.diff
@@ -0,0 +1,16 @@
+ netwerk/wifi/nsWifiScannerDBus.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git c/netwerk/wifi/nsWifiScannerDBus.cpp i/netwerk/wifi/nsWifiScannerDBus.cpp
+index 182553e18fa6e104..6fa0a0b023d3e45f 100644
+--- c/netwerk/wifi/nsWifiScannerDBus.cpp
++++ i/netwerk/wifi/nsWifiScannerDBus.cpp
+@@ -62,7 +62,7 @@ nsWifiScannerDBus::SendMessage(const char* aInterface,
+       return NS_ERROR_FAILURE;
+     }
+   } else if (!strcmp(aFuncCall, "GetAll")) {
+-    const char* param = "";
++    const char* param = "org.freedesktop.NetworkManager.AccessPoint";
+     if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, &param)) {
+       return NS_ERROR_FAILURE;
+     }
diff --git a/nonprism/icedove/glibc-2.26-fix.diff b/nonprism/icedove/glibc-2.26-fix.diff
new file mode 100644
index 000000000..48733ab89
--- /dev/null
+++ b/nonprism/icedove/glibc-2.26-fix.diff
@@ -0,0 +1,258 @@
+From 6a0b7c8ecf0734ba1bcdccf8e0ee97e721fd5420 Mon Sep 17 00:00:00 2001
+Message-Id: <6a0b7c8ecf0734ba1bcdccf8e0ee97e721fd5420.1505113337.git.jan.steffens@gmail.com>
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Sat, 19 Aug 2017 20:14:25 +0200
+Subject: [PATCH] Fix use of struct ucontext (squash 2 commits)
+
+Needed for building with glibc 2.26.
+
+Bug 1385667: Use ucontext_t consistently in breakpad-client. r=ted
+MozReview-Commit-ID: AJhzJdNXP0f
+
+Bug 1394149: Fix remaining uses of ucontext in breakpad-client. r=ted
+MozReview-Commit-ID: 5tP7fXsI7dQ
+---
+ .../linux/dump_writer_common/ucontext_reader.cc    | 30 +++++++++++-----------
+ .../linux/dump_writer_common/ucontext_reader.h     | 10 ++++----
+ .../linux/handler/exception_handler.cc             | 10 ++++----
+ .../linux/handler/exception_handler.h              |  2 +-
+ .../linux/microdump_writer/microdump_writer.cc     |  2 +-
+ .../linux/minidump_writer/minidump_writer.cc       |  2 +-
+ 6 files changed, 28 insertions(+), 28 deletions(-)
+
+diff --git a/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.cc b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.cc
+index 999960912e459e1b..303c0ebd32b663c4 100644
+--- a/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.cc
++++ b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.cc
+@@ -40,15 +40,15 @@ namespace google_breakpad {
+ 
+ #if defined(__i386__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_ESP];
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_EIP];
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+                                     const struct _libc_fpstate* fp) {
+   const greg_t* regs = uc->uc_mcontext.gregs;
+ 
+@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+ 
+ #elif defined(__x86_64)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_RSP];
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[REG_RIP];
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+                                     const struct _libc_fpstate* fpregs) {
+   const greg_t* regs = uc->uc_mcontext.gregs;
+ 
+@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+ 
+ #elif defined(__ARM_EABI__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.arm_sp;
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.arm_pc;
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
+   out->context_flags = MD_CONTEXT_ARM_FULL;
+ 
+   out->iregs[0] = uc->uc_mcontext.arm_r0;
+@@ -184,41 +184,41 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
+ 
+ #elif defined(__aarch64__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.sp;
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.pc;
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+                                     const struct fpsimd_context* fpregs) {
+   out->context_flags = MD_CONTEXT_ARM64_FULL;
+ 
+   out->cpsr = static_cast<uint32_t>(uc->uc_mcontext.pstate);
+   for (int i = 0; i < MD_CONTEXT_ARM64_REG_SP; ++i)
+     out->iregs[i] = uc->uc_mcontext.regs[i];
+   out->iregs[MD_CONTEXT_ARM64_REG_SP] = uc->uc_mcontext.sp;
+   out->iregs[MD_CONTEXT_ARM64_REG_PC] = uc->uc_mcontext.pc;
+ 
+   out->float_save.fpsr = fpregs->fpsr;
+   out->float_save.fpcr = fpregs->fpcr;
+   my_memcpy(&out->float_save.regs, &fpregs->vregs,
+       MD_FLOATINGSAVEAREA_ARM64_FPR_COUNT * 16);
+ }
+ 
+ #elif defined(__mips__)
+ 
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
+ }
+ 
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+   return uc->uc_mcontext.pc;
+ }
+ 
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
+ #if _MIPS_SIM == _ABI64
+   out->context_flags = MD_CONTEXT_MIPS64_FULL;
+ #elif _MIPS_SIM == _ABIO32
+diff --git a/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.h b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.h
+index c533e28ba7441e83..039752a2dfb6e589 100644
+--- a/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.h
++++ b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.h
+@@ -41,21 +41,21 @@ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext structs.
+ struct UContextReader {
+-  static uintptr_t GetStackPointer(const struct ucontext* uc);
++  static uintptr_t GetStackPointer(const ucontext_t* uc);
+ 
+-  static uintptr_t GetInstructionPointer(const struct ucontext* uc);
++  static uintptr_t GetInstructionPointer(const ucontext_t* uc);
+ 
+   // Juggle a arch-specific ucontext into a minidump format
+   //   out: the minidump structure
+   //   info: the collection of register structures.
+ #if defined(__i386__) || defined(__x86_64)
+-  static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+                              const struct _libc_fpstate* fp);
+ #elif defined(__aarch64__)
+-  static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+                              const struct fpsimd_context* fpregs);
+ #else
+-  static void FillCPUContext(RawContextCPU *out, const ucontext *uc);
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
+ #endif
+ };
+ 
+diff --git a/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc
+index 71a51a763938e39d..12df9bc96ec45fea 100644
+--- a/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc
++++ b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc
+@@ -439,44 +439,44 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) {
+   // Fill in all the holes in the struct to make Valgrind happy.
+   memset(&g_crash_context_, 0, sizeof(g_crash_context_));
+   memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t));
+-  memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext));
++  memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t));
+ #if defined(__aarch64__)
+-  struct ucontext* uc_ptr = (struct ucontext*)uc;
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
+   struct fpsimd_context* fp_ptr =
+       (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
+   if (fp_ptr->head.magic == FPSIMD_MAGIC) {
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of struct ucontext
++  // In case of MIPS Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+-  struct ucontext* uc_ptr = (struct ucontext*)uc;
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+     memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs,
+            sizeof(g_crash_context_.float_state));
+   }
+ #endif
+   g_crash_context_.tid = syscall(__NR_gettid);
+   if (crash_handler_ != NULL) {
+     if (crash_handler_(&g_crash_context_, sizeof(g_crash_context_),
+                        callback_context_)) {
+       return true;
+     }
+   }
+   return GenerateDump(&g_crash_context_);
+ }
+ 
+ // This is a public interface to HandleSignal that allows the client to
+ // generate a crash dump. This function may run in a compromised context.
+ bool ExceptionHandler::SimulateSignalDelivery(int sig) {
+   siginfo_t siginfo = {};
+   // Mimic a trusted signal to allow tracing the process (see
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  struct ucontext context;
++  ucontext_t context;
+   getcontext(&context);
+   return HandleSignal(sig, &siginfo, &context);
+ }
+diff --git a/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.h b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.h
+index 711586fec7ddae59..be1880170e2826b0 100644
+--- a/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.h
++++ b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.h
+@@ -191,7 +191,7 @@ class ExceptionHandler {
+   struct CrashContext {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+-    struct ucontext context;
++    ucontext_t context;
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of struct
+diff --git a/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.cc b/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.cc
+index ff20bf36584c876b..a0b90e08fc5f0cff 100644
+--- a/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.cc
++++ b/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.cc
+@@ -571,7 +571,7 @@ class MicrodumpWriter {
+ 
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+-  const struct ucontext* const ucontext_;
++  const ucontext_t* const ucontext_;
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+diff --git a/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc
+index 0650bb95c179464a..6b5304bcd605ca3a 100644
+--- a/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc
++++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc
+@@ -1247,7 +1247,7 @@ class MinidumpWriter {
+   const int fd_;  // File descriptor where the minidum should be written.
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+-  const struct ucontext* const ucontext_;  // also from the signal handler
++  const ucontext_t* const ucontext_;  // also from the signal handler
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+-- 
+2.14.1
+
diff --git a/nonprism/icedove/icedove-install-dir.patch b/nonprism/icedove/icedove-install-dir.patch
index ac58bc982..0e3ba7f58 100644
--- a/nonprism/icedove/icedove-install-dir.patch
+++ b/nonprism/icedove/icedove-install-dir.patch
@@ -1,5 +1,6 @@
---- a/mozilla/config/baseconfig.mk
-+++ b/mozilla/config/baseconfig.mk
+diff -upr comm-esr31.orig/mozilla/config/baseconfig.mk comm-esr31/mozilla/config/baseconfig.mk
+--- comm-esr31.orig/mozilla/config/baseconfig.mk	2014-07-22 09:44:22.000000000 +0300
++++ comm-esr31/mozilla/config/baseconfig.mk	2014-07-22 09:46:45.000000000 +0300
 @@ -4,7 +4,7 @@
  # whether a normal build is happening or whether the check is running.
  includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
diff --git a/nonprism/icedove/icedove.desktop b/nonprism/icedove/icedove.desktop
index 1ba43e0b3..df3502947 100644
--- a/nonprism/icedove/icedove.desktop
+++ b/nonprism/icedove/icedove.desktop
@@ -55,7 +55,7 @@ GenericName[uk]=Поштова програма
 GenericName[vi]=Phần mềm khách quản lý thư điện tử
 GenericName[zh_CN]=邮件新闻客户端
 GenericName[zh_TW]=郵件用戶端
-Exec=icedove %u
+Exec=/usr/lib/icedove/icedove %u
 Terminal=false
 Type=Application
 Icon=icedove
@@ -116,7 +116,7 @@ Name[uk]=Написати нового листа
 Name[vi]=Viết thư mới
 Name[zh_CN]=编写新消息
 Name[zh_TW]=寫一封新訊息
-Exec=icedove -compose
+Exec=/usr/lib/icedove/icedove -compose
 
 [Desktop Action OpenAddressBook]
 Name=Open address book
@@ -170,4 +170,4 @@ Name[uk]=Відкрити адресну книгу
 Name[vi]=Mở sổ địa chỉ
 Name[zh_CN]=打开通讯录
 Name[zh_TW]=開啟通訊錄
-Exec=icedove -addressbook
+Exec=/usr/lib/icedove/icedove -addressbook
diff --git a/nonprism/icedove/icedove.install b/nonprism/icedove/icedove.install
deleted file mode 100644
index 4d4a283db..000000000
--- a/nonprism/icedove/icedove.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/nonprism/icedove/libre-searchengines.patch b/nonprism/icedove/libre.patch
index 181655d4e..e601388bb 100644
--- a/nonprism/icedove/libre-searchengines.patch
+++ b/nonprism/icedove/libre.patch
@@ -361,3 +361,43 @@
          ]
        }
      }
+diff --git a/mail/locales/en-US/chrome/messenger-region/region.properties b/mail/locales/en-US/chrome/messenger-region/region.properties
+index fcc870d..f810450 100644
+--- a/mail/locales/en-US/chrome/messenger-region/region.properties
++++ b/mail/locales/en-US/chrome/messenger-region/region.properties
+@@ -3,12 +3,12 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+ # Default search engine
+-browser.search.defaultenginename=Bing
++browser.search.defaultenginename=searx
+ 
+ # Search engine order (order displayed in the search bar dropdown)s
+-browser.search.order.1=Bing
+-browser.search.order.2=Yahoo
+-browser.search.order.3=
++browser.search.order.1=searx
++browser.search.order.2=DuckDuckGo HTML
++browser.search.order.3=DuckDuckGo Lite
+ 
+ # To make mapit buttons to disappear in the addressbook, specify empty string.  For example:
+ # mail.addr_book.mapit_url.format=
+@@ -23,14 +23,12 @@ browser.search.order.3=
+ # @ZI == zip code
+ # @CO == country
+ # Default map service:
+-mail.addr_book.mapit_url.format=https://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
++mail.addr_book.mapit_url.format=https://nominatim.openstreetmap.org/search.php?polygon=1&q=@A1%2C@A2%2C@CI%2C@ST%2C@ZI%2C@CO
+ # List of available map services (up to 5 can be defined here):
+-mail.addr_book.mapit_url.1.name=Google Maps
+-mail.addr_book.mapit_url.1.format=https://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
+-mail.addr_book.mapit_url.2.name=OpenStreetMap
+-mail.addr_book.mapit_url.2.format=https://nominatim.openstreetmap.org/search.php?polygon=1&q=@A1%2C@A2%2C@CI%2C@ST%2C@ZI%2C@CO
++mail.addr_book.mapit_url.1.name=OpenStreetMap
++mail.addr_book.mapit_url.1.format=https://nominatim.openstreetmap.org/search.php?polygon=1&q=@A1%2C@A2%2C@CI%2C@ST%2C@ZI%2C@CO
+ 
+-mailnews.messageid_browser.url=http://groups.google.com/search?as_umsgid=%mid
++mailnews.messageid_browser.url=
+ 
+ # Recognize non-standard versions of "Re:" in subjects from localized versions of MS Outlook et al.
+ # Specify a comma-separated list without spaces. For example: mailnews.localizedRe=AW,SV
diff --git a/nonprism/icedove/mozconfig b/nonprism/icedove/mozconfig
deleted file mode 100644
index 54decf725..000000000
--- a/nonprism/icedove/mozconfig
+++ /dev/null
@@ -1,44 +0,0 @@
-ac_add_options --enable-application=mail
-
-ac_add_options --prefix=/usr
-ac_add_options --enable-release
-ac_add_options --enable-gold
-ac_add_options --enable-pie
-ac_add_options --enable-optimize="-O2"
-ac_add_options --enable-rust
-
-# Icedove
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=mail/branding/icedove
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-icu
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-pixman
-
-# Features
-ac_add_options --enable-startup-notification
-ac_add_options --enable-alsa
-ac_add_options --disable-updater
-ac_add_options --disable-crashreporter
-ac_add_options --enable-calendar
-
-ac_add_options --disable-tests
-
-STRIP_FLAGS="--strip-debug"
-
-# Parabola features
-ac_add_options --with-distribution-id=nu.parabola
-ac_add_options --disable-safe-browsing
-ac_add_options --disable-url-classifier
-ac_add_options --disable-eme
-
-# vim:set ft=sh:
diff --git a/nonprism/icedove/mp4parse-bindings.patch b/nonprism/icedove/mp4parse-bindings.patch
deleted file mode 100644
index d0a2da27c..000000000
--- a/nonprism/icedove/mp4parse-bindings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml
-+++ b/mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml
-@@ -18,6 +18,8 @@ exclude = [
-   "*.mp4",
- ]
- 
-+build = false
-+
- [dependencies]
- byteorder = "1.0.0"
- "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
diff --git a/libre/icedove/no-crmf.patch b/nonprism/icedove/no-crmf.diff
index 73e545de0..4d74a1af2 100644
--- a/libre/icedove/no-crmf.patch
+++ b/nonprism/icedove/no-crmf.diff
@@ -12,7 +12,7 @@ diff -u -rN thunderbird-52.1.1/mozilla/config/external/nss/crmf/moz.build thunde
 diff -u -rN thunderbird-52.1.1/mozilla/old-configure thunderbird-52.1.1-nocrmf/mozilla/old-configure
 --- thunderbird-52.1.1/mozilla/old-configure	2017-05-09 23:35:35.000000000 +0200
 +++ thunderbird-52.1.1-nocrmf/mozilla/old-configure	2017-06-14 01:50:28.726873231 +0200
-@@ -10692,9 +10692,7 @@
+@@ -10693,9 +10693,7 @@
  
  fi
  
@@ -27,7 +27,7 @@ diff -u -rN thunderbird-52.1.1/mozilla/old-configure.in thunderbird-52.1.1-nocrm
 --- thunderbird-52.1.1/mozilla/old-configure.in	2017-05-09 23:35:22.000000000 +0200
 +++ thunderbird-52.1.1-nocrmf/mozilla/old-configure.in	2017-06-14 01:50:50.953507079 +0200
 @@ -2126,9 +2126,7 @@
-     AM_PATH_NSS(3.28.4, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+     AM_PATH_NSS(3.28.6, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
  fi
  
 -if test -n "$MOZ_SYSTEM_NSS"; then
diff --git a/nonprism/icedove/no-neon.patch b/nonprism/icedove/no-neon.patch
deleted file mode 100644
index af8bf198d..000000000
--- a/nonprism/icedove/no-neon.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- mozilla/configure.orig	2016-04-19 12:42:57.280811615 -0600
-+++ mozilla/configure	2016-04-19 12:44:20.697690476 -0600
-@@ -7389,14 +7389,7 @@
- rm -f conftest*
-   echo "$ac_t"""$result"" 1>&6
-   if test "$result" = "yes"; then
--      cat >> confdefs.pytmp <<\EOF
--    (''' HAVE_ARM_SIMD ''', ' 1 ')
--EOF
--cat >> confdefs.h <<\EOF
--#define HAVE_ARM_SIMD 1
--EOF
--
--      HAVE_ARM_SIMD=1
-+      HAVE_ARM_SIMD=
-   fi
- 
-   echo $ac_n "checking ARM version support in compiler""... $ac_c" 1>&6
-@@ -7428,27 +7421,13 @@
- rm -f conftest*
-   echo "$ac_t"""$result"" 1>&6
-   if test "$result" = "yes"; then
--      cat >> confdefs.pytmp <<\EOF
--    (''' HAVE_ARM_NEON ''', ' 1 ')
--EOF
--cat >> confdefs.h <<\EOF
--#define HAVE_ARM_NEON 1
--EOF
--
--      HAVE_ARM_NEON=1
-+      HAVE_ARM_NEON=
- 
-                   if test -n "$ARM_ARCH"; then
-           if test "$ARM_ARCH" -lt 7; then
-               BUILD_ARM_NEON=
-           else
--              cat >> confdefs.pytmp <<\EOF
--    (''' BUILD_ARM_NEON ''', ' 1 ')
--EOF
--cat >> confdefs.h <<\EOF
--#define BUILD_ARM_NEON 1
--EOF
--
--              BUILD_ARM_NEON=1
-+              BUILD_ARM_NEON=
-           fi
-       fi
-   fi
---- mozilla/js/src/configure.orig	2016-04-07 15:33:39.000000000 -0600
-+++ mozilla/js/src/configure	2016-04-19 12:44:20.697690476 -0600
-@@ -6578,14 +6578,7 @@
- rm -f conftest*
-   echo "$ac_t"""$result"" 1>&6
-   if test "$result" = "yes"; then
--      cat >> confdefs.pytmp <<\EOF
--    (''' HAVE_ARM_SIMD ''', ' 1 ')
--EOF
--cat >> confdefs.h <<\EOF
--#define HAVE_ARM_SIMD 1
--EOF
--
--      HAVE_ARM_SIMD=1
-+      HAVE_ARM_SIMD=
-   fi
- 
-   echo $ac_n "checking ARM version support in compiler""... $ac_c" 1>&6
-@@ -6617,27 +6610,13 @@
- rm -f conftest*
-   echo "$ac_t"""$result"" 1>&6
-   if test "$result" = "yes"; then
--      cat >> confdefs.pytmp <<\EOF
--    (''' HAVE_ARM_NEON ''', ' 1 ')
--EOF
--cat >> confdefs.h <<\EOF
--#define HAVE_ARM_NEON 1
--EOF
--
--      HAVE_ARM_NEON=1
-+      HAVE_ARM_NEON=
- 
-                   if test -n "$ARM_ARCH"; then
-           if test "$ARM_ARCH" -lt 7; then
-               BUILD_ARM_NEON=
-           else
--              cat >> confdefs.pytmp <<\EOF
--    (''' BUILD_ARM_NEON ''', ' 1 ')
--EOF
--cat >> confdefs.h <<\EOF
--#define BUILD_ARM_NEON 1
--EOF
--
--              BUILD_ARM_NEON=1
-+              BUILD_ARM_NEON=
-           fi
-       fi
-   fi
diff --git a/nonprism/icedove/rust-i686.patch b/nonprism/icedove/rust-i686.patch
new file mode 100644
index 000000000..85512e143
--- /dev/null
+++ b/nonprism/icedove/rust-i686.patch
@@ -0,0 +1,16 @@
+ build/moz.configure/rust.configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git c/build/moz.configure/rust.configure i/build/moz.configure/rust.configure
+index cd86b24153debb1b..44911715e25d95e3 100644
+--- c/build/moz.configure/rust.configure
++++ i/build/moz.configure/rust.configure
+@@ -81,7 +81,7 @@ def rust_target(rust_compiler, rustc, target, cross_compiling):
+             # OpenBSD
+             ('x86_64', 'OpenBSD'): 'x86_64-unknown-openbsd',
+             # Linux
+-            ('x86', 'Linux'): 'i586-unknown-linux-gnu',
++            ('x86', 'Linux'): 'i686-unknown-linux-gnu',
+             # Linux
+             ('x86_64', 'Linux'): 'x86_64-unknown-linux-gnu',
+             # OS X and iOS
diff --git a/nonprism/icedove/rust-target-i586-to-i686.patch b/nonprism/icedove/rust-target-i586-to-i686.patch
deleted file mode 100644
index f22f4fa0f..000000000
--- a/nonprism/icedove/rust-target-i586-to-i686.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mozilla/build/moz.configure/rust.configure
-+++ b/mozilla/build/moz.configure/rust.configure
-@@ -105,7 +105,7 @@ def rust_target(rust_compiler, rustc, ta
-             # OpenBSD
-             ('x86_64', 'OpenBSD'): 'x86_64-unknown-openbsd',
-             # Linux
--            ('x86', 'Linux'): 'i586-unknown-linux-gnu',
-+            ('x86', 'Linux'): 'i686-unknown-linux-gnu',
-             # Linux
-             ('x86_64', 'Linux'): 'x86_64-unknown-linux-gnu',
-             # OS X and iOS
diff --git a/nonprism/icedove/vendor.js b/nonprism/icedove/vendor.js
deleted file mode 100644
index 2da68d2bb..000000000
--- a/nonprism/icedove/vendor.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default mailer checking.
-pref("mail.shell.checkDefaultMail", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);
-
-// Disable Social API for content
-pref("social.remote-install.enabled", false);
-pref("social.toast-notifications.enabled", false);
-
-// Make sure that whitelisted and directory installs are empty
-pref("social.whitelist", "");
-pref("social.directories", "");
-
-// Disable the GeoLocation API for content
-pref("geo.enabled", false);
-
-// Pointing the "Help -> What's new" menu entry to mozilla.debian.net
-pref("mailnews.start_page.override_url", "http://wiki.debian.org/Icedove/WhatsNew45");