diff options
Diffstat (limited to 'libre/icecat/libre.patch')
| -rw-r--r-- | libre/icecat/libre.patch | 180 |
1 files changed, 109 insertions, 71 deletions
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index 16f77f72e..ee88c6d56 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -1,21 +1,34 @@ diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js ---- a/browser/app/profile/icecat.js 2014-10-09 12:56:31.000000000 -0200 -+++ b/browser/app/profile/icecat.js 2014-10-21 14:05:40.131766712 -0200 -@@ -281,11 +281,6 @@ - pref("browser.slowStartup.timeThreshold", 50000); +--- a/browser/app/profile/icecat.js 2015-08-23 17:05:03.000000000 -0300 ++++ b/browser/app/profile/icecat.js 2015-08-25 04:49:18.450526750 -0300 +@@ -279,11 +279,6 @@ + pref("browser.slowStartup.timeThreshold", 40000); pref("browser.slowStartup.maxSamples", 5); -// 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.mozilla.com/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/"); +-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.casting.enabled", false); pref("browser.chrome.site_icons", true); - pref("browser.chrome.favicons", true); +@@ -2080,12 +2075,6 @@ + pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%"); + pref("pfs.filehint.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%"); + +-// 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); +- + // https://directory.fsf.org/wiki/Disable_DHE + pref("security.ssl3.dhe_rsa_aes_128_sha", false); + pref("security.ssl3.dhe_rsa_aes_256_sha", false); diff -Nur a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css ---- a/browser/base/content/abouthome/aboutHome.css 2014-10-09 12:53:31.000000000 -0200 -+++ b/browser/base/content/abouthome/aboutHome.css 2014-10-21 14:11:09.936570764 -0200 +--- a/browser/base/content/abouthome/aboutHome.css 2015-07-13 19:10:24.000000000 -0300 ++++ b/browser/base/content/abouthome/aboutHome.css 2015-08-18 02:37:30.095295232 -0300 @@ -49,11 +49,6 @@ background-repeat: no-repeat; } @@ -34,7 +47,7 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/ height: 28px; - width: 70px; - min-width: 70px; -+ width: 47px; ++ width: 28px; } #searchText { @@ -158,9 +171,9 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/ } diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js ---- a/browser/base/content/abouthome/aboutHome.js 2014-10-09 12:53:31.000000000 -0200 -+++ b/browser/base/content/abouthome/aboutHome.js 2014-10-21 14:21:10.012011384 -0200 -@@ -3,149 +3,44 @@ +--- a/browser/base/content/abouthome/aboutHome.js 2015-07-13 19:10:24.000000000 -0300 ++++ b/browser/base/content/abouthome/aboutHome.js 2015-08-18 02:40:01.024730697 -0300 +@@ -3,149 +3,54 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const SEARCH_ENGINES = { @@ -290,41 +303,51 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a - "k4w0jAcTAyllnBoh9Kxw/tEdS8cuT0WyH4vX1PYD5qMBzQDE2eFDxz09zsscWuwVHX6a8YwaFAiM" + - "NAkHr4vdUdf82rQN6JwnSl4N4vAxeKdxP2A+mjXuKTvcXcY9TdOnyxPk4zKZ/vbRAqe75C3QfZZY" + - "0P/y6/7299z+H4QrdGsoib8JAAAAAElFTkSuQmCC" -+ "DuckDuckGo HTML": { -+ image: "data:image/png;base64," + -+ "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" ++ "searx": { ++ image: "data:image/png;base64,\ ++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" } }; @@ -345,7 +368,7 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a // This global tracks if the page has been set up before, to prevent double inits let gInitialized = false; let gObserver = new MutationObserver(function (mutations) { -@@ -153,7 +48,6 @@ +@@ -153,7 +58,6 @@ if (mutation.attributeName == "searchEngineName") { setupSearchEngine(); if (!gInitialized) { @@ -353,7 +376,7 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a gInitialized = true; } return; -@@ -178,118 +72,6 @@ +@@ -178,118 +82,6 @@ window.removeEventListener("resize", fitToWidth); }); @@ -472,7 +495,7 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a function onSearchSubmit(aEvent) { let searchTerms = document.getElementById("searchText").value; -@@ -339,159 +121,6 @@ +@@ -339,159 +131,6 @@ } @@ -633,8 +656,21 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a if (window.scrollMaxX) { document.body.setAttribute("narrow", "true"); diff -Nur a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml ---- a/browser/base/content/abouthome/aboutHome.xhtml 2014-10-09 12:53:31.000000000 -0200 -+++ b/browser/base/content/abouthome/aboutHome.xhtml 2014-10-21 14:23:10.525956357 -0200 +--- a/browser/base/content/abouthome/aboutHome.xhtml 2015-07-13 19:10:24.000000000 -0300 ++++ b/browser/base/content/abouthome/aboutHome.xhtml 2015-08-18 02:41:35.756857459 -0300 +@@ -90,10 +90,10 @@ + <img src="chrome://branding/content/about-logo.png"/> + + <div id="searchContainer"> +- <form name="searchForm" id="searchForm" action="https://duckduckgo.com/html/"> ++ <form name="searchForm" id="searchForm" action="https://searx.laquadrature.net/"> + <input type="text" name="q" value="" id="searchText" maxlength="256" + autofocus="autofocus"/> +- <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label; DuckDuckGO"/> ++ <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label; searx"/> + </form> + </div> + @@ -101,6 +101,7 @@ <div class="spacer"/> @@ -655,8 +691,8 @@ diff -Nur a/browser/base/jar.mn b/browser/base/jar.mn content/browser/abouthome/snippet2@2x.png (content/abouthome/snippet2@2x.png) content/browser/abouthome/downloads@2x.png (content/abouthome/downloads@2x.png) diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd ---- a/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-27 16:19:19.000000000 -0200 -+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-29 12:19:21.741429014 -0200 +--- a/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-08-23 17:05:01.000000000 -0300 ++++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-08-25 04:47:50.321608830 -0300 @@ -13,17 +13,6 @@ <!ENTITY abouthome.searchEngineButton.label "Search"> @@ -674,16 +710,16 @@ diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales - <!ENTITY abouthome.bookmarksButton.label "Bookmarks"> <!ENTITY abouthome.historyButton.label "History"> - <!ENTITY abouthome.settingsButton.label "Settings"> + <!-- LOCALIZATION NOTE (abouthome.preferencesButtonWin.label): The label for the diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties ---- a/browser/locales/en-US/chrome/browser-region/region.properties 2015-01-27 16:20:32.000000000 -0200 -+++ b/browser/locales/en-US/chrome/browser-region/region.properties 2015-01-29 12:21:13.202346944 -0200 +--- a/browser/locales/en-US/chrome/browser-region/region.properties 2015-07-13 19:14:26.000000000 -0300 ++++ b/browser/locales/en-US/chrome/browser-region/region.properties 2015-08-18 02:43:13.382178053 -0300 @@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=DuckDuckGo HTML ++browser.search.defaultenginename=searx # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google @@ -694,9 +730,9 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow -# 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=DuckDuckGo HTML -+browser.search.order.2=DuckDuckGo Lite -+browser.search.order.3=searx ++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 @@ -753,8 +789,8 @@ diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/ </DL><p> </DL><p> diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm ---- a/browser/modules/AboutHome.jsm 2014-10-09 12:53:30.000000000 -0200 -+++ b/browser/modules/AboutHome.jsm 2014-10-21 14:54:12.086062616 -0200 +--- a/browser/modules/AboutHome.jsm 2015-08-23 17:04:41.000000000 -0300 ++++ b/browser/modules/AboutHome.jsm 2015-08-25 04:52:43.993422621 -0300 @@ -8,7 +8,7 @@ let Ci = Components.interfaces; let Cu = Components.utils; @@ -764,9 +800,9 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/Services.jsm"); -@@ -18,66 +18,6 @@ - XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts", - "resource://gre/modules/FxAccounts.jsm"); +@@ -20,68 +20,6 @@ + XPCOMUtils.defineLazyModuleGetter(this, "Promise", + "resource://gre/modules/Promise.jsm"); -// Url to fetch snippets, in the urlFormatter service format. -const SNIPPETS_URL_PREF = "browser.aboutHomeSnippets.updateUrl"; @@ -775,7 +811,9 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm -const STARTPAGE_VERSION = 4; - -this.AboutHomeUtils = { -- get snippetsVersion() STARTPAGE_VERSION, +- get snippetsVersion() { +- return STARTPAGE_VERSION; +- }, - - /* - * showKnowYourRights - Determines if the user should be shown the @@ -831,14 +869,14 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm /** * This code provides services to the about:home page. Whenever * about:home needs to do something chrome-privileged, it sends a -@@ -202,18 +142,9 @@ - ss.promiseInitialized.then(function() { +@@ -246,18 +184,9 @@ + }).then(function(engineName) { let data = { showRestoreLastSession: ss.canRestoreLastSession, - snippetsURL: AboutHomeUtils.snippetsURL, - showKnowYourRights: AboutHomeUtils.showKnowYourRights, - snippetsVersion: AboutHomeUtils.snippetsVersion, - defaultEngineName: Services.search.defaultEngine.name + defaultEngineName: engineName }; - if (AboutHomeUtils.showKnowYourRights) { @@ -847,6 +885,6 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm - Services.prefs.setBoolPref("browser.rights." + currentVersion + ".shown", true); - } - - if (target) { + if (target && target.messageManager) { target.messageManager.sendAsyncMessage("AboutHome:Update", data); } else { |