dgarcia/virtualbox
SHA256
1
0
Fork 0
forked from jengelh/virtualbox
Code Pull Requests Activity

Accepting request 787617 from home:lwfinger:branches:Virtualization

Browse Source 
- With version 6.1.4 of VB, the bidirectional clipboard part of VBoxClient
  for guest systems is failing. A patch is provided at
  https://www.virtualbox.org/ticket/19336. These changes have been added
  to file "VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch". This
  fixes boo #1167403 "VBoxClient --clipboard dies".

- Update the wrapper that starts the UI for VirtualBox to check the
  version of the extpack that is installed. If no pack is installed
  or if the license is not current, the new code does nothing. If there
  is a current license and the installed pack does not match the
  running version of VB, then the script downloads and installs the
  new version. File "update-extpack.sh" is added.

OBS-URL: https://build.opensuse.org/request/show/787617
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=540
This commit is contained in:
Larry Finger
2020-03-24 02:06:06 +00:00
committed by Git OBS Bridge
parent 9eaa6430bd
commit ee1b9cadf2
5 changed files with 135 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch
View File

@@ -1,6 +1,7 @@
diff -up VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp~ VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp
--- VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp~ 2020-02-18 18:13:08.000000000 +0100
+++ VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp 2020-03-03 16:27:49.947341705 +0100
Index: VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp
===================================================================
--- VirtualBox-6.1.4.orig/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp
+++ VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp
@@ -100,16 +100,19 @@ static void x11Connect(struct X11CONTEXT
{
XCloseDisplay(pContext->pDisplay);
@@ -21,3 +22,44 @@ diff -up VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp
}
pContext->rootWindow = DefaultRootWindow(pContext->pDisplay);
}
Index: VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
===================================================================
--- VirtualBox-6.1.4.orig/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
+++ VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
@@ -215,7 +215,6 @@ DECLCALLBACK(void) ShClX11RequestFromX11
*
* @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 **ppIn
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,9 @@ static int run(struct VBCLSERVICE **ppIn
if (RT_SUCCESS(rc))
{
#endif
- RTThreadSleep(60 * 1000);
+ // RTThreadSleep(60 * 1000);
- //rc = vboxClipboardMain();
+ rc = vboxClipboardMain();
#ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
int rc2 = vboxClipboardFUSEStop();