From owner-dev-commits-ports-main@freebsd.org Tue Aug 3 02:47:16 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 4917D67ECCD; Tue, 3 Aug 2021 02:47:16 +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 4Gdzmh0Bntz4X55; Tue, 3 Aug 2021 02:47:16 +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 CF26B2FE8; Tue, 3 Aug 2021 02:47:15 +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 1732lFUU005761; Tue, 3 Aug 2021 02:47:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1732lFIs005760; Tue, 3 Aug 2021 02:47:15 GMT (envelope-from git) Date: Tue, 3 Aug 2021 02:47:15 GMT Message-Id: <202108030247.1732lFIs005760@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 42dfc139f65b - main - emulators/open-vm-tools: Prepare for glib 2.68.3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42dfc139f65ba4e9033376a97762a78d93c3cc6a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Aug 2021 02:47:16 -0000 The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=42dfc139f65ba4e9033376a97762a78d93c3cc6a commit 42dfc139f65ba4e9033376a97762a78d93c3cc6a Author: Neel Chauhan AuthorDate: 2021-08-03 01:50:57 +0000 Commit: Neel Chauhan CommitDate: 2021-08-03 02:47:10 +0000 emulators/open-vm-tools: Prepare for glib 2.68.3 PR: 256200 --- .../open-vm-tools/files/patch-lib_include_tracer.hh | 12 ++++++++++++ .../open-vm-tools/files/patch-lib_pollGtk_pollGtk.c | 11 +++++++++++ ...ces_plugins_dndcp_dndGuest_dndCPTransportGuestRpc.hpp | 16 ++++++++++++++++ .../files/patch-services_plugins_dndcp_dndcp.cpp | 14 ++++++++++++++ 4 files changed, 53 insertions(+) diff --git a/emulators/open-vm-tools/files/patch-lib_include_tracer.hh b/emulators/open-vm-tools/files/patch-lib_include_tracer.hh new file mode 100644 index 000000000000..6e3e401453da --- /dev/null +++ b/emulators/open-vm-tools/files/patch-lib_include_tracer.hh @@ -0,0 +1,12 @@ +--- 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-lib_pollGtk_pollGtk.c b/emulators/open-vm-tools/files/patch-lib_pollGtk_pollGtk.c new file mode 100644 index 000000000000..abe899d9f45a --- /dev/null +++ b/emulators/open-vm-tools/files/patch-lib_pollGtk_pollGtk.c @@ -0,0 +1,11 @@ +--- lib/pollGtk/pollGtk.c.orig 2021-08-03 01:31:55 UTC ++++ lib/pollGtk/pollGtk.c +@@ -1485,7 +1485,7 @@ Poll_InitGtk(void) + PollLockingAlwaysEnabled, + }; + +- if (g_once_init_enter(&inited)) { ++ if (g_once_init_enter((gsize *)&inited)) { + gsize didInit = 1; + Poll_InitWithImpl(>kImpl); + g_once_init_leave(&inited, didInit); 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 new file mode 100644 index 000000000000..7d90d26a669e --- /dev/null +++ b/emulators/open-vm-tools/files/patch-services_plugins_dndcp_dndGuest_dndCPTransportGuestRpc.hpp @@ -0,0 +1,16 @@ +--- 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" diff --git a/emulators/open-vm-tools/files/patch-services_plugins_dndcp_dndcp.cpp b/emulators/open-vm-tools/files/patch-services_plugins_dndcp_dndcp.cpp new file mode 100644 index 000000000000..cc0e68453b66 --- /dev/null +++ b/emulators/open-vm-tools/files/patch-services_plugins_dndcp_dndcp.cpp @@ -0,0 +1,14 @@ +--- services/plugins/dndcp/dndcp.cpp.orig 2021-08-03 01:47:47 UTC ++++ services/plugins/dndcp/dndcp.cpp +@@ -31,11 +31,9 @@ + + #define G_LOG_DOMAIN "dndcp" + +-extern "C" { + #include "vmware/guestrpc/tclodefs.h" + #include "vmware/tools/plugin.h" + #include "vmware/tools/utils.h" +-} + + #include + #include "copyPasteDnDWrapper.h"