From 282611cf0e519a11b17b6b4068fefaa6410b4ba6 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 7 Aug 2015 11:42:56 +0200 Subject: Update to 40.0 Build 4 - fixed addons patch --- firefox-enable-addons.patch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/firefox-enable-addons.patch b/firefox-enable-addons.patch index 751d2ce..04a1f65 100644 --- a/firefox-enable-addons.patch +++ b/firefox-enable-addons.patch @@ -1,7 +1,7 @@ -diff -up mozilla-aurora/browser/app/profile/firefox.js.addons mozilla-aurora/browser/app/profile/firefox.js ---- mozilla-aurora/browser/app/profile/firefox.js.addons 2015-03-12 13:21:14.000000000 +0100 -+++ mozilla-aurora/browser/app/profile/firefox.js 2015-03-12 14:25:39.974909169 +0100 -@@ -65,7 +65,8 @@ pref("extensions.hotfix.certs.1.sha1Fing +diff -up mozilla-release/browser/app/profile/firefox.js.addons mozilla-release/browser/app/profile/firefox.js +--- mozilla-release/browser/app/profile/firefox.js.addons 2015-08-06 12:57:11.459795815 +0200 ++++ mozilla-release/browser/app/profile/firefox.js 2015-08-06 13:01:55.045869605 +0200 +@@ -69,7 +69,8 @@ pref("extensions.hotfix.certs.2.sha1Fing // 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. @@ -9,12 +9,12 @@ diff -up mozilla-aurora/browser/app/profile/firefox.js.addons mozilla-aurora/bro +pref("extensions.autoDisableScopes", 0); +pref("extensions.showMismatchUI", false); - // Dictionary download preference - pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); -diff -up mozilla-aurora/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons mozilla-aurora/toolkit/mozapps/extensions/internal/XPIProvider.jsm ---- mozilla-aurora/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons 2015-03-12 14:25:39.975909166 +0100 -+++ mozilla-aurora/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2015-03-12 15:23:05.879366812 +0100 -@@ -2102,11 +2102,7 @@ this.XPIProvider = { + // Don't require signed add-ons by default + pref("xpinstall.signatures.required", false); +diff -up mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm +--- mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons 2015-08-04 22:24:47.000000000 +0200 ++++ mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2015-08-06 12:57:11.461795823 +0200 +@@ -2293,11 +2293,7 @@ this.XPIProvider = { AddonManagerPrivate.markProviderSafe(this); @@ -27,7 +27,7 @@ diff -up mozilla-aurora/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addo 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 -@@ -2126,6 +2122,9 @@ this.XPIProvider = { +@@ -2317,6 +2313,9 @@ this.XPIProvider = { flushCaches = true; } } -- cgit