summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2018-10-25 19:29:28 +0200
committerThomas Deutschmann <whissi@gentoo.org>2018-10-25 19:29:28 +0200
commit897afd8248d60a0186c833915a67689d42dff515 (patch)
treef6a59b3da0209682ff126f3a33889149dc6b7edb
parentmail-client/thunderbird: synchronize with Gentoo (diff)
downloadmozilla-897afd8248d60a0186c833915a67689d42dff515.tar.gz
mozilla-897afd8248d60a0186c833915a67689d42dff515.tar.bz2
mozilla-897afd8248d60a0186c833915a67689d42dff515.zip
www-client/firefox: synchronize with Gentoo repository
Package-Manager: Portage-2.3.51, Repoman-2.3.11 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rw-r--r--www-client/firefox/firefox-63.0.ebuild9
1 files changed, 7 insertions, 2 deletions
diff --git a/www-client/firefox/firefox-63.0.ebuild b/www-client/firefox/firefox-63.0.ebuild
index 78eee6a..3b7c9d2 100644
--- a/www-client/firefox/firefox-63.0.ebuild
+++ b/www-client/firefox/firefox-63.0.ebuild
@@ -180,6 +180,9 @@ src_unpack() {
src_prepare() {
eapply "${WORKDIR}/firefox"
+ # Allow user to apply any additional patches without modifing ebuild
+ eapply_user
+
# Enable gnomebreakpad
if use debug ; then
sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
@@ -221,8 +224,10 @@ src_prepare() {
sed '/^MOZ_DEV_EDITION=1/d' \
-i "${S}"/browser/branding/aurora/configure.sh || die
- # Allow user to apply any additional patches without modifing ebuild
- eapply_user
+ # rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
+ # However, when available, an unsupported version can cause problems, bug #669548
+ sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
+ "${S}"/build/moz.configure/rust.configure || die
# Autotools configure is now called old-configure.in
# This works because there is still a configure.in that happens to be for the