Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/
Date: Wed, 04 Sep 2019 18:59:11
Message-Id: 1567623527.92450dbca756a99056bb397cdaec453f75a8847c.whissi@gentoo
1 commit: 92450dbca756a99056bb397cdaec453f75a8847c
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 4 18:49:27 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 4 18:58:47 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92450dbc
7
8 www-client/firefox: re-enable USE=pgo for USE=wayland
9
10 Backport of commit 125dfa502a876811160290cb21348daa26f81ce3.
11
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 www-client/firefox/firefox-69.0.ebuild | 16 ++++++++--------
15 1 file changed, 8 insertions(+), 8 deletions(-)
16
17 diff --git a/www-client/firefox/firefox-69.0.ebuild b/www-client/firefox/firefox-69.0.ebuild
18 index 879b6e94338..125ff3d5f5d 100644
19 --- a/www-client/firefox/firefox-69.0.ebuild
20 +++ b/www-client/firefox/firefox-69.0.ebuild
21 @@ -167,12 +167,7 @@ DEPEND="${CDEPEND}
22 x86? ( >=dev-lang/nasm-2.13 )
23 )"
24
25 -# We use virtx eclass which cannot handle wayland
26 -REQUIRED_USE="wifi? ( dbus )
27 - pgo? (
28 - lto
29 - !wayland
30 - )"
31 +REQUIRED_USE="pgo? ( lto )"
32
33 RESTRICT="!test? ( test )"
34
35 @@ -594,8 +589,13 @@ src_compile() {
36 addpredict /etc/gconf
37 fi
38
39 - MOZ_MAKE_FLAGS="${MAKEOPTS} -O" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 ${_virtx} \
40 - ./mach build --verbose || die
41 + GDK_BACKEND=x11 \
42 + MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
43 + SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
44 + MOZ_NOSPAM=1 \
45 + ${_virtx} \
46 + ./mach build --verbose \
47 + || die
48 }
49
50 src_install() {