[arch-commits] Commit in virtualbox/trunk (5 files)
Christian Hesse
eworm at archlinux.org
Mon Jun 8 08:44:41 UTC 2020
Date: Monday, June 8, 2020 @ 08:44:41
Author: eworm
Revision: 640398
upgpkg: virtualbox 6.1.10-1
new upstream release
Added:
virtualbox/trunk/018-work-around-black-screen.patch
virtualbox/trunk/019-qt-5-15.patch
virtualbox/trunk/020-gsoap.patch
Modified:
virtualbox/trunk/PKGBUILD
Deleted:
virtualbox/trunk/018-work-around-black-screen.patch
------------------------------------+
018-work-around-black-screen.patch | 38 +++++++++++++--------------
019-qt-5-15.patch | 48 +++++++++++++++++++++++++++++++++++
020-gsoap.patch | 13 +++++++++
PKGBUILD | 14 ++++++----
4 files changed, 88 insertions(+), 25 deletions(-)
Deleted: 018-work-around-black-screen.patch
===================================================================
--- 018-work-around-black-screen.patch 2020-06-08 08:41:20 UTC (rev 640397)
+++ 018-work-around-black-screen.patch 2020-06-08 08:44:41 UTC (rev 640398)
@@ -1,20 +0,0 @@
-From bbd990f83a23c22da787d10c62bd7ff114d32703 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at 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 at eworm.de>
----
- src/VBox/Additions/x11/Installer/98vboxadd-xclient | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/VBox/Additions/x11/Installer/98vboxadd-xclient b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
-index e7d4e292..7a17a692 100755
---- a/src/VBox/Additions/x11/Installer/98vboxadd-xclient
-+++ b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
-@@ -34,5 +34,4 @@ elif test -z "${SSH_CONNECTION}"; then
- /usr/bin/VBoxClient --checkhostversion
- /usr/bin/VBoxClient --seamless
- /usr/bin/VBoxClient --draganddrop
-- /usr/bin/VBoxClient --vmsvga-x11 # In case VMSVGA emulation is enabled
- fi
Added: 018-work-around-black-screen.patch
===================================================================
--- 018-work-around-black-screen.patch (rev 0)
+++ 018-work-around-black-screen.patch 2020-06-08 08:44:41 UTC (rev 640398)
@@ -0,0 +1,18 @@
+From bbd990f83a23c22da787d10c62bd7ff114d32703 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Mon, 18 May 2020 08:21:06 +0200
+Subject: [PATCH 1/1] work around black screen
+---
+ src/VBox/Additions/x11/Installer/98vboxadd-xclient | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/VBox/Additions/x11/Installer/98vboxadd-xclient b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+index e7d4e292..7a17a692 100755
+--- a/src/VBox/Additions/x11/Installer/98vboxadd-xclient
++++ b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+@@ -34,5 +34,4 @@ elif test -z "${SSH_CONNECTION}"; then
+ /usr/bin/VBoxClient --checkhostversion
+ /usr/bin/VBoxClient --seamless
+ /usr/bin/VBoxClient --draganddrop
+- /usr/bin/VBoxClient --vmsvga # In case VMSVGA emulation is enabled
+ fi
Added: 019-qt-5-15.patch
===================================================================
--- 019-qt-5-15.patch (rev 0)
+++ 019-qt-5-15.patch 2020-06-08 08:44:41 UTC (rev 640398)
@@ -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"
Added: 020-gsoap.patch
===================================================================
--- 020-gsoap.patch (rev 0)
+++ 020-gsoap.patch 2020-06-08 08:44:41 UTC (rev 640398)
@@ -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;
+ }
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-08 08:41:20 UTC (rev 640397)
+++ PKGBUILD 2020-06-08 08:44:41 UTC (rev 640398)
@@ -9,8 +9,8 @@
'virtualbox-guest-utils'
'virtualbox-guest-utils-nox'
'virtualbox-ext-vnc')
-pkgver=6.1.8
-pkgrel=2
+pkgver=6.1.10
+pkgrel=1
_vboxsf_commit='5aba938bcabd978e4615186ad7d8617d633e6f30'
arch=('x86_64')
url='https://virtualbox.org/'
@@ -75,8 +75,10 @@
'013-Makefile.patch'
'016-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch'
'017-fix-narrowing-conversion.patch'
- '018-work-around-black-screen.patch')
-sha256sums=('426888f83036b6b1f79c272d317a4e8ecf43781f6a266fd7209c03dca504eefc'
+ '018-work-around-black-screen.patch'
+ '019-qt-5-15.patch'
+ '020-gsoap.patch')
+sha256sums=('37d8b30c0be82a50c858f3fc70cde967882239b6212bb32e138d3615b423c477'
'SKIP'
'76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db'
'c1ccfaa3a37d6b227cd65de944df2d68cbf178a857b6ab15c04b8fa05693f252'
@@ -97,7 +99,9 @@
'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9'
'100c9e14e9cfb12ae65364e830153d2481cf272ceeb39d11c6b203bc6e35bf0c'
'5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99'
- '116f90f2d87a0a5d49e84b734dd6407667faf9e44f5078085bba591dd357745f')
+ 'c64a4f284a4e91a42df5b30939d9190127ea5aa25470b5d31507a8309c20e1fc'
+ '7a6b21f33952d46c5253acb6ada5c76fc579c50df2602dadcd9bd0d381cd9335'
+ 'c6892a3561a72a9b308cb33fa6647cc53e54a3bd40cb41780cad7f8e9d7df9f6')
prepare() {
cd "VirtualBox-$pkgver"
More information about the arch-commits
mailing list