virtualbox-7.6.16

2024-04-17 17:34:41 +03:00
parent ffff2788dd
commit 90e675e901
6 changed files with 46 additions and 46 deletions
@@ -1,8 +1,8 @@
 diff --git a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
-index da373c92..18fb69a7 100644
+index 7a902e83..e19804ed 100644
 --- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
-@@ -2349,7 +2349,7 @@ QString UIExtraDataManager::preventBetaBuildWarningForVersion()
+@@ -2420,7 +2420,7 @@ QString UIExtraDataManager::preventBetaBuildWarningForVersion()
 bool UIExtraDataManager::applicationUpdateEnabled()
 {
     /* 'True' unless 'restriction' feature allowed: */
@@ -1,12 +1,13 @@
-Fix FTBFS by not compile X.org-1.19 drv, we don't use it, just need in el <= 7
--- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2016-10-11 02:49:23.184986182 +0100
-+++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2016-10-11 02:49:39.879176964 +0100
-@@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo
+diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+index 6f98670d..0a7b7e01 100644
+--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+@@ -406,7 +406,7 @@ vboxvideo_drv_118_LIBS += $(vboxvideo_drv_70_LIBS)
 
 ifdef VBOX_USE_SYSTEM_XORG_HEADERS
  # Build using local X.Org headers.  We assume X.Org Server 1.7 or later.
 - DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
 + DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS))
  SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
-  vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
+  vboxvideo_drv_system_TEMPLATE = VBoxGuestR3XOrgMod
  vboxvideo_drv_system_CFLAGS := \
@@ -1,20 +1,8 @@
-From b9e64417e4c33e2c17e060aa482519c2c8c7d416 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Tue, 17 Jan 2023 22:04:08 +0100
-Subject: [PATCH] properly handle i3wm
-
---
- .../VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp        | 3 ++-
- .../Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp   | 3 +++
- .../Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.h     | 3 ++-
- src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp   | 4 ++++
- 4 files changed, 11 insertions(+), 2 deletions(-)
-
 diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp
-index c27ff6f6..066a80e0 100644
+index 01aa93c6..06a78ac1 100644
 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp
-@@ -385,7 +385,8 @@ QRect UIDesktopWidgetWatchdog::availableGeometry(QScreen *pScreen) const
+@@ -391,7 +391,8 @@ QRect UIDesktopWidgetWatchdog::availableGeometry(QScreen *pScreen) const
     /* Get cached available-geometry: */
     const QRect availableGeometry = m_availableGeometryData.value(screenToIndex(pScreen));
     /* Return cached available-geometry if it's valid or screen-geometry otherwise: */
@@ -25,10 +13,10 @@ index c27ff6f6..066a80e0 100644
 #else /* !VBOX_WS_X11 */
     /* Just return screen available-geometry: */
 diff --git a/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp b/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp
-index 2443af89..6cfcff74 100644
+index e8b8db43..8c8ebdca 100644
 --- a/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp
-@@ -109,6 +109,9 @@ X11WMType NativeWindowSubsystem::X11WindowManagerType()
+@@ -115,6 +115,9 @@ X11WMType NativeWindowSubsystem::X11WindowManagerType()
                 else
                 if (QString((const char*)pcData).contains("Xfwm4", Qt::CaseInsensitive))
                     wmType = X11WMType_Xfwm4;
@@ -39,7 +27,7 @@ index 2443af89..6cfcff74 100644
                     XFree(pcData);
             }
 diff --git a/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.h b/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.h
-index 66504c71..f83b5c85 100644
+index 12b4a172..dae12f25 100644
 --- a/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.h
 +++ b/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.h
@@ -49,6 +49,7 @@ enum X11WMType
@@ -60,7 +48,7 @@ index 66504c71..f83b5c85 100644
     /** X11: Returns true if XLib extension with name @p extensionName is avaible, false otherwise. */
     bool X11CheckExtension(const char *extensionName);
 diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
-index 7b37d46b..b838ad07 100644
+index 8ac46c99..5b749947 100644
 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
@@ -1076,6 +1076,10 @@ void UIMiniToolBar::prepare()
@@ -1,8 +1,8 @@
 diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp
-index 6ad7df3e..2f12c277 100644
+index fc29936c..cbf9c478 100644
 --- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp
 +++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp
-@@ -162,6 +162,9 @@ static int vbglR3GuestCtrlMsgWaitFor(uint32_t idClient, uint32_t *pidMsg, uint32
+@@ -178,6 +178,9 @@ static int vbglR3GuestCtrlMsgWaitFor(uint32_t idClient, uint32_t *pidMsg, uint32
  */
 DECL_NO_INLINE(static, bool) vbglR3GuestCtrlDetectPeekGetCancelSupport(uint32_t idClient)
 {
@@ -11,4 +11,4 @@ index 6ad7df3e..2f12c277 100644
 +
     /*
      * Seems we get VINF_SUCCESS back from the host if we try unsupported
-      * guest control functions, so we need to supply some random message
+      * guest control messages, so we need to supply some random message