1 |
commit: 275f28d779e7632bbd1501ca5813d90b3300cd6f |
2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 10 01:26:20 2016 +0000 |
4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 10 01:26:20 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=275f28d7 |
7 |
|
8 |
mail-client/thunderbird: moved gcc6 and binutils-2.26 patches to tarball |
9 |
|
10 |
mail-client/thunderbird/Manifest | 2 +- |
11 |
.../firefox-45-binutils-2.26-gold-elfhack.patch | 49 ---------------------- |
12 |
.../thunderbird/files/firefox-45-gcc6.patch | 40 ------------------ |
13 |
.../thunderbird/thunderbird-45.4.0-r1.ebuild | 6 +-- |
14 |
4 files changed, 3 insertions(+), 94 deletions(-) |
15 |
|
16 |
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest |
17 |
index 797685c..22abc56 100644 |
18 |
--- a/mail-client/thunderbird/Manifest |
19 |
+++ b/mail-client/thunderbird/Manifest |
20 |
@@ -1,5 +1,5 @@ |
21 |
DIST enigmail-1.9.1.tar.gz 1736876 SHA256 0393119725fa5931d9888a2a1c9796d440ee7975ca3d005eb63142768b10f993 SHA512 5417d7744ff5b8299d9799059f62013e546fb74206782169e5ce6baa0950d96d1c8996c99ec902ca73b241fd1268966e0a7ad30c032a1706a0efbf06fefc311c WHIRLPOOL 80cff68461edc743851de5a83cd04105f6689eb1289f46b72334a96b091dc430399a91b2ab004a39bd7cb04433ab0471dd07b44d39fc2eb3869487b07841fc5a |
22 |
-DIST firefox-45.0-patches-06.tar.xz 19792 SHA256 4cacdb0ca1e710a0e3f577d5a1253ed14fab9a2d1cdaf83b3fa7bac86cfddef2 SHA512 eec8ccb3d67144368cfad807cad847379bf9ee54c2394f8bf0bda121178b1036ec1d32bea67afad840dff38e1ef26c4c19569d4fa4b553b6e2719bf07a46e017 WHIRLPOOL 7bb6b8f59d86beb9178fbea8bdd372a016b62e00766daf9439e2e59d20635a21b3a218447b09ce7d6a4b601611013f9ad08e088ef8112a41bde9ce951d10bdad |
23 |
+DIST firefox-45.0-patches-07.tar.xz 21016 SHA256 76a70ebb3f9c0515c0632170dfeedf0bfb60f248bee579514940148bb3e2b1c5 SHA512 304d6ed4b4c9ac58f3762263207167a9a32532fd48f17d9cc86f5106f7ec98273f402e3779b810b455ceea77d84313ffc8f236fa6fdc6cd5ef21e8159beec552 WHIRLPOOL a50d54d1e3b5c0fb0e8b32c8d69cdeb99a8fbfa90ac51dfa01163ab0228499b08d3ef37b27391d0d5179d80e937447029c2f976f014bf97d0da3e4bc1b58eaf7 |
24 |
DIST gdata-provider-2.6-r1.tar.xz 83836 SHA256 e181d5fe69e66f34719295790301e0d265c855be5f30df516c52dd3708d82158 SHA512 e5fcf60c221590d1d904ce8c6a74da7208b118c2872a26267f4ee6d3e68eea466d44b979b7259a012a21e48eb5b470d52cc9e58584226fe04ce88ff698da495b WHIRLPOOL 0e85fbb321edec0397b42808fd6320e245de35ddd1cf772545c432dbf26d8c28b042ba2c61bbde2abdbf4d5cca076436e6d678d6d636d3bcc562470d485df6c1 |
25 |
DIST lightning-4.7.4.tar.xz 1927800 SHA256 24310e7ef2e5dfdf35c52cce4480553c1641368558f1c388e8ba3a99d4c8f2f2 SHA512 65b398d71897a942cae30924de15ae47e2fed83cb70a58b3d99271246eaaabf48703a1b8b5ea74799bf66a4908df56ae2fa75422f62979036f1d322fe77fdae1 WHIRLPOOL 499deb17bf2cb28b028dd68f41c973185282703dc87963ae5df60d81f8e8004feda9a9e5ec202f94ddf87249402e78679330ddd74e51347a12702d005d2ddf38 |
26 |
DIST thunderbird-38.0-patches-0.1.tar.xz 684 SHA256 cd2a347b72a104e72d38e56bb92df3464e8820485119b4114dbd0bbda131a808 SHA512 52c83af301be959e861dfec55b3c4bc60035387c606976bd29232c4cba077230edcadef242491e699fba10027d0408dd4f33fa320bcf96727afe149166ca02de WHIRLPOOL a378a0fa1b152f17681a5e389662fedfacd45a137b224f038d3c98ab4a024bcf9e753fb2fe018cdb7126fb710ee8baabdf7882540450ead2985070d0d1f12eb0 |
27 |
|
28 |
diff --git a/mail-client/thunderbird/files/firefox-45-binutils-2.26-gold-elfhack.patch b/mail-client/thunderbird/files/firefox-45-binutils-2.26-gold-elfhack.patch |
29 |
deleted file mode 100644 |
30 |
index 1e7fa1c..0000000 |
31 |
--- a/mail-client/thunderbird/files/firefox-45-binutils-2.26-gold-elfhack.patch |
32 |
+++ /dev/null |
33 |
@@ -1,49 +0,0 @@ |
34 |
-From 4d0fe8f40364c170226f1ef3bc98975630463e87 Mon Sep 17 00:00:00 2001 |
35 |
-From: Mike Hommey <mh+mozilla@××××××××.org> |
36 |
-Date: Tue, 19 Jan 2016 14:31:04 +0900 |
37 |
-Subject: [PATCH] Bug 1233963 - Work around recent GNU gold behavior with |
38 |
- segments starting before the first section they contain |
39 |
- |
40 |
---- |
41 |
- build/unix/elfhack/elf.cpp | 7 +++++-- |
42 |
- 1 file changed, 5 insertions(+), 2 deletions(-) |
43 |
- |
44 |
-diff --git a/build/unix/elfhack/elf.cpp b/build/unix/elfhack/elf.cpp |
45 |
-index 666b535..743afde 100644 |
46 |
---- a/build/unix/elfhack/elf.cpp |
47 |
-+++ b/build/unix/elfhack/elf.cpp |
48 |
-@@ -253,26 +253,29 @@ Elf::Elf(std::ifstream &file) |
49 |
- } |
50 |
- if (phdr.p_type == PT_PHDR) |
51 |
- segment->addSection(phdr_section); |
52 |
- for (int j = 1; j < ehdr->e_shnum; j++) |
53 |
- if (phdr.contains(sections[j])) |
54 |
- segment->addSection(sections[j]); |
55 |
- // Make sure that our view of segments corresponds to the original |
56 |
- // ELF file. |
57 |
-- assert(segment->getFileSize() == phdr.p_filesz); |
58 |
-+ // GNU gold likes to start some segments before the first section |
59 |
-+ // they contain. https://sourceware.org/bugzilla/show_bug.cgi?id=19392 |
60 |
-+ unsigned int gold_adjustment = segment->getAddr() - phdr.p_vaddr; |
61 |
-+ assert(segment->getFileSize() == phdr.p_filesz - gold_adjustment); |
62 |
- // gold makes TLS segments end on an aligned virtual address, even |
63 |
- // when the underlying section ends before that, while bfd ld |
64 |
- // doesn't. It's fine if we don't keep that alignment. |
65 |
- unsigned int memsize = segment->getMemSize(); |
66 |
- if (phdr.p_type == PT_TLS && memsize != phdr.p_memsz) { |
67 |
- unsigned int align = segment->getAlign(); |
68 |
- memsize = (memsize + align - 1) & ~(align - 1); |
69 |
- } |
70 |
-- assert(memsize == phdr.p_memsz); |
71 |
-+ assert(memsize == phdr.p_memsz - gold_adjustment); |
72 |
- segments.push_back(segment); |
73 |
- } |
74 |
- |
75 |
- new (&eh_entry) ElfLocation(ehdr->e_entry, this); |
76 |
- } |
77 |
- |
78 |
- Elf::~Elf() |
79 |
- { |
80 |
--- |
81 |
-2.7.0 |
82 |
- |
83 |
|
84 |
diff --git a/mail-client/thunderbird/files/firefox-45-gcc6.patch b/mail-client/thunderbird/files/firefox-45-gcc6.patch |
85 |
deleted file mode 100644 |
86 |
index c5b861c..0000000 |
87 |
--- a/mail-client/thunderbird/files/firefox-45-gcc6.patch |
88 |
+++ /dev/null |
89 |
@@ -1,40 +0,0 @@ |
90 |
-Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1245076 |
91 |
- |
92 |
---- a/config/gcc-stl-wrapper.template.h 2016-08-31 12:38:43.094770023 -0400 |
93 |
-+++ b/config/gcc-stl-wrapper.template.h 2016-08-31 12:40:12.030579071 -0400 |
94 |
-@@ -17,6 +17,12 @@ |
95 |
- // Silence "warning: #include_next is a GCC extension" |
96 |
- #pragma GCC system_header |
97 |
- |
98 |
-+ |
99 |
-+#ifndef moz_dont_include_mozalloc_for_cstdlib |
100 |
-+# define moz_dont_include_mozalloc_for_cstdlib |
101 |
-+#endif |
102 |
-+#ifndef moz_dont_include_mozalloc_for_${HEADER} |
103 |
-+ |
104 |
- // mozalloc.h wants <new>; break the cycle by always explicitly |
105 |
- // including <new> here. NB: this is a tad sneaky. Sez the gcc docs: |
106 |
- // |
107 |
-@@ -25,15 +31,17 @@ |
108 |
- // same name as the current file. It simply looks for the file |
109 |
- // named, starting with the directory in the search path after the |
110 |
- // one where the current file was found. |
111 |
--#include_next <new> |
112 |
-+# include_next <new> |
113 |
- |
114 |
- // See if we're in code that can use mozalloc. NB: this duplicates |
115 |
- // code in nscore.h because nscore.h pulls in prtypes.h, and chromium |
116 |
- // can't build with that being included before base/basictypes.h. |
117 |
--#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) |
118 |
--# include "mozilla/mozalloc.h" |
119 |
--#else |
120 |
--# error "STL code can only be used with infallible ::operator new()" |
121 |
-+# if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) |
122 |
-+# include "mozilla/mozalloc.h" |
123 |
-+# else |
124 |
-+# error "STL code can only be used with infallible ::operator new()" |
125 |
-+# endif |
126 |
-+ |
127 |
- #endif |
128 |
- |
129 |
- #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG) |
130 |
|
131 |
diff --git a/mail-client/thunderbird/thunderbird-45.4.0-r1.ebuild b/mail-client/thunderbird/thunderbird-45.4.0-r1.ebuild |
132 |
index a74e343..78d5a44 100644 |
133 |
--- a/mail-client/thunderbird/thunderbird-45.4.0-r1.ebuild |
134 |
+++ b/mail-client/thunderbird/thunderbird-45.4.0-r1.ebuild |
135 |
@@ -22,7 +22,7 @@ EMVER="1.9.1" |
136 |
|
137 |
# Patches |
138 |
PATCH="thunderbird-38.0-patches-0.1" |
139 |
-PATCHFF="firefox-45.0-patches-06" |
140 |
+PATCHFF="firefox-45.0-patches-07" |
141 |
|
142 |
MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases" |
143 |
|
144 |
@@ -143,9 +143,7 @@ src_prepare() { |
145 |
|
146 |
# Apply our patchset from firefox to thunderbird as well |
147 |
pushd "${S}"/mozilla &>/dev/null || die |
148 |
- eapply "${WORKDIR}/firefox" \ |
149 |
- "${FILESDIR}"/firefox-45-binutils-2.26-gold-elfhack.patch \ |
150 |
- "${FILESDIR}"/firefox-45-gcc6.patch |
151 |
+ eapply "${WORKDIR}/firefox" |
152 |
popd &>/dev/null || die |
153 |
|
154 |
# Ensure that are plugins dir is enabled as default |