Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 18 Aug 2021 18:54:37 GMT
From:      Renato Botelho <garga@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: fd649cf02561 - main - emulators/open-vm-tools: Fix build
Message-ID:  <202108181854.17IIsbWU012680@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by garga:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fd649cf02561a5ee6d4e33abe8687761d6627edb

commit fd649cf02561a5ee6d4e33abe8687761d6627edb
Author:     Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2021-08-18 18:52:15 +0000
Commit:     Renato Botelho <garga@FreeBSD.org>
CommitDate: 2021-08-18 18:54:18 +0000

    emulators/open-vm-tools: Fix build
    
    Remove some patches introduced by 42dfc139f65 that are note needed on
    11.3.0 and fix build
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 .../open-vm-tools/files/patch-lib_include_tracer.hh      | 12 ------------
 ...ces_plugins_dndcp_dndGuest_dndCPTransportGuestRpc.hpp | 16 ----------------
 2 files changed, 28 deletions(-)

diff --git a/emulators/open-vm-tools/files/patch-lib_include_tracer.hh b/emulators/open-vm-tools/files/patch-lib_include_tracer.hh
deleted file mode 100644
index 6e3e401453da..000000000000
--- a/emulators/open-vm-tools/files/patch-lib_include_tracer.hh
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/include/tracer.hh.orig	2021-08-03 01:45:08 UTC
-+++ lib/include/tracer.hh
-@@ -28,9 +28,7 @@
- 
- #include "vm_basic_defs.h"
- 
--extern "C" {
- #include "glib.h"
--}
- 
- 
- #ifdef VMX86_DEVEL
diff --git a/emulators/open-vm-tools/files/patch-services_plugins_dndcp_dndGuest_dndCPTransportGuestRpc.hpp b/emulators/open-vm-tools/files/patch-services_plugins_dndcp_dndGuest_dndCPTransportGuestRpc.hpp
deleted file mode 100644
index 7d90d26a669e..000000000000
--- a/emulators/open-vm-tools/files/patch-services_plugins_dndcp_dndGuest_dndCPTransportGuestRpc.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp.orig	2021-08-03 01:43:48 UTC
-+++ services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
-@@ -31,13 +31,11 @@
- 
- #include "dnd.h"
- 
--extern "C" {
- #ifdef VMX86_TOOLS
-    #include "vmware/tools/guestrpc.h"
- #else
-    #include "guest_rpc.h"
- #endif
--}
- 
- #define GUEST_RPC_CMD_STR_DND "dnd.transport"
- #define GUEST_RPC_CMD_STR_CP  "copypaste.transport"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108181854.17IIsbWU012680>