summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-05-24 11:34:13 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-05-24 11:34:13 -0300
commit78146e35a531b102885422eaf6629a00c349a858 (patch)
tree5340e9d9847929951d45bd3e210bba57b9bfd9ec /libre
parent85f98aca87fce886899d74f8c5dcf6b46fe15f70 (diff)
virtualbox-libre: remove Guest Additions Installation option on the menu
Diffstat (limited to 'libre')
-rw-r--r--libre/virtualbox-libre/PKGBUILD2
-rw-r--r--libre/virtualbox-libre/libre.patch48
2 files changed, 47 insertions, 3 deletions
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index cf2a4e4d4..fae16f8ba 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -108,7 +108,7 @@ md5sums=('654e45054ae6589452508d37403dc800'
'c7951fe6888d939f3a7d0dafe477e82b'
'4da8eeb2ece7e475fc7a0d1003da26c6'
'5e4187af59726d71c5be48d0cd816c34'
- 'a757fa81ccf64788952c69dc5e6e43ff'
+ '1665142daf1614193b7cadc4f64d697c'
'50387fba578646a9d29de3f917a199d2')
prepare() {
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
index ec40c0692..22fa5fabf 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