summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/virtualbox-libre/PKGBUILD4
-rw-r--r--libre/virtualbox-libre/free-distros.patch6
-rw-r--r--libre/virtualbox-libre/libre.patch14
3 files changed, 12 insertions, 12 deletions
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 8c4d4ba76..9b90dd554 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -106,8 +106,8 @@ md5sums=('be834de415adaf2f696f7a499f88b4e6'
'c7951fe6888d939f3a7d0dafe477e82b'
'4da8eeb2ece7e475fc7a0d1003da26c6'
'5e4187af59726d71c5be48d0cd816c34'
- '17fca4ba3a751c8a1db19b92b1820462'
- '50387fba578646a9d29de3f917a199d2')
+ '9e0b199059faa3f99def5b0ba6e74009'
+ '2dc83a3286aa8eab080a3a6608ab3f67')
prepare() {
cd "VirtualBox-$pkgver"
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index 913fe7039..fd6d29f3d 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -506,7 +506,7 @@ index 8c6ab79..1e048d9 100644
1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 },
diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-index b335043..59ee885 100644
+index 25928b9..0fd3a6e 100644
--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
@@ -44,46 +44,32 @@ struct osTypePattern
@@ -579,8 +579,8 @@ index b335043..59ee885 100644
+ { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" },
+
+ /* Code names for non-free GNU/Linux distributions: */
- { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
- { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)", Qt::CaseInsensitive), "Ubuntu" },
+ { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
+ { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)", Qt::CaseInsensitive), "Ubuntu" },
{ QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
@@ -91,7 +77,7 @@ static const osTypePattern gs_OSTypePattern[] =
{ QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", Qt::CaseInsensitive), "Fedora_64" },
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
index 75a5ed22f..7f236a678 100644
--- a/libre/virtualbox-libre/libre.patch
+++ b/libre/virtualbox-libre/libre.patch
@@ -1051,18 +1051,18 @@ diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIAct
#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 @@
+diff -Nur VirtualBox-4.2.14.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp VirtualBox-4.2.14/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
+--- VirtualBox-4.2.14.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp 2013-06-21 09:26:42.000000000 -0300
++++ VirtualBox-4.2.14/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp 2013-06-24 18:08:12.915719347 -0300
+@@ -704,7 +704,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 @@
+ /* Move actions into running-n-paused-n-stuck actions group: */
+ m_pRunningOrPausedOrStuckActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_PowerOff));
+@@ -765,8 +764,6 @@
this, SLOT(sltOpenSharedFoldersDialog()));
connect(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer), SIGNAL(toggled(bool)),
this, SLOT(sltSwitchVrde(bool)));