Djam/firefox-esr91
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/firefox-esr91.git synced 2025-02-24 17:42:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sync patches from Fedora

Browse source
This commit is contained in:
Tigro 2015-09-25 15:11:05 +03:00
parent c1832ea845
commit cf0122c570
5 changed files with 102 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
firefox-enable-addons.patch Normal file
View file

@ -0,0 +1,39 @@
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.
-pref("extensions.autoDisableScopes", 15);
+pref("extensions.autoDisableScopes", 0);
+pref("extensions.showMismatchUI", false);
// 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);
- 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
@@ -2317,6 +2313,9 @@ this.XPIProvider = {
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) {

21
firefox-fedora-ua.patch Normal file
View file

@ -0,0 +1,21 @@
diff -up firefox-35.0.1/mozilla-release/media/webrtc/trunk/Makefile.old firefox-35.0.1/mozilla-release/media/webrtc/trunk/Makefile
diff -up firefox-35.0.1/mozilla-release/netwerk/protocol/http/nsHttpHandler.cpp.old firefox-35.0.1/mozilla-release/netwerk/protocol/http/nsHttpHandler.cpp
--- firefox-35.0.1/mozilla-release/netwerk/protocol/http/nsHttpHandler.cpp.old 2015-01-23 07:00:06.000000000 +0100
+++ firefox-35.0.1/mozilla-release/netwerk/protocol/http/nsHttpHandler.cpp 2015-02-09 16:40:42.983220596 +0100
@@ -607,7 +607,7 @@ nsHttpHandler::BuildUserAgent()
mUserAgent.SetCapacity(mLegacyAppName.Length() +
mLegacyAppVersion.Length() +
#ifndef UA_SPARE_PLATFORM
- mPlatform.Length() +
+ mPlatform.Length() + 8 +
#endif
mOscpu.Length() +
mMisc.Length() +
@@ -631,6 +631,7 @@ nsHttpHandler::BuildUserAgent()
if (!mPlatform.IsEmpty()) {
mUserAgent += mPlatform;
mUserAgent.AppendLiteral("; ");
+ mUserAgent.AppendLiteral("Fedora; ");
}
#endif
if (!mCompatDevice.IsEmpty()) {

19
firefox.spec
View file

@ -57,13 +57,17 @@ Patch36: firefox-38.0-enable-NTLMv1.patch
# Fedora specific patches
# Unable to install addons from https pages
Patch204: rhbz-966424.patch
Patch215: firefox-enable-addons.patch
Patch219: rhbz-1173156.patch
Patch220: rhbz-1014858.patch
Patch221: firefox-fedora-ua.patch
# Gtk3 upstream patches
Patch420: mozilla-1160154.patch
Patch425: mozilla-1192243.patch
Patch426: mozilla-1180971.patch
Patch427: mozilla-1190935.patch
Patch428: mozilla-1205045.patch
Patch420: mozilla-1160154.patch
Patch425: mozilla-1192243.patch
Patch426: mozilla-1180971.patch
Patch427: mozilla-1190935.patch
Patch428: mozilla-1205045.patch
BuildRequires: gtk+2-devel
%if %{toolkit_gtk3}
@ -187,6 +191,10 @@ Files and macros mainly for building Firefox extensions.
# Fedora patches
%patch204 -p2 -b .966424
%patch215 -p1 -b .addons
%patch219 -p2 -b .rhbz-1173156
%patch220 -p1 -b .rhbz-1014858
%patch221 -p2 -b .fedora-ua
# Upstream patches
%if %{toolkit_gtk3}
@ -343,6 +351,7 @@ pref("dom.ipc.plugins.enabled.nswrapper*", false);
pref("extensions.autoDisableScopes", 0);
pref("extensions.shownSelectionUI", true);
pref("network.manage-offline-status", true);
pref("layers.offmainthreadcomposition.enabled", false);
EOF
cat << EOF >> %{buildroot}%{mozillalibdir}/defaults/pref/config-prefs.js
pref("general.config.filename", "firefox.cfg");

16
rhbz-1014858.patch Normal file
View file

@ -0,0 +1,16 @@
diff -up mozilla-release/toolkit/xre/nsAppRunner.cpp.old mozilla-release/toolkit/xre/nsAppRunner.cpp
--- mozilla-release/toolkit/xre/nsAppRunner.cpp.old 2014-11-26 03:17:40.000000000 +0100
+++ mozilla-release/toolkit/xre/nsAppRunner.cpp 2015-01-05 14:23:05.977933308 +0100
@@ -4168,10 +4168,8 @@ XREMain::XRE_main(int argc, char* argv[]
#if defined(MOZ_WIDGET_GTK)
#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
- // Disable the slice allocator, since jemalloc already uses similar layout
- // algorithms, and using a sub-allocator tends to increase fragmentation.
- // This must be done before g_thread_init() is called.
- g_slice_set_config(G_SLICE_CONFIG_ALWAYS_MALLOC, 1);
+ // rhbz#1014858 - enable slice allocator for child processes
+ unsetenv("G_SLICE");
#endif
g_thread_init(nullptr);
#endif

12
rhbz-1173156.patch Normal file
View file

@ -0,0 +1,12 @@
diff -up firefox-31.3.0/mozilla-esr31/extensions/auth/nsAuthSambaNTLM.cpp.old firefox-31.3.0/mozilla-esr31/extensions/auth/nsAuthSambaNTLM.cpp
--- firefox-31.3.0/mozilla-esr31/extensions/auth/nsAuthSambaNTLM.cpp.old 2014-11-25 12:23:22.000000000 +0100
+++ firefox-31.3.0/mozilla-esr31/extensions/auth/nsAuthSambaNTLM.cpp 2014-12-23 15:26:36.606674625 +0100
@@ -174,7 +174,7 @@ nsAuthSambaNTLM::SpawnNTLMAuthHelper()
return NS_ERROR_FAILURE;
const char* const args[] = {
- "ntlm_auth",
+ "/usr/bin/ntlm_auth",
"--helper-protocol", "ntlmssp-client-1",
"--use-cached-creds",
"--username", username,