| 1 |
commit: ad150c6ee2c1b21f746fb91f7819e2f0f6ad5874 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 31 19:09:54 2016 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 31 19:09:54 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=ad150c6e |
| 7 |
|
| 8 |
mail-client/thunderbird-45.3.0: patch to fix gcc6 compilation |
| 9 |
|
| 10 |
.../thunderbird/files/firefox-45-gcc6.patch | 40 ++++++++++++++++++++++ |
| 11 |
mail-client/thunderbird/thunderbird-45.3.0.ebuild | 3 +- |
| 12 |
2 files changed, 42 insertions(+), 1 deletion(-) |
| 13 |
|
| 14 |
diff --git a/mail-client/thunderbird/files/firefox-45-gcc6.patch b/mail-client/thunderbird/files/firefox-45-gcc6.patch |
| 15 |
new file mode 100644 |
| 16 |
index 0000000..c5b861c |
| 17 |
--- /dev/null |
| 18 |
+++ b/mail-client/thunderbird/files/firefox-45-gcc6.patch |
| 19 |
@@ -0,0 +1,40 @@ |
| 20 |
+Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1245076 |
| 21 |
+ |
| 22 |
+--- a/config/gcc-stl-wrapper.template.h 2016-08-31 12:38:43.094770023 -0400 |
| 23 |
++++ b/config/gcc-stl-wrapper.template.h 2016-08-31 12:40:12.030579071 -0400 |
| 24 |
+@@ -17,6 +17,12 @@ |
| 25 |
+ // Silence "warning: #include_next is a GCC extension" |
| 26 |
+ #pragma GCC system_header |
| 27 |
+ |
| 28 |
++ |
| 29 |
++#ifndef moz_dont_include_mozalloc_for_cstdlib |
| 30 |
++# define moz_dont_include_mozalloc_for_cstdlib |
| 31 |
++#endif |
| 32 |
++#ifndef moz_dont_include_mozalloc_for_${HEADER} |
| 33 |
++ |
| 34 |
+ // mozalloc.h wants <new>; break the cycle by always explicitly |
| 35 |
+ // including <new> here. NB: this is a tad sneaky. Sez the gcc docs: |
| 36 |
+ // |
| 37 |
+@@ -25,15 +31,17 @@ |
| 38 |
+ // same name as the current file. It simply looks for the file |
| 39 |
+ // named, starting with the directory in the search path after the |
| 40 |
+ // one where the current file was found. |
| 41 |
+-#include_next <new> |
| 42 |
++# include_next <new> |
| 43 |
+ |
| 44 |
+ // See if we're in code that can use mozalloc. NB: this duplicates |
| 45 |
+ // code in nscore.h because nscore.h pulls in prtypes.h, and chromium |
| 46 |
+ // can't build with that being included before base/basictypes.h. |
| 47 |
+-#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) |
| 48 |
+-# include "mozilla/mozalloc.h" |
| 49 |
+-#else |
| 50 |
+-# error "STL code can only be used with infallible ::operator new()" |
| 51 |
++# if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) |
| 52 |
++# include "mozilla/mozalloc.h" |
| 53 |
++# else |
| 54 |
++# error "STL code can only be used with infallible ::operator new()" |
| 55 |
++# endif |
| 56 |
++ |
| 57 |
+ #endif |
| 58 |
+ |
| 59 |
+ #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG) |
| 60 |
|
| 61 |
diff --git a/mail-client/thunderbird/thunderbird-45.3.0.ebuild b/mail-client/thunderbird/thunderbird-45.3.0.ebuild |
| 62 |
index 84ebec5..f85141b 100644 |
| 63 |
--- a/mail-client/thunderbird/thunderbird-45.3.0.ebuild |
| 64 |
+++ b/mail-client/thunderbird/thunderbird-45.3.0.ebuild |
| 65 |
@@ -144,7 +144,8 @@ src_prepare() { |
| 66 |
|
| 67 |
# Apply our patchset from firefox to thunderbird as well |
| 68 |
pushd "${S}"/mozilla &>/dev/null || die |
| 69 |
- eapply "${WORKDIR}/firefox" |
| 70 |
+ eapply "${WORKDIR}/firefox" \ |
| 71 |
+ "${FILESDIR}"/firefox-45-gcc6.patch |
| 72 |
popd &>/dev/null || die |
| 73 |
|
| 74 |
# Ensure that are plugins dir is enabled as default |
Archives