fix the disable-pocket.patch

1 files changed, 31 insertions, 47 deletions

diff --git a/scripts/prep-librewolf-dpkg.sh b/scripts/prep-librewolf-dpkg.sh
index 61d8a75..0a7b496 100755
--- a/scripts/prep-librewolf-dpkg.sh
+++ b/scripts/prep-librewolf-dpkg.sh
@@ -508,53 +508,37 @@ index b32a6bf..07fd0ed 100644
     },
 EOF
    # added 111.0, updated 125.0.1
-   test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/disable-pocket.patch" <<'EOF'
-diff --git a/patches/librewolf/disable-pocket.patch b/patches/librewolf/disable-pocket.patch
---- a/debian/patches/librewolf/disable-pocket.patch	2023-03-22 10:28:09.099519405 -0400
-+++ b/debian/patches/librewolf/disable-pocket.patch	2023-03-22 13:03:46.205211526 -0400
-@@ -1,29 +1,23 @@
--diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
--index 43c84c3..4b4aad2 100644
- --- a/browser/base/content/browser.js
- +++ b/browser/base/content/browser.js
--@@ -5478,7 +5478,6 @@ var XULBrowserWindow = {
-+@@ -5289,7 +5289,6 @@ var XULBrowserWindow = {
-  
-      SafeBrowsingNotificationBox.onLocationChange(aLocationURI);
-  
- -    SaveToPocket.onLocationChange(window);
-  
-      let originalURI;
--     if (
--diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.sys.mjs
--index b2479db..7670f08 100644
-+     if (aRequest instanceof Ci.nsIChannel) {
- --- a/browser/components/BrowserGlue.sys.mjs
- +++ b/browser/components/BrowserGlue.sys.mjs
--@@ -1274,7 +1274,6 @@ BrowserGlue.prototype = {
-+@@ -1421,7 +1421,6 @@ BrowserGlue.prototype = {
-        lazy.Normandy.init();
-      }
-  
- -    lazy.SaveToPocket.init();
-  
--     AboutHomeStartupCache.init();
-+     lazy.ResetPBMPanel.init();
-  
--diff --git a/browser/components/moz.build b/browser/components/moz.build
--index 3b2126e..32b7831 100644
- --- a/browser/components/moz.build
- +++ b/browser/components/moz.build
--@@ -44,7 +44,6 @@ DIRS += [
-+@@ -48,7 +48,6 @@ DIRS += [
-      "originattributes",
-      "pagedata",
-      "places",
- -    "pocket",
-      "preferences",
-      "privatebrowsing",
--     "prompts",
-+     "profiles",
+   test -n "1" && cat <<'EOF' > "${debian_dir}/patches/librewolf/disable-pocket.patch"
+--- a/browser/base/content/browser.js
++++ b/browser/base/content/browser.js
+@@ -5314,7 +5314,6 @@ var XULBrowserWindow = {
+ 
+     SafeBrowsingNotificationBox.onLocationChange(aLocationURI);
+ 
+-    SaveToPocket.onLocationChange(window);
+ 
+     let originalURI;
+     if (aRequest instanceof Ci.nsIChannel) {
+--- a/browser/components/BrowserGlue.sys.mjs
++++ b/browser/components/BrowserGlue.sys.mjs
+@@ -1440,7 +1440,6 @@ BrowserGlue.prototype = {
+       lazy.Normandy.init();
+     }
+ 
+-    lazy.SaveToPocket.init();
+ 
+     lazy.ResetPBMPanel.init();
+ 
+--- a/browser/components/moz.build
++++ b/browser/components/moz.build
+@@ -48,7 +48,6 @@ DIRS += [
+     "originattributes",
+     "pagedata",
+     "places",
+-    "pocket",
+     "preferences",
+     "privatebrowsing",
+     "profiles",
 EOF
    # added 109.0 to patch for debian 109.0 until defuzz-109.0 gets merged
    test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/disable-data-reporting-at-compile-time.patch" <<'EOF'