[packages/VirtualBox] fix compilation on x86

atler atler at pld-linux.org
Fri Apr 17 00:13:52 CEST 2020


commit a36da0f3ec2197a2ce910a7a9d9458b30aecd7fb
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Apr 17 00:12:00 2020 +0200

    fix compilation on x86
    
    upstream issue https://www.virtualbox.org/ticket/19494

 VirtualBox.spec |  2 ++
 x86-guest.patch | 11 +++++++++++
 2 files changed, 13 insertions(+)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 1ccb9c8..b90afa2 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -88,6 +88,7 @@ Patch15:	%{pname}-lightdm-1.19.2.patch
 Patch16:	%{pname}-no-vboxvideo.patch
 Patch17:	qt5-gl.patch
 Patch18:	eflags.ac.patch
+Patch19:	x86-guest.patch
 URL:		http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -553,6 +554,7 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker
 %patch16 -p0
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
 %{__sed} -i -e 's, at VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
 	-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
diff --git a/x86-guest.patch b/x86-guest.patch
new file mode 100644
index 0000000..044fe3e
--- /dev/null
+++ b/x86-guest.patch
@@ -0,0 +1,11 @@
+--- VirtualBox-6.1.6/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp.orig	2020-04-09 19:34:49.000000000 +0200
++++ VirtualBox-6.1.6/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp	2020-04-17 00:05:01.199999966 +0200
+@@ -293,7 +293,7 @@
+     }
+ }
+ 
+-int x11MonitorThreadFunction(RTTHREAD hThreadSelf, void *pvUser)
++DECLCALLBACK(int) x11MonitorThreadFunction(RTTHREAD hThreadSelf, void *pvUser)
+ {
+     (void)hThreadSelf;
+     (void*)pvUser;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/a36da0f3ec2197a2ce910a7a9d9458b30aecd7fb



More information about the pld-cvs-commit mailing list