diff --git a/hardware/virtualization/virtualbox/files/archlinux/001-disable-update.patch b/hardware/virtualization/virtualbox/files/archlinux/001-disable-update.patch index 97fd06a56d..a04f368ab7 100644 --- a/hardware/virtualization/virtualbox/files/archlinux/001-disable-update.patch +++ b/hardware/virtualization/virtualbox/files/archlinux/001-disable-update.patch @@ -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: */ diff --git a/hardware/virtualization/virtualbox/files/archlinux/008-no-vboxvideo.patch b/hardware/virtualization/virtualbox/files/archlinux/008-no-vboxvideo.patch index c427c2fa3d..85c659e5ec 100644 --- a/hardware/virtualization/virtualbox/files/archlinux/008-no-vboxvideo.patch +++ b/hardware/virtualization/virtualbox/files/archlinux/008-no-vboxvideo.patch @@ -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 := \ 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 fc66f28163..6967efa3ca 100644 --- a/hardware/virtualization/virtualbox/files/archlinux/009-properly-handle-i3wm.patch +++ b/hardware/virtualization/virtualbox/files/archlinux/009-properly-handle-i3wm.patch @@ -1,20 +1,8 @@ -From b9e64417e4c33e2c17e060aa482519c2c8c7d416 Mon Sep 17 00:00:00 2001 -From: Christian Hesse -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() diff --git a/hardware/virtualization/virtualbox/files/archlinux/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch b/hardware/virtualization/virtualbox/files/archlinux/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch index d2ef03c8f0..5d805d5f14 100644 --- a/hardware/virtualization/virtualbox/files/archlinux/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch +++ b/hardware/virtualization/virtualbox/files/archlinux/012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch @@ -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 diff --git a/hardware/virtualization/virtualbox/files/libxml2.12.patch b/hardware/virtualization/virtualbox/files/libxml2.12.patch index 60df8c8b04..5502a8eb74 100644 --- a/hardware/virtualization/virtualbox/files/libxml2.12.patch +++ b/hardware/virtualization/virtualbox/files/libxml2.12.patch @@ -1,29 +1,33 @@ ---- VirtualBox-7.0.12/include/iprt/cpp/xml.h.orig 2023-12-24 15:42:18.092685383 +0100 -+++ VirtualBox-7.0.12/include/iprt/cpp/xml.h 2023-12-24 15:46:14.872125732 +0100 -@@ -113,9 +113,9 @@ +diff --git a/include/iprt/cpp/xml.h b/include/iprt/cpp/xml.h +index 40975e86..7639c281 100644 +--- a/include/iprt/cpp/xml.h ++++ b/include/iprt/cpp/xml.h +@@ -113,9 +113,9 @@ public: class RT_DECL_CLASS XmlError : public RuntimeError { public: - XmlError(xmlErrorPtr aErr); -+ XmlError(const xmlError* aErr); - ++ XmlError(const xmlError *aErr); + - static char* Format(xmlErrorPtr aErr); -+ static char* Format(const xmlError* aErr); ++ static char* Format(const xmlError *aErr); }; - + // Logical errors ---- VirtualBox-7.0.12/src/VBox/Runtime/r3/xml.cpp.orig 2023-12-24 15:31:18.385556729 +0100 -+++ VirtualBox-7.0.12/src/VBox/Runtime/r3/xml.cpp 2023-12-24 15:46:31.679225463 +0100 -@@ -131,7 +131,7 @@ +diff --git a/src/VBox/Runtime/r3/xml.cpp b/src/VBox/Runtime/r3/xml.cpp +index a6661760..b301a6c6 100644 +--- a/src/VBox/Runtime/r3/xml.cpp ++++ b/src/VBox/Runtime/r3/xml.cpp +@@ -131,7 +131,7 @@ LogicError::LogicError(RT_SRC_POS_DECL) RTStrFree(msg); } - + -XmlError::XmlError(xmlErrorPtr aErr) -+XmlError::XmlError(const xmlError* aErr) ++XmlError::XmlError(const xmlError *aErr) { if (!aErr) throw EInvalidArg(RT_SRC_POS); -@@ -145,7 +145,7 @@ +@@ -145,7 +145,7 @@ XmlError::XmlError(xmlErrorPtr aErr) * Composes a single message for the given error. The caller must free the * returned string using RTStrFree() when no more necessary. */ @@ -32,12 +36,12 @@ { const char *msg = aErr->message ? aErr->message : ""; size_t msgLen = strlen(msg); -@@ -1856,7 +1856,7 @@ +@@ -1856,7 +1856,7 @@ static void xmlParserBaseGenericError(void *pCtx, const char *pszMsg, ...) RT_NO va_end(args); } - + -static void xmlParserBaseStructuredError(void *pCtx, xmlErrorPtr error) RT_NOTHROW_DEF -+static void xmlParserBaseStructuredError(void *pCtx, const xmlError* error) RT_NOTHROW_DEF ++static void xmlParserBaseStructuredError(void *pCtx, const xmlError *error) RT_NOTHROW_DEF { NOREF(pCtx); /* we expect that there is always a trailing NL */ diff --git a/hardware/virtualization/virtualbox/pspec.xml b/hardware/virtualization/virtualbox/pspec.xml index 3b5a694c88..142430b5c2 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.14/VirtualBox-7.0.14.tar.bz2 + http://download.virtualbox.org/virtualbox/7.0.16/VirtualBox-7.0.16.tar.bz2 dkms.conf dkms-guest.conf @@ -79,7 +79,7 @@ archlinux/018-upate-xclient-script.patch python.patch - libxml2.12.patch + @@ -214,6 +214,13 @@ + + 2024-04-17 + 7.0.16 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2024-04-05 7.0.14