| 1 |
commit: b1e7185593b8d3f4c46481d43da41176c5628126 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 28 11:39:43 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 28 11:43:51 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1e71855 |
| 7 |
|
| 8 |
www-client/firefox: 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/firefox-60.0-rust-1.29-comp.patch | 37 ++++++++++++++++++++++ |
| 15 |
www-client/firefox/firefox-60.2.1-r1.ebuild | 1 + |
| 16 |
www-client/firefox/firefox-62.0.2.ebuild | 1 + |
| 17 |
3 files changed, 39 insertions(+) |
| 18 |
|
| 19 |
diff --git a/www-client/firefox/files/firefox-60.0-rust-1.29-comp.patch b/www-client/firefox/files/firefox-60.0-rust-1.29-comp.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..6fbd13fe639 |
| 22 |
--- /dev/null |
| 23 |
+++ b/www-client/firefox/files/firefox-60.0-rust-1.29-comp.patch |
| 24 |
@@ -0,0 +1,37 @@ |
| 25 |
+https://bugs.gentoo.org/666898 |
| 26 |
+ |
| 27 |
+https://bugzilla.mozilla.org/show_bug.cgi?id=1479540 |
| 28 |
+--- a/build/moz.configure/init.configure |
| 29 |
++++ b/build/moz.configure/init.configure |
| 30 |
+@@ -572,17 +572,26 @@ option('--target', nargs=1, |
| 31 |
+ @imports(_from='__builtin__', _import='KeyError') |
| 32 |
+ @imports(_from='__builtin__', _import='ValueError') |
| 33 |
+ def split_triplet(triplet, allow_unknown=False): |
| 34 |
+ # The standard triplet is defined as |
| 35 |
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM |
| 36 |
+ # There is also a quartet form: |
| 37 |
+ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM |
| 38 |
+ # But we can consider the "KERNEL-OPERATING_SYSTEM" as one. |
| 39 |
+- cpu, manufacturer, os = triplet.split('-', 2) |
| 40 |
++ # Additionally, some may omit "unknown" when the manufacturer |
| 41 |
++ # is not specified and emit |
| 42 |
++ # CPU_TYPE-OPERATING_SYSTEM |
| 43 |
++ parts = triplet.split('-', 2) |
| 44 |
++ if len(parts) == 3: |
| 45 |
++ cpu, _, os = parts |
| 46 |
++ elif len(parts) == 2: |
| 47 |
++ cpu, os = parts |
| 48 |
++ else: |
| 49 |
++ die("Unexpected triplet string: %s" % triplet) |
| 50 |
+ |
| 51 |
+ # Autoconf uses config.sub to validate and canonicalize those triplets, |
| 52 |
+ # but the granularity of its results has never been satisfying to our |
| 53 |
+ # use, so we've had our own, different, canonicalization. We've also |
| 54 |
+ # historically not been very consistent with how we use the canonicalized |
| 55 |
+ # values. Hopefully, this will help us make things better. |
| 56 |
+ # The tests are inherited from our decades-old autoconf-based configure, |
| 57 |
+ # which can probably be improved/cleaned up because they are based on a |
| 58 |
+ |
| 59 |
+ |
| 60 |
+ |
| 61 |
+ |
| 62 |
|
| 63 |
diff --git a/www-client/firefox/firefox-60.2.1-r1.ebuild b/www-client/firefox/firefox-60.2.1-r1.ebuild |
| 64 |
index 03ffedb5a69..89ad061bccf 100644 |
| 65 |
--- a/www-client/firefox/firefox-60.2.1-r1.ebuild |
| 66 |
+++ b/www-client/firefox/firefox-60.2.1-r1.ebuild |
| 67 |
@@ -126,6 +126,7 @@ src_prepare() { |
| 68 |
|
| 69 |
eapply "${FILESDIR}"/bug_1461221.patch |
| 70 |
eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316 |
| 71 |
+ eapply "${FILESDIR}"/${PN}-60.0-rust-1.29-comp.patch |
| 72 |
|
| 73 |
# Enable gnomebreakpad |
| 74 |
if use debug ; then |
| 75 |
|
| 76 |
diff --git a/www-client/firefox/firefox-62.0.2.ebuild b/www-client/firefox/firefox-62.0.2.ebuild |
| 77 |
index 426d2ba9bc0..82a6728b4ee 100644 |
| 78 |
--- a/www-client/firefox/firefox-62.0.2.ebuild |
| 79 |
+++ b/www-client/firefox/firefox-62.0.2.ebuild |
| 80 |
@@ -187,6 +187,7 @@ src_prepare() { |
| 81 |
eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316 |
| 82 |
eapply "${FILESDIR}"/${PN}-60.0-do-not-force-lld.patch |
| 83 |
eapply "${FILESDIR}"/${PN}-60.0-sandbox-lto.patch # 666580 |
| 84 |
+ eapply "${FILESDIR}"/${PN}-60.0-rust-1.29-comp.patch |
| 85 |
|
| 86 |
# Enable gnomebreakpad |
| 87 |
if use debug ; then |
Archives