From df53b56ca874d866b269b0956a57be64e7c0084d Mon Sep 17 00:00:00 2001
From: Sérgio M. Basto <sergio@serjux.com>
Date: Mar 11 2020 01:48:44 +0000
Subject: Fix for clipboard

Obsoletes virtualbox-guest-additions-ogl

---

diff --git a/Clipboard.patch b/Clipboard.patch
new file mode 100644
index 0000000..6df543f
--- /dev/null
+++ b/Clipboard.patch
@@ -0,0 +1,52 @@
+Shared Clipboard: ticketref:19336 Linux guest: shared clipboard doesn't work (on fresh VirtualBox-6.1.4-136177)
+
+git-svn-id: http://www.virtualbox.org/svn/vbox@83184 cfe28804-0f27-0410-a406-dd0f0b0b656f
+diff --git trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp b/trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
+index ad9e3bf69c..9063b212cd 100644
+--- trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
++++ trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
+@@ -107,7 +107,7 @@ DECLCALLBACK(int) ShClX11RequestDataForX11Callback(PSHCLCONTEXT pCtx, SHCLFORMAT
+     else
+ #endif
+     {
+-        uint32_t cbData = _4K; /** @ŧodo Make this dynamic. */
++        uint32_t cbData = _4K; /** @todo Make this dynamic. */
+         void    *pvData = RTMemAlloc(cbData);
+         if (pvData)
+         {
+@@ -215,7 +215,6 @@ DECLCALLBACK(void) ShClX11RequestFromX11CompleteCallback(PSHCLCONTEXT pCtx, int
+  *
+  * @returns VBox status code.
+  */
+-#if 0
+ static int vboxClipboardConnect(void)
+ {
+     LogFlowFuncEnter();
+@@ -245,7 +244,6 @@ static int vboxClipboardConnect(void)
+     LogFlowFuncLeaveRC(rc);
+     return rc;
+ }
+-#endif
+ 
+ /**
+  * The main loop of our clipboard reader.
+@@ -469,7 +467,7 @@ static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
+     RT_NOREF(ppInterface, fDaemonised);
+ 
+     /* Initialise the guest library. */
+-    int rc = 0; //vboxClipboardConnect();
++    int rc = vboxClipboardConnect();
+     if (RT_SUCCESS(rc))
+     {
+ #ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
+@@ -477,9 +475,7 @@ static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
+         if (RT_SUCCESS(rc))
+         {
+ #endif
+-            RTThreadSleep(60 * 1000);
+-
+-            //rc = vboxClipboardMain();
++            rc = vboxClipboardMain();
+ 
+ #ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
+             int rc2 = vboxClipboardFUSEStop();
diff --git a/virtualbox-guest-additions.spec b/virtualbox-guest-additions.spec
index 1831a48..5687417 100644
--- a/virtualbox-guest-additions.spec
+++ b/virtualbox-guest-additions.spec
@@ -2,7 +2,7 @@
 
 Name:       virtualbox-guest-additions
 Version:    6.1.4
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    VirtualBox Guest Additions
 License:    GPLv2 or (GPLv2 and CDDL)
 URL:        https://www.virtualbox.org/wiki/VirtualBox
@@ -18,6 +18,9 @@ Patch2:     0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
 Patch3:     VirtualBox-5.2.10-xclient.patch
 # Fix for https://www.virtualbox.org/ticket/19357 / rhbz#1806778
 Patch4:     VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch
+#Shared Clipboard: ticketref:19336 Linux guest: shared clipboard doesn't work (on fresh VirtualBox-6.1.4-136177)
+#git-svn-id: http://www.virtualbox.org/svn/vbox@83184 cfe28804-0f27-0410-a406-dd0f0b0b656f
+Patch5:     Clipboard.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  kBuild >= 0.1.9998.r3093
@@ -52,6 +55,10 @@ Provides:       VirtualBox-guest-additions = %{version}-%{release}
 # VirtualBox guests are always x86, no need to build for other archs
 ExclusiveArch:  i686 x86_64
 
+# VBoxOGL was removed in 6.1.0
+# we need obsolete it to fix upgrade path
+Obsoletes:  %{name}-ogl < 6.0.14-2
+
 %description
 VirtualBox is a powerful x86 and AMD64/Intel64 virtualization product for
 enterprise as well as home use. This package contains the VirtualBox
@@ -166,6 +173,10 @@ getent passwd vboxadd >/dev/null || \
 
 
 %changelog
+* Wed Mar 11 2020 Sérgio Basto <sergio@serjux.com> - 6.1.4-3
+- Fix for clipboard
+- Obsoletes virtualbox-guest-additions-ogl
+
 * Tue Mar  3 2020 Hans de Goede <hdegoede@redhat.com> - 6.1.4-2
 - Fix VBoxClient --vmsvga-x11 crash (rhbz#1806778)