virtualbox: version bump to 6.1.10

2020-06-09 00:26:03 +03:00
parent 05d030acf6
commit 9122616e8d
4 changed files with 74 additions and 7 deletions
@@ -2,8 +2,6 @@ From bbd990f83a23c22da787d10c62bd7ff114d32703 Mon Sep 17 00:00:00 2001
 From: Christian Hesse <mail@eworm.de>
 Date: Mon, 18 May 2020 08:21:06 +0200
 Subject: [PATCH 1/1] work around black screen
-
-Signed-off-by: Christian Hesse <mail@eworm.de>
 ---
 src/VBox/Additions/x11/Installer/98vboxadd-xclient | 1 -
 1 file changed, 1 deletion(-)
@@ -16,5 +14,5 @@ index e7d4e292..7a17a692 100755
   /usr/bin/VBoxClient --checkhostversion
   /usr/bin/VBoxClient --seamless
   /usr/bin/VBoxClient --draganddrop
-  /usr/bin/VBoxClient --vmsvga-x11  # In case VMSVGA emulation is enabled
+-  /usr/bin/VBoxClient --vmsvga  # In case VMSVGA emulation is enabled
 fi
@@ -0,0 +1,48 @@
+diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp
+index b70d289d..9716781e 100644
+--- a/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp
+@@ -17,6 +17,7 @@
+ 
+ /* Qt includes: */
+ #include <QPainter>
+#include <QPainterPath>
+ 
+ /* GUI include */
+ #include "UIImageTools.h"
+diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp
+index 4d695f19..406c2dbd 100644
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp
+@@ -19,6 +19,7 @@
+ #include <QApplication>
+ #include <QHBoxLayout>
+ #include <QPainter>
+#include <QPainterPath>
+ #include <QStyle>
+ #include <QToolButton>
+ 
+diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
+index 53b545a4..6e38448c 100644
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
+@@ -21,6 +21,7 @@
+ #include <QMenu>
+ #include <QMoveEvent>
+ #include <QPainter>
+#include <QPainterPath>
+ #include <QStateMachine>
+ #include <QStyle>
+ #include <QTimer>
+diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
+index 2f153d80..7b18a66b 100644
+--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
+@@ -24,6 +24,7 @@
+ /* Qt includes: */
+ #include <QIcon>
+ #include <QWidget>
+#include <QPainterPath>
+ 
+ /* GUI includes: */
+ #include "UILibraryDefs.h"
@@ -0,0 +1,13 @@
+diff --git a/src/VBox/Main/webservice/vboxweb.cpp b/src/VBox/Main/webservice/vboxweb.cpp
+index 8dd3ca1b..9d5c9138 100644
+--- a/src/VBox/Main/webservice/vboxweb.cpp
+++ b/src/VBox/Main/webservice/vboxweb.cpp
+@@ -944,7 +944,7 @@ static void doQueuesLoop()
+                 if (rv == 0)
+                     continue; // timeout, not necessary to bother gsoap
+                 // r < 0, errno
+-                if (soap_socket_errno(soap.master) == SOAP_EINTR)
+                if (soap_socket_errno == SOAP_EINTR)
+                     rv = 0; // re-check if we should terminate
+                 break;
+             }