diff options
| author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-05-24 22:31:17 -0300 |
|---|---|---|
| committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-05-24 22:31:17 -0300 |
| commit | e57aa6bacf83b8062b15907e7ced8e462d324f5f (patch) | |
| tree | 10ec50eeee327a38b0ea94b9283daa43590f8e29 /libre/virtualbox-libre/libre.patch | |
| parent | e30ea4382110b99725dbc7823f8a8b2ff5c4a78c (diff) | |
| parent | e01fd0db257851f64e503de18662b4804e855438 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/virtualbox-libre/libre.patch')
| -rw-r--r-- | libre/virtualbox-libre/libre.patch | 48 |
1 files changed, 46 insertions, 2 deletions
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index ec40c0692..75a5ed22f 100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -1,5 +1,5 @@ --- VirtualBox-4.2.12.orig/Config.kmk 2013-04-12 07:33:55.000000000 -0300 -+++ VirtualBox-4.2.12/Config.kmk 2013-05-10 15:03:20.817944799 -0300 ++++ VirtualBox-4.2.12/Config.kmk 2013-05-23 18:48:57.560690206 -0300 @@ -56,9 +56,6 @@ PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES @@ -1001,8 +1001,9 @@ else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_TESTSUITE && !VBOX_ONLY_DOCS # +diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp --- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-04-12 07:38:01.000000000 -0300 -+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-05-10 17:03:11.087825690 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-05-23 18:59:56.434051894 -0300 @@ -650,27 +650,6 @@ } }; @@ -1039,3 +1040,46 @@ #ifdef VBOX_WITH_DEBUGGER_GUI /* 'Debug' actions: */ +diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h +--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h 2013-04-12 07:38:01.000000000 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h 2013-05-24 11:26:13.789861574 -0300 +@@ -62,7 +62,6 @@ + UIActionIndexRuntime_Menu_SharedFolders, + UIActionIndexRuntime_Simple_SharedFoldersDialog, + UIActionIndexRuntime_Toggle_VRDEServer, +- UIActionIndexRuntime_Simple_InstallGuestTools, + + #ifdef VBOX_WITH_DEBUGGER_GUI + /* 'Debugger' menu actions: */ +diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp +--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp 2013-04-12 07:38:01.000000000 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp 2013-05-24 11:27:14.723176263 -0300 +@@ -651,7 +651,6 @@ + m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders)); + m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog)); + m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer)); +- m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools)); + } + + void UIMachineLogic::prepareActionConnections() +@@ -705,8 +704,6 @@ + this, SLOT(sltOpenSharedFoldersDialog())); + connect(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer), SIGNAL(toggled(bool)), + this, SLOT(sltSwitchVrde(bool))); +- connect(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools), SIGNAL(triggered()), +- this, SLOT(sltInstallGuestAdditions())); + + #ifdef VBOX_WITH_DEBUGGER_GUI + /* "Debug" actions connections: */ +diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp +--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp 2013-04-12 07:38:01.000000000 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp 2013-05-24 11:28:03.193841501 -0300 +@@ -244,8 +244,6 @@ + pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkAdaptersDialog)); + pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog)); + pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer)); +- pMenu->addSeparator(); +- pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools)); + } + + #ifdef VBOX_WITH_DEBUGGER_GUI |