virtualbox/Fix_for_server_1.19.patch
Larry Rainey fb62e748b1 Accepting request 1029812 from home:larryr:branches:Virtualization
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
2022-10-18 18:55:40 +00:00

47 lines
1.7 KiB
Diff

Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
+++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
@@ -1236,7 +1236,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc
#endif
/* Register block and wake-up handlers for getting new screen size hints. */
+#if XORG_VERSION_CURRENT >= 11900000
+ RegisterBlockAndWakeupHandlers(vboxBlockHandler, (ServerWakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
+#else
RegisterBlockAndWakeupHandlers(vboxBlockHandler, (WakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
+#endif
/* software cursor */
miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/pointer.c
===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
+++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/pointer.c
@@ -39,6 +39,10 @@
#include "cursorstr.h"
#include "servermd.h"
+#if XORG_VERSION_CURRENT >= 11900000
+#include <bits/sigset.h>
+typedef __sigset_t sigset_t;
+#endif
#include "vboxvideo.h"
#ifdef XORG_7X
Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/edid.c
===================================================================
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/edid.c
+++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/edid.c
@@ -35,6 +35,10 @@
* Michael Thayer <michael.thayer@oracle.com>
*/
+#if XORG_VERSION_CURRENT >= 11900000
+#include <bits/sigset.h>
+typedef __sigset_t sigset_t;
+#endif
#include "misc.h"
#include "xf86DDC.h"
#include "xf86Crtc.h"