www-client/firefox: add rust-1.29+ support

Closes: https://bugs.gentoo.org/666898
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

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
new file mode 100644 (file)
index 0000000..6fbd13f
--- /dev/null
+++ b/www-client/firefox/files/firefox-60.0-rust-1.29-comp.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/666898
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1479540
+--- a/build/moz.configure/init.configure
++++ b/build/moz.configure/init.configure
+@@ -572,17 +572,26 @@ option('--target', nargs=1,
+ @imports(_from='__builtin__', _import='KeyError')
+ @imports(_from='__builtin__', _import='ValueError')
+ def split_triplet(triplet, allow_unknown=False):
+     # The standard triplet is defined as
+     #   CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+     # There is also a quartet form:
+     #   CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+     # But we can consider the "KERNEL-OPERATING_SYSTEM" as one.
+-    cpu, manufacturer, os = triplet.split('-', 2)
++    # Additionally, some may omit "unknown" when the manufacturer
++    # is not specified and emit
++    #   CPU_TYPE-OPERATING_SYSTEM
++    parts = triplet.split('-', 2)
++    if len(parts) == 3:
++        cpu, _, os = parts
++    elif len(parts) == 2:
++        cpu, os = parts
++    else:
++        die("Unexpected triplet string: %s" % triplet)
+ 
+     # Autoconf uses config.sub to validate and canonicalize those triplets,
+     # but the granularity of its results has never been satisfying to our
+     # use, so we've had our own, different, canonicalization. We've also
+     # historically not been very consistent with how we use the canonicalized
+     # values. Hopefully, this will help us make things better.
+     # The tests are inherited from our decades-old autoconf-based configure,
+     # which can probably be improved/cleaned up because they are based on a
+
+
+
+

diff --git a/www-client/firefox/firefox-60.2.1-r1.ebuild b/www-client/firefox/firefox-60.2.1-r1.ebuild
index 03ffedb5a69b04d2b32a0c90fd13d48a9413b889..89ad061bccf9472d05945c9f085bb1dd63d06149 100644 (file)
--- a/www-client/firefox/firefox-60.2.1-r1.ebuild
+++ b/www-client/firefox/firefox-60.2.1-r1.ebuild
@@ -126,6 +126,7 @@ src_prepare() {
 
        eapply "${FILESDIR}"/bug_1461221.patch
        eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316
+       eapply "${FILESDIR}"/${PN}-60.0-rust-1.29-comp.patch
 
        # Enable gnomebreakpad
        if use debug ; then

diff --git a/www-client/firefox/firefox-62.0.2.ebuild b/www-client/firefox/firefox-62.0.2.ebuild
index 426d2ba9bc02df8376993dddbb4de74aaeab0f19..82a6728b4eea30c2f3d55f321b92e82d178fdc47 100644 (file)
--- a/www-client/firefox/firefox-62.0.2.ebuild
+++ b/www-client/firefox/firefox-62.0.2.ebuild
@@ -187,6 +187,7 @@ src_prepare() {
        eapply "${FILESDIR}"/${PN}-60.0-blessings-TERM.patch # 654316
        eapply "${FILESDIR}"/${PN}-60.0-do-not-force-lld.patch
        eapply "${FILESDIR}"/${PN}-60.0-sandbox-lto.patch # 666580
+       eapply "${FILESDIR}"/${PN}-60.0-rust-1.29-comp.patch
 
        # Enable gnomebreakpad
        if use debug ; then