Fixed compilation with >=curl-7.21.7 (bug #375899)

(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

7 files changed, 100 insertions, 8 deletions

diff --git a/www-client/icecat/ChangeLog b/www-client/icecat/ChangeLog
index 7c01238c975b..4dd9ab944f2c 100644
--- a/www-client/icecat/ChangeLog
+++ b/www-client/icecat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/icecat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.92 2011/07/06 23:43:49 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.93 2011/07/26 13:11:03 polynomial-c Exp $
+
+  26 Jul 2011; Lars Wendler <polynomial-c@gentoo.org> icecat-3.6.16-r1.ebuild,
+  icecat-3.6.16-r2.ebuild, +files/icecat-3.6.16-curl7217-includes-fix.patch,
+  icecat-4.0.1-r1.ebuild, icecat-5.0-r1.ebuild,
+  +files/icecat-5.0-curl7217-includes-fix.patch:
+  Fixed compilation with >=curl-7.21.7 (bug #375899).
 
 *icecat-5.0-r1 (06 Jul 2011)
 
diff --git a/www-client/icecat/files/icecat-3.6.16-curl7217-includes-fix.patch b/www-client/icecat/files/icecat-3.6.16-curl7217-includes-fix.patch
new file mode 100644
index 000000000000..7ab201d8f6da
--- /dev/null
+++ b/www-client/icecat/files/icecat-3.6.16-curl7217-includes-fix.patch
@@ -0,0 +1,40 @@
+--- icecat-3.6.16/config/system-headers
++++ icecat-3.6.16/config/system-headers
+@@ -203,7 +203,6 @@
+ ctype.h
+ curl/curl.h
+ curl/easy.h
+-curl/types.h
+ curses.h
+ cxxabi.h
+ DateTimeUtils.h
+--- icecat-3.6.16/js/src/config/system-headers
++++ icecat-3.6.16/js/src/config/system-headers
+@@ -203,7 +203,6 @@
+ ctype.h
+ curl/curl.h
+ curl/easy.h
+-curl/types.h
+ curses.h
+ cxxabi.h
+ DateTimeUtils.h
+--- icecat-3.6.16/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
++++ icecat-3.6.16/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
+@@ -31,7 +31,6 @@
+ #include <dlfcn.h>
+ #include <curl/curl.h>
+ #include <curl/easy.h>
+-#include <curl/types.h>
+ 
+ #include "common/linux/http_upload.h"
+ 
+--- icecat-3.6.16/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
++++ icecat-3.6.16/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
+@@ -29,7 +29,6 @@
+ 
+ #include <curl/curl.h>
+ #include <curl/easy.h>
+-#include <curl/types.h>
+ #include <dlfcn.h>
+ 
+ #include <string>
diff --git a/www-client/icecat/files/icecat-5.0-curl7217-includes-fix.patch b/www-client/icecat/files/icecat-5.0-curl7217-includes-fix.patch
new file mode 100644
index 000000000000..46853697a227
--- /dev/null
+++ b/www-client/icecat/files/icecat-5.0-curl7217-includes-fix.patch
@@ -0,0 +1,40 @@
+--- icecat-5.0/config/system-headers
++++ icecat-5.0/config/system-headers
+@@ -207,7 +207,6 @@
+ ctype.h
+ curl/curl.h
+ curl/easy.h
+-curl/types.h
+ curses.h
+ cxxabi.h
+ DateTimeUtils.h
+--- icecat-5.0/js/src/config/system-headers
++++ icecat-5.0/js/src/config/system-headers
+@@ -207,7 +207,6 @@
+ ctype.h
+ curl/curl.h
+ curl/easy.h
+-curl/types.h
+ curses.h
+ cxxabi.h
+ DateTimeUtils.h
+--- icecat-5.0/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
++++ icecat-5.0/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
+@@ -33,7 +33,6 @@
+ #include <dlfcn.h>
+ #include <curl/curl.h>
+ #include <curl/easy.h>
+-#include <curl/types.h>
+ 
+ namespace {
+ 
+--- icecat-5.0/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
++++ icecat-5.0/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
+@@ -29,7 +29,6 @@
+ 
+ #include <curl/curl.h>
+ #include <curl/easy.h>
+-#include <curl/types.h>
+ #include <dlfcn.h>
+ 
+ #include <iostream>
diff --git a/www-client/icecat/icecat-3.6.16-r1.ebuild b/www-client/icecat/icecat-3.6.16-r1.ebuild
index 2b007238715c..2f22a2e79bff 100644
--- a/www-client/icecat/icecat-3.6.16-r1.ebuild
+++ b/www-client/icecat/icecat-3.6.16-r1.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/icecat/icecat-3.6.16-r1.ebuild,v 1.5 2011/06/21 12:34:27 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.16-r1.ebuild,v 1.6 2011/07/26 13:11:03 polynomial-c Exp $
 EAPI="3"
 WANT_AUTOCONF="2.1"
 
@@ -129,6 +129,8 @@ src_prepare() {
 	# Make this a 3.6.17 version
 	epatch "${DISTDIR}"/ff3617.diff.xz
 
+	epatch "${FILESDIR}"/${PN}-3.6.16-curl7217-includes-fix.patch
+
 	# Integrate rebranding
 	sed -i "s|/firefox|/icecat|" \
 		"${WORKDIR}"/001-firefox_gentoo_install_dirs.patch
diff --git a/www-client/icecat/icecat-3.6.16-r2.ebuild b/www-client/icecat/icecat-3.6.16-r2.ebuild
index 9117a67841e4..3e927b087f76 100644
--- a/www-client/icecat/icecat-3.6.16-r2.ebuild
+++ b/www-client/icecat/icecat-3.6.16-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/icecat/icecat-3.6.16-r2.ebuild,v 1.2 2011/06/23 11:13:10 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.16-r2.ebuild,v 1.3 2011/07/26 13:11:03 polynomial-c Exp $
 EAPI="3"
 WANT_AUTOCONF="2.1"
 
@@ -130,6 +130,8 @@ src_prepare() {
 	# Make this a 3.6.17 version
 	epatch "${DISTDIR}"/ff3617.diff.xz "${DISTDIR}"/ff3618.diff.xz
 
+	epatch "${FILESDIR}"/${PN}-3.6.16-curl7217-includes-fix.patch
+
 	# Integrate rebranding
 	sed -i "s|/firefox|/icecat|" \
 		"${WORKDIR}"/001-firefox_gentoo_install_dirs.patch
diff --git a/www-client/icecat/icecat-4.0.1-r1.ebuild b/www-client/icecat/icecat-4.0.1-r1.ebuild
index 6634263aae3d..7547830222e4 100644
--- a/www-client/icecat/icecat-4.0.1-r1.ebuild
+++ b/www-client/icecat/icecat-4.0.1-r1.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/icecat/icecat-4.0.1-r1.ebuild,v 1.3 2011/06/21 12:34:27 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-4.0.1-r1.ebuild,v 1.4 2011/07/26 13:11:03 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -124,8 +124,9 @@ src_prepare() {
 	epatch "${WORKDIR}"
 
 	epatch "${FILESDIR}"/2000-icecat_gentoo_install_dirs.patch \
-		"${FILESDIR}"/5001_fix-prefs-directory.patch
-	epatch "${FILESDIR}"/fix-preferences-gentoo.patch
+		"${FILESDIR}"/5001_fix-prefs-directory.patch \
+		"${FILESDIR}"/fix-preferences-gentoo.patch \
+		"${FILESDIR}"/${PN}-5.0-curl7217-includes-fix.patch
 
 	# Fix rebranding
 	sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefile.in
diff --git a/www-client/icecat/icecat-5.0-r1.ebuild b/www-client/icecat/icecat-5.0-r1.ebuild
index b59c1d7106cb..47d27d33b009 100644
--- a/www-client/icecat/icecat-5.0-r1.ebuild
+++ b/www-client/icecat/icecat-5.0-r1.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/icecat/icecat-5.0-r1.ebuild,v 1.1 2011/07/06 23:43:49 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-5.0-r1.ebuild,v 1.2 2011/07/26 13:11:03 polynomial-c Exp $
 
 EAPI="3"
 VIRTUALX_REQUIRED="pgo"
@@ -148,7 +148,8 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"
 
-	epatch "${FILESDIR}"/2000-icecat-5_gentoo_install_dirs.patch
+	epatch "${FILESDIR}"/2000-icecat-5_gentoo_install_dirs.patch \
+		"${FILESDIR}"/${PN}-5.0-curl7217-includes-fix.patch
 
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user