Added open-vm-tools-gdk-glib.patch to fix RHBZ#1939718.

This commit is contained in:
Ravindra Kumar 2021-03-19 20:34:24 -07:00
parent 3862e8a050
commit 10ae4cce92
2 changed files with 77 additions and 1 deletions

View File

@ -0,0 +1,72 @@
diff -ur a/lib/include/tracer.hh b/lib/include/tracer.hh
--- a/lib/include/tracer.hh 2020-12-17 12:11:31.000000000 -0800
+++ b/lib/include/tracer.hh 2021-03-15 19:51:49.287342746 -0700
@@ -28,9 +28,7 @@
#include "vm_basic_defs.h"
-extern "C" {
#include "glib.h"
-}
#ifdef VMX86_DEVEL
diff -ur a/services/plugins/dndcp/copyPasteUIX11.cpp b/services/plugins/dndcp/copyPasteUIX11.cpp
--- a/services/plugins/dndcp/copyPasteUIX11.cpp 2020-12-17 12:11:31.000000000 -0800
+++ b/services/plugins/dndcp/copyPasteUIX11.cpp 2021-03-15 19:53:20.020952955 -0700
@@ -1666,6 +1666,7 @@
char buf[sizeof(VMBLOCK_FUSE_READ_RESPONSE)];
ssize_t size;
size = read(fd, buf, sizeof(VMBLOCK_FUSE_READ_RESPONSE));
+ (void) size; /* Prevent unused variable warning */
/*
* The current thread will block in read function until
* any other application accesses the file params->fileBlockName
diff -ur a/services/plugins/dndcp/dndcp.cpp b/services/plugins/dndcp/dndcp.cpp
--- a/services/plugins/dndcp/dndcp.cpp 2020-12-17 12:11:31.000000000 -0800
+++ b/services/plugins/dndcp/dndcp.cpp 2021-03-15 19:54:34.873281325 -0700
@@ -33,9 +33,9 @@
extern "C" {
#include "vmware/guestrpc/tclodefs.h"
+}
#include "vmware/tools/plugin.h"
#include "vmware/tools/utils.h"
-}
#include <string.h>
#include "copyPasteDnDWrapper.h"
diff -ur a/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp b/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
--- a/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp 2020-12-17 12:12:15.000000000 -0800
+++ b/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp 2021-03-15 19:55:28.810238519 -0700
@@ -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 -ur a/services/plugins/dndcp/dndUIX11.cpp b/services/plugins/dndcp/dndUIX11.cpp
--- a/services/plugins/dndcp/dndUIX11.cpp 2020-12-17 12:11:31.000000000 -0800
+++ b/services/plugins/dndcp/dndUIX11.cpp 2021-03-15 20:53:51.733705766 -0700
@@ -467,8 +467,13 @@
#ifndef GTK3
event.device = gdk_device_get_core_pointer();
#else
+ #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();

View File

@ -28,7 +28,7 @@
Name: open-vm-tools
Version: %{toolsversion}
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Open Virtual Machine Tools for virtual machines hosted on VMware
License: GPLv2
URL: https://github.com/vmware/%{name}
@ -46,6 +46,7 @@ ExclusiveArch: %{ix86} x86_64
%endif
Patch1: %{name}-gcc11.patch
Patch2: %{name}-gdk-glib.patch
BuildRequires: autoconf
BuildRequires: automake
@ -390,6 +391,9 @@ fi
%{_bindir}/vmware-vgauth-smoketest
%changelog
* Fri Mar 19 2021 Ravindra Kumar <ravindrakumar@vmware.com> - 11.2.5-5
- Added open-vm-tools-gdk-glib.patch to fix RHBZ#1939718.
* Tue Mar 16 2021 Neal Gompa <ngompa13@gmail.com> - 11.2.5-4
- Add missing BRs
- Clean up conditionals to build correctly with EL8+