From 367443cce1807354af9ef8dc6b50d3d61ceaf962 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Mon, 25 Jul 2022 16:56:27 +0200 Subject: [PATCH] patch fix --- .../sed-patches/stop-undesired-requests.patch | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/patches/sed-patches/stop-undesired-requests.patch b/patches/sed-patches/stop-undesired-requests.patch index 79caa68..33630d1 100644 --- a/patches/sed-patches/stop-undesired-requests.patch +++ b/patches/sed-patches/stop-undesired-requests.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js -index 34395476104e..83bc25d7fc62 100644 +index cb7c26e..b1a56e9 100644 --- a/browser/components/newtab/data/content/activity-stream.bundle.js +++ b/browser/components/newtab/data/content/activity-stream.bundle.js -@@ -1577,7 +1577,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent { +@@ -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", @@ -12,25 +12,24 @@ index 34395476104e..83bc25d7fc62 100644 }, "nimbus-desktop-experiments"), ")"); } diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm -index 31ad77d28678..cca446b6fbde 100644 +index 23d6bf1..4affc89 100644 --- a/services/settings/Utils.jsm +++ b/services/settings/Utils.jsm -@@ -60,6 +60,10 @@ XPCOMUtils.defineLazyGetter(this, "isRunningTests", () => { +@@ -62,6 +62,9 @@ XPCOMUtils.defineLazyGetter(lazy, "isRunningTests", () => { // Overriding the server URL is normally disabled on Beta and Release channels, // except under some conditions. - XPCOMUtils.defineLazyGetter(this, "allowServerURLOverride", () => { + XPCOMUtils.defineLazyGetter(lazy, "allowServerURLOverride", () => { + -+ // always allow this override for librewolf -+ return true; ++ return true; // always allow this override for LW + if (!AppConstants.RELEASE_OR_BETA) { // Always allow to override the server URL on Nightly/DevEdition. return true; diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm -index 0bf60e5f163a..bcb685efe68d 100644 +index a3100fa..c7bf03b 100644 --- a/toolkit/components/search/SearchUtils.jsm +++ b/toolkit/components/search/SearchUtils.jsm -@@ -158,9 +158,9 @@ var SearchUtils = { +@@ -157,9 +157,9 @@ var SearchUtils = { ENGINES_URLS: { "prod-main": @@ -43,10 +42,10 @@ index 0bf60e5f163a..bcb685efe68d 100644 "https://settings.stage.mozaws.net/v1/buckets/main/collections/search-config/records", "stage-preview": diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm -index 7f8ac95dd962..334003b3e005 100644 +index 9311d06..eb6cda1 100644 --- a/toolkit/modules/AppConstants.jsm +++ b/toolkit/modules/AppConstants.jsm -@@ -422,7 +422,7 @@ this.AppConstants = Object.freeze({ +@@ -425,7 +425,7 @@ var AppConstants = Object.freeze({ #ifdef MOZ_THUNDERBIRD "https://thunderbird-settings.thunderbird.net/v1", #else