Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/virtualbox/patches/virtualbox-4.0.0-magellan-branding.patch

    Contents of /trunk/virtualbox/patches/virtualbox-4.0.0-magellan-branding.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1381 - (show annotations) (download)
    Wed Jun 29 23:28:26 2011 UTC (12 years, 10 months ago) by niro
    File size: 9420 byte(s) 
    -virtualbox4 patches
    1 diff -Naur VirtualBox-4.0.0_OSE/include/VBox/ostypes.h VirtualBox-4.0.0_OSE-magellan/include/VBox/ostypes.h
    2 --- VirtualBox-4.0.0_OSE/include/VBox/ostypes.h 2010-12-05 19:17:32.000000000 +0100
    3 +++ VirtualBox-4.0.0_OSE-magellan/include/VBox/ostypes.h 2010-12-24 12:21:00.000000000 +0100
    4 @@ -96,6 +96,8 @@
    5 VBOXOSTYPE_Xandros_x64 = 0x5D100,
    6 VBOXOSTYPE_Oracle = 0x5E000,
    7 VBOXOSTYPE_Oracle_x64 = 0x5E100,
    8 + VBOXOSTYPE_Magellan = 0x5F000,
    9 + VBOXOSTYPE_Magellan_x64 = 0x5F100,
    10 VBOXOSTYPE_FreeBSD = 0x60000,
    11 VBOXOSTYPE_FreeBSD_x64 = 0x60100,
    12 VBOXOSTYPE_OpenBSD = 0x61000,
    13 diff -Naur VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp VirtualBox-4.0.0_OSE-magellan/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
    14 --- VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2010-12-17 16:14:24.000000000 +0100
    15 +++ VirtualBox-4.0.0_OSE-magellan/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2010-12-24 12:21:57.000000000 +0100
    16 @@ -4857,6 +4857,8 @@
    17 {"Fedora_64", ":/os_fedora_64.png"},
    18 {"Gentoo", ":/os_gentoo.png"},
    19 {"Gentoo_64", ":/os_gentoo_64.png"},
    20 + {"Magellan", ":/os_magellan.png"},
    21 + {"Magellan_64", ":/os_magellan_64.png"},
    22 {"Mandriva", ":/os_mandriva.png"},
    23 {"Mandriva_64", ":/os_mandriva_64.png"},
    24 {"RedHat", ":/os_redhat.png"},
    25 diff -Naur VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp VirtualBox-4.0.0_OSE-magellan/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp
    26 --- VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp 2010-11-16 14:12:08.000000000 +0100
    27 +++ VirtualBox-4.0.0_OSE-magellan/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp 2010-12-24 12:23:03.000000000 +0100
    28 @@ -199,10 +199,10 @@
    29 if (xpIndex != -1)
    30 mCbType->setCurrentIndex (xpIndex);
    31 }
    32 - /* Or select Ubuntu item for Linux family as default */
    33 + /* Or select Magellan item for Linux family as default */
    34 else if (familyId == "Linux")
    35 {
    36 - int ubIndex = mCbType->findData ("Ubuntu", RoleTypeID);
    37 + int ubIndex = mCbType->findData ("Magellan", RoleTypeID);
    38 if (ubIndex != -1)
    39 mCbType->setCurrentIndex (ubIndex);
    40 }
    41 diff -Naur VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp VirtualBox-4.0.0_OSE-magellan/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp
    42 --- VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp 2010-12-21 09:11:34.000000000 +0100
    43 +++ VirtualBox-4.0.0_OSE-magellan/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp 2010-12-24 12:24:13.000000000 +0100
    44 @@ -93,6 +93,8 @@
    45 { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
    46 { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
    47 { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
    48 + { QRegExp("Mage.*64", Qt::CaseInsensitive), "Magellan_64" },
    49 + { QRegExp("Mage", Qt::CaseInsensitive), "Magellan" },
    50 { QRegExp("Man.*64", Qt::CaseInsensitive), "Mandriva_64" },
    51 { QRegExp("Man", Qt::CaseInsensitive), "Mandriva" },
    52 { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
    53 diff -Naur VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc VirtualBox-4.0.0_OSE-magellan/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
    54 --- VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2010-12-14 09:26:26.000000000 +0100
    55 +++ VirtualBox-4.0.0_OSE-magellan/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2010-12-24 12:24:58.000000000 +0100
    56 @@ -19,6 +19,8 @@
    57 <file alias="os_linux24_64.png">images/os_linux24_64.png</file>
    58 <file alias="os_linux26.png">images/os_linux26.png</file>
    59 <file alias="os_linux26_64.png">images/os_linux26_64.png</file>
    60 + <file alias="os_magellan.png">images/os_magellan.png</file>
    61 + <file alias="os_magellan_64.png">images/os_magellan_64.png</file>
    62 <file alias="os_mandriva.png">images/os_mandriva.png</file>
    63 <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file>
    64 <file alias="os_netbsd.png">images/os_netbsd.png</file>
    65 diff -Naur VirtualBox-4.0.0_OSE/src/VBox/Main/ApplianceImpl.cpp VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/ApplianceImpl.cpp
    66 --- VirtualBox-4.0.0_OSE/src/VBox/Main/ApplianceImpl.cpp 2010-12-22 15:00:24.000000000 +0100
    67 +++ VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/ApplianceImpl.cpp 2010-12-24 12:37:05.000000000 +0100
    68 @@ -116,6 +116,8 @@
    69 { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Fedora_64 },
    70 { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Gentoo },
    71 { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Gentoo_64 },
    72 + { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Magellan },
    73 + { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Magellan_64 },
    74 { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Xandros },
    75 { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Xandros_64 },
    76 { ovf::CIMOSType_CIMOS_Solaris, SchemaDefs_OSTypeId_OpenSolaris },
    77 diff -Naur VirtualBox-4.0.0_OSE/src/VBox/Main/Global.cpp VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/Global.cpp
    78 --- VirtualBox-4.0.0_OSE/src/VBox/Main/Global.cpp 2010-12-09 21:41:45.000000000 +0100
    79 +++ VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/Global.cpp 2010-12-24 12:27:37.000000000 +0100
    80 @@ -163,6 +163,14 @@
    81 VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
    82 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    83 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
    84 + { "Linux", "Linux", SchemaDefs_OSTypeId_Magellan, "Magellan Linux",
    85 + VBOXOSTYPE_Magellan, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
    86 + 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    87 + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
    88 + { "Linux", "Linux", SchemaDefs_OSTypeId_Magellan_64, "Magellan Linux (64 bit)",
    89 + VBOXOSTYPE_Magellan_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
    90 + 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    91 + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
    92 { "Linux", "Linux", SchemaDefs_OSTypeId_Mandriva, "Mandriva",
    93 VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
    94 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    95 diff -Naur VirtualBox-4.0.0_OSE/src/VBox/Main/xml/SettingsConverter.xsl VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/xml/SettingsConverter.xsl
    96 --- VirtualBox-4.0.0_OSE/src/VBox/Main/xml/SettingsConverter.xsl 2010-04-27 22:24:51.000000000 +0200
    97 +++ VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/xml/SettingsConverter.xsl 2010-12-24 12:28:07.000000000 +0100
    98 @@ -752,6 +752,7 @@
    99 <xsl:when test="@OSType='opensuse'">OpenSUSE</xsl:when>
    100 <xsl:when test="@OSType='fedoracore'">Fedora</xsl:when>
    101 <xsl:when test="@OSType='gentoo'">Gentoo</xsl:when>
    102 + <xsl:when test="@OSType='magellan'">Magellan</xsl:when>
    103 <xsl:when test="@OSType='mandriva'">Mandriva</xsl:when>
    104 <xsl:when test="@OSType='redhat'">RedHat</xsl:when>
    105 <xsl:when test="@OSType='ubuntu'">Ubuntu</xsl:when>
    106 diff -Naur VirtualBox-4.0.0_OSE/src/VBox/Main/xml/Settings.cpp VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/xml/Settings.cpp
    107 --- VirtualBox-4.0.0_OSE/src/VBox/Main/xml/Settings.cpp 2010-12-17 16:14:21.000000000 +0100
    108 +++ VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/xml/Settings.cpp 2010-12-24 12:28:26.000000000 +0100
    109 @@ -3140,6 +3140,7 @@
    110 { "opensuse", "OpenSUSE" },
    111 { "fedoracore", "Fedora" },
    112 { "gentoo", "Gentoo" },
    113 + { "magellan", "Magellan" },
    114 { "mandriva", "Mandriva" },
    115 { "redhat", "RedHat" },
    116 { "ubuntu", "Ubuntu" },
    117 diff -Naur VirtualBox-4.0.0_OSE/src/VBox/Main/xml/VirtualBox-settings-common.xsd VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/xml/VirtualBox-settings-common.xsd
    118 --- VirtualBox-4.0.0_OSE/src/VBox/Main/xml/VirtualBox-settings-common.xsd 2010-12-14 09:26:25.000000000 +0100
    119 +++ VirtualBox-4.0.0_OSE-magellan/src/VBox/Main/xml/VirtualBox-settings-common.xsd 2010-12-24 12:28:52.000000000 +0100
    120 @@ -177,6 +177,8 @@
    121 <xsd:enumeration value="Fedora_64"/>
    122 <xsd:enumeration value="Gentoo"/>
    123 <xsd:enumeration value="Gentoo_64"/>
    124 + <xsd:enumeration value="Magellan"/>
    125 + <xsd:enumeration value="Magellan_64"/>
    126 <xsd:enumeration value="Mandriva"/>
    127 <xsd:enumeration value="Mandriva_64"/>
    128 <xsd:enumeration value="RedHat"/>