Accepting request 881492 from Virtualization:VMware
OBS-URL: https://build.opensuse.org/request/show/881492 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/open-vm-tools?expand=0&rev=101
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
16075478f4
73
open-vm-tools-glib-2.67.patch
Normal file
73
open-vm-tools-glib-2.67.patch
Normal file
@ -0,0 +1,73 @@
|
||||
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();
|
||||
|
||||
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 26 09:40:41 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Add open-vm-tools-glib-2.67.patch: Fix build with glib 2.67.
|
||||
Patch has been borrowed by Fedora, upstream is still busy working
|
||||
out a patch (I'd not be surprised if they end up merging this
|
||||
finally.
|
||||
https://github.com/vmware/open-vm-tools/issues/500
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 15 13:14:28 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
- prepare usrmerge (boo#1029961)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 21 23:11:19 UTC 2021 - Kirk Allan <kallan@suse.com>
|
||||
|
||||
|
||||
@ -56,6 +56,8 @@ Source6: open-vm-tools-modprobe.conf
|
||||
Source7: tools.conf
|
||||
Source8: vgauthd.service
|
||||
Source9: vmblock-fuse.service
|
||||
# PATCH-FIX-UPSTREAM open-vm-tools-glib-2.67.patch dimstar@opensuse.org -- Fix build with glib 2.67, https://github.com/vmware/open-vm-tools/issues/500
|
||||
Patch100: open-vm-tools-glib-2.67.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: gcc-c++
|
||||
# don't use pkgconfig(gtk+-2.0) so we can build on SLE
|
||||
@ -218,6 +220,9 @@ sed -i -e "s/\r//" README
|
||||
#Upstream patches
|
||||
%patch0 -p2
|
||||
|
||||
# patch not yet coming from upstream, https://github.com/vmware/open-vm-tools/issues/500
|
||||
%patch100 -p1
|
||||
|
||||
%build
|
||||
%if %{with_X}
|
||||
%define arg_x --with-x
|
||||
@ -311,7 +316,10 @@ install -D -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.co
|
||||
%endif
|
||||
|
||||
# fix a link pointing to the buildroot for mount.vmhgfs
|
||||
( cd %{buildroot}/sbin; rm mount.vmhgfs; ln -s ..%{_sbindir}/mount.vmhgfs )
|
||||
rm %{buildroot}/sbin/mount.vmhgfs
|
||||
%if !0%{?usrmerged}
|
||||
ln -s ..%{_sbindir}/mount.vmhgfs %{buildroot}/sbin/mount.vmhgfs
|
||||
%endif
|
||||
|
||||
%pre
|
||||
%service_add_pre vmtoolsd.service
|
||||
@ -416,7 +424,9 @@ rm -rf %{buildroot}
|
||||
%{_bindir}/vmware-xferlogs
|
||||
%{_bindir}/vm-support
|
||||
%{_sbindir}/mount.vmhgfs
|
||||
%if !0%{?usrmerged}
|
||||
/sbin/mount.vmhgfs
|
||||
%endif
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/vmtoolsd
|
||||
%dir %{_sysconfdir}/vmware-tools
|
||||
%dir %{_sysconfdir}/vmware-tools/scripts
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user