diff --git a/patches/megabar.patch b/patches/megabar.patch index c660e67..ce666c1 100644 --- a/patches/megabar.patch +++ b/patches/megabar.patch @@ -36,50 +36,16 @@ index e80aaf6..6ec0961 100644 %define urlbarSearchButtonWidth calc(16px + 2 * var(--urlbar-icon-padding)) :root { -@@ -279,40 +279,40 @@ - } +@@ -246,14 +246,14 @@ - #urlbar[breakout][breakout-extend] { -- top: -@urlbarBreakoutExtend@; -- left: calc(-@urlbarMarginInline@ - @urlbarBreakoutExtend@); -- width: calc(100% + 2 * @urlbarMarginInline@ + 2 * @urlbarBreakoutExtend@); -+ top: 0; -+ left: 0; -+ width: 100%; - } - - @media (-moz-proton) { #urlbar[breakout][breakout-extend] { top: 0; - left: -@urlbarMarginInline@; - width: calc(100% + 2 * @urlbarMarginInline@); + left: 0; -+ width: 100%; - } - } /*** END proton ***/ - - @media not (-moz-proton) { - #urlbar[breakout][breakout-extend] > #urlbar-background { -- box-shadow: 0 3px 8px 0 rgba(0,0,0,.15) -+ box-shadow: 0 1px 4px rgba(0,0,0,.05); ++ width: 100; } - #urlbar[breakout][breakout-extend][open] > #urlbar-background { -- box-shadow: 0 5px 18px rgba(0,0,0,.2); -+ box-shadow: 0 1px 4px rgba(0,0,0,.05); - } - } /*** END !proton ***/ - - #urlbar[breakout][breakout-extend] > #urlbar-input-container { -- height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@); -- padding-block: calc(@urlbarBreakoutExtend@ + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2); -- padding-inline: calc(@urlbarMarginInline@ + @urlbarBreakoutExtend@); -+ height: var(--urlbar-toolbar-height); -+ padding-block: 0; -+ padding-inline: 0; - } - - @media (-moz-proton) { #urlbar[breakout][breakout-extend] > #urlbar-input-container { height: var(--urlbar-toolbar-height); - padding-block: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 + var(--urlbar-container-padding)); @@ -87,9 +53,9 @@ index e80aaf6..6ec0961 100644 + padding-block: 0; + padding-inline: 0; } - } /*** END proton ***/ -@@ -331,7 +331,7 @@ + #urlbar.searchButton[breakout][breakout-extend] > #urlbar-input-container > #urlbar-search-button { +@@ -271,7 +271,7 @@ } #urlbar[breakout][breakout-extend] > #urlbar-background { @@ -102,7 +68,7 @@ diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/ur index d2bb269..0d47466 100644 --- a/browser/themes/shared/urlbarView.inc.css +++ b/browser/themes/shared/urlbarView.inc.css -@@ -73,16 +73,16 @@ +@@ -56,8 +56,8 @@ display: block; text-shadow: none; overflow: clip; @@ -113,43 +79,29 @@ index d2bb269..0d47466 100644 /* Match urlbar-background's border. */ border-inline: 1px solid transparent; } - - @media not (-moz-proton) { - .urlbarView { -- margin-inline: calc(4px + var(--identity-box-margin-inline)); -- width: calc(100% - 2 * (4px + var(--identity-box-margin-inline))); -+ margin-inline: 0; -+ width: 100%; - } - /* If the view is open, offset the toolbar overlap so the view's top border - aligns with the toolbar. */ -@@ -112,7 +112,7 @@ +@@ -83,11 +83,11 @@ .urlbarView-row { fill: currentColor; fill-opacity: var(--urlbar-icon-fill-opacity); -- padding-block: 3px; -+ padding-block: 0; +- padding-block: 2px; ++ padding-block: 0px; } - - @media not (-moz-proton) { -@@ -127,7 +127,7 @@ - } - + :root:not([uidensity=compact]) .urlbarView-row:not([type=tip], [type=dynamic]) { - min-height: 32px; -+ min-height: 0; ++ min-height: 0px; } - } /*** END proton ***/ -@@ -295,6 +295,7 @@ + :root[uidensity=touch] .urlbarView-row:not([type=tip], [type=dynamic]) { +@@ -241,6 +241,7 @@ object-fit: contain; flex-shrink: 0; -moz-context-properties: fill, fill-opacity; + margin-inline-start: 20px; } - @media not (-moz-proton) { -@@ -328,10 +329,10 @@ + +@@ -268,10 +269,10 @@ .urlbarView-type-icon { position: absolute; @@ -159,8 +111,9 @@ index d2bb269..0d47466 100644 - margin-inline-start: 8px; + width: 16px; + height: 16px; -+ margin-bottom: 0; -+ margin-inline-start: 0; ++ margin-bottom: 0px; ++ margin-inline-start: 0px; align-self: end; background-repeat: no-repeat; background-size: contain; + diff --git a/patches/remove_addons.patch b/patches/remove_addons.patch index 40fef37..9cbf3fe 100644 --- a/patches/remove_addons.patch +++ b/patches/remove_addons.patch @@ -2,7 +2,7 @@ diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build index 269dcb2..ed7c31d 100644 --- a/browser/extensions/moz.build +++ b/browser/extensions/moz.build -@@ -5,10 +5,7 @@ +@@ -5,11 +5,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIRS += [ @@ -13,6 +13,7 @@ index 269dcb2..ed7c31d 100644 - "report-site-issue", "pictureinpicture", ] + diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index 496379c..dd6f359 100644 --- a/browser/locales/Makefile.in @@ -37,10 +38,10 @@ diff --git a/browser/locales/filter.py b/browser/locales/filter.py index bb2e992..7d7768e 100644 --- a/browser/locales/filter.py +++ b/browser/locales/filter.py -@@ -20,7 +20,6 @@ def test(mod, path, entity=None): +@@ -19,7 +19,6 @@ + "devtools/startup", "browser", "browser/extensions/formautofill", - "browser/extensions/fxmonitor", - "browser/extensions/report-site-issue", "extensions/spellcheck", "other-licenses/branding/firefox", @@ -49,10 +50,10 @@ diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini index f4cb7ca..4efac13 100644 --- a/browser/locales/l10n.ini +++ b/browser/locales/l10n.ini -@@ -14,7 +14,6 @@ dirs = browser +@@ -13,7 +13,6 @@ + devtools/client devtools/startup browser/extensions/formautofill - browser/extensions/fxmonitor - browser/extensions/report-site-issue [includes] @@ -61,14 +62,13 @@ diff --git a/browser/locales/l10n.toml b/browser/locales/l10n.toml index b9b18fe..af7c583 100644 --- a/browser/locales/l10n.toml +++ b/browser/locales/l10n.toml -@@ -133,10 +133,6 @@ locales = [ - reference = "browser/extensions/fxmonitor/locales/en-US/**" - l10n = "{l}browser/extensions/fxmonitor/**" +@@ -132,10 +132,6 @@ + l10n = "{l}browser/extensions/formautofill/**" --[[paths]] + [[paths]] - reference = "browser/extensions/report-site-issue/locales/en-US/**" - l10n = "{l}browser/extensions/report-site-issue/**" - - [[paths]] +-[[paths]] reference = "services/sync/locales/en-US/**" l10n = "{l}services/sync/**" diff --git a/patches/search-config.patch b/patches/search-config.patch index 147f733..df8feff 100644 --- a/patches/search-config.patch +++ b/patches/search-config.patch @@ -1,19 +1,25 @@ --- a/services/settings/dumps/main/search-config.json +++ b/services/settings/dumps/main/search-config.json -@@ -1,77 +1,155 @@ +@@ -1,246 +1,155 @@ { "data": [ { -- "schema": 1623235246279, +- "params": { +- "searchUrlGetParams": [ +- { +- "name": "pc", +- "value": "MOZI" +- }, +- { +- "name": "q", +- "value": "{searchTerms}" + "schema": 1619432100208, - "appliesTo": [ - { - "included": { -- "regions": [ -- "cn" -- ] ++ "appliesTo": [ ++ { ++ "included": { + "everywhere": true } +- ] + } + ], + "extraParams": [ @@ -22,20 +28,8 @@ + "value": "ffcm", + "purpose": "contextmenu", + "condition": "purpose" - }, - { -- "override": true, -- "orderHint": 1500, -- "application": { -- "distributions": [ -- "MozillaOnline" -- ] -- }, -- "webExtension": { -- "locales": [ -- "mozillaonline" -- ] -- } ++ }, ++ { + "name": "t", + "value": "ffab", + "purpose": "keyword", @@ -58,21 +52,17 @@ + "value": "ffnt", + "purpose": "newtab", + "condition": "purpose" - } - ], -- "telemetryId": "amazondotcn", ++ } ++ ], + "telemetryId": "ddg", - "webExtension": { -- "id": "amazondotcn@search.mozilla.org" ++ "webExtension": { + "id": "ddg@search.mozilla.org" }, -- "id": "ccb137f1-7733-464c-bb70-037be4ba2529", -- "last_modified": 1623330482152 +- "schema": 1627654944012, + "id": "c0b26c0e-63e6-4235-b2ce-5f16b6a8bf87", + "last_modified": 1619450717295 - }, - { -- "schema": 1623235243537, ++ }, ++ { + "schema": 1613245306902, "appliesTo": [ { @@ -84,254 +74,869 @@ + "included": { "locales": { "matches": [ -- "bn", -- "bn-IN", -+ "af", -+ "an", -+ "ar", -+ "ast", -+ "az", +- "ach", + "af", + "an", + "ar", + "ast", + "az", +- "ca", +- "ca-valencia", +- "cak", + "bg", + "br", + "bs", + "cy", -+ "da", -+ "de", -+ "dsb", -+ "el", -+ "eo", + "da", + "de", + "dsb", + "el", + "eo", +- "es-CL", +- "es-ES", +- "es-MX", + "et", -+ "eu", -+ "fa", -+ "fi", -+ "fy-NL", + "eu", + "fa", +- "ff", + "fi", +- "fr", + "fy-NL", + "ga-IE", + "gd", + "gl", -+ "gn", -+ "he", -+ "hr", -+ "hsb", -+ "hu", -+ "ia", -+ "id", -+ "is", -+ "it", -+ "ka", -+ "kab", -+ "kk", -+ "km", - "kn", + "gn", - "gu-IN", -+ "lij", -+ "lo", -+ "lt", +- "hi-IN", ++ "he", + "hr", + "hsb", ++ "hu", + "ia", ++ "id", + "is", + "it", +- "ja-JP-macos", +- "ja", + "ka", + "kab", ++ "kk", + "km", + "kn", + "lij", + "lo", + "lt", + "ltg", + "lv", -+ "mk", - "mr", + "mk", ++ "mr", + "ms", + "my", +- "nb-NO", +- "ne-NP", + "nl", +- "nn-NO", + "oc", - "pa-IN", -+ "ms", -+ "my", -+ "nl", -+ "oc", +- "pt-BR", + "pl", -+ "rm", -+ "ro", + "rm", + "ro", +- "sco", +- "son", + "ru", + "si", + "sk", + "sl", -+ "sq", -+ "sr", -+ "sv-SE", - "ta", - "te", -- "ur" -+ "th", -+ "tl", + "sq", + "sr", + "sv-SE", ++ "ta", ++ "te", + "th", + "tl", +- "trs", + "tr", -+ "uk", -+ "ur", -+ "uz", + "uk", + "ur", + "uz", + "vi", -+ "wo", + "wo", +- "xh", +- "zh-CN" +- ], +- "startsWith": [ +- "bn", +- "en" + "zh-CN", + "zh-TW" ] -- }, -- "regions": [ -- "in" + } +- } +- }, +- { +- "params": { +- "searchUrlGetParams": [ +- { +- "name": "pc", +- "value": "MZSL01" +- }, +- { +- "name": "q", +- "value": "{searchTerms}" +- } +- ] +- }, +- "default": "yes", +- "override": true, +- "application": { +- "distributions": [ +- "sweetlabs-b-oem1", +- "sweetlabs-b-r-oem1" +- ] +- } +- }, +- { +- "params": { +- "searchUrlGetParams": [ +- { +- "name": "pc", +- "value": "MZSL02" +- }, +- { +- "name": "q", +- "value": "{searchTerms}" +- } +- ] +- }, +- "default": "yes", +- "override": true, +- "application": { +- "distributions": [ +- "sweetlabs-b-oem2", +- "sweetlabs-b-r-oem2" +- ] +- } +- }, +- { +- "params": { +- "searchUrlGetParams": [ +- { +- "name": "pc", +- "value": "MZSL03" +- }, +- { +- "name": "q", +- "value": "{searchTerms}" +- } +- ] +- }, +- "default": "yes", +- "override": true, +- "application": { +- "distributions": [ +- "sweetlabs-b-oem3", +- "sweetlabs-b-r-oem3" +- ] +- } +- }, +- { +- "default": "yes", +- "included": { +- "everywhere": true +- }, +- "application": { +- "distributions": [ +- "acer-001", +- "acer-002", +- "acer-g-003" +- ] +- } +- }, +- { +- "params": { +- "searchUrlGetParams": [ +- { +- "name": "pc", +- "value": "MOZD" +- }, +- { +- "name": "q", +- "value": "{searchTerms}" +- } +- ] +- }, +- "override": true, +- "application": { +- "distributions": [ +- "acer-001", +- "acer-002" +- ] +- } +- }, +- { +- "params": { +- "searchUrlGetParams": [ +- { +- "name": "pc", +- "value": "MOZE" +- }, +- { +- "name": "q", +- "value": "{searchTerms}" +- } - ] -+ } }, -- "telemetryId": "amazon-in", - "webExtension": { - "locales": [ -- "in" +- "override": true, +- "application": { +- "distributions": [ +- "acer-g-003" ++ "webExtension": { ++ "locales": [ + "$USER_LOCALE" ] } }, { - "included": { -- "regions": [ -- "fr", -- "mc" +- "override": "true", +- "orderHint": 2500, +- "application": { +- "distributions": [ +- "MozillaOnline" - ] -+ "locales": { -+ "matches": [ +- } +- } +- ], +- "webExtension": { +- "id": "bing@search.mozilla.org" +- }, +- "id": "7ec766f6-639a-4618-91bc-33eb3d4378c6", +- "last_modified": 1627663746803 +- }, +- { +- "schema": 1627058212123, +- "appliesTo": [ +- { + "included": { + "locales": { + "matches": [ +- "en-US" + "be" -+ ] + ] +- }, +- "regions": [ +- "us" + } - }, -- "telemetryId": "amazon-france", - "webExtension": { - "locales": [ -- "france" ++ }, ++ "webExtension": { ++ "locales": [ + "be", + "be-tarask" ] } }, -@@ -79,60 +157,63 @@ +@@ -248,20 +157,15 @@ "included": { "locales": { "matches": [ -- "fr" +- "an", +- "ast", +- "ca", +- "ca-valencia", +- "es-ES", +- "eu", +- "gl" + "bn", + "bn-BD", + "bn-IN" ] + } + }, +- "telemetryId": "ebay-es", + "webExtension": { + "locales": [ +- "es" ++ "bn" + ] + } + }, +@@ -269,16 +173,14 @@ + "included": { + "locales": { + "matches": [ +- "br", +- "fr", +- "wo" ++ "ca", ++ "ca-valencia" + ] + } + }, +- "telemetryId": "ebay-fr", + "webExtension": { + "locales": [ +- "fr" ++ "ca" + ] + } + }, +@@ -286,20 +188,18 @@ + "included": { + "locales": { + "matches": [ +- "br", +- "en-US", +- "fr", +- "wo" ++ "cak", ++ "es-AR", ++ "es-CL", ++ "es-ES", ++ "es-MX", ++ "trs" + ] - }, - "regions": [ - "be" - ] + } }, -- "telemetryId": "amazon-france", +- "telemetryId": "ebay-be", "webExtension": { "locales": [ -- "france" -+ "bn" - ] - } - }, - { - "included": { -- "regions": [ -- "jp" -- ] -+ "locales": { -+ "matches": [ -+ "ca", -+ "ca-valencia" -+ ] -+ } - }, -- "telemetryId": "amazon-jp", - "webExtension": { - "locales": [ -- "jp" -+ "ca" - ] - } - }, - { - "included": { -- "regions": [ -- "it", -- "sm", -- "va" -- ] -+ "locales": { -+ "matches": [ -+ "cak", -+ "es-AR", -+ "es-CL", -+ "es-ES", -+ "es-MX", -+ "trs" -+ ] -+ } - }, -- "telemetryId": "amazon-it", - "webExtension": { - "locales": [ -- "it" +- "be" + "es" ] } }, - { +@@ -307,20 +207,13 @@ "included": { -- "regions": [ -- "at", -- "ch", -- "de" -- ] -+ "locales": { -+ "matches": [ + "locales": { + "matches": [ +- "br", +- "en-US", +- "fr", +- "wo" + "cs" -+ ] + ] +- }, +- "regions": [ +- "ca" +- ] + } }, -- "telemetryId": "amazon-de", +- "telemetryId": "ebay-ca", "webExtension": { "locales": [ -- "de" +- "ca" + "cz" ] } }, -@@ -140,32 +221,29 @@ +@@ -328,20 +221,15 @@ + "included": { + "locales": { + "matches": [ +- "br", +- "en-US", ++ "ff", + "fr", +- "wo" ++ "son" + ] +- }, +- "regions": [ +- "ch" +- ] ++ } + }, +- "telemetryId": "ebay-ch", + "webExtension": { + "locales": [ +- "ch" ++ "fr" + ] + } + }, +@@ -349,16 +237,13 @@ + "included": { + "locales": { + "matches": [ +- "cy", +- "en-GB", +- "gd" ++ "gu-IN" + ] + } + }, +- "telemetryId": "ebay-uk", + "webExtension": { + "locales": [ +- "uk" ++ "gu" + ] + } + }, +@@ -366,17 +251,13 @@ + "included": { + "locales": { + "matches": [ +- "sco" ++ "hi-IN" + ] +- }, +- "regions": [ +- "gb" +- ] ++ } + }, +- "telemetryId": "ebay-uk", + "webExtension": { + "locales": [ +- "uk" ++ "hi" + ] + } + }, +@@ -384,17 +265,13 @@ + "included": { + "locales": { + "matches": [ +- "en-US" ++ "hy-AM" + ] +- }, +- "regions": [ +- "gb" +- ] ++ } + }, +- "telemetryId": "ebay-uk", + "webExtension": { + "locales": [ +- "uk" ++ "hy" + ] + } + }, +@@ -402,20 +279,14 @@ + "included": { + "locales": { + "matches": [ +- "cy", +- "en-GB", +- "en-US", +- "gd" ++ "ja-JP-macos", ++ "ja" + ] +- }, +- "regions": [ +- "au" +- ] ++ } + }, +- "telemetryId": "ebay-au", + "webExtension": { + "locales": [ +- "au" ++ "ja" + ] + } + }, +@@ -423,20 +294,13 @@ + "included": { + "locales": { + "matches": [ +- "cy", +- "en-GB", +- "en-US", +- "gd" ++ "ko" + ] +- }, +- "regions": [ +- "ie" +- ] ++ } + }, +- "telemetryId": "ebay-ie", + "webExtension": { + "locales": [ +- "ie" ++ "kr" + ] + } + }, +@@ -444,16 +308,13 @@ "included": { "locales": { "matches": [ - "de", - "dsb", - "hsb" -+ "ff", -+ "fr", -+ "son" ++ "nb-NO" ] } }, -- "experiment": "amazon-de-adm", -- "telemetryId": "amazon-de-adm", +- "telemetryId": "ebay-de", "webExtension": { "locales": [ -- "de-adm" -+ "fr" +- "de" ++ "NO" ] + } + }, +@@ -461,19 +322,13 @@ + "included": { + "locales": { + "matches": [ +- "de", +- "dsb", +- "hsb" ++ "ne-NP" + ] +- }, +- "regions": [ +- "at" +- ] ++ } + }, +- "telemetryId": "ebay-at", + "webExtension": { + "locales": [ +- "at" ++ "ne" + ] + } + }, +@@ -481,19 +336,13 @@ + "included": { + "locales": { + "matches": [ +- "de", +- "dsb", +- "hsb" ++ "nn-NO" + ] +- }, +- "regions": [ +- "ch" +- ] ++ } + }, +- "telemetryId": "ebay-ch", + "webExtension": { + "locales": [ +- "ch" ++ "NN" + ] + } + }, +@@ -501,14 +350,13 @@ + "included": { + "locales": { + "matches": [ +- "en-CA" ++ "pa-IN" + ] + } + }, +- "telemetryId": "ebay-ca", + "webExtension": { + "locales": [ +- "ca" ++ "pa" + ] + } + }, +@@ -516,15 +364,14 @@ + "included": { + "locales": { + "matches": [ +- "fy-NL", +- "nl" ++ "pt-BR", ++ "pt-PT" + ] + } + }, +- "telemetryId": "ebay-nl", + "webExtension": { + "locales": [ +- "nl" ++ "pt" + ] + } + }, +@@ -532,3549 +379,31 @@ + "included": { + "locales": { + "matches": [ +- "en-US" ++ "szl" + ] +- }, +- "regions": [ +- "nl" +- ] ++ } + }, +- "telemetryId": "ebay-nl", + "webExtension": { + "locales": [ +- "nl" +- ] +- } +- }, +- { +- "included": { +- "locales": { +- "matches": [ +- "fy-NL", +- "nl" +- ] +- }, +- "regions": [ +- "be" +- ] - }, -- "sendAttributionRequest": true -+ } +- "telemetryId": "ebay-be", +- "webExtension": { +- "locales": [ +- "be" +- ] +- } +- }, +- { +- "included": { +- "locales": { +- "matches": [ +- "ga-IE" +- ] +- } +- }, +- "telemetryId": "ebay-ie", +- "webExtension": { +- "locales": [ +- "ie" +- ] +- } +- }, +- { +- "included": { +- "locales": { +- "matches": [ +- "it", +- "lij" +- ] +- } +- }, +- "telemetryId": "ebay-it", +- "webExtension": { +- "locales": [ +- "it" +- ] +- } +- }, +- { +- "included": { +- "locales": { +- "matches": [ +- "rm" +- ] +- } +- }, +- "telemetryId": "ebay-ch", +- "webExtension": { +- "locales": [ +- "ch" +- ] +- } +- } +- ], +- "webExtension": { +- "id": "ebay@search.mozilla.org" +- }, +- "id": "cbe309e0-f638-4996-9dfc-ea5c19ef16e9", +- "last_modified": 1627663746799 +- }, +- { +- "schema": 1623235246279, +- "appliesTo": [ +- { +- "included": { +- "regions": [ +- "cn" ++ "pl" + ] + } }, { - "included": { + "override": true, +- "orderHint": 1500, ++ "orderHint": 1000, + "application": { + "distributions": [ + "MozillaOnline" + ] +- }, +- "webExtension": { +- "locales": [ +- "mozillaonline" +- ] + } + } + ], +- "telemetryId": "amazondotcn", + "webExtension": { +- "id": "amazondotcn@search.mozilla.org" ++ "id": "wikipedia@search.mozilla.org" + }, +- "id": "ccb137f1-7733-464c-bb70-037be4ba2529", +- "last_modified": 1623330482152 +- }, +- { +- "schema": 1623235243537, +- "appliesTo": [ +- { +- "included": { +- "locales": { +- "matches": [ +- "bn", +- "bn-IN", +- "kn", +- "gu-IN", +- "mr", +- "pa-IN", +- "ta", +- "te", +- "ur" +- ] +- }, +- "regions": [ +- "in" +- ] +- }, +- "telemetryId": "amazon-in", +- "webExtension": { +- "locales": [ +- "in" +- ] +- } +- }, +- { +- "included": { +- "regions": [ +- "fr", +- "mc" +- ] +- }, +- "telemetryId": "amazon-france", +- "webExtension": { +- "locales": [ +- "france" +- ] +- } +- }, +- { +- "included": { +- "locales": { +- "matches": [ +- "fr" +- ] +- }, +- "regions": [ +- "be" +- ] +- }, +- "telemetryId": "amazon-france", +- "webExtension": { +- "locales": [ +- "france" +- ] +- } +- }, +- { +- "included": { +- "regions": [ +- "jp" +- ] +- }, +- "telemetryId": "amazon-jp", +- "webExtension": { +- "locales": [ +- "jp" +- ] +- } +- }, +- { +- "included": { +- "regions": [ +- "it", +- "sm", +- "va" +- ] +- }, +- "telemetryId": "amazon-it", +- "webExtension": { +- "locales": [ +- "it" +- ] +- } +- }, +- { +- "included": { +- "regions": [ +- "at", +- "ch", +- "de" +- ] +- }, +- "telemetryId": "amazon-de", +- "webExtension": { +- "locales": [ +- "de" +- ] +- } +- }, +- { +- "included": { +- "locales": { +- "matches": [ +- "de", +- "dsb", +- "hsb" +- ] +- } +- }, +- "experiment": "amazon-de-adm", +- "telemetryId": "amazon-de-adm", +- "webExtension": { +- "locales": [ +- "de-adm" +- ] +- }, +- "sendAttributionRequest": true +- }, +- { +- "included": { - "regions": [ - "gb", - "ie" - ] -+ "locales": { -+ "matches": [ -+ "gu-IN" -+ ] -+ } - }, +- }, - "telemetryId": "amazon-en-GB", - "webExtension": { - "locales": [ +- "webExtension": { +- "locales": [ - "en-GB" -+ "gu" - ] - } - }, -@@ -173,3921 +251,159 @@ - "included": { - "locales": { - "matches": [ +- ] +- } +- }, +- { +- "included": { +- "locales": { +- "matches": [ - "ach", - "af", - "ar", @@ -358,29 +963,25 @@ - "tl", - "trs", - "uz" -+ "hi-IN" - ] +- ] - }, - "regions": [ - "gb" - ] -+ } - }, +- }, - "experiment": "amazon-en-GB-adm", - "telemetryId": "amazon-en-GB-adm", - "webExtension": { - "locales": [ +- "webExtension": { +- "locales": [ - "en-GB-adm" -+ "hi" - ] +- ] - }, - "sendAttributionRequest": true -+ } - }, - { - "included": { - "locales": { - "matches": [ +- }, +- { +- "included": { +- "locales": { +- "matches": [ - "cy", - "da", - "el", @@ -395,92 +996,68 @@ - "pt-PT", - "sq", - "sr" -+ "hy-AM" - ] - } - }, +- ] +- } +- }, - "experiment": "amazon-en-GB-adm", - "telemetryId": "amazon-en-GB-adm", - "webExtension": { - "locales": [ +- "webExtension": { +- "locales": [ - "en-GB-adm" -+ "hy" - ] +- ] - }, - "sendAttributionRequest": true -+ } - }, - { - "included": { +- }, +- { +- "included": { - "regions": [ - "au" - ] -+ "locales": { -+ "matches": [ -+ "ja-JP-macos", -+ "ja" -+ ] -+ } - }, +- }, - "telemetryId": "amazon-au", - "webExtension": { - "locales": [ +- "webExtension": { +- "locales": [ - "au" -+ "ja" - ] - } - }, - { - "included": { +- ] +- } +- }, +- { +- "included": { - "regions": [ - "ca" - ] -+ "locales": { -+ "matches": [ -+ "ko" -+ ] -+ } - }, +- }, - "telemetryId": "amazon-ca", - "webExtension": { - "locales": [ +- "webExtension": { +- "locales": [ - "ca" -+ "kr" - ] - } - }, - { - "included": { +- ] +- } +- }, +- { +- "included": { - "regions": [ - "nl" - ] - }, - "application": { - "minVersion": "89.0a1" -+ "locales": { -+ "matches": [ -+ "nb-NO" -+ ] -+ } - }, +- }, - "telemetryId": "amazon-nl", - "webExtension": { - "locales": [ +- "webExtension": { +- "locales": [ - "nl" -+ "NO" - ] - } - }, - { +- ] +- } +- }, +- { - "excluded": { -+ "included": { - "locales": { - "matches": [ +- "locales": { +- "matches": [ - "fr" -+ "ne-NP" - ] - } - }, +- ] +- } +- }, - "included": { - "regions": [ - "be" @@ -490,15 +1067,14 @@ - "minVersion": "89.0a1" - }, - "telemetryId": "amazon-nl", - "webExtension": { - "locales": [ +- "webExtension": { +- "locales": [ - "nl" -+ "ne" - ] - } - }, - { - "included": { +- ] +- } +- }, +- { +- "included": { - "regions": [ - "es", - "pt" @@ -542,15 +1118,10 @@ - }, - "application": { - "minVersion": "89.0a1" -+ "locales": { -+ "matches": [ -+ "nn-NO" -+ ] -+ } - }, +- }, - "telemetryId": "amazondotcom-us", - "webExtension": { - "locales": [ +- "webExtension": { +- "locales": [ - "us" - ] - } @@ -559,14 +1130,13 @@ - "included": { - "regions": [ - "us" -+ "NN" - ] +- ] - }, - "application": { - "maxVersion": "89.0a1" - } - }, - { +- } +- }, +- { - "excluded": { - "regions": [ - "at", @@ -592,9 +1162,9 @@ - "va" - ] - }, - "included": { - "locales": { - "matches": [ +- "included": { +- "locales": { +- "matches": [ - "ach", - "af", - "ar", @@ -635,17 +1205,11 @@ - "tl", - "trs", - "uz" -+ "pa-IN" - ] - } -+ }, -+ "webExtension": { -+ "locales": [ -+ "pa" -+ ] - } - }, - { +- ] +- } +- } +- }, +- { - "excluded": { - "regions": [ - "au", @@ -656,9 +1220,9 @@ - "se" - ] - }, - "included": { - "locales": { - "matches": [ +- "included": { +- "locales": { +- "matches": [ - "ach", - "af", - "ar", @@ -685,18 +1249,15 @@ - "tl", - "trs", - "uz" -+ "pt-BR", -+ "pt-PT" - ] - } - }, +- ] +- } +- }, - "experiment": "amazondotcom-adm", - "telemetryId": "amazondotcom-adm", - "webExtension": { - "locales": [ +- "webExtension": { +- "locales": [ - "en-adm" -+ "pt" - ] +- ] - }, - "sendAttributionRequest": true - } @@ -788,7 +1349,7 @@ - { - "name": "wd", - "value": "{searchTerms}" - } +- } - ] - }, - "schema": 1619106893528, @@ -852,15 +1413,14 @@ - "condition": "purpose" - } - ] - }, - { - "included": { - "locales": { - "matches": [ +- }, +- { +- "included": { +- "locales": { +- "matches": [ - "zh-CN" -+ "szl" - ] - } +- ] +- } - } - }, - { @@ -873,27 +1433,21 @@ - }, - "regions": [ - "cn" -+ }, -+ "webExtension": { -+ "locales": [ -+ "pl" - ] - } - }, - { +- ] +- } +- }, +- { - "default": "no", - "override": true, -+ "orderHint": 1000, - "application": { - "distributions": [ +- "override": true, +- "application": { +- "distributions": [ - "acer-001", - "acer-002", - "acer-g-003" -+ "MozillaOnline" - ] - } - } - ], +- ] +- } +- } +- ], - "telemetryId": "baidu", - "webExtension": { - "id": "baidu@search.mozilla.org" @@ -955,10 +1509,9 @@ - } - } - ], - "webExtension": { +- "webExtension": { - "id": "allegro-pl@search.mozilla.org" -+ "id": "wikipedia@search.mozilla.org" - }, +- }, - "id": "d915b6bc-bbae-47a6-8323-1b2990ad0e57", - "last_modified": 1613587855067 - }, @@ -1320,377 +1873,6 @@ - "last_modified": 1613587855064 - }, - { -- "schema": 1609962110792, -- "appliesTo": [ -- { -- "included": { -- "locales": { -- "matches": [ -- "en-US" -- ] -- }, -- "regions": [ -- "us" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "an", -- "ast", -- "ca", -- "ca-valencia", -- "es-ES", -- "eu", -- "gl" -- ] -- } -- }, -- "telemetryId": "ebay-es", -- "webExtension": { -- "locales": [ -- "es" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "br", -- "fr", -- "wo" -- ] -- } -- }, -- "telemetryId": "ebay-fr", -- "webExtension": { -- "locales": [ -- "fr" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "br", -- "en-US", -- "fr", -- "wo" -- ] -- }, -- "regions": [ -- "be" -- ] -- }, -- "telemetryId": "ebay-be", -- "webExtension": { -- "locales": [ -- "be" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "br", -- "en-US", -- "fr", -- "wo" -- ] -- }, -- "regions": [ -- "ca" -- ] -- }, -- "telemetryId": "ebay-ca", -- "webExtension": { -- "locales": [ -- "ca" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "br", -- "en-US", -- "fr", -- "wo" -- ] -- }, -- "regions": [ -- "ch" -- ] -- }, -- "telemetryId": "ebay-ch", -- "webExtension": { -- "locales": [ -- "ch" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "cy", -- "en-GB", -- "gd" -- ] -- } -- }, -- "telemetryId": "ebay-uk", -- "webExtension": { -- "locales": [ -- "uk" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "en-US" -- ] -- }, -- "regions": [ -- "gb" -- ] -- }, -- "telemetryId": "ebay-uk", -- "webExtension": { -- "locales": [ -- "uk" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "cy", -- "en-GB", -- "en-US", -- "gd" -- ] -- }, -- "regions": [ -- "au" -- ] -- }, -- "telemetryId": "ebay-au", -- "webExtension": { -- "locales": [ -- "au" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "cy", -- "en-GB", -- "en-US", -- "gd" -- ] -- }, -- "regions": [ -- "ie" -- ] -- }, -- "telemetryId": "ebay-ie", -- "webExtension": { -- "locales": [ -- "ie" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "de", -- "dsb", -- "hsb" -- ] -- } -- }, -- "telemetryId": "ebay-de", -- "webExtension": { -- "locales": [ -- "de" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "de", -- "dsb", -- "hsb" -- ] -- }, -- "regions": [ -- "at" -- ] -- }, -- "telemetryId": "ebay-at", -- "webExtension": { -- "locales": [ -- "at" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "de", -- "dsb", -- "hsb" -- ] -- }, -- "regions": [ -- "ch" -- ] -- }, -- "telemetryId": "ebay-ch", -- "webExtension": { -- "locales": [ -- "ch" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "en-CA" -- ] -- } -- }, -- "telemetryId": "ebay-ca", -- "webExtension": { -- "locales": [ -- "ca" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "fy-NL", -- "nl" -- ] -- } -- }, -- "telemetryId": "ebay-nl", -- "webExtension": { -- "locales": [ -- "nl" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "en-US" -- ] -- }, -- "regions": [ -- "nl" -- ] -- }, -- "telemetryId": "ebay-nl", -- "webExtension": { -- "locales": [ -- "nl" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "fy-NL", -- "nl" -- ] -- }, -- "regions": [ -- "be" -- ] -- }, -- "telemetryId": "ebay-be", -- "webExtension": { -- "locales": [ -- "be" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "ga-IE" -- ] -- } -- }, -- "telemetryId": "ebay-ie", -- "webExtension": { -- "locales": [ -- "ie" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "it", -- "lij" -- ] -- } -- }, -- "telemetryId": "ebay-it", -- "webExtension": { -- "locales": [ -- "it" -- ] -- } -- }, -- { -- "included": { -- "locales": { -- "matches": [ -- "rm" -- ] -- } -- }, -- "telemetryId": "ebay-ch", -- "webExtension": { -- "locales": [ -- "ch" -- ] -- } -- } -- ], -- "webExtension": { -- "id": "ebay@search.mozilla.org" -- }, -- "id": "cbe309e0-f638-4996-9dfc-ea5c19ef16e9", -- "last_modified": 1610163579843 -- }, -- { - "params": { - "searchUrlGetParams": [ - { @@ -2074,266 +2256,6 @@ - "last_modified": 1597327602800 - }, - { -- "params": { -- "searchUrlGetParams": [ -- { -- "name": "pc", -- "value": "MOZI" -- }, -- { -- "name": "q", -- "value": "{searchTerms}" -- } -- ] -- }, -- "schema": 1592948527171, -- "appliesTo": [ -- { -- "included": { -- "locales": { -- "matches": [ -- "ach", -- "af", -- "an", -- "ar", -- "ast", -- "az", -- "ca", -- "ca-valencia", -- "cak", -- "da", -- "de", -- "dsb", -- "el", -- "eo", -- "es-CL", -- "es-ES", -- "es-MX", -- "eu", -- "fa", -- "ff", -- "fi", -- "fr", -- "fy-NL", -- "gn", -- "gu-IN", -- "hi-IN", -- "hr", -- "hsb", -- "ia", -- "is", -- "it", -- "ja-JP-macos", -- "ja", -- "ka", -- "kab", -- "km", -- "kn", -- "lij", -- "lo", -- "lt", -- "mk", -- "ms", -- "my", -- "nb-NO", -- "ne-NP", -- "nl", -- "nn-NO", -- "oc", -- "pa-IN", -- "pt-BR", -- "rm", -- "ro", -- "son", -- "sq", -- "sr", -- "sv-SE", -- "th", -- "tl", -- "trs", -- "uk", -- "ur", -- "uz", -- "wo", -- "xh", -- "zh-CN" -- ], -- "startsWith": [ -- "bn", -- "en" -- ] -- } -- } -- }, -- { -- "params": { -- "searchUrlGetParams": [ -- { -- "name": "pc", -- "value": "MZSL01" -- }, -- { -- "name": "q", -- "value": "{searchTerms}" -- } -- ] -- }, -- "default": "yes", -- "override": true, -- "application": { -- "distributions": [ -- "sweetlabs-b-oem1", -- "sweetlabs-b-r-oem1" -- ] -- } -- }, -- { -- "params": { -- "searchUrlGetParams": [ -- { -- "name": "pc", -- "value": "MZSL02" -- }, -- { -- "name": "q", -- "value": "{searchTerms}" -- } -- ] -- }, -- "default": "yes", -- "override": true, -- "application": { -- "distributions": [ -- "sweetlabs-b-oem2", -- "sweetlabs-b-r-oem2" -- ] -- } -- }, -- { -- "params": { -- "searchUrlGetParams": [ -- { -- "name": "pc", -- "value": "MZSL03" -- }, -- { -- "name": "q", -- "value": "{searchTerms}" -- } -- ] -- }, -- "default": "yes", -- "override": true, -- "application": { -- "distributions": [ -- "sweetlabs-b-oem3", -- "sweetlabs-b-r-oem3" -- ] -- } -- }, -- { -- "default": "yes", -- "included": { -- "everywhere": true -- }, -- "application": { -- "distributions": [ -- "acer-001", -- "acer-002", -- "acer-g-003" -- ] -- } -- }, -- { -- "params": { -- "searchUrlGetParams": [ -- { -- "name": "pc", -- "value": "MOZD" -- }, -- { -- "name": "q", -- "value": "{searchTerms}" -- } -- ] -- }, -- "override": true, -- "application": { -- "distributions": [ -- "acer-001", -- "acer-002" -- ] -- } -- }, -- { -- "params": { -- "searchUrlGetParams": [ -- { -- "name": "pc", -- "value": "MOZE" -- }, -- { -- "name": "q", -- "value": "{searchTerms}" -- } -- ] -- }, -- "override": true, -- "application": { -- "distributions": [ -- "acer-g-003" -- ] -- } -- }, -- { -- "override": "true", -- "orderHint": 2500, -- "application": { -- "distributions": [ -- "MozillaOnline" -- ] -- } -- } -- ], -- "extraParams": [ -- { -- "name": "form", -- "value": "MOZCON", -- "purpose": "contextmenu", -- "condition": "purpose" -- }, -- { -- "name": "form", -- "value": "MOZSBR", -- "purpose": "searchbar", -- "condition": "purpose" -- }, -- { -- "name": "form", -- "value": "MOZSPG", -- "purpose": "homepage", -- "condition": "purpose" -- }, -- { -- "name": "form", -- "value": "MOZLBR", -- "purpose": "keyword", -- "condition": "purpose" -- }, -- { -- "name": "form", -- "value": "MOZTSB", -- "purpose": "newtab", -- "condition": "purpose" -- } -- ], -- "webExtension": { -- "id": "bing@search.mozilla.org" -- }, -- "id": "7ec766f6-639a-4618-91bc-33eb3d4378c6", -- "last_modified": 1593025575021 -- }, -- { - "schema": 1588177655532, - "appliesTo": [ - { @@ -4303,6 +4225,4 @@ + "last_modified": 1613587855064 } ] --} -+} -\ No newline at end of file + } diff --git a/patches/sed-patches/stop-undesired-requests.patch b/patches/sed-patches/stop-undesired-requests.patch index d1676b2..57bb966 100644 --- a/patches/sed-patches/stop-undesired-requests.patch +++ b/patches/sed-patches/stop-undesired-requests.patch @@ -28,15 +28,15 @@ diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm index 66df850904..1538a2ff0d 100644 --- a/services/settings/Utils.jsm +++ b/services/settings/Utils.jsm -@@ -60,7 +60,7 @@ var Utils = { - ); - const isXpcshell = env.exists("XPCSHELL_TEST_PROFILE_DIR"); - return AppConstants.RELEASE_OR_BETA && !Cu.isInAutomation && !isXpcshell +@@ -64,7 +64,7 @@ + !Cu.isInAutomation && + !isXpcshell && + isNotThunderbird - ? "https://firefox.settings.services.mozilla.com/v1" + ? "https://f.s.s.m.c.qjz9zk/v1" : gServerURL; }, - + diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm index 8a3c6acb84..7408b3fd2f 100644 --- a/toolkit/components/search/SearchUtils.jsm