Fix compilation with curl-7.21.7, bug #375899

Package-Manager: portage-2.1.10.7/cvs/Linux x86_64

diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index 1babd2377cc943a2906fa75494e76f24ce9cd719..3e3aff7d7343c88be8f31d6efd2a05bab7e4f8d8 100644 (file)
--- 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/Manifest b/www-client/firefox/Manifest
index a4a9d47b08052b88f3650f163bf21c606d764b99..46a2f6bac00010b5ef801570a81bebd6c0bfdab7 100644 (file)
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -395,6 +395,6 @@ EBUILD firefox-3.6.12.ebuild 9391 RMD160 e4a7c868b69c1b61cd4cc2bceb145a22f9d76db
 EBUILD firefox-3.6.17.ebuild 9453 RMD160 877c8bf7441925e36687e08e598ff290b25374f1 SHA1 18b1a63b6cece37c3b94139069d5520520738ba0 SHA256 495299be97ed6b650c6d8f5f0044ec2fc74c0bfb2dc8baa79ee9801dd09de92f
 EBUILD firefox-3.6.18.ebuild 9465 RMD160 06b69070b29ff7187bb663b1007a3db1c4dae06b SHA1 6e8a2da98abd0ab6419af3be02156ca9d04ac434 SHA256 dbae0686c9bd1a6b7e12222b9c13214e3902a7d6161d83ee2b2bcda9e763435b
 EBUILD firefox-4.0.1-r1.ebuild 7999 RMD160 744aa73bc524584610bd5086a9c74519b4ada62b SHA1 190d20749be4463b594d56922bd77e19993da690 SHA256 1b426e0ea6be5c55695fd89ecbe8834b3e6469e060bad034aecfc1faf7d37770
-EBUILD firefox-5.0-r2.ebuild 10528 RMD160 476286fc937d4709b80e4bac81dc7120a16de487 SHA1 7886b911f75e794eed8ab830c642c8665772aa4a SHA256 bf06d6e4cbc6951ddd524773adb81f3af39ed94180b8b8f670d24b79d4fed160
-MISC ChangeLog 130070 RMD160 ba4de8f4ac00ce78c9053c0f652b2771d0e77265 SHA1 142ba3b7cfe0b0a2c4486d7b804544a6303d3273 SHA256 285cd5e4c66e6d69417c07a3ddcb89080d8e50be8ccdcc2810b9e4169c2f26ca
+EBUILD firefox-5.0-r2.ebuild 10884 RMD160 2364be6b15255d5c3b04538b144b5b4a26a48d27 SHA1 75063c38b2883ffca4087d4c55e626561adf3e9b SHA256 aeab9630ecea0558feaa579b6dd537c15f2209dddd9665c9b9b84fbb5088f175
+MISC ChangeLog 130191 RMD160 dfc66a3ae10a364e571ca55b910faf2840008b13 SHA1 36dbe221cae4bfa3e7e09102ee10233ceaf2450e SHA256 74b6f1014f83222ae9494bce2af92f7300ea7bee3335e43d0ffdfae813c31487
 MISC metadata.xml 984 RMD160 3d501f6e987667abce5a9f1ba7fb5894d33a0f1c SHA1 06cb2914f1c1a81b705384aa6de5c3f8733f677e SHA256 1d835af90178f4e4b26c9394808f224180bbe4b8bf3fde52df01490343308b27

diff --git a/www-client/firefox/firefox-5.0-r2.ebuild b/www-client/firefox/firefox-5.0-r2.ebuild
index 3ae48033bca0d6795e27e65a4231b43a3b44e566..c42ffa2567e6e49574a7c3b6d80af2704dca0cab 100644 (file)
--- 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