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

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

8 files changed, 120 insertions, 26 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/Manifest b/www-client/icecat/Manifest
index 20d4f77f3638..4e5d36b411e0 100644
--- a/www-client/icecat/Manifest
+++ b/www-client/icecat/Manifest
@@ -7,6 +7,8 @@ AUX 5001_fix-prefs-directory.patch 964 RMD160 d025e72b21766c727e6a226cb610d21d9a
 AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
 AUX fix-preferences-gentoo.patch 426 RMD160 83075ec3c2e4c39ba298096bd08447bb94cad34d SHA1 ffff69bcff712483d1962ce04a700748fdab24f5 SHA256 7edae5ea1efb042412d02ef00c51f5e55c4499751c240b48c7b07f69cc420d94
 AUX gentoo-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc134289a SHA1 b9efc3ef5e95ad3081f6b68d771e32e848b4b9ac SHA256 53493080276f221f1619153c114caf268206a6fa107972b33a4eb7f1c1cf6fe8
+AUX icecat-3.6.16-curl7217-includes-fix.patch 1034 RMD160 1d09ece8820f5a1069a9ea326ba69651069a2a6a SHA1 aadeec4b9379971000beec6f4761818bfb7626a8 SHA256 6b9a70565dcee577daf8d1880eb8dd19ce48a2840d5c23355d5ef4c8c6132afd
+AUX icecat-5.0-curl7217-includes-fix.patch 986 RMD160 e065aff5df8229c17c7cf67e783c19e4936e9585 SHA1 bd81e2f1982ed73fa721adc798ccbaaee6bd3898 SHA256 486e58378a555ee529d1bd1d3c9bcdc3b3a5219516ab53c631a3c248f2a53444
 AUX icon/icecat.desktop 245 RMD160 3cef06f5a0280d91ce56b3d1e29ac931c88b9cc2 SHA1 245a7edffd6d3a78f0d4f90269adbfa1076f467c SHA256 3797d3c1ceafe3951a8cd0c1c06520efabb4b38b6da1e6977b470a4b971ac909
 DIST ff3617.diff.xz 255324 RMD160 0bb953b177d1fcc1e9083fe6b9495e2294183aa2 SHA1 c9c6f00424339454d092da28f233ddbb2722d556 SHA256 3078f25fa2745cbe03ab6e5661a03580645e2b2a77e392b2d0f8633b532b33b2
 DIST ff3618.diff.xz 20160 RMD160 7ed6b8d143b01e3998d867a2789e3116b541b472 SHA1 4a754fb15a10e5399f50f5eaef7fc4c3ac506ddd SHA256 1b2346f9bfde56a342e73a2a0c3a4f29a9873ea0b18137a60fd978fd11b62176
@@ -238,26 +240,26 @@ DIST icecat-5.0-uk.xpi 269755 RMD160 5e65854ab2bb21d80133a08b5245397be8da945f SH
 DIST icecat-5.0-vi.xpi 249405 RMD160 7e3a85fa420f676c6b6f7a77d9fb6105782d8f51 SHA1 bda361b17c67670db4d78b5341b5b10c9d67bef2 SHA256 5bc1ae0b236a85ff706d07e288b6537ad5fd864b0aca0f0581f40736a599a3d2
 DIST icecat-5.0-zu.xpi 237169 RMD160 8b51c6ff36ec1e15ac5def94dc6c55478939755b SHA1 0cbb0af0efcde588f1517d78352f09e8156f6c0f SHA256 fc7b7e9a55b1a3da4b53f9f8b31b8759ec560a98070b50135295dfbd4c826adb
 DIST icecat-5.0.tar.bz2 66222560 RMD160 72bc9a591b807f4c5d5a4bd23567beaeab69c03e SHA1 0b529b152d470a13879dec0f85e3d0908edce3f8 SHA256 aa0ad89c680676e460ad9cf9ee239773c830720ef8b6d567b0341d126264b86e
-EBUILD icecat-3.6.16-r1.ebuild 8865 RMD160 7dd7d5480f85d2a1bf5e98b77c94d81451900ccc SHA1 73f6009b89e6cd3bdc8c9121b45e171a138d4eef SHA256 a3ed37f4b328df7ae42a70b780f9259b15ca4acf9981bcb76590e826e307acd6
-EBUILD icecat-3.6.16-r2.ebuild 8961 RMD160 cd95bebc03a4736d2c6fd693deddff6de66c9e19 SHA1 afa4ca7f086441dad89b08dba33f54299176e922 SHA256 85a95c1bd94f54a74d5f9637d0cb646633f94598def03b6d299ef2a01432f2dc
-EBUILD icecat-4.0.1-r1.ebuild 7616 RMD160 4fe20e8e5d02ba37fd6b40ff36cfbd7839741548 SHA1 9fd7329b0d662974022c56a3960966ebd9fe2651 SHA256 c8cb2a5e919baad27df2278c2967d2b97cb73c1bf74f9df4b09b511c6c88e3b2
-EBUILD icecat-5.0-r1.ebuild 9492 RMD160 bfff8a1d4204702ea0c2a8f38fc9e852c1473331 SHA1 16a36845eb86a16f0b6b4d24ad50fd697a4a0583 SHA256 fd8019e00e7d19d621a879d8181483d7aec9ec4824fffa5f6ff8e05ab7b03f6e
-MISC ChangeLog 13561 RMD160 682d00c85b6b5f9bfdb8808b83fee3fd58bd961d SHA1 d2cc59d500a89d12d6bb66b10719be77ac814f9a SHA256 dee8fd5cd25ce6c6dc536f63d0329a5e75d951e5d9092fd7bf58ca675c63d62c
+EBUILD icecat-3.6.16-r1.ebuild 8933 RMD160 6bafa2fbb7108579d3ce8f061fa667727e36a9f7 SHA1 379f36c025e5489bb177644f4b47340207610f27 SHA256 91bf9b4f6c1402a2563f84593ba3eb01d989b2a70397e90e2cf26ac309db4e9c
+EBUILD icecat-3.6.16-r2.ebuild 9025 RMD160 95f64de8ebf256546f70fb14057b5693d6f431c8 SHA1 939caa0b1cc4e24ee567f41a2e0e67209f664f30 SHA256 654f15a3fc820386dd0c574b7e99202f278b1b1ca7babc17469e88dddd29f9cb
+EBUILD icecat-4.0.1-r1.ebuild 7672 RMD160 05048132b09d3f7d80f786741686560a1dab4f2e SHA1 a67060813179a2ed21432e862e589a6919586e1a SHA256 63b8bf39beba5b920fde5762582b98006feedf8f42b7ea2adab201b52d63d94f
+EBUILD icecat-5.0-r1.ebuild 9548 RMD160 feb72b41c5cf41d5f34091e80e3776193d98b5ad SHA1 bf15a50d380a00334e1e6107aa23fdeaad75c23f SHA256 02d049198f3af6bd8b338fec29d55b60f6938b1c2cc93abb39a30527ef3ad324
+MISC ChangeLog 13869 RMD160 d2fa65c653b14a793f1158b9b2a61b1e14208820 SHA1 9a0980aeea47c1fcf2f68d58c36815edef0a746a SHA256 42d1674403ee6767409b85b0699529ba72889f212470f706dbc61316d9103707
 MISC metadata.xml 974 RMD160 7532aab7831e78fc42ee499cab9f49d34ed159a3 SHA1 01cbca62b8574e05a11761a2bbe9756ead3f6f91 SHA256 7d43db1eab925b5a2499aac3ffda6b7e0d2933db44447760377119c30e7d8211
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOFPM7AAoJEPiazRVxLXTFJXEP/3rFFvwTdmHx8/psflInpVm6
-YEI5AtNBo3WwXAMKhipQAZfDNB1zxtTtWFQYeHwNNZBdmx8AHry7c8H55rmGY7FC
-nDw0uIdEHibgFimt4cRr65ZXLisXzJRkjuu0+Z/7V3gaY1tQRARwzVClf47NQ6zU
-2MVLdGoQfjtI+sHYx35m7VxJu/SmOmlwakEYfqfgZCnQ8/ZfmDWI5Ezct0eGFDqD
-4xzkjzW2mp+0OaBw2LPrM97+m+bWNZslWeAfqCAVMwX6cEW0Nre94WadOtJnQpjm
-xbx/aacEDunflipnvXMspKnFB0skH08wzK4+6KEGCMR9CrbgIANjYcxhtUDrPrpV
-NnbB9Vg/Y2Gu0p6mxf2NiGGQfIqeXYjeu4evaMKIt421akkrgw/ehGn/xbCQyBSZ
-35RAaHzanOBmK4gvssm/e9dL+J2iffaAjZaoIhuRn0hk/R56BuwC7vbURclDsBdh
-HZX6OXZVeqjgnTY+OowZB6/h4H4Y00YwB2tGh17Wv4iw6WLQQtzbJvo+5Drhisod
-oOTCQWvcQoUocRXHuvWHh/RHM06z7PGpWZel322J0hqYbcyxN9a6KuitHoongb0s
-Zmjdqk1N3IqUZ7IaqiUu/ekF52kigdbxnIuouAEDCnLWpGQw/AjqzGtrWdKhOzZ4
-uX6FcQGHMlf9H3yBpV2C
-=0151
+iQIcBAEBCgAGBQJOLrzuAAoJEPiazRVxLXTFbmUP/0AAJM7oEwyXMdLbQ9HpPTlQ
+sS1alazIp33M+uj3Y9UTSPPllNuALz5xnbj4lDyUs7/k1m/2nYJsWwr2+36Zth8c
+MNBI9olKCThy0aIuUcjH9oNY1xlU/TAm+yPK8D0HRX1TT7DdcIfG8gZ7KEIiecTq
+Cp65lkj55SsfJnIikqs6yFcLTMwiE553Ml5aEIPXrEApjIrQi4wp3Akxyeqh3NDX
+Vh2N1TyFKVS4YVhh0X16JaADwYz2FFDjVQkm8rB+0Xmh1jdS0lrvTHijfKFAmnj6
+f9efn0ijO0GVfUXepBfFc7ohnytqu62jv5AxIjOOd8AYLccWDXNrXu6cNwJF3bMK
+2yj9mNHKjEzTxBH2NIX2l+4cFgDXEBMwhpIax9/cMdxAIwIlwu/MJlUWqQfirlAg
+wZKnrunIW0UlomWn185/nJ7G+UmJu5XNtV7aOKqFwvjVNXhHhs1V1rwEDGoswZWf
+UDJWgLl+UHhCgxi4p7Sz4b7jrjb/OOkikmAwJ4RL+eTDd0dbiyYAyJI+apY608Sz
+AB1zpo4YkicbXEZanF9OZRy3/wQ5UGPOpzarRZGlx5jYsgeYuHlet4oyB47ybaEQ
+0C7Ho27TzoBX3V8laNKOj0blnD+nxC61RLBMwa1KoNqs1ToMYSCrfJTk8OPOXlQO
+LwafN/C8b8+H08sWdOyI
+=7mJT
 -----END PGP SIGNATURE-----
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