Abrowser updated for v71
This commit is contained in:
Ruben Rodriguez
parent
765a46e1b9
commit
57763bb6b1
18 changed files with 81 additions and 260 deletions
|
|
@ -1,3 +0,0 @@
|
||||||
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/.
|
|
||||||
|
|
@ -1,52 +0,0 @@
|
||||||
# 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/.
|
|
||||||
|
|
||||||
# NSIS branding defines for official release builds.
|
|
||||||
# The nightly build branding.nsi is located in browser/installer/windows/nsis/
|
|
||||||
# The unofficial build branding.nsi is located in browser/branding/unofficial/
|
|
||||||
|
|
||||||
# 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"
|
|
||||||
|
|
||||||
; 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 SHA2 Assured ID Code Signing CA"
|
|
||||||
|
|
||||||
# Dialog units are used so the UI displays correctly with the system's DPI
|
|
||||||
# settings.
|
|
||||||
# The dialog units for the bitmap's dimensions should match exactly with the
|
|
||||||
# bitmap's width and height in pixels.
|
|
||||||
!define APPNAME_BMP_WIDTH_DU "134u"
|
|
||||||
!define APPNAME_BMP_HEIGHT_DU "36u"
|
|
||||||
!define INTRO_BLURB_WIDTH_DU "258u"
|
|
||||||
!define INTRO_BLURB_EDGE_DU "170u"
|
|
||||||
!define INTRO_BLURB_LTR_TOP_DU "20u"
|
|
||||||
!define INTRO_BLURB_RTL_TOP_DU "12u"
|
|
||||||
|
|
||||||
# UI Colors that can be customized for each channel
|
|
||||||
!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000
|
|
||||||
!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x666666
|
|
||||||
!define FOOTER_BKGRD_COLOR 0xFFFFFF
|
|
||||||
!define INTRO_BLURB_TEXT_COLOR 0x666666
|
|
||||||
!define INSTALL_BLURB_TEXT_COLOR 0x666666
|
|
||||||
!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0x666666
|
|
||||||
!define COMMON_TEXT_COLOR_NORMAL 0x000000
|
|
||||||
!define COMMON_TEXT_COLOR_FADED 0x666666
|
|
||||||
!define COMMON_BKGRD_COLOR 0xF0F0F0
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
# 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/.
|
|
||||||
|
|
||||||
MOZ_APP_DISPLAYNAME=Abrowser
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
# 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/.
|
|
||||||
|
|
||||||
browser.jar:
|
|
||||||
% content branding %content/branding/ contentaccessible=yes
|
|
||||||
content/branding/about.png
|
|
||||||
content/branding/about-logo.png
|
|
||||||
content/branding/about-logo@2x.png
|
|
||||||
content/branding/about-wordmark.svg
|
|
||||||
content/branding/icon16.png (../default16.png)
|
|
||||||
content/branding/icon32.png (../default32.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/aboutDialog.css
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
# -*- 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
|
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
||||||
|
|
||||||
JAR_MANIFESTS += ['jar.mn']
|
|
||||||
Binary file not shown.
|
|
@ -1,8 +0,0 @@
|
||||||
<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>
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
# 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/.
|
|
||||||
|
|
||||||
# Do NOT localize or otherwise change these values
|
|
||||||
browser.startup.homepage=about:home
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
<!-- 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/. -->
|
|
||||||
|
|
||||||
<!ENTITY brandShorterName "Abrowser">
|
|
||||||
<!ENTITY brandShortName "Abrowser">
|
|
||||||
<!ENTITY brandFullName "Abrowser">
|
|
||||||
<!ENTITY vendorShortName "Trisquel">
|
|
||||||
<!ENTITY trademarkInfo.part1 "">
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
# 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
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
# 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/.
|
|
||||||
|
|
||||||
brandShorterName=Abrowser
|
|
||||||
brandShortName=Abrowser
|
|
||||||
brandFullName=Abrowser
|
|
||||||
vendorShortName=Trisquel
|
|
||||||
|
|
||||||
syncBrandShortName=Sync
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
#filter substitution
|
|
||||||
# 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/.
|
|
||||||
|
|
||||||
[localization] @AB_CD@.jar:
|
|
||||||
branding (%*.ftl)
|
|
||||||
|
|
||||||
@AB_CD@.jar:
|
|
||||||
% locale branding @AB_CD@ %locale/branding/
|
|
||||||
locale/branding/brand.dtd (%brand.dtd)
|
|
||||||
locale/branding/brand.properties (%brand.properties)
|
|
||||||
locale/branding/browserconfig.properties
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
# -*- 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
|
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
||||||
|
|
||||||
JAR_MANIFESTS += ['jar.mn']
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
# -*- 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
|
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
||||||
|
|
||||||
DIRS += ['content', 'locales']
|
|
||||||
|
|
||||||
DIST_SUBDIR = 'browser'
|
|
||||||
export('DIST_SUBDIR')
|
|
||||||
|
|
||||||
include('../branding-common.mozbuild')
|
|
||||||
FirefoxBranding()
|
|
||||||
|
|
@ -1,37 +0,0 @@
|
||||||
/* 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/. */
|
|
||||||
|
|
||||||
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)
|
|
||||||
// 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", "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", "https://trisquel.info/browser");
|
|
||||||
|
|
||||||
pref("app.vendorURL", "http://trisquel.info/browser/");
|
|
||||||
pref("app.releaseNotesURL", "https://trisquel.info/browser");
|
|
||||||
|
|
||||||
// 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);
|
|
||||||
22
helpers/DATA/firefox/default-strict.patch
Normal file
22
helpers/DATA/firefox/default-strict.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
--- a/browser/components/BrowserGlue.jsm 2019-12-19 12:45:18.535559096 -0500
|
||||||
|
+++ b/browser/components/BrowserGlue.jsm 2019-12-19 12:45:08.935572729 -0500
|
||||||
|
@@ -1580,6 +1580,19 @@
|
||||||
|
|
||||||
|
this._trackSlowStartup();
|
||||||
|
|
||||||
|
+ // Trisquel hack: if no user settings for tracking, default to strict instead of standard.
|
||||||
|
+ if (!
|
||||||
|
+ (Services.prefs.prefHasUserValue("browser.contentblocking.category")
|
||||||
|
+ || Services.prefs.prefHasUserValue("network.cookie.cookieBehavior")
|
||||||
|
+ || Services.prefs.prefHasUserValue("privacy.trackingprotection.enabled")
|
||||||
|
+ || Services.prefs.prefHasUserValue("privacy.trackingprotection.socialtracking.enabled")
|
||||||
|
+ || Services.prefs.prefHasUserValue("privacy.trackingprotection.cryptomining.enabled")
|
||||||
|
+ || Services.prefs.prefHasUserValue("privacy.trackingprotection.fingerprinting.enabled")
|
||||||
|
+ || Services.prefs.prefHasUserValue("privacy.trackingprotection.pbmode.enabled"))
|
||||||
|
+ ) {
|
||||||
|
+ Services.prefs.setStringPref("browser.contentblocking.category", "strict"); this._updateCBCategory;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
// Offer to reset a user's profile if it hasn't been used for 60 days.
|
||||||
|
const OFFER_PROFILE_RESET_INTERVAL_MS = 60 * 24 * 60 * 60 * 1000;
|
||||||
|
let lastUse = Services.appinfo.replacedLockTime;
|
||||||
|
|
@ -33,9 +33,6 @@ pref("network.http.proxy.pipelining", true);
|
||||||
pref("network.http.pipelining.maxrequests", 10);
|
pref("network.http.pipelining.maxrequests", 10);
|
||||||
pref("nglayout.initialpaint.delay", 0);
|
pref("nglayout.initialpaint.delay", 0);
|
||||||
|
|
||||||
// Disable third party cookies
|
|
||||||
pref("network.cookie.cookieBehavior", 1);
|
|
||||||
|
|
||||||
// Extensions cannot be updated without permission
|
// Extensions cannot be updated without permission
|
||||||
pref("extensions.update.enabled", false);
|
pref("extensions.update.enabled", false);
|
||||||
pref("extensions.systemAddon.update.enabled", false);
|
pref("extensions.systemAddon.update.enabled", false);
|
||||||
|
|
@ -95,6 +92,7 @@ pref("network.protocol-handler.external.apt+http",true);
|
||||||
// https://webdevelopmentaid.wordpress.com/2013/10/21/customize-privacy-settings-in-mozilla-firefox-part-1-aboutconfig/
|
// https://webdevelopmentaid.wordpress.com/2013/10/21/customize-privacy-settings-in-mozilla-firefox-part-1-aboutconfig/
|
||||||
// https://panopticlick.eff.org
|
// https://panopticlick.eff.org
|
||||||
// https://wiki.mozilla.org/Fingerprinting
|
// https://wiki.mozilla.org/Fingerprinting
|
||||||
|
pref("browser.contentblocking.features.strict", "tp,tpPrivate,cookieBehavior1,cm,fp,stp");
|
||||||
pref("privacy.donottrackheader.enabled", true);
|
pref("privacy.donottrackheader.enabled", true);
|
||||||
pref("privacy.donottrackheader.value", 1);
|
pref("privacy.donottrackheader.value", 1);
|
||||||
pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", false);
|
pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", false);
|
||||||
|
|
@ -102,7 +100,8 @@ pref("browser.safebrowsing.enabled", false);
|
||||||
pref("browser.safebrowsing.downloads.remote.enabled", false);
|
pref("browser.safebrowsing.downloads.remote.enabled", false);
|
||||||
pref("browser.safebrowsing.malware.enabled", false);
|
pref("browser.safebrowsing.malware.enabled", false);
|
||||||
pref("browser.safebrowsing.provider.mozilla.gethashURL", "");
|
pref("browser.safebrowsing.provider.mozilla.gethashURL", "");
|
||||||
pref("browser.safebrowsing.provider.mozilla.updateURL", "");
|
// Uncomment next line to prevent automated connection to mozilla, to fetch block list
|
||||||
|
//pref("browser.safebrowsing.provider.mozilla.updateURL", "");
|
||||||
pref("services.sync.privacyURL", "https://trisquel.info/en/legal");
|
pref("services.sync.privacyURL", "https://trisquel.info/en/legal");
|
||||||
pref("social.enabled", false);
|
pref("social.enabled", false);
|
||||||
pref("social.remote-install.enabled", false);
|
pref("social.remote-install.enabled", false);
|
||||||
|
|
@ -133,10 +132,7 @@ pref("browser.aboutHomeSnippets.updateUrl", "");
|
||||||
pref("browser.sessionstore.max_resumed_crashes", 0);
|
pref("browser.sessionstore.max_resumed_crashes", 0);
|
||||||
// Disable tracking protection by default, as it makes automated connections to fetch lists (not doing this until the newtab privacy block is reimplemented)
|
// Disable tracking protection by default, as it makes automated connections to fetch lists (not doing this until the newtab privacy block is reimplemented)
|
||||||
//pref("browser.safebrowsing.provider.mozilla.updateURL", "");
|
//pref("browser.safebrowsing.provider.mozilla.updateURL", "");
|
||||||
pref("privacy.trackingprotection.enabled", true);
|
|
||||||
pref("privacy.trackingprotection.pbmode.enabled", true);
|
|
||||||
pref("urlclassifier.trackingTable", "test-track-simple,base-track-digest256,content-track-digest256");
|
pref("urlclassifier.trackingTable", "test-track-simple,base-track-digest256,content-track-digest256");
|
||||||
pref("browser.privacy.trackingprotection.menu", "always");
|
|
||||||
pref("privacy.trackingprotection.introURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tracking-protection/start/");
|
pref("privacy.trackingprotection.introURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tracking-protection/start/");
|
||||||
// Disable geolocation
|
// Disable geolocation
|
||||||
pref("geo.enabled", false);
|
pref("geo.enabled", false);
|
||||||
|
|
@ -152,8 +148,7 @@ pref("privacy.resistFingerprinting", true);
|
||||||
pref("webgl.disabled", true);
|
pref("webgl.disabled", true);
|
||||||
// Don't reveal your internal IP when WebRTC is enabled
|
// Don't reveal your internal IP when WebRTC is enabled
|
||||||
pref("media.peerconnection.ice.no_host", true);
|
pref("media.peerconnection.ice.no_host", true);
|
||||||
pref("privacy.trackingprotection.cryptomining.enabled", true);
|
|
||||||
pref("privacy.trackingprotection.fingerprinting.enabled", true);
|
|
||||||
|
|
||||||
// Services
|
// Services
|
||||||
pref("gecko.handlerService.schemes.mailto.0.name", "");
|
pref("gecko.handlerService.schemes.mailto.0.name", "");
|
||||||
|
|
@ -256,3 +251,7 @@ pref("extensions.blocklist.url", "");
|
||||||
pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr", false);
|
pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr", false);
|
||||||
pref("extensions.htmlaboutaddons.discover.enabled", false);
|
pref("extensions.htmlaboutaddons.discover.enabled", false);
|
||||||
pref("extensions.htmlaboutaddons.recommendations.enabled", false);
|
pref("extensions.htmlaboutaddons.recommendations.enabled", false);
|
||||||
|
|
||||||
|
// Disable pingback on first run
|
||||||
|
pref("browser.newtabpage.activity-stream.fxaccounts.endpoint", "");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,38 +18,34 @@
|
||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=65
|
VERSION=66
|
||||||
|
|
||||||
. ./config
|
. ./config
|
||||||
|
|
||||||
patch -p1 < debian/patches/partially-revert-google-search-update.patch
|
patch -p1 < debian/patches/partially-revert-google-search-update.patch
|
||||||
patch -p1 < debian/patches/no-region-overrides-for-google-search.patch
|
patch -p1 < debian/patches/no-region-overrides-for-google-search.patch
|
||||||
|
|
||||||
|
sed 's/clang-9 |//' -i debian/control.in
|
||||||
|
sed 's/libclang-9-dev |//' -i debian/control.in
|
||||||
|
sed 's/llvm-9-dev |//' -i debian/control.in
|
||||||
|
|
||||||
rm debian/control
|
rm debian/control
|
||||||
|
|
||||||
# Disable activity-stream antifeatures.
|
# 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
|
# These are not condensed into a single sed script to make it fail on individual commands that didn't change the source
|
||||||
ActivityStream=browser/components/newtab/lib/ActivityStream.jsm
|
ActivityStream=browser/components/newtab/lib/ActivityStream.jsm
|
||||||
sed '/^const DEFAULT_SITES/,/^])\;/c const DEFAULT_SITES = new Map\([[""]]\);' -i $ActivityStream
|
sed '/^const DEFAULT_SITES/,/^])\;/c const DEFAULT_SITES = new Map\([[""]]\);' -i $ActivityStream
|
||||||
sed '/\["showSponsored/,/value/s/value: true/value: false/' -i $ActivityStream
|
sed '/"showSponsored"/,/value/s/value: true/value: false/' -i $ActivityStream
|
||||||
sed '/\["telemetry"/,/value/s/value: true/value: false/' -i $ActivityStream
|
sed '/"telemetry"/,/value/s/value: true/value: false/' -i $ActivityStream
|
||||||
sed '/\["section.highlights.includePocket"/,/value/s/value: true/value: false/' -i $ActivityStream
|
sed '/"section.highlights.includePocket"/,/value/s/value: true/value: false/' -i $ActivityStream
|
||||||
sed '/\["telemetry.ping.endpoint"/,/value/s/value: .*/value: ""/' -i $ActivityStream
|
sed '/"telemetry.ping.endpoint"/,/value/s/value: .*/value: ""/' -i $ActivityStream
|
||||||
sed 's/\(read_more_endpoint:\) .http.*/\1 "",/' -i $ActivityStream
|
sed '/read_more_endpoint/,+1s/http.*/",/' -i $ActivityStream
|
||||||
sed 's/\(stories_endpoint:\) .http.*/\1 "",/' -i $ActivityStream
|
sed '/stories_endpoint/s/getpocket.cdn.mozilla.net/127.0.0.1/' -i $ActivityStream
|
||||||
sed 's/\(stories_referrer:\) .http.*/\1 "",/' -i $ActivityStream
|
sed '/stories_referrer/s/http.*/",/' -i $ActivityStream
|
||||||
sed 's/\(topics_endpoint:\) .http.*/\1 "",/' -i $ActivityStream
|
sed '/topics_endpoint/s/getpocket.cdn.mozilla.net/127.0.0.1/' -i $ActivityStream
|
||||||
sed '/name: "telemetry"/,/value/s/value: true/value: false/' -i $ActivityStream
|
|
||||||
sed '/name: "section.topstories"/,/return/s/return.*/return false;/' -i $ActivityStream
|
sed '/name: "section.topstories"/,/return/s/return.*/return false;/' -i $ActivityStream
|
||||||
sed 's/.Ubuntu., //' -i browser/components/newtab/css/activity-stream*.css
|
sed 's/.Ubuntu., //' -i browser/components/newtab/css/activity-stream*.css
|
||||||
|
echo "#header-asrouter-container{display: none!important;}" >> browser/components/newtab/css/activity-stream-linux.css
|
||||||
#cp $DATA/watermark.svg ./browser/extensions/onboarding/content/img/watermark.svg
|
|
||||||
#cp $DATA/onboarding/bootstrap.js browser/extensions/onboarding
|
|
||||||
#cp $DATA/onboarding/onboarding.js browser/extensions/onboarding/content
|
|
||||||
#cp $DATA/onboarding/onboarding.properties browser/extensions/onboarding/locales/en-US
|
|
||||||
#for locale in $(ls -1 $DATA/onboarding/locales/); do
|
|
||||||
# cp $DATA/onboarding/locales/$locale/onboarding.properties l10n/$locale/browser/extensions/onboarding
|
|
||||||
#done
|
|
||||||
|
|
||||||
sed '/captivedetect.canonicalURL/s/http.*success.txt//' -i modules/libpref/init/all.js
|
sed '/captivedetect.canonicalURL/s/http.*success.txt//' -i modules/libpref/init/all.js
|
||||||
|
|
||||||
|
|
@ -70,8 +66,6 @@ cp toolkit/components/telemetry/healthreport-prefs.js mobile/android/chrome/cont
|
||||||
|
|
||||||
sed 's%https://www.mozilla.org/legal/privacy/%https://trisquel.info/legal%' -i ./browser/app/profile/firefox.js ./toolkit/content/aboutRights.xhtml
|
sed 's%https://www.mozilla.org/legal/privacy/%https://trisquel.info/legal%' -i ./browser/app/profile/firefox.js ./toolkit/content/aboutRights.xhtml
|
||||||
|
|
||||||
#sed 's%https://www.mozilla.org/firefox/central/%https://trisquel.info/browser%' -i browser/base/content/browser-appmenu.inc
|
|
||||||
|
|
||||||
# Remove Google API key
|
# Remove Google API key
|
||||||
sed '/Google API/,/google-api-keyfile/ d' debian/config/mozconfig.in -i
|
sed '/Google API/,/google-api-keyfile/ d' debian/config/mozconfig.in -i
|
||||||
|
|
||||||
|
|
@ -82,12 +76,12 @@ sed 's/com.ubuntu/org.trisquel/' -i debian/config/mozconfig.in
|
||||||
echo ac_add_options --disable-eme >> debian/config/mozconfig.in
|
echo ac_add_options --disable-eme >> debian/config/mozconfig.in
|
||||||
sed '/gmp-clearkey/d' -i ./debian/firefox.install.in
|
sed '/gmp-clearkey/d' -i ./debian/firefox.install.in
|
||||||
|
|
||||||
# Correct build error
|
|
||||||
echo ac_add_options --enable-stdcxx-compat >> debian/config/mozconfig.in
|
|
||||||
|
|
||||||
# Locale packages should provide firefox-locale-$LANG
|
# Locale packages should provide firefox-locale-$LANG
|
||||||
sed "s/Provides.*/Provides: abrowser-locale-@LANGCODE@/" -i debian/control.langpacks
|
sed "s/Provides.*/Provides: abrowser-locale-@LANGCODE@/" -i debian/control.langpacks
|
||||||
|
|
||||||
|
# Provide firefox
|
||||||
|
sed "s/iceweasel,/iceweasel, firefox,/" -i debian/control.in
|
||||||
|
|
||||||
# Remove Ubuntu bookmarks
|
# Remove Ubuntu bookmarks
|
||||||
sed -i /ubuntu-bookmarks/d debian/patches/series
|
sed -i /ubuntu-bookmarks/d debian/patches/series
|
||||||
rm debian/patches/ubuntu-bookmarks*
|
rm debian/patches/ubuntu-bookmarks*
|
||||||
|
|
@ -129,30 +123,11 @@ sed "s/^MOZ_PKG_NAME\t.*/MOZ_PKG_NAME\t\t:= abrowser/;" debian/build/config.mk
|
||||||
############################################################################3
|
############################################################################3
|
||||||
sed "s_^Maintainer.*_Maintainer: $DEBFULLNAME <$DEBEMAIL>_g" -i debian/control.in
|
sed "s_^Maintainer.*_Maintainer: $DEBFULLNAME <$DEBEMAIL>_g" -i debian/control.in
|
||||||
|
|
||||||
SEDSCRIPT="
|
|
||||||
s/Try Firefox/Try Abrowser/g;
|
|
||||||
s/Firefox Home/Abrowser Home/g;
|
|
||||||
s/Firefox Account/Sync Account/g;
|
|
||||||
s/Updates from Mozilla and Firefox/Updates from Mozilla/g;
|
|
||||||
s/Adobe Flash/Flash/g;
|
|
||||||
s|www.mozilla.com/firefox/central|trisquel.info/browser|g;
|
|
||||||
s|mozilla.com/plugincheck|trisquel.info/browser|g;
|
|
||||||
s|www.mozilla.com/legal/privacy|trisquel.info/legal|g;
|
|
||||||
"
|
|
||||||
|
|
||||||
echo "Running batch replace operation"
|
|
||||||
find . -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -not -iregex '.*third_party/rust.*' -execdir /bin/sed --follow-symlinks -i "$SEDSCRIPT" '{}' ';'
|
|
||||||
|
|
||||||
echo "Replacing Firefox with Abrowser on ./l10n"
|
|
||||||
find l10n -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -execdir /bin/sed --follow-symlinks -i "s/Firefox/Abrowser/" '{}' ';'
|
|
||||||
|
|
||||||
sed s/ubuntu/trisquel/g debian/distribution.ini -i
|
|
||||||
sed "s/ubuntu_version/trisquel_version/; s/Ubuntu 10.10/Trisquel $REVISION/; s/1010/40/" -i debian/firefox.postinst.in
|
|
||||||
|
|
||||||
# Branding files
|
# Branding files
|
||||||
rm browser/branding/{official,aurora,nightly,unofficial} -rf
|
cp -a $DATA/branding/* browser/branding/official
|
||||||
cp -a $DATA/branding/ browser/branding/official
|
cp -a $DATA/branding/* browser/branding/unofficial
|
||||||
cp -a $DATA/branding/ browser/branding/unofficial
|
cp -a $DATA/branding/* browser/branding/nightly
|
||||||
|
sed '/about-wordmark.svg/d' -i browser/base/content/aboutDialog.css
|
||||||
# Disable preprocessor
|
# Disable preprocessor
|
||||||
sed 's/_PP//' -i browser/branding/branding-common.mozbuild
|
sed 's/_PP//' -i browser/branding/branding-common.mozbuild
|
||||||
cat << EOF >> debian/config/branch.mk
|
cat << EOF >> debian/config/branch.mk
|
||||||
|
|
@ -163,6 +138,31 @@ MOZ_ENABLE_BREAKPAD = 0
|
||||||
MOZ_ENABLE_TELEMETRY = 0
|
MOZ_ENABLE_TELEMETRY = 0
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
SEDSCRIPT="
|
||||||
|
s|Updates from { -vendor-short-name } and { -brand-product-name }|Updates from { -vendor-short-name }|;
|
||||||
|
s/Try Firefox/Try Abrowser/g;
|
||||||
|
s/Firefox Home/Abrowser Home/g;
|
||||||
|
s/Firefox Account/Sync Account/g;
|
||||||
|
s/Updates from Mozilla and Firefox/Updates from Mozilla/g;
|
||||||
|
s/Adobe Flash/Flash/g;
|
||||||
|
s|www.mozilla.com/firefox/central|trisquel.info/browser|g;
|
||||||
|
s|mozilla.com/plugincheck|trisquel.info/browser|g;
|
||||||
|
s|www.mozilla.com/legal/privacy|trisquel.info/legal|g;
|
||||||
|
s|Firefox Nightly|Abrowser|;
|
||||||
|
s|Nightly|Abrowser|g;
|
||||||
|
s|brandProductName=Firefox|brandProductName=Abrowser|;
|
||||||
|
s|Sign in to Firefox|Sign in to Sync|;
|
||||||
|
"
|
||||||
|
|
||||||
|
echo "Running batch replace operation"
|
||||||
|
find . -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -not -iregex '.*third_party/.*' -execdir /bin/sed --follow-symlinks -i "$SEDSCRIPT" '{}' ';'
|
||||||
|
|
||||||
|
echo "Replacing Firefox with Abrowser on ./l10n"
|
||||||
|
find l10n -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -execdir /bin/sed --follow-symlinks -i "s/Firefox/Abrowser/" '{}' ';'
|
||||||
|
|
||||||
|
sed s/ubuntu/trisquel/g debian/distribution.ini -i
|
||||||
|
sed "s/ubuntu_version/trisquel_version/; s/Ubuntu 10.10/Trisquel $REVISION/; s/1010/40/" -i debian/firefox.postinst.in
|
||||||
|
|
||||||
# Delete stuff we don't use and that may contain trademaked logos
|
# Delete stuff we don't use and that may contain trademaked logos
|
||||||
rm -rf ./browser/metro ./addon-sdk/source/doc/static-files/media ./browser/themes/windows ./browser/themes/osx ./b2g
|
rm -rf ./browser/metro ./addon-sdk/source/doc/static-files/media ./browser/themes/windows ./browser/themes/osx ./b2g
|
||||||
|
|
||||||
|
|
@ -214,11 +214,6 @@ sed '/description.*helpus/,/description/d' -i ./browser/base/content/aboutDialog
|
||||||
|
|
||||||
find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
|
find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
|
||||||
|
|
||||||
for STRING in rights.intro-point3-unbranded rights.intro-point4a-unbranded rights.intro-point4b-unbranded rights.intro-point4c-unbranded
|
|
||||||
do
|
|
||||||
find -name aboutRights.dtd | xargs sed -i "s/ENTITY $STRING.*/ENTITY $STRING \"\">/"
|
|
||||||
done
|
|
||||||
|
|
||||||
for STRING in rights-intro-point-2 rights-intro-point-3 rights-intro-point-4 rights-intro-point-5 rights-intro-point-6 rights-webservices rights-safebrowsing
|
for STRING in rights-intro-point-2 rights-intro-point-3 rights-intro-point-4 rights-intro-point-5 rights-intro-point-6 rights-webservices rights-safebrowsing
|
||||||
do
|
do
|
||||||
find -name aboutRights.ftl | xargs sed -i "s/^$STRING.*/$STRING = /"
|
find -name aboutRights.ftl | xargs sed -i "s/^$STRING.*/$STRING = /"
|
||||||
|
|
@ -234,20 +229,17 @@ sed -i 's/<a\ href\=\"http\:\/\/www.mozilla.org\/\">Mozilla\ Project<\/a>/<a\ hr
|
||||||
# We went too far...
|
# We went too far...
|
||||||
#sed -i 's/iceweasel, abrowser, icecat,/iceweasel, firefox, icecat,/g' debian/control.in
|
#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 '/Provides/s/abrowser-locale/firefox-locale/' -i debian/control.langpacks
|
||||||
/bin/sed '/intro-point2-a/s/Abrowser/Firefox/' -i l10n/*/toolkit/chrome/global/aboutRights.dtd
|
|
||||||
/bin/sed '/trademarkInfo/s/Abrowser/Firefox/' -i l10n/*/browser/branding/official/brand.ftl
|
/bin/sed '/trademarkInfo/s/Abrowser/Firefox/' -i l10n/*/browser/branding/official/brand.ftl
|
||||||
|
|
||||||
/bin/sed 's/prefs_snippets_description=.*/prefs_snippets_description=Mozilla snippets/' -i l10n/*/browser/chrome/browser/activity-stream/newtab.properties
|
/bin/sed 's/prefs_snippets_description=.*/prefs_snippets_description=Mozilla snippets/' -i l10n/*/browser/chrome/browser/activity-stream/newtab.properties
|
||||||
|
|
||||||
# Set migrator scripts
|
|
||||||
#sed 's/Abrowser/Firefox/g; s/abrowser/firefox/g' -i browser/components/migration/FirefoxProfileMigrator.js
|
|
||||||
#sed s/ChromeProfileMigrator/_temp_/ -i browser/components/migration/moz.build
|
|
||||||
#sed s/AbrowserProfileMigrator/ChromeProfileMigrator/ -i browser/components/migration/moz.build
|
|
||||||
#sed s/_temp_/AbrowserProfileMigrator/ -i browser/components/migration/moz.build
|
|
||||||
|
|
||||||
# js settings
|
# js settings
|
||||||
cat $DATA/settings.js >> debian/vendor-firefox.js
|
cat $DATA/settings.js >> debian/vendor-firefox.js
|
||||||
|
|
||||||
|
# set contentblocking to strict by default
|
||||||
|
patch -p1 < $DATA/default-strict.patch
|
||||||
|
#sed '/this._trackSlowStartup/s/$/\n\n if (! Services.prefs.prefHasUserValue("browser.contentblocking.category")) { Services.prefs.setStringPref("browser.contentblocking.category", "strict"); this._updateCBCategory; }/' -i ./browser/components/BrowserGlue.jsm
|
||||||
|
|
||||||
#################
|
#################
|
||||||
# Android stuff #
|
# Android stuff #
|
||||||
#################
|
#################
|
||||||
|
|
@ -291,7 +283,7 @@ rm mobile/android/branding/{official,unofficial,beta,nightly} -rf
|
||||||
cp -a $DATA/android/branding/ mobile/android/branding/official
|
cp -a $DATA/android/branding/ mobile/android/branding/official
|
||||||
cp $DATA/android/mobile.ico mobile/android/app/
|
cp $DATA/android/mobile.ico mobile/android/app/
|
||||||
cp $DATA/android/images/* mobile/android/themes/core/images/
|
cp $DATA/android/images/* mobile/android/themes/core/images/
|
||||||
cp -a $DATA/android/res/main/* mobile/android/app/src/main/res/
|
cp -a $DATA/android/res/main/* mobile/android/geckoview/src/main/res
|
||||||
|
|
||||||
# Postinst script to manage profile migration and system links
|
# Postinst script to manage profile migration and system links
|
||||||
echo '
|
echo '
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue