summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2012-09-07 23:25:16 +0000
committerJory Pratt <anarchy@gentoo.org>2012-09-07 23:25:16 +0000
commite1df709dc960ad0f46480fcfe49ff2ef33d113d5 (patch)
tree661a6ba21b80de5ef9296127fc10df830461d0ab /www-client/firefox
parentBug #415693: version bump. (diff)
downloadgentoo-2-e1df709dc960ad0f46480fcfe49ff2ef33d113d5.tar.gz
gentoo-2-e1df709dc960ad0f46480fcfe49ff2ef33d113d5.tar.bz2
gentoo-2-e1df709dc960ad0f46480fcfe49ff2ef33d113d5.zip
Address failing patch, bug #434100
(Portage version: 2.1.11.13/cvs/Linux x86_64)
Diffstat (limited to 'www-client/firefox')
-rw-r--r--www-client/firefox/ChangeLog7
-rw-r--r--www-client/firefox/firefox-10.0.7.ebuild6
2 files changed, 9 insertions, 4 deletions
diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index 6910366e574d..97461e3e611c 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for www-client/firefox
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.175 2012/09/07 00:32:29 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.176 2012/09/07 23:25:16 anarchy Exp $
+
+ 07 Sep 2012; <anarchy@gentoo.org> firefox-10.0.7.ebuild:
+ Exclude failing resource_urls patch in esr release
*firefox-15.0.1 (07 Sep 2012)
07 Sep 2012; <anarchy@gentoo.org> +firefox-15.0.1.ebuild,
-firefox-14.0.1.ebuild, -firefox-15.0.ebuild:
- --echangelog=yes
+ Update for private browsing issues
*firefox-15.0 (01 Sep 2012)
*firefox-10.0.7 (01 Sep 2012)
diff --git a/www-client/firefox/firefox-10.0.7.ebuild b/www-client/firefox/firefox-10.0.7.ebuild
index 6cd8d4febf09..66f5b94ec2cd 100644
--- a/www-client/firefox/firefox-10.0.7.ebuild
+++ b/www-client/firefox/firefox-10.0.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-10.0.7.ebuild,v 1.1 2012/09/01 23:44:39 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-10.0.7.ebuild,v 1.2 2012/09/07 23:25:16 anarchy Exp $
EAPI="3"
VIRTUALX_REQUIRED="pgo"
@@ -136,7 +136,9 @@ src_unpack() {
src_prepare() {
# Apply our patches
- EPATCH_EXCLUDE="6012_fix_shlibsign.patch 6013_fix_abort_declaration.patch" \
+ EPATCH_EXCLUDE="5005_use_resource_urls_appropriately.patch
+ 6012_fix_shlibsign.patch
+ 6013_fix_abort_declaration.patch" \
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/firefox"