libre/iceweasel: update search engines patching

Apart from upstream updates to list.json, there is also a bit of
preparation for the next significant change of how search engines are
handled upstream. 78.0 enabled this new mechanism, but 78.0.1 disabled
it again because of [1]. For details see [2]. It looks like  Mozilla
can now update the list of available and visible search engines
remotely. So removing all engines except Wikipedia and DuckDuckGo just
to avoid surprises in future.

[1] https://bugzilla.mozilla.org/show_bug.cgi?id=1649393
[2] https://bugzilla.mozilla.org/show_bug.cgi?id=1542235

Signed-off-by: Andreas Grapentin <andreas@grapentin.org>

2 files changed, 33 insertions, 25 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index a8d215351..73b742ba9 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -267,15 +267,23 @@ END
   #        browser/components/search/extensions/<ID>/
 #   local _remove_engines_sed='s|.*oogle.*|          "ddg", "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-labs", "parabola-packages", "parabola-wiki-en", "searx", "wikipedia", "yacy"|g'
   local _remove_engines_sed='s|.*oogle.*|          "ddg", "wikipedia"|g'
-  local _search_config_file=browser/components/search/extensions/list.json
   echo "applying libre-searchengines.patch"
   patch -Np1 -i "$srcdir/libre-searchengines.patch"
-  sed -i "${_remove_engines_sed}" ${_search_config_file}
+
+  pushd browser/components/search/extensions
+  sed -i "${_remove_engines_sed}" list.json
 
   # Sanity-check search-engines patching
   _removed_engines_regex='Bing|Google|Seznam|Twitter|Yahoo|Yandex|Яндекс|amazon|bing|google|ebay|twitter'
   _err_msg="search-engines patch needs re-working"
-  ! grep -E ${_removed_engines_regex} ${_search_config_file} > /dev/null || ! echo "${_err_msg}"
+  ! grep -E ${_removed_engines_regex} list.json > /dev/null || ! echo "${_err_msg}"
+
+  find -mindepth 1 -maxdepth 1 \
+    -not -name ddg \
+    -not -name wikipedia \
+    -not -name list.json \
+    -exec rm -rf {} \;
+  popd
 
   # Removing What's New tab from Developer Tools, usages are removed by libre.patch
   rm -rf devtools/client/whats-new
diff --git a/libre/iceweasel/libre-searchengines.patch b/libre/iceweasel/libre-searchengines.patch
index 220b07a95..3efc1738c 100644
--- a/libre/iceweasel/libre-searchengines.patch
+++ b/libre/iceweasel/libre-searchengines.patch
@@ -8,7 +8,7 @@ index d023e0a..15ee5f5 100644
 -    "searchDefault": "Google",
 -    "searchOrder": ["Google", "Bing"],
      "visibleDefaultEngines": [
-       "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
+       "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "wikipedia"
      ]
    },
    "regionOverrides": {
@@ -58,30 +58,30 @@ index d023e0a..15ee5f5 100644
    "locales": {
 @@ -56,35 +32,6 @@
          "visibleDefaultEngines": [
-           "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
+           "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "wikipedia"
          ]
 -      },
 -      "KZ": {
 -        "visibleDefaultEngines": [
--          "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
+-          "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en"
 -        ],
 -        "searchDefault": "Yandex"
 -      },
 -      "BY": {
 -        "visibleDefaultEngines": [
--          "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
+-          "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en"
 -        ],
 -        "searchDefault": "Yandex"
 -      },
 -      "RU": {
 -        "visibleDefaultEngines": [
--          "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
+-          "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en"
 -        ],
 -        "searchDefault": "Yandex"
 -      },
 -      "TR": {
 -        "visibleDefaultEngines": [
--          "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
+-          "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en"
 -        ],
 -        "searchDefault": "Yandex"
 -      },
@@ -121,30 +121,30 @@ index d023e0a..15ee5f5 100644
          ]
 @@ -266,35 +200,6 @@
          "visibleDefaultEngines": [
-           "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
+           "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia"
          ]
 -      },
 -      "KZ": {
 -        "visibleDefaultEngines": [
--          "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
+-          "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia"
 -        ],
 -        "searchDefault": "Yandex"
 -      },
 -      "BY": {
 -        "visibleDefaultEngines": [
--          "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
+-          "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia"
 -        ],
 -        "searchDefault": "Yandex"
 -      },
 -      "RU": {
 -        "visibleDefaultEngines": [
--          "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
+-          "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia"
 -        ],
 -        "searchDefault": "Yandex"
 -      },
 -      "TR": {
 -        "visibleDefaultEngines": [
--          "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
+-          "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia"
 -        ],
 -        "searchDefault": "Yandex"
 -      },
@@ -157,30 +157,30 @@ index d023e0a..15ee5f5 100644
      "en-GB": {
 @@ -302,35 +207,6 @@
          "visibleDefaultEngines": [
-           "google-b-d", "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", "wikipedia"
          ]
 -      },
 -      "KZ": {
 -        "visibleDefaultEngines": [
--          "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
+-          "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia"
 -        ],
 -        "searchDefault": "Yandex"
 -      },
 -      "BY": {
 -        "visibleDefaultEngines": [
--          "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
+-          "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia"
 -        ],
 -        "searchDefault": "Yandex"
 -      },
 -      "RU": {
 -        "visibleDefaultEngines": [
--          "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
+-          "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia"
 -        ],
 -        "searchDefault": "Yandex"
 -      },
 -      "TR": {
 -        "visibleDefaultEngines": [
--          "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
+-          "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia"
 -        ],
 -        "searchDefault": "Yandex"
 -      },
@@ -219,21 +219,21 @@ index d023e0a..15ee5f5 100644
      },
      "ja-JP-macos": {
        "default": {
--        "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"],
+-        "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Wikipedia (ja)"],
          "visibleDefaultEngines": [
-           "google-b-d", "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", "wikipedia-ja", "ddg"
          ]
 @@ -573,7 +414,6 @@
      },
      "ja": {
        "default": {
--        "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"],
+-        "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Wikipedia (ja)"],
          "visibleDefaultEngines": [
-           "google-b-d", "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", "wikipedia-ja", "ddg"
          ]
 @@ -598,18 +438,6 @@
          "visibleDefaultEngines": [
-           "yandex-kk", "google-b-d", "ddg", "flip", "twitter", "wikipedia-kk"
+           "yandex-kk", "google-b-d", "ddg", "flip", "wikipedia-kk"
          ]
 -      },
 -      "KZ": {
@@ -283,7 +283,7 @@ index d023e0a..15ee5f5 100644
      "si": {
 @@ -900,18 +711,6 @@
          "visibleDefaultEngines": [
-           "yandex-tr", "google-b-d", "ddg", "twitter", "wikipedia-tr"
+           "yandex-tr", "google-b-d", "ddg", "wikipedia-tr"
          ]
 -      },
 -      "TR": {