* [PR PATCH] virtualbox-ose: update to 7.1.4.
@ 2024-11-04 10:01 Vinfall
2024-11-18 1:51 ` Vinfall
` (30 more replies)
0 siblings, 31 replies; 32+ messages in thread
From: Vinfall @ 2024-11-04 10:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1753 bytes --]
There is a new pull request by Vinfall against master on the void-packages repository
https://github.com/Vinfall/void-packages virtualbox-ose-update
https://github.com/void-linux/void-packages/pull/52910
virtualbox-ose: update to 7.1.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
- Checks passed locally
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
#### Notes
- 015-no-update.patch is updated by myself, just trivial change, deleted patches are no longer needed
- adjusted template as vbox 7.1 is based on Qt6 now. As there is no `qt6-devel` package, I choose a larger `qt6-base-devel` in makedepends. Please let me know if there is a better option. `setuid` change is taken from [Artix](https://gitea.artixlinux.org/packages/virtualbox/commit/a349e60d4475af1623821689696814b294cad618#diff-9b9baac1eb9b72790eef5540a1685306fc43fd6c)
- While checks did pass locally, I have not intensely used it, would make draft ready when it does work well for me.
A patch file from https://github.com/void-linux/void-packages/pull/52910.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-virtualbox-ose-update-52910.patch --]
[-- Type: text/x-diff, Size: 24209 bytes --]
From fe5095f87bb4a50dcfd3036e8bf97e97dbaefc45 Mon Sep 17 00:00:00 2001
From: Vinfall <neptuniah@riseup.net>
Date: Thu, 12 Sep 2024 10:05:40 +0800
Subject: [PATCH] virtualbox-ose: update to 7.1.4.
---
.../patches/015-no-update.patch | 45 +++--
.../patches/050-fix-include.patch | 12 --
srcpkgs/virtualbox-ose/patches/052-xml.patch | 163 ------------------
srcpkgs/virtualbox-ose/template | 17 +-
4 files changed, 30 insertions(+), 207 deletions(-)
delete mode 100644 srcpkgs/virtualbox-ose/patches/050-fix-include.patch
delete mode 100644 srcpkgs/virtualbox-ose/patches/052-xml.patch
diff --git a/srcpkgs/virtualbox-ose/patches/015-no-update.patch b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
index 12ee94908c9598..f4019330c30ae2 100644
--- a/srcpkgs/virtualbox-ose/patches/015-no-update.patch
+++ b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
@@ -1,27 +1,24 @@
-
+Adapted for VBox 7.1.0
Description: Disable "Check for Updates" action.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
---- a/doc/manual/en_US/user_Introduction.xml
-+++ b/doc/manual/en_US/user_Introduction.xml
-@@ -6090,14 +6090,14 @@
- <xref linkend="specialcharacters"/>.
- </para>
- </listitem>
--
+--- a/doc/manual/en_US/dita/topics/preferences.dita
++++ b/doc/manual/en_US/dita/topics/preferences.dita
+@@ -31,11 +31,13 @@
+ <li>
+ <p><b outputclass="bold">Input.</b> Enables you to specify keyboard shortcuts, both in <ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/> and in individual VMs. For example you might want to specify a different <b outputclass="bold">Host key</b>. This is the key that toggles whether the cursor is in the focus of the VM or the Host OS windows, see <xref href="keyb_mouse_normal.dita#keyb_mouse_normal"/>. The Host key is also used to trigger certain VM actions, see <xref href="specialcharacters.dita#specialcharacters"/>. </p>
+ </li>
+ <!--
- <listitem>
- <para>
- <emphasis role="bold">Update.</emphasis> Enables you to
+ <li>
+ <p><b outputclass="bold">Update.</b> Enables you to
specify various settings for Automatic Updates.
- </para>
- </listitem>
--
+ </p>
+ </li>
+ -->
- <listitem>
- <para>
- <emphasis role="bold">Language.</emphasis> Enables you to
+ <li>
+ <p><b outputclass="bold">Language.</b> Enables you to specify the language used for menus, labels, and text in
+ <ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/>. </p>
--- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
@@ -2421,7 +2421,7 @@ QString UIExtraDataManager::preventBetaB
@@ -33,9 +30,9 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
}
QString UIExtraDataManager::applicationUpdateData()
---- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-@@ -47,10 +47,10 @@
+--- a/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
+@@ -49,10 +49,10 @@
#ifdef VBOX_WS_WIN
# include "UIGlobalSettingsInterface.h"
#endif
@@ -50,7 +47,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
/* GUI includes: Machine Settings: */
#include "UIMachineSettingsAudio.h"
-@@ -99,7 +99,7 @@ void UISettingsDialogGlobal::retranslate
+@@ -98,7 +98,7 @@ void UISettingsDialogGlobal::retranslate
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Update page: */
@@ -59,7 +56,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif
/* Language page: */
-@@ -110,7 +110,7 @@ void UISettingsDialogGlobal::retranslate
+@@ -109,7 +109,7 @@ void UISettingsDialogGlobal::retranslate
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Proxy page: */
@@ -68,7 +65,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif
#ifdef VBOX_WS_WIN
-@@ -226,14 +226,14 @@ void UISettingsDialogGlobal::prepare()
+@@ -219,14 +219,14 @@ void UISettingsDialogGlobal::prepare()
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Update page: */
@@ -85,7 +82,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
/* Language page: */
case GlobalSettingsPageType_Language:
-@@ -255,14 +255,14 @@ void UISettingsDialogGlobal::prepare()
+@@ -248,14 +248,14 @@ void UISettingsDialogGlobal::prepare()
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Proxy page: */
diff --git a/srcpkgs/virtualbox-ose/patches/050-fix-include.patch b/srcpkgs/virtualbox-ose/patches/050-fix-include.patch
deleted file mode 100644
index f6f3e115dba3b1..00000000000000
--- a/srcpkgs/virtualbox-ose/patches/050-fix-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: virtualbox-ose-7.0.4/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-===================================================================
---- virtualbox-ose-7.0.4.orig/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-+++ virtualbox-ose-7.0.4/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-@@ -32,6 +32,7 @@
- #endif
-
- /* Qt includes: */
-+#include <QObject>
- #include <QPointer>
- #include <QUrl>
-
diff --git a/srcpkgs/virtualbox-ose/patches/052-xml.patch b/srcpkgs/virtualbox-ose/patches/052-xml.patch
deleted file mode 100644
index 81f93ba7a5ebb7..00000000000000
--- a/srcpkgs/virtualbox-ose/patches/052-xml.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-Fix ftbfs
-From: nezos@hotmail.com
---- a/doc/manual/en_US/user_VBoxManage.xml
-+++ b/doc/manual/en_US/user_VBoxManage.xml
-@@ -242,107 +242,107 @@ Settings file: '/home/username/.config/V
- on your particular host.
- </para>
-
-- <xi:include href="overview_man_VBoxManage-common.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-common.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-list.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-list.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-showvminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-showvminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-registervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-registervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-unregistervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-unregistervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-createvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-createvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifyvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifyvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-clonevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-clonevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-movevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-movevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-encryptvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-encryptvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-cloud.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-cloud.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-cloudprofile.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-cloudprofile.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-import.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-import.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-export.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-export.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-signova.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-signova.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-startvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-startvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-controlvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-controlvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-unattended.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-unattended.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-discardstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-discardstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-adoptstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-adoptstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-snapshot.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-snapshot.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-closemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-closemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-storageattach.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-storageattach.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-storagectl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-storagectl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-bandwidthctl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-bandwidthctl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-createmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-createmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifymedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifymedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-clonemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-clonemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-encryptmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-encryptmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-mediumio.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-mediumio.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-setextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-setextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-getextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-getextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-setproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-setproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-usbfilter.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-usbfilter.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-sharedfolder.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-sharedfolder.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-guestproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-guestproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-guestcontrol.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-guestcontrol.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-debugvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-debugvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-metrics.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-metrics.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-natnetwork.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-natnetwork.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-hostonlyif.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-hostonlyif.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-hostonlynet.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-hostonlynet.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-dhcpserver.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-dhcpserver.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-usbdevsource.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-usbdevsource.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-extpack.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-extpack.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-updatecheck.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-updatecheck.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifynvram.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifynvram.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
- <para>
- Each time <command>VBoxManage</command> is invoked, only one
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 8eda04269d1516..aa133fbedba3b5 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
-version=7.0.20
+version=7.1.4
revision=1
short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -8,21 +8,22 @@ license="GPL-2.0-only, CDDL-1.0"
homepage="https://www.virtualbox.org"
changelog="https://www.virtualbox.org/wiki/Changelog"
distfiles="http://download.virtualbox.org/virtualbox/${version%[a-z]*}/VirtualBox-${version}.tar.bz2"
-checksum=5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02
+checksum=872e7a42b41f8558abbf887f1bdc7aac932bb88b2764d07cbce270cab57e3b5e
nopie=yes
lib32disabled=yes
archs="x86_64"
-hostmakedepends="acpica-utils dev86 perl pkg-config qt5-tools tar yasm which glslang
+hostmakedepends="acpica-utils dev86 perl pkg-config qt6-tools tar yasm which glslang
vulkan-loader"
makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel
- libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt5-tools-devel
- libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt5-x11extras-devel
- SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel qt5-devel
+ libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt6-tools-devel
+ libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt6-scxml-devel
+ SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel
openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel
libglvnd-devel libX11-devel libXt-devel libXcursor-devel pam-devel vde2-devel SDL2-devel
- SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
+ SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel
+ qt6-base-devel"
if [ "$XBPS_MACHINE" = "x86_64" ]; then
makedepends+=" gcc-multilib"
@@ -80,7 +81,7 @@ do_install() {
install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp \
VBoxBugReport VBoxCpuReport VBoxDTrace vboximg-mount \
VBoxVolInfo xpidl \
- VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest \
+ VBoxBalloonCtrl vboxwebsrv webtest \
-t ${DESTDIR}/usr/lib/virtualbox
# locales
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
@ 2024-11-18 1:51 ` Vinfall
2024-11-23 2:24 ` [PR PATCH] [Updated] " Vinfall
` (29 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2024-11-18 1:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 653 bytes --]
New comment by Vinfall on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#issuecomment-2481765401
Comment:
Note on Linux 6.12 since it's out and a LTS release, quoted from [vbox changelog](https://www.virtualbox.org/wiki/Changelog-7.1):
> Linux Guest Additions: Introduce initial support for kernel 6.12 (NOTE: In kernel 6.12, KVM initializes virtualization on module loading by default. This prevents [VirtualBox](https://www.virtualbox.org/wiki/VirtualBox) VMs from starting. In order to avoid this, either add "kvm.enable_virt_at_load=0" parameter into kernel command line or unload corresponding kvm_XXX module)
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
2024-11-18 1:51 ` Vinfall
@ 2024-11-23 2:24 ` Vinfall
2024-12-23 5:03 ` Vinfall
` (28 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2024-11-23 2:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1830 bytes --]
There is an updated pull request by Vinfall against master on the void-packages repository
https://github.com/Vinfall/void-packages virtualbox-ose-update
https://github.com/void-linux/void-packages/pull/52910
virtualbox-ose: update to 7.1.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
- Checks passed locally
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
#### Notes
- 015-no-update.patch is updated by myself, just trivial change, deleted patches are no longer needed
- adjusted template as vbox 7.1 is based on Qt6 now. As there is no `qt6-devel` package, I choose a larger `qt6-base-devel` in makedepends. Please let me know if there is a better option. `setuid` change is taken from [Artix](https://gitea.artixlinux.org/packages/virtualbox/commit/a349e60d4475af1623821689696814b294cad618#diff-9b9baac1eb9b72790eef5540a1685306fc43fd6c)
- Works quite well for me. The only thing broken is dark mode, but it's unrelated to packaging as official .run installer has the same issue, probably caused by qt6ct. Should be fine to merge.
A patch file from https://github.com/void-linux/void-packages/pull/52910.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-virtualbox-ose-update-52910.patch --]
[-- Type: text/x-diff, Size: 24209 bytes --]
From 0943a5d27e9f29d54783a21c76b63b1ff2e4d399 Mon Sep 17 00:00:00 2001
From: Vinfall <neptuniah@riseup.net>
Date: Thu, 12 Sep 2024 10:05:40 +0800
Subject: [PATCH] virtualbox-ose: update to 7.1.4.
---
.../patches/015-no-update.patch | 45 +++--
.../patches/050-fix-include.patch | 12 --
srcpkgs/virtualbox-ose/patches/052-xml.patch | 163 ------------------
srcpkgs/virtualbox-ose/template | 17 +-
4 files changed, 30 insertions(+), 207 deletions(-)
delete mode 100644 srcpkgs/virtualbox-ose/patches/050-fix-include.patch
delete mode 100644 srcpkgs/virtualbox-ose/patches/052-xml.patch
diff --git a/srcpkgs/virtualbox-ose/patches/015-no-update.patch b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
index 12ee94908c9598..f4019330c30ae2 100644
--- a/srcpkgs/virtualbox-ose/patches/015-no-update.patch
+++ b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
@@ -1,27 +1,24 @@
-
+Adapted for VBox 7.1.0
Description: Disable "Check for Updates" action.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
---- a/doc/manual/en_US/user_Introduction.xml
-+++ b/doc/manual/en_US/user_Introduction.xml
-@@ -6090,14 +6090,14 @@
- <xref linkend="specialcharacters"/>.
- </para>
- </listitem>
--
+--- a/doc/manual/en_US/dita/topics/preferences.dita
++++ b/doc/manual/en_US/dita/topics/preferences.dita
+@@ -31,11 +31,13 @@
+ <li>
+ <p><b outputclass="bold">Input.</b> Enables you to specify keyboard shortcuts, both in <ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/> and in individual VMs. For example you might want to specify a different <b outputclass="bold">Host key</b>. This is the key that toggles whether the cursor is in the focus of the VM or the Host OS windows, see <xref href="keyb_mouse_normal.dita#keyb_mouse_normal"/>. The Host key is also used to trigger certain VM actions, see <xref href="specialcharacters.dita#specialcharacters"/>. </p>
+ </li>
+ <!--
- <listitem>
- <para>
- <emphasis role="bold">Update.</emphasis> Enables you to
+ <li>
+ <p><b outputclass="bold">Update.</b> Enables you to
specify various settings for Automatic Updates.
- </para>
- </listitem>
--
+ </p>
+ </li>
+ -->
- <listitem>
- <para>
- <emphasis role="bold">Language.</emphasis> Enables you to
+ <li>
+ <p><b outputclass="bold">Language.</b> Enables you to specify the language used for menus, labels, and text in
+ <ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/>. </p>
--- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
@@ -2421,7 +2421,7 @@ QString UIExtraDataManager::preventBetaB
@@ -33,9 +30,9 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
}
QString UIExtraDataManager::applicationUpdateData()
---- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-@@ -47,10 +47,10 @@
+--- a/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
+@@ -49,10 +49,10 @@
#ifdef VBOX_WS_WIN
# include "UIGlobalSettingsInterface.h"
#endif
@@ -50,7 +47,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
/* GUI includes: Machine Settings: */
#include "UIMachineSettingsAudio.h"
-@@ -99,7 +99,7 @@ void UISettingsDialogGlobal::retranslate
+@@ -98,7 +98,7 @@ void UISettingsDialogGlobal::retranslate
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Update page: */
@@ -59,7 +56,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif
/* Language page: */
-@@ -110,7 +110,7 @@ void UISettingsDialogGlobal::retranslate
+@@ -109,7 +109,7 @@ void UISettingsDialogGlobal::retranslate
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Proxy page: */
@@ -68,7 +65,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif
#ifdef VBOX_WS_WIN
-@@ -226,14 +226,14 @@ void UISettingsDialogGlobal::prepare()
+@@ -219,14 +219,14 @@ void UISettingsDialogGlobal::prepare()
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Update page: */
@@ -85,7 +82,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
/* Language page: */
case GlobalSettingsPageType_Language:
-@@ -255,14 +255,14 @@ void UISettingsDialogGlobal::prepare()
+@@ -248,14 +248,14 @@ void UISettingsDialogGlobal::prepare()
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Proxy page: */
diff --git a/srcpkgs/virtualbox-ose/patches/050-fix-include.patch b/srcpkgs/virtualbox-ose/patches/050-fix-include.patch
deleted file mode 100644
index f6f3e115dba3b1..00000000000000
--- a/srcpkgs/virtualbox-ose/patches/050-fix-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: virtualbox-ose-7.0.4/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-===================================================================
---- virtualbox-ose-7.0.4.orig/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-+++ virtualbox-ose-7.0.4/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-@@ -32,6 +32,7 @@
- #endif
-
- /* Qt includes: */
-+#include <QObject>
- #include <QPointer>
- #include <QUrl>
-
diff --git a/srcpkgs/virtualbox-ose/patches/052-xml.patch b/srcpkgs/virtualbox-ose/patches/052-xml.patch
deleted file mode 100644
index 81f93ba7a5ebb7..00000000000000
--- a/srcpkgs/virtualbox-ose/patches/052-xml.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-Fix ftbfs
-From: nezos@hotmail.com
---- a/doc/manual/en_US/user_VBoxManage.xml
-+++ b/doc/manual/en_US/user_VBoxManage.xml
-@@ -242,107 +242,107 @@ Settings file: '/home/username/.config/V
- on your particular host.
- </para>
-
-- <xi:include href="overview_man_VBoxManage-common.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-common.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-list.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-list.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-showvminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-showvminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-registervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-registervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-unregistervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-unregistervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-createvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-createvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifyvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifyvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-clonevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-clonevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-movevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-movevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-encryptvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-encryptvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-cloud.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-cloud.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-cloudprofile.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-cloudprofile.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-import.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-import.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-export.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-export.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-signova.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-signova.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-startvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-startvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-controlvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-controlvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-unattended.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-unattended.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-discardstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-discardstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-adoptstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-adoptstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-snapshot.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-snapshot.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-closemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-closemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-storageattach.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-storageattach.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-storagectl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-storagectl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-bandwidthctl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-bandwidthctl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-createmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-createmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifymedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifymedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-clonemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-clonemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-encryptmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-encryptmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-mediumio.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-mediumio.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-setextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-setextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-getextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-getextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-setproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-setproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-usbfilter.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-usbfilter.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-sharedfolder.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-sharedfolder.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-guestproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-guestproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-guestcontrol.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-guestcontrol.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-debugvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-debugvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-metrics.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-metrics.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-natnetwork.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-natnetwork.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-hostonlyif.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-hostonlyif.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-hostonlynet.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-hostonlynet.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-dhcpserver.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-dhcpserver.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-usbdevsource.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-usbdevsource.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-extpack.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-extpack.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-updatecheck.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-updatecheck.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifynvram.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifynvram.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
- <para>
- Each time <command>VBoxManage</command> is invoked, only one
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 8eda04269d1516..aa133fbedba3b5 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
-version=7.0.20
+version=7.1.4
revision=1
short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -8,21 +8,22 @@ license="GPL-2.0-only, CDDL-1.0"
homepage="https://www.virtualbox.org"
changelog="https://www.virtualbox.org/wiki/Changelog"
distfiles="http://download.virtualbox.org/virtualbox/${version%[a-z]*}/VirtualBox-${version}.tar.bz2"
-checksum=5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02
+checksum=872e7a42b41f8558abbf887f1bdc7aac932bb88b2764d07cbce270cab57e3b5e
nopie=yes
lib32disabled=yes
archs="x86_64"
-hostmakedepends="acpica-utils dev86 perl pkg-config qt5-tools tar yasm which glslang
+hostmakedepends="acpica-utils dev86 perl pkg-config qt6-tools tar yasm which glslang
vulkan-loader"
makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel
- libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt5-tools-devel
- libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt5-x11extras-devel
- SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel qt5-devel
+ libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt6-tools-devel
+ libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt6-scxml-devel
+ SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel
openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel
libglvnd-devel libX11-devel libXt-devel libXcursor-devel pam-devel vde2-devel SDL2-devel
- SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
+ SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel
+ qt6-base-devel"
if [ "$XBPS_MACHINE" = "x86_64" ]; then
makedepends+=" gcc-multilib"
@@ -80,7 +81,7 @@ do_install() {
install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp \
VBoxBugReport VBoxCpuReport VBoxDTrace vboximg-mount \
VBoxVolInfo xpidl \
- VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest \
+ VBoxBalloonCtrl vboxwebsrv webtest \
-t ${DESTDIR}/usr/lib/virtualbox
# locales
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
2024-11-18 1:51 ` Vinfall
2024-11-23 2:24 ` [PR PATCH] [Updated] " Vinfall
@ 2024-12-23 5:03 ` Vinfall
2024-12-23 5:03 ` Vinfall
` (27 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2024-12-23 5:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 816 bytes --]
New comment by Vinfall on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#issuecomment-2481765401
Comment:
Note on Linux 6.12 since it's out and a LTS release, quoted from [vbox changelog](https://www.virtualbox.org/wiki/Changelog-7.1):
> Linux Guest Additions: Introduce initial support for kernel 6.12 (NOTE: In kernel 6.12, KVM initializes virtualization on module loading by default. This prevents [VirtualBox](https://www.virtualbox.org/wiki/VirtualBox) VMs from starting. In order to avoid this, either add "kvm.enable_virt_at_load=0" parameter into kernel command line or unload corresponding kvm_XXX module)
`linux` package in Void bumped to 6.12 since https://github.com/void-linux/void-packages/commit/db3491817616807376de52625ae471991faec8a9 so it's now effective.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (2 preceding siblings ...)
2024-12-23 5:03 ` Vinfall
@ 2024-12-23 5:03 ` Vinfall
2024-12-23 5:33 ` [PR PATCH] [Updated] " Vinfall
` (26 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2024-12-23 5:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 808 bytes --]
New comment by Vinfall on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#issuecomment-2481765401
Comment:
Note on Linux 6.12 since it's a LTS release, quoted from [vbox changelog](https://www.virtualbox.org/wiki/Changelog-7.1):
> Linux Guest Additions: Introduce initial support for kernel 6.12 (NOTE: In kernel 6.12, KVM initializes virtualization on module loading by default. This prevents [VirtualBox](https://www.virtualbox.org/wiki/VirtualBox) VMs from starting. In order to avoid this, either add "kvm.enable_virt_at_load=0" parameter into kernel command line or unload corresponding kvm_XXX module)
`linux` package in Void bumped to 6.12 since https://github.com/void-linux/void-packages/commit/db3491817616807376de52625ae471991faec8a9 so it's now effective.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (3 preceding siblings ...)
2024-12-23 5:03 ` Vinfall
@ 2024-12-23 5:33 ` Vinfall
2024-12-23 5:35 ` Vinfall
` (25 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2024-12-23 5:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1830 bytes --]
There is an updated pull request by Vinfall against master on the void-packages repository
https://github.com/Vinfall/void-packages virtualbox-ose-update
https://github.com/void-linux/void-packages/pull/52910
virtualbox-ose: update to 7.1.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
- Checks passed locally
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
#### Notes
- 015-no-update.patch is updated by myself, just trivial change, deleted patches are no longer needed
- adjusted template as vbox 7.1 is based on Qt6 now. As there is no `qt6-devel` package, I choose a larger `qt6-base-devel` in makedepends. Please let me know if there is a better option. `setuid` change is taken from [Artix](https://gitea.artixlinux.org/packages/virtualbox/commit/a349e60d4475af1623821689696814b294cad618#diff-9b9baac1eb9b72790eef5540a1685306fc43fd6c)
- Works quite well for me. The only thing broken is dark mode, but it's unrelated to packaging as official .run installer has the same issue, probably caused by qt6ct. Should be fine to merge.
A patch file from https://github.com/void-linux/void-packages/pull/52910.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-virtualbox-ose-update-52910.patch --]
[-- Type: text/x-diff, Size: 24798 bytes --]
From 81bb533bac54f35855bb36f8e52cc84eea733cf6 Mon Sep 17 00:00:00 2001
From: Vinfall <neptuniah@riseup.net>
Date: Thu, 12 Sep 2024 10:05:40 +0800
Subject: [PATCH] virtualbox-ose: update to 7.1.4.
---
srcpkgs/virtualbox-ose/INSTALL.msg | 5 +
.../patches/015-no-update.patch | 45 +++--
.../patches/050-fix-include.patch | 12 --
srcpkgs/virtualbox-ose/patches/052-xml.patch | 163 ------------------
srcpkgs/virtualbox-ose/template | 17 +-
5 files changed, 35 insertions(+), 207 deletions(-)
create mode 100644 srcpkgs/virtualbox-ose/INSTALL.msg
delete mode 100644 srcpkgs/virtualbox-ose/patches/050-fix-include.patch
delete mode 100644 srcpkgs/virtualbox-ose/patches/052-xml.patch
diff --git a/srcpkgs/virtualbox-ose/INSTALL.msg b/srcpkgs/virtualbox-ose/INSTALL.msg
new file mode 100644
index 00000000000000..816c2f7d1ce190
--- /dev/null
+++ b/srcpkgs/virtualbox-ose/INSTALL.msg
@@ -0,0 +1,5 @@
+In kernel 6.12, KVM initializes virtualization on module loading by default.
+This prevents VirtualBox VMs from starting.
+In order to avoid this, either add "kvm.enable_virt_at_load=0" parameter
+into kernel command line or unload corresponding kvm_XXX module.
+
diff --git a/srcpkgs/virtualbox-ose/patches/015-no-update.patch b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
index 12ee94908c9598..f4019330c30ae2 100644
--- a/srcpkgs/virtualbox-ose/patches/015-no-update.patch
+++ b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
@@ -1,27 +1,24 @@
-
+Adapted for VBox 7.1.0
Description: Disable "Check for Updates" action.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
---- a/doc/manual/en_US/user_Introduction.xml
-+++ b/doc/manual/en_US/user_Introduction.xml
-@@ -6090,14 +6090,14 @@
- <xref linkend="specialcharacters"/>.
- </para>
- </listitem>
--
+--- a/doc/manual/en_US/dita/topics/preferences.dita
++++ b/doc/manual/en_US/dita/topics/preferences.dita
+@@ -31,11 +31,13 @@
+ <li>
+ <p><b outputclass="bold">Input.</b> Enables you to specify keyboard shortcuts, both in <ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/> and in individual VMs. For example you might want to specify a different <b outputclass="bold">Host key</b>. This is the key that toggles whether the cursor is in the focus of the VM or the Host OS windows, see <xref href="keyb_mouse_normal.dita#keyb_mouse_normal"/>. The Host key is also used to trigger certain VM actions, see <xref href="specialcharacters.dita#specialcharacters"/>. </p>
+ </li>
+ <!--
- <listitem>
- <para>
- <emphasis role="bold">Update.</emphasis> Enables you to
+ <li>
+ <p><b outputclass="bold">Update.</b> Enables you to
specify various settings for Automatic Updates.
- </para>
- </listitem>
--
+ </p>
+ </li>
+ -->
- <listitem>
- <para>
- <emphasis role="bold">Language.</emphasis> Enables you to
+ <li>
+ <p><b outputclass="bold">Language.</b> Enables you to specify the language used for menus, labels, and text in
+ <ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/>. </p>
--- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
@@ -2421,7 +2421,7 @@ QString UIExtraDataManager::preventBetaB
@@ -33,9 +30,9 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
}
QString UIExtraDataManager::applicationUpdateData()
---- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-@@ -47,10 +47,10 @@
+--- a/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
+@@ -49,10 +49,10 @@
#ifdef VBOX_WS_WIN
# include "UIGlobalSettingsInterface.h"
#endif
@@ -50,7 +47,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
/* GUI includes: Machine Settings: */
#include "UIMachineSettingsAudio.h"
-@@ -99,7 +99,7 @@ void UISettingsDialogGlobal::retranslate
+@@ -98,7 +98,7 @@ void UISettingsDialogGlobal::retranslate
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Update page: */
@@ -59,7 +56,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif
/* Language page: */
-@@ -110,7 +110,7 @@ void UISettingsDialogGlobal::retranslate
+@@ -109,7 +109,7 @@ void UISettingsDialogGlobal::retranslate
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Proxy page: */
@@ -68,7 +65,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif
#ifdef VBOX_WS_WIN
-@@ -226,14 +226,14 @@ void UISettingsDialogGlobal::prepare()
+@@ -219,14 +219,14 @@ void UISettingsDialogGlobal::prepare()
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Update page: */
@@ -85,7 +82,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
/* Language page: */
case GlobalSettingsPageType_Language:
-@@ -255,14 +255,14 @@ void UISettingsDialogGlobal::prepare()
+@@ -248,14 +248,14 @@ void UISettingsDialogGlobal::prepare()
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Proxy page: */
diff --git a/srcpkgs/virtualbox-ose/patches/050-fix-include.patch b/srcpkgs/virtualbox-ose/patches/050-fix-include.patch
deleted file mode 100644
index f6f3e115dba3b1..00000000000000
--- a/srcpkgs/virtualbox-ose/patches/050-fix-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: virtualbox-ose-7.0.4/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-===================================================================
---- virtualbox-ose-7.0.4.orig/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-+++ virtualbox-ose-7.0.4/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-@@ -32,6 +32,7 @@
- #endif
-
- /* Qt includes: */
-+#include <QObject>
- #include <QPointer>
- #include <QUrl>
-
diff --git a/srcpkgs/virtualbox-ose/patches/052-xml.patch b/srcpkgs/virtualbox-ose/patches/052-xml.patch
deleted file mode 100644
index 81f93ba7a5ebb7..00000000000000
--- a/srcpkgs/virtualbox-ose/patches/052-xml.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-Fix ftbfs
-From: nezos@hotmail.com
---- a/doc/manual/en_US/user_VBoxManage.xml
-+++ b/doc/manual/en_US/user_VBoxManage.xml
-@@ -242,107 +242,107 @@ Settings file: '/home/username/.config/V
- on your particular host.
- </para>
-
-- <xi:include href="overview_man_VBoxManage-common.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-common.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-list.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-list.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-showvminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-showvminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-registervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-registervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-unregistervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-unregistervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-createvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-createvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifyvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifyvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-clonevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-clonevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-movevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-movevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-encryptvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-encryptvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-cloud.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-cloud.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-cloudprofile.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-cloudprofile.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-import.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-import.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-export.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-export.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-signova.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-signova.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-startvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-startvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-controlvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-controlvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-unattended.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-unattended.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-discardstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-discardstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-adoptstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-adoptstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-snapshot.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-snapshot.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-closemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-closemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-storageattach.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-storageattach.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-storagectl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-storagectl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-bandwidthctl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-bandwidthctl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-createmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-createmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifymedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifymedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-clonemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-clonemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-encryptmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-encryptmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-mediumio.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-mediumio.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-setextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-setextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-getextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-getextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-setproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-setproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-usbfilter.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-usbfilter.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-sharedfolder.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-sharedfolder.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-guestproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-guestproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-guestcontrol.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-guestcontrol.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-debugvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-debugvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-metrics.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-metrics.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-natnetwork.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-natnetwork.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-hostonlyif.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-hostonlyif.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-hostonlynet.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-hostonlynet.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-dhcpserver.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-dhcpserver.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-usbdevsource.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-usbdevsource.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-extpack.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-extpack.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-updatecheck.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-updatecheck.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifynvram.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifynvram.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
- <para>
- Each time <command>VBoxManage</command> is invoked, only one
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 8eda04269d1516..aa133fbedba3b5 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
-version=7.0.20
+version=7.1.4
revision=1
short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -8,21 +8,22 @@ license="GPL-2.0-only, CDDL-1.0"
homepage="https://www.virtualbox.org"
changelog="https://www.virtualbox.org/wiki/Changelog"
distfiles="http://download.virtualbox.org/virtualbox/${version%[a-z]*}/VirtualBox-${version}.tar.bz2"
-checksum=5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02
+checksum=872e7a42b41f8558abbf887f1bdc7aac932bb88b2764d07cbce270cab57e3b5e
nopie=yes
lib32disabled=yes
archs="x86_64"
-hostmakedepends="acpica-utils dev86 perl pkg-config qt5-tools tar yasm which glslang
+hostmakedepends="acpica-utils dev86 perl pkg-config qt6-tools tar yasm which glslang
vulkan-loader"
makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel
- libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt5-tools-devel
- libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt5-x11extras-devel
- SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel qt5-devel
+ libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt6-tools-devel
+ libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt6-scxml-devel
+ SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel
openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel
libglvnd-devel libX11-devel libXt-devel libXcursor-devel pam-devel vde2-devel SDL2-devel
- SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
+ SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel
+ qt6-base-devel"
if [ "$XBPS_MACHINE" = "x86_64" ]; then
makedepends+=" gcc-multilib"
@@ -80,7 +81,7 @@ do_install() {
install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp \
VBoxBugReport VBoxCpuReport VBoxDTrace vboximg-mount \
VBoxVolInfo xpidl \
- VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest \
+ VBoxBalloonCtrl vboxwebsrv webtest \
-t ${DESTDIR}/usr/lib/virtualbox
# locales
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (4 preceding siblings ...)
2024-12-23 5:33 ` [PR PATCH] [Updated] " Vinfall
@ 2024-12-23 5:35 ` Vinfall
2024-12-26 4:09 ` [PR PATCH] [Updated] " Vinfall
` (24 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2024-12-23 5:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
New comment by Vinfall on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#issuecomment-2558942360
Comment:
INSTALL.msg added to address KVM loading on Linux 6.12.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (5 preceding siblings ...)
2024-12-23 5:35 ` Vinfall
@ 2024-12-26 4:09 ` Vinfall
2024-12-26 4:11 ` Vinfall
` (23 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2024-12-26 4:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1679 bytes --]
There is an updated pull request by Vinfall against master on the void-packages repository
https://github.com/Vinfall/void-packages virtualbox-ose-update
https://github.com/void-linux/void-packages/pull/52910
virtualbox-ose: update to 7.1.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
- Checks passed locally
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
#### Notes
- 015-no-update.patch is updated by myself, just trivial change, deleted patches are no longer needed
- adjusted template as vbox 7.1 is based on Qt6 now. As there is no `qt6-devel` package, I choose a larger `qt6-base-devel` in makedepends. Please let me know if there is a better option. `setuid` change is taken from [Artix](https://gitea.artixlinux.org/packages/virtualbox/commit/a349e60d4475af1623821689696814b294cad618#diff-9b9baac1eb9b72790eef5540a1685306fc43fd6c)
- Works quite well and tested for months.
A patch file from https://github.com/void-linux/void-packages/pull/52910.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-virtualbox-ose-update-52910.patch --]
[-- Type: text/x-diff, Size: 24798 bytes --]
From 4145c23d6a42bf8e0bffa5b007b51e89cc89525c Mon Sep 17 00:00:00 2001
From: Vinfall <neptuniah@riseup.net>
Date: Thu, 12 Sep 2024 10:05:40 +0800
Subject: [PATCH] virtualbox-ose: update to 7.1.4.
---
srcpkgs/virtualbox-ose/INSTALL.msg | 5 +
.../patches/015-no-update.patch | 45 +++--
.../patches/050-fix-include.patch | 12 --
srcpkgs/virtualbox-ose/patches/052-xml.patch | 163 ------------------
srcpkgs/virtualbox-ose/template | 17 +-
5 files changed, 35 insertions(+), 207 deletions(-)
create mode 100644 srcpkgs/virtualbox-ose/INSTALL.msg
delete mode 100644 srcpkgs/virtualbox-ose/patches/050-fix-include.patch
delete mode 100644 srcpkgs/virtualbox-ose/patches/052-xml.patch
diff --git a/srcpkgs/virtualbox-ose/INSTALL.msg b/srcpkgs/virtualbox-ose/INSTALL.msg
new file mode 100644
index 00000000000000..816c2f7d1ce190
--- /dev/null
+++ b/srcpkgs/virtualbox-ose/INSTALL.msg
@@ -0,0 +1,5 @@
+In kernel 6.12, KVM initializes virtualization on module loading by default.
+This prevents VirtualBox VMs from starting.
+In order to avoid this, either add "kvm.enable_virt_at_load=0" parameter
+into kernel command line or unload corresponding kvm_XXX module.
+
diff --git a/srcpkgs/virtualbox-ose/patches/015-no-update.patch b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
index 12ee94908c9598..f4019330c30ae2 100644
--- a/srcpkgs/virtualbox-ose/patches/015-no-update.patch
+++ b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
@@ -1,27 +1,24 @@
-
+Adapted for VBox 7.1.0
Description: Disable "Check for Updates" action.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
---- a/doc/manual/en_US/user_Introduction.xml
-+++ b/doc/manual/en_US/user_Introduction.xml
-@@ -6090,14 +6090,14 @@
- <xref linkend="specialcharacters"/>.
- </para>
- </listitem>
--
+--- a/doc/manual/en_US/dita/topics/preferences.dita
++++ b/doc/manual/en_US/dita/topics/preferences.dita
+@@ -31,11 +31,13 @@
+ <li>
+ <p><b outputclass="bold">Input.</b> Enables you to specify keyboard shortcuts, both in <ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/> and in individual VMs. For example you might want to specify a different <b outputclass="bold">Host key</b>. This is the key that toggles whether the cursor is in the focus of the VM or the Host OS windows, see <xref href="keyb_mouse_normal.dita#keyb_mouse_normal"/>. The Host key is also used to trigger certain VM actions, see <xref href="specialcharacters.dita#specialcharacters"/>. </p>
+ </li>
+ <!--
- <listitem>
- <para>
- <emphasis role="bold">Update.</emphasis> Enables you to
+ <li>
+ <p><b outputclass="bold">Update.</b> Enables you to
specify various settings for Automatic Updates.
- </para>
- </listitem>
--
+ </p>
+ </li>
+ -->
- <listitem>
- <para>
- <emphasis role="bold">Language.</emphasis> Enables you to
+ <li>
+ <p><b outputclass="bold">Language.</b> Enables you to specify the language used for menus, labels, and text in
+ <ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/>. </p>
--- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
@@ -2421,7 +2421,7 @@ QString UIExtraDataManager::preventBetaB
@@ -33,9 +30,9 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
}
QString UIExtraDataManager::applicationUpdateData()
---- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-@@ -47,10 +47,10 @@
+--- a/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
+@@ -49,10 +49,10 @@
#ifdef VBOX_WS_WIN
# include "UIGlobalSettingsInterface.h"
#endif
@@ -50,7 +47,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
/* GUI includes: Machine Settings: */
#include "UIMachineSettingsAudio.h"
-@@ -99,7 +99,7 @@ void UISettingsDialogGlobal::retranslate
+@@ -98,7 +98,7 @@ void UISettingsDialogGlobal::retranslate
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Update page: */
@@ -59,7 +56,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif
/* Language page: */
-@@ -110,7 +110,7 @@ void UISettingsDialogGlobal::retranslate
+@@ -109,7 +109,7 @@ void UISettingsDialogGlobal::retranslate
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Proxy page: */
@@ -68,7 +65,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif
#ifdef VBOX_WS_WIN
-@@ -226,14 +226,14 @@ void UISettingsDialogGlobal::prepare()
+@@ -219,14 +219,14 @@ void UISettingsDialogGlobal::prepare()
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Update page: */
@@ -85,7 +82,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
/* Language page: */
case GlobalSettingsPageType_Language:
-@@ -255,14 +255,14 @@ void UISettingsDialogGlobal::prepare()
+@@ -248,14 +248,14 @@ void UISettingsDialogGlobal::prepare()
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Proxy page: */
diff --git a/srcpkgs/virtualbox-ose/patches/050-fix-include.patch b/srcpkgs/virtualbox-ose/patches/050-fix-include.patch
deleted file mode 100644
index f6f3e115dba3b1..00000000000000
--- a/srcpkgs/virtualbox-ose/patches/050-fix-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: virtualbox-ose-7.0.4/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-===================================================================
---- virtualbox-ose-7.0.4.orig/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-+++ virtualbox-ose-7.0.4/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-@@ -32,6 +32,7 @@
- #endif
-
- /* Qt includes: */
-+#include <QObject>
- #include <QPointer>
- #include <QUrl>
-
diff --git a/srcpkgs/virtualbox-ose/patches/052-xml.patch b/srcpkgs/virtualbox-ose/patches/052-xml.patch
deleted file mode 100644
index 81f93ba7a5ebb7..00000000000000
--- a/srcpkgs/virtualbox-ose/patches/052-xml.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-Fix ftbfs
-From: nezos@hotmail.com
---- a/doc/manual/en_US/user_VBoxManage.xml
-+++ b/doc/manual/en_US/user_VBoxManage.xml
-@@ -242,107 +242,107 @@ Settings file: '/home/username/.config/V
- on your particular host.
- </para>
-
-- <xi:include href="overview_man_VBoxManage-common.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-common.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-list.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-list.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-showvminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-showvminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-registervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-registervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-unregistervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-unregistervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-createvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-createvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifyvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifyvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-clonevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-clonevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-movevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-movevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-encryptvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-encryptvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-cloud.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-cloud.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-cloudprofile.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-cloudprofile.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-import.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-import.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-export.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-export.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-signova.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-signova.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-startvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-startvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-controlvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-controlvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-unattended.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-unattended.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-discardstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-discardstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-adoptstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-adoptstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-snapshot.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-snapshot.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-closemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-closemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-storageattach.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-storageattach.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-storagectl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-storagectl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-bandwidthctl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-bandwidthctl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-createmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-createmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifymedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifymedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-clonemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-clonemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-encryptmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-encryptmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-mediumio.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-mediumio.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-setextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-setextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-getextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-getextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-setproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-setproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-usbfilter.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-usbfilter.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-sharedfolder.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-sharedfolder.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-guestproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-guestproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-guestcontrol.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-guestcontrol.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-debugvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-debugvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-metrics.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-metrics.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-natnetwork.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-natnetwork.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-hostonlyif.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-hostonlyif.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-hostonlynet.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-hostonlynet.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-dhcpserver.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-dhcpserver.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-usbdevsource.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-usbdevsource.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-extpack.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-extpack.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-updatecheck.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-updatecheck.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifynvram.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifynvram.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
- <para>
- Each time <command>VBoxManage</command> is invoked, only one
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 8eda04269d1516..aa133fbedba3b5 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
-version=7.0.20
+version=7.1.4
revision=1
short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -8,21 +8,22 @@ license="GPL-2.0-only, CDDL-1.0"
homepage="https://www.virtualbox.org"
changelog="https://www.virtualbox.org/wiki/Changelog"
distfiles="http://download.virtualbox.org/virtualbox/${version%[a-z]*}/VirtualBox-${version}.tar.bz2"
-checksum=5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02
+checksum=872e7a42b41f8558abbf887f1bdc7aac932bb88b2764d07cbce270cab57e3b5e
nopie=yes
lib32disabled=yes
archs="x86_64"
-hostmakedepends="acpica-utils dev86 perl pkg-config qt5-tools tar yasm which glslang
+hostmakedepends="acpica-utils dev86 perl pkg-config qt6-tools tar yasm which glslang
vulkan-loader"
makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel
- libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt5-tools-devel
- libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt5-x11extras-devel
- SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel qt5-devel
+ libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt6-tools-devel
+ libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt6-scxml-devel
+ SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel
openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel
libglvnd-devel libX11-devel libXt-devel libXcursor-devel pam-devel vde2-devel SDL2-devel
- SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
+ SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel
+ qt6-base-devel"
if [ "$XBPS_MACHINE" = "x86_64" ]; then
makedepends+=" gcc-multilib"
@@ -80,7 +81,7 @@ do_install() {
install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp \
VBoxBugReport VBoxCpuReport VBoxDTrace vboximg-mount \
VBoxVolInfo xpidl \
- VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest \
+ VBoxBalloonCtrl vboxwebsrv webtest \
-t ${DESTDIR}/usr/lib/virtualbox
# locales
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (6 preceding siblings ...)
2024-12-26 4:09 ` [PR PATCH] [Updated] " Vinfall
@ 2024-12-26 4:11 ` Vinfall
2025-01-05 11:34 ` [PR REVIEW] " return42
` (22 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2024-12-26 4:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 240 bytes --]
New comment by Vinfall on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#issuecomment-2562135065
Comment:
Rebuild against Qt6.8 fixed previous (upstream) dark mode bug, so all issues are solved right now.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (7 preceding siblings ...)
2024-12-26 4:11 ` Vinfall
@ 2025-01-05 11:34 ` return42
2025-01-05 23:22 ` classabbyamp
` (21 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: return42 @ 2025-01-05 11:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 529 bytes --]
New review comment by return42 on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#discussion_r1903251498
Comment:
Is it really necessary even with vbox 7.1.4? ... I'm not sure how, but in ArchLinux they don't need this kernel parameter --> https://bbs.archlinux.org/viewtopic.php?pid=2210067#p2210067
FYI: voidlinux has been upgraded to kernel 6.12 and virtualbox-ose-7.0.20_1 does not work any longer .. I opened a bug report:
- https://github.com/void-linux/void-packages/issues/53855
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (8 preceding siblings ...)
2025-01-05 11:34 ` [PR REVIEW] " return42
@ 2025-01-05 23:22 ` classabbyamp
2025-01-05 23:23 ` classabbyamp
` (20 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: classabbyamp @ 2025-01-05 23:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 288 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#discussion_r1903359571
Comment:
they add a modprobe.d file for it: https://gitlab.archlinux.org/archlinux/packaging/packages/virtualbox/-/blob/main/virtualbox.modprobe
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (9 preceding siblings ...)
2025-01-05 23:22 ` classabbyamp
@ 2025-01-05 23:23 ` classabbyamp
2025-01-06 6:26 ` Vinfall
` (19 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: classabbyamp @ 2025-01-05 23:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#discussion_r1903359713
Comment:
is python3-devel needed if we're configuring with --disable-python on line 40?
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (10 preceding siblings ...)
2025-01-05 23:23 ` classabbyamp
@ 2025-01-06 6:26 ` Vinfall
2025-01-06 6:27 ` Vinfall
` (18 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2025-01-06 6:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
New review comment by Vinfall on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#discussion_r1903724423
Comment:
It's definitely necessary. But I'd rather keep it opt-out by default (i.e. manually adding the parameter by the user itself) than making QEMU/KVM buddy annoyed for breaking the exciting new kernel behavior.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (11 preceding siblings ...)
2025-01-06 6:26 ` Vinfall
@ 2025-01-06 6:27 ` Vinfall
2025-01-06 6:28 ` [PR PATCH] [Updated] " Vinfall
` (17 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2025-01-06 6:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New review comment by Vinfall on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#discussion_r1903725215
Comment:
Removing it from makedepends and recompiled packages test local checks indeed. I'll remove it.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (12 preceding siblings ...)
2025-01-06 6:27 ` Vinfall
@ 2025-01-06 6:28 ` Vinfall
2025-01-06 6:41 ` Vinfall
` (16 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2025-01-06 6:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1679 bytes --]
There is an updated pull request by Vinfall against master on the void-packages repository
https://github.com/Vinfall/void-packages virtualbox-ose-update
https://github.com/void-linux/void-packages/pull/52910
virtualbox-ose: update to 7.1.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
- Checks passed locally
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
#### Notes
- 015-no-update.patch is updated by myself, just trivial change, deleted patches are no longer needed
- adjusted template as vbox 7.1 is based on Qt6 now. As there is no `qt6-devel` package, I choose a larger `qt6-base-devel` in makedepends. Please let me know if there is a better option. `setuid` change is taken from [Artix](https://gitea.artixlinux.org/packages/virtualbox/commit/a349e60d4475af1623821689696814b294cad618#diff-9b9baac1eb9b72790eef5540a1685306fc43fd6c)
- Works quite well and tested for months.
A patch file from https://github.com/void-linux/void-packages/pull/52910.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-virtualbox-ose-update-52910.patch --]
[-- Type: text/x-diff, Size: 24784 bytes --]
From 73b5e4659eee37d930a9cd298a8ac279c9256b12 Mon Sep 17 00:00:00 2001
From: Vinfall <neptuniah@riseup.net>
Date: Thu, 12 Sep 2024 10:05:40 +0800
Subject: [PATCH] virtualbox-ose: update to 7.1.4.
---
srcpkgs/virtualbox-ose/INSTALL.msg | 5 +
.../patches/015-no-update.patch | 45 +++--
.../patches/050-fix-include.patch | 12 --
srcpkgs/virtualbox-ose/patches/052-xml.patch | 163 ------------------
srcpkgs/virtualbox-ose/template | 17 +-
5 files changed, 35 insertions(+), 207 deletions(-)
create mode 100644 srcpkgs/virtualbox-ose/INSTALL.msg
delete mode 100644 srcpkgs/virtualbox-ose/patches/050-fix-include.patch
delete mode 100644 srcpkgs/virtualbox-ose/patches/052-xml.patch
diff --git a/srcpkgs/virtualbox-ose/INSTALL.msg b/srcpkgs/virtualbox-ose/INSTALL.msg
new file mode 100644
index 00000000000000..816c2f7d1ce190
--- /dev/null
+++ b/srcpkgs/virtualbox-ose/INSTALL.msg
@@ -0,0 +1,5 @@
+In kernel 6.12, KVM initializes virtualization on module loading by default.
+This prevents VirtualBox VMs from starting.
+In order to avoid this, either add "kvm.enable_virt_at_load=0" parameter
+into kernel command line or unload corresponding kvm_XXX module.
+
diff --git a/srcpkgs/virtualbox-ose/patches/015-no-update.patch b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
index 12ee94908c9598..f4019330c30ae2 100644
--- a/srcpkgs/virtualbox-ose/patches/015-no-update.patch
+++ b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
@@ -1,27 +1,24 @@
-
+Adapted for VBox 7.1.0
Description: Disable "Check for Updates" action.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
---- a/doc/manual/en_US/user_Introduction.xml
-+++ b/doc/manual/en_US/user_Introduction.xml
-@@ -6090,14 +6090,14 @@
- <xref linkend="specialcharacters"/>.
- </para>
- </listitem>
--
+--- a/doc/manual/en_US/dita/topics/preferences.dita
++++ b/doc/manual/en_US/dita/topics/preferences.dita
+@@ -31,11 +31,13 @@
+ <li>
+ <p><b outputclass="bold">Input.</b> Enables you to specify keyboard shortcuts, both in <ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/> and in individual VMs. For example you might want to specify a different <b outputclass="bold">Host key</b>. This is the key that toggles whether the cursor is in the focus of the VM or the Host OS windows, see <xref href="keyb_mouse_normal.dita#keyb_mouse_normal"/>. The Host key is also used to trigger certain VM actions, see <xref href="specialcharacters.dita#specialcharacters"/>. </p>
+ </li>
+ <!--
- <listitem>
- <para>
- <emphasis role="bold">Update.</emphasis> Enables you to
+ <li>
+ <p><b outputclass="bold">Update.</b> Enables you to
specify various settings for Automatic Updates.
- </para>
- </listitem>
--
+ </p>
+ </li>
+ -->
- <listitem>
- <para>
- <emphasis role="bold">Language.</emphasis> Enables you to
+ <li>
+ <p><b outputclass="bold">Language.</b> Enables you to specify the language used for menus, labels, and text in
+ <ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/>. </p>
--- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
@@ -2421,7 +2421,7 @@ QString UIExtraDataManager::preventBetaB
@@ -33,9 +30,9 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
}
QString UIExtraDataManager::applicationUpdateData()
---- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-@@ -47,10 +47,10 @@
+--- a/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
+@@ -49,10 +49,10 @@
#ifdef VBOX_WS_WIN
# include "UIGlobalSettingsInterface.h"
#endif
@@ -50,7 +47,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
/* GUI includes: Machine Settings: */
#include "UIMachineSettingsAudio.h"
-@@ -99,7 +99,7 @@ void UISettingsDialogGlobal::retranslate
+@@ -98,7 +98,7 @@ void UISettingsDialogGlobal::retranslate
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Update page: */
@@ -59,7 +56,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif
/* Language page: */
-@@ -110,7 +110,7 @@ void UISettingsDialogGlobal::retranslate
+@@ -109,7 +109,7 @@ void UISettingsDialogGlobal::retranslate
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Proxy page: */
@@ -68,7 +65,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif
#ifdef VBOX_WS_WIN
-@@ -226,14 +226,14 @@ void UISettingsDialogGlobal::prepare()
+@@ -219,14 +219,14 @@ void UISettingsDialogGlobal::prepare()
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Update page: */
@@ -85,7 +82,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
/* Language page: */
case GlobalSettingsPageType_Language:
-@@ -255,14 +255,14 @@ void UISettingsDialogGlobal::prepare()
+@@ -248,14 +248,14 @@ void UISettingsDialogGlobal::prepare()
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Proxy page: */
diff --git a/srcpkgs/virtualbox-ose/patches/050-fix-include.patch b/srcpkgs/virtualbox-ose/patches/050-fix-include.patch
deleted file mode 100644
index f6f3e115dba3b1..00000000000000
--- a/srcpkgs/virtualbox-ose/patches/050-fix-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: virtualbox-ose-7.0.4/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-===================================================================
---- virtualbox-ose-7.0.4.orig/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-+++ virtualbox-ose-7.0.4/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-@@ -32,6 +32,7 @@
- #endif
-
- /* Qt includes: */
-+#include <QObject>
- #include <QPointer>
- #include <QUrl>
-
diff --git a/srcpkgs/virtualbox-ose/patches/052-xml.patch b/srcpkgs/virtualbox-ose/patches/052-xml.patch
deleted file mode 100644
index 81f93ba7a5ebb7..00000000000000
--- a/srcpkgs/virtualbox-ose/patches/052-xml.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-Fix ftbfs
-From: nezos@hotmail.com
---- a/doc/manual/en_US/user_VBoxManage.xml
-+++ b/doc/manual/en_US/user_VBoxManage.xml
-@@ -242,107 +242,107 @@ Settings file: '/home/username/.config/V
- on your particular host.
- </para>
-
-- <xi:include href="overview_man_VBoxManage-common.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-common.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-list.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-list.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-showvminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-showvminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-registervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-registervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-unregistervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-unregistervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-createvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-createvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifyvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifyvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-clonevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-clonevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-movevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-movevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-encryptvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-encryptvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-cloud.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-cloud.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-cloudprofile.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-cloudprofile.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-import.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-import.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-export.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-export.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-signova.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-signova.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-startvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-startvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-controlvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-controlvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-unattended.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-unattended.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-discardstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-discardstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-adoptstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-adoptstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-snapshot.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-snapshot.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-closemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-closemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-storageattach.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-storageattach.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-storagectl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-storagectl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-bandwidthctl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-bandwidthctl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-createmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-createmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifymedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifymedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-clonemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-clonemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-encryptmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-encryptmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-mediumio.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-mediumio.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-setextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-setextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-getextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-getextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-setproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-setproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-usbfilter.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-usbfilter.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-sharedfolder.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-sharedfolder.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-guestproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-guestproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-guestcontrol.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-guestcontrol.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-debugvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-debugvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-metrics.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-metrics.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-natnetwork.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-natnetwork.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-hostonlyif.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-hostonlyif.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-hostonlynet.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-hostonlynet.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-dhcpserver.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-dhcpserver.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-usbdevsource.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-usbdevsource.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-extpack.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-extpack.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-updatecheck.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-updatecheck.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifynvram.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifynvram.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
- <para>
- Each time <command>VBoxManage</command> is invoked, only one
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 8eda04269d1516..062e573d705b98 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
-version=7.0.20
+version=7.1.4
revision=1
short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -8,21 +8,22 @@ license="GPL-2.0-only, CDDL-1.0"
homepage="https://www.virtualbox.org"
changelog="https://www.virtualbox.org/wiki/Changelog"
distfiles="http://download.virtualbox.org/virtualbox/${version%[a-z]*}/VirtualBox-${version}.tar.bz2"
-checksum=5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02
+checksum=872e7a42b41f8558abbf887f1bdc7aac932bb88b2764d07cbce270cab57e3b5e
nopie=yes
lib32disabled=yes
archs="x86_64"
-hostmakedepends="acpica-utils dev86 perl pkg-config qt5-tools tar yasm which glslang
+hostmakedepends="acpica-utils dev86 perl pkg-config qt6-tools tar yasm which glslang
vulkan-loader"
makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel
- libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt5-tools-devel
- libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt5-x11extras-devel
- SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel qt5-devel
+ libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt6-tools-devel
+ libXinerama-devel libxslt-devel opus-devel pam-devel qt6-scxml-devel
+ SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel
openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel
libglvnd-devel libX11-devel libXt-devel libXcursor-devel pam-devel vde2-devel SDL2-devel
- SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
+ SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel
+ qt6-base-devel"
if [ "$XBPS_MACHINE" = "x86_64" ]; then
makedepends+=" gcc-multilib"
@@ -80,7 +81,7 @@ do_install() {
install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp \
VBoxBugReport VBoxCpuReport VBoxDTrace vboximg-mount \
VBoxVolInfo xpidl \
- VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest \
+ VBoxBalloonCtrl vboxwebsrv webtest \
-t ${DESTDIR}/usr/lib/virtualbox
# locales
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (13 preceding siblings ...)
2025-01-06 6:28 ` [PR PATCH] [Updated] " Vinfall
@ 2025-01-06 6:41 ` Vinfall
2025-01-06 6:47 ` [PR REVIEW] " Vinfall
` (15 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2025-01-06 6:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1679 bytes --]
There is an updated pull request by Vinfall against master on the void-packages repository
https://github.com/Vinfall/void-packages virtualbox-ose-update
https://github.com/void-linux/void-packages/pull/52910
virtualbox-ose: update to 7.1.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
- Checks passed locally
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
#### Notes
- 015-no-update.patch is updated by myself, just trivial change, deleted patches are no longer needed
- adjusted template as vbox 7.1 is based on Qt6 now. As there is no `qt6-devel` package, I choose a larger `qt6-base-devel` in makedepends. Please let me know if there is a better option. `setuid` change is taken from [Artix](https://gitea.artixlinux.org/packages/virtualbox/commit/a349e60d4475af1623821689696814b294cad618#diff-9b9baac1eb9b72790eef5540a1685306fc43fd6c)
- Works quite well and tested for months.
A patch file from https://github.com/void-linux/void-packages/pull/52910.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-virtualbox-ose-update-52910.patch --]
[-- Type: text/x-diff, Size: 24626 bytes --]
From 2078c9238a8ed1acf2248e62d0cd83ea7b9c75c2 Mon Sep 17 00:00:00 2001
From: Vinfall <neptuniah@riseup.net>
Date: Thu, 12 Sep 2024 10:05:40 +0800
Subject: [PATCH] virtualbox-ose: update to 7.1.4.
---
srcpkgs/virtualbox-ose/INSTALL.msg | 5 +
.../patches/015-no-update.patch | 45 +++--
.../patches/050-fix-include.patch | 12 --
srcpkgs/virtualbox-ose/patches/052-xml.patch | 163 ------------------
srcpkgs/virtualbox-ose/template | 14 +-
5 files changed, 33 insertions(+), 206 deletions(-)
create mode 100644 srcpkgs/virtualbox-ose/INSTALL.msg
delete mode 100644 srcpkgs/virtualbox-ose/patches/050-fix-include.patch
delete mode 100644 srcpkgs/virtualbox-ose/patches/052-xml.patch
diff --git a/srcpkgs/virtualbox-ose/INSTALL.msg b/srcpkgs/virtualbox-ose/INSTALL.msg
new file mode 100644
index 00000000000000..816c2f7d1ce190
--- /dev/null
+++ b/srcpkgs/virtualbox-ose/INSTALL.msg
@@ -0,0 +1,5 @@
+In kernel 6.12, KVM initializes virtualization on module loading by default.
+This prevents VirtualBox VMs from starting.
+In order to avoid this, either add "kvm.enable_virt_at_load=0" parameter
+into kernel command line or unload corresponding kvm_XXX module.
+
diff --git a/srcpkgs/virtualbox-ose/patches/015-no-update.patch b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
index 12ee94908c9598..f4019330c30ae2 100644
--- a/srcpkgs/virtualbox-ose/patches/015-no-update.patch
+++ b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
@@ -1,27 +1,24 @@
-
+Adapted for VBox 7.1.0
Description: Disable "Check for Updates" action.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
---- a/doc/manual/en_US/user_Introduction.xml
-+++ b/doc/manual/en_US/user_Introduction.xml
-@@ -6090,14 +6090,14 @@
- <xref linkend="specialcharacters"/>.
- </para>
- </listitem>
--
+--- a/doc/manual/en_US/dita/topics/preferences.dita
++++ b/doc/manual/en_US/dita/topics/preferences.dita
+@@ -31,11 +31,13 @@
+ <li>
+ <p><b outputclass="bold">Input.</b> Enables you to specify keyboard shortcuts, both in <ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/> and in individual VMs. For example you might want to specify a different <b outputclass="bold">Host key</b>. This is the key that toggles whether the cursor is in the focus of the VM or the Host OS windows, see <xref href="keyb_mouse_normal.dita#keyb_mouse_normal"/>. The Host key is also used to trigger certain VM actions, see <xref href="specialcharacters.dita#specialcharacters"/>. </p>
+ </li>
+ <!--
- <listitem>
- <para>
- <emphasis role="bold">Update.</emphasis> Enables you to
+ <li>
+ <p><b outputclass="bold">Update.</b> Enables you to
specify various settings for Automatic Updates.
- </para>
- </listitem>
--
+ </p>
+ </li>
+ -->
- <listitem>
- <para>
- <emphasis role="bold">Language.</emphasis> Enables you to
+ <li>
+ <p><b outputclass="bold">Language.</b> Enables you to specify the language used for menus, labels, and text in
+ <ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/>. </p>
--- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
@@ -2421,7 +2421,7 @@ QString UIExtraDataManager::preventBetaB
@@ -33,9 +30,9 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
}
QString UIExtraDataManager::applicationUpdateData()
---- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-@@ -47,10 +47,10 @@
+--- a/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
+@@ -49,10 +49,10 @@
#ifdef VBOX_WS_WIN
# include "UIGlobalSettingsInterface.h"
#endif
@@ -50,7 +47,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
/* GUI includes: Machine Settings: */
#include "UIMachineSettingsAudio.h"
-@@ -99,7 +99,7 @@ void UISettingsDialogGlobal::retranslate
+@@ -98,7 +98,7 @@ void UISettingsDialogGlobal::retranslate
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Update page: */
@@ -59,7 +56,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif
/* Language page: */
-@@ -110,7 +110,7 @@ void UISettingsDialogGlobal::retranslate
+@@ -109,7 +109,7 @@ void UISettingsDialogGlobal::retranslate
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Proxy page: */
@@ -68,7 +65,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif
#ifdef VBOX_WS_WIN
-@@ -226,14 +226,14 @@ void UISettingsDialogGlobal::prepare()
+@@ -219,14 +219,14 @@ void UISettingsDialogGlobal::prepare()
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Update page: */
@@ -85,7 +82,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
/* Language page: */
case GlobalSettingsPageType_Language:
-@@ -255,14 +255,14 @@ void UISettingsDialogGlobal::prepare()
+@@ -248,14 +248,14 @@ void UISettingsDialogGlobal::prepare()
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Proxy page: */
diff --git a/srcpkgs/virtualbox-ose/patches/050-fix-include.patch b/srcpkgs/virtualbox-ose/patches/050-fix-include.patch
deleted file mode 100644
index f6f3e115dba3b1..00000000000000
--- a/srcpkgs/virtualbox-ose/patches/050-fix-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: virtualbox-ose-7.0.4/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-===================================================================
---- virtualbox-ose-7.0.4.orig/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-+++ virtualbox-ose-7.0.4/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-@@ -32,6 +32,7 @@
- #endif
-
- /* Qt includes: */
-+#include <QObject>
- #include <QPointer>
- #include <QUrl>
-
diff --git a/srcpkgs/virtualbox-ose/patches/052-xml.patch b/srcpkgs/virtualbox-ose/patches/052-xml.patch
deleted file mode 100644
index 81f93ba7a5ebb7..00000000000000
--- a/srcpkgs/virtualbox-ose/patches/052-xml.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-Fix ftbfs
-From: nezos@hotmail.com
---- a/doc/manual/en_US/user_VBoxManage.xml
-+++ b/doc/manual/en_US/user_VBoxManage.xml
-@@ -242,107 +242,107 @@ Settings file: '/home/username/.config/V
- on your particular host.
- </para>
-
-- <xi:include href="overview_man_VBoxManage-common.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-common.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-list.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-list.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-showvminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-showvminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-registervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-registervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-unregistervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-unregistervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-createvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-createvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifyvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifyvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-clonevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-clonevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-movevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-movevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-encryptvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-encryptvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-cloud.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-cloud.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-cloudprofile.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-cloudprofile.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-import.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-import.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-export.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-export.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-signova.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-signova.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-startvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-startvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-controlvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-controlvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-unattended.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-unattended.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-discardstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-discardstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-adoptstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-adoptstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-snapshot.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-snapshot.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-closemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-closemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-storageattach.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-storageattach.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-storagectl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-storagectl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-bandwidthctl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-bandwidthctl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-createmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-createmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifymedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifymedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-clonemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-clonemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-encryptmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-encryptmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-mediumio.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-mediumio.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-setextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-setextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-getextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-getextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-setproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-setproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-usbfilter.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-usbfilter.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-sharedfolder.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-sharedfolder.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-guestproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-guestproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-guestcontrol.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-guestcontrol.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-debugvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-debugvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-metrics.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-metrics.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-natnetwork.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-natnetwork.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-hostonlyif.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-hostonlyif.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-hostonlynet.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-hostonlynet.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-dhcpserver.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-dhcpserver.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-usbdevsource.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-usbdevsource.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-extpack.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-extpack.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-updatecheck.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-updatecheck.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifynvram.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifynvram.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
- <para>
- Each time <command>VBoxManage</command> is invoked, only one
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 8eda04269d1516..6981d6ce688961 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
-version=7.0.20
+version=7.1.4
revision=1
short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -8,18 +8,18 @@ license="GPL-2.0-only, CDDL-1.0"
homepage="https://www.virtualbox.org"
changelog="https://www.virtualbox.org/wiki/Changelog"
distfiles="http://download.virtualbox.org/virtualbox/${version%[a-z]*}/VirtualBox-${version}.tar.bz2"
-checksum=5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02
+checksum=872e7a42b41f8558abbf887f1bdc7aac932bb88b2764d07cbce270cab57e3b5e
nopie=yes
lib32disabled=yes
archs="x86_64"
-hostmakedepends="acpica-utils dev86 perl pkg-config qt5-tools tar yasm which glslang
+hostmakedepends="acpica-utils dev86 perl pkg-config qt6-tools tar yasm which glslang
vulkan-loader"
makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel
- libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt5-tools-devel
- libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt5-x11extras-devel
- SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel qt5-devel
+ libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt6-tools-devel
+ libXinerama-devel libxslt-devel opus-devel pam-devel qt6-base-devel qt6-scxml-devel
+ SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel
openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel
libglvnd-devel libX11-devel libXt-devel libXcursor-devel pam-devel vde2-devel SDL2-devel
SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
@@ -80,7 +80,7 @@ do_install() {
install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp \
VBoxBugReport VBoxCpuReport VBoxDTrace vboximg-mount \
VBoxVolInfo xpidl \
- VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest \
+ VBoxBalloonCtrl vboxwebsrv webtest \
-t ${DESTDIR}/usr/lib/virtualbox
# locales
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (14 preceding siblings ...)
2025-01-06 6:41 ` Vinfall
@ 2025-01-06 6:47 ` Vinfall
2025-01-06 6:55 ` return42
` (14 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2025-01-06 6:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
New review comment by Vinfall on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#discussion_r1903725215
Comment:
After removing it from makedepends, recompiled packages passed local checks indeed. I'll remove it.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (15 preceding siblings ...)
2025-01-06 6:47 ` [PR REVIEW] " Vinfall
@ 2025-01-06 6:55 ` return42
2025-01-06 17:24 ` classabbyamp
` (13 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: return42 @ 2025-01-06 6:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 208 bytes --]
New review comment by return42 on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#discussion_r1903744631
Comment:
@Vinfall @classabbyamp thanks a lot for clarification :+1:
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (16 preceding siblings ...)
2025-01-06 6:55 ` return42
@ 2025-01-06 17:24 ` classabbyamp
2025-01-07 2:53 ` [PR PATCH] [Updated] " Vinfall
` (12 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: classabbyamp @ 2025-01-06 17:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 300 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#discussion_r1904432557
Comment:
kernels 6.11 and lower will ignore this option because it was added new. let's also ship a modprobe.d file for this instead of the install message.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (17 preceding siblings ...)
2025-01-06 17:24 ` classabbyamp
@ 2025-01-07 2:53 ` Vinfall
2025-01-07 2:59 ` [PR REVIEW] " Vinfall
` (11 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2025-01-07 2:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1679 bytes --]
There is an updated pull request by Vinfall against master on the void-packages repository
https://github.com/Vinfall/void-packages virtualbox-ose-update
https://github.com/void-linux/void-packages/pull/52910
virtualbox-ose: update to 7.1.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
- Checks passed locally
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
#### Notes
- 015-no-update.patch is updated by myself, just trivial change, deleted patches are no longer needed
- adjusted template as vbox 7.1 is based on Qt6 now. As there is no `qt6-devel` package, I choose a larger `qt6-base-devel` in makedepends. Please let me know if there is a better option. `setuid` change is taken from [Artix](https://gitea.artixlinux.org/packages/virtualbox/commit/a349e60d4475af1623821689696814b294cad618#diff-9b9baac1eb9b72790eef5540a1685306fc43fd6c)
- Works quite well and tested for months.
A patch file from https://github.com/void-linux/void-packages/pull/52910.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-virtualbox-ose-update-52910.patch --]
[-- Type: text/x-diff, Size: 24822 bytes --]
From 81d7a0a78555a58a2aeece9fb908eb8d3682f430 Mon Sep 17 00:00:00 2001
From: Vinfall <neptuniah@riseup.net>
Date: Thu, 12 Sep 2024 10:05:40 +0800
Subject: [PATCH] virtualbox-ose: update to 7.1.4.
---
.../virtualbox-ose/files/virtualbox.modprobe | 3 +
.../patches/015-no-update.patch | 45 +++--
.../patches/050-fix-include.patch | 12 --
srcpkgs/virtualbox-ose/patches/052-xml.patch | 163 ------------------
srcpkgs/virtualbox-ose/template | 16 +-
5 files changed, 33 insertions(+), 206 deletions(-)
create mode 100644 srcpkgs/virtualbox-ose/files/virtualbox.modprobe
delete mode 100644 srcpkgs/virtualbox-ose/patches/050-fix-include.patch
delete mode 100644 srcpkgs/virtualbox-ose/patches/052-xml.patch
diff --git a/srcpkgs/virtualbox-ose/files/virtualbox.modprobe b/srcpkgs/virtualbox-ose/files/virtualbox.modprobe
new file mode 100644
index 00000000000000..cbfc5b2cca726f
--- /dev/null
+++ b/srcpkgs/virtualbox-ose/files/virtualbox.modprobe
@@ -0,0 +1,3 @@
+# For kernel 6.12+, KVM initializes virtualization on module loading.
+# Disable this behavior to run VirtualBox VMs.
+options kvm enable_virt_at_load=0
diff --git a/srcpkgs/virtualbox-ose/patches/015-no-update.patch b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
index 12ee94908c9598..f4019330c30ae2 100644
--- a/srcpkgs/virtualbox-ose/patches/015-no-update.patch
+++ b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
@@ -1,27 +1,24 @@
-
+Adapted for VBox 7.1.0
Description: Disable "Check for Updates" action.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
---- a/doc/manual/en_US/user_Introduction.xml
-+++ b/doc/manual/en_US/user_Introduction.xml
-@@ -6090,14 +6090,14 @@
- <xref linkend="specialcharacters"/>.
- </para>
- </listitem>
--
+--- a/doc/manual/en_US/dita/topics/preferences.dita
++++ b/doc/manual/en_US/dita/topics/preferences.dita
+@@ -31,11 +31,13 @@
+ <li>
+ <p><b outputclass="bold">Input.</b> Enables you to specify keyboard shortcuts, both in <ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/> and in individual VMs. For example you might want to specify a different <b outputclass="bold">Host key</b>. This is the key that toggles whether the cursor is in the focus of the VM or the Host OS windows, see <xref href="keyb_mouse_normal.dita#keyb_mouse_normal"/>. The Host key is also used to trigger certain VM actions, see <xref href="specialcharacters.dita#specialcharacters"/>. </p>
+ </li>
+ <!--
- <listitem>
- <para>
- <emphasis role="bold">Update.</emphasis> Enables you to
+ <li>
+ <p><b outputclass="bold">Update.</b> Enables you to
specify various settings for Automatic Updates.
- </para>
- </listitem>
--
+ </p>
+ </li>
+ -->
- <listitem>
- <para>
- <emphasis role="bold">Language.</emphasis> Enables you to
+ <li>
+ <p><b outputclass="bold">Language.</b> Enables you to specify the language used for menus, labels, and text in
+ <ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/>. </p>
--- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
@@ -2421,7 +2421,7 @@ QString UIExtraDataManager::preventBetaB
@@ -33,9 +30,9 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
}
QString UIExtraDataManager::applicationUpdateData()
---- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-@@ -47,10 +47,10 @@
+--- a/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
+@@ -49,10 +49,10 @@
#ifdef VBOX_WS_WIN
# include "UIGlobalSettingsInterface.h"
#endif
@@ -50,7 +47,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
/* GUI includes: Machine Settings: */
#include "UIMachineSettingsAudio.h"
-@@ -99,7 +99,7 @@ void UISettingsDialogGlobal::retranslate
+@@ -98,7 +98,7 @@ void UISettingsDialogGlobal::retranslate
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Update page: */
@@ -59,7 +56,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif
/* Language page: */
-@@ -110,7 +110,7 @@ void UISettingsDialogGlobal::retranslate
+@@ -109,7 +109,7 @@ void UISettingsDialogGlobal::retranslate
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Proxy page: */
@@ -68,7 +65,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif
#ifdef VBOX_WS_WIN
-@@ -226,14 +226,14 @@ void UISettingsDialogGlobal::prepare()
+@@ -219,14 +219,14 @@ void UISettingsDialogGlobal::prepare()
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Update page: */
@@ -85,7 +82,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
/* Language page: */
case GlobalSettingsPageType_Language:
-@@ -255,14 +255,14 @@ void UISettingsDialogGlobal::prepare()
+@@ -248,14 +248,14 @@ void UISettingsDialogGlobal::prepare()
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Proxy page: */
diff --git a/srcpkgs/virtualbox-ose/patches/050-fix-include.patch b/srcpkgs/virtualbox-ose/patches/050-fix-include.patch
deleted file mode 100644
index f6f3e115dba3b1..00000000000000
--- a/srcpkgs/virtualbox-ose/patches/050-fix-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: virtualbox-ose-7.0.4/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-===================================================================
---- virtualbox-ose-7.0.4.orig/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-+++ virtualbox-ose-7.0.4/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-@@ -32,6 +32,7 @@
- #endif
-
- /* Qt includes: */
-+#include <QObject>
- #include <QPointer>
- #include <QUrl>
-
diff --git a/srcpkgs/virtualbox-ose/patches/052-xml.patch b/srcpkgs/virtualbox-ose/patches/052-xml.patch
deleted file mode 100644
index 81f93ba7a5ebb7..00000000000000
--- a/srcpkgs/virtualbox-ose/patches/052-xml.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-Fix ftbfs
-From: nezos@hotmail.com
---- a/doc/manual/en_US/user_VBoxManage.xml
-+++ b/doc/manual/en_US/user_VBoxManage.xml
-@@ -242,107 +242,107 @@ Settings file: '/home/username/.config/V
- on your particular host.
- </para>
-
-- <xi:include href="overview_man_VBoxManage-common.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-common.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-list.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-list.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-showvminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-showvminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-registervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-registervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-unregistervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-unregistervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-createvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-createvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifyvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifyvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-clonevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-clonevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-movevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-movevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-encryptvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-encryptvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-cloud.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-cloud.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-cloudprofile.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-cloudprofile.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-import.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-import.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-export.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-export.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-signova.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-signova.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-startvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-startvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-controlvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-controlvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-unattended.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-unattended.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-discardstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-discardstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-adoptstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-adoptstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-snapshot.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-snapshot.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-closemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-closemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-storageattach.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-storageattach.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-storagectl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-storagectl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-bandwidthctl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-bandwidthctl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-createmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-createmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifymedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifymedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-clonemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-clonemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-encryptmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-encryptmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-mediumio.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-mediumio.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-setextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-setextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-getextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-getextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-setproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-setproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-usbfilter.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-usbfilter.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-sharedfolder.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-sharedfolder.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-guestproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-guestproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-guestcontrol.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-guestcontrol.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-debugvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-debugvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-metrics.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-metrics.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-natnetwork.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-natnetwork.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-hostonlyif.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-hostonlyif.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-hostonlynet.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-hostonlynet.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-dhcpserver.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-dhcpserver.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-usbdevsource.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-usbdevsource.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-extpack.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-extpack.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-updatecheck.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-updatecheck.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifynvram.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifynvram.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
- <para>
- Each time <command>VBoxManage</command> is invoked, only one
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 8eda04269d1516..45ee9a22248ad1 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
-version=7.0.20
+version=7.1.4
revision=1
short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -8,18 +8,18 @@ license="GPL-2.0-only, CDDL-1.0"
homepage="https://www.virtualbox.org"
changelog="https://www.virtualbox.org/wiki/Changelog"
distfiles="http://download.virtualbox.org/virtualbox/${version%[a-z]*}/VirtualBox-${version}.tar.bz2"
-checksum=5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02
+checksum=872e7a42b41f8558abbf887f1bdc7aac932bb88b2764d07cbce270cab57e3b5e
nopie=yes
lib32disabled=yes
archs="x86_64"
-hostmakedepends="acpica-utils dev86 perl pkg-config qt5-tools tar yasm which glslang
+hostmakedepends="acpica-utils dev86 perl pkg-config qt6-tools tar yasm which glslang
vulkan-loader"
makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel
- libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt5-tools-devel
- libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt5-x11extras-devel
- SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel qt5-devel
+ libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt6-tools-devel
+ libXinerama-devel libxslt-devel opus-devel pam-devel qt6-base-devel qt6-scxml-devel
+ SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel
openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel
libglvnd-devel libX11-devel libXt-devel libXcursor-devel pam-devel vde2-devel SDL2-devel
SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
@@ -80,7 +80,7 @@ do_install() {
install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp \
VBoxBugReport VBoxCpuReport VBoxDTrace vboximg-mount \
VBoxVolInfo xpidl \
- VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest \
+ VBoxBalloonCtrl vboxwebsrv webtest \
-t ${DESTDIR}/usr/lib/virtualbox
# locales
@@ -112,6 +112,8 @@ do_install() {
# Install modules-load.d file.
vinstall ${FILESDIR}/virtualbox.conf 644 usr/lib/modules-load.d
+ vinstall ${FILESDIR}/virtualbox.modprobe 644 \
+ ${DESTDIR}/etc/modprobe.d/virtualbox.conf
vsv vboxwebsrv
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (18 preceding siblings ...)
2025-01-07 2:53 ` [PR PATCH] [Updated] " Vinfall
@ 2025-01-07 2:59 ` Vinfall
2025-01-07 4:05 ` classabbyamp
` (10 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2025-01-07 2:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 487 bytes --]
New review comment by Vinfall on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#discussion_r1904845901
Comment:
Adjusted, but I'm not sure if `do_install` is the right place for that. The docs and existing templates have no such case (modprobe) for my reference. Vbox template is also a bit complicated.
Btw I'm still against it as this makes the kernel behave differently than upstream and I am going to be one of the annoyed QEMU/KVM buddy now...
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (19 preceding siblings ...)
2025-01-07 2:59 ` [PR REVIEW] " Vinfall
@ 2025-01-07 4:05 ` classabbyamp
2025-01-07 4:06 ` classabbyamp
` (9 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: classabbyamp @ 2025-01-07 4:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 370 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#discussion_r1904880626
Comment:
```suggestion
vinstall ${FILESDIR}/virtualbox.modprobe 644 usr/lib/modprobe.d virtualbox.conf
```
package should install to `/usr/lib`, `/etc` is for local admin
also, the syntax for `vinstall` was slightly off
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (20 preceding siblings ...)
2025-01-07 4:05 ` classabbyamp
@ 2025-01-07 4:06 ` classabbyamp
2025-01-07 6:58 ` [PR PATCH] [Updated] " Vinfall
` (8 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: classabbyamp @ 2025-01-07 4:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 188 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#discussion_r1904881017
Comment:
it just makes it behave like <=6.11
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Updated] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (21 preceding siblings ...)
2025-01-07 4:06 ` classabbyamp
@ 2025-01-07 6:58 ` Vinfall
2025-01-07 7:02 ` [PR REVIEW] " Vinfall
` (7 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2025-01-07 6:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1679 bytes --]
There is an updated pull request by Vinfall against master on the void-packages repository
https://github.com/Vinfall/void-packages virtualbox-ose-update
https://github.com/void-linux/void-packages/pull/52910
virtualbox-ose: update to 7.1.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
- Checks passed locally
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
#### Notes
- 015-no-update.patch is updated by myself, just trivial change, deleted patches are no longer needed
- adjusted template as vbox 7.1 is based on Qt6 now. As there is no `qt6-devel` package, I choose a larger `qt6-base-devel` in makedepends. Please let me know if there is a better option. `setuid` change is taken from [Artix](https://gitea.artixlinux.org/packages/virtualbox/commit/a349e60d4475af1623821689696814b294cad618#diff-9b9baac1eb9b72790eef5540a1685306fc43fd6c)
- Works quite well and tested for months.
A patch file from https://github.com/void-linux/void-packages/pull/52910.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-virtualbox-ose-update-52910.patch --]
[-- Type: text/x-diff, Size: 24810 bytes --]
From 9a46c5d12a7320b671d82ba2965df7f3b78f3456 Mon Sep 17 00:00:00 2001
From: Vinfall <neptuniah@riseup.net>
Date: Thu, 12 Sep 2024 10:05:40 +0800
Subject: [PATCH] virtualbox-ose: update to 7.1.4.
---
.../virtualbox-ose/files/virtualbox.modprobe | 3 +
.../patches/015-no-update.patch | 45 +++--
.../patches/050-fix-include.patch | 12 --
srcpkgs/virtualbox-ose/patches/052-xml.patch | 163 ------------------
srcpkgs/virtualbox-ose/template | 15 +-
5 files changed, 32 insertions(+), 206 deletions(-)
create mode 100644 srcpkgs/virtualbox-ose/files/virtualbox.modprobe
delete mode 100644 srcpkgs/virtualbox-ose/patches/050-fix-include.patch
delete mode 100644 srcpkgs/virtualbox-ose/patches/052-xml.patch
diff --git a/srcpkgs/virtualbox-ose/files/virtualbox.modprobe b/srcpkgs/virtualbox-ose/files/virtualbox.modprobe
new file mode 100644
index 00000000000000..cbfc5b2cca726f
--- /dev/null
+++ b/srcpkgs/virtualbox-ose/files/virtualbox.modprobe
@@ -0,0 +1,3 @@
+# For kernel 6.12+, KVM initializes virtualization on module loading.
+# Disable this behavior to run VirtualBox VMs.
+options kvm enable_virt_at_load=0
diff --git a/srcpkgs/virtualbox-ose/patches/015-no-update.patch b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
index 12ee94908c9598..f4019330c30ae2 100644
--- a/srcpkgs/virtualbox-ose/patches/015-no-update.patch
+++ b/srcpkgs/virtualbox-ose/patches/015-no-update.patch
@@ -1,27 +1,24 @@
-
+Adapted for VBox 7.1.0
Description: Disable "Check for Updates" action.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org>
---- a/doc/manual/en_US/user_Introduction.xml
-+++ b/doc/manual/en_US/user_Introduction.xml
-@@ -6090,14 +6090,14 @@
- <xref linkend="specialcharacters"/>.
- </para>
- </listitem>
--
+--- a/doc/manual/en_US/dita/topics/preferences.dita
++++ b/doc/manual/en_US/dita/topics/preferences.dita
+@@ -31,11 +31,13 @@
+ <li>
+ <p><b outputclass="bold">Input.</b> Enables you to specify keyboard shortcuts, both in <ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/> and in individual VMs. For example you might want to specify a different <b outputclass="bold">Host key</b>. This is the key that toggles whether the cursor is in the focus of the VM or the Host OS windows, see <xref href="keyb_mouse_normal.dita#keyb_mouse_normal"/>. The Host key is also used to trigger certain VM actions, see <xref href="specialcharacters.dita#specialcharacters"/>. </p>
+ </li>
+ <!--
- <listitem>
- <para>
- <emphasis role="bold">Update.</emphasis> Enables you to
+ <li>
+ <p><b outputclass="bold">Update.</b> Enables you to
specify various settings for Automatic Updates.
- </para>
- </listitem>
--
+ </p>
+ </li>
+ -->
- <listitem>
- <para>
- <emphasis role="bold">Language.</emphasis> Enables you to
+ <li>
+ <p><b outputclass="bold">Language.</b> Enables you to specify the language used for menus, labels, and text in
+ <ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/>. </p>
--- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
@@ -2421,7 +2421,7 @@ QString UIExtraDataManager::preventBetaB
@@ -33,9 +30,9 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
}
QString UIExtraDataManager::applicationUpdateData()
---- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-@@ -47,10 +47,10 @@
+--- a/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
+@@ -49,10 +49,10 @@
#ifdef VBOX_WS_WIN
# include "UIGlobalSettingsInterface.h"
#endif
@@ -50,7 +47,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
/* GUI includes: Machine Settings: */
#include "UIMachineSettingsAudio.h"
-@@ -99,7 +99,7 @@ void UISettingsDialogGlobal::retranslate
+@@ -98,7 +98,7 @@ void UISettingsDialogGlobal::retranslate
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Update page: */
@@ -59,7 +56,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif
/* Language page: */
-@@ -110,7 +110,7 @@ void UISettingsDialogGlobal::retranslate
+@@ -109,7 +109,7 @@ void UISettingsDialogGlobal::retranslate
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Proxy page: */
@@ -68,7 +65,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif
#ifdef VBOX_WS_WIN
-@@ -226,14 +226,14 @@ void UISettingsDialogGlobal::prepare()
+@@ -219,14 +219,14 @@ void UISettingsDialogGlobal::prepare()
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Update page: */
@@ -85,7 +82,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
/* Language page: */
case GlobalSettingsPageType_Language:
-@@ -255,14 +255,14 @@ void UISettingsDialogGlobal::prepare()
+@@ -248,14 +248,14 @@ void UISettingsDialogGlobal::prepare()
}
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* Proxy page: */
diff --git a/srcpkgs/virtualbox-ose/patches/050-fix-include.patch b/srcpkgs/virtualbox-ose/patches/050-fix-include.patch
deleted file mode 100644
index f6f3e115dba3b1..00000000000000
--- a/srcpkgs/virtualbox-ose/patches/050-fix-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: virtualbox-ose-7.0.4/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-===================================================================
---- virtualbox-ose-7.0.4.orig/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-+++ virtualbox-ose-7.0.4/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.h
-@@ -32,6 +32,7 @@
- #endif
-
- /* Qt includes: */
-+#include <QObject>
- #include <QPointer>
- #include <QUrl>
-
diff --git a/srcpkgs/virtualbox-ose/patches/052-xml.patch b/srcpkgs/virtualbox-ose/patches/052-xml.patch
deleted file mode 100644
index 81f93ba7a5ebb7..00000000000000
--- a/srcpkgs/virtualbox-ose/patches/052-xml.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-Fix ftbfs
-From: nezos@hotmail.com
---- a/doc/manual/en_US/user_VBoxManage.xml
-+++ b/doc/manual/en_US/user_VBoxManage.xml
-@@ -242,107 +242,107 @@ Settings file: '/home/username/.config/V
- on your particular host.
- </para>
-
-- <xi:include href="overview_man_VBoxManage-common.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-common.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-list.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-list.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-showvminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-showvminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-registervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-registervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-unregistervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-unregistervm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-createvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-createvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifyvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifyvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-clonevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-clonevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-movevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-movevm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-encryptvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-encryptvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-cloud.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-cloud.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-cloudprofile.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-cloudprofile.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-import.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-import.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-export.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-export.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-signova.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-signova.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-startvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-startvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-controlvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-controlvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-unattended.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-unattended.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-discardstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-discardstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-adoptstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-adoptstate.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-snapshot.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-snapshot.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-closemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-closemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-storageattach.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-storageattach.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-storagectl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-storagectl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-bandwidthctl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-bandwidthctl.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-showmediuminfo.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-createmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-createmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifymedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifymedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-clonemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-clonemedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-mediumproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-encryptmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-encryptmedium.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-checkmediumpwd.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-convertfromraw.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-mediumio.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-mediumio.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-setextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-setextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-getextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-getextradata.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-setproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-setproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-usbfilter.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-usbfilter.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-sharedfolder.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-sharedfolder.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-guestproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-guestproperty.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-guestcontrol.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-guestcontrol.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-debugvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-debugvm.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-metrics.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-metrics.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-natnetwork.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-natnetwork.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-hostonlyif.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-hostonlyif.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-hostonlynet.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-hostonlynet.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-dhcpserver.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-dhcpserver.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-usbdevsource.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-usbdevsource.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-extpack.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-extpack.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-updatecheck.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-updatecheck.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
-- <xi:include href="overview_man_VBoxManage-modifynvram.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
-+ <xi:include href="overview_man_VBoxManage-modifynvram.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" ><xi:fallback/></xi:include>
-
- <para>
- Each time <command>VBoxManage</command> is invoked, only one
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 8eda04269d1516..cc9a87b2261b2b 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
-version=7.0.20
+version=7.1.4
revision=1
short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -8,18 +8,18 @@ license="GPL-2.0-only, CDDL-1.0"
homepage="https://www.virtualbox.org"
changelog="https://www.virtualbox.org/wiki/Changelog"
distfiles="http://download.virtualbox.org/virtualbox/${version%[a-z]*}/VirtualBox-${version}.tar.bz2"
-checksum=5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02
+checksum=872e7a42b41f8558abbf887f1bdc7aac932bb88b2764d07cbce270cab57e3b5e
nopie=yes
lib32disabled=yes
archs="x86_64"
-hostmakedepends="acpica-utils dev86 perl pkg-config qt5-tools tar yasm which glslang
+hostmakedepends="acpica-utils dev86 perl pkg-config qt6-tools tar yasm which glslang
vulkan-loader"
makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel
- libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt5-tools-devel
- libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt5-x11extras-devel
- SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel qt5-devel
+ libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt6-tools-devel
+ libXinerama-devel libxslt-devel opus-devel pam-devel qt6-base-devel qt6-scxml-devel
+ SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel
openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel
libglvnd-devel libX11-devel libXt-devel libXcursor-devel pam-devel vde2-devel SDL2-devel
SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
@@ -80,7 +80,7 @@ do_install() {
install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp \
VBoxBugReport VBoxCpuReport VBoxDTrace vboximg-mount \
VBoxVolInfo xpidl \
- VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest \
+ VBoxBalloonCtrl vboxwebsrv webtest \
-t ${DESTDIR}/usr/lib/virtualbox
# locales
@@ -112,6 +112,7 @@ do_install() {
# Install modules-load.d file.
vinstall ${FILESDIR}/virtualbox.conf 644 usr/lib/modules-load.d
+ vinstall ${FILESDIR}/virtualbox.modprobe 644 usr/lib/modprobe.d virtualbox.conf
vsv vboxwebsrv
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (22 preceding siblings ...)
2025-01-07 6:58 ` [PR PATCH] [Updated] " Vinfall
@ 2025-01-07 7:02 ` Vinfall
2025-01-07 7:07 ` Vinfall
` (6 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2025-01-07 7:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 bytes --]
New review comment by Vinfall on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#discussion_r1904991040
Comment:
Sure, my point is it should not behave like that, even if it would sacrifice user experience. But it's very personal and I agree adding a modprobe.d conf would benefit others.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (23 preceding siblings ...)
2025-01-07 7:02 ` [PR REVIEW] " Vinfall
@ 2025-01-07 7:07 ` Vinfall
2025-01-07 8:05 ` return42
` (5 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2025-01-07 7:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 289 bytes --]
New review comment by Vinfall on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#discussion_r1904994486
Comment:
Fixed. Tbh I always find `vinstall` syntax a bit weird, original `install -pm644 source target` seems more natural but it's, again, personal.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (24 preceding siblings ...)
2025-01-07 7:07 ` Vinfall
@ 2025-01-07 8:05 ` return42
2025-01-07 11:08 ` return42
` (4 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: return42 @ 2025-01-07 8:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 944 bytes --]
New review comment by return42 on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#discussion_r1905048888
Comment:
> it just makes it behave like <=6.11
I'm very new to void-linux, so take my words with care:
If I understand the concept/intention of voiid-linux right, we should prefer to go with the upstream .. in this case it means we should not install a modprobe file that will change the behavior compared to the upstream linux kernel.
But I think we can install an example [like other packages do ..](https://docs.voidlinux.org/config/network/wpa_supplicant.html?search=/usr/share/examples) (e.g. [pipewire pkg](https://docs.voidlinux.org/config/media/pipewire.html?highlight=%2Fusr%2Fshare%2Fexamples#session-management)).
Something like / using `vsconf()`:
```bash
post_install() {
# ...
vsconf "${FILESDIR}/10-virtualbox.conf"
}
```
.. with a hint in the `INSTALL.msg`.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (25 preceding siblings ...)
2025-01-07 8:05 ` return42
@ 2025-01-07 11:08 ` return42
2025-01-08 2:56 ` Vinfall
` (3 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: return42 @ 2025-01-07 11:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 244 bytes --]
New review comment by return42 on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#discussion_r1905292047
Comment:
See my comment at https://github.com/void-linux/void-packages/pull/52910#discussion_r1905048888
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (26 preceding siblings ...)
2025-01-07 11:08 ` return42
@ 2025-01-08 2:56 ` Vinfall
2025-01-08 5:13 ` return42
` (2 subsequent siblings)
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2025-01-08 2:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 701 bytes --]
New review comment by Vinfall on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#discussion_r1906278394
Comment:
After rethinking about this, I decided it was acceptable for me. The *upstream* here is actually Oracle VirtualBox, not the kernel. In this regard, this upstream (vbox) explicitly mentioned the solutions in https://github.com/void-linux/void-packages/pull/52910#issuecomment-2481765401, and other distros are already taking the modprobe route. (yeah, I persuaded myself...)
It's still your choice to stick with it but when I do contribution, I also strongly prefer getting things done than anything else. I'll mark the other conversation as resolved.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (27 preceding siblings ...)
2025-01-08 2:56 ` Vinfall
@ 2025-01-08 5:13 ` return42
2025-01-08 16:33 ` [PR PATCH] [Merged]: " classabbyamp
2025-01-09 2:08 ` [PR REVIEW] " Vinfall
30 siblings, 0 replies; 32+ messages in thread
From: return42 @ 2025-01-08 5:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
New review comment by return42 on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#discussion_r1906483675
Comment:
> The _upstream_ here is actually Oracle VirtualBox .. and other distros are already taking the modprobe route
.. I think your arguments are valid :+1:
> (yeah, I persuaded myself...)
as I said, I'm new to void-linux and still in the learning phase :-)
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR PATCH] [Merged]: virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (28 preceding siblings ...)
2025-01-08 5:13 ` return42
@ 2025-01-08 16:33 ` classabbyamp
2025-01-09 2:08 ` [PR REVIEW] " Vinfall
30 siblings, 0 replies; 32+ messages in thread
From: classabbyamp @ 2025-01-08 16:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1509 bytes --]
There's a merged pull request on the void-packages repository
virtualbox-ose: update to 7.1.4.
https://github.com/void-linux/void-packages/pull/52910
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
- Checks passed locally
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
#### Notes
- 015-no-update.patch is updated by myself, just trivial change, deleted patches are no longer needed
- adjusted template as vbox 7.1 is based on Qt6 now. As there is no `qt6-devel` package, I choose a larger `qt6-base-devel` in makedepends. Please let me know if there is a better option. `setuid` change is taken from [Artix](https://gitea.artixlinux.org/packages/virtualbox/commit/a349e60d4475af1623821689696814b294cad618#diff-9b9baac1eb9b72790eef5540a1685306fc43fd6c)
- Works quite well and tested for months.
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PR REVIEW] virtualbox-ose: update to 7.1.4.
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
` (29 preceding siblings ...)
2025-01-08 16:33 ` [PR PATCH] [Merged]: " classabbyamp
@ 2025-01-09 2:08 ` Vinfall
30 siblings, 0 replies; 32+ messages in thread
From: Vinfall @ 2025-01-09 2:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
New review comment by Vinfall on void-packages repository
https://github.com/void-linux/void-packages/pull/52910#discussion_r1908071808
Comment:
> new to void-linux and still in the learning phase
It's fine. Actually I appreciate that someone shares the same attitude because I thought it was a quite marginal issue for others.
^ permalink raw reply [flat|nested] 32+ messages in thread
end of thread, other threads:[~2025-01-09 2:08 UTC | newest]
Thread overview: 32+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-11-04 10:01 [PR PATCH] virtualbox-ose: update to 7.1.4 Vinfall
2024-11-18 1:51 ` Vinfall
2024-11-23 2:24 ` [PR PATCH] [Updated] " Vinfall
2024-12-23 5:03 ` Vinfall
2024-12-23 5:03 ` Vinfall
2024-12-23 5:33 ` [PR PATCH] [Updated] " Vinfall
2024-12-23 5:35 ` Vinfall
2024-12-26 4:09 ` [PR PATCH] [Updated] " Vinfall
2024-12-26 4:11 ` Vinfall
2025-01-05 11:34 ` [PR REVIEW] " return42
2025-01-05 23:22 ` classabbyamp
2025-01-05 23:23 ` classabbyamp
2025-01-06 6:26 ` Vinfall
2025-01-06 6:27 ` Vinfall
2025-01-06 6:28 ` [PR PATCH] [Updated] " Vinfall
2025-01-06 6:41 ` Vinfall
2025-01-06 6:47 ` [PR REVIEW] " Vinfall
2025-01-06 6:55 ` return42
2025-01-06 17:24 ` classabbyamp
2025-01-07 2:53 ` [PR PATCH] [Updated] " Vinfall
2025-01-07 2:59 ` [PR REVIEW] " Vinfall
2025-01-07 4:05 ` classabbyamp
2025-01-07 4:06 ` classabbyamp
2025-01-07 6:58 ` [PR PATCH] [Updated] " Vinfall
2025-01-07 7:02 ` [PR REVIEW] " Vinfall
2025-01-07 7:07 ` Vinfall
2025-01-07 8:05 ` return42
2025-01-07 11:08 ` return42
2025-01-08 2:56 ` Vinfall
2025-01-08 5:13 ` return42
2025-01-08 16:33 ` [PR PATCH] [Merged]: " classabbyamp
2025-01-09 2:08 ` [PR REVIEW] " Vinfall
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).