From 76c2518597b9475498150f2d6ad19d358e61f6d5 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Thu, 2 Jul 2020 20:48:04 +0300 Subject: iceweasel: remove What's New tab from DevTools This is to reduce maintenance burden. The tab is going to have new content in each new release, and as can be seen with this release, some news items can contain references or mention nonfree stuff. Instead of patching each new release, just removing it for now. Those who want to see the news can find them (and more) on the upstream release notes webpage. Signed-off-by: Andreas Grapentin --- libre/iceweasel/PKGBUILD | 3 + libre/iceweasel/libre.patch | 180 +++++++++++++------------------------------- 2 files changed, 54 insertions(+), 129 deletions(-) diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 2e5a556e3..a8d215351 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -276,6 +276,9 @@ END _removed_engines_regex='Bing|Google|Seznam|Twitter|Yahoo|Yandex|Яндекс|amazon|bing|google|ebay|twitter' _err_msg="search-engines patch needs re-working" ! grep -E ${_removed_engines_regex} ${_search_config_file} > /dev/null || ! echo "${_err_msg}" + + # Removing What's New tab from Developer Tools, usages are removed by libre.patch + rm -rf devtools/client/whats-new } build() { diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index 1198e6c04..bde8de32d 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -165,110 +165,6 @@ index 2d3c7b4..00221d3 100644 -#endif -diff --git a/devtools/client/whats-new/src/main.js b/devtools/client/whats-new/src/main.js -index e5c4676da6..adcc1708de 100644 ---- a/devtools/client/whats-new/src/main.js -+++ b/devtools/client/whats-new/src/main.js -@@ -21,15 +21,8 @@ const utmParams = new URLSearchParams({ - utm_medium: "devtools_whatsnew", - }); - --const aside = { -- header: "Instantly Send Tabs to Mobile", -- content: `Test your site on mobile and other devices without having to copy, paste, or leave the browser.`, -- cta: "Learn More About Send Tabs", -- href: `https://play.google.com/store/apps/details?id=org.mozilla.fennec_aurora&referrer=utm_source%3Dmozilla%26utm_medium%3DReferral%26utm_campaign%3Dmozilla-org${utmParams}`, --}; -- - const release = { -- title: "What’s New in DevTools (Firefox 77)", -+ title: "What’s New in DevTools (Iceweasel 77)", - linkText: "Read more", - linkUrl: `https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/77?${utmParams}`, - features: [ -@@ -40,7 +33,7 @@ const release = { - }, - { - header: `Source Maps that just work`, -- description: `Firefox 77 has the most fixes yet to make source maps faster and more dependable so that your original CSS and JavaScript/TypeScript/etc code is always at hand. Especially improved: build outputs which previously failed to load source maps.`, -+ description: `Iceweasel 77 has the most fixes yet to make source maps faster and more dependable so that your original CSS and JavaScript/TypeScript/etc code is always at hand. Especially improved: build outputs which previously failed to load source maps.`, - href: `https://developer.mozilla.org/en-US/docs/Tools/Debugger/How_to/Use_a_source_map?${utmParams}`, - }, - { -@@ -61,19 +54,6 @@ const release = { - ], - }; - --const dev = { -- title: "Experimental Features in Firefox Developer Edition", -- linkUrl: `https://www.mozilla.org/firefox/developer/?${utmParams}`, -- linkText: "Get DevEdition", -- features: [ -- { -- header: `Cross-browser CSS compatibility audit`, -- description: `Analyze your CSS for cross-browser compatibility with a new sidepanel in the Inspector. Let us know how well it worked for your projects via the Feedback option!`, -- href: `https://discourse.mozilla.org/t/new-in-devedition-77-css-compatibility-in-inspector/60669`, -- }, -- ], --}; -- - function openLink(href, e) { - return openDocLink(href, { - relatedToCurrent: true, -@@ -81,33 +61,6 @@ function openLink(href, e) { - }); - } - --class Aside extends Component { -- render() { -- return dom.aside( -- {}, -- dom.div( -- { className: "call-out" }, -- dom.h3({}, aside.header), -- dom.p({}, aside.content), -- dom.p( -- { className: "cta" }, -- dom.a( -- { -- href: aside.href, -- className: "devtools-button", -- onClick: e => { -- e.preventDefault(); -- openLink(aside.href, e); -- }, -- }, -- aside.cta -- ) -- ) -- ) -- ); -- } --} -- - class Feature extends Component { - static get propTypes() { - return { -@@ -154,7 +107,6 @@ class App extends Component { - render() { - return dom.main( - {}, -- createFactory(Aside)(), - dom.article( - {}, - dom.h2( -@@ -167,11 +119,6 @@ class App extends Component { - ...release.features - .filter(feature => !feature.hidden) - .map(feature => createFactory(Feature)(feature)) -- ), -- dom.h2({}, dom.span({}, dev.title), Link(dev.linkText, dev.linkUrl)), -- dom.ul( -- {}, -- ...dev.features.map(feature => createFactory(Feature)(feature)) - ) - ) - ); diff --git a/devtools/startup/aboutdevtools/aboutdevtools.xhtml b/devtools/startup/aboutdevtools/aboutdevtools.xhtml index 5b0709e..38ea275 100644 --- a/devtools/startup/aboutdevtools/aboutdevtools.xhtml @@ -604,30 +500,56 @@ index 03feeef059..f9580d0f8f 100644 about-logins-menu-menuitem-help = Help -menu-menuitem-android-app = { -lockwise-brand-short-name } for Android -menu-menuitem-iphone-app = { -lockwise-brand-short-name } for iPhone and iPad - + ## Login List - -diff --git a/browser/locales/en-US/browser/protections.ftl b/browser/locales/en-US/browser/protections.ftl -index dc51592c0a..19e269bdd8 100644 ---- a/browser/locales/en-US/browser/protections.ftl -+++ b/browser/locales/en-US/browser/protections.ftl -@@ -68,19 +68,12 @@ protections-close-button2 = - .aria-label = Close - .title = Close - --mobile-app-title = Block ad trackers across more devices --mobile-app-card-content = Use the mobile browser with built-in protection against ad tracking. --mobile-app-links = { -brand-product-name } Browser for Android and iOS + +diff --git a/devtools/client/definitions.js b/devtools/client/definitions.js +index 5cd41b3e36..ba6b2bc4d8 100644 +--- a/devtools/client/definitions.js ++++ b/devtools/client/definitions.js +@@ -73,11 +73,6 @@ loader.lazyGetter( + "ApplicationPanel", + () => require("devtools/client/application/panel").ApplicationPanel + ); +-loader.lazyGetter( +- this, +- "WhatsNewPanel", +- () => require("devtools/client/whats-new/panel").WhatsNewPanel +-); + + // Other dependencies + loader.lazyRequireGetter( +@@ -529,7 +524,6 @@ var defaultTools = [ + Tools.dom, + Tools.accessibility, + Tools.application, +- Tools.whatsnew, + ]; + + exports.defaultTools = defaultTools; +diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn +index daf4549c6e..b04d79f191 100644 +--- a/devtools/client/jar.mn ++++ b/devtools/client/jar.mn +@@ -247,9 +247,6 @@ devtools.jar: + # Application panel + content/application/index.html (application/index.html) + +- # WhatsNew panel +- content/whats-new/index.html (whats-new/index.html) - - lockwise-title = Never forget a password again - lockwise-title-logged-in = { -lockwise-brand-name } - lockwise-header-content = { -lockwise-brand-name } securely stores your passwords in your browser. - lockwise-header-content-logged-in = Securely store and sync your passwords to all your devices. - protection-report-view-logins-button = View Logins - .title = Go to Saved Logins --lockwise-mobile-app-title = Take your passwords everywhere --lockwise-no-logins-card-content = Use passwords saved in { -brand-short-name } on any device. --lockwise-app-links = { -lockwise-brand-name } for Android and iOS - - # This string is displayed after a large numeral that indicates the total number - # of email addresses being monitored. Don’t add $count to + # about:profiling + skin/aboutprofiling.css (themes/aboutprofiling.css) + content/performance-new/aboutprofiling/initializer.js (performance-new/aboutprofiling/initializer.js) +diff --git a/devtools/client/moz.build b/devtools/client/moz.build +index 0dd219c13c..b589c7ac4d 100644 +--- a/devtools/client/moz.build ++++ b/devtools/client/moz.build +@@ -28,7 +28,6 @@ DIRS += [ + 'styleeditor', + 'themes', + 'webconsole', +- 'whats-new', + ] + + JAR_MANIFESTS += ['jar.mn'] -- cgit v1.2.3