[arch-commits] Commit in virtualbox/trunk (014-vboxclient.patch PKGBUILD)

[Christian Hesse]

    Date: Monday, March 9, 2020 @ 22:49:23
  Author: eworm
Revision: 593333

upgpkg: virtualbox 6.1.4-3

fix vboxclient core dump and clipboard issue

Added:
  virtualbox/trunk/014-vboxclient.patch
Modified:
  virtualbox/trunk/PKGBUILD

----------------------+
 014-vboxclient.patch |   70 +++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD             |    4 ++
 2 files changed, 73 insertions(+), 1 deletion(-)

Added: 014-vboxclient.patch
===================================================================
--- 014-vboxclient.patch	                        (rev 0)
+++ 014-vboxclient.patch	2020-03-09 22:49:23 UTC (rev 593333)
@@ -0,0 +1,70 @@
+--- a/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
++++ b/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
+@@ -107,7 +107,7 @@
+     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 @@
+  *
+  * @returns VBox status code.
+  */
+-#if 0
+ static int vboxClipboardConnect(void)
+ {
+     LogFlowFuncEnter();
+@@ -245,7 +244,6 @@
+     LogFlowFuncLeaveRC(rc);
+     return rc;
+ }
+-#endif
+ 
+ /**
+  * The main loop of our clipboard reader.
+@@ -469,7 +467,7 @@
+     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,10 +475,8 @@
+         if (RT_SUCCESS(rc))
+         {
+ #endif
+-            RTThreadSleep(60 * 1000);
++            rc = vboxClipboardMain();
+ 
+-            //rc = vboxClipboardMain();
+-
+ #ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
+             int rc2 = vboxClipboardFUSEStop();
+             if (RT_SUCCESS(rc))
+--- a/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp
++++ b/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp
+@@ -100,16 +100,19 @@ static void x11Connect(struct X11CONTEXT
+     {
+         XCloseDisplay(pContext->pDisplay);
+         pContext->pDisplay = NULL;
++        return;
+     }
+     if (!XRRQueryExtension(pContext->pDisplay, &pContext->hRandREventBase, &pContext->hRandRErrorBase))
+     {
+         XCloseDisplay(pContext->pDisplay);
+         pContext->pDisplay = NULL;
++        return;
+     }
+     if (!XRRQueryVersion(pContext->pDisplay, &pContext->hRandRMajor, &pContext->hRandRMinor))
+     {
+         XCloseDisplay(pContext->pDisplay);
+         pContext->pDisplay = NULL;
++        return;
+     }
+     pContext->rootWindow = DefaultRootWindow(pContext->pDisplay);
+ }

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-09 22:48:48 UTC (rev 593332)
+++ PKGBUILD	2020-03-09 22:49:23 UTC (rev 593333)
@@ -10,7 +10,7 @@
          'virtualbox-guest-utils-nox'
          'virtualbox-ext-vnc')
 pkgver=6.1.4
-pkgrel=2
+pkgrel=3
 _vboxsf_commit='5aba938bcabd978e4615186ad7d8617d633e6f30'
 arch=('x86_64')
 url='https://virtualbox.org/'
@@ -74,6 +74,7 @@
         '008-no-vboxvideo.patch'
         '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch'
         '013-Makefile.patch'
+        '014-vboxclient.patch'
         # The following patch and mount.vboxsf wrapper should be removed
         # once support for mainline-style options string gets upstreamed
         '101-vboxsf-automount.patch'
@@ -98,6 +99,7 @@
             '053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491'
             '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024'
             'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9'
+            'db617a3e7a3a94b96d5c3fe771d31c927242ef4f2cb265a22e4d5d64560a910a'
             'a784f3cc24652a16385cc63abac6c5178932ca5f3861be7650631b7dafa753a4'
             'f3ed6741f8977f40900c8aa372fa082df1f8723d497d4fff445153c543bc8947')