summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2019-08-16 14:05:05 +0200
committerThomas Deutschmann <whissi@gentoo.org>2019-08-16 14:05:05 +0200
commit125dfa502a876811160290cb21348daa26f81ce3 (patch)
tree30bd0c9d5c5566abc499407c9ac9bec96608b858
parentapp-admin/kpcli: clean old (diff)
downloadgentoo-125dfa50.tar.gz
gentoo-125dfa50.tar.bz2
gentoo-125dfa50.zip
www-client/firefox: re-enable USE=pgo for USE=wayland
Forcing GDK_BACKEND=x11 during build should be enough. Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rw-r--r--www-client/firefox/firefox-68.0.2.ebuild15
1 files changed, 8 insertions, 7 deletions
diff --git a/www-client/firefox/firefox-68.0.2.ebuild b/www-client/firefox/firefox-68.0.2.ebuild
index 39bdfe00f4fb..c3b6f387d562 100644
--- a/www-client/firefox/firefox-68.0.2.ebuild
+++ b/www-client/firefox/firefox-68.0.2.ebuild
@@ -169,10 +169,7 @@ DEPEND="${CDEPEND}
# We use virtx eclass which cannot handle wayland
REQUIRED_USE="wifi? ( dbus )
- pgo? (
- lto
- !wayland
- )"
+ pgo? ( lto )"
S="${WORKDIR}/firefox-${PV%_*}"
@@ -259,7 +256,6 @@ src_unpack() {
}
src_prepare() {
- use !wayland && rm -f "${WORKDIR}/firefox/2019_mozilla-bug1539471.patch"
eapply "${WORKDIR}/firefox"
# Allow user to apply any additional patches without modifing ebuild
@@ -586,8 +582,13 @@ src_compile() {
addpredict /etc/gconf
fi
- MOZ_MAKE_FLAGS="${MAKEOPTS} -O" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 ${_virtx} \
- ./mach build --verbose || die
+ GDK_BACKEND=x11 \
+ MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
+ SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+ MOZ_NOSPAM=1 \
+ ${_virtx} \
+ ./mach build --verbose \
+ || die
}
src_install() {