#98 libre/iceweasel: 126.0.1.parabola1, sync with upstreams
Closed 5 months ago by billauger. Opened 5 months ago by grizzlyuser.

@@ -0,0 +1,4 @@ 

+ [firefox]

+ source = "jq"

+ url = "https://product-details.mozilla.org/1.0/firefox_versions.json"

+ filter = ".LATEST_FIREFOX_VERSION"

@@ -1,4 +1,4 @@ 

- From f5fee3a8375aa0a40b8023840722e5d5e48b509a Mon Sep 17 00:00:00 2001

+ From d742aad6ea3eeb4deeaef4e35c26e74d5a2025c8 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 17:20:39 +0200

  Subject: [PATCH 01/13] Point to local omni.ja files, not remote server
@@ -34,12 +34,12 @@ 

   .../backgroundtasks/BackgroundTask_message.sys.mjs        | 4 ++--

   toolkit/components/search/SearchUtils.sys.mjs             | 8 ++++----

   toolkit/components/search/docs/DefaultSearchEngines.rst   | 2 +-

-  .../components/search/docs/SearchEngineConfiguration.rst  | 2 +-

+  .../components/search/docs/SearchEngineConfiguration.rst  | 8 ++++----

   toolkit/modules/AppConstants.sys.mjs                      | 4 ++--

-  14 files changed, 22 insertions(+), 22 deletions(-)

+  14 files changed, 25 insertions(+), 25 deletions(-)

  

  diff --git a/browser/components/asrouter/bin/import-rollouts.js b/browser/components/asrouter/bin/import-rollouts.js

- index d29a31a068..28a94b1bb9 100644

+ index bb5c17d9ae..ae310b6939 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")
@@ -51,7 +51,7 @@ 

   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() {

+ @@ -229,7 +229,7 @@ async function main() {

       }

     );

   
@@ -61,10 +61,10 @@ 

     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 befce707ef..eb20567593 100644

+ index 32d1614307..9ba1e278a6 100644

  --- a/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx

  +++ b/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx

- @@ -870,7 +870,7 @@ export class ASRouterAdminInner extends React.PureComponent {

+ @@ -884,7 +884,7 @@ export class ASRouterAdminInner extends React.PureComponent {

                     <a

                       className="providerUrl"

                       target="_blank"
@@ -74,10 +74,10 @@ 

                     >

                       nimbus-desktop-experiments

  diff --git a/browser/components/asrouter/content/asrouter-admin.bundle.js b/browser/components/asrouter/content/asrouter-admin.bundle.js

- index b38d551a17..5c2920d822 100644

+ index e5a1e6dd6a..3cd068f740 100644

  --- a/browser/components/asrouter/content/asrouter-admin.bundle.js

  +++ b/browser/components/asrouter/content/asrouter-admin.bundle.js

- @@ -1622,7 +1622,7 @@ class ASRouterAdminInner extends (react__WEBPACK_IMPORTED_MODULE_1___default().P

+ @@ -1634,7 +1634,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: "providerUrl",

             target: "_blank",
@@ -100,7 +100,7 @@ 

     /**

      * Logger instance.

  diff --git a/services/settings/docs/index.rst b/services/settings/docs/index.rst

- index c91d5e6ba6..eb358715f7 100644

+ index 9cf3e4dc30..282ff1b40e 100644

  --- a/services/settings/docs/index.rst

  +++ b/services/settings/docs/index.rst

  @@ -177,11 +177,11 @@ It is possible to package a dump of the server records that will be loaded into
@@ -115,10 +115,10 @@ 

  -      curl "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/${CID}/changeset?_expected=0" | jq '{"data": .changes, "timestamp": .timestamp}' > services/settings/dumps/main/${CID}.json``

  +      curl "https://settings.invalid/v1/buckets/main/collections/${CID}/changeset?_expected=0" | jq '{"data": .changes, "timestamp": .timestamp}' > services/settings/dumps/main/${CID}.json``

   

-  #. Add the filename to the ``FINAL_TARGET_FILES`` list in ``services/settings/dumps/main/moz.build``

-  #. Add the filename to the ``[browser]`` section of ``mobile/android/installer/package-manifest.in`` IF the file should be bundled with Android.

+  #. 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 f01f5cd9c3..0524504266 100755

+ index 4ab38dd799..e21f0d4f44 100755

  --- a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh

  +++ b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh

  @@ -293,7 +293,7 @@ function compare_suffix_lists {
@@ -131,15 +131,15 @@ 

     # 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 8a2b63f314..c6796dddbd 100644

+ index 619a9d13ca..4352280a39 100644

  --- a/third_party/rust/remote_settings/.cargo-checksum.json

  +++ b/third_party/rust/remote_settings/.cargo-checksum.json

  @@ -1 +1 @@

- -{"files":{"Cargo.toml":"4fa89b0606fe8ec8ac8c479b8b9adf33d0c936b09fa5af108ded74139ace37fb","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"fb3f2cd47460e5ae07a5e8d61b358d588d14075bd9dd6b6e818e1af74abd5dba","src/config.rs":"7bb678addfae3b4ed5f2892d32263e5b33cc05e5a12a250f664150e78211f94a","src/error.rs":"192ca42af7c6b882f3129378c23b45dab8a0d2b179e23a8813a335ffd56b21dc","src/lib.rs":"416e99894e152f6cea7418ad2fabfd94bc3d907efd9f33fbd2a83fb99452b2df","src/remote_settings.udl":"2e71491ad3894d17e5bde0663d9490bfea6294d99cdbe9d67a36137faeedc593","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null}

+ -{"files":{"Cargo.toml":"1029f571c66d33c4dfc5e9fc55287a780329ce183f5d2b672de79737155c4227","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"7510ae0d5bcb9fbaa2c43c4773aa0fd518edc78fe0f396c0e1d6dd442446f429","src/config.rs":"7bb678addfae3b4ed5f2892d32263e5b33cc05e5a12a250f664150e78211f94a","src/error.rs":"192ca42af7c6b882f3129378c23b45dab8a0d2b179e23a8813a335ffd56b21dc","src/lib.rs":"416e99894e152f6cea7418ad2fabfd94bc3d907efd9f33fbd2a83fb99452b2df","src/remote_settings.udl":"2e71491ad3894d17e5bde0663d9490bfea6294d99cdbe9d67a36137faeedc593","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null}

  \ No newline at end of file

- +{"files":{"Cargo.toml":"4fa89b0606fe8ec8ac8c479b8b9adf33d0c936b09fa5af108ded74139ace37fb","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"07e0bc48379de4ead6ae06a42a6329ed62febc8ad84ed4dc1cdf0060dde3709d","src/config.rs":"7bb678addfae3b4ed5f2892d32263e5b33cc05e5a12a250f664150e78211f94a","src/error.rs":"192ca42af7c6b882f3129378c23b45dab8a0d2b179e23a8813a335ffd56b21dc","src/lib.rs":"416e99894e152f6cea7418ad2fabfd94bc3d907efd9f33fbd2a83fb99452b2df","src/remote_settings.udl":"2e71491ad3894d17e5bde0663d9490bfea6294d99cdbe9d67a36137faeedc593","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null}

+ +{"files":{"Cargo.toml":"1029f571c66d33c4dfc5e9fc55287a780329ce183f5d2b672de79737155c4227","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"49c1e90f764b7efe5a086daef345f0784c42713b8d673071638fd8836ba20192","src/config.rs":"7bb678addfae3b4ed5f2892d32263e5b33cc05e5a12a250f664150e78211f94a","src/error.rs":"192ca42af7c6b882f3129378c23b45dab8a0d2b179e23a8813a335ffd56b21dc","src/lib.rs":"416e99894e152f6cea7418ad2fabfd94bc3d907efd9f33fbd2a83fb99452b2df","src/remote_settings.udl":"2e71491ad3894d17e5bde0663d9490bfea6294d99cdbe9d67a36137faeedc593","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null}

  diff --git a/third_party/rust/remote_settings/src/client.rs b/third_party/rust/remote_settings/src/client.rs

- index 0d99de9cc1..ad0e2acf41 100644

+ index 2cf26b7319..a83ae40033 100644

  --- a/third_party/rust/remote_settings/src/client.rs

  +++ b/third_party/rust/remote_settings/src/client.rs

  @@ -33,7 +33,7 @@ impl Client {
@@ -151,7 +151,7 @@ 

           let bucket_name = config.bucket_name.unwrap_or_else(|| String::from("main"));

           let base_url = Url::parse(&server_url)?;

   

- @@ -521,7 +521,7 @@ mod test {

+ @@ -525,7 +525,7 @@ mod test {

           };

           let client = Client::new(config).unwrap();

           assert_eq!(
@@ -174,7 +174,7 @@ 

   they apply.

   

  diff --git a/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs b/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs

- index 6fc1d789b9..ca0e5c719f 100644

+ index aafe4a6dcf..a431c41a9b 100644

  --- a/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs

  +++ b/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs

  @@ -19,8 +19,8 @@
@@ -189,7 +189,7 @@ 

   // --preview: enable Remote Settings and Experiment previews.

   //

  diff --git a/toolkit/components/search/SearchUtils.sys.mjs b/toolkit/components/search/SearchUtils.sys.mjs

- index 27c8f8ad03..d67f112985 100644

+ index 1262bb28b1..515d7a9cf8 100644

  --- a/toolkit/components/search/SearchUtils.sys.mjs

  +++ b/toolkit/components/search/SearchUtils.sys.mjs

  @@ -201,13 +201,13 @@ export var SearchUtils = {
@@ -221,16 +221,21 @@ 

  -.. _search-default-override-allowlist bucket: https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-default-override-allowlist/records

  +.. _search-default-override-allowlist bucket: resource://app/defaults/settings/main/search-default-override-allowlist.json

  diff --git a/toolkit/components/search/docs/SearchEngineConfiguration.rst b/toolkit/components/search/docs/SearchEngineConfiguration.rst

- index c782f9f7c3..4d773d27c5 100644

+ index ca6009a0ef..66ef611e73 100644

  --- a/toolkit/components/search/docs/SearchEngineConfiguration.rst

  +++ b/toolkit/components/search/docs/SearchEngineConfiguration.rst

- @@ -68,5 +68,5 @@ related. As a result several situations may occur:

+ @@ -40,7 +40,7 @@ An outline of the schemas may be found on the `Search Configuration Schema`_ pag

   .. _JSON schema: https://json-schema.org/

   .. _stored in mozilla-central: https://searchfox.org/mozilla-central/source/toolkit/components/search/schema/

   .. _Search Configuration Schema: SearchConfigurationSchema.html

- -.. _viewed live: https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-config/records

- +.. _viewed live: resource://app/defaults/settings/main/search-config.json

-  .. _Normandy: /toolkit/components/normandy/normandy/services.html

+ -.. _viewed live: https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-config-v2/records

+ -.. _search-config-icons: https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-config-icons/records

+ -.. _search-config-overrides-v2: https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-config-overrides-v2/records

+ -.. _search-default-override-allowlist: https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-default-override-allowlist/records

+ +.. _viewed live: resource://app/defaults/settings/main/search-config-v2.json

+ +.. _search-config-icons: resource://app/defaults/settings/main/search-config-icons.json

+ +.. _search-config-overrides-v2: resource://app/defaults/settings/main/search-config-overrides-v2.json

+ +.. _search-default-override-allowlist: resource://app/defaults/settings/main/search-default-override-allowlist.json

  diff --git a/toolkit/modules/AppConstants.sys.mjs b/toolkit/modules/AppConstants.sys.mjs

  index bfc87fa622..a7527af0fd 100644

  --- a/toolkit/modules/AppConstants.sys.mjs
@@ -247,11 +252,100 @@ 

   #endif

   

     REMOTE_SETTINGS_VERIFY_SIGNATURE:

+ diff --git a/mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/telemetry/SerpTelemetryRepository.kt b/mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/telemetry/SerpTelemetryRepository.kt

+ index 436b0e22db..129e728872 100644

+ --- a/mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/telemetry/SerpTelemetryRepository.kt

+ +++ b/mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/telemetry/SerpTelemetryRepository.kt

+ @@ -16,7 +16,7 @@ import org.json.JSONException

+  import org.json.JSONObject

+  import java.io.File

+  

+ -internal const val REMOTE_PROD_ENDPOINT_URL = "https://firefox.settings.services.mozilla.com"

+ +internal const val REMOTE_PROD_ENDPOINT_URL = "resource://app/defaults/settings"

+  internal const val REMOTE_ENDPOINT_BUCKET_NAME = "main"

+  

+  /**

+ diff --git a/mobile/android/android-components/components/support/remotesettings/src/main/java/mozilla/components/support/remotesettings/RemoteSettingsClient.kt b/mobile/android/android-components/components/support/remotesettings/src/main/java/mozilla/components/support/remotesettings/RemoteSettingsClient.kt

+ index c9e448e8a2..ba2638ff10 100644

+ --- a/mobile/android/android-components/components/support/remotesettings/src/main/java/mozilla/components/support/remotesettings/RemoteSettingsClient.kt

+ +++ b/mobile/android/android-components/components/support/remotesettings/src/main/java/mozilla/components/support/remotesettings/RemoteSettingsClient.kt

+ @@ -43,7 +43,7 @@ import java.net.URL

+  

+  class RemoteSettingsClient(

+      private val storageRootDirectory: File,

+ -    private val serverUrl: String = "https://firefox.settings.services.mozilla.com",

+ +    private val serverUrl: String = "resource://app/defaults/settings",

+      private val bucketName: String = "main",

+      private val collectionName: String,

+  ) {

+ diff --git a/mobile/android/android-components/components/support/remotesettings/src/test/java/mozilla/components/support/remotesettings/RemoteSettingsClientTest.kt b/mobile/android/android-components/components/support/remotesettings/src/test/java/mozilla/components/support/remotesettings/RemoteSettingsClientTest.kt

+ index e6b153a9a4..afca8776f5 100644

+ --- a/mobile/android/android-components/components/support/remotesettings/src/test/java/mozilla/components/support/remotesettings/RemoteSettingsClientTest.kt

+ +++ b/mobile/android/android-components/components/support/remotesettings/src/test/java/mozilla/components/support/remotesettings/RemoteSettingsClientTest.kt

+ @@ -37,7 +37,7 @@ class RemoteSettingsClientTest {

+          mockFileReader = mock()

+          mockJsonObject = mock()

+          mockRemoteSettings = mock()

+ -        remoteSettingsClient = RemoteSettingsClient(File(""), "https://firefox.settings.services.mozilla.com", "", "")

+ +        remoteSettingsClient = RemoteSettingsClient(File(""), "resource://app/defaults/settings", "", "")

+      }

+  

+      @Test

+ diff --git a/mobile/android/android-components/docs/_posts/2018-08-10-fretboard.md b/mobile/android/android-components/docs/_posts/2018-08-10-fretboard.md

+ index f4f852eeb1..b877808e79 100644

+ --- a/mobile/android/android-components/docs/_posts/2018-08-10-fretboard.md

+ +++ b/mobile/android/android-components/docs/_posts/2018-08-10-fretboard.md

+ @@ -8,7 +8,7 @@ author: fernando

+  ## Overview

+  Firefox for Android (codenamed Fennec) started using [KeepSafe's Switchboard library](https://github.com/KeepSafe/Switchboard) and server component in order to run A/B testing or staged rollout of features, but since then the code changed significantly. It used a special [switchboard server](https://github.com/mozilla-services/switchboard-server) that decided which experiments a client is part of and returned a simplified list for the client to consume. However, this required the client to send data (including a unique id) to the server.

+  

+ -To avoid this Firefox moved to using [Kinto](https://github.com/Kinto/kinto) as storage and server of the experiment configuration. Clients now download the whole list of experiments and decide locally what experiments they are enrolled in (the configuration for Fennec [looks like this](https://firefox.settings.services.mozilla.com/v1/buckets/fennec/collections/experiments/records)).

+ +To avoid this Firefox moved to using [Kinto](https://github.com/Kinto/kinto) as storage and server of the experiment configuration. Clients now download the whole list of experiments and decide locally what experiments they are enrolled in (the configuration for Fennec [looks like this](resource://app/defaults/settings/fennec/experiments.json)).

+  

+  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 65778d2795..169cc703c8 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

+ @@ -628,7 +628,7 @@ class Core(

+  

+          // collection name to fetch from server for SERP telemetry

+          const val COLLECTION_NAME = "search-telemetry-v2"

+ -        internal const val REMOTE_PROD_ENDPOINT_URL = "https://firefox.settings.services.mozilla.com"

+ +        internal const val REMOTE_PROD_ENDPOINT_URL = "resource://app/defaults/settings"

+          internal const val REMOTE_STAGE_ENDPOINT_URL = "https://firefox.settings.services.allizom.org"

+      }

+  }

+ diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/telemetry/GleanMetricsService.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/telemetry/GleanMetricsService.kt

+ index 1b6aec961c..695f1f54d3 100644

+ --- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/telemetry/GleanMetricsService.kt

+ +++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/telemetry/GleanMetricsService.kt

+ @@ -62,7 +62,7 @@ class GleanMetricsService(context: Context) : MetricsService {

+          const val COLLECTION_NAME = "search-telemetry-v2"

+  

+          // urls for prod and stage remote settings server

+ -        internal const val REMOTE_PROD_ENDPOINT_URL = "https://firefox.settings.services.mozilla.com"

+ +        internal const val REMOTE_PROD_ENDPOINT_URL = "resource://app/defaults/settings"

+          internal const val REMOTE_STAGE_ENDPOINT_URL = "https://firefox.settings.services.allizom.org"

+  

+          private val isEnabledByDefault: Boolean

+ diff --git a/toolkit/components/search/docs/SearchEngineConfigurationArchive.rst b/toolkit/components/search/docs/SearchEngineConfigurationArchive.rst

+ index a6aba91a42..0700ab0b69 100644

+ --- a/toolkit/components/search/docs/SearchEngineConfigurationArchive.rst

+ +++ b/toolkit/components/search/docs/SearchEngineConfigurationArchive.rst

+ @@ -68,5 +68,5 @@ related. As a result several situations may occur:

+  .. _JSON schema: https://json-schema.org/

+  .. _stored in mozilla-central: https://searchfox.org/mozilla-central/source/toolkit/components/search/schema/

+  .. _Search Configuration Schema: SearchConfigurationSchema.html

+ -.. _viewed live: https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-config/records

+ +.. _viewed live: resource://app/defaults/settings/main/search-config.json

+  .. _Normandy: /toolkit/components/normandy/normandy/services.html

  -- 

- 2.44.0

+ 2.45.1

  

  

- From 5695ac81d69210b834715ff627c14aef23c8925e Mon Sep 17 00:00:00 2001

+ From 166e6d0c1dfe19e0952102370e7b9615eb2e0533 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 17:34:08 +0200

  Subject: [PATCH 02/13] Remove polling triggered by push broadcasts
@@ -320,10 +414,10 @@ 

     },

   };

  -- 

- 2.44.0

+ 2.45.1

  

  

- From 4d33af45258c3c21424a7a3299d2541d32dec2af Mon Sep 17 00:00:00 2001

+ From 3144c4fd16c3763bc15113b99486ca332b9ccd26 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 17:41:54 +0200

  Subject: [PATCH 03/13] Remove timer that triggers polling for changes
@@ -364,10 +458,10 @@ 

  -# see syntax https://searchfox.org/mozilla-central/rev/cc280c4be94ff8cf64a27cc9b3d6831ffa49fa45/toolkit/components/timermanager/UpdateTimerManager.jsm#155

  -category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200

  -- 

- 2.44.0

+ 2.45.1

  

  

- From 9e51dd108accc4247fea093d9bba0a533fab5623 Mon Sep 17 00:00:00 2001

+ From c9b0cffce96b539857fd6cd8b6ad896a67580e1d Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 17:47:41 +0200

  Subject: [PATCH 04/13] Utils: fetch timestamps of each collection locally
@@ -378,25 +472,12 @@ 

  timestamps from that file and mock response headers to not confuse any

  code that expects them.

  ---

-  browser/installer/package-manifest.in     |  1 +

   services/settings/Utils.sys.mjs           | 28 ++++++++++++++++++++---

   services/settings/dumps/monitor/moz.build |  8 +++++++

   services/settings/dumps/moz.build         |  1 +

-  4 files changed, 35 insertions(+), 3 deletions(-)

+  3 files changed, 34 insertions(+), 3 deletions(-)

   create mode 100644 services/settings/dumps/monitor/moz.build

  

- diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in

- index 1b87a9ab4a..0542b8b239 100644

- --- a/browser/installer/package-manifest.in

- +++ b/browser/installer/package-manifest.in

- @@ -248,6 +248,7 @@

-  @RESPATH@/browser/defaults/settings/last_modified.json

-  @RESPATH@/browser/defaults/settings/blocklists

-  @RESPATH@/browser/defaults/settings/main

- +@RESPATH@/browser/defaults/settings/monitor

-  @RESPATH@/browser/defaults/settings/security-state

-  

-  ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)

  diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs

  index 653cabe7e1..e4d4247253 100644

  --- a/services/settings/Utils.sys.mjs
@@ -465,7 +546,7 @@ 

  +if CONFIG["MOZ_BUILD_APP"] == "browser":

  +    DIST_SUBDIR = "browser"

  diff --git a/services/settings/dumps/moz.build b/services/settings/dumps/moz.build

- index f407580bfa..53e9d8b45e 100644

+ index a3e9e9b3f2..b32a8d8691 100644

  --- a/services/settings/dumps/moz.build

  +++ b/services/settings/dumps/moz.build

  @@ -5,6 +5,7 @@
@@ -477,10 +558,10 @@ 

   ]

   

  -- 

- 2.44.0

+ 2.45.1

  

  

- From 0dcc08dcb124b552415b7d9603d90b2005307d82 Mon Sep 17 00:00:00 2001

+ From 8538a3a55f0ca68a2365f3b531c84f16b14602bb Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 17:52:10 +0200

  Subject: [PATCH 05/13] Utils: disable offline checking
@@ -513,10 +594,10 @@ 

     },

   

  -- 

- 2.44.0

+ 2.45.1

  

  

- From 1bca9bbd252fa445cbf26c22f91ef74b868adf95 Mon Sep 17 00:00:00 2001

+ From a5d1d8a73e8bf3a5b4e98007ea62fef7e87e77f2 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 17:56:02 +0200

  Subject: [PATCH 06/13] Refactor hashing logic to a separate function
@@ -567,10 +648,10 @@ 

   

     /**

  -- 

- 2.44.0

+ 2.45.1

  

  

- From 33b69866397602678bdcf7e16d9374ca569a6f6c Mon Sep 17 00:00:00 2001

+ From ea06d503c57998d695697b17b5bd75c39249859c Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 18:05:02 +0200

  Subject: [PATCH 07/13] Client: Fetch and hash records from local dump
@@ -713,10 +794,10 @@ 

         remoteRecords,

       };

  -- 

- 2.44.0

+ 2.45.1

  

  

- From f0c05d180b69a5d32f0c5db3fa99fccdf0750daa Mon Sep 17 00:00:00 2001

+ From af5dba34019263866d9d7a612edb03f5d757fb17 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 18:42:56 +0200

  Subject: [PATCH 08/13] Client: start deferred sync on get() or on()
@@ -818,10 +899,10 @@ 

      * Synchronize the local database with the remote server.

      *

  -- 

- 2.44.0

+ 2.45.1

  

  

- From fd0363ac2bab5ae134ab840a7bc73e95fe0c8207 Mon Sep 17 00:00:00 2001

+ From fcc663be8cb25a30e1260e6129de9a2c4a075f3c Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 18:53:51 +0200

  Subject: [PATCH 09/13] Client: deep compare records if timestamps match
@@ -867,10 +948,10 @@ 

             }

           } else {

  -- 

- 2.44.0

+ 2.45.1

  

  

- From 32623ba28e591f36ded9afa495d8bd4f4aea90a2 Mon Sep 17 00:00:00 2001

+ From 5e8094292726becfb0be4a45539b0b2000ff97e6 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 19:01:39 +0200

  Subject: [PATCH 10/13] Client: delete more data on cleanup
@@ -932,10 +1013,10 @@ 

      * Fetch information from changeset endpoint.

      *

  -- 

- 2.44.0

+ 2.45.1

  

  

- From 0ce759fdd68a9a1e7c4d163fab32f34071e3f6ca Mon Sep 17 00:00:00 2001

+ From 8ede2b8f90c3b495af8b232b9d608ad18252edf6 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 19:07:56 +0200

  Subject: [PATCH 11/13] Client: remove comparison of collection timestamps
@@ -969,10 +1050,10 @@ 

       await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, {

         clear: retry,

  -- 

- 2.44.0

+ 2.45.1

  

  

- From 32dca09cb4163315643939ddc9fd98e3f03227f0 Mon Sep 17 00:00:00 2001

+ From d20231002fecc1067923f7dff7003a792ab75358 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 19:15:44 +0200

  Subject: [PATCH 12/13] Attachments: load only from dump and drop cached
@@ -1062,10 +1143,10 @@ 

   

     /**

  -- 

- 2.44.0

+ 2.45.1

  

  

- From b4225f1c9949f27349d29bfa266ad6fa5dc97cd9 Mon Sep 17 00:00:00 2001

+ From 2c2b7c06db44ac570900e0085e6f81cc03163d59 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 30 Dec 2020 19:22:20 +0200

  Subject: [PATCH 13/13] Disable CRLite entirely for now
@@ -1090,10 +1171,10 @@ 

   2 files changed, 2 insertions(+), 1 deletion(-)

  

  diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml

- index 835450712a..c9f8b2927a 100644

+ index f32e8a9e8f..f2796de2c5 100644

  --- a/modules/libpref/init/StaticPrefList.yaml

  +++ b/modules/libpref/init/StaticPrefList.yaml

- @@ -14563,7 +14563,7 @@

+ @@ -14729,7 +14729,7 @@

   # 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked".

   - name: security.pki.crlite_mode

     type: RelaxedAtomicUint32
@@ -1115,5 +1196,5 @@ 

       case CRLiteMode::Disabled:

       case CRLiteMode::TelemetryOnly:

  -- 

- 2.44.0

+ 2.45.1

  

@@ -1,4 +1,4 @@ 

- From 9f77e0e2463614448a5575c8b24fab8fdd417f95 Mon Sep 17 00:00:00 2001

+ From f4753dbbef5c79f59e44d6153ae8ba874a5a1656 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Sun, 4 Apr 2021 13:09:05 +0300

  Subject: [PATCH 1/6] geolocation: Disable API and remove Google API URLs
@@ -23,10 +23,10 @@ 

   2 files changed, 2 insertions(+), 2 deletions(-)

  

  diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml

- index c9f8b2927a..4d93c69b4f 100644

+ index f2796de2c5..ab7297a45c 100644

  --- a/modules/libpref/init/StaticPrefList.yaml

  +++ b/modules/libpref/init/StaticPrefList.yaml

- @@ -5559,7 +5559,7 @@

+ @@ -5548,7 +5548,7 @@

   # Is support for Navigator.geolocation enabled?

   - name: geo.enabled

     type: bool
@@ -36,10 +36,10 @@ 

   

   # 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 7157f197e8..3c962f6dc1 100644

+ index 9707432c6e..9ba2f61eed 100644

  --- a/modules/libpref/init/all.js

  +++ b/modules/libpref/init/all.js

- @@ -3110,7 +3110,7 @@ pref("network.psl.onUpdate_notify", false);

+ @@ -3104,7 +3104,7 @@ pref("network.psl.onUpdate_notify", false);

   

   // All the Geolocation preferences are here.

   //
@@ -49,10 +49,10 @@ 

   // Timeout to wait before sending the location request.

   pref("geo.provider.network.timeToWaitBeforeSending", 5000);

  -- 

- 2.44.0

+ 2.45.1

  

  

- From 4bbdf5c5e986d99e9df238549731428b212e8fee Mon Sep 17 00:00:00 2001

+ From 1293fa03398509e1d2d0a35f172e9024296f6ab4 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Sun, 4 Apr 2021 13:49:05 +0300

  Subject: [PATCH 2/6] Disable banners and remove URLs for mobile apps on
@@ -63,7 +63,7 @@ 

   1 file changed, 8 insertions(+), 8 deletions(-)

  

  diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js

- index 32cd57b0ed..fd8dde1cda 100644

+ index 8c4b0e28e5..7c28d00e54 100644

  --- a/browser/app/profile/firefox.js

  +++ b/browser/app/profile/firefox.js

  @@ -2116,7 +2116,7 @@ pref("browser.contentblocking.report.monitor.enabled", false);
@@ -104,10 +104,10 @@ 

   // Protection Report's SUMO urls

   pref("browser.contentblocking.report.lockwise.how_it_works.url", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/password-manager-report");

  -- 

- 2.44.0

+ 2.45.1

  

  

- From 33a3782b5b5e0ac27b4f39d2f10b625915d8c14f Mon Sep 17 00:00:00 2001

+ From d8349f656404fdabea8cb241e48778d5979ebdce Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Tue, 17 Jan 2023 21:59:51 +0100

  Subject: [PATCH 3/6] FSDG: Remove some references to AMO
@@ -128,6 +128,8 @@ 

  * Remove some AMO URLs from mobile.js. There's no Android version of

    Iceweasel AFAIK, but these are some steps towards total removal of

    references to AMO.

+ * Remove references to AMO from mobile codebase, to satisfy the sanity

+   checking.

  * Remove some AMO related preferences from vendor.js.in and patch them

    directly in the sources, to avoid the rotting and to get notified

    quickly when Mozilla introduces any changes to them in the future.
@@ -140,7 +142,7 @@ 

   3 files changed, 17 insertions(+), 17 deletions(-)

  

  diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js

- index fd8dde1cda..475eb1b77f 100644

+ index 7c28d00e54..1cb7b0d017 100644

  --- a/browser/app/profile/firefox.js

  +++ b/browser/app/profile/firefox.js

  @@ -22,9 +22,9 @@
@@ -176,7 +178,7 @@ 

   // The URL for the privacy policy related to recommended extensions.

   pref("extensions.recommendations.privacyPolicyUrl", "https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_content=privacy-policy-link#addons");

  diff --git a/mobile/android/app/geckoview-prefs.js b/mobile/android/app/geckoview-prefs.js

- index 6d136b1a0a..604df7045c 100644

+ index d0906f0711..787177a6b6 100644

  --- a/mobile/android/app/geckoview-prefs.js

  +++ b/mobile/android/app/geckoview-prefs.js

  @@ -223,11 +223,11 @@ pref("extensions.experiments.enabled", false);
@@ -196,10 +198,10 @@ 

   // Don't let XPIProvider install distribution add-ons; we do our own thing on mobile

   pref("extensions.installDistroAddons", false);

  diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js

- index 3c962f6dc1..5f4e6b2e4a 100644

+ index 9ba2f61eed..faa4777ed9 100644

  --- a/modules/libpref/init/all.js

  +++ b/modules/libpref/init/all.js

- @@ -1880,11 +1880,11 @@ pref("services.common.uptake.sampleRate", 1);   // 1%

+ @@ -1874,11 +1874,11 @@ pref("services.common.uptake.sampleRate", 1);   // 1%

   pref("extensions.abuseReport.enabled", false);

   // Whether abuse report originated from AMO should use the Firefox integrated dialog.

   pref("extensions.abuseReport.amWebAPI.enabled", false);
@@ -214,7 +216,7 @@ 

   

   // Blocklist preferences

   pref("extensions.blocklist.enabled", true);

- @@ -3174,7 +3174,7 @@ pref("extensions.webextensions.ExtensionStorageIDB.enabled", true);

+ @@ -3168,7 +3168,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.
@@ -223,11 +225,165 @@ 

   

   // The URL for the privacy policy related to recommended add-ons.

   pref("extensions.recommendations.privacyPolicyUrl", "");

+ diff --git a/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AMOAddonsProvider.kt b/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AMOAddonsProvider.kt

+ index e5a49d7b8f..593157d8ff 100644

+ --- a/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AMOAddonsProvider.kt

+ +++ b/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AMOAddonsProvider.kt

+ @@ -36,7 +36,7 @@ import java.util.concurrent.ConcurrentHashMap

+  import java.util.concurrent.TimeUnit

+  

+  internal const val API_VERSION = "api/v4"

+ -internal const val DEFAULT_SERVER_URL = "https://services.addons.mozilla.org"

+ +internal const val DEFAULT_SERVER_URL = ""

+  internal const val DEFAULT_COLLECTION_USER = "mozilla"

+  internal const val DEFAULT_COLLECTION_NAME = "7e8d6dc651b54ab385fb8791bf9dac"

+  internal const val COLLECTION_FILE_NAME_PREFIX = "mozilla_components_addon_collection"

+ diff --git a/mobile/android/android-components/components/feature/addons/src/test/java/mozilla/components/feature/addons/amo/AMOAddonsProviderTest.kt b/mobile/android/android-components/components/feature/addons/src/test/java/mozilla/components/feature/addons/amo/AMOAddonsProviderTest.kt

+ index 8f8f7cafd5..8140e15fc2 100644

+ --- a/mobile/android/android-components/components/feature/addons/src/test/java/mozilla/components/feature/addons/amo/AMOAddonsProviderTest.kt

+ +++ b/mobile/android/android-components/components/feature/addons/src/test/java/mozilla/components/feature/addons/amo/AMOAddonsProviderTest.kt

+ @@ -77,8 +77,7 @@ class AMOAddonsProviderTest {

+          assertNull(addon.author)

+          verify(client).fetch(

+              Request(

+ -                url = "https://services.addons.mozilla.org/api/v4/accounts/account/mozilla/collections/" +

+ -                    "7e8d6dc651b54ab385fb8791bf9dac/addons/?page_size=$PAGE_SIZE&sort=${SortOption.POPULARITY_DESC.value}",

+ +                url = "",

+                  readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS),

+                  conservative = true,

+              ),

+ @@ -145,8 +144,7 @@ class AMOAddonsProviderTest {

+  

+          verify(client).fetch(

+              Request(

+ -                url = "https://services.addons.mozilla.org/api/v4/accounts/account/mozilla/collections/" +

+ -                    "7e8d6dc651b54ab385fb8791bf9dac/addons/?page_size=$PAGE_SIZE&sort=${SortOption.POPULARITY_DESC.value}&lang=en",

+ +                url = "",

+                  readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS),

+                  conservative = true,

+              ),

+ @@ -163,8 +161,7 @@ class AMOAddonsProviderTest {

+          provider.getFeaturedAddons(readTimeoutInSeconds = 5)

+          verify(mockedClient).fetch(

+              Request(

+ -                url = "https://services.addons.mozilla.org/api/v4/accounts/account/mozilla/collections/" +

+ -                    "7e8d6dc651b54ab385fb8791bf9dac/addons/?page_size=$PAGE_SIZE&sort=${SortOption.POPULARITY_DESC.value}",

+ +                url = "",

+                  readTimeout = Pair(5, TimeUnit.SECONDS),

+                  conservative = true,

+              ),

+ @@ -419,8 +416,7 @@ class AMOAddonsProviderTest {

+          provider.getFeaturedAddons()

+          verify(mockedClient).fetch(

+              Request(

+ -                url = "https://services.addons.mozilla.org/api/v4/accounts/account/mozilla/collections/" +

+ -                    "$collectionName/addons/?page_size=$PAGE_SIZE&sort=${SortOption.POPULARITY_DESC.value}",

+ +                url = "",

+                  readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS),

+                  conservative = true,

+              ),

+ @@ -445,8 +441,7 @@ class AMOAddonsProviderTest {

+  

+          verify(mockedClient).fetch(

+              Request(

+ -                url = "https://services.addons.mozilla.org/api/v4/accounts/account/mozilla/collections/" +

+ -                    "$collectionName/addons/?page_size=$PAGE_SIZE&sort=${SortOption.POPULARITY.value}",

+ +                url = "",

+                  readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS),

+                  conservative = true,

+              ),

+ @@ -463,8 +458,7 @@ class AMOAddonsProviderTest {

+  

+          verify(mockedClient).fetch(

+              Request(

+ -                url = "https://services.addons.mozilla.org/api/v4/accounts/account/mozilla/collections/" +

+ -                    "$collectionName/addons/?page_size=$PAGE_SIZE&sort=${SortOption.POPULARITY_DESC.value}",

+ +                url = "",

+                  readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS),

+                  conservative = true,

+              ),

+ @@ -481,8 +475,7 @@ class AMOAddonsProviderTest {

+  

+          verify(mockedClient).fetch(

+              Request(

+ -                url = "https://services.addons.mozilla.org/api/v4/accounts/account/mozilla/collections/" +

+ -                    "$collectionName/addons/?page_size=$PAGE_SIZE&sort=${SortOption.NAME.value}",

+ +                url = "",

+                  readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS),

+                  conservative = true,

+              ),

+ @@ -499,8 +492,7 @@ class AMOAddonsProviderTest {

+  

+          verify(mockedClient).fetch(

+              Request(

+ -                url = "https://services.addons.mozilla.org/api/v4/accounts/account/mozilla/collections/" +

+ -                    "$collectionName/addons/?page_size=$PAGE_SIZE&sort=${SortOption.NAME_DESC.value}",

+ +                url = "",

+                  readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS),

+                  conservative = true,

+              ),

+ @@ -517,8 +509,7 @@ class AMOAddonsProviderTest {

+  

+          verify(mockedClient).fetch(

+              Request(

+ -                url = "https://services.addons.mozilla.org/api/v4/accounts/account/mozilla/collections/" +

+ -                    "$collectionName/addons/?page_size=$PAGE_SIZE&sort=${SortOption.DATE_ADDED.value}",

+ +                url = "",

+                  readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS),

+                  conservative = true,

+              ),

+ @@ -535,8 +526,7 @@ class AMOAddonsProviderTest {

+  

+          verify(mockedClient).fetch(

+              Request(

+ -                url = "https://services.addons.mozilla.org/api/v4/accounts/account/mozilla/collections/" +

+ -                    "$collectionName/addons/?page_size=$PAGE_SIZE&sort=${SortOption.DATE_ADDED_DESC.value}",

+ +                url = "",

+                  readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS),

+                  conservative = true,

+              ),

+ @@ -560,10 +550,7 @@ class AMOAddonsProviderTest {

+          provider.getFeaturedAddons()

+          verify(mockedClient).fetch(

+              Request(

+ -                url = "https://services.addons.mozilla.org/api/v4/accounts/account/" +

+ -                    "$collectionUser/collections/$collectionName/addons/" +

+ -                    "?page_size=$PAGE_SIZE" +

+ -                    "&sort=${SortOption.POPULARITY_DESC.value}",

+ +                url = "",

+                  readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS),

+                  conservative = true,

+              ),

+ @@ -587,10 +574,7 @@ class AMOAddonsProviderTest {

+          provider.getFeaturedAddons()

+          verify(mockedClient).fetch(

+              Request(

+ -                url = "https://services.addons.mozilla.org/api/v4/accounts/account/" +

+ -                    "$DEFAULT_COLLECTION_USER/collections/$DEFAULT_COLLECTION_NAME/addons/" +

+ -                    "?page_size=$PAGE_SIZE" +

+ -                    "&sort=${SortOption.POPULARITY_DESC.value}",

+ +                url = "",

+                  readTimeout = Pair(DEFAULT_READ_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS),

+                  conservative = true,

+              ),

+ diff --git a/mobile/android/fenix/app/build.gradle b/mobile/android/fenix/app/build.gradle

+ index a3e5442372..0ee7778278 100644

+ --- a/mobile/android/fenix/app/build.gradle

+ +++ b/mobile/android/fenix/app/build.gradle

+ @@ -69,7 +69,7 @@ android {

+                          "\"adnauseam@rednoise.org\"" +

+                  "}"

+          // This should be the base URL used to call the AMO API.

+ -        buildConfigField "String", "AMO_SERVER_URL", "\"https://services.addons.mozilla.org\""

+ +        buildConfigField "String", "AMO_SERVER_URL", "\"\""

+  

+          def deepLinkSchemeValue = "fenix-dev"

+          buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""

  -- 

- 2.44.0

+ 2.45.1

  

  

- From dd0e60923858fb40bebb02df7c62be2e5cd763d3 Mon Sep 17 00:00:00 2001

+ From 3a5a319a9fae681c410d3e409ac627a27ce9c447 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Sun, 4 Jun 2023 13:16:40 +0200

  Subject: [PATCH 4/6] FSDG: Disable Contile and autoupdate of system addons
@@ -247,7 +403,7 @@ 

   1 file changed, 4 insertions(+), 4 deletions(-)

  

  diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js

- index 475eb1b77f..8f4ed154de 100644

+ index 1cb7b0d017..c1b35db29b 100644

  --- a/browser/app/profile/firefox.js

  +++ b/browser/app/profile/firefox.js

  @@ -53,8 +53,8 @@ pref("extensions.recommendations.themeRecommendationUrl", "https://color.firefox
@@ -261,7 +417,7 @@ 

   

   // 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.

- @@ -1667,8 +1667,8 @@ pref("prompts.defaultModalType", 3);

+ @@ -1678,8 +1678,8 @@ pref("prompts.defaultModalType", 3);

   

   pref("browser.topsites.useRemoteSetting", true);

   // Fetch sponsored Top Sites from Mozilla Tiles Service (Contile)
@@ -273,10 +429,10 @@ 

   // Whether to enable the Share-of-Voice feature for Sponsored Topsites via Contile.

   pref("browser.topsites.contile.sov.enabled", true);

  -- 

- 2.44.0

+ 2.45.1

  

  

- From bf7d0977cb8d1f24aeceafc97c32bbd29a210d27 Mon Sep 17 00:00:00 2001

+ From f9cddd87f4dd48c28b74c91e98971376e331b17a Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Tue, 26 Sep 2023 21:27:34 +0200

  Subject: [PATCH 5/6] FSDG: Disable Firefox Translations for now
@@ -326,7 +482,7 @@ 

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js

- index 8f4ed154de..83c8be3f66 100644

+ index c1b35db29b..6203966405 100644

  --- a/browser/app/profile/firefox.js

  +++ b/browser/app/profile/firefox.js

  @@ -1979,7 +1979,7 @@ pref("browser.translation.neverForLanguages", "");
@@ -339,10 +495,10 @@ 

   // Enable the new Firefox Translations Settings UI Design

   pref("browser.translations.newSettingsUI.enable", false);

  -- 

- 2.44.0

+ 2.45.1

  

  

- From 9403ce83446a514b5e38150645d46da30496772e Mon Sep 17 00:00:00 2001

+ From 2d409dea532458ae13322948a7c1f13e3db1af02 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Fri, 17 Nov 2023 20:52:18 +0100

  Subject: [PATCH 6/6] FSDG: Put a fuse, to blow up when upstream switches to
@@ -350,22 +506,21 @@ 

  

  process-json-files.py will probably need rework.

  ---

-  modules/libpref/init/all.js | 2 ++

-  1 file changed, 2 insertions(+)

+  modules/libpref/init/all.js | 1 +

+  1 file changed, 1 insertion(+)

  

  diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js

- index 5f4e6b2e4a..33ebfaff66 100644

+ index faa4777ed9..45ba7376cc 100644

  --- a/modules/libpref/init/all.js

  +++ b/modules/libpref/init/all.js

- @@ -3476,6 +3476,8 @@ pref("browser.search.removeEngineInfobar.enabled", true);

-  // Enables a new search configuration style with no functional changes for the

-  // user. This is solely intended as a rollout button - it will go away once the

-  // new configuration has been rolled out.

- +//

- +// Extra comment, so the patch fails to apply as soon as the line below is changed upstream.

+ @@ -3474,6 +3474,7 @@ pref("browser.search.removeEngineInfobar.enabled", true);

+  #ifdef NIGHTLY_BUILD

+  pref("browser.search.newSearchConfig.enabled", true);

+  #else

+ +// Extra comment, so the patch fails to apply as soon as surrounding lines are changed upstream, especially 'false' below to 'true'.

   pref("browser.search.newSearchConfig.enabled", false);

+  #endif

   

-  // GMPInstallManager prefs

  -- 

- 2.44.0

+ 2.45.1

  

@@ -1,3 +1,12 @@ 

+ From 997bfee7494163a059a6f483f2f159b8b6829d58 Mon Sep 17 00:00:00 2001

+ From: various_authors <various_authors@parabola.nu>

+ Date: Mon, Sep 17 00:00:00 2001 +0100

+ Subject: [PATCH] FSDG: Remove URI handlers that serve nonfree software

+ 

+ ---

+  uriloader/exthandler/HandlerList.sys.mjs | 184 +----------------------

+  1 file changed, 6 insertions(+), 178 deletions(-)

+ 

  diff --git a/uriloader/exthandler/HandlerList.sys.mjs b/uriloader/exthandler/HandlerList.sys.mjs

  index e95d627c07..81f9218da9 100644

  --- a/uriloader/exthandler/HandlerList.sys.mjs
@@ -206,3 +215,6 @@ 

             },

           ],

         },

+ -- 

+ 2.45.1

+ 

@@ -1,11 +1,11 @@ 

- From d8ea43891548f1e2a205cf73bb5b39f916a0ee8d Mon Sep 17 00:00:00 2001

+ From 9ca2b97670c2505885f920703a7cc111c9ea6712 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Sat, 12 Mar 2022 17:14:25 +0100

- Subject: [PATCH] FSDG: Replace upstream default bookmarks

+ Subject: [PATCH 1/6] FSDG: Replace upstream default bookmarks

  

  ---

-  browser/base/content/default-bookmarks.html | 50 +++++++++------------

-  1 file changed, 21 insertions(+), 29 deletions(-)

+  browser/base/content/default-bookmarks.html | 60 ++++++++-------------

+  1 file changed, 21 insertions(+), 39 deletions(-)

  

  diff --git a/browser/base/content/default-bookmarks.html b/browser/base/content/default-bookmarks.html

  index c42e81ac23..e2e643bcf2 100644
@@ -90,36 +90,35 @@ 

   </body>

   </html>

  -- 

- 2.35.1

+ 2.45.1

  

- From f4475bc77e63f16562aa8360233140522d72d8d4 Mon Sep 17 00:00:00 2001

+ 

+ From 10d35b0bf8c6509056898f7882f460bf9039ab75 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Sat, 7 May 2022 21:46:48 +0200

- Subject: [PATCH] Remove 'More from Mozilla' section in Preferences

+ Subject: [PATCH 2/6] Remove 'More from Mozilla' section in Preferences

  

  Currently it contains functionality to provide links to nonfree software

  like Firefox Mobile, which is not compatible with the FSDG for the same

  reasons as desktop Firefox.

  ---

   browser/app/profile/firefox.js                |  2 +-

-  .../static/browser_all_files_referenced.js    | 12 -------

-  browser/components/preferences/jar.mn         |  4 ---

-  .../more-from-mozilla-qr-code-advanced.svg    |  4 ---

+  .../static/browser_all_files_referenced.js    |  9 ------

+  browser/components/preferences/jar.mn         |  3 --

   .../more-from-mozilla-qr-code-simple-cn.svg   |  4 ---

   .../more-from-mozilla-qr-code-simple.svg      |  4 ---

-  .../components/preferences/moreFromMozilla.js | 33 +------------------

-  browser/components/preferences/preferences.js |  9 -----

-  .../components/preferences/preferences.xhtml  | 12 -------

-  9 files changed, 2 insertions(+), 82 deletions(-)

-  delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-advanced.svg

+  .../components/preferences/moreFromMozilla.js | 30 -------------------

+  browser/components/preferences/preferences.js |  8 -----

+  .../components/preferences/preferences.xhtml  | 12 --------

+  8 files changed, 1 insertion(+), 71 deletions(-)

   delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg

   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 76b495ea6c..d0c2b98b11 100644

+ index 6203966405..85806a9f6e 100644

  --- a/browser/app/profile/firefox.js

  +++ b/browser/app/profile/firefox.js

- @@ -1011,7 +1011,7 @@ pref("browser.preferences.experimental", true);

+ @@ -1236,7 +1236,7 @@ pref("browser.preferences.experimental", true);

   #else

   pref("browser.preferences.experimental", false);

   #endif
@@ -129,10 +128,10 @@ 

   pref("browser.preferences.defaultPerformanceSettings.enabled", true);

   

  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 df8a1997a7..40696ea097 100644

+ index d73c3fe8de..b47bb4c39f 100644

  --- a/browser/base/content/test/static/browser_all_files_referenced.js

  +++ b/browser/base/content/test/static/browser_all_files_referenced.js

- @@ -147,15 +147,6 @@ var whitelist = [

+ @@ -144,15 +144,6 @@ var allowlist = [

     // extensions/pref/autoconfig/src/nsReadConfig.cpp

     { file: "resource://gre/defaults/autoconfig/prefcalls.js" },

   
@@ -227,10 +226,10 @@ 

           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 115a67c962..3f9b72b021 100644

+ index 0cd498fd96..89d2abf0fe 100644

  --- a/browser/components/preferences/preferences.js

  +++ b/browser/components/preferences/preferences.js

- @@ -10,7 +10,6 @@

+ @@ -11,7 +11,6 @@

   /* import-globals-from privacy.js */

   /* import-globals-from sync.js */

   /* import-globals-from experimental.js */
@@ -238,7 +237,7 @@ 

   /* import-globals-from findInPage.js */

   /* import-globals-from /browser/base/content/utilityOverlay.js */

   /* import-globals-from /toolkit/content/preferencesBindings.js */

- @@ -227,13 +226,6 @@ function init_all() {

+ @@ -218,13 +217,6 @@ function init_all() {

       register_module("paneExperimental", gExperimentalPane);

     }

   
@@ -253,7 +252,7 @@ 

     // 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 eee227822a..7ebf547d2c 100644

+ index 64062f1f77..dde3dd1259 100644

  --- a/browser/components/preferences/preferences.xhtml

  +++ b/browser/components/preferences/preferences.xhtml

  @@ -47,7 +47,6 @@
@@ -264,7 +263,7 @@ 

     <link rel="localization" href="browser/preferences/preferences.ftl"/>

     <link rel="localization" href="toolkit/branding/accounts.ftl"/>

     <link rel="localization" href="toolkit/branding/brandings.ftl"/>

- @@ -168,16 +167,6 @@

+ @@ -170,16 +169,6 @@

             <image class="category-icon"/>

             <label class="category-name" flex="1" data-l10n-id="pane-experimental-title"></label>

           </richlistitem>
@@ -281,7 +280,7 @@ 

   

           <!-- The following <richlistitem> elements are hidden from the list of items via the hidden-category class.

               The intent is that they act as sub-pages, accessible from the UI of one of the main pages, but are

- @@ -247,7 +236,6 @@

+ @@ -249,7 +238,6 @@

   #include translations.inc.xhtml

   #include sync.inc.xhtml

   #include experimental.inc.xhtml
@@ -290,13 +289,13 @@ 

         </vbox>

       </vbox>

  -- 

- 2.36.0

+ 2.45.1

  

  

- From 66dec07e773e35b82aa42120441dea0fb185986d Mon Sep 17 00:00:00 2001

+ From 7bfcf6fdd1fe2c37e40ac526974a10b2388ae662 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Sat, 7 May 2022 21:51:06 +0200

- Subject: [PATCH] Remove promos of Firefox Focus and Klar from Private

+ Subject: [PATCH 3/6] Remove promos of Firefox Focus and Klar from Private

   Browsing

  

  Please correct me if I'm wrong, but these are not compatible with FSDG
@@ -304,19 +303,19 @@ 

  ---

   browser/app/profile/firefox.js                |   2 +-

   .../static/browser_all_files_referenced.js    |   2 -

-  .../newtab/lib/OnboardingMessageProvider.jsm  | 215 ------------------

-  .../newtab/lib/PanelTestProvider.sys.mjs          |  84 -------

-  .../content/assets/focus-qr-code.svg          | 114 ----------

-  .../content/assets/klar-qr-code.svg           | 114 ----------

-  6 files changed, 1 insertion(+), 530 deletions(-)

+  .../modules/OnboardingMessageProvider.sys.mjs | 309 ------------------

+  .../modules/PanelTestProvider.sys.mjs         |  79 -----

+  .../content/assets/focus-qr-code.svg          | 114 -------

+  .../content/assets/klar-qr-code.svg           | 114 -------

+  6 files changed, 1 insertion(+), 619 deletions(-)

   delete mode 100644 browser/components/privatebrowsing/content/assets/focus-qr-code.svg

   delete mode 100644 browser/components/privatebrowsing/content/assets/klar-qr-code.svg

  

  diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js

- index d0eeab95fa..f69cab44a1 100644

+ index 85806a9f6e..fbf35c59c6 100644

  --- a/browser/app/profile/firefox.js

  +++ b/browser/app/profile/firefox.js

- @@ -2013,7 +2013,7 @@ pref("browser.contentblocking.report.vpn_regions", "as,at,be,ca,ch,de,es,fi,fr,g

+ @@ -2137,7 +2137,7 @@ pref("browser.contentblocking.report.vpn_regions", "ca,my,nz,sg,gb,gg,im,io,je,u

   pref("browser.promo.focus.disallowed_regions", "cn");

   

   // Default to enabling focus promos to be shown where allowed.
@@ -326,7 +325,7 @@ 

   // Default to enabling pin promos to be shown where allowed.

   pref("browser.promo.pin.enabled", true);

  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 df8a1997a7..d3cafd9c7f 100644

+ index b47bb4c39f..79ca6d9f44 100644

  --- a/browser/base/content/test/static/browser_all_files_referenced.js

  +++ b/browser/base/content/test/static/browser_all_files_referenced.js

  @@ -35,8 +35,6 @@ var gExceptionPaths = [
@@ -339,10 +338,10 @@ 

     // toolkit/components/pdfjs/content/build/pdf.js

     "resource://pdf.js/web/images/",

  diff --git a/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs b/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs

- index 49a76defeb..38407b8e4b 100644

+ index 3cfbbb3f34..6c01d63aea 100644

  --- a/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs

  +++ b/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs

- @@ -505,315 +505,6 @@ const BASE_MESSAGES = () => [

+ @@ -496,315 +496,6 @@ const BASE_MESSAGES = () => [

         ],

       },

     },
@@ -659,10 +658,10 @@ 

       id: "PB_NEWTAB_PIN_PROMO",

       template: "pb_newtab",

  diff --git a/browser/components/asrouter/modules/PanelTestProvider.sys.mjs b/browser/components/asrouter/modules/PanelTestProvider.sys.mjs

- index b5ff59290a..eb5fc60451 100644

+ index 5180e2e6a2..13a871b856 100644

  --- a/browser/components/asrouter/modules/PanelTestProvider.sys.mjs

  +++ b/browser/components/asrouter/modules/PanelTestProvider.sys.mjs

- @@ -367,85 +367,6 @@ const MESSAGES = () => [

+ @@ -236,85 +236,6 @@ const MESSAGES = () => [

       frequency: { lifetime: 3 },

       trigger: { id: "defaultBrowserCheck" },

     },
@@ -989,30 +988,29 @@ 

  -</defs>

  -</svg>

  -- 

- 2.36.0

+ 2.45.1

+ 

  

- From 842d945be96cddf4192fed890066f96bc9894a83 Mon Sep 17 00:00:00 2001

+ From 11196e21c50d8fb32461157d130abb4bbf7eb851 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Tue, 17 Jan 2023 21:59:51 +0100

- Subject: [PATCH] FSDG: Remove 'Extensions for developers' menu item

-   

-   Main menu -> 'More tools' -> 'Extensions for developers' opens

-   addons.mozilla.org (AMO), a third-party repository, not compatible

-   with the FSDG, because it is not committed to only including free

-   software, see [1].

+ Subject: [PATCH 4/6] FSDG: Remove 'Extensions for developers' menu item Main

+  menu -> 'More tools' -> 'Extensions for developers' opens addons.mozilla.org

+  (AMO), a third-party repository, not compatible with the FSDG, because it is

+  not committed to only including free software, see [1].

  

  [1] https://labs.parabola.nu/issues/2409#note-4

  ---

-  browser/components/asrouter/modules/CFRPageActions.sys.mjs |  2 +-

-  devtools/client/framework/devtools-browser.js    |  3 ++-

-  devtools/client/menus.js                         |  2 +-

+  browser/components/asrouter/modules/CFRPageActions.sys.mjs | 2 +-

+  devtools/client/framework/devtools-browser.js              | 3 ++-

+  devtools/client/menus.js                                   | 2 +-

   3 files changed, 4 insertions(+), 3 deletions(-)

  

  diff --git a/browser/components/asrouter/modules/CFRPageActions.sys.mjs b/browser/components/asrouter/modules/CFRPageActions.sys.mjs

- index 2ca59d73e3..6e06ee7c93 100644

+ index 392173f754..f1f532acb3 100644

  --- a/browser/components/asrouter/modules/CFRPageActions.sys.mjs

  +++ b/browser/components/asrouter/modules/CFRPageActions.sys.mjs

- @@ -38,7 +38,7 @@ const SUMO_BASE_URL = Services.urlFormatter.formatURLPref(

+ @@ -41,7 +41,7 @@ const SUMO_BASE_URL = Services.urlFormatter.formatURLPref(

     "app.support.baseURL"

   );

   const ADDONS_API_URL =
@@ -1022,10 +1020,10 @@ 

   const DELAY_BEFORE_EXPAND_MS = 1000;

   const CATEGORY_ICONS = {

  diff --git a/devtools/client/framework/devtools-browser.js b/devtools/client/framework/devtools-browser.js

- index 8357df95d0..a9eb87c232 100644

+ index 2cfbc09331..ac4cd7bad2 100644

  --- a/devtools/client/framework/devtools-browser.js

  +++ b/devtools/client/framework/devtools-browser.js

- @@ -155,8 +155,9 @@ var gDevToolsBrowser = (exports.gDevToolsBrowser = {

+ @@ -131,8 +131,9 @@ var gDevToolsBrowser = (exports.gDevToolsBrowser = {

         toggleMenuItem("menu_browserConsole", false);

         toggleMenuItem("menu_responsiveUI", false);

         toggleMenuItem("menu_eyedropper", false);
@@ -1037,10 +1035,10 @@ 

   

     /**

  diff --git a/devtools/client/menus.js b/devtools/client/menus.js

- index b47e1c4a3f..fd62bfd3df 100644

+ index e75115c220..0abeb4d830 100644

  --- a/devtools/client/menus.js

  +++ b/devtools/client/menus.js

- @@ -189,7 +189,7 @@ exports.menuitems = [

+ @@ -181,7 +181,7 @@ exports.menuitems = [

       appMenuL10nId: "appmenu-developer-tools-extensions",

       oncommand() {

         openDocLink(
@@ -1050,12 +1048,13 @@ 

       },

     },

  -- 

- 2.39.0

+ 2.45.1

+ 

  

- From a985a80d5df1226f4d7f84a72dd6c03b51fc68e4 Mon Sep 17 00:00:00 2001

+ From ecd3f96cb4df329a9cc84dede9a5ae6632ab401d Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Sun, 12 Mar 2023 21:57:14 +0100

- Subject: [PATCH] FSDG: Change DuckDuckGo URL to DuckDuckGo HTML URL

+ Subject: [PATCH 5/6] FSDG: Change DuckDuckGo URL to DuckDuckGo HTML URL

  

  Some of JavaScript files from the regular DDG URL lack license info, and

  I couldn't find their freely licensed sources, so they can be considered
@@ -1112,26 +1111,27 @@ 

         "suggest_url_get_params": "q={searchTerms}&type=list"

       }

  -- 

- 2.39.2

+ 2.45.1

  

- From a985a80d5df1226f4d7f84a72dd6c03b51fc86e4 Mon Sep 17 00:00:00 2001

+ 

+ From e3a7694385c0622d3851d0a5cd5d4dbee979f562 Mon Sep 17 00:00:00 2001

  From: various_authors <various_authors@parabola.nu>

- Date: Mon, Sep 17 00:00:00 2001 +0100

- Subject: [PATCH] FSDG: Various patches

+ Date: Mon, 17 Sep 2001 00:00:00 +0100

+ Subject: [PATCH 6/6] FSDG: Various patches

  

  I'm too lazy to find the history for each, just making the whole patch

  set compatible with 'git am' and easier to manage. If needed, it can be

  found using git.

  ---

-  browser/app/permissions                          |  3 ---

-  browser/components/preferences/sync.inc.xhtml    | 16 ----------------

-  .../protections/content/protections.ftl          |  2 +-

-  .../protections/content/protections.html         | 10 ----------

-  .../components/protections/content/vpn-card.mjs  | 16 ----------------

-  .../en-US/browser/preferences/preferences.ftl    | 10 ----------

-  .../locales/en-US/toolkit/about/aboutAddons.ftl  | 10 ++++++----

-  .../locales/en-US/toolkit/branding/brandings.ftl | 14 +++++++-------

-  8 files changed, 14 insertions(+), 67 deletions(-)

+  browser/app/permissions                        |  3 ---

+  browser/components/preferences/sync.inc.xhtml  | 18 ------------------

+  .../protections/content/protections.ftl        |  2 +-

+  .../protections/content/protections.html       | 10 ----------

+  .../protections/content/vpn-card.mjs           | 16 ----------------

+  .../en-US/browser/preferences/preferences.ftl  | 10 ----------

+  .../en-US/toolkit/about/aboutAddons.ftl        | 10 ++++++----

+  .../en-US/toolkit/branding/brandings.ftl       | 14 +++++++-------

+  8 files changed, 14 insertions(+), 69 deletions(-)

  

  diff --git a/browser/app/permissions b/browser/app/permissions

  index 1c72a96de8..052a6a5c83 100644
@@ -1148,15 +1148,16 @@ 

   origin	remote-troubleshooting	1	https://support.mozilla.org

   

  diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml

- index 7d37d26..4ebbc06 100644

+ index 492491a369..0c8c462a1d 100644

  --- a/browser/components/preferences/sync.inc.xhtml

  +++ b/browser/components/preferences/sync.inc.xhtml

- @@ -35,22 +35,6 @@

+ @@ -35,24 +35,6 @@

           </hbox>

         </vbox>

       </hbox>

  -    <label class="fxaMobilePromo" data-l10n-id="sync-mobile-promo">

  -      <html:img

+ -        role="none"

  -        src="chrome://browser/skin/logo-android.svg"

  -        data-l10n-name="android-icon"

  -        class="androidIcon"/>
@@ -1164,6 +1165,7 @@ 

  -        data-l10n-name="android-link"

  -        class="fxaMobilePromo-android text-link" target="_blank"/>

  -      <html:img

+ -        role="none"

  -        src="chrome://browser/skin/logo-ios.svg"

  -        data-l10n-name="ios-icon"

  -        class="iOSIcon"/>
@@ -1174,117 +1176,8 @@ 

     </groupbox>

   

     <vbox id="hasFxaAccount">

- diff --git a/toolkit/locales/en-US/toolkit/branding/brandings.ftl b/toolkit/locales/en-US/toolkit/branding/brandings.ftl

- index 504598d05e..075f9f60cb 100644

- --- a/toolkit/locales/en-US/toolkit/branding/brandings.ftl

- +++ b/toolkit/locales/en-US/toolkit/branding/brandings.ftl

- @@ -15,16 +15,16 @@

-  ## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark

-  

-  -facebook-container-brand-name = Facebook Container

- --monitor-brand-name = Firefox Monitor

- +-monitor-brand-name = Iceweasel Monitor

-  -monitor-brand-short-name = Monitor

-  -mozmonitor-brand-name = Mozilla Monitor

-  -pocket-brand-name = Pocket

- --send-brand-name = Firefox Send

- --screenshots-brand-name = Firefox Screenshots

- +-send-brand-name = Iceweasel Send

- +-screenshots-brand-name = Iceweasel Screenshots

-  -mozilla-vpn-brand-name = Mozilla VPN

- --profiler-brand-name = Firefox Profiler

- --translations-brand-name = Firefox Translations

- --focus-brand-name = Firefox Focus

- --relay-brand-name = Firefox Relay

- +-profiler-brand-name = Iceweasel Profiler

- +-translations-brand-name = Iceweasel Translations

- +-focus-brand-name = Iceweasel Focus

- +-relay-brand-name = Iceweasel Relay

-  -relay-brand-short-name = Relay

-  -fakespot-brand-name = Fakespot

-  

-  # Note the name of the website is capitalized.

-  -fakespot-website-name = Fakespot.com

-  

-  # The particle "by" can be localized, "Fakespot" and "Mozilla" should not be localized or transliterated.

-  -fakespot-brand-full-name = Fakespot by Mozilla

-  

- -# “Suggest” can be localized, “Firefox” must be treated as a brand

- +# “Suggest” can be localized, “Iceweasel” must be treated as a brand

-  # and kept in English.

- --firefox-suggest-brand-name = Firefox Suggest

- +-Iceweasel-suggest-brand-name = Iceweasel Suggest

-  

- -# ”Home" can be localized, “Firefox” must be treated as a brand

- +# ”Home" can be localized, “Iceweasel” must be treated as a brand

-  # and kept in English.

- --firefox-home-brand-name = Firefox Home

- +-Iceweasel-home-brand-name = Iceweasel Home

-  

- -# View" can be localized, “Firefox” must be treated as a brand

- +# View" can be localized, “Iceweasel” must be treated as a brand

-  # and kept in English.

- --firefoxview-brand-name = Firefox View

- +-Iceweaselview-brand-name = Iceweasel View

- diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl

- index 829c18c5e1..71c75114e9 100644

- --- a/browser/locales/en-US/browser/preferences/preferences.ftl

- +++ b/browser/locales/en-US/browser/preferences/preferences.ftl

- @@ -838,16 +838,6 @@ sync-signedout-account-signin3 =

-      .label = Sign in to sync…

-      .accesskey = i

-  

- -# This message contains two links and two icon images.

- -#   `<img data-l10n-name="android-icon"/>` - Android logo icon

- -#   `<a data-l10n-name="android-link">` - Link to Android Download

- -#   `<img data-l10n-name="ios-icon">` - iOS logo icon

- -#   `<a data-l10n-name="ios-link">` - Link to iOS Download

- -#

- -# They can be moved within the sentence as needed to adapt

- -# to your language, but should not be changed or translated.

- -sync-mobile-promo = Download Firefox for <img data-l10n-name="android-icon"/> <a data-l10n-name="android-link">Android</a> or <img data-l10n-name="ios-icon"/> <a data-l10n-name="ios-link">iOS</a> to sync with your mobile device.

- -

-  ## Firefox account - Signed in

-  

-  sync-profile-picture =

- diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl

- index f4aa0a5..e2978e3 100644

- --- a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl

- +++ b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl

- @@ -5,7 +5,7 @@

-  addons-page-title = Add-ons Manager

-  

-  search-header =

- -    .placeholder = Search addons.mozilla.org

- +    .placeholder = Search Mozarella

-      .searchbuttonlabel = Search

-  

-  ## Variables

- @@ -335,7 +335,8 @@ install-theme-button = Install Theme

-  # The label of the button that appears after installing an add-on. Upon click,

-  # the detailed add-on view is opened, from where the add-on can be managed.

-  manage-addon-button = Manage

- -find-more-addons = Find more add-ons

- +find-more-addons = Popular add-ons are in the Parabola pacman repos.

- +  For others, you can search here:

-  find-more-themes = Find more themes

-  

-  # This is a label for the button to open the "more options" menu, it is only

- @@ -505,9 +505,10 @@ sitepermission-heading = Manage Your Site Permissions

-  discover-heading = Personalize Your { -brand-short-name }

-  shortcuts-heading = Manage Extension Shortcuts

-  

- -default-heading-search-label = Find more add-ons

- +default-heading-search-label = Popular add-ons are in the Parabola pacman repos.

- +  For others, you can search here:

-  addons-heading-search-input =

- -    .placeholder = Search addons.mozilla.org

- +    .placeholder = Search Mozarella

-  

-  addon-page-options-button =

-      .title = Tools for all add-ons

  diff --git a/browser/components/protections/content/protections.ftl b/browser/components/protections/content/protections.ftl

- index 5ac8a7b08c..fec81698e3 100644

+ index 0f5b96e7ff..9617795e92 100644

  --- a/browser/components/protections/content/protections.ftl

  +++ b/browser/components/protections/content/protections.ftl

  @@ -18,7 +18,7 @@ get-vpn-link = Get { -mozilla-vpn-brand-name }
@@ -1318,10 +1211,10 @@ 

               </div>

               <a

  diff --git a/browser/components/protections/content/vpn-card.mjs b/browser/components/protections/content/vpn-card.mjs

- index 2417f1a641..698c48ccc3 100644

+ index dd2039db2e..e70583628b 100644

  --- a/browser/components/protections/content/vpn-card.mjs

  +++ b/browser/components/protections/content/vpn-card.mjs

- @@ -23,22 +23,6 @@ export default class VPNCard {

+ @@ -24,22 +24,6 @@ export default class VPNCard {

       vpnLink.addEventListener("click", () => {

         this.doc.sendTelemetryEvent("click", "vpn_card_link");

       });
@@ -1344,5 +1237,92 @@ 

   

       const vpnBanner = this.doc.querySelector(".vpn-banner");

       const exitIcon = vpnBanner.querySelector(".exit-icon");

- --

- 2.39.2

+ diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl

+ index c25b299ae1..a710fa74af 100644

+ --- a/browser/locales/en-US/browser/preferences/preferences.ftl

+ +++ b/browser/locales/en-US/browser/preferences/preferences.ftl

+ @@ -843,16 +843,6 @@ sync-signedout-account-signin3 =

+      .label = Sign in to sync…

+      .accesskey = i

+  

+ -# This message contains two links and two icon images.

+ -#   `<img data-l10n-name="android-icon"/>` - Android logo icon

+ -#   `<a data-l10n-name="android-link">` - Link to Android Download

+ -#   `<img data-l10n-name="ios-icon">` - iOS logo icon

+ -#   `<a data-l10n-name="ios-link">` - Link to iOS Download

+ -#

+ -# They can be moved within the sentence as needed to adapt

+ -# to your language, but should not be changed or translated.

+ -sync-mobile-promo = Download Firefox for <img data-l10n-name="android-icon"/> <a data-l10n-name="android-link">Android</a> or <img data-l10n-name="ios-icon"/> <a data-l10n-name="ios-link">iOS</a> to sync with your mobile device.

+ -

+  ## Firefox account - Signed in

+  

+  sync-profile-picture-with-alt =

+ diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl

+ index dbdbfd063d..65942db1eb 100644

+ --- a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl

+ +++ b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl

+ @@ -5,7 +5,7 @@

+  addons-page-title = Add-ons Manager

+  

+  search-header =

+ -    .placeholder = Search addons.mozilla.org

+ +    .placeholder = Search Mozarella

+      .searchbuttonlabel = Search

+  

+  ## Variables

+ @@ -344,7 +344,8 @@ install-theme-button = Install Theme

+  # The label of the button that appears after installing an add-on. Upon click,

+  # the detailed add-on view is opened, from where the add-on can be managed.

+  manage-addon-button = Manage

+ -find-more-addons = Find more add-ons

+ +find-more-addons = Popular add-ons are in the Parabola pacman repos.

+ +  For others, you can search here:

+  find-more-themes = Find more themes

+  

+  # This is a label for the button to open the "more options" menu, it is only

+ @@ -516,9 +517,10 @@ sitepermission-heading = Manage Your Site Permissions

+  discover-heading = Personalize Your { -brand-short-name }

+  shortcuts-heading = Manage Extension Shortcuts

+  

+ -default-heading-search-label = Find more add-ons

+ +default-heading-search-label = Popular add-ons are in the Parabola pacman repos.

+ +  For others, you can search here:

+  addons-heading-search-input =

+ -    .placeholder = Search addons.mozilla.org

+ +    .placeholder = Search Mozarella

+  

+  addon-page-options-button =

+      .title = Tools for all add-ons

+ diff --git a/toolkit/locales/en-US/toolkit/branding/brandings.ftl b/toolkit/locales/en-US/toolkit/branding/brandings.ftl

+ index cc95fbc3b8..018b2e1bce 100644

+ --- a/toolkit/locales/en-US/toolkit/branding/brandings.ftl

+ +++ b/toolkit/locales/en-US/toolkit/branding/brandings.ftl

+ @@ -15,17 +15,17 @@

+  ## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark

+  

+  -facebook-container-brand-name = Facebook Container

+ --monitor-brand-name = Firefox Monitor

+ +-monitor-brand-name = Iceweasel Monitor

+  -monitor-brand-short-name = Monitor

+  -mozmonitor-brand-name = Mozilla Monitor

+  -pocket-brand-name = Pocket

+ --send-brand-name = Firefox Send

+ --screenshots-brand-name = Firefox Screenshots

+ +-send-brand-name = Iceweasel Send

+ +-screenshots-brand-name = Iceweasel Screenshots

+  -mozilla-vpn-brand-name = Mozilla VPN

+ --profiler-brand-name = Firefox Profiler

+ --translations-brand-name = Firefox Translations

+ --focus-brand-name = Firefox Focus

+ --relay-brand-name = Firefox Relay

+ +-profiler-brand-name = Iceweasel Profiler

+ +-translations-brand-name = Iceweasel Translations

+ +-focus-brand-name = Iceweasel Focus

+ +-relay-brand-name = Iceweasel Relay

+  -relay-brand-short-name = Relay

+  -fakespot-brand-name = Fakespot

+  

+ -- 

+ 2.45.1

+ 

file modified
+57 -26
@@ -70,10 +70,10 @@ 

  

  pkgname=iceweasel

  epoch=1

- pkgver=125.0.2

+ pkgver=126.0.1

  pkgrel=1

  pkgrel+=.parabola1

- _brandingver=123.0

+ _brandingver=126.0

  _brandingrel=1

  pkgdesc="Standalone web browser derived from Mozilla Firefox"

  url=https://wiki.parabola.nu/Iceweasel
@@ -85,14 +85,34 @@ 

    MPL

  )

  depends=(

+   alsa-lib

+   at-spi2-core

+   bash

+   cairo

    dbus

    ffmpeg

+   fontconfig

+   freetype2

+   gcc-libs

+   gdk-pixbuf2

+   glib2

+   glibc

    gtk3

+   hicolor-icon-theme

    libpulse

+   libx11

+   libxcb

+   libxcomposite

+   libxdamage

+   libxext

+   libxfixes

+   libxrandr

    libxss

    libxt

    mime-types

+   nspr

    nss

+   pango

    ttf-font

  )

  makedepends=(
@@ -133,7 +153,6 @@ 

    'hunspell-en_US: Spell checking, American English'

    'libnotify: Notification integration'

    'networkmanager: Location detection via available WiFi networks'

-   'pulseaudio: Audio support'

    'speech-dispatcher: Text-to-Speech'

    'xdg-desktop-portal: Screensharing with Wayland'

  )
@@ -149,6 +168,7 @@ 

    https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}

    $pkgname.desktop

    identity-icons-brand.svg

+   0001-Bug-1882209-Update-encoding_rs-to-0.8.34-to-deal-wit.patch

  )

  source=(${source[*]/identity-icons-brand.svg/}) # branding over-ride

  source+=(
@@ -177,16 +197,17 @@ 

    '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40' # bill-auger

  )

  

- sha256sums=('69d0563361bab375407b25430c782346bec7623f3f1005e7dc505351ac69f799'

+ sha256sums=('f63026359f678a5d45cea4c7744fcef512abbb58a5b016bbbb1c6ace723a263b'

              'SKIP'

-             '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') # $pkgname.desktop

-                                                                                 # identity-icons-brand.svg

- sha256sums+=('3a365374e3565a8963b000410cdd863d2fe3b4da9f63aa90d4150d1e1822102b'  # *.branding.tar.xz

+             '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58' # $pkgname.desktop

+                                                                                # identity-icons-brand.svg

+             '22c030ef8a047802ae56d20b1c2a6a3830e9a5ac4e5399163a2b57a1c09a20b2')

+ sha256sums+=('68a7748b8b8e78024d6c5279d93a9661ced63144503c5b64f0c3d6cf3d613682'  # *.branding.tar.xz

               'SKIP'

-              'c96d4420738e1bd8dcfed07141aeadbfc6d4fbf453a8cc20c121f48342a95ef8'  # 9001-FSDG-sync-remote-settings-with-local-dump.patch

-              'ec3dd6573379added898fa6833153beaff1c01563b6547f0683680b40e3ebb52'  # 9002-FSDG-preference-defaults.patch

-              '07d6910ddd07f60b803957259e06e3babee6f072f48c6fe31b906a1ea24e3b62'  # 9003-FSDG-urihandlers.patch

-              '9fef95cc7ee0c32a6742740a321c748552312e2f0dd5241a1704bdfaf5a669bd'  # 9004-FSDG-misc.patch

+              '0ef9aee39873fefe170e989f4299d7c5acb48ddcc563fd35f8c9bc5c80b7c872'  # 9001-FSDG-sync-remote-settings-with-local-dump.patch

+              'c157f5f4d87767e5085708865c6c38976d73d02a1b4c63f7efa80e0df464c5a5'  # 9002-FSDG-preference-defaults.patch

+              '854f1b4bb9ea49580826b021f755293495b4cdfb1c4250e00cdb2fc87cac8d11'  # 9003-FSDG-urihandlers.patch

+              'ff36e5af55f12e3ac14028e6563aedd7fd8ccf95ba3ab28316b73a3d8a7adb3d'  # 9004-FSDG-misc.patch

               'c1d57c2b5b3621b34a4c5e7cc6e83170cfa576965b341c71e750e610440f490c'  # process-json-files.py

               '86bd54db6026ff65bd24ac4f05d0679a645ff447e2f81b0ee44037c0c4285e06') # vendor.js.in

  sha256sums_i686=('62fa060e09b95e92fa81f4ac47c06b03d70c2bbc6cda061d85e965a82730e1c0'  # avoid-libxul-OOM-python-check.patch
@@ -194,16 +215,17 @@ 

                   'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1'  # firefox-111.0.1-fdlibm.patch

                   '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06'  # fix-i686-build-moz-1792159.patch

                   'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544') # fix-i686-xsimd-incomplete.patch

- b2sums=('70d27d0ee0bfdf7156546e8762b608c442bd35ba8f33ad89a6d5544eedef4d59b24db2b1988aab9ca626e9a01898f7b0c00a4c7550f78cba9bb722dd3c6d155e'

+ b2sums=('b5d381bbf3ac7d63561dc4c8f8955faeb08fe41e57a05b39585f01054a5348d68d6fc50d9c00d151c211d26ba2d0fb21843868e4cfc1445e4c637ac5756af161'

          'SKIP'

-         'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635') # $pkgname.desktop

+         'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635'  # $pkgname.desktop

                                                                                                                                              # identity-icons-brand.svg

- b2sums+=('96ee9ddf3306db08e9d3e6efdae87900e088aedebadb4b703524f2396ebd26e67120298bb6ec7fee2363e9fe4a83395b1a314ef34732b059870cdf161eaecc8b'  # *.branding.tar.xz

+         '6b8b6fe5d658fd76844fc1d9f47b3892bcb5a59a8d10baabf7d52fb4f7c9e8f4858576859390e6d4c542d46cabb335cd06f8c4a80a7d5dde0868b29cd048d308')

+ b2sums+=('aa718f500e40bc958568d36d87f7840afce62cd927f81f93b755b720ba91333a9635c2fcf4718be47f2538248f08dc35cba3f07d34814bdc856a3984916b7d87'  # *.branding.tar.xz

           'SKIP'

-          '0295f895af6eff20a0d2e6db2807a25d893d564d50bd6ec27312e3b14846991ec88d6de44caf2c4b120af627822ad12f322a0b6af50b804a33eb88bf857c6a71' # 9001-FSDG-sync-remote-settings-with-local-dump.patch

-          '6ba97308faa7e8818762899806c4194b60fb00a2b9dd71c0c82c52060ae52771fbb3f85b7781e0ab84414771f7f0137957aaea2373df5f5aac3aca50d283e7c8' # 9002-FSDG-preference-defaults.patch

-          'dbb0f9639cbe08bf423faf9e2966b5464a26ab5c6314eea18be0e89edd8ac465bfa04a219821852bdd0801dfed9092999bcca1a982a631035bae9a51408d8dde' # 9003-FSDG-urihandlers.patch

-          'ad01a57ebeab90337656bd3a3d9261d063d698a967d6bba305ea1a61f6bd43fe5dd559c3bae32edfe98797614d40a7842a2667ad61f621ddf21039be2c136e10' # 9004-FSDG-misc.patch

+          '7c7069d7a253f7f91838b71319b4e96fafad8b43f647e40793721110307b71a3b3d31763e15e8cbdcbf3139981adde173f20ac434c7075b9610994c01eddfdd0' # 9001-FSDG-sync-remote-settings-with-local-dump.patch

+          'a882e6449bc22b6988189b56a6975b241104bdf6818916f981019372504acf326a3d6c28e12f7fc1277bc4354f17c64e2bed7a56fd45e718d631e39355b5f80d' # 9002-FSDG-preference-defaults.patch

+          'b02437812548e76ccb0409a97b4f725dc9740090383358d1cefa3ea479f735639d73f3d7efc7c4d31b9bca11d8537122a900b5b31fb044a730a0cc9accdff5d0' # 9003-FSDG-urihandlers.patch

+          'd9bd5da474fdfa3c836ba0cb7c2f127e2a81d4289c9fa821d0d15b876952448fd2ef3e4ec04e247f417c13cf1ea5f32dc60b2b4aca1cf96794f3c6e113097645' # 9004-FSDG-misc.patch

           '74e81a58faa219d6a822caae0212896561ecf8d97f736b9b23c6aec2b6e9dbd284702093ee1c75bd99638d8f86c4755542ae4b0dfa0ce8a25064e3430a6f2135' # process-json-files.py

           'f3f344196d03499f3f0392d5dfc5310e131d8c85772edd340faf1df3f04ebf2931eb1dda1b7fe6870d61d498618f4d8ae9f1dd446acbe83e0ce324e04b38f3f9') # vendor.js.in

  b2sums_i686=('684559d207d33e8b83c70d79ddb8b4d7532f2440895668245856553e02b6c786cf0de776981cdcce2438c7add2d692f4afbc85255949558852bdec9800c59882'  # avoid-libxul-OOM-python-check.patch
@@ -346,6 +368,9 @@ 

    mkdir mozbuild

    cd firefox-$pkgver

  

+   # Fix build with Rust 1.78.0

+   patch -Np1 -i ../0001-Bug-1882209-Update-encoding_rs-to-0.8.34-to-deal-wit.patch

+ 

    ## technical patching ##

  

    # Use system python-typing-extensions instead of the old vendored one to avoid
@@ -433,7 +458,7 @@ 

  ac_add_options --with-unsigned-addon-scopes=app,system

  ac_add_options --allow-addon-sideload

  # export MOZILLA_OFFICIAL=1                                # branding over-ride

- export MOZ_APP_REMOTINGNAME=${pkgname//-/}

+ export MOZ_APP_REMOTINGNAME=$pkgname

  export MOZ_TELEMETRY_REPORTING=

  export MOZ_REQUIRE_SIGNING=

  
@@ -716,6 +741,10 @@ 

    CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"

    CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"

  

+   # Breaks compilation since https://bugzilla.mozilla.org/show_bug.cgi?id=1896066

+   CFLAGS="${CFLAGS/-fexceptions/}"

+   CXXFLAGS="${CXXFLAGS/-fexceptions/}"

+ 

    # LTO needs more open files

    ulimit -n 4096

  
@@ -804,7 +833,7 @@ 

  ac_add_options --enable-profile-generate=cross