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

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

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index e953c27ba92c56dd2e29d9b92e930bacb6eb5d01..45164b55c139082cfc2967351be89db28e034bd4 100644 (file)
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.425 2011/07/06 05:14:14 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.426 2011/07/26 17:02:29 polynomial-c Exp $
+
+  26 Jul 2011; Lars Wendler <polynomial-c@gentoo.org>
+  xulrunner-1.9.2.12.ebuild, xulrunner-1.9.2.17.ebuild,
+  xulrunner-1.9.2.18.ebuild, xulrunner-2.0.1-r1.ebuild:
+  Fixed compilation with >=curl-7.21.7 (bug #375899).
 
   06 Jul 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   xulrunner-1.9.2.12.ebuild:

diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 7de3d9e51e8827df5bbe429afb543900bf3ef473..83ed075dbb371dd39df93c73ddebd774c15fa8fe 100644 (file)
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX bug-606109.patch 1243 RMD160 ec262eed0480d8a13c914c4781329e3ea1c23b0f SHA1 0c0cc40ee0a663422b107cc3ae5d1412b8c45ac7 SHA256 266d9c7218cc04c3badadc54f8f31b1238326b9c3052aed057ffce40c69541dc
 AUX fix-animated-gifs.patch 7789 RMD160 a8889110a2daea27e07f92a70df6cb1e39e05546 SHA1 05b335feeefff4f06004a20182f821d998b44879 SHA256 6d85d3c103b0dcdbb073302a4041a37bea97c715384d04d299c1fb49a5da7443
@@ -14,26 +14,26 @@ DIST firefox-4.0.1.source.tar.bz2 65980273 RMD160 63faaae78b56db407a344549863612
 DIST xulrunner-1.9.2-patches-0.7.tar.bz2 16366 RMD160 2bfa5f56d58d5bb4508512190cf07454814fb0b5 SHA1 2c6e2cfb0c50a5595795561126de26941dbed576 SHA256 3e25e9b8d5fe9109f03889bca9240f92acd502fd68efe0e7eda304f5487b6bf0
 DIST xulrunner-1.9.2-patches-0.9.tar.bz2 15320 RMD160 2dfb86650c0a9a1f0c5bf86df7434c7c286658d6 SHA1 a2276c708eec2e92611ac1e7a2eaf25c39263d30 SHA256 5cca685442f1ab920eb1ba86719a38a437ae05bd5cefc42ababc2556425ebf5a
 DIST xulrunner-2.0-patches-1.8.tar.bz2 68053 RMD160 58ef5ff8fd037f34232a8acc706a1cb086651940 SHA1 bac72e12bfc1150ed116ba5e930688ec72157671 SHA256 88950bf5bdc34cf96bf79e1e1d2f2a4071e1f9e9d53e52f400c433f2f661b77f
-EBUILD xulrunner-1.9.2.12.ebuild 8151 RMD160 e199d309d7d38e5e1bd92df0ca9db02eaadc344f SHA1 fc1f63077114d02874d94cf86bb81c48462466e8 SHA256 b91dc0f6f771e13e91a02b6fc3746a7916a2fe7d71b2a94367070ec262a8f4b9
-EBUILD xulrunner-1.9.2.17.ebuild 8141 RMD160 91c7c97fdfbae8237ffbe56d5fe5cb47b5aac5dd SHA1 d2c367172fc9cb876a313530dc67c088f6368f1a SHA256 faae1d83e09e7c729bc1ca18a324b204f880090a63ed232b1942be35f0f63ab2
-EBUILD xulrunner-1.9.2.18.ebuild 8153 RMD160 307cad375abfb098fae3646a5f4208189f82652e SHA1 859ea05c1215689cd9c9eeb3c837120fb6084ba6 SHA256 3e0e4625645aaa21f1a9fac3e131eb3cf549e1b0f525e5a34b32fe085a284bb3
-EBUILD xulrunner-2.0.1-r1.ebuild 5924 RMD160 414c524bd41d7a80ed7ab344456332adb79cb5cf SHA1 0d58808f8556bb748951a9507d5af332d173e481 SHA256 93ada06472bfc09189625d2567e61cc3019fe30b1744b8e2ff3ad2d61c665bc3
-MISC ChangeLog 59270 RMD160 1ff6c0552cb029706f906c0daccedcd9a0209474 SHA1 2569edcd2b0787cdf8d70b0d12b5bd0efb3dcd04 SHA256 8617f197be81b4e746a134cd2b90a9aecf6dbb90f1ca66e019566a3fe2fd4582
+EBUILD xulrunner-1.9.2.12.ebuild 8544 RMD160 b9237eaa83d73bfeae84245453dd5c120f33cbb7 SHA1 74ae00402ecbd1b382aa69a3e43b2b3b9826cd22 SHA256 acb634dcc7bddb968faeea0082d08470d49148c9a3bc70ed23676d99b08cffc0
+EBUILD xulrunner-1.9.2.17.ebuild 8534 RMD160 04f8f664e9b6de6937a7deccd85f7df43e681bf9 SHA1 08b6b5314351364cc44001fd9ceb355602e359cb SHA256 d3275874435569b1da0efbf3cf46a91cba74e9285e7d644c33217391450af04f
+EBUILD xulrunner-1.9.2.18.ebuild 8542 RMD160 ef6dee2fb5171a41596da273295be458f3a0100b SHA1 0dd9585bf061befd18d06f986ebdf8d2a8b69589 SHA256 1edddec93a080d3872af085f6c0b966ccaac1b46e2cbed54c4b62c1b05b1dfee
+EBUILD xulrunner-2.0.1-r1.ebuild 6317 RMD160 475ebca161ac8c3a9479f776519c56d6b2acd530 SHA1 88bde9e1b76fbae4da2e32bc70c10c93c709e4ff SHA256 0809b20a882694550d0daa1f8198a6071ae2b200a96ba2a8d3cc7fc7e9b2b4ce
+MISC ChangeLog 59495 RMD160 2e1fd3bfb62586319ab690ad85b2437db3e46524 SHA1 7108f7d5da662ad789a894253d654c3fcf62c8d4 SHA256 853586ffb3038c7ab34741ff8db15f625970894a6e53dc578dcc513931fcf953
 MISC metadata.xml 737 RMD160 ee298932f419af0c12657a8df62b797e1ae7720b SHA1 8b9e4d04ae106f928b374568a5d3e2ff0eddcc88 SHA256 400effb40ec15054f2a51ce3d9ea5c27359a4a4456c18459c014c58773491be0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOE+8rAAoJEO/kOhxWD91kHJcQAKpcTA72Rgr9/6nwvGq9pS/E
-IQbaB+kZPOuoFGK3ju9osx54YEYb50RrsaGzUy5Ppm2nSg5R63V9mPOVkRy+UOg3
-jL3EHlb1rmgiLmR71xCiWAqEuDEeCiKt8LGbXcgbUC9f8Jsomca9f7Ia8jYO3tDZ
-1R+FM/XcPVWfedSXP/u7jUCV0utYsAgvcaEsNVlnwji5lwL5rVz5Hun86WvxkoRM
-9EdgIyeoKGiPLSNrO+GVNGkp/6CAQeCpYAwMkzQxnTUhzmpZPUHwtr1hjadAYL2W
-Sav31pr8uoOKDsjgrYIsbkG8SwVQ8hAFMm7Gcd7BkfnzZK+7FeNnWIIe+GvugSH/
-6eRsN+KTR3nB6SvwDarwxFYViRlZnTujcggOxcPbn9vKfHxrC5ECWSG2rc3bIYfZ
-m4xxkMVYaGK/YGNLqsC76sOGJIpCXN6OCMyoWJrdQ4pJTitlYi3kfNTUf+LkD0/e
-fBBe8r8dON98eZuYYbbsW24Rds9tfCBVmNttJYXFJ0NddiOqRS0e4HLd0YpFFHsp
-oo47sz7hYUwcSAtBqfZJDejcPiQgmfwHr55qW7ZtiuFxbosjG1gHErfOLLZDHSQk
-PZK564+8wOkkQ66gTD49dd2P6NnzQu/sCaY3xuxpDBSsfEeOJm12uza31ktrDs6r
-sDXuqDPkwr+hUqScx35M
-=F2OQ
+iQIcBAEBCgAGBQJOLvMvAAoJEPiazRVxLXTFqZYP/iL3BzteKiTNnNTHxlPpfBYM
+q20m72X6CejSuDoFplGTSEcJLBzD0mkfjISnpDjiaAgNItuFdh3ou1A6T0hTBGJW
+5N3cjPMmimFgFS1PnBxqAVUmkrnxmJu0CNeymg/sGHEWdbIdV2irjSCuSsZXFVlp
+sNnN3x4sarHfR0FCPzbU2N35zmsI9kL7j4anZ5o6CKLlA8R/UaZQhKSfXLYesxGV
+BTnr+4l9vRJxoz+7A6fW/3JPktLm8G4NyErQLQDO5VK3YOKkXVrrsZdlED9QFq9R
+gbEsjFjvpR6XHVEqnSfcYKg80qfr84qtD019Icg28grx2pnu/ig+cVTSaqYhTMdl
+4V0ZTpkHKmMdFwat9kBqEG3u8op0dbZFrN0cYxbOSZnQXBwgFxjs7X458kPhia0u
+NC7zzkD4WUo5UzTQ5syFVL3V99O/1tmicdBnKP4c9R/ZDboHrKfez8mBOPcii5tO
+rmf4gIFpmYuB8BOyfEg/77G9pRpWJCbMWRoZ/H6+hOWV9NTJruT2XBDF9l5f5CD2
+gk488U/l2S/EAiPprsiGa8oT/kXsJn7GkNXwnDRJ5pzwEN+OSGz953w3gA/PEoSo
+C0d/ibwZRyr4G4uBffg3rD4vInaIsHChOiuQWBEfAIEe4RvItNX1oyehDEi1z6kh
+QAberjxvbO+B4Y3z8Kgx
+=qKNO
 -----END PGP SIGNATURE-----

diff --git a/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild
index 37630cc2ea3204595f48925b410418c76119e50b..f306dc59404f331fdd17f23d1a02070c48c32190 100644 (file)
--- a/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.2.12.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/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild,v 1.11 2011/07/06 05:14:14 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild,v 1.12 2011/07/26 17:02:29 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -82,6 +82,16 @@ src_prepare() {
        sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
                xulrunner/stub/Makefile.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/libcurl_wrapper.cc \
+               -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
+                       || die
+       sed -e '/curl\/types\.h/d' \
+               -i "${S}"/config/system-headers \
+               -i "${S}"/js/src/config/system-headers \
+                       || die
+
        # Allow user to apply additional patches without modifing ebuild
        epatch_user
 

diff --git a/net-libs/xulrunner/xulrunner-1.9.2.17.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.17.ebuild
index ea5aa8354abcbe3966c0c374f2259c0398c7d34c..448fa713f9b58421c66fe0446acb89d7dfe24deb 100644 (file)
--- a/net-libs/xulrunner/xulrunner-1.9.2.17.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.2.17.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/net-libs/xulrunner/xulrunner-1.9.2.17.ebuild,v 1.7 2011/06/21 12:30:43 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.17.ebuild,v 1.8 2011/07/26 17:02:29 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -80,6 +80,16 @@ src_prepare() {
        sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
                xulrunner/stub/Makefile.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/libcurl_wrapper.cc \
+               -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
+                       || die
+       sed -e '/curl\/types\.h/d' \
+               -i "${S}"/config/system-headers \
+               -i "${S}"/js/src/config/system-headers \
+                       || die
+
        # Allow user to apply additional patches without modifing ebuild
        epatch_user
 

diff --git a/net-libs/xulrunner/xulrunner-1.9.2.18.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.18.ebuild
index 0be201bb03bd88156a1c2111e3766025190ca399..aa8f004f6c78af01056e9b83ebf2600f6766b031 100644 (file)
--- a/net-libs/xulrunner/xulrunner-1.9.2.18.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.2.18.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/net-libs/xulrunner/xulrunner-1.9.2.18.ebuild,v 1.1 2011/06/23 11:07:25 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.18.ebuild,v 1.2 2011/07/26 17:02:29 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -80,6 +80,16 @@ src_prepare() {
        sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
                xulrunner/stub/Makefile.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/libcurl_wrapper.cc \
+               -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
+                       || die
+       sed -e '/curl\/types\.h/d' \
+               -i "${S}"/config/system-headers \
+               -i "${S}"/js/src/config/system-headers \
+                       || die
+
        # Allow user to apply additional patches without modifing ebuild
        epatch_user
 

diff --git a/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild b/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild
index cc8883a4c24f008a2e7223228b28c569d3f0ca9c..b3e21ef6f6ade6882ef927ad48e5ca464cab084e 100644 (file)
--- a/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild
+++ b/net-libs/xulrunner/xulrunner-2.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/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild,v 1.5 2011/06/21 12:30:43 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild,v 1.6 2011/07/26 17:02:29 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -86,6 +86,16 @@ src_prepare() {
        sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
                xulrunner/stub/Makefile.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/libcurl_wrapper.cc \
+               -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
+                       || die
+       sed -e '/curl\/types\.h/d' \
+               -i "${S}"/config/system-headers \
+               -i "${S}"/js/src/config/system-headers \
+                       || die
+
        # Same as in config/autoconf.mk.in
        MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_XUL_PV}"
        SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_XUL_PV}/sdk"