| 1 |
commit: cfdf79384bbc9e7164a75eea6110642c5cb66a0a |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 5 02:22:45 2015 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 5 02:22:45 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfdf7938 |
| 7 |
|
| 8 |
www-client/firefox: remove conflicting patch, force nss/nspr for security bug 564834 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
www-client/firefox/firefox-38.4.0.ebuild | 5 +++-- |
| 13 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/www-client/firefox/firefox-38.4.0.ebuild b/www-client/firefox/firefox-38.4.0.ebuild |
| 16 |
index a4db9de..9c008b5 100644 |
| 17 |
--- a/www-client/firefox/firefox-38.4.0.ebuild |
| 18 |
+++ b/www-client/firefox/firefox-38.4.0.ebuild |
| 19 |
@@ -55,8 +55,8 @@ ASM_DEPEND=">=dev-lang/yasm-1.1" |
| 20 |
|
| 21 |
# Mesa 7.10 needed for WebGL + bugfixes |
| 22 |
RDEPEND=" |
| 23 |
- >=dev-libs/nss-3.19.2 |
| 24 |
- >=dev-libs/nspr-4.10.8 |
| 25 |
+ >=dev-libs/nss-3.20.1 |
| 26 |
+ >=dev-libs/nspr-4.10.10 |
| 27 |
selinux? ( sec-policy/selinux-mozilla )" |
| 28 |
|
| 29 |
DEPEND="${RDEPEND} |
| 30 |
@@ -139,6 +139,7 @@ src_prepare() { |
| 31 |
# Apply our patches |
| 32 |
EPATCH_SUFFIX="patch" \ |
| 33 |
EPATCH_FORCE="yes" \ |
| 34 |
+ EPATCH_EXCLUDE="8011_bug1194520-freetype261_until_moz43.patch" \ |
| 35 |
epatch "${WORKDIR}/firefox" |
| 36 |
|
| 37 |
# Allow user to apply any additional patches without modifing ebuild |
Archives