dgarcia/virtualbox
SHA256
1
0
Fork 0
forked from jengelh/virtualbox
Code Pull Requests Activity

Accepting request 1029812 from home:larryr:branches:Virtualization

Browse Source 
Version Bump to 6.1.40
This is a maintenance release. The following items were fixed and/or added:
    GUI: Fixed missed machine-items state translation on language change
    USB: Fixed possible crash when the device got detached while the controller is resetting the port
    Main: Provide guest's absolute pointing mouse device with buttons state when mouse integration is ON
    Linux Host and Guest Additions: Prevented build failure on 5.8+ 32-bit kernels
    Linux Host and Guest Additions: Introduced additional fixes for kernel 6.0
    Linux Host and Guest Additions: Introduced additional fixes for Debian specific kernels
    Solaris and Linux Guest Additions: Added better handling of negative screen sizes which some X11 desktop environments are reporting
    Windows Guest Additions: Added fixes related to VBoxTray IPC 
- Fix boo#1204233 boo#1204331 boo#1202851
- Remove file fix_error_in_USB_header.patch - fixed upstream

OBS-URL: https://build.opensuse.org/request/show/1029812
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=661
This commit is contained in:
Larry Rainey
2022-10-18 18:55:40 +00:00
committed by Git OBS Bridge
parent 6374f221da
commit fb62e748b1
46 changed files with 430 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
vbox-no-build-dates.diff
View File

@@ -1,7 +1,7 @@
Index: VirtualBox-6.1.38/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
Index: VirtualBox-6.1.40/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
+++ VirtualBox-6.1.38/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
--- VirtualBox-6.1.40.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
+++ VirtualBox-6.1.40/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
printf("VirtualBox DirectFB GUI built %s %s\n"
@@ -11,10 +11,10 @@ Index: VirtualBox-6.1.38/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
for (;;)
{
Index: VirtualBox-6.1.38/src/VBox/Runtime/common/string/uniread.cpp
Index: VirtualBox-6.1.40/src/VBox/Runtime/common/string/uniread.cpp
===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/Runtime/common/string/uniread.cpp
+++ VirtualBox-6.1.38/src/VBox/Runtime/common/string/uniread.cpp
--- VirtualBox-6.1.40.orig/src/VBox/Runtime/common/string/uniread.cpp
+++ VirtualBox-6.1.40/src/VBox/Runtime/common/string/uniread.cpp
@@ -1036,7 +1036,7 @@ int PrintHeader(const char *argv0, const
" * IPRT - Unicode Tables.\n"
" *\n"
@@ -24,10 +24,10 @@ Index: VirtualBox-6.1.38/src/VBox/Runtime/common/string/uniread.cpp
" */\n"
"\n"
"/*\n"
Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
===================================================================
--- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
+++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
+++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@@ -50,10 +50,10 @@ Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
===================================================================
--- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
+++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
+++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
@@ -44,16 +44,10 @@
#ifndef XP_MAC
#include "_pr_bld.h"
@@ -73,10 +73,10 @@ Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
===================================================================
--- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
+++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
+++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@@ -99,10 +99,10 @@ Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
===================================================================
--- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
+++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
+++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
@@ -42,16 +42,13 @@
/**************************IDENTITY AND VERSIONING***********************/
/************************************************************************/
@@ -125,10 +125,10 @@ Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
#if !defined(_PRODUCTION)
#define _PRODUCTION ""
#endif
Index: VirtualBox-6.1.38/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
Index: VirtualBox-6.1.40/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
+++ VirtualBox-6.1.38/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
--- VirtualBox-6.1.40.orig/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
+++ VirtualBox-6.1.40/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.cpp
@@ -308,7 +308,7 @@ static int vboxInitLogging(const char *p
#endif
"Log opened %s\n",
@@ -138,10 +138,10 @@ Index: VirtualBox-6.1.38/src/VBox/Main/src-helper-apps/OpenGLTest/OpenGLTestApp.
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: VirtualBox-6.1.38/src/VBox/Devices/PC/BIOS/bios.c
Index: VirtualBox-6.1.40/src/VBox/Devices/PC/BIOS/bios.c
===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/Devices/PC/BIOS/bios.c
+++ VirtualBox-6.1.38/src/VBox/Devices/PC/BIOS/bios.c
--- VirtualBox-6.1.40.orig/src/VBox/Devices/PC/BIOS/bios.c
+++ VirtualBox-6.1.40/src/VBox/Devices/PC/BIOS/bios.c
@@ -143,7 +143,7 @@ void set_mode(uint8_t mode);
#define BX_PCIBIOS 1
@@ -151,10 +151,10 @@ Index: VirtualBox-6.1.38/src/VBox/Devices/PC/BIOS/bios.c
//--------------------------------------------------------------------------
// print_bios_banner
// displays a the bios version
Index: VirtualBox-6.1.38/src/VBox/Additions/common/VBoxService/VBoxService.cpp
Index: VirtualBox-6.1.40/src/VBox/Additions/common/VBoxService/VBoxService.cpp
===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+++ VirtualBox-6.1.38/src/VBox/Additions/common/VBoxService/VBoxService.cpp
--- VirtualBox-6.1.40.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+++ VirtualBox-6.1.40/src/VBox/Additions/common/VBoxService/VBoxService.cpp
@@ -245,7 +245,7 @@ static DECLCALLBACK(void) vgsvcLogHeader
"VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n"
"Log opened %s\n",
@@ -164,10 +164,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/common/VBoxService/VBoxService.cpp
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: VirtualBox-6.1.38/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
Index: VirtualBox-6.1.40/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
+++ VirtualBox-6.1.38/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
+++ VirtualBox-6.1.40/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
@@ -187,7 +187,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_BUSMOUSE_MA
$(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxBusMouseIns_0_OUTDIR)/Stage/ExtPack.signature
@@ -177,10 +177,10 @@ Index: VirtualBox-6.1.38/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
# Clean up
$(RM) -Rf $(VBoxBusMouseIns_0_OUTDIR)/Stage/
Index: VirtualBox-6.1.38/src/VBox/ExtPacks/Skeleton/Makefile.kmk
Index: VirtualBox-6.1.40/src/VBox/ExtPacks/Skeleton/Makefile.kmk
===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk
+++ VirtualBox-6.1.38/src/VBox/ExtPacks/Skeleton/Makefile.kmk
--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/Skeleton/Makefile.kmk
+++ VirtualBox-6.1.40/src/VBox/ExtPacks/Skeleton/Makefile.kmk
@@ -161,7 +161,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_SKELETON_MA
$(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxSkeletonIns_0_OUTDIR)/Stage/ExtPack.signature
@@ -190,10 +190,10 @@ Index: VirtualBox-6.1.38/src/VBox/ExtPacks/Skeleton/Makefile.kmk
# Clean up
$(RM) -Rf $(VBoxSkeletonIns_0_OUTDIR)/Stage/
Index: VirtualBox-6.1.38/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
Index: VirtualBox-6.1.40/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
+++ VirtualBox-6.1.38/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
+++ VirtualBox-6.1.40/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
@@ -343,7 +343,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE)
$(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxDTraceIns_0_OUTDIR)/Stage/ExtPack.signature
@@ -203,10 +203,10 @@ Index: VirtualBox-6.1.38/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
# Clean up
$(RM) -Rf $(VBoxDTraceIns_0_OUTDIR)/Stage/
Index: VirtualBox-6.1.38/src/VBox/ExtPacks/VNC/Makefile.kmk
Index: VirtualBox-6.1.40/src/VBox/ExtPacks/VNC/Makefile.kmk
===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/ExtPacks/VNC/Makefile.kmk
+++ VirtualBox-6.1.38/src/VBox/ExtPacks/VNC/Makefile.kmk
--- VirtualBox-6.1.40.orig/src/VBox/ExtPacks/VNC/Makefile.kmk
+++ VirtualBox-6.1.40/src/VBox/ExtPacks/VNC/Makefile.kmk
@@ -154,7 +154,7 @@ $(VBOX_PATH_PACKAGES)/$(VBOX_VNC_MANGLED
$(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.manifest \
$(VBoxVNCIns_0_OUTDIR)/Stage/ExtPack.signature
@@ -216,10 +216,10 @@ Index: VirtualBox-6.1.38/src/VBox/ExtPacks/VNC/Makefile.kmk
# Clean up
$(RM) -Rf $(VBoxVNCIns_0_OUTDIR)/Stage/
Index: VirtualBox-6.1.38/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
Index: VirtualBox-6.1.40/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
+++ VirtualBox-6.1.38/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
--- VirtualBox-6.1.40.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
+++ VirtualBox-6.1.40/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
@@ -319,7 +319,7 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDrv
}
VGDrvCommonInitLoggers();
@@ -229,10 +229,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp
/*
* Check if the NT version is supported and initialize g_enmVGDrvNtVer.
Index: VirtualBox-6.1.38/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
Index: VirtualBox-6.1.40/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
+++ VirtualBox-6.1.38/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
--- VirtualBox-6.1.40.orig/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
+++ VirtualBox-6.1.40/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
@@ -872,7 +872,7 @@ static DECLCALLBACK(void) vboxGreeterLog
"vbox-greeter %s r%s (verbosity: %d) %s (%s %s) release log\n"
"Log opened %s\n",
@@ -242,10 +242,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.c
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
Index: VirtualBox-6.1.38/src/VBox/Additions/solaris/Mouse/vboxms.c
Index: VirtualBox-6.1.40/src/VBox/Additions/solaris/Mouse/vboxms.c
===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/Additions/solaris/Mouse/vboxms.c
+++ VirtualBox-6.1.38/src/VBox/Additions/solaris/Mouse/vboxms.c
--- VirtualBox-6.1.40.orig/src/VBox/Additions/solaris/Mouse/vboxms.c
+++ VirtualBox-6.1.40/src/VBox/Additions/solaris/Mouse/vboxms.c
@@ -256,7 +256,7 @@ static VBMSSTATE g_OpenNodeSt
int _init(void)
{
@@ -255,10 +255,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/solaris/Mouse/vboxms.c
mutex_init(&g_OpenNodeState.InitMtx, NULL, MUTEX_DRIVER, NULL);
/*
* Prevent module autounloading.
Index: VirtualBox-6.1.38/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
Index: VirtualBox-6.1.40/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
+++ VirtualBox-6.1.38/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
--- VirtualBox-6.1.40.orig/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
+++ VirtualBox-6.1.40/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/VolInfo.c
@@ -247,10 +247,10 @@ Returns:
UTILITY_NAME,
UTILITY_MAJOR_VERSION,
@@ -272,10 +272,10 @@ Index: VirtualBox-6.1.38/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInf
Usage ();
return -1;
}
Index: VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
Index: VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+++ VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
--- VirtualBox-6.1.40.orig/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+++ VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
@@ -118,7 +118,7 @@ static NTSTATUS vboxUsbDdiAddDevice(PDRI
static VOID vboxUsbDdiUnload(PDRIVER_OBJECT pDriverObject)
{
@@ -294,10 +294,10 @@ Index: VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
NTSTATUS Status = vboxUsbRtGlobalsInit();
Assert(Status == STATUS_SUCCESS);
Index: VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
Index: VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+++ VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
--- VirtualBox-6.1.40.orig/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+++ VirtualBox-6.1.40/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
@@ -1516,7 +1516,7 @@ NTSTATUS _stdcall DriverEntry(PDRIVER_OB
RTLogDestinations(0, "debugger");
#endif
@@ -307,10 +307,10 @@ Index: VirtualBox-6.1.38/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
memset (&g_VBoxUsbMonGlobals, 0, sizeof (g_VBoxUsbMonGlobals));
Index: VirtualBox-6.1.38/src/VBox/Main/glue/VBoxLogRelCreate.cpp
Index: VirtualBox-6.1.40/src/VBox/Main/glue/VBoxLogRelCreate.cpp
===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp
+++ VirtualBox-6.1.38/src/VBox/Main/glue/VBoxLogRelCreate.cpp
--- VirtualBox-6.1.40.orig/src/VBox/Main/glue/VBoxLogRelCreate.cpp
+++ VirtualBox-6.1.40/src/VBox/Main/glue/VBoxLogRelCreate.cpp
@@ -61,7 +61,7 @@ static DECLCALLBACK(void) vboxHeaderFoot
#endif
"Log opened %s\n",
@@ -320,10 +320,10 @@ Index: VirtualBox-6.1.38/src/VBox/Main/glue/VBoxLogRelCreate.cpp
pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE);
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
Index: VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
===================================================================
--- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
+++ VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
+++ VirtualBox-6.1.40/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
@@ -141,7 +141,7 @@ int main(int argc, char **argv)
{
PRIntn tab = 0;
@@ -333,10 +333,10 @@ Index: VirtualBox-6.1.38/src/libs/xpcom18a4/nsprpub/pr/tests/depend.c
printf("Depend.c build time is %s %s\n", buildDate, buildTime);
Index: VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
Index: VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
===================================================================
--- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
+++ VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
+++ VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/profile_main.cpp
@@ -458,7 +458,7 @@ int
main()
{
@@ -346,10 +346,10 @@ Index: VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/pro
#ifdef TEST_STD_STRING
cout << "Testing std::string." << endl;
#else
Index: VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
Index: VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
===================================================================
--- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
+++ VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
+++ VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/test_main.cpp
@@ -425,7 +425,7 @@ int
main()
{
@@ -359,10 +359,10 @@ Index: VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/StringFactoringTests/tes
#if 0
{
Index: VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
Index: VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
===================================================================
--- VirtualBox-6.1.38.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
+++ VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
--- VirtualBox-6.1.40.orig/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
+++ VirtualBox-6.1.40/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
@@ -102,7 +102,7 @@ class test_message
public:
test_message()
@@ -372,10 +372,10 @@ Index: VirtualBox-6.1.38/src/libs/xpcom18a4/xpcom/tests/TestCOMPtr.cpp
}
~test_message()
Index: VirtualBox-6.1.38/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
Index: VirtualBox-6.1.40/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
+++ VirtualBox-6.1.38/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
--- VirtualBox-6.1.40.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
+++ VirtualBox-6.1.40/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_id.c
@@ -29,9 +29,8 @@
#include "build_id.h"
@@ -387,10 +387,10 @@ Index: VirtualBox-6.1.38/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/util/build_i
#ifndef ElfW
#define ElfW(type) Elf_##type
Index: VirtualBox-6.1.38/src/libs/zlib-1.2.11/os400/make.sh
Index: VirtualBox-6.1.40/src/libs/zlib-1.2.11/os400/make.sh
===================================================================
--- VirtualBox-6.1.38.orig/src/libs/zlib-1.2.11/os400/make.sh
+++ VirtualBox-6.1.38/src/libs/zlib-1.2.11/os400/make.sh
--- VirtualBox-6.1.40.orig/src/libs/zlib-1.2.11/os400/make.sh
+++ VirtualBox-6.1.40/src/libs/zlib-1.2.11/os400/make.sh
@@ -258,8 +258,8 @@ fi
# Create and compile the identification source file.
@@ -402,10 +402,10 @@ Index: VirtualBox-6.1.38/src/libs/zlib-1.2.11/os400/make.sh
echo '#pragma comment(copyright, "Copyright (C) 1995-2017 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c
make_module OS400 os400.c
LINK= # No need to rebuild service program yet.
Index: VirtualBox-6.1.38/src/VBox/Additions/x11/VBoxClient/logging.cpp
Index: VirtualBox-6.1.40/src/VBox/Additions/x11/VBoxClient/logging.cpp
===================================================================
--- VirtualBox-6.1.38.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp
+++ VirtualBox-6.1.38/src/VBox/Additions/x11/VBoxClient/logging.cpp
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/VBoxClient/logging.cpp
+++ VirtualBox-6.1.40/src/VBox/Additions/x11/VBoxClient/logging.cpp
@@ -162,10 +162,10 @@ static DECLCALLBACK(void) vbClLogHeaderF
case RTLOGPHASE_BEGIN:
{