[VirtualBox] Add back Mageia support and default Linux OS as Fedora From Mageia add VirtualBox-6.0.10-convert-map
by Sérgio M. Basto
commit e50025afc14fb9514c22fe52caa8698c0b69051b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Apr 22 12:23:01 2021 +0100
Add back Mageia support and default Linux OS as Fedora
From Mageia add VirtualBox-6.0.10-convert-map-python3.patch
Add a couple of patches of openSuse for qt and virtualbox-snpritnf-buffer-overflow.patch
Drop patch of aiobug is for EL6 only
VirtualBox-5.1.0-add-Mageia-support.patch | 195 -----------------------
VirtualBox-6.0.10-convert-map-python3.patch | 9 ++
VirtualBox-6.1.20-add-Mageia-support.patch | 238 ++++++++++++++++++++++++++++
VirtualBox-OSE-4.0.2-aiobug.patch | 28 ----
VirtualBox.spec | 34 +++-
fixes_for_Qt5.11to15.patch | 65 ++++++++
os_mageia.png | Bin 4254 -> 1982 bytes
os_mageia_64_x2.png | Bin 0 -> 4624 bytes
os_mageia_64_x3.png | Bin 0 -> 6936 bytes
os_mageia_64_x4.png | Bin 0 -> 8227 bytes
os_mageia_x2.png | Bin 0 -> 3858 bytes
os_mageia_x3.png | Bin 0 -> 5641 bytes
os_mageia_x4.png | Bin 0 -> 7064 bytes
vbox-default-os-type.diff | 25 +++
virtualbox-snpritnf-buffer-overflow.patch | 12 ++
15 files changed, 378 insertions(+), 228 deletions(-)
---
diff --git a/VirtualBox-6.0.10-convert-map-python3.patch b/VirtualBox-6.0.10-convert-map-python3.patch
new file mode 100644
index 0000000..1bae0f4
--- /dev/null
+++ b/VirtualBox-6.0.10-convert-map-python3.patch
@@ -0,0 +1,9 @@
+diff -Nurp VirtualBox-6.0.10.orig/src/VBox/RDP/client-1.8.4/keymaps/convert-map VirtualBox-6.0.10/src/VBox/RDP/client-1.8.4/keymaps/convert-map
+--- VirtualBox-6.0.10.orig/src/VBox/RDP/client-1.8.4/keymaps/convert-map 2019-07-12 11:38:37.000000000 +0300
++++ VirtualBox-6.0.10/src/VBox/RDP/client-1.8.4/keymaps/convert-map 2019-08-30 19:06:04.712761560 +0300
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2
++#!/usr/bin/env python3
+ # -*-Python-*-
+ #
+ # Copyright 2001 Peter Åstrand <astrand(a)cendio.se> for Cendio AB
diff --git a/VirtualBox-6.1.20-add-Mageia-support.patch b/VirtualBox-6.1.20-add-Mageia-support.patch
new file mode 100644
index 0000000..17a157e
--- /dev/null
+++ b/VirtualBox-6.1.20-add-Mageia-support.patch
@@ -0,0 +1,238 @@
+
+ include/VBox/ostypes.h | 2 ++
+ src/VBox/Additions/linux/installer/vboxadd-x11.sh | 6 ++++++
+ src/VBox/Devices/VMMDev/VMMDev.cpp | 1 +
+ src/VBox/Frontends/VirtualBox/VirtualBox2.qrc | 2 ++
+ src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc | 2 ++
+ src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc | 2 ++
+ src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc | 2 ++
+ src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp | 2 ++
+ src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp | 6 ++++--
+ src/VBox/Installer/linux/VBoxSysInfo.sh | 5 +++++
+ src/VBox/Installer/linux/distributions_rpm | 15 +++++++++++++++
+ src/VBox/Main/src-all/Global.cpp | 11 +++++++++++
+ src/VBox/Main/src-server/ApplianceImpl.cpp | 2 ++
+ src/VBox/Main/src-server/MachineImpl.cpp | 2 ++
+ src/VBox/Main/xml/Settings.cpp | 1 +
+ 15 files changed, 59 insertions(+), 2 deletions(-)
+
+diff -Nurp VirtualBox-6.1.20.orig/include/VBox/ostypes.h VirtualBox-6.1.20/include/VBox/ostypes.h
+--- VirtualBox-6.1.20.orig/include/VBox/ostypes.h 2021-04-20 07:22:16.000000000 +0300
++++ VirtualBox-6.1.20/include/VBox/ostypes.h 2021-04-20 22:23:34.664631359 +0300
+@@ -112,6 +112,8 @@ typedef enum VBOXOSTYPE
+ 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,
+diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh VirtualBox-6.1.20/src/VBox/Additions/linux/installer/vboxadd-x11.sh
+--- VirtualBox-6.1.20.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2021-04-20 07:24:21.000000000 +0300
++++ VirtualBox-6.1.20/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2021-04-20 22:23:34.686632426 +0300
+@@ -94,8 +94,14 @@ install_x11_startup_app() {
+ 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"
+diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Devices/VMMDev/VMMDev.cpp VirtualBox-6.1.20/src/VBox/Devices/VMMDev/VMMDev.cpp
+--- VirtualBox-6.1.20.orig/src/VBox/Devices/VMMDev/VMMDev.cpp 2021-04-20 07:30:47.000000000 +0300
++++ VirtualBox-6.1.20/src/VBox/Devices/VMMDev/VMMDev.cpp 2021-04-20 22:23:34.690632620 +0300
+@@ -200,6 +200,7 @@ static void vmmdevLogGuestOsInfo(VBoxGue
+ case VBOXOSTYPE_OpenSUSE: pszOs = "openSUSE"; break;
+ case VBOXOSTYPE_FedoraCore: pszOs = "Fedora"; break;
+ case VBOXOSTYPE_Gentoo: pszOs = "Gentoo"; break;
++ case VBOXOSTYPE_Mageia: pszOs = "Mageia"; break;
+ case VBOXOSTYPE_Mandriva: pszOs = "Mandriva"; break;
+ case VBOXOSTYPE_RedHat: pszOs = "RedHat"; break;
+ case VBOXOSTYPE_Turbolinux: pszOs = "TurboLinux"; break;
+diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp
+--- VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2021-04-20 07:31:49.000000000 +0300
++++ VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2021-04-20 22:23:34.690632620 +0300
+@@ -326,6 +326,8 @@ UIIconPoolGeneral::UIIconPoolGeneral()
+ m_guestOSTypeIconNames.insert("Fedora_64", ":/os_fedora_64.png");
+ m_guestOSTypeIconNames.insert("Gentoo", ":/os_gentoo.png");
+ m_guestOSTypeIconNames.insert("Gentoo_64", ":/os_gentoo_64.png");
++ m_guestOSTypeIconNames.insert("Mageia", ":/os_mageia.png");
++ m_guestOSTypeIconNames.insert("Mageia_64", ":/os_mageia_64.png");
+ m_guestOSTypeIconNames.insert("Mandriva", ":/os_mandriva.png");
+ m_guestOSTypeIconNames.insert("Mandriva_64", ":/os_mandriva_64.png");
+ m_guestOSTypeIconNames.insert("RedHat", ":/os_redhat.png");
+diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
+--- VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2021-04-20 07:32:00.000000000 +0300
++++ VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2021-04-20 22:23:34.694632814 +0300
+@@ -137,8 +137,10 @@ static const osTypePattern gs_OSTypePatt
+ { 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" },
+diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
+--- VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2021-04-20 07:31:25.000000000 +0300
++++ VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2021-04-20 22:23:34.695632862 +0300
+@@ -64,6 +64,8 @@
+ <file alias="os_linux_64.png">images/os_linux_64.png</file>
+ <file alias="os_macosx.png">images/os_macosx.png</file>
+ <file alias="os_macosx_64.png">images/os_macosx_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>
+diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc
+--- VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2021-04-20 07:31:25.000000000 +0300
++++ VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2021-04-20 22:23:34.695632862 +0300
+@@ -67,6 +67,8 @@
+ <file alias="os_linux_x2.png">images/x2/os_linux_x2.png</file>
+ <file alias="os_macosx_64_x2.png">images/x2/os_macosx_64_x2.png</file>
+ <file alias="os_macosx_x2.png">images/x2/os_macosx_x2.png</file>
++ <file alias="os_mageia_64_x2.png">images/x2/os_mageia_64_x2.png</file>
++ <file alias="os_mageia_x2.png">images/x2/os_mageia_x2.png</file>
+ <file alias="os_mandriva_64_x2.png">images/x2/os_mandriva_64_x2.png</file>
+ <file alias="os_mandriva_x2.png">images/x2/os_mandriva_x2.png</file>
+ <file alias="os_netbsd_64_x2.png">images/x2/os_netbsd_64_x2.png</file>
+diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc
+--- VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc 2021-04-20 07:31:25.000000000 +0300
++++ VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc 2021-04-20 22:23:34.695632862 +0300
+@@ -67,6 +67,8 @@
+ <file alias="os_linux_x3.png">images/x3/os_linux_x3.png</file>
+ <file alias="os_macosx_64_x3.png">images/x3/os_macosx_64_x3.png</file>
+ <file alias="os_macosx_x3.png">images/x3/os_macosx_x3.png</file>
++ <file alias="os_mageia_64_x3.png">images/x3/os_mageia_64_x3.png</file>
++ <file alias="os_mageia_x3.png">images/x3/os_mageia_x3.png</file>
+ <file alias="os_mandriva_64_x3.png">images/x3/os_mandriva_64_x3.png</file>
+ <file alias="os_mandriva_x3.png">images/x3/os_mandriva_x3.png</file>
+ <file alias="os_netbsd_64_x3.png">images/x3/os_netbsd_64_x3.png</file>
+diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc
+--- VirtualBox-6.1.20.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc 2021-04-20 07:31:25.000000000 +0300
++++ VirtualBox-6.1.20/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc 2021-04-20 22:23:34.695632862 +0300
+@@ -67,6 +67,8 @@
+ <file alias="os_linux_x4.png">images/x4/os_linux_x4.png</file>
+ <file alias="os_macosx_64_x4.png">images/x4/os_macosx_64_x4.png</file>
+ <file alias="os_macosx_x4.png">images/x4/os_macosx_x4.png</file>
++ <file alias="os_mageia_64_x4.png">images/x4/os_mageia_64_x4.png</file>
++ <file alias="os_mageia_x4.png">images/x4/os_mageia_x4.png</file>
+ <file alias="os_mandriva_64_x4.png">images/x4/os_mandriva_64_x4.png</file>
+ <file alias="os_mandriva_x4.png">images/x4/os_mandriva_x4.png</file>
+ <file alias="os_netbsd_64_x4.png">images/x4/os_netbsd_64_x4.png</file>
+diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Installer/linux/distributions_rpm VirtualBox-6.1.20/src/VBox/Installer/linux/distributions_rpm
+--- VirtualBox-6.1.20.orig/src/VBox/Installer/linux/distributions_rpm 2021-04-20 07:32:09.000000000 +0300
++++ VirtualBox-6.1.20/src/VBox/Installer/linux/distributions_rpm 2021-04-20 22:23:34.695632862 +0300
+@@ -7,6 +7,21 @@ openSUSE114 = OPENSUSE_11_4
+ openSUSE113 = OPENSUSE_11_3
+ sles11.0 = SLES_11_0
+ sles10.1 = SLES_10_1
++mga15 = MAGEIA_15
++mga14 = MAGEIA_14
++mga13 = MAGEIA_13
++mga12 = MAGEIA_12
++mga11 = MAGEIA_11
++mga10 = MAGEIA_10
++mga9 = MAGEIA_9
++mga8 = MAGEIA_8
++mga7 = MAGEIA_7
++mga6 = MAGEIA_6
++mga5 = MAGEIA_5
++mga4 = MAGEIA_4
++mga3 = MAGEIA_3
++mga2 = MAGEIA_2
++mga1 = MAGEIA_1
+ mdv2011.0 = MANDRIVA_2011_0
+ fedora33 = FEDORA_33
+ fedora32 = FEDORA_32
+diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Installer/linux/VBoxSysInfo.sh VirtualBox-6.1.20/src/VBox/Installer/linux/VBoxSysInfo.sh
+--- VirtualBox-6.1.20.orig/src/VBox/Installer/linux/VBoxSysInfo.sh 2021-04-20 07:32:09.000000000 +0300
++++ VirtualBox-6.1.20/src/VBox/Installer/linux/VBoxSysInfo.sh 2021-04-20 22:23:34.695632862 +0300
+@@ -44,6 +44,11 @@ get_linux_info () {
+ # 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
+diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Main/src-all/Global.cpp VirtualBox-6.1.20/src/VBox/Main/src-all/Global.cpp
+--- VirtualBox-6.1.20.orig/src/VBox/Main/src-all/Global.cpp 2021-04-20 07:32:15.000000000 +0300
++++ VirtualBox-6.1.20/src/VBox/Main/src-all/Global.cpp 2021-04-20 22:23:34.699633056 +0300
+@@ -249,6 +249,17 @@ const Global::OSType Global::sOSTypes[]
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
+
++ { "Linux", "Linux", "Mageia", "Mageia (32-bit)",
++ VBOXOSTYPE_Mageia, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
++ 1024, 16, 20 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
++
++ { "Linux", "Linux", "Mageia_64", "Mageia (64-bit)",
++ VBOXOSTYPE_Mandriva_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
++ | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
++ 1024, 16, 20 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
++
+ { "Linux", "Linux", "Mandriva", "Mandriva (32-bit)",
+ VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBox-6.1.20/src/VBox/Main/src-server/ApplianceImpl.cpp
+--- VirtualBox-6.1.20.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2021-04-20 07:32:17.000000000 +0300
++++ VirtualBox-6.1.20/src/VBox/Main/src-server/ApplianceImpl.cpp 2021-04-20 22:23:34.700633105 +0300
+@@ -218,6 +218,7 @@ static const osTypePattern g_aOsTypesPat
+ {"SUSE", VBOXOSTYPE_OpenSUSE},
+ {"Novell", VBOXOSTYPE_OpenSUSE},
+ {"Red Hat", VBOXOSTYPE_RedHat},
++ {"Mageia", VBOXOSTYPE_Mageia},
+ {"Mandriva", VBOXOSTYPE_Mandriva},
+ {"Ubuntu", VBOXOSTYPE_Ubuntu},
+ {"Debian", VBOXOSTYPE_Debian},
+@@ -254,6 +255,7 @@ static const osTypePattern g_aOsTypesPat
+ {"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},
+diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Main/src-server/MachineImpl.cpp VirtualBox-6.1.20/src/VBox/Main/src-server/MachineImpl.cpp
+--- VirtualBox-6.1.20.orig/src/VBox/Main/src-server/MachineImpl.cpp 2021-04-20 07:32:18.000000000 +0300
++++ VirtualBox-6.1.20/src/VBox/Main/src-server/MachineImpl.cpp 2021-04-20 22:23:34.701633153 +0300
+@@ -1360,6 +1360,8 @@ HRESULT Machine::getEffectiveParavirtPro
+ || mUserData->s.strOsType == "Gentoo_64"
+ || mUserData->s.strOsType == "Mandriva"
+ || mUserData->s.strOsType == "Mandriva_64"
++ || mUserData->s.strOsType == "Mageia"
++ || mUserData->s.strOsType == "Mageia_64"
+ || mUserData->s.strOsType == "OpenSUSE"
+ || mUserData->s.strOsType == "OpenSUSE_64"
+ || mUserData->s.strOsType == "Oracle"
+diff -Nurp VirtualBox-6.1.20.orig/src/VBox/Main/xml/Settings.cpp VirtualBox-6.1.20/src/VBox/Main/xml/Settings.cpp
+--- VirtualBox-6.1.20.orig/src/VBox/Main/xml/Settings.cpp 2021-04-20 07:32:21.000000000 +0300
++++ VirtualBox-6.1.20/src/VBox/Main/xml/Settings.cpp 2021-04-20 22:23:34.701633153 +0300
+@@ -5673,6 +5673,7 @@ const struct {
+ { "opensuse", "OpenSUSE" },
+ { "fedoracore", "Fedora" },
+ { "gentoo", "Gentoo" },
++ { "mageia", "Mageia" },
+ { "mandriva", "Mandriva" },
+ { "redhat", "RedHat" },
+ { "ubuntu", "Ubuntu" },
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 85570aa..70f7fa3 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -46,7 +46,7 @@
Name: VirtualBox
Version: 6.1.20
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -70,16 +70,24 @@ Source9: 96-vbox-server.preset
Source10: vboxweb.service
Source20: os_mageia.png
Source21: os_mageia_64.png
+Source22: os_mageia_x2.png
+Source23: os_mageia_64_x2.png
+Source24: os_mageia_x3.png
+Source25: os_mageia_64_x3.png
+Source26: os_mageia_x4.png
+Source27: os_mageia_64_x4.png
Patch1: VirtualBox-6.0.0-noupdate.patch
Patch2: VirtualBox-6.1.0-strings.patch
-Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
+Patch3: vbox-default-os-type.diff
#Patch27: VirtualBox-gcc.patch
+#to revert on EL7
Patch29: 590355dbdcffa4081c377fd31565e172785b390c.patch
# from ArchLinux
Patch40: 007-python2-path.patch
# from Mageia
-#Patch50: VirtualBox-5.1.0-add-Mageia-support.patch
+Patch50: VirtualBox-6.1.20-add-Mageia-support.patch
Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch
+Patch52: VirtualBox-6.0.10-convert-map-python3.patch
# from Fedora
# Do not show an error dialog when not running under vbox
# Do not start VBoxClient --vmsvga, we run VBoxClient --vmsvga as
@@ -88,6 +96,8 @@ Patch60: VirtualBox-5.2.10-xclient.patch
#Patch61: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
# from OpenSuse
Patch70: vbox-python-detection.diff
+Patch71: fixes_for_Qt5.11to15.patch
+Patch72: virtualbox-snpritnf-buffer-overflow.patch
Patch80: VirtualBox-6.1.4-gcc10.patch
Patch86: VirtualBox-6.1.0-VBoxRem.patch
@@ -292,6 +302,9 @@ which is generated during the build of main package.
%setup -q -n %{name}-%{version}%{?prereltag}
# add Mageia images
cp -a %{SOURCE20} %{SOURCE21} src/VBox/Frontends/VirtualBox/images/
+cp -a %{SOURCE22} %{SOURCE23} src/VBox/Frontends/VirtualBox/images/x2/
+cp -a %{SOURCE24} %{SOURCE25} src/VBox/Frontends/VirtualBox/images/x3/
+cp -a %{SOURCE26} %{SOURCE27} src/VBox/Frontends/VirtualBox/images/x4/
# Remove prebuilt binary tools
find -name '*.py[co]' -delete
@@ -316,20 +329,23 @@ rm -r src/libs/zlib-1.2.*/
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
-%patch18 -p1 -b .aiobug
+%patch3 -p1 -b .default_os_fedora
#patch27 -p1 -b .gcc
%if 0%{?rhel} && 0%{?rhel} < 8
%patch29 -p2 -R -b .gsoap3
%endif
%if %{with python3}
%patch40 -p1 -b .python2_path
+%patch52 -p1 -b .convert-map-python3
%endif
# mageia support not ready for 6.0
-#patch50 -p1 -b .mageia-support
+%patch50 -p1 -b .mageia-support
%patch51 -p1 -b .revert-VBox.sh
%patch60 -p1 -b .xclient
#patch61 -p1 -b .automount
%patch70 -p1 -b .python-detection
+%patch71 -p1 -b .qt
+%patch72 -p1 -b .snpritnf-buffer-overflow
%patch80 -p1 -b .gcc10
%patch86 -p1 -b .vboxrem
%patch87 -p1 -b .fix-file-picker
@@ -393,6 +409,8 @@ kmk %{_smp_mflags} \
VBOX_WITHOUT_PRECOMPILED_HEADERS=1 \
VBOX_BUILD_PUBLISHER=%{publisher}
+# SDK_VBOX_LZF_LIBS="lzf" \
+# SDK_VBOX_LZF_INCS="/usr/include/liblzf" \
# VBOX_WITH_TESTCASES= \
# VBOX_WITH_VALIDATIONKIT= \
# VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
@@ -886,6 +904,12 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Thu Apr 22 2021 Sérgio Basto <sergio(a)serjux.com> - 6.1.20-2
+- Add back Mageia support and default Linux OS as Fedora
+- From Mageia add VirtualBox-6.0.10-convert-map-python3.patch
+- Add a couple of patches of openSuse for qt and virtualbox-snpritnf-buffer-overflow.patch
+- Drop patch of aiobug is for EL6 only
+
* Wed Apr 21 2021 Sérgio Basto <sergio(a)serjux.com> - 6.1.20-1
- Update VirtualBox to 6.1.20
diff --git a/fixes_for_Qt5.11to15.patch b/fixes_for_Qt5.11to15.patch
new file mode 100644
index 0000000..8d4681b
--- /dev/null
+++ b/fixes_for_Qt5.11to15.patch
@@ -0,0 +1,65 @@
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
++++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
+@@ -83,6 +83,7 @@
+ #include <QtWidgets/qgraphicsitem.h>
+ #include <QtWidgets/qgraphicslayoutitem.h>
+ #include <QtWidgets/qgraphicswidget.h>
++#include <QtWidgets/qbuttongroup.h>
+ #include <QtCore/QMetaType>
+ #include <QtGui/qevent.h>
+ #include <QtGui/qtouchdevice.h>
+--- VirtualBox-6.1.14.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
++++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
+@@ -18,6 +18,7 @@
+ /* Qt includes: */
+ #include <QButtonGroup>
+ #include <QRegExpValidator>
++#include <QButtonGroup>
+
+ /* GUI includes: */
+ #include "QIWidgetValidator.h"
+--- VirtualBox-6.1.2.orig/include/VBox/VBoxGL2D.h
++++ VirtualBox-6.1.2/include/VBox/VBoxGL2D.h
+@@ -113,7 +113,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN
+ /* GL_ARB_pixel_buffer_object*/
+ #ifndef Q_WS_MAC
+ /* apears to be defined on mac */
+-typedef ptrdiff_t GLsizeiptr;
++typedef long int GLsizeiptr;
+ #endif
+
+ #ifndef GL_READ_ONLY
+--- VirtualBox-6.1.2.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
++++ VirtualBox-6.1.2/src/VBox/Devices/Graphics/vmsvga_glext/glext.h
+@@ -6194,7 +6194,11 @@ typedef char GLchar;
+ #ifndef GL_VERSION_1_5
+ /* GL types for handling large vertex buffer objects */
+ typedef ptrdiff_t GLintptr;
++#if __BITS_PER_LONG != 64
+ typedef ptrdiff_t GLsizeiptr;
++#else
++typedef long int GLsizeiptr;
++#endif
+ #endif
+
+ #ifndef GL_ARB_vertex_buffer_object
+--- VirtualBox-6.1.12.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
++++ VirtualBox-6.1.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
+@@ -18,6 +18,7 @@
+ /* Qt includes: */
+ #include <QApplication>
+ #include <QLabel>
++#include <QPainterPath>
+ #include <QPaintEvent>
+ #include <QStyle>
+ #include <QVBoxLayout>
+--- VirtualBox-6.1.12.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
++++ VirtualBox-6.1.12/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
+@@ -37,7 +37,6 @@ class QIcon;
+ class QLabel;
+ class QMouseEvent;
+ class QObject;
+-class QPainterPath;
+ class QPaintEvent;
+ class QResizeEvent;
+ class QString;
diff --git a/os_mageia.png b/os_mageia.png
index 44f0fb5..ee70392 100644
Binary files a/os_mageia.png and b/os_mageia.png differ
diff --git a/os_mageia_64_x2.png b/os_mageia_64_x2.png
new file mode 100644
index 0000000..ce6d96a
Binary files /dev/null and b/os_mageia_64_x2.png differ
diff --git a/os_mageia_64_x3.png b/os_mageia_64_x3.png
new file mode 100644
index 0000000..19df395
Binary files /dev/null and b/os_mageia_64_x3.png differ
diff --git a/os_mageia_64_x4.png b/os_mageia_64_x4.png
new file mode 100644
index 0000000..caa5397
Binary files /dev/null and b/os_mageia_64_x4.png differ
diff --git a/os_mageia_x2.png b/os_mageia_x2.png
new file mode 100644
index 0000000..3ef3782
Binary files /dev/null and b/os_mageia_x2.png differ
diff --git a/os_mageia_x3.png b/os_mageia_x3.png
new file mode 100644
index 0000000..973cb44
Binary files /dev/null and b/os_mageia_x3.png differ
diff --git a/os_mageia_x4.png b/os_mageia_x4.png
new file mode 100644
index 0000000..d785d01
Binary files /dev/null and b/os_mageia_x4.png differ
diff --git a/vbox-default-os-type.diff b/vbox-default-os-type.diff
new file mode 100644
index 0000000..dccfe1c
--- /dev/null
+++ b/vbox-default-os-type.diff
@@ -0,0 +1,25 @@
+Index: VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
+===================================================================
+--- VirtualBox-6.0.0.orig/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
++++ VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
+@@ -251,15 +251,15 @@ void UINameAndSystemEditor::sltFamilyCha
+ if (iIndexWin7 != -1)
+ m_pComboType->setCurrentIndex(iIndexWin7);
+ }
+- /* Or select Oracle Linux item for Linux family as default: */
++ /* Or select Fedora item for Linux family as default: */
+ else if (m_strFamilyId == "Linux")
+ {
+- QString strDefaultID = "Oracle";
++ QString strDefaultID = "Fedora";
+ if (ARCH_BITS == 64 && m_fSupportsHWVirtEx && m_fSupportsLongMode)
+ strDefaultID += "_64";
+- const int iIndexUbuntu = m_pComboType->findData(strDefaultID, TypeID);
+- if (iIndexUbuntu != -1)
+- m_pComboType->setCurrentIndex(iIndexUbuntu);
++ const int iIndexFedora = m_pComboType->findData(strDefaultID, TypeID);
++ if (iIndexFedora != -1)
++ m_pComboType->setCurrentIndex(iIndexFedora);
+ }
+ /* Else simply select the first one present: */
+ else
diff --git a/virtualbox-snpritnf-buffer-overflow.patch b/virtualbox-snpritnf-buffer-overflow.patch
new file mode 100644
index 0000000..33507a9
--- /dev/null
+++ b/virtualbox-snpritnf-buffer-overflow.patch
@@ -0,0 +1,12 @@
+Index: VirtualBox-5.1.4/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c
+===================================================================
+--- VirtualBox-5.1.4.orig/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c
++++ VirtualBox-5.1.4/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c
+@@ -833,6 +833,7 @@ dt_gmatch(const char *s, const char *p)
+ #else
+ return (p == NULL || *p == '\0' || RTStrSimplePatternMatch(p, s)); /** @todo implement gmatch. */
+ #endif
++ return 0;
+ }
+
+ char *
3 years, 7 months
[chromium-freeworld] Update to 90.0.4430.85
by qvint
commit f9e44487d7773d26f8854baa2a80a382df600a12
Author: qvint <dotqvint(a)gmail.com>
Date: Thu Apr 22 07:22:48 2021 +0300
Update to 90.0.4430.85
chromium-89-vaapi-r850949.patch | 547 ------------------------------
chromium-89-vaapi-r851954.patch | 55 ---
chromium-89-vaapi-r854937.patch | 684 --------------------------------------
chromium-89-webcodecs-deps.patch | 21 --
chromium-enable-widevine.patch | 2 +-
chromium-freeworld.spec | 50 +--
chromium-fstatfix.patch | 4 +-
chromium-hw-accel-mjpeg.patch | 6 +-
chromium-md5-based-build-id.patch | 2 +-
chromium-names.patch | 4 +-
sources | 4 +-
11 files changed, 40 insertions(+), 1339 deletions(-)
---
diff --git a/chromium-enable-widevine.patch b/chromium-enable-widevine.patch
index 7fecad8..7e34f4d 100644
--- a/chromium-enable-widevine.patch
+++ b/chromium-enable-widevine.patch
@@ -1,6 +1,6 @@
--- a/third_party/widevine/cdm/BUILD.gn
+++ b/third_party/widevine/cdm/BUILD.gn
-@@ -15,7 +15,7 @@ buildflag_header("buildflags") {
+@@ -16,7 +16,7 @@ buildflag_header("buildflags") {
flags = [
"ENABLE_WIDEVINE=$enable_widevine",
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 30f29df..242c502 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -24,8 +24,8 @@
%global system_re2 1
##############################Package Definitions######################################
Name: chromium-freeworld
-Version: 89.0.4389.114
-Release: 2%{?dist}
+Version: 90.0.4430.85
+Release: 1%{?dist}
Summary: Chromium built with all freeworld codecs and VA-API support
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
URL: https://www.chromium.org/Home
@@ -49,7 +49,7 @@ Source0: chromium-%{version}-clean.tar.xz
%endif
# Patchset composed by Stephan Hartmann.
-%global patchset_revision chromium-89-patchset-7
+%global patchset_revision chromium-90-patchset-7
Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c...
# The following two source files are copied and modified from the chromium source
@@ -75,7 +75,7 @@ BuildRequires: mesa-libGL-devel, mesa-libEGL-devel
BuildRequires: minizip-compat-devel
%endif
# Pipewire need this.
-BuildRequires: pkgconfig(libpipewire-0.2)
+BuildRequires: pkgconfig(libpipewire-0.3)
BuildRequires: pkgconfig(gtk+-2.0), pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libexif), pkgconfig(nss)
BuildRequires: pkgconfig(xtst), pkgconfig(xscrnsaver)
@@ -144,13 +144,7 @@ Recommends: libva-utils
# This build should be only available to amd64
ExclusiveArch: x86_64
-# Google patches:
-Patch1101: chromium-89-vaapi-r850949.patch
-Patch1102: chromium-89-vaapi-r851954.patch
-Patch1103: chromium-89-vaapi-r854937.patch
-
# Gentoo patches:
-Patch200: chromium-89-webcodecs-deps.patch
Patch201: chromium-89-EnumTable-crash.patch
# Fedora patches:
@@ -183,22 +177,16 @@ Patch1406: chromium-rpm-fusion-brand.patch
%{__scm_apply_patch -p1} <%{patchset_root}/%{1}
%patchset_apply chromium-78-protobuf-RepeatedPtrField-export.patch
-%patchset_apply chromium-89-AXTreeSerializer-include.patch
-%patchset_apply chromium-89-dawn-include.patch
-%patchset_apply chromium-89-quiche-dcheck.patch
-%patchset_apply chromium-89-quiche-private.patch
-%patchset_apply chromium-89-skia-CropRect.patch
+%patchset_apply chromium-90-CrossThreadCopier-qualification.patch
+%patchset_apply chromium-90-TokenizedOutput-include.patch
+%patchset_apply chromium-90-angle-constexpr.patch
+%patchset_apply chromium-90-quantization_utils-include.patch
+%patchset_apply chromium-90-ruy-include.patch
# Apply patches up to #1000 from this spec.
%autopatch -M1000 -p1
# Manually apply patches that need an ifdef
-%if 0%{?fedora} >= 34
-%patch1101 -p1
-%patch1102 -p1
-%patch1103 -p1
-%endif
-
%if 0%{?fedora} >= 35
%patch1303 -p1
%endif
@@ -292,14 +280,20 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/devtools-frontend/src/front_end/third_party/wasmparser \
third_party/devtools-frontend/src/third_party \
third_party/dom_distiller_js \
+ third_party/eigen3 \
third_party/emoji-segmenter \
+ third_party/farmhash \
+ third_party/fdlibm \
%if !%{system_ffmpeg}
third_party/ffmpeg \
%endif
+ third_party/fft2d \
third_party/flatbuffers \
third_party/freetype \
third_party/fusejs \
third_party/liburlpattern \
+ third_party/libzip \
+ third_party/gemmlowp \
third_party/google_input_tools \
third_party/google_input_tools/third_party/closure_library \
third_party/google_input_tools/third_party/closure_library/third_party/closure \
@@ -321,9 +315,11 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/leveldatabase \
third_party/libaddressinput \
third_party/libaom \
+ third_party/libaom/source/libaom/third_party/fastfeat \
third_party/libaom/source/libaom/third_party/vector \
third_party/libaom/source/libaom/third_party/x86inc \
third_party/libavif \
+ third_party/libgav1 \
third_party/libjingle \
third_party/libphonenumber \
third_party/libsecret \
@@ -359,6 +355,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/modp_b64 \
third_party/nasm \
third_party/nearby \
+ third_party/neon_2_sse \
third_party/node \
third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 \
third_party/one_euro_filter \
@@ -393,6 +390,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/re2 \
%endif
third_party/rnnoise \
+ third_party/ruy \
third_party/s2cellid \
third_party/schema_org \
third_party/securemessage \
@@ -413,9 +411,15 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/swiftshader/third_party/subzero \
third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1 \
third_party/tcmalloc \
+ third_party/tensorflow-text \
+ third_party/tflite \
+ third_party/tflite/src/third_party/eigen3 \
+ third_party/tflite/src/third_party/fft2d \
+ third_party/tflite-support \
third_party/tint \
third_party/ukey2 \
third_party/unrar \
+ third_party/utf \
third_party/usb_ids \
third_party/usrsctp \
third_party/vulkan \
@@ -432,6 +436,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/webrtc/rtc_base/third_party/sigslot \
third_party/widevine \
third_party/woff2 \
+ third_party/wuffs \
third_party/x11proto \
third_party/xcbproto \
third_party/xdg-utils \
@@ -674,6 +679,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
+* Thu Apr 22 2021 qvint <dotqvint(a)gmail.com> - 90.0.4430.85-1
+- Update to 90.0.4430.85
+
* Sat Apr 17 2021 Leigh Scott <leigh123linux(a)gmail.com> - 89.0.4389.114-2
- Rebuild for F33 to include missed patches (rfbz#5973)
diff --git a/chromium-fstatfix.patch b/chromium-fstatfix.patch
index 269a180..9c81c1f 100644
--- a/chromium-fstatfix.patch
+++ b/chromium-fstatfix.patch
@@ -1,7 +1,7 @@
--- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-@@ -261,6 +261,18 @@ ResultExpr EvaluateSyscallImpl(int fs_de
- return RestrictKillTarget(current_pid, sysno);
+@@ -269,6 +269,18 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+ return Allow();
}
+#if defined(__NR_newfstatat)
diff --git a/chromium-hw-accel-mjpeg.patch b/chromium-hw-accel-mjpeg.patch
index 93d4e36..2370bb1 100644
--- a/chromium-hw-accel-mjpeg.patch
+++ b/chromium-hw-accel-mjpeg.patch
@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
-@@ -3526,12 +3526,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3625,12 +3625,12 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
#endif // ENABLE_VR
@@ -18,7 +18,7 @@
FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)},
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
-@@ -3704,12 +3704,22 @@ const char kAccountManagementFlowsV2Desc
+@@ -3818,12 +3818,22 @@ const char kAccountManagementFlowsV2Desc
"Settings. "
"See go/betterAM";
@@ -43,7 +43,7 @@
const char kAllowDisableMouseAccelerationDescription[] =
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
-@@ -2138,9 +2138,17 @@ extern const char kVideoToolboxVp9Decodi
+@@ -2208,9 +2208,17 @@ extern const char kMetalDescription[];
extern const char kAccountManagementFlowsV2Name[];
extern const char kAccountManagementFlowsV2Description[];
diff --git a/chromium-md5-based-build-id.patch b/chromium-md5-based-build-id.patch
index d6411fd..3f55448 100644
--- a/chromium-md5-based-build-id.patch
+++ b/chromium-md5-based-build-id.patch
@@ -3,7 +3,7 @@ https://bugzilla.rpmfusion.org/show_bug.cgi?id=5743
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
-@@ -360,7 +360,7 @@ config("compiler") {
+@@ -368,7 +368,7 @@ config("compiler") {
# links.
ldflags += [ "-Wl,--build-id=sha1" ]
} else if (current_os != "aix") {
diff --git a/chromium-names.patch b/chromium-names.patch
index c94dae9..facad24 100644
--- a/chromium-names.patch
+++ b/chromium-names.patch
@@ -11,7 +11,7 @@ Replace hard-coded "chromium-browser" with package name.
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
-@@ -5082,6 +5082,7 @@ static_library("browser") {
+@@ -5149,6 +5149,7 @@ static_library("browser") {
"upgrade_detector/directory_monitor.h",
"upgrade_detector/get_installed_version_linux.cc",
]
@@ -53,7 +53,7 @@ Replace hard-coded "chromium-browser" with package name.
#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
--- a/media/audio/BUILD.gn
+++ b/media/audio/BUILD.gn
-@@ -296,6 +296,8 @@ source_set("audio") {
+@@ -294,6 +294,8 @@ source_set("audio") {
"pulse/pulse_util.h",
]
diff --git a/sources b/sources
index 375adb4..f09f094 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (chromium-89.0.4389.114.tar.xz) = 5b8d92ecde3ab35847dc4981caa12434334f81fc576e8809c5832a18989b6d1465ae8c43f0ad0ea8a3da7a5876c52679c57ec8323109de2b81ac467419fa1a4c
-SHA512 (chromium-patches-chromium-89-patchset-7.tar.gz) = 259358087f50960443e4a4bced2580a2b2e1cfc519ea6211d9e6be84a3282913cd1b546465aef5f2b4d2446ed27425be464407dfef52dbf87935aef4c50e1996
+SHA512 (chromium-90.0.4430.85.tar.xz) = 90aac1f0b676e1ca5ccb9a362abb475945c1944686a8aba08509cde105a974ef115ca3ea56e3a88737bec7d0ae3ac1482d9c844cb14adc8f1bc06ac41ad60791
+SHA512 (chromium-patches-chromium-90-patchset-7.tar.gz) = 92a02fb1d142abf3f7378308eeee8b2609dd4915b5c46dad1f15e03fff246502c0a8e8fe02223f80925b7d18e971fff37296d384a360b8c31910c07df5afdcaa
3 years, 7 months
[VirtualBox] add vbox-fix-file-picker.patch
by Sérgio M. Basto
commit 303f6a50f06b6aa4e843feb71b7a0a38ba84c6f8
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Apr 21 20:04:21 2021 +0100
add vbox-fix-file-picker.patch
vbox-fix-file-picker.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
---
diff --git a/vbox-fix-file-picker.patch b/vbox-fix-file-picker.patch
new file mode 100644
index 0000000..20888e7
--- /dev/null
+++ b/vbox-fix-file-picker.patch
@@ -0,0 +1,11 @@
+--- VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp_ 2021-01-07 18:41:12.000000000 +0300
++++ VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp 2021-02-23 16:27:39.968740587 +0300
+@@ -2738,7 +2738,7 @@
+ strFilter = backends.join(";;").trimmed();
+
+ /* Create open file dialog: */
+- QStringList files = QIFileDialog::getOpenFileNames(strHomeFolder, strFilter, pParent, strTitle, 0, true, true);
++ QStringList files = QIFileDialog::getOpenFileNames(strHomeFolder, strFilter, nullptr, strTitle, 0, true, true);
+
+ /* If dialog has some result: */
+ if (!files.empty() && !files[0].isEmpty())
3 years, 7 months
[VirtualBox] Update VirtualBox to 6.1.20
by Sérgio M. Basto
commit 9b968c0a41066111de02a33d639a556f405104da
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Apr 21 18:57:07 2021 +0100
Update VirtualBox to 6.1.20
VirtualBox-python.patch | 101 ------------------------------------------------
VirtualBox.spec | 19 +++++----
sources | 4 +-
update_vbox.sh | 6 +--
4 files changed, 16 insertions(+), 114 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index d25bf59..85570aa 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -45,8 +45,8 @@
%endif
Name: VirtualBox
-Version: 6.1.18
-Release: 2%{?dist}
+Version: 6.1.20
+Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -75,23 +75,23 @@ Patch2: VirtualBox-6.1.0-strings.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
#Patch27: VirtualBox-gcc.patch
Patch29: 590355dbdcffa4081c377fd31565e172785b390c.patch
-Patch30: VirtualBox-python.patch
# from ArchLinux
Patch40: 007-python2-path.patch
# from Mageia
-Patch50: VirtualBox-5.1.0-add-Mageia-support.patch
+#Patch50: VirtualBox-5.1.0-add-Mageia-support.patch
Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch
# from Fedora
# Do not show an error dialog when not running under vbox
# Do not start VBoxClient --vmsvga, we run VBoxClient --vmsvga as
# a systemd service, this works with both Wayland and Xorg based sessions
Patch60: VirtualBox-5.2.10-xclient.patch
-Patch61: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
+#Patch61: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
# from OpenSuse
Patch70: vbox-python-detection.diff
Patch80: VirtualBox-6.1.4-gcc10.patch
Patch86: VirtualBox-6.1.0-VBoxRem.patch
+Patch87: vbox-fix-file-picker.patch
BuildRequires: kBuild >= 0.1.9998.r3093
BuildRequires: SDL-devel
@@ -250,7 +250,7 @@ Python XPCOM bindings to %{name}.
Summary: Python3 bindings for %{name}
Group: Development/Libraries
Requires: %{name}-server%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
+%py_provides python%{python3_pkgversion}-%{name}
%description -n python%{python3_pkgversion}-%{name}
Python3 XPCOM bindings to %{name}.
@@ -321,7 +321,6 @@ rm -r src/libs/zlib-1.2.*/
%if 0%{?rhel} && 0%{?rhel} < 8
%patch29 -p2 -R -b .gsoap3
%endif
-%patch30 -p1 -b .python39
%if %{with python3}
%patch40 -p1 -b .python2_path
%endif
@@ -329,10 +328,11 @@ rm -r src/libs/zlib-1.2.*/
#patch50 -p1 -b .mageia-support
%patch51 -p1 -b .revert-VBox.sh
%patch60 -p1 -b .xclient
-%patch61 -p1 -b .automount
+#patch61 -p1 -b .automount
%patch70 -p1 -b .python-detection
%patch80 -p1 -b .gcc10
%patch86 -p1 -b .vboxrem
+%patch87 -p1 -b .fix-file-picker
%build
@@ -886,6 +886,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Wed Apr 21 2021 Sérgio Basto <sergio(a)serjux.com> - 6.1.20-1
+- Update VirtualBox to 6.1.20
+
* Tue Feb 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 6.1.18-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 656c1b2..f60ee90 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (VirtualBox-6.1.18.tar.bz2) = 41cb4bd42429b09836c59ef9867dd3d35d0d5512ff6e515a7f8688ed444c079ce353a84f0d45b607ccf08424782d5de09b264f51b2c41a9ec34eb834458c293c
-SHA512 (UserManual.pdf) = da97b2b9ffec58e27e104c0902c719965b68feb80e31a1dc995899735eecfadb032bf6ecc19a4636be7704247e899e3c6f45f64995043ef67712c2c2739e8e46
+SHA512 (VirtualBox-6.1.20.tar.bz2) = b5af4e04e1a52c85b20226a274fac93712b79d426c0268cce3f2a337616a03161a55522ecddd13844bfc24a6808ba3d651366e74ce657cc6f8fd64c34ae745a4
+SHA512 (UserManual.pdf) = f4908b35efb658997c1562384290490c96bef222a00198780c0a127bd6c40123106e1a5c910e1fac94e066b46c37f2125efe64ef6a237a454467eea1a7219ce7
diff --git a/update_vbox.sh b/update_vbox.sh
index 09468f3..324e136 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,7 +1,7 @@
-VERSION=6.1.18
+VERSION=6.1.20
REL=1
-RAWHIDE=34
-REPOS="f33 f32 f31 el8 el7"
+RAWHIDE=35
+REPOS="f34 f33 f32 el8 el7"
if [ -z "$1" ]
then
stage=0
3 years, 7 months
[libdvdcss/f34] Update to 1.4.3
by Leigh Scott
Summary of changes:
e6bed6f... Update to 1.4.3 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 7 months
