diff --git a/fix_wayland_crash.patch b/fix_wayland_crash.patch new file mode 100644 index 0000000..cadccd3 --- /dev/null +++ b/fix_wayland_crash.patch @@ -0,0 +1,13 @@ +Index: VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/main.cpp +=================================================================== +--- VirtualBox-6.1.8.orig/src/VBox/Frontends/VirtualBox/src/main.cpp ++++ VirtualBox-6.1.8/src/VBox/Frontends/VirtualBox/src/main.cpp +@@ -669,6 +669,8 @@ extern "C" DECLEXPORT(int) TrustedMain(i + /* Make sure multi-threaded environment is safe: */ + if (!MakeSureMultiThreadingIsSafe()) + break; ++ /* Force using Qt platform module 'xcb', we have X11 specific code: */ ++ RTEnvSet("QT_QPA_PLATFORM", "xcb"); + #endif /* VBOX_WS_X11 */ + + /* Console help preprocessing: */ diff --git a/handle_gsoap_208103.patch b/handle_gsoap_208103.patch new file mode 100644 index 0000000..71b079d --- /dev/null +++ b/handle_gsoap_208103.patch @@ -0,0 +1,17 @@ +Index: VirtualBox-6.1.8/src/VBox/Main/webservice/vboxweb.cpp +=================================================================== +--- VirtualBox-6.1.8.orig/src/VBox/Main/webservice/vboxweb.cpp ++++ VirtualBox-6.1.8/src/VBox/Main/webservice/vboxweb.cpp +@@ -944,7 +944,11 @@ static void doQueuesLoop() + if (rv == 0) + continue; // timeout, not necessary to bother gsoap + // r < 0, errno +- if (soap_socket_errno(soap.master) == SOAP_EINTR) ++#if GSOAP_VERSION >= 208103 ++ if (soap_socket_errno == SOAP_EINTR) ++#else ++ if (soap_socket_errno(fd) == SOAP_EINTR) ++#endif + rv = 0; // re-check if we should terminate + break; + } diff --git a/virtualbox.changes b/virtualbox.changes index 210025f..9781189 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 29 14:59:11 UTC 2020 - Larry Finger + +- Gsoap 2.8.103 changes the way that "soap_socket_errno" is handled. + File "handle_gsoap_208103.patch" is added. + Handle case where Wayland chooses wrong video. File "fix_wayland_crash.patch" is added. + ------------------------------------------------------------------- Sat May 16 00:52:34 UTC 2020 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index 53543eb..e01aac2 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -154,6 +154,10 @@ Patch134: fixes_for_5.5.patch Patch135: fix-missing-includes-with-qt-5.15.patch # Fix builds with GCC10 Patch136: fixes_for_gcc10.patch +# Fix for chanes in GSOAP 2.8.103 +Patch137: handle_gsoap_208103.patch +# Fix for Wayland crashes +Patch138: fix_wayland_crash.patch Patch999: virtualbox-fix-ui-background-color.patch # BuildRequires: LibVNCServer-devel @@ -458,6 +462,8 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. %patch134 -p1 %patch135 -p1 %patch136 -p1 +%patch137 -p1 +%patch138 -p1 # make VB UI background colors look sane again %patch999 -p1