Sophie

Sophie

distrib > Mageia > 3 > x86_64 > media > core-updates-src > by-pkgid > ad9567098c9b129be767dcca049e4d4d > files > 12

virtualbox-4.3.18-1.mga3.src.rpm

--- VirtualBox-4.3.8/include/VBox/ostypes.h.0013	2014-02-26 00:59:48.000000000 +0800
+++ VirtualBox-4.3.8/include/VBox/ostypes.h	2014-02-26 07:19:43.140803196 +0800
@@ -103,6 +103,8 @@
     VBOXOSTYPE_Xandros_x64      = 0x5D100,
     VBOXOSTYPE_Oracle           = 0x5E000,
     VBOXOSTYPE_Oracle_x64       = 0x5E100,
+    VBOXOSTYPE_Mageia           = 0x5F000,
+    VBOXOSTYPE_Mageia_x64       = 0x5F100,
     VBOXOSTYPE_FreeBSD          = 0x60000,
     VBOXOSTYPE_FreeBSD_x64      = 0x60100,
     VBOXOSTYPE_OpenBSD          = 0x61000,
--- VirtualBox-4.3.8/src/VBox/Additions/linux/installer/vboxadd-x11.sh.0013	2014-02-26 01:00:31.000000000 +0800
+++ VirtualBox-4.3.8/src/VBox/Additions/linux/installer/vboxadd-x11.sh	2014-02-26 07:19:43.140803196 +0800
@@ -215,8 +215,14 @@
     x11_autostart="/etc/xdg/autostart"
     kde_autostart="/usr/share/autostart"
     redhat_dir=/etc/X11/Xsession.d
+    mageia_dir=/etc/X11/xinit.d
     mandriva_dir=/etc/X11/xinit.d
     debian_dir=/etc/X11/xinit/xinitrc.d
+    if [ -d "$mageia_dir" -a -w "$mageia_dir" -a -x "$mageia_dir" ]
+    then
+        install -m 0644 $app_src "$mageia_dir/$app_dest"
+        found=1
+    fi
     if [ -d "$mandriva_dir" -a -w "$mandriva_dir" -a -x "$mandriva_dir" ]
     then
         install -m 0644 $app_src "$mandriva_dir/$app_dest"
--- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp.0013	2014-02-26 01:08:50.000000000 +0800
+++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	2014-02-26 07:19:43.340808670 +0800
@@ -4164,6 +4164,8 @@
         {"Fedora_64",       ":/os_fedora_64.png"},
         {"Gentoo",          ":/os_gentoo.png"},
         {"Gentoo_64",       ":/os_gentoo_64.png"},
+        {"Mageia",          ":/os_mageia.png"},
+        {"Mageia_64",       ":/os_mageia_64.png"},
         {"Mandriva",        ":/os_mandriva.png"},
         {"Mandriva_64",     ":/os_mandriva_64.png"},
         {"RedHat",          ":/os_redhat.png"},
--- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp.0013	2014-02-26 01:09:00.000000000 +0800
+++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	2014-02-26 07:53:32.926016647 +0800
@@ -121,8 +121,10 @@
     { QRegExp("Fe.*32",                            Qt::CaseInsensitive), "Fedora" },
     { QRegExp("((Gen)|(Sab)).*64",                 Qt::CaseInsensitive), "Gentoo_64" },
     { QRegExp("((Gen)|(Sab)).*32",                 Qt::CaseInsensitive), "Gentoo" },
-    { QRegExp("((Man)|(Mag)).*64",                 Qt::CaseInsensitive), "Mandriva_64" },
-    { QRegExp("((Man)|(Mag)).*32",                 Qt::CaseInsensitive), "Mandriva" },
+    { QRegExp("Mag.*64",                           Qt::CaseInsensitive), "Mageia_64" },
+    { QRegExp("Mag",                               Qt::CaseInsensitive), "Mageia" },
+    { QRegExp("Man.*64",                           Qt::CaseInsensitive), "Mandriva_64" },
+    { QRegExp("Man",                               Qt::CaseInsensitive), "Mandriva" },
     { QRegExp("((Red)|(rhel)|(cen)).*64",          Qt::CaseInsensitive), "RedHat_64" },
     { QRegExp("((Red)|(rhel)|(cen)).*32",          Qt::CaseInsensitive), "RedHat" },
     { QRegExp("Tur.*64",                           Qt::CaseInsensitive), "Turbolinux_64" },
--- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc.0013	2014-02-26 01:08:35.000000000 +0800
+++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc	2014-02-26 07:19:44.130830290 +0800
@@ -19,6 +19,8 @@
         <file alias="os_linux24_64.png">images/os_linux24_64.png</file>
         <file alias="os_linux26.png">images/os_linux26.png</file>
         <file alias="os_linux26_64.png">images/os_linux26_64.png</file>
+        <file alias="os_mageia.png">images/os_mageia.png</file>
+        <file alias="os_mageia_64.png">images/os_mageia_64.png</file>
         <file alias="os_mandriva.png">images/os_mandriva.png</file>
         <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file>
         <file alias="os_netbsd.png">images/os_netbsd.png</file>
--- VirtualBox-4.3.8/src/VBox/Installer/linux/distributions_rpm.0013	2014-02-26 01:09:10.000000000 +0800
+++ VirtualBox-4.3.8/src/VBox/Installer/linux/distributions_rpm	2014-02-26 07:19:44.210832478 +0800
@@ -3,6 +3,10 @@
 openSUSE113     = OPENSUSE_11_3
 sles11.0        = SLES_11_0
 sles10.1        = SLES_10_1
+mga4		= MAGEIA_4
+mga3		= MAGEIA_3
+mga2		= MAGEIA_2
+mga1		= MAGEIA_1
 mdv2011.0       = MANDRIVA_2011_0
 fedora18        = FEDORA_18
 fedora17        = FEDORA_17
--- VirtualBox-4.3.8/src/VBox/Installer/linux/routines.sh.0013	2014-02-26 01:09:10.000000000 +0800
+++ VirtualBox-4.3.8/src/VBox/Installer/linux/routines.sh	2014-02-26 07:19:44.490840139 +0800
@@ -226,7 +226,7 @@
     return 0
 }
 
-# Hack to handle Mandriva's speedboot runlevel
+# Hack to handle Mageia & Mandriva's speedboot runlevel
 copy_install_script() {
     if [ "$ro_INIT_TYPE" = "sysv" -a -r /etc/sysconfig/speedboot ]; then
         cp "$1" "$2" 2>/dev/null
--- VirtualBox-4.3.8/src/VBox/Installer/linux/VBoxSysInfo.sh.0013	2014-02-26 01:09:10.000000000 +0800
+++ VirtualBox-4.3.8/src/VBox/Installer/linux/VBoxSysInfo.sh	2014-02-26 07:19:44.810848894 +0800
@@ -43,6 +43,11 @@
         # Debian-based system
         release=`cat /etc/debian_version`
         print_linux_info "Debian" $release
+    elif [ -r /etc/mageia-release ]
+    then
+        # Mageia-based system
+        release=`cat /etc/mageia-release | sed -e 's/[A-Za-z ]* release //'`
+        print_linux_info "Mageia" $release
     elif [ -r /etc/mandriva-release ]
     then
         # Mandriva-based system
--- VirtualBox-4.3.8/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h.0013	2014-02-26 01:09:11.000000000 +0800
+++ VirtualBox-4.3.8/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h	2014-02-26 07:19:45.690872981 +0800
@@ -921,7 +921,9 @@
     CIMOSType_CIMOS_Linux_2_6_x = 99,
     CIMOSType_CIMOS_Linux_2_6_x_64 = 100,
     CIMOSType_CIMOS_Linux_64 = 101,
-    CIMOSType_CIMOS_Other_64 = 102
+    CIMOSType_CIMOS_Other_64 = 102,
+    CIMOSType_CIMOS_Mageia = 111,
+    CIMOSType_CIMOS_Mageia_64 = 112
 };
 /* End of enum CIMOSType Declaration */
 
--- VirtualBox-4.3.8/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h.0013	2014-02-26 01:09:11.000000000 +0800
+++ VirtualBox-4.3.8/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h	2014-02-26 07:19:45.760874897 +0800
@@ -1371,7 +1371,9 @@
     CIMOSType_CIMOS_Linux_2_6_x = 99,
     CIMOSType_CIMOS_Linux_2_6_x_64 = 100,
     CIMOSType_CIMOS_Linux_64 = 101,
-    CIMOSType_CIMOS_Other_64 = 102
+    CIMOSType_CIMOS_Other_64 = 102,
+    CIMOSType_CIMOS_Mageia = 111,
+    CIMOSType_CIMOS_Mageia_64 = 112
 };
 /* End of enum CIMOSType Declaration */
 
--- VirtualBox-4.3.8/src/VBox/Main/include/ovfreader.h.0013	2014-02-26 01:09:14.000000000 +0800
+++ VirtualBox-4.3.8/src/VBox/Main/include/ovfreader.h	2014-02-26 07:19:45.850877359 +0800
@@ -174,8 +174,10 @@
     CIMOSType_CIMOS_CentOS_64 = 107,
     CIMOSType_CIMOS_OracleEnterpriseLinux = 108,
     CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109,
-    CIMOSType_CIMOS_eComStation = 110
+    CIMOSType_CIMOS_eComStation = 110,
     // no new types added with CIM 2.26.0
+    CIMOSType_CIMOS_Mageia = 111,
+    CIMOSType_CIMOS_Mageia_64 = 112
 };
 
 enum OVFVersion_T
--- VirtualBox-4.3.8/src/VBox/Main/src-all/Global.cpp.0013	2014-02-26 01:09:14.000000000 +0800
+++ VirtualBox-4.3.8/src/VBox/Main/src-all/Global.cpp	2014-02-26 07:55:02.768483224 +0800
@@ -189,6 +189,14 @@
       VBOXOSTYPE_Gentoo_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
+    { "Linux",   "Linux",             "Mageia",           "Mageia",
+      VBOXOSTYPE_Mageia,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+      512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
+    { "Linux",   "Linux",             "Mageia_64",        "Mageia (64 bit)",
+        VBOXOSTYPE_Mageia_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
     { "Linux",   "Linux",             "Mandriva",           "Mandriva (32 bit)",
       VBOXOSTYPE_Mandriva,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--- VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp.0013	2014-02-26 01:09:15.000000000 +0800
+++ VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp	2014-02-26 07:19:45.860877633 +0800
@@ -118,6 +118,8 @@
     { ovf::CIMOSType_CIMOS_SunJavaDesktopSystem,                 VBOXOSTYPE_Linux },
     { ovf::CIMOSType_CIMOS_TurboLinux,                           VBOXOSTYPE_Turbolinux },
     { ovf::CIMOSType_CIMOS_TurboLinux_64,                        VBOXOSTYPE_Turbolinux_x64 },
+    { ovf::CIMOSType_CIMOS_Mageia,                               VBOXOSTYPE_Mageia },
+    { ovf::CIMOSType_CIMOS_Mageia_64,                            VBOXOSTYPE_Mageia_x64 },
     { ovf::CIMOSType_CIMOS_Mandriva,                             VBOXOSTYPE_Mandriva },
     { ovf::CIMOSType_CIMOS_Mandriva_64,                          VBOXOSTYPE_Mandriva_x64 },
     { ovf::CIMOSType_CIMOS_Ubuntu,                               VBOXOSTYPE_Ubuntu },
@@ -180,6 +182,7 @@
     {"SUSE",          VBOXOSTYPE_OpenSUSE},
     {"Novell",        VBOXOSTYPE_OpenSUSE},
     {"Red Hat",       VBOXOSTYPE_RedHat},
+    {"Mageia",        VBOXOSTYPE_Mageia},
     {"Mandriva",      VBOXOSTYPE_Mandriva},
     {"Ubuntu",        VBOXOSTYPE_Ubuntu},
     {"Debian",        VBOXOSTYPE_Debian},
@@ -209,6 +212,7 @@
     {"SUSE",          VBOXOSTYPE_OpenSUSE_x64},
     {"Novell",        VBOXOSTYPE_OpenSUSE_x64},
     {"Red Hat",       VBOXOSTYPE_RedHat_x64},
+    {"Mageia",        VBOXOSTYPE_Mageia_x64},
     {"Mandriva",      VBOXOSTYPE_Mandriva_x64},
     {"Ubuntu",        VBOXOSTYPE_Ubuntu_x64},
     {"Debian",        VBOXOSTYPE_Debian_x64},
--- VirtualBox-4.3.8/src/VBox/Main/xml/Settings.cpp.0013	2014-02-26 01:09:19.000000000 +0800
+++ VirtualBox-4.3.8/src/VBox/Main/xml/Settings.cpp	2014-02-26 07:19:45.870877908 +0800
@@ -3796,6 +3796,7 @@
     { "opensuse", "OpenSUSE" },
     { "fedoracore", "Fedora" },
     { "gentoo", "Gentoo" },
+    { "mageia", "Mageia" },
     { "mandriva", "Mandriva" },
     { "redhat", "RedHat" },
     { "ubuntu", "Ubuntu" },

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional