libre/icecat: updated to 60.7.0_gnu1

4 files changed, 168 insertions, 149 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 4f962dbb7..7b9194b4c 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -15,9 +15,9 @@
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
 
 pkgname=icecat
-_pkgver=60.3.0-gnu1
+_pkgver=60.7.0-gnu1
 pkgver=${_pkgver//-/_}
-pkgrel=6
+pkgrel=1
 pkgdesc="GNU IceCat - a libre standalone web browser based on Mozilla Firefox."
 arch=(x86_64 i686 armv7h)
 license=(MPL GPL LGPL)
@@ -39,22 +39,29 @@ source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{
         libre-searchengines.patch
         libre.patch
         mozilla-1463035.patch
-        deny_missing_docs.patch)
-sha256sums=('6145327092b4b195a4f63d0e86f4857eeba5607ffeb69b6f3bceb36e89a19645'
+        deny_missing_docs.patch
+        fix-double-definition-of-gettid.patch)
+sha256sums=('6873d55b13e2d95ede3bf5bb59769179e91b1c4e05d8538d1576f18c9a6bb827'
             'SKIP'
             '2f9d117c1524312fb45f3e953cb0de02c525fd385a9b2b6d47308c8aaab0aedd'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
-            'ec6bedc8e7af6db74ce57ea07fe34d266af0280d8d7b46387e6cf5a27c1e6ca7'
-            '6057f40b2a35a0ad01faa810d8cd41d6c22bddc8ae32e883e68b9fc543e4c92d'
+            '99c279d04315c332a973a29b6ee540962364cd6d53cdaafc4055b3e1973e20da'
+            '65a560566db10e11bb1114805a653feaa40f4ff3775ac7e5f84d956deee2ed0a'
             '6c3781e13d3e8343aa2435bdb78d2e2666891154c7abd847388e5331e0424edb'
-            'cb1116c783995b8187574f84acb8365681aedaa2c76222cf060d31fedcb063c4')
-validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez
+            'cb1116c783995b8187574f84acb8365681aedaa2c76222cf060d31fedcb063c4'
+            '3ea006eafe4cee790955024faca3b3d7ac6cd6968b50635b9da3c254a07f4791')
+validpgpkeys=('318C679D94F17700CC847DE646A70073E4E50D4E') # Ruben Rodriguez
 
 prepare() {
   cd "$srcdir/$pkgname-${pkgver%_*}"
 
   patch -Np1 -i ../deny_missing_docs.patch
 
+  patch -Np1 -i ../fix-double-definition-of-gettid.patch
+
+  # needed for 60.7-esr
+  export CXXFLAGS="$CXXFLAGS -fpermissive"
+
   # Patch to move files directly to /usr/lib/icecat. No more symlinks.
   sed -e 's;$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME);g' -i config/baseconfig.mk
   sed -e 's;$(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME)-devel;g' -i config/baseconfig.mk
@@ -98,6 +105,9 @@ ac_add_options --disable-crashreporter
 ac_add_options --disable-gconf
 ac_add_options --disable-updater
 ac_add_options --disable-eme
+
+# broken by rust-1.38 in esr60
+ac_add_options --disable-stylo
 END
 
   if [[ $CARCH = arm* ]]; then
diff --git a/libre/icecat/fix-double-definition-of-gettid.patch b/libre/icecat/fix-double-definition-of-gettid.patch
new file mode 100644
index 000000000..99f053837
--- /dev/null
+++ b/libre/icecat/fix-double-definition-of-gettid.patch
@@ -0,0 +1,12 @@
+diff -rupN icecat-60.7.0-orig/tools/profiler/core/platform.h icecat-60.7.0/tools/profiler/core/platform.h
+--- icecat-60.7.0-orig/tools/profiler/core/platform.h	2019-11-18 11:29:11.638304093 +0100
++++ icecat-60.7.0/tools/profiler/core/platform.h	2019-11-18 20:35:38.133957814 +0100
+@@ -47,7 +47,7 @@
+ #if defined(__GLIBC__)
+ #include <unistd.h>
+ #include <sys/syscall.h>
+-static inline pid_t gettid() { return (pid_t)syscall(SYS_gettid); }
++#define gettid() ((pid_t)syscall(SYS_gettid))
+ #elif defined(GP_OS_darwin)
+ #include <unistd.h>
+ #include <sys/syscall.h>
diff --git a/libre/icecat/libre-searchengines.patch b/libre/icecat/libre-searchengines.patch
index f054b56b0..8cd7eb6d2 100644
--- a/libre/icecat/libre-searchengines.patch
+++ b/libre/icecat/libre-searchengines.patch
@@ -2,75 +2,72 @@ diff --git a/browser/locales/search/list.json b/browser/locales/search/list.json
 index eff09189b..6d76d20f0 100644
 --- a/browser/locales/search/list.json
 +++ b/browser/locales/search/list.json
-@@ -1,809 +1,758 @@
+@@ -1,806 +1,730 @@
  {
    "default": {
      "visibleDefaultEngines": [
--      "google", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
+-      "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
 +      "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
      ]
    },
    "regionOverrides": {
-     "US": {
--      "google": "google-2018"
-     },
-     "CA": {
+-    "US": {
+-      "google-b-d": "google-b-1-d"
+-    },
+-    "CA": {
 -      "ebay": "ebay-ca",
 -      "ebay-fr": "ebay-ca"
-     },
-     "KZ": {
--      "google": "google-nocodes"
-     },
-     "BY": {
--      "google": "google-nocodes"
-     },
-     "RU": {
--      "google": "google-nocodes"
-     },
-     "TR": {
--      "google": "google-nocodes"
-     },
-     "CN": {
--      "google": "google-nocodes"
-     },
-     "AT": {
+-    },
+-    "AT": {
 -      "ebay-de": "ebay-at"
-     },
-     "AU": {
+-    },
+-    "AU": {
 -      "ebay": "ebay-au",
 -      "ebay-uk": "ebay-au"
-     },
-     "BE": {
+-    },
+-    "BE": {
 -      "ebay": "ebay-be",
 -      "ebay-nl": "ebay-be",
 -      "ebay-fr": "ebay-be"
-     },
-     "CH": {
+-    },
+-    "CH": {
 -      "ebay": "ebay-ch",
 -      "ebay-de": "ebay-ch",
 -      "ebay-fr": "ebay-ch"
-     },
-     "IE": {
+-    },
+-    "IE": {
 -      "ebay": "ebay-ie",
 -      "ebay-uk": "ebay-ie"
-     },
-     "NL": {
+-    },
+-    "NL": {
 -      "ebay": "ebay-nl"
-     },
-     "GB": {
+-    },
+-    "GB": {
 -      "ebay": "ebay-uk"
-     }
+-    },
+-    "esronly-1": {
+-      "google-b-d": "google-b-e"
+-    },
+-    "esronly-2": {
+-      "google-b-d": "google-b-1-e"
+-    },
+-    "esronly-3": {
+-      "google-b-d": "google"
+-    },
+-    "esronly-4": {
+-      "google-b-d": "google-2018"
+-    }
    },
    "locales": {
      "en-US": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
+-          "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
 -        ]
 -      },
 -      "experimental-hidden": {
 -        "visibleDefaultEngines": [
--          "amazon-ca", "amazon-au", "google-2018", "yandex-en"
+-          "amazon-ca", "amazon-au", "yandex-en"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -78,7 +75,7 @@ index eff09189b..6d76d20f0 100644
      "ach": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -86,7 +83,7 @@ index eff09189b..6d76d20f0 100644
      "af": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "wikipedia-af"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-af"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -94,7 +91,7 @@ index eff09189b..6d76d20f0 100644
      "an": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter"
+-          "google-b-d", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -102,7 +99,7 @@ index eff09189b..6d76d20f0 100644
      "ar": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "wikipedia-ar"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ar"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -110,7 +107,7 @@ index eff09189b..6d76d20f0 100644
      "as": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazondotcom", "ddg", "wikipedia-as"
+-          "google-b-d", "amazondotcom", "ddg", "wikipedia-as"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -118,7 +115,7 @@ index eff09189b..6d76d20f0 100644
      "ast": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "diccionariu-alla", "ddg", "ebay-es", "wikipedia-ast"
+-          "google-b-d", "bing", "diccionariu-alla", "ddg", "ebay-es", "wikipedia-ast"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -126,7 +123,7 @@ index eff09189b..6d76d20f0 100644
      "az": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazondotcom", "azerdict", "bing", "ddg", "wikipedia-az", "yandex-az"
+-          "google-b-d", "amazondotcom", "azerdict", "bing", "ddg", "wikipedia-az", "yandex-az"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -134,7 +131,7 @@ index eff09189b..6d76d20f0 100644
      "be": {
        "default": {
          "visibleDefaultEngines": [
--          "yandex-by", "google", "ddg", "wikipedia-be", "wikipedia-be-tarask"
+-          "yandex-by", "google-b-d", "ddg", "wikipedia-be", "wikipedia-be-tarask"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -142,7 +139,7 @@ index eff09189b..6d76d20f0 100644
      "bg": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazondotcom", "ddg", "portalbgdict", "wikipedia-bg"
+-          "google-b-d", "amazondotcom", "ddg", "portalbgdict", "wikipedia-bg"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -150,7 +147,7 @@ index eff09189b..6d76d20f0 100644
      "bn-BD": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "ddg", "wikipedia-bn"
+-          "google-b-d", "bing", "ddg", "wikipedia-bn"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -158,7 +155,7 @@ index eff09189b..6d76d20f0 100644
      "bn-IN": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazondotcom", "bing", "ddg", "rediff", "wikipedia-bn"
+-          "google-b-d", "amazondotcom", "bing", "ddg", "rediff", "wikipedia-bn"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -166,7 +163,7 @@ index eff09189b..6d76d20f0 100644
      "br": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazon-france", "ddg", "ebay-fr", "freelang", "klask", "wikipedia-br"
+-          "google-b-d", "amazon-france", "ddg", "ebay-fr", "freelang", "klask", "wikipedia-br"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -174,7 +171,7 @@ index eff09189b..6d76d20f0 100644
      "bs": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "ddg", "olx", "twitter", "wikipedia-bs"
+-          "google-b-d", "ddg", "olx", "twitter", "wikipedia-bs"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -182,7 +179,7 @@ index eff09189b..6d76d20f0 100644
      "ca": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "diec2", "ddg", "ebay-es", "twitter", "wikipedia-ca"
+-          "google-b-d", "bing", "diec2", "ddg", "ebay-es", "twitter", "wikipedia-ca"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -190,7 +187,7 @@ index eff09189b..6d76d20f0 100644
      "cak": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "wikipedia-es"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-es"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -198,7 +195,7 @@ index eff09189b..6d76d20f0 100644
      "cs": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "seznam-cz", "ddg", "heureka-cz", "mapy-cz", "wikipedia-cz"
+-          "google-b-d", "seznam-cz", "ddg", "heureka-cz", "mapy-cz", "wikipedia-cz"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -206,7 +203,7 @@ index eff09189b..6d76d20f0 100644
      "cy": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazon-en-GB", "ddg", "ebay-uk", "palasprint", "termau", "wikipedia-cy"
+-          "google-b-d", "amazon-en-GB", "ddg", "ebay-uk", "palasprint", "termau", "wikipedia-cy"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -214,7 +211,7 @@ index eff09189b..6d76d20f0 100644
      "da": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazon-en-GB", "ddg", "wikipedia-da"
+-          "google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-da"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -222,7 +219,7 @@ index eff09189b..6d76d20f0 100644
      "de": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazondotcom-de", "bing", "ddg", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de"
+-          "google-b-d", "amazondotcom-de", "bing", "ddg", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -230,7 +227,7 @@ index eff09189b..6d76d20f0 100644
      "dsb": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb"
+-          "google-b-d", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -238,7 +235,7 @@ index eff09189b..6d76d20f0 100644
      "el": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazon-en-GB", "bing", "ddg", "wikipedia-el"
+-          "google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-el"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -246,7 +243,7 @@ index eff09189b..6d76d20f0 100644
      "en-GB": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
+-          "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
 -        ]
 -      },
 -      "experimental-hidden": {
@@ -259,7 +256,7 @@ index eff09189b..6d76d20f0 100644
      "en-ZA": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -267,7 +264,7 @@ index eff09189b..6d76d20f0 100644
      "eo": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "reta-vortaro", "wikipedia-eo"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "reta-vortaro", "wikipedia-eo"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -275,7 +272,7 @@ index eff09189b..6d76d20f0 100644
      "es-AR": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es"
+-          "google-b-d", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -283,7 +280,7 @@ index eff09189b..6d76d20f0 100644
      "es-CL": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "drae", "ddg", "mercadolibre-cl", "wikipedia-es"
+-          "google-b-d", "bing", "drae", "ddg", "mercadolibre-cl", "wikipedia-es"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -291,7 +288,7 @@ index eff09189b..6d76d20f0 100644
      "es-ES": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es"
+-          "google-b-d", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -299,7 +296,7 @@ index eff09189b..6d76d20f0 100644
      "es-MX": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "ddg", "mercadolibre-mx", "wikipedia-es"
+-          "google-b-d", "bing", "ddg", "mercadolibre-mx", "wikipedia-es"
 -        ]
 -      },
 -      "experimental-hidden": {
@@ -312,7 +309,7 @@ index eff09189b..6d76d20f0 100644
      "et": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "neti-ee", "ddg", "osta-ee", "wikipedia-et", "eki-ee"
+-          "google-b-d", "neti-ee", "ddg", "osta-ee", "wikipedia-et", "eki-ee"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -320,7 +317,7 @@ index eff09189b..6d76d20f0 100644
      "eu": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazon-en-GB", "ddg", "ebay-es", "elebila", "wikipedia-eu"
+-          "google-b-d", "bing", "amazon-en-GB", "ddg", "ebay-es", "elebila", "wikipedia-eu"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -328,7 +325,7 @@ index eff09189b..6d76d20f0 100644
      "fa": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazondotcom", "bing", "ddg", "wikipedia-fa"
+-          "google-b-d", "amazondotcom", "bing", "ddg", "wikipedia-fa"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -336,7 +333,7 @@ index eff09189b..6d76d20f0 100644
      "ff": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
+-          "google-b-d", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -344,7 +341,7 @@ index eff09189b..6d76d20f0 100644
      "fi": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "bookplus-fi", "ddg", "wikipedia-fi"
+-          "google-b-d", "bing", "bookplus-fi", "ddg", "wikipedia-fi"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -352,7 +349,7 @@ index eff09189b..6d76d20f0 100644
      "fr": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazon-france", "ddg", "ebay-fr", "cnrtl-tlfi-fr", "qwant", "wikipedia-fr"
+-          "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "cnrtl-tlfi-fr", "qwant", "wikipedia-fr"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -360,7 +357,7 @@ index eff09189b..6d76d20f0 100644
      "fy-NL": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL"
+-          "google-b-d", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL"
 -        ]
 -      },
 -      "experimental-hidden": {
@@ -373,7 +370,7 @@ index eff09189b..6d76d20f0 100644
      "ga-IE": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE"
+-          "google-b-d", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -381,7 +378,7 @@ index eff09189b..6d76d20f0 100644
      "gd": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd"
+-          "google-b-d", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -389,7 +386,7 @@ index eff09189b..6d76d20f0 100644
      "gl": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl"
+-          "google-b-d", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -397,7 +394,7 @@ index eff09189b..6d76d20f0 100644
      "gn": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-gn"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-gn"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -405,7 +402,7 @@ index eff09189b..6d76d20f0 100644
      "gu-IN": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "ddg", "gujaratilexicon", "wikipedia-gu"
+-          "google-b-d", "bing", "ddg", "gujaratilexicon", "wikipedia-gu"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -413,7 +410,7 @@ index eff09189b..6d76d20f0 100644
      "he": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "ddg", "wikipedia-he", "morfix-dic"
+-          "google-b-d", "ddg", "wikipedia-he", "morfix-dic"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -421,7 +418,7 @@ index eff09189b..6d76d20f0 100644
      "hi-IN": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "ddg", "wikipedia-hi"
+-          "google-b-d", "bing", "ddg", "wikipedia-hi"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -429,7 +426,7 @@ index eff09189b..6d76d20f0 100644
      "hr": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr"
+-          "google-b-d", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -437,7 +434,7 @@ index eff09189b..6d76d20f0 100644
      "hsb": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb"
+-          "google-b-d", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -445,7 +442,7 @@ index eff09189b..6d76d20f0 100644
      "hu": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "ddg", "sztaki-en-hu", "vatera", "wikipedia-hu"
+-          "google-b-d", "ddg", "sztaki-en-hu", "vatera", "wikipedia-hu"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -453,7 +450,7 @@ index eff09189b..6d76d20f0 100644
      "hy-AM": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazondotcom", "ddg", "list-am", "wikipedia-hy"
+-          "google-b-d", "amazondotcom", "ddg", "list-am", "wikipedia-hy"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -461,7 +458,7 @@ index eff09189b..6d76d20f0 100644
      "ia": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -469,7 +466,7 @@ index eff09189b..6d76d20f0 100644
      "id": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "ddg", "wikipedia-id"
+-          "google-b-d", "ddg", "wikipedia-id"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -477,7 +474,7 @@ index eff09189b..6d76d20f0 100644
      "is": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "leit-is", "wikipedia-is"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "leit-is", "wikipedia-is"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -485,7 +482,7 @@ index eff09189b..6d76d20f0 100644
      "it": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazon-it", "ddg", "ebay-it", "hoepli", "wikipedia-it"
+-          "google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "hoepli", "wikipedia-it"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -493,7 +490,7 @@ index eff09189b..6d76d20f0 100644
      "ja-JP-mac": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg"
+-          "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -501,7 +498,7 @@ index eff09189b..6d76d20f0 100644
      "ja": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg"
+-          "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -509,7 +506,7 @@ index eff09189b..6d76d20f0 100644
      "ka": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -517,7 +514,7 @@ index eff09189b..6d76d20f0 100644
      "kab": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "ddg", "wikipedia-kab"
+-          "google-b-d", "bing", "ddg", "wikipedia-kab"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -525,7 +522,7 @@ index eff09189b..6d76d20f0 100644
      "kk": {
        "default": {
          "visibleDefaultEngines": [
--          "yandex-kk", "google", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
+-          "yandex-kk", "google-b-d", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -533,7 +530,7 @@ index eff09189b..6d76d20f0 100644
      "km": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-km"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-km"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -541,7 +538,7 @@ index eff09189b..6d76d20f0 100644
      "kn": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "kannadastore", "wikipedia-kn"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "kannadastore", "wikipedia-kn"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -549,7 +546,7 @@ index eff09189b..6d76d20f0 100644
      "ko": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "ddg", "naver-kr", "danawa-kr", "daum-kr", "wikipedia-kr"
+-          "google-b-d", "ddg", "naver-kr", "danawa-kr", "daum-kr", "wikipedia-kr"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -557,7 +554,7 @@ index eff09189b..6d76d20f0 100644
      "lij": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazon-it", "ddg", "ebay-it", "paroledigenova-lij", "wikipedia-lij"
+-          "google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "paroledigenova-lij", "wikipedia-lij"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -565,7 +562,7 @@ index eff09189b..6d76d20f0 100644
      "lo": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "ddg", "wikipedia-lo", "twitter"
+-          "google-b-d", "bing", "ddg", "wikipedia-lo", "twitter"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -573,7 +570,7 @@ index eff09189b..6d76d20f0 100644
      "lt": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "wikipedia-lt", "bing", "amazondotcom", "ddg", "twitter"
+-          "google-b-d", "wikipedia-lt", "bing", "amazondotcom", "ddg", "twitter"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -581,7 +578,7 @@ index eff09189b..6d76d20f0 100644
      "ltg": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-ltg"
+-          "google-b-d", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-ltg"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -589,7 +586,7 @@ index eff09189b..6d76d20f0 100644
      "lv": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-lv"
+-          "google-b-d", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-lv"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -597,7 +594,7 @@ index eff09189b..6d76d20f0 100644
      "mai": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "ddg", "twitter", "wikipedia-hi"
+-          "google-b-d", "bing", "ddg", "twitter", "wikipedia-hi"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -605,7 +602,7 @@ index eff09189b..6d76d20f0 100644
      "mk": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "wikipedia-mk"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-mk"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -613,7 +610,7 @@ index eff09189b..6d76d20f0 100644
      "ml": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "webdunia", "bing", "ddg", "rediff", "wikipedia", "wikipedia-ml"
+-          "google-b-d", "webdunia", "bing", "ddg", "rediff", "wikipedia", "wikipedia-ml"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -621,7 +618,7 @@ index eff09189b..6d76d20f0 100644
      "mr": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazondotcom", "ddg", "rediff", "wikipedia-mr"
+-          "google-b-d", "amazondotcom", "ddg", "rediff", "wikipedia-mr"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -629,7 +626,7 @@ index eff09189b..6d76d20f0 100644
      "ms": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ms"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ms"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -637,7 +634,7 @@ index eff09189b..6d76d20f0 100644
      "my": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-my"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-my"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -645,7 +642,7 @@ index eff09189b..6d76d20f0 100644
      "nb-NO": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO"
+-          "google-b-d", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -653,7 +650,7 @@ index eff09189b..6d76d20f0 100644
      "ne-NP": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "ddg", "twitter", "wikipedia-ne"
+-          "google-b-d", "bing", "ddg", "twitter", "wikipedia-ne"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -661,7 +658,7 @@ index eff09189b..6d76d20f0 100644
      "nl": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl"
+-          "google-b-d", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl"
 -        ]
 -      },
 -      "experimental-hidden": {
@@ -674,7 +671,7 @@ index eff09189b..6d76d20f0 100644
      "nn-NO": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazon-en-GB", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN"
+-          "google-b-d", "bing", "amazon-en-GB", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -682,7 +679,7 @@ index eff09189b..6d76d20f0 100644
      "oc": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "ddg", "twitter", "wikipedia-oc", "wiktionary-oc"
+-          "google-b-d", "bing", "ddg", "twitter", "wikipedia-oc", "wiktionary-oc"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -690,7 +687,7 @@ index eff09189b..6d76d20f0 100644
      "or": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "wikipedia-or"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-or"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -698,7 +695,7 @@ index eff09189b..6d76d20f0 100644
      "pa-IN": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "ddg", "wikipedia-pa"
+-          "google-b-d", "bing", "ddg", "wikipedia-pa"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -706,7 +703,7 @@ index eff09189b..6d76d20f0 100644
      "pl": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "allegro-pl", "ddg", "pwn-pl", "wikipedia-pl", "wolnelektury-pl"
+-          "google-b-d", "allegro-pl", "ddg", "pwn-pl", "wikipedia-pl", "wolnelektury-pl"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -714,7 +711,7 @@ index eff09189b..6d76d20f0 100644
      "pt-BR": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "buscape", "ddg", "mercadolivre", "twitter", "wikipedia-pt"
+-          "google-b-d", "bing", "buscape", "ddg", "mercadolivre", "twitter", "wikipedia-pt"
 -        ]
 -      },
 -      "experimental-hidden": {
@@ -727,7 +724,7 @@ index eff09189b..6d76d20f0 100644
      "pt-PT": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazon-en-GB", "ddg", "priberam", "sapo", "wikipedia-pt"
+-          "google-b-d", "amazon-en-GB", "ddg", "priberam", "sapo", "wikipedia-pt"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -735,7 +732,7 @@ index eff09189b..6d76d20f0 100644
      "rm": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "ddg", "ebay-ch", "leo_ende_de-rm", "pledarigrond", "wikipedia-rm"
+-          "google-b-d", "bing", "ddg", "ebay-ch", "leo_ende_de-rm", "pledarigrond", "wikipedia-rm"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -743,7 +740,7 @@ index eff09189b..6d76d20f0 100644
      "ro": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "wikipedia-ro"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ro"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -751,7 +748,7 @@ index eff09189b..6d76d20f0 100644
      "ru": {
        "default": {
          "visibleDefaultEngines": [
--          "yandex-ru", "google", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
+-          "yandex-ru", "google-b-d", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -759,7 +756,7 @@ index eff09189b..6d76d20f0 100644
      "si": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazondotcom", "ddg", "wikipedia-si"
+-          "google-b-d", "amazondotcom", "ddg", "wikipedia-si"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -767,7 +764,7 @@ index eff09189b..6d76d20f0 100644
      "sk": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "azet-sk", "atlas-sk", "ddg", "slovnik-sk", "wikipedia-sk", "zoznam-sk"
+-          "google-b-d", "azet-sk", "atlas-sk", "ddg", "slovnik-sk", "wikipedia-sk", "zoznam-sk"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -775,7 +772,7 @@ index eff09189b..6d76d20f0 100644
      "sl": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "ceneji", "ddg", "najdi-si", "odpiralni", "twitter", "wikipedia-sl"
+-          "google-b-d", "ceneji", "ddg", "najdi-si", "odpiralni", "twitter", "wikipedia-sl"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -783,7 +780,7 @@ index eff09189b..6d76d20f0 100644
      "son": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
+-          "google-b-d", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -791,7 +788,7 @@ index eff09189b..6d76d20f0 100644
      "sq": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazon-en-GB", "ddg", "wikipedia-sq"
+-          "google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-sq"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -799,7 +796,7 @@ index eff09189b..6d76d20f0 100644
      "sr": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazon-en-GB", "bing", "ddg", "wikipedia-sr", "pogodak"
+-          "google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-sr", "pogodak"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -807,7 +804,7 @@ index eff09189b..6d76d20f0 100644
      "sv-SE": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE"
+-          "google-b-d", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -815,7 +812,7 @@ index eff09189b..6d76d20f0 100644
      "ta": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "ddg", "wikipedia-ta"
+-          "google-b-d", "ddg", "wikipedia-ta"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -823,7 +820,7 @@ index eff09189b..6d76d20f0 100644
      "te": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazondotcom", "ddg", "wikipedia-te", "wiktionary-te"
+-          "google-b-d", "amazondotcom", "ddg", "wikipedia-te", "wiktionary-te"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -831,7 +828,7 @@ index eff09189b..6d76d20f0 100644
      "th": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "amazondotcom", "bing", "ddg", "longdo", "wikipedia-th"
+-          "google-b-d", "amazondotcom", "bing", "ddg", "longdo", "wikipedia-th"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -839,7 +836,7 @@ index eff09189b..6d76d20f0 100644
      "tl": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-tl"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-tl"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -847,7 +844,7 @@ index eff09189b..6d76d20f0 100644
      "tr": {
        "default": {
          "visibleDefaultEngines": [
--          "yandex-tr", "google", "ddg", "twitter", "wikipedia-tr"
+-          "yandex-tr", "google-b-d", "ddg", "twitter", "wikipedia-tr"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -855,7 +852,7 @@ index eff09189b..6d76d20f0 100644
      "uk": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
+-          "google-b-d", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -863,7 +860,7 @@ index eff09189b..6d76d20f0 100644
      "ur": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur"
+-          "google-b-d", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -871,7 +868,7 @@ index eff09189b..6d76d20f0 100644
      "uz": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-uz"
+-          "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-uz"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -879,7 +876,7 @@ index eff09189b..6d76d20f0 100644
      "vi": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "coccoc", "ddg", "wikipedia-vi"
+-          "google-b-d", "coccoc", "ddg", "wikipedia-vi"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -887,7 +884,7 @@ index eff09189b..6d76d20f0 100644
      "wo": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "amazon-france", "ddg", "ebay-fr", "twitter", "wikipedia-wo"
+-          "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "twitter", "wikipedia-wo"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -895,7 +892,7 @@ index eff09189b..6d76d20f0 100644
      "xh": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "ddg", "wikipedia"
+-          "google-b-d", "bing", "ddg", "wikipedia"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -903,7 +900,7 @@ index eff09189b..6d76d20f0 100644
      "zh-CN": {
        "default": {
          "visibleDefaultEngines": [
--          "baidu", "google", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
+-          "baidu", "google-b-d", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -911,7 +908,7 @@ index eff09189b..6d76d20f0 100644
      "zh-TW": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "ddg", "readmoo", "wikipedia-zh-TW"
+-          "google-b-d", "ddg", "readmoo", "wikipedia-zh-TW"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 8de222787..4ee9952b9 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -14,7 +14,7 @@ index 17c1e93..40f1e2b 100644
  pref("browser.enable_automatic_image_resizing", true);
  pref("browser.chrome.site_icons", true);
  pref("browser.chrome.favicons", true);
-@@ -2003,17 +1998,6 @@ pref("pfs.filehint.url", "http://gnuzill
+@@ -1988,17 +1983,6 @@ pref("pfs.filehint.url", "http://gnuzill
  pref("geo.enabled", false);
  pref("geo.wifi.uri", "");