From owner-dev-commits-ports-all@freebsd.org Wed Aug 18 18:54:37 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E5911655007; Wed, 18 Aug 2021 18:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GqcWx5s5zz4vPj; Wed, 18 Aug 2021 18:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B10E416BFF; Wed, 18 Aug 2021 18:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17IIsbJK012681; Wed, 18 Aug 2021 18:54:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17IIsbWU012680; Wed, 18 Aug 2021 18:54:37 GMT (envelope-from git) Date: Wed, 18 Aug 2021 18:54:37 GMT Message-Id: <202108181854.17IIsbWU012680@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Renato Botelho Subject: git: fd649cf02561 - main - emulators/open-vm-tools: Fix build MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: garga X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd649cf02561a5ee6d4e33abe8687761d6627edb Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Aug 2021 18:54:38 -0000 The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd649cf02561a5ee6d4e33abe8687761d6627edb commit fd649cf02561a5ee6d4e33abe8687761d6627edb Author: Renato Botelho AuthorDate: 2021-08-18 18:52:15 +0000 Commit: Renato Botelho 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"