From 1c4db552865a01f756bc821139525fb61b0c7ae7 Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Sun, 10 Mar 2019 11:33:27 +0100
Subject: nonprism/icedove: updated to 60.5.1

---
 ...-Don-t-try-to-build-mp4parse-bindings.-r-.patch |  48 ---
 nonprism/icedove/PKGBUILD                          | 193 +++++----
 nonprism/icedove/fix-wifi-scanner.diff             |  16 -
 nonprism/icedove/icedove-install-dir.patch         |  12 -
 nonprism/icedove/libre-searchengines.patch         | 436 +++++++++++++++++++++
 nonprism/icedove/libre.patch                       | 403 -------------------
 nonprism/icedove/mozilla-1238661.patch             |  12 +
 nonprism/icedove/no-crmf.diff                      |  39 --
 nonprism/icedove/rust-i686.patch                   |  16 -
 9 files changed, 542 insertions(+), 633 deletions(-)
 delete mode 100644 nonprism/icedove/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
 delete mode 100644 nonprism/icedove/fix-wifi-scanner.diff
 delete mode 100644 nonprism/icedove/icedove-install-dir.patch
 create mode 100644 nonprism/icedove/libre-searchengines.patch
 delete mode 100644 nonprism/icedove/libre.patch
 create mode 100644 nonprism/icedove/mozilla-1238661.patch
 delete mode 100644 nonprism/icedove/no-crmf.diff
 delete mode 100644 nonprism/icedove/rust-i686.patch

(limited to 'nonprism')

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
deleted file mode 100644
index cf2e0eb9b..000000000
--- a/nonprism/icedove/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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 580227265..5e15c6c8d 100644
--- a/nonprism/icedove/PKGBUILD
+++ b/nonprism/icedove/PKGBUILD
@@ -19,80 +19,56 @@
 
 _pkgname=thunderbird
 pkgname=icedove
+replaces=("$_pkgname")
 epoch=1
-pkgver=52.7.0
-pkgrel=5
-pkgrel+=.nonprism1
-_bver=52.1
-_brel=1
+pkgver=60.5.1
+pkgrel=2
+pkgrel+=.parabola1.nonprism1
+_brandingver=60.5
+_brandingrel=1
 pkgdesc="Libre standalone mail and news reader based on Mozilla Thunderbird"
 pkgdesc+=", without support for unsafe and dangerous for privacy protocols"
 arch=(x86_64)
 arch+=(i686 armv7h)
 license=(MPL GPL LGPL)
 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+=('icu>=63' 'icu<64')
+depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib alsa-lib
+         nss hunspell sqlite ttf-font icu)  # libvpx
 makedepends=(unzip zip diffutils python2 yasm mesa imake gconf libpulse inetutils xorg-server-xvfb
              autoconf2.13 rust clang llvm)
-makedepends+=(quilt mozilla-searchplugins python2-blessings)
+makedepends+=(quilt mozilla-searchplugins python2-blessings imagemagick)
 optdepends=('libcanberra: sound support')
-replaces=("$_pkgname")
-conflicts=("$_pkgname")
 options=(!emptydirs !makeflags)
 source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz
-        $pkgname.desktop
-        0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
-        rust-i686.patch fix-wifi-scanner.diff
-        $pkgname-install-dir.patch no-crmf.diff)
-source+=(https://repo.parabola.nu/other/icedove/${pkgname}_$_bver-$_brel.branding.tar.xz{,.sig}
-         libre.patch)
-sha256sums=('82462890d393ed78c03226924a6166596b7b6d1562b5071e713a7558cd292ea3'
+        $pkgname.desktop)
+source+=(https://repo.parabola.nu/other/icedove/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz{,.sig}
+         mozilla-1238661.patch
+         libre-searchengines.patch)
+sha256sums=('69a3f741b7378b50a3b6a3b59f6c4fedd2d82d469ab234390627e15da1b58e03'
             'af8199a12ebe09189d143458bd1e2d0071aff3410ed121dc2329a448a56632f0'
-            '413cd6d366d78f325d80ebebccfd0afa0d266b40b2e54b66ba2fa03c15f3ea67'
-            'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269'
-            '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8'
-            'a3f2431a6e9eb01d3e20dfa5110e769180b4a752ea834c1162088aa90d99e8f3'
-            'a7317caba56e89932bd9e3b9352d94701dd9a419685057f238b1ded8dc0adcd7'
-            '246418976524fbead5b99e6227f97322f8d4c45e0edf9ce75561ae8eccdefc65'
+            '590862b39ba7baf60e47240e33de5839a8e85b6831c839ea57481968c9020241'
             'SKIP'
-            '4a09569394f1b4e154fdcd53f2947b7be7f065baaa31c964629dff9117fdf49b')
+            '97b1d3bb2916cd1a297682b3ae4dc679a5afce28610140c73e454b931116028e'
+            '9ef9dd18ac1f76ccc3d5d2ace866bb40199fd00a1192da83aef376c585be2ec3')
 validpgpkeys=(BFA8008A8265677063B11BF47171986E4B745536) # Andreas Grapentin
 
 prepare() {
-  mkdir path
-  ln -s /usr/bin/python2 path/python
-
   cd $_pkgname-$pkgver
-  patch -Np1 -i ../$pkgname-install-dir.patch
-
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
-  patch -d mozilla -Np1 < ../fix-wifi-scanner.diff
-
-  # 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-application=comm/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
+ac_add_options --enable-linker=gold
+ac_add_options --enable-hardening
+ac_add_options --enable-optimize
+ac_add_options --enable-rust-simd
 
 # Branding
 ac_add_options --disable-official-branding
-ac_add_options --with-branding=mail/branding/icedove
+ac_add_options --with-branding=comm/mail/branding/icedove
 ac_add_options --enable-update-channel=release
 ac_add_options --with-distribution-id=nu.parabola
 
@@ -101,7 +77,8 @@ 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
+# FIXME: does not build against libvpx-1.8.0
+# ac_add_options --with-system-libvpx
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --enable-system-hunspell
@@ -114,104 +91,123 @@ 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
+  if [[ $CARCH = arm* ]]; then
+    sed -i '/--enable-linker=gold/d' .mozconfig
+    sed -i '/--enable-hardening/d' .mozconfig
+    sed -i '/--enable-optimize/d' .mozconfig
+
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=1238661
+    patch -Np1 -i "$srcdir"/mozilla-1238661.patch
 
-    cat >> .mozconfig << END
+    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
 
+  if [[ $CARCH = i686 ]]; then
+    sed -i 's/--enable-linker=gold/--enable-linker=bfd/' .mozconfig
+  fi
+
   # perform rebranding
-  local brandingdir="$srcdir/$pkgname-$_bver"
-  mkdir -v mail/branding/$pkgname
-  cp -va $srcdir/$pkgname-$_bver/$pkgname-branding/* mail/branding/$pkgname
+  local brandingdir="$srcdir/$pkgname-$_brandingver"
+  rm -rf -- comm/mail/branding/$pkgname
+  cp -aT -- $brandingdir/$pkgname-branding/ comm/mail/branding/$pkgname
 
-  export QUILT_PATCHES=$srcdir/$pkgname-$_bver/patches
+  export QUILT_PATCHES=$brandingdir/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
   export QUILT_DIFF_ARGS='--no-timestamps'
   quilt push -av
 
+  # produce icons
+  for i in 16 22 24 32; do
+    rsvg-convert -w $i -h $i "$brandingdir/app-icons/${pkgname}_small.svg" \
+      -o "comm/mail/branding/$pkgname/default$i.png"
+  done
+  for i in 48 64 128 256; do
+    rsvg-convert -w $i -h $i "$brandingdir/app-icons/${pkgname}_big.svg" \
+      -o "comm/mail/branding/$pkgname/default$i.png"
+  done
+  cp "$brandingdir/logo/icedove_icon.svg" "comm/mail/branding/$pkgname/"
+
   # Patch and remove anything that's left
-  patch -Np1 -i "$srcdir/libre.patch"
+  patch -Np1 -i "$srcdir/libre-searchengines.patch"
   sed -i '\|Phishing Protection|d
           \|UrlClassifier|d
           \|URLClassifier|d
           \|url-classifier|d
-         ' mail/installer/package-manifest.in
+         ' comm/mail/installer/package-manifest.in
   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
+         ' comm/mail/app/profile/all-thunderbird.js
+
   sed -i '\|facebook|d
           \|gtalk|d
           \|odnoklassniki|d
+          \|skype|d
           \|twitter|d
           \|yahoo|d
-         ' chat/moz.build
+         ' comm/chat/moz.build
   sed -i '\|facebook[.]js|d
           \|facebook[.]manifest|d
           \|gtalk[.]js|d
           \|gtalk[.]manifest|d
+          \|odnoklassniki[.]js|d
+          \|odnoklassniki[.]manifest|d
+          \|skype[.]js|d
+          \|skype[.]manifest|d
           \|twitter[.]js|d
           \|twitter[.]manifest|d
           \|yahoo[.]js|d
           \|yahoo[.]manifest|d
-         ' mail/installer/package-manifest.in
-  rm -rv chat/protocols/{facebook,gtalk,twitter,yahoo}
+         ' comm/mail/installer/package-manifest.in
+  rm -rv comm/chat/protocols/{facebook,gtalk,odnoklassniki,skype,twitter,yahoo}
 
-  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
+  cp -av $srcdir/$pkgname-$_brandingver/preview.png \
+    comm/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/
+  rm -rv comm/mail/locales/en-US/searchplugins
+  cp -av /usr/lib/mozilla/searchplugins comm/mail/locales/en-US/
 }
 
 build() {
   cd $_pkgname-$pkgver
 
-  # _FORTIFY_SOURCE causes configure failures
-  CPPFLAGS+=" -O2"
+  if [[ $CARCH = armv7h ]]; then
+    export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off"
+    export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+  fi
 
-  export PATH="$srcdir/path:$PATH"
+  if [[ $CARCH = i686 ]]; then
+    export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off"
+    export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+  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
+  ./mach configure
+  ./mach build
+  ./mach buildsymbols
 }
 
 package() {
+  local _icu_ver
+  _icu_ver=$(pacman -S --print-format='%v' icu)
+  depends+=("icu>=${_icu_ver}" "icu<$((${_icu_ver%%.*} + 1))")
+
   cd $_pkgname-$pkgver
-  make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
+  DESTDIR="$pkgdir" ./mach install
 
   _vendorjs="$pkgdir/usr/lib/$pkgname/defaults/preferences/vendor.js"
   install -Dm644 /dev/stdin "$_vendorjs" <<END
 // Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
+pref("intl.locale.requested", "");
+
+// Use system-provided dictionaries
+pref("spellchecker.dictionary_path", "/usr/share/hunspell");
 
 // Disable default mailer checking.
 pref("mail.shell.checkDefaultMail", false);
@@ -249,20 +245,17 @@ app.partner.parabola=parabola
 END
 
   for i in 16 22 24 32 48 64 128 256; do
-    install -Dm644 "$srcdir/$pkgname-$_bver/app-icons/$pkgname$i.png" \
+    install -Dm644 comm/mail/branding/$pkgname/default${i}.png \
       "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
   done
-  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 -Dm644 comm/mail/branding/$pkgname/${pkgname}_icon.svg \
+    "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg"
 
   install -Dm644 ../$pkgname.desktop \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
 
   # Use system-provided dictionaries
-  rm -r "$pkgdir"/usr/lib/$pkgname/dictionaries
+  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"
 
@@ -277,3 +270,5 @@ END
   ln -srf "$pkgdir/usr/bin/$pkgname" \
     "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
 }
+
+# vim:set sw=2 et:
diff --git a/nonprism/icedove/fix-wifi-scanner.diff b/nonprism/icedove/fix-wifi-scanner.diff
deleted file mode 100644
index f8fdd6c42..000000000
--- a/nonprism/icedove/fix-wifi-scanner.diff
+++ /dev/null
@@ -1,16 +0,0 @@
- 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/icedove-install-dir.patch b/nonprism/icedove/icedove-install-dir.patch
deleted file mode 100644
index 0e3ba7f58..000000000
--- a/nonprism/icedove/icedove-install-dir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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)
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
- sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
- ifeq (.,$(DEPTH))
- DIST = dist
diff --git a/nonprism/icedove/libre-searchengines.patch b/nonprism/icedove/libre-searchengines.patch
new file mode 100644
index 000000000..5c2009a45
--- /dev/null
+++ b/nonprism/icedove/libre-searchengines.patch
@@ -0,0 +1,436 @@
+diff -rupN thunderbird-60.5.1.orig/comm/mail/locales/en-US/chrome/messenger-region/region.properties thunderbird-60.5.1/comm/mail/locales/en-US/chrome/messenger-region/region.properties
+--- thunderbird-60.5.1.orig/comm/mail/locales/en-US/chrome/messenger-region/region.properties	2019-03-07 10:38:57.276013048 +0100
++++ thunderbird-60.5.1/comm/mail/locales/en-US/chrome/messenger-region/region.properties	2019-03-07 11:29:23.255564314 +0100
+@@ -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=https://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 -rupN thunderbird-60.5.1.orig/comm/mail/locales/search/list.json thunderbird-60.5.1/comm/mail/locales/search/list.json
+--- thunderbird-60.5.1.orig/comm/mail/locales/search/list.json	2019-03-07 10:38:57.272679671 +0100
++++ thunderbird-60.5.1/comm/mail/locales/search/list.json	2019-03-07 11:26:46.920196972 +0100
+@@ -1,7 +1,7 @@
+ {
+   "default": {
+     "visibleDefaultEngines": [
+-      "amazondotcom", "bing", "ddg", "google", "twitter", "wikipedia", "yahoo"
++      "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+     ]
+   },
+   "regionOverrides": {},
+@@ -9,336 +9,336 @@
+     "en-US": {
+       "default": {
+         "visibleDefaultEngines": [
+-           "amazondotcom", "bing", "ddg", "google", "twitter", "wikipedia", "yahoo"
++           "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "ar": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "bing", "yahoo", "twitter", "wikipedia-ar", "amazondotcom"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "ast": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "amazondotcom", "bing", "twitter", "wikipedia-ast", "yahoo"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "be": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "be.wikipedia.org", "be-x-old.wikipedia.org", "ru.wikipedia.org-be", "tut.by", "yahoo", "yandex.by"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "br": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "amazondotcom", "bing", "google", "twitter", "wikipedia", "yahoo"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "ca": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "bing", "huubs", "diec2", "wikipedia-ca", "llibres"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "cak": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "amazondotcom", "bing", "twitter", "wikipedia", "yahoo"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "cs": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "seznam-cz", "duckduckgo-cz", "heureka-cz", "mapy-cz", "wikipedia-cz"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "da": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "amazon-co-uk", "bing", "google", "wikipedia-da"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "de": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "amazondotcom-de", "bing", "twitter-de", "wikipedia-de", "yahoo-de"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "en-GB": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "amazon-en-GB", "aol-en-GB", "bing", "ddg", "google", "twitter", "wikipedia", "yahoo-en-GB"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "es-AR": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "yahoo-ar", "amazondotcom", "mercadolibre-ar", "drae", "wikipedia-es"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "es-ES": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "yahoo-es", "bing", "drae", "twitter", "wikipedia-es"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "et": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "neti-ee", "osta-ee", "eki-ee", "wikipedia-et"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "fa": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "bing", "yahoo", "twitter"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "fi": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "amazondotcom", "bing", "twitter", "wikipedia-fi", "yahoo-fi"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "fr": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "amazon-france", "bing", "wikipedia-fr", "yahoo-france", "cnrtl-tlfi-fr"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "ga-IE": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "twitter", "yahoo-en-GB", "amazon-en-GB", "focal", "wikipedia-ga-IE"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "gd": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "yahoo-en-GB", "bbc-alba", "amazon-en-GB", "faclair-beag", "wikipedia-gd"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "he": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "amazondotcom", "bing", "google", "twitter", "wikipedia", "yahoo"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "hr": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "amazondotcom", "bing", "google", "twitter", "wikipedia", "yahoo"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "hu": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "sztaki-en-hu", "vatera", "wikipedia-hu"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "id": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "yahoo-id", "wikipedia-id"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "is": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "amazondotcom", "bing", "leit-is", "wikipedia-is", "yahoo"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "it": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "amazon-it", "bing", "google", "twitter", "wikipedia-it", "yahoo-it"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "ja-JP-mac": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google-jp", "yahoo-jp", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "ja": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google-jp", "yahoo-jp", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "kab": {
+       "default": {
+         "visibleDefaultEngines": [
+-           "amazondotcom", "bing", "twitter", "wikipedia", "yahoo"
++           "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "kk": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "amazondotcom", "bing", "twitter", "wikipedia", "yahoo"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "ko": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "danawa-kr", "daum-kr", "google","naver-kr", "wikipedia-kr"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "lt": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "amazondotcom", "bing", "google", "twitter", "wikipedia-lt"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "ms": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "amazondotcom", "bing", "google", "twitter", "wikipedia", "yahoo"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "nb-NO": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "amazondotcom", "bing", "google", "twitter", "wikipedia", "yahoo", "gulesider-NO"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "nl": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "bing", "yahoo", "google", "twitter", "wikipedia-nl", "marktplaats-nl"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "nn-NO": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "amazondotcom", "bing", "twitter", "wikipedia", "yahoo", "gulesider-NO"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "pl": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "allegro-pl", "google", "pwn-pl", "wikipedia-pl", "wolnelektury-pl"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "pt-PT": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "sapo", "priberam", "wikipedia-ptpt", "amazon-en-GB"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "rm": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "bing", "google", "leo_ende_de", "pledarigrond", "wikipedia-rm", "yahoo-ch"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "ro": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "yahoo", "bing", "amazondotcom", "wikipediaro"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "ru": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "bing", "duckduckgo-ru", "ozonru", "priceru", "wikipedia-ru", "yandex"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "sk": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "atlas-sk", "azet-sk", "bing", "google", "slovnik-sk", "wikipedia-sk", "zoznam-sk"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "sl": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "najdi-si", "ceneji", "google", "odpiralni", "twitter", "wikipedia-sl"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "sq": {
+       "default": {
+         "visibleDefaultEngines": [
+-           "amazondotcom", "bing", "twitter", "wikipedia-sq", "yahoo"
++           "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "sv-SE": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "bing", "yahoo", "wikipedia-sv-SE", "tyda-sv-SE", "prisjakt-sv-SE"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "tr": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "yandex-tr", "wikipedia-tr"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "uk": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "yandex", "meta-ua", "metamarket", "wikipedia-uk"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "vi": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "amazondotcom", "bing", "google", "twitter", "wikipedia", "yahoo"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "zh-TW": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "yahoo-zh-TW", "yahoo-bid-zh-TW", "wikipedia-zh-TW", "chunghwapost-zh-TW", "google-maps-zh-TW", "ipeen-zh-TW", "findbook-zh-TW"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     }
diff --git a/nonprism/icedove/libre.patch b/nonprism/icedove/libre.patch
deleted file mode 100644
index e601388bb..000000000
--- a/nonprism/icedove/libre.patch
+++ /dev/null
@@ -1,403 +0,0 @@
---- a/mail/locales/search/list.json
-+++ b/mail/locales/search/list.json
-@@ -1,315 +1,315 @@
- {
-   "default": {
-     "visibleDefaultEngines": [
--      "amazondotcom", "aol-web-search", "bing", "twitter", "wikipedia", "yahoo"
-+      "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-     ]
-   },
-   "locales": {
-     "en-US": {
-       "default": {
-         "visibleDefaultEngines": [
--           "amazondotcom", "aol-web-search", "bing", "twitter", "wikipedia", "yahoo"
-+           "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "ar": {
-       "default": {
-         "visibleDefaultEngines": [
--          "bing", "yahoo", "twitter", "wikipedia-ar", "amazondotcom"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "ast": {
-       "default": {
-         "visibleDefaultEngines": [
--          "amazondotcom", "aol-web-search", "bing", "twitter", "wikipedia-ast", "yahoo"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "be": {
-       "default": {
-         "visibleDefaultEngines": [
--          "google", "be.wikipedia.org", "be-x-old.wikipedia.org", "ru.wikipedia.org-be", "tut.by", "yahoo", "yandex.by"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "br": {
-       "default": {
-         "visibleDefaultEngines": [
--          "amazondotcom", "aol-web-search", "bing", "google", "twitter", "wikipedia", "yahoo"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "ca": {
-       "default": {
-         "visibleDefaultEngines": [
--          "bing", "huubs", "diec2", "wikipedia-ca", "llibres"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "cs": {
-       "default": {
-         "visibleDefaultEngines": [
--          "google", "seznam-cz", "duckduckgo-cz", "heureka-cz", "mapy-cz", "wikipedia-cz"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "da": {
-       "default": {
-         "visibleDefaultEngines": [
--          "amazon-co-uk", "bing", "google", "wikipedia-da"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "de": {
-       "default": {
-         "visibleDefaultEngines": [
--          "amazondotcom-de", "bing", "twitter-de", "wikipedia-de", "yahoo-de"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "en-GB": {
-       "default": {
-         "visibleDefaultEngines": [
--          "amazon-en-GB", "aol-en-GB", "bing", "google", "twitter", "wikipedia", "yahoo-en-GB"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "es-AR": {
-       "default": {
-         "visibleDefaultEngines": [
--          "google", "yahoo-ar", "amazondotcom", "mercadolibre-ar", "drae", "wikipedia-es"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "es-ES": {
-       "default": {
-         "visibleDefaultEngines": [
--          "google", "yahoo-es", "bing", "drae", "twitter", "wikipedia-es"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "et": {
-       "default": {
-         "visibleDefaultEngines": [
--          "google", "neti-ee", "osta-ee", "eki-ee", "wikipedia-et"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "fi": {
-       "default": {
-         "visibleDefaultEngines": [
--          "amazondotcom", "bing", "twitter", "wikipedia-fi", "yahoo-fi"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "fr": {
-       "default": {
-         "visibleDefaultEngines": [
--          "amazon-france", "bing", "wikipedia-fr", "yahoo-france", "cnrtl-tlfi-fr"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "ga-IE": {
-       "default": {
-         "visibleDefaultEngines": [
--          "google", "twitter", "yahoo-en-GB", "amazon-en-GB", "focal", "wikipedia-ga-IE"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "gd": {
-       "default": {
-         "visibleDefaultEngines": [
--          "google", "yahoo-en-GB", "bbc-alba", "amazon-en-GB", "faclair-beag", "wikipedia-gd"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "he": {
-       "default": {
-         "visibleDefaultEngines": [
--          "amazondotcom", "aol-web-search", "bing", "google", "twitter", "wikipedia", "yahoo"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "hr": {
-       "default": {
-         "visibleDefaultEngines": [
--          "amazondotcom", "aol-web-search", "bing", "google", "twitter", "wikipedia", "yahoo"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "hu": {
-       "default": {
-         "visibleDefaultEngines": [
--          "google", "sztaki-en-hu", "vatera", "wikipedia-hu"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "id": {
-       "default": {
-         "visibleDefaultEngines": [
--          "google", "yahoo-id", "wikipedia-id"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "is": {
-       "default": {
-         "visibleDefaultEngines": [
--          "amazondotcom", "bing", "leit-is", "wikipedia-is", "yahoo"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "it": {
-       "default": {
-         "visibleDefaultEngines": [
--          "amazon-it", "bing", "google", "twitter", "wikipedia-it", "yahoo-it"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "ja-JP-mac": {
-       "default": {
-         "visibleDefaultEngines": [
--          "google-jp", "yahoo-jp", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "ja": {
-       "default": {
-         "visibleDefaultEngines": [
--          "google-jp", "yahoo-jp", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "kab": {
-       "default": {
-         "visibleDefaultEngines": [
--           "amazondotcom", "aol-web-search", "bing", "twitter", "wikipedia", "yahoo"
-+           "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "ko": {
-       "default": {
-         "visibleDefaultEngines": [
--          "danawa-kr", "daum-kr", "google","naver-kr", "wikipedia-kr"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "lt": {
-       "default": {
-         "visibleDefaultEngines": [
--          "amazondotcom", "bing", "google", "twitter", "wikipedia-lt"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "nb-NO": {
-       "default": {
-         "visibleDefaultEngines": [
--          "amazondotcom", "aol-web-search", "bing", "google", "twitter", "wikipedia", "yahoo", "gulesider-NO"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "nl": {
-       "default": {
-         "visibleDefaultEngines": [
--          "bing", "yahoo", "google", "twitter", "wikipedia-nl", "marktplaats-nl"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "nn-NO": {
-       "default": {
-         "visibleDefaultEngines": [
--          "amazondotcom", "aol-web-search", "bing", "twitter", "wikipedia", "yahoo", "gulesider-NO"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "pl": {
-       "default": {
-         "visibleDefaultEngines": [
--          "allegro-pl", "google", "pwn-pl", "wikipedia-pl", "wolnelektury-pl"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "pt-PT": {
-       "default": {
-         "visibleDefaultEngines": [
--          "google", "sapo", "priberam", "wikipedia-ptpt", "amazon-en-GB"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "rm": {
-       "default": {
-         "visibleDefaultEngines": [
--          "bing", "google", "leo_ende_de", "pledarigrond", "wikipedia-rm", "yahoo-ch"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "ro": {
-       "default": {
-         "visibleDefaultEngines": [
--          "yahoo", "bing", "amazondotcom", "wikipediaro"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "ru": {
-       "default": {
-         "visibleDefaultEngines": [
--          "google", "bing", "duckduckgo-ru", "ozonru", "priceru", "wikipedia-ru", "yandex"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "sk": {
-       "default": {
-         "visibleDefaultEngines": [
--          "atlas-sk", "azet-sk", "bing", "google", "slovnik-sk", "wikipedia-sk", "zoznam-sk"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "sl": {
-       "default": {
-         "visibleDefaultEngines": [
--          "najdi-si", "ceneji", "google", "odpiralni", "twitter", "wikipedia-sl"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "sq": {
-       "default": {
-         "visibleDefaultEngines": [
--           "amazondotcom", "bing", "twitter", "wikipedia-sq", "yahoo"
-+           "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "sv-SE": {
-       "default": {
-         "visibleDefaultEngines": [
--          "google", "bing", "yahoo", "wikipedia-sv-SE", "tyda-sv-SE", "prisjakt-sv-SE"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "tr": {
-       "default": {
-         "visibleDefaultEngines": [
--          "google", "yandex-tr", "wikipedia-tr"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "uk": {
-       "default": {
-         "visibleDefaultEngines": [
--          "google", "yandex", "meta-ua", "metamarket", "wikipedia-uk"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "vi": {
-       "default": {
-         "visibleDefaultEngines": [
--          "amazondotcom", "aol-web-search", "bing", "google", "twitter", "wikipedia", "yahoo"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     },
-     "zh-TW": {
-       "default": {
-         "visibleDefaultEngines": [
--          "google", "yahoo-zh-TW", "yahoo-bid-zh-TW", "wikipedia-zh-TW", "chunghwapost-zh-TW", "google-maps-zh-TW", "ipeen-zh-TW", "findbook-zh-TW"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       }
-     }
-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/mozilla-1238661.patch b/nonprism/icedove/mozilla-1238661.patch
new file mode 100644
index 000000000..d4fd64a6d
--- /dev/null
+++ b/nonprism/icedove/mozilla-1238661.patch
@@ -0,0 +1,12 @@
+diff -up thunderbird-60.5.0/mfbt/LinuxSignal.h.mozilla-1238661 thunderbird-60.5.0/mfbt/LinuxSignal.h
+--- thunderbird-60.5.0/mfbt/LinuxSignal.h.mozilla-1238661	2019-01-30 11:33:21.447003175 +0100
++++ thunderbird-60.5.0/mfbt/LinuxSignal.h	2019-01-30 11:35:13.848537051 +0100
+@@ -22,7 +22,7 @@ __attribute__((naked)) void SignalTrampo
+                                              void* aContext) {
+   asm volatile("nop; nop; nop; nop" : : : "memory");
+ 
+-  asm volatile("b %0" : : "X"(H) : "memory");
++  asm volatile("bx %0" : : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext) : "memory");
+ }
+ 
+ #define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline)
diff --git a/nonprism/icedove/no-crmf.diff b/nonprism/icedove/no-crmf.diff
deleted file mode 100644
index 73e545de0..000000000
--- a/nonprism/icedove/no-crmf.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -u -rN thunderbird-52.1.1/mozilla/config/external/nss/crmf/moz.build thunderbird-52.1.1-nocrmf/mozilla/config/external/nss/crmf/moz.build
---- thunderbird-52.1.1/mozilla/config/external/nss/crmf/moz.build	2017-05-09 23:35:13.000000000 +0200
-+++ thunderbird-52.1.1-nocrmf/mozilla/config/external/nss/crmf/moz.build	2017-06-14 01:51:36.686773132 +0200
-@@ -8,7 +8,6 @@
- 
- if CONFIG['MOZ_SYSTEM_NSS']:
-     OS_LIBS += [l for l in CONFIG['NSS_LIBS'] if l.startswith('-L')]
--    OS_LIBS += ['-lcrmf']
- else:
-     USE_LIBS += [
-         # The dependency on nss is not real, but is required to force the
-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 @@
- 
- fi
- 
--if test -n "$MOZ_SYSTEM_NSS"; then
--   NSS_LIBS="$NSS_LIBS -lcrmf"
--else
-+if test -z "$MOZ_SYSTEM_NSS"; then
-    NSS_CFLAGS="-I${DIST}/include/nss"
- fi
- 
-diff -u -rN thunderbird-52.1.1/mozilla/old-configure.in thunderbird-52.1.1-nocrmf/mozilla/old-configure.in
---- 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])])
- fi
- 
--if test -n "$MOZ_SYSTEM_NSS"; then
--   NSS_LIBS="$NSS_LIBS -lcrmf"
--else
-+if test -z "$MOZ_SYSTEM_NSS"; then
-    NSS_CFLAGS="-I${DIST}/include/nss"
- fi
- 
diff --git a/nonprism/icedove/rust-i686.patch b/nonprism/icedove/rust-i686.patch
deleted file mode 100644
index 85512e143..000000000
--- a/nonprism/icedove/rust-i686.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- 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
-- 
cgit v1.2.3