1 |
commit: 34ae111abcc96ee08ef046f7b6dab0d4dd2dd2c6 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 28 11:43:37 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 28 11:43:53 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ae111a |
7 |
|
8 |
mail-client/thunderbird: add rust-1.29+ support |
9 |
|
10 |
Closes: https://bugs.gentoo.org/666898 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
13 |
|
14 |
.../files/thunderbird-60.0-rust-1.29-comp.patch | 37 ++++++++++++++++++++++ |
15 |
mail-client/thunderbird/thunderbird-60.0-r3.ebuild | 1 + |
16 |
2 files changed, 38 insertions(+) |
17 |
|
18 |
diff --git a/mail-client/thunderbird/files/thunderbird-60.0-rust-1.29-comp.patch b/mail-client/thunderbird/files/thunderbird-60.0-rust-1.29-comp.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..6fbd13fe639 |
21 |
--- /dev/null |
22 |
+++ b/mail-client/thunderbird/files/thunderbird-60.0-rust-1.29-comp.patch |
23 |
@@ -0,0 +1,37 @@ |
24 |
+https://bugs.gentoo.org/666898 |
25 |
+ |
26 |
+https://bugzilla.mozilla.org/show_bug.cgi?id=1479540 |
27 |
+--- a/build/moz.configure/init.configure |
28 |
++++ b/build/moz.configure/init.configure |
29 |
+@@ -572,17 +572,26 @@ option('--target', nargs=1, |
30 |
+ @imports(_from='__builtin__', _import='KeyError') |
31 |
+ @imports(_from='__builtin__', _import='ValueError') |
32 |
+ def split_triplet(triplet, allow_unknown=False): |
33 |
+ # The standard triplet is defined as |
34 |
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM |
35 |
+ # There is also a quartet form: |
36 |
+ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM |
37 |
+ # But we can consider the "KERNEL-OPERATING_SYSTEM" as one. |
38 |
+- cpu, manufacturer, os = triplet.split('-', 2) |
39 |
++ # Additionally, some may omit "unknown" when the manufacturer |
40 |
++ # is not specified and emit |
41 |
++ # CPU_TYPE-OPERATING_SYSTEM |
42 |
++ parts = triplet.split('-', 2) |
43 |
++ if len(parts) == 3: |
44 |
++ cpu, _, os = parts |
45 |
++ elif len(parts) == 2: |
46 |
++ cpu, os = parts |
47 |
++ else: |
48 |
++ die("Unexpected triplet string: %s" % triplet) |
49 |
+ |
50 |
+ # Autoconf uses config.sub to validate and canonicalize those triplets, |
51 |
+ # but the granularity of its results has never been satisfying to our |
52 |
+ # use, so we've had our own, different, canonicalization. We've also |
53 |
+ # historically not been very consistent with how we use the canonicalized |
54 |
+ # values. Hopefully, this will help us make things better. |
55 |
+ # The tests are inherited from our decades-old autoconf-based configure, |
56 |
+ # which can probably be improved/cleaned up because they are based on a |
57 |
+ |
58 |
+ |
59 |
+ |
60 |
+ |
61 |
|
62 |
diff --git a/mail-client/thunderbird/thunderbird-60.0-r3.ebuild b/mail-client/thunderbird/thunderbird-60.0-r3.ebuild |
63 |
index f9ecfc86791..86b25342c2a 100644 |
64 |
--- a/mail-client/thunderbird/thunderbird-60.0-r3.ebuild |
65 |
+++ b/mail-client/thunderbird/thunderbird-60.0-r3.ebuild |
66 |
@@ -195,6 +195,7 @@ src_prepare() { |
67 |
|| die |
68 |
eapply "${WORKDIR}/firefox" |
69 |
eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316 |
70 |
+ eapply "${FILESDIR}"/${PN}-60.0-rust-1.29-comp.patch |
71 |
|
72 |
# Ensure that are plugins dir is enabled as default |
73 |
sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \ |