From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 89CDA138334 for ; Wed, 4 Sep 2019 20:43:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E4F8E0841; Wed, 4 Sep 2019 20:43:44 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2AF8BE0841 for ; Wed, 4 Sep 2019 20:43:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E0E134AC24 for ; Wed, 4 Sep 2019 20:43:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C2945776 for ; Wed, 4 Sep 2019 20:43:39 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1567629804.e3baea52889e49460bd68a09ccae6e2858be07b4.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/ X-VCS-Repository: proj/mozilla X-VCS-Files: www-client/firefox/firefox-69.0.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: e3baea52889e49460bd68a09ccae6e2858be07b4 X-VCS-Branch: master Date: Wed, 4 Sep 2019 20:43:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c87c892c-7853-4e95-ab5f-412358d11ad3 X-Archives-Hash: 68908f15f09f1454010539146864cd39 commit: e3baea52889e49460bd68a09ccae6e2858be07b4 Author: Jory Pratt gentoo org> AuthorDate: Wed Sep 4 20:43:24 2019 +0000 Commit: Jory Pratt gentoo org> CommitDate: Wed Sep 4 20:43:24 2019 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=e3baea52 www-client/firefox: sync with tree Package-Manager: Portage-2.3.75, Repoman-2.3.17 Signed-off-by: Jory Pratt gentoo.org> www-client/firefox/firefox-69.0.ebuild | 37 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/www-client/firefox/firefox-69.0.ebuild b/www-client/firefox/firefox-69.0.ebuild index 815eea2..2e43398 100644 --- a/www-client/firefox/firefox-69.0.ebuild +++ b/www-client/firefox/firefox-69.0.ebuild @@ -64,7 +64,7 @@ SRC_URI="${SRC_URI} ${PATCH_URIS[@]}" CDEPEND=" - >=dev-libs/nss-3.46 + >=dev-libs/nss-3.45 >=dev-libs/nspr-4.22 dev-libs/atk dev-libs/expat @@ -79,8 +79,8 @@ CDEPEND=" >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme - || ( >=sys-apps/dbus-0.60 - >=dev-libs/dbus-glib-0.72 ) + sys-apps/dbus + dev-libs/dbus-glib startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 @@ -98,17 +98,18 @@ CDEPEND=" >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) - system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 ) + system-harfbuzz? ( >=media-libs/harfbuzz-2.5.3:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) - system-libvpx? ( - >=media-libs/libvpx-1.7.0:0=[postproc] - =dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) - wifi? ( kernel_linux? ( net-misc/networkmanager ) ) + wifi? ( + kernel_linux? ( + net-misc/networkmanager + ) + ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla )" @@ -165,12 +166,7 @@ DEPEND="${CDEPEND} x86? ( >=dev-lang/nasm-2.13 ) )" -# We use virtx eclass which cannot handle wayland -REQUIRED_USE=" - pgo? ( - lto - !wayland - )" +REQUIRED_USE="pgo? ( lto )" RESTRICT="!test? ( test )" @@ -388,6 +384,7 @@ src_configure() { show_old_compiler_warning=1 fi + # Bug 689358 append-cxxflags -flto if ! use cpu_flags_x86_avx2 ; then @@ -490,7 +487,6 @@ src_configure() { mozconfig_annotate '' --disable-gconf mozconfig_annotate '' --with-intl-api mozconfig_annotate '' --enable-system-pixman - mozconfig_annotate '' --enable-dbus # Instead of the standard --build= and --host=, mozilla uses --host instead # of --build, and --target intstead of --host. # Note, mozilla also has --build but it does not do what you think it does. @@ -590,8 +586,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() {