forked from pool/virtualbox
fb62e748b1
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
40 lines
2.0 KiB
Diff
40 lines
2.0 KiB
Diff
Index: VirtualBox-6.1.40/Config.kmk
|
|
===================================================================
|
|
--- VirtualBox-6.1.40.orig/Config.kmk
|
|
+++ VirtualBox-6.1.40/Config.kmk
|
|
@@ -2642,11 +2642,17 @@ else
|
|
# The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
|
|
# Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
|
|
# gcc-5 of openSUSE42.1 only returns the major version on `gcc -dumpversion`!
|
|
- VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion) | \
|
|
- $(SED_EXT) 's|\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' )
|
|
+ #
|
|
+ # Check to make sure that the compiler has either -dumpfullversion or -dumpversion. gcc-10 has neither
|
|
+ RC = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion 2>/dev/null) ; echo $$?)
|
|
+ ifneq ($(RC),0)
|
|
+ # dump version commands not available - hardcode 10.2.1 for the moment
|
|
+ VBOX_GCC_VERSION = 100201
|
|
+ else
|
|
+ VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion 2>/dev/null) | \
|
|
+ $(SED_EXT) 's|\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000 * \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|' )
|
|
+ endif
|
|
endif
|
|
-
|
|
-# YASM macros
|
|
ifndef DONT_USE_YASM
|
|
include $(KBUILD_PATH)/tools/YASM.kmk
|
|
if1of ($(KBUILD_HOST), win os2)
|
|
Index: VirtualBox-6.1.40/src/VBox/Debugger/DBGCDumpImage.cpp
|
|
===================================================================
|
|
--- VirtualBox-6.1.40.orig/src/VBox/Debugger/DBGCDumpImage.cpp
|
|
+++ VirtualBox-6.1.40/src/VBox/Debugger/DBGCDumpImage.cpp
|
|
@@ -468,7 +468,7 @@ static const char *dbgcMachoCpuType(int3
|
|
{
|
|
switch (iType)
|
|
{
|
|
- case CPU_TYPE_ANY: return "CPU_TYPE_ANY";
|
|
+ default: return "CPU_TYPE_ANY";
|
|
case CPU_TYPE_VAX: return "VAX";
|
|
case CPU_TYPE_MC680x0: return "MC680x0";
|
|
case CPU_TYPE_X86: return "X86";
|