diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-12 22:53:11 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-12 22:53:11 -0300 |
commit | e14736ca7ac051726b587d8fdb8368be502a9109 (patch) | |
tree | 6a40b3b2de9bf45e8f31ba5fd45ee8f2615bd4ae /libre/virtualbox-libre/free-distros.patch | |
parent | e6e169990bdfc35fb6151f148510bf3f0da1dc1e (diff) | |
parent | 360a407f262ac47087ff29718465fbfc7765cb73 (diff) | |
download | abslibre-e14736ca7ac051726b587d8fdb8368be502a9109.tar.gz abslibre-e14736ca7ac051726b587d8fdb8368be502a9109.tar.bz2 abslibre-e14736ca7ac051726b587d8fdb8368be502a9109.zip |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to 'libre/virtualbox-libre/free-distros.patch')
-rw-r--r-- | libre/virtualbox-libre/free-distros.patch | 216 |
1 files changed, 118 insertions, 98 deletions
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch index 913fe7039..025a2b9f4 100644 --- a/libre/virtualbox-libre/free-distros.patch +++ b/libre/virtualbox-libre/free-distros.patch @@ -1,8 +1,8 @@ diff --git a/src/VBox/Main/src-all/Global.cpp b/src/VBox/Main/src-all/Global.cpp -index 8c6ab79..1e048d9 100644 +index 2cd5a81..f234d58 100644 --- a/src/VBox/Main/src-all/Global.cpp +++ b/src/VBox/Main/src-all/Global.cpp -@@ -33,285 +33,361 @@ const Global::OSType Global::sOSTypes[] = +@@ -33,293 +33,369 @@ const Global::OSType Global::sOSTypes[] = VBOXOSTYPE_Unknown, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, @@ -78,6 +78,14 @@ index 8c6ab79..1e048d9 100644 - VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, - 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, +- { "Windows", "Microsoft Windows", "Windows81", "Windows 8.1", +- VBOXOSTYPE_Win8, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE, +- 1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, +- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, +- { "Windows", "Microsoft Windows", "Windows81_64", "Windows 8.1 (64 bit)", +- VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, +- 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, +- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, - { "Windows", "Microsoft Windows", "Windows2012_64", "Windows 2012 (64 bit)", - VBOXOSTYPE_Win2k12_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, - 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, @@ -376,6 +384,14 @@ index 8c6ab79..1e048d9 100644 + VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, ++ { "Non-free OSs", "Non-free Operating Systems", "Windows81", "Windows 8.1", ++ VBOXOSTYPE_Win8, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE, ++ 1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, ++ { "Non-free OSs", "Non-free Operating Systems", "Windows81_64", "Windows 8.1 (64 bit)", ++ VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, ++ 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, + { "Non-free OSs", "Non-free Operating Systems", "Windows2012_64", "Windows 2012 (64 bit)", + VBOXOSTYPE_Win2k12_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, @@ -496,7 +512,7 @@ index 8c6ab79..1e048d9 100644 #ifdef VBOX_WITH_RAW_RING1 VBOXOSTYPE_QNX, VBOXOSHINT_NONE, #else -@@ -319,7 +395,7 @@ const Global::OSType Global::sOSTypes[] = +@@ -327,7 +403,7 @@ const Global::OSType Global::sOSTypes[] = #endif 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, @@ -506,53 +522,15 @@ 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 bd5bd86..c7a8c87 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 +@@ -44,10 +44,80 @@ struct osTypePattern static const osTypePattern gs_OSTypePattern[] = { - /* DOS: */ - { QRegExp("DOS", Qt::CaseInsensitive), "DOS" }, -- -- /* Windows: */ -- { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" }, -- { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" }, -- { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" }, -- { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "WindowsNT4" }, -- { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "WindowsXP_64" }, -- { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "WindowsXP" }, -- { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" }, -- { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" }, -- { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" }, -- { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" }, -- { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" }, -- { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" }, -- { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" }, -- { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" }, -- { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" }, -- { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" }, -- { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" }, -- { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" }, -- { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" }, -- { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" }, -- -- /* Solaris: */ -- { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" }, -- { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" }, -- { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" }, -- { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" }, -- { QRegExp("So", Qt::CaseInsensitive), "Solaris" }, -- -- /* OS/2: */ -- { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" }, -- { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" }, -- { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" }, -- { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" }, -- { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" }, -- -- /* Code names for Linux distributions: */ + /* Code names for free GNU/Linux distributions */ + { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" }, + { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" }, @@ -579,31 +557,39 @@ 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("((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" }, - { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)", Qt::CaseInsensitive), "Fedora" }, ++ { 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" }, ++ { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)", Qt::CaseInsensitive), "Debian" }, ++ { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", Qt::CaseInsensitive), "Fedora_64" }, ++ { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)", Qt::CaseInsensitive), "Fedora" }, -- /* Regular names of Linux distributions: */ +- /* Windows: */ + /* Regular names of non-free GNU/Linux distributions: */ - { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, - { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, - { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -116,15 +102,52 @@ static const osTypePattern gs_OSTypePattern[] = - { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" }, - { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, - { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, -- { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" }, -- { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" }, -- { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" }, -- { QRegExp("((((Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" }, -- { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" }, -- { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" }, -- { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" }, -- -- /* Other: */ ++ { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, ++ { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, ++ { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, ++ { QRegExp("Deb", Qt::CaseInsensitive), "Debian" }, ++ { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "OpenSUSE_64" }, ++ { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "OpenSUSE" }, ++ { QRegExp("Fe.*64", Qt::CaseInsensitive), "Fedora_64" }, ++ { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" }, ++ { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" }, ++ { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" }, ++ { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" }, ++ { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" }, ++ { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" }, ++ { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" }, ++ { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" }, ++ { QRegExp("Tur", Qt::CaseInsensitive), "Turbolinux" }, ++ { QRegExp("Ub.*64", Qt::CaseInsensitive), "Ubuntu_64" }, ++ { QRegExp("Ub", Qt::CaseInsensitive), "Ubuntu" }, ++ { QRegExp("Xa.*64", Qt::CaseInsensitive), "Xandros_64" }, ++ { QRegExp("Xa", Qt::CaseInsensitive), "Xandros" }, ++ { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "Oracle_64" }, ++ { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" }, ++ { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, ++ { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, + { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" }, + + /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */ @@ -620,40 +606,74 @@ index b335043..59ee885 100644 + + /* Regular names of non-free operating systems: */ + { QRegExp("DOS", Qt::CaseInsensitive), "DOS" }, -+ { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" }, -+ { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" }, -+ { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" }, -+ { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "WindowsNT4" }, -+ { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "WindowsXP_64" }, -+ { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "WindowsXP" }, -+ { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" }, -+ { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" }, -+ { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" }, -+ { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" }, -+ { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" }, -+ { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" }, -+ { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" }, -+ { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" }, -+ { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" }, -+ { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" }, -+ { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" }, -+ { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" }, -+ { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" }, -+ { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" }, -+ { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" }, -+ { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" }, -+ { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" }, -+ { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" }, -+ { QRegExp("So", Qt::CaseInsensitive), "Solaris" }, -+ { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" }, -+ { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" }, -+ { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" }, -+ { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" }, -+ { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" }, + { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" }, + { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" }, + { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" }, +@@ -70,63 +140,16 @@ static const osTypePattern gs_OSTypePattern[] = + { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" }, + { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" }, + { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" }, +- +- /* Solaris: */ + { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" }, + { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" }, + { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" }, + { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" }, + { QRegExp("So", Qt::CaseInsensitive), "Solaris" }, +- +- /* OS/2: */ + { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" }, + { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" }, + { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" }, + { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" }, + { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" }, +- +- /* Code names for Linux distributions: */ +- { 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" }, +- { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)", Qt::CaseInsensitive), "Debian" }, +- { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", Qt::CaseInsensitive), "Fedora_64" }, +- { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)", Qt::CaseInsensitive), "Fedora" }, +- +- /* Regular names of Linux distributions: */ +- { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, +- { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, +- { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, +- { QRegExp("Deb", Qt::CaseInsensitive), "Debian" }, +- { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "OpenSUSE_64" }, +- { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "OpenSUSE" }, +- { QRegExp("Fe.*64", Qt::CaseInsensitive), "Fedora_64" }, +- { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" }, +- { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" }, +- { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" }, +- { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" }, +- { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" }, +- { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" }, +- { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" }, +- { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" }, +- { QRegExp("Tur", Qt::CaseInsensitive), "Turbolinux" }, +- { QRegExp("Ub.*64", Qt::CaseInsensitive), "Ubuntu_64" }, +- { QRegExp("Ub", Qt::CaseInsensitive), "Ubuntu" }, +- { QRegExp("Xa.*64", Qt::CaseInsensitive), "Xandros_64" }, +- { QRegExp("Xa", Qt::CaseInsensitive), "Xandros" }, +- { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "Oracle_64" }, +- { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" }, +- { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, +- { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, +- { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" }, +- { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" }, +- { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" }, +- { QRegExp("((((Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" }, +- { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" }, +- { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" }, +- { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" }, +- +- /* Other: */ { QRegExp("L4", Qt::CaseInsensitive), "L4" }, { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" }, { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" }, -@@ -137,6 +160,8 @@ static const osTypePattern gs_OSTypePattern[] = +@@ -139,6 +162,8 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" }, { QRegExp("Net", Qt::CaseInsensitive), "Netware" }, { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" }, @@ -662,7 +682,7 @@ index b335043..59ee885 100644 { QRegExp("Ot", Qt::CaseInsensitive), "Other" }, }; -@@ -231,11 +256,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup) +@@ -233,11 +258,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup) /* Create widgets: */ QVBoxLayout *pMainLayout = new QVBoxLayout(this); { |