Date: Tue, 3 Aug 2021 02:47:15 GMT From: Neel Chauhan <nc@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 42dfc139f65b - main - emulators/open-vm-tools: Prepare for glib 2.68.3 Message-ID: <202108030247.1732lFIs005760@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=42dfc139f65ba4e9033376a97762a78d93c3cc6a commit 42dfc139f65ba4e9033376a97762a78d93c3cc6a Author: Neel Chauhan <nc@FreeBSD.org> AuthorDate: 2021-08-03 01:50:57 +0000 Commit: Neel Chauhan <nc@FreeBSD.org> 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 <string.h> + #include "copyPasteDnDWrapper.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108030247.1732lFIs005760>