From: Lars Wendler Date: Tue, 26 Jul 2011 12:27:51 +0000 (+0000) Subject: Fixed compilation with >=curl-7.21.7 (bug #375899) X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=14033f645422a8ac203444e52b134ad89e41d185;p=gentoo.git Fixed compilation with >=curl-7.21.7 (bug #375899) Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64 --- diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog index 16dd2a9fb8cc..17a310b38b6a 100644 --- a/www-client/seamonkey/ChangeLog +++ b/www-client/seamonkey/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-client/seamonkey # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.321 2011/07/11 07:47:48 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.322 2011/07/26 12:27:51 polynomial-c Exp $ + + 26 Jul 2011; Lars Wendler + seamonkey-2.0.14-r1.ebuild, + +files/seamonkey-2.0.14-curl7217-includes-fix.patch, seamonkey-2.1.ebuild, + seamonkey-2.2-r1.ebuild, +files/seamonkey-2.2-curl7217-includes-fix.patch: + Fixed compilation with >=curl-7.21.7 (bug #375899). 11 Jul 2011; Lars Wendler seamonkey-2.2-r1.ebuild: Fixed patchname diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest index 08e77026e8db..607ed9de2369 100644 --- a/www-client/seamonkey/Manifest +++ b/www-client/seamonkey/Manifest @@ -7,7 +7,9 @@ AUX enigmail/enigmail-1.2-seamonkey-2.1-lowercaseequalsliteralfix.patch 508 RMD1 AUX enigmail/enigmail-updates.patch 8587 RMD160 b2641d4058ab609c60a8e425497732334099f5a4 SHA1 ee95dc6a3dd4f8cc4957af20634eb8ef2d13cf51 SHA256 edc27e1739a597c42127b8d684fc2e3c7a6ff919c83500f57bc77eac112a4db8 AUX icon/seamonkey.desktop 288 RMD160 c9f56aed280a3ff68f0c40ae453fc24351daeea6 SHA1 87254c3cbfad672309e4b1fa408d08b74be31056 SHA256 524ae39ffc10b2a950aa344ae6c3f3d9b4a21009697edfd52ec47aa850d795d0 AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59 +AUX seamonkey-2.0.14-curl7217-includes-fix.patch 746 RMD160 fcf9b5cbf409d6f04eb276c956824bc770abfb79 SHA1 87f829c5176b9da2a3ae564cca465072dd8aaa13 SHA256 0b48bc32b97242edc11379a3ea1c7df0e576464b72ec493d547a81dfb1ba9612 AUX seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff 744 RMD160 7c9bab23159e956813fa2e2a59dac5dbc16dbe60 SHA1 d29a9ded0cad3df137539642e6a6031c361c47ac SHA256 a8b217e3bf7902caab447f849712459f92e19c8889bc66c977019c603ddb99d4 +AUX seamonkey-2.2-curl7217-includes-fix.patch 1066 RMD160 e5581348a5dfdd1e1c07487442ff7cc06566973d SHA1 dad9bdc18fc2ba93f1925818b74bcf7e3df0d4cb SHA256 2a46c70973f93f4c2c3a2292804ed11b8daa404ee515a1e1f7a863899a37bd11 DIST enigmail-1.0.1.tar.gz 1201945 RMD160 2abd8e70fcfcd2e75e71a97a5a3c7d1e0c292666 SHA1 334e70723fffc0631dadb6fd4449afffdeafc3f2 SHA256 7bc8541eef483d67246f3d83682ba13263f001fa94b5982c0cfbe54e5bdfd32a DIST enigmail-1.2.tar.gz 1326482 RMD160 868c73aa28566895d4b6c6b9cbf4602d75df0a73 SHA1 05fb80a99544f95bfa2531e6cd5cac8cf1e78780 SHA256 e5e51685d09eb5a87bd21f80b4b64eeb8d75d6424b21cfeaea7b9c16723c9cc4 DIST seamonkey-2.0.11-patches-01.tar.bz2 17740 RMD160 00747880b61bab159a48cca01766dd788fdbfcee SHA1 5f3be090d2d65d361b2b337fbd2c30b589cdfa3d SHA256 1d032cdb98a65910b4ec5c64e4649b7a25fc2a8f604b0ae2f7a24199d408e76e @@ -82,25 +84,25 @@ DIST seamonkey-2.2-sk.xpi 840212 RMD160 24f53c0ab9bcd792b36782b84da70be42679fef0 DIST seamonkey-2.2-sv-SE.xpi 869508 RMD160 592963815c37201e54594a9dc1c103fad147d743 SHA1 73dc9b6b6a277687712db523f26d7bc697e0cb6f SHA256 83b5e7572ed550e299b2813a0826d3760e18fd49b56a3e852f3be32cd133a1fc DIST seamonkey-2.2-tr.xpi 805151 RMD160 5accabd955766af2f6a95ec6a162fe7e9fc50790 SHA1 313cdb5c013f09e5931fc32ff84308b08b710c8f SHA256 0bb342f7845493c35f743b3f8589e9fa0d7ed1c283f400eeb929617c13f26f56 DIST seamonkey-2.2.source.tar.bz2 87478968 RMD160 cfad0460357c357df7a5936c0bd10374c18eac04 SHA1 bb2181fbbb4aa16e51899b483acadb31f7e0cbbc SHA256 0b713e2f78a2c5139bf16736bd12e87017cdbc675948d4a8893a3d834bf8c13a -EBUILD seamonkey-2.0.14-r1.ebuild 10004 RMD160 b2c7c104521879191e20e96949ad5c7f099e6f27 SHA1 4526a824c43500f4949c509914df49bb0a177840 SHA256 ed952957062934a3f564506a6fc73858147597f84be95b9e9c52f358fb8d00e8 -EBUILD seamonkey-2.1.ebuild 8652 RMD160 f2b30f546157d680e2e4bb691c1ec97b64d42189 SHA1 063c964ff1a2265eb82621acbbe9feb69b790d8f SHA256 e25b921dc2bf1728f835573a3d237c11de5f83e9c393c564c50ab00785e6ef09 -EBUILD seamonkey-2.2-r1.ebuild 9272 RMD160 a9726cda7efdf5f0edbb783a3f4407ee1443436b SHA1 0ab6f9d6e97ab2e7ff73bc817863e9d7b5a75a89 SHA256 68cc45255b0e0aeac62c73eb96e181949e3deaf047445440a1d6eb589d188270 -MISC ChangeLog 42328 RMD160 5605ebfc3dec8d8d410495566bc4d1355c7db7fd SHA1 1263d815cb9f499d58c788465dc7a1bf36b30da0 SHA256 ca18b2eeed7313d9140711d402747c7d91be0e1b1efadcf4bca73e72b8c988c3 +EBUILD seamonkey-2.0.14-r1.ebuild 10068 RMD160 f7d5bccfa3ffcb086286b63f14e5b6efdee3bb0b SHA1 d0697dc74fca26e9df5522d5d39b248b68085d07 SHA256 2f159db8ee3d4f266818f59dda7e4843e5434e636ecda0193b1ff289142acf9b +EBUILD seamonkey-2.1.ebuild 8708 RMD160 5c852317c6d494f974eb97d8c3ec910f41a55406 SHA1 b3b3997fa6b8db0dabe7335d608d66f9f1eeb568 SHA256 105ec7c7bfa381068766cbc14431d7bb5e170b9c2546e6a1445d68c130df41c7 +EBUILD seamonkey-2.2-r1.ebuild 9328 RMD160 30feaf2661d8986559b4cb8d9079af747d5e88ad SHA1 e6d3cb2ce7c55326f0e4bfa45a07062b3a0bdd88 SHA256 0fc7787f47c7b5f9d4d2d05fa34f166f1f6dda34cbdc9571ef72e40bec295eac +MISC ChangeLog 42621 RMD160 71a2a2cae57c0be5cfa11c3bd2196999087156de SHA1 a118e0c40c6fcf229322c30504a73ca020e61541 SHA256 d295898246284a0371f7d0a45a21902519df9f401ae12ca9cf8bfde520d1e6ec MISC metadata.xml 1201 RMD160 db4a19472bbc6e9586bdebc804c1845e4a9cf062 SHA1 cdd2acd56566f2014682735db36922d7660afd12 SHA256 a8ad3bb4d1d4643e9ad5f280b46016801d7da73e5d319870e3d91ef780825208 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJOGqqrAAoJEPiazRVxLXTFBwsQAJc9yUkZK+NufWFvgHYwqsbM -d/UXraR0YCceW2GqiFIyizcL7Oq4hEGqDNy4x9X0hnKKISmx3mdh/BNaStvu9B4k -94+8/+0z7OoGsMLfyOcpWh2gxLTCMIzd5t6tomfkz4ofXBW0B+8bc5h/z86DszkU -FM6psD1K7kHMQkPlVsCaOcdFqwh9LHxef0pXg6QNQfAk7LUbXOh1HGKEja1yLTKL -PVpEn/lbzANzZVQ9Fk80gPnS38DqiczTu/n7/gu2W1+PwshLtpbsTQbMJW25wQ8R -E/axfQewG7/omoNA6nPnkDhMb6u6Bb9WSGduQc0LljQhK5xgYi37aXCGBQjkUlRG -4TD0iWZVsRXqaY2Ai3FhW/gFsNln2Hdw5VLV4Hd+92enHIysMsG/uZVTDEDsda6e -BnC6CAM0YYrrrOMbxE5BYqigd2C6f52loou9VJbVQzAbCsYtmbisO/3+KDBKP0oa -jVxyPs5MdQtKHuZP++BbRlPAaHwjNx6vPRv+U6wy4SMHVpSdI34E9XUEoR0X0PK0 -Ejtd25FnOePH6M1ERGbqRkdcd92hTlBgyUKsa9zd+wiRtcw8WnVsXpcfboFf9UFU -pmkN3elIQOip0OtS0m1VDu7V878cXzJcifyuDqUF2TuturtFJkqcA2GktLhWSWx2 -mvOUxYWg9MJaoImhslq+ -=MCF4 +iQIcBAEBCgAGBQJOLrLOAAoJEPiazRVxLXTFET0P/AgELTRJ5/hFWozhLrWK4N3l +jqFDOslI/rPMIb8SSQ1WhBEwpXOT3fkosyl2KML8SkNNzbS7oWHnxp4Y+0N/m3CR +PO5xnyhKOCtM5IcuTVVui6sW96uluO+r62hx14maS2F3Pl+bJWfgl5Rmt3V7RClJ +JGD1lIiT+1sM3Zcme/AiyBdB4GBN9MTVI3smggMGywpPmXV6JJ2PrDkrJvP1mVHy +24cDkrcTG7de0pZnDhpFk4nZCsRIV29g4Dlq20JIcnldzVnS65LOJl6StD0jJn1V +VSdGWW2nRo3smdkoizwQlk9y3egMzlriwhkkYg/mymZtwtWOvn3uQAWHE/FGD5GA +6ipbOe/KHjxMjpixVxEikjV3yx9qGYjA3CqeRuJhxl9pnUl6xSeZNiOnlHaWYES/ +hwyVaTTGJPWltxQqwXLo7AN2wK42jDhf/aEvXRbjOZuWjuQu9y4ML22LpBOEf775 +vzysx9Ly1fKZYJ5x8vVxAQlfrWtVtY/Zp+OparOHqL11tIzaF0f+3DRO1HwkTdww +7EJX2GfTCaxsuhvvxQ2Bufu5LVO2cUR62gPE+f0Pgcj5CzjbEnQUDEFhFL7q2v+k +k7/c0JqK9GYsTSG3Xj2oMWNgxYrdVLCb7Cji9w539yu+JFWmnZis/MXPA8QKgTvd +ttXNvACFbK5VaAJ/0dt1 +=hf09 -----END PGP SIGNATURE----- diff --git a/www-client/seamonkey/files/seamonkey-2.0.14-curl7217-includes-fix.patch b/www-client/seamonkey/files/seamonkey-2.0.14-curl7217-includes-fix.patch new file mode 100644 index 000000000000..26b3130f3e0d --- /dev/null +++ b/www-client/seamonkey/files/seamonkey-2.0.14-curl7217-includes-fix.patch @@ -0,0 +1,30 @@ +--- comm-1.9.1/mozilla/config/system-headers ++++ comm-1.9.1/mozilla/config/system-headers +@@ -200,7 +200,6 @@ + ctype.h + curl/curl.h + curl/easy.h +-curl/types.h + curses.h + cxxabi.h + DateTimeUtils.h +--- comm-1.9.1/mozilla/js/src/config/system-headers ++++ comm-1.9.1/mozilla/js/src/config/system-headers +@@ -200,7 +200,6 @@ + ctype.h + curl/curl.h + curl/easy.h +-curl/types.h + curses.h + cxxabi.h + DateTimeUtils.h +--- comm-1.9.1/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc ++++ comm-1.9.1/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc +@@ -31,7 +31,6 @@ + #include + #include + #include +-#include + + #include "common/linux/http_upload.h" + diff --git a/www-client/seamonkey/files/seamonkey-2.2-curl7217-includes-fix.patch b/www-client/seamonkey/files/seamonkey-2.2-curl7217-includes-fix.patch new file mode 100644 index 000000000000..63d9a6ff4762 --- /dev/null +++ b/www-client/seamonkey/files/seamonkey-2.2-curl7217-includes-fix.patch @@ -0,0 +1,40 @@ +--- comm-release/mozilla/config/system-headers ++++ comm-release/mozilla/config/system-headers +@@ -207,7 +207,6 @@ + ctype.h + curl/curl.h + curl/easy.h +-curl/types.h + curses.h + cxxabi.h + DateTimeUtils.h +--- comm-release/mozilla/js/src/config/system-headers ++++ comm-release/mozilla/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 +--- comm-release/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc ++++ comm-release/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc +@@ -33,7 +33,6 @@ + #include + #include + #include +-#include + + namespace { + +--- comm-release/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc ++++ comm-release/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc +@@ -29,7 +29,6 @@ + + #include + #include +-#include + #include + + #include diff --git a/www-client/seamonkey/seamonkey-2.0.14-r1.ebuild b/www-client/seamonkey/seamonkey-2.0.14-r1.ebuild index 34c0315fea41..555c1b7f4c40 100644 --- a/www-client/seamonkey/seamonkey-2.0.14-r1.ebuild +++ b/www-client/seamonkey/seamonkey-2.0.14-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/seamonkey/seamonkey-2.0.14-r1.ebuild,v 1.1 2011/06/06 14:41:21 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.14-r1.ebuild,v 1.2 2011/07/26 12:27:51 polynomial-c Exp $ EAPI="2" WANT_AUTOCONF="2.1" @@ -154,6 +154,8 @@ src_prepare() { EPATCH_FORCE="yes" \ epatch "${WORKDIR}/patch" + epatch "${FILESDIR}"/${PN}-2.0.14-curl7217-includes-fix.patch + if use crypt && use mailclient ; then mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail cd "${S}"/mailnews/extensions/enigmail || die diff --git a/www-client/seamonkey/seamonkey-2.1.ebuild b/www-client/seamonkey/seamonkey-2.1.ebuild index fd9e993f3e57..c9bd6575e794 100644 --- a/www-client/seamonkey/seamonkey-2.1.ebuild +++ b/www-client/seamonkey/seamonkey-2.1.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/seamonkey/seamonkey-2.1.ebuild,v 1.4 2011/07/08 16:37:14 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.1.ebuild,v 1.5 2011/07/26 12:27:51 polynomial-c Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -138,7 +138,8 @@ src_prepare() { EPATCH_FORCE="yes" \ epatch "${WORKDIR}/patch" - epatch "${FILESDIR}"/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff + epatch "${FILESDIR}"/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff \ + "${FILESDIR}"/${PN}-2.2-curl7217-includes-fix.patch # Allow user to apply any additional patches without modifing ebuild epatch_user diff --git a/www-client/seamonkey/seamonkey-2.2-r1.ebuild b/www-client/seamonkey/seamonkey-2.2-r1.ebuild index f708fd95be36..2bf2c341ce8a 100644 --- a/www-client/seamonkey/seamonkey-2.2-r1.ebuild +++ b/www-client/seamonkey/seamonkey-2.2-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/seamonkey/seamonkey-2.2-r1.ebuild,v 1.2 2011/07/11 07:47:48 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.2-r1.ebuild,v 1.3 2011/07/26 12:27:51 polynomial-c Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -153,7 +153,8 @@ src_prepare() { EPATCH_FORCE="yes" \ epatch "${WORKDIR}/patch" - epatch "${FILESDIR}"/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff + epatch "${FILESDIR}"/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff \ + "${FILESDIR}"/${PN}-2.2-curl7217-includes-fix.patch # Allow user to apply any additional patches without modifing ebuild epatch_user