[packages/open-vm-tools] fix build with gcc 10
atler
atler at pld-linux.org
Mon Aug 17 21:06:17 CEST 2020
commit 70785d2cc3208e285e933253e0f08e35c38b114a
Author: Jan Palus <atler at pld-linux.org>
Date: Mon Aug 17 20:58:11 2020 +0200
fix build with gcc 10
gcc10.patch | 39 +++++++++++++++++++++++++++++++++++++++
open-vm-tools.spec | 2 ++
2 files changed, 41 insertions(+)
---
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index a008c22..fab6453 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -27,6 +27,7 @@ Source6: vmtoolsd.pamd
Patch0: %{name}-dnd.patch
Patch1: iopl.patch
Patch2: log.patch
+Patch3: gcc10.patch
URL: https://github.com/vmware/open-vm-tools
BuildRequires: autoconf
BuildRequires: doxygen
@@ -141,6 +142,7 @@ Reguły UDEV dla open-vm-tools.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
cp %{SOURCE1} open-vm-tools/packaging
diff --git a/gcc10.patch b/gcc10.patch
new file mode 100644
index 0000000..b880050
--- /dev/null
+++ b/gcc10.patch
@@ -0,0 +1,39 @@
+From 6578e6a740a027e8957b8af1442277feba022ef9 Mon Sep 17 00:00:00 2001
+From: John Wolfe <jwolfe at vmware.com>
+Date: Fri, 31 Jul 2020 13:36:35 -0700
+Subject: [PATCH] Remove duplicate global definitions.
+
+Remove duplicate and unused global definitions for
+GDK_SELECTION_TYPE_TIMESTAMP and GDK_SELECTION_TYPE_UTF8_STRING.
+
+This fix will address https://github.com/vmware/open-vm-tools/issues/451
+---
+ .../services/plugins/dndcp/copyPasteUIX11.cpp | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
+index be8369e74..68212ab8b 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-2019 VMware, Inc. All rights reserved.
++ * Copyright (C) 2009-2020 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
+@@ -97,14 +97,6 @@ extern "C" {
+ GdkAtom GDK_SELECTION_CLIPBOARD;
+ #endif
+
+-#ifndef GDK_SELECTION_TYPE_TIMESTAMP
+-GdkAtom GDK_SELECTION_TYPE_TIMESTAMP;
+-#endif
+-
+-#ifndef GDK_SELECTION_TYPE_UTF8_STRING
+-GdkAtom GDK_SELECTION_TYPE_UTF8_STRING;
+-#endif
+-
+
+ /*
+ *-----------------------------------------------------------------------------
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/open-vm-tools.git/commitdiff/8b9551a950812f9e365a98e01bd79bea263eccb8
More information about the pld-cvs-commit
mailing list