Magellan Linux

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

    Annotation of /trunk/virtualbox/patches/virtualbox-4.2.6-magellan-branding.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2061 - (hide annotations) (download)
    Wed Jan 30 14:49:39 2013 UTC (11 years, 4 months ago) by niro
    File size: 8821 byte(s) 
    -reworked patch for 4.2.6
    1 niro 2061 diff -Naur VirtualBox-4.2.6/include/VBox/ostypes.h VirtualBox-4.2.6-magellan/include/VBox/ostypes.h
    2     --- VirtualBox-4.2.6/include/VBox/ostypes.h 2012-12-19 18:24:38.000000000 +0000
    3     +++ VirtualBox-4.2.6-magellan/include/VBox/ostypes.h 2013-01-30 16:05:47.711458256 +0000
    4     @@ -99,6 +99,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.2.6/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp VirtualBox-4.2.6-magellan/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
    14     --- VirtualBox-4.2.6/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-12-19 18:26:55.000000000 +0000
    15     +++ VirtualBox-4.2.6-magellan/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2013-01-30 16:06:36.489469866 +0000
    16     @@ -4351,6 +4351,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.2.6/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp VirtualBox-4.2.6-magellan/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
    26     --- VirtualBox-4.2.6/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp 2012-12-19 18:27:00.000000000 +0000
    27     +++ VirtualBox-4.2.6-magellan/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp 2013-01-30 16:23:32.900737354 +0000
    28     @@ -200,12 +200,12 @@
    29     if (iIndexWinXP != -1)
    30     m_pTypeCombo->setCurrentIndex(iIndexWinXP);
    31     }
    32     - /* Or select Ubuntu item for Linux family as default: */
    33     + /* Or select Magellan item for Linux family as default: */
    34     else if (strFamilyId == "Linux")
    35     {
    36     - int iIndexUbuntu = m_pTypeCombo->findData("Ubuntu", TypeID);
    37     - if (iIndexUbuntu != -1)
    38     - m_pTypeCombo->setCurrentIndex(iIndexUbuntu);
    39     + int iIndexMagellan = m_pTypeCombo->findData("Magellan", TypeID);
    40     + if (iIndexMagellan != -1)
    41     + m_pTypeCombo->setCurrentIndex(iIndexMagellan);
    42     }
    43     /* Else simply select the first one present: */
    44     else m_pTypeCombo->setCurrentIndex(0);
    45     diff -Naur VirtualBox-4.2.6/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp VirtualBox-4.2.6-magellan/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
    46     --- VirtualBox-4.2.6/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-12-19 18:27:01.000000000 +0000
    47     +++ VirtualBox-4.2.6-magellan/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2013-01-30 16:24:53.605756719 +0000
    48     @@ -102,6 +102,8 @@
    49     { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
    50     { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
    51     { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
    52     + { QRegExp("Mage.*64", Qt::CaseInsensitive), "Magellan_64" },
    53     + { QRegExp("Mage", Qt::CaseInsensitive), "Magellan" },
    54     { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" },
    55     { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" },
    56     { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
    57     diff -Naur VirtualBox-4.2.6/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc VirtualBox-4.2.6-magellan/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
    58     --- VirtualBox-4.2.6/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-12-19 18:26:50.000000000 +0000
    59     +++ VirtualBox-4.2.6-magellan/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2013-01-30 16:25:48.518770474 +0000
    60     @@ -11,6 +11,8 @@
    61     <file alias="os_freebsd_64.png">images/os_freebsd_64.png</file>
    62     <file alias="os_gentoo.png">images/os_gentoo.png</file>
    63     <file alias="os_gentoo_64.png">images/os_gentoo_64.png</file>
    64     + <file alias="os_magellan.png">images/os_magellan.png</file>
    65     + <file alias="os_magellan_64.png">images/os_magellan_64.png</file>
    66     <file alias="os_jrockitve.png">images/os_jrockitve.png</file>
    67     <file alias="os_l4.png">images/os_l4.png</file>
    68     <file alias="os_linux_other.png">images/os_linux_other.png</file>
    69     diff -Naur VirtualBox-4.2.6/src/VBox/Main/src-all/Global.cpp VirtualBox-4.2.6-magellan/src/VBox/Main/src-all/Global.cpp
    70     --- VirtualBox-4.2.6/src/VBox/Main/src-all/Global.cpp 2012-12-19 18:27:15.000000000 +0000
    71     +++ VirtualBox-4.2.6-magellan/src/VBox/Main/src-all/Global.cpp 2013-01-30 16:31:32.613852738 +0000
    72     @@ -173,6 +173,14 @@
    73     VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | 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", "Magellan Linux",
    77     + VBOXOSTYPE_Magellan, 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", "Magellan_64", "Magellan Linux (64 bit)",
    81     + VBOXOSTYPE_Magellan_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", "Mandriva", "Mandriva",
    85     VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
    86     512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    87     diff -Naur VirtualBox-4.2.6/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBox-4.2.6-magellan/src/VBox/Main/src-server/ApplianceImpl.cpp
    88     --- VirtualBox-4.2.6/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-12-19 18:27:16.000000000 +0000
    89     +++ VirtualBox-4.2.6-magellan/src/VBox/Main/src-server/ApplianceImpl.cpp 2013-01-30 16:32:59.495875377 +0000
    90     @@ -117,6 +117,8 @@
    91     { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_FedoraCore_x64 },
    92     { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Gentoo },
    93     { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Gentoo_x64 },
    94     + { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Magellan },
    95     + { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Magellan_x64 },
    96     { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Xandros },
    97     { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Xandros_x64 },
    98     { ovf::CIMOSType_CIMOS_Solaris, VBOXOSTYPE_OpenSolaris },
    99     diff -Naur VirtualBox-4.2.6/src/VBox/Main/xml/SettingsConverter.xsl VirtualBox-4.2.6-magellan/src/VBox/Main/xml/SettingsConverter.xsl
    100     --- VirtualBox-4.2.6/src/VBox/Main/xml/SettingsConverter.xsl 2012-12-19 18:27:19.000000000 +0000
    101     +++ VirtualBox-4.2.6-magellan/src/VBox/Main/xml/SettingsConverter.xsl 2013-01-30 16:34:13.537894513 +0000
    102     @@ -752,6 +752,7 @@
    103     <xsl:when test="@OSType='opensuse'">OpenSUSE</xsl:when>
    104     <xsl:when test="@OSType='fedoracore'">Fedora</xsl:when>
    105     <xsl:when test="@OSType='gentoo'">Gentoo</xsl:when>
    106     + <xsl:when test="@OSType='magellan'">Magellan</xsl:when>
    107     <xsl:when test="@OSType='mandriva'">Mandriva</xsl:when>
    108     <xsl:when test="@OSType='redhat'">RedHat</xsl:when>
    109     <xsl:when test="@OSType='ubuntu'">Ubuntu</xsl:when>
    110     diff -Naur VirtualBox-4.2.6/src/VBox/Main/xml/Settings.cpp VirtualBox-4.2.6-magellan/src/VBox/Main/xml/Settings.cpp
    111     --- VirtualBox-4.2.6/src/VBox/Main/xml/Settings.cpp 2012-12-19 18:27:19.000000000 +0000
    112     +++ VirtualBox-4.2.6-magellan/src/VBox/Main/xml/Settings.cpp 2013-01-30 16:34:39.778901651 +0000
    113     @@ -3395,6 +3395,7 @@
    114     { "opensuse", "OpenSUSE" },
    115     { "fedoracore", "Fedora" },
    116     { "gentoo", "Gentoo" },
    117     + { "magellan", "Magellan" },
    118     { "mandriva", "Mandriva" },
    119     { "redhat", "RedHat" },
    120     { "ubuntu", "Ubuntu" },