diff options
Diffstat (limited to 'libre/iceweasel-libre/libre.patch')
| -rw-r--r-- | libre/iceweasel-libre/libre.patch | 108 |
1 files changed, 50 insertions, 58 deletions
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 29b8e9457..71f401e05 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,8 +1,7 @@ -diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 171c78a..a02efa8 100644 ---- a/browser/app/profile/firefox.js -+++ b/browser/app/profile/firefox.js -@@ -273,11 +273,6 @@ pref("browser.slowStartup.notificationDisabled", false); +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-06-11 23:44:43.729632510 -0300 ++++ mozilla-release/browser/app/profile/firefox.js 2014-06-11 23:54:32.231213278 -0300 +@@ -281,11 +281,6 @@ pref("browser.slowStartup.timeThreshold", 60000); pref("browser.slowStartup.maxSamples", 5); @@ -14,24 +13,24 @@ index 171c78a..a02efa8 100644 pref("browser.enable_automatic_image_resizing", true); pref("browser.chrome.site_icons", true); pref("browser.chrome.favicons", true); -@@ -1298,11 +1293,7 @@ pref("shumway.disabled", true); +@@ -1486,12 +1481,7 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); -// Default social providers -pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Share\",\"shareURL\":\"https://www.facebook.com/sharer/sharer.php?u=%{url}\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"icon32URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAADbklEQVRYCc1Xv08UQRj99tctexAuCEFjRE0kGBEtLDSGqIWNxkYKbTAxNlY2JhaGWltNtNFeKgsKKxITK43/gCYW+IsoRhA4D47bH7fn9+bcvdm5JR7sefolC3Ozu9978+bNN7PayUv3HN3umdY0Y6IWBtSJ0HSTarXqTOiuTep6Lj+tdxAcA8RAgSmwdd2aCDs0clldYALb/FvgYVhjmfliVA2XpjEgWo0Attn42Z6WH1RFor5ehwo9XQIUZMoVn4qlCoVMSo62EvD8Kh0b3U2Xz43R2PBO6mUCGDlAf65V6MadZzT/rUimoccc2kYA4BfPHqJb105RzjJigKhRq9kEJUBIjgYVuXeL7SAI6eD+Abp5dTwVHOmEHxT50d8WBYJqSOdPj5BjW8gZR8UNqFR2xagx/65XFYaMH+BGWwiYpi4UkBPPLxTp9v1Z+lHc4DWvCQXWmIy6EjITgKowVd5Jjv7N3Hd6y5esigoOwpkJIAmMpZpLJGdiaaC4F0UmAj6bD84GCEwmB/qxMmRilmnwb/mpjAocHh4UEoNAt5NLZB7oy9OJo0PxqkAtePdhiSqunyC1LQUwWMPQaOr6GRre258Ajn4cP7KHcEXhsxpXbj+lT19X2TMNGTLVAcjcalS8gDwsQ2UOMhH4k8FkcrEn5E5ub2sKohxLK2VR77Hl9RUcsrgeRIEiVOT6z+tDbIeLy+vk+kGTCbXxycet6xhl//3f6bJEkdHYhA+mLtDIvoH4ieev5+juoxdk5+pjhALYEdXIpEB5w+NlSKSzqVQ/+H7IO6BLtl3fngGMiqhGJgIwlM6qpyUGFjySdk8m0Zg0ubeD7X9OIDEFajltRQgUJaUKx69tdgaQa0FMADuahZPMFtcEwNPm2hA7ZI5sK4aoE2NvYI+o8hkCIe7CwTv68zS0q9Dk5vpbm/8FXxitSzmMFHpsGj0wyLUheTwD2Y9fVgh1Ae0EPUgD9241ZEnld+v5kgnVZ/8fE0brVh5BK+1oCqKKF72Dk7HwBsssB/pklU1dfChy3S659H5+uelgIb+8WRv1/uGTV9Sdb5wJFlfW6fPCalMhwhSU1j2xKwKbP838GcOwJja4TqO0bjdmXxYTy1EYjFdCWoCEYZhseH/GDL3yJPHnuW6YmT7P1SlIA4768Hke4vOcsX8BE346lLHhDUQAAAAASUVORK5CYII=\", \"icon64URL\":\"data:image/png;base64,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\", \"description\":\"Easily share the web to your Facebook friends.\",\"author\":\"Facebook\",\"homepageURL\":\"https://www.facebook.com\",\"builtin\":\"true\",\"version\":1}"); - --pref("social.sidebar.open", true); -pref("social.sidebar.unload_timeout_ms", 10000); +- +-pref("dom.identity.enabled", false); +// Removed Facebook sidebar with Iceweasel. - pref("social.allowMultipleWorkers", true); - -diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css -index c270318..049fe6e 100644 ---- a/browser/base/content/abouthome/aboutHome.css -+++ b/browser/base/content/abouthome/aboutHome.css -@@ -49,11 +49,6 @@ a { + // Turn on the CSP 1.0 parser for Content Security Policy headers + pref("security.csp.speccompliant", true); +diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css 2014-06-05 22:15:17.000000000 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2014-06-11 23:51:17.732797819 -0300 +@@ -49,11 +49,6 @@ background-repeat: no-repeat; } @@ -43,7 +42,7 @@ index c270318..049fe6e 100644 #searchForm { display: -moz-box; } -@@ -72,8 +67,7 @@ a { +@@ -72,8 +67,7 @@ #searchEngineLogo { display: inline-block; height: 28px; @@ -53,7 +52,7 @@ index c270318..049fe6e 100644 } #searchText { -@@ -145,48 +139,6 @@ a { +@@ -145,48 +139,6 @@ transition-duration: 0ms; } @@ -102,7 +101,7 @@ index c270318..049fe6e 100644 #launcher { display: -moz-box; -moz-box-align: center; -@@ -335,26 +287,25 @@ body[narrow] #restorePreviousSession::before { +@@ -335,26 +287,25 @@ width: 32px; } @@ -135,7 +134,7 @@ index c270318..049fe6e 100644 } /* [HiDPI] -@@ -366,26 +317,6 @@ body[narrow] #restorePreviousSession::before { +@@ -366,26 +317,6 @@ background-image: url("chrome://branding/content/about-logo@2x.png"); } @@ -162,7 +161,7 @@ index c270318..049fe6e 100644 #downloads::before { content: url("chrome://browser/content/abouthome/downloads@2x.png"); } -@@ -421,9 +352,5 @@ body[narrow] #restorePreviousSession::before { +@@ -421,9 +352,5 @@ body[narrow] #restorePreviousSession::before { content: url("chrome://browser/content/abouthome/restore@2x.png"); } @@ -172,10 +171,9 @@ index c270318..049fe6e 100644 - } } -diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js -index 432fcdc..bd1692a 100644 ---- a/browser/base/content/abouthome/aboutHome.js -+++ b/browser/base/content/abouthome/aboutHome.js +diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2014-06-05 22:15:17.000000000 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2014-06-11 23:51:17.769464803 -0300 @@ -3,152 +3,44 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -363,7 +361,7 @@ index 432fcdc..bd1692a 100644 // This global tracks if the page has been set up before, to prevent double inits let gInitialized = false; let gObserver = new MutationObserver(function (mutations) { -@@ -156,7 +48,6 @@ let gObserver = new MutationObserver(function (mutations) { +@@ -156,7 +48,6 @@ if (mutation.attributeName == "searchEngineName") { setupSearchEngine(); if (!gInitialized) { @@ -371,7 +369,7 @@ index 432fcdc..bd1692a 100644 gInitialized = true; } return; -@@ -181,117 +72,6 @@ window.addEventListener("pagehide", function() { +@@ -181,117 +72,6 @@ window.removeEventListener("resize", fitToWidth); }); @@ -489,7 +487,7 @@ index 432fcdc..bd1692a 100644 function onSearchSubmit(aEvent) { let searchTerms = document.getElementById("searchText").value; -@@ -350,147 +130,6 @@ function loadSucceeded() +@@ -350,147 +130,6 @@ document.dispatchEvent(event); } @@ -637,10 +635,9 @@ index 432fcdc..bd1692a 100644 function fitToWidth() { if (window.scrollMaxX) { document.body.setAttribute("narrow", "true"); -diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml -index 1d03d38..5d808db 100644 ---- a/browser/base/content/abouthome/aboutHome.xhtml -+++ b/browser/base/content/abouthome/aboutHome.xhtml +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 @@ -43,15 +43,6 @@ <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/> </form> @@ -665,11 +662,10 @@ index 1d03d38..5d808db 100644 + <a id="aboutGNU" href="http://gnu.org"></a> </body> </html> -diff --git a/browser/base/jar.mn b/browser/base/jar.mn -index 0870527..301c8cb 100644 ---- a/browser/base/jar.mn -+++ b/browser/base/jar.mn -@@ -33,7 +33,7 @@ browser.jar: +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 +@@ -32,7 +32,7 @@ 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) @@ -678,7 +674,7 @@ index 0870527..301c8cb 100644 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) -@@ -45,7 +45,6 @@ browser.jar: +@@ -44,7 +44,6 @@ content/browser/abouthome/settings@2x.png (content/abouthome/settings@2x.png) content/browser/abouthome/restore@2x.png (content/abouthome/restore@2x.png) content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png) @@ -686,10 +682,9 @@ index 0870527..301c8cb 100644 #ifdef MOZ_SERVICES_HEALTHREPORT content/browser/abouthealthreport/abouthealth.xhtml (content/abouthealthreport/abouthealth.xhtml) content/browser/abouthealthreport/abouthealth.js (content/abouthealthreport/abouthealth.js) -diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd -index e84341f..5476d32 100644 ---- a/browser/locales/en-US/chrome/browser/aboutHome.dtd -+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd +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 @@ -13,17 +13,6 @@ <!ENTITY abouthome.searchEngineButton.label "Search"> @@ -708,10 +703,9 @@ index e84341f..5476d32 100644 <!ENTITY abouthome.bookmarksButton.label "Bookmarks"> <!ENTITY abouthome.historyButton.label "History"> <!ENTITY abouthome.settingsButton.label "Settings"> -diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties -index 087cc50..5654eb9 100644 ---- a/browser/locales/en-US/chrome/browser-region/region.properties -+++ b/browser/locales/en-US/chrome/browser-region/region.properties +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-06-05 22:15:18.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2014-06-11 23:51:17.842798771 -0300 @@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -734,7 +728,7 @@ index 087cc50..5654eb9 100644 # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the -@@ -22,20 +17,10 @@ browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s +@@ -22,20 +17,10 @@ # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=4 @@ -759,10 +753,9 @@ index 087cc50..5654eb9 100644 -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s +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 e925c1e..8c121fc 100644 ---- a/browser/locales/generic/profile/bookmarks.html.in -+++ b/browser/locales/generic/profile/bookmarks.html.in +diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in +--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2014-06-05 22:15:18.000000000 -0300 ++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2014-06-11 23:51:17.869465669 -0300 @@ -15,13 +15,20 @@ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> <DD>@bookmarks_toolbarfolder_description@ @@ -790,11 +783,10 @@ index e925c1e..8c121fc 100644 + <DT><A HREF="http://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/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm -index c3dc6b2..df312e3 100644 ---- a/browser/modules/AboutHome.jsm -+++ b/browser/modules/AboutHome.jsm -@@ -8,7 +8,7 @@ let Cc = Components.classes; +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 +@@ -8,7 +8,7 @@ let Ci = Components.interfaces; let Cu = Components.utils; @@ -803,9 +795,9 @@ index c3dc6b2..df312e3 100644 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/Services.jsm"); -@@ -16,66 +16,6 @@ Components.utils.import("resource://gre/modules/Services.jsm"); - XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils", - "resource://gre/modules/PrivateBrowsingUtils.jsm"); +@@ -18,66 +18,6 @@ + XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts", + "resource://gre/modules/FxAccounts.jsm"); -// Url to fetch snippets, in the urlFormatter service format. -const SNIPPETS_URL_PREF = "browser.aboutHomeSnippets.updateUrl"; @@ -870,7 +862,7 @@ index c3dc6b2..df312e3 100644 /** * This code provides services to the about:home page. Whenever * about:home needs to do something chrome-privileged, it sends a -@@ -186,18 +126,9 @@ let AboutHome = { +@@ -202,18 +142,9 @@ ss.promiseInitialized.then(function() { let data = { showRestoreLastSession: ss.canRestoreLastSession, |