Accepting request 184179 from home:mseben:branches:Virtualization

updated to version 4.2.16

OBS-URL: https://build.opensuse.org/request/show/184179
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=133
This commit is contained in:
Michal Seben 2013-07-24 10:57:58 +00:00 committed by Git OBS Bridge
parent a26a24ae55
commit a6e4c15ca7
7 changed files with 29 additions and 43 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f28e3b517b46436f3238f1bae207c9eab3d23312e57ec2418a67b3314c4ed04
size 49388013

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ece4f7864223b6ff9129b7115bfa340a06d11d0a3f74fa8ebe406367e8010dea
size 49378116

View File

@ -2,9 +2,7 @@ Index: src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.
=================================================================== ===================================================================
--- src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp.orig --- src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp.orig
+++ src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp +++ src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
@@ -61,11 +61,11 @@ void UIGlobalSettingsUpdate::loadToCache @@ -63,7 +63,7 @@ void UIGlobalSettingsUpdate::loadToCache
/* Load data to corresponding widgets from cache,
* this task SHOULD be performed in GUI thread only: */
void UIGlobalSettingsUpdate::getFromCache() void UIGlobalSettingsUpdate::getFromCache()
{ {
/* Apply internal variables data to QWidget(s): */ /* Apply internal variables data to QWidget(s): */
@ -13,36 +11,16 @@ Index: src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.
if (m_pEnableUpdateCheckbox->isChecked()) if (m_pEnableUpdateCheckbox->isChecked())
{ {
m_pUpdatePeriodCombo->setCurrentIndex(m_cache.m_periodIndex); m_pUpdatePeriodCombo->setCurrentIndex(m_cache.m_periodIndex);
if (m_cache.m_branchIndex == VBoxUpdateData::BranchWithBetas)
m_pUpdateFilterBetasRadio->setChecked(true);
Index: src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
===================================================================
--- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h.orig
+++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
@@ -37,11 +37,10 @@ public:
enum GLSettingsPage
{
GLSettingsPage_General = 0,
GLSettingsPage_Input,
- GLSettingsPage_Update,
GLSettingsPage_Language,
GLSettingsPage_Display,
GLSettingsPage_USB,
GLSettingsPage_Network,
GLSettingsPage_Extension,
Index: src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp Index: src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
=================================================================== ===================================================================
--- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp.orig --- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp.orig
+++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
@@ -327,19 +327,10 @@ UISettingsDialogGlobal::UISettingsDialog @@ -342,15 +342,6 @@ UISettingsDialogGlobal::UISettingsDialog
addItem(":/hostkey_32px.png", ":/hostkey_disabled_32px.png",
":/hostkey_16px.png", ":/hostkey_disabled_16px.png",
iPageIndex, "#input", pSettingsPage); iPageIndex, "#input", pSettingsPage);
break; break;
} }
- /* Update page: */ - /* Update page: */
- case GLSettingsPage_Update: - case GlobalSettingsPageType_Update:
- { - {
- pSettingsPage = new UIGlobalSettingsUpdate; - pSettingsPage = new UIGlobalSettingsUpdate;
- addItem(":/refresh_32px.png", ":/refresh_disabled_32px.png", - addItem(":/refresh_32px.png", ":/refresh_disabled_32px.png",
@ -51,21 +29,15 @@ Index: src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
- break; - break;
- } - }
/* Language page: */ /* Language page: */
case GLSettingsPage_Language: case GlobalSettingsPageType_Language:
{ {
pSettingsPage = new UIGlobalSettingsLanguage; @@ -489,9 +480,6 @@ void UISettingsDialogGlobal::retranslate
addItem(":/site_32px.png", ":/site_disabled_32px.png",
@@ -474,13 +465,10 @@ void UISettingsDialogGlobal::retranslate
m_pSelector->setItemText(GLSettingsPage_General, tr("General"));
/* Input page: */ /* Input page: */
m_pSelector->setItemText(GLSettingsPage_Input, tr("Input")); m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input"));
- /* Update page: */ - /* Update page: */
- m_pSelector->setItemText(GLSettingsPage_Update, tr("Update")); - m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update"));
- -
/* Language page: */ /* Language page: */
m_pSelector->setItemText(GLSettingsPage_Language, tr("Language")); m_pSelector->setItemText(GlobalSettingsPageType_Language, tr("Language"));
/* Display page: */
m_pSelector->setItemText(GLSettingsPage_Display, tr("Display"));

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1ac7f37d3e254a1dc715dfd8286f5cc49e0fe957d078cdae1d944d57e9c1ca29
size 6180180

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3cf5ae957d411376c2e4ac31317a6bffb4af6435b4603a613de29dad4512be7f
size 6187414

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Jul 24 07:31:24 UTC 2013 - mseben@gmail.com
- updated to virtualbox 4.2.16
* OVF/OVA: don't crash on import if no manifest is used (4.2.14 regression; bug #11895)
* GUI: do not restore the current snapshot if we power-off after a Guru Mediation
* Storage: fixed a crash when hotplugging an empty DVD drive to the VM
* Storage: fixed a crash when a guest read from a DVD drive attached to the SATA controller under certain circumstances
* EFI: don't fail with 64-bit guests on 32-bit hosts (bug #11456)
* Autostart: fixed VM startup on OS X
* Windows hosts: native Windows 8 controls
* Windows hosts: restore native style on Vista 32
* Windows hosts / guests: Windows 8.1 adaptions (bug #11899)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 2 14:53:38 UTC 2013 - sndirsch@suse.com Tue Jul 2 14:53:38 UTC 2013 - sndirsch@suse.com

View File

@ -92,7 +92,7 @@ BuildRequires: xorg-x11-libXt-devel-32bit
%endif %endif
# #
ExclusiveArch: %ix86 x86_64 ExclusiveArch: %ix86 x86_64
Version: 4.2.14 Version: 4.2.16
Release: 0 Release: 0
Summary: VirtualBox is an Emulator Summary: VirtualBox is an Emulator
License: GPL-2.0+ License: GPL-2.0+