commit:     aed9654bcc37a01ee11b70fb601bfe8b68ee8dd3
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 14:50:34 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 20:53:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aed9654b

mail-client/thunderbird: fix link issue with ld.gold from binutils-2.26.1

Bug: http://bugs.gentoo.org/593958

Package-Manager: portage-2.3.0

 mail-client/thunderbird/Manifest                   |  2 +-
 .../thunderbird/files/firefox-45-gcc6.patch        | 40 ----------------------
 mail-client/thunderbird/thunderbird-45.4.0.ebuild  |  5 ++-
 3 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index aa973df..824031e 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -6,7 +6,7 @@ DIST firefox-24.0-patches-0.9.tar.xz 6576 SHA256 
615b47ed076ead8f6fe8a9cc8b51ae7
 DIST firefox-31.0-patches-0.3.tar.xz 6004 SHA256 
1ca282d9b58e611c395fcda508bf0ddfebfc91ea6a6132b59f1acf90566f663c SHA512 
4469ccc3200955bb790a177352ebdbfa5c2299581bbbd0d83be4e2e0ccd5cb850c5023f3784dfbb3cd5d0dbed9bea4b533bdbe1627e42ba60437b4743a0e8fae
 WHIRLPOOL 
86b2da659dcb11f34cbb6bc966d7f7ab79fb3f8f3584f929ea50f7893bf84b01ece435c4598c05b538d0719fb0426fca51a1cc9f9abdecd8b8e8beb5109cc899
 DIST firefox-38.0-patches-05.tar.xz 18412 SHA256 
d2a2be8359c15d42fd2355bb54048db88af2288f9f9b69acbd742c29bd10be16 SHA512 
0556531fa5685bf04438df22b0e35ffd22c27e31a2d1d264b9401af8f3c79604577fc71f71e2bf338dc5465471152067ce1a30ba2813c612e062e20c4b5b7ea2
 WHIRLPOOL 
cc9aa2174395c8a70a9fc7010fc48d2f4e35c64c73deda38934a42ded5def14f7ccf6c3be8700ab3bea02bdd93bb4b98b40ff44176e4cfccd0b68b70d9deed61
 DIST firefox-45.0-patches-04.tar.xz 18600 SHA256 
2ee0ab58e0a1db7b573dd7ac407dcb9a43a85dd295c5d6d263f72ce629c5290c SHA512 
cf5d4ddfe14dff92950baae066350ace0a503c5bdd9d837e4724fd2fb905a2fb540dcf34971531e79547dd62dfbf217d472f39ccc4802f34a245e24f406fdb5e
 WHIRLPOOL 
1461c61ba7e54b7a91c758fdf91fda22260eaff4148b3cccab8ccfd9d09a3d80c0314e999284d392d9e961c42cd9720d6d30ac190074f74d1e53ecb1afa1b1e3
-DIST firefox-45.0-patches-06.tar.xz 19792 SHA256 
4cacdb0ca1e710a0e3f577d5a1253ed14fab9a2d1cdaf83b3fa7bac86cfddef2 SHA512 
eec8ccb3d67144368cfad807cad847379bf9ee54c2394f8bf0bda121178b1036ec1d32bea67afad840dff38e1ef26c4c19569d4fa4b553b6e2719bf07a46e017
 WHIRLPOOL 
7bb6b8f59d86beb9178fbea8bdd372a016b62e00766daf9439e2e59d20635a21b3a218447b09ce7d6a4b601611013f9ad08e088ef8112a41bde9ce951d10bdad
+DIST firefox-45.0-patches-07.tar.xz 21016 SHA256 
76a70ebb3f9c0515c0632170dfeedf0bfb60f248bee579514940148bb3e2b1c5 SHA512 
304d6ed4b4c9ac58f3762263207167a9a32532fd48f17d9cc86f5106f7ec98273f402e3779b810b455ceea77d84313ffc8f236fa6fdc6cd5ef21e8159beec552
 WHIRLPOOL 
a50d54d1e3b5c0fb0e8b32c8d69cdeb99a8fbfa90ac51dfa01163ab0228499b08d3ef37b27391d0d5179d80e937447029c2f976f014bf97d0da3e4bc1b58eaf7
 DIST gdata-provider-1.0.3.tar.xz 55860 SHA256 
2a6b8c1bed9c32dbb91bceadaf36986bffab4379ebf8ab1af83f9321b38f9cdd SHA512 
d1a99e179f4bc57c98beef80c27c5f774dffdd177a0ee0adf27441aaea27f96d61e723e592f9fa813b943acb34f572d5769622e2dd45c5befec762e0cbe013fb
 WHIRLPOOL 
2d896ae041ec8e6bd6f9474bf01ccc43925d89254cd6c719dfb70e1a5677f21fcc9536c2595f6b1b5823607d69248512d6dc9f5a1f208bd2e25a59f30a0c8c3f
 DIST gdata-provider-1.9.tar.xz 80812 SHA256 
8e60960999c752c49d6414d14c35c2d0cc474d4a199ec99e531453d4d60bc5a3 SHA512 
b1411b0a8614eb5e9fbdc0a41eb5ed38e8d4c90832e2a356fd0412b554af46bde4b766b213d9da3cafd85206da44d333354c9f6b469c95ddb190fa04fe14a54a
 WHIRLPOOL 
df7451e55f937c604d92faed82a16bddd6ca87a7c03981324c5409ab5824ac1c631ec767f10eaedc6f7128cd1f9001eca599c848d39e116d9722f26811b01092
 DIST gdata-provider-2.6-r1.tar.xz 83836 SHA256 
e181d5fe69e66f34719295790301e0d265c855be5f30df516c52dd3708d82158 SHA512 
e5fcf60c221590d1d904ce8c6a74da7208b118c2872a26267f4ee6d3e68eea466d44b979b7259a012a21e48eb5b470d52cc9e58584226fe04ce88ff698da495b
 WHIRLPOOL 
0e85fbb321edec0397b42808fd6320e245de35ddd1cf772545c432dbf26d8c28b042ba2c61bbde2abdbf4d5cca076436e6d678d6d636d3bcc562470d485df6c1

diff --git a/mail-client/thunderbird/files/firefox-45-gcc6.patch 
b/mail-client/thunderbird/files/firefox-45-gcc6.patch
deleted file mode 100644
index c5b861c..00000000
--- a/mail-client/thunderbird/files/firefox-45-gcc6.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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 <new>; break the cycle by always explicitly
- // including <new> 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 <new>
-+#  include_next <new>
- 
- // 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.4.0.ebuild 
b/mail-client/thunderbird/thunderbird-45.4.0.ebuild
index 55d978f..bebd894 100644
--- a/mail-client/thunderbird/thunderbird-45.4.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-45.4.0.ebuild
@@ -22,7 +22,7 @@ EMVER="1.9.1"
 
 # Patches
 PATCH="thunderbird-38.0-patches-0.1"
-PATCHFF="firefox-45.0-patches-06"
+PATCHFF="firefox-45.0-patches-07"
 
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases";
 
@@ -130,8 +130,7 @@ src_prepare() {
 
        # Apply our patchset from firefox to thunderbird as well
        pushd "${S}"/mozilla &>/dev/null || die
-       eapply "${WORKDIR}/firefox" \
-               "${FILESDIR}"/firefox-45-gcc6.patch
+       eapply "${WORKDIR}/firefox"
        popd &>/dev/null || die
 
        # Ensure that are plugins dir is enabled as default

Reply via email to