From 8f7b183f7fc7c3a71d9d3375f4f2e00be6efb0ad Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Thu, 25 Jan 2018 18:42:39 +0100
Subject: libre/iceweasel: updated to 58.0

---
 libre/iceweasel/libre.patch | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

(limited to 'libre/iceweasel/libre.patch')

diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index 6597b5a56..f9cb11c5e 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -295,7 +295,7 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
 index eff09189b..6d76d20f0 100644
 --- a/browser/locales/jar.mn
 +++ b/browser/locales/jar.mn
-@@ -97,12 +97,6 @@
+@@ -99,12 +99,6 @@
      locale/browser/searchplugins/               (.deps/generated_@AB_CD@/*.xml)
      locale/browser/searchplugins/list.json      (.deps/generated_@AB_CD@/list.json)
  #endif
@@ -312,20 +312,19 @@ diff --git a/browser/locales/search/list.json b/browser/locales/search/list.json
 index 544740a43..4961e5437 100644
 --- a/browser/locales/search/list.json
 +++ b/browser/locales/search/list.json
-@@ -1,802 +1,748 @@
+@@ -1,809 +1,758 @@
  {
    "default": {
      "visibleDefaultEngines": [
--      "google", "yahoo", "amazondotcom", "bing", "ddg", "twitter", "wikipedia"
+-      "google", "yahoo", "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-nocodes"
+-      "google": "google-2018"
      },
      "CA": {
--      "google": "google-nocodes",
 -      "ebay": "ebay-ca",
 -      "ebay-fr": "ebay-ca"
      },
@@ -342,12 +341,6 @@ index 544740a43..4961e5437 100644
 -      "google": "google-nocodes"
      },
      "CN": {
--      "google": "google-nocodes"
-     },
-     "TW": {
--      "google": "google-nocodes"
-     },
-     "HK": {
 -      "google": "google-nocodes"
      },
      "AT": {
@@ -771,6 +764,14 @@ index 544740a43..4961e5437 100644
        "default": {
          "visibleDefaultEngines": [
 -          "google", "yahoo", "amazondotcom", "ddg", "list-am", "wikipedia-hy"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "ia": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -890,7 +891,7 @@ index 544740a43..4961e5437 100644
      "ltg": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-lv"
+-          "google", "yahoo", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-ltg"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -984,6 +985,14 @@ index 544740a43..4961e5437 100644
        "default": {
          "visibleDefaultEngines": [
 -          "google", "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"
+         ]
+       }
+     },
+     "oc": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "yahoo-france", "bing", "ddg", "twitter", "wikipedia-oc", "wiktionary-oc"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1044,7 +1053,7 @@ index 544740a43..4961e5437 100644
      "ro": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipediaro"
+-          "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-ro"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1180,7 +1189,7 @@ index 544740a43..4961e5437 100644
      "vi": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "coccoc", "ddg", "wikipedia-vi", "zing-mp3"
+-          "google", "coccoc", "ddg", "wikipedia-vi"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1212,7 +1221,7 @@ index 544740a43..4961e5437 100644
      "zh-TW": {
        "default": {
          "visibleDefaultEngines": [
--          "yahoo-zh-TW", "google", "ddg", "findbook-zh-TW", "wikipedia-zh-TW", "yahoo-zh-TW-HK", "yahoo-bid-zh-TW", "yahoo-answer-zh-TW"
+-          "yahoo-zh-TW", "google", "ddg", "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"
          ]
        }
-- 
cgit v1.2.3