mirror of
https://github.com/void-linux/void-packages.git
synced 2025-09-03 02:23:11 +02:00
virtualbox-ose: update to 7.2.0.
This commit is contained in:
parent
70a7e3b681
commit
e3fbfb35ad
2 changed files with 46 additions and 32 deletions
|
@ -1,27 +1,27 @@
|
|||
Adapted for VBox 7.1.0
|
||||
Adapted for VBox 7.2.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/dita/topics/preferences.dita
|
||||
+++ b/doc/manual/en_US/dita/topics/preferences.dita
|
||||
@@ -31,11 +31,13 @@
|
||||
@@ -21,9 +21,11 @@
|
||||
<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>
|
||||
<p>On the <uicontrol>Input</uicontrol> tab, set 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>
|
||||
+ <!--
|
||||
<li>
|
||||
<p><b outputclass="bold">Update.</b> Enables you to
|
||||
specify various settings for Automatic Updates.
|
||||
</p>
|
||||
<p>On the <uicontrol>Update</uicontrol> tab, select the type of software updates you want to install, and how frequently to check for updates.</p>
|
||||
</li>
|
||||
+ -->
|
||||
<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>
|
||||
<p>On the <uicontrol>Language</uicontrol> tab, choose the language used for menus, labels, and text in <ph conkeyref="vbox-conkeyref-phrases/vbox-mgr"/>.</p>
|
||||
</li>
|
||||
diff --git a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
|
||||
index 1bf2d53..69e2f24 100644
|
||||
--- 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
|
||||
@@ -2412,7 +2412,7 @@ QString UIExtraDataManager::preventBetaBuildWarningForVersion()
|
||||
bool UIExtraDataManager::applicationUpdateEnabled()
|
||||
{
|
||||
/* 'True' unless 'restriction' feature allowed: */
|
||||
|
@ -30,9 +30,11 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
|
|||
}
|
||||
|
||||
QString UIExtraDataManager::applicationUpdateData()
|
||||
diff --git a/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
|
||||
index 6c24bae..9042c59 100644
|
||||
--- a/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
|
||||
+++ b/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialogSpecific.cpp
|
||||
@@ -49,10 +49,10 @@
|
||||
@@ -50,10 +50,10 @@
|
||||
#ifdef VBOX_WS_WIN
|
||||
# include "UIGlobalSettingsInterface.h"
|
||||
#endif
|
||||
|
@ -47,7 +49,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
|
|||
|
||||
/* GUI includes: Machine Settings: */
|
||||
#include "UIMachineSettingsAudio.h"
|
||||
@@ -98,7 +98,7 @@ void UISettingsDialogGlobal::retranslate
|
||||
@@ -99,7 +99,7 @@ void UIAdvancedSettingsDialogGlobal::sltRetranslateUI()
|
||||
|
||||
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
|
||||
/* Update page: */
|
||||
|
@ -56,7 +58,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
|
|||
#endif
|
||||
|
||||
/* Language page: */
|
||||
@@ -109,7 +109,7 @@ void UISettingsDialogGlobal::retranslate
|
||||
@@ -110,7 +110,7 @@ void UIAdvancedSettingsDialogGlobal::sltRetranslateUI()
|
||||
|
||||
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
|
||||
/* Proxy page: */
|
||||
|
@ -65,37 +67,49 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gian
|
|||
#endif
|
||||
|
||||
#ifdef VBOX_WS_WIN
|
||||
@@ -219,14 +219,14 @@ void UISettingsDialogGlobal::prepare()
|
||||
@@ -220,14 +220,14 @@ void UIAdvancedSettingsDialogGlobal::prepare()
|
||||
}
|
||||
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
|
||||
/* Update page: */
|
||||
- case GlobalSettingsPageType_Update:
|
||||
+ /*case GlobalSettingsPageType_Update:
|
||||
{
|
||||
pSettingsPage = new UIGlobalSettingsUpdate;
|
||||
addItem(":/refresh_32px.png", ":/refresh_24px.png", ":/refresh_16px.png",
|
||||
iPageIndex, "#update", pSettingsPage);
|
||||
addPageHelpKeyword(iPageIndex, "preferences");
|
||||
break;
|
||||
- {
|
||||
- pSettingsPage = new UIGlobalSettingsUpdate;
|
||||
- addItem(":/refresh_32px.png", ":/refresh_24px.png", ":/refresh_16px.png",
|
||||
- iPageIndex, "#update", pSettingsPage);
|
||||
- addPageHelpKeyword(iPageIndex, "tk_preferences" /* help keyword */);
|
||||
- break;
|
||||
- }
|
||||
+ }*/
|
||||
+ // case GlobalSettingsPageType_Update:
|
||||
+ // {
|
||||
+ // pSettingsPage = new UIGlobalSettingsUpdate;
|
||||
+ // addItem(":/refresh_32px.png", ":/refresh_24px.png", ":/refresh_16px.png",
|
||||
+ // iPageIndex, "#update", pSettingsPage);
|
||||
+ // addPageHelpKeyword(iPageIndex, "tk_preferences" /* help keyword */);
|
||||
+ // break;
|
||||
+ // }
|
||||
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
|
||||
/* Language page: */
|
||||
case GlobalSettingsPageType_Language:
|
||||
@@ -248,14 +248,14 @@ void UISettingsDialogGlobal::prepare()
|
||||
@@ -249,14 +249,14 @@ void UIAdvancedSettingsDialogGlobal::prepare()
|
||||
}
|
||||
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
|
||||
/* Proxy page: */
|
||||
- case GlobalSettingsPageType_Proxy:
|
||||
+ /*case GlobalSettingsPageType_Proxy:
|
||||
{
|
||||
pSettingsPage = new UIGlobalSettingsProxy;
|
||||
addItem(":/proxy_32px.png", ":/proxy_24px.png", ":/proxy_16px.png",
|
||||
iPageIndex, "#proxy", pSettingsPage);
|
||||
addPageHelpKeyword(iPageIndex, "preferences");
|
||||
break;
|
||||
- {
|
||||
- pSettingsPage = new UIGlobalSettingsProxy;
|
||||
- addItem(":/proxy_32px.png", ":/proxy_24px.png", ":/proxy_16px.png",
|
||||
- iPageIndex, "#proxy", pSettingsPage);
|
||||
- addPageHelpKeyword(iPageIndex, "tk_preferences" /* help keyword */);
|
||||
- break;
|
||||
- }
|
||||
+ }*/
|
||||
+ // case GlobalSettingsPageType_Proxy:
|
||||
+ // {
|
||||
+ // pSettingsPage = new UIGlobalSettingsProxy;
|
||||
+ // addItem(":/proxy_32px.png", ":/proxy_24px.png", ":/proxy_16px.png",
|
||||
+ // iPageIndex, "#proxy", pSettingsPage);
|
||||
+ // addPageHelpKeyword(iPageIndex, "tk_preferences" /* help keyword */);
|
||||
+ // break;
|
||||
+ // }
|
||||
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
|
||||
#ifdef VBOX_WS_WIN
|
||||
/* Interface page: */
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'virtualbox-ose'
|
||||
pkgname=virtualbox-ose
|
||||
version=7.1.12
|
||||
version=7.2.0
|
||||
revision=1
|
||||
short_desc="General-purpose full virtualizer for x86 hardware"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
|
@ -8,7 +8,7 @@ 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=6f9618f39168898134975f51df7c2d6d5129c0aa82b6ae11cf47f920c70df276
|
||||
checksum=4f2804ff27848ea772aee6b637bb1e10ee74ec2da117c257413e2d2c4f670ba0
|
||||
|
||||
nopie=yes
|
||||
lib32disabled=yes
|
||||
|
|
Loading…
Add table
Reference in a new issue