summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2012-09-07 23:40:24 +0000
committerJory Pratt <anarchy@gentoo.org>2012-09-07 23:40:24 +0000
commit2214ae9118e494312118a88bf0f5468a158ae277 (patch)
treed086c9da34d11c224cac431ace7c611bfdc801a1 /mail-client
parentStable ppc, bug #434030 (diff)
downloadgentoo-2-2214ae9118e494312118a88bf0f5468a158ae277.tar.gz
gentoo-2-2214ae9118e494312118a88bf0f5468a158ae277.tar.bz2
gentoo-2-2214ae9118e494312118a88bf0f5468a158ae277.zip
Address failing patch, bug #434100
(Portage version: 2.1.11.13/cvs/Linux x86_64)
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/thunderbird/ChangeLog5
-rw-r--r--mail-client/thunderbird/thunderbird-10.0.7.ebuild6
2 files changed, 8 insertions, 3 deletions
diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index 21f2f2b27572..d621d3079bbc 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for mail-client/thunderbird
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.164 2012/09/01 23:29:58 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.165 2012/09/07 23:40:24 anarchy Exp $
+
+ 07 Sep 2012; <anarchy@gentoo.org> thunderbird-10.0.7.ebuild:
+ Exclude failing resource_urls patch in esr release
*thunderbird-15.0 (01 Sep 2012)
*thunderbird-10.0.7 (01 Sep 2012)
diff --git a/mail-client/thunderbird/thunderbird-10.0.7.ebuild b/mail-client/thunderbird/thunderbird-10.0.7.ebuild
index 4fb32586eeef..ba7407e02f86 100644
--- a/mail-client/thunderbird/thunderbird-10.0.7.ebuild
+++ b/mail-client/thunderbird/thunderbird-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/mail-client/thunderbird/thunderbird-10.0.7.ebuild,v 1.1 2012/09/01 23:29:58 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.7.ebuild,v 1.2 2012/09/07 23:40:24 anarchy Exp $
EAPI="3"
WANT_AUTOCONF="2.1"
@@ -115,7 +115,9 @@ src_prepare() {
# Apply our patchset from firefox to thunderbird as well
pushd "${S}"/mozilla &>/dev/null || die
- 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"