From 2fb05a01ff2c755034e9821e179f93ad6dede62d Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 29 Jul 2014 15:20:46 +0200 Subject: Renamed a addon patch file --- firefox-15.0-enable-addons.patch | 27 --------------------------- firefox-enable-addons.patch | 27 +++++++++++++++++++++++++++ firefox.spec | 2 +- 3 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 firefox-15.0-enable-addons.patch create mode 100644 firefox-enable-addons.patch diff --git a/firefox-15.0-enable-addons.patch b/firefox-15.0-enable-addons.patch deleted file mode 100644 index e97b5ca..0000000 --- a/firefox-15.0-enable-addons.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up firefox-29.0/mozilla-release/browser/app/profile/firefox.js.addons firefox-29.0/mozilla-release/browser/app/profile/firefox.js ---- firefox-29.0/mozilla-release/browser/app/profile/firefox.js.addons 2014-04-22 07:27:34.000000000 +0200 -+++ firefox-29.0/mozilla-release/browser/app/profile/firefox.js 2014-04-22 15:49:04.953173027 +0200 -@@ -65,7 +65,8 @@ pref("extensions.hotfix.certs.1.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. --pref("extensions.autoDisableScopes", 15); -+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 firefox-29.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm.addons firefox-29.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm ---- firefox-29.0/mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons 2014-04-22 15:49:04.955173021 +0200 -+++ firefox-29.0/mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2014-04-22 15:50:34.711891888 +0200 -@@ -2051,8 +2051,8 @@ var XPIProvider = { - this.showUpgradeUI(); - flushCaches = true; - } -- else if (aAppChanged === undefined) { -- // For new profiles we will never need to show the add-on selection UI -+ else { -+ // For all profiles we will never need to show the add-on selection UI - Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true); - } - diff --git a/firefox-enable-addons.patch b/firefox-enable-addons.patch new file mode 100644 index 0000000..e97b5ca --- /dev/null +++ b/firefox-enable-addons.patch @@ -0,0 +1,27 @@ +diff -up firefox-29.0/mozilla-release/browser/app/profile/firefox.js.addons firefox-29.0/mozilla-release/browser/app/profile/firefox.js +--- firefox-29.0/mozilla-release/browser/app/profile/firefox.js.addons 2014-04-22 07:27:34.000000000 +0200 ++++ firefox-29.0/mozilla-release/browser/app/profile/firefox.js 2014-04-22 15:49:04.953173027 +0200 +@@ -65,7 +65,8 @@ pref("extensions.hotfix.certs.1.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. +-pref("extensions.autoDisableScopes", 15); ++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 firefox-29.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm.addons firefox-29.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm +--- firefox-29.0/mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons 2014-04-22 15:49:04.955173021 +0200 ++++ firefox-29.0/mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2014-04-22 15:50:34.711891888 +0200 +@@ -2051,8 +2051,8 @@ var XPIProvider = { + this.showUpgradeUI(); + flushCaches = true; + } +- else if (aAppChanged === undefined) { +- // For new profiles we will never need to show the add-on selection UI ++ else { ++ // For all profiles we will never need to show the add-on selection UI + Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true); + } + diff --git a/firefox.spec b/firefox.spec index 9bda65f..2e03b1e 100644 --- a/firefox.spec +++ b/firefox.spec @@ -113,7 +113,7 @@ Patch19: xulrunner-24.0-s390-inlines.patch # Fedora specific patches # Unable to install addons from https pages Patch204: rhbz-966424.patch -Patch215: firefox-15.0-enable-addons.patch +Patch215: firefox-enable-addons.patch Patch216: firefox-duckduckgo.patch # Upstream patches -- cgit