Magellan Linux

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

    Contents of /trunk/virtualbox/patches/virtualbox-4.1.51_svn40321-magellan-branding.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1670 - (show annotations) (download)
    Sat Mar 3 02:23:38 2012 UTC (12 years, 2 months ago) by niro
    File size: 8874 byte(s) 
    -re-diffed for new svn snapshot
    1 diff -Naur virtualbox-4.1.51_svn40321/include/VBox/ostypes.h virtualbox-4.1.51_svn40321-magellan/include/VBox/ostypes.h
    2 --- virtualbox-4.1.51_svn40321/include/VBox/ostypes.h 2012-03-03 03:37:57.000000000 +0100
    3 +++ virtualbox-4.1.51_svn40321-magellan/include/VBox/ostypes.h 2012-03-03 04:02:00.442982386 +0100
    4 @@ -98,6 +98,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.1.51_svn40321/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp virtualbox-4.1.51_svn40321-magellan/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
    14 --- virtualbox-4.1.51_svn40321/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-03-03 03:38:29.000000000 +0100
    15 +++ virtualbox-4.1.51_svn40321-magellan/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-03-03 04:02:41.941982386 +0100
    16 @@ -4907,6 +4907,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.1.51_svn40321/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp virtualbox-4.1.51_svn40321-magellan/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp
    26 --- virtualbox-4.1.51_svn40321/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp 2012-03-03 03:38:29.000000000 +0100
    27 +++ virtualbox-4.1.51_svn40321-magellan/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp 2012-03-03 04:03:45.422982387 +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.1.51_svn40321/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp virtualbox-4.1.51_svn40321-magellan/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp
    42 --- virtualbox-4.1.51_svn40321/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp 2012-03-03 03:38:28.000000000 +0100
    43 +++ virtualbox-4.1.51_svn40321-magellan/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp 2012-03-03 04:04:50.962982386 +0100
    44 @@ -100,6 +100,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)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" },
    51 { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" },
    52 { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
    53 diff -Naur virtualbox-4.1.51_svn40321/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc virtualbox-4.1.51_svn40321-magellan/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
    54 --- virtualbox-4.1.51_svn40321/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-03-03 03:38:27.000000000 +0100
    55 +++ virtualbox-4.1.51_svn40321-magellan/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-03-03 04:05:30.246982386 +0100
    56 @@ -11,6 +11,8 @@
    57 <file alias="os_freebsd_64.png">images/os_freebsd_64.png</file>
    58 <file alias="os_gentoo.png">images/os_gentoo.png</file>
    59 <file alias="os_gentoo_64.png">images/os_gentoo_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_jrockitve.png">images/os_jrockitve.png</file>
    63 <file alias="os_l4.png">images/os_l4.png</file>
    64 <file alias="os_linux_other.png">images/os_linux_other.png</file>
    65 diff -Naur virtualbox-4.1.51_svn40321/src/VBox/Main/src-all/Global.cpp virtualbox-4.1.51_svn40321-magellan/src/VBox/Main/src-all/Global.cpp
    66 --- virtualbox-4.1.51_svn40321/src/VBox/Main/src-all/Global.cpp 2012-03-03 03:38:18.000000000 +0100
    67 +++ virtualbox-4.1.51_svn40321-magellan/src/VBox/Main/src-all/Global.cpp 2012-03-03 04:08:23.163982385 +0100
    68 @@ -169,6 +169,14 @@
    69 VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
    70 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    71 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
    72 + { "Linux", "Linux", "Magellan", "Magellan Linux",
    73 + VBOXOSTYPE_Magellan, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
    74 + 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    75 + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
    76 + { "Linux", "Linux", "Magellan_64", "Magellan Linux (64 bit)",
    77 + VBOXOSTYPE_Magellan_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
    78 + 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    79 + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
    80 { "Linux", "Linux", "Mandriva", "Mandriva",
    81 VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
    82 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    83 diff -Naur virtualbox-4.1.51_svn40321/src/VBox/Main/src-server/ApplianceImpl.cpp virtualbox-4.1.51_svn40321-magellan/src/VBox/Main/src-server/ApplianceImpl.cpp
    84 --- virtualbox-4.1.51_svn40321/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-03-03 03:38:18.000000000 +0100
    85 +++ virtualbox-4.1.51_svn40321-magellan/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-03-03 04:09:15.658982387 +0100
    86 @@ -117,6 +117,8 @@
    87 { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_FedoraCore_x64 },
    88 { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Gentoo },
    89 { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Gentoo_x64 },
    90 + { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Magellan },
    91 + { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Magellan_x64 },
    92 { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Xandros },
    93 { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Xandros_x64 },
    94 { ovf::CIMOSType_CIMOS_Solaris, VBOXOSTYPE_OpenSolaris },
    95 diff -Naur virtualbox-4.1.51_svn40321/src/VBox/Main/xml/SettingsConverter.xsl virtualbox-4.1.51_svn40321-magellan/src/VBox/Main/xml/SettingsConverter.xsl
    96 --- virtualbox-4.1.51_svn40321/src/VBox/Main/xml/SettingsConverter.xsl 2012-03-03 03:38:17.000000000 +0100
    97 +++ virtualbox-4.1.51_svn40321-magellan/src/VBox/Main/xml/SettingsConverter.xsl 2012-03-03 04:09:50.053982383 +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.1.51_svn40321/src/VBox/Main/xml/Settings.cpp virtualbox-4.1.51_svn40321-magellan/src/VBox/Main/xml/Settings.cpp
    107 --- virtualbox-4.1.51_svn40321/src/VBox/Main/xml/Settings.cpp 2012-03-03 03:38:17.000000000 +0100
    108 +++ virtualbox-4.1.51_svn40321-magellan/src/VBox/Main/xml/Settings.cpp 2012-03-03 04:10:19.033982386 +0100
    109 @@ -3261,6 +3261,7 @@
    110 { "opensuse", "OpenSUSE" },
    111 { "fedoracore", "Fedora" },
    112 { "gentoo", "Gentoo" },
    113 + { "magellan", "Magellan" },
    114 { "mandriva", "Mandriva" },
    115 { "redhat", "RedHat" },
    116 { "ubuntu", "Ubuntu" },