From 4233483ac632d25ca3d166145a02e1477c1450bc Mon Sep 17 00:00:00 2001
From: geos_one <geos_one@6952d904-891a-0410-993b-d76249ca496b>
Date: Wed, 10 Jun 2009 07:12:11 +0000
Subject: [PATCH] app-emulation/open-vm-tools: fix build

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1298 6952d904-891a-0410-993b-d76249ca496b
---
 app-emulation/open-vm-tools/ChangeLog         |  5 ++++
 app-emulation/open-vm-tools/Manifest          |  5 ++--
 .../files/open-vm-tools-build-fix.patch       | 23 +++++++++++++++++++
 .../open-vm-tools-2009.05.22_p167859.ebuild   |  1 +
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 app-emulation/open-vm-tools/files/open-vm-tools-build-fix.patch

diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog
index ce9d7aaa..d15c7663 100644
--- a/app-emulation/open-vm-tools/ChangeLog
+++ b/app-emulation/open-vm-tools/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Jun 2009; Mario Fetka <mario.fetka@gmail.com>
+  open-vm-tools-2009.05.22_p167859.ebuild,
+  +files/open-vm-tools-build-fix.patch:
+  fix build
+
   02 Jun 2009; Mario Fetka <mario.fetka@gmail.com>
   +files/wiper-warning-fix.patch:
   add gcc 4.4 patch
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index f5c4c50b..b6adca97 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -1,9 +1,10 @@
 AUX default-scripts.patch 3525 RMD160 7c3dfd342be245531493a9cf7a8be2be4c67dc4b SHA1 56ba6ca91262f73732a7d806a9c812aea683c2d2 SHA256 99ad1a202335736c50bbb92432371e522934d1a3347e992158b881cf9f810da6
+AUX open-vm-tools-build-fix.patch 836 RMD160 463fd9f2fb2b704fe8d3eab41c211f21ae47818c SHA1 075d14e85e46eabe5a6a1a0a5d318453c323b9e9 SHA256 07d9c7bb228e7d5d1299e5fb5052109218e5d1ad074b4ea8fe2b54f22cc26ed6
 AUX open-vm-tools.desktop 127 RMD160 375ec8cd688a5fe0609076798e515c048be81c15 SHA1 6b6adcb93fbcb11e1638d6a80b3828256f880dcf SHA256 7cb78f0d94f1849aa964bc8e9d9a6c49955ba1a9b937174b1c266a9cc8eb4bc3
 AUX open-vm.confd 88 RMD160 5e398024e72a871f258d73e09f02e37a815443b0 SHA1 56133c21c6d29243ac81a9c1ada61616778f3ce2 SHA256 180a2b6d9d18af319b79b2ca6ebf1020b63e5ebf2f601a63c1a9f9f7d2e0b95c
 AUX open-vm.initd 1875 RMD160 9d2cc36fd93e70ae20eecd49b10c4da0e09aad69 SHA1 1702f267d32ca138e0e99d9ed86b4abc32cc3997 SHA256 1799b78836441b389de0b3d92aad80fcf020fe8b57da4f6d6999f86ee87f51bf
 AUX wiper-warning-fix.patch 418 RMD160 d3595ca361e1b330e22ec10b33b19813df94ff82 SHA1 ff644d5fa4e5d4e5017ce843cd09ab282e4dcd9a SHA256 3678c0ab683336e645a0c2e1c2167ad6fd094784722b63c6e66c435d685ed712
 DIST open-vm-tools-2009.05.22-167859.tar.gz 3417843 RMD160 c8403e0fe1ff32ec356ce997b7e621ee7fe87d22 SHA1 a38e16e8cc6bb3b9d9ce88244aef8332a233b7e4 SHA256 99f3726f86e53abac4efcf70a871e2003d2f245fd83b663ae8ad756322c48a2b
-EBUILD open-vm-tools-2009.05.22_p167859.ebuild 2162 RMD160 d96c4bd398e7653e9182083562bab859714ba57a SHA1 b043c9c861625735839d8c93a6b1f30ea2a17b80 SHA256 18afe757ae55b041ffee6d5d4c6a8116db4cecea9815645dcd7d90258ace8ab5
-MISC ChangeLog 957 RMD160 ea955a457651c116c421e5e3aece614c2ecc1221 SHA1 939662f2f00c884d96ee1dbe66158b848a036481 SHA256 798fb6436cef3220a2e865f45fe833c1b5a7df0a95ab515c21bb7581015560a7
+EBUILD open-vm-tools-2009.05.22_p167859.ebuild 2214 RMD160 82afb31e797f1e9c58973395f223cce193388ce6 SHA1 8cd67c9e2db900dea7b47e3254b95a576ddd19c0 SHA256 e1243df23f431cc348bd4c9b9738908acdb20e8a6f39f695993cb19aa5e69d16
+MISC ChangeLog 1104 RMD160 795be5b6abb3f477a58995cf3b0a41155a7b783a SHA1 0919fbb5473528fb4a712faa00207d9baf8f63cb SHA256 108dca801f5abf4c4e392b8daf706ea575b7204835e1cc0a277576a14d042411
 MISC metadata.xml 273 RMD160 868f3e6ce2b19d6874be333eb73f9320df75605f SHA1 a5fa804bbe72aee73c241218da87736c81ff3815 SHA256 3528eb8ce4ae248c296a08cd9c3d252fbb4421fe5369ec3b5353b3c4f0da025d
diff --git a/app-emulation/open-vm-tools/files/open-vm-tools-build-fix.patch b/app-emulation/open-vm-tools/files/open-vm-tools-build-fix.patch
new file mode 100644
index 00000000..572f1dcb
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/open-vm-tools-build-fix.patch
@@ -0,0 +1,23 @@
+--- a/vmware-user/vmware-user.cpp
++++ b/vmware-user/vmware-user.cpp
+@@ -529,7 +529,7 @@ VMwareUserRpcInSetOptionCB(char const **
+    char *value;
+    unsigned int index = 0;
+    Bool ret = FALSE;
+-   char *retStr = NULL;
++   const char *retStr = NULL;
+ 
+    /* parse the option & value string */
+    option = StrUtil_GetNextToken(&index, args, " ");
+--- a/vmware-user/Makefile.am
++++ b/vmware-user/Makefile.am
+@@ -75,7 +75,9 @@ vmware_user_LDADD += ../lib/err/libErr.l
+ vmware_user_LDADD += ../lib/foundryMsg/libFoundryMsg.la
+ vmware_user_LDADD += ../lib/backdoor/libBackdoor.la
+ vmware_user_LDADD += ../lib/dict/libDict.la
++if HAVE_GTKMM
+ vmware_user_LDADD += ../lib/dndGuest/libDndGuest.la
++endif
+ vmware_user_LDADD += ../lib/dnd/libDnd.la
+ vmware_user_LDADD += ../lib/dynxdr/libDynxdr.la
+ vmware_user_LDADD += ../lib/hgfs/libHgfs.la
diff --git a/app-emulation/open-vm-tools/open-vm-tools-2009.05.22_p167859.ebuild b/app-emulation/open-vm-tools/open-vm-tools-2009.05.22_p167859.ebuild
index d06c0474..a1fe20ce 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-2009.05.22_p167859.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-2009.05.22_p167859.ebuild
@@ -66,6 +66,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}/default-scripts.patch"
 	epatch "${FILESDIR}/wiper-warning-fix.patch"
+	epatch "${FILESDIR}/open-vm-tools-build-fix.patch"
 }
 
 src_configure() {