From 1537880dac3087d3779543303f0df83432831166 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 11 Oct 2021 18:15:11 -0400 Subject: Update GNU IceCat to 91.2.0 * data/files-to-append/browser/locales/en-US/browser/preferences/preferences.ftl (detect-network-connectivity-option) (detect-network-connectivity-description): Add label and description for new IceCat-specific preference for toggling the network connectivity service. * data/newtab/directory.png: * data/newtab/fsf.ico: * data/newtab/fsf.png: * data/newtab/gnu.ico: * data/newtab/gnu.png: * data/newtab/libreplanet.ico: * data/newtab/libreplanet.png: * data/newtab/trisquel.ico: * data/newtab/trisquel.png: * data/newtab/wikinews.ico: * data/newtab/wikinews.png: * data/newtab/wikipedia-org@2x.png: * data/newtab/wikipedia.ico: * data/newtab/wikipedia.png: New files, imported from Trisquel's Abrowser build helper. These will be used for the "top sites" displayed on the newtab page. * data/patches/default-search-duckduckgo.patch: * data/patches/duckduckgo-no-params.patch: Remove. The search engine machinery has been completely changed upstream, yet again. * data/patches/disable-settings-services.patch: * data/patches/hide-protections-dashboard.patch: * data/patches/icecat-about-dialog.patch: * data/patches/moz-configure-changes.patch: Adapt to v91. * data/patches/icecat-preferences.patch: Change the preference key for the captive portal toggle from 'captivedetect.canonicalURL' to 'network.captive-portal-service.enabled'. There was at least one report from several years back that 'network.captive-portal-service.enabled' was not respected: https://bugzilla.mozilla.org/show_bug.cgi?id=1481085 But it seems to have been a rare occurrence/bug. As such, I believe it's okay to toggle this preference instead of changing the address 'captivedetect.canonicalURL' points to. * data/settings.js: Set several preferencess to try and disable new annoying VPN- and mobile-related promos. * makeicecat: Adapt to v91. Update FFMAJOR, FFMINOR, SOURCEBALL_CHECKSUM, and L10N_CMP_REV. We now require Python 3 and the jsonschema Python library as build dependencies. So check for their existence and error out if they don't. Given that the search engine machinery has been completely changed yet again, add a 'configure_search' function to make relevant changes, and ultimately run the new 'tools/process-json-files.py' Python script. Also comment out the 'configure_mobile', to be removed soon, as Mozilla has long since removed the parts of the firefox code base for mobile builds, and their mobile browser is now a separate project and code base. * tools/process-json-files.py: New file, from packagers/maintainers of Trisquel's Abrowser and Parabola's Iceweasel, for processing and modifying various JSON files -- such as those relating to search engines -- in the firefox code base. --- .../en-US/browser/preferences/preferences.ftl | 4 + data/newtab/directory.png | Bin 0 -> 32641 bytes data/newtab/fsf.ico | Bin 0 -> 873 bytes data/newtab/fsf.png | Bin 0 -> 35298 bytes data/newtab/gnu.ico | Bin 0 -> 1518 bytes data/newtab/gnu.png | Bin 0 -> 76800 bytes data/newtab/libreplanet.ico | Bin 0 -> 1406 bytes data/newtab/libreplanet.png | Bin 0 -> 36250 bytes data/newtab/trisquel.ico | Bin 0 -> 11630 bytes data/newtab/trisquel.png | Bin 0 -> 200350 bytes data/newtab/wikinews.ico | Bin 0 -> 7741 bytes data/newtab/wikinews.png | Bin 0 -> 58853 bytes data/newtab/wikipedia-org@2x.png | Bin 0 -> 46598 bytes data/newtab/wikipedia.ico | Bin 0 -> 2734 bytes data/newtab/wikipedia.png | Bin 0 -> 46598 bytes data/patches/default-search-duckduckgo.patch | 1092 -------------------- data/patches/disable-settings-services.patch | 15 +- data/patches/duckduckgo-no-params.patch | 51 - data/patches/hide-protections-dashboard.patch | 48 +- data/patches/icecat-about-dialog.patch | 12 +- data/patches/icecat-preferences.patch | 49 +- data/patches/moz-configure-changes.patch | 26 +- data/settings.js | 14 +- 23 files changed, 103 insertions(+), 1208 deletions(-) create mode 100644 data/newtab/directory.png create mode 100644 data/newtab/fsf.ico create mode 100644 data/newtab/fsf.png create mode 100644 data/newtab/gnu.ico create mode 100644 data/newtab/gnu.png create mode 100644 data/newtab/libreplanet.ico create mode 100644 data/newtab/libreplanet.png create mode 100644 data/newtab/trisquel.ico create mode 100644 data/newtab/trisquel.png create mode 100644 data/newtab/wikinews.ico create mode 100644 data/newtab/wikinews.png create mode 100644 data/newtab/wikipedia-org@2x.png create mode 100644 data/newtab/wikipedia.ico create mode 100644 data/newtab/wikipedia.png delete mode 100644 data/patches/default-search-duckduckgo.patch delete mode 100644 data/patches/duckduckgo-no-params.patch (limited to 'data') diff --git a/data/files-to-append/browser/locales/en-US/browser/preferences/preferences.ftl b/data/files-to-append/browser/locales/en-US/browser/preferences/preferences.ftl index 2f90bcd..87ce9b9 100644 --- a/data/files-to-append/browser/locales/en-US/browser/preferences/preferences.ftl +++ b/data/files-to-append/browser/locales/en-US/browser/preferences/preferences.ftl @@ -27,6 +27,10 @@ detect-captive-portal-option = .label = Detect captive portal detect-captive-portal-description = Captive portals are the sites that control access to public wireless networks in hotels, airports, cafes, etc. The detection service is useful if you connect to such netwoks, but it will start connections automatically. +detect-network-connectivity-option = + .label = Detect network connectivity +detect-network-connectivity-description = The network connectivity service checks if IPv4/v6 DNS lookups work on the current network, whether connecting to IPv4/v6 addresses work on the current network, and whether a NAT64 gateway is detected on the network. These help the browser assess the network connectivity state, but will result in automatic DNS queries and HTTP connections being made for those checks. + geolocation-option = .label = Enable Geolocation geolocation-description = This is commonly used for maps, weather sites, and some stores. It is better to keep it off unless you really need it. diff --git a/data/newtab/directory.png b/data/newtab/directory.png new file mode 100644 index 0000000..4fbaacd Binary files /dev/null and b/data/newtab/directory.png differ diff --git a/data/newtab/fsf.ico b/data/newtab/fsf.ico new file mode 100644 index 0000000..1a616bd Binary files /dev/null and b/data/newtab/fsf.ico differ diff --git a/data/newtab/fsf.png b/data/newtab/fsf.png new file mode 100644 index 0000000..2ff8aff Binary files /dev/null and b/data/newtab/fsf.png differ diff --git a/data/newtab/gnu.ico b/data/newtab/gnu.ico new file mode 100644 index 0000000..3891a85 Binary files /dev/null and b/data/newtab/gnu.ico differ diff --git a/data/newtab/gnu.png b/data/newtab/gnu.png new file mode 100644 index 0000000..0669539 Binary files /dev/null and b/data/newtab/gnu.png differ diff --git a/data/newtab/libreplanet.ico b/data/newtab/libreplanet.ico new file mode 100644 index 0000000..c55e25e Binary files /dev/null and b/data/newtab/libreplanet.ico differ diff --git a/data/newtab/libreplanet.png b/data/newtab/libreplanet.png new file mode 100644 index 0000000..3b60e47 Binary files /dev/null and b/data/newtab/libreplanet.png differ diff --git a/data/newtab/trisquel.ico b/data/newtab/trisquel.ico new file mode 100644 index 0000000..0c0408c Binary files /dev/null and b/data/newtab/trisquel.ico differ diff --git a/data/newtab/trisquel.png b/data/newtab/trisquel.png new file mode 100644 index 0000000..3e5b00d Binary files /dev/null and b/data/newtab/trisquel.png differ diff --git a/data/newtab/wikinews.ico b/data/newtab/wikinews.ico new file mode 100644 index 0000000..6c7ce5a Binary files /dev/null and b/data/newtab/wikinews.ico differ diff --git a/data/newtab/wikinews.png b/data/newtab/wikinews.png new file mode 100644 index 0000000..93bde2c Binary files /dev/null and b/data/newtab/wikinews.png differ diff --git a/data/newtab/wikipedia-org@2x.png b/data/newtab/wikipedia-org@2x.png new file mode 100644 index 0000000..506aa1a Binary files /dev/null and b/data/newtab/wikipedia-org@2x.png differ diff --git a/data/newtab/wikipedia.ico b/data/newtab/wikipedia.ico new file mode 100644 index 0000000..e700218 Binary files /dev/null and b/data/newtab/wikipedia.ico differ diff --git a/data/newtab/wikipedia.png b/data/newtab/wikipedia.png new file mode 100644 index 0000000..506aa1a Binary files /dev/null and b/data/newtab/wikipedia.png differ diff --git a/data/patches/default-search-duckduckgo.patch b/data/patches/default-search-duckduckgo.patch deleted file mode 100644 index 93c70c6..0000000 --- a/data/patches/default-search-duckduckgo.patch +++ /dev/null @@ -1,1092 +0,0 @@ ---- a/browser/components/search/SearchTelemetry.jsm -+++ b/browser/components/search/SearchTelemetry.jsm -@@ -61,16 +61,6 @@ - * a partner search. - */ - const SEARCH_PROVIDER_INFO = { -- google: { -- regexp: /^https:\/\/www\.google\.(?:.+)\/search/, -- queryParam: "q", -- codeParam: "client", -- codePrefixes: ["firefox"], -- followonParams: ["oq", "ved", "ei"], -- extraAdServersRegexps: [ -- /^https:\/\/www\.google(?:adservices)?\.com\/(?:pagead\/)?aclk/, -- ], -- }, - duckduckgo: { - regexp: /^https:\/\/duckduckgo\.com\//, - queryParam: "q", -@@ -81,6 +71,16 @@ - /^https:\/\/www\.amazon\.(?:[a-z.]{2,24}).*(?:tag=duckduckgo-)/, - ], - }, -+ google: { -+ regexp: /^https:\/\/www\.google\.(?:.+)\/search/, -+ queryParam: "q", -+ codeParam: "client", -+ codePrefixes: ["firefox"], -+ followonParams: ["oq", "ved", "ei"], -+ extraAdServersRegexps: [ -+ /^https:\/\/www\.google(?:adservices)?\.com\/(?:pagead\/)?aclk/, -+ ], -+ }, - yahoo: { - regexp: /^https:\/\/(?:.*)search\.yahoo\.com\/search/, - queryParam: "p", ---- a/browser/components/search/extensions/list.json -+++ b/browser/components/search/extensions/list.json -@@ -1,9 +1,9 @@ - { - "default": { -- "searchDefault": "Google", -- "searchOrder": ["Google", "Bing"], -+ "searchDefault": "DuckDuckGo", -+ "searchOrder": ["DuckDuckGo", "Google", "Bing"], - "visibleDefaultEngines": [ -- "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "wikipedia" -+ "ddg", "google-b-d", "amazondotcom", "bing", "ebay", "wikipedia" - ] - }, - "regionOverrides": { -@@ -54,32 +54,32 @@ - "en-US": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "wikipedia" -+ "ddg", "google-b-d", "amazondotcom", "bing", "ebay", "wikipedia" - ] - }, - "KZ": { - "visibleDefaultEngines": [ -- "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en" -+ "ddg", "amazondotcom", "bing", "google-b-d", "wikipedia", "yandex-en" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "BY": { - "visibleDefaultEngines": [ -- "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en" -+ "ddg", "amazondotcom", "bing", "google-b-d", "wikipedia", "yandex-en" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "RU": { - "visibleDefaultEngines": [ -- "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en" -+ "ddg", "amazondotcom", "bing", "google-b-d", "wikipedia", "yandex-en" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "TR": { - "visibleDefaultEngines": [ -- "amazondotcom", "bing", "google-b-d", "wikipedia", "ddg", "yandex-en" -+ "ddg", "amazondotcom", "bing", "google-b-d", "wikipedia", "yandex-en" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "experimental-hidden": { - "visibleDefaultEngines": [ -@@ -90,145 +90,145 @@ - "ach": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia" - ] - } - }, - "af": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-af" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-af" - ] - } - }, - "an": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ebay-es", "wikipedia-an", "ddg" -+ "ddg", "google-b-d", "bing", "ebay-es", "wikipedia-an" - ] - } - }, - "ar": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ar" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-ar" - ] - } - }, - "ast": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "ebay-es", "wikipedia-ast" -+ "ddg", "google-b-d", "bing", "ebay-es", "wikipedia-ast" - ] - } - }, - "az": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazondotcom", "azerdict", "bing", "ddg", "wikipedia-az", "yandex-az" -+ "ddg", "google-b-d", "amazondotcom", "azerdict", "bing", "wikipedia-az", "yandex-az" - ] - } - }, - "be": { - "default": { - "visibleDefaultEngines": [ -- "yandex-by", "google-b-d", "ddg", "wikipedia-be", "wikipedia-be-tarask" -+ "ddg", "yandex-by", "google-b-d", "wikipedia-be", "wikipedia-be-tarask" - ] - }, - "BY": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - }, - "KZ": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - }, - "RU": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - }, - "TR": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - } - }, - "bg": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazondotcom", "ddg", "pazaruvaj", "wikipedia-bg" -+ "ddg", "google-b-d", "amazondotcom", "pazaruvaj", "wikipedia-bg" - ] - } - }, - "bn": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-in", "bing", "ddg", "wikipedia-bn" -+ "ddg", "google-b-d", "amazon-in", "bing", "wikipedia-bn" - ] - } - }, - "bn-BD": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "wikipedia-bn" -+ "ddg", "google-b-d", "bing", "wikipedia-bn" - ] - } - }, - "bn-IN": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-in", "bing", "ddg", "wikipedia-bn" -+ "ddg", "google-b-d", "amazon-in", "bing", "wikipedia-bn" - ] - } - }, - "bo": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "wikipedia" -+ "ddg", "google-b-d", "wikipedia" - ] - } - }, - "br": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-france", "ddg", "ebay-fr", "freelang", "wikipedia-br" -+ "ddg", "google-b-d", "amazon-france", "ebay-fr", "freelang", "wikipedia-br" - ] - } - }, - "brx": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "wikipedia" -+ "ddg", "google-b-d", "wikipedia" - ] - } - }, - "bs": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "olx", "wikipedia-bs" -+ "ddg", "google-b-d", "olx", "wikipedia-bs" - ] - } - }, - "ca": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "diec2", "ddg", "ebay-es", "wikipedia-ca" -+ "ddg", "google-b-d", "bing", "diec2", "ebay-es", "wikipedia-ca" - ] - } - }, - "ca-valencia": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "diec2", "ddg", "ebay-es", "wikipedia-ca" -+ "ddg", "google-b-d", "bing", "diec2", "ebay-es", "wikipedia-ca" - ] - } - }, - "cak": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-es" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-es" - ] - } - }, - "ckb": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "wikipedia" -+ "ddg", "google-b-d", "wikipedia" - ] - } - }, -@@ -236,74 +236,74 @@ - "default": { - "searchOrder": ["Google", "Seznam"], - "visibleDefaultEngines": [ -- "google-b-d", "seznam-cz", "ddg", "heureka-cz", "mapy-cz", "wikipedia-cz" -+ "ddg", "google-b-d", "seznam-cz", "heureka-cz", "mapy-cz", "wikipedia-cz" - ] - } - }, - "cy": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-en-GB", "ddg", "ebay-uk", "palasprint", "wikipedia-cy" -+ "ddg", "google-b-d", "amazon-en-GB", "ebay-uk", "palasprint", "wikipedia-cy" - ] - } - }, - "da": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-da" -+ "ddg", "google-b-d", "bing", "amazon-en-GB", "wikipedia-da" - ] - } - }, - "de": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-de", "bing", "ddg", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de" -+ "ddg", "google-b-d", "amazon-de", "bing", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de" - ] - } - }, - "dsb": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb" -+ "ddg", "google-b-d", "bing", "amazon-de", "ebay-de", "leo_ende_de", "wikipedia-dsb" - ] - } - }, - "el": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-el" -+ "ddg", "google-b-d", "amazon-en-GB", "bing", "wikipedia-el" - ] - } - }, - "en-CA": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia" -+ "ddg", "google-b-d", "amazon-ca", "bing", "ebay-ca", "wikipedia" - ] - }, - "KZ": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "BY": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "RU": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "TR": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "amazon-ca", "bing", "ebay-ca", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "experimental-hidden": { - "visibleDefaultEngines": [ -@@ -314,32 +314,32 @@ - "en-GB": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia" -+ "ddg", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "wikipedia" - ] - }, - "KZ": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "BY": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "RU": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "TR": { - "visibleDefaultEngines": [ -- "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "wikipedia" -+ "ddg", "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ebay-uk", "wikipedia" - ], -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "experimental-hidden": { - "visibleDefaultEngines": [ -@@ -350,35 +350,35 @@ - "eo": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-eo" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-eo" - ] - } - }, - "es-AR": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es" -+ "ddg", "google-b-d", "amazondotcom", "drae", "mercadolibre-ar", "wikipedia-es" - ] - } - }, - "es-CL": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "drae", "ddg", "mercadolibre-cl", "wikipedia-es" -+ "ddg", "google-b-d", "bing", "drae", "mercadolibre-cl", "wikipedia-es" - ] - } - }, - "es-ES": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "drae", "ddg", "ebay-es", "wikipedia-es" -+ "ddg", "google-b-d", "bing", "drae", "ebay-es", "wikipedia-es" - ] - } - }, - "es-MX": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "mercadolibre-mx", "wikipedia-es" -+ "ddg", "google-b-d", "bing", "mercadolibre-mx", "wikipedia-es" - ] - }, - "experimental-hidden": { -@@ -390,49 +390,49 @@ - "et": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "neti-ee", "ddg", "osta-ee", "wikipedia-et", "eki-ee" -+ "ddg", "google-b-d", "neti-ee", "osta-ee", "wikipedia-et", "eki-ee" - ] - } - }, - "eu": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-eu" -+ "ddg", "google-b-d", "bing", "amazon-en-GB", "ebay-es", "wikipedia-eu" - ] - } - }, - "fa": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazondotcom", "bing", "ddg", "wikipedia-fa" -+ "ddg", "google-b-d", "amazondotcom", "bing", "wikipedia-fa" - ] - } - }, - "ff": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-france", "ddg", "wikipedia-fr" -+ "ddg", "google-b-d", "bing", "amazon-france", "wikipedia-fr" - ] - } - }, - "fi": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "wikipedia-fi" -+ "ddg", "google-b-d", "bing", "wikipedia-fi" - ] - } - }, - "fr": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "qwant", "wikipedia-fr" -+ "ddg", "google-b-d", "bing", "amazon-france", "ebay-fr", "qwant", "wikipedia-fr" - ] - } - }, - "fy-NL": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL" -+ "ddg", "google-b-d", "bing", "bolcom-fy-NL", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL" - ] - }, - "experimental-hidden": { -@@ -444,112 +444,112 @@ - "ga-IE": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "wikipedia-ga-IE" -+ "ddg", "google-b-d", "amazon-en-GB", "ebay-ie", "tearma", "wikipedia-ga-IE" - ] - } - }, - "gd": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd" -+ "ddg", "google-b-d", "amazon-en-GB", "bbc-alba", "ebay-uk", "faclair-beag", "wikipedia-gd" - ] - } - }, - "gl": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl" -+ "ddg", "google-b-d", "amazon-en-GB", "ebay-es", "wikipedia-gl" - ] - } - }, - "gn": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-gn" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-gn" - ] - } - }, - "gu-IN": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-gu" -+ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-gu" - ] - } - }, - "he": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "wikipedia-he", "morfix-dic" -+ "ddg", "google-b-d", "wikipedia-he", "morfix-dic" - ] - } - }, - "hi-IN": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "wikipedia-hi" -+ "ddg", "google-b-d", "bing", "wikipedia-hi" - ] - } - }, - "hr": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-en-GB", "bing", "ddg", "eudict", "wikipedia-hr" -+ "ddg", "google-b-d", "amazon-en-GB", "bing", "eudict", "wikipedia-hr" - ] - } - }, - "hsb": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb" -+ "ddg", "google-b-d", "bing", "amazon-de", "ebay-de", "leo_ende_de", "wikipedia-hsb" - ] - } - }, - "hu": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "vatera", "wikipedia-hu" -+ "ddg", "google-b-d", "vatera", "wikipedia-hu" - ] - } - }, - "hye": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "wikipedia" -+ "ddg", "google-b-d", "wikipedia" - ] - } - }, - "hy-AM": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazondotcom", "ddg", "list-am", "wikipedia-hy" -+ "ddg", "google-b-d", "amazondotcom", "list-am", "wikipedia-hy" - ] - } - }, - "ia": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ia" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-ia" - ] - } - }, - "id": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "wikipedia-id" -+ "ddg", "google-b-d", "wikipedia-id" - ] - } - }, - "is": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-is" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-is" - ] - } - }, - "it": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "wikipedia-it" -+ "ddg", "google-b-d", "bing", "amazon-it", "ebay-it", "wikipedia-it" - ] - } - }, -@@ -557,7 +557,7 @@ - "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" -+ "ddg", "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "wikipedia-ja" - ] - } - }, -@@ -565,152 +565,152 @@ - "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" -+ "ddg", "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "wikipedia-ja" - ] - } - }, - "ka": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ka" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-ka" - ] - } - }, - "kab": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "wikipedia-kab" -+ "ddg", "google-b-d", "bing", "wikipedia-kab" - ] - } - }, - "kk": { - "default": { - "visibleDefaultEngines": [ -- "yandex-kk", "google-b-d", "ddg", "flip", "wikipedia-kk" -+ "ddg", "yandex-kk", "google-b-d", "flip", "wikipedia-kk" - ] - }, - "KZ": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - }, - "BY": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - }, - "RU": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - }, - "TR": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - } - }, - "km": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-km" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-km" - ] - } - }, - "kn": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-in", "ddg", "kannadastore", "wikipedia-kn" -+ "ddg", "google-b-d", "bing", "amazon-in", "kannadastore", "wikipedia-kn" - ] - } - }, - "ko": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "naver-kr", "daum-kr", "wikipedia-kr" -+ "ddg", "google-b-d", "naver-kr", "daum-kr", "wikipedia-kr" - ] - } - }, - "lij": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "wikipedia-lij" -+ "ddg", "google-b-d", "bing", "amazon-it", "ebay-it", "wikipedia-lij" - ] - } - }, - "lo": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "wikipedia-lo" -+ "ddg", "google-b-d", "bing", "wikipedia-lo" - ] - } - }, - "lt": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "wikipedia-lt", "bing", "amazondotcom", "ddg" -+ "ddg", "google-b-d", "wikipedia-lt", "bing", "amazondotcom" - ] - } - }, - "ltg": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "salidzinilv", "sslv", "wikipedia-ltg" -+ "ddg", "google-b-d", "salidzinilv", "sslv", "wikipedia-ltg" - ] - } - }, - "lv": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "salidzinilv", "sslv", "wikipedia-lv" -+ "ddg", "google-b-d", "salidzinilv", "sslv", "wikipedia-lv" - ] - } - }, - "meh": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "wikipedia" -+ "ddg", "google-b-d", "wikipedia" - ] - } - }, - "mk": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-mk" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-mk" - ] - } - }, - "mr": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-in", "ddg", "wikipedia-mr" -+ "ddg", "google-b-d", "amazon-in", "wikipedia-mr" - ] - } - }, - "ms": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ms" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-ms" - ] - } - }, - "my": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-my" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-my" - ] - } - }, - "nb-NO": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO" -+ "ddg", "google-b-d", "amazon-en-GB", "bing", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO" - ] - } - }, - "ne-NP": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "wikipedia-ne" -+ "ddg", "google-b-d", "bing", "wikipedia-ne" - ] - } - }, - "nl": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl" -+ "ddg", "google-b-d", "bing", "bolcom-nl", "ebay-nl", "marktplaats-nl", "wikipedia-nl" - ] - }, - "experimental-hidden": { -@@ -722,244 +722,244 @@ - "nn-NO": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-en-GB", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN" -+ "ddg", "google-b-d", "bing", "amazon-en-GB", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN" - ] - } - }, - "oc": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "wikipedia-oc", "wiktionary-oc" -+ "ddg", "google-b-d", "bing", "wikipedia-oc", "wiktionary-oc" - ] - } - }, - "pa-IN": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-pa" -+ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-pa" - ] - } - }, - "pl": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "allegro-pl", "ddg", "pwn-pl", "wikipedia-pl", "wolnelektury-pl" -+ "ddg", "google-b-d", "allegro-pl", "pwn-pl", "wikipedia-pl", "wolnelektury-pl" - ] - } - }, - "pt-BR": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "mercadolivre", "wikipedia-pt" -+ "ddg", "google-b-d", "bing", "mercadolivre", "wikipedia-pt" - ] - } - }, - "pt-PT": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-en-GB", "ddg", "priberam", "wikipedia-pt" -+ "ddg", "google-b-d", "amazon-en-GB", "priberam", "wikipedia-pt" - ] - } - }, - "rm": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "ebay-ch", "leo_ende_de", "wikipedia-rm" -+ "ddg", "google-b-d", "bing", "ebay-ch", "leo_ende_de", "wikipedia-rm" - ] - } - }, - "ro": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ro" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-ro" - ] - } - }, - "ru": { - "default": { - "visibleDefaultEngines": [ -- "yandex-ru", "google-b-d", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru" -+ "ddg", "yandex-ru", "google-b-d", "ozonru", "priceru", "wikipedia-ru", "mailru" - ] - }, - "RU": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - }, - "BY": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - }, - "KZ": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - }, - "TR": { -- "searchDefault": "Яндекс" -+ "searchDefault": "DuckDuckGo" - } - }, - "scn": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "wikipedia" -+ "ddg", "google-b-d", "wikipedia" - ] - } - }, - "si": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazondotcom", "ddg", "wikipedia-si" -+ "ddg", "google-b-d", "amazondotcom", "wikipedia-si" - ] - } - }, - "sk": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "azet-sk", "atlas-sk", "ddg", "wikipedia-sk", "zoznam-sk" -+ "ddg", "google-b-d", "azet-sk", "atlas-sk", "wikipedia-sk", "zoznam-sk" - ] - } - }, - "sl": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ceneji", "ddg", "najdi-si", "odpiralni", "wikipedia-sl" -+ "ddg", "google-b-d", "ceneji", "najdi-si", "odpiralni", "wikipedia-sl" - ] - } - }, - "son": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-france", "ddg", "wikipedia-fr" -+ "ddg", "google-b-d", "bing", "amazon-france", "wikipedia-fr" - ] - } - }, - "sq": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-sq" -+ "ddg", "google-b-d", "bing", "amazon-en-GB", "wikipedia-sq" - ] - } - }, - "sr": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-sr", "pogodak" -+ "ddg", "google-b-d", "amazon-en-GB", "bing", "wikipedia-sr", "pogodak" - ] - } - }, - "sv-SE": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE" -+ "ddg", "google-b-d", "bing", "allaannonser-sv-SE", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE" - ] - } - }, - "ta": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-in", "ddg", "wikipedia-ta" -+ "ddg", "google-b-d", "amazon-in", "wikipedia-ta" - ] - } - }, - "te": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazon-in", "ddg", "wikipedia-te", "wiktionary-te" -+ "ddg", "google-b-d", "amazon-in", "wikipedia-te", "wiktionary-te" - ] - } - }, - "th": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "amazondotcom", "bing", "ddg", "longdo", "wikipedia-th" -+ "ddg", "google-b-d", "amazondotcom", "bing", "longdo", "wikipedia-th" - ] - } - }, - "tl": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-tl" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-tl" - ] - } - }, - "tr": { - "default": { - "visibleDefaultEngines": [ -- "yandex-tr", "google-b-d", "ddg", "wikipedia-tr" -+ "ddg", "yandex-tr", "google-b-d", "wikipedia-tr" - ] - }, - "TR": { -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "BY": { -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "KZ": { -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - }, - "RU": { -- "searchDefault": "Yandex" -+ "searchDefault": "DuckDuckGo" - } - }, - "trs": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-es" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-es" - ] - } - }, - "uk": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "wikipedia-uk", "hotline-ua" -+ "ddg", "google-b-d", "bing", "wikipedia-uk", "hotline-ua" - ] - } - }, - "ur": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-in", "ddg", "wikipedia-ur" -+ "ddg", "google-b-d", "bing", "amazon-in", "wikipedia-ur" - ] - } - }, - "uz": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-uz" -+ "ddg", "google-b-d", "bing", "amazondotcom", "wikipedia-uz" - ] - } - }, - "vi": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "coccoc", "ddg", "wikipedia-vi" -+ "ddg", "google-b-d", "coccoc", "wikipedia-vi" - ] - } - }, - "wo": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "wikipedia-wo" -+ "ddg", "google-b-d", "bing", "amazon-france", "ebay-fr", "wikipedia-wo" - ] - } - }, - "xh": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "bing", "ddg", "wikipedia" -+ "ddg", "google-b-d", "bing", "wikipedia" - ] - } - }, - "zh-CN": { - "default": { - "visibleDefaultEngines": [ -- "baidu", "google-b-d", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn" -+ "ddg", "baidu", "google-b-d", "bing", "wikipedia-zh-CN", "amazondotcn" - ] - }, - "CN": { -- "searchDefault": "百度" -+ "searchDefault": "DuckDuckGo" - } - }, - "zh-TW": { - "default": { - "visibleDefaultEngines": [ -- "google-b-d", "ddg", "readmoo", "wikipedia-zh-TW" -+ "ddg", "google-b-d", "readmoo", "wikipedia-zh-TW" - ] - } - } diff --git a/data/patches/disable-settings-services.patch b/data/patches/disable-settings-services.patch index d869bff..a79d0e4 100644 --- a/data/patches/disable-settings-services.patch +++ b/data/patches/disable-settings-services.patch @@ -1,13 +1,16 @@ ---- a/services/settings/Utils.jsm -+++ b/services/settings/Utils.jsm -@@ -59,9 +59,7 @@ - Ci.nsIEnvironment +--- a/services/settings/Utils.jsm.orig 2021-08-17 16:32:27.475448626 -0400 ++++ b/services/settings/Utils.jsm 2021-08-17 16:32:40.859457980 -0400 +@@ -60,12 +60,7 @@ ); const isXpcshell = env.exists("XPCSHELL_TEST_PROFILE_DIR"); -- return AppConstants.RELEASE_OR_BETA && !Cu.isInAutomation && !isXpcshell + const isNotThunderbird = AppConstants.MOZ_APP_NAME != "thunderbird"; +- return AppConstants.RELEASE_OR_BETA && +- !Cu.isInAutomation && +- !isXpcshell && +- isNotThunderbird - ? "https://firefox.settings.services.mozilla.com/v1" - : gServerURL; + return gServerURL; }, - CHANGES_PATH: "/buckets/monitor/collections/changes/records", + CHANGES_PATH: "/buckets/monitor/collections/changes/changeset", diff --git a/data/patches/duckduckgo-no-params.patch b/data/patches/duckduckgo-no-params.patch deleted file mode 100644 index fe28e59..0000000 --- a/data/patches/duckduckgo-no-params.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/browser/components/search/extensions/ddg/manifest.json -+++ b/browser/components/search/extensions/ddg/manifest.json -@@ -18,43 +18,11 @@ - "chrome_settings_overrides": { - "search_provider": { - "name": "DuckDuckGo", -- "search_url": "https://duckduckgo.com/", -- "search_form": "https://duckduckgo.com/?q={searchTerms}", -- "search_url_get_params": "q={searchTerms}", -- "params": [ -- { -- "name": "t", -- "condition": "purpose", -- "purpose": "contextmenu", -- "value": "ffcm" -- }, -- { -- "name": "t", -- "condition": "purpose", -- "purpose": "keyword", -- "value": "ffab" -- }, -- { -- "name": "t", -- "condition": "purpose", -- "purpose": "searchbar", -- "value": "ffsb" -- }, -- { -- "name": "t", -- "condition": "purpose", -- "purpose": "homepage", -- "value": "ffhp" -- }, -- { -- "name": "t", -- "condition": "purpose", -- "purpose": "newtab", -- "value": "ffnt" -- } -- ], -+ "search_url": "https://duckduckgo.com", -+ "search_form": "https://duckduckgo.com", -+ "search_url_post_params": "q={searchTerms}", - "suggest_url": "https://ac.duckduckgo.com/ac/", - "suggest_url_get_params": "q={searchTerms}&type=list" - } - } --} -\ No newline at end of file -+} diff --git a/data/patches/hide-protections-dashboard.patch b/data/patches/hide-protections-dashboard.patch index 9fd6d4c..d1eb999 100644 --- a/data/patches/hide-protections-dashboard.patch +++ b/data/patches/hide-protections-dashboard.patch @@ -1,26 +1,26 @@ ---- a/browser/components/customizableui/content/panelUI.inc.xhtml -+++ b/browser/components/customizableui/content/panelUI.inc.xhtml -@@ -242,7 +242,7 @@ - oncommand="gSync.toggleAccountPanel('PanelUI-fxa', this, event)"/> - - -- -+ -- -+ + +- ++ +- ++