remove pocket integration with patch from aur/firefox-esr-privacy

3 files changed, 97 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5aa26d52d42f..719b2079ab56 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Oct 20 04:02:00 UTC 2017
+# Sat Nov 11 19:14:28 UTC 2017
 pkgbase = firefox-esr-gtk2
 	pkgdesc = Standalone web browser from mozilla.org, Extended Support Release
 	pkgver = 52.4.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.mozilla.org/en-US/firefox/organizations/
 	arch = i686
 	arch = x86_64
@@ -57,6 +57,7 @@ pkgbase = firefox-esr-gtk2
 	source = rust-i686.patch
 	source = make_SystemResourceMonitor.stop_more_resilient_to_errors.patch
 	source = nvidia-GLSL-version.patch
+	source = firefox-52-disable-pocket-leftovers.patch
 	sha256sums = 96fab11b7e5bd016f80718161ee8dd8afdf989a2cd03106a148b15def2569457
 	sha256sums = ada313750e6fb14558b37c764409a17c1672a351a46c73b350aa1fe4ea9220ef
 	sha256sums = a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9
@@ -67,6 +68,7 @@ pkgbase = firefox-esr-gtk2
 	sha256sums = f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269
 	sha256sums = 7760ebe71f4057cbd2f52b715abaf0d944c14c39e2bb2a5322114ad8451e12d9
 	sha256sums = d8c5c30589c0e176d260a5814f3cb99e94267b3185ab40ff01bf33a58f375d6a
+	sha256sums = d6760634e4926ce5ad0df501d06139a5e693d7058e671a195c9e0b54197c1d96
 
 pkgname = firefox-esr-gtk2
 
diff --git a/PKGBUILD b/PKGBUILD
index d33e421c27a0..a4e5ef03124a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=firefox-esr-gtk2
 _pkgname=firefox-esr
 pkgver=52.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone web browser from mozilla.org, Extended Support Release"
 arch=(i686 x86_64)
 license=(MPL GPL LGPL)
@@ -31,7 +31,8 @@ source=(https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox
         glibc-2.26-fix.diff
         rust-i686.patch
         make_SystemResourceMonitor.stop_more_resilient_to_errors.patch
-        nvidia-GLSL-version.patch)
+        nvidia-GLSL-version.patch
+        firefox-52-disable-pocket-leftovers.patch)
 sha256sums=('96fab11b7e5bd016f80718161ee8dd8afdf989a2cd03106a148b15def2569457'
             'ada313750e6fb14558b37c764409a17c1672a351a46c73b350aa1fe4ea9220ef'
             'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9'
@@ -41,7 +42,8 @@ sha256sums=('96fab11b7e5bd016f80718161ee8dd8afdf989a2cd03106a148b15def2569457'
             'cd7ff441da66a287f8712e60cdc9e216c30355d521051e2eaae28a66d81915e8'
             'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269'
             '7760ebe71f4057cbd2f52b715abaf0d944c14c39e2bb2a5322114ad8451e12d9'
-            'd8c5c30589c0e176d260a5814f3cb99e94267b3185ab40ff01bf33a58f375d6a')
+            'd8c5c30589c0e176d260a5814f3cb99e94267b3185ab40ff01bf33a58f375d6a'
+            'd6760634e4926ce5ad0df501d06139a5e693d7058e671a195c9e0b54197c1d96')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -80,6 +82,12 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1384062
   patch -Np1 -i ../make_SystemResourceMonitor.stop_more_resilient_to_errors.patch
 
+  ## Patch from aur/firefox-esr-privacy ##
+  # Disable Pocket integration
+  patch -Np1 -i "$srcdir"/firefox-${_basever}-disable-pocket-leftovers.patch
+  # Remove pocket source directory
+  rm -fr browser/extensions/pocket
+
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1382358
   # https://hg.mozilla.org/integration/mozilla-inbound/rev/4a5185552a07
 #  patch -Np1 -i ../nvidia-GLSL-version.patch
diff --git a/firefox-52-disable-pocket-leftovers.patch b/firefox-52-disable-pocket-leftovers.patch
new file mode 100644
index 000000000000..a6a0172dd6b3
--- /dev/null
+++ b/firefox-52-disable-pocket-leftovers.patch
@@ -0,0 +1,82 @@
+--- firefox-52.0esr.bak/browser/app/profile/firefox.js	2017-03-09
++++ firefox-52.0esr/browser/app/profile/firefox.js	2017-03-09
+@@ -1525,8 +1525,6 @@
+ // Enable browser frames for use on desktop.  Only exposed to chrome callers.
+ pref("dom.mozBrowserFramesEnabled", true);
+ 
+-pref("extensions.pocket.enabled", true);
+-
+ pref("signon.schemeUpgrades", true);
+ 
+ // "Simplify Page" feature in Print Preview. This feature is disabled by default
+--- firefox-52.0esr.bak/browser/components/uitour/UITour.jsm	2017-03-09
++++ firefox-52.0esr/browser/components/uitour/UITour.jsm	2017-03-09
+@@ -154,11 +154,6 @@
+       query: "#panic-button",
+       widgetName: "panic-button",
+     }],
+-    ["pocket", {
+-      allowAdd: true,
+-      query: "#pocket-button",
+-      widgetName: "pocket-button",
+-    }],
+     ["privateWindow",  {query: "#privatebrowsing-button"}],
+     ["quit",        {query: "#PanelUI-quit"}],
+     ["readerMode-urlBar", {query: "#reader-mode-button"}],
+@@ -1688,46 +1683,6 @@
+         popup.addEventListener("popupshown", onPopupShown);
+       }
+       aWindow.document.getElementById("identity-box").click();
+-    } else if (aMenuName == "pocket") {
+-      this.getTarget(aWindow, "pocket").then(Task.async(function* onPocketTarget(target) {
+-        let widgetGroupWrapper = CustomizableUI.getWidget(target.widgetName);
+-        if (widgetGroupWrapper.type != "view" || !widgetGroupWrapper.viewId) {
+-          log.error("Can't open the pocket menu without a view");
+-          return;
+-        }
+-        let placement = CustomizableUI.getPlacementOfWidget(target.widgetName);
+-        if (!placement || !placement.area) {
+-          log.error("Can't open the pocket menu without a placement");
+-          return;
+-        }
+-
+-        if (placement.area == CustomizableUI.AREA_PANEL) {
+-          // Open the appMenu and wait for it if it's not already opened or showing a subview.
+-          yield new Promise((resolve, reject) => {
+-            if (aWindow.PanelUI.panel.state != "closed") {
+-              if (aWindow.PanelUI.multiView.showingSubView) {
+-                reject("A subview is already showing");
+-                return;
+-              }
+-
+-              resolve();
+-              return;
+-            }
+-
+-            aWindow.PanelUI.panel.addEventListener("popupshown", function onShown() {
+-              aWindow.PanelUI.panel.removeEventListener("popupshown", onShown);
+-              resolve();
+-            });
+-
+-            aWindow.PanelUI.show();
+-          });
+-        }
+-
+-        let widgetWrapper = widgetGroupWrapper.forWindow(aWindow);
+-        aWindow.PanelUI.showSubView(widgetGroupWrapper.viewId,
+-                                    widgetWrapper.anchor,
+-                                    placement.area);
+-      })).catch(log.error);
+     }
+   },
+ 
+--- firefox-52.0esr.bak/browser/extensions/moz.build	2017-03-09
++++ firefox-52.0esr/browser/extensions/moz.build	2017-03-09
+@@ -8,7 +8,6 @@
+     'aushelper',
+     'e10srollout',
+     'pdfjs',
+-    'pocket',
+     'webcompat',
+ ]
+