]>
Commit | Line | Data |
---|---|---|
621cd96c ER |
1 | --- VirtualBox-4.2.12/./src/VBox/Main/xml/Settings.cpp~ 2013-04-12 13:38:26.000000000 +0300 |
2 | +++ VirtualBox-4.2.12/./src/VBox/Main/xml/Settings.cpp 2013-05-13 15:49:30.035999373 +0300 | |
3 | @@ -3408,6 +3408,7 @@ | |
4 | { "xandros", "Xandros" }, | |
5 | { "freebsd", "FreeBSD" }, | |
6 | { "openbsd", "OpenBSD" }, | |
7 | + { "pld", "PLD" }, | |
8 | { "netbsd", "NetBSD" }, | |
9 | { "netware", "Netware" }, | |
10 | { "solaris", "Solaris" }, | |
ebc5ec73 JP |
11 | --- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2.qrc~ 2013-04-12 13:37:50.000000000 +0300 |
12 | +++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2013-05-13 15:51:14.323890458 +0300 | |
621cd96c ER |
13 | @@ -26,6 +26,8 @@ |
14 | <file alias="os_netware.png">images/os_netware.png</file> | |
621cd96c | 15 | <file alias="os_openbsd_64.png">images/os_openbsd_64.png</file> |
ebc5ec73 | 16 | <file alias="os_openbsd.png">images/os_openbsd.png</file> |
621cd96c ER |
17 | + <file alias="os_pld.png">images/os_pld.png</file> |
18 | + <file alias="os_pld_64.png">images/os_pld_64.png</file> | |
8c008609 | 19 | <file alias="os_opensuse_64.png">images/os_opensuse_64.png</file> |
ebc5ec73 JP |
20 | <file alias="os_opensuse.png">images/os_opensuse.png</file> |
21 | <file alias="os_oracle_64.png">images/os_oracle_64.png</file> | |
22 | --- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc~ 2013-04-12 13:37:50.000000000 +0300 | |
23 | +++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2013-05-13 15:51:14.323890458 +0300 | |
24 | @@ -26,6 +26,8 @@ | |
25 | <file alias="os_netware_x2.png">images/x2/os_netware_x2.png</file> | |
26 | <file alias="os_openbsd_64_x2.png">images/x2/os_openbsd_64_x2.png</file> | |
27 | <file alias="os_openbsd_x2.png">images/x2/os_openbsd_x2.png</file> | |
28 | + <file alias="os_pld.png">images/os_pld.png</file> | |
29 | + <file alias="os_pld_64.png">images/os_pld_64.png</file> | |
30 | <file alias="os_opensuse_64_x2.png">images/x2/os_opensuse_64_x2.png</file> | |
31 | <file alias="os_opensuse_x2.png">images/x2/os_opensuse_x2.png</file> | |
32 | <file alias="os_oracle_64_x2.png">images/x2/os_oracle_64_x2.png</file> | |
33 | --- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc~ 2013-04-12 13:37:50.000000000 +0300 | |
34 | +++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc 2013-05-13 15:51:14.323890458 +0300 | |
35 | @@ -26,6 +26,8 @@ | |
36 | <file alias="os_netware_x3.png">images/x3/os_netware_x3.png</file> | |
37 | <file alias="os_openbsd_64_x3.png">images/x3/os_openbsd_64_x3.png</file> | |
38 | <file alias="os_openbsd_x3.png">images/x3/os_openbsd_x3.png</file> | |
39 | + <file alias="os_pld.png">images/os_pld.png</file> | |
40 | + <file alias="os_pld_64.png">images/os_pld_64.png</file> | |
41 | <file alias="os_opensuse_64_x3.png">images/x3/os_opensuse_64_x3.png</file> | |
42 | <file alias="os_opensuse_x3.png">images/x3/os_opensuse_x3.png</file> | |
43 | <file alias="os_oracle_64_x3.png">images/x3/os_oracle_64_x3.png</file> | |
44 | --- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc~ 2013-04-12 13:37:50.000000000 +0300 | |
45 | +++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc 2013-05-13 15:51:14.323890458 +0300 | |
46 | @@ -26,6 +26,8 @@ | |
47 | <file alias="os_netware_x4.png">images/x4/os_netware_x4.png</file> | |
48 | <file alias="os_openbsd_64_x4.png">images/x4/os_openbsd_64_x4.png</file> | |
49 | <file alias="os_openbsd_x4.png">images/x4/os_openbsd_x4.png</file> | |
50 | + <file alias="os_pld.png">images/os_pld.png</file> | |
51 | + <file alias="os_pld_64.png">images/os_pld_64.png</file> | |
52 | <file alias="os_opensuse_64_x4.png">images/x4/os_opensuse_64_x4.png</file> | |
53 | <file alias="os_opensuse_x4.png">images/x4/os_opensuse_x4.png</file> | |
54 | <file alias="os_oracle_64_x4.png">images/x4/os_oracle_64_x4.png</file> | |
d19b622b JP |
55 | --- VirtualBox-5.1.2/src/VBox/Main/src-all/Global.cpp.orig 2016-07-29 19:25:16.731328887 +0200 |
56 | +++ VirtualBox-5.1.2/src/VBox/Main/src-all/Global.cpp 2016-07-29 19:31:59.252427682 +0200 | |
57 | @@ -321,6 +321,17 @@ | |
58 | 512, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, | |
8c008609 | 59 | StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, |
d19b622b JP |
60 | |
61 | + { "Linux", "Linux", "PLD", "PLD Linux (32-bit)", | |
62 | + VBOXOSTYPE_Linux26, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, | |
ebc5ec73 | 63 | + 512, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, |
d19b622b JP |
64 | + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, |
65 | + | |
66 | + { "Linux", "Linux", "PLD_64", "PLD Linux (64-bit)", | |
67 | + VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | |
68 | + | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, | |
ebc5ec73 | 69 | + 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, |
d19b622b JP |
70 | + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, |
71 | + | |
8c008609 | 72 | { "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier (32-bit)", |
621cd96c | 73 | VBOXOSTYPE_Solaris, VBOXOSHINT_NONE, |
d19b622b | 74 | 768, 16, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, |
621cd96c ER |
75 | --- VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp~ 2014-02-25 19:09:15.000000000 +0200 |
76 | +++ VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp 2014-02-28 09:52:48.663191185 +0200 | |
77 | @@ -141,6 +141,8 @@ | |
78 | { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Xandros_x64 }, | |
79 | { ovf::CIMOSType_CIMOS_Solaris, VBOXOSTYPE_OpenSolaris }, | |
80 | { ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_OpenSolaris_x64 }, | |
81 | + { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_PLD }, | |
82 | + { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_PLD_x64 }, | |
83 | ||
84 | // types added with CIM 2.25.0 follow: | |
85 | { ovf::CIMOSType_CIMOS_WindowsServer2008R2, VBOXOSTYPE_Win2k8 }, // duplicate, see above | |
86 | --- VirtualBox-4.3.8/include/VBox/ostypes.h~ 2014-02-25 18:59:48.000000000 +0200 | |
87 | +++ VirtualBox-4.3.8/include/VBox/ostypes.h 2014-02-28 09:56:34.440314457 +0200 | |
88 | @@ -103,6 +103,8 @@ | |
89 | VBOXOSTYPE_Xandros_x64 = 0x5D100, | |
90 | VBOXOSTYPE_Oracle = 0x5E000, | |
91 | VBOXOSTYPE_Oracle_x64 = 0x5E100, | |
92 | + VBOXOSTYPE_PLD = 0x5F000, | |
93 | + VBOXOSTYPE_PLD_x64 = 0x5F100, | |
94 | VBOXOSTYPE_FreeBSD = 0x60000, | |
95 | VBOXOSTYPE_FreeBSD_x64 = 0x60100, | |
96 | VBOXOSTYPE_OpenBSD = 0x61000, | |
97 | --- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp~ 2014-02-25 19:09:00.000000000 +0200 | |
98 | +++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2014-02-28 09:58:59.493698505 +0200 | |
99 | @@ -133,6 +133,8 @@ | |
100 | { QRegExp("Xa.*32", Qt::CaseInsensitive), "Xandros" }, | |
ecbe1249 JR |
101 | { QRegExp("((Or)|(oel)|(ol)).*64", Qt::CaseInsensitive), "Oracle_64" }, |
102 | { QRegExp("((Or)|(oel)|(ol)).*32", Qt::CaseInsensitive), "Oracle" }, | |
621cd96c ER |
103 | + { QRegExp("PLD.*64", Qt::CaseInsensitive), "PLD_64" }, |
104 | + { QRegExp("PLD.*32", Qt::CaseInsensitive), "PLD" }, | |
105 | { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, | |
106 | { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, | |
107 | { QRegExp("((Lin)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" }, | |
8c008609 JP |
108 | --- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIIconPool.cpp.orig 2015-07-09 20:00:01.339965485 +0200 |
109 | +++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIIconPool.cpp 2015-07-09 20:00:40.670058835 +0200 | |
110 | @@ -332,6 +332,8 @@ | |
111 | m_guestOSTypeIconNames.insert("FreeBSD_64", ":/os_freebsd_64.png"); | |
112 | m_guestOSTypeIconNames.insert("OpenBSD", ":/os_openbsd.png"); | |
113 | m_guestOSTypeIconNames.insert("OpenBSD_64", ":/os_openbsd_64.png"); | |
114 | + m_guestOSTypeIconNames.insert("PLD", ":/os_pld.png"); | |
115 | + m_guestOSTypeIconNames.insert("PLD_64", ":/os_pld_64.png"); | |
116 | m_guestOSTypeIconNames.insert("NetBSD", ":/os_netbsd.png"); | |
117 | m_guestOSTypeIconNames.insert("NetBSD_64", ":/os_netbsd_64.png"); | |
118 | m_guestOSTypeIconNames.insert("Solaris", ":/os_solaris.png"); |