- added x32 to supported archs (kernel modules build for sure there)

[packages/VirtualBox.git] / 16-no-update.patch

diff --git a/16-no-update.patch b/16-no-update.patch
index a09cfa3a3bf5050bc85f940bd77f6091d7ebb316..5cd2a0407ea18228537b8c99260fbdde6150d0d4 100644 (file)
--- a/16-no-update.patch
+++ b/16-no-update.patch
@@ -5,7 +5,7 @@ Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>
 diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
 --- a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
-@@ -465,6 +465,8 @@ void UIUpdateManager::shutdown()
+@@ -474,6 +474,8 @@ void UIUpdateManager::shutdown()
  
  void UIUpdateManager::sltForceCheck()
  {
@@ -14,65 +14,60 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
      /* Force call for new version check: */
      sltCheckIfUpdateIsNecessary(true /* force call */);
  }
---- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-@@ -550,6 +550,10 @@ bool UISettingsDialogGlobal::isPageAvail
- #endif /* !VBOX_WITH_NETFLT */
-             break;
-         }
-+        case GLSettingsPage_Update:
-+        {
-+            return false;
-+        }
-         default:
-             break;
-     }
 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
 @@ -538,7 +538,6 @@ void UIActionPool::createActions()
-     m_pool[UIActionIndex_Simple_WebSite] = new UIActionSimpleWebSite(this);
      m_pool[UIActionIndex_Simple_ResetWarnings] = new UIActionSimpleResetWarnings(this);
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      m_pool[UIActionIndex_Simple_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
 -    m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
      m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
  }
- 
-@@ -570,9 +569,6 @@ void UIActionPool::createMenus()
-     m_pool[UIActionIndex_Simple_CheckForUpdates]->setVisible(false);
- #endif
- #if !(defined(Q_WS_MAC) && (QT_VERSION < 0x040700))
--    if (m_pool[UIActionIndex_Simple_CheckForUpdates])
--        delete m_pool[UIActionIndex_Simple_CheckForUpdates];
--    m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
-     if (m_pool[UIActionIndex_Simple_About])
-         delete m_pool[UIActionIndex_Simple_About];
-     m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
 +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
 @@ -47,7 +47,6 @@ enum UIActionIndex
-     UIActionIndex_Simple_WebSite,
      UIActionIndex_Simple_ResetWarnings,
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      UIActionIndex_Simple_NetworkAccessManager,
 -    UIActionIndex_Simple_CheckForUpdates,
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
      UIActionIndex_Simple_About,
  
-     /* Maximum index: */
 --- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-@@ -1300,8 +1300,6 @@ void UISelectorWindow::prepareMenuHelp(Q
-     m_pRegisterAction = gActionPool->action(UIActionIndex_Simple_Register);
-     pMenu->addAction(m_pRegisterAction);
- #endif /* VBOX_WITH_REGISTRATION */
+@@ -1301,12 +1301,6 @@ void UISelectorWindow::prepareMenuHelp(Q
+     pMenu->addSeparator();
+     m_pNetworkAccessManager = gActionPool->action(UIActionIndex_Simple_NetworkAccessManager);
+     pMenu->addAction(m_pNetworkAccessManager);
 -    m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates);
--    pMenu->addAction(m_pUpdateAction);
+-    CVirtualBox vbox = vboxGlobal().virtualBox();
+-    if (VBoxGlobal::shouldWeAllowApplicationUpdate(vbox))
+-        pMenu->addAction(m_pUpdateAction);
+-    else
+-        m_pUpdateAction->setEnabled(false);
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
  #ifndef Q_WS_MAC
      pMenu->addSeparator();
- #endif /* !Q_WS_MAC */
-@@ -1438,7 +1436,6 @@ void UISelectorWindow::prepareConnection
-     connect(m_pRegisterAction, SIGNAL(triggered()), &vboxGlobal(), SLOT(showRegistrationDialog()));
-     connect(gEDataEvents, SIGNAL(sigCanShowRegistrationDlg(bool)), m_pRegisterAction, SLOT(setEnabled(bool)));
- #endif /* VBOX_WITH_REGISTRATION */
+@@ -1443,7 +1437,6 @@ void UISelectorWindow::prepareConnection
+     connect(m_pResetWarningsAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltResetSuppressedMessages()));
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+     connect(m_pNetworkAccessManager, SIGNAL(triggered()), gNetworkManager, SLOT(show()));
 -    connect(m_pUpdateAction, SIGNAL(triggered()), gUpdateManager, SLOT(sltForceCheck()));
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
      connect(m_pAboutAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog()));
  
-     /* Status-bar connections: */
+diff a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+--- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+@@ -557,6 +557,10 @@ bool UISettingsDialogGlobal::isPageAvailable(int iPageId)
+ #endif /* !VBOX_WITH_NETFLT */
+             break;
+         }
++        case GlobalSettingsPageType_Update:
++        {
++            return false;
++        }
+         default:
+             break;
+     }