added gcc6 firefox patch

This commit is contained in:
Martin Stransky 2016-02-15 11:37:31 +01:00
parent cedf2709e4
commit 3514a50edb
3 changed files with 30 additions and 42 deletions

View File

@ -1,39 +0,0 @@
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
// 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-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 = {
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
@@ -2126,6 +2122,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) {

26
firefox-gcc-6.0.patch Normal file
View File

@ -0,0 +1,26 @@
diff -up firefox-44.0/nsprpub/config/make-system-wrappers.pl.back firefox-44.0/nsprpub/config/make-system-wrappers.pl
--- firefox-44.0/nsprpub/config/make-system-wrappers.pl.back 2016-01-24 00:23:49.000000000 +0100
+++ firefox-44.0/nsprpub/config/make-system-wrappers.pl 2016-02-02 14:58:45.064112655 +0100
@@ -19,7 +19,9 @@ while (<STDIN>) {
open OUT, ">$output_dir/$_";
print OUT "#pragma GCC system_header\n"; # suppress include_next warning
print OUT "#pragma GCC visibility push(default)\n";
+ print OUT "#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n";
print OUT "#include_next \<$_\>\n";
+ print OUT "#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n";
print OUT "#pragma GCC visibility pop\n";
close OUT;
}
diff -up firefox-44.0/mozglue/build/arm.cpp.old firefox-44.0/mozglue/build/arm.cpp
--- firefox-44.0/mozglue/build/arm.cpp.old 2016-02-03 10:07:29.879526500 +0100
+++ firefox-44.0/mozglue/build/arm.cpp 2016-02-03 10:08:11.062697517 +0100
@@ -104,7 +104,9 @@ check_neon(void)
# elif defined(__linux__) || defined(ANDROID)
# include <stdio.h>
+#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
# include <stdlib.h>
+#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
# include <string.h>
enum{

View File

@ -91,7 +91,7 @@ Patch100: thunderbird-objdir.patch
Patch101: build-nspr-prbool.patch
Patch102: build-werror.patch
Patch103: rhbz-1219542-s390-build.patch
Patch104: firefox-gcc-6.0.patch
# Linux specific
Patch200: thunderbird-enable-addons.patch
@ -208,6 +208,7 @@ cd mozilla
%ifarch s390
%patch103 -p1 -b .rhbz-1219542-s390-build
%endif
%patch104 -p1 -b .gcc6
%patch400 -p1 -b .966424
%patch402 -p1 -b .rhbz-1014858