commit:     61e82256fbe02afb645e742335f7abceb9b8611d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 21:07:43 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 21:08:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61e82256

app-emulation/open-vm-tools: Fix build with glib-2.68

Closes: https://bugs.gentoo.org/784077
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-emulation/open-vm-tools/files/11.2.5-glib-2.68.patch     | 12 ++++++++++++
 .../open-vm-tools/open-vm-tools-11.2.5_p17337674.ebuild      |  1 +
 2 files changed, 13 insertions(+)

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 00000000000..1e35f6cb673
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/11.2.5-glib-2.68.patch
@@ -0,0 +1,12 @@
+--- a/open-vm-tools/lib/include/tracer.hh      2021-04-19 16:42:19.967147908 
-0400
++++ b/open-vm-tools/lib/include/tracer.hh      2021-04-19 16:42:27.364829692 
-0400
+@@ -28,9 +28,7 @@
+ 
+ #include "vm_basic_defs.h"
+ 
+-extern "C" {
+ #include "glib.h"
+-}
+ 
+ 
+ #ifdef VMX86_DEVEL

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 b67d57a3213..3ba72787b09 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() {

Reply via email to