Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/open-vm-tools.git#b7a7c93548213205a1a9dd0506b3b852dbba13a3
This commit is contained in:
parent
fa282a8750
commit
63b9c155d7
13
open-vm-tools-gcc11.patch
Normal file
13
open-vm-tools-gcc11.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/lib/pollGtk/pollGtk.c b/lib/pollGtk/pollGtk.c
|
||||
index 4ccaeda..336a8bf 100644
|
||||
--- a/lib/pollGtk/pollGtk.c
|
||||
+++ b/lib/pollGtk/pollGtk.c
|
||||
@@ -127,7 +127,7 @@ typedef struct Poll {
|
||||
} Poll;
|
||||
|
||||
static Poll *pollState;
|
||||
-static volatile gsize inited = 0;
|
||||
+static gsize inited = 0;
|
||||
|
||||
static VMwareStatus
|
||||
PollGtkCallback(PollClassSet classSet, // IN
|
@ -28,7 +28,7 @@
|
||||
|
||||
Name: open-vm-tools
|
||||
Version: %{toolsversion}
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?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: patch1.patch
|
||||
Patch2: %{name}-gcc11.patch
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
@ -167,7 +168,7 @@ useful for verifying the functioning of %{name} in VMware virtual
|
||||
machines.
|
||||
|
||||
%prep
|
||||
%autosetup -p2 -n %{name}-%{version}-%{toolsbuild}
|
||||
%autosetup -p1 -n %{name}-%{version}-%{toolsbuild}
|
||||
|
||||
%build
|
||||
# Required for regenerating configure script when
|
||||
@ -391,6 +392,9 @@ fi
|
||||
%{_bindir}/vmware-vgauth-smoketest
|
||||
|
||||
%changelog
|
||||
* Fri Oct 30 2020 Jeff Law <law@redhat.com> - 11.1.5-2
|
||||
- Fix incorrect volatile exposed by gcc-11
|
||||
|
||||
* Tue Sep 08 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.1.5-1
|
||||
- Package new upstream version open-vm-tools-11.1.5-16724464.
|
||||
- Removed gcc10-warning.patch and sdmp-fixes.patch (no longer needed).
|
||||
|
Loading…
Reference in New Issue
Block a user