From: Christoph Mende <angelos@gentoo.org>
Date: Mon, 25 Jul 2011 10:35:12 +0000 (+0000)
Subject: Fix compilation against curl-7.21.7 (bug #376227)
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1478ecced1b377c8c87a7f8360dbe49dc428bd41;p=gentoo.git

Fix compilation against curl-7.21.7 (bug #376227)

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

diff --git a/app-emulation/vmware-view-open-client/ChangeLog b/app-emulation/vmware-view-open-client/ChangeLog
index d7354ff9e64a..5aa3d25b3e65 100644
--- a/app-emulation/vmware-view-open-client/ChangeLog
+++ b/app-emulation/vmware-view-open-client/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/vmware-view-open-client
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/ChangeLog,v 1.9 2011/06/15 22:15:57 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/ChangeLog,v 1.10 2011/07/25 10:35:12 angelos Exp $
+
+  25 Jul 2011; Christoph Mende <angelos@gentoo.org>
+  vmware-view-open-client-4.5.0.297975-r1.ebuild,
+  +files/vmware-view-open-client-4.5.0.297975-curl-headers.patch:
+  Fix compilation against curl-7.21.7 (bug #376227)
 
 *vmware-view-open-client-4.5.0.297975-r1 (15 Jun 2011)
 
diff --git a/app-emulation/vmware-view-open-client/Manifest b/app-emulation/vmware-view-open-client/Manifest
index 8bdd21ccef8f..785dd11c5aec 100644
--- a/app-emulation/vmware-view-open-client/Manifest
+++ b/app-emulation/vmware-view-open-client/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX vmware-view-open-client-4.5.0.297975-curl-headers.patch 308 RMD160 bf86c297ad460d8975947857e478bb9f8e44952c SHA1 c319080b9c6654bf8e648027a575946e9fd92838 SHA256 860491e047078a31939371cc72d1ad31b362c9038c27bfbcf60b1296daae8dc5
 AUX vmware-view-open-client-4.5.0.297975-linking.patch 771 RMD160 e723052861b007025db8cef9401a34ae7502c474 SHA1 593d4cc7d30583ce54edcbdb263539d6c052e9f1 SHA256 53f3d58716394c0b4c219c03a854e816ba10cf6e41d0c624c646a98d0d191167
 DIST VMware-view-open-client-source-4.5.0-297975.tar.gz 3044430 RMD160 742663d2b58037c52be1da99fd91891febafc383 SHA1 ebd0ff4bb05c9add2eba65badafa9bdeead3e2df SHA256 8c81aed954419180c4b36807df15907b333c5558dd0b57650f3743af7c67702c
-EBUILD vmware-view-open-client-4.5.0.297975-r1.ebuild 1280 RMD160 ee963e2f5567018ec18fc20e24d18496d256bfed SHA1 f189660af42a87742927fe416a72a6de9d070dec SHA256 b23662ccdcd6952691ccadbc2d180378e314150bfeec509f84df05653ab80a9d
-MISC ChangeLog 2316 RMD160 f0f16f7a25c8ef0ef626998979da5f51244faa4c SHA1 ca277a4f4c5bd9428dfd0282e5ddbc8db3de6387 SHA256 795a1b0ee5836f840f05b31de99ee4a1d01d37eec8ea7fc27ab9030b28909005
+EBUILD vmware-view-open-client-4.5.0.297975-r1.ebuild 1324 RMD160 67a20f58cd39bdd02c9d643fa62264eed6ceea25 SHA1 be2102ab5d01e58513f0d787747accd40d441ec5 SHA256 b17b75b9247a60fc7cd09e5644972119154a5cbe5c2a4c5b469beaf575549ca7
+MISC ChangeLog 2540 RMD160 5f20621ea5d176088b243b2a28f99b208275869f SHA1 68f88d0fb33f4a6ea515d4c7da907aadfa376bdf SHA256 834f152fb828b3a74856f6502376b49aa0f98e094100c63303e860e7462eb051
 MISC metadata.xml 379 RMD160 51dec18c38a8d65a232bf1ee6c2ef2637bd4bf48 SHA1 c61297aa532fad9a681539f95680f654377a4668 SHA256 b29387364e959c36d2a0eb125c7b77143bd88bd8c1dc283edc5c634a010b0863
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk4tRtoACgkQmWq1bYTyC0OFIgD/d563c1WNbQiE0oILPJfa20ZZ
+IcW7LygLZNEfbp5Qb+gA/iUQao+fUsSE6H0k5ejc+OOEGoGNipYGicpefG99qwle
+=jTWM
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-curl-headers.patch b/app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-curl-headers.patch
new file mode 100644
index 000000000000..48b6904c8c79
--- /dev/null
+++ b/app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-curl-headers.patch
@@ -0,0 +1,12 @@
+diff --git a/lib/bora/basicHttp/http.c b/lib/bora/basicHttp/http.c
+index a0f7df3..1f538b4 100644
+--- a/lib/bora/basicHttp/http.c
++++ b/lib/bora/basicHttp/http.c
+@@ -40,7 +40,6 @@
+ #include "requestQueue.h"
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <curl/multi.h>
+ 
diff --git a/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild b/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild
index 620f8f715636..e24f548d1846 100644
--- a/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild
+++ b/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-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/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild,v 1.1 2011/06/15 22:15:57 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild,v 1.2 2011/07/25 10:35:12 angelos Exp $
 
 EAPI="4"
 
@@ -39,7 +39,8 @@ RDEPEND="${COMMON_DEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-linking.patch"
+	epatch "${FILESDIR}/${P}-linking.patch" \
+		"${FILESDIR}"/${P}-curl-headers.patch
 	sed -e "s:e.x.p:$(get_version_component_range 1-3):" \
 		-e "s:00000:$(get_version_component_range 4):" \
 		-i configure.ac