summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2011-07-25 10:35:12 +0000
committerChristoph Mende <angelos@gentoo.org>2011-07-25 10:35:12 +0000
commit8dcc82fbfcc5f1a38471e9eaf23e63f23737a097 (patch)
tree194c3dda03645d76950835e2a49ff2747c469656 /app-emulation/vmware-view-open-client
parentVersion bump to final 2.6.1; remove 2.6.0 and rc1. Use SF.net mirrors directl... (diff)
downloadgentoo-2-8dcc82fbfcc5f1a38471e9eaf23e63f23737a097.tar.gz
gentoo-2-8dcc82fbfcc5f1a38471e9eaf23e63f23737a097.tar.bz2
gentoo-2-8dcc82fbfcc5f1a38471e9eaf23e63f23737a097.zip
Fix compilation against curl-7.21.7 (bug #376227)
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/vmware-view-open-client')
-rw-r--r--app-emulation/vmware-view-open-client/ChangeLog7
-rw-r--r--app-emulation/vmware-view-open-client/files/vmware-view-open-client-4.5.0.297975-curl-headers.patch12
-rw-r--r--app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild5
3 files changed, 21 insertions, 3 deletions
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/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