1
0
forked from pool/virtualbox

Accepting request 785717 from Virtualization

OBS-URL: https://build.opensuse.org/request/show/785717
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=193
This commit is contained in:
Dominique Leuenberger 2020-03-19 18:47:18 +00:00 committed by Git OBS Bridge
commit 9a55ce1cd5
3 changed files with 34 additions and 0 deletions

View File

@ -0,0 +1,23 @@
diff -up VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp~ VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp
--- VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp~ 2020-02-18 18:13:08.000000000 +0100
+++ VirtualBox-6.1.4/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp 2020-03-03 16:27:49.947341705 +0100
@@ -100,16 +100,19 @@ static void x11Connect(struct X11CONTEXT
{
XCloseDisplay(pContext->pDisplay);
pContext->pDisplay = NULL;
+ return;
}
if (!XRRQueryExtension(pContext->pDisplay, &pContext->hRandREventBase, &pContext->hRandRErrorBase))
{
XCloseDisplay(pContext->pDisplay);
pContext->pDisplay = NULL;
+ return;
}
if (!XRRQueryVersion(pContext->pDisplay, &pContext->hRandRMajor, &pContext->hRandRMinor))
{
XCloseDisplay(pContext->pDisplay);
pContext->pDisplay = NULL;
+ return;
}
pContext->rootWindow = DefaultRootWindow(pContext->pDisplay);
}

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Mar 16 21:32:05 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>
- A fix for boo #1166782 ("VirtualBox Guest 6.1.4 for OpenSUSE 15.1 constant
segfault in libX11.so.6.3 every 5 seconds") is fixed.
File "VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch", published in
https://www.virtualbox.org/ticket/19357, fixes the problem.
-------------------------------------------------------------------
Wed Mar 11 20:10:36 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>

View File

@ -151,6 +151,8 @@ Patch133: fixes_for_leap15.2.patch
Patch134: fixes_for_5.5.patch
# Fixes for API changes in kernel 5.6
Patch135: fixes_for_5.6.patch
# Fis VBoxClient Crashes
Patch136: VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch
Patch999: virtualbox-fix-ui-background-color.patch
#
BuildRequires: LibVNCServer-devel
@ -456,6 +458,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL.
%if 0%{?suse_version} > 1500
%patch135 -p1
%endif
%patch136 -p1
# make VB UI background colors look sane again
%patch999 -p1