X-Git-Url: http://git.pld-linux.org/?p=packages%2FVirtualBox.git;a=blobdiff_plain;f=16-no-update.patch;h=b6d70f4713dc6314b05c9de1e8cd45896f6a2c65;hp=34ce0736cbc866648eaf92a73db97cb4d81f3438;hb=fdf4c273d291c0394f5499ccbc0a107fb78ff3f5;hpb=c48bdb7733034a11ea11c323831af84d37335051 diff --git a/16-no-update.patch b/16-no-update.patch index 34ce073..b6d70f4 100644 --- a/16-no-update.patch +++ b/16-no-update.patch @@ -1,49 +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 ---- VirtualBox-4.1.2_OSE/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp.orig 2011-08-15 14:28:35.000000000 +0200 -+++ VirtualBox-4.1.2_OSE/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp 2011-08-16 23:27:21.954256054 +0200 -@@ -275,13 +275,6 @@ - #if defined(Q_WS_MAC) && (QT_VERSION < 0x040700) - if (m_fIsFirstTime) - # endif -- pMenu->addAction(gActionPool->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(gActionPool->action(UIActionIndex_Simple_About)); +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() - -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 @@ + void UIUpdateManager::sltForceCheck() + { ++ return; ++ + /* 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), &UIAction::triggered, + gNetworkManager, &UINetworkManager::show, Qt::UniqueConnection); +- connect(action(UIActionIndex_M_Application_S_CheckForUpdates), &UIAction::triggered, +- gUpdateManager, &UIUpdateManager::sltForceCheck, Qt::UniqueConnection); + #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ + 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/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; } ---- VirtualBox-4.1.2_OSE/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp.orig 2011-08-15 14:28:35.000000000 +0200 -+++ VirtualBox-4.1.2_OSE/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp 2011-08-17 22:48:08.700558251 +0200 -@@ -1747,12 +1747,6 @@ - pMenu->addAction(gActionPool->action(UIActionIndex_Simple_Register)); - #endif /* VBOX_WITH_REGISTRATION */ - -- pMenu->addAction(gActionPool->action(UIActionIndex_Simple_Update)); -- --#ifndef Q_WS_MAC -- pMenu->addSeparator(); --#endif /* !Q_WS_MAC */ -- - pMenu->addAction(gActionPool->action(UIActionIndex_Simple_About)); - - /* Configure connections: */