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

virtualbox-6.1.8

Browse Source
This commit is contained in:
Rmys
2020-05-31 22:50:09 +03:00
committed by GitHub
parent 84f1d47d38
commit 502a37312c
3 changed files with 67 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/virtualization/virtualbox/files/017-fix-narrowing-conversion.patch
+37
View File
@@ -0,0 +1,37 @@
From ee6ae088673d14c407d4773855dbda821024653c Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Sun, 17 May 2020 00:40:18 +0200
Subject: [PATCH 1/1] fix narrowing conversion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Building fails with:
/build/virtualbox/src/VirtualBox-6.1.8/src/VBox/Debugger/DBGCDumpImage.cpp: In function ‘const char* dbgcMachoCpuType(uint32_t, uint32_t)’:
/build/virtualbox/src/VirtualBox-6.1.8/include/iprt/formats/mach-o.h:41:46: error: narrowing conversion of ‘-1’ from ‘int’ to ‘unsigned int’ [-Wnarrowing]
41 | #define CPU_TYPE_ANY INT32_C(-1)
| ^
/build/virtualbox/src/VirtualBox-6.1.8/src/VBox/Debugger/DBGCDumpImage.cpp:471:14: note: in expansion of macro ‘CPU_TYPE_ANY’
471 | case CPU_TYPE_ANY: return "CPU_TYPE_ANY";
| ^~~~~~~~~~~~
As uType is unsigned it can never match CPU_TYPE_ANY, which is -1.
Signed-off-by: Christian Hesse <mail@eworm.de>
---
src/VBox/Debugger/DBGCDumpImage.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/VBox/Debugger/DBGCDumpImage.cpp b/src/VBox/Debugger/DBGCDumpImage.cpp
index 02ba3158..d906c37c 100644
--- a/src/VBox/Debugger/DBGCDumpImage.cpp
+++ b/src/VBox/Debugger/DBGCDumpImage.cpp
@@ -468,7 +468,6 @@ static const char *dbgcMachoCpuType(uint32_t uType, uint32_t uSubType)
{
switch (uType)
{
- case CPU_TYPE_ANY: return "CPU_TYPE_ANY";
case CPU_TYPE_VAX: return "VAX";
case CPU_TYPE_MC680x0: return "MC680x0";
case CPU_TYPE_X86: return "X86";
hardware/virtualization/virtualbox/files/018-work-around-black-screen.patch
+20
View File
@@ -0,0 +1,20 @@
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(-)
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
hardware/virtualization/virtualbox/pspec.xml
+10 -1
View File
@@ -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="f078d7d198890b761575cdf70adcec0c8328a7ca" type="tarbz2">http://download.virtualbox.org/virtualbox/6.1.6/VirtualBox-6.1.6.tar.bz2</Archive>
<Archive sha1sum="14d28c73ea1286829ef0d11f34e59925cfea4d76" type="tarbz2">http://download.virtualbox.org/virtualbox/6.1.8/VirtualBox-6.1.8.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>
@@ -70,6 +70,8 @@
<Patch level="1">013-Makefile.patch</Patch>
<Patch level="1">VirtualBox-6.1.2-disable-update.patch</Patch>
<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>
</Patches>
</Source>
@@ -195,6 +197,13 @@
</Package>
<History>
<Update release="36">
<Date>2020-05-30</Date>
<Version>6.1.8</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="35">
<Date>2020-04-22</Date>
<Version>6.1.6</Version>