Abrowser: branding and other changes for v60

helpers/DATA/firefox/branding/abrowser.VisualElementsManifest.xml

@@ -0,0 +1,8 @@
+<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+  <VisualElements
+      ShowNameOnSquare150x150Logo='on'
+      Square150x150Logo='browser\VisualElements\VisualElements_150.png'
+      Square70x70Logo='browser\VisualElements\VisualElements_70.png'
+      ForegroundText='light'
+      BackgroundColor='#000f40'/>
+</Application>

helpers/DATA/firefox/branding/branding.nsi

@@ -9,23 +9,25 @@
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Abrowser"
+!define BrandFullName         "Abrowser"
 !define CompanyName           "Trisquel"
 !define URLInfoAbout          "http://trisquel.info/browser"
 !define URLUpdateInfo         "http://trisquel.info/wiki"
 !define HelpLink              "https://trisquel.info/en/wiki/abrowser-help"
 
-!define URLStubDownload "http://trisquel.info/browser"
-!define URLManualDownload "http://trisquel.info/browser"
-
 ; The OFFICIAL define is a workaround to support different urls for Release and
 ; Beta since they share the same branding when building with other branches that
 ; set the update channel to beta.
 !define OFFICIAL
+!define URLStubDownload32 "http://trisquel.info/browser"
+!define URLStubDownload64 "http://trisquel.info/browser"
+!define URLManualDownload "http://trisquel.info/browser"
+!define URLSystemRequirements "http://trisquel.info/browser"
 !define Channel "release"
 
 # The installer's certificate name and issuer expected by the stub installer
 !define CertNameDownload   "Mozilla Corporation"
-!define CertIssuerDownload "DigiCert Assured ID Code Signing CA-1"
+!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA"
 
 # Dialog units are used so the UI displays correctly with the system's DPI
 # settings.

helpers/DATA/firefox/branding/content/aboutDialog.css

@@ -2,20 +2,25 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#aboutDialogContainer {
+  background-color: #202340;
+  color: #fff;
+}
+
 #clientBox {
-  background-color: #F7F7F7;
-  color: #222222;
+  padding: 10px 0 15px;
 }
 
 #leftBox {
   background-image: url("chrome://branding/content/about-logo.png");
   background-repeat: no-repeat;
   background-size: 192px auto;
+  background-position: center 20%;
   /* min-width and min-height create room for the logo */
   min-width: 210px;
   min-height: 210px;
   margin-top: 20px;
-  -moz-margin-start: 30px;
+  margin-inline-start: 30px;
 }
 
 
@@ -25,14 +30,23 @@
   }
 }
 
+.text-link {
+  color: #fff !important;
+  text-decoration: underline;
+}
+
+.text-link:-moz-focusring {
+  border-color: #fff;
+}
+
 #rightBox {
   margin-left: 30px;
   margin-right: 30px;
- min-width: 300px;
 }
 
-#updateDeck > hbox > label:not([class="text-link"]) {
-  color: #909090;
+#bottomBox {
+  background-color: hsla(235, 43%, 10%, .5);
+  padding: 15px 10px 15px;
 }
 
 #trademark {
@@ -42,4 +56,3 @@
   margin-top: 10px;
   margin-bottom: 10px;
 }
-

helpers/DATA/firefox/branding/content/jar.mn

@@ -8,11 +8,10 @@ browser.jar:
   content/branding/about-logo.png
   content/branding/about-logo@2x.png
   content/branding/about-wordmark.svg
-  content/branding/icon48.png
-  content/branding/icon64.png
   content/branding/icon16.png                    (../default16.png)
   content/branding/icon32.png                    (../default32.png)
-  content/branding/icon128.png                   (../mozicon128.png)
+  content/branding/icon48.png                    (../default48.png)
+  content/branding/icon64.png                    (../default64.png)
+  content/branding/icon128.png                   (../default128.png)
   content/branding/identity-icons-brand.svg
-  content/branding/silhouette-40.svg
   content/branding/aboutDialog.css

helpers/DATA/firefox/branding/content/moz.build

@@ -1,4 +1,4 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

helpers/DATA/firefox/branding/locales/en-US/brand.ftl

@@ -0,0 +1,5 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+-brand-short-name = Abrowser

helpers/DATA/firefox/branding/locales/en-US/brand.properties

@@ -7,10 +7,4 @@ brandShortName=Abrowser
 brandFullName=Abrowser
 vendorShortName=Trisquel
 
-homePageSingleStartMain=Abrowser Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
-
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
-
 syncBrandShortName=Sync

helpers/DATA/firefox/branding/locales/jar.mn

@@ -3,6 +3,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+[localization] @AB_CD@.jar:
+  branding                                          (%*.ftl)
 
 @AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/

helpers/DATA/firefox/branding/locales/moz.build

@@ -1,4 +1,4 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

helpers/DATA/firefox/branding/moz.build

@@ -1,4 +1,4 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this

helpers/DATA/firefox/branding/pref/abrowser-branding.js

@@ -2,27 +2,36 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-pref("startup.homepage_override_url","http://trisquel.info");
-pref("startup.homepage_welcome_url","http://trisquel.info/welcome");
-// The time interval between checks for a new version (in seconds)
-// nightly=8 hours, official=24 hours
-pref("app.update.interval", 86400);
+pref("startup.homepage_override_url","https://trisquel.info");
+pref("startup.homepage_welcome_url","https://trisquel.info/welcome");
+pref("startup.homepage_welcome_url.additional", "");
+// Interval: Time between checks for a new version (in seconds)
+pref("app.update.interval", 43200); // 12 hours
 // The time interval between the downloading of mar file chunks in the
 // background (in seconds)
-pref("app.update.download.backgroundInterval", 60);
+// 0 means "download everything at once"
+pref("app.update.download.backgroundInterval", 0);
+// Give the user x seconds to react before showing the big UI. default=192 hours
+pref("app.update.promptWaitTime", 691200);
 // URL user can browse to manually if for some reason all update installation
 // attempts fail.
-pref("app.update.url.manual", "http://trisquel.info/browser");
+pref("app.update.url.manual", "https://trisquel.info/browser");
 // A default value for the "More information about this update" link
 // supplied in the "An update is available" page of the update wizard.
-pref("app.update.url.details", "http://trisquel.info/browser");
+pref("app.update.url.details", "https://trisquel.info/browser");
 
-// Release notes and vendor URLs
-pref("app.releaseNotesURL", "http://trisquel.info/browser");
 pref("app.vendorURL", "http://trisquel.info/browser/");
+pref("app.releaseNotesURL", "https://trisquel.info/browser");
 
-// Search codes belong only in builds with official branding
-pref("browser.search.param.yahoo-fr", "");
-pref("browser.search.param.yahoo-fr-cjkt", ""); // now unused
-pref("browser.search.param.yahoo-fr-ja", "");
-pref("browser.search.param.yahoo-f-CN", "");
+// The number of days a binary is permitted to be old
+// without checking for an update.  This assumes that
+// app.update.checkInstallTime is true.
+pref("app.update.checkInstallTime.days", 63);
+
+// Give the user x seconds to reboot before showing a badge on the hamburger
+// button. default=4 days
+pref("app.update.badgeWaitTime", 345600);
+
+// Number of usages of the web console or scratchpad.
+// If this is less than 5, then pasting code into the web console or scratchpad is disabled
+pref("devtools.selfxss.count", 0);

helpers/DATA/firefox/disable-activity-streams.patch

@@ -1,104 +0,0 @@
---- 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([
-   // This first item is the global list fallback for any unexpected geos
--  ["", "https://www.youtube.com/,https://www.facebook.com/,https://www.wikipedia.org/,https://www.reddit.com/,https://www.amazon.com/,https://twitter.com/"],
--  ["US", "https://www.youtube.com/,https://www.facebook.com/,https://www.amazon.com/,https://www.reddit.com/,https://www.wikipedia.org/,https://twitter.com/"],
--  ["CA", "https://www.youtube.com/,https://www.facebook.com/,https://www.reddit.com/,https://www.wikipedia.org/,https://www.amazon.ca/,https://twitter.com/"],
--  ["DE", "https://www.youtube.com/,https://www.facebook.com/,https://www.amazon.de/,https://www.ebay.de/,https://www.wikipedia.org/,https://www.reddit.com/"],
--  ["PL", "https://www.youtube.com/,https://www.facebook.com/,https://allegro.pl/,https://www.wikipedia.org/,https://www.olx.pl/,https://www.wykop.pl/"],
--  ["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;
-@@ -56,19 +49,19 @@
-       provider_description: "pocket_description",
-       provider_icon: "pocket",
-       provider_name: "Pocket",
--      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: "http://getpocket.com/recommendations",
--      info_link: "https://www.mozilla.org/privacy/firefox/#pocketstories",
--      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/`,
-+      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: true
-     })
-   }],
-   ["showSponsored", {
-     title: "Show sponsored cards in spoc experiment (show_spocs in topstories.options has to be set to true as well)",
--    value: true
-+    value: false
-   }],
-   ["filterAdult", {
-     title: "Remove adult pages from sites, highlights, etc.",
-@@ -96,7 +89,7 @@
-   }],
-   ["disableSnippets", {
-     title: "Disable snippets on activity stream",
--    value: false
-+    value: true
-   }],
-   ["showTopSites", {
-     title: "Show the Top Sites section",
-@@ -112,12 +105,12 @@
-   }],
-   ["telemetry", {
-     title: "Enable system error and usage data collection",
--    value: true,
-+    value: false,
-     value_local_dev: false
-   }],
-   ["telemetry.ping.endpoint", {
-     title: "Telemetry server endpoint",
--    value: "https://tiles.services.mozilla.com/v4/links/activity-stream"
-+    value: "https://127.0.0.1/"
-   }],
-   ["section.highlights.collapsed", {
-     title: "Collapse the Highlights section",
-@@ -133,7 +126,7 @@
-   }],
-   ["tippyTop.service.endpoint", {
-     title: "Tippy Top service manifest url",
--    value: "https://activity-stream-icons.services.mozilla.com/v1/icons.json.br"
-+    value: ""
-   }]
- ]);
- 
-@@ -186,14 +179,14 @@
-         "CA": ["en-US", "en-GB", "en-ZA"],
-         "DE": ["de", "de-DE", "de-AT", "de-CH"]
-       })[geo];
--      return !!locales && locales.includes(locale);
-+      return false;
-     }
-   },
-   {
-     name: "snippets",
-     factory: () => new SnippetsFeed(),
-     title: "Gets snippets data",
--    value: true
-+    value: false
-   },
-   {
-     name: "systemtick",
-@@ -205,7 +198,7 @@
-     name: "telemetry",
-     factory: () => new TelemetryFeed(),
-     title: "Relays telemetry-related actions to PingCentre",
--    value: true
-+    value: false
-   },
-   {
-     name: "favicon",

helpers/make-firefox

@@ -18,13 +18,30 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=56
+VERSION=57
 
 . ./config
 
 rm debian/control
 
-patch -p1 < $DATA/disable-activity-streams.patch
+# Disable activity-stream antifeatures.
+# These are not condensed into a single sed script to make it fail on individual commands that didn't change the source
+sed '/^const DEFAULT_SITES/,/^])\;/c const DEFAULT_SITES = new Map\([[""]]\);' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
+sed '/\["showSponsored/,/value/s/value: true/value: false/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
+sed '/\["disableSnippets/,/value/s/value: false/value: true/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
+sed '/\["telemetry"/,/value/s/value: true/value: false/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
+sed '/\["section.highlights.includePocket"/,/value/s/value: true/value: false/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
+sed '/\["telemetry.ping.endpoint"/,/value/s/value: .*/value: ""/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
+sed '/\["tippyTop.service.endpoint"/,/value/s/value: .*/value: ""/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
+sed 's/\(read_more_endpoint:\) .http.*/\1 "",/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
+sed 's/\(stories_endpoint:\) .http.*/\1 "",/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
+sed 's/\(stories_referrer:\) .http.*/\1 "",/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
+sed 's/\(privacy_notice_link:\) .http.*/\1 "https:\/\/trisquel.info\/legal",/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
+sed 's/\(disclaimer_link:\) .http.*/\1 "",/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
+sed 's/\(topics_endpoint:\) .http.*/\1 "",/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
+sed '/name: "snippets"/,/value/s/value: true/value: false/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
+sed '/name: "telemetry"/,/value/s/value: true/value: false/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
+sed '/name: "section.topstories"/,/return/s/return.*/return false;/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
 sed 's/.Ubuntu., //' -i ./browser/extensions/activity-stream/css/activity-stream*.css
 
 cp $DATA/onboarding/bootstrap.js browser/extensions/onboarding
@@ -40,34 +57,6 @@ sed '/captivedetect.canonicalURL/s/http.*success.txt//' -i modules/libpref/init/
 sed '/ShouldResistFingerprinting/,/}/s/^/\/\//' -i ./netwerk/protocol/http/nsHttpHandler.cpp
 sed '/If fingerprinting resistance is on/,/}/s/^/\/\//' -i ./dom/base/Navigator.cpp
 
-# Disabled until the patches work on v57 with moz1382323.patch
-## KDE integration patches from https://www.rosenauer.org/hg/mozilla
-## Use firefox$MAJORVERSION branch if available, otherwise use default
-#MAJORVERSION=$(echo `pkgversion` | /bin/sed 's/\([0-9]\+\).*/\1/')
-#BRANCH=firefox$MAJORVERSION
-#if ! wget --spider https://rosenauer.org/hg/mozilla/log/$BRANCH; then
-#	BRANCH=default
-#fi
-#wget https://rosenauer.org/hg/mozilla/raw-file/$BRANCH/mozilla-kde.patch -O debian/patches/mozilla-kde.patch
-#wget https://rosenauer.org/hg/mozilla/raw-file/$BRANCH/firefox-kde.patch -O debian/patches/abrowser-kde.patch
-#
-## Add to series
-#cat << EOF >> debian/patches/series
-#mozilla-kde.patch
-#abrowser-kde.patch
-#EOF
-#
-## Add kde.js file
-#echo 'pref("browser.preferences.instantApply", false);' > debian/kde.js
-#sed -i '/pre-build/r /dev/stdin' debian/rules << 'EOF'
-#	mkdir -p $(MOZ_DISTDIR)/bin/defaults/pref
-#	cp $(CURDIR)/debian/kde.js $(MOZ_DISTDIR)/bin/defaults/pref/kde.js
-#EOF
-#
-## A line is added to widget/gtk/moz.build by unity-menubar.patch, so we have to fix mozilla-kde.patch
-#sed -i "/widget\/gtk\/moz\.build/,/widget\/gtk\/nsFilePicker\.cpp/{ /chromium/d; /generic/a\ \ \ \ \ '/layout/style',
-#; }" debian/patches/mozilla-kde.patch
-
 # Replace ubufox recommendation
 sed 's/xul-ext-ubufox/xul-ext-youtube-html5-video-player/' -i debian/control.in
 
@@ -162,7 +151,7 @@ s/abrowser.com/firefox.com/g;
 "
 
 echo "Running batch replace operation"
-find . -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -execdir /bin/sed --follow-symlinks -i "$SEDSCRIPT" '{}' ';'
+find . -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -not -iregex '.*third_party/rust.*' -execdir /bin/sed --follow-symlinks -i "$SEDSCRIPT" '{}' ';'
 
 sed -i '2s/^Source:.*/Source: firefox/' debian/control.in
 sed s/ubuntu/trisquel/g debian/distribution.ini -i
@@ -175,6 +164,8 @@ sed '/Package: @MOZ_PKG_NAME@$/,/Description:/ s/Provides:/Provides: firefox, /'
 # Branding files
 rm browser/branding/{official,aurora,nightly,unofficial} -rf
 cp -a $DATA/branding/ browser/branding/official
+# Disable preprocessor
+sed 's/_PP//' -i browser/branding/branding-common.mozbuild
 cat << EOF >> debian/config/branch.mk
 CHANNEL                 = release
 MOZ_WANT_UNIT_TESTS     = 0
@@ -206,13 +197,6 @@ for extension in $(ls -1 $DATA/extensions/); do
   echo "debian/$extension @MOZ_ADDONDIR@/extensions/" >> debian/abrowser.install.in
 done
 
-# Disable newtab "What is this" popup and config button
-cat << EOF >> browser/themes/linux/newtab/newTab.css
-#newtab-customize-button, #newtab-intro-what{
-display:none
-}
-EOF
-
 # Disable search field at extensions panel
 #sed  '/header-search/d; /search.placeholder/d' -i toolkit/mozapps/extensions/content/extensions.xul
 cat << EOF >> toolkit/mozapps/extensions/content/extensions.css
@@ -248,8 +232,6 @@ sed -i 's/<a\ href\=\"http\:\/\/www.mozilla.org\/\">Mozilla\ Project<\/a>/<a\ hr
 # We went too far...
 #sed -i 's/iceweasel, abrowser, icecat,/iceweasel, firefox, icecat,/g' debian/control.in
 sed '/Provides/s/abrowser-locale/firefox-locale/' -i debian/control.langpacks
-sed 's/Abrowser/Firefox/' -i third_party/rust/idna/src/lib.rs third_party/rust/encoding_rs/.travis.yml third_party/rust/encoding_rs/README.md
-sed 's/Trisquel/Mozilla/' -i third_party/rust/encoding_rs/src/lib.rs browser/components/uitour/UITour-lib.js third_party/rust/mio/README.md
 
 # Restore useragent to Firefox
 sed '/MOZILLA_UAVERSION/ s:Abrowser/:Firefox/:' -i netwerk/protocol/http/nsHttpHandler.cpp