From 6e51c349b7cf12933be0d9c1b0e820c485f85357 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Thu, 21 Jan 2021 23:16:30 +0100 Subject: [PATCH] bring back "DECLCALLBACK generates incorrect code on ix86, remove it" as 32bit.patch --- 32bit.patch | 12 ++++++++++++ VirtualBox.spec | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 32bit.patch diff --git a/32bit.patch b/32bit.patch new file mode 100644 index 0000000..c1ab2c0 --- /dev/null +++ b/32bit.patch @@ -0,0 +1,12 @@ +diff --color -ur VirtualBox-6.1.18.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c VirtualBox-6.1.18/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c +--- VirtualBox-6.1.18.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c 2021-01-07 16:42:09.000000000 +0100 ++++ VirtualBox-6.1.18/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c 2021-01-21 23:13:58.808360771 +0100 +@@ -536,7 +536,7 @@ + * @param uAddr The address to apply the new protection to. + * @param pvUser The opaque user data. + */ +-static DECLCALLBACK(int) rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser) ++static int rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser) + { + PCLNXAPPLYPGRANGE pArgs = (PCLNXAPPLYPGRANGE)pvUser; + PRTR0MEMOBJLNX pMemLnx = pArgs->pMemLnx; diff --git a/VirtualBox.spec b/VirtualBox.spec index c84d1e0..7138087 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -87,6 +87,7 @@ Patch14: %{pname}-multipython.patch Patch15: %{pname}-lightdm-1.19.2.patch Patch16: %{pname}-no-vboxvideo.patch Patch17: qt5-gl.patch +Patch18: 32bit.patch URL: http://www.virtualbox.org/ %if %{with userspace} %ifarch %{x8664} @@ -547,6 +548,7 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker %patch15 -p0 %patch16 -p0 %patch17 -p1 +%patch18 -p1 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \ -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in -- 2.43.0