diff options
Diffstat (limited to 'libre/icecat/libre.patch')
| -rw-r--r-- | libre/icecat/libre.patch | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index 8138985ad..ee88c6d56 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -1,19 +1,19 @@ diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js ---- a/browser/app/profile/icecat.js 2015-07-13 19:14:27.000000000 -0300 -+++ b/browser/app/profile/icecat.js 2015-08-18 02:36:42.167590967 -0300 -@@ -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); -@@ -1746,11 +1741,6 @@ +@@ -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%"); @@ -21,6 +21,7 @@ diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js -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); @@ -690,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"> @@ -709,7 +710,7 @@ 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-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 @@ -788,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; @@ -799,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"; @@ -810,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 @@ -866,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) { @@ -882,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 { |