add patches

2023-10-26 23:08:06 +02:00 · 2023-10-26 23:08:06 +02:00 · a3a9f10f36
parent 85553af73e
commit a3a9f10f36
2 changed files with 81 additions and 0 deletions
--- a/patches/0002-disable-pocket.patch
+++ b/patches/0002-disable-pocket.patch
@ -0,0 +1,38 @@
+diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
+index b3a09ea31391c..ab99059eb36f3 100644
+--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
+@@ -5273,8 +5273,6 @@ var XULBrowserWindow = {
+
+     SafeBrowsingNotificationBox.onLocationChange(aLocationURI);
+
+-    SaveToPocket.onLocationChange(window);
+-
+     let originalURI;
+     if (aRequest instanceof Ci.nsIChannel) {
+       originalURI = aRequest.originalURI;
+diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs
+index 78a7d7e456f4c..5e64ee8310b27 100644
+--- a/browser/components/BrowserGlue.sys.mjs
+++ b/browser/components/BrowserGlue.sys.mjs
+@@ -1421,8 +1421,6 @@ BrowserGlue.prototype = {
+       lazy.Normandy.init();
+     }
+
+-    lazy.SaveToPocket.init();
+-
+     lazy.ResetPBMPanel.init();
+
+     AboutHomeStartupCache.init();
+diff --git a/browser/components/moz.build b/browser/components/moz.build
+index 0c59bb842172a..c0d32e13ef06f 100644
+--- a/browser/components/moz.build
+++ b/browser/components/moz.build
+@@ -44,7 +44,6 @@ DIRS += [
+     "originattributes",
+     "pagedata",
+     "places",
+-    "pocket",
+     "preferences",
+     "privatebrowsing",
+     "prompts",
--- a/patches/0003-disable-unwanted-requests.patch
+++ b/patches/0003-disable-unwanted-requests.patch
@ -0,0 +1,43 @@
+diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js
+index cb7c26e..b1a56e9 100644
+--- a/browser/components/newtab/data/content/activity-stream.bundle.js
+++ b/browser/components/newtab/data/content/activity-stream.bundle.js
+@@ -1576,7 +1576,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent {
+         label = /*#__PURE__*/external_React_default().createElement("span", null, "remote settings (", /*#__PURE__*/external_React_default().createElement("a", {
+           className: "providerUrl",
+           target: "_blank",
+-          href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records",
+          href: "https://see.ticket.about.this.invalid",
+           rel: "noopener noreferrer"
+         }, "nimbus-desktop-experiments"), ")");
+       }
+diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
+index 23d6bf1..4affc89 100644
+--- a/services/settings/Utils.sys.mjs
+++ b/services/settings/Utils.sys.mjs
+@@ -51,6 +51,9 @@ ChromeUtils.defineLazyGetter(lazy, "isRunningTests", () => {
+ // Overriding the server URL is normally disabled on Beta and Release channels,
+ // except under some conditions.
+ ChromeUtils.defineLazyGetter(lazy, "allowServerURLOverride", () => {
+
+  return true; // always override in SL
+
+   if (!AppConstants.RELEASE_OR_BETA) {
+     // Always allow to override the server URL on Nightly/DevEdition.
+     return true;
+diff --git a/toolkit/components/search/SearchUtils.sys.mjs b/toolkit/components/search/SearchUtils.sys.mjs
+index c876a50708439..4847d2f997e38 100644
+--- a/toolkit/components/search/SearchUtils.sys.mjs
+++ b/toolkit/components/search/SearchUtils.sys.mjs
+@@ -150,9 +150,9 @@ export var SearchUtils = {
+
+   ENGINES_URLS: {
+     "prod-main":
+-      "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-config/records",
+      "https://%.invalid",
+     "prod-preview":
+-      "https://firefox.settings.services.mozilla.com/v1/buckets/main-preview/collections/search-config/records",
+      "https://%.invalid",
+     "stage-main":
+       "https://firefox.settings.services.allizom.org/v1/buckets/main/collections/search-config/records",
+     "stage-preview":