1 |
commit: 58b2b04ba4f4ce5864869a075af042f9c50f5544 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jan 14 15:16:11 2020 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 29 11:13:41 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58b2b04b |
7 |
|
8 |
mail-client/thunderbird: remove unused patch |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/14335 |
12 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
13 |
|
14 |
.../files/thunderbird-68.2.2-rust-1.39+.patch | 170 --------------------- |
15 |
1 file changed, 170 deletions(-) |
16 |
|
17 |
diff --git a/mail-client/thunderbird/files/thunderbird-68.2.2-rust-1.39+.patch b/mail-client/thunderbird/files/thunderbird-68.2.2-rust-1.39+.patch |
18 |
deleted file mode 100644 |
19 |
index bfb71cbb788..00000000000 |
20 |
--- a/mail-client/thunderbird/files/thunderbird-68.2.2-rust-1.39+.patch |
21 |
+++ /dev/null |
22 |
@@ -1,170 +0,0 @@ |
23 |
-Based on https://github.com/rust-lang/rust/issues/64710 |
24 |
- |
25 |
---- a/third_party/rust/bindgen/.cargo-checksum.json |
26 |
-+++ b/third_party/rust/bindgen/.cargo-checksum.json |
27 |
-@@ -1 +1 @@ |
28 |
--{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partial |
29 |
eq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc8 |
30 |
53fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"8dc10043d872e68e660ef96edca4d9733f95be45cdad4893462fa929b335014f","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b5 |
31 |
7cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf |
32 |
232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"} |
33 |
-\ No newline at end of file |
34 |
-+{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partial |
35 |
eq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"8c92a52c0f859c7bec7bfbc36b9d18f904baab0c8c9dc1b3e7af34de1a0b0da4","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc8 |
36 |
53fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"71f1a37f75b971ea5b0d8457473cc410947dbf706cb6d2c0338916910b78a675","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b5 |
37 |
7cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf |
38 |
232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"} |
39 |
-\ No newline at end of file |
40 |
---- a/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs |
41 |
-+++ b/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs |
42 |
-@@ -9,17 +9,17 @@ use std::ops; |
43 |
- use {HashMap, Entry}; |
44 |
- |
45 |
- /// The result of the `HasVtableAnalysis` for an individual item. |
46 |
--#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)] |
47 |
-+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] |
48 |
- pub enum HasVtableResult { |
49 |
-- /// The item has a vtable, but the actual vtable pointer is in a base |
50 |
-- /// member. |
51 |
-- BaseHasVtable, |
52 |
-+ /// The item does not have a vtable pointer. |
53 |
-+ No, |
54 |
- |
55 |
- /// The item has a vtable and the actual vtable pointer is within this item. |
56 |
- SelfHasVtable, |
57 |
- |
58 |
-- /// The item does not have a vtable pointer. |
59 |
-- No |
60 |
-+ /// The item has a vtable, but the actual vtable pointer is in a base |
61 |
-+ /// member. |
62 |
-+ BaseHasVtable, |
63 |
- } |
64 |
- |
65 |
- impl Default for HasVtableResult { |
66 |
-@@ -28,21 +28,6 @@ impl Default for HasVtableResult { |
67 |
- } |
68 |
- } |
69 |
- |
70 |
--impl cmp::PartialOrd for HasVtableResult { |
71 |
-- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { |
72 |
-- use self::HasVtableResult::*; |
73 |
-- |
74 |
-- match (*self, *rhs) { |
75 |
-- (x, y) if x == y => Some(cmp::Ordering::Equal), |
76 |
-- (BaseHasVtable, _) => Some(cmp::Ordering::Greater), |
77 |
-- (_, BaseHasVtable) => Some(cmp::Ordering::Less), |
78 |
-- (SelfHasVtable, _) => Some(cmp::Ordering::Greater), |
79 |
-- (_, SelfHasVtable) => Some(cmp::Ordering::Less), |
80 |
-- _ => unreachable!(), |
81 |
-- } |
82 |
-- } |
83 |
--} |
84 |
-- |
85 |
- impl HasVtableResult { |
86 |
- /// Take the least upper bound of `self` and `rhs`. |
87 |
- pub fn join(self, rhs: Self) -> Self { |
88 |
---- a/third_party/rust/bindgen/src/ir/analysis/sizedness.rs |
89 |
-+++ b/third_party/rust/bindgen/src/ir/analysis/sizedness.rs |
90 |
-@@ -22,13 +22,14 @@ use {HashMap, Entry}; |
91 |
- /// |
92 |
- /// We initially assume that all types are `ZeroSized` and then update our |
93 |
- /// understanding as we learn more about each type. |
94 |
--#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)] |
95 |
-+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] |
96 |
- pub enum SizednessResult { |
97 |
-- /// Has some size that is known to be greater than zero. That doesn't mean |
98 |
-- /// it has a static size, but it is not zero sized for sure. In other words, |
99 |
-- /// it might contain an incomplete array or some other dynamically sized |
100 |
-- /// type. |
101 |
-- NonZeroSized, |
102 |
-+ /// The type is zero-sized. |
103 |
-+ /// |
104 |
-+ /// This means that if it is a C++ type, and is not being used as a base |
105 |
-+ /// member, then we must add an `_address` byte to enforce the |
106 |
-+ /// unique-address-per-distinct-object-instance rule. |
107 |
-+ ZeroSized, |
108 |
- |
109 |
- /// Whether this type is zero-sized or not depends on whether a type |
110 |
- /// parameter is zero-sized or not. |
111 |
-@@ -52,12 +53,11 @@ pub enum SizednessResult { |
112 |
- /// https://github.com/rust-lang-nursery/rust-bindgen/issues/586 |
113 |
- DependsOnTypeParam, |
114 |
- |
115 |
-- /// The type is zero-sized. |
116 |
-- /// |
117 |
-- /// This means that if it is a C++ type, and is not being used as a base |
118 |
-- /// member, then we must add an `_address` byte to enforce the |
119 |
-- /// unique-address-per-distinct-object-instance rule. |
120 |
-- ZeroSized, |
121 |
-+ /// Has some size that is known to be greater than zero. That doesn't mean |
122 |
-+ /// it has a static size, but it is not zero sized for sure. In other words, |
123 |
-+ /// it might contain an incomplete array or some other dynamically sized |
124 |
-+ /// type. |
125 |
-+ NonZeroSized, |
126 |
- } |
127 |
- |
128 |
- impl Default for SizednessResult { |
129 |
-@@ -66,21 +66,6 @@ impl Default for SizednessResult { |
130 |
- } |
131 |
- } |
132 |
- |
133 |
--impl cmp::PartialOrd for SizednessResult { |
134 |
-- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { |
135 |
-- use self::SizednessResult::*; |
136 |
-- |
137 |
-- match (*self, *rhs) { |
138 |
-- (x, y) if x == y => Some(cmp::Ordering::Equal), |
139 |
-- (NonZeroSized, _) => Some(cmp::Ordering::Greater), |
140 |
-- (_, NonZeroSized) => Some(cmp::Ordering::Less), |
141 |
-- (DependsOnTypeParam, _) => Some(cmp::Ordering::Greater), |
142 |
-- (_, DependsOnTypeParam) => Some(cmp::Ordering::Less), |
143 |
-- _ => unreachable!(), |
144 |
-- } |
145 |
-- } |
146 |
--} |
147 |
-- |
148 |
- impl SizednessResult { |
149 |
- /// Take the least upper bound of `self` and `rhs`. |
150 |
- pub fn join(self, rhs: Self) -> Self { |
151 |
---- a/third_party/rust/bindgen/src/ir/derive.rs |
152 |
-+++ b/third_party/rust/bindgen/src/ir/derive.rs |
153 |
-@@ -92,10 +92,10 @@ pub trait CanDeriveOrd { |
154 |
- /// |
155 |
- /// Initially we assume that we can derive trait for all types and then |
156 |
- /// update our understanding as we learn more about each type. |
157 |
--#[derive(Debug, Copy, Clone, PartialEq, Eq, Ord)] |
158 |
-+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)] |
159 |
- pub enum CanDerive { |
160 |
-- /// No, we cannot. |
161 |
-- No, |
162 |
-+ /// Yes, we can derive automatically. |
163 |
-+ Yes, |
164 |
- |
165 |
- /// The only thing that stops us from automatically deriving is that |
166 |
- /// array with more than maximum number of elements is used. |
167 |
-@@ -103,8 +103,8 @@ pub enum CanDerive { |
168 |
- /// This means we probably can "manually" implement such trait. |
169 |
- Manually, |
170 |
- |
171 |
-- /// Yes, we can derive automatically. |
172 |
-- Yes, |
173 |
-+ /// No, we cannot. |
174 |
-+ No, |
175 |
- } |
176 |
- |
177 |
- impl Default for CanDerive { |
178 |
-@@ -113,22 +113,6 @@ impl Default for CanDerive { |
179 |
- } |
180 |
- } |
181 |
- |
182 |
--impl cmp::PartialOrd for CanDerive { |
183 |
-- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> { |
184 |
-- use self::CanDerive::*; |
185 |
-- |
186 |
-- let ordering = match (*self, *rhs) { |
187 |
-- (x, y) if x == y => cmp::Ordering::Equal, |
188 |
-- (No, _) => cmp::Ordering::Greater, |
189 |
-- (_, No) => cmp::Ordering::Less, |
190 |
-- (Manually, _) => cmp::Ordering::Greater, |
191 |
-- (_, Manually) => cmp::Ordering::Less, |
192 |
-- _ => unreachable!() |
193 |
-- }; |
194 |
-- Some(ordering) |
195 |
-- } |
196 |
--} |
197 |
-- |
198 |
- impl CanDerive { |
199 |
- /// Take the least upper bound of `self` and `rhs`. |
200 |
- pub fn join(self, rhs: Self) -> Self { |