From a6e4c15ca7b61926afb706dbb5c3cf61fd150e0c86356e346b8f22edfc64f9f8 Mon Sep 17 00:00:00 2001 From: Michal Seben Date: Wed, 24 Jul 2013 10:57:58 +0000 Subject: [PATCH] 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 --- VirtualBox-4.2.14-patched.tar.bz2 | 3 --- VirtualBox-4.2.16-patched.tar.bz2 | 3 +++ vbox-disable-updates.diff | 44 ++++++------------------------- virtualbox-4.2.14-UserManual.pdf | 3 --- virtualbox-4.2.16-UserManual.pdf | 3 +++ virtualbox.changes | 14 ++++++++++ virtualbox.spec | 2 +- 7 files changed, 29 insertions(+), 43 deletions(-) delete mode 100644 VirtualBox-4.2.14-patched.tar.bz2 create mode 100644 VirtualBox-4.2.16-patched.tar.bz2 delete mode 100644 virtualbox-4.2.14-UserManual.pdf create mode 100644 virtualbox-4.2.16-UserManual.pdf diff --git a/VirtualBox-4.2.14-patched.tar.bz2 b/VirtualBox-4.2.14-patched.tar.bz2 deleted file mode 100644 index 3e34bde..0000000 --- a/VirtualBox-4.2.14-patched.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f28e3b517b46436f3238f1bae207c9eab3d23312e57ec2418a67b3314c4ed04 -size 49388013 diff --git a/VirtualBox-4.2.16-patched.tar.bz2 b/VirtualBox-4.2.16-patched.tar.bz2 new file mode 100644 index 0000000..917e5c3 --- /dev/null +++ b/VirtualBox-4.2.16-patched.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ece4f7864223b6ff9129b7115bfa340a06d11d0a3f74fa8ebe406367e8010dea +size 49378116 diff --git a/vbox-disable-updates.diff b/vbox-disable-updates.diff index a523e9f..8f9b8af 100644 --- a/vbox-disable-updates.diff +++ b/vbox-disable-updates.diff @@ -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 -@@ -61,11 +61,11 @@ void UIGlobalSettingsUpdate::loadToCache - /* Load data to corresponding widgets from cache, - * this task SHOULD be performed in GUI thread only: */ +@@ -63,7 +63,7 @@ void UIGlobalSettingsUpdate::loadToCache void UIGlobalSettingsUpdate::getFromCache() { /* Apply internal variables data to QWidget(s): */ @@ -13,36 +11,16 @@ Index: src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate. if (m_pEnableUpdateCheckbox->isChecked()) { 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 =================================================================== --- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp.orig +++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp -@@ -327,19 +327,10 @@ UISettingsDialogGlobal::UISettingsDialog - addItem(":/hostkey_32px.png", ":/hostkey_disabled_32px.png", - ":/hostkey_16px.png", ":/hostkey_disabled_16px.png", +@@ -342,15 +342,6 @@ UISettingsDialogGlobal::UISettingsDialog iPageIndex, "#input", pSettingsPage); break; } - /* Update page: */ -- case GLSettingsPage_Update: +- case GlobalSettingsPageType_Update: - { - pSettingsPage = new UIGlobalSettingsUpdate; - addItem(":/refresh_32px.png", ":/refresh_disabled_32px.png", @@ -51,21 +29,15 @@ Index: src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp - break; - } /* Language page: */ - case GLSettingsPage_Language: + case GlobalSettingsPageType_Language: { - pSettingsPage = new UIGlobalSettingsLanguage; - addItem(":/site_32px.png", ":/site_disabled_32px.png", -@@ -474,13 +465,10 @@ void UISettingsDialogGlobal::retranslate - m_pSelector->setItemText(GLSettingsPage_General, tr("General")); - +@@ -489,9 +480,6 @@ void UISettingsDialogGlobal::retranslate /* Input page: */ - m_pSelector->setItemText(GLSettingsPage_Input, tr("Input")); + m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input")); - /* Update page: */ -- m_pSelector->setItemText(GLSettingsPage_Update, tr("Update")); +- m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update")); - /* 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")); diff --git a/virtualbox-4.2.14-UserManual.pdf b/virtualbox-4.2.14-UserManual.pdf deleted file mode 100644 index 74b36f7..0000000 --- a/virtualbox-4.2.14-UserManual.pdf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ac7f37d3e254a1dc715dfd8286f5cc49e0fe957d078cdae1d944d57e9c1ca29 -size 6180180 diff --git a/virtualbox-4.2.16-UserManual.pdf b/virtualbox-4.2.16-UserManual.pdf new file mode 100644 index 0000000..7b98150 --- /dev/null +++ b/virtualbox-4.2.16-UserManual.pdf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3cf5ae957d411376c2e4ac31317a6bffb4af6435b4603a613de29dad4512be7f +size 6187414 diff --git a/virtualbox.changes b/virtualbox.changes index bbf4fe0..4247e99 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -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 diff --git a/virtualbox.spec b/virtualbox.spec index c0cb422..29aa9cc 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -92,7 +92,7 @@ BuildRequires: xorg-x11-libXt-devel-32bit %endif # ExclusiveArch: %ix86 x86_64 -Version: 4.2.14 +Version: 4.2.16 Release: 0 Summary: VirtualBox is an Emulator License: GPL-2.0+