]> git.pld-linux.org Git - packages/VirtualBox.git/blobdiff - 16-no-update.patch
projects / packages / VirtualBox.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
deterministically prefer vendor shipped module over mainline
[packages/VirtualBox.git] / 16-no-update.patch
diff --git a/16-no-update.patch b/16-no-update.patch
index a09cfa3a3bf5050bc85f940bd77f6091d7ebb316..e914773967f1a8ca658a1a2309d6af899d451589 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,79 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
      /* Force call for new version check: */
      sltCheckIfUpdateIsNecessary(true /* force call */);
  }
+--- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.cpp.orig 2015-07-09 20:11:53.129742315 +0200
++++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.cpp      2015-07-09 20:12:02.136424394 +0200
+@@ -991,7 +991,6 @@
+     m_pool[UIActionIndex_M_Application_S_Preferences] = new UIActionSimplePreferences(this);
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+     m_pool[UIActionIndex_M_Application_S_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
+-    m_pool[UIActionIndex_M_Application_S_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
+ #endif
+     m_pool[UIActionIndex_M_Application_S_ResetWarnings] = new UIActionSimpleResetWarnings(this);
+     m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this);
+@@ -1033,8 +1033,6 @@
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+     connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), &UIAction::triggered,
+             gNetworkManager, &UINetworkManager::show, Qt::UniqueConnection);
+-    connect(action(UIActionIndex_M_Application_S_CheckForUpdates), &UIAction::triggered,
+-            gUpdateManager, &UIUpdateManager::sltForceCheck, Qt::UniqueConnection);
+ #endif
+     connect(action(UIActionIndex_M_Application_S_ResetWarnings), &UIAction::triggered,
+             &msgCenter(), &UIMessageCenter::sltResetSuppressedMessages, Qt::UniqueConnection);
+--- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.h.orig   2015-07-09 20:13:36.439757556 +0200
++++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.h        2015-07-09 20:13:40.446396985 +0200
+@@ -62,7 +62,6 @@
+     UIActionIndex_M_Application_S_Preferences,
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+     UIActionIndex_M_Application_S_NetworkAccessManager,
+-    UIActionIndex_M_Application_S_CheckForUpdates,
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+     UIActionIndex_M_Application_S_ResetWarnings,
+     UIActionIndex_M_Application_S_Close,
+--- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp.orig  2015-07-09 20:09:22.239478146 +0200
++++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp       2015-07-09 20:17:20.635207663 +0200
+@@ -1211,9 +1211,6 @@
+     /* 'About' action goes to Application menu: */
+     pMenu->addAction(action(UIActionIndex_M_Application_S_About));
+ # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+-    /* 'Check for Updates' action goes to Application menu: */
+-    if (gEDataManager->applicationUpdateEnabled())
+-        pMenu->addAction(action(UIActionIndex_M_Application_S_CheckForUpdates));
+     /* 'Network Access Manager' action goes to Application menu: */
+     pMenu->addAction(action(UIActionIndex_M_Application_S_NetworkAccessManager));
+ # endif
+@@ -1368,9 +1365,6 @@
+ # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+     /* 'Network Access Manager' action goes to 'File' menu: */
+     pMenu->addAction(action(UIActionIndex_M_Application_S_NetworkAccessManager));
+-    /* 'Check for Updates' action goes to 'File' menu: */
+-    if (gEDataManager->applicationUpdateEnabled())
+-        pMenu->addAction(action(UIActionIndex_M_Application_S_CheckForUpdates));
+ # endif
+     /* Separator after tool actions of the 'File' menu: */
+     pMenu->addSeparator();
+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
-@@ -550,6 +550,10 @@ bool UISettingsDialogGlobal::isPageAvail
- #endif /* !VBOX_WITH_NETFLT */
+@@ -557,6 +557,10 @@ bool UISettingsDialogGlobal::isPageAvailable(int iPageId)
+ #endif
              break;
          }
-+        case GLSettingsPage_Update:
++        case GlobalSettingsPageType_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);
-     m_pool[UIActionIndex_Simple_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
--    m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
-     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,
-     UIActionIndex_Simple_NetworkAccessManager,
--    UIActionIndex_Simple_CheckForUpdates,
-     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 */
--    m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates);
--    pMenu->addAction(m_pUpdateAction);
- #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 */
--    connect(m_pUpdateAction, SIGNAL(triggered()), gUpdateManager, SLOT(sltForceCheck()));
-     connect(m_pAboutAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog()));
- 
-     /* Status-bar connections: */
+--- VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp.orig 2018-12-19 19:53:33.019049148 +0100
++++ VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp      2018-12-19 19:53:56.902224273 +0100
+@@ -1366,8 +1366,6 @@
+             m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager));
+ # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+         m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
+-        if (gEDataManager->applicationUpdateEnabled())
+-            m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
+ # endif
+ #endif /* !VBOX_WS_MAC */
+     }
VirtualBox - x86 hardware virtualizer
This page took 0.029961 seconds and 4 git commands to generate.