+++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2013-05-13 15:51:14.323890458 +0300
@@ -26,6 +26,8 @@
<file alias="os_netware.png">images/os_netware.png</file>
- <file alias="os_openbsd.png">images/os_openbsd.png</file>
<file alias="os_openbsd_64.png">images/os_openbsd_64.png</file>
-+ <file alias="os_pld.png">images/os_pld.png</file>
+ <file alias="os_openbsd.png">images/os_openbsd.png</file>
+ <file alias="os_pld_64.png">images/os_pld_64.png</file>
- <file alias="os_opensuse.png">images/os_opensuse.png</file>
++ <file alias="os_pld.png">images/os_pld.png</file>
<file alias="os_opensuse_64.png">images/os_opensuse_64.png</file>
- <file alias="os_oracle.png">images/os_oracle.png</file>
+ <file alias="os_opensuse.png">images/os_opensuse.png</file>
+ <file alias="os_oracle_64.png">images/os_oracle_64.png</file>
--- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc~ 2013-04-12 13:37:50.000000000 +0300
+++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2013-05-13 15:51:14.323890458 +0300
@@ -26,6 +26,8 @@
<file alias="os_oracle_64_x4.png">images/x4/os_oracle_64_x4.png</file>
--- VirtualBox-5.1.2/src/VBox/Main/src-all/Global.cpp.orig 2016-07-29 19:25:16.731328887 +0200
+++ VirtualBox-5.1.2/src/VBox/Main/src-all/Global.cpp 2016-07-29 19:31:59.252427682 +0200
-@@ -321,6 +321,17 @@
- 1, 512, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 },
+@@ -321,6 +321,9 @@
+ VBOX_LINUX_SUBTYPE_A_32(SUSE_LE, "SUSE Linux Enterprise (32-bit)", 2048, 16, 8),
+ VBOX_LINUX_SUBTYPE_A_64(SUSE_LE, "SUSE Linux Enterprise (64-bit)", 2048, 16, 8),
-+ { "Linux", "Linux", "PLD", "PLD Linux (32-bit)",
-+ VBOXOSTYPE_PLD, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_X2APIC,
-+ 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
++ VBOX_LINUX_SUBTYPE_A_32(PLD, "PLD Linux (32-bit)", 1024, 16, 8),
++ VBOX_LINUX_SUBTYPE_A_64(PLD, "PLD Linux (64-bit)", 1024, 16, 8),
+
-+ { "Linux", "Linux", "PLD_64", "PLD Linux (64-bit)",
-+ VBOXOSTYPE_PLD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
-+ | VBOXOSHINT_X2APIC,
-+ 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
-+
- { "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier (32-bit)",
- VBOXOSTYPE_Solaris, VBOXOSHINT_NONE,
- 1, 1024, 16, 32 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ VBOX_LINUX_SUBTYPE_A_32(Turbolinux, "Turbolinux (32-bit)", 384, 16, 8),
+ VBOX_LINUX_SUBTYPE_A_64(Turbolinux, "Turbolinux (64-bit)", 384, 16, 8),
+
--- VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp~ 2014-02-25 19:09:15.000000000 +0200
+++ VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp 2014-02-28 09:52:48.663191185 +0200
@@ -141,6 +141,8 @@
--- VirtualBox-4.3.8/include/VBox/ostypes.h~ 2014-02-25 18:59:48.000000000 +0200
+++ VirtualBox-4.3.8/include/VBox/ostypes.h 2014-02-28 09:56:34.440314457 +0200
@@ -103,6 +103,8 @@
- VBOXOSTYPE_Xandros_x64 = 0x5D100,
- VBOXOSTYPE_Oracle = 0x5E000,
- VBOXOSTYPE_Oracle_x64 = 0x5E100,
+ VBOXOSTYPE_Oracle8_x64 = 0x5E105, // 64-bit only
+ VBOXOSTYPE_Oracle9_x64 = 0x5E106, // 64-bit only
+ VBOXOSTYPE_Oracle_latest_x64 = VBOXOSTYPE_Oracle9_x64,
+ VBOXOSTYPE_PLD = 0x5F000,
+ VBOXOSTYPE_PLD_x64 = 0x5F100,
VBOXOSTYPE_FreeBSD = 0x60000,
VBOXOSTYPE_FreeBSD_x64 = 0x60100,
VBOXOSTYPE_OpenBSD = 0x61000,
---- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp~ 2014-02-25 19:09:00.000000000 +0200
-+++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2014-02-28 09:58:59.493698505 +0200
+--- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp~ 2014-02-25 19:09:00.000000000 +0200
++++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp 2014-02-28 09:58:59.493698505 +0200
@@ -133,6 +133,8 @@
- { QRegExp("Xa.*32", Qt::CaseInsensitive), "Xandros" },
- { QRegExp("((Or)|(oel)|(ol)).*64", Qt::CaseInsensitive), "Oracle_64" },
- { QRegExp("((Or)|(oel)|(ol)).*32", Qt::CaseInsensitive), "Oracle" },
-+ { QRegExp("PLD.*64", Qt::CaseInsensitive), "PLD_64" },
-+ { QRegExp("PLD.*32", Qt::CaseInsensitive), "PLD" },
- { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
- { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
- { QRegExp("((Lin)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
+ { QRegularExpression("Xa.*32", QRegularExpression::CaseInsensitiveOption), "Xandros" },
+ { QRegularExpression("((Or)|(oel)|(^ol)).*64", QRegularExpression::CaseInsensitiveOption), "Oracle_64" },
+ { QRegularExpression("((Or)|(oel)|(^ol)).*32", QRegularExpression::CaseInsensitiveOption), "Oracle" },
++ { QRegularExpression("PLD.*64", QRegularExpression::CaseInsensitiveOption), "PLD_64" },
++ { QRegularExpression("PLD.*32", QRegularExpression::CaseInsensitiveOption), "PLD" },
+ { QRegularExpression("Knoppix", QRegularExpression::CaseInsensitiveOption), "Linux26" },
+ { QRegularExpression("Dsl", QRegularExpression::CaseInsensitiveOption), "Linux24" },
+ { QRegularExpression("((Lin)|(lnx)).*2.?2", QRegularExpression::CaseInsensitiveOption), "Linux22" },
--- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIIconPool.cpp.orig 2015-07-09 20:00:01.339965485 +0200
+++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIIconPool.cpp 2015-07-09 20:00:40.670058835 +0200
@@ -332,6 +332,8 @@
projects / packages / VirtualBox.git / blobdiff