gentoo resync : 28.04.2021

3 files changed, 151 insertions, 1 deletions

diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index 716c07ef3172..feb62dcce585 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -1,5 +1,6 @@
 AUX 10.1.0-Werror.patch 660 BLAKE2B a2877e473e2206259cf260b22d638643ae0e1a595f79bc69c401b9e5107445764868782e3cd4d8626f9a9d62fd748b7242530d89881678c12ac49230804cab41 SHA512 3bfbc1e5c064318b36b01e656ce6296726b31632222f8cebe96cac6acf011e1237380cdad71d01a0493c1382d0e3fc471e2a4e0ed0b902e70cf29e1d8a88633f
 AUX 10.1.0-mount.vmhgfs.patch 1305 BLAKE2B 5482c6ab87c5e14e229088eb71c3e6833674eae09af4f4171ff16ee752fd354828c7eab1f7c85eb5f23f14d9412c15e4566f872d709aaead4ff7d7cf8dbd06b4 SHA512 3cf1cf89f8e39d676075a56643e9d0aef22609234166195cb31cea2cb3daf6d90cb5aab0aa84f446c34dabc9ad67ccc5532276fe1c20d5cc5a723240b1313694
+AUX 11.2.5-glib-2.68.patch 6419 BLAKE2B ca772719d7328deeb784a4bb6e7e1bbee56704bab2d5faf81e1df719877960333df7004aff9775e2903b4ac996495e5cc150bace69c84d10568b75956ca6fc36 SHA512 1e99c9b61406aeb0b071b1d3706074f900c8b8afa57881c9e13e712b6ae1cd61702795e7f01580b748c52fd58be47fa1c23bfafbf497da74dfd1924d8e4fdab2
 AUX mount.vmhgfs 63 BLAKE2B 8214f6eaae9e1c2b6af7cb364572323f91e544d17d816ce93ca1a58e4f6c0ac8692000c95ef982ad6a2721bb070a5d0c4a65275a63e8cea91e14888713b560d4 SHA512 dbad70fbb96e37ffca4664abe7766c26ce3303e52ccfc80b5c83d1e21066d2a23d548910f8e15055be36e1ca162cdbbf6e19fcb672314888c63cd802a499acb9
 AUX open-vm-tools.confd 88 BLAKE2B d82267674328d1e38cc850df238b8cc6c566588883d81e59f308ddd070fde6e4f9ae4950c9d68ac6daf2ed33e1a45f323d8f954430559b03697f1a25f1e7ef6a SHA512 fca30a3be4dd3247e16115fe32b4d27ede8751f96b5a33b9f489b0ce57823c605b6249ff722d6f4ed82a98979f36d28821603b4a5a1d967d3048d23d983a19be
 AUX open-vm-tools.initd 1225 BLAKE2B 279f572bfb07c40f0612c39989ba0048c640b5bdfdb06e624d8af974cd9fdff42ab0b4bb6ad79e19dedf3cd89fd90d61f7d549b9c8a8a6406129a5eab5e60cbc SHA512 a612dd69e671cd32b028caeefa8123243e46ed6ffe5f6f7cbd1f805ec10088dbe994d4ecb2346a7f6d094e913e70e87fa17fa195702a0825cc3af319d350d34d
@@ -9,5 +10,5 @@ AUX vmtoolsd.vgauth.service 312 BLAKE2B dba8ddb1b701cea490b117d08c93738a38bd668c
 DIST open-vm-tools-11.2.0-16938113.tar.gz 4050857 BLAKE2B b0e5e1e985d9f3d50dbbb8a4a7939d37d8968f0aa15e6d7200b7ec8511bd059d3a78a4ddd763d22965dc6da614d156e6b7ee23af73490f8bbf8e1dc2664041d3 SHA512 c950d6e8ba5218dd40e845f3c2b09eeb640ef0d33c7ea1671164027927e062dcf0b4745f6e4515a7495ec20a6d06a8fbf700819f6211073194b5ef97d7be441d
 DIST open-vm-tools-11.2.5-17337674.tar.gz 4057528 BLAKE2B 2adc5179e09a4bb501fe12c9e6dea7fee106516fd250899170a8fb3bcefb9b576136a82e4c3d3a73217b44aba8880728bb3588cedd715529f9b2991f0156ac84 SHA512 b6d4bc6522418ec7a881752181ad9240e535854df492e758abf3996c6afe245466ffbff60cc1b6cdff5cf731b5769c9f9cb96aed29f0b788d0eef05f91fcf8ab
 EBUILD open-vm-tools-11.2.0_p16938113-r1.ebuild 3138 BLAKE2B 89fd2f0ad743c54e9df564749e4163be037dbed8f159717779419c9c5430528634a36ffb22712be305ad39accadfd12c5cabf99180d782744c028819369c0baf SHA512 0d463a4ac777a0e0afdc6df7035bf5c832b38c60e06c5f96485fec88a7f054d842e487fbe307d41cbf489c44ff83566ef9c94ac3495957120c8074f94d26a628
-EBUILD open-vm-tools-11.2.5_p17337674.ebuild 3112 BLAKE2B 7e9207ec60692927fbfb3e33818f3abc1ee452cfcb835d0804544441076d1c24a7526349dd81b1582136f3fcb120b14028b4282d49b86501e3f11b545b126dd7 SHA512 d99ce3e9505992e3a9a46919932be42a4b2e159a739aed4f2fdd35d9d90e7a26a0b98d9d58a359937f85579da5038b685dc7e8d9e1e2d28b733db21b8a66300d
+EBUILD open-vm-tools-11.2.5_p17337674.ebuild 3150 BLAKE2B a088348de7d7a0cb43dcacb6ce00727c7fee59c041c3e877f7ab0904c2c8488bdeae1d725209fbb9dade47b9b6d34a6066a055e771aa5fd65e3378012cdcd1ce SHA512 e23d84a00bce83c9fc05c8d7c24febd37f2a865c1777c785e02b934d65d6451bdd495b599f97c1ce3144baaa015f703ee421eec4770f30d5f333d0f4fffde75a
 MISC metadata.xml 1098 BLAKE2B f4a5ef8cb8661438d0d1e01da16993a3334c25dcf8a43e55ecabd0b02734b33681d1b0824db1f08431086f8287094d7aee559e50af8c0ef0f4819cc2c14158eb SHA512 f4eb924b8a5269f0fe7f4c00f3a4747f56dfdc5c028a913785cf1929938ad333102ebfba6f3ca9ac15fb7e25f06d629be528abdcd7bb96a8c31e257405cda201
diff --git a/app-emulation/open-vm-tools/files/11.2.5-glib-2.68.patch b/app-emulation/open-vm-tools/files/11.2.5-glib-2.68.patch
new file mode 100644
index 000000000000..b04342c3f68e
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/11.2.5-glib-2.68.patch
@@ -0,0 +1,148 @@
+From 82931a1bcb39d5132910c7fb2ddc086c51d06662 Mon Sep 17 00:00:00 2001
+From: John Wolfe <jwolfe@vmware.com>
+Date: Mon, 19 Apr 2021 11:08:10 -0700
+Subject: [PATCH] Fix issues using GCC 11 with gtk >= 3.20 and glib >=2.66.3
+
+With glib2.0 releases >= 2.66.3, glib header files inside an
+extern "C" block will encounter compilation errors.  This has
+impacted several OSS packages.  Consumers of newer versions of glib2.0
+must not include glib headers in an extern "C" block.
+
+GTK 3.20 has deprecated gdk_display_get_device_manager(); using the
+newer gdk_display_get_default_seat() when the GTK version is >= 3.20.
+
+The return value from read() must be used to avoid an unused result
+warning from the compiler.  This can be avoided by using dummy retyping
+in the case where the return value is not used or in this case, using
+the returned value in a debug log message.
+
+Pull Request: https://github.com/vmware/open-vm-tools/pull/505
+Addresses:    https://github.com/vmware/open-vm-tools/issues/500
+Addresses:    https://github.com/vmware/open-vm-tools/issues/509
+---
+ open-vm-tools/AUTHORS                                 |  3 +++
+ open-vm-tools/lib/include/tracer.hh                   |  4 +---
+ .../services/plugins/dndcp/copyPasteUIX11.cpp         |  3 ++-
+ .../plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp |  6 +++---
+ open-vm-tools/services/plugins/dndcp/dndUIX11.cpp     | 11 +++++++++--
+ open-vm-tools/services/plugins/dndcp/dndcp.cpp        |  7 ++++++-
+ 6 files changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/open-vm-tools/lib/include/tracer.hh b/open-vm-tools/lib/include/tracer.hh
+index 697caedbc..e9ae892cb 100644
+--- a/open-vm-tools/lib/include/tracer.hh
++++ b/open-vm-tools/lib/include/tracer.hh
+@@ -1,5 +1,5 @@
+ /*********************************************************
+- * Copyright (C) 2013-2017 VMware, Inc. All rights reserved.
++ * Copyright (C) 2013-2017,2021 VMware, Inc. All rights reserved.
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as published
+@@ -28,9 +28,7 @@
+ 
+ #include "vm_basic_defs.h"
+ 
+-extern "C" {
+ #include "glib.h"
+-}
+ 
+ 
+ #ifdef VMX86_DEVEL
+diff --git a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
+index 68212ab8b..080dc3d76 100644
+--- a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
++++ b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
+@@ -1,5 +1,5 @@
+ /*********************************************************
+- * Copyright (C) 2009-2020 VMware, Inc. All rights reserved.
++ * Copyright (C) 2009-2021 VMware, Inc. All rights reserved.
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as published
+@@ -1666,6 +1666,7 @@ CopyPasteUIX11::FileBlockMonitorThread(void *arg)   // IN
+       char buf[sizeof(VMBLOCK_FUSE_READ_RESPONSE)];
+       ssize_t size;
+       size = read(fd, buf, sizeof(VMBLOCK_FUSE_READ_RESPONSE));
++      g_debug("%s: Number of bytes read : %" FMTSZ "u\n", __FUNCTION__, size);
+       /*
+        * The current thread will block in read function until
+        * any other application accesses the file params->fileBlockName
+diff --git a/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp b/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
+index 9b70984fc..424481baa 100644
+--- a/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
++++ b/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
+@@ -1,5 +1,5 @@
+ /*********************************************************
+- * Copyright (C) 2010-2017 VMware, Inc. All rights reserved.
++ * Copyright (C) 2010-2017,2021 VMware, Inc. All rights reserved.
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as published
+@@ -31,13 +31,13 @@
+ 
+ #include "dnd.h"
+ 
+-extern "C" {
+ #ifdef VMX86_TOOLS
+    #include "vmware/tools/guestrpc.h"
+ #else
++extern "C" {
+    #include "guest_rpc.h"
+-#endif
+ }
++#endif
+ 
+ #define GUEST_RPC_CMD_STR_DND "dnd.transport"
+ #define GUEST_RPC_CMD_STR_CP  "copypaste.transport"
+diff --git a/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp b/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp
+index 50c2bf5e1..03cf3e0d7 100644
+--- a/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp
++++ b/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp
+@@ -1,5 +1,5 @@
+ /*********************************************************
+- * Copyright (C) 2009-2019 VMware, Inc. All rights reserved.
++ * Copyright (C) 2009-2021 VMware, Inc. All rights reserved.
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as published
+@@ -467,8 +467,15 @@ DnDUIX11::OnSrcDragBegin(const CPClipboard *clip,       // IN
+ #ifndef GTK3
+    event.device = gdk_device_get_core_pointer();
+ #else
+-   GdkDeviceManager* manager = gdk_display_get_device_manager(gdk_window_get_display(event.window));
++#   if GTK_MINOR_VERSION >= 20
++   GdkSeat *seat =
++      gdk_display_get_default_seat(gdk_window_get_display(event.window));
++   event.device = gdk_seat_get_pointer(seat);
++#   else
++   GdkDeviceManager *manager =
++      gdk_display_get_device_manager(gdk_window_get_display(event.window));
+    event.device = gdk_device_manager_get_client_pointer(manager);
++#   endif
+ #endif
+    event.x_root = mOrigin.get_x();
+    event.y_root = mOrigin.get_y();
+diff --git a/open-vm-tools/services/plugins/dndcp/dndcp.cpp b/open-vm-tools/services/plugins/dndcp/dndcp.cpp
+index d1013f4a7..bae4c94c7 100644
+--- a/open-vm-tools/services/plugins/dndcp/dndcp.cpp
++++ b/open-vm-tools/services/plugins/dndcp/dndcp.cpp
+@@ -1,5 +1,5 @@
+ /*********************************************************
+- * Copyright (C) 2010-2019 VMware, Inc. All rights reserved.
++ * Copyright (C) 2010-2021 VMware, Inc. All rights reserved.
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as published
+@@ -31,6 +31,11 @@
+ 
+ #define G_LOG_DOMAIN "dndcp"
+ 
++/**
++ * Include glib.h before encountering any extern "C".
++ */
++#include <glib.h>
++
+ extern "C" {
+ #include "vmware/guestrpc/tclodefs.h"
+ #include "vmware/tools/plugin.h"
diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674.ebuild b/app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674.ebuild
index b67d57a32133..3ba72787b09b 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674.ebuild
@@ -69,6 +69,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}/10.1.0-mount.vmhgfs.patch"
 	"${FILESDIR}/10.1.0-Werror.patch"
+	"${FILESDIR}/11.2.5-glib-2.68.patch"
 )
 
 pkg_setup() {