[VirtualBox/f29] Update to 5.2.24.

commit 2ea721aba4588c0d3503be9a48dea664a5895c46 Author: Vasiliy Glazov <v.glazov(a)javad.com&gt; Date: Thu Jan 17 16:34:50 2019 +0300 Update to 5.2.24. .gitignore | 1 + VirtualBox-5.0.18-xserver_guest.patch | 54 --------- VirtualBox-5.1.0-add-Mageia-support.patch | 16 --- VirtualBox-5.2.24-xpcom18a4-fix.patch | 12 ++ VirtualBox.spec | 13 +- fixes_for_4.20.patch | 193 ------------------------------ sources | 2 +- 7 files changed, 21 insertions(+), 270 deletions(-) --- diff --git a/.gitignore b/.gitignore index d50a20c..d719926 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ VirtualBox-5.0.16.tar.bz2 /VirtualBox-5.2.18.tar.bz2 /VirtualBox-5.2.20.tar.bz2 /VirtualBox-5.2.22.tar.bz2 +/VirtualBox-5.2.24.tar.bz2 diff --git a/VirtualBox-5.1.0-add-Mageia-support.patch b/VirtualBox-5.1.0-add-Mageia-support.patch index 9e9682b..3efb046 100644 --- a/VirtualBox-5.1.0-add-Mageia-support.patch +++ b/VirtualBox-5.1.0-add-Mageia-support.patch @@ -40,22 +40,6 @@ diff -rup VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIcon m_guestOSTypeIconNames.insert("Mandriva", ":/os_mandriva.png"); m_guestOSTypeIconNames.insert("Mandriva_64", ":/os_mandriva_64.png"); m_guestOSTypeIconNames.insert("RedHat", ":/os_redhat.png"); -diff -rup VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp ---- VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2017-12-19 09:27:51.000000000 +0000 -+++ VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2018-01-16 01:33:36.647056070 +0000 -@@ -138,8 +138,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 -rup VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc --- VirtualBox-5.2.4.orig/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc 2017-12-19 09:27:33.000000000 +0000 +++ VirtualBox-5.2.4/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc 2018-01-16 01:33:36.653056131 +0000 diff --git a/VirtualBox-5.2.24-xpcom18a4-fix.patch b/VirtualBox-5.2.24-xpcom18a4-fix.patch new file mode 100644 index 0000000..9822ae2 --- /dev/null +++ b/VirtualBox-5.2.24-xpcom18a4-fix.patch @@ -0,0 +1,12 @@ +Index: trunk/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +=================================================================== +--- a/src/libs/xpcom18a4/python/src/ErrorUtils.cpp ++++ b/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +@@ -441,5 +441,6 @@ + char *tempResult = PyString_AsString(obResult); + #else +- char *tempResult = PyUnicode_AsUTF8(obResult); ++ /* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */ ++ const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult); + #endif + result = (char *)PyMem_Malloc(strlen(tempResult)+1); diff --git a/VirtualBox.spec b/VirtualBox.spec index 4f502bf..eb1e49a 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -36,7 +36,7 @@ %endif Name: VirtualBox -Version: 5.2.22 +Version: 5.2.24 #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} Release: 1%{?dist} Summary: A general-purpose full virtualizer for PC hardware @@ -46,7 +46,6 @@ URL: http://www.virtualbox.org/wiki/VirtualBox ExclusiveArch: i686 x86_64 -Group: System/Emulators/PC Requires: %{name}-server%{?isa} = %{version} Obsoletes: %{name}-qt @@ -64,7 +63,6 @@ Source21: os_mageia_64.png Patch1: VirtualBox-OSE-4.1.4-noupdate.patch Patch2: VirtualBox-5.1.0-strings.patch Patch18: VirtualBox-OSE-4.0.2-aiobug.patch -Patch23: VirtualBox-5.0.18-xserver_guest.patch Patch27: VirtualBox-gcc.patch # from Debian Patch28: 02-gsoap-build-fix.patch @@ -74,7 +72,8 @@ Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch # from Fedora Patch60: VirtualBox-5.2.10-xclient.patch Patch61: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch -Patch70: fixes_for_4.20.patch +# https://www.virtualbox.org/changeset/73153/vbox +Patch65: VirtualBox-5.2.24-xpcom18a4-fix.patch BuildRequires: kBuild >= 0.1.9998.r3093 @@ -274,7 +273,6 @@ rm -r src/libs/zlib-1.2.8/ %patch1 -p1 -b .noupdates %patch2 -p1 -b .strings %patch18 -p1 -b .aiobug -%patch23 -p1 -b .xserver_guest #patch27 -p1 -b .gcc %if 0%{?fedora} > 20 %patch28 -p1 -b .gsoap2 @@ -283,7 +281,7 @@ rm -r src/libs/zlib-1.2.8/ %patch51 -p1 -b .revert-VBox.sh %patch60 -p1 -b .xclient %patch61 -p1 -b .automount -%patch70 -p1 -b .kernel_4.20.patch +%patch65 -p1 -b .xpcom18a4-fix # CRLF->LF sed -i 's/\r//' COPYING @@ -777,6 +775,9 @@ getent passwd vboxadd >/dev/null || \ %{_datadir}/%{name}-kmod-%{version} %changelog +* Thu Jan 17 2019 Vasiliy N. Glazov <vascom2(a)gmail.com&gt; - 5.2.24-1 +- Update to 5.2.24 + * Fri Nov 09 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 5.2.22-1 - Update VBox to 5.2.22 - Reenable noupdate.patch diff --git a/sources b/sources index 343ea52..74770f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9c2f162ac5f99d28d8c0ca43b19ed01 VirtualBox-5.2.22.tar.bz2 +798c39b9fc84b826e99a1b0b19a650dd VirtualBox-5.2.24.tar.bz2