commit 821cab2611eb751d9b84d95f6df4451bef178f0f Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Mon Jul 25 14:46:00 2022 +0100 Update VirtualBox to 6.1.36 ...Added-support-for-running-with-Python-3.1.patch | 208 -------------- 0002-no_ifndef.patch | 15 -- ...h => VirtualBox-6.1.36-add-Mageia-support.patch | 112 ++++---- VirtualBox-python3.11.patch | 134 +++++++++ VirtualBox.spec | 17 +- fixes_for_kernel_5.18.patch | 300 --------------------- sources | 4 +- update_vbox.sh | 2 +- vb-6.1.16-modal-dialog-parent.patch | 63 ++--- 9 files changed, 226 insertions(+), 629 deletions(-) --- diff --git a/VirtualBox-6.1.28-add-Mageia-support.patch b/VirtualBox-6.1.36-add-Mageia-support.patch similarity index 67% rename from VirtualBox-6.1.28-add-Mageia-support.patch rename to VirtualBox-6.1.36-add-Mageia-support.patch index ea2eba9..44bff68 100644 --- a/VirtualBox-6.1.28-add-Mageia-support.patch +++ b/VirtualBox-6.1.36-add-Mageia-support.patch @@ -16,10 +16,10 @@ src/VBox/Main/xml/Settings.cpp | 1 + 15 files changed, 59 insertions(+), 2 deletions(-) -diff -Nurp VirtualBox-6.1.28.orig/include/VBox/ostypes.h VirtualBox-6.1.28/include/VBox/ostypes.h ---- VirtualBox-6.1.28.orig/include/VBox/ostypes.h 2021-10-18 20:47:30.000000000 +0300 -+++ VirtualBox-6.1.28/include/VBox/ostypes.h 2021-10-19 23:37:22.566374741 +0300 -@@ -113,6 +113,8 @@ typedef enum VBOXOSTYPE +diff -Nurp VirtualBox-6.1.36.orig/include/VBox/ostypes.h VirtualBox-6.1.36/include/VBox/ostypes.h +--- VirtualBox-6.1.36.orig/include/VBox/ostypes.h 2022-07-19 23:48:58.000000000 +0300 ++++ VirtualBox-6.1.36/include/VBox/ostypes.h 2022-07-20 21:07:15.249840769 +0300 +@@ -119,6 +119,8 @@ typedef enum VBOXOSTYPE VBOXOSTYPE_Xandros_x64 = 0x5D100, VBOXOSTYPE_Oracle = 0x5E000, VBOXOSTYPE_Oracle_x64 = 0x5E100, @@ -28,9 +28,9 @@ diff -Nurp VirtualBox-6.1.28.orig/include/VBox/ostypes.h VirtualBox-6.1.28/inclu VBOXOSTYPE_FreeBSD = 0x60000, VBOXOSTYPE_FreeBSD_x64 = 0x60100, VBOXOSTYPE_OpenBSD = 0x61000, -diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh VirtualBox-6.1.28/src/VBox/Additions/linux/installer/vboxadd-x11.sh ---- VirtualBox-6.1.28.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2021-10-18 20:50:51.000000000 +0300 -+++ VirtualBox-6.1.28/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2021-10-19 23:37:22.566374741 +0300 +diff -Nurp VirtualBox-6.1.36.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh VirtualBox-6.1.36/src/VBox/Additions/linux/installer/vboxadd-x11.sh +--- VirtualBox-6.1.36.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2022-07-19 23:51:59.000000000 +0300 ++++ VirtualBox-6.1.36/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2022-07-20 21:07:15.250840819 +0300 @@ -94,8 +94,14 @@ install_x11_startup_app() { x11_autostart="/etc/xdg/autostart" kde_autostart="/usr/share/autostart" @@ -46,10 +46,10 @@ diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Additions/linux/installer/vboxadd-x11 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.28.orig/src/VBox/Devices/VMMDev/VMMDev.cpp VirtualBox-6.1.28/src/VBox/Devices/VMMDev/VMMDev.cpp ---- VirtualBox-6.1.28.orig/src/VBox/Devices/VMMDev/VMMDev.cpp 2021-10-18 20:56:47.000000000 +0300 -+++ VirtualBox-6.1.28/src/VBox/Devices/VMMDev/VMMDev.cpp 2021-10-19 23:37:22.567374788 +0300 -@@ -202,6 +202,7 @@ static void vmmdevLogGuestOsInfo(VBoxGue +diff -Nurp VirtualBox-6.1.36.orig/src/VBox/Devices/VMMDev/VMMDev.cpp VirtualBox-6.1.36/src/VBox/Devices/VMMDev/VMMDev.cpp +--- VirtualBox-6.1.36.orig/src/VBox/Devices/VMMDev/VMMDev.cpp 2022-07-19 23:57:28.000000000 +0300 ++++ VirtualBox-6.1.36/src/VBox/Devices/VMMDev/VMMDev.cpp 2022-07-20 21:07:15.250840819 +0300 +@@ -203,6 +203,7 @@ static void vmmdevLogGuestOsInfo(VBoxGue case VBOXOSTYPE_OpenSUSE: pszOs = "openSUSE"; break; case VBOXOSTYPE_FedoraCore: pszOs = "Fedora"; break; case VBOXOSTYPE_Gentoo: pszOs = "Gentoo"; break; @@ -57,10 +57,10 @@ diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Devices/VMMDev/VMMDev.cpp VirtualBox- case VBOXOSTYPE_Mandriva: pszOs = "Mandriva"; break; case VBOXOSTYPE_RedHat: pszOs = "RedHat"; break; case VBOXOSTYPE_Turbolinux: pszOs = "TurboLinux"; break; -diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp ---- VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2021-10-18 20:57:50.000000000 +0300 -+++ VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2021-10-19 23:37:22.567374788 +0300 -@@ -327,6 +327,8 @@ UIIconPoolGeneral::UIIconPoolGeneral() +diff -Nurp VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp +--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2022-07-19 23:58:29.000000000 +0300 ++++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2022-07-20 21:07:15.251840868 +0300 +@@ -328,6 +328,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"); @@ -69,10 +69,10 @@ diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIc 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.28.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp ---- VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2021-10-18 20:58:01.000000000 +0300 -+++ VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2021-10-19 23:37:22.567374788 +0300 -@@ -138,8 +138,10 @@ static const osTypePattern gs_OSTypePatt +diff -Nurp VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp +--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2022-07-19 23:58:40.000000000 +0300 ++++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2022-07-20 21:07:15.251840868 +0300 +@@ -146,8 +146,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" }, @@ -85,9 +85,9 @@ diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/src/wizards/newv { 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.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc ---- VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2021-10-18 20:57:28.000000000 +0300 -+++ VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2021-10-19 23:37:22.567374788 +0300 +diff -Nurp VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc +--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2022-07-19 23:58:06.000000000 +0300 ++++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2022-07-20 21:07:15.251840868 +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> @@ -97,9 +97,9 @@ diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc <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.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc ---- VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2021-10-18 20:57:28.000000000 +0300 -+++ VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2021-10-19 23:37:22.567374788 +0300 +diff -Nurp VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc +--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2022-07-19 23:58:06.000000000 +0300 ++++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2022-07-20 21:07:15.251840868 +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> @@ -109,9 +109,9 @@ diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.q <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.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc ---- VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc 2021-10-18 20:57:28.000000000 +0300 -+++ VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc 2021-10-19 23:37:22.567374788 +0300 +diff -Nurp VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc +--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc 2022-07-19 23:58:06.000000000 +0300 ++++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc 2022-07-20 21:07:15.251840868 +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> @@ -121,9 +121,9 @@ diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.q <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.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc ---- VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc 2021-10-18 20:57:28.000000000 +0300 -+++ VirtualBox-6.1.28/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc 2021-10-19 23:37:22.567374788 +0300 +diff -Nurp VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc +--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc 2022-07-19 23:58:06.000000000 +0300 ++++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc 2022-07-20 21:07:15.252840918 +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> @@ -133,10 +133,10 @@ diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.q <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.28.orig/src/VBox/Installer/linux/distributions_rpm VirtualBox-6.1.28/src/VBox/Installer/linux/distributions_rpm ---- VirtualBox-6.1.28.orig/src/VBox/Installer/linux/distributions_rpm 2021-10-18 20:58:10.000000000 +0300 -+++ VirtualBox-6.1.28/src/VBox/Installer/linux/distributions_rpm 2021-10-19 23:37:22.567374788 +0300 -@@ -7,6 +7,21 @@ openSUSE114 = OPENSUSE_11_4 +diff -Nurp VirtualBox-6.1.36.orig/src/VBox/Installer/linux/distributions_rpm VirtualBox-6.1.36/src/VBox/Installer/linux/distributions_rpm +--- VirtualBox-6.1.36.orig/src/VBox/Installer/linux/distributions_rpm 2022-07-19 23:58:50.000000000 +0300 ++++ VirtualBox-6.1.36/src/VBox/Installer/linux/distributions_rpm 2022-07-20 21:07:15.252840918 +0300 +@@ -8,6 +8,21 @@ openSUSE114 = OPENSUSE_11_4 openSUSE113 = OPENSUSE_11_3 sles11.0 = SLES_11_0 sles10.1 = SLES_10_1 @@ -156,11 +156,11 @@ diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Installer/linux/distributions_rpm Vir +mga2 = MAGEIA_2 +mga1 = MAGEIA_1 mdv2011.0 = MANDRIVA_2011_0 - fedora33 = FEDORA_33 - fedora32 = FEDORA_32 -diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Installer/linux/VBoxSysInfo.sh VirtualBox-6.1.28/src/VBox/Installer/linux/VBoxSysInfo.sh ---- VirtualBox-6.1.28.orig/src/VBox/Installer/linux/VBoxSysInfo.sh 2021-10-18 20:58:09.000000000 +0300 -+++ VirtualBox-6.1.28/src/VBox/Installer/linux/VBoxSysInfo.sh 2021-10-19 23:37:22.567374788 +0300 + fedora36 = FEDORA_36 + fedora35 = FEDORA_35 +diff -Nurp VirtualBox-6.1.36.orig/src/VBox/Installer/linux/VBoxSysInfo.sh VirtualBox-6.1.36/src/VBox/Installer/linux/VBoxSysInfo.sh +--- VirtualBox-6.1.36.orig/src/VBox/Installer/linux/VBoxSysInfo.sh 2022-07-19 23:58:50.000000000 +0300 ++++ VirtualBox-6.1.36/src/VBox/Installer/linux/VBoxSysInfo.sh 2022-07-20 21:07:15.252840918 +0300 @@ -44,6 +44,11 @@ get_linux_info () { # Debian-based system release=`cat /etc/debian_version` @@ -173,9 +173,9 @@ diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Installer/linux/VBoxSysInfo.sh Virtua elif [ -r /etc/mandriva-release ] then # Mandriva-based system -diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Main/src-all/Global.cpp VirtualBox-6.1.28/src/VBox/Main/src-all/Global.cpp ---- VirtualBox-6.1.28.orig/src/VBox/Main/src-all/Global.cpp 2021-10-18 20:58:15.000000000 +0300 -+++ VirtualBox-6.1.28/src/VBox/Main/src-all/Global.cpp 2021-10-19 23:57:42.607061761 +0300 +diff -Nurp VirtualBox-6.1.36.orig/src/VBox/Main/src-all/Global.cpp VirtualBox-6.1.36/src/VBox/Main/src-all/Global.cpp +--- VirtualBox-6.1.36.orig/src/VBox/Main/src-all/Global.cpp 2022-07-19 23:58:56.000000000 +0300 ++++ VirtualBox-6.1.36/src/VBox/Main/src-all/Global.cpp 2022-07-20 21:07:15.252840918 +0300 @@ -257,6 +257,17 @@ const Global::OSType Global::sOSTypes[] 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, @@ -194,10 +194,10 @@ diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Main/src-all/Global.cpp VirtualBox-6. { "Linux", "Linux", "Mandriva", "Mandriva (32-bit)", VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBox-6.1.28/src/VBox/Main/src-server/ApplianceImpl.cpp ---- VirtualBox-6.1.28.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2021-10-18 20:58:17.000000000 +0300 -+++ VirtualBox-6.1.28/src/VBox/Main/src-server/ApplianceImpl.cpp 2021-10-19 23:37:22.568374835 +0300 -@@ -218,6 +218,7 @@ static const osTypePattern g_aOsTypesPat +diff -Nurp VirtualBox-6.1.36.orig/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBox-6.1.36/src/VBox/Main/src-server/ApplianceImpl.cpp +--- VirtualBox-6.1.36.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2022-07-19 23:58:58.000000000 +0300 ++++ VirtualBox-6.1.36/src/VBox/Main/src-server/ApplianceImpl.cpp 2022-07-20 21:07:15.252840918 +0300 +@@ -223,6 +223,7 @@ static const osTypePattern g_aOsTypesPat {"SUSE", VBOXOSTYPE_OpenSUSE}, {"Novell", VBOXOSTYPE_OpenSUSE}, {"Red Hat", VBOXOSTYPE_RedHat}, @@ -205,7 +205,7 @@ diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Main/src-server/ApplianceImpl.cpp Vir {"Mandriva", VBOXOSTYPE_Mandriva}, {"Ubuntu", VBOXOSTYPE_Ubuntu}, {"Debian", VBOXOSTYPE_Debian}, -@@ -254,6 +255,7 @@ static const osTypePattern g_aOsTypesPat +@@ -259,6 +260,7 @@ static const osTypePattern g_aOsTypesPat {"SUSE", VBOXOSTYPE_OpenSUSE_x64}, {"Novell", VBOXOSTYPE_OpenSUSE_x64}, {"Red Hat", VBOXOSTYPE_RedHat_x64}, @@ -213,10 +213,10 @@ diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Main/src-server/ApplianceImpl.cpp Vir {"Mandriva", VBOXOSTYPE_Mandriva_x64}, {"Ubuntu", VBOXOSTYPE_Ubuntu_x64}, {"Debian", VBOXOSTYPE_Debian_x64}, -diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Main/src-server/MachineImpl.cpp VirtualBox-6.1.28/src/VBox/Main/src-server/MachineImpl.cpp ---- VirtualBox-6.1.28.orig/src/VBox/Main/src-server/MachineImpl.cpp 2021-10-18 20:58:18.000000000 +0300 -+++ VirtualBox-6.1.28/src/VBox/Main/src-server/MachineImpl.cpp 2021-10-19 23:37:22.569374882 +0300 -@@ -1363,6 +1363,8 @@ HRESULT Machine::getEffectiveParavirtPro +diff -Nurp VirtualBox-6.1.36.orig/src/VBox/Main/src-server/MachineImpl.cpp VirtualBox-6.1.36/src/VBox/Main/src-server/MachineImpl.cpp +--- VirtualBox-6.1.36.orig/src/VBox/Main/src-server/MachineImpl.cpp 2022-07-19 23:58:58.000000000 +0300 ++++ VirtualBox-6.1.36/src/VBox/Main/src-server/MachineImpl.cpp 2022-07-20 21:07:15.254841017 +0300 +@@ -1364,6 +1364,8 @@ HRESULT Machine::getEffectiveParavirtPro || mUserData->s.strOsType == "Gentoo_64" || mUserData->s.strOsType == "Mandriva" || mUserData->s.strOsType == "Mandriva_64" @@ -225,10 +225,10 @@ diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Main/src-server/MachineImpl.cpp Virtu || mUserData->s.strOsType == "OpenSUSE" || mUserData->s.strOsType == "OpenSUSE_64" || mUserData->s.strOsType == "Oracle" -diff -Nurp VirtualBox-6.1.28.orig/src/VBox/Main/xml/Settings.cpp VirtualBox-6.1.28/src/VBox/Main/xml/Settings.cpp ---- VirtualBox-6.1.28.orig/src/VBox/Main/xml/Settings.cpp 2021-10-18 20:58:21.000000000 +0300 -+++ VirtualBox-6.1.28/src/VBox/Main/xml/Settings.cpp 2021-10-19 23:37:22.569374882 +0300 -@@ -5673,6 +5673,7 @@ const struct { +diff -Nurp VirtualBox-6.1.36.orig/src/VBox/Main/xml/Settings.cpp VirtualBox-6.1.36/src/VBox/Main/xml/Settings.cpp +--- VirtualBox-6.1.36.orig/src/VBox/Main/xml/Settings.cpp 2022-07-19 23:59:02.000000000 +0300 ++++ VirtualBox-6.1.36/src/VBox/Main/xml/Settings.cpp 2022-07-20 21:07:15.255841066 +0300 +@@ -5744,6 +5744,7 @@ const struct { { "opensuse", "OpenSUSE" }, { "fedoracore", "Fedora" }, { "gentoo", "Gentoo" }, diff --git a/VirtualBox-python3.11.patch b/VirtualBox-python3.11.patch new file mode 100644 index 0000000..e732999 --- /dev/null +++ b/VirtualBox-python3.11.patch @@ -0,0 +1,134 @@ +--- VirtualBox-6.1.36/configure 2022-07-19 21:48:52.000000000 +0100 ++++ VirtualBox-6.1.34.orig/configure 2022-07-25 14:00:03.679779468 +0100 +@@ -2027,7 +2027,7 @@ extern "C" int main(void) + } + EOF + found= +- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m python3.9 python3.9m python3.10 python3.10m" ++ SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m python3.9 python3.9m python3.10 python3.10m python3.11 python3.11m" + for p in $PYTHONDIR; do + for d in $SUPPYTHONLIBS; do + for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do +diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/gen_python_deps.py VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/gen_python_deps.py +--- VirtualBox-6.1.36/src/libs/xpcom18a4/python/gen_python_deps.py 2022-07-19 22:01:39.000000000 +0100 ++++ VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/gen_python_deps.py 2022-07-25 14:00:04.027778063 +0100 +@@ -16,7 +16,7 @@ from __future__ import print_function + import os,sys + from distutils.version import StrictVersion + +-versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m", "3.9", "3.9m", "3.10", "3.10m" ] ++versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m", "3.9", "3.9m", "3.10", "3.10m", "3.11", "3.11m"] + prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"] + known = {} + +diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/Makefile.kmk +--- VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk 2022-07-19 22:01:39.000000000 +0100 ++++ VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/Makefile.kmk 2022-07-25 14:00:03.971778289 +0100 +@@ -26,7 +26,7 @@ endif + + # + # List of supported Python versions, defining a number of +-# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|310|310M|DEF]_[INC|LIB] variables ++# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|310|310M|311|311M|DEF]_[INC|LIB] variables + # which get picked up below. + # + ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script. +@@ -624,6 +624,52 @@ VBoxPython3_10m_x86_LIBS = $(VBOX_ + endif + endif + endif ++ ++ifdef VBOX_PYTHON311_INC ++# ++# Python 3.11 version ++# ++DLLS += VBoxPython3_11 ++VBoxPython3_11_EXTENDS = VBoxPythonBase ++VBoxPython3_11_EXTENDS_BY = appending ++VBoxPython3_11_TEMPLATE = XPCOM ++VBoxPython3_11_INCS = $(VBOX_PYTHON311_INC) ++VBoxPython3_11_LIBS = $(VBOX_PYTHON311_LIB) ++ ++ ifdef VBOX_WITH_32_ON_64_MAIN_API ++ ifdef VBOX_PYTHON311_LIB_X86 ++DLLS += VBoxPython3_11_x86 ++VBoxPython3_11_x86_EXTENDS = VBoxPythonBase_x86 ++VBoxPython3_11_x86_EXTENDS_BY = appending ++VBoxPython3_11_x86_TEMPLATE = XPCOM ++VBoxPython3_11_x86_INCS = $(VBOX_PYTHON311_INC) ++VBoxPython3_11_x86_LIBS = $(VBOX_PYTHON311_LIB_X86) ++ endif ++ endif ++endif ++ ++ifdef VBOX_PYTHON311M_INC ++# ++# Python 3.11 version with pymalloc ++# ++DLLS += VBoxPython3_11m ++VBoxPython3_11m_EXTENDS = VBoxPythonBase_m ++VBoxPython3_11m_EXTENDS_BY = appending ++VBoxPython3_11m_TEMPLATE = XPCOM ++VBoxPython3_11m_INCS = $(VBOX_PYTHON311M_INC) ++VBoxPython3_11m_LIBS = $(VBOX_PYTHON311M_LIB) ++ ++ ifdef VBOX_WITH_32_ON_64_MAIN_API ++ ifdef VBOX_PYTHON311M_LIB_X86 ++DLLS += VBoxPython3_11m_x86 ++VBoxPython3_11m_x86_EXTENDS = VBoxPythonBase_x86_m ++VBoxPython3_11m_x86_EXTENDS_BY = appending ++VBoxPython3_11m_x86_TEMPLATE_ = XPCOM ++VBoxPython3_11m_x86_INCS = $(VBOX_PYTHON311M_INC) ++VBoxPython3_11m_x86_LIBS = $(VBOX_PYTHON311M_LIB_X86) ++ endif ++ endif ++endif + + ifdef VBOX_PYTHONDEF_INC + # +diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/module/_xpcom.cpp VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/module/_xpcom.cpp +--- VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/module/_xpcom.cpp 2022-07-19 22:01:40.000000000 +0100 ++++ VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/module/_xpcom.cpp 2022-07-25 14:00:04.134777632 +0100 +@@ -84,7 +84,11 @@ extern PYXPCOM_EXPORT void PyXPCOM_Inter + # define MANGLE_MODULE_INIT(a_Name) RT_CONCAT(a_Name, MODULE_NAME_SUFFIX) + # endif + # ifdef VBOX_PYXPCOM_VERSIONED +-# if PY_VERSION_HEX >= 0x030a0000 && PY_VERSION_HEX < 0x030b0000 ++# if PY_VERSION_HEX >= 0x030b0000 && PY_VERSION_HEX < 0x030c0000 ++# define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_11") ++# define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_11) ++ ++# elif PY_VERSION_HEX >= 0x030a0000 && PY_VERSION_HEX < 0x030b0000 + # define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_10") + # define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_10) + +diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/PyXPCOM.h VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h +--- VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/PyXPCOM.h 2022-07-19 22:01:40.000000000 +0100 ++++ VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h 2022-07-25 14:00:23.316663783 +0100 +@@ -137,14 +137,6 @@ inline PyObject *PyBool_FromLong(long ok + # define PyInt_Check(o) PyLong_Check(o) + # define PyInt_AsLong(o) PyLong_AsLong(o) + # define PyNumber_Int(o) PyNumber_Long(o) +-# if PY_VERSION_HEX <= 0x03030000 /* 3.3 added PyUnicode_AsUTF8AndSize */ +-# ifndef PyUnicode_AsUTF8 +-# define PyUnicode_AsUTF8(o) _PyUnicode_AsString(o) +-# endif +-# ifndef PyUnicode_AsUTF8AndSize +-# define PyUnicode_AsUTF8AndSize(o,s) _PyUnicode_AsStringAndSize(o,s) +-# endif +-# endif + typedef struct PyMethodChain + { + PyMethodDef *methods; +diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/VariantUtils.cpp VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp +--- VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/VariantUtils.cpp 2022-07-19 22:01:40.000000000 +0100 ++++ VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp 2022-03-22 23:47:49.000000000 +0000 +@@ -628,7 +628,7 @@ static PyObject *UnpackSingleArray(Py_ns + #if PY_MAJOR_VERSION <= 2 + return PyString_FromStringAndSize( (char *)array_ptr, sequence_size ); + #else +- return PyBytes_FromStringAndSize( (char *)array_ptr, sequence_size ); ++ return PyUnicode_FromStringAndSize( (char *)array_ptr, sequence_size ); + #endif + + PRUint32 array_element_size = GetArrayElementSize(array_type); diff --git a/VirtualBox.spec b/VirtualBox.spec index 8348f25..6535795 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -38,8 +38,8 @@ %bcond_without python3 Name: VirtualBox -Version: 6.1.34 -Release: 5%{?dist} +Version: 6.1.36 +Release: 1%{?dist} Summary: A general-purpose full virtualizer for PC hardware License: GPLv2 or (GPLv2 and CDDL) @@ -78,7 +78,7 @@ Patch29: 590355dbdcffa4081c377fd31565e172785b390c.patch # from ArchLinux Patch40: 007-python2-path.patch # from Mageia -Patch50: VirtualBox-6.1.28-add-Mageia-support.patch +Patch50: VirtualBox-6.1.36-add-Mageia-support.patch Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch Patch52: VirtualBox-6.0.10-convert-map-python3.patch # from Fedora @@ -91,12 +91,10 @@ Patch70: vbox-python-selection.patch Patch71: fixes_for_Qt5.11to15.patch Patch72: virtualbox-snpritnf-buffer-overflow.patch Patch73: vb-6.1.16-modal-dialog-parent.patch -Patch74: fixes_for_kernel_5.18.patch Patch80: VirtualBox-6.1.4-gcc10.patch Patch88: VirtualBox-lzf.patch -Patch90: 0001-libs-xpcom-Added-support-for-running-with-Python-3.1.patch -Patch91: 0002-no_ifndef.patch +Patch90: VirtualBox-python3.11.patch # Force the build of xpcom with -std=gnu++17, mandated by Python 3.11 Patch92: VirtualBox-6.1.34-build-xpcom18a4-with-c++17.patch @@ -345,11 +343,9 @@ rm -r src/libs/zlib-1.2.*/ %patch71 -p1 -b .qt %patch72 -p1 -b .snpritnf-buffer-overflow %patch73 -p1 -b .modal-dialog-parent -%patch74 -p1 -b .linux-5.18 %patch80 -p1 -b .gcc10 %patch88 -p1 -b .lzf -%patch90 -p2 -b .python3.10 -%patch91 -p1 -b .python3.10 +%patch90 -p1 -b .python3.11 %patch92 -p1 -b .c++17 @@ -907,6 +903,9 @@ getent passwd vboxadd >/dev/null || \ %{_datadir}/%{name}-kmod-%{version} %changelog +* Mon Jul 25 2022 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.36-1 +- Update VirtualBox to 6.1.36 + * Sat Jun 25 2022 Robert-André Mauchin <zebob.m(a)gmail.com&gt; - 6.1.34-5 - Rebuilt for Python 3.11 diff --git a/sources b/sources index ba903b0..a4c2007 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VirtualBox-6.1.34.tar.bz2) = 46d63a9fd9df76af654af59fab5cf555858bc2c4b5dc34e2378d85ae784e6380b6def4aab06909a9b5e114a7297269f90cfb2c3d8d6529b423d703afbad18c64 -SHA512 (UserManual.pdf) = 64d8dc6af48656fef8f8621c86bb80541add6a1d71b41d33bfbf38bb5748b62c05ce0a685926698635b67d154477e0b77066e7e52d4a1fbe2f05a805f7d46c19 +SHA512 (VirtualBox-6.1.36.tar.bz2) = cc3b984a7da40c9bf14831808a2bc2bf7bf6821e53c25fa11cb4b4275feb1d4b0cb4a47d8a360b90c89e5a4038481efe8fe28ee22996dbefb6446761e88a8dec +SHA512 (UserManual.pdf) = 7481e6f231f5f43579c2d2f09d5893b590ffb059063a953883e72fb78d78eaff79a87f60b69cfe5e01e2e3d0a82ccd39e094716f84e6aaa41ce411a3d3d5e777 diff --git a/update_vbox.sh b/update_vbox.sh index fa9f5ee..02df05b 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -1,4 +1,4 @@ -VERSION=6.1.34 +VERSION=6.1.36 REL=1 RAWHIDE=37 REPOS="f36 f35 f34 el9 el8 el7" diff --git a/vb-6.1.16-modal-dialog-parent.patch b/vb-6.1.16-modal-dialog-parent.patch index 05d91ba..f45c559 100644 --- a/vb-6.1.16-modal-dialog-parent.patch +++ b/vb-6.1.16-modal-dialog-parent.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp +Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp =================================================================== ---- VirtualBox-6.1.18.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp -+++ VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp +--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp ++++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp @@ -16,6 +16,7 @@ */ @@ -19,10 +19,10 @@ Index: VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlo QString strFilePath; if (!fileNames.isEmpty()) -Index: VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp +Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp =================================================================== ---- VirtualBox-6.1.18.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp -+++ VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp +--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp ++++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp @@ -397,10 +397,10 @@ void UIFilePathSelector::selectPath() switch (m_enmMode) { @@ -45,10 +45,10 @@ Index: VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSel } /* Do nothing if nothing chosen: */ -Index: VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp +Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp =================================================================== ---- VirtualBox-6.1.18.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp -+++ VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp +--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp ++++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp @@ -232,16 +232,16 @@ void UIEmptyFilePathSelector::choose() switch (mMode) { @@ -69,11 +69,11 @@ Index: VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePa } if (path.isEmpty()) return; -Index: VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp +Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp =================================================================== ---- VirtualBox-6.1.18.orig/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp -+++ VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp -@@ -438,7 +438,7 @@ void UIMediumSelector::sltButtonLeaveEmp +--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp ++++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp +@@ -441,7 +441,7 @@ void UIMediumSelector::sltButtonLeaveEmp void UIMediumSelector::sltAddMedium() { @@ -82,10 +82,10 @@ Index: VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelect if (uMediumID.isNull()) return; repopulateTreeWidget(); -Index: VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp +Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp =================================================================== ---- VirtualBox-6.1.18.orig/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp -+++ VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp +--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp ++++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp @@ -3197,7 +3197,7 @@ void UICommon::updateMachineStorage(cons } else if (target.type == UIMediumTarget::UIMediumTargetType_WithFileDialog) @@ -95,10 +95,10 @@ Index: VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp strMachineFolder, false /* fUseLastFolder */); } else if(target.type == UIMediumTarget::UIMediumTargetType_CreateAdHocVISO) -Index: VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp +Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp =================================================================== ---- VirtualBox-6.1.18.orig/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp -+++ VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp +--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp ++++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp @@ -486,7 +486,7 @@ void UIMediumManagerWidget::sltHandleMac void UIMediumManagerWidget::sltAddMedium() { @@ -108,23 +108,10 @@ Index: VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManage strDefaultMachineFolder, true /* use most recent medium folder */); } -Index: VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp +Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp =================================================================== ---- VirtualBox-6.1.18.orig/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp -+++ VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp -@@ -3958,7 +3958,7 @@ void UIMachineSettingsStorage::sltChoose - { - const QString strMachineFolder(QFileInfo(m_strMachineSettingsFilePath).absolutePath()); - -- QUuid uMediumId = uiCommon().openMediumWithFileOpenDialog(m_pMediumIdHolder->type(), this, strMachineFolder); -+ QUuid uMediumId = uiCommon().openMediumWithFileOpenDialog(m_pMediumIdHolder->type(), QApplication::activeWindow(), strMachineFolder); - if (uMediumId.isNull()) - return; - m_pMediumIdHolder->setId(uMediumId); -Index: VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp -=================================================================== ---- VirtualBox-6.1.18.orig/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp -+++ VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp +--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp ++++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp @@ -1176,7 +1176,7 @@ void UIExtraDataManagerWindow::sltSave() /* Compose initial file-name: */ const QString strInitialFileName = QDir(uiCommon().homeFolder()).absoluteFilePath(QString("%1_ExtraData.xml").arg(currentChooserName())); @@ -143,10 +130,10 @@ Index: VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraData "Choose file to load extra-data from.."); /* Make sure file-name was chosen: */ if (strFileName.isEmpty()) -Index: VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp +Index: VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp =================================================================== ---- VirtualBox-6.1.18.orig/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp -+++ VirtualBox-6.1.18/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp +--- VirtualBox-6.1.36.orig/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp ++++ VirtualBox-6.1.36/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp @@ -78,7 +78,7 @@ void UITextEditor::retranslateUi() void UITextEditor::open()