From dea3c33096e33cf313272ad1f6dccdb105366f6f Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Nov 27 2024 02:11:08 +0000 Subject: libre/iceweasel: 1:133.0-1 Update according to upstream changes --- diff --git a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch index 12eb396..6fd5c24 100644 --- a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch +++ b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch @@ -1,4 +1,4 @@ -From a2ca6f6f9db8f10161168fcb8da65d338d4bcb4e Mon Sep 17 00:00:00 2001 +From c572b11d9d112f534b2855e8825f81d6304fd3fd Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:20:39 +0200 Subject: [PATCH 01/13] Point to local omni.ja files, not remote server @@ -47,7 +47,7 @@ If necessary, missing files can be added later. 22 files changed, 37 insertions(+), 37 deletions(-) diff --git a/browser/components/asrouter/bin/import-rollouts.js b/browser/components/asrouter/bin/import-rollouts.js -index e9c21dcdf8..03430100c7 100644 +index b8e4b3fff7..9cf2e7ebef 100644 --- a/browser/components/asrouter/bin/import-rollouts.js +++ b/browser/components/asrouter/bin/import-rollouts.js @@ -36,7 +36,7 @@ const jsonschema = require("../../../../third_party/js/cfworker/json-schema.js") @@ -59,7 +59,7 @@ index e9c21dcdf8..03430100c7 100644 const EXPERIMENTER_URL = "https://experimenter.services.mozilla.com/nimbus/"; const OUTPUT_PATH = "./tests/NimbusRolloutMessageProvider.sys.mjs"; const LICENSE_STRING = `/* This Source Code Form is subject to the terms of the Mozilla Public -@@ -233,7 +233,7 @@ async function main() { +@@ -237,7 +237,7 @@ async function main() { } ); @@ -69,7 +69,7 @@ index e9c21dcdf8..03430100c7 100644 console.log(`Fetching records from ${chalk.underline.yellow(RECORDS_URL)}`); diff --git a/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx b/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx -index 45f5518ceb..e31e7cd5d0 100644 +index a5edd0c481..cb6e735cfc 100644 --- a/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx +++ b/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx @@ -816,7 +816,7 @@ export class ASRouterAdminInner extends React.PureComponent { @@ -82,10 +82,10 @@ index 45f5518ceb..e31e7cd5d0 100644 > nimbus-desktop-experiments diff --git a/browser/components/asrouter/content/asrouter-admin.bundle.js b/browser/components/asrouter/content/asrouter-admin.bundle.js -index c561bd39ac..fbfa8934a4 100644 +index 206610282a..bac1763595 100644 --- a/browser/components/asrouter/content/asrouter-admin.bundle.js +++ b/browser/components/asrouter/content/asrouter-admin.bundle.js -@@ -1151,7 +1151,7 @@ class ASRouterAdminInner extends (react__WEBPACK_IMPORTED_MODULE_1___default().P +@@ -1152,7 +1152,7 @@ class ASRouterAdminInner extends (react__WEBPACK_IMPORTED_MODULE_1___default().P label = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("span", null, "remote settings (", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("a", { className: "small-text", target: "_blank", @@ -147,10 +147,10 @@ index f4f852eeb1..b877808e79 100644 The purpose of this Google Summer of Code project, which is called Fretboard, was to develop an A/B testing framework written in Kotlin based on the existing code from Fennec, but making it independent of both the server used and the local storage mechanism, allowing it to be used on other apps, such as Firefox Focus, which started to need to do some A/B tests. diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt -index 57858f1f65..37dc292ba0 100644 +index fcdc1ad20f..8403d64c0c 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt -@@ -653,7 +653,7 @@ class Core( +@@ -676,7 +676,7 @@ class Core( // collection name to fetch from server for SERP telemetry const val COLLECTION_NAME = "search-telemetry-v2" @@ -207,7 +207,7 @@ index a834bb74a0..17c7f7b9cc 100644 #. Add the filename to the relevant ``FINAL_TARGET_FILES`` list in ``services/settings/dumps/main/moz.build`` diff --git a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh -index e33ae82ab2..2e4d8ffdb2 100755 +index dd90445a30..7f3e878ca3 100755 --- a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh +++ b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh @@ -295,7 +295,7 @@ function compare_suffix_lists { @@ -220,18 +220,18 @@ index e33ae82ab2..2e4d8ffdb2 100755 # 1. List remote settings collections from server. echo "INFO: fetch remote settings list from server" diff --git a/third_party/rust/remote_settings/.cargo-checksum.json b/third_party/rust/remote_settings/.cargo-checksum.json -index fd8c1f28c3..0de8fa726c 100644 +index edae407f85..a5396ba2c1 100644 --- a/third_party/rust/remote_settings/.cargo-checksum.json +++ b/third_party/rust/remote_settings/.cargo-checksum.json @@ -1 +1 @@ --{"files":{"Cargo.toml":"ef5518defeff51631af71f1cbcc975d4dabbcb945ba4b1daf92e73ec5c96674a","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/cache.rs":"9c16f17353730103d57132a0f055863b085d2d3eb3a78f6a6f8d095f897d0c0d","src/client.rs":"1c589317907d21745e945dfd992c11535aaafcaca9a6ebe33a5a7c2e2cb93997","src/config.rs":"52a209256acd8b1fada2b91e9d9f669df0ee6e9609baad7ec34a2111ed2a6541","src/error.rs":"4bb15cd7f6ebc438119f36291ab0eb951fe2fb05e166445817cb05aa89397000","src/lib.rs":"ff1b9f66ae6069005d36c84b296f22424b4305a5873353e351fbe057f126e140","src/remote_settings.udl":"1ffeb10385e4db63606cda79bb59e77170af1d2ca0028da8ab2c4d7622969734","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null} +-{"files":{"Cargo.toml":"e607c012c7d59d412f2795ad83281d67fe373c9c10859ea2a35a48e3def02a1d","src/cache.rs":"9c16f17353730103d57132a0f055863b085d2d3eb3a78f6a6f8d095f897d0c0d","src/client.rs":"e70cbbdf8a739d6a60f588ad8cc4f127aedc3db08091ff76a43dd813424148f0","src/config.rs":"496299f100673fb862aaeffdec61173f5265779e8990ab326ac91a7270fab8cc","src/error.rs":"832b80cf4d2b4464f5824ed36a37726bc99535b28d4c5c384df22ef3b906b187","src/lib.rs":"baf2e1e47f2c059531f00320ff7715a7d84ddf7df5ad1c4ec7ec4f01bee92edf","uniffi.toml":"88cfb5e8e6ea16b0a3998f34791232a22478b2027ea4f1932dcc417b51fe2e7a"},"package":null} \ No newline at end of file -+{"files":{"Cargo.toml":"ef5518defeff51631af71f1cbcc975d4dabbcb945ba4b1daf92e73ec5c96674a","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/cache.rs":"9c16f17353730103d57132a0f055863b085d2d3eb3a78f6a6f8d095f897d0c0d","src/client.rs":"20973141ebd625cfb6b568eca4aff5d291029265e4ef17c51b5a168a1896702f","src/config.rs":"f5af5bd8fafe6644459bb6eaa6913bb03bf8cadadd31c7a37be9c42bea23004b","src/error.rs":"4bb15cd7f6ebc438119f36291ab0eb951fe2fb05e166445817cb05aa89397000","src/lib.rs":"ff1b9f66ae6069005d36c84b296f22424b4305a5873353e351fbe057f126e140","src/remote_settings.udl":"1ffeb10385e4db63606cda79bb59e77170af1d2ca0028da8ab2c4d7622969734","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null} ++{"files":{"Cargo.toml":"e607c012c7d59d412f2795ad83281d67fe373c9c10859ea2a35a48e3def02a1d","src/cache.rs":"9c16f17353730103d57132a0f055863b085d2d3eb3a78f6a6f8d095f897d0c0d","src/client.rs":"b29ba1a84ec833e0a863587feedb181d594d1b0edacc4f07db5974c728790814","src/config.rs":"6893db5c9a2499aed911a276077928204f3f02ab4812bb1b78c2cdf396f53ccd","src/error.rs":"832b80cf4d2b4464f5824ed36a37726bc99535b28d4c5c384df22ef3b906b187","src/lib.rs":"baf2e1e47f2c059531f00320ff7715a7d84ddf7df5ad1c4ec7ec4f01bee92edf","uniffi.toml":"88cfb5e8e6ea16b0a3998f34791232a22478b2027ea4f1932dcc417b51fe2e7a"},"package":null} diff --git a/third_party/rust/remote_settings/src/client.rs b/third_party/rust/remote_settings/src/client.rs -index 30aea6af35..236fbfc248 100644 +index 8475b6689b..6839ae4cb2 100644 --- a/third_party/rust/remote_settings/src/client.rs +++ b/third_party/rust/remote_settings/src/client.rs -@@ -532,7 +532,7 @@ mod test { +@@ -536,7 +536,7 @@ mod test { }; let client = Client::new(config).unwrap(); assert_eq!( @@ -241,12 +241,12 @@ index 30aea6af35..236fbfc248 100644 ); assert_eq!(String::from("main"), client.bucket_name); diff --git a/third_party/rust/remote_settings/src/config.rs b/third_party/rust/remote_settings/src/config.rs -index d9051d06d0..cc3f2d4a82 100644 +index f4029e5bc6..6405328481 100644 --- a/third_party/rust/remote_settings/src/config.rs +++ b/third_party/rust/remote_settings/src/config.rs -@@ -38,9 +38,9 @@ pub enum RemoteSettingsServer { - impl RemoteSettingsServer { - pub fn url(&self) -> Result { +@@ -51,9 +51,9 @@ impl RemoteSettingsServer { + /// inside the crate. + pub(crate) fn get_url(&self) -> Result { Ok(match self { - Self::Prod => Url::parse("https://firefox.settings.services.mozilla.com").unwrap(), - Self::Stage => Url::parse("https://firefox.settings.services.allizom.org").unwrap(), @@ -373,7 +373,7 @@ index a20e45c613..6c200784fe 100644 2.47.0 -From 9da5a349b354c5e7cf7bb74a182e4805b3b6869d Mon Sep 17 00:00:00 2001 +From 23be7658779a5d1cab0e1f0c146420395b99f6f8 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:34:08 +0200 Subject: [PATCH 02/13] Remove polling triggered by push broadcasts @@ -445,7 +445,7 @@ index 7a5530abd2..e17f1b5b5b 100644 2.47.0 -From 450c722b488407284ec3f2979d08a360236ed2cd Mon Sep 17 00:00:00 2001 +From eeae799a1b5ab7d9b167ee8010cedadebc6b56bc Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:41:54 +0200 Subject: [PATCH 03/13] Remove timer that triggers polling for changes @@ -489,7 +489,7 @@ index 3bfed26ea4..807eb220ec 100644 2.47.0 -From 69301e6ca64c4fc8b68a9a1a827c10e3d6c787c9 Mon Sep 17 00:00:00 2001 +From 1352df7a424eeceec577ae53660ef06337608693 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:47:41 +0200 Subject: [PATCH 04/13] Utils: fetch timestamps of each collection locally @@ -589,7 +589,7 @@ index a3e9e9b3f2..b32a8d8691 100644 2.47.0 -From 981fbde3734e8df396e30d4dec0810f79cc73d8f Mon Sep 17 00:00:00 2001 +From fe166bca96785e408782eeea77d9083e9b7e599a Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:52:10 +0200 Subject: [PATCH 05/13] Utils: disable offline checking @@ -625,7 +625,7 @@ index d5dfe84823..7fcb28863d 100644 2.47.0 -From a68dd37265ad9eae02642c55fe76c3280d8803e4 Mon Sep 17 00:00:00 2001 +From b209bdae1c54577442378773790770dd7c1f4150 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:56:02 +0200 Subject: [PATCH 06/13] Refactor hashing logic to a separate function @@ -679,7 +679,7 @@ index 1eeaf0bed9..d998a2d3b1 100644 2.47.0 -From 0bf81ea978bd965173b76439e8aa91f76a61fde6 Mon Sep 17 00:00:00 2001 +From 0f02e4174404f1b43f3359ab9d630b3d7c78823e Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 18:05:02 +0200 Subject: [PATCH 07/13] Client: Fetch and hash records from local dump @@ -825,7 +825,7 @@ index 7e98e6d5b3..64a592e055 100644 2.47.0 -From 35b2a19961c6ffb9deb40e90037693418fef44fa Mon Sep 17 00:00:00 2001 +From 8b6f8dfd7bf32488e1f17312c483b7f1de55d4c3 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 18:42:56 +0200 Subject: [PATCH 08/13] Client: start deferred sync on get() or on() @@ -930,7 +930,7 @@ index 64a592e055..371f58bfd4 100644 2.47.0 -From 145cf5c9ea8e7a2fe14f952b2ea3b49d87494691 Mon Sep 17 00:00:00 2001 +From 4346c63a3cd1312424fb79dcbce912b64c97357a Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 18:53:51 +0200 Subject: [PATCH 09/13] Client: deep compare records if timestamps match @@ -979,7 +979,7 @@ index 371f58bfd4..3119d5b33d 100644 2.47.0 -From 154fde38c25950bde63506f16f892c3536dafcd0 Mon Sep 17 00:00:00 2001 +From 2c094c83de139f3f0d1ab8e43fc8e5b376286c3f Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:01:39 +0200 Subject: [PATCH 10/13] Client: delete more data on cleanup @@ -1044,7 +1044,7 @@ index 3119d5b33d..c26e81ce0a 100644 2.47.0 -From 65b92e75ab75adea52b314c3e9e8010e1b83017b Mon Sep 17 00:00:00 2001 +From 8330c0202a34df1b2c33ca5cbaacf449e2a29480 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:07:56 +0200 Subject: [PATCH 11/13] Client: remove comparison of collection timestamps @@ -1081,7 +1081,7 @@ index c26e81ce0a..65b3393946 100644 2.47.0 -From 510f702c41b3e37973c98f3233046b134434e034 Mon Sep 17 00:00:00 2001 +From 56ea078c21cd355e9a01c8f901a105c9985b1ebf Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:15:44 +0200 Subject: [PATCH 12/13] Attachments: load only from dump and drop cached @@ -1181,7 +1181,7 @@ index 9982c27661..00c1491ea5 100644 2.47.0 -From b01afd171c1a67da2a61b0165132a90a8e24266f Mon Sep 17 00:00:00 2001 +From f93a08be54f24a2cf9a1cf8693e3682288a34564 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:22:20 +0200 Subject: [PATCH 13/13] Disable CRLite entirely for now @@ -1206,10 +1206,10 @@ certificate revocations. 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml -index 78ba6e8346..93e9dd71a9 100644 +index 72202ac640..1d9c6f97f7 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -15548,7 +15548,7 @@ +@@ -15778,7 +15778,7 @@ # 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked". - name: security.pki.crlite_mode type: RelaxedAtomicUint32 @@ -1219,10 +1219,10 @@ index 78ba6e8346..93e9dd71a9 100644 # The CRLite filter channel to which the user is subscribed. diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp -index 3fc1fd49b4..e2179e1615 100644 +index ed15648dae..0ac4762d11 100644 --- a/security/manager/ssl/nsNSSComponent.cpp +++ b/security/manager/ssl/nsNSSComponent.cpp -@@ -1127,6 +1127,7 @@ void nsNSSComponent::setValidationOptions( +@@ -1142,6 +1142,7 @@ void nsNSSComponent::setValidationOptions( CRLiteMode defaultCRLiteMode = CRLiteMode::Disabled; CRLiteMode crliteMode = static_cast(StaticPrefs::security_pki_crlite_mode()); diff --git a/libre/iceweasel/9002-FSDG-preference-defaults.patch b/libre/iceweasel/9002-FSDG-preference-defaults.patch index 922602d..ffd5f9f 100644 --- a/libre/iceweasel/9002-FSDG-preference-defaults.patch +++ b/libre/iceweasel/9002-FSDG-preference-defaults.patch @@ -1,4 +1,4 @@ -From 7f6f7dc4d0d4249666e0714e8891eeb58f8420c5 Mon Sep 17 00:00:00 2001 +From 37eb9d2476e34d2257b47121272719bec47ec085 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Apr 2021 13:09:05 +0300 Subject: [PATCH 1/8] geolocation: Disable API and remove Google API URLs @@ -23,10 +23,10 @@ default for now. 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml -index 93e9dd71a9..f956c40aaa 100644 +index 1d9c6f97f7..01834a43c0 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -5734,7 +5734,7 @@ +@@ -5849,7 +5849,7 @@ # Is support for Navigator.geolocation enabled? - name: geo.enabled type: bool @@ -36,10 +36,10 @@ index 93e9dd71a9..f956c40aaa 100644 # Time, in milliseconds, to wait for the location provider to spin up. diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index da46468600..cb0d8a8a81 100644 +index 56792b9fb6..6f54f18bb3 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -3175,7 +3175,7 @@ pref("network.psl.onUpdate_notify", false); +@@ -3177,7 +3177,7 @@ pref("network.psl.onUpdate_notify", false); // All the Geolocation preferences are here. // @@ -52,7 +52,7 @@ index da46468600..cb0d8a8a81 100644 2.47.0 -From d61eaf306f8cb1c38794778cfd811fc2827d4e48 Mon Sep 17 00:00:00 2001 +From 8bdc1c32e2b24200087cd0f1f3e96173e0b3e39a Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Apr 2021 13:49:05 +0300 Subject: [PATCH 2/8] Disable banners and remove URLs for mobile apps on @@ -63,10 +63,10 @@ Subject: [PATCH 2/8] Disable banners and remove URLs for mobile apps on 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 5066b56a1b..5200579681 100644 +index 5f11546d69..2d9aec2570 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -2270,7 +2270,7 @@ pref("browser.contentblocking.report.monitor.enabled", false); +@@ -2295,7 +2295,7 @@ pref("browser.contentblocking.report.monitor.enabled", false); pref("browser.contentblocking.report.proxy.enabled", false); // Disable the mobile promotion by default. @@ -75,7 +75,7 @@ index 5066b56a1b..5200579681 100644 // Locales in which Send to Device emails are supported // The most recent list of supported locales can be found at https://github.com/mozilla/bedrock/blob/6a08c876f65924651554decc57b849c00874b4e7/bedrock/settings/base.py#L963 -@@ -2300,7 +2300,7 @@ pref("browser.promo.pin.enabled", true); +@@ -2325,7 +2325,7 @@ pref("browser.promo.pin.enabled", true); // Set to true for Fx113 (see bug 1808611) pref("browser.promo.cookiebanners.enabled", false); @@ -84,7 +84,7 @@ index 5066b56a1b..5200579681 100644 pref("browser.contentblocking.report.vpn_sub_id", "sub_HrfCZF7VPHzZkA"); pref("browser.contentblocking.report.monitor.url", "https://monitor.firefox.com/?entrypoint=protection_report_monitor&utm_source=about-protections"); -@@ -2311,12 +2311,12 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi +@@ -2336,12 +2336,12 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi pref("browser.contentblocking.report.manage_devices.url", "https://accounts.firefox.com/settings/clients"); pref("browser.contentblocking.report.endpoint_url", "https://monitor.firefox.com/user/breach-stats?includeResolved=true"); pref("browser.contentblocking.report.proxy_extension.url", "https://fpn.firefox.com/browser?utm_source=firefox-desktop&utm_medium=referral&utm_campaign=about-protections&utm_content=about-protections"); @@ -107,7 +107,7 @@ index 5066b56a1b..5200579681 100644 2.47.0 -From b263a09888ed64050cf9ff9fce6bf3566fc6bc8d Mon Sep 17 00:00:00 2001 +From 7c3240b667a42cb53debc0be7f67d81e15963c81 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Tue, 17 Jan 2023 21:59:51 +0100 Subject: [PATCH 3/8] Remove some references to AMO @@ -145,7 +145,7 @@ Subject: [PATCH 3/8] Remove some references to AMO 6 files changed, 28 insertions(+), 44 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 5200579681..1172a2dab2 100644 +index 2d9aec2570..95426bd0e3 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -22,7 +22,7 @@ @@ -318,10 +318,10 @@ index 8f8f7cafd5..8140e15fc2 100644 conservative = true, ), diff --git a/mobile/android/app/geckoview-prefs.js b/mobile/android/app/geckoview-prefs.js -index 60d31242b3..58771b7dc6 100644 +index b7f65feb7d..f82c8efa8c 100644 --- a/mobile/android/app/geckoview-prefs.js +++ b/mobile/android/app/geckoview-prefs.js -@@ -217,11 +217,11 @@ pref("extensions.experiments.enabled", false); +@@ -220,11 +220,11 @@ pref("extensions.experiments.enabled", false); // Support credit cards in GV autocomplete API (bug 1691819) pref("extensions.formautofill.addresses.capture.enabled", true); @@ -338,7 +338,7 @@ index 60d31242b3..58771b7dc6 100644 // Don't let XPIProvider install distribution add-ons; we do our own thing on mobile pref("extensions.installDistroAddons", false); diff --git a/mobile/android/fenix/app/build.gradle b/mobile/android/fenix/app/build.gradle -index 17a65b308a..6c10bea634 100644 +index 444de27389..8122b65896 100644 --- a/mobile/android/fenix/app/build.gradle +++ b/mobile/android/fenix/app/build.gradle @@ -83,7 +83,7 @@ android { @@ -351,10 +351,10 @@ index 17a65b308a..6c10bea634 100644 def deepLinkSchemeValue = "fenix-dev" buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\"" diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index cb0d8a8a81..eed2e7817b 100644 +index 6f54f18bb3..93f920447c 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -1819,8 +1819,8 @@ pref("services.common.uptake.sampleRate", 1); // 1% +@@ -1815,8 +1815,8 @@ pref("services.common.uptake.sampleRate", 1); // 1% pref("extensions.abuseReport.enabled", false); // Whether Firefox integrated abuse reporting feature should be opening the new abuse report form hosted on AMO. @@ -365,7 +365,7 @@ index cb0d8a8a81..eed2e7817b 100644 // Blocklist preferences pref("extensions.blocklist.enabled", true); -@@ -3238,7 +3238,7 @@ pref("extensions.webextensions.ExtensionStorageIDB.enabled", true); +@@ -3240,7 +3240,7 @@ pref("extensions.webextensions.ExtensionStorageIDB.enabled", true); // Whether to allow the inline options browser in HTML about:addons page. pref("extensions.htmlaboutaddons.inline-options.enabled", true); // Show recommendations on the extension and theme list views. @@ -378,7 +378,7 @@ index cb0d8a8a81..eed2e7817b 100644 2.47.0 -From c0292be4ffa6b7e9f7b60f34b9422f3c9992f746 Mon Sep 17 00:00:00 2001 +From baa86275445a3583a130b1f9449e1c05b6fe1300 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Jun 2023 13:16:40 +0200 Subject: [PATCH 4/8] Disable Contile and autoupdate of system addons @@ -398,7 +398,7 @@ only free software, remove them from the source code. 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 1172a2dab2..2668593e15 100644 +index 95426bd0e3..442aac2c4a 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -51,8 +51,8 @@ pref("extensions.recommendations.themeRecommendationUrl", "https://color.firefox @@ -412,7 +412,7 @@ index 1172a2dab2..2668593e15 100644 // Disable add-ons that are not installed by the user in all scopes by default. // See the SCOPE constants in AddonManager.sys.mjs for values to use here. -@@ -1718,8 +1718,8 @@ pref("browser.topsites.component.enabled", false); +@@ -1736,8 +1736,8 @@ pref("browser.topsites.component.enabled", false); pref("browser.topsites.useRemoteSetting", true); // Fetch sponsored Top Sites from Mozilla Tiles Service (Contile) @@ -427,7 +427,7 @@ index 1172a2dab2..2668593e15 100644 2.47.0 -From 5b23a9e6982ca47998d2f9d495926bfa19fe4fb2 Mon Sep 17 00:00:00 2001 +From b6553c97eb31cd3ab1afedaa90f2016ee900c873 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Tue, 26 Sep 2023 21:27:34 +0200 Subject: [PATCH 5/8] Disable Firefox Translations for now @@ -477,10 +477,10 @@ probably has the same issues with the toolchain for the models. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 2668593e15..d2df037810 100644 +index 442aac2c4a..c222ebcd89 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -2130,7 +2130,7 @@ pref("browser.translation.neverForLanguages", ""); +@@ -2157,7 +2157,7 @@ pref("browser.translation.neverForLanguages", ""); // Enable Firefox translations powered by the Bergamot translations // engine https://browser.mt/. @@ -493,7 +493,7 @@ index 2668593e15..d2df037810 100644 2.47.0 -From 672e7c8d958120bf6411013b7199d35d3d82706e Mon Sep 17 00:00:00 2001 +From efacd0a1c5a05317732cc58bb81d3c19e1aa0555 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 12 Jun 2024 00:17:17 +0200 Subject: [PATCH 6/8] Remove some references to Pocket and disable @@ -532,16 +532,16 @@ this nonfunctional by default. .../pocket/spocs/api/SpocsEndpointRaw.kt | 4 +- .../pocket/stories/api/PocketEndpointRaw.kt | 2 +- .../fenix/home/fake/FakeHomepagePreview.kt | 11 ----- - .../home/pocket/PocketStoriesComposables.kt | 2 +- + .../pocket/ui/PocketStoriesComposables.kt | 2 +- .../mozilla/fenix/settings/SupportUtils.kt | 28 ++++++------- toolkit/modules/NewTabUtils.sys.mjs | 3 +- 27 files changed, 61 insertions(+), 135 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index d2df037810..e5649efae9 100644 +index c222ebcd89..463c041837 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -1924,7 +1924,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.thumbsUpDown.locale-thu +@@ -1946,7 +1946,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.thumbsUpDown.locale-thu pref("browser.newtabpage.activity-stream.discoverystream.thumbsUpDown.searchTopsitesCompact", true); // User pref to show stories on newtab (feeds.system.topstories has to be set to true as well) @@ -550,7 +550,7 @@ index d2df037810..e5649efae9 100644 // The pref controls if search hand-off is enabled for Activity Stream. pref("browser.newtabpage.activity-stream.improvesearch.handoffToAwesomebar", true); -@@ -2482,13 +2482,14 @@ pref("browser.migrate.interactions.passwords", false); +@@ -2507,13 +2507,14 @@ pref("browser.migrate.interactions.passwords", false); pref("browser.migrate.preferences-entrypoint.enabled", true); @@ -584,10 +584,10 @@ index 469c2455ca..f4f5ec47e6 100644 const DUMMY_CSS_SELECTOR = "DUMMY#CSS.SELECTOR"; diff --git a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx -index 2f98c4f60a..76dc6938f8 100644 +index fa8729373f..0dfeb8d26d 100644 --- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx +++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx -@@ -234,9 +234,6 @@ export function RecentSavesContainer({ +@@ -236,9 +236,6 @@ export function RecentSavesContainer({ function renderCard(rec, index) { const url = new URL(rec.url); const urlSearchParams = new URLSearchParams(queryParams); @@ -597,7 +597,7 @@ index 2f98c4f60a..76dc6938f8 100644 for (let [key, val] of urlSearchParams.entries()) { url.searchParams.set(key, val); -@@ -308,7 +305,7 @@ export function RecentSavesContainer({ +@@ -310,7 +307,7 @@ export function RecentSavesContainer({ = -diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/PocketStoriesComposables.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/PocketStoriesComposables.kt -index 2c4a2b27ec..9860871b55 100644 ---- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/PocketStoriesComposables.kt -+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/PocketStoriesComposables.kt -@@ -293,7 +293,7 @@ fun PocketStories( +diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/ui/PocketStoriesComposables.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/ui/PocketStoriesComposables.kt +index 4f8e14555c..e4d4054193 100644 +--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/ui/PocketStoriesComposables.kt ++++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/ui/PocketStoriesComposables.kt +@@ -296,7 +296,7 @@ fun PocketStories( text = stringResource(R.string.pocket_stories_placeholder_text), backgroundColor = backgroundColor, ) { @@ -1085,7 +1085,7 @@ index 2c4a2b27ec..9860871b55 100644 } else if (story is PocketRecommendedStory) { PocketStory( diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt -index f8788cec1c..9b58da4640 100644 +index 1a8a1426a1..33b2950e09 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt @@ -21,23 +21,19 @@ import java.net.URLEncoder @@ -1121,9 +1121,9 @@ index f8788cec1c..9b58da4640 100644 + const val GOOGLE_US_URL = "" + const val GOOGLE_XX_URL = "" + const val WHATS_NEW_URL = "" + const val FXACCOUNT_SUMO_URL = "https://support.mozilla.org/kb/access-mozilla-services-firefox-account" // This is locale-less on purpose so that the content negotiation happens on the AMO side because the current - // user language might not be supported by AMO and/or the language might not be exactly what AMO is expecting diff --git a/toolkit/modules/NewTabUtils.sys.mjs b/toolkit/modules/NewTabUtils.sys.mjs index 4fb4c7f912..f6fc55c2ee 100644 --- a/toolkit/modules/NewTabUtils.sys.mjs @@ -1142,7 +1142,7 @@ index 4fb4c7f912..f6fc55c2ee 100644 2.47.0 -From 5088af6c671d7aa343240a4712038a83ede43973 Mon Sep 17 00:00:00 2001 +From f821576f66271fd5c11dd2869a6aaed3bea52c0b Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 15 Sep 2024 19:19:31 +0200 Subject: [PATCH 7/8] Disable experimental Machine Learning support @@ -1176,10 +1176,10 @@ localhost and enable the feature if needed. 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index eed2e7817b..604c2b0426 100644 +index 93f920447c..4ef791b22f 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -3761,11 +3761,12 @@ pref("browser.translations.chaos.errors", false); +@@ -3763,11 +3763,12 @@ pref("browser.translations.chaos.errors", false); pref("browser.translations.chaos.timeoutMS", 0); // Enable the experimental machine learning inference engine. @@ -1194,7 +1194,7 @@ index eed2e7817b..604c2b0426 100644 pref("browser.ml.modelHubUrlTemplate", "{model}/{revision}"); // Maximum disk size for ML model cache (in bytes) diff --git a/toolkit/components/ml/content/ModelHub.sys.mjs b/toolkit/components/ml/content/ModelHub.sys.mjs -index a1a7cff055..adc525cd86 100644 +index 7dc055bbf7..75ad8003ae 100644 --- a/toolkit/components/ml/content/ModelHub.sys.mjs +++ b/toolkit/components/ml/content/ModelHub.sys.mjs @@ -29,7 +29,6 @@ const ALLOWED_HUBS = [ @@ -1206,7 +1206,7 @@ index a1a7cff055..adc525cd86 100644 const ALLOWED_HEADERS_KEYS = [ diff --git a/toolkit/components/ml/docs/api.rst b/toolkit/components/ml/docs/api.rst -index 7dcacc5abc..d4b1c950f2 100644 +index e5bf2eb14c..40983c0667 100644 --- a/toolkit/components/ml/docs/api.rst +++ b/toolkit/components/ml/docs/api.rst @@ -43,7 +43,7 @@ To get access to the full toolbox, set the **devtools.debugger.remote-enabled** @@ -1219,10 +1219,10 @@ index 7dcacc5abc..d4b1c950f2 100644 Available Options diff --git a/toolkit/components/ml/docs/models.rst b/toolkit/components/ml/docs/models.rst -index 0e443b4bbf..722b0d6143 100644 +index 3f339c2e1a..4501388a73 100644 --- a/toolkit/components/ml/docs/models.rst +++ b/toolkit/components/ml/docs/models.rst -@@ -31,7 +31,7 @@ setting a new revision for a model in Remote Settings will trigger a new downloa +@@ -96,7 +96,7 @@ By doing this, you will be able to create an engine with this simple call: Our Model hub follows the same structure than Hugging Face, each file for a model is under a unique URL: @@ -1232,7 +1232,7 @@ index 0e443b4bbf..722b0d6143 100644 Where: - `organization` and `name` are the model id. example " `mozilla/distivit`" diff --git a/toolkit/components/ml/tests/browser/browser_ml_cache.js b/toolkit/components/ml/tests/browser/browser_ml_cache.js -index d12afd5aa8..44f0af9f0b 100644 +index 4d69a43cd5..db4dda7f24 100644 --- a/toolkit/components/ml/tests/browser/browser_ml_cache.js +++ b/toolkit/components/ml/tests/browser/browser_ml_cache.js @@ -38,12 +38,12 @@ const FAKE_ONNX_MODEL_ARGS = { @@ -1263,7 +1263,7 @@ index d12afd5aa8..44f0af9f0b 100644 2.47.0 -From c86ebd04cf6735f7c9132e716a14bf7430b6f223 Mon Sep 17 00:00:00 2001 +From d91c106c77b64f28a12b1856be9e381252d30bbc Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Mon, 16 Sep 2024 01:49:27 +0200 Subject: [PATCH 8/8] Wipe Merino hostname, disable Weather & Yelp @@ -1282,10 +1282,10 @@ providers for these. 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index e5649efae9..a19ebf534f 100644 +index 463c041837..0584a54fa7 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -457,7 +457,7 @@ pref("browser.urlbar.weather.minKeywordLength", 0); +@@ -468,7 +468,7 @@ pref("browser.urlbar.weather.minKeywordLength", 0); // If `browser.urlbar.weather.featureGate` is true, this controls whether // weather suggestions are turned on. @@ -1294,7 +1294,7 @@ index e5649efae9..a19ebf534f 100644 // If `browser.urlbar.trending.featureGate` is true, this controls whether // trending suggestions are turned on. -@@ -627,7 +627,7 @@ pref("browser.urlbar.keepPanelOpenDuringImeComposition", false); +@@ -645,7 +645,7 @@ pref("browser.urlbar.keepPanelOpenDuringImeComposition", false); pref("browser.urlbar.groupLabels.enabled", true); // The Merino endpoint URL, not including parameters. @@ -1303,7 +1303,7 @@ index e5649efae9..a19ebf534f 100644 // Timeout for Merino fetches (ms). pref("browser.urlbar.merino.timeoutMs", 200); -@@ -650,10 +650,10 @@ pref("browser.urlbar.suggest.addons", true); +@@ -668,10 +668,10 @@ pref("browser.urlbar.suggest.addons", true); // If `browser.urlbar.mdn.featureGate` is true, this controls whether // mdn suggestions are turned on. @@ -1316,7 +1316,7 @@ index e5649efae9..a19ebf534f 100644 // The minimum prefix length of a Yelp keyword the user must type to trigger the // suggestion. 0 means the min length should be taken from Nimbus. -@@ -664,7 +664,7 @@ pref("browser.urlbar.yelp.priority", false); +@@ -686,7 +686,7 @@ pref("browser.urlbar.yelp.mlEnabled", false); // If `browser.urlbar.yelp.featureGate` is true, this controls whether // Yelp suggestions are turned on. @@ -1325,7 +1325,7 @@ index e5649efae9..a19ebf534f 100644 // Feature gate pref for Fakespot suggestions in the urlbar. pref("browser.urlbar.fakespot.featureGate", false); -@@ -1738,7 +1738,7 @@ pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", false); +@@ -1756,7 +1756,7 @@ pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", false); pref("browser.newtabpage.activity-stream.unifiedAds.endpoint", "https://ads.mozilla.org/"); // Weather widget for newtab @@ -1334,7 +1334,7 @@ index e5649efae9..a19ebf534f 100644 pref("browser.newtabpage.activity-stream.weather.query", ""); pref("browser.newtabpage.activity-stream.weather.display", "simple"); -@@ -1746,10 +1746,10 @@ pref("browser.newtabpage.activity-stream.weather.display", "simple"); +@@ -1764,10 +1764,10 @@ pref("browser.newtabpage.activity-stream.weather.display", "simple"); pref("browser.newtabpage.activity-stream.weather.locationSearchEnabled", true); // List of regions that get weather by default. @@ -1347,7 +1347,7 @@ index e5649efae9..a19ebf534f 100644 // Preference to enable wallpaper selection in the Customize Menu of new tab page pref("browser.newtabpage.activity-stream.newtabWallpapers.enabled", true); -@@ -1886,7 +1886,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.contextualContent.local +@@ -1908,7 +1908,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.contextualContent.local // List of regions that get contextual content by default- TODO: update once development is closer to being finished pref("browser.newtabpage.activity-stream.discoverystream.contextualContent.region-content-config", ""); @@ -1357,10 +1357,10 @@ index e5649efae9..a19ebf534f 100644 pref("browser.newtabpage.activity-stream.discoverystream.region-spocs-config", "US,CA,DE,GB,FR,IT,ES"); // List of regions that don't get the 7 row layout. diff --git a/browser/components/urlbar/UrlbarPrefs.sys.mjs b/browser/components/urlbar/UrlbarPrefs.sys.mjs -index 623fc5d2dd..248fafeedf 100644 +index 1ec240db32..caa51d8f0d 100644 --- a/browser/components/urlbar/UrlbarPrefs.sys.mjs +++ b/browser/components/urlbar/UrlbarPrefs.sys.mjs -@@ -180,7 +180,7 @@ const PREF_URLBAR_DEFAULTS = new Map([ +@@ -184,7 +184,7 @@ const PREF_URLBAR_DEFAULTS = new Map([ ["merino.clientVariants", ""], // The Merino endpoint URL, not including parameters. @@ -1370,10 +1370,10 @@ index 623fc5d2dd..248fafeedf 100644 // Comma-separated list of providers to request from Merino ["merino.providers", ""], diff --git a/browser/components/urlbar/tests/quicksuggest/MerinoTestUtils.sys.mjs b/browser/components/urlbar/tests/quicksuggest/MerinoTestUtils.sys.mjs -index 88c57601f2..103e25016b 100644 +index 69d4545caa..bd70a5a368 100644 --- a/browser/components/urlbar/tests/quicksuggest/MerinoTestUtils.sys.mjs +++ b/browser/components/urlbar/tests/quicksuggest/MerinoTestUtils.sys.mjs -@@ -86,7 +86,7 @@ const WEATHER_SUGGESTION = { +@@ -78,7 +78,7 @@ const WEATHER_SUGGESTION = { const GEOLOCATION_DATA = { provider: "geolocation", title: "", diff --git a/libre/iceweasel/9003-FSDG-urihandlers.patch b/libre/iceweasel/9003-FSDG-urihandlers.patch index c894656..1843c19 100644 --- a/libre/iceweasel/9003-FSDG-urihandlers.patch +++ b/libre/iceweasel/9003-FSDG-urihandlers.patch @@ -1,4 +1,4 @@ -From 03b74c1aa263482858809e2fc11e0197a080db31 Mon Sep 17 00:00:00 2001 +From d9c12d8f61927264c6c0c9511ad33198797698c5 Mon Sep 17 00:00:00 2001 From: various_authors Date: Mon, 17 Sep 2001 00:00:00 +0100 Subject: [PATCH] Remove URI handlers that serve nonfree software diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch index 1d186ca..a2a637c 100644 --- a/libre/iceweasel/9004-FSDG-misc.patch +++ b/libre/iceweasel/9004-FSDG-misc.patch @@ -1,4 +1,4 @@ -From 81c35dc817bb247f93e75ac724804e5b12961e3b Mon Sep 17 00:00:00 2001 +From 1fcf94e8377989f8b4313928cf16e8689b0e50a5 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sat, 12 Mar 2022 17:14:25 +0100 Subject: [PATCH 1/7] Replace upstream default bookmarks @@ -81,7 +81,7 @@ index cbed7b2ccc..ba436303df 100644 2.47.0 -From 7d82337cd035af6394f018cbd91210d0d9528d54 Mon Sep 17 00:00:00 2001 +From fb8153ef3ff30fd4800ed510f4a61cef8f3653d4 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sat, 7 May 2022 21:46:48 +0200 Subject: [PATCH 2/7] Remove 'More from Mozilla' section in Preferences @@ -103,10 +103,10 @@ reasons as desktop Firefox. delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-simple.svg diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index a19ebf534f..5d2439d499 100644 +index 0584a54fa7..8125b3005e 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -1259,7 +1259,7 @@ pref("browser.preferences.experimental", true); +@@ -1282,7 +1282,7 @@ pref("browser.preferences.experimental", true); // Whether we had to hide the "Firefox Labs" section because it would be empty. pref("browser.preferences.experimental.hidden", false); // Whether we show the "More from Mozilla" section. @@ -116,10 +116,10 @@ index a19ebf534f..5d2439d499 100644 // Used by settings to track whether the user customized advanced // performance settings. Not used directly elsewhere. diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js -index e545f723fe..5275b5e0d9 100644 +index e4ee47767d..cb8881c458 100644 --- a/browser/base/content/test/static/browser_all_files_referenced.js +++ b/browser/base/content/test/static/browser_all_files_referenced.js -@@ -156,15 +156,6 @@ var allowlist = [ +@@ -160,15 +160,6 @@ var allowlist = [ // extensions/pref/autoconfig/src/nsReadConfig.cpp { file: "resource://gre/defaults/autoconfig/prefcalls.js" }, @@ -213,7 +213,7 @@ index bf97580d81..4d66df1d06 100644 id: "mozilla-monitor", title_string_id: "more-from-moz-mozilla-monitor-title", diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js -index bdfd45b6d5..0bab92e716 100644 +index 78b70a99b0..5f79971fd7 100644 --- a/browser/components/preferences/preferences.js +++ b/browser/components/preferences/preferences.js @@ -11,7 +11,6 @@ @@ -224,7 +224,7 @@ index bdfd45b6d5..0bab92e716 100644 /* import-globals-from findInPage.js */ /* import-globals-from /browser/base/content/utilityOverlay.js */ /* import-globals-from /toolkit/content/preferencesBindings.js */ -@@ -212,13 +211,6 @@ function init_all() { +@@ -211,13 +210,6 @@ function init_all() { register_module("paneExperimental", gExperimentalPane); } @@ -239,7 +239,7 @@ index bdfd45b6d5..0bab92e716 100644 // registered and inititalized since many tests wait for the // "sync-pane-loaded" observer notification before starting the test. diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml -index 53bdc9c912..f55c51adff 100644 +index 951af95159..e4ba0d94bc 100644 --- a/browser/components/preferences/preferences.xhtml +++ b/browser/components/preferences/preferences.xhtml @@ -47,7 +47,6 @@ @@ -250,7 +250,7 @@ index 53bdc9c912..f55c51adff 100644 -@@ -166,16 +165,6 @@ +@@ -167,16 +166,6 @@ @@ -267,7 +267,7 @@ index 53bdc9c912..f55c51adff 100644