diff options
Diffstat (limited to 'data/patches')
| -rw-r--r-- | data/patches/default-search-duckduckgo.patch | 1092 | ||||
| -rw-r--r-- | data/patches/disable-settings-services.patch | 15 | ||||
| -rw-r--r-- | data/patches/duckduckgo-no-params.patch | 51 | ||||
| -rw-r--r-- | data/patches/hide-protections-dashboard.patch | 48 | ||||
| -rw-r--r-- | data/patches/icecat-about-dialog.patch | 12 | ||||
| -rw-r--r-- | data/patches/icecat-preferences.patch | 49 | ||||
| -rw-r--r-- | data/patches/moz-configure-changes.patch | 26 |
7 files changed, 86 insertions, 1207 deletions
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)"/> - </toolbaritem> - <toolbarseparator class="sync-ui-item"/> -- <toolbaritem> -+ <toolbaritem hidden="true"> - <toolbarbutton id="appMenu-protection-report-button" - class="subviewbutton subviewbutton-iconic" - oncommand="gProtectionsHandler.openProtections(); gProtectionsHandler.recordClick('open_full_report', null, 'app_menu');"> -@@ -253,7 +253,7 @@ - </label> - </toolbarbutton> - </toolbaritem> -- <toolbarseparator id="appMenu-tp-separator"/> -+ <toolbarseparator id="appMenu-tp-separator" hidden="true"/> - <toolbarbutton id="appMenu-new-window-button" - class="subviewbutton subviewbutton-iconic" - label="&newNavigatorCmd.label;" ---- a/browser/base/content/browser-siteProtections.js -+++ b/browser/base/content/browser-siteProtections.js -@@ -1634,7 +1634,7 @@ +--- a/browser/base/content/appmenu-viewcache.inc.xhtml.orig 2021-08-17 16:54:44.323100518 -0400 ++++ b/browser/base/content/appmenu-viewcache.inc.xhtml 2021-08-17 16:55:42.131053772 -0400 +@@ -24,7 +24,7 @@ + oncommand="gSync.toggleAccountPanel(this, event)"/> + </toolbaritem> + <toolbarseparator class="sync-ui-item"/> +- <toolbaritem> ++ <toolbaritem hidden="true"> + <toolbarbutton id="appMenu-protection-report-button" + class="subviewbutton subviewbutton-iconic" + oncommand="gProtectionsHandler.openProtections(); gProtectionsHandler.recordClick('open_full_report', null, 'app_menu');"> +@@ -35,7 +35,7 @@ + </label> + </toolbarbutton> + </toolbaritem> +- <toolbarseparator id="appMenu-tp-separator"/> ++ <toolbarseparator id="appMenu-tp-separator" hidden="true"/> + <toolbarbutton id="appMenu-new-window-button" + class="subviewbutton subviewbutton-iconic" + data-l10n-id="appmenuitem-new-window" +--- a/browser/base/content/browser-siteProtections.js.orig 2021-08-17 16:52:32.107227395 -0400 ++++ b/browser/base/content/browser-siteProtections.js 2021-08-17 16:52:39.303219686 -0400 +@@ -1558,7 +1558,7 @@ this._trackingProtectionIconContainer.hidden = true; return; } @@ -28,4 +28,4 @@ + this._trackingProtectionIconContainer.hidden = true; // Check whether the user has added an exception for this site. - let hasException = ContentBlockingAllowList.includes( + this.hasException = ContentBlockingAllowList.includes( diff --git a/data/patches/icecat-about-dialog.patch b/data/patches/icecat-about-dialog.patch index 476fb18..0551cf7 100644 --- a/data/patches/icecat-about-dialog.patch +++ b/data/patches/icecat-about-dialog.patch @@ -1,10 +1,10 @@ ---- a/browser/base/content/aboutDialog.xhtml -+++ b/browser/base/content/aboutDialog.xhtml -@@ -147,7 +147,6 @@ +--- a/browser/base/content/aboutDialog.xhtml.orig 2021-08-17 16:59:51.674898001 -0400 ++++ b/browser/base/content/aboutDialog.xhtml 2021-08-17 17:00:18.346884904 -0400 +@@ -161,7 +161,6 @@ <hbox pack="center"> - <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"></label> - <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:rights" data-l10n-id="bottomLinks-rights"></label> -- <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/" data-l10n-id="bottomLinks-privacy"></label> + <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"/> + <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:rights" data-l10n-id="bottomLinks-rights"/> +- <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog" data-l10n-id="bottomLinks-privacy"/> </hbox> <description id="trademark" data-l10n-id="trademarkInfo"></description> </vbox> diff --git a/data/patches/icecat-preferences.patch b/data/patches/icecat-preferences.patch index 57d3c5a..46bfa8b 100644 --- a/data/patches/icecat-preferences.patch +++ b/data/patches/icecat-preferences.patch @@ -1,6 +1,6 @@ ---- a/browser/components/preferences/privacy.inc.xhtml.orig 2020-09-06 22:53:37.160379447 -0400 -+++ b/browser/components/preferences/privacy.inc.xhtml 2020-09-06 22:45:17.436948014 -0400 -@@ -602,6 +602,70 @@ +--- a/browser/components/preferences/privacy.inc.xhtml.orig 2021-08-17 15:38:19.838881866 -0400 ++++ b/browser/components/preferences/privacy.inc.xhtml 2021-08-17 15:39:01.382760058 -0400 +@@ -632,6 +632,76 @@ data-l10n-id="addressbar-suggestions-settings"/> </groupbox> @@ -46,12 +46,19 @@ + </vbox> + <vbox> + <checkbox id="detectCaptivePortal" data-l10n-id="detect-captive-portal-option" -+ preference="captivedetect.canonicalURL"/> ++ preference="network.captive-portal-service.enabled"/> + <vbox class="indent"> + <label data-l10n-id="detect-captive-portal-description"/> + </vbox> + </vbox> + <vbox> ++ <checkbox id="detectNetworkConnectivity" data-l10n-id="detect-network-connectivity-option" ++ preference="network.connectivity-service.enabled"/> ++ <vbox class="indent"> ++ <label data-l10n-id="detect-network-connectivity-description"/> ++ </vbox> ++ </vbox> ++ <vbox> + <checkbox id="geolocation" data-l10n-id="geolocation-option" + preference="browser.search.geoip.url"/> + <vbox class="indent"> @@ -67,15 +74,14 @@ + </vbox> +</groupbox> + -+ <hbox id="permissionsCategory" class="subcategory" hidden="true" ---- a/browser/components/preferences/privacy.js.orig 2020-09-06 22:53:44.008371642 -0400 -+++ b/browser/components/preferences/privacy.js 2020-09-06 23:09:21.419302924 -0400 -@@ -127,6 +127,15 @@ - { id: "browser.urlbar.suggest.openpage", type: "bool" }, +--- a/browser/components/preferences/privacy.js.orig 2021-08-17 15:39:19.662709308 -0400 ++++ b/browser/components/preferences/privacy.js 2021-08-17 16:10:17.129079115 -0400 +@@ -138,6 +138,16 @@ { id: "browser.urlbar.suggest.topsites", type: "bool" }, + { id: "browser.urlbar.suggest.engines", type: "bool" }, + // IceCat-specific + { id: "javascript.enabled", type: "bool" }, @@ -83,13 +89,14 @@ + { id: "extensions.update.enabled", type: "bool" }, + { id: "network.http.referer.spoofSource", type: "bool" }, + { id: "webgl.disabled", type: "bool" }, -+ { id: "captivedetect.canonicalURL", type: "string" }, ++ { id: "network.captive-portal-service.enabled", type: "bool" }, ++ { id: "network.connectivity-service.enabled", type: "bool" }, + { id: "browser.search.geoip.url", type: "string" }, + // History { id: "places.history.enabled", type: "bool" }, { id: "browser.formfill.enable", type: "bool" }, -@@ -615,6 +624,21 @@ +@@ -706,6 +716,24 @@ setSyncFromPrefListener("enableOCSP", () => this.readEnableOCSP()); setSyncToPrefListener("enableOCSP", () => this.writeEnableOCSP()); @@ -102,6 +109,9 @@ + setSyncFromPrefListener("detectCaptivePortal", () => this.readDetectCaptive()); + setSyncToPrefListener("detectCaptivePortal", () => this.writeDetectCaptive()); + ++ setSyncFromPrefListener("detectNetworkConnectivity", () => this.readDetectConnectivity()); ++ setSyncToPrefListener("detectNetworkConnectivity", () => this.writeDetectConnectivity()); ++ + setSyncFromPrefListener("geolocation", () => this.readGeolocation()); + setSyncToPrefListener("geolocation", () => this.writeGeolocation()); + @@ -111,7 +121,7 @@ if (AlertsServiceDND) { let notificationsDoNotDisturbBox = document.getElementById( "notificationsDoNotDisturbBox" -@@ -704,6 +728,53 @@ +@@ -825,6 +850,62 @@ SiteDataManager.updateSites(); }, @@ -136,12 +146,21 @@ + }, + + readDetectCaptive() { -+ let pref = Preferences.get("captivedetect.canonicalURL"); -+ return pref.value !== ""; ++ let pref = Preferences.get("network.captive-portal-service.enabled"); ++ return pref.value; + }, + writeDetectCaptive() { + let checkbox = document.getElementById("detectCaptivePortal"); -+ return checkbox.checked ? "http://detectportal.firefox.com/success.txt" : ""; ++ return checkbox.checked; ++ }, ++ ++ readDetectConnectivity() { ++ let pref = Preferences.get("network.connectivity-service.enabled"); ++ return pref.value; ++ }, ++ writeDetectConnectivity() { ++ let checkbox = document.getElementById("detectNetworkConnectivity"); ++ return checkbox.checked; + }, + + readGeolocation() { diff --git a/data/patches/moz-configure-changes.patch b/data/patches/moz-configure-changes.patch index 43a940a..85d5657 100644 --- a/data/patches/moz-configure-changes.patch +++ b/data/patches/moz-configure-changes.patch @@ -1,18 +1,18 @@ ---- a/browser/moz.configure -+++ b/browser/moz.configure +--- a/browser/moz.configure.orig 2021-08-17 17:06:02.522757210 -0400 ++++ b/browser/moz.configure 2021-08-17 17:06:48.846744492 -0400 @@ -5,11 +5,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. - imply_option('MOZ_PLACES', True) --imply_option('MOZ_SERVICES_HEALTHREPORT', True) -+imply_option('MOZ_SERVICES_HEALTHREPORT', False) - imply_option('MOZ_SERVICES_SYNC', True) --imply_option('MOZ_DEDICATED_PROFILES', True) --imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) --imply_option('MOZ_NORMANDY', True) -+imply_option('MOZ_DEDICATED_PROFILES', False) -+imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', False) -+imply_option('MOZ_NORMANDY', False) + imply_option("MOZ_PLACES", True) +-imply_option("MOZ_SERVICES_HEALTHREPORT", True) ++imply_option("MOZ_SERVICES_HEALTHREPORT", False) + imply_option("MOZ_SERVICES_SYNC", True) +-imply_option("MOZ_DEDICATED_PROFILES", True) +-imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", True) +-imply_option("MOZ_NORMANDY", True) ++imply_option("MOZ_DEDICATED_PROFILES", False) ++imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", False) ++imply_option("MOZ_NORMANDY", False) with only_when(target_is_linux & compile_environment): - option(env='MOZ_NO_PIE_COMPAT', + option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper") |