* [gentoo-commits] repo/gentoo:master commit in: app-emulation/open-vm-tools/files/
@ 2017-08-13 11:31 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2017-08-13 11:31 UTC (permalink / raw
To: gentoo-commits
commit: c290a927cecb8f33c0236e3808bc05675f510daa
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Aug 11 14:51:03 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 11:28:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c290a927
app-emulation/open-vm-tools: remove unused patch/files
Closes: https://github.com/gentoo/gentoo/pull/5390
.../open-vm-tools/files/9.10.0-vgauth.patch | 22 ----------------------
app-emulation/open-vm-tools/files/network | 22 ----------------------
.../open-vm-tools/files/open-vm-tools.desktop | 6 ------
3 files changed, 50 deletions(-)
diff --git a/app-emulation/open-vm-tools/files/9.10.0-vgauth.patch b/app-emulation/open-vm-tools/files/9.10.0-vgauth.patch
deleted file mode 100644
index aa8d1e3e353..00000000000
--- a/app-emulation/open-vm-tools/files/9.10.0-vgauth.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/vgauth/service/Makefile.am
-+++ b/vgauth/service/Makefile.am
-@@ -78,7 +78,7 @@
- $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
- else
-- VGAuthService_LINK = $(LINK)
-+ VGAuthService_LINK = $(CXXLINK)
- endif
-
- # Message catalogs.
---- a/vgauth/service/Makefile.in
-+++ b/vgauth/service/Makefile.in
-@@ -322,7 +322,7 @@
- ../lib/libvgauth.la @XERCES_LIBS@ @XMLSECURITY_LIBS@ \
- @SSL_LIBS@ -lxerces-c -lxml-security-c -lssl -lcrypto \
- $(am__append_1)
--@HAVE_ICU_FALSE@VGAuthService_LINK = $(LINK)
-+@HAVE_ICU_FALSE@VGAuthService_LINK = $(CXXLINK)
- @HAVE_ICU_TRUE@VGAuthService_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- @HAVE_ICU_TRUE@ $(LIBTOOLFLAGS) --mode=link $(CXX) \
- @HAVE_ICU_TRUE@ $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
diff --git a/app-emulation/open-vm-tools/files/network b/app-emulation/open-vm-tools/files/network
deleted file mode 100644
index 3608455a9bc..00000000000
--- a/app-emulation/open-vm-tools/files/network
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-#
-# net.eth0, net.eth1, network, wicd, NetworkManager
-service="net.eth0"
-
-if ! rc-service -e ${service}
-then
- service="network"
-fi
-
-case "$1" in
- suspend-vm)
- rc-service ${service} stop
- ;;
- resume-vm)
- rc-service ${service} start
- ;;
- *)
- ;;
-esac
-
diff --git a/app-emulation/open-vm-tools/files/open-vm-tools.desktop b/app-emulation/open-vm-tools/files/open-vm-tools.desktop
deleted file mode 100644
index 97d4abf17f8..00000000000
--- a/app-emulation/open-vm-tools/files/open-vm-tools.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=vmware-user-suid-wrapper
-Name=VMware User Agent
-X-KDE-autostart-phase=1
-NoDisplay=true
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/open-vm-tools/files/
@ 2019-02-15 21:22 Mike Gilbert
0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert @ 2019-02-15 21:22 UTC (permalink / raw
To: gentoo-commits
commit: 37d1cd04fe9a69eafa7b79ae0aa76c9f18b2cad9
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 15 21:22:12 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Feb 15 21:22:12 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37d1cd04
app-emulation/open-vm-tools: remove old patches
Package-Manager: Portage-2.3.59_p2, Repoman-2.3.12_p67
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../open-vm-tools/files/10.1.0-vgauth.patch | 25 ------------
.../open-vm-tools/files/10.2.5-libtirpc.patch | 45 ----------------------
2 files changed, 70 deletions(-)
diff --git a/app-emulation/open-vm-tools/files/10.1.0-vgauth.patch b/app-emulation/open-vm-tools/files/10.1.0-vgauth.patch
deleted file mode 100644
index bc91b1b141a..00000000000
--- a/app-emulation/open-vm-tools/files/10.1.0-vgauth.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 488258effa60e293a70000338422c33ce5c73f9b Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 25 Nov 2016 13:59:34 -0500
-Subject: [PATCH] build: Always link VGAuthService using CXX
-
----
- open-vm-tools/vgauth/service/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/open-vm-tools/vgauth/service/Makefile.am b/open-vm-tools/vgauth/service/Makefile.am
-index 8c51d9f2..8f99dad1 100644
---- a/open-vm-tools/vgauth/service/Makefile.am
-+++ b/open-vm-tools/vgauth/service/Makefile.am
-@@ -95,7 +95,7 @@ if HAVE_ICU
- $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
- else
-- VGAuthService_LINK = $(LINK)
-+ VGAuthService_LINK = $(CXXLINK)
- endif
-
- # Message catalogs.
---
-2.11.0.rc2
-
diff --git a/app-emulation/open-vm-tools/files/10.2.5-libtirpc.patch b/app-emulation/open-vm-tools/files/10.2.5-libtirpc.patch
deleted file mode 100644
index a9dfb42b2fc..00000000000
--- a/app-emulation/open-vm-tools/files/10.2.5-libtirpc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 75505fed193fc3779560b57c1b0d6d4209b05bf9 Mon Sep 17 00:00:00 2001
-From: Xiami <i@f2light.com>
-Date: Thu, 14 Jun 2018 16:23:00 +0800
-Subject: [PATCH] lib/dynxdr: for libtirpc
-
-glibc-2.26 do not provide RPC support by default.
-This workaround only works for Gentoo as ebuild forces libtirpc.
----
- open-vm-tools/lib/dynxdr/dynxdr.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/open-vm-tools/lib/dynxdr/dynxdr.c b/open-vm-tools/lib/dynxdr/dynxdr.c
-index 95fdc7e2..d3182733 100644
---- a/open-vm-tools/lib/dynxdr/dynxdr.c
-+++ b/open-vm-tools/lib/dynxdr/dynxdr.c
-@@ -55,7 +55,7 @@ typedef struct DynXdrData {
- * Mac OS X, FreeBSD and Solaris don't take a const parameter to the
- * "x_getpostn" function.
- */
--#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun) || defined(_TIRPC_XDR_H)
- # define DYNXDR_GETPOS_CONST
- #else
- # define DYNXDR_GETPOS_CONST const
-@@ -172,7 +172,7 @@ DynXdrSetPos(XDR *xdrs, // IN
- }
-
-
--#if defined(__GLIBC__) || (defined(sun) && (defined(_LP64) || defined(_KERNEL)))
-+#if (defined(__GLIBC__) && !defined(_TIRPC_XDR_H)) || (defined(sun) && (defined(_LP64) || defined(_KERNEL)))
- /*
- *-----------------------------------------------------------------------------
- *
-@@ -322,7 +322,7 @@ DynXdr_Create(XDR *in) // IN
- DynXdrSetPos, /* x_setpostn */
- DynXdrInline, /* x_inline */
- NULL, /* x_destroy */
--#if defined(__GLIBC__)
-+#if defined(__GLIBC__) && !defined(_TIRPC_XDR_H)
- NULL, /* x_getint32 */
- DynXdrPutInt32, /* x_putint32 */
- #elif defined(__APPLE__)
---
-2.16.4
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/open-vm-tools/files/
@ 2020-11-20 18:35 Mike Gilbert
0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert @ 2020-11-20 18:35 UTC (permalink / raw
To: gentoo-commits
commit: 7e51c6a6b2d0438b27e3a383c5878766bb5cce7e
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Nov 20 17:22:41 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 18:35:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e51c6a6
app-emulation/open-vm-tools: remove unused patch
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/18337
.../files/11.0.1-udev-complaints.patch | 60 ----------------------
1 file changed, 60 deletions(-)
diff --git a/app-emulation/open-vm-tools/files/11.0.1-udev-complaints.patch b/app-emulation/open-vm-tools/files/11.0.1-udev-complaints.patch
deleted file mode 100644
index b34e06d1a22..00000000000
--- a/app-emulation/open-vm-tools/files/11.0.1-udev-complaints.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From f1dab8ded45aaaa4b6993a4d96d0aefc700f1796 Mon Sep 17 00:00:00 2001
-From: Oliver Kurth <okurth@vmware.com>
-Date: Mon, 28 Oct 2019 16:12:42 -0700
-Subject: [PATCH] stop systemd-243 udev complaints #371
-
-Address issues from pull request #371 on github:
-- fix substiution variables for systemd-243
-- fix permissions of rules file
-See https://github.com/vmware/open-vm-tools/pull/371
----
- open-vm-tools/AUTHORS | 4 ++++
- open-vm-tools/udev/99-vmware-scsi-udev.rules | 6 +++---
- open-vm-tools/udev/Makefile.am | 4 ++--
- 3 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/open-vm-tools/AUTHORS b/open-vm-tools/AUTHORS
-index 08cc28ef2..026de07e6 100644
---- a/open-vm-tools/AUTHORS
-+++ b/open-vm-tools/AUTHORS
-@@ -49,3 +49,7 @@ Josh Paetzel Additional changes to vmmemctl.ko for FreeBSD 12.0 API changes.
-
- Haruki Tsurumoto Fix Asianux identification
- - https://github.com/vmware/open-vm-tools/pull/325
-+
-+MilhouseVH stop systemd-243 udev complaints
-+ - https://github.com/vmware/open-vm-tools/pull/371
-+
-diff --git a/open-vm-tools/udev/99-vmware-scsi-udev.rules b/open-vm-tools/udev/99-vmware-scsi-udev.rules
-index 053b59706..fb4ed6844 100644
---- a/open-vm-tools/udev/99-vmware-scsi-udev.rules
-+++ b/open-vm-tools/udev/99-vmware-scsi-udev.rules
-@@ -1,7 +1,7 @@
--# Copyright (C) 2016 VMware, Inc. All rights reserved.
-+# Copyright (C) 2016,2019 VMware, Inc. All rights reserved.
- #
- # This file is part of open-vm-tools
-
--ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'"
--ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'"
-+ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$env{DEVPATH}/device/timeout'"
-+ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$env{DEVPATH}/device/timeout'"
-
-diff --git a/open-vm-tools/udev/Makefile.am b/open-vm-tools/udev/Makefile.am
-index 68fbc3e27..c3baadf16 100644
---- a/open-vm-tools/udev/Makefile.am
-+++ b/open-vm-tools/udev/Makefile.am
-@@ -1,5 +1,5 @@
- ################################################################################
--### Copyright (C) 2016 VMware, Inc. All rights reserved.
-+### Copyright (C) 2016,2019 VMware, Inc. All rights reserved.
- ###
- ### This program is free software; you can redistribute it and/or modify
- ### it under the terms of version 2 of the GNU General Public License as
-@@ -17,5 +17,5 @@
-
- install-data-local:
- $(INSTALL) -d $(DESTDIR)$(UDEVRULESDIR)
-- $(INSTALL) $(srcdir)/99-vmware-scsi-udev.rules $(DESTDIR)$(UDEVRULESDIR)
-+ $(INSTALL) -m 644 $(srcdir)/99-vmware-scsi-udev.rules $(DESTDIR)$(UDEVRULESDIR)
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/open-vm-tools/files/
@ 2021-04-19 21:27 Mike Gilbert
0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert @ 2021-04-19 21:27 UTC (permalink / raw
To: gentoo-commits
commit: 2c1c3fe7d60160a8a2535c081301b47ab97adb6b
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 21:25:51 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 21:27:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c1c3fe7
app-emulation/open-vm-tools: replace glib fix with upstream patch
Bug: https://bugs.gentoo.org/784077
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../open-vm-tools/files/11.2.5-glib-2.68.patch | 140 ++++++++++++++++++++-
1 file changed, 138 insertions(+), 2 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
index 1e35f6cb673..b04342c3f68 100644
--- 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
@@ -1,5 +1,44 @@
---- 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
+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"
@@ -10,3 +49,100 @@
#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"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/open-vm-tools/files/
@ 2022-06-07 16:42 Mike Gilbert
0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert @ 2022-06-07 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 4eda3c98aef9cc88fd2f215ab94811a7dfc35c04
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun 7 16:30:29 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 16:41:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eda3c98
app-emulation/open-vm-tools: remove unused patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25795
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../open-vm-tools/files/10.1.0-mount.vmhgfs.patch | 33 -----
.../open-vm-tools/files/11.2.5-glib-2.68.patch | 148 ---------------------
2 files changed, 181 deletions(-)
diff --git a/app-emulation/open-vm-tools/files/10.1.0-mount.vmhgfs.patch b/app-emulation/open-vm-tools/files/10.1.0-mount.vmhgfs.patch
deleted file mode 100644
index bff97811771b..000000000000
--- a/app-emulation/open-vm-tools/files/10.1.0-mount.vmhgfs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1805ab024b10e8185175de7ce9c9b9db87fd0897 Mon Sep 17 00:00:00 2001
-From: Bernd Zeimetz <bernd@bzed.de>
-Date: Sun, 10 Jan 2016 22:18:04 +0100
-Subject: [PATCH] Fix mount.vmhgfs symlinks if DESTDIR is used
-
-Without this change symlinks in the form of
-sbin/mount.vmhgfs -> /build/open-vm-tools-10.0.5-3227872/debian/open-vm-tools/usr/sbin/mount.vmhgfs
-are being produced, if DESTDIR was uset while running make install.
----
- open-vm-tools/hgfsmounter/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/open-vm-tools/hgfsmounter/Makefile.am b/open-vm-tools/hgfsmounter/Makefile.am
-index e48417e..fe70892 100644
---- a/open-vm-tools/hgfsmounter/Makefile.am
-+++ b/open-vm-tools/hgfsmounter/Makefile.am
-@@ -33,14 +33,14 @@ install-exec-hook:
- mv $(DESTDIR)$(sbindir)/mount.vmhgfs \
- $(DESTDIR)$(sbindir)/mount_vmhgfs
- -$(MKDIR_P) $(DESTDIR)/sbin
-- -$(LN_S) $(DESTDIR)$(sbindir)/mount_vmhgfs \
-+ -$(LN_S) $(sbindir)/mount_vmhgfs \
- $(DESTDIR)/sbin/mount_vmhgfs &> /dev/null
- uninstall-hook:
- rm -f $(DESTDIR)$(sbindir)/mount_vmhgfs
- else
- install-exec-hook:
- -$(MKDIR_P) $(DESTDIR)/sbin
-- -$(LN_S) $(DESTDIR)$(sbindir)/mount.vmhgfs \
-+ -$(LN_S) $(sbindir)/mount.vmhgfs \
- $(DESTDIR)/sbin/mount.vmhgfs &> /dev/null
- uninstall-hook:
- rm -f $(DESTDIR)/sbin/mount.vmhgfs
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
deleted file mode 100644
index b04342c3f68e..000000000000
--- a/app-emulation/open-vm-tools/files/11.2.5-glib-2.68.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-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"
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-06-07 16:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-19 21:27 [gentoo-commits] repo/gentoo:master commit in: app-emulation/open-vm-tools/files/ Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2022-06-07 16:42 Mike Gilbert
2020-11-20 18:35 Mike Gilbert
2019-02-15 21:22 Mike Gilbert
2017-08-13 11:31 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox