#100 libre/iceweasel: 128.0-1
Closed 3 months ago by grizzlyuser. Opened 4 months ago by grizzlyuser.

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

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

+ From c1a4cb25ff553541fd831e5980c27e47ff4cb186 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
@@ -69,12 +69,12 @@ 

     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 32d1614307..9ba1e278a6 100644

+ index 2775ff14ad..e408afd3fd 100644

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

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

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

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

                     <a

-                      className="providerUrl"

+                      className="small-text"

                       target="_blank"

  -                    href="https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records"

  +                    href="resource://app/defaults/settings/main/nimbus-desktop-experiments.json"
@@ -82,12 +82,12 @@ 

                     >

                       nimbus-desktop-experiments

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

- index 0ac94260d8..c96a6bd83d 100644

+ index a76ab1ec85..694a42a14e 100644

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

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

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

+ @@ -1149,7 +1149,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",

+            className: "small-text",

             target: "_blank",

  -          href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records",

  +          href: "resource://app/defaults/settings/main/nimbus-desktop-experiments.json",
@@ -147,10 +147,10 @@ 

   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..3db7c27b5f 100644

+ index ef41b0eef3..47edd1d4ec 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(

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

   

           // collection name to fetch from server for SERP telemetry

           const val COLLECTION_NAME = "search-telemetry-v2"
@@ -207,10 +207,10 @@ 

   #. 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 4ab38dd799..e21f0d4f44 100755

+ index 77fe5c583a..2302412498 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 {

+ @@ -292,7 +292,7 @@ function compare_suffix_lists {

   }

   

   function compare_remote_settings_files {
@@ -220,15 +220,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 0d6b1110ea..e25dd14bb5 100644

+ index 8d1fb68e12..e09d627a59 100644

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

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

  @@ -1 +1 @@

- -{"files":{"Cargo.toml":"1029f571c66d33c4dfc5e9fc55287a780329ce183f5d2b672de79737155c4227","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"666ef6536a81b107cdd6047b56ffb53a052c0a615b1fa827e630892c0e528a5d","src/config.rs":"52a209256acd8b1fada2b91e9d9f669df0ee6e9609baad7ec34a2111ed2a6541","src/error.rs":"4bb15cd7f6ebc438119f36291ab0eb951fe2fb05e166445817cb05aa89397000","src/lib.rs":"655559b1b0f09ad221ceba462ace73d9216a6551d70062126ffc8a085d8b89bb","src/remote_settings.udl":"1ffeb10385e4db63606cda79bb59e77170af1d2ca0028da8ab2c4d7622969734","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null}

+ -{"files":{"Cargo.toml":"b7ce43b44cab449291d711602e00307ef113e85d220990123756fdf46d345bbf","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"289bd72c901d99eebbf9d6f559456ca05a4f23b1570ccba2d206284a9dec7d65","src/config.rs":"52a209256acd8b1fada2b91e9d9f669df0ee6e9609baad7ec34a2111ed2a6541","src/error.rs":"4bb15cd7f6ebc438119f36291ab0eb951fe2fb05e166445817cb05aa89397000","src/lib.rs":"655559b1b0f09ad221ceba462ace73d9216a6551d70062126ffc8a085d8b89bb","src/remote_settings.udl":"1ffeb10385e4db63606cda79bb59e77170af1d2ca0028da8ab2c4d7622969734","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null}

  \ No newline at end of file

- +{"files":{"Cargo.toml":"1029f571c66d33c4dfc5e9fc55287a780329ce183f5d2b672de79737155c4227","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"79e711ab5439d3e8dc7f36b66e9504bffedf7aab0b08919f643f9b0c55f18e6b","src/config.rs":"f5af5bd8fafe6644459bb6eaa6913bb03bf8cadadd31c7a37be9c42bea23004b","src/error.rs":"4bb15cd7f6ebc438119f36291ab0eb951fe2fb05e166445817cb05aa89397000","src/lib.rs":"655559b1b0f09ad221ceba462ace73d9216a6551d70062126ffc8a085d8b89bb","src/remote_settings.udl":"1ffeb10385e4db63606cda79bb59e77170af1d2ca0028da8ab2c4d7622969734","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null}

+ +{"files":{"Cargo.toml":"b7ce43b44cab449291d711602e00307ef113e85d220990123756fdf46d345bbf","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"6ab83e441eef69b0f0a96dc727880e18903d5176e985abe10fdeea3c6ef175fb","src/config.rs":"f5af5bd8fafe6644459bb6eaa6913bb03bf8cadadd31c7a37be9c42bea23004b","src/error.rs":"4bb15cd7f6ebc438119f36291ab0eb951fe2fb05e166445817cb05aa89397000","src/lib.rs":"655559b1b0f09ad221ceba462ace73d9216a6551d70062126ffc8a085d8b89bb","src/remote_settings.udl":"1ffeb10385e4db63606cda79bb59e77170af1d2ca0028da8ab2c4d7622969734","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 601b5c451a..ff416cf480 100644

+ index d152ee6ec0..fd8ba14bca 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 {
@@ -370,10 +370,10 @@ 

   

     REMOTE_SETTINGS_VERIFY_SIGNATURE:

  -- 

- 2.45.2

+ 2.46.0

  

  

- From 54e96dbaf230c52de060a842a2e219e42b92c744 Mon Sep 17 00:00:00 2001

+ From dbc7b88dd50b8051f6dbff5af7aeb374e68ba501 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
@@ -442,10 +442,10 @@ 

     },

   };

  -- 

- 2.45.2

+ 2.46.0

  

  

- From 8346cf8d0e9c83620f67b32cf8dddda13b07acbf Mon Sep 17 00:00:00 2001

+ From 69d353b846078ca72eee7751ae0c57ac5da11899 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
@@ -486,10 +486,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.45.2

+ 2.46.0

  

  

- From 84b1dcb292f81404478b1bfdbf41603ab0794563 Mon Sep 17 00:00:00 2001

+ From 2bb7e9ad5509664c150f34a6f0dcd884a4259538 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
@@ -586,10 +586,10 @@ 

   ]

   

  -- 

- 2.45.2

+ 2.46.0

  

  

- From 170634ce09efd1241e4fc966bc5a9efb9ea6596a Mon Sep 17 00:00:00 2001

+ From c3f7d5f66a2b369bce80430975e342457d629b9b 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
@@ -622,10 +622,10 @@ 

     },

   

  -- 

- 2.45.2

+ 2.46.0

  

  

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

+ From d68021448f95515d251249e97a7b32156f44d1e6 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
@@ -676,10 +676,10 @@ 

   

     /**

  -- 

- 2.45.2

+ 2.46.0

  

  

- From 35e1d4320c7746faa5b4479a3b577739b220553e Mon Sep 17 00:00:00 2001

+ From a4443c8cb7cd8c69f58974bd3dc75387ce856b2d 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
@@ -822,10 +822,10 @@ 

         remoteRecords,

       };

  -- 

- 2.45.2

+ 2.46.0

  

  

- From 495dc2978b43a237db58d17a600ad3e877cc64f6 Mon Sep 17 00:00:00 2001

+ From ef8b8eed950d5d8df7327e327bd24a65b11c8103 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()
@@ -927,10 +927,10 @@ 

      * Synchronize the local database with the remote server.

      *

  -- 

- 2.45.2

+ 2.46.0

  

  

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

+ From 6a2517e88429a01bdbc321ff2c55c870a8d7d3f0 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
@@ -976,10 +976,10 @@ 

             }

           } else {

  -- 

- 2.45.2

+ 2.46.0

  

  

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

+ From 075e5ea13c2088ebd8d1f74ac1268cae6f5aacad 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
@@ -1041,10 +1041,10 @@ 

      * Fetch information from changeset endpoint.

      *

  -- 

- 2.45.2

+ 2.46.0

  

  

- From 95568b0b53196fe2d3bf440304acdad2ee2280c7 Mon Sep 17 00:00:00 2001

+ From cca892a2ca1ac1b353639f814c9eead5223a6e50 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
@@ -1078,10 +1078,10 @@ 

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

         clear: retry,

  -- 

- 2.45.2

+ 2.46.0

  

  

- From 9518b1740d5b39ad330a5c10dc69453edc4228bb Mon Sep 17 00:00:00 2001

+ From d04fa9375e7373f07b49e0edb5cc5b7a025c296e 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
@@ -1171,10 +1171,10 @@ 

   

     /**

  -- 

- 2.45.2

+ 2.46.0

  

  

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

+ From 354f2eaac9988f7a030649968d6874b134bf5897 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
@@ -1199,10 +1199,10 @@ 

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

  

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

- index 824bc50ed8..7551e96e24 100644

+ index 884a475e21..87e1256997 100644

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

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

- @@ -15004,7 +15004,7 @@

+ @@ -15227,7 +15227,7 @@

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

   - name: security.pki.crlite_mode

     type: RelaxedAtomicUint32
@@ -1210,12 +1210,12 @@ 

  +  value: 0

     mirror: always

   

-  - name: security.tls.version.min

+  # 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 5f3792fd52..f5b655c2f0 100644

+ index 5891ae628f..f18094cda8 100644

  --- a/security/manager/ssl/nsNSSComponent.cpp

  +++ b/security/manager/ssl/nsNSSComponent.cpp

- @@ -1176,6 +1176,7 @@ void nsNSSComponent::setValidationOptions(

+ @@ -1172,6 +1172,7 @@ void nsNSSComponent::setValidationOptions(

     CRLiteMode defaultCRLiteMode = CRLiteMode::Disabled;

     CRLiteMode crliteMode =

         static_cast<CRLiteMode>(StaticPrefs::security_pki_crlite_mode());
@@ -1224,5 +1224,5 @@ 

       case CRLiteMode::Disabled:

       case CRLiteMode::TelemetryOnly:

  -- 

- 2.45.2

+ 2.46.0

  

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

- From 92831217b971daad1a92d28a35c04a7bddea46cb Mon Sep 17 00:00:00 2001

+ From cfcf6350be0e9a411cc9ad1f5d0b1aee61e4e132 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 7551e96e24..6c11e3275f 100644

+ index 87e1256997..4f9814cc2a 100644

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

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

- @@ -5607,7 +5607,7 @@

+ @@ -5639,7 +5639,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 e089619c38..3383eb7d00 100644

+ index 55955e8174..3e66e787eb 100644

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

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

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

+ @@ -3204,7 +3204,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.45.2

+ 2.46.0

  

  

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

+ From ee85f768343fa54b22d3a2eb4f56a323ec272fcc 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,10 +63,10 @@ 

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

  

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

- index b8aa71126c..fe1cbaff15 100644

+ index b05b474d13..52bd748d2c 100644

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

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

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

+ @@ -2214,7 +2214,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 @@ 

   

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

- @@ -2206,7 +2206,7 @@ pref("browser.promo.pin.enabled", true);

+ @@ -2244,7 +2244,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 @@ 

   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");

- @@ -2217,12 +2217,12 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi

+ @@ -2255,12 +2255,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");
@@ -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.45.2

+ 2.46.0

  

  

- From 2599479335e7a5a4c27281ceb364bf8c13c5428c Mon Sep 17 00:00:00 2001

+ From bfdb53b5c15aa3bf057e36b38ae0a7c1f19afe20 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
@@ -145,7 +145,7 @@ 

   6 files changed, 28 insertions(+), 44 deletions(-)

  

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

- index fe1cbaff15..0bd921f58b 100644

+ index 52bd748d2c..11f5353e7a 100644

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

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

  @@ -22,7 +22,7 @@
@@ -318,7 +318,7 @@ 

                   conservative = true,

               ),

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

- index ece1bbf69b..a141aadc2d 100644

+ index e8433346ee..00c3e1caac 100644

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

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

  @@ -220,11 +220,11 @@ pref("extensions.experiments.enabled", false);
@@ -338,10 +338,10 @@ 

   // 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 fec76b60ec..8abf49c5fb 100644

+ index 990a88db30..20f63be756 100644

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

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

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

+ @@ -87,7 +87,7 @@ android {

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

                   "}"

           // This should be the base URL used to call the AMO API.
@@ -351,10 +351,10 @@ 

           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 3383eb7d00..992937b610 100644

+ index 3e66e787eb..25360e8492 100644

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

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

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

+ @@ -1845,8 +1845,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 @@ 

   

   // Blocklist preferences

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

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

+ @@ -3271,7 +3271,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.
@@ -375,10 +375,10 @@ 

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

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

  -- 

- 2.45.2

+ 2.46.0

  

  

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

+ From 70dd56ccc24637535e735471d3a86ac53deaf240 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
@@ -398,7 +398,7 @@ 

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

  

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

- index 0bd921f58b..151f0775d9 100644

+ index 11f5353e7a..0dd7807072 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 @@ 

   

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

- @@ -1698,8 +1698,8 @@ pref("browser.topsites.component.enabled", false);

+ @@ -1695,8 +1695,8 @@ pref("browser.topsites.component.enabled", false);

   

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

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

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

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

  -- 

- 2.45.2

+ 2.46.0

  

  

- From 3f36ca3417c7e971657c5f0468f92608f1632e23 Mon Sep 17 00:00:00 2001

+ From 011bec2bfeb09e61b9f020f1c276f18d2c7049e5 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
@@ -477,10 +477,10 @@ 

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

  

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

- index 151f0775d9..42eb741bd1 100644

+ index 0dd7807072..7267199afb 100644

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

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

- @@ -2039,7 +2039,7 @@ pref("browser.translation.neverForLanguages", "");

+ @@ -2070,7 +2070,7 @@ pref("browser.translation.neverForLanguages", "");

   

   // Enable Firefox translations powered by the Bergamot translations

   // engine https://browser.mt/.
@@ -490,10 +490,10 @@ 

   // Enable the new Firefox Translations Settings UI Design

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

  -- 

- 2.45.2

+ 2.46.0

  

  

- From 5d529f0f12be2d2c99621eca1e7bab72c870f77c Mon Sep 17 00:00:00 2001

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

  From: grizzlyuser <grizzlyuser@protonmail.com>

  Date: Wed, 12 Jun 2024 00:17:17 +0200

  Subject: [PATCH 6/6] FSDG: Remove some references to Pocket and disable
@@ -538,11 +538,11 @@ 

   27 files changed, 63 insertions(+), 126 deletions(-)

  

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

- index 42eb741bd1..05dbb3b588 100644

+ index 7267199afb..a1a2a308fe 100644

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

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

- @@ -1852,7 +1852,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.onboardingExperience.di

-  pref("browser.newtabpage.activity-stream.discoverystream.onboardingExperience.enabled", false);

+ @@ -1874,7 +1874,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.thumbsUpDown.enabled",

+  pref("browser.newtabpage.activity-stream.discoverystream.thumbsUpDown.searchTopsitesCompact", false);

   

   // User pref to show stories on newtab (feeds.system.topstories has to be set to true as well)

  -pref("browser.newtabpage.activity-stream.feeds.section.topstories", true);
@@ -550,7 +550,7 @@ 

   

   // The pref controls if search hand-off is enabled for Activity Stream.

   pref("browser.newtabpage.activity-stream.improvesearch.handoffToAwesomebar", true);

- @@ -2388,13 +2388,14 @@ pref("browser.migrate.interactions.passwords", false);

+ @@ -2426,13 +2426,14 @@ pref("browser.migrate.interactions.passwords", false);

   

   pref("browser.migrate.preferences-entrypoint.enabled", true);

   
@@ -584,10 +584,10 @@ 

   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 2a9497d1b4..c4ad9ab1d7 100644

+ index d6b1723245..3f004f10e8 100644

  --- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx

  +++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid.jsx

- @@ -223,9 +223,6 @@ export function RecentSavesContainer({

+ @@ -224,9 +224,6 @@ export function RecentSavesContainer({

     function renderCard(rec, index) {

       const url = new URL(rec.url);

       const urlSearchParams = new URLSearchParams(queryParams);
@@ -597,7 +597,7 @@ 

   

       for (let [key, val] of urlSearchParams.entries()) {

         url.searchParams.set(key, val);

- @@ -297,7 +294,7 @@ export function RecentSavesContainer({

+ @@ -298,7 +295,7 @@ export function RecentSavesContainer({

           <SafeAnchor

             onLinkClick={onMyListClicked}

             className="section-sub-link"
@@ -622,7 +622,7 @@ 

   

     componentDidMount() {

  diff --git a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSLinkMenu/DSLinkMenu.jsx b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSLinkMenu/DSLinkMenu.jsx

- index 107adca4da..0b9c26c352 100644

+ index 8da2d9b7f0..1c00fea702 100644

  --- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSLinkMenu/DSLinkMenu.jsx

  +++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSLinkMenu/DSLinkMenu.jsx

  @@ -52,7 +52,7 @@ export class DSLinkMenu extends React.PureComponent {
@@ -736,10 +736,10 @@ 

   

   A list of endpoints that are allowed to be used by Discovery Stream for remote content (eg: story metadata) and configuration (eg: remote layout definitions for experimentation).

  diff --git a/browser/components/newtab/lib/ActivityStream.sys.mjs b/browser/components/newtab/lib/ActivityStream.sys.mjs

- index 29928f4cf9..b498ea4642 100644

+ index 43d2253ae2..d5c56cab35 100644

  --- a/browser/components/newtab/lib/ActivityStream.sys.mjs

  +++ b/browser/components/newtab/lib/ActivityStream.sys.mjs

- @@ -93,14 +93,10 @@ export const PREFS_CONFIG = new Map([

+ @@ -99,14 +99,10 @@ export const PREFS_CONFIG = new Map([

             provider_icon: "chrome://global/skin/icons/pocket.svg",

             provider_name: "Pocket",

             read_more_endpoint:
@@ -758,7 +758,7 @@ 

             show_spocs: showSpocs(args),

           }),

       },

- @@ -124,7 +120,7 @@ export const PREFS_CONFIG = new Map([

+ @@ -130,7 +126,7 @@ export const PREFS_CONFIG = new Map([

       "showSponsored",

       {

         title: "User pref for sponsored Pocket content",
@@ -767,7 +767,7 @@ 

       },

     ],

     [

- @@ -139,7 +135,7 @@ export const PREFS_CONFIG = new Map([

+ @@ -145,7 +141,7 @@ export const PREFS_CONFIG = new Map([

       "showSponsoredTopSites",

       {

         title: "Show sponsored top sites",
@@ -776,16 +776,16 @@ 

       },

     ],

     [

- @@ -455,7 +451,7 @@ export const PREFS_CONFIG = new Map([

+ @@ -446,7 +442,7 @@ export const PREFS_CONFIG = new Map([

         title:

           "Endpoint prefixes (comma-separated) that are allowed to be requested",

         value:

- -        "https://getpocket.cdn.mozilla.net/,https://firefox-api-proxy.cdn.mozilla.net/,https://spocs.getpocket.com/",

+ -        "https://getpocket.cdn.mozilla.net/,https://firefox-api-proxy.cdn.mozilla.net/,https://spocs.getpocket.com/,https://merino.services.mozilla.com/",

  +        "",

       },

     ],

     [

- @@ -509,7 +505,7 @@ export const PREFS_CONFIG = new Map([

+ @@ -515,7 +511,7 @@ export const PREFS_CONFIG = new Map([

       {

         title:

           "Endpoint for when a user opts-out of sponsored content to delete the user's data from the ad server.",
@@ -795,7 +795,7 @@ 

     ],

     [

  diff --git a/browser/components/newtab/lib/DiscoveryStreamFeed.sys.mjs b/browser/components/newtab/lib/DiscoveryStreamFeed.sys.mjs

- index e1f5dff6ce..3476cfab09 100644

+ index 701b93899c..5535953612 100644

  --- a/browser/components/newtab/lib/DiscoveryStreamFeed.sys.mjs

  +++ b/browser/components/newtab/lib/DiscoveryStreamFeed.sys.mjs

  @@ -35,9 +35,9 @@ const SPOCS_FEEDS_UPDATE_TIME = 30 * 60 * 1000; // 30 minutes
@@ -810,7 +810,7 @@ 

   const PREF_CONFIG = "discoverystream.config";

   const PREF_ENDPOINTS = "discoverystream.endpoints";

   const PREF_IMPRESSION_ID = "browser.newtabpage.activity-stream.impressionId";

- @@ -2183,7 +2183,7 @@ getHardcodedLayout = ({

+ @@ -2221,7 +2221,7 @@ getHardcodedLayout = ({

               link_text: {

                 id: "newtab-pocket-learn-more",

               },
@@ -819,7 +819,7 @@ 

               icon: "chrome://global/skin/icons/pocket.svg",

             },

             properties: {

- @@ -2239,42 +2239,8 @@ getHardcodedLayout = ({

+ @@ -2277,42 +2277,8 @@ getHardcodedLayout = ({

             newFooterSection,

             properties: {

               alignment: "left-align",
@@ -887,10 +887,10 @@ 

         },

       },

  diff --git a/browser/components/newtab/lib/TopSitesFeed.sys.mjs b/browser/components/newtab/lib/TopSitesFeed.sys.mjs

- index 7ab85466c6..b5e6e48531 100644

+ index a527a45767..6139113f44 100644

  --- a/browser/components/newtab/lib/TopSitesFeed.sys.mjs

  +++ b/browser/components/newtab/lib/TopSitesFeed.sys.mjs

- @@ -1059,9 +1059,7 @@ export class TopSitesFeed {

+ @@ -1060,9 +1060,7 @@ export class TopSitesFeed {

             // Also: force JPEG, quality 60, no upscaling, no EXIF data

             // Uses Thumbor: https://thumbor.readthedocs.io/en/latest/usage.html

             // For now we wrap this in single quotes because this is being used in a url() css rule, and otherwise would cause a parsing error.
@@ -1139,5 +1139,5 @@ 

      * @param {Object} aOptions

      *   {int} numItems: The max number of pocket items to fetch

  -- 

- 2.45.2

+ 2.46.0

  

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

- From 345ed10b9a5d73506addf735b90f156ddd0ad449 Mon Sep 17 00:00:00 2001

+ From 50cf4a44a6a5b4c7217f43c527bf861d8a5a3cf3 Mon Sep 17 00:00:00 2001

  From: various_authors <various_authors@parabola.nu>

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

  Subject: [PATCH] FSDG: Remove URI handlers that serve nonfree software
@@ -216,5 +216,5 @@ 

           ],

         },

  -- 

- 2.45.2

+ 2.46.0

  

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

- From 37c5502943e75b856670299f54447d4f7e3a1ff7 Mon Sep 17 00:00:00 2001

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

  From: grizzlyuser <grizzlyuser@protonmail.com>

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

  Subject: [PATCH 1/6] FSDG: Replace upstream default bookmarks
@@ -90,10 +90,10 @@ 

   </body>

   </html>

  -- 

- 2.45.2

+ 2.46.0

  

  

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

+ From 4bdaad3823992fc1a6591b8751189534ed908074 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

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

  Subject: [PATCH 2/6] Remove 'More from Mozilla' section in Preferences
@@ -115,7 +115,7 @@ 

   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 05dbb3b588..b270db5885 100644

+ index a1a2a308fe..f625803930 100644

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

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

  @@ -1235,7 +1235,7 @@ pref("browser.preferences.experimental", true);
@@ -128,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 ede2a14e9a..414b9c434c 100644

+ index c8aaef36f4..df3911dca9 100644

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

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

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

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

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

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

   
@@ -289,10 +289,10 @@ 

         </vbox>

       </vbox>

  -- 

- 2.45.2

+ 2.46.0

  

  

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

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

  From: grizzlyuser <grizzlyuser@protonmail.com>

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

  Subject: [PATCH 3/6] Remove promos of Firefox Focus and Klar from Private
@@ -312,10 +312,10 @@ 

   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 b270db5885..fe45d2e027 100644

+ index f625803930..4cc2f97965 100644

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

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

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

+ @@ -2235,7 +2235,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.
@@ -325,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 414b9c434c..0d10165a31 100644

+ index df3911dca9..dd32916808 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 = [
@@ -338,7 +338,7 @@ 

     // 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 32b7ed08fd..6cc27bf369 100644

+ index d88d2244f2..4539d205fc 100644

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

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

  @@ -494,315 +494,6 @@ const BASE_MESSAGES = () => [
@@ -658,7 +658,7 @@ 

       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 8dbb718bfd..0a06ab6a6a 100644

+ index 0e8383960e..2f414efca5 100644

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

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

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

  -</defs>

  -</svg>

  -- 

- 2.45.2

+ 2.46.0

  

  

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

+ From 4fa8aade1267f5e34e123639a25a29c674bbbb80 Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

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

  Subject: [PATCH 4/6] FSDG: Remove 'Extensions for developers' menu item
@@ -1008,7 +1008,7 @@ 

   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 392173f754..f1f532acb3 100644

+ index a360ef994c..52ebca9423 100644

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

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

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

       },

     },

  -- 

- 2.45.2

+ 2.46.0

  

  

- From 308e7538072c6a706d80f8e5d6f36a5dee7c3f1e Mon Sep 17 00:00:00 2001

+ From 2902017b64a68ef297192639c427a0928b004b0a Mon Sep 17 00:00:00 2001

  From: grizzlyuser <grizzlyuser@protonmail.com>

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

  Subject: [PATCH 5/6] FSDG: Change DuckDuckGo URL to DuckDuckGo HTML URL
@@ -1081,11 +1081,11 @@ 

  [1] https://www.gnu.org/

  [2] https://duckduckgo.com/l/?uddg=https%3A%2F%2Fwww.gnu.org%2F&rut=b1ab1ab1a...

  ---

-  .../components/search/extensions/ddg/manifest.json    | 11 +++++------

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

+  browser/components/search/extensions/ddg/manifest.json | 10 +++++-----

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

  

  diff --git a/browser/components/search/extensions/ddg/manifest.json b/browser/components/search/extensions/ddg/manifest.json

- index 1e1bffed47..14b6cf9f5a 100644

+ index 104eee6457..9a3279c622 100644

  --- a/browser/components/search/extensions/ddg/manifest.json

  +++ b/browser/components/search/extensions/ddg/manifest.json

  @@ -1,6 +1,6 @@
@@ -1095,15 +1095,14 @@ 

  +  "name": "DuckDuckGo HTML",

  +  "description": "Search DuckDuckGo HTML",

     "manifest_version": 2,

-    "version": "1.4",

+    "version": "1.5",

     "browser_specific_settings": {

- @@ -16,10 +16,9 @@

+ @@ -12,9 +12,9 @@

     "chrome_settings_overrides": {

       "search_provider": {

         "keyword": ["@duckduckgo", "@ddg"],

  -      "name": "DuckDuckGo",

  -      "search_url": "https://duckduckgo.com/",

- -      "search_form": "https://duckduckgo.com/",

  -      "search_url_get_params": "t=ffab&q={searchTerms}",

  +      "name": "DuckDuckGo HTML",

  +      "search_url": "https://html.duckduckgo.com/html/",
@@ -1112,10 +1111,10 @@ 

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

       }

  -- 

- 2.45.2

+ 2.46.0

  

  

- From 4639ad8fa487622f6de966804a366e9df45376a2 Mon Sep 17 00:00:00 2001

+ From 0c7f18221b09cceb576d5e8c42ffad28fad4c9dd Mon Sep 17 00:00:00 2001

  From: various_authors <various_authors@parabola.nu>

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

  Subject: [PATCH 6/6] FSDG: Various patches
@@ -1239,10 +1238,10 @@ 

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

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

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

- index ac13d4fdcd..63951dc2fb 100644

+ index dfbf89fc21..0410f60294 100644

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

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

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

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

       .label = Sign in to sync…

       .accesskey = i

   
@@ -1346,5 +1345,5 @@ 

  --firefoxview-brand-name = Firefox View

  +-firefoxview-brand-name = Iceweasel View

  -- 

- 2.45.2

+ 2.46.0

  

file modified
+25 -24
@@ -70,9 +70,9 @@ 

  

  pkgname=iceweasel

  epoch=1

- pkgver=128.0

+ pkgver=129.0

  pkgrel=1

- _brandingver=126.0

+ _brandingver=129.0

  _brandingrel=1

  pkgdesc="Fast, Private & Safe Web Browser"

  url=https://wiki.parabola.nu/Iceweasel
@@ -185,7 +185,7 @@ 

    BFA8008A8265677063B11BF47171986E4B745536 # Andreas Grapentin (branding source-ball)

    3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40 # bill-auger        (libre source-ball)

  )

- sha256sums=('65271ffefb235ea1e162a081f2074a0f06fce27b2f613f573c126ba8eef95172'

+ sha256sums=('4b9ff955de7099f09aa1f00985e34695fa1a911e56c2d46cb4d60c3bff3d9174'

              'SKIP'

                                                                                  # $pkgname-symbolic.svg

              '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58'  # $pkgname.desktop
@@ -196,7 +196,7 @@ 

                   'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1'  # firefox-111.0.1-fdlibm.patch

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

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

- b2sums=('a50c7ded69d86c9d45475e701f83295ab6ccfc4eb59d9c91379504bc35dd0e7e1fb59e8c7737684709fe62969b9762e2960fa90607c83f9e8d637b78e60f56b3'

+ b2sums=('abd8b0008dfd0948234baf7c307c42051e2f58a9c7ebd07b3b0dec9bdb6d8d78e4e1ae25d552aba8685e8b307dbdeb1360d873fef98ac108671dbbbc53c2a3af'

          'SKIP'

                                                                                                                                               # $pkgname-symbolic.svg

          'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635'   # $pkgname.desktop
@@ -235,19 +235,19 @@ 

              9003-FSDG-urihandlers.patch

              9004-FSDG-misc.patch

              process-json-files.py )

- mksha256sums+=( 'ed928297fa87bf292bc477f58a2d07d5a0e9d27418138624af8aee1e38494ced'   # *.branding.tar.xz

+ mksha256sums+=( '2b5ad32521042ebef71a5f650ed066b50be45c8b0252132e5fd1df49e9122098'   # *.branding.tar.xz

                  'SKIP'

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

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

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

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

+                 '6c636d417d32e9836b8ca3e172fb13552e759885d2a29dffb0fbd945ab00878e'   # 9001-FSDG-sync-remote-settings-with-local-dump.patch

+                 '3dcf58c7e339338c7aee5507da6e9b4b887a7e7fd52aeb27af58f2e167317166'   # 9002-FSDG-preference-defaults.patch

+                 '2de7f85cc16e0a08ce6c360e29f334e483ba96dccd6ea2ff13771ba41f552fa8'   # 9003-FSDG-urihandlers.patch

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

                  '74d8a6172f3013ecae99974cd046481ebb347d38f04e264b285ff6183db0baee' ) # process-json-files.py

- mkb2sums+=( 'c6833d2edc84ca2b4cc4e10d8d5a5b37d9764c2ab6bf1ecd7658b270ab93fabda42742c81cd13e8892ad66a1569547564ba5312d561b13ac24daff151ebc4485'   # *.branding.tar.xz

+ mkb2sums+=( '9cf176b7613c5665a5218ec69445479ae471614ca57f920e8affb0906f5ec39132af4f3bd109100211ae496cca46fa550e170c86e4d5c04680b35e093081936b'   # *.branding.tar.xz

              'SKIP'

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

-             '9d48f2b9b02d9633784f931a2d7bba9f3cce1633a3afa8fdafc4387662ed92018e5a0e0322e1dfbb01e45080278987f4b014c506348193b20a766d1e8e109a94'   # 9002-FSDG-preference-defaults.patch

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

-             '7a31ca0a353b50f000ba3ec5ef6178fe3375b01e681bbae3e668f9a4fc03423117f7cfb03425bd73db306372f9660265e8f9599ff7abe630b1bccd5c818c629e'   # 9004-FSDG-misc.patch

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

+             '81c64e74ed60355bf6a65a3887a6a037222e3190796ff790576d90a8577ce368a2d9fc477c892e3513d4892efd84204a067982d9dab762e0f07ca6c219fcb1cc'   # 9002-FSDG-preference-defaults.patch

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

+             '6931d79e0860202cf5fcc6ee784ee1b4fb3973158f1760ac07cbf5e4439ef30efe11aace16ef6b32ff4eab0bbf1fef7496cd9585b31f5e6ec2d39cc8c1164ad0'   # 9004-FSDG-misc.patch

              'e887b22ca3837f2be0aa1e6d86ea74b56b198b596ea14154a20ce3c16b71310e907503ae47863f84214797a68d451c06100d12bda2fd963a8ad1b380dd441fbe' ) # process-json-files.py

  source=( https://repo.parabola.nu/other/${pkgname}/${pkgname}-${pkgver}.tar.zst{,.sig}

           ${source[*]:${_N_MKSOURCES}} )
@@ -755,16 +755,17 @@ 

    for size in 16 22 24 32 48 64 128 256

    do  rsvg-convert -w ${size} -h ${size}  iceweasel_icon.svg -o default${size}.png

    done

-   cp                     iceweasel_logo.svg              content/aboutlogins.svg

-   cp                     iceweasel_logo.svg              content/about-logo.svg

- #   cp                     iceweasel_logo.svg              content/about-logo.svg # RuntimeError: File "about-logo.svg" not found in browser/branding/iceweasel/content

-   rsvg-convert -a -w 192 iceweasel_logo.svg           -o content/about-logo.png

-   rsvg-convert -a -w 384 iceweasel_logo.svg           -o content/about-logo@2x.png

-   cp                     content/about-logo.png          content/about-logo-private.png

-   cp                     content/about-logo@2x.png       content/about-logo-private@2x.png

-   echo "${blank_svg}"                                  > content/${pkgname}-symbolic.svg # TODO: branding package

-   cp                     content/${pkgname}-symbolic.svg "${srcdir}"/${pkgname}-symbolic.svg # minimize diff (in package())

-   cp                     ../unofficial/document.ico      document.ico

+   cp                     iceweasel_logo.svg                        content/aboutlogins.svg

+   cp                     iceweasel_logo.svg                        content/about-logo.svg

+ #   cp                     iceweasel_logo.svg                        content/about-logo.svg # RuntimeError: File "about-logo.svg" not found in browser/branding/iceweasel/content

+   rsvg-convert -a -w 192 iceweasel_logo.svg                     -o content/about-logo.png

+   rsvg-convert -a -w 384 iceweasel_logo.svg                     -o content/about-logo@2x.png

+   cp                     content/about-logo.png                    content/about-logo-private.png

+   cp                     content/about-logo@2x.png                 content/about-logo-private@2x.png

+   echo "${blank_svg}"                                            > content/${pkgname}-symbolic.svg # TODO: branding package

+   cp                     content/${pkgname}-symbolic.svg           "${srcdir}"/${pkgname}-symbolic.svg # minimize diff (in package())

+   cp                     ../unofficial/document.ico                document.ico

+   cp                     ../unofficial/content/document_pdf.svg    content/document_pdf.svg

  

    popd > /dev/null

  

Built for x86_64 with PGO with zram trickery mentioned in https://pagure.io/abslibre/pull-request/89

Didn't try to build on i686 and armv7h, also didn't check if there were any updates from their upstreams, sorry for that.

rebased onto ef79a7f

4 months ago

rebased onto ef79a7f

3 months ago

rebased onto 536e58d

3 months ago

Pull-Request has been closed by grizzlyuser

3 months ago