]>
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> | |
e313de71 | 15 | <file alias="os_openbsd_64.png">images/os_openbsd_64.png</file> |
ef335418 | 16 | <file alias="os_openbsd.png">images/os_openbsd.png</file> |
621cd96c | 17 | + <file alias="os_pld_64.png">images/os_pld_64.png</file> |
ef335418 | 18 | + <file alias="os_pld.png">images/os_pld.png</file> |
e313de71 | 19 | <file alias="os_opensuse_64.png">images/os_opensuse_64.png</file> |
ef335418 JR |
20 | <file alias="os_opensuse.png">images/os_opensuse.png</file> |
21 | <file alias="os_oracle_64.png">images/os_oracle_64.png</file> | |
ebc5ec73 JP |
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 | |
ef335418 JR |
57 | @@ -321,6 +321,9 @@ |
58 | VBOX_LINUX_SUBTYPE_A_32(SUSE_LE, "SUSE Linux Enterprise (32-bit)", 2048, 16, 8), | |
59 | VBOX_LINUX_SUBTYPE_A_64(SUSE_LE, "SUSE Linux Enterprise (64-bit)", 2048, 16, 8), | |
d19b622b | 60 | |
ef335418 JR |
61 | + VBOX_LINUX_SUBTYPE_A_32(PLD, "PLD Linux (32-bit)", 1024, 16, 8), |
62 | + VBOX_LINUX_SUBTYPE_A_64(PLD, "PLD Linux (64-bit)", 1024, 16, 8), | |
d19b622b | 63 | + |
ef335418 JR |
64 | VBOX_LINUX_SUBTYPE_A_32(Turbolinux, "Turbolinux (32-bit)", 384, 16, 8), |
65 | VBOX_LINUX_SUBTYPE_A_64(Turbolinux, "Turbolinux (64-bit)", 384, 16, 8), | |
66 | ||
621cd96c ER |
67 | --- VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp~ 2014-02-25 19:09:15.000000000 +0200 |
68 | +++ VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp 2014-02-28 09:52:48.663191185 +0200 | |
69 | @@ -141,6 +141,8 @@ | |
70 | { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Xandros_x64 }, | |
71 | { ovf::CIMOSType_CIMOS_Solaris, VBOXOSTYPE_OpenSolaris }, | |
72 | { ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_OpenSolaris_x64 }, | |
73 | + { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_PLD }, | |
74 | + { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_PLD_x64 }, | |
75 | ||
76 | // types added with CIM 2.25.0 follow: | |
77 | { ovf::CIMOSType_CIMOS_WindowsServer2008R2, VBOXOSTYPE_Win2k8 }, // duplicate, see above | |
78 | --- VirtualBox-4.3.8/include/VBox/ostypes.h~ 2014-02-25 18:59:48.000000000 +0200 | |
79 | +++ VirtualBox-4.3.8/include/VBox/ostypes.h 2014-02-28 09:56:34.440314457 +0200 | |
80 | @@ -103,6 +103,8 @@ | |
ef335418 JR |
81 | VBOXOSTYPE_Oracle8_x64 = 0x5E105, // 64-bit only |
82 | VBOXOSTYPE_Oracle9_x64 = 0x5E106, // 64-bit only | |
83 | VBOXOSTYPE_Oracle_latest_x64 = VBOXOSTYPE_Oracle9_x64, | |
621cd96c ER |
84 | + VBOXOSTYPE_PLD = 0x5F000, |
85 | + VBOXOSTYPE_PLD_x64 = 0x5F100, | |
86 | VBOXOSTYPE_FreeBSD = 0x60000, | |
87 | VBOXOSTYPE_FreeBSD_x64 = 0x60100, | |
88 | VBOXOSTYPE_OpenBSD = 0x61000, | |
ef335418 JR |
89 | --- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp~ 2014-02-25 19:09:00.000000000 +0200 |
90 | +++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp 2014-02-28 09:58:59.493698505 +0200 | |
621cd96c | 91 | @@ -133,6 +133,8 @@ |
ef335418 JR |
92 | { QRegularExpression("Xa.*32", QRegularExpression::CaseInsensitiveOption), "Xandros" }, |
93 | { QRegularExpression("((Or)|(oel)|(^ol)).*64", QRegularExpression::CaseInsensitiveOption), "Oracle_64" }, | |
94 | { QRegularExpression("((Or)|(oel)|(^ol)).*32", QRegularExpression::CaseInsensitiveOption), "Oracle" }, | |
95 | + { QRegularExpression("PLD.*64", QRegularExpression::CaseInsensitiveOption), "PLD_64" }, | |
96 | + { QRegularExpression("PLD.*32", QRegularExpression::CaseInsensitiveOption), "PLD" }, | |
97 | { QRegularExpression("Knoppix", QRegularExpression::CaseInsensitiveOption), "Linux26" }, | |
98 | { QRegularExpression("Dsl", QRegularExpression::CaseInsensitiveOption), "Linux24" }, | |
99 | { QRegularExpression("((Lin)|(lnx)).*2.?2", QRegularExpression::CaseInsensitiveOption), "Linux22" }, | |
8c008609 JP |
100 | --- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIIconPool.cpp.orig 2015-07-09 20:00:01.339965485 +0200 |
101 | +++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIIconPool.cpp 2015-07-09 20:00:40.670058835 +0200 | |
102 | @@ -332,6 +332,8 @@ | |
103 | m_guestOSTypeIconNames.insert("FreeBSD_64", ":/os_freebsd_64.png"); | |
104 | m_guestOSTypeIconNames.insert("OpenBSD", ":/os_openbsd.png"); | |
105 | m_guestOSTypeIconNames.insert("OpenBSD_64", ":/os_openbsd_64.png"); | |
106 | + m_guestOSTypeIconNames.insert("PLD", ":/os_pld.png"); | |
107 | + m_guestOSTypeIconNames.insert("PLD_64", ":/os_pld_64.png"); | |
108 | m_guestOSTypeIconNames.insert("NetBSD", ":/os_netbsd.png"); | |
109 | m_guestOSTypeIconNames.insert("NetBSD_64", ":/os_netbsd_64.png"); | |
110 | m_guestOSTypeIconNames.insert("Solaris", ":/os_solaris.png"); |