Gentoo Archives: gentoo-commits

From: Ian Stakenvicius <axs@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/
Date: Mon, 28 Mar 2016 15:29:09
Message-Id: 1459178932.6e29b4cead03c3fb7913639545bb56ad6d76184c.axs@gentoo
1 commit: 6e29b4cead03c3fb7913639545bb56ad6d76184c
2 Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 28 15:28:52 2016 +0000
4 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 28 15:28:52 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=6e29b4ce
7
8 fixes for firefox-46.0_beta4
9
10 www-client/firefox/firefox-46.0_beta4.ebuild | 9 +++++----
11 1 file changed, 5 insertions(+), 4 deletions(-)
12
13 diff --git a/www-client/firefox/firefox-46.0_beta4.ebuild b/www-client/firefox/firefox-46.0_beta4.ebuild
14 index ebda88f..99bda6c 100644
15 --- a/www-client/firefox/firefox-46.0_beta4.ebuild
16 +++ b/www-client/firefox/firefox-46.0_beta4.ebuild
17 @@ -57,7 +57,7 @@ ASM_DEPEND=">=dev-lang/yasm-1.1"
18
19 # Mesa 7.10 needed for WebGL + bugfixes
20 RDEPEND="
21 - >=dev-libs/nss-3.21.1
22 + >=dev-libs/nss-3.23
23 >=dev-libs/nspr-4.12
24 selinux? ( sec-policy/selinux-mozilla )"
25
26 @@ -76,9 +76,7 @@ DEPEND="${RDEPEND}
27 # https://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.xz"
28 # S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
29 #else
30 -# S="${WORKDIR}/firefox-${MOZ_PV}"
31 -# -- temporary workaround just for this beta version
32 - S="${WORKDIR}/firefox-46.0"
33 + S="${WORKDIR}/firefox-${MOZ_PV}"
34 SRC_URI="${SRC_URI}
35 ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
36 #fi
37 @@ -132,6 +130,9 @@ src_unpack() {
38 }
39
40 src_prepare() {
41 + # Clear patches no longer needed
42 + rm -f "${WORKDIR}"/firefox/8005_gtk3_fix_transparent_tooltip_bkg_bug1197165_moz47.patch
43 +
44 # Apply our patches
45 eapply "${WORKDIR}/firefox"
46 # "${FILESDIR}"/${PN}-45-qt-widget-fix.patch \