jengelh/virtualbox
SHA256
1
0
Fork 0
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 714454 from Virtualization

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/714454
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=180
This commit is contained in:
Dominique Leuenberger 2019-07-12 09:59:00 +00:00 committed by Git OBS Bridge
commit 1567fd5880
4 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fixes_focus_steal.patch Normal file
View File

@ -0,0 +1,22 @@
Index: a/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp
===================================================================
--- a/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (revision 131843)
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp
(working copy)
@@ -269,6 +269,14 @@
* the keyboard before the target window sees the click. (GNOME Shell's hot corner has
* the same problem. At present we just let that problem be.) */
+ /* Make sure we really do still have the focus: */
+ xcb_get_input_focus_cookie_t xcbFocusCookie = xcb_get_input_focus(QX11Info::connection());
+ xcb_get_input_focus_reply_t *pFocusReply = xcb_get_input_focus_reply(QX11Info::connection(), xcbFocusCookie, 0);
+ xcb_window_t xcbFocusWindow = pFocusReply->focus;
+ free(pFocusReply);
+ if (xcbFocusWindow != m_windows[m_iKeyboardCaptureViewIndex]->winId())
+ return true;
+
/* Grab the mouse button.
* We do not check for failure as we do not currently implement a back-up plan. */
/* If any previous grab is still in process, release it. */

18
fixes_for_SLE15.patch
View File

@ -14,3 +14,21 @@ Index: VirtualBox-6.0.8/src/VBox/Additions/linux/drm/vbox_drv.c
.fops = &vbox_fops,
.irq_handler = vbox_irq_handler,
Index: VirtualBox-6.0.8/src/VBox/Additions/linux/drm/vbox_main.c
===================================================================
--- VirtualBox-6.0.8.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-6.0.8/src/VBox/Additions/linux/drm/vbox_main.c
@@ -600,13 +600,6 @@ int vbox_dumb_destroy(struct drm_file *f
}
#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
-static void ttm_bo_put(struct ttm_buffer_object *bo)
-{
- ttm_bo_unref(&bo);
-}
-#endif
-
void vbox_gem_free_object(struct drm_gem_object *obj)
{
struct vbox_bo *vbox_bo = gem_to_vbox_bo(obj);

15
virtualbox.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Sat Jul 6 17:06:28 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
- Correct the logic for SLE15_SP1.
-------------------------------------------------------------------
Sat Jul 6 02:30:18 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
- Update the patch for SLE15 to handle the changes in SP1.
-------------------------------------------------------------------
Sat Jul 6 02:24:37 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
- Fix Virtualbox for problem with stealing focus under Qt 5.13. File "fixes_focus_steal.patch" is added.
-------------------------------------------------------------------
Mon Jun 10 18:09:09 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>

6
virtualbox.spec
View File

@ -149,6 +149,8 @@ Patch131: fixes_for_qt5.13.patch
Patch132: fixes_for_5.2.patch
# Fixes for SLE15
Patch133: fixes_for_SLE15.patch
# Fixes for VB stealing focus under Qt 5.13
Patch134: fixes_focus_steal.patch
#endif
Patch999: virtualbox-fix-ui-background-color.patch
#
@ -453,8 +455,11 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL.
%if 0%{?suse_version} > 1500 || (0%{?sle_version} >= 150100 && 0%{?is_opensuse})
%patch129 -p1
%else
%if (0%{?sle_version} == 150100)
# Patch only for SLE15.1
%patch133 -p1
%endif
%endif
# Leap 42.3 adjustments
%if 0%{?sle_version} == 120300 && 0%{?is_opensuse}
%patch130 -p1
@ -464,6 +469,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL.
%patch131 -p1
%endif
%patch132 -p1
%patch134 -p1
# make VB UI background colors look sane again
%patch999 -p1