summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-10-16 20:56:03 -0200
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-10-16 20:56:03 -0200
commita7fd62be588bd91e5d29cf46050765db6a1c539e (patch)
tree2baa3cabe8663ca0869969db426717195941b5fa /libre
parenteeca7638c292f648065344a9959ca4ae3083934f (diff)
virtualbox-libre-4.2.0-4.1: fixing some bugs on virtual machine creation wizard
Diffstat (limited to 'libre')
-rwxr-xr-xlibre/virtualbox-libre/PKGBUILD4
-rw-r--r--libre/virtualbox-libre/free-distros.patch36
2 files changed, 20 insertions, 20 deletions
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 931f0f492..0c1bb624f 100755
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=('virtualbox-libre'
'virtualbox-libre-guest-utils'
'virtualbox-libre-guest-source')
pkgver=4.2.0
-pkgrel=4
+pkgrel=4.1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -109,7 +109,7 @@ md5sums=('691b4134983ce7d89b9fb683305cb647'
'4da8eeb2ece7e475fc7a0d1003da26c6'
'5e4187af59726d71c5be48d0cd816c34'
'67cc4c8611890038eb3e4114ae899525'
- '8864e92c5e997c45e27a51020cef7e12')
+ '276292b9183c38945e1e75f7d9e1baa9')
#_extramodules=extramodules-3.5-LIBRE
#_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index 34fc3984d..2f6ab3491 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -500,8 +500,8 @@
1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 },
--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-08-29 11:13:40.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-10-15 22:30:16.982062202 -0200
-@@ -44,45 +44,45 @@
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-10-16 20:51:20.628787157 -0200
+@@ -44,45 +44,33 @@
static const osTypePattern gs_OSTypePattern[] =
{
@@ -542,18 +542,6 @@
- { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
- { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
- { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
-+ /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */
-+ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
-+ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
-+ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
-+ { QRegExp("((((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
-+ { QRegExp("(((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
-+ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
-+ { QRegExp("(GNU[/|!-]{,1}Li)|(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
-+ { QRegExp("(GNU-Hu)|(GNU[/|!-]{,1}Hu)|(Hu)", Qt::CaseInsensitive), "GNUHurd" },
-+ { QRegExp("GNU.*64", Qt::CaseInsensitive), "GNU_64" },
-+ { QRegExp("GNU", Qt::CaseInsensitive), "GNU" },
-+
+ /* Code names for free GNU/Linux distributions */
+ { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" },
+ { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" },
@@ -563,8 +551,8 @@
+ { QRegExp("(90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)", Qt::CaseInsensitive), "Blag" },
+
+ /* Regular names of free GNU/Linux distributions */
-+ { QRegExp("Pa.*64", Qt::CaseInsensitive), "Parabola_64" },
-+ { QRegExp("Pa", Qt::CaseInsensitive), "Parabola" },
++ { QRegExp("((Pa.*GNU[/|!-]{,1}Li)|(Pa.*Li)|(Pa)).*64", Qt::CaseInsensitive), "Parabola_64" },
++ { QRegExp("(Pa.*GNU[/|!-]{,1}Li)|(Pa.*Li)|(Pa)", Qt::CaseInsensitive), "Parabola" },
+ { QRegExp("((gNe)|(new)|(Sen)).*64", Qt::CaseInsensitive), "gNewSense_64" },
+ { QRegExp("(gNe)|(new)|(Sen)", Qt::CaseInsensitive), "gNewSense" },
+ { QRegExp("Bla.*64", Qt::CaseInsensitive), "Blag_64" },
@@ -585,7 +573,7 @@
{ QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
{ QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" },
{ QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -90,7 +90,7 @@
+@@ -90,7 +78,7 @@
{ QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" },
{ QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" },
@@ -594,7 +582,7 @@
{ QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
{ QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
{ QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -115,15 +115,38 @@
+@@ -115,15 +103,50 @@
{ QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
{ QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
{ QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
@@ -607,6 +595,18 @@
- { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
- /* Other: */
++ /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */
++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
++ { QRegExp("((((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
++ { QRegExp("(((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
++ { QRegExp("(GNU[/|!-]{,1}Li)|(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
++ { QRegExp("(GNU-Hu)|(GNU[/|!-]{,1}Hu)|(Hu)", Qt::CaseInsensitive), "GNUHurd" },
++ { QRegExp("GNU.*64", Qt::CaseInsensitive), "GNU_64" },
++ { QRegExp("GNU", Qt::CaseInsensitive), "GNU" },
++
+ /* Regular names of non-free operating systems: */
+ { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
+ { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },