From 1a3fa24fbeb79482ff1137c87fb52e6d7ac09cf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 27 Dec 2012 21:44:09 -0200 Subject: virtualbox-libre-4.2.6-1.1: fixing some issues on free-distros.patch --- libre/virtualbox-libre/PKGBUILD | 4 ++-- libre/virtualbox-libre/free-distros.patch | 40 +++++++++++++++++++++++-------- 2 files changed, 32 insertions(+), 12 deletions(-) (limited to 'libre/virtualbox-libre') diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 48761e058..586b69d5c 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -13,7 +13,7 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-sdk' 'virtualbox-libre-guest-utils') pkgver=4.2.6 -pkgrel=1 +pkgrel=1.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -108,7 +108,7 @@ md5sums=('d680aeb3b4379b8281527aeb012b2df5' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' '05d166104a66ee479896c941ac27a3d0' - 'c2ede303258ed763a2ed861adf537a3f') + '7d34a1db0cf7b0d6eef66bab65418b02') build() { cd "VirtualBox-$pkgver" diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch index a522dea2f..26e4b7ce8 100644 --- a/libre/virtualbox-libre/free-distros.patch +++ b/libre/virtualbox-libre/free-distros.patch @@ -502,7 +502,7 @@ index 6ae0372..df65e60 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 c5a4cfe..b3e0247 100644 +index c5a4cfe..7d2b363 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp +++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp @@ -44,46 +44,33 @@ struct osTypePattern @@ -588,7 +588,7 @@ index c5a4cfe..b3e0247 100644 { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -116,15 +103,50 @@ static const osTypePattern gs_OSTypePattern[] = +@@ -116,15 +103,51 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" }, { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, @@ -625,6 +625,7 @@ index c5a4cfe..b3e0247 100644 + { 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" }, @@ -647,7 +648,7 @@ index c5a4cfe..b3e0247 100644 { QRegExp("L4", Qt::CaseInsensitive), "L4" }, { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" }, { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" }, -@@ -137,6 +159,8 @@ static const osTypePattern gs_OSTypePattern[] = +@@ -137,6 +160,8 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" }, { QRegExp("Net", Qt::CaseInsensitive), "Netware" }, { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" }, @@ -656,7 +657,7 @@ index c5a4cfe..b3e0247 100644 { QRegExp("Ot", Qt::CaseInsensitive), "Other" }, }; -@@ -231,11 +255,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup) +@@ -231,11 +256,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup) /* Create widgets: */ QVBoxLayout *pMainLayout = new QVBoxLayout(this); { @@ -720,10 +721,10 @@ index 9a31a4c..7db11ad 100644 diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc -index 075f097..3d311e1 100644 +index 4523dad..f430bec 100644 --- a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc +++ b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc -@@ -70,6 +70,24 @@ +@@ -71,6 +71,24 @@ images/os_oracle_64.png images/os_macosx.png images/os_macosx_64.png @@ -748,11 +749,30 @@ index 075f097..3d311e1 100644 images/hd_16px.png images/hd_disabled_16px.png images/hd_32px.png +@@ -170,18 +188,6 @@ + images/status_check_32px.png + images/status_error_16px.png + images/status_error_32px.png +- images/extension_pack_16px.png +- images/extension_pack_disabled_16px.png +- images/extension_pack_32px.png +- images/extension_pack_disabled_32px.png +- images/extension_pack_install_16px.png +- images/extension_pack_install_disabled_16px.png +- images/extension_pack_install_32px.png +- images/extension_pack_install_disabled_32px.png +- images/extension_pack_uninstall_16px.png +- images/extension_pack_uninstall_disabled_16px.png +- images/extension_pack_uninstall_32px.png +- images/extension_pack_uninstall_disabled_32px.png + images/proxy_16px.png + images/proxy_disabled_16px.png + images/proxy_32px.png diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp -index ec404df..c09e3b1 100644 +index 8af9597..39a8d39 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp -@@ -4334,11 +4334,11 @@ void VBoxGlobal::init() +@@ -4336,11 +4336,11 @@ void VBoxGlobal::init() {"OS2Warp45", ":/os_os2warp45.png"}, {"OS2eCS", ":/os_os2ecs.png"}, {"OS2", ":/os_os2_other.png"}, @@ -769,7 +789,7 @@ index ec404df..c09e3b1 100644 {"ArchLinux", ":/os_archlinux.png"}, {"ArchLinux_64", ":/os_archlinux_64.png"}, {"Debian", ":/os_debian.png"}, -@@ -4361,7 +4361,7 @@ void VBoxGlobal::init() +@@ -4363,7 +4363,7 @@ void VBoxGlobal::init() {"Xandros_64", ":/os_xandros_64.png"}, {"Oracle", ":/os_oracle.png"}, {"Oracle_64", ":/os_oracle_64.png"}, @@ -778,7 +798,7 @@ index ec404df..c09e3b1 100644 {"FreeBSD", ":/os_freebsd.png"}, {"FreeBSD_64", ":/os_freebsd_64.png"}, {"OpenBSD", ":/os_openbsd.png"}, -@@ -4377,6 +4377,25 @@ void VBoxGlobal::init() +@@ -4379,6 +4379,25 @@ void VBoxGlobal::init() {"MacOS", ":/os_macosx.png"}, {"MacOS_64", ":/os_macosx_64.png"}, {"JRockitVE", ":/os_jrockitve.png"}, -- cgit v1.2.3-2-g168b