diff options
| -rw-r--r-- | libre/iceweasel-libre/PKGBUILD | 4 | ||||
| -rw-r--r-- | libre/iceweasel-libre/libre.patch | 199 | ||||
| -rw-r--r-- | libre/iceweasel-libre/vendor.js | 3 |
3 files changed, 123 insertions, 83 deletions
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 120310a8a..63ae55214 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -62,10 +62,10 @@ md5sums=('dd1462b582747210cc6c2ac1d01c4c17' '4f4cde44b6e83cf78ff5d6e757d1913c' '350feec44d359c31679dbec3de6685df' 'df08eaa1ac3bc6c2356be4fbf8ec8932' - '5e01a51ec4f3dd72ff2525edfe6cd371' + '8c11b80574b11e96c2ef44fa16f4b844' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' - 'cfd8c2fb5e49ea3a7d5a52eda09d13e4' + '816013881cfc9a1f4f0ede72b014f8b3' 'b0c23b67c247008b50fe9e7cf1e576ad' '6e335a517c68488941340ee1c23f97b0' 'f1594fa3567e5b70202c3432d7c00202') diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index c0e61d5b9..e5632c667 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 2617a7f..a70434a 100644 ---- a/browser/app/profile/firefox.js -+++ b/browser/app/profile/firefox.js -@@ -1242,14 +1242,6 @@ pref("pdfjs.previousHandler.alwaysAskBeforeHandling", 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 2013-11-05 03:52:59.229583495 -0200 ++++ mozilla-release/browser/app/profile/firefox.js 2013-11-05 03:57:12.955661016 -0200 +@@ -1269,14 +1269,6 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); @@ -17,11 +16,10 @@ index 2617a7f..a70434a 100644 // Turn on the CSP 1.0 parser for Content Security Policy headers pref("security.csp.speccompliant", true); -diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css -index ce8db3c..27ff8b6 100644 ---- a/browser/base/content/abouthome/aboutHome.css -+++ b/browser/base/content/abouthome/aboutHome.css -@@ -51,11 +51,6 @@ a { +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 2013-10-25 20:27:08.000000000 -0200 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2013-11-05 03:57:12.958994121 -0200 +@@ -49,11 +49,6 @@ background-repeat: no-repeat; } @@ -33,7 +31,7 @@ index ce8db3c..27ff8b6 100644 #searchForm { display: -moz-box; } -@@ -74,8 +69,7 @@ a { +@@ -72,8 +67,7 @@ #searchEngineLogo { display: inline-block; height: 28px; @@ -43,7 +41,7 @@ index ce8db3c..27ff8b6 100644 } #searchText { -@@ -147,48 +141,6 @@ a { +@@ -145,48 +139,6 @@ transition-duration: 0ms; } @@ -92,7 +90,7 @@ index ce8db3c..27ff8b6 100644 #launcher { display: -moz-box; -moz-box-align: center; -@@ -368,20 +320,6 @@ body[narrow] #restorePreviousSession::before { +@@ -366,20 +318,6 @@ background-image: url("chrome://branding/content/about-logo@2x.png"); } @@ -113,11 +111,10 @@ index ce8db3c..27ff8b6 100644 .launchButton::before, #aboutMozilla::before { transform: scale(.5); -diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js -index dd050d3..7ae28d2 100644 ---- a/browser/base/content/abouthome/aboutHome.js -+++ b/browser/base/content/abouthome/aboutHome.js -@@ -3,147 +3,44 @@ +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 2013-10-25 20:27:08.000000000 -0200 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-11-05 04:10:11.565757913 -0200 +@@ -3,152 +3,44 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const SEARCH_ENGINES = { @@ -296,10 +293,15 @@ index dd050d3..7ae28d2 100644 - -const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. - +-// IndexedDB storage constants. +-const DATABASE_NAME = "abouthome"; +-const DATABASE_VERSION = 1; +-const SNIPPETS_OBJECTSTORE_NAME = "snippets"; +- // This global tracks if the page has been set up before, to prevent double inits let gInitialized = false; let gObserver = new MutationObserver(function (mutations) { -@@ -151,7 +48,6 @@ let gObserver = new MutationObserver(function (mutations) { +@@ -156,7 +48,6 @@ if (mutation.attributeName == "searchEngineURL") { setupSearchEngine(); if (!gInitialized) { @@ -307,7 +309,7 @@ index dd050d3..7ae28d2 100644 gInitialized = true; } return; -@@ -172,70 +68,6 @@ window.addEventListener("pagehide", function() { +@@ -177,117 +68,6 @@ window.removeEventListener("resize", fitToWidth); }); @@ -339,46 +341,93 @@ index dd050d3..7ae28d2 100644 - return; - } - -- // TODO (bug 789348): use a real asynchronous storage here. This setTimeout -- // is done just to catch bugs with the asynchronous behavior. -- setTimeout(function() { -- // Populate the cache from the persistent storage. -- let cache = new Map(); -- for (let key of [ "snippets-last-update", -- "snippets-cached-version", -- "snippets" ]) { -- cache.set(key, localStorage[key]); +- let invokeCallbacks = function () { +- if (!gSnippetsMap) { +- gSnippetsMap = Object.freeze(new Map()); - } - -- gSnippetsMap = Object.freeze({ -- get: function (aKey) cache.get(aKey), -- set: function (aKey, aValue) { -- localStorage[aKey] = aValue; -- return cache.set(aKey, aValue); -- }, -- has: function(aKey) cache.has(aKey), -- delete: function(aKey) { -- delete localStorage[aKey]; -- return cache.delete(aKey); -- }, -- clear: function() { -- localStorage.clear(); -- return cache.clear(); -- }, -- get size() cache.size -- }); -- - for (let callback of gSnippetsMapCallbacks) { - callback(gSnippetsMap); - } - gSnippetsMapCallbacks.length = 0; -- }, 0); +- } +- +- let openRequest = indexedDB.open(DATABASE_NAME, DATABASE_VERSION); +- +- openRequest.onerror = function (event) { +- // Try to delete the old database so that we can start this process over +- // next time. +- indexedDB.deleteDatabase(DATABASE_NAME); +- invokeCallbacks(); +- }; +- +- openRequest.onupgradeneeded = function (event) { +- let db = event.target.result; +- if (!db.objectStoreNames.contains(SNIPPETS_OBJECTSTORE_NAME)) { +- db.createObjectStore(SNIPPETS_OBJECTSTORE_NAME); +- } +- } +- +- openRequest.onsuccess = function (event) { +- let db = event.target.result; +- +- db.onerror = function (event) { +- invokeCallbacks(); +- } +- +- db.onversionchange = function (event) { +- event.target.close(); +- invokeCallbacks(); +- } +- +- let cache = new Map(); +- let cursorRequest = db.transaction(SNIPPETS_OBJECTSTORE_NAME) +- .objectStore(SNIPPETS_OBJECTSTORE_NAME).openCursor(); +- cursorRequest.onerror = function (event) { +- invokeCallbacks(); +- } +- +- cursorRequest.onsuccess = function(event) { +- let cursor = event.target.result; +- +- // Populate the cache from the persistent storage. +- if (cursor) { +- cache.set(cursor.key, cursor.value); +- cursor.continue(); +- return; +- } +- +- // The cache has been filled up, create the snippets map. +- gSnippetsMap = Object.freeze({ +- get: function (aKey) cache.get(aKey), +- set: function (aKey, aValue) { +- db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite") +- .objectStore(SNIPPETS_OBJECTSTORE_NAME).put(aValue, aKey); +- return cache.set(aKey, aValue); +- }, +- has: function (aKey) cache.has(aKey), +- delete: function (aKey) { +- db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite") +- .objectStore(SNIPPETS_OBJECTSTORE_NAME).delete(aKey); +- return cache.delete(aKey); +- }, +- clear: function () { +- db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite") +- .objectStore(SNIPPETS_OBJECTSTORE_NAME).clear(); +- return cache.clear(); +- }, +- get size() cache.size +- }); +- +- setTimeout(invokeCallbacks, 0); +- } +- } -} - function onSearchSubmit(aEvent) { let searchTerms = document.getElementById("searchText").value; -@@ -320,140 +152,6 @@ function setupSearchEngine() +@@ -372,140 +152,6 @@ } @@ -519,10 +568,9 @@ index dd050d3..7ae28d2 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 cd821c4..9816d54 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 2013-10-25 20:27:08.000000000 -0200 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml 2013-11-05 03:57:12.962327229 -0200 @@ -43,15 +43,6 @@ <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/> </form> @@ -539,10 +587,9 @@ index cd821c4..9816d54 100644 </div> <div class="spacer"/> -diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties -index 23a30d0..fe7f265 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 2013-10-25 20:27:09.000000000 -0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-11-05 04:16:11.884325686 -0200 @@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -565,13 +612,13 @@ index 23a30d0..fe7f265 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=3 + 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=http://30boxes.com/external/widget?refer=ff&url=%s +-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 @@ -590,10 +637,9 @@ index 23a30d0..fe7f265 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..5101035 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 2013-10-25 20:27:09.000000000 -0200 ++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2013-11-05 03:57:12.972326552 -0200 @@ -15,13 +15,20 @@ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> <DD>@bookmarks_toolbarfolder_description@ @@ -621,11 +667,10 @@ index e925c1e..5101035 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/dom/ipc/test.xul b/dom/ipc/test.xul -index 25efdb6..8162c73 100644 ---- a/dom/ipc/test.xul -+++ b/dom/ipc/test.xul -@@ -299,6 +299,6 @@ +diff -Nur mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul +--- mozilla-release.orig/dom/ipc/test.xul 2013-10-25 20:27:14.000000000 -0200 ++++ mozilla-release/dom/ipc/test.xul 2013-11-05 03:57:12.982325866 -0200 +@@ -302,6 +302,6 @@ oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> </toolbar> @@ -633,10 +678,9 @@ index 25efdb6..8162c73 100644 + <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/> <label id="messageLog" value="" crop="center"/> </window> -diff --git a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul -index 237ba61..7603d7d 100644 ---- a/layout/ipc/test-ipcbrowser.xul -+++ b/layout/ipc/test-ipcbrowser.xul +diff -Nur mozilla-release.orig/layout/ipc/test-ipcbrowser.xul mozilla-release/layout/ipc/test-ipcbrowser.xul +--- mozilla-release.orig/layout/ipc/test-ipcbrowser.xul 2013-10-25 20:27:28.000000000 -0200 ++++ mozilla-release/layout/ipc/test-ipcbrowser.xul 2013-11-05 03:57:12.982325866 -0200 @@ -73,6 +73,6 @@ label="setViewportScale"/> </toolbar> @@ -645,11 +689,10 @@ index 237ba61..7603d7d 100644 + <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content" remote="true"/> </window> -diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js -index 3b67260..29f7730 100644 ---- a/modules/libpref/src/init/all.js -+++ b/modules/libpref/src/init/all.js -@@ -4190,20 +4190,6 @@ pref("memory.ghost_window_timeout_seconds", 60); +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 2013-11-05 03:52:59.219584174 -0200 ++++ mozilla-release/modules/libpref/src/init/all.js 2013-11-05 03:57:12.985658973 -0200 +@@ -4255,20 +4255,6 @@ // Disable freeing dirty pages when minimizing memory. pref("memory.free_dirty_pages", false); diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js index 2eb202a56..6510944a7 100644 --- a/libre/iceweasel-libre/vendor.js +++ b/libre/iceweasel-libre/vendor.js @@ -20,6 +20,3 @@ pref("dom.storage.enabled", false); // Disable missing nonfree flash notification pref("plugins.notifyMissingFlash", false); - -// Enable Adwaita skin -pref("general.skins.selectedSkin", "Adwaita"); |