Merge pull request #11376 from Rmys/master

virtualbox-7.0.6

hardware/virtualization/virtualbox/files/archlinux/009-properly-handle-i3wm.patch

@@ -1,35 +1,34 @@
-From 9284f5a37708ddf0108898a48eca5db0e5316a43 Mon Sep 17 00:00:00 2001
+From b9e64417e4c33e2c17e060aa482519c2c8c7d416 Mon Sep 17 00:00:00 2001
 From: Christian Hesse <mail@eworm.de>
-Date: Mon, 17 Oct 2022 16:35:53 +0200
+Date: Tue, 17 Jan 2023 22:04:08 +0100
 Subject: [PATCH] properly handle i3wm
 
 ---
- .../VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp        | 4 ++--
+ .../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(+), 3 deletions(-)
+ 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 9c5faa42..5439e2a7 100644
+index c27ff6f6..066a80e0 100644
 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp
-@@ -443,8 +443,8 @@ const QRect UIDesktopWidgetWatchdog::availableGeometry(int iHostScreenIndex /* =
+@@ -385,7 +385,8 @@ QRect UIDesktopWidgetWatchdog::availableGeometry(QScreen *pScreen) const
      /* Get cached available-geometry: */
-     const QRect availableGeometry = m_availableGeometryData.value(iHostScreenIndex);
+     const QRect availableGeometry = m_availableGeometryData.value(screenToIndex(pScreen));
      /* Return cached available-geometry if it's valid or screen-geometry otherwise: */
--    return availableGeometry.isValid() ? availableGeometry :
+-    return availableGeometry.isValid() ? availableGeometry : screenGeometry(pScreen);
--           QApplication::desktop()->screenGeometry(iHostScreenIndex);
 +    return availableGeometry.isValid() && NativeWindowSubsystem::X11WindowManagerType() != X11WMType_i3 ?
-+           availableGeometry : QApplication::desktop()->screenGeometry(iHostScreenIndex);
++           availableGeometry : screenGeometry(pScreen);
- #  endif /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
+ # endif /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
- # else /* !VBOX_WS_X11 */
+ #else /* !VBOX_WS_X11 */
-     /* Redirect call to desktop-widget: */
+     /* 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 53927559..ea648da7 100644
+index 2443af89..6cfcff74 100644
 --- a/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp
-@@ -117,6 +117,9 @@ X11WMType NativeWindowSubsystem::X11WindowManagerType()
+@@ -109,6 +109,9 @@ X11WMType NativeWindowSubsystem::X11WindowManagerType()
                  else
                  if (QString((const char*)pcData).contains("Xfwm4", Qt::CaseInsensitive))
                      wmType = X11WMType_Xfwm4;
@@ -40,7 +39,7 @@ index 53927559..ea648da7 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 bad78665..f2a0b462 100644
+index 66504c71..f83b5c85 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
@@ -51,20 +50,20 @@ index bad78665..f2a0b462 100644
  };
  
  /** X11: Screen-saver inhibit methods. */
-@@ -95,7 +96,7 @@
+@@ -95,7 +96,7 @@ namespace NativeWindowSubsystem
      /** X11: Determines and returns whether the compositing manager is running. */
      bool X11IsCompositingManagerRunning();
      /** X11: Determines and returns current Window Manager type. */
 -    X11WMType X11WindowManagerType();
 +    SHARED_LIBRARY_STUFF X11WMType X11WindowManagerType();
  
- #if 0 // unused for now?
+     /** X11: Returns true if XLib extension with name @p extensionName is avaible, false otherwise. */
-     /** X11: Inits the screen saver save/restore mechanism. */
+     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 815db408..8cddb431 100644
+index 7b37d46b..b838ad07 100644
 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
-@@ -888,6 +888,10 @@ void UIMiniToolBar::prepare()
+@@ -1076,6 +1076,10 @@ void UIMiniToolBar::prepare()
      /* Enable translucency through Qt API if supported: */
      if (uiCommon().isCompositingManagerRunning())
          setAttribute(Qt::WA_TranslucentBackground);

hardware/virtualization/virtualbox/pspec.xml

@@ -12,7 +12,7 @@
         <IsA>app:gui</IsA>
         <Summary>A powerful virtualization program</Summary>
         <Description>VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use. This is the Open Source Edition which lacks USB support and some other things.</Description>
-        <Archive sha1sum="caed72b3e1f4eebfd07ce85db3cce4448037ee85" type="tarbz2">http://download.virtualbox.org/virtualbox/7.0.4/VirtualBox-7.0.4.tar.bz2</Archive>
+        <Archive sha1sum="cd4ea11db41d7748ee0b5c8932fbd197983afeec" type="tarbz2">http://download.virtualbox.org/virtualbox/7.0.6/VirtualBox-7.0.6.tar.bz2</Archive>
         <AdditionalFiles>
             <AdditionalFile owner="root" permission="0644" target="dkms.conf">dkms.conf</AdditionalFile>
             <AdditionalFile owner="root" permission="0644" target="dkms-guest.conf">dkms-guest.conf</AdditionalFile>
@@ -51,7 +51,7 @@
             <Dependency>libvncserver-devel</Dependency>
             <Dependency>libXcomposite-devel</Dependency>
             <Dependency>pulseaudio-libs-devel</Dependency>
-            <Dependency versionFrom="5.10.58">kernel-headers</Dependency>
+            <Dependency versionFrom="5.15.86">kernel-headers</Dependency>
             <Dependency>kernel-module-headers</Dependency>
             <Dependency>qt5-x11extras-devel</Dependency>
             <Dependency>jdk8-openjdk</Dependency>
@@ -211,6 +211,13 @@
     </Package>
 
     <History>
+        <Update release="57">
+            <Date>2023-01-20</Date>
+            <Version>7.0.6</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="56">
             <Date>2022-11-20</Date>
             <Version>7.0.4</Version>