From 54c6acbac14d454eabdd2f2c15f8090d63028c41 Mon Sep 17 00:00:00 2001 From: Christoph Mende Date: Mon, 25 Jul 2011 10:21:07 +0000 Subject: [PATCH] Fix compilation against curl-7.21.7 (bug #376101) Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64 --- dev-libs/xmlrpc-c/ChangeLog | 9 +++-- dev-libs/xmlrpc-c/Manifest | 18 ++++++++-- .../files/xmlrpc-c-1.06.27-curl-headers.patch | 12 +++++++ .../files/xmlrpc-c-1.18.02/curl-headers.patch | 36 +++++++++++++++++++ dev-libs/xmlrpc-c/xmlrpc-c-1.06.27.ebuild | 5 +-- dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild | 5 +-- 6 files changed, 76 insertions(+), 9 deletions(-) create mode 100644 dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.27-curl-headers.patch create mode 100644 dev-libs/xmlrpc-c/files/xmlrpc-c-1.18.02/curl-headers.patch diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog index e7f2c40d7f20..2e4ca57150bc 100644 --- a/dev-libs/xmlrpc-c/ChangeLog +++ b/dev-libs/xmlrpc-c/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/xmlrpc-c -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.95 2010/01/15 12:25:42 scarabeus Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.96 2011/07/25 10:21:06 angelos Exp $ + + 25 Jul 2011; Christoph Mende xmlrpc-c-1.06.27.ebuild, + +files/xmlrpc-c-1.06.27-curl-headers.patch, xmlrpc-c-1.18.02.ebuild, + +files/xmlrpc-c-1.18.02/curl-headers.patch: + Fix compilation against curl-7.21.7 (bug #376101) 15 Jan 2010; Tomáš Chvátal xmlrpc-c-1.18.02.ebuild: diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest index 67100af28783..bae4c473d7b3 100644 --- a/dev-libs/xmlrpc-c/Manifest +++ b/dev-libs/xmlrpc-c/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX xmlrpc-c-1.05-pic.patch 566 RMD160 2e64750d04cdb3a9ad9f95e753e6dd46d4cd650c SHA1 5b266ed0600aa32c5f461df402038ffee1dac87c SHA256 b27f31ef0098ff83518be25131b1ddb72a3290c45636219a58cbf7dcd5ff415d AUX xmlrpc-c-1.06.02-strsol.patch 716 RMD160 c98b5c6d10ae1b11d57ed80515aa2e7855acceb7 SHA1 5540ded87bd50ca0a413c0b4bbf5faa630754d32 SHA256 2ffd9c6cf54a1bb8664b0d0aeb36985efd40d65ccf71f697ad0f6efb845adedd AUX xmlrpc-c-1.06.02-threadupdatestatus.patch 465 RMD160 e8e8cdeb31d0afad547dd8abab3533e9f54114ba SHA1 b209a5d55c3e587eabe220503c8818b17731fc78 SHA256 64fac915d4bdab37ebf04fece7066213a96d09651d4e088c90f08e9fd364a985 @@ -7,14 +10,23 @@ AUX xmlrpc-c-1.06.09-asneeded.patch 2218 RMD160 82e644faf71229ecb77f558fd48d73e3 AUX xmlrpc-c-1.06.09-strsol.patch 602 RMD160 b18f2ceb63c44cccdbcc2f38cefd7d5f2769f917 SHA1 64ad16c0a4908a1cda54209c2667f2e6a7f1d719 SHA256 e77fb9ac9aa2d4e10b80386618e044ccce514fd63afd8f938da12b086ca36b0b AUX xmlrpc-c-1.06.27-abyss-header-fixup.patch 896 RMD160 a9e536a19d78dad7040f945ffce7520b338fa9f9 SHA1 a23fef2d86a7dd21215414ca669e213c4adeb7e2 SHA256 0bfb14b42800043b210652d86f48901db4a1706caee7b45f63bd8ba95b1048bc AUX xmlrpc-c-1.06.27-curl-easy-setopt.patch 800 RMD160 477121a69fbd1e4f923ec6e38cb86411d27e104b SHA1 17b92331be7d01854dcdb43b25fb0ce7733c4b7c SHA256 988cb420a9bac9bb62038158174c0d1b75ab4249526b71c202b7b55cee468961 +AUX xmlrpc-c-1.06.27-curl-headers.patch 371 RMD160 f48e6b9c6d1bddd54190421a14569bb874024203 SHA1 a9f31b71dca60e7740df9c43e3a56e64b179b8e0 SHA256 f4636331807690bdccad8be7cfbe0976a15537a4a4bacc5a384f9f76019f4df4 AUX xmlrpc-c-1.06.27-gcc43-test-fix.patch 1045 RMD160 e86d11e2279fea066fd7709a681b32a3ec01bc50 SHA1 16e4bd8a33cb6ff0d94d65e2d540f1400b424e37 SHA256 ddf21cad0ae3a44ae3d626bf34672e65c7bb37c8b652d04c87565bdd05f753e5 AUX xmlrpc-c-1.18.02/cpp-depends.patch 777 RMD160 575f16e59927a5a1cd76c55405871f9096e7346c SHA1 984a2f05ea0e4fb855731896ae9ea115a566d0c6 SHA256 5e7ac2d3a93f6fc742de54e97950d8af2246af75d5baaf4ef513da6bd5ca53f9 +AUX xmlrpc-c-1.18.02/curl-headers.patch 1038 RMD160 b9d6b8de1dbf73140c715ad64fbfa8625ab7cd3a SHA1 2398b2d7a43fa22d9bd09d4742599507d2d0fc42 SHA256 28c48b11334806958824f77601fcb73f1910e0a1b4f0b4c7f4198b54e20db739 AUX xmlrpc-c-1.18.02/dump-symlinks.patch 19339 RMD160 1ed2bb4cddabb6ddabd3b8c15bf0d4dfd209607c SHA1 11ce54c1099c219d14c8f9c0411d22deba9d882a SHA256 4320670f81a8d20ec96bf9ce4ffc458792eeadaee49c515923f4858ff4ba6f02 AUX xmlrpc-c-1.18.02/dumpvalue.patch 520 RMD160 63947d91c5498bd603db30cc7efa85440eefbe46 SHA1 343d0ead6deada7eba40ebf832fe2f21222e1cac SHA256 a53f6b2fb44db2775e704bacee04fbcf8b2d2ab6eea27407e2de44213f933404 AUX xmlrpc-c-gcc43.patch 3386 RMD160 7260a649337849caa2784f0ecdbe9a64e31215a7 SHA1 a90b4ba1ad7ba793dce640f62c15cdb46ee5d36f SHA256 d34c3c5e7b7fbcba19a1abdb1afafdeaebb32fff7300981027c6ed247eb80092 DIST xmlrpc-1.06.27.tgz 699510 RMD160 65803ad240331182ecdddf442c0da80669ae3292 SHA1 7dc857eb411b2acf04a127ee5623e0961633bfac SHA256 04e81ec9f4b0e586be41ccffd402f42b6c268ec2fc7875d44fcbb4ba7a660378 DIST xmlrpc-c-1.18.02.tar.bz2 552233 RMD160 efe2f03ae37512636d33c7d285c46d9050e9296b SHA1 b815899dff10d245b31257f434230f8e45f2446a SHA256 b59845ebbad959f86a349873fda75af02a69105a4e5c6a7eb40225358677411a -EBUILD xmlrpc-c-1.06.27.ebuild 2213 RMD160 f68f0248e88fc2dd5c77d30b5d25678f335c034e SHA1 9e2bb999540321c145b825ef4a9191554c4ebb2f SHA256 31cdbde6bdadb5b9912a6df373dbc8acb12865f8e9a88863bec7ce8855881a28 -EBUILD xmlrpc-c-1.18.02.ebuild 2173 RMD160 897794c6f8fe25e164cb4f1d76c3fa0d928d57f6 SHA1 884f09c0d4ed17b8a832b020cc34ae7e32907990 SHA256 360147e407ade07fcacf8aba4a3bc1a462d473cdebc43fc34487eb75e946c080 -MISC ChangeLog 15454 RMD160 045b15f153927018e964bf82e8614a605642e8aa SHA1 14ba5853066af08114fa1f8d5973736b9fdae022 SHA256 09f9e0266709cafc7c593ed22b2bda0e87ab7b92e313914ce26813060ade2d22 +EBUILD xmlrpc-c-1.06.27.ebuild 2260 RMD160 d9f88caa84597ac08e40b7720ad20de8c2cc1839 SHA1 9eae88dfa3d3a28e52df3b3ababb277d382a08e5 SHA256 2e2e2cc0d557fb3bbd4240e3fcce1b742347b4a90b2e6e68950b60099348d402 +EBUILD xmlrpc-c-1.18.02.ebuild 2211 RMD160 fa2902c60ea1ab80b429d8817fbf34490cff1c3f SHA1 e1118cb342fd8606eaaef0a3b5a5f7ab41b6ff6e SHA256 db6e29daabeda78c93f071e9bca5380f2f094b5d59ee7abe6d62a34650eb46e4 +MISC ChangeLog 15699 RMD160 53e36eb7642d4f372610f74da716e491e75b9e3c SHA1 43945c1f24278ef00c4ee1e891acc1c218b58879 SHA256 177058b73e158de1a5f8f2347506770c36b64bc4931890685563db7baa523162 MISC metadata.xml 499 RMD160 f9d1d3c58837e9713d01117b860658db99565b11 SHA1 66be7900342b06c05c2d951643d83f054a89924e SHA256 d012b1b4909db4b540a1c8f3f27732cf2feef8e3060d63e2ac211ae0880a7e8d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iF4EAREIAAYFAk4tQ4wACgkQmWq1bYTyC0PSwAD8CCXGp7IoBEoqn5R3q6QBc+Po +D05ks6yaYVD+q2lbJPQBAJpTZMJLef8fwup2L0YKS8u9xmzOYKpAOxEm62Y+B8TC +=tUwa +-----END PGP SIGNATURE----- diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.27-curl-headers.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.27-curl-headers.patch new file mode 100644 index 000000000000..897922d943f3 --- /dev/null +++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.27-curl-headers.patch @@ -0,0 +1,12 @@ +diff --git a/lib/curl_transport/xmlrpc_curl_transport.c b/lib/curl_transport/xmlrpc_curl_transport.c +index 46099ba..b85d4a1 100644 +--- a/lib/curl_transport/xmlrpc_curl_transport.c ++++ b/lib/curl_transport/xmlrpc_curl_transport.c +@@ -76,7 +76,6 @@ + #include "version.h" + + #include +-#include + #include + #include + diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.18.02/curl-headers.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.18.02/curl-headers.patch new file mode 100644 index 000000000000..aed59d4abed1 --- /dev/null +++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.18.02/curl-headers.patch @@ -0,0 +1,36 @@ +diff --git a/lib/curl_transport/curlmulti.c b/lib/curl_transport/curlmulti.c +index 27f93e3..6897d68 100644 +--- a/lib/curl_transport/curlmulti.c ++++ b/lib/curl_transport/curlmulti.c +@@ -19,7 +19,6 @@ + #endif + + #include +-#include + #include + #include + +diff --git a/lib/curl_transport/curltransaction.c b/lib/curl_transport/curltransaction.c +index 3889462..0745f42 100644 +--- a/lib/curl_transport/curltransaction.c ++++ b/lib/curl_transport/curltransaction.c +@@ -17,7 +17,6 @@ + #include "version.h" + + #include +-#include + #include + + #include "curlversion.h" +diff --git a/lib/curl_transport/xmlrpc_curl_transport.c b/lib/curl_transport/xmlrpc_curl_transport.c +index 812ba2f..0a16835 100644 +--- a/lib/curl_transport/xmlrpc_curl_transport.c ++++ b/lib/curl_transport/xmlrpc_curl_transport.c +@@ -85,7 +85,6 @@ + #include "xmlrpc-c/time_int.h" + + #include +-#include + #include + #include + diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.06.27.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.06.27.ebuild index e5692e4d3955..87490d6eecc1 100644 --- a/dev-libs/xmlrpc-c/xmlrpc-c-1.06.27.ebuild +++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.06.27.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.06.27.ebuild,v 1.10 2008/11/04 09:13:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.06.27.ebuild,v 1.11 2011/07/25 10:21:06 angelos Exp $ EAPI=1 @@ -36,6 +36,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-gcc43-test-fix.patch epatch "${FILESDIR}"/${PN}-1.06.09-asneeded.patch epatch "${FILESDIR}"/${PN}-1.05-pic.patch + epatch "${FILESDIR}"/${P}-curl-headers.patch # Respect the user's CFLAGS/CXXFLAGS. sed -i -e "/CFLAGS_COMMON/s:-g -O3$:${CFLAGS}:" Makefile.common diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild index abc473bfe96c..4156ac2bbe85 100644 --- a/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild +++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild,v 1.17 2010/12/14 03:46:30 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild,v 1.18 2011/07/25 10:21:06 angelos Exp $ EAPI=2 @@ -38,6 +38,7 @@ PATCHES=( "${FILESDIR}/${P}/dumpvalue.patch" "${FILESDIR}/${P}/cpp-depends.patch" "${FILESDIR}/${P}/dump-symlinks.patch" + "${FILESDIR}/${P}/curl-headers.patch" ) src_prepare() { -- 2.26.2