mirror of
https://abf.rosa.ru/djam/firefox.git
synced 2025-02-25 02:52:59 +00:00
reenable patch what fixing addons installation via https
This commit is contained in:
parent
8309183acd
commit
d61b743d87
3 changed files with 33 additions and 33 deletions
|
@ -1,28 +0,0 @@
|
|||
diff -up firefox-21.0/mozilla-release/browser/app/profile/firefox.js.addons firefox-21.0/mozilla-release/browser/app/profile/firefox.js
|
||||
--- firefox-21.0/mozilla-release/browser/app/profile/firefox.js.addons 2013-05-11 21:19:20.000000000 +0200
|
||||
+++ firefox-21.0/mozilla-release/browser/app/profile/firefox.js 2013-05-16 12:02:13.840660585 +0200
|
||||
@@ -61,7 +61,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-21.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm.addons firefox-21.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm
|
||||
diff -up firefox-15.0/mozilla-beta/toolkit/mozapps/extensions/XPIProvider.jsm.addons firefox-15.0/mozilla-beta/toolkit/mozapps/extensions/XPIProvider.jsm
|
||||
--- firefox-15.0/mozilla-beta/toolkit/mozapps/extensions/XPIProvider.jsm.addons 2012-08-15 07:48:32.000000000 +0200
|
||||
+++ firefox-15.0/mozilla-beta/toolkit/mozapps/extensions/XPIProvider.jsm 2012-08-21 11:56:41.441980035 +0200
|
||||
@@ -1630,8 +1630,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);
|
||||
}
|
||||
|
27
firefox-enable-addons.patch
Normal file
27
firefox-enable-addons.patch
Normal file
|
@ -0,0 +1,27 @@
|
|||
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 2014-08-26 05:37:44.000000000 +0200
|
||||
+++ mozilla-release/browser/app/profile/firefox.js 2014-08-26 15:20:52.114149955 +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 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 2014-08-26 15:20:52.115149958 +0200
|
||||
+++ mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2014-08-26 15:29:16.229670636 +0200
|
||||
@@ -1888,8 +1888,8 @@ this.XPIProvider = {
|
||||
// Changes to installed extensions may have changed which theme is selected
|
||||
this.applyThemeChange();
|
||||
|
||||
- if (aAppChanged === undefined) {
|
||||
- // For new profiles we will never need to show the add-on selection UI
|
||||
+ if (true) {
|
||||
+ // For all 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 &&
|
11
firefox.spec
11
firefox.spec
|
@ -57,11 +57,9 @@ Patch12: mozilla-34-kde.patch
|
|||
#Patch13: mozilla-kde-background.patch
|
||||
Patch34: xulrunner_nojit.patch
|
||||
|
||||
# Upstream patches
|
||||
|
||||
# Fedora
|
||||
Patch90: firefox-baseline-disable.patch
|
||||
|
||||
# Fedora specific patches
|
||||
# Unable to install addons from https pages
|
||||
Patch215: firefox-enable-addons.patch
|
||||
|
||||
BuildRequires: gtk+2-devel
|
||||
BuildRequires: unzip
|
||||
|
@ -183,6 +181,9 @@ Files and macros mainly for building Firefox extensions.
|
|||
%patch90 -p2 -b .baseline
|
||||
%endif
|
||||
|
||||
# Fedora patches
|
||||
%patch215 -p1 -b .addons
|
||||
|
||||
pushd js/src
|
||||
autoconf-2.13
|
||||
popd
|
||||
|
|
Loading…
Add table
Reference in a new issue