X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=16-no-update.patch;h=fd06789969d85407e5b1831a9eb039439017b93f;hb=e6d149f01d2201f62fe10c766cf34d9f4248a551;hp=95afeac1123e616e74bb4aa705f3375ac1bc035b;hpb=acf12a8799654366080612310de7fe05028848e5;p=packages%2FVirtualBox.git diff --git a/16-no-update.patch b/16-no-update.patch index 95afeac..fd06789 100644 --- a/16-no-update.patch +++ b/16-no-update.patch @@ -1,65 +1,88 @@ Description: Disable "Check for Updates" action. Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212 -Author: Daniel Hahler , Felix Geyer +Author: Daniel Hahler , Felix Geyer -diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp ---- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2010-12-17 16:14:24.000000000 +0100 -+++ virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2011-01-01 23:55:23.240440031 +0100 -@@ -4565,6 +4565,9 @@ - */ - void VBoxGlobal::showUpdateDialog (bool aForce) +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 +@@ -474,6 +474,8 @@ void UIUpdateManager::shutdown() + + void UIUpdateManager::sltForceCheck() { -+ // Updates are handled through package managers. + return; + - /* Silently check in one day after current time-stamp */ - QTimer::singleShot (24 /* hours */ * 60 /* minutes */ * - 60 /* seconds */ * 1000 /* milliseconds */, -diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp ---- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp 2010-11-22 11:05:07.000000000 +0100 -+++ virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp 2011-01-01 23:56:55.292774878 +0100 -@@ -266,13 +266,6 @@ - #if defined(Q_WS_MAC) && (QT_VERSION < 0x040700) - if (m_fIsFirstTime) - # endif -- pMenu->addAction(pActionsPool->action(UIActionIndex_Simple_Update)); --#ifndef Q_WS_MAC -- pMenu->addSeparator(); --#endif /* !Q_WS_MAC */ --#if defined(Q_WS_MAC) && (QT_VERSION < 0x040700) -- if (m_fIsFirstTime) --# endif - pMenu->addAction(pActionsPool->action(UIActionIndex_Simple_About)); - - -diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp ---- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2010-12-17 16:14:24.000000000 +0100 -+++ virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2011-01-02 00:03:55.120533579 +0100 -@@ -501,6 +501,10 @@ + /* 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 /* VBOX_GUI_WITH_NETWORK_MANAGER */ + 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), SIGNAL(triggered()), + gNetworkManager, SLOT(show()), Qt::UniqueConnection); +- connect(action(UIActionIndex_M_Application_S_CheckForUpdates), SIGNAL(triggered()), +- gUpdateManager, SLOT(sltForceCheck()), Qt::UniqueConnection); + #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ + connect(action(UIActionIndex_M_Application_S_ResetWarnings), SIGNAL(triggered()), + &msgCenter(), SLOT(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/selector/UISelectorWindow.cpp.orig 2015-07-09 20:09:22.239478146 +0200 ++++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/selector/UISelectorWindow.cpp 2015-07-09 20:17:20.635207663 +0200 +@@ -1211,8 +1211,6 @@ + /* 'About' action goes to Application menu: */ + pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About)); + # ifdef VBOX_GUI_WITH_NETWORK_MANAGER +- /* 'Check for Updates' action goes to Application menu: */ +- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates)); + /* 'Network Access Manager' action goes to Application menu: */ + pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager)); + # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ +@@ -1303,7 +1301,6 @@ + addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowMediumManager)); + # ifdef VBOX_GUI_WITH_NETWORK_MANAGER + addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager)); +- addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates)); + # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ + addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings)); + addAction(actionPool()->action(UIActionIndexST_M_File_S_Close)); +@@ -1368,9 +1365,6 @@ + # ifdef VBOX_GUI_WITH_NETWORK_MANAGER + /* 'Network Access Manager' action goes to 'File' menu: */ + pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager)); +- /* 'Check for Updates' action goes to 'File' menu: */ +- if (gEDataManager->applicationUpdateEnabled()) +- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates)); + # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ + /* 'Reset Warnings' action goes 'File' menu: */ + pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings)); +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 GLSettingsPage_Update: ++ case GlobalSettingsPageType_Update: + { + return false; + } default: break; } -diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp ---- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp 2010-08-13 12:17:07.000000000 +0200 -+++ virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp 2011-01-02 00:00:00.599195342 +0100 -@@ -90,13 +90,6 @@ - GetExtraData (VBoxDefs::GUI_RegistrationDlgWinID).isEmpty()); - #endif - -- aMenu->addAction (updateAction); -- updateAction->setEnabled (vboxGlobal().virtualBox(). -- GetExtraData (VBoxDefs::GUI_UpdateDlgWinID).isEmpty()); -- --#ifndef Q_WS_MAC -- aMenu->addSeparator(); --#endif /* Q_WS_MAC */ - aMenu->addAction (aboutAction); - } -