Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8578 from suvari/master

Browse Source 
virtualbox: version bump to 6.1.10
This commit is contained in:
Kamil ATLI
2020-06-09 00:27:30 +03:00
committed by GitHub
parent 05d030acf6 9122616e8d
commit 68aca6a870
4 changed files with 74 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/virtualization/virtualbox/files/018-work-around-black-screen.patch
+1 -3
View File
@@ -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
hardware/virtualization/virtualbox/files/019-qt-5-15.patch
+48
View File
@@ -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"
hardware/virtualization/virtualbox/files/020-gsoap.patch
+13
View File
@@ -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;
}
hardware/virtualization/virtualbox/pspec.xml
+12 -4
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>virtualbox</Name>
@@ -12,7 +12,7 @@
<IsA>app:gui</IsA>
<Summary>A powerful virtualization program</Summary>
<Description>VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use. This is the Open Source Edition which lacks USB support and some other things.</Description>
<Archive sha1sum="14d28c73ea1286829ef0d11f34e59925cfea4d76" type="tarbz2">http://download.virtualbox.org/virtualbox/6.1.8/VirtualBox-6.1.8.tar.bz2</Archive>
<Archive sha1sum="1545c4e5f138cc118ed2b3e72e2dd6a013f46b41" type="tarbz2">http://download.virtualbox.org/virtualbox/6.1.10/VirtualBox-6.1.10.tar.bz2</Archive>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="dkms.conf">dkms.conf</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="dkms-guest.conf">dkms-guest.conf</AdditionalFile>
@@ -27,7 +27,7 @@
<Dependency>pam-devel</Dependency>
<Dependency>device-mapper-devel</Dependency>
<Dependency>libcap-devel</Dependency>
<Dependency>gsoap-devel</Dependency>
<Dependency versionFrom="2.8.103">gsoap-devel</Dependency>
<Dependency>libXt-devel</Dependency>
<Dependency>libXmu-devel</Dependency>
<Dependency>libIDL-devel</Dependency>
@@ -72,6 +72,7 @@
<Patch level="1">0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch</Patch>
<Patch level="1">017-fix-narrowing-conversion.patch</Patch>
<Patch level="1">018-work-around-black-screen.patch</Patch>
<Patch level="1">020-gsoap.patch</Patch>
</Patches>
</Source>
@@ -197,6 +198,13 @@
</Package>
<History>
<Update release="37">
<Date>2020-06-08</Date>
<Version>6.1.10</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="36">
<Date>2020-05-30</Date>
<Version>6.1.8</Version>
@@ -457,4 +465,4 @@
<Email>alialgul@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>