initial update to 5.1 line (version 5.1.2)
[packages/VirtualBox.git] / pld-guest.patch
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" },
11 --- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox1.qrc~  2013-04-12 13:37:50.000000000 +0300
12 +++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox1.qrc   2013-05-13 15:51:14.323890458 +0300
13 @@ -26,6 +26,8 @@
14          <file alias="os_netware.png">images/os_netware.png</file>
15          <file alias="os_openbsd.png">images/os_openbsd.png</file>
16          <file alias="os_openbsd_64.png">images/os_openbsd_64.png</file>
17 +        <file alias="os_pld.png">images/os_pld.png</file>
18 +        <file alias="os_pld_64.png">images/os_pld_64.png</file>
19          <file alias="os_opensuse.png">images/os_opensuse.png</file>
20          <file alias="os_opensuse_64.png">images/os_opensuse_64.png</file>
21          <file alias="os_oracle.png">images/os_oracle.png</file>
22 --- VirtualBox-5.1.2/src/VBox/Main/src-all/Global.cpp.orig      2016-07-29 19:25:16.731328887 +0200
23 +++ VirtualBox-5.1.2/src/VBox/Main/src-all/Global.cpp   2016-07-29 19:31:59.252427682 +0200
24 @@ -321,6 +321,17 @@
25         512,  16,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
26          StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
27  
28 +    { "Linux",   "Linux",             "PLD",            "PLD Linux (32-bit)",
29 +      VBOXOSTYPE_Linux26,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
30 +       512,  16,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
31 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
32 +
33 +    { "Linux",   "Linux",             "PLD_64",         "PLD Linux (64-bit)",
34 +      VBOXOSTYPE_Linux26_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC 
35 +                                | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
36 +      1024,  16,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
37 +        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
38 +
39      { "Solaris", "Solaris",           "Solaris",            "Oracle Solaris 10 5/09 and earlier (32-bit)",
40        VBOXOSTYPE_Solaris,         VBOXOSHINT_NONE,
41         768,  16, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
42 --- VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp~        2014-02-25 19:09:15.000000000 +0200
43 +++ VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp 2014-02-28 09:52:48.663191185 +0200
44 @@ -141,6 +141,8 @@
45      { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Xandros_x64 },
46      { ovf::CIMOSType_CIMOS_Solaris,                              VBOXOSTYPE_OpenSolaris },
47      { ovf::CIMOSType_CIMOS_Solaris_64,                           VBOXOSTYPE_OpenSolaris_x64 },
48 +    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_PLD },
49 +    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_PLD_x64 },
50  
51      // types added with CIM 2.25.0 follow:
52      { ovf::CIMOSType_CIMOS_WindowsServer2008R2,                  VBOXOSTYPE_Win2k8 },           // duplicate, see above
53 --- VirtualBox-4.3.8/include/VBox/ostypes.h~    2014-02-25 18:59:48.000000000 +0200
54 +++ VirtualBox-4.3.8/include/VBox/ostypes.h     2014-02-28 09:56:34.440314457 +0200
55 @@ -103,6 +103,8 @@
56      VBOXOSTYPE_Xandros_x64      = 0x5D100,
57      VBOXOSTYPE_Oracle           = 0x5E000,
58      VBOXOSTYPE_Oracle_x64       = 0x5E100,
59 +    VBOXOSTYPE_PLD              = 0x5F000,
60 +    VBOXOSTYPE_PLD_x64          = 0x5F100,
61      VBOXOSTYPE_FreeBSD          = 0x60000,
62      VBOXOSTYPE_FreeBSD_x64      = 0x60100,
63      VBOXOSTYPE_OpenBSD          = 0x61000,
64 --- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp~       2014-02-25 19:09:00.000000000 +0200
65 +++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp        2014-02-28 09:58:59.493698505 +0200
66 @@ -133,6 +133,8 @@
67      { QRegExp("Xa.*32",                            Qt::CaseInsensitive), "Xandros" },
68      { QRegExp("((Or)|(oel)|(ol)).*64",             Qt::CaseInsensitive), "Oracle_64" },
69      { QRegExp("((Or)|(oel)|(ol)).*32",             Qt::CaseInsensitive), "Oracle" },
70 +    { QRegExp("PLD.*64",                           Qt::CaseInsensitive), "PLD_64" },
71 +    { QRegExp("PLD.*32",                           Qt::CaseInsensitive), "PLD" },
72      { QRegExp("Knoppix",                           Qt::CaseInsensitive), "Linux26" },
73      { QRegExp("Dsl",                               Qt::CaseInsensitive), "Linux24" },
74      { QRegExp("((Lin)|(lnx)).*2.?2",               Qt::CaseInsensitive), "Linux22" },
75 --- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIIconPool.cpp.orig    2015-07-09 20:00:01.339965485 +0200
76 +++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIIconPool.cpp 2015-07-09 20:00:40.670058835 +0200
77 @@ -332,6 +332,8 @@
78      m_guestOSTypeIconNames.insert("FreeBSD_64",      ":/os_freebsd_64.png");
79      m_guestOSTypeIconNames.insert("OpenBSD",         ":/os_openbsd.png");
80      m_guestOSTypeIconNames.insert("OpenBSD_64",      ":/os_openbsd_64.png");
81 +    m_guestOSTypeIconNames.insert("PLD",             ":/os_pld.png");
82 +    m_guestOSTypeIconNames.insert("PLD_64",          ":/os_pld_64.png");
83      m_guestOSTypeIconNames.insert("NetBSD",          ":/os_netbsd.png");
84      m_guestOSTypeIconNames.insert("NetBSD_64",       ":/os_netbsd_64.png");
85      m_guestOSTypeIconNames.insert("Solaris",         ":/os_solaris.png");
This page took 0.057852 seconds and 3 git commands to generate.