From 5da8cfe1882ae917314e88b9ae7d61b8677aa80a Mon Sep 17 00:00:00 2001 From: Rmys Date: Fri, 20 Jan 2023 13:05:36 +0300 Subject: [PATCH] virtualbox-7.0.6 --- .../archlinux/009-properly-handle-i3wm.patch | 41 +++++++++---------- hardware/virtualization/virtualbox/pspec.xml | 11 ++++- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/hardware/virtualization/virtualbox/files/archlinux/009-properly-handle-i3wm.patch b/hardware/virtualization/virtualbox/files/archlinux/009-properly-handle-i3wm.patch index b8ade3678d..fc66f28163 100644 --- a/hardware/virtualization/virtualbox/files/archlinux/009-properly-handle-i3wm.patch +++ b/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 -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 : -- QApplication::desktop()->screenGeometry(iHostScreenIndex); +- return availableGeometry.isValid() ? availableGeometry : screenGeometry(pScreen); + return availableGeometry.isValid() && NativeWindowSubsystem::X11WindowManagerType() != X11WMType_i3 ? -+ availableGeometry : QApplication::desktop()->screenGeometry(iHostScreenIndex); - # endif /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */ - # else /* !VBOX_WS_X11 */ - /* Redirect call to desktop-widget: */ ++ availableGeometry : screenGeometry(pScreen); + # endif /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */ + #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 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: Inits the screen saver save/restore mechanism. */ + /** 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 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); diff --git a/hardware/virtualization/virtualbox/pspec.xml b/hardware/virtualization/virtualbox/pspec.xml index 2f00140e35..3b579b23dd 100644 --- a/hardware/virtualization/virtualbox/pspec.xml +++ b/hardware/virtualization/virtualbox/pspec.xml @@ -12,7 +12,7 @@ app:gui A powerful virtualization program 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. - http://download.virtualbox.org/virtualbox/7.0.4/VirtualBox-7.0.4.tar.bz2 + http://download.virtualbox.org/virtualbox/7.0.6/VirtualBox-7.0.6.tar.bz2 dkms.conf dkms-guest.conf @@ -51,7 +51,7 @@ libvncserver-devel libXcomposite-devel pulseaudio-libs-devel - kernel-headers + kernel-headers kernel-module-headers qt5-x11extras-devel jdk8-openjdk @@ -211,6 +211,13 @@ + + 2023-01-20 + 7.0.6 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-11-20 7.0.4