From 63b9c155d77ddad03307111d876368694acf4886 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Fri, 30 Oct 2020 22:38:42 +0000
Subject: [PATCH] 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
---
 open-vm-tools-gcc11.patch | 13 +++++++++++++
 open-vm-tools.spec        |  8 ++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 open-vm-tools-gcc11.patch

diff --git a/open-vm-tools-gcc11.patch b/open-vm-tools-gcc11.patch
new file mode 100644
index 0000000..ae85124
--- /dev/null
+++ b/open-vm-tools-gcc11.patch
@@ -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
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 1db6fb1..c80b951 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -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).