From 75a7904752fda9260fb0c362cfb18922c27f0229 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 21:32:11 +0200 Subject: libre/iceweasel: Drop old search engine patching Legacy search configuration has been dropped upstream [1]. It needs to be done by new method now. [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1619926 --- libre/iceweasel/PKGBUILD | 37 +--- libre/iceweasel/libre-searchengines.patch | 312 ------------------------------ libre/iceweasel/vendor.js.in | 4 - 3 files changed, 5 insertions(+), 348 deletions(-) delete mode 100644 libre/iceweasel/libre-searchengines.patch diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index fffe5070b..1f0960d57 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -296,36 +296,9 @@ END ## searchengines ## - # Load custom searchplugins - # FIXME: no longer applicable - replace with (broken) replacement fo libre/mozilla-searchplugins - # https://git.parabola.nu/packages/iceweasel.git/tree/branding-dev-build/mozilla-searchplugins?h=68.0 -# rm -rvf -- browser/components/search/searchplugins/{*.xml,images/} -# cp -av -- /usr/lib/mozilla/searchplugins/* browser/components/search/searchplugins/ - - # Patch search-engines config - # FIXME: custom searchplugins ID per new format above ("ddg" is standard) - # browser/components/search/extensions// -# 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' - echo "applying libre-searchengines.patch" - patch -Np1 -i "${srcdir}"/libre-searchengines.patch - sed -i "${remove_engines_sed}" list.json - sed -i 's|https://duckduckgo.com/|https://html.duckduckgo.com/html/|' ddg/manifest.json - pushd browser/components/search/extensions - # replace default searchplugins - # FIXME: no longer applicable - replace with (broken) replacement fo libre/mozilla-searchplugins - # https://git.parabola.nu/packages/iceweasel.git/tree/branding-dev-build/mozilla-searchplugins?h=68.0 -# rm -rvf -- browser/components/search/searchplugins/{*.xml,images/} -# cp -av -- /usr/lib/mozilla/searchplugins/* browser/components/search/searchplugins/ - # TODO: replacement implementation for above - see analogous changes in libre/icecat/PKGBUILD -# cp -av -- /usr/share/mozilla/searchplugins/* . - find -mindepth 1 -maxdepth 1 \ - -not -name ddg \ - -not -name wikipedia \ - -not -name list.json \ - -exec rm -rf {} \; + sed -i 's|https://duckduckgo.com/|https://html.duckduckgo.com/html/|' ddg/manifest.json # Removing URL parameters that let DuckDuckGo know the place in UI # the search was ran from (like address bar, context menu, etc.) @@ -334,10 +307,10 @@ END ! diff manifest.json.tmp ddg/manifest.json > /dev/null mv manifest.json.tmp ddg/manifest.json - # Sanity-check search-engines patching - local removed_engines_regex='Bing|Google|Seznam|Twitter|Yahoo|Yandex|Яндекс|amazon|bing|google|ebay|twitter' - local engines_err_msg="search-engines patch needs re-working" - ! grep -E ${removed_engines_regex} list.json > /dev/null || ! echo "${engines_err_msg}" + find -mindepth 1 -maxdepth 1 \ + -not -name ddg \ + -not -name wikipedia \ + -exec rm -frv {} \; popd diff --git a/libre/iceweasel/libre-searchengines.patch b/libre/iceweasel/libre-searchengines.patch deleted file mode 100644 index 3efc1738c..000000000 --- a/libre/iceweasel/libre-searchengines.patch +++ /dev/null @@ -1,312 +0,0 @@ -diff --git a/browser/components/search/extensions/list.json b/browser/components/search/extensions/list.json -index d023e0a..15ee5f5 100644 ---- a/browser/components/search/extensions/list.json -+++ b/browser/components/search/extensions/list.json -@@ -1,53 +1,29 @@ - { - "default": { -- "searchDefault": "Google", -- "searchOrder": ["Google", "Bing"], - "visibleDefaultEngines": [ - "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "wikipedia" - ] - }, - "regionOverrides": { - "US": { -- "google-b-d": "google-b-1-d" - }, - "CA": { -- "ebay": "ebay-ca", -- "ebay-fr": "ebay-ca", -- "amazondotcom": "amazon-ca", -- "amazon-france": "amazon-ca" - }, - "AT": { -- "ebay-de": "ebay-at" - }, - "AU": { -- "ebay": "ebay-au", -- "ebay-uk": "ebay-au", -- "amazondotcom": "amazon-au", -- "amazon-en-GB": "amazon-au" - }, - "BE": { -- "ebay": "ebay-be", -- "ebay-nl": "ebay-be", -- "ebay-fr": "ebay-be" - }, - "CH": { -- "ebay": "ebay-ch", -- "ebay-de": "ebay-ch", -- "ebay-fr": "ebay-ch" - }, - "FR": { -- "amazondotcom": "amazon-france" - }, - "IE": { -- "ebay": "ebay-ie", -- "ebay-uk": "ebay-ie" - }, - "NL": { -- "ebay": "ebay-nl" - }, - "GB": { -- "ebay": "ebay-uk", -- "amazondotcom": "amazon-en-GB" - } - }, - "locales": { -@@ -56,35 +32,6 @@ - "visibleDefaultEngines": [ - "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "wikipedia" - ] -- }, -- "KZ": { -- "visibleDefaultEngines": [ -- "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en" -- ], -- "searchDefault": "Yandex" -- }, -- "BY": { -- "visibleDefaultEngines": [ -- "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en" -- ], -- "searchDefault": "Yandex" -- }, -- "RU": { -- "visibleDefaultEngines": [ -- "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en" -- ], -- "searchDefault": "Yandex" -- }, -- "TR": { -- "visibleDefaultEngines": [ -- "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en" -- ], -- "searchDefault": "Yandex" -- }, -- "experimental-hidden": { -- "visibleDefaultEngines": [ -- "amazon-ca", "amazon-au", "yandex-en", "google", "google-b-1-e", "google-b-e" -- ] - } - }, - "ach": { -@@ -141,18 +88,6 @@ - "visibleDefaultEngines": [ - "yandex-by", "google-b-d", "ddg", "wikipedia-be", "wikipedia-be-tarask" - ] -- }, -- "BY": { -- "searchDefault": "Яндекс" -- }, -- "KZ": { -- "searchDefault": "Яндекс" -- }, -- "RU": { -- "searchDefault": "Яндекс" -- }, -- "TR": { -- "searchDefault": "Яндекс" - } - }, - "bg": { -@@ -220,7 +155,6 @@ - }, - "cs": { - "default": { -- "searchOrder": ["Google", "Seznam"], - "visibleDefaultEngines": [ - "google-b-d", "seznam-cz", "ddg", "heureka-cz", "mapy-cz", "wikipedia-cz" - ] -@@ -266,35 +200,6 @@ - "visibleDefaultEngines": [ - "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia" - ] -- }, -- "KZ": { -- "visibleDefaultEngines": [ -- "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", "wikipedia" -- ], -- "searchDefault": "Yandex" -- }, -- "RU": { -- "visibleDefaultEngines": [ -- "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", "wikipedia" -- ], -- "searchDefault": "Yandex" -- }, -- "experimental-hidden": { -- "visibleDefaultEngines": [ -- "amazon-ca", "amazon-au", "yandex-en", "google", "google-b-1-e", "google-b-e" -- ] - } - }, - "en-GB": { -@@ -302,35 +207,6 @@ - "visibleDefaultEngines": [ - "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", "wikipedia" -- ], -- "searchDefault": "Yandex" -- }, -- "BY": { -- "visibleDefaultEngines": [ -- "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", "wikipedia" -- ], -- "searchDefault": "Yandex" -- }, -- "TR": { -- "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia" -- ], -- "searchDefault": "Yandex" -- }, -- "experimental-hidden": { -- "visibleDefaultEngines": [ -- "yandex-en" -- ] - } - }, - "eo": { -@@ -397,11 +249,6 @@ - "visibleDefaultEngines": [ - "google-b-d", "bing", "ddg", "mercadolibre-mx", "wikipedia-es" - ] -- }, -- "experimental-hidden": { -- "visibleDefaultEngines": [ -- "amazon-mx" -- ] - } - }, - "et": { -@@ -451,11 +298,6 @@ - "visibleDefaultEngines": [ - "google-b-d", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL" - ] -- }, -- "experimental-hidden": { -- "visibleDefaultEngines": [ -- "amazon-nl" -- ] - } - }, - "ga-IE": { -@@ -565,7 +407,6 @@ - }, - "ja-JP-macos": { - "default": { -- "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", "wikipedia-ja", "ddg" - ] -@@ -573,7 +414,6 @@ - }, - "ja": { - "default": { -- "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", "wikipedia-ja", "ddg" - ] -@@ -598,18 +438,6 @@ - "visibleDefaultEngines": [ - "yandex-kk", "google-b-d", "ddg", "flip", "wikipedia-kk" - ] -- }, -- "KZ": { -- "searchDefault": "Яндекс" -- }, -- "BY": { -- "searchDefault": "Яндекс" -- }, -- "RU": { -- "searchDefault": "Яндекс" -- }, -- "TR": { -- "searchDefault": "Яндекс" - } - }, - "km": { -@@ -729,11 +557,6 @@ - "visibleDefaultEngines": [ - "google-b-d", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl" - ] -- }, -- "experimental-hidden": { -- "visibleDefaultEngines": [ -- "amazon-nl" -- ] - } - }, - "nn-NO": { -@@ -804,18 +627,6 @@ - "visibleDefaultEngines": [ - "yandex-ru", "google-b-d", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru" - ] -- }, -- "RU": { -- "searchDefault": "Яндекс" -- }, -- "BY": { -- "searchDefault": "Яндекс" -- }, -- "KZ": { -- "searchDefault": "Яндекс" -- }, -- "TR": { -- "searchDefault": "Яндекс" - } - }, - "si": { -@@ -900,18 +711,6 @@ - "visibleDefaultEngines": [ - "yandex-tr", "google-b-d", "ddg", "wikipedia-tr" - ] -- }, -- "TR": { -- "searchDefault": "Yandex" -- }, -- "BY": { -- "searchDefault": "Yandex" -- }, -- "KZ": { -- "searchDefault": "Yandex" -- }, -- "RU": { -- "searchDefault": "Yandex" - } - }, - "trs": { -@@ -968,9 +767,6 @@ - "visibleDefaultEngines": [ - "baidu", "google-b-d", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn" - ] -- }, -- "CN": { -- "searchDefault": "百度" - } - }, - "zh-TW": { diff --git a/libre/iceweasel/vendor.js.in b/libre/iceweasel/vendor.js.in index 2d5f1a30b..d67ae2fb0 100644 --- a/libre/iceweasel/vendor.js.in +++ b/libre/iceweasel/vendor.js.in @@ -321,7 +321,3 @@ pref("extensions.getAddons.showPane", false); // Setting these preferences just in case and to not frustrate users. pref("app.normandy.api_url", "http://127.0.0.1/"); pref("app.normandy.enabled", false); - -// Disable Mozilla's remote configuration of search engines -// See https://bugzilla.mozilla.org/show_bug.cgi?id=1542235 -pref("browser.search.modernConfig", false); -- cgit v1.2.3