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 946EF13908F for ; Sat, 28 Jan 2017 00:31:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23655E0DBB; Sat, 28 Jan 2017 00:31:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EE691E0DBB for ; Sat, 28 Jan 2017 00:31:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E6B6341662 for ; Sat, 28 Jan 2017 00:31:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D2AC43239 for ; Sat, 28 Jan 2017 00:31:38 +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: <1485563472.2d67ad7b04bb26d9bc037effe1d2a936a0dfc947.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-45.7.0.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 2d67ad7b04bb26d9bc037effe1d2a936a0dfc947 X-VCS-Branch: master Date: Sat, 28 Jan 2017 00:31:38 +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-Archives-Salt: 660d2ce0-946c-447e-a1ae-4e8c6c6017e9 X-Archives-Hash: 411c6078087ea2f7c8a58fb619d84daa commit: 2d67ad7b04bb26d9bc037effe1d2a936a0dfc947 Author: Jory A. Pratt gentoo org> AuthorDate: Sat Jan 28 00:31:12 2017 +0000 Commit: Jory Pratt gentoo org> CommitDate: Sat Jan 28 00:31:12 2017 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=2d67ad7b www-client/firefox - sync esr ebuild with tree www-client/firefox/firefox-45.7.0.ebuild | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/www-client/firefox/firefox-45.7.0.ebuild b/www-client/firefox/firefox-45.7.0.ebuild index 34f9e6c..9ad87f2 100644 --- a/www-client/firefox/firefox-45.7.0.ebuild +++ b/www-client/firefox/firefox-45.7.0.ebuild @@ -28,8 +28,8 @@ fi PATCH="${PN}-45.0-patches-10" MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases" -MOZCONFIG_OPTIONAL_GTK3=1 -MOZCONFIG_OPTIONAL_QT5=1 +# Kill gtk3 support since gtk+-3.20 breaks it hard prior to 48.0 +#MOZCONFIG_OPTIONAL_GTK3=1 MOZCONFIG_OPTIONAL_WIFI=1 MOZCONFIG_OPTIONAL_JIT="enabled" @@ -54,9 +54,7 @@ SRC_URI="${SRC_URI} ASM_DEPEND=">=dev-lang/yasm-1.1" # Mesa 7.10 needed for WebGL + bugfixes -# gtk3 from 3.20 and above fails hard, limit it RDEPEND=" - gtk3? ( =dev-libs/nss-3.21.1 >=dev-libs/nspr-4.12 selinux? ( sec-policy/selinux-mozilla )" @@ -131,8 +129,7 @@ src_unpack() { src_prepare() { # Apply our patches - eapply "${WORKDIR}/firefox" \ - "${FILESDIR}"/${PN}-45-qt-widget-fix.patch + eapply "${WORKDIR}/firefox" # Allow user to apply any additional patches without modifing ebuild eapply_user