diff options
Diffstat (limited to 'libre/iceweasel/libre.patch')
-rw-r--r-- | libre/iceweasel/libre.patch | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index 08704affd..7884ec5ba 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -1,8 +1,8 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js ---- mozilla-release.orig/browser/app/profile/firefox.js 2014-07-23 13:16:30.287622288 -0300 -+++ mozilla-release/browser/app/profile/firefox.js 2014-07-23 13:19:13.362141893 -0300 -@@ -281,11 +281,6 @@ - pref("browser.slowStartup.timeThreshold", 50000); +--- mozilla-release.orig/browser/app/profile/firefox.js 2014-09-05 17:00:02.762187158 -0300 ++++ mozilla-release/browser/app/profile/firefox.js 2014-09-05 17:02:57.786772902 -0300 +@@ -282,11 +282,6 @@ + pref("browser.slowStartup.timeThreshold", 45000); pref("browser.slowStartup.maxSamples", 5); -// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into @@ -13,7 +13,7 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br pref("browser.enable_automatic_image_resizing", true); pref("browser.chrome.site_icons", true); pref("browser.chrome.favicons", true); -@@ -1489,12 +1484,7 @@ +@@ -1540,12 +1535,7 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); @@ -639,8 +639,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil if (window.scrollMaxX) { document.body.setAttribute("narrow", "true"); diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mozilla-release/browser/base/content/abouthome/aboutHome.xhtml ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml 2014-06-05 22:15:17.000000000 -0300 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml 2014-06-11 23:51:17.789464976 -0300 +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml 2014-08-26 00:37:44.000000000 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml 2014-09-05 17:02:57.806773064 -0300 @@ -43,15 +43,6 @@ <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/> </form> @@ -657,7 +657,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mo </div> <div class="spacer"/> -@@ -67,6 +58,6 @@ +@@ -71,6 +62,6 @@ <button class="launchButton" id="restorePreviousSession">&historyRestoreLastSession.label;</button> </div> @@ -666,8 +666,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mo </body> </html> diff -Nur mozilla-release.orig/browser/base/jar.mn mozilla-release/browser/base/jar.mn ---- mozilla-release.orig/browser/base/jar.mn 2014-06-05 22:15:17.000000000 -0300 -+++ mozilla-release/browser/base/jar.mn 2014-06-11 23:51:17.812798511 -0300 +--- mozilla-release.orig/browser/base/jar.mn 2014-08-26 00:37:44.000000000 -0300 ++++ mozilla-release/browser/base/jar.mn 2014-09-05 17:05:26.448079382 -0300 @@ -32,7 +32,7 @@ content/browser/abouthome/settings.png (content/abouthome/settings.png) content/browser/abouthome/restore.png (content/abouthome/restore.png) @@ -682,12 +682,12 @@ diff -Nur mozilla-release.orig/browser/base/jar.mn mozilla-release/browser/base/ content/browser/abouthome/restore@2x.png (content/abouthome/restore@2x.png) content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png) - content/browser/abouthome/mozilla@2x.png (content/abouthome/mozilla@2x.png) - #ifdef MOZ_SERVICES_HEALTHREPORT - content/browser/abouthealthreport/abouthealth.xhtml (content/abouthealthreport/abouthealth.xhtml) - content/browser/abouthealthreport/abouthealth.js (content/abouthealthreport/abouthealth.js) + + content/browser/aboutneterror/netError.xhtml (content/aboutneterror/netError.xhtml) + content/browser/aboutneterror/netError.css (content/aboutneterror/netError.css) diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd ---- mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd 2014-06-05 22:15:18.000000000 -0300 -+++ mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd 2014-06-11 23:51:17.836132046 -0300 +--- mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd 2014-08-26 00:37:46.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd 2014-09-05 17:02:57.820106506 -0300 @@ -13,17 +13,6 @@ <!ENTITY abouthome.searchEngineButton.label "Search"> @@ -705,7 +705,7 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dt - <!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 mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties --- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2014-07-16 22:45:07.000000000 -0300 +++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2014-07-23 13:32:03.204266405 -0300 @@ -787,8 +787,8 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in </DL><p> </DL><p> diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/browser/modules/AboutHome.jsm ---- mozilla-release.orig/browser/modules/AboutHome.jsm 2014-06-05 22:15:18.000000000 -0300 -+++ mozilla-release/browser/modules/AboutHome.jsm 2014-06-11 23:51:17.926132826 -0300 +--- mozilla-release.orig/browser/modules/AboutHome.jsm 2014-08-26 00:37:46.000000000 -0300 ++++ mozilla-release/browser/modules/AboutHome.jsm 2014-09-05 17:07:48.222390205 -0300 @@ -8,7 +8,7 @@ let Ci = Components.interfaces; let Cu = Components.utils; @@ -798,9 +798,9 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro 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,66 +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"; @@ -865,14 +865,14 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro /** * 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() { +@@ -229,18 +169,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) { @@ -885,9 +885,9 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro target.messageManager.sendAsyncMessage("AboutHome:Update", data); } else { diff -Nur mozilla-release.orig/modules/libpref/src/init/all.js mozilla-release/modules/libpref/src/init/all.js ---- mozilla-release.orig/modules/libpref/src/init/all.js 2014-09-03 04:25:46.017695291 -0300 -+++ mozilla-release/modules/libpref/src/init/all.js 2014-09-03 04:44:10.801521540 -0300 -@@ -4268,19 +4268,6 @@ +--- mozilla-release.orig/modules/libpref/src/init/all.js 2014-09-05 17:00:02.748853744 -0300 ++++ mozilla-release/modules/libpref/src/init/all.js 2014-09-05 17:02:57.840106668 -0300 +@@ -4024,19 +4024,6 @@ // Number of stack frames to capture in createObjectURL for about:memory. pref("memory.blob_report.stack_frames", 0); |