From 957fd6967f29a16d7f408607258892e7cd3ca649 Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Mon, 9 Jul 2018 23:28:18 +0200
Subject: libre-testing/iceweasel: added preliminary iceweasel-61.0.1 build

---
 libre-testing/iceweasel/libre.patch | 40 ++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

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

diff --git a/libre-testing/iceweasel/libre.patch b/libre-testing/iceweasel/libre.patch
index 412725459..d8b9f7171 100644
--- a/libre-testing/iceweasel/libre.patch
+++ b/libre-testing/iceweasel/libre.patch
@@ -261,7 +261,7 @@ index 5b7bdad69..19871732e 100644
 +    <p><dt><h3>Parabola GNU/Linux-libre</h3></dt>
          <dl><p>
 -            <dt><a href="https://support.mozilla.org/@AB_CD@/products/firefox" icon="@firefox_icon@">@firefox_help@</a>
--            <dt><a href="https://www.mozilla.org/@AB_CD@/firefox/customize/" icon="@firefox_icon@">@firefox_customize@</a>
+-            <dt><a href="https://support.mozilla.org/@AB_CD@/kb/customize-firefox-controls-buttons-and-toolbars?utm_source=firefox-browser&utm_medium=default-bookmarks&utm_campaign=customize" icon="@firefox_icon@">@firefox_customize@</a>
 -            <dt><a href="https://www.mozilla.org/@AB_CD@/contribute/" icon="@mozilla_icon@">@firefox_community@</a>
 -            <dt><a href="https://www.mozilla.org/@AB_CD@/about/" icon="@mozilla_icon@">@firefox_about@</a>
 -        </dl>
@@ -294,14 +294,13 @@ 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
-@@ -91,12 +91,6 @@
+@@ -66,11 +66,6 @@
      locale/browser/searchplugins/               (.deps/generated_@AB_CD@/*.xml)
      locale/browser/searchplugins/list.json      (.deps/generated_@AB_CD@/list.json)
  #endif
 -    locale/browser/searchplugins/images/amazon.ico     (searchplugins/images/amazon.ico)
 -    locale/browser/searchplugins/images/ebay.ico       (searchplugins/images/ebay.ico)
 -    locale/browser/searchplugins/images/wikipedia.ico  (searchplugins/images/wikipedia.ico)
--    locale/browser/searchplugins/images/yahoo.ico      (searchplugins/images/yahoo.ico)
 -    locale/browser/searchplugins/images/yandex-en.ico  (searchplugins/images/yandex-en.ico)
 -    locale/browser/searchplugins/images/yandex-ru.ico  (searchplugins/images/yandex-ru.ico)
  % locale browser-region @AB_CD@ %locale/browser-region/
@@ -387,7 +386,7 @@ 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,809 +1,758 @@
+@@ -1,808 +1,762 @@
  {
    "default": {
      "visibleDefaultEngines": [
@@ -402,21 +401,6 @@ index 544740a43..4961e5437 100644
      "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": {
 -      "ebay-de": "ebay-at"
@@ -576,6 +560,14 @@ index 544740a43..4961e5437 100644
        "default": {
          "visibleDefaultEngines": [
 -          "google", "bing", "amazondotcom", "ddg", "wikipedia-es"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "crh": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "ddg", "twitter", "wikipedia-crh"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -624,6 +616,14 @@ index 544740a43..4961e5437 100644
        "default": {
          "visibleDefaultEngines": [
 -          "google", "amazon-en-GB", "bing", "ddg", "wikipedia-el"
++          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
+         ]
+       }
+     },
+     "en-CA": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1240,7 +1240,7 @@ index 544740a43..4961e5437 100644
      "uk": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
+-          "google", "bing", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
-- 
cgit v1.2.3