summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2011-07-26 03:18:33 +0000
committerJory Pratt <anarchy@gentoo.org>2011-07-26 03:18:33 +0000
commiteefd89718a207d9b07438658391493e418479919 (patch)
tree2b6c0fb847f37c6ed0b1981507718f3e96634943 /www-client
parentVersion bump. Bump. Not dump. (diff)
downloadgentoo-2-eefd89718a207d9b07438658391493e418479919.tar.gz
gentoo-2-eefd89718a207d9b07438658391493e418479919.tar.bz2
gentoo-2-eefd89718a207d9b07438658391493e418479919.zip
Fix compilation with curl-7.21.7, bug #375899
(Portage version: 2.1.10.7/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/firefox/ChangeLog5
-rw-r--r--www-client/firefox/firefox-5.0-r2.ebuild9
2 files changed, 12 insertions, 2 deletions
diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index 1babd2377cc9..3e3aff7d7343 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-client/firefox
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.80 2011/07/12 14:10:23 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.81 2011/07/26 03:18:33 anarchy Exp $
+
+ 26 Jul 2011; Jory A. Pratt <anarchy@gentoo.org> firefox-5.0-r2.ebuild:
+ Fix compilation with curl-7.21.7, bug #375899
12 Jul 2011; Jeremy Olexa <darkside@gentoo.org> firefox-5.0-r2.ebuild:
Fix paths for Gentoo Prefix
diff --git a/www-client/firefox/firefox-5.0-r2.ebuild b/www-client/firefox/firefox-5.0-r2.ebuild
index 3ae48033bca0..c42ffa2567e6 100644
--- a/www-client/firefox/firefox-5.0-r2.ebuild
+++ b/www-client/firefox/firefox-5.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-5.0-r2.ebuild,v 1.2 2011/07/12 14:10:23 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-5.0-r2.ebuild,v 1.3 2011/07/26 03:18:33 anarchy Exp $
EAPI="3"
VIRTUALX_REQUIRED="pgo"
@@ -197,6 +197,13 @@ src_prepare() {
-i "${S}"/nsprpub/configure{.in,} \
|| die
+ #Fix compilation with curl-7.21.7 bug 376027
+ sed -e '/#include <curl\/types.h>/d' \
+ -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
+ -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
+ -i "${S}"/config/system-headers \
+ -i "${S}"/js/src/config/system-headers || die "Sed failed"
+
eautoreconf
cd js/src