Merge branch 'master' into f23

This commit is contained in:
Martin Stransky 2016-04-27 09:38:43 +02:00
commit 65efd05c49
2 changed files with 4 additions and 14 deletions

View File

@ -11,16 +11,3 @@ diff -up firefox-46.0/browser/app/profile/firefox.js.addons firefox-46.0/browser
// Require signed add-ons by default // Require signed add-ons by default
pref("xpinstall.signatures.required", true); pref("xpinstall.signatures.required", 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
+ Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
}
if (flushCaches) {

View File

@ -94,7 +94,7 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 46.0 Version: 46.0
Release: 2%{?pre_tag}%{?dist} Release: 3%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/projects/firefox/ URL: https://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet Group: Applications/Internet
@ -807,6 +807,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Wed Apr 27 2016 Martin Stransky <stransky@redhat.com> - 46.0-3
- Fixed missing langpacks
* Tue Apr 26 2016 Martin Stransky <stransky@redhat.com> - 46.0-2 * Tue Apr 26 2016 Martin Stransky <stransky@redhat.com> - 46.0-2
- Disabled system libicu on Fedora 22/23 - Disabled system libicu on Fedora 22/23