summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2021-04-19 17:07:43 -0400
committerMatt Turner <mattst88@gentoo.org>2021-04-19 17:08:19 -0400
commit61e82256fbe02afb645e742335f7abceb9b8611d (patch)
treef16fea5692bb6e6b0f1bae9a8c62f69238ff5050 /app-emulation/open-vm-tools
parentsys-apps/fakeroot: undo revbump for previous build fix (diff)
downloadgentoo-61e82256fbe02afb645e742335f7abceb9b8611d.tar.gz
gentoo-61e82256fbe02afb645e742335f7abceb9b8611d.tar.bz2
gentoo-61e82256fbe02afb645e742335f7abceb9b8611d.zip
app-emulation/open-vm-tools: Fix build with glib-2.68
Closes: https://bugs.gentoo.org/784077 Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'app-emulation/open-vm-tools')
-rw-r--r--app-emulation/open-vm-tools/files/11.2.5-glib-2.68.patch12
-rw-r--r--app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674.ebuild1
2 files changed, 13 insertions, 0 deletions
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..1e35f6cb673b
--- /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 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() {