From 0eb057075c56fe10253c578acabb3fa22d567402615ad620fcbec64480efaca4 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@gmail.com>
Date: Thu, 4 Feb 2021 22:48:26 +0000
Subject: [PATCH] Accepting request 869569 from
 home:lwfinger:branches:Virtualization

-  Fix build for Leap 15.3. File "fixes_for_leap15.3.patch" is added.

OBS-URL: https://build.opensuse.org/request/show/869569
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=590
---
 fixes_for_leap15.3.patch | 16 ++++++++++++++++
 virtualbox.changes       |  5 +++++
 virtualbox.spec          |  6 ++++++
 3 files changed, 27 insertions(+)
 create mode 100644 fixes_for_leap15.3.patch

diff --git a/fixes_for_leap15.3.patch b/fixes_for_leap15.3.patch
new file mode 100644
index 0000000..422ba95
--- /dev/null
+++ b/fixes_for_leap15.3.patch
@@ -0,0 +1,16 @@
+Index: VirtualBox-6.1.18/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+===================================================================
+--- VirtualBox-6.1.18.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
++++ VirtualBox-6.1.18/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+@@ -137,9 +137,9 @@
+ #include <linux/interrupt.h>
+ #include <linux/completion.h>
+ #include <linux/compiler.h>
+-#if RTLNX_VER_MIN(5,9,0) /* linux/fs.h defined HAVE_UNLOCKED_IOCTL from 2.6.11 up to 5.9, when it became an implicit assumption. */
++//#if RTLNX_VER_MIN(5,9,0) /* linux/fs.h defined HAVE_UNLOCKED_IOCTL from 2.6.11 up to 5.9, when it became an implicit assumption. */
+ # define HAVE_UNLOCKED_IOCTL 1 /* We use this in a couple of places, so for now just define it for 5.9+ too. */
+-#endif
++//#endif
+ #if !defined(HAVE_UNLOCKED_IOCTL) && RTLNX_VER_MAX(2,6,38)
+ # include <linux/smp_lock.h>
+ #endif
diff --git a/virtualbox.changes b/virtualbox.changes
index a7fb50d..73d8f1a 100644
--- a/virtualbox.changes
+++ b/virtualbox.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  4 18:47:09 UTC 2021 - Larry Finger <Larry.Finger@gmail.com>
+
+-  Fix build for Leap 15.3. File "fixes_for_leap15.3.patch" is added.
+
 -------------------------------------------------------------------
 Sat Jan 23 21:28:37 UTC 2021 - Larry Finger <Larry.Finger@gmail.com>
 - Fix additional problem with modal dialog parent.
diff --git a/virtualbox.spec b/virtualbox.spec
index beeece2..313262d 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -179,6 +179,8 @@ Patch136:       fixes_for_gcc10.patch
 # Fix for changes in GSOAP 2.8.103
 Patch137:       handle_gsoap_208103.patch
 Patch138:       fixes-for-5.11.patch
+# Fix for struct file_operations backport in 15.3
+Patch139:       fixes_for_leap15.3.patch
 Patch141:       vb-6.1.16-modal-dialog-parent.patch
 Patch999:       virtualbox-fix-ui-background-color.patch
 #
@@ -488,6 +490,10 @@ This package contains the kernel-modules that VirtualBox uses to create or run v
 %patch136 -p1
 %patch137 -p1
 %patch138 -p1
+%if 0%{?sle_version} == 150300 && 0%{?is_opensuse} 
+# Patch for Leap 15.3
+%patch139 -p1
+%endif
 %patch141 -p1
 # make VB UI background colors look sane again
 %patch999 -p1