diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-10-04 01:57:43 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-10-04 01:57:43 -0300 |
| commit | 117758f0d2800f664adeb5c035211cec54cedbb9 (patch) | |
| tree | f1482b690417b5ba22e4af90dba0ec1b2d4944e5 /libre/virtualbox-libre | |
| parent | a84aa03021a5a26e91f18bcf62442532ff54e101 (diff) | |
virtualbox-libre-4.2.0-3.2: updating free-distros.patch on UIWizardNewVMPageBasic1.cpp
Diffstat (limited to 'libre/virtualbox-libre')
| -rwxr-xr-x | libre/virtualbox-libre/PKGBUILD | 2 | ||||
| -rw-r--r-- | libre/virtualbox-libre/free-distros.patch | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 9238bee6a..8bd1c2022 100755 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -108,7 +108,7 @@ md5sums=('691b4134983ce7d89b9fb683305cb647' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' '67cc4c8611890038eb3e4114ae899525' - 'd2eeec604471dae7e0e9be4b8f1979e5') + '1ede8951f4bebac3b50a8e0b999aa348') #_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 84da590bb..223aeeb16 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-03 23:13:12.530788276 -0300 -@@ -44,45 +44,44 @@ ++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-10-04 01:54:14.693582889 -0300 +@@ -44,45 +44,45 @@ static const osTypePattern gs_OSTypePattern[] = { @@ -543,15 +543,16 @@ - { 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", Qt::CaseInsensitive), "GNU" }, -+ { QRegExp("(GNU-Hu)|(GNU[/|!-]{,1}Hu)|(Hu)", Qt::CaseInsensitive), "GNUHurd" }, + { 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[/|!-]{,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" }, @@ -584,7 +585,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 +89,7 @@ +@@ -90,7 +90,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" }, @@ -593,7 +594,7 @@ { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -115,15 +114,38 @@ +@@ -115,15 +115,38 @@ { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" }, { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, @@ -640,7 +641,7 @@ { QRegExp("L4", Qt::CaseInsensitive), "L4" }, { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" }, { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" }, -@@ -136,6 +158,8 @@ +@@ -136,6 +159,8 @@ { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" }, { QRegExp("Net", Qt::CaseInsensitive), "Netware" }, { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" }, @@ -994,4 +995,4 @@ + m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Non-free OSs"; #endif /* VBOX_WITH_VIDEOHWACCEL */ #ifdef VBOX_WITH_CRHGSMI - /* Check if WDDM mode supported by the guest OS type: */
\ No newline at end of file + /* Check if WDDM mode supported by the guest OS type: */ |