| 1 |
commit: e530a268c3003ad7455cad8fe0b5b8bf23f8f21a |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 25 17:27:25 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 25 17:28:00 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e530a268 |
| 7 |
|
| 8 |
www-client/firefox: don't use rustfmt |
| 9 |
|
| 10 |
In addition, move eapply_user to the beginning of src_prepare to increase |
| 11 |
the chance to apply upstream patches without the need for changes. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/669548 |
| 14 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 15 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 16 |
|
| 17 |
www-client/firefox/firefox-63.0.ebuild | 9 +++++++-- |
| 18 |
1 file changed, 7 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/www-client/firefox/firefox-63.0.ebuild b/www-client/firefox/firefox-63.0.ebuild |
| 21 |
index 78eee6a7e4e..3b7c9d2ecfd 100644 |
| 22 |
--- a/www-client/firefox/firefox-63.0.ebuild |
| 23 |
+++ b/www-client/firefox/firefox-63.0.ebuild |
| 24 |
@@ -180,6 +180,9 @@ src_unpack() { |
| 25 |
src_prepare() { |
| 26 |
eapply "${WORKDIR}/firefox" |
| 27 |
|
| 28 |
+ # Allow user to apply any additional patches without modifing ebuild |
| 29 |
+ eapply_user |
| 30 |
+ |
| 31 |
# Enable gnomebreakpad |
| 32 |
if use debug ; then |
| 33 |
sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \ |
| 34 |
@@ -221,8 +224,10 @@ src_prepare() { |
| 35 |
sed '/^MOZ_DEV_EDITION=1/d' \ |
| 36 |
-i "${S}"/browser/branding/aurora/configure.sh || die |
| 37 |
|
| 38 |
- # Allow user to apply any additional patches without modifing ebuild |
| 39 |
- eapply_user |
| 40 |
+ # rustfmt, a tool to format Rust code, is optional and not required to build Firefox. |
| 41 |
+ # However, when available, an unsupported version can cause problems, bug #669548 |
| 42 |
+ sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \ |
| 43 |
+ "${S}"/build/moz.configure/rust.configure || die |
| 44 |
|
| 45 |
# Autotools configure is now called old-configure.in |
| 46 |
# This works because there is still a configure.in that happens to be for the |
Archives