1 files changed, 17 insertions, 62 deletions
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 7698a34e1..0ca3668f4 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -680,7 +680,7 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 index 334358c..44148fd 100644
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -32,6 +32,7 @@ browser.jar:
+@@ -31,6 +31,7 @@ browser.jar:
          content/browser/abouthome/settings.png        (content/abouthome/settings.png)
          content/browser/abouthome/restore.png         (content/abouthome/restore.png)
          content/browser/abouthome/restore-large.png   (content/abouthome/restore-large.png)
@@ -765,7 +765,7 @@ diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales
 index e8460a4..374bf61 100644
 --- a/browser/locales/generic/profile/bookmarks.html.in
 +++ b/browser/locales/generic/profile/bookmarks.html.in
-@@ -11,8 +11,20 @@
+@@ -12,8 +12,20 @@
  <DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
      <DL><p>
  	<HR>
@@ -802,7 +802,7 @@ index bcb7d1c..f902aac 100644
  
  Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
  Components.utils.import("resource://gre/modules/Services.jsm");
-@@ -22,68 +22,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts",
+@@ -24,68 +24,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts",
  XPCOMUtils.defineLazyModuleGetter(this, "Promise",
    "resource://gre/modules/Promise.jsm");
  
@@ -871,7 +871,7 @@ index bcb7d1c..f902aac 100644
  /**
   * This code provides services to the about:home page. Whenever
   * about:home needs to do something chrome-privileged, it sends a
-@@ -162,17 +100,8 @@ var AboutHome = {
+@@ -169,17 +107,8 @@ var AboutHome = {
      ss.promiseInitialized.then(function() {
        let data = {
          showRestoreLastSession: ss.canRestoreLastSession,
@@ -903,7 +903,7 @@ index eff09189b..6d76d20f0 100644
  # the following files are browser-specific overrides
 --- a/browser/locales/search/list.json
 +++ b/browser/locales/search/list.json
-@@ -1,176 +1,176 @@
+@@ -1,840 +1,830 @@
  {
    "default": {
      "visibleDefaultEngines": [
@@ -916,24 +916,11 @@ index eff09189b..6d76d20f0 100644
        "default": {
          "visibleDefaultEngines": [
 -          "google", "yahoo", "amazondotcom", "bing", "ddg", "twitter", "wikipedia"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       },
-       "US": {
-         "visibleDefaultEngines": [
--          "yahoo", "google-nocodes", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       },
-       "CA": {
-         "visibleDefaultEngines": [
--          "google-nocodes", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       },
-       "experimental-hidden": {
-         "visibleDefaultEngines": [
--          "yahoo-en-CA", "yandex-en"
+-        ]
+-      },
+-      "experimental-hidden": {
+-        "visibleDefaultEngines": [
+-          "yahoo-en-CA", "yandex-en", "google-2018"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1102,11 +1089,15 @@ index eff09189b..6d76d20f0 100644
        "default": {
          "visibleDefaultEngines": [
 -          "google", "yahoo-en-GB", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "twitter", "wikipedia"
+-        ]
+-      },
+-      "experimental-hidden": {
+-        "visibleDefaultEngines": [
+-          "yandex-en"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
-       },
-       "experimental-hidden": {
-@@ -182,699 +182,699 @@
+       }
+     },
      "en-ZA": {
        "default": {
          "visibleDefaultEngines": [
@@ -1840,30 +1831,6 @@ index eff09189b..6d76d20f0 100644
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        },
-       "TW": {
-         "visibleDefaultEngines": [
--          "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       },
-       "HK": {
-         "visibleDefaultEngines": [
--          "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       },
-       "US": {
-         "visibleDefaultEngines": [
--          "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       },
-       "CA": {
-         "visibleDefaultEngines": [
--          "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       },
        "KZ": {
          "visibleDefaultEngines": [
 -          "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
@@ -1901,17 +1868,5 @@ index eff09189b..6d76d20f0 100644
 -          "yahoo-zh-TW", "google", "ddg", "findbook-zh-TW", "wikipedia-zh-TW", "yahoo-zh-TW-HK", "yahoo-bid-zh-TW", "yahoo-answer-zh-TW"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
-       },
-       "TW": {
-         "visibleDefaultEngines": [
--          "yahoo-zh-TW", "google-nocodes", "ddg", "findbook-zh-TW", "wikipedia-zh-TW", "yahoo-zh-TW-HK", "yahoo-bid-zh-TW", "yahoo-answer-zh-TW"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
-       },
-       "HK": {
-         "visibleDefaultEngines": [
--          "yahoo-zh-TW-HK", "google-nocodes", "ddg", "findbook-zh-TW", "wikipedia-zh-TW", "yahoo-zh-TW", "yahoo-bid-zh-TW", "yahoo-answer-zh-TW"
-+          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
-         ]
        }
      }