From 9eaa6430bd2539b858a483ef4dc01ef5fc66ab7da80896a875675e4a59d82361 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@gmail.com>
Date: Mon, 16 Mar 2020 21:42:02 +0000
Subject: [PATCH] Accepting request 785716 from
 home:lwfinger:branches:Virtualization

- 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.

OBS-URL: https://build.opensuse.org/request/show/785716
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=538
---
 ...ox-6.1.4-VBoxClient-vmsvga-x11-crash.patch | 23 +++++++++++++++++++
 virtualbox.changes                            |  8 +++++++
 virtualbox.spec                               |  3 +++
 3 files changed, 34 insertions(+)
 create mode 100644 VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch

diff --git a/VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch b/VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch
new file mode 100644
index 0000000..e0dbd6e
--- /dev/null
+++ b/VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch
@@ -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);
+ }
diff --git a/virtualbox.changes b/virtualbox.changes
index f3a8eae..7493f0a 100644
--- a/virtualbox.changes
+++ b/virtualbox.changes
@@ -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>
 
diff --git a/virtualbox.spec b/virtualbox.spec
index 195bcfc..a9fbadd 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -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