firefox: prepare package changes for v139
This commit is contained in:
Luis Guzmán
parent
7e57197c68
commit
80d1c2166b
12 changed files with 142 additions and 95 deletions
|
|
@ -487,63 +487,6 @@ index bb847abd..e69de29b 100644
|
|||
- - 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/. -->
|
||||
-<svg width="80" height="80" fill="context-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M76 2H4a2 2 0 0 0-2 2v72a2 2 0 0 0 2 2h72a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2ZM4 0a4 4 0 0 0-4 4v72a4 4 0 0 0 4 4h72a4 4 0 0 0 4-4V4a4 4 0 0 0-4-4H4Zm3.08 7.08h15.892v15.892H7.08V7.08Zm4.54 2.27H9.35V20.701H20.701V9.35h-9.08Zm20.434-2.27h2.27v2.27h2.27V7.08h4.541v2.27h2.27v2.27H36.596v2.27h-4.541v2.271h-2.27v-2.27h-2.271v-2.27h2.27V9.35h2.27V7.08Zm-4.541 4.54h-2.27V9.35h2.27v2.27Zm2.27 11.352v-4.54h2.27v-2.27h4.541V13.89h4.541v2.27h4.54v2.27h-2.27v2.27h-2.27v-2.27h-2.27v2.27h-2.27v-2.27h-2.27v2.27h-2.271v2.271h-2.27Zm-4.54 2.27V18.433h2.27v4.54h2.27v2.27h-4.54Zm0 0v2.271h-9.081v-2.27h9.08Zm11.351-2.27h-2.27v-2.27h2.27v2.27Zm2.27 0h-2.27v4.541h-2.27v-2.27h-2.27v2.27h2.27v2.27h4.54V22.973Zm2.271 0v-2.27h-2.27v2.27h2.27Zm2.27 0h-2.27v6.811h4.54v-2.27h-2.27v-4.54Zm2.27 0h-2.27v-2.27h2.27v2.27Zm4.542-6.81h-2.27V22.971h-2.271v2.27h2.27v2.271h2.27v2.27h-2.27v2.27h2.27v-2.27h2.271v2.27h2.27v2.271h2.27v-4.54h2.271v2.27h2.27v2.27h-2.27v2.27h-2.27v2.27h-4.541v6.811h2.27v2.271h4.541v4.541h-6.811v-2.27h-2.27v2.27h-2.27v-2.27h-4.541v2.27h-4.541v-2.27h-4.54v2.27h2.27v2.27h2.27v2.27H45.675v4.541h2.271v2.27h-2.27v2.271h-2.27v-4.54h-4.541v-2.27h-2.27v-2.271h-2.27v2.27h2.27v2.27h-2.27v2.27h-2.271v-2.27h-2.27v-2.27h-2.271v-4.54h2.27v2.27h2.27v-2.27h-2.27v-2.271h2.27v-2.27h-4.54v-2.27h2.27v-2.271h-2.27v-4.54h2.27v-2.271h-2.27v-6.811h2.27v-2.27h-2.27v2.27h-4.54v-2.27h-2.271v2.27h2.27v2.27h-4.54v-4.54h-2.27V36.593H13.89v-4.54h-2.27v-2.27h2.27v-2.271H7.08v6.811h2.27v4.54h4.54v2.271h-2.27v2.27H9.35v-2.27H7.08v2.27h2.27v2.27H7.08v2.271h2.27v-2.27h2.27v2.27h2.27v-4.54h4.541v-2.27h-2.27v-4.541h2.27v2.27h2.27v2.27h2.271v2.27h-2.27v2.27h-2.27v2.271h-2.27v2.27H11.62v2.271H7.08v2.27h4.54v-2.27h4.541v2.27h9.081v9.081h4.541v4.541h-2.27v4.541h4.54v-2.27h2.271v2.27h2.27v-4.54h-4.54v-2.27h2.27v-2.271h2.27v-2.27h2.27v2.27h2.271v2.27h-2.27v6.811H45.675v-4.54h2.271v4.54h2.27v-4.54h2.271v4.54h6.811v-2.27h2.27v2.27h2.27v-2.27h-2.27v-2.27h-4.54v-2.27h-9.081v-2.271H59.297v2.27h2.27v-2.27h2.27v4.54h4.541v4.541h2.271v-2.27h2.27v-4.54h-2.27v-2.271h2.27v-2.27h-2.27v-2.27h2.27v-4.541h-2.27v-4.541h2.27V27.513h-2.27v-2.27h-2.27v2.27h-6.811v-2.27h-4.541v2.27h-2.27v-2.27h-2.271v-2.27h2.27v-4.541h-4.54v-2.27Zm2.27-6.812h2.27v4.54h-2.27v2.271h-2.27v-4.54h2.27V9.35Zm0 0h-6.811V7.08h6.811v2.27Zm0 13.622v-2.27h-2.27v2.27h2.27Zm9.081 6.811v2.27h2.27v2.271h-2.27v2.27h-2.27v4.541h-4.54v2.27h2.27v2.27h4.54v-2.27h2.27v4.541h-2.27v4.541h2.27v6.811h2.271v2.27h-2.27v2.27h4.54v-4.54h2.271v-4.54h-2.27v-4.541h2.27v-4.541h-2.27v-4.54h2.27v-6.811h-2.27v-2.271h2.27v-2.27h-4.54v2.27h-2.271v-2.27h-2.27Zm6.812 24.974h-2.27v2.27h2.27v-2.27Zm0-4.54h-4.541v-2.27h4.54v2.27Zm-4.541-9.082h2.27v2.27h-2.27v-2.27Zm-2.27 0v-4.54h2.27v4.54h-2.27Zm4.54-4.54v-2.27h-2.27v2.27h2.27Zm0 0h2.27v2.27h-2.27v-2.27Zm-4.54 4.54v2.27h-2.27v-2.27h2.27Zm0-11.352v-2.27h-2.27v2.27h2.27ZM57.028 68.38h-2.27v2.27h2.27v-2.27Zm-24.974 0h-2.27v2.27h2.27v-2.27ZM20.702 47.946v2.27h2.27v2.271h-4.54v-4.54h2.27Zm2.27-2.27v2.27h-2.27v-2.27h2.27Zm2.27 0v2.27h2.271v-2.27h-2.27Zm0 0h-2.27v-2.27h2.27v2.27Zm-2.27-9.082v2.27h-2.27v-2.27h2.27Zm0 0h2.27v-2.27h-2.27v2.27ZM9.35 34.324v-2.27h2.27v2.27H9.35Zm15.893 20.433h2.27v-2.27h-2.27v2.27ZM41.135 66.11v4.541h2.27v-4.54h-2.27Zm6.811-4.54v-2.27h2.27v2.27h-2.27Zm-2.27-6.812h-2.27v-2.27h2.27v2.27Zm0 0v2.27h2.27v-2.27h-2.27Zm4.54-20.433v2.27h2.271v-2.27h-2.27Zm2.271-9.081h-2.27v2.27h2.27v-2.27Zm4.54-18.163H72.92v15.892H57.028V7.08Zm4.541 2.27h-2.27V20.701H70.65V9.35h-9.081ZM11.62 11.62h6.811v6.811H11.621V11.621Zm34.056 0h2.27v2.27h-2.27v-2.27Zm15.892 0h6.811v6.811H61.57V11.621Zm-4.54 43.137h-2.27v6.811H61.567V54.758h-4.54ZM7.08 57.027h15.892V72.92H7.08V57.028Zm4.54 2.271H9.35V70.65H20.701V59.299h-9.08Zm45.408-2.27h2.27v2.27h-2.27v-2.27Zm-45.408 4.54h6.811v6.811H11.621V61.57Z"/></svg>
|
||||
diff --git a/browser/components/preferences/moreFromMozilla.js b/browser/components/preferences/moreFromMozilla.js
|
||||
index bf97580d..31017a6f 100644
|
||||
--- a/browser/components/preferences/moreFromMozilla.js
|
||||
+++ b/browser/components/preferences/moreFromMozilla.js
|
||||
@@ -81,51 +81,7 @@ var gMoreFromMozillaPane = {
|
||||
|
||||
renderProducts() {
|
||||
const isRegionUS = Region.home.toLowerCase() === "us";
|
||||
- let products = [
|
||||
- {
|
||||
- id: "firefox-mobile",
|
||||
- title_string_id: "more-from-moz-firefox-mobile-title",
|
||||
- description_string_id: "more-from-moz-firefox-mobile-description",
|
||||
- region: "global",
|
||||
- button: {
|
||||
- id: "fxMobile",
|
||||
- type: "link",
|
||||
- label_string_id: "more-from-moz-learn-more-link",
|
||||
- actionURL: AppConstants.isChinaRepack()
|
||||
- ? "https://www.firefox.com.cn/browsers/mobile/"
|
||||
- : "https://www.mozilla.org/firefox/browsers/mobile/",
|
||||
- },
|
||||
- qrcode: {
|
||||
- title: {
|
||||
- string_id: "more-from-moz-qr-code-box-firefox-mobile-title",
|
||||
- },
|
||||
- image_src_prefix:
|
||||
- "chrome://browser/content/preferences/more-from-mozilla-qr-code",
|
||||
- button: {
|
||||
- id: "qr-code-send-email",
|
||||
- label: {
|
||||
- string_id: "more-from-moz-qr-code-box-firefox-mobile-button",
|
||||
- },
|
||||
- actionURL: AppConstants.isChinaRepack()
|
||||
- ? "https://www.firefox.com.cn/mobile/get-app/"
|
||||
- : "https://www.mozilla.org/firefox/mobile/get-app/?v=mfm",
|
||||
- },
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- id: "mozilla-monitor",
|
||||
- title_string_id: "more-from-moz-mozilla-monitor-title",
|
||||
- description_string_id: isRegionUS
|
||||
- ? "more-from-moz-mozilla-monitor-us-description"
|
||||
- : "more-from-moz-mozilla-monitor-global-description",
|
||||
- region: isRegionUS ? "us" : "global",
|
||||
- button: {
|
||||
- id: "mozillaMonitor",
|
||||
- label_string_id: "more-from-moz-mozilla-monitor-button",
|
||||
- actionURL: "https://monitor.mozilla.org/",
|
||||
- },
|
||||
- },
|
||||
- ];
|
||||
+ let products = [];
|
||||
|
||||
if (BrowserUtils.shouldShowVPNPromo()) {
|
||||
const vpn = {
|
||||
diff -Nru a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg b/browser/components/privatebrowsing/content/assets/focus-qr-code.svg
|
||||
--- a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg 2022-05-22 09:35:55.412674110 +0000
|
||||
+++ b/browser/components/privatebrowsing/content/assets/focus-qr-code.svg 1970-01-01 00:00:00.000000000 +0000
|
||||
|
|
@ -794,3 +737,60 @@ index 3888af10..1d6c606f 100644
|
|||
"chrome://browser/content/asrouter/assets/fox-with-box-on-cloud.svg",
|
||||
"chrome://browser/content/asrouter/assets/fox-with-devices.svg",
|
||||
"chrome://browser/content/asrouter/assets/fox-with-locked-box.svg",
|
||||
diff --git a/browser/components/preferences/moreFromMozilla.js b/browser/components/preferences/moreFromMozilla.js
|
||||
index 8807b5d3..82367922 100644
|
||||
--- a/browser/components/preferences/moreFromMozilla.js
|
||||
+++ b/browser/components/preferences/moreFromMozilla.js
|
||||
@@ -81,51 +81,7 @@ var gMoreFromMozillaPane = {
|
||||
|
||||
renderProducts() {
|
||||
const isRegionUS = Region.home.toLowerCase() === "us";
|
||||
- let products = [
|
||||
- {
|
||||
- id: "firefox-mobile",
|
||||
- title_string_id: "more-from-moz-firefox-mobile-title",
|
||||
- description_string_id: "more-from-moz-firefox-mobile-description",
|
||||
- region: "global",
|
||||
- button: {
|
||||
- id: "fxMobile",
|
||||
- type: "link",
|
||||
- label_string_id: "more-from-moz-learn-more-link",
|
||||
- actionURL: BrowserUtils.isChinaRepack()
|
||||
- ? "https://www.firefox.com.cn/browsers/mobile/"
|
||||
- : "https://www.mozilla.org/firefox/browsers/mobile/",
|
||||
- },
|
||||
- qrcode: {
|
||||
- title: {
|
||||
- string_id: "more-from-moz-qr-code-box-firefox-mobile-title",
|
||||
- },
|
||||
- image_src_prefix:
|
||||
- "chrome://browser/content/preferences/more-from-mozilla-qr-code",
|
||||
- button: {
|
||||
- id: "qr-code-send-email",
|
||||
- label: {
|
||||
- string_id: "more-from-moz-qr-code-box-firefox-mobile-button",
|
||||
- },
|
||||
- actionURL: BrowserUtils.isChinaRepack()
|
||||
- ? "https://www.firefox.com.cn/mobile/get-app/"
|
||||
- : "https://www.mozilla.org/firefox/mobile/get-app/?v=mfm",
|
||||
- },
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- id: "mozilla-monitor",
|
||||
- title_string_id: "more-from-moz-mozilla-monitor-title",
|
||||
- description_string_id: isRegionUS
|
||||
- ? "more-from-moz-mozilla-monitor-us-description"
|
||||
- : "more-from-moz-mozilla-monitor-global-description",
|
||||
- region: isRegionUS ? "us" : "global",
|
||||
- button: {
|
||||
- id: "mozillaMonitor",
|
||||
- label_string_id: "more-from-moz-mozilla-monitor-button",
|
||||
- actionURL: "https://monitor.mozilla.org/",
|
||||
- },
|
||||
- },
|
||||
- ];
|
||||
+ let products = [];
|
||||
|
||||
if (BrowserUtils.shouldShowVPNPromo()) {
|
||||
const vpn = {
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
|
||||
index 391bc93e..df6b3f84 100644
|
||||
index 52a520fd..81cc685d 100644
|
||||
--- a/browser/app/profile/firefox.js
|
||||
+++ b/browser/app/profile/firefox.js
|
||||
@@ -1718,19 +1718,19 @@ pref("browser.topsites.component.enabled", false);
|
||||
|
||||
@@ -1718,19 +1718,19 @@
|
||||
pref("browser.topsites.component.enabled", false);
|
||||
pref("browser.topsites.useRemoteSetting", true);
|
||||
// Fetch sponsored Top Sites from Mozilla Tiles Service (Contile)
|
||||
-pref("browser.topsites.contile.enabled", true);
|
||||
|
|
@ -26,10 +26,17 @@ index 391bc93e..df6b3f84 100644
|
|||
-pref("browser.newtab.preload", true);
|
||||
+pref("browser.newtab.preload", false);
|
||||
|
||||
pref("browser.preonboarding.onTrainRolloutPopulation", 0);
|
||||
|
||||
// Mozilla Ad Routing Service (MARS) unified ads service
|
||||
pref("browser.newtabpage.activity-stream.unifiedAds.tiles.enabled", false);
|
||||
@@ -1738,12 +1738,12 @@ pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", false);
|
||||
pref("browser.newtabpage.activity-stream.unifiedAds.endpoint", "https://ads.mozilla.org/");
|
||||
-pref("browser.newtabpage.activity-stream.unifiedAds.tiles.enabled", true);
|
||||
-pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", true);
|
||||
-pref("browser.newtabpage.activity-stream.unifiedAds.endpoint", "https://ads.mozilla.org/");
|
||||
+pref("browser.newtabpage.activity-stream.unifiedAds.tiles.enabled", false);
|
||||
+pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", false);
|
||||
+pref("browser.newtabpage.activity-stream.unifiedAds.endpoint", "");
|
||||
pref("browser.newtabpage.activity-stream.unifiedAds.adsFeed.enabled", false);
|
||||
pref("browser.newtabpage.activity-stream.unifiedAds.adsFeed.tiles.enabled", false);
|
||||
|
||||
// Weather widget for newtab
|
||||
-pref("browser.newtabpage.activity-stream.showWeather", true);
|
||||
|
|
@ -37,9 +44,11 @@ index 391bc93e..df6b3f84 100644
|
|||
pref("browser.newtabpage.activity-stream.weather.query", "");
|
||||
pref("browser.newtabpage.activity-stream.weather.display", "simple");
|
||||
|
||||
+pref("browser.newtabpage.activity-stream.images.smart", true);
|
||||
|
||||
// enable location search for newtab weather widget
|
||||
-pref("browser.newtabpage.activity-stream.weather.locationSearchEnabled", true);
|
||||
+pref("browser.newtabpage.activity-stream.weather.locationSearchEnabled", false);
|
||||
|
||||
// List of regions that get weather by default.
|
||||
pref("browser.newtabpage.activity-stream.discoverystream.region-weather-config", "US,CA");
|
||||
pref("browser.newtabpage.activity-stream.discoverystream.region-weather-config", "US,CA")
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml
|
||||
index 53e4616a..ba6a3dfb 100644
|
||||
index c6498081..a8db34ad 100644
|
||||
--- a/browser/base/content/aboutDialog.xhtml
|
||||
+++ b/browser/base/content/aboutDialog.xhtml
|
||||
@@ -137,7 +137,7 @@
|
||||
@@ -138,7 +138,7 @@
|
||||
<vbox id="bottomBox">
|
||||
<hbox pack="center">
|
||||
<label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"/>
|
||||
- <label is="text-link" class="bottom-link" href="https://www.mozilla.org/about/legal/terms/firefox/" data-l10n-id="bottomLinks-rights"/>
|
||||
+ <label is="text-link" class="bottom-link" href="https://trisquel.info/es/legal" data-l10n-id="bottomLinks-rights"/>
|
||||
<label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog" data-l10n-id="bottomLinks-privacy"/>
|
||||
- <label is="text-link" class="bottom-link" href="https://www.mozilla.org/about/legal/terms/firefox/" data-l10n-id="bottom-links-terms"/>
|
||||
+ <label is="text-link" class="bottom-link" href="https://trisquel.info/legal" data-l10n-id="bottom-links-terms"/>
|
||||
<label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog" data-l10n-id="bottom-links-privacy"/>
|
||||
</hbox>
|
||||
<description id="trademark" data-l10n-id="trademarkInfo"></description>
|
||||
diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp
|
||||
|
|
@ -20,7 +20,7 @@ index d1fe0148..ce5d1f42 100644
|
|||
"chrome://devtools/content/performance-new/aboutprofiling/index.xhtml",
|
||||
nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
|
||||
- {"rights", "https://www.mozilla.org/about/legal/terms/firefox/",
|
||||
+ {"rights", "https://trisquel.info/es/legal",
|
||||
+ {"rights", "https://trisquel.info/legal",
|
||||
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
|
||||
nsIAboutModule::URI_MUST_LOAD_IN_CHILD},
|
||||
{"robots", "chrome://browser/content/aboutRobots.xhtml",
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
diff --git a/toolkit/mozapps/extensions/content/aboutaddons.html b/toolkit/mozapps/extensions/content/aboutaddons.html
|
||||
index 77702576..35cf6593 100644
|
||||
--- a/toolkit/mozapps/extensions/content/aboutaddons.html
|
||||
+++ b/toolkit/mozapps/extensions/content/aboutaddons.html
|
||||
@@ -799,18 +799,6 @@
|
||||
<footer is="recommended-footer" class="view-footer"></footer>
|
||||
</template>
|
||||
|
||||
- <template name="recommended-themes-footer">
|
||||
- <p data-l10n-id="recommended-theme-1" class="theme-recommendation">
|
||||
- <a data-l10n-name="link" target="_blank"></a>
|
||||
- </p>
|
||||
- <div class="amo-link-container view-footer-item">
|
||||
- <button
|
||||
- class="primary"
|
||||
- action="open-amo"
|
||||
- data-l10n-id="find-more-themes"
|
||||
- ></button>
|
||||
- </div>
|
||||
- </template>
|
||||
|
||||
<template name="recommended-themes-section">
|
||||
<h2
|
||||
|
|
@ -324,7 +324,7 @@ class TopSites(RemoteSettings):
|
|||
|
||||
@classmethod
|
||||
def should_drop_record(cls, site):
|
||||
return site['url'] != 'https://www.wikipedia.org/'
|
||||
return True
|
||||
|
||||
@classmethod
|
||||
def process_record(cls, site):
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
#
|
||||
|
||||
VERSION=120.8
|
||||
VERSION=120.14
|
||||
EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main'
|
||||
REPOKEY=9BDB3D89CE49EC21
|
||||
|
||||
|
|
@ -43,9 +43,9 @@ sed "/async download.*/a\ \ \ \ console.warn(\"Function 'fetchLatestChanges' dis
|
|||
|
||||
# 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
|
||||
ActivityStream=browser/components/newtab/lib/ActivityStream.sys.mjs
|
||||
ActivityStream=browser/extensions/newtab/lib/ActivityStream.sys.mjs
|
||||
BAP_FirefoxJs=browser/app/profile/firefox.js
|
||||
sed '/^const DEFAULT_SITES/,/^])\;/c const DEFAULT_SITES = new Map\([[""]]\);' -i browser/components/newtab/lib/DefaultSites.sys.mjs
|
||||
sed '/^const DEFAULT_SITES/,/^])\;/c const DEFAULT_SITES = new Map\([[""]]\);' -i browser/extensions/newtab/lib/DefaultSites.sys.mjs
|
||||
sed '/"showSponsored"/,/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
|
||||
|
|
@ -81,7 +81,7 @@ sed -i '/services.sync.prefs.sync.browser.firefox-view.feature-tour/s|true|false
|
|||
##disable ui tour
|
||||
sed -i '/browser.uitour.enabled/s|true|false|' $BAP_FirefoxJs
|
||||
##disable colorways closet
|
||||
sed -i '/browser.theme.colorway-closet/s|true|false|' $BAP_FirefoxJs
|
||||
#sed -i '/browser.theme.colorway-closet/s|true|false|' $BAP_FirefoxJs
|
||||
##disable newtab intro - check adjustment for versions greater than 106
|
||||
#grep -rl browser.newtabpage.introShown |xargs -r sed -i '/browser.newtabpage.introShown/s|true|false|'
|
||||
##Remove mailto handlers. 110
|
||||
|
|
@ -135,6 +135,9 @@ sed -i '/media.gmp-manager.chromium-update-url/s|https://update.googleapis.com/s
|
|||
sed -i 's|\(pref("media\.gmp-widevinecdm-l1\.chromium-guid", \)"[^"]*"|\1""|' $BAP_FirefoxJs
|
||||
sed -i 's|\(pref("media\.gmp-widevinecdm\.chromium-guid", \)"[^"]*"|\1""|' $BAP_FirefoxJs
|
||||
|
||||
# Replace mozilla url addons button
|
||||
sed -i '/extensions.getAddons.link.url/s|https://addons.mozilla.org/%LOCALE%/firefox/|https://gnuzilla.gnu.org/mozzarella/|' $BAP_FirefoxJs
|
||||
|
||||
# Update third_party/rust/glean/src/configuration.rs sha256sum at third_party/rust/glean/.cargo-checksum.json
|
||||
GLEAN_CONF_RS_MODIFIED=$(sha256sum third_party/rust/glean/src/configuration.rs|awk '{print$1}')
|
||||
sed_csum $GLEAN_CONF_RS_INITIAL \
|
||||
|
|
@ -145,7 +148,9 @@ sed '/Google API/,/google-api-keyfile/ d' debian/config/mozconfig.in -i
|
|||
sed '/"geo.provider.network.url"/s|https.*"|"|' -i modules/libpref/init/all.js
|
||||
|
||||
# Disable save password in browser suggestion.
|
||||
#grep -lr '^pref("signon.rememberSignons"'| xargs sed -i "/^pref(\"signon.rememberSignons\"/s|true|false|" modules/libpref/init/all.js
|
||||
#grep -lr '^pref("signon.rememberSignons"'| \
|
||||
# xargs sed -i "/^pref(\"signon.rememberSignons\"/s|true|false|" \
|
||||
# modules/libpref/init/all.js
|
||||
|
||||
# Org branding
|
||||
sed 's/com.ubuntu/org.trisquel/' -i debian/config/mozconfig.in
|
||||
|
|
@ -251,7 +256,8 @@ cp -a $DATA/branding/* browser/branding/nightly
|
|||
cp -a $DATA/branding/* browser/branding/aurora
|
||||
# We are using unofficial but also should have abrowser word on the about window.
|
||||
cp browser/branding/official/content/jar.mn browser/branding/unofficial/content/jar.mn
|
||||
echo '#warningDesc, #communityExperimentalDesc, #communityDesc, #contributeDesc {display:none!important}' >> browser/base/content/aboutDialog.css
|
||||
echo '#warningDesc, #communityExperimentalDesc, #communityDesc, #contributeDesc {display:none!important}' >> \
|
||||
browser/base/content/aboutDialog.css
|
||||
|
||||
# Replace/remove brand name on used view(s) to avoid branding issues.
|
||||
for i in $(find . -name brandings.ftl)
|
||||
|
|
@ -295,10 +301,14 @@ s|firefox-help|abrowser-help|g;
|
|||
"
|
||||
|
||||
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" '{}' ';'
|
||||
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/" '{}' ';'
|
||||
find l10n -type f -not -iregex '.*changelog.*' \
|
||||
-not -iregex '.*copyright.*' \
|
||||
-execdir /bin/sed --follow-symlinks -i "s/Firefox/Abrowser/" '{}' ';'
|
||||
|
||||
sed 's/Firefox/Abrowser/' -i debian/control.in \
|
||||
browser/locales/en-US/chrome/overrides/appstrings.properties
|
||||
|
|
@ -328,11 +338,14 @@ cat << EOF >> toolkit/mozapps/extensions/content/extensions.css
|
|||
EOF
|
||||
|
||||
# Hide mobile promo
|
||||
echo ".fxaMobilePromo { display: none !important; }" >> browser/themes/shared/preferences/preferences.inc.css
|
||||
echo ".fxaMobilePromo { display: none !important; }" >> \
|
||||
browser/themes/shared/preferences/preferences.inc.css
|
||||
# Hide unwanted elements on about:addons
|
||||
echo ".discopane-notice, .privacy-policy-link, #main header, #plugindeprecation-notice { display: none !important; }" >> toolkit/mozapps/extensions/content/aboutaddons.css
|
||||
echo ".discopane-notice, .privacy-policy-link, #main header, #plugindeprecation-notice { display: none !important; }" >> \
|
||||
toolkit/mozapps/extensions/content/aboutaddons.css
|
||||
# Hide warnings on unsigned extensions
|
||||
echo ".warning{display: none!important; } .addon[notification=warning]{background-image: none!important;}" >> toolkit/mozapps/extensions/content/extensions.css
|
||||
echo ".warning{display: none!important; } .addon[notification=warning]{background-image: none!important;}" >> \
|
||||
toolkit/mozapps/extensions/content/extensions.css
|
||||
# Hide extra links in about box
|
||||
|
||||
# about: page mods, like rights.
|
||||
|
|
@ -344,8 +357,10 @@ echo ".warning{display: none!important; } .addon[notification=warning]{backgroun
|
|||
|
||||
#EO about: mods.
|
||||
|
||||
sed -i 's|<a href="http://www.mozilla.org/">Mozilla Project</a>|<a href="http://www.trisquel.info/">Trisquel Project</a>|g' browser/base/content/overrides/app-license.html
|
||||
sed -i 's|https://firefox-source-docs.mozilla.org/contributing/contribution_quickref.html|https://gitlab.trisquel.org/trisquel/package-helpers|' toolkit/content/license.html
|
||||
sed -i 's|<a href="http://www.mozilla.org/">Mozilla Project</a>|<a href="http://www.trisquel.info/">Trisquel Project</a>|g' \
|
||||
browser/base/content/overrides/app-license.html
|
||||
sed -i "s|https://firefox-source-docs.mozilla.org/contributing/contribution_quickref.html|$GIT_TPH_REPO|" \
|
||||
toolkit/content/license.html
|
||||
|
||||
# We went too far...
|
||||
#sed -i 's/iceweasel, abrowser, icecat,/iceweasel, firefox, icecat,/g' debian/control.in
|
||||
|
|
@ -405,12 +420,12 @@ find browser/branding/ -name PrivateBrowsing_150.png | xargs -n1 cp $DATA/debug_
|
|||
find l10n/ -name aboutAddons.ftl | xargs -r sed -i '/.placeholder/s|addons.mozilla.org|gnuzilla.gnu.org|g'
|
||||
sed -i "s|$OLD_WEB_DEV_URL|$WEB_DEV_URL|" devtools/client/menus.js
|
||||
grep -lr addons-help toolkit/mozapps/extensions/ | xargs -r sed -i 's|addons-help|abrowser-help|'
|
||||
#sed -i '/domain ==/s|addons.mozilla.org|gnuzilla.gnu.org|' netwerk/protocol/http/nsHttpChannel.cpp
|
||||
sed -i "/browser.discovery.sites/s|addons.mozilla.org|gnuzilla.gnu.org|" $BAP_FirefoxJs
|
||||
sed -i "/lightweightThemes.getMoreURL/s|https://addons.mozilla.org/.*themes||" $BAP_FirefoxJs
|
||||
|
||||
#Fixes by patch on source, see DATA/firefox/patches for more info.
|
||||
for patch in $(ls -v ${DATA}/patch_changes/*.patch)
|
||||
do
|
||||
patch_p1 $patch
|
||||
done
|
||||
apply_patch_changes
|
||||
|
||||
# Postinst script to manage profile migration and system links
|
||||
echo '
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue