From 72851d5f27f4fafefc20922de319e133caa53449 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sat, 18 Jan 2020 20:06:11 -0500 Subject: [iceweasel]: rework patches for v72.0.1 --- libre/iceweasel/libre.patch | 328 ++++++++++++++++++++++---------------------- 1 file changed, 164 insertions(+), 164 deletions(-) (limited to 'libre/iceweasel/libre.patch') diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index 53abc78b2..018ab6e5d 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -1,5 +1,134 @@ +diff --git a/browser/app/permissions b/browser/app/permissions +index ecb82a2..5d522ef 100644 +--- a/browser/app/permissions ++++ b/browser/app/permissions +@@ -14,12 +14,6 @@ origin uitour 1 https://support.mozilla.org + origin uitour 1 about:home + origin uitour 1 about:newtab + +-# XPInstall +-origin install 1 https://addons.mozilla.org +- + # Remote troubleshooting + origin remote-troubleshooting 1 https://support.mozilla.org + +-# addon install +-origin install 1 https://private-network.firefox.com +-origin install 1 https://fpn.firefox.com +diff --git a/browser/components/newtab/docs/index.rst b/browser/components/newtab/docs/index.rst +index ea1e42a..855b245 100644 +--- a/browser/components/newtab/docs/index.rst ++++ b/browser/components/newtab/docs/index.rst +@@ -1,8 +1,8 @@ + ====================== +-Firefox Home (New Tab) ++Iceweasel Home (New Tab) + ====================== + +-All files related to Firefox Home, which includes content that appears on `about:home`, ++All files related to Iceweasel Home, which includes content that appears on `about:home`, + `about:newtab`, and `about:welcome`, can we found in the `browser/components/newtab` directory. + Some of these source files (such as `.js`, `.jsx`, and `.sass`) require an additional build step. + We are working on migrating this to work with `mach`, but in the meantime, please +diff --git a/browser/components/preferences/in-content/sync.inc.xhtml b/browser/components/preferences/in-content/sync.inc.xhtml +index 7d37d26..4ebbc06 100644 +--- a/browser/components/preferences/in-content/sync.inc.xhtml ++++ b/browser/components/preferences/in-content/sync.inc.xhtml +@@ -35,22 +35,6 @@ + + + +- + + + +diff --git a/browser/locales/en-US/browser/newtab/newtab.ftl b/browser/locales/en-US/browser/newtab/newtab.ftl +index 0737833..7cb90d6 100644 +--- a/browser/locales/en-US/browser/newtab/newtab.ftl ++++ b/browser/locales/en-US/browser/newtab/newtab.ftl +@@ -2,7 +2,7 @@ + # 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/. + +-### Firefox Home / New Tab strings for about:home / about:newtab. ++### Iceweasel Home / New Tab strings for about:home / about:newtab. + + newtab-page-title = New Tab + newtab-settings-button = +diff --git a/browser/locales/en-US/browser/policies/policies-descriptions.ftl b/browser/locales/en-US/browser/policies/policies-descriptions.ftl +index dabfadc..3ce732e 100644 +--- a/browser/locales/en-US/browser/policies/policies-descriptions.ftl ++++ b/browser/locales/en-US/browser/policies/policies-descriptions.ftl +@@ -96,7 +96,7 @@ policy-ExtensionSettings = Manage all aspects of extension installation. + + policy-ExtensionUpdate = Enable or disable automatic extension updates. + +-policy-FirefoxHome = Configure Firefox Home. ++policy-FirefoxHome = Configure Iceweasel Home. + + policy-FlashPlugin = Allow or deny usage of the Flash plugin. + +diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl +index 1b29e8d..6f7566c 100644 +--- a/browser/locales/en-US/browser/preferences/preferences.ftl ++++ b/browser/locales/en-US/browser/preferences/preferences.ftl +@@ -550,7 +550,7 @@ home-restore-defaults = + # "Firefox" should be treated as a brand and kept in English, + # while "Home" and "(Default)" can be localized. + home-mode-choice-default = +- .label = Firefox Home (Default) ++ .label = Iceweasel Home (Default) + + home-mode-choice-custom = + .label = Custom URLs… +@@ -577,10 +577,10 @@ choose-bookmark = + .label = Use Bookmark… + .accesskey = B + +-## Home Section - Firefox Home Content Customization ++## Home Section - Iceweasel Home Content Customization + +-home-prefs-content-header = Firefox Home Content +-home-prefs-content-description = Choose what content you want on your Firefox Home screen. ++home-prefs-content-header = Iceweasel Home Content ++home-prefs-content-description = Choose what content you want on your Iceweasel Home screen. + + home-prefs-search-header = + .label = Web Search +@@ -714,16 +714,6 @@ sync-signedout-account-signin2 = + .label = Sign in to { -sync-brand-short-name }… + .accesskey = i + +-# This message contains two links and two icon images. +-# `` - Android logo icon +-# `` - Link to Android Download +-# `` - iOS logo icon +-# `` - Link to iOS Download +-# +-# They can be moved within the sentence as needed to adapt +-# to your language, but should not be changed or translated. +-sync-mobile-promo = Download Firefox for Android or iOS to sync with your mobile device. +- + ## Firefox Account - Signed in + + sync-profile-picture = diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in -index dc67747620..00221d37a1 100644 +index 2d3c7b4..00221d3 100644 --- a/browser/locales/generic/profile/bookmarks.html.in +++ b/browser/locales/generic/profile/bookmarks.html.in @@ -1,15 +1,15 @@ @@ -23,7 +152,7 @@ index dc67747620..00221d37a1 100644 -@@ -21,30 +21,21 @@ +@@ -21,29 +21,21 @@

@bookmarks_toolbarfolder@

@bookmarks_toolbarfolder_description@ @@ -56,7 +185,6 @@ index dc67747620..00221d37a1 100644 -
@mdn@ -
@nightly_tester_tools@ -
@crashes@ --
@irc@ -
@planet@ +
Free Software Foundation +
The GNU Operating System and the Free Software Movement @@ -66,122 +194,62 @@ index dc67747620..00221d37a1 100644 -#endif
diff --git a/devtools/client/locales/en-US/sourceeditor.properties b/devtools/client/locales/en-US/sourceeditor.properties -index 842d549f04..31dcb82e5a 100644 +index 9427244..c17d490 100644 --- a/devtools/client/locales/en-US/sourceeditor.properties +++ b/devtools/client/locales/en-US/sourceeditor.properties @@ -4,7 +4,7 @@ # LOCALIZATION NOTE These strings are used inside the Source Editor component. # This component is used whenever source code is displayed for the purpose of --# being edited, inside the Firefox developer tools - current examples are the -+# being edited, inside the Iceweasel developer tools - current examples are the - # Scratchpad and the Style Editor tools. +-# being edited, inside the Firefox developer tools (like Style Editor). ++# being edited, inside the Iceweasel developer tools (like Style Editor). # LOCALIZATION NOTE The correct localization of this file might be to keep it -diff --git a/browser/app/permissions b/browser/app/permissions -index f40a60e..c23fa76 100644 ---- a/browser/app/permissions -+++ b/browser/app/permissions -@@ -14,16 +14,9 @@ origin uitour 1 https://support.mozilla.org - origin uitour 1 about:home - origin uitour 1 about:newtab - --# XPInstall --origin install 1 https://addons.mozilla.org -- - # Remote troubleshooting - origin remote-troubleshooting 1 https://support.mozilla.org - - # Hybrid Content Telemetry - https://firefox-source-docs.mozilla.org/toolkit/components/telemetry/telemetry/collection/hybrid-content.html - # Adding hc_telemetry permission to a new domain requires Data Collection Review: https://wiki.mozilla.org/Firefox/Data_Collection - origin hc_telemetry 1 https://discovery.addons.mozilla.org -- --# addon install --origin install 1 https://private-network.firefox.com --origin install 1 https://fpn.firefox.com -diff --git a/browser/components/preferences/in-content/sync.inc.xul b/browser/components/preferences/in-content/sync.inc.xul -index e444bf3..05e9824 100644 ---- a/browser/components/preferences/in-content/sync.inc.xul -+++ b/browser/components/preferences/in-content/sync.inc.xul -@@ -46,22 +46,6 @@ - - - -- - - - -diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl -index 8e0602d..cde6252 100644 ---- a/browser/locales/en-US/browser/preferences/preferences.ftl -+++ b/browser/locales/en-US/browser/preferences/preferences.ftl -@@ -719,16 +719,6 @@ sync-signedout-account-signin = - .label = Sign In… - .accesskey = I - --# This message contains two links and two icon images. --# `` - Android logo icon --# `` - Link to Android Download --# `` - iOS logo icon --# `` - Link to iOS Download --# --# They can be moved within the sentence as needed to adapt --# to your language, but should not be changed or translated. --sync-mobile-promo = Download Firefox for Android or iOS to sync with your mobile device. -- - ## Firefox Account - Signed in - - sync-profile-picture = + # in English, or another language commonly spoken among web developers. diff --git a/devtools/client/whats-new/src/main.js b/devtools/client/whats-new/src/main.js -index ad34ff9..3e937c6 100644 +index 0a31843..c01e488 100644 --- a/devtools/client/whats-new/src/main.js +++ b/devtools/client/whats-new/src/main.js -@@ -23,7 +23,7 @@ const aside = { +@@ -29,7 +29,7 @@ const aside = { }; const release = { -- title: "What’s New in DevTools (Firefox 70 & 71)", -+ title: "What’s New in DevTools (Iceweasel 70 & 71)", +- title: "What’s New in DevTools (Firefox 72 & 71)", ++ title: "What’s New in DevTools (Iceweasel 72 & 71)", linkText: "Read more", - linkUrl: - "https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/71?utm_source=devtools&utm_medium=devtools_whatsnew", -@@ -83,20 +83,6 @@ const release = { + linkUrl: `https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/72?${utmParams}`, + features: [ +@@ -66,29 +66,6 @@ const release = { ], }; -const dev = { - title: "Experimental Features in Firefox Developer Edition", -- linkUrl: -- "https://www.mozilla.org/firefox/developer/?utm_medium=devtools_whatsnew&utm_source=devtools", +- linkUrl: `https://www.mozilla.org/firefox/developer/?${utmParams}`, - linkText: "Get DevEdition", - features: [ - { -- header: `Debug Variables with Watchpoints`, -- description: `Debugger’s new Watchpoints feature lets you pause when properties get read or written. Right-click object properties in the Scopes pane when paused to use the new “Break on…” menu.`, -- href: `https://developer.mozilla.org/docs/Tools/Debugger/How_to/Set_a_watchpoint_on_a_property?utm_source=devtools&utm_medium=devtools_whatsnew`, +- header: `Asynchronous Stacks in Debugger`, +- description: `Asynchronous call stacks in the Debugger let you examine the event-driven function calls at previous points in time.`, +- href: `https://developer.mozilla.org/en-US/docs/Tools/Debugger/UI_Tour?${utmParams}`, +- }, +- { +- header: `Correct Meta Viewport in Responsive Design Mode`, +- description: `RDM with touch simulation enabled will now correctly simulate the meta viewport rendering of a mobile device.`, +- href: `https://developer.mozilla.org/docs/Tools/Responsive_Design_Mode?${utmParams}`, +- }, +- { +- header: `CSP Style Directives No Longer Prevent CSS Edits`, +- description: `Editing an element’s inline style from Inspector’s rule-view now works even if style-src is blocked by CSP.`, +- href: `https://developer.mozilla.org/en-US/docs/Tools/Page_Inspector/How_to/Examine_and_edit_CSS?${utmParams}`, - }, - ], -}; - - class Aside extends Component { - render() { - return dom.aside( -@@ -183,11 +169,6 @@ class App extends Component { + function openLink(href, e) { + return openDocLink(href, { + relatedToCurrent: true, +@@ -182,11 +159,6 @@ class App extends Component { ...release.features .filter(feature => !feature.hidden) .map(feature => createFactory(Feature)(feature)) @@ -239,6 +307,7 @@ index db2146d..e02ab58 100644 enable-learn-more-link = Learn more about Developer Tools enable-enable-button = Enable Developer Tools enable-close-button = Close this Tab + -welcome-title = Welcome to Firefox Developer Tools! +welcome-title = Welcome to Iceweasel Developer Tools! newsletter-title = Mozilla Developer Newsletter @@ -254,11 +323,11 @@ index db2146d..e02ab58 100644 features-learn-more = Learn more diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl -index 0066077..801f2fb 100644 +index edd871b..77870fe 100644 --- a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl +++ b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl -@@ -6,7 +6,7 @@ addons-window = - .title = Add-ons Manager +@@ -7,7 +7,7 @@ addons-window = + addons-page-title = Add-ons Manager search-header = - .placeholder = Search addons.mozilla.org @@ -266,72 +335,3 @@ index 0066077..801f2fb 100644 .searchbuttonlabel = Search search-header-shortcut = -diff --git a/browser/components/newtab/docs/index.rst b/browser/components/newtab/docs/index.rst -index ea1e42ae8..855b245a1 100644 ---- a/browser/components/newtab/docs/index.rst -+++ b/browser/components/newtab/docs/index.rst -@@ -1,8 +1,8 @@ - ====================== --Firefox Home (New Tab) -+Iceweasel Home (New Tab) - ====================== - --All files related to Firefox Home, which includes content that appears on `about:home`, -+All files related to Iceweasel Home, which includes content that appears on `about:home`, - `about:newtab`, and `about:welcome`, can we found in the `browser/components/newtab` directory. - Some of these source files (such as `.js`, `.jsx`, and `.sass`) require an additional build step. - We are working on migrating this to work with `mach`, but in the meantime, please -diff --git a/browser/locales/en-US/browser/newtab/newtab.ftl b/browser/locales/en-US/browser/newtab/newtab.ftl -index d0f0fe0af..360e04b61 100644 ---- a/browser/locales/en-US/browser/newtab/newtab.ftl -+++ b/browser/locales/en-US/browser/newtab/newtab.ftl -@@ -2,7 +2,7 @@ - # 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/. - --### Firefox Home / New Tab strings for about:home / about:newtab. -+### Iceweasel Home / New Tab strings for about:home / about:newtab. - - newtab-page-title = New Tab - newtab-settings-button = -diff --git a/browser/locales/en-US/browser/policies/policies-descriptions.ftl b/browser/locales/en-US/browser/policies/policies-descriptions.ftl -index dfee10e51..6402f5c85 100644 ---- a/browser/locales/en-US/browser/policies/policies-descriptions.ftl -+++ b/browser/locales/en-US/browser/policies/policies-descriptions.ftl -@@ -96,7 +96,7 @@ policy-ExtensionSettings = Manage all aspects of extension installation. - - policy-ExtensionUpdate = Enable or disable automatic extension updates. - --policy-FirefoxHome = Configure Firefox Home. -+policy-FirefoxHome = Configure Iceweasel Home. - - policy-FlashPlugin = Allow or deny usage of the Flash plugin. - -diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl -index cde625248..662c15736 100644 ---- a/browser/locales/en-US/browser/preferences/preferences.ftl -+++ b/browser/locales/en-US/browser/preferences/preferences.ftl -@@ -551,7 +551,7 @@ home-restore-defaults = - # "Firefox" should be treated as a brand and kept in English, - # while "Home" and "(Default)" can be localized. - home-mode-choice-default = -- .label = Firefox Home (Default) -+ .label = Iceweasel Home (Default) - - home-mode-choice-custom = - .label = Custom URLs… -@@ -578,10 +578,10 @@ choose-bookmark = - .label = Use Bookmark… - .accesskey = B - --## Home Section - Firefox Home Content Customization -+## Home Section - Iceweasel Home Content Customization - --home-prefs-content-header = Firefox Home Content --home-prefs-content-description = Choose what content you want on your Firefox Home screen. -+home-prefs-content-header = Iceweasel Home Content -+home-prefs-content-description = Choose what content you want on your Iceweasel Home screen. - - home-prefs-search-header = - .label = Web Search - -- cgit v1.2.3