From dba86ea74dde110b8e5d432bd5de746d0839a7d1 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 25 Apr 2016 14:58:04 +0200 Subject: Update to Firefox 46 --- firefox-enable-addons.patch | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) (limited to 'firefox-enable-addons.patch') diff --git a/firefox-enable-addons.patch b/firefox-enable-addons.patch index 8b47ebf..dae974b 100644 --- a/firefox-enable-addons.patch +++ b/firefox-enable-addons.patch @@ -1,7 +1,7 @@ -diff -up firefox-43.0/firefox-43.0/browser/app/profile/firefox.js.addons firefox-43.0/firefox-43.0/browser/app/profile/firefox.js ---- firefox-43.0/browser/app/profile/firefox.js.addons 2015-12-10 10:18:32.942990945 +0100 -+++ firefox-43.0/browser/app/profile/firefox.js 2015-12-10 10:22:36.435169388 +0100 -@@ -71,7 +71,8 @@ pref("extensions.hotfix.certs.2.sha1Fing +diff -up firefox-46.0/browser/app/profile/firefox.js.addons firefox-46.0/browser/app/profile/firefox.js +--- firefox-46.0/browser/app/profile/firefox.js.addons 2016-04-22 02:37:18.000000000 +0200 ++++ firefox-46.0/browser/app/profile/firefox.js 2016-04-25 12:09:36.133479899 +0200 +@@ -74,7 +74,8 @@ pref("extensions.systemAddon.update.url" // Disable add-ons that are not installed by the user in all scopes by default. // See the SCOPE constants in AddonManager.jsm for values to use here. @@ -11,25 +11,12 @@ diff -up firefox-43.0/firefox-43.0/browser/app/profile/firefox.js.addons firefox // Require signed add-ons by default pref("xpinstall.signatures.required", true); -diff -up firefox-43.0/firefox-43.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons firefox-43.0/firefox-43.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm ---- firefox-43.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons 2015-12-08 19:06:45.000000000 +0100 -+++ firefox-43.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2015-12-10 10:18:32.944990955 +0100 -@@ -2523,11 +2523,7 @@ this.XPIProvider = { - - AddonManagerPrivate.markProviderSafe(this); - -- if (aAppChanged === undefined) { -- // For new profiles we will never need to show the add-on selection UI -- Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true); -- } -- else if (aAppChanged && !this.allAppGlobal && -+ if (aAppChanged && !this.allAppGlobal && - Preferences.get(PREF_EM_SHOW_MISMATCH_UI, true)) { - if (!Preferences.get(PREF_SHOWN_SELECTION_UI, false)) { - // Flip a flag to indicate that we interrupted startup with an interactive prompt -@@ -2547,6 +2543,9 @@ this.XPIProvider = { - flushCaches = true; - } +diff -up firefox-46.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons firefox-46.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm +--- firefox-46.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons 2016-04-25 12:09:36.134479903 +0200 ++++ firefox-46.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2016-04-25 13:32:07.401769022 +0200 +@@ -2679,6 +2679,9 @@ this.XPIProvider = { + this.showUpgradeUI(addonsToUpdate); + flushCaches = true; } + } else { + // For new profiles we will never need to show the add-on selection UI -- cgit