diff --git a/helpers/DATA/firefox/branding/default128.png b/helpers/DATA/firefox/branding/default128.png
new file mode 100644
index 0000000000000000000000000000000000000000..09547088a1a92670f45c4ae7b145a9ca2ebc4051
Binary files /dev/null and b/helpers/DATA/firefox/branding/default128.png differ
diff --git a/helpers/DATA/firefox/branding/default64.png b/helpers/DATA/firefox/branding/default64.png
new file mode 100644
index 0000000000000000000000000000000000000000..deab8059f57ad8d055ffb8e73fee5e1dfdce1fae
Binary files /dev/null and b/helpers/DATA/firefox/branding/default64.png differ
diff --git a/helpers/DATA/firefox/disable-activity-streams.patch b/helpers/DATA/firefox/disable-activity-streams.patch
index 7ff84c948edbed8155773ae5bb246d530332fc39..6b8bc74829196824d14523f9c76290d9bd37e1b5 100644
--- a/helpers/DATA/firefox/disable-activity-streams.patch
+++ b/helpers/DATA/firefox/disable-activity-streams.patch
@@ -1,6 +1,5 @@
-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 23:19:12.842155717 +0000
+--- a/browser/extensions/activity-stream/lib/ActivityStream.jsm 2018-03-15 21:41:38.000000000 -0400
++++ b/browser/extensions/activity-stream/lib/ActivityStream.jsm 2018-03-17 01:26:49.040525184 -0400
@@ -26,14 +26,7 @@
const DEFAULT_SITES = new Map([
@@ -13,11 +12,11 @@ diff -ru firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/Activit
- ["RU", "https://vk.com/,https://www.youtube.com/,https://ok.ru/,https://www.avito.ru/,https://www.aliexpress.com/,https://www.wikipedia.org/"],
- ["GB", "https://www.youtube.com/,https://www.facebook.com/,https://www.reddit.com/,https://www.amazon.co.uk/,https://www.bbc.co.uk/,https://www.ebay.co.uk/"],
- ["FR", "https://www.youtube.com/,https://www.facebook.com/,https://www.wikipedia.org/,https://www.amazon.fr/,https://www.leboncoin.fr/,https://twitter.com/"]
-+ [""]
++ [""],
]);
const GEO_PREF = "browser.search.region";
const REASON_ADDON_UNINSTALL = 6;
-@@ -60,19 +53,19 @@
+@@ -56,19 +49,19 @@
provider_description: "pocket_description",
provider_icon: "pocket",
provider_name: "Pocket",
@@ -25,7 +24,7 @@ diff -ru firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/Activit
- stories_endpoint: `https://getpocket.cdn.mozilla.net/v3/firefox/global-recs?version=2&consumer_key=$apiKey&locale_lang=${args.locale}`,
- 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",
+- disclaimer_link: "https://getpocket.com/firefox/new_tab_learn_more.php",
- 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/`,
@@ -44,7 +43,7 @@ diff -ru firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/Activit
}],
["filterAdult", {
title: "Remove adult pages from sites, highlights, etc.",
-@@ -100,7 +93,7 @@
+@@ -96,7 +89,7 @@
}],
["disableSnippets", {
title: "Disable snippets on activity stream",
@@ -53,7 +52,7 @@ diff -ru firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/Activit
}],
["showTopSites", {
title: "Show the Top Sites section",
-@@ -116,12 +109,12 @@
+@@ -112,12 +105,12 @@
}],
["telemetry", {
title: "Enable system error and usage data collection",
@@ -68,7 +67,7 @@ diff -ru firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/Activit
}],
["section.highlights.collapsed", {
title: "Collapse the Highlights section",
-@@ -137,7 +130,7 @@
+@@ -133,7 +126,7 @@
}],
["tippyTop.service.endpoint", {
title: "Tippy Top service manifest url",
@@ -77,7 +76,7 @@ diff -ru firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/Activit
}]
]);
-@@ -190,14 +183,14 @@
+@@ -186,14 +179,14 @@
"CA": ["en-US", "en-GB", "en-ZA"],
"DE": ["de", "de-DE", "de-AT", "de-CH"]
})[geo];
@@ -94,7 +93,7 @@ diff -ru firefox-58.0+build6.orig/browser/extensions/activity-stream/lib/Activit
},
{
name: "systemtick",
-@@ -209,7 +202,7 @@
+@@ -205,7 +198,7 @@
name: "telemetry",
factory: () => new TelemetryFeed(),
title: "Relays telemetry-related actions to PingCentre",
diff --git a/helpers/DATA/firefox/onboarding/onboarding.js b/helpers/DATA/firefox/onboarding/onboarding.js
index e8984b72e91da097e76403f3bbc8631733653e02..17899be5020b1f2ea5cd51e3f2f415b70e95afcb 100644
--- a/helpers/DATA/firefox/onboarding/onboarding.js
+++ b/helpers/DATA/firefox/onboarding/onboarding.js
@@ -64,6 +64,15 @@ class Onboarding {
onvalue: "https://shavar.services.mozilla.com/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2",
offvalue: "",
},
+ "privacy.firstparty.isolate": {
+ type: "boolean",
+ name: "privacy.firstparty.isolate",
+ label: "Isolate requests to First Party domains",
+ description: "This <a href=\"https://www.torproject.org/projects/torbrowser/design/#identifier-linkability\">improves privacy</a>, but it may interfere with login into some sites.",
+ defaultvalue: false,
+ onvalue: true,
+ offvalue: false,
+ },
"extensions.update.enabled": {
type: "boolean",
name: "extensions.update.enabled",
diff --git a/helpers/DATA/firefox/searchplugins/searchplugins.conf b/helpers/DATA/firefox/searchplugins/searchplugins.conf
index f848056014229667ceb8ebf428c7efb9aa51e2a7..499b88ec8e59970cd85d0306c5b832c905db24a3 100644
--- a/helpers/DATA/firefox/searchplugins/searchplugins.conf
+++ b/helpers/DATA/firefox/searchplugins/searchplugins.conf
@@ -2,7 +2,7 @@
"overrides": [
{
"name": "Amazon",
- "include_locales": [ "af", "ar", "as", "az", "bg", "bn-IN", "br", "cak", "cy", "da", "de", "el", "en-GB", "en-US", "en-ZA", "eo", "es-AR", "eu", "fa", "fr", "ga-IE", "gd", "gl", "gn", "hr", "hsb", "hy-AM", "is", "it", "ja", "ka", "km", "kn", "ku", "lt", "mk", "mr", "ms", "my", "nb-NO", "nn-NO", "or", "pt-PT", "ro", "si", "son", "sq", "sr", "te", "th", "ur", "uz", "zh-CN", "zu"],
+ "include_locales": [ "af", "ar", "as", "az", "bg", "bn-IN", "br", "cak", "cy", "da", "de", "el", "en-GB", "en-US", "en-ZA", "eo", "es-AR", "eu", "fa", "fr", "ga-IE", "gd", "gl", "gn", "hr", "hsb", "hy-AM", "ia", "is", "it", "ja", "ka", "km", "kn", "ku", "lt", "mk", "mr", "ms", "my", "nb-NO", "nn-NO", "or", "pt-PT", "ro", "si", "son", "sq", "sr", "te", "th", "ur", "uz", "zh-CN", "zu"],
"exclude_locales": [],
"match": "amazondotcom.xml",
"source": "en-US/amazondotcom.xml",
diff --git a/helpers/make-firefox b/helpers/make-firefox
index 608027dec311e6857594d5bef714699c7ad8ad92..5682263a5189f5fafc68efc7b8052b01f94b4428 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -160,12 +160,9 @@ echo "Running batch replace operation"
find . -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -execdir /bin/sed --follow-symlinks -i "$SEDSCRIPT" '{}' ';'
sed -i '2s/^Source:.*/Source: firefox/' debian/control.in
-sed s/Trisquel/Mozilla/ l10n/compare-locales/scripts/compare-locales -i
-sed s/Trisquel/Mozilla/ l10n/compare-locales/setup.py -i
sed s/ubuntu/trisquel/g debian/distribution.ini -i
sed 's/ubuntu_version/trisquel_version/; s/Ubuntu 10.10/Trisquel 4.0/; s/1010/40/' -i debian/abrowser.postinst.in
-
# abrowser should provide firefox
sed '/Package: @MOZ_PKG_NAME@-dev/,/Description:/ s/Architecture: any/Architecture: any\nProvides: firefox-dev /' debian/control.in -i
sed '/Package: @MOZ_PKG_NAME@$/,/Description:/ s/Provides:/Provides: firefox, /' debian/control.in -i