From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 61040138330 for ; Wed, 31 Aug 2016 19:10:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32296E0B22; Wed, 31 Aug 2016 19:10:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9032EE0B22 for ; Wed, 31 Aug 2016 19:10:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 082C83406C2 for ; Wed, 31 Aug 2016 19:10:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29B4D2471 for ; Wed, 31 Aug 2016 19:10:26 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1472670594.ad150c6ee2c1b21f746fb91f7819e2f0f6ad5874.axs@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/files/, mail-client/thunderbird/ X-VCS-Repository: proj/mozilla X-VCS-Files: mail-client/thunderbird/files/firefox-45-gcc6.patch mail-client/thunderbird/thunderbird-45.3.0.ebuild X-VCS-Directories: mail-client/thunderbird/ mail-client/thunderbird/files/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: ad150c6ee2c1b21f746fb91f7819e2f0f6ad5874 X-VCS-Branch: master Date: Wed, 31 Aug 2016 19:10:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0ffa5aba-063f-4af3-a398-18ad01fc56f7 X-Archives-Hash: c1afb6b0602c07b9ab05cbb8add0f192 commit: ad150c6ee2c1b21f746fb91f7819e2f0f6ad5874 Author: Ian Stakenvicius gentoo org> AuthorDate: Wed Aug 31 19:09:54 2016 +0000 Commit: Ian Stakenvicius gentoo org> CommitDate: Wed Aug 31 19:09:54 2016 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=ad150c6e mail-client/thunderbird-45.3.0: patch to fix gcc6 compilation .../thunderbird/files/firefox-45-gcc6.patch | 40 ++++++++++++++++++++++ mail-client/thunderbird/thunderbird-45.3.0.ebuild | 3 +- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/mail-client/thunderbird/files/firefox-45-gcc6.patch b/mail-client/thunderbird/files/firefox-45-gcc6.patch new file mode 100644 index 0000000..c5b861c --- /dev/null +++ b/mail-client/thunderbird/files/firefox-45-gcc6.patch @@ -0,0 +1,40 @@ +Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1245076 + +--- a/config/gcc-stl-wrapper.template.h 2016-08-31 12:38:43.094770023 -0400 ++++ b/config/gcc-stl-wrapper.template.h 2016-08-31 12:40:12.030579071 -0400 +@@ -17,6 +17,12 @@ + // Silence "warning: #include_next is a GCC extension" + #pragma GCC system_header + ++ ++#ifndef moz_dont_include_mozalloc_for_cstdlib ++# define moz_dont_include_mozalloc_for_cstdlib ++#endif ++#ifndef moz_dont_include_mozalloc_for_${HEADER} ++ + // mozalloc.h wants ; break the cycle by always explicitly + // including here. NB: this is a tad sneaky. Sez the gcc docs: + // +@@ -25,15 +31,17 @@ + // same name as the current file. It simply looks for the file + // named, starting with the directory in the search path after the + // one where the current file was found. +-#include_next ++# include_next + + // See if we're in code that can use mozalloc. NB: this duplicates + // code in nscore.h because nscore.h pulls in prtypes.h, and chromium + // can't build with that being included before base/basictypes.h. +-#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) +-# include "mozilla/mozalloc.h" +-#else +-# error "STL code can only be used with infallible ::operator new()" ++# if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) ++# include "mozilla/mozalloc.h" ++# else ++# error "STL code can only be used with infallible ::operator new()" ++# endif ++ + #endif + + #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG) diff --git a/mail-client/thunderbird/thunderbird-45.3.0.ebuild b/mail-client/thunderbird/thunderbird-45.3.0.ebuild index 84ebec5..f85141b 100644 --- a/mail-client/thunderbird/thunderbird-45.3.0.ebuild +++ b/mail-client/thunderbird/thunderbird-45.3.0.ebuild @@ -144,7 +144,8 @@ src_prepare() { # Apply our patchset from firefox to thunderbird as well pushd "${S}"/mozilla &>/dev/null || die - eapply "${WORKDIR}/firefox" + eapply "${WORKDIR}/firefox" \ + "${FILESDIR}"/firefox-45-gcc6.patch popd &>/dev/null || die # Ensure that are plugins dir is enabled as default