diff options
author | w | 2017-03-10 09:36:36 +0100 |
---|---|---|
committer | w | 2017-03-10 09:36:36 +0100 |
commit | 05d489ba90bc47c78c5c747aa577bc5c53c929a3 (patch) | |
tree | 213f2320f141e5e6f8c1c2591c61d900265bf3aa | |
parent | 9de6fb26223a79c54f557e5233dbf583b3d781a3 (diff) | |
download | aur-05d489ba90bc47c78c5c747aa577bc5c53c929a3.tar.gz |
Update Firefox 52 ESR
-rw-r--r-- | .SRCINFO | 37 | ||||
-rw-r--r-- | PKGBUILD | 36 | ||||
-rw-r--r-- | firefox-45-disable-loop-pocket.patch | 1063 | ||||
-rw-r--r-- | firefox-45-disable-reader.patch | 114 | ||||
-rw-r--r-- | firefox-45-disable-telemetry.patch | 24 | ||||
-rw-r--r-- | firefox-45-prefs.patch | 145 | ||||
-rw-r--r-- | firefox-52-disable-data-sharing-infobar.patch (renamed from firefox-45-disable-data-sharing-infobar.patch) | 0 | ||||
-rw-r--r-- | firefox-52-disable-location.services.mozilla.com.patch (renamed from firefox-45-disable-location.services.mozilla.com.patch) | 0 | ||||
-rw-r--r-- | firefox-52-disable-pocket-leftovers.patch | 82 | ||||
-rw-r--r-- | firefox-52-disable-reader.patch | 104 | ||||
-rw-r--r-- | firefox-52-disable-sponsored-tiles.patch (renamed from firefox-45-disable-sponsored-tiles.patch) | 60 | ||||
-rw-r--r-- | firefox-52-disable-telemetry.patch | 13 | ||||
-rw-r--r-- | firefox-52-prefs.patch | 260 | ||||
-rw-r--r-- | firefox-install-dir.patch | 9 | ||||
-rw-r--r-- | mozconfig | 5 |
15 files changed, 510 insertions, 1442 deletions
@@ -1,8 +1,8 @@ # Generated by makepkg 5.0.0 -# Tue Nov 8 20:58:23 UTC 2016 +# Fri Mar 10 08:36:09 UTC 2017 pkgbase = firefox-esr-privacy pkgdesc = Standalone web browser from mozilla.org - pkgver = 45.4.0 + pkgver = 52.0 pkgrel = 1 url = https://www.mozilla.org/firefox/ install = firefox.install @@ -19,6 +19,7 @@ pkgbase = firefox-esr-privacy makedepends = mesa makedepends = xorg-server makedepends = inetutils + depends = autoconf2.13 depends = gtk2 depends = libxt depends = startup-notification @@ -35,31 +36,31 @@ pkgbase = firefox-esr-privacy provides = firefox conflicts = firefox options = !emptydirs - source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/45.4.0esr/source/firefox-45.4.0esr.source.tar.xz + source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/52.0esr/source/firefox-52.0esr.source.tar.xz source = firefox-install-dir.patch - source = firefox-45-disable-location.services.mozilla.com.patch - source = firefox-45-disable-loop-pocket.patch - source = firefox-45-disable-sponsored-tiles.patch - source = firefox-45-prefs.patch - source = firefox-45-disable-telemetry.patch - source = firefox-45-disable-data-sharing-infobar.patch - source = firefox-45-disable-reader.patch + source = firefox-52-disable-location.services.mozilla.com.patch + source = firefox-52-disable-pocket-leftovers.patch + source = firefox-52-disable-sponsored-tiles.patch + source = firefox-52-prefs.patch + source = firefox-52-disable-telemetry.patch + source = firefox-52-disable-data-sharing-infobar.patch + source = firefox-52-disable-reader.patch source = firefox.desktop source = firefox-fixed-loading-icon.png source = mozconfig validpgpkeys = 2B90598A745E992F315E22C58AB132963A06537A - sha256sums = cfd90096b9e1019b9de4fe061ece8c65f668b8a24bcbb657ce6b3c940ef83ad0 - sha256sums = d86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd + sha256sums = 40748a6d73ecea29257c1b4bdbb8d218c35bf98bef380173c780e922132506de + sha256sums = b7a9eb7f4c9f5c297978459338d389e5bc790e5c5d89805668f7d24ea1d485b2 sha256sums = 8d9afa1f940a9dac689ead40a57990d1491f34a1787b2222f8f5b5e485d54103 - sha256sums = 9fa5b6a7ea021802a4126e8614d1c776dd26d573c023cc8fd810c8075e823211 - sha256sums = 1926a3d3b8996cdbdd8b970a12d9880e3272181fd4b07c2c9277ca7290b159c3 - sha256sums = 2ac3742a5916d14102d6e6c1e975ae15024f0b9aad36db96533674929e895cdb - sha256sums = 5f97739f5962c98c94c0cf7a7361d9dac01be1366773cb2b45d2bd5938569fde + sha256sums = d6760634e4926ce5ad0df501d06139a5e693d7058e671a195c9e0b54197c1d96 + sha256sums = a72c657784dc5804509456d9ba39ccc8d5e5998c847f49abbcfeb2a547290815 + sha256sums = c51a948262319925d17ef80d1bbbe581144685d2ef848cd708653c3f2d15b5cf + sha256sums = b661dcaa00323119e58a3b9d5b6e732291a107fbd29d242fb1ddcd36ea50106e sha256sums = 52a94f48e562f98ba0b22b43b1684f6a813872b9c310d6f7567fe91aaab4944b - sha256sums = 01fa29086c1cba4a1fb7ea0e13baea3e210a771ccc67134fbb32de4185e0cb23 + sha256sums = 7f171b7d69866ac6d8945ab0867b2646964362c791875c6428b4c2c8e3f3fb5b sha256sums = 0bcfe168964338ec9c6e781479f2f8d06aa44f2262d6405ff8fa42983be89630 sha256sums = 68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213 - sha256sums = 8da3e8502a50828edd2f5653e50bf6c60dd37a6eef1e02b05f7008091cd9beb7 + sha256sums = 0ab9c4d33e88ab6fa8fdeab7e80e39876115413af1b344f67cf766614359069e pkgname = firefox-esr-privacy @@ -1,13 +1,13 @@ # firefox-esr-privacy pkgname=firefox-esr-privacy -_basever=45 -pkgver=45.4.0 +_basever=52 +pkgver=52.0 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') url="https://www.mozilla.org/firefox/" -depends=('gtk2' 'libxt' 'startup-notification' 'dbus-glib' 'alsa-lib' 'desktop-file-utils' +depends=('autoconf2.13' 'gtk2' 'libxt' 'startup-notification' 'dbus-glib' 'alsa-lib' 'desktop-file-utils' 'hicolor-icon-theme' 'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite') makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'xorg-server' 'inetutils') install=firefox.install @@ -17,7 +17,7 @@ provides=('firefox') source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}esr/source/firefox-${pkgver}esr.source.tar.xz firefox-install-dir.patch firefox-${_basever}-disable-location.services.mozilla.com.patch - firefox-${_basever}-disable-loop-pocket.patch + firefox-${_basever}-disable-pocket-leftovers.patch firefox-${_basever}-disable-sponsored-tiles.patch firefox-${_basever}-prefs.patch firefox-${_basever}-disable-telemetry.patch @@ -26,18 +26,18 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}esr/so firefox.desktop firefox-fixed-loading-icon.png mozconfig) -sha256sums=('cfd90096b9e1019b9de4fe061ece8c65f668b8a24bcbb657ce6b3c940ef83ad0' - 'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd' +sha256sums=('40748a6d73ecea29257c1b4bdbb8d218c35bf98bef380173c780e922132506de' + 'b7a9eb7f4c9f5c297978459338d389e5bc790e5c5d89805668f7d24ea1d485b2' '8d9afa1f940a9dac689ead40a57990d1491f34a1787b2222f8f5b5e485d54103' - '9fa5b6a7ea021802a4126e8614d1c776dd26d573c023cc8fd810c8075e823211' - '1926a3d3b8996cdbdd8b970a12d9880e3272181fd4b07c2c9277ca7290b159c3' - '2ac3742a5916d14102d6e6c1e975ae15024f0b9aad36db96533674929e895cdb' - '5f97739f5962c98c94c0cf7a7361d9dac01be1366773cb2b45d2bd5938569fde' + 'd6760634e4926ce5ad0df501d06139a5e693d7058e671a195c9e0b54197c1d96' + 'a72c657784dc5804509456d9ba39ccc8d5e5998c847f49abbcfeb2a547290815' + 'c51a948262319925d17ef80d1bbbe581144685d2ef848cd708653c3f2d15b5cf' + 'b661dcaa00323119e58a3b9d5b6e732291a107fbd29d242fb1ddcd36ea50106e' '52a94f48e562f98ba0b22b43b1684f6a813872b9c310d6f7567fe91aaab4944b' - '01fa29086c1cba4a1fb7ea0e13baea3e210a771ccc67134fbb32de4185e0cb23' + '7f171b7d69866ac6d8945ab0867b2646964362c791875c6428b4c2c8e3f3fb5b' '0bcfe168964338ec9c6e781479f2f8d06aa44f2262d6405ff8fa42983be89630' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213' - '8da3e8502a50828edd2f5653e50bf6c60dd37a6eef1e02b05f7008091cd9beb7') + '0ab9c4d33e88ab6fa8fdeab7e80e39876115413af1b344f67cf766614359069e') validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A') prepare() { @@ -48,10 +48,10 @@ prepare() { # Disable sponsored tiles patch -Np1 -i "$srcdir"/firefox-${_basever}-disable-sponsored-tiles.patch - # Disable Loop (Firefox Hello) and Pocket integration - patch -Np1 -i "$srcdir"/firefox-${_basever}-disable-loop-pocket.patch - # Remove loop and pocket source directories - rm -fr browser/extensions/loop/ browser/components/pocket/ + # Disable Pocket integration leftovers + patch -Np1 -i "$srcdir"/firefox-${_basever}-disable-pocket-leftovers.patch + # Remove pocket source directory + rm -fr browser/extensions/pocket # Disable geo IP lookup on first run patch -Np1 -i "$srcdir"/firefox-${_basever}-disable-location.services.mozilla.com.patch @@ -76,10 +76,6 @@ prepare() { # Install in /usr/lib/firefox without version number patch -Np1 -i "$srcdir"/firefox-install-dir.patch - - # Don't install files from the browser/features directory - # This directory only contains the loop program, which is not built - sed -i 's#@RESPATH@/browser/features/*#; @RESPATH@/browser/features/*#' browser/installer/package-manifest.in } build() { diff --git a/firefox-45-disable-loop-pocket.patch b/firefox-45-disable-loop-pocket.patch deleted file mode 100644 index af449bc7579f..000000000000 --- a/firefox-45-disable-loop-pocket.patch +++ /dev/null @@ -1,1063 +0,0 @@ -diff -Naur firefox-45.0esr.bak/browser/app/profile/firefox.js firefox-45.0esr/browser/app/profile/firefox.js ---- firefox-45.0esr.bak/browser/app/profile/firefox.js 2016-03-13 -+++ firefox-45.0esr/browser/app/profile/firefox.js 2016-03-13 -@@ -1617,13 +1617,6 @@ - // and because (normally) these errors are not persisted anywhere. - pref("reader.errors.includeURLs", true); - --pref("browser.pocket.enabled", true); --pref("browser.pocket.api", "api.getpocket.com"); --pref("browser.pocket.site", "getpocket.com"); --pref("browser.pocket.oAuthConsumerKey", "40249-e88c401e1b1f2242d9e441c4"); --pref("browser.pocket.useLocaleList", true); --pref("browser.pocket.enabledLocales", "cs de en-GB en-US en-ZA es-ES es-MX fr hu it ja ja-JP-mac ko nl pl pt-BR pt-PT ru zh-CN zh-TW"); -- - pref("view_source.tab", true); - - pref("dom.webnotifications.serviceworker.enabled", true); -diff -Naur firefox-45.0esr.bak/browser/base/content/browser-context.inc firefox-45.0esr/browser/base/content/browser-context.inc ---- firefox-45.0esr.bak/browser/base/content/browser-context.inc 2016-03-13 -+++ firefox-45.0esr/browser/base/content/browser-context.inc 2016-03-13 -@@ -79,10 +79,6 @@ - label="&saveLinkCmd.label;" - accesskey="&saveLinkCmd.accesskey;" - oncommand="gContextMenu.saveLink();"/> -- <menuitem id="context-savelinktopocket" -- label="&saveLinkToPocketCmd.label;" -- accesskey="&saveLinkToPocketCmd.accesskey;" -- oncommand="gContextMenu.saveLinkToPocket();"/> - <menu id="context-marklinkMenu" label="&social.marklinkMenu.label;" - accesskey="&social.marklinkMenu.accesskey;"> - <menupopup/> -@@ -270,10 +266,6 @@ - label="&savePageCmd.label;" - accesskey="&savePageCmd.accesskey2;" - oncommand="gContextMenu.savePageAs();"/> -- <menuitem id="context-pocket" -- label="&saveToPocketCmd.label;" -- accesskey="&saveToPocketCmd.accesskey;" -- oncommand="gContextMenu.savePageToPocket();"/> - <menu id="context-markpageMenu" label="&social.markpageMenu.label;" - accesskey="&social.markpageMenu.accesskey;"> - <menupopup/> -diff -Naur firefox-45.0esr.bak/browser/base/content/browser.css firefox-45.0esr/browser/base/content/browser.css ---- firefox-45.0esr.bak/browser/base/content/browser.css 2016-03-13 -+++ firefox-45.0esr/browser/base/content/browser.css 2016-03-13 -@@ -18,30 +18,6 @@ - %endif - } - --/* These values are chosen to keep the Loop detached chat window from -- * getting too small. When it's too small, three bad things happen: -- * -- * - It looks terrible -- * - It's not really usable -- * - It's possible for the user to be transmitting video that's cropped by the -- * the edge of the window, so that they're not aware of it, which is a -- * privacy problem -- * -- * Note that if the chat window grows more users than Loop who want this -- * ability, we'll need to generalize. A partial patch for this is in -- * bug 1112264. -- */ -- --#chat-window { -- /* -- * In some ideal world, we'd have a simple way to express "block resizing -- * along any dimension beyond the point at which an overflow event would -- * occur". But none of -moz-{fit,max,min}-content do what we want here. So.. -- */ -- min-width: 260px; -- min-height: 315px; --} -- - #main-window[customize-entered] { - min-width: -moz-fit-content; - } -@@ -897,68 +873,6 @@ - -moz-binding: url("chrome://browser/content/translation-infobar.xml#translationbar"); - } - --/* Social */ --/* Note the chatbox 'width' values are duplicated in socialchat.xml */ --chatbox { -- -moz-binding: url("chrome://browser/content/socialchat.xml#chatbox"); -- transition: height 150ms ease-out, width 150ms ease-out; -- height: 290px; -- width: 300px; /* CHAT_WIDTH_OPEN in socialchat.xml */ --} -- --chatbox[customSize] { -- width: 350px; /* CHAT_WIDTH_OPEN_ALT in socialchat.xml */ --} -- --#chat-window[customSize] { -- min-width: 350px; --} -- --chatbox[customSize="loopChatEnabled"] { -- /* 430px as defined per UX */ -- height: 430px; --} -- --#chat-window[customSize="loopChatEnabled"] { -- /* 325px + 30px top bar height. */ -- min-height: calc(325px + 30px); --} -- --chatbox[customSize="loopChatMessageAppended"] { -- /* 430px as defined per UX */ -- height: 430px; --} -- --chatbox[customSize="loopChatDisabledMessageAppended"] { -- /* 388px as defined per UX */ -- height: 388px; --} -- --#chat-window[customSize="loopChatMessageAppended"] { -- /* 445px + 30px top bar height. */ -- min-height: calc(400px + 30px); --} -- --chatbox[minimized="true"] { -- width: 160px; -- height: 20px; /* CHAT_WIDTH_MINIMIZED in socialchat.xml */ --} -- --chatbar { -- -moz-binding: url("chrome://browser/content/socialchat.xml#chatbar"); -- height: 0; -- max-height: 0; --} -- --.chatbar-innerbox { -- margin: -285px 0 0; --} -- --chatbar[customSize] > .chatbar-innerbox { -- /* 450px to make room for the maximum custom-size chatbox; currently 'loopChatMessageAppended'. */ -- margin-top: -450px; --} -- - /* Apply crisp rendering for favicons at exactly 2dppx resolution */ - @media (resolution: 2dppx) { - #social-sidebar-favico, -diff -Naur firefox-45.0esr.bak/browser/base/content/browser.js firefox-45.0esr/browser/base/content/browser.js ---- firefox-45.0esr.bak/browser/base/content/browser.js 2016-03-13 -+++ firefox-45.0esr/browser/base/content/browser.js 2016-03-13 -@@ -53,37 +53,6 @@ - "@mozilla.org/windows-ui-utils;1", "nsIWindowsUIUtils"); - XPCOMUtils.defineLazyModuleGetter(this, "LightweightThemeManager", - "resource://gre/modules/LightweightThemeManager.jsm"); --XPCOMUtils.defineLazyModuleGetter(this, "Pocket", -- "resource:///modules/Pocket.jsm"); -- --// Can't use XPCOMUtils for these because the scripts try to define the variables --// on window, and so the defineProperty inside defineLazyGetter fails. --Object.defineProperty(window, "pktApi", { -- get: function() { -- // Avoid this getter running again: -- delete window.pktApi; -- Services.scriptloader.loadSubScript("chrome://browser/content/pocket/pktApi.js", window); -- return window.pktApi; -- }, -- configurable: true, -- enumerable: true --}); -- --function pktUIGetter(prop) { -- return { -- get: function() { -- // Avoid either of these getters running again: -- delete window.pktUI; -- delete window.pktUIMessaging; -- Services.scriptloader.loadSubScript("chrome://browser/content/pocket/main.js", window); -- return window[prop]; -- }, -- configurable: true, -- enumerable: true -- }; --} --Object.defineProperty(window, "pktUI", pktUIGetter("pktUI")); --Object.defineProperty(window, "pktUIMessaging", pktUIGetter("pktUIMessaging")); - - XPCOMUtils.defineLazyGetter(this, "gBrowserBundle", function() { - return Services.strings.createBundle('chrome://browser/locale/browser.properties'); -diff -Naur firefox-45.0esr.bak/browser/base/content/browser-menubar.inc firefox-45.0esr/browser/base/content/browser-menubar.inc ---- firefox-45.0esr.bak/browser/base/content/browser-menubar.inc 2016-03-13 -+++ firefox-45.0esr/browser/base/content/browser-menubar.inc 2016-03-13 -@@ -413,7 +413,6 @@ - oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);" - onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);" - onpopupshowing="BookmarkingUI.onMainMenuPopupShowing(event); -- BookmarkingUI.updatePocketItemVisibility('menu_'); - if (!this.parentNode._placesView) - new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');" - tooltip="bhTooltip" popupsinherittooltip="true"> -@@ -422,12 +421,6 @@ - command="Browser:ShowAllBookmarks" - key="manBookmarkKb"/> - <menuseparator id="organizeBookmarksSeparator"/> -- <menuitem id="menu_pocket" label="&pocketMenuitem.label;" --#ifndef XP_MACOSX -- class="menuitem-iconic" --#endif -- oncommand="openUILink(Pocket.listURL, event);"/> -- <menuseparator id="menu_pocketSeparator"/> - <menuitem id="menu_bookmarkThisPage" - command="Browser:AddBookmarkAs" - observes="bookmarkThisPageBroadcaster" -diff -Naur firefox-45.0esr.bak/browser/base/content/browser-places.js firefox-45.0esr/browser/base/content/browser-places.js ---- firefox-45.0esr.bak/browser/base/content/browser-places.js 2016-03-13 -+++ firefox-45.0esr/browser/base/content/browser-places.js 2016-03-13 -@@ -1552,12 +1552,6 @@ - PlacesCommandHook.updateBookmarkAllTabsCommand(); - }, - -- updatePocketItemVisibility: function BUI_updatePocketItemVisibility(prefix) { -- let hidden = !CustomizableUI.getPlacementOfWidget("pocket-button"); -- document.getElementById(prefix + "pocket").hidden = hidden; -- document.getElementById(prefix + "pocketSeparator").hidden = hidden; -- }, -- - _showBookmarkedNotification: function BUI_showBookmarkedNotification() { - function getCenteringTransformForRects(rectToPosition, referenceRect) { - let topDiff = referenceRect.top - rectToPosition.top; -@@ -1679,7 +1673,6 @@ - - onPanelMenuViewShowing: function BUI_onViewShowing(aEvent) { - this._updateBookmarkPageMenuItem(); -- this.updatePocketItemVisibility("panelMenu_"); - // Update checked status of the toolbar toggle. - let viewToolbar = document.getElementById("panelMenu_viewBookmarksToolbar"); - let personalToolbar = document.getElementById("PersonalToolbar"); -diff -Naur firefox-45.0esr.bak/browser/base/content/browser.xul firefox-45.0esr/browser/base/content/browser.xul ---- firefox-45.0esr.bak/browser/base/content/browser.xul 2016-03-13 -+++ firefox-45.0esr/browser/base/content/browser.xul 2016-03-13 -@@ -290,18 +290,6 @@ - noautofocus="true" - position="topcenter topright"/> - -- <panel id="loop-notification-panel" -- class="loop-panel social-panel" -- type="arrow" -- hidden="true" -- noautofocus="true"/> -- -- <panel id="loop-panel" -- class="loop-panel social-panel" -- type="arrow" -- orient="horizontal" -- hidden="true"/> -- - <menupopup id="toolbar-context-menu" - onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));"> - <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)" -@@ -609,9 +597,9 @@ - fullscreentoolbar="true" mode="icons" customizable="true" - iconsize="small" - #ifdef MOZ_DEV_EDITION -- defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,pocket-button,downloads-button,home-button,loop-button" -+ defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button" - #else -- defaultset="urlbar-container,search-container,bookmarks-menu-button,pocket-button,downloads-button,home-button,loop-button" -+ defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button" - #endif - customizationtarget="nav-bar-customization-target" - overflowable="true" -@@ -787,7 +775,6 @@ - oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);" - onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);" - onpopupshowing="BookmarkingUI.onPopupShowing(event); -- BookmarkingUI.updatePocketItemVisibility('BMB_'); - BookmarkingUI.attachPlacesView(event, this);" - tooltip="bhTooltip" popupsinherittooltip="true"> - <menuitem id="BMB_viewBookmarksSidebar" -@@ -804,11 +791,6 @@ - command="Browser:ShowAllBookmarks" - key="manBookmarkKb"/> - <menuseparator/> -- <menuitem id="BMB_pocket" -- class="menuitem-iconic bookmark-item subviewbutton" -- label="&pocketMenuitem.label;" -- oncommand="openUILink(Pocket.listURL, event);"/> -- <menuseparator id="BMB_pocketSeparator"/> - <menuitem id="BMB_subscribeToPageMenuitem" - #ifndef XP_MACOSX - class="menuitem-iconic subviewbutton" -diff -Naur firefox-45.0esr.bak/browser/base/content/nsContextMenu.js firefox-45.0esr/browser/base/content/nsContextMenu.js ---- firefox-45.0esr.bak/browser/base/content/nsContextMenu.js 2016-03-13 -+++ firefox-45.0esr/browser/base/content/nsContextMenu.js 2016-03-13 -@@ -13,8 +13,6 @@ - - XPCOMUtils.defineLazyModuleGetter(this, "CustomizableUI", - "resource:///modules/CustomizableUI.jsm"); --XPCOMUtils.defineLazyModuleGetter(this, "Pocket", -- "resource:///modules/Pocket.jsm"); - XPCOMUtils.defineLazyModuleGetter(this, "LoginHelper", - "resource://gre/modules/LoginHelper.jsm"); - -@@ -216,25 +214,6 @@ - SimpleServiceDiscovery.services.length > 0 && - CastingApps.getServicesForVideo(this.target).length > 0; - this.setItemAttr("context-castvideo", "disabled", !shouldShowCast); -- -- this.initPocketItems(); -- }, -- -- initPocketItems: function CM_initPocketItems() { -- var showSaveCurrentPageToPocket = !(this.onTextInput || this.onLink || -- this.isContentSelected || this.onImage || -- this.onCanvas || this.onVideo || this.onAudio); -- let targetURI = (this.onSaveableLink || this.onPlainTextLink) ? this.linkURI : this.browser.currentURI; -- let canPocket = CustomizableUI.getPlacementOfWidget("pocket-button") && -- window.pktApi && window.pktApi.isUserLoggedIn(); -- canPocket = canPocket && (targetURI.schemeIs("http") || targetURI.schemeIs("https") || -- (targetURI.schemeIs("about") && ReaderMode.getOriginalUrl(targetURI.spec))); -- canPocket = canPocket && window.gBrowser && this.browser.getTabBrowser() == window.gBrowser; -- -- this.showItem("context-pocket", canPocket && showSaveCurrentPageToPocket); -- let showSaveLinkToPocket = canPocket && !showSaveCurrentPageToPocket && -- (this.onSaveableLink || this.onPlainTextLink); -- this.showItem("context-savelinktopocket", showSaveLinkToPocket); - }, - - initViewItems: function CM_initViewItems() { -@@ -1723,14 +1702,6 @@ - saveBrowser(this.browser); - }, - -- saveLinkToPocket: function CM_saveLinkToPocket() { -- Pocket.savePage(this.browser, this.linkURL); -- }, -- -- savePageToPocket: function CM_saveToPocket() { -- Pocket.savePage(this.browser, this.browser.currentURI.spec, this.browser.contentTitle); -- }, -- - printFrame: function CM_printFrame() { - PrintUtils.printWindow(this.frameOuterWindowID, this.browser); - }, -diff -Naur firefox-45.0esr.bak/browser/components/customizableui/content/panelUI.inc.xul firefox-45.0esr/browser/components/customizableui/content/panelUI.inc.xul ---- firefox-45.0esr.bak/browser/components/customizableui/content/panelUI.inc.xul 2016-03-13 -+++ firefox-45.0esr/browser/components/customizableui/content/panelUI.inc.xul 2016-03-13 -@@ -196,10 +196,6 @@ - observes="bookmarkThisPageBroadcaster" - command="Browser:AddBookmarkAs" - onclick="PanelUI.hide();"/> -- <toolbarseparator id="panelMenu_pocketSeparator"/> -- <toolbarbutton id="panelMenu_pocket" label="&pocketMenuitem.label;" -- class="subviewbutton cui-withicon" -- oncommand="openUILink(Pocket.listURL, event);"/> - <toolbarseparator/> - <toolbarbutton id="panelMenu_viewBookmarksSidebar" - label="&viewBookmarksSidebar2.label;" -@@ -243,8 +239,6 @@ - - <panelview id="PanelUI-socialapi" flex="1"/> - -- <panelview id="PanelUI-loopapi" flex="1"/> -- - <panelview id="PanelUI-feeds" flex="1" oncommand="FeedHandler.subscribeToFeed(null, event);"> - <label value="&feedsMenu.label;" class="panel-subview-header"/> - </panelview> -@@ -315,11 +309,6 @@ - </vbox> - </panelview> - -- <panelview id="PanelUI-pocketView" flex="1"> -- <vbox class="panel-subview-body"> -- </vbox> -- </panelview> -- - - </panelmultiview> - <!-- These menupopups are located here to prevent flickering, -diff -Naur firefox-45.0esr.bak/browser/components/customizableui/CustomizableUI.jsm firefox-45.0esr/browser/components/customizableui/CustomizableUI.jsm ---- firefox-45.0esr.bak/browser/components/customizableui/CustomizableUI.jsm 2016-03-13 -+++ firefox-45.0esr/browser/components/customizableui/CustomizableUI.jsm 2016-03-13 -@@ -64,7 +64,6 @@ - * version the button is removed in as the value. e.g. "pocket-button": 5 - */ - var ObsoleteBuiltinButtons = { -- "loop-button": 5 - }; - - /** -@@ -219,18 +218,8 @@ - "bookmarks-menu-button", - "downloads-button", - "home-button", -- "loop-button", - ]; - -- // Insert the Pocket button after the bookmarks button if it's present. -- for (let widgetDefinition of CustomizableWidgets) { -- if (widgetDefinition.id == "pocket-button") { -- let idx = navbarPlacements.indexOf("bookmarks-menu-button") + 1; -- navbarPlacements.splice(idx, 0, widgetDefinition.id); -- break; -- } -- } -- - if (Services.prefs.getBoolPref(kPrefWebIDEInNavbar)) { - navbarPlacements.push("webide-button"); - } -@@ -355,15 +344,6 @@ - } - } - } -- -- if (currentVersion < 2) { -- // Nuke the old 'loop-call-button' out of orbit. -- CustomizableUI.removeWidgetFromArea("loop-call-button"); -- } -- -- if (currentVersion < 4) { -- CustomizableUI.removeWidgetFromArea("loop-button-throttled"); -- } - }, - - /** -diff -Naur firefox-45.0esr.bak/browser/components/customizableui/CustomizableWidgets.jsm firefox-45.0esr/browser/components/customizableui/CustomizableWidgets.jsm ---- firefox-45.0esr.bak/browser/components/customizableui/CustomizableWidgets.jsm 2016-03-13 -+++ firefox-45.0esr/browser/components/customizableui/CustomizableWidgets.jsm 2016-03-13 -@@ -18,8 +18,6 @@ - "resource:///modules/PlacesUIUtils.jsm"); - XPCOMUtils.defineLazyModuleGetter(this, "RecentlyClosedTabsAndWindowsMenuUtils", - "resource:///modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm"); --XPCOMUtils.defineLazyModuleGetter(this, "Pocket", -- "resource:///modules/Pocket.jsm"); - XPCOMUtils.defineLazyModuleGetter(this, "ShortcutUtils", - "resource://gre/modules/ShortcutUtils.jsm"); - XPCOMUtils.defineLazyModuleGetter(this, "CharsetMenu", -@@ -1219,68 +1217,6 @@ - }); - } - --if (Services.prefs.getBoolPref("browser.pocket.enabled")) { -- let isEnabledForLocale = true; -- if (Services.prefs.getBoolPref("browser.pocket.useLocaleList")) { -- let chromeRegistry = Cc["@mozilla.org/chrome/chrome-registry;1"] -- .getService(Ci.nsIXULChromeRegistry); -- let browserLocale = chromeRegistry.getSelectedLocale("browser"); -- let enabledLocales = []; -- try { -- enabledLocales = Services.prefs.getCharPref("browser.pocket.enabledLocales").split(' '); -- } catch (ex) { -- Cu.reportError(ex); -- } -- isEnabledForLocale = enabledLocales.indexOf(browserLocale) != -1; -- } -- -- if (isEnabledForLocale) { -- let pocketButton = { -- id: "pocket-button", -- defaultArea: CustomizableUI.AREA_NAVBAR, -- introducedInVersion: "pref", -- type: "view", -- viewId: "PanelUI-pocketView", -- // Use forwarding functions here to avoid loading Pocket.jsm on startup: -- onViewShowing: function() { -- return Pocket.onPanelViewShowing.apply(this, arguments); -- }, -- onViewHiding: function() { -- return Pocket.onPanelViewHiding.apply(this, arguments); -- }, -- -- // If the user has the "classic" Pocket add-on installed, use that instead -- // and destroy the widget. -- conditionalDestroyPromise: new Promise(resolve => { -- AddonManager.getAddonByID("isreaditlater@ideashower.com", addon => { -- resolve(addon && addon.isActive); -- }); -- }), -- }; -- -- CustomizableWidgets.push(pocketButton); -- CustomizableUI.addListener(pocketButton); -- -- // Uninstall the Pocket social provider if it exists, but only if we haven't -- // already uninstalled it in this manner. That way the user can reinstall -- // it if they prefer it without its being uninstalled every time they start -- // the browser. -- let origin = "https://getpocket.com"; -- SocialService.getProvider(origin, provider => { -- if (provider) { -- let pref = "social.backup.getpocket-com"; -- if (!Services.prefs.prefHasUserValue(pref)) { -- let str = Cc["@mozilla.org/supports-string;1"]. -- createInstance(Ci.nsISupportsString); -- str.data = JSON.stringify(provider.manifest); -- Services.prefs.setComplexValue(pref, Ci.nsISupportsString, str); -- SocialService.uninstallProvider(origin, () => {}); -- } -- } -- }); -- } --} -- - #ifdef E10S_TESTING_ONLY - var e10sDisabled = false; - #ifdef XP_MACOSX -diff -Naur firefox-45.0esr.bak/browser/components/moz.build firefox-45.0esr/browser/components/moz.build ---- firefox-45.0esr.bak/browser/components/moz.build 2016-03-13 -+++ firefox-45.0esr/browser/components/moz.build 2016-03-13 -@@ -15,7 +15,6 @@ - 'migration', - 'newtab', - 'places', -- 'pocket', - 'preferences', - 'privatebrowsing', - 'search', -diff -Naur firefox-45.0esr.bak/browser/components/pocket/moz.build firefox-45.0esr/browser/components/pocket/moz.build ---- firefox-45.0esr.bak/browser/components/pocket/moz.build 2016-03-13 -+++ firefox-45.0esr/browser/components/pocket/moz.build 2016-03-13 -@@ -3,5 +3,3 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - JAR_MANIFESTS += ['jar.mn'] -- --EXTRA_JS_MODULES += ['Pocket.jsm'] -diff -Naur firefox-45.0esr.bak/browser/components/uitour/UITour.jsm firefox-45.0esr/browser/components/uitour/UITour.jsm ---- firefox-45.0esr.bak/browser/components/uitour/UITour.jsm 2016-03-13 -+++ firefox-45.0esr/browser/components/uitour/UITour.jsm 2016-03-13 -@@ -152,59 +152,6 @@ - query: "#panic-button", - widgetName: "panic-button", - }], -- ["loop", { -- allowAdd: true, -- query: "#loop-button", -- widgetName: "loop-button", -- }], -- ["loop-newRoom", { -- infoPanelPosition: "leftcenter topright", -- query: (aDocument) => { -- let loopUI = aDocument.defaultView.LoopUI; -- // Use the parentElement full-width container of the button so our arrow -- // doesn't overlap the panel contents much. -- return loopUI.browser.contentDocument.querySelector(".new-room-button").parentElement; -- }, -- }], -- ["loop-roomList", { -- infoPanelPosition: "leftcenter topright", -- query: (aDocument) => { -- let loopUI = aDocument.defaultView.LoopUI; -- return loopUI.browser.contentDocument.querySelector(".room-list"); -- }, -- }], -- ["loop-selectedRoomButtons", { -- infoPanelOffsetY: -20, -- infoPanelPosition: "start_after", -- query: (aDocument) => { -- let chatbox = aDocument.querySelector("chatbox[src^='about\:loopconversation'][selected]"); -- -- // Check that the real target actually exists -- if (!chatbox || !chatbox.contentDocument || -- !chatbox.contentDocument.querySelector(".call-action-group")) { -- return null; -- } -- -- // But anchor on the <browser> in the chatbox so the panel doesn't jump to undefined -- // positions when the copy/email buttons disappear e.g. when the feedback form opens or -- // somebody else joins the room. -- return chatbox.content; -- }, -- }], -- ["loop-signInUpLink", { -- query: (aDocument) => { -- let loopBrowser = aDocument.defaultView.LoopUI.browser; -- if (!loopBrowser) { -- return null; -- } -- return loopBrowser.contentDocument.querySelector(".signin-link"); -- }, -- }], -- ["pocket", { -- allowAdd: true, -- query: "#pocket-button", -- widgetName: "pocket-button", -- }], - ["privateWindow", {query: "#privatebrowsing-button"}], - ["quit", {query: "#PanelUI-quit"}], - ["readerMode-urlBar", {query: "#reader-mode-button"}], -@@ -869,16 +816,12 @@ - this.hideInfo(aWindow); - // Ensure the menu panel is hidden before calling recreatePopup so popup events occur. - this.hideMenu(aWindow, "appMenu"); -- this.hideMenu(aWindow, "loop"); - this.hideMenu(aWindow, "controlCenter"); - - // Clean up panel listeners after calling hideMenu above. - aWindow.PanelUI.panel.removeEventListener("popuphiding", this.hideAppMenuAnnotations); - aWindow.PanelUI.panel.removeEventListener("ViewShowing", this.hideAppMenuAnnotations); - aWindow.PanelUI.panel.removeEventListener("popuphidden", this.onPanelHidden); -- let loopPanel = aWindow.document.getElementById("loop-notification-panel"); -- loopPanel.removeEventListener("popuphidden", this.onPanelHidden); -- loopPanel.removeEventListener("popuphiding", this.hideLoopPanelAnnotations); - let controlCenterPanel = aWindow.gIdentityHandler._identityPopup; - controlCenterPanel.removeEventListener("popuphidden", this.onPanelHidden); - controlCenterPanel.removeEventListener("popuphiding", this.hideControlCenterAnnotations); -@@ -1592,71 +1535,6 @@ - popup.addEventListener("popupshown", onPopupShown); - } - aWindow.document.getElementById("identity-box").click(); -- } else if (aMenuName == "loop") { -- let toolbarButton = aWindow.LoopUI.toolbarButton; -- // It's possible to have a node that isn't placed anywhere -- if (!toolbarButton || !toolbarButton.node || -- !CustomizableUI.getPlacementOfWidget(toolbarButton.node.id)) { -- log.debug("Can't show the Loop menu since the toolbarButton isn't placed"); -- return; -- } -- -- let panel = aWindow.document.getElementById("loop-notification-panel"); -- panel.setAttribute("noautohide", true); -- if (panel.state != "open") { -- this.recreatePopup(panel); -- this.availableTargetsCache.clear(); -- } -- -- // An event object is expected but we don't want to toggle the panel with a click if the panel -- // is already open. -- aWindow.LoopUI.openCallPanel({ target: toolbarButton.node, }, "rooms").then(() => { -- if (aOpenCallback) { -- aOpenCallback(); -- } -- }); -- panel.addEventListener("popuphidden", this.onPanelHidden); -- panel.addEventListener("popuphiding", this.hideLoopPanelAnnotations); -- } else if (aMenuName == "pocket") { -- this.getTarget(aWindow, "pocket").then(Task.async(function* onPocketTarget(target) { -- let widgetGroupWrapper = CustomizableUI.getWidget(target.widgetName); -- if (widgetGroupWrapper.type != "view" || !widgetGroupWrapper.viewId) { -- log.error("Can't open the pocket menu without a view"); -- return; -- } -- let placement = CustomizableUI.getPlacementOfWidget(target.widgetName); -- if (!placement || !placement.area) { -- log.error("Can't open the pocket menu without a placement"); -- return; -- } -- -- if (placement.area == CustomizableUI.AREA_PANEL) { -- // Open the appMenu and wait for it if it's not already opened or showing a subview. -- yield new Promise((resolve, reject) => { -- if (aWindow.PanelUI.panel.state != "closed") { -- if (aWindow.PanelUI.multiView.showingSubView) { -- reject("A subview is already showing"); -- return; -- } -- -- resolve(); -- return; -- } -- -- aWindow.PanelUI.panel.addEventListener("popupshown", function onShown() { -- aWindow.PanelUI.panel.removeEventListener("popupshown", onShown); -- resolve(); -- }); -- -- aWindow.PanelUI.show(); -- }); -- } -- -- let widgetWrapper = widgetGroupWrapper.forWindow(aWindow); -- aWindow.PanelUI.showSubView(widgetGroupWrapper.viewId, -- widgetWrapper.anchor, -- placement.area); -- })).catch(log.error); - } - }, - -@@ -1675,9 +1553,6 @@ - } else if (aMenuName == "controlCenter") { - let panel = aWindow.gIdentityHandler._identityPopup; - panel.hidePopup(); -- } else if (aMenuName == "loop") { -- let panel = aWindow.document.getElementById("loop-notification-panel"); -- panel.hidePopup(); - } - }, - -@@ -1710,12 +1585,6 @@ - UITour.hideAnnotationsForPanel(aEvent, UITour.targetIsInAppMenu); - }, - -- hideLoopPanelAnnotations: function(aEvent) { -- UITour.hideAnnotationsForPanel(aEvent, (aTarget) => { -- return aTarget.targetName.startsWith("loop-") && aTarget.targetName != "loop-selectedRoomButtons"; -- }); -- }, -- - hideControlCenterAnnotations(aEvent) { - UITour.hideAnnotationsForPanel(aEvent, (aTarget) => { - return aTarget.targetName.startsWith("controlCenter-"); -@@ -1813,11 +1682,6 @@ - case "availableTargets": - this.getAvailableTargets(aMessageManager, aWindow, aCallbackID); - break; -- case "loop": -- this.sendPageCallback(aMessageManager, aCallbackID, { -- gettingStartedSeen: Services.prefs.getBoolPref("loop.gettingStarted.seen"), -- }); -- break; - case "search": - case "selectedSearchEngine": - Services.search.init(rv => { -@@ -1859,10 +1723,6 @@ - } - } catch (e) {} - break; -- case "Loop:ResumeTourOnFirstJoin": -- // Ignore aValue in this case to avoid accidentally setting it to false. -- Services.prefs.setBoolPref("loop.gettingStarted.resumeOnFirstJoin", true); -- break; - default: - log.error("setConfiguration: Unknown configuration requested: " + aConfiguration); - break; -diff -Naur firefox-45.0esr.bak/browser/extensions/moz.build firefox-45.0esr/browser/extensions/moz.build ---- firefox-45.0esr.bak/browser/extensions/moz.build 2016-03-13 -+++ firefox-45.0esr/browser/extensions/moz.build 2016-03-13 -@@ -5,7 +5,6 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - DIRS += [ -- 'loop', - 'pdfjs', - 'shumway', - ] -diff -Naur firefox-45.0esr.bak/browser/locales/en-US/chrome/browser/browser.dtd firefox-45.0esr/browser/locales/en-US/chrome/browser/browser.dtd ---- firefox-45.0esr.bak/browser/locales/en-US/chrome/browser/browser.dtd 2016-03-13 -+++ firefox-45.0esr/browser/locales/en-US/chrome/browser/browser.dtd 2016-03-13 -@@ -252,8 +252,6 @@ - <!ENTITY addons.commandkey "A"> - <!ENTITY webapps.label "Apps"> - <!ENTITY webapps.accesskey "p"> --<!ENTITY loopMenuItem.label "Start a conversation…"> --<!ENTITY loopMenuItem.accesskey "t"> - - <!ENTITY webDeveloperMenu.label "Web Developer"> - <!ENTITY webDeveloperMenu.accesskey "W"> -@@ -936,10 +934,3 @@ - <!ENTITY emeNotificationsNotNow.accesskey "N"> - <!ENTITY emeNotificationsDontAskAgain.label "Don't ask me again"> - <!ENTITY emeNotificationsDontAskAgain.accesskey "D"> -- --<!-- LOCALIZATION NOTE (saveToPocketCmd.label, saveLinkToPocketCmd.label, pocketMenuitem.label): Pocket is a brand name --> --<!ENTITY saveToPocketCmd.label "Save Page to Pocket"> --<!ENTITY saveToPocketCmd.accesskey "k"> --<!ENTITY saveLinkToPocketCmd.label "Save Link to Pocket"> --<!ENTITY saveLinkToPocketCmd.accesskey "o"> --<!ENTITY pocketMenuitem.label "View Pocket List"> -diff -Naur firefox-45.0esr.bak/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties firefox-45.0esr/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties ---- firefox-45.0esr.bak/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties 2016-03-13 -+++ firefox-45.0esr/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties 2016-03-13 -@@ -96,19 +96,6 @@ - # %2$S is the keyboard shortcut - quit-button.tooltiptext.mac = Quit %1$S (%2$S) - --# LOCALIZATION NOTE(loop-call-button3.label): This is a brand name, request --# approval before you change it. --loop-call-button3.label = Hello --loop-call-button3.tooltiptext2 = Browse this page with a friend --loop-call-button3-error.tooltiptext = Error! --loop-call-button3-donotdisturb.tooltiptext = Do not disturb --loop-call-button3-screensharing.tooltiptext = You are sharing your screen --loop-call-button3-active.tooltiptext2 = You are sharing your tabs --loop-call-button3-participantswaiting.tooltiptext2 = Someone is waiting for you --# LOCALIZATION NOTE(loop-call-button3-pb.tooltiptext): Shown when the button is --# placed inside a Private Browsing window. %S is the value of loop-call-button3.label. --loop-call-button3-pb.tooltiptext = %S is not available in Private Browsing -- - social-share-button.label = Share This Page - social-share-button.tooltiptext = Share this page - -@@ -124,10 +111,5 @@ - devtools-webide-button2.label = WebIDE - devtools-webide-button2.tooltiptext = Open WebIDE (%S) - --# LOCALIZATION NOTE(pocket-button.label, pocket-button.tooltiptext): "Pocket" --# is a brand name. --pocket-button.label = Pocket --pocket-button.tooltiptext = Save to Pocket -- - e10s-button.label = New Non-e10s Window - e10s-button.tooltiptext = Open a new Non-e10s Window -diff -Naur firefox-45.0esr.bak/browser/locales/jar.mn firefox-45.0esr/browser/locales/jar.mn ---- firefox-45.0esr.bak/browser/locales/jar.mn 2016-03-13 -+++ firefox-45.0esr/browser/locales/jar.mn 2016-03-13 -@@ -24,10 +24,8 @@ - locale/browser/browser.dtd (%chrome/browser/browser.dtd) - locale/browser/baseMenuOverlay.dtd (%chrome/browser/baseMenuOverlay.dtd) - locale/browser/browser.properties (%chrome/browser/browser.properties) -- locale/browser/browser-pocket.properties (%chrome/browser/browser-pocket.properties) - locale/browser/customizableui/customizableWidgets.properties (%chrome/browser/customizableui/customizableWidgets.properties) - locale/browser/lightweightThemes.properties (%chrome/browser/lightweightThemes.properties) -- locale/browser/loop/loop.properties (%chrome/browser/loop/loop.properties) - locale/browser/newTab.dtd (%chrome/browser/newTab.dtd) - locale/browser/newTab.properties (%chrome/browser/newTab.properties) - locale/browser/pageInfo.dtd (%chrome/browser/pageInfo.dtd) -diff -Naur firefox-45.0esr.bak/browser/modules/BrowserUITelemetry.jsm firefox-45.0esr/browser/modules/BrowserUITelemetry.jsm ---- firefox-45.0esr.bak/browser/modules/BrowserUITelemetry.jsm 2016-03-13 -+++ firefox-45.0esr/browser/modules/BrowserUITelemetry.jsm 2016-03-13 -@@ -49,7 +49,6 @@ - "urlbar-container", - "search-container", - "bookmarks-menu-button", -- "pocket-button", - "downloads-button", - "home-button", - "social-share-button", -@@ -668,7 +667,7 @@ - "copyvideourl", "copyaudiourl", "saveimage", "shareimage", "sendimage", - "setDesktopBackground", "viewimageinfo", "viewimagedesc", "savevideo", - "sharevideo", "saveaudio", "video-saveimage", "sendvideo", "sendaudio", -- "ctp-play", "ctp-hide", "sharepage", "savepage", "pocket", "markpageMenu", -+ "ctp-play", "ctp-hide", "sharepage", "savepage", "markpageMenu", - "viewbgimage", "undo", "cut", "copy", "paste", "delete", "selectall", - "keywordfield", "searchselect", "shareselect", "frame", "showonlythisframe", - "openframeintab", "openframe", "reloadframe", "bookmarkframe", "saveframe", -diff -Naur firefox-45.0esr.bak/browser/modules/ReaderParent.jsm firefox-45.0esr/browser/modules/ReaderParent.jsm ---- firefox-45.0esr.bak/browser/modules/ReaderParent.jsm 2016-03-13 -+++ firefox-45.0esr/browser/modules/ReaderParent.jsm 2016-03-13 -@@ -25,11 +25,9 @@ - - MESSAGES: [ - "Reader:AddToList", -- "Reader:AddToPocket", - "Reader:ArticleGet", - "Reader:FaviconRequest", - "Reader:ListStatusRequest", -- "Reader:PocketEnabledGet", - "Reader:RemoveFromList", - "Reader:Share", - "Reader:SystemUIVisibility", -@@ -47,24 +45,6 @@ - - receiveMessage: function(message) { - switch (message.name) { -- case "Reader:AddToPocket": { -- let doc = message.target.ownerDocument; -- let pocketWidget = doc.getElementById("pocket-button"); -- let placement = CustomizableUI.getPlacementOfWidget("pocket-button"); -- if (placement) { -- if (placement.area == CustomizableUI.AREA_PANEL) { -- doc.defaultView.PanelUI.show().then(function() { -- // The DOM node might not exist yet if the panel wasn't opened before. -- pocketWidget = doc.getElementById("pocket-button"); -- pocketWidget.doCommand(); -- }); -- } else { -- pocketWidget.doCommand(); -- } -- } -- break; -- } -- - case "Reader:ArticleGet": - this._getArticle(message.data.url, message.target).then((article) => { - // Make sure the target browser is still alive before trying to send data back. -@@ -78,13 +58,6 @@ - }); - break; - -- case "Reader:PocketEnabledGet": { -- let pocketPlacement = CustomizableUI.getPlacementOfWidget("pocket-button"); -- let isPocketEnabled = pocketPlacement && pocketPlacement.area; -- message.target.messageManager.sendAsyncMessage("Reader:PocketEnabledData", { enabled: !!isPocketEnabled}); -- break; -- } -- - case "Reader:FaviconRequest": { - if (message.target.messageManager) { - let faviconUrl = PlacesUtils.promiseFaviconLinkUrl(message.data.url); -diff -Naur firefox-45.0esr.bak/browser/themes/linux/browser.css firefox-45.0esr/browser/themes/linux/browser.css ---- firefox-45.0esr.bak/browser/themes/linux/browser.css 2016-03-13 -+++ firefox-45.0esr/browser/themes/linux/browser.css 2016-03-13 -@@ -525,12 +525,6 @@ - list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); - } - --#panelMenu_pocket, --#menu_pocket, --#BMB_pocket { -- list-style-image: url("chrome://browser/content/pocket/panels/img/pocketmenuitem16.png"); --} -- - #menu_openDownloads { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 16px 16px 0px); -diff -Naur firefox-45.0esr.bak/browser/themes/osx/browser.css firefox-45.0esr/browser/themes/osx/browser.css ---- firefox-45.0esr.bak/browser/themes/osx/browser.css 2016-03-13 -+++ firefox-45.0esr/browser/themes/osx/browser.css 2016-03-13 -@@ -576,24 +576,6 @@ - } - } - --#panelMenu_pocket, --#menu_pocket, --#BMB_pocket { -- list-style-image: url("chrome://browser/content/pocket/panels/img/pocketmenuitem16.png"); --} -- --@media (min-resolution: 2dppx) { -- #panelMenu_pocket, -- #menu_pocket, -- #BMB_pocket { -- list-style-image: url("chrome://browser/content/pocket/panels/img/pocketmenuitem16@2x.png"); -- } -- -- #panelMenu_pocket > .toolbarbutton-icon { -- width: 16px; -- } --} -- - /* ----- PRIMARY TOOLBAR BUTTONS ----- */ - - :-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > .toolbarbutton-icon, -@@ -822,10 +804,6 @@ - -moz-image-region: rect(18px, 738px, 36px, 720px); - } - -- #pocket-button@toolbarButtonPressed@ { -- -moz-image-region: rect(18px, 774px, 36px, 756px); -- } -- - #new-tab-button@toolbarButtonPressed@ { - -moz-image-region: rect(18px, 360px, 36px, 342px); - } -@@ -985,10 +963,6 @@ - -moz-image-region: rect(36px, 1476px, 72px, 1440px); - } - -- #pocket-button@toolbarButtonPressed@ { -- -moz-image-region: rect(36px, 1548px, 72px, 1512px); -- } -- - #new-tab-button@toolbarButtonPressed@ { - -moz-image-region: rect(36px, 720px, 72px, 684px); - } -diff -Naur firefox-45.0esr.bak/browser/themes/shared/browser.inc firefox-45.0esr/browser/themes/shared/browser.inc ---- firefox-45.0esr.bak/browser/themes/shared/browser.inc 2016-03-13 -+++ firefox-45.0esr/browser/themes/shared/browser.inc 2016-03-13 -@@ -2,7 +2,7 @@ - - % Note that zoom-reset-button is a bit different since it doesn't use an image and thus has the image with display: none. - %define nestedButtons #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button --%define primaryToolbarButtons #back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, @nestedButtons@, #e10s-button, #panic-button, #webide-button, #pocket-button -+%define primaryToolbarButtons #back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, @nestedButtons@, #e10s-button, #panic-button, #webide-button - - %ifdef XP_MACOSX - % Prior to 10.7 there wasn't a native fullscreen button so we use #restore-button to exit fullscreen -diff -Naur firefox-45.0esr.bak/browser/themes/shared/menupanel.inc.css firefox-45.0esr/browser/themes/shared/menupanel.inc.css ---- firefox-45.0esr.bak/browser/themes/shared/menupanel.inc.css 2016-03-13 -+++ firefox-45.0esr/browser/themes/shared/menupanel.inc.css 2016-03-13 -@@ -163,15 +163,6 @@ - -moz-image-region: rect(0px, 960px, 32px, 928px); - } - -- #pocket-button[cui-areatype="menu-panel"], -- toolbarpaletteitem[place="palette"] > #pocket-button { -- -moz-image-region: rect(0px, 992px, 32px, 960px); -- } -- -- #pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { -- -moz-image-region: rect(32px, 992px, 64px, 960px); -- } -- - toolbaritem[sdkstylewidget="true"] > toolbarbutton { - -moz-image-region: rect(0, 832px, 32px, 800px); - } -@@ -310,15 +301,6 @@ - -moz-image-region: rect(0px, 1920px, 64px, 1856px); - } - -- #pocket-button[cui-areatype="menu-panel"], -- toolbarpaletteitem[place="palette"] > #pocket-button { -- -moz-image-region: rect(0px, 1984px, 64px, 1920px); -- } -- -- #pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { -- -moz-image-region: rect(64px, 1984px, 128px, 1920px); -- } -- - #new-tab-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #new-tab-button { - -moz-image-region: rect(0px, 1088px, 64px, 1024px); -diff -Naur firefox-45.0esr.bak/browser/themes/shared/toolbarbuttons.inc.css firefox-45.0esr/browser/themes/shared/toolbarbuttons.inc.css ---- firefox-45.0esr.bak/browser/themes/shared/toolbarbuttons.inc.css 2016-03-13 -+++ firefox-45.0esr/browser/themes/shared/toolbarbuttons.inc.css 2016-03-13 -@@ -171,18 +171,6 @@ - -moz-image-region: rect(0, 738px, 18px, 720px); - } - --#pocket-button[cui-areatype="toolbar"] { -- -moz-image-region: rect(0, 774px, 18px, 756px); --} -- --#pocket-button[cui-areatype="toolbar"][open] { --%ifdef XP_MACOSX -- -moz-image-region: rect(36px, 774px, 54px, 756px); --%else -- -moz-image-region: rect(18px, 774px, 36px, 756px); --%endif --} -- - %if defined(XP_WIN) || defined(XP_MACOSX) - @media (min-resolution: 1.1dppx) { - :-moz-any(@primaryToolbarButtons@), -@@ -350,16 +338,4 @@ - -moz-image-region: rect(0, 1476px, 36px, 1440px); - } - -- #pocket-button[cui-areatype="toolbar"] { -- -moz-image-region: rect(0, 1548px, 36px, 1512px); -- } -- -- #pocket-button[cui-areatype="toolbar"][open] { --%ifdef XP_MACOSX -- -moz-image-region: rect(72px, 1548px, 108px, 1512px); --%else -- -moz-image-region: rect(36px, 1548px, 72px, 1512px); --%endif -- } --} - %endif -diff -Naur firefox-45.0esr.bak/browser/themes/windows/browser.css firefox-45.0esr/browser/themes/windows/browser.css ---- firefox-45.0esr.bak/browser/themes/windows/browser.css 2016-03-13 -+++ firefox-45.0esr/browser/themes/windows/browser.css 2016-03-13 -@@ -2305,12 +2305,6 @@ - -moz-image-region: auto; - } - --#panelMenu_pocket, --#menu_pocket, --#BMB_pocket { -- list-style-image: url("chrome://browser/content/pocket/panels/img/pocketmenuitem16.png"); --} -- - /* ::::: Keyboard UI Panel ::::: */ - - .KUI-panel { -diff -Naur firefox-45.0esr.bak/toolkit/themes/shared/aboutReaderControls.css firefox-45.0esr/toolkit/themes/shared/aboutReaderControls.css ---- firefox-45.0esr.bak/toolkit/themes/shared/aboutReaderControls.css 2016-03-13 -+++ firefox-45.0esr/toolkit/themes/shared/aboutReaderControls.css 2016-03-13 -@@ -379,14 +379,6 @@ - background-image: url("chrome://global/skin/reader/RM-Plus-24x24.svg"); - } - --#pocket-button { -- background-image: url("chrome://global/skin/reader/pocket.svg#pocket-mark"); --} -- --#pocket-button:hover:active { -- background-image: url("chrome://global/skin/reader/pocket.svg#pocket-mark-added"); --} -- - @media print { - .toolbar { - display: none !important; diff --git a/firefox-45-disable-reader.patch b/firefox-45-disable-reader.patch deleted file mode 100644 index 9a3b42c07609..000000000000 --- a/firefox-45-disable-reader.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -Naur firefox-45.0esr.bak/browser/base/content/browser.js firefox-45.0esr/browser/base/content/browser.js ---- firefox-45.0esr.bak/browser/base/content/browser.js 2016-03-15 -+++ firefox-45.0esr/browser/base/content/browser.js 2016-03-15 -@@ -251,9 +251,6 @@ - XPCOMUtils.defineLazyModuleGetter(this, "ReaderMode", - "resource://gre/modules/ReaderMode.jsm"); - --XPCOMUtils.defineLazyModuleGetter(this, "ReaderParent", -- "resource:///modules/ReaderParent.jsm"); -- - XPCOMUtils.defineLazyModuleGetter(this, "LoginManagerParent", - "resource://gre/modules/LoginManagerParent.jsm"); - -@@ -4574,7 +4571,6 @@ - } - } - UpdateBackForwardCommands(gBrowser.webNavigation); -- ReaderParent.updateReaderButton(gBrowser.selectedBrowser); - - gGestureSupport.restoreRotationState(); - -diff -Naur firefox-45.0esr.bak/browser/base/content/browser-sets.inc firefox-45.0esr/browser/base/content/browser-sets.inc ---- firefox-45.0esr.bak/browser/base/content/browser-sets.inc 2016-03-15 -+++ firefox-45.0esr/browser/base/content/browser-sets.inc 2016-03-15 -@@ -42,7 +42,6 @@ - <command id="View:PageSource" oncommand="BrowserViewSource(window.gBrowser.selectedBrowser);" observes="canViewSource"/> - <command id="View:PageInfo" oncommand="BrowserPageInfo();"/> - <command id="View:FullScreen" oncommand="BrowserFullScreen();"/> -- <command id="View:ReaderView" oncommand="ReaderParent.toggleReaderMode(event);"/> - <command id="cmd_find" - oncommand="gFindBar.onFindCommand();" - observes="isImage"/> -diff -Naur firefox-45.0esr.bak/browser/base/content/browser.xul firefox-45.0esr/browser/base/content/browser.xul ---- firefox-45.0esr.bak/browser/base/content/browser.xul 2016-03-15 -+++ firefox-45.0esr/browser/base/content/browser.xul 2016-03-15 -@@ -731,10 +731,6 @@ - hidden="true" - tooltiptext="&pageReportIcon.tooltip;" - onclick="gPopupBlockerObserver.onReportButtonClick(event);"/> -- <image id="reader-mode-button" -- class="urlbar-icon" -- hidden="true" -- onclick="ReaderParent.buttonClick(event);"/> - </hbox> - <hbox id="userContext-icons"> - <label id="userContext-label"/> -diff -Naur firefox-45.0esr.bak/browser/components/nsBrowserGlue.js firefox-45.0esr/browser/components/nsBrowserGlue.js ---- firefox-45.0esr.bak/browser/components/nsBrowserGlue.js 2016-03-15 -+++ firefox-45.0esr/browser/components/nsBrowserGlue.js 2016-03-15 -@@ -177,9 +177,6 @@ - XPCOMUtils.defineLazyModuleGetter(this, "WebChannel", - "resource://gre/modules/WebChannel.jsm"); - --XPCOMUtils.defineLazyModuleGetter(this, "ReaderParent", -- "resource:///modules/ReaderParent.jsm"); -- - XPCOMUtils.defineLazyModuleGetter(this, "AddonWatcher", - "resource://gre/modules/AddonWatcher.jsm"); - -@@ -850,7 +847,6 @@ - ContentPrefServiceParent.init(); - - LoginManagerParent.init(); -- ReaderParent.init(); - - SelfSupportBackend.init(); - -diff -Naur firefox-45.0esr.bak/browser/components/uitour/UITour.jsm firefox-45.0esr/browser/components/uitour/UITour.jsm ---- firefox-45.0esr.bak/browser/components/uitour/UITour.jsm 2016-03-15 -+++ firefox-45.0esr/browser/components/uitour/UITour.jsm 2016-03-15 -@@ -34,8 +34,6 @@ - "resource://gre/modules/PrivateBrowsingUtils.jsm"); - XPCOMUtils.defineLazyModuleGetter(this, "ReaderMode", - "resource://gre/modules/ReaderMode.jsm"); --XPCOMUtils.defineLazyModuleGetter(this, "ReaderParent", -- "resource:///modules/ReaderParent.jsm"); - - // See LOG_LEVELS in Console.jsm. Common examples: "All", "Info", "Warn", & "Error". - const PREF_LOG_LEVEL = "browser.uitour.loglevel"; -@@ -722,15 +720,10 @@ - } - - case "forceShowReaderIcon": { -- ReaderParent.forceShowReaderIcon(browser); - break; - } - - case "toggleReaderMode": { -- let targetPromise = this.getTarget(window, "readerMode-urlBar"); -- targetPromise.then(target => { -- ReaderParent.toggleReaderMode({target: target.node}); -- }); - break; - } - } -@@ -1911,7 +1904,6 @@ - } - - if (aFeature == "readinglist") { -- ReaderParent.showReaderModeInfoPanel(browser); - } else { - log.error("startSubTour: Unknown feature option specified"); - return; -diff -Naur firefox-45.0esr.bak/browser/modules/moz.build firefox-45.0esr/browser/modules/moz.build ---- firefox-45.0esr.bak/browser/modules/moz.build 2016-03-15 -+++ firefox-45.0esr/browser/modules/moz.build 2016-03-15 -@@ -33,7 +33,6 @@ - 'offlineAppCache.jsm', - 'PanelFrame.jsm', - 'PluginContent.jsm', -- 'ReaderParent.jsm', - 'RecentWindow.jsm', - 'RemotePrompt.jsm', - 'SelfSupportBackend.jsm', diff --git a/firefox-45-disable-telemetry.patch b/firefox-45-disable-telemetry.patch deleted file mode 100644 index b988fe004633..000000000000 --- a/firefox-45-disable-telemetry.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- firefox-45.0esr.bak/browser/confvars.sh 2016-03-13 -+++ firefox-45.0esr/browser/confvars.sh 2016-03-13 -@@ -30,8 +30,8 @@ - MOZ_SAFE_BROWSING=1 - MOZ_SERVICES_COMMON=1 - MOZ_SERVICES_CRYPTO=1 --MOZ_SERVICES_HEALTHREPORT=1 --MOZ_SERVICES_METRICS=1 -+MOZ_SERVICES_HEALTHREPORT=0 -+MOZ_SERVICES_METRICS=0 - MOZ_SERVICES_SYNC=1 - MOZ_SERVICES_CLOUDSYNC=1 - MOZ_APP_VERSION=$FIREFOX_VERSION -@@ -70,3 +70,10 @@ - - # Include the DevTools client, not just the server (which is the default) - MOZ_DEVTOOLS=all -+ -+# Reduce data sharing with Mozilla -+MOZ_SOCIAL=0 -+MOZ_DATA_REPORTING=0 -+MOZ_TELEMETRY_REPORTING=0 -+MOZ_CRASHREPORTER=0 -+ diff --git a/firefox-45-prefs.patch b/firefox-45-prefs.patch deleted file mode 100644 index c7f1ab755f53..000000000000 --- a/firefox-45-prefs.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff -Naur firefox-45.0esr.bak/browser/app/profile/firefox.js firefox-45.0esr/browser/app/profile/firefox.js ---- firefox-45.0esr.bak/browser/app/profile/firefox.js 2016-03-13 -+++ firefox-45.0esr/browser/app/profile/firefox.js 2016-03-13 -@@ -230,7 +230,7 @@ - #endif - - // At startup, check if we're the default browser and prompt user if not. --pref("browser.shell.checkDefaultBrowser", true); -+pref("browser.shell.checkDefaultBrowser", false); - pref("browser.shell.shortcutFavicons",true); - pref("browser.shell.mostRecentDateSetAsDefault", ""); - pref("browser.shell.skipDefaultBrowserCheck", true); -@@ -238,7 +238,7 @@ - - // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session - // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore --pref("browser.startup.page", 1); -+pref("browser.startup.page", 0); - pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); - - pref("browser.slowStartup.notificationDisabled", false); -@@ -312,7 +312,7 @@ - pref("browser.urlbar.suggest.bookmark", true); - pref("browser.urlbar.suggest.openpage", true); - pref("browser.urlbar.suggest.searches", false); --pref("browser.urlbar.userMadeSearchSuggestionsChoice", false); -+pref("browser.urlbar.userMadeSearchSuggestionsChoice", true); - - // Limit the number of characters sent to the current search engine to fetch - // suggestions. -@@ -346,7 +346,7 @@ - pref("browser.download.animateNotifications", true); - - // This records whether or not the panel has been shown at least once. --pref("browser.download.panel.shown", false); -+pref("browser.download.panel.shown", true); - - #ifndef XP_MACOSX - pref("browser.helperApps.deleteTempFileOnExit", true); -@@ -426,7 +426,7 @@ - // Tabbed browser - pref("browser.tabs.closeWindowWithLastTab", true); - pref("browser.tabs.insertRelatedAfterCurrent", true); --pref("browser.tabs.warnOnClose", true); -+pref("browser.tabs.warnOnClose", false); - pref("browser.tabs.warnOnCloseOtherTabs", true); - pref("browser.tabs.warnOnOpen", true); - pref("browser.tabs.maxOpenBeforeWarn", 15); -@@ -1335,7 +1335,7 @@ - pref("browser.newtab.preload", true); - - // Remembers if the about:newtab intro has been shown --pref("browser.newtabpage.introShown", false); -+pref("browser.newtabpage.introShown", true); - - // Toggles the content of 'about:newtab'. Shows the grid when enabled. - pref("browser.newtabpage.enabled", true); -diff -Naur firefox-45.0esr.bak/browser/branding/official/pref/firefox-branding.js firefox-45.0esr/browser/branding/official/pref/firefox-branding.js ---- firefox-45.0esr.bak/browser/branding/official/pref/firefox-branding.js 2016-03-13 -+++ firefox-45.0esr/browser/branding/official/pref/firefox-branding.js 2016-03-13 -@@ -3,8 +3,7 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - - pref("startup.homepage_override_url", ""); --pref("startup.homepage_welcome_url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/firstrun/"); --pref("startup.homepage_welcome_url.additional", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/firstrun/learnmore/"); -+pref("startup.homepage_welcome_url", "about:blank"); - // Interval: Time between checks for a new version (in seconds) - pref("app.update.interval", 43200); // 12 hours - // The time interval between the downloading of mar file chunks in the -diff -Naur firefox-45.0esr.bak/build/application.ini firefox-45.0esr/build/application.ini ---- firefox-45.0esr.bak/build/application.ini 2016-03-13 -+++ firefox-45.0esr/build/application.ini 2016-03-13 -@@ -41,7 +41,7 @@ - - [XRE] - #ifdef MOZ_PROFILE_MIGRATOR --EnableProfileMigrator=1 -+EnableProfileMigrator=0 - #endif - - #if MOZ_CRASHREPORTER -diff -Naur firefox-45.0esr.bak/modules/libpref/init/all.js firefox-45.0esr/modules/libpref/init/all.js ---- firefox-45.0esr.bak/modules/libpref/init/all.js 2016-03-13 -+++ firefox-45.0esr/modules/libpref/init/all.js 2016-03-13 -@@ -29,7 +29,7 @@ - - pref("general.config.obscure_value", 13); // for MCD .cfg files - --pref("general.warnOnAboutConfig", true); -+pref("general.warnOnAboutConfig", false); - - // maximum number of dated backups to keep at any time - pref("browser.bookmarks.max_backups", 5); -@@ -1117,7 +1117,7 @@ - // send "do not track" HTTP header, disabled by default - pref("privacy.donottrackheader.enabled", false); - // Enforce tracking protection in all modes --pref("privacy.trackingprotection.enabled", false); -+pref("privacy.trackingprotection.enabled", true); - // Enforce tracking protection in Private Browsing mode - pref("privacy.trackingprotection.pbmode.enabled", true); - -@@ -3644,7 +3644,7 @@ - - // Middle-mouse handling - pref("middlemouse.paste", true); --pref("middlemouse.contentLoadURL", true); -+pref("middlemouse.contentLoadURL", false); - pref("middlemouse.openNewWindow", true); - pref("middlemouse.scrollbarPosition", true); - -@@ -3710,7 +3710,7 @@ - - // Middle-mouse handling - pref("middlemouse.paste", true); --pref("middlemouse.contentLoadURL", true); -+pref("middlemouse.contentLoadURL", false); - pref("middlemouse.openNewWindow", true); - pref("middlemouse.scrollbarPosition", true); - -@@ -4105,7 +4105,7 @@ - - // Satchel (Form Manager) prefs - pref("browser.formfill.debug", false); --pref("browser.formfill.enable", true); -+pref("browser.formfill.enable", false); - pref("browser.formfill.expire_days", 180); - pref("browser.formfill.saveHttpsForms", true); - pref("browser.formfill.agedWeight", 2); -diff -Naur firefox-45.0esr.bak/services/healthreport/healthreport-prefs.js firefox-45.0esr/services/healthreport/healthreport-prefs.js ---- firefox-45.0esr.bak/services/healthreport/healthreport-prefs.js 2016-03-13 -+++ firefox-45.0esr/services/healthreport/healthreport-prefs.js 2016-03-13 -@@ -18,9 +18,9 @@ - pref("datareporting.healthreport.pendingDeleteRemoteData", false); - - // Health Report is enabled by default on all channels. --pref("datareporting.healthreport.uploadEnabled", true); -+pref("datareporting.healthreport.uploadEnabled", false); - --pref("datareporting.healthreport.service.enabled", true); -+pref("datareporting.healthreport.service.enabled", false); - pref("datareporting.healthreport.service.loadDelayMsec", 10000); - pref("datareporting.healthreport.service.loadDelayFirstRunMsec", 60000); - diff --git a/firefox-45-disable-data-sharing-infobar.patch b/firefox-52-disable-data-sharing-infobar.patch index 7857f81f237d..7857f81f237d 100644 --- a/firefox-45-disable-data-sharing-infobar.patch +++ b/firefox-52-disable-data-sharing-infobar.patch diff --git a/firefox-45-disable-location.services.mozilla.com.patch b/firefox-52-disable-location.services.mozilla.com.patch index 42f25557ec75..42f25557ec75 100644 --- a/firefox-45-disable-location.services.mozilla.com.patch +++ b/firefox-52-disable-location.services.mozilla.com.patch diff --git a/firefox-52-disable-pocket-leftovers.patch b/firefox-52-disable-pocket-leftovers.patch new file mode 100644 index 000000000000..a6a0172dd6b3 --- /dev/null +++ b/firefox-52-disable-pocket-leftovers.patch @@ -0,0 +1,82 @@ +--- firefox-52.0esr.bak/browser/app/profile/firefox.js 2017-03-09 ++++ firefox-52.0esr/browser/app/profile/firefox.js 2017-03-09 +@@ -1525,8 +1525,6 @@ + // Enable browser frames for use on desktop. Only exposed to chrome callers. + pref("dom.mozBrowserFramesEnabled", true); + +-pref("extensions.pocket.enabled", true); +- + pref("signon.schemeUpgrades", true); + + // "Simplify Page" feature in Print Preview. This feature is disabled by default +--- firefox-52.0esr.bak/browser/components/uitour/UITour.jsm 2017-03-09 ++++ firefox-52.0esr/browser/components/uitour/UITour.jsm 2017-03-09 +@@ -154,11 +154,6 @@ + query: "#panic-button", + widgetName: "panic-button", + }], +- ["pocket", { +- allowAdd: true, +- query: "#pocket-button", +- widgetName: "pocket-button", +- }], + ["privateWindow", {query: "#privatebrowsing-button"}], + ["quit", {query: "#PanelUI-quit"}], + ["readerMode-urlBar", {query: "#reader-mode-button"}], +@@ -1688,46 +1683,6 @@ + popup.addEventListener("popupshown", onPopupShown); + } + aWindow.document.getElementById("identity-box").click(); +- } else if (aMenuName == "pocket") { +- this.getTarget(aWindow, "pocket").then(Task.async(function* onPocketTarget(target) { +- let widgetGroupWrapper = CustomizableUI.getWidget(target.widgetName); +- if (widgetGroupWrapper.type != "view" || !widgetGroupWrapper.viewId) { +- log.error("Can't open the pocket menu without a view"); +- return; +- } +- let placement = CustomizableUI.getPlacementOfWidget(target.widgetName); +- if (!placement || !placement.area) { +- log.error("Can't open the pocket menu without a placement"); +- return; +- } +- +- if (placement.area == CustomizableUI.AREA_PANEL) { +- // Open the appMenu and wait for it if it's not already opened or showing a subview. +- yield new Promise((resolve, reject) => { +- if (aWindow.PanelUI.panel.state != "closed") { +- if (aWindow.PanelUI.multiView.showingSubView) { +- reject("A subview is already showing"); +- return; +- } +- +- resolve(); +- return; +- } +- +- aWindow.PanelUI.panel.addEventListener("popupshown", function onShown() { +- aWindow.PanelUI.panel.removeEventListener("popupshown", onShown); +- resolve(); +- }); +- +- aWindow.PanelUI.show(); +- }); +- } +- +- let widgetWrapper = widgetGroupWrapper.forWindow(aWindow); +- aWindow.PanelUI.showSubView(widgetGroupWrapper.viewId, +- widgetWrapper.anchor, +- placement.area); +- })).catch(log.error); + } + }, + +--- firefox-52.0esr.bak/browser/extensions/moz.build 2017-03-09 ++++ firefox-52.0esr/browser/extensions/moz.build 2017-03-09 +@@ -8,7 +8,6 @@ + 'aushelper', + 'e10srollout', + 'pdfjs', +- 'pocket', + 'webcompat', + ] + diff --git a/firefox-52-disable-reader.patch b/firefox-52-disable-reader.patch new file mode 100644 index 000000000000..5fb85f37950a --- /dev/null +++ b/firefox-52-disable-reader.patch @@ -0,0 +1,104 @@ +--- firefox-52.0esr.bak/browser/base/content/browser.js 2017-03-09 ++++ firefox-52.0esr/browser/base/content/browser.js 2017-03-09 +@@ -38,7 +38,6 @@ + ["ProcessHangMonitor", "resource:///modules/ProcessHangMonitor.jsm"], + ["PromiseUtils", "resource://gre/modules/PromiseUtils.jsm"], + ["ReaderMode", "resource://gre/modules/ReaderMode.jsm"], +- ["ReaderParent", "resource:///modules/ReaderParent.jsm"], + ["RecentWindow", "resource:///modules/RecentWindow.jsm"], + ["SessionStore", "resource:///modules/sessionstore/SessionStore.jsm"], + ["ShortcutUtils", "resource://gre/modules/ShortcutUtils.jsm"], +@@ -4574,7 +4573,6 @@ + } + } + UpdateBackForwardCommands(gBrowser.webNavigation); +- ReaderParent.updateReaderButton(gBrowser.selectedBrowser); + + gGestureSupport.restoreRotationState(); + +--- firefox-52.0esr.bak/browser/base/content/browser-sets.inc 2017-03-09 ++++ firefox-52.0esr/browser/base/content/browser-sets.inc 2017-03-09 +@@ -43,7 +43,6 @@ + <command id="View:PageSource" oncommand="BrowserViewSource(window.gBrowser.selectedBrowser);" observes="canViewSource"/> + <command id="View:PageInfo" oncommand="BrowserPageInfo();"/> + <command id="View:FullScreen" oncommand="BrowserFullScreen();"/> +- <command id="View:ReaderView" oncommand="ReaderParent.toggleReaderMode(event);"/> + <command id="cmd_find" + oncommand="gFindBar.onFindCommand();" + observes="isImage"/> +--- firefox-52.0esr.bak/browser/base/content/browser.xul 2017-03-09 ++++ firefox-52.0esr/browser/base/content/browser.xul 2017-03-09 +@@ -766,10 +766,6 @@ + hidden="true" + tooltiptext="&pageReportIcon.tooltip;" + onmousedown="gPopupBlockerObserver.onReportButtonMousedown(event);"/> +- <image id="reader-mode-button" +- class="urlbar-icon" +- hidden="true" +- onclick="ReaderParent.buttonClick(event);"/> + <toolbarbutton id="urlbar-zoom-button" + onclick="FullZoom.reset();" + tooltiptext="&urlbar.zoomReset.tooltip;" +--- firefox-52.0esr.bak/browser/components/nsBrowserGlue.js 2017-03-09 ++++ firefox-52.0esr/browser/components/nsBrowserGlue.js 2017-03-09 +@@ -53,7 +53,6 @@ + ["PluralForm", "resource://gre/modules/PluralForm.jsm"], + ["PrivateBrowsingUtils", "resource://gre/modules/PrivateBrowsingUtils.jsm"], + ["ProcessHangMonitor", "resource:///modules/ProcessHangMonitor.jsm"], +- ["ReaderParent", "resource:///modules/ReaderParent.jsm"], + ["RecentWindow", "resource:///modules/RecentWindow.jsm"], + ["RemotePrompt", "resource:///modules/RemotePrompt.jsm"], + ["SelfSupportBackend", "resource:///modules/SelfSupportBackend.jsm"], +@@ -670,7 +669,6 @@ + ContentPrefServiceParent.init(); + + LoginManagerParent.init(); +- ReaderParent.init(); + URLBarZoom.init(); + + SelfSupportBackend.init(); +--- firefox-52.0esr.bak/browser/components/uitour/UITour.jsm 2017-03-09 ++++ firefox-52.0esr/browser/components/uitour/UITour.jsm 2017-03-09 +@@ -34,8 +34,6 @@ + "resource://gre/modules/PrivateBrowsingUtils.jsm"); + XPCOMUtils.defineLazyModuleGetter(this, "ReaderMode", + "resource://gre/modules/ReaderMode.jsm"); +-XPCOMUtils.defineLazyModuleGetter(this, "ReaderParent", +- "resource:///modules/ReaderParent.jsm"); + + // See LOG_LEVELS in Console.jsm. Common examples: "All", "Info", "Warn", & "Error". + const PREF_LOG_LEVEL = "browser.uitour.loglevel"; +@@ -661,15 +654,10 @@ + } + + case "forceShowReaderIcon": { +- ReaderParent.forceShowReaderIcon(browser); + break; + } + + case "toggleReaderMode": { +- let targetPromise = this.getTarget(window, "readerMode-urlBar"); +- targetPromise.then(target => { +- ReaderParent.toggleReaderMode({target: target.node}); +- }); + break; + } + +@@ -1948,7 +1896,6 @@ + } + + if (aFeature == "readinglist") { +- ReaderParent.showReaderModeInfoPanel(browser); + } else { + log.error("startSubTour: Unknown feature option specified"); + return; +--- firefox-52.0esr.bak/browser/modules/moz.build 2017-03-09 ++++ firefox-52.0esr/browser/modules/moz.build 2017-03-09 +@@ -35,7 +35,6 @@ + 'PermissionUI.jsm', + 'PluginContent.jsm', + 'ProcessHangMonitor.jsm', +- 'ReaderParent.jsm', + 'RecentWindow.jsm', + 'RemotePrompt.jsm', + 'Sanitizer.jsm', diff --git a/firefox-45-disable-sponsored-tiles.patch b/firefox-52-disable-sponsored-tiles.patch index caf5aa1814e8..91214c648bd9 100644 --- a/firefox-45-disable-sponsored-tiles.patch +++ b/firefox-52-disable-sponsored-tiles.patch @@ -1,6 +1,6 @@ ---- firefox-45.0esr.bak/browser/modules/DirectoryLinksProvider.jsm 2016-03-13 -+++ firefox-45.0esr/browser/modules/DirectoryLinksProvider.jsm 2016-03-13 -@@ -58,16 +58,16 @@ +--- firefox-52.0esr.bak/browser/modules/DirectoryLinksProvider.jsm 2017-03-09 ++++ firefox-52.0esr/browser/modules/DirectoryLinksProvider.jsm 2017-03-09 +@@ -50,16 +50,16 @@ const DIRECTORY_LINKS_TYPE = "application/json"; // The preference that tells whether to match the OS locale @@ -21,7 +21,7 @@ // The preference that tells if newtab is enhanced const PREF_NEWTAB_ENHANCED = "browser.newtabpage.enhanced"; -@@ -200,30 +200,6 @@ +@@ -189,30 +189,6 @@ * @return the selected locale or "en-US" if none is selected */ get locale() { @@ -52,7 +52,7 @@ return "en-US"; }, -@@ -294,13 +270,6 @@ +@@ -283,13 +259,6 @@ }, _fetchAndCacheLinks: function DirectoryLinksProvider_fetchAndCacheLinks(uri) { @@ -66,7 +66,7 @@ }, /** -@@ -309,33 +278,6 @@ +@@ -298,33 +267,6 @@ * @return promise resolved to json string, "{}" returned if status != 200 */ _downloadJsonData: function DirectoryLinksProvider__downloadJsonData(uri) { @@ -100,7 +100,7 @@ }, /** -@@ -343,30 +285,6 @@ +@@ -332,30 +274,6 @@ * @return promise resolved immediately if no download needed, or upon completion */ _fetchAndCacheLinksIfNecessary: function DirectoryLinksProvider_fetchAndCacheLinksIfNecessary(forceDownload=false) { @@ -131,52 +131,10 @@ }, /** -@@ -574,40 +492,6 @@ - } - catch (ex) {} - -- // Only send pings when enhancing tiles with an endpoint and valid action -- let invalidAction = PING_ACTIONS.indexOf(action) == -1; -- if (!newtabEnhanced || pingEndPoint == "" || invalidAction) { -- return Promise.resolve(); -- } -- -- let actionIndex; -- let data = { -- locale: this.locale, -- tiles: sites.reduce((tiles, site, pos) => { -- // Only add data for non-empty tiles -- if (site) { -- // Remember which tiles data triggered the action -- let {link} = site; -- let tilesIndex = tiles.length; -- if (triggeringSiteIndex == pos) { -- actionIndex = tilesIndex; -- } -- -- // Make the payload in a way so keys can be excluded when stringified -- let id = link.directoryId; -- tiles.push({ -- id: id || site.enhancedId, -- pin: site.isPinned() ? 1 : undefined, -- pos: pos != tilesIndex ? pos : undefined, -- past_impressions: pos == triggeringSiteIndex ? pastImpressions : undefined, -- score: Math.round(link.frecency / PING_SCORE_DIVISOR) || undefined, -- url: site.enhancedId && "", -- }); -- } -- return tiles; -- }, []), -- }; -- - // Provide a direct index to the tile triggering the action - if (actionIndex !== undefined) { - data[action] = actionIndex; -@@ -1021,17 +905,6 @@ - * @return a promise resolved when lookup Set for sites is built +@@ -962,16 +880,6 @@ */ _loadInadjacentSites: function DirectoryLinksProvider_loadInadjacentSites() { -- return this._downloadJsonData(this._inadjacentSitesUrl).then(jsonString => { + return this._downloadJsonData(this._inadjacentSitesUrl).then(jsonString => { - let jsonObject = {}; - try { - jsonObject = JSON.parse(jsonString); diff --git a/firefox-52-disable-telemetry.patch b/firefox-52-disable-telemetry.patch new file mode 100644 index 000000000000..bcf27226dc25 --- /dev/null +++ b/firefox-52-disable-telemetry.patch @@ -0,0 +1,13 @@ +--- firefox-52.0esr.bak/browser/confvars.sh 2017-03-09 09:11:36.643104656 +0100 ++++ firefox-52.0esr/browser/confvars.sh 2017-03-09 11:13:13.798231732 +0100 +@@ -62,3 +62,10 @@ + + # Include the DevTools client, not just the server (which is the default) + MOZ_DEVTOOLS=all ++ ++# Reduce data sharing with Mozilla ++MOZ_DATA_REPORTING=0 ++MOZ_TELEMETRY_REPORTING=0 ++MOZ_CRASHREPORTER=0 ++MOZ_SERVICES_HEALTHREPORT=0 ++ diff --git a/firefox-52-prefs.patch b/firefox-52-prefs.patch new file mode 100644 index 000000000000..3152bce31f52 --- /dev/null +++ b/firefox-52-prefs.patch @@ -0,0 +1,260 @@ +--- firefox-52.0esr.bak/browser/app/profile/firefox.js 2017-03-09 ++++ firefox-52.0esr/browser/app/profile/firefox.js 2017-03-09 +@@ -206,7 +206,7 @@ + #endif + + // At startup, check if we're the default browser and prompt user if not. +-pref("browser.shell.checkDefaultBrowser", true); ++pref("browser.shell.checkDefaultBrowser", false); + pref("browser.shell.shortcutFavicons",true); + pref("browser.shell.mostRecentDateSetAsDefault", ""); + #ifdef RELEASE_OR_BETA +@@ -220,7 +220,7 @@ + + // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session + // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore +-pref("browser.startup.page", 1); ++pref("browser.startup.page", 0); + pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); + // Whether we should skip the homepage when opening the first-run page + pref("browser.startup.firstrunSkipsHomepage", false); +@@ -294,7 +294,7 @@ + pref("browser.urlbar.suggest.bookmark", true); + pref("browser.urlbar.suggest.openpage", true); + pref("browser.urlbar.suggest.searches", false); +-pref("browser.urlbar.userMadeSearchSuggestionsChoice", false); ++pref("browser.urlbar.userMadeSearchSuggestionsChoice", true); + // 4 here means the suggestion notification will be automatically + // hidden the 4th day, so it will actually be shown on 3 different days. + pref("browser.urlbar.daysBeforeHidingSuggestionsPrompt", 4); +@@ -344,7 +344,7 @@ + pref("browser.download.animateNotifications", true); + + // This records whether or not the panel has been shown at least once. +-pref("browser.download.panel.shown", false); ++pref("browser.download.panel.shown", true); + + #ifndef XP_MACOSX + pref("browser.helperApps.deleteTempFileOnExit", true); +@@ -419,7 +419,7 @@ + // Tabbed browser + pref("browser.tabs.closeWindowWithLastTab", true); + pref("browser.tabs.insertRelatedAfterCurrent", true); +-pref("browser.tabs.warnOnClose", true); ++pref("browser.tabs.warnOnClose", false); + pref("browser.tabs.warnOnCloseOtherTabs", true); + pref("browser.tabs.warnOnOpen", true); + pref("browser.tabs.maxOpenBeforeWarn", 15); +@@ -596,7 +596,7 @@ + pref("browser.xul.error_pages.expert_bad_cert", false); + + // Enable captive portal detection. +-pref("network.captive-portal-service.enabled", true); ++pref("network.captive-portal-service.enabled", false); + + // If true, network link events will change the value of navigator.onLine + pref("network.manage-offline-status", true); +@@ -1155,7 +1155,7 @@ + // Remembers if the about:newtab intro has been shown + // NOTE: This preference is unused but was not removed in case + // this information will be valuable in the future. +-pref("browser.newtabpage.introShown", false); ++pref("browser.newtabpage.introShown", true); + + // Toggles the content of 'about:newtab'. Shows the grid when enabled. + pref("browser.newtabpage.enabled", true); +--- firefox-52.0esr.bak/browser/branding/official/pref/firefox-branding.js 2017-03-09 ++++ firefox-52.0esr/browser/branding/official/pref/firefox-branding.js 2017-03-09 +@@ -3,8 +3,7 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + + pref("startup.homepage_override_url", ""); +-pref("startup.homepage_welcome_url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/firstrun/"); +-pref("startup.homepage_welcome_url.additional", ""); ++pref("startup.homepage_welcome_url", "about:blank"); + // Interval: Time between checks for a new version (in seconds) + pref("app.update.interval", 43200); // 12 hours + // The time interval between the downloading of mar file chunks in the +--- firefox-52.0esr.bak/build/application.ini 2017-03-09 ++++ firefox-52.0esr/build/application.ini 2017-03-09 +@@ -43,7 +43,7 @@ + + [XRE] + #ifdef MOZ_PROFILE_MIGRATOR +-EnableProfileMigrator=1 ++EnableProfileMigrator=0 + #endif + + #if MOZ_CRASHREPORTER +--- firefox-52.0esr.bak/toolkit/components/telemetry/healthreport-prefs.js 2017-03-09 ++++ firefox-52.0esr/toolkit/components/telemetry/healthreport-prefs.js 2017-03-09 +@@ -5,6 +5,6 @@ + pref("datareporting.healthreport.infoURL", "https://www.mozilla.org/legal/privacy/firefox.html#health-report"); + + // Health Report is enabled by default on all channels. +-pref("datareporting.healthreport.uploadEnabled", true); ++pref("datareporting.healthreport.uploadEnabled", false); + + pref("datareporting.healthreport.about.reportUrl", "https://fhr.cdn.mozilla.net/%LOCALE%/v4/"); +--- firefox-52.0esr.bak/modules/libpref/init/all.js 2017-03-09 ++++ firefox-52.0esr/modules/libpref/init/all.js 2017-03-09 +@@ -29,7 +29,7 @@ + + pref("general.config.obscure_value", 13); // for MCD .cfg files + +-pref("general.warnOnAboutConfig", true); ++pref("general.warnOnAboutConfig", false); + + // maximum number of dated backups to keep at any time + pref("browser.bookmarks.max_backups", 5); +@@ -1527,7 +1527,7 @@ + + // The maximum number of current global half open sockets allowable + // when starting a new speculative connection. +-pref("network.http.speculative-parallel-limit", 6); ++pref("network.http.speculative-parallel-limit", 0); + + // Whether or not to block requests for non head js/css items (e.g. media) + // while those elements load. +@@ -1863,7 +1863,7 @@ + pref("network.dir.format", 2); + + // enables the prefetch service (i.e., prefetching of <link rel="next"> URLs). +-pref("network.prefetch-next", true); ++pref("network.prefetch-next", false); + + // enables the predictive service + pref("network.predictor.enabled", true); +@@ -2183,7 +2183,7 @@ + pref("services.settings.server", "https://firefox.settings.services.mozilla.com/v1"); + + // Blocklist preferences +-pref("extensions.blocklist.enabled", true); ++pref("extensions.blocklist.enabled", false); + // OneCRL freshness checking depends on this value, so if you change it, + // please also update security.onecrl.maximum_staleness_in_seconds. + pref("extensions.blocklist.interval", 86400); +@@ -3916,7 +3916,7 @@ + + // Middle-mouse handling + pref("middlemouse.paste", true); +-pref("middlemouse.contentLoadURL", true); ++pref("middlemouse.contentLoadURL", false); + pref("middlemouse.openNewWindow", true); + pref("middlemouse.scrollbarPosition", true); + +@@ -3979,7 +3979,7 @@ + + // Middle-mouse handling + pref("middlemouse.paste", true); +-pref("middlemouse.contentLoadURL", true); ++pref("middlemouse.contentLoadURL", false); + pref("middlemouse.openNewWindow", true); + pref("middlemouse.scrollbarPosition", true); + +@@ -4375,7 +4375,7 @@ + + // Satchel (Form Manager) prefs + pref("browser.formfill.debug", false); +-pref("browser.formfill.enable", true); ++pref("browser.formfill.enable", false); + pref("browser.formfill.expire_days", 180); + pref("browser.formfill.saveHttpsForms", true); + pref("browser.formfill.agedWeight", 2); +@@ -5065,18 +5065,18 @@ + pref("dom.mapped_arraybuffer.enabled", true); + + // The tables used for Safebrowsing phishing and malware checks. +-pref("urlclassifier.malwareTable", "goog-malware-shavar,goog-unwanted-shavar,test-malware-simple,test-unwanted-simple"); ++pref("urlclassifier.malwareTable", ""); + + #ifdef MOZILLA_OFFICIAL + // In the official build, we are allowed to use google's private + // phishing list "goog-phish-shavar". See Bug 1288840. +-pref("urlclassifier.phishTable", "goog-phish-shavar,test-phish-simple"); ++pref("urlclassifier.phishTable", ""); + #else +-pref("urlclassifier.phishTable", "googpub-phish-shavar,test-phish-simple"); ++pref("urlclassifier.phishTable", ""); + #endif + + // Tables for application reputation. +-pref("urlclassifier.downloadBlockTable", "goog-badbinurl-shavar"); ++pref("urlclassifier.downloadBlockTable", ""); + + #ifdef XP_WIN + // Only download the whitelist on Windows, since the whitelist is +@@ -5110,48 +5110,48 @@ + pref("urlclassifier.alternate_error_page", "blocked"); + + // Enable phishing protection +-pref("browser.safebrowsing.phishing.enabled", true); ++pref("browser.safebrowsing.phishing.enabled", false); + + // Enable malware protection +-pref("browser.safebrowsing.malware.enabled", true); ++pref("browser.safebrowsing.malware.enabled", false); + +-pref("browser.safebrowsing.downloads.enabled", true); +-pref("browser.safebrowsing.downloads.remote.enabled", true); ++pref("browser.safebrowsing.downloads.enabled", false); ++pref("browser.safebrowsing.downloads.remote.enabled", false); + pref("browser.safebrowsing.downloads.remote.timeout_ms", 10000); +-pref("browser.safebrowsing.downloads.remote.url", "https://sb-ssl.google.com/safebrowsing/clientreport/download?key=%GOOGLE_API_KEY%"); +-pref("browser.safebrowsing.downloads.remote.block_dangerous", true); +-pref("browser.safebrowsing.downloads.remote.block_dangerous_host", true); +-pref("browser.safebrowsing.downloads.remote.block_potentially_unwanted", true); +-pref("browser.safebrowsing.downloads.remote.block_uncommon", true); ++pref("browser.safebrowsing.downloads.remote.url", ""); ++pref("browser.safebrowsing.downloads.remote.block_dangerous", false); ++pref("browser.safebrowsing.downloads.remote.block_dangerous_host", false); ++pref("browser.safebrowsing.downloads.remote.block_potentially_unwanted", false); ++pref("browser.safebrowsing.downloads.remote.block_uncommon", false); + pref("browser.safebrowsing.debug", false); + + // The protocol version we communicate with google server. + pref("browser.safebrowsing.provider.google.pver", "2.2"); +-pref("browser.safebrowsing.provider.google.lists", "goog-badbinurl-shavar,goog-downloadwhite-digest256,goog-phish-shavar,googpub-phish-shavar,goog-malware-shavar,goog-unwanted-shavar"); +-pref("browser.safebrowsing.provider.google.updateURL", "https://safebrowsing.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2&key=%GOOGLE_API_KEY%"); +-pref("browser.safebrowsing.provider.google.gethashURL", "https://safebrowsing.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2"); +-pref("browser.safebrowsing.provider.google.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site="); ++pref("browser.safebrowsing.provider.google.lists", ""); ++pref("browser.safebrowsing.provider.google.updateURL", ""); ++pref("browser.safebrowsing.provider.google.gethashURL", ""); ++pref("browser.safebrowsing.provider.google.reportURL", ""); + + // Prefs for v4. + pref("browser.safebrowsing.provider.google4.pver", "4"); +-pref("browser.safebrowsing.provider.google4.lists", "goog-phish-proto,googpub-phish-proto,goog-malware-proto,goog-unwanted-proto"); +-pref("browser.safebrowsing.provider.google4.updateURL", "https://safebrowsing.googleapis.com/v4/threatListUpdates:fetch?$ct=application/x-protobuf&key=%GOOGLE_API_KEY%"); +-pref("browser.safebrowsing.provider.google4.gethashURL", "https://safebrowsing.googleapis.com/v4/fullHashes:find?$req=%REQUEST_BASE64%&$ct=application/x-protobuf&key=%GOOGLE_API_KEY%"); +-pref("browser.safebrowsing.provider.google4.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site="); +- +-pref("browser.safebrowsing.reportPhishMistakeURL", "https://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%&url="); +-pref("browser.safebrowsing.reportPhishURL", "https://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%&url="); +-pref("browser.safebrowsing.reportMalwareMistakeURL", "https://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%&url="); ++pref("browser.safebrowsing.provider.google4.lists", ""); ++pref("browser.safebrowsing.provider.google4.updateURL", ""); ++pref("browser.safebrowsing.provider.google4.gethashURL", ""); ++pref("browser.safebrowsing.provider.google4.reportURL", ""); ++ ++pref("browser.safebrowsing.reportPhishMistakeURL", ""); ++pref("browser.safebrowsing.reportPhishURL", ""); ++pref("browser.safebrowsing.reportMalwareMistakeURL", ""); + + // The table and global pref for blocking plugin content +-pref("browser.safebrowsing.blockedURIs.enabled", true); ++pref("browser.safebrowsing.blockedURIs.enabled", false); + pref("urlclassifier.blockedTable", "test-block-simple,mozplugin-block-digest256"); + + // The protocol version we communicate with mozilla server. + pref("browser.safebrowsing.provider.mozilla.pver", "2.2"); +-pref("browser.safebrowsing.provider.mozilla.lists", "base-track-digest256,mozstd-trackwhite-digest256,content-track-digest256,mozplugin-block-digest256,mozplugin2-block-digest256"); +-pref("browser.safebrowsing.provider.mozilla.updateURL", "https://shavar.services.mozilla.com/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2"); +-pref("browser.safebrowsing.provider.mozilla.gethashURL", "https://shavar.services.mozilla.com/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2"); ++pref("browser.safebrowsing.provider.mozilla.lists", ""); ++pref("browser.safebrowsing.provider.mozilla.updateURL", ""); ++pref("browser.safebrowsing.provider.mozilla.gethashURL", ""); + // Set to a date in the past to force immediate download in new profiles. + pref("browser.safebrowsing.provider.mozilla.nextupdatetime", "1"); + // Block lists for tracking protection. The name values will be used as the keys diff --git a/firefox-install-dir.patch b/firefox-install-dir.patch index 51fe4ba0a855..c2dda0013c71 100644 --- a/firefox-install-dir.patch +++ b/firefox-install-dir.patch @@ -1,6 +1,5 @@ -diff -up firefox-29.0/mozilla-release/config/baseconfig.mk.orig firefox-29.0/mozilla-release/config/baseconfig.mk ---- mozilla-release/config/baseconfig.mk.orig 2014-04-22 15:38:52.948165295 +0200 -+++ mozilla-release/config/baseconfig.mk 2014-04-22 15:42:20.387481673 +0200 +--- firefox-52.0esr.bak/config/baseconfig.mk 2017-03-09 09:11:38.434104687 +0100 ++++ firefox-52.0esr/config/baseconfig.mk 2017-03-09 11:26:48.571245921 +0100 @@ -4,7 +4,7 @@ # whether a normal build is happening or whether the check is running. includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) @@ -8,5 +7,5 @@ diff -up firefox-29.0/mozilla-release/config/baseconfig.mk.orig firefox-29.0/moz -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +installdir = $(libdir)/$(MOZ_APP_NAME) sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) - ifndef TOP_DIST - TOP_DIST = dist + ifeq (.,$(DEPTH)) + DIST = dist diff --git a/mozconfig b/mozconfig index c5d3db444c24..4a0dfe0ea262 100644 --- a/mozconfig +++ b/mozconfig @@ -29,7 +29,6 @@ ac_add_options --with-system-bz2 ac_add_options --with-system-jpeg ac_add_options --with-system-png ac_add_options --with-system-zlib -ac_add_options --enable-gstreamer=1.0 ac_add_options --enable-system-hunspell ac_add_options --enable-startup-notification ac_add_options --disable-pulseaudio @@ -38,7 +37,9 @@ ac_add_options --with-system-libevent ac_add_options --with-system-libvpx ac_add_options --with-system-nspr ac_add_options --with-system-nss -#ac_add_options --with-system-icu # Segmentation fault with ICU 58.1 and FF 45.4.0 +ac_add_options --with-system-icu ac_add_options --disable-gconf +ac_add_options --enable-alsa +ac_add_options --enable-default-toolkit=cairo-gtk2 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build-dir |