diff options
author | Andreas Grapentin <andreas@grapentin.org> | 2020-12-16 08:55:26 +0100 |
---|---|---|
committer | Andreas Grapentin <andreas@grapentin.org> | 2020-12-17 19:26:05 +0100 |
commit | d94bb564b00986448c29e6de518206804d1fe05a (patch) | |
tree | 341ba3c2f7bef399c0863902da2d533f48cb5966 /libre/icecat/libre.patch | |
parent | 8253c1b6a18fd8c81d9e750d903e063e81bf5ccc (diff) | |
download | abslibre-d94bb564b00986448c29e6de518206804d1fe05a.tar.gz abslibre-d94bb564b00986448c29e6de518206804d1fe05a.tar.bz2 abslibre-d94bb564b00986448c29e6de518206804d1fe05a.zip |
libre/icecat: restructured and updated to 78.4.0
Diffstat (limited to 'libre/icecat/libre.patch')
-rw-r--r-- | libre/icecat/libre.patch | 234 |
1 files changed, 18 insertions, 216 deletions
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index 4ee9952b9..8476f6d4c 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -1,104 +1,24 @@ -diff --git a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js -index 17c1e93..40f1e2b 100644 ---- a/browser/app/profile/icecat.js -+++ b/browser/app/profile/icecat.js -@@ -267,11 +267,6 @@ pref("browser.slowStartup.notificationDi - pref("browser.slowStartup.timeThreshold", 20000); - pref("browser.slowStartup.maxSamples", 5); - +diff -rupN icecat-78.4.0/browser/app/profile/icecat.js icecat-78.4.0-new/browser/app/profile/icecat.js +--- icecat-78.4.0/browser/app/profile/icecat.js 2020-10-24 04:33:19.000000000 +0200 ++++ icecat-78.4.0-new/browser/app/profile/icecat.js 2020-12-15 13:35:02.966838162 +0100 +@@ -1303,10 +1303,6 @@ pref("browser.newtabpage.activity-stream + pref("browser.newtabpage.activity-stream.asrouter.providers.cfr", "{\"id\":\"cfr\",\"enabled\":true,\"type\":\"remote-settings\",\"bucket\":\"cfr\",\"frequency\":{\"custom\":[{\"period\":\"daily\",\"cap\":1}]},\"categories\":[\"cfrAddons\",\"cfrFeatures\"],\"updateCycleInMs\":3600000}"); + pref("browser.newtabpage.activity-stream.asrouter.providers.whats-new-panel", "{\"id\":\"whats-new-panel\",\"enabled\":true,\"type\":\"remote-settings\",\"bucket\":\"whats-new-panel\",\"updateCycleInMs\":3600000}"); + pref("browser.newtabpage.activity-stream.asrouter.providers.message-groups", "{\"id\":\"message-groups\",\"enabled\":false,\"type\":\"remote-settings\",\"bucket\":\"message-groups\",\"updateCycleInMs\":3600000}"); -// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into -// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream -// repackager of this code using an alternate snippet url, please keep your users safe --pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.cdn.mozilla.net/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/"); -- - pref("browser.enable_automatic_image_resizing", true); - pref("browser.chrome.site_icons", true); - pref("browser.chrome.favicons", true); -@@ -1988,17 +1983,6 @@ pref("pfs.filehint.url", "http://gnuzill - pref("geo.enabled", false); - pref("geo.wifi.uri", ""); - --// I'm feeling Ducky. --pref("keyword.URL", "https://duckduckgo.com/html?t=gnu&q=!+"); --pref("browser.search.defaultenginename", "DuckDuckGo"); --pref("browser.search.order.extra.duckduckgo", "DuckDuckGo"); --pref("browser.search.showOneOffButtons", false); --// US specific default (used as a fallback if the geoSpecificDefaults request fails). --pref("browser.search.defaultenginename.US", "data:text/plain,browser.search.defaultenginename.US=DuckDuckGo"); --pref("browser.search.order.US.1", "data:text/plain,browser.search.order.US.1=DuckDuckGo"); --pref("browser.search.order.US.2", "data:text/plain,browser.search.order.US.2=Google"); --pref("browser.search.order.US.3", "data:text/plain,browser.search.order.US.3=Yahoo"); -- - // Disable Gecko media plugins: https://wiki.mozilla.org/GeckoMediaPlugins - pref("media.gmp-manager.url", "http://127.0.0.1/"); - pref("media.gmp-manager.url.override", "data:text/plain,"); -diff --git a/browser/base/jar.mn b/browser/base/jar.mn -index 334358c..44148fd 100644 ---- a/browser/base/jar.mn -+++ b/browser/base/jar.mn -@@ -24,6 +24,7 @@ browser.jar: - content/browser/abouthome/settings.png (content/abouthome/settings.png) - content/browser/abouthome/restore.png (content/abouthome/restore.png) - content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png) -+ content/browser/abouthome/gnu_headshadow.png (content/abouthome/gnu_headshadow.png) - content/browser/abouthome/snippet1@2x.png (content/abouthome/snippet1@2x.png) - content/browser/abouthome/snippet2@2x.png (content/abouthome/snippet2@2x.png) - content/browser/abouthome/downloads@2x.png (content/abouthome/downloads@2x.png) -diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd -index 053f07c..f306f0a 100644 ---- a/browser/locales/en-US/chrome/browser/aboutHome.dtd -+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd -@@ -11,17 +11,6 @@ - - <!ENTITY abouthome.pageTitle "&brandFullName; Start Page"> - --<!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1): -- text in <a/> will be linked to the IceCat features page on mozilla.com ----> --<!ENTITY abouthome.defaultSnippet1.v1 "Thanks for choosing IceCat! To get the most out of your browser, learn more about the <a>latest features</a>."> --<!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1): -- text in <a/> will be linked to the featured add-ons on addons.mozilla.org ----> --<!ENTITY abouthome.defaultSnippet2.v1 "It’s easy to customize your IceCat exactly the way you want it. <a>Choose from thousands of add-ons</a>."> --<!-- LOCALIZATION NOTE (abouthome.rightsSnippet): text in <a/> will be linked to about:rights --> --<!ENTITY abouthome.rightsSnippet "&brandFullName; is Free Software from the non-profit Mozilla Foundation. <a>Know your rights…</a>"> -- - <!ENTITY abouthome.bookmarksButton.label "Bookmarks"> - <!ENTITY abouthome.historyButton.label "History"> - <!-- LOCALIZATION NOTE (abouthome.preferencesButtonWin.label): The label for the -diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties -index 0b28ba8..3333c1b 100644 ---- a/browser/locales/en-US/chrome/browser-region/region.properties -+++ b/browser/locales/en-US/chrome/browser-region/region.properties -@@ -3,16 +3,12 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - # Default search engine --browser.search.defaultenginename=Google -+browser.search.defaultenginename=searx - - # Search engine order (order displayed in the search bar dropdown)s --browser.search.order.1=Google --browser.search.order.2=Bing -- --# This is the default set of web based feed handlers shown in the reader --# selection UI --browser.contentHandlers.types.0.title=My Yahoo! --browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s -+browser.search.order.1=searx -+browser.search.order.2=DuckDuckGo HTML -+browser.search.order.3=DuckDuckGo Lite - - # increment this number when anything gets changed in the list below. This will - # cause IceCat to re-read these prefs and inject any new handlers into the -@@ -21,20 +17,10 @@ browser.contentHandlers.types.0.uri=http +-pref("browser.newtabpage.activity-stream.asrouter.providers.snippets", "{\"id\":\"snippets\",\"enabled\":true,\"type\":\"remote\",\"url\":\"https://snippets.cdn.mozilla.net/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/\",\"updateCycleInMs\":14400000}"); + pref("browser.newtabpage.activity-stream.asrouter.providers.messaging-experiments", "{\"id\":\"messaging-experiments\",\"enabled\":true,\"type\":\"remote-experiments\",\"messageGroups\":[\"cfr\",\"whats-new-panel\",\"moments-page\",\"snippets\",\"cfr-fxa\",\"aboutwelcome\"],\"updateCycleInMs\":3600000}"); + + // The pref that controls if ASRouter uses the remote fluent files. +diff -rupN icecat-78.4.0/browser/locales/en-US/chrome/browser-region/region.properties icecat-78.4.0-new/browser/locales/en-US/chrome/browser-region/region.properties +--- icecat-78.4.0/browser/locales/en-US/chrome/browser-region/region.properties 2020-10-24 04:33:19.000000000 +0200 ++++ icecat-78.4.0-new/browser/locales/en-US/chrome/browser-region/region.properties 2020-12-15 13:41:00.218218564 +0100 +@@ -9,16 +9,10 @@ # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=4 --# The default set of protocol handlers for webcal: --gecko.handlerService.schemes.webcal.0.name=30 Boxes --gecko.handlerService.schemes.webcal.0.uriTemplate=https://30boxes.com/external/widget?refer=ff&url=%s -- -# The default set of protocol handlers for mailto: -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail -gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s @@ -116,10 +36,9 @@ index 0b28ba8..3333c1b 100644 -gecko.handlerService.schemes.ircs.0.uriTemplate= +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net -diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in -index e8460a4..374bf61 100644 ---- a/browser/locales/generic/profile/bookmarks.html.in -+++ b/browser/locales/generic/profile/bookmarks.html.in +diff -rupN icecat-78.4.0/browser/locales/generic/profile/bookmarks.html.in icecat-78.4.0-new/browser/locales/generic/profile/bookmarks.html.in +--- icecat-78.4.0/browser/locales/generic/profile/bookmarks.html.in 2020-10-24 04:25:35.000000000 +0200 ++++ icecat-78.4.0-new/browser/locales/generic/profile/bookmarks.html.in 2020-12-15 13:42:11.272489118 +0100 @@ -12,5 +12,20 @@ <DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar <DL><p> @@ -141,120 +60,3 @@ index e8460a4..374bf61 100644 + <DT><A HREF="https://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A> </DL><p> </DL><p> -diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn -index eff09189b..6d76d20f0 100644 ---- a/browser/locales/jar.mn -+++ b/browser/locales/jar.mn -@@ -91,12 +91,6 @@ - locale/browser/searchplugins/ (.deps/generated_@AB_CD@/*.xml) - locale/browser/searchplugins/list.json (.deps/generated_@AB_CD@/list.json) - #endif -- locale/browser/searchplugins/images/amazon.ico (searchplugins/images/amazon.ico) -- locale/browser/searchplugins/images/ebay.ico (searchplugins/images/ebay.ico) -- locale/browser/searchplugins/images/wikipedia.ico (searchplugins/images/wikipedia.ico) -- locale/browser/searchplugins/images/yahoo.ico (searchplugins/images/yahoo.ico) -- locale/browser/searchplugins/images/yandex-en.ico (searchplugins/images/yandex-en.ico) -- locale/browser/searchplugins/images/yandex-ru.ico (searchplugins/images/yandex-ru.ico) - % locale browser-region @AB_CD@ %locale/browser-region/ - locale/browser-region/region.properties (%chrome/browser-region/region.properties) - # the following files are browser-specific overrides -diff --git a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm -index bcb7d1c..f902aac 100644 ---- a/browser/modules/AboutHome.jsm -+++ b/browser/modules/AboutHome.jsm -@@ -4,7 +4,7 @@ - - "use strict"; - --var EXPORTED_SYMBOLS = [ "AboutHomeUtils", "AboutHome" ]; -+var EXPORTED_SYMBOLS = [ "AboutHome" ]; - - ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); - ChromeUtils.import("resource://gre/modules/Services.jsm"); -@@ -18,68 +18,6 @@ ChromeUtils.defineModuleGetter(this, "fx - ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils", - "resource://gre/modules/PrivateBrowsingUtils.jsm"); - --// Url to fetch snippets, in the urlFormatter service format. --const SNIPPETS_URL_PREF = "browser.aboutHomeSnippets.updateUrl"; -- --// Should be bumped up if the snippets content format changes. --const STARTPAGE_VERSION = 4; -- --var AboutHomeUtils = { -- get snippetsVersion() { -- return STARTPAGE_VERSION; -- }, -- -- /* -- * showKnowYourRights - Determines if the user should be shown the -- * about:rights notification. The notification should *not* be shown if -- * we've already shown the current version, or if the override pref says to -- * never show it. The notification *should* be shown if it's never been seen -- * before, if a newer version is available, or if the override pref says to -- * always show it. -- */ -- get showKnowYourRights() { -- // Look for an unconditional override pref. If set, do what it says. -- // (true --> never show, false --> always show) -- try { -- return !Services.prefs.getBoolPref("browser.rights.override"); -- } catch (e) { } -- // Ditto, for the legacy EULA pref. -- try { -- return !Services.prefs.getBoolPref("browser.EULA.override"); -- } catch (e) { } -- -- if (!AppConstants.MOZILLA_OFFICIAL) { -- // Non-official builds shouldn't show the notification. -- return false; -- } -- -- // Look to see if the user has seen the current version or not. -- var currentVersion = Services.prefs.getIntPref("browser.rights.version"); -- try { -- return !Services.prefs.getBoolPref("browser.rights." + currentVersion + ".shown"); -- } catch (e) { } -- -- // Legacy: If the user accepted a EULA, we won't annoy them with the -- // equivalent about:rights page until the version changes. -- try { -- return !Services.prefs.getBoolPref("browser.EULA." + currentVersion + ".accepted"); -- } catch (e) { } -- -- // We haven't shown the notification before, so do so now. -- return true; -- } --}; -- --/** -- * Returns the URL to fetch snippets from, in the urlFormatter service format. -- */ --XPCOMUtils.defineLazyGetter(AboutHomeUtils, "snippetsURL", function() { -- let updateURL = Services.prefs -- .getCharPref(SNIPPETS_URL_PREF) -- .replace("%STARTPAGE_VERSION%", STARTPAGE_VERSION); -- return Services.urlFormatter.formatURL(updateURL); --}); -- - /** - * This code provides services to the about:home page. Whenever - * about:home needs to do something chrome-privileged, it sends a -@@ -164,17 +102,8 @@ var AboutHome = { - ss.promiseInitialized.then(function() { - let data = { - showRestoreLastSession: ss.canRestoreLastSession, -- snippetsURL: AboutHomeUtils.snippetsURL, -- showKnowYourRights: AboutHomeUtils.showKnowYourRights, -- snippetsVersion: AboutHomeUtils.snippetsVersion, - }; - -- if (AboutHomeUtils.showKnowYourRights) { -- // Set pref to indicate we've shown the notification. -- let currentVersion = Services.prefs.getIntPref("browser.rights.version"); -- Services.prefs.setBoolPref("browser.rights." + currentVersion + ".shown", true); -- } -- - if (target && target.messageManager) { - target.messageManager.sendAsyncMessage("AboutHome:Update", data); - } else { |