diff --git a/helpers/DATA/firefox/disable-activity-streams.patch b/helpers/DATA/firefox/disable-activity-streams.patch index d425b4f29460fa28864c13245ea04438b771b14e..ec88e836ba26c7ed15c8329ad0d361c49e862193 100644 --- a/helpers/DATA/firefox/disable-activity-streams.patch +++ b/helpers/DATA/firefox/disable-activity-streams.patch @@ -1,6 +1,6 @@ -diff -ru firefox-57.0+build4.orig/browser/extensions/activity-stream/lib/ActivityStream.jsm firefox-57.0+build4/browser/extensions/activity-stream/lib/ActivityStream.jsm ---- firefox-57.0+build4.orig/browser/extensions/activity-stream/lib/ActivityStream.jsm 2017-11-13 05:15:36.000000000 -0500 -+++ firefox-57.0+build4/browser/extensions/activity-stream/lib/ActivityStream.jsm 2017-11-22 15:28:45.835676239 -0500 +diff -ru firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/ActivityStream.jsm firefox-58.0+build6/browser/extensions/activity-stream/lib/ActivityStream.jsm +--- firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/ActivityStream.jsm 2018-01-22 17:33:33.000000000 +0000 ++++ firefox-58.0+build6/browser/extensions/activity-stream/lib/ActivityStream.jsm 2018-01-24 16:00:23.580412017 +0000 @@ -26,14 +26,7 @@ const DEFAULT_SITES = new Map([ @@ -17,24 +17,26 @@ diff -ru firefox-57.0+build4.orig/browser/extensions/activity-stream/lib/Activit ]); const GEO_PREF = "browser.search.region"; const REASON_ADDON_UNINSTALL = 6; -@@ -60,11 +53,11 @@ +@@ -60,12 +53,12 @@ provider_description: "pocket_description", provider_icon: "pocket", provider_name: "Pocket", -- read_more_endpoint: "https://getpocket.cdn.mozilla.net/explore/trending?src=fx_new_tab", +- read_more_endpoint: "https://getpocket.com/explore/trending?src=fx_new_tab", - stories_endpoint: `https://getpocket.cdn.mozilla.net/v3/firefox/global-recs?version=2&consumer_key=$apiKey&locale_lang=${args.locale}`, -- stories_referrer: "https://getpocket.com/recommendations", +- stories_referrer: "http://getpocket.com/recommendations", - info_link: "https://www.mozilla.org/privacy/firefox/#pocketstories", +- disclaimer_link: "https://getpocket.cdn.mozilla.net/firefox/new_tab_learn_more", - topics_endpoint: `https://getpocket.cdn.mozilla.net/v3/firefox/trending-topics?version=2&consumer_key=$apiKey&locale_lang=${args.locale}`, + read_more_endpoint: "http://127.0.0.1/", + stories_endpoint: `http://127.0.0.1/`, + stories_referrer: "http://127.0.0.1/", + info_link: "http://127.0.0.1/", ++ disclaimer_link: "http://127.0.0.1/", + topics_endpoint: `http://127.0.0.1}`, show_spocs: false, - personalized: false + personalized: true }) -@@ -95,7 +88,7 @@ +@@ -100,11 +93,11 @@ }], ["disableSnippets", { title: "Disable snippets on activity stream", @@ -42,16 +44,13 @@ diff -ru firefox-57.0+build4.orig/browser/extensions/activity-stream/lib/Activit + value: true }], ["showTopSites", { - title: "Show the Top Sites section on the New Tab page", -@@ -183,14 +176,14 @@ - "CA": ["en-US", "en-GB", "en-ZA"], - "DE": ["de", "de-DE", "de-AT", "de-CH"] - })[geo]; -- return !!locales && locales.includes(locale); -+ return false; - } - }, - { + title: "Show the Top Sites section", +- value: true ++ value: false + }], + ["collapseTopSites", { + title: "Collapse the Top Sites section", +@@ -197,7 +190,7 @@ name: "snippets", factory: () => new SnippetsFeed(), title: "Gets snippets data", @@ -60,7 +59,7 @@ diff -ru firefox-57.0+build4.orig/browser/extensions/activity-stream/lib/Activit }, { name: "systemtick", -@@ -202,7 +195,7 @@ +@@ -209,7 +202,7 @@ name: "telemetry", factory: () => new TelemetryFeed(), title: "Relays telemetry-related actions to PingCentre", @@ -68,4 +67,4 @@ diff -ru firefox-57.0+build4.orig/browser/extensions/activity-stream/lib/Activit + value: false }, { - name: "topsites", + name: "favicon",