summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO8
-rw-r--r--002-dri-driver-path.patch30
-rw-r--r--007-python2-path.patch9
-rw-r--r--009-glibc-2.26.patch27
-rw-r--r--009-include-path.patch13
-rw-r--r--010-qt-5.11.patch11
-rw-r--r--011-python-3-7.patch13
-rw-r--r--012-vboxsf-automount.patch20
-rw-r--r--014-iasl.patch73
-rw-r--r--018-work-around-black-screen.patch18
-rw-r--r--019-qt-5-15.patch60
-rw-r--r--020-gsoap.patch13
-rw-r--r--101-vboxsf-automount.patch20
-rw-r--r--109-include-path.patch111
-rw-r--r--PKGBUILD8
-rw-r--r--vboxdrmclient.path6
-rw-r--r--vboxservice.service1
-rw-r--r--virtualbox-guest-dkms.conf34
18 files changed, 17 insertions, 358 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7dba42e17663..8662a0e73fc1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = virtualbox-svn
- pkgver = 86044
- pkgrel = 2
+ pkgver = 86698
+ pkgrel = 1
url = http://virtualbox.org
arch = x86_64
license = GPL
@@ -54,6 +54,7 @@ pkgbase = virtualbox-svn
source = LocalConfig.kmk
source = vboxservice.service
source = vboxservice-nox.service
+ source = vboxdrmclient.path
source = vboxdrmclient.service
source = vboxweb.service
source = vboxreload
@@ -75,8 +76,9 @@ pkgbase = virtualbox-svn
md5sums = 6e2722bfd7013c1b0174382626ac1b8d
md5sums = ed1341881437455d9735875ddf455fbe
md5sums = 9a72e6635976513f442f418431dc6151
- md5sums = 8ba9179c4a3516904417d773816dd992
+ md5sums = 3cf3dd86ff350a690c978a266f015dcc
md5sums = fcf6bcef98b16849d5c9f048592739c0
+ md5sums = 16470fa4b27dc29f65e061b3e613f96d
md5sums = 6ab29654246a060561ad2de675105072
md5sums = bc9efed88e0469cd7fc460d5a5cd7b4b
md5sums = 6a4e9581a6240b64feee765a1f19e5c3
diff --git a/002-dri-driver-path.patch b/002-dri-driver-path.patch
deleted file mode 100644
index 26b7f3f65f44..000000000000
--- a/002-dri-driver-path.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
-index 92b4ffc..1a1c467 100644
---- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
-+++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
-@@ -56,24 +56,8 @@ typedef enum {
-
- //#define DEBUG_DRI_CALLS
-
--/// @todo this could be different...
--#ifdef RT_ARCH_AMD64
--# ifdef RT_OS_FREEBSD
--# define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
--# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
--# else
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/xorg/modules/dri"
--# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--# endif
--#else
--# ifdef RT_OS_FREEBSD
--# define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
--# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
--# else
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/xorg/modules/dri"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
- # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--# endif
--#endif
-
- #ifdef DEBUG_DRI_CALLS
- #define SWDRI_SHOWNAME(pext, func) \
diff --git a/007-python2-path.patch b/007-python2-path.patch
deleted file mode 100644
index d11e75dd9f40..000000000000
--- a/007-python2-path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-# 2013 © Sébastien Luttringer
---- a/src/VBox/Frontends/VBoxShell/vboxshell.py 2014-01-03 01:38:41.831615590 +0100
-+++ b/src/VBox/Frontends/VBoxShell/vboxshell.py 2014-01-04 04:23:33.884544420 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2
- # -*- coding: utf-8 -*-
- # $Id: vboxshell.py 49841 2013-12-09 13:32:33Z vboxsync $
- """
diff --git a/009-glibc-2.26.patch b/009-glibc-2.26.patch
deleted file mode 100644
index 81d149e703bd..000000000000
--- a/009-glibc-2.26.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4d1e01e1df513666642d4ddbb24625c5bcc12d84 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Thu, 14 Sep 2017 23:14:36 +0200
-Subject: [PATCH 1/1] fix compilation with glibc 2.26
-
-Signed-off-by: Christian Hesse <mail@eworm.de>
----
- src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h b/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h
-index 9032e6d..0d1770e 100644
---- a/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h
-+++ b/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h
-@@ -55,11 +55,11 @@ typedef uint64_t hrtime_t;
- typedef uint32_t id_t;
- typedef uint32_t zoneid_t;
- #endif
--#if !defined(NGREG) || !defined(RT_OS_LINUX)
-+#if !defined(__NGREG) || !defined(RT_OS_LINUX)
- typedef RTCCINTREG greg_t;
- #else
- AssertCompileSize(greg_t, sizeof(RTCCINTREG));
- #endif
- typedef uintptr_t pc_t;
- typedef unsigned int model_t;
- typedef RTCPUID processorid_t;
diff --git a/009-include-path.patch b/009-include-path.patch
deleted file mode 100644
index 985a30cd04c6..000000000000
--- a/009-include-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
-index 623485e9..5068906f 100644
---- a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
-+++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
-@@ -58,7 +58,7 @@ VBOXMOD_DEFS = \
- RT_WITH_VBOX \
- VBOX_WITH_HARDENING \
- VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
--VBOXMOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
-+VBOXMOD_CFLAGS = -include $(VBOXNETADPT_DIR)include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
-
- include $(obj)/Makefile-footer.gmk
-
diff --git a/010-qt-5.11.patch b/010-qt-5.11.patch
deleted file mode 100644
index e1874536be39..000000000000
--- a/010-qt-5.11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r VirtualBox-5.2.12/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp VirtualBox-5.2.12-qt/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
---- VirtualBox-5.2.12/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp 2018-05-09 18:38:05.000000000 +0200
-+++ VirtualBox-5.2.12-qt/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp 2018-06-05 21:51:18.401913367 +0200
-@@ -21,6 +21,7 @@
-
- /* Qt includes: */
- # include <QRegExpValidator>
-+# include <QButtonGroup>
-
- /* GUI includes: */
- # include "QIWidgetValidator.h"
diff --git a/011-python-3-7.patch b/011-python-3-7.patch
deleted file mode 100644
index 0eebf0039b43..000000000000
--- a/011-python-3-7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure b/configure
-index 128da55c..c4bb08c4 100755
---- a/configure
-+++ b/configure
-@@ -1969,7 +1969,7 @@ extern "C" int main(void)
- }
- EOF
- found=
-- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m"
-+ SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m"
- for p in $PYTHONDIR; do
- for d in $SUPPYTHONLIBS; do
- for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
diff --git a/012-vboxsf-automount.patch b/012-vboxsf-automount.patch
deleted file mode 100644
index 5c665e722c83..000000000000
--- a/012-vboxsf-automount.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This ghetto patch attempts to fix shared folder automounting for guests running
-Linux 4.16, and also suggests an alternative to mount.vboxsf.
-
-diff -uprb VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
---- VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2018-02-26 17:57:30.000000000 +0200
-+++ VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2018-04-07 21:00:05.785735622 +0300
-@@ -346,6 +346,13 @@ static int vbsvcAutoMountSharedFolder(co
- "vboxsf",
- fFlags,
- &mntinf);
-+ if (r == -1 && errno == EINVAL)
-+ {
-+ /* Mainline vboxsf accepts regular mount opts. */
-+ char mount_opts[1024];
-+ snprintf(mount_opts, 1024, "gid=%d,dmode=0770,fmode=0770", mntinf.gid);
-+ r = mount(pszShareName, pszMountPoint, "vboxsf", fFlags, mount_opts);
-+ }
- if (r == 0)
- {
- VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint);
diff --git a/014-iasl.patch b/014-iasl.patch
deleted file mode 100644
index 93f777c8cbae..000000000000
--- a/014-iasl.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- "a/src/VBox/Devices/PC/vbox-cpuhotplug.dsl"
-+++ "a/src/VBox/Devices/PC/vbox-cpuhotplug.dsl"
-@@ -95,38 +95,38 @@ DefinitionBlock ("SSDT-cpuhotplug.aml",
- } \
- } \
-
-- GENERATE_CPU_OBJECT(0x00, SCK0, "SCKCPU0", CPU0, "SCK0-CPU0")
-- GENERATE_CPU_OBJECT(0x01, SCK1, "SCKCPU1", CPU1, "SCK1-CPU0")
-- GENERATE_CPU_OBJECT(0x02, SCK2, "SCKCPU2", CPU2, "SCK2-CPU0")
-- GENERATE_CPU_OBJECT(0x03, SCK3, "SCKCPU3", CPU3, "SCK3-CPU0")
-- GENERATE_CPU_OBJECT(0x04, SCK4, "SCKCPU4", CPU4, "SCK4-CPU0")
-- GENERATE_CPU_OBJECT(0x05, SCK5, "SCKCPU5", CPU5, "SCK5-CPU0")
-- GENERATE_CPU_OBJECT(0x06, SCK6, "SCKCPU6", CPU6, "SCK6-CPU0")
-- GENERATE_CPU_OBJECT(0x07, SCK7, "SCKCPU7", CPU7, "SCK7-CPU0")
-- GENERATE_CPU_OBJECT(0x08, SCK8, "SCKCPU8", CPU8, "SCK8-CPU0")
-- GENERATE_CPU_OBJECT(0x09, SCK9, "SCKCPU9", CPU9, "SCK9-CPU0")
-- GENERATE_CPU_OBJECT(0x0a, SCKA, "SCKCPUA", CPUA, "SCKA-CPU0")
-- GENERATE_CPU_OBJECT(0x0b, SCKB, "SCKCPUB", CPUB, "SCKB-CPU0")
-- GENERATE_CPU_OBJECT(0x0c, SCKC, "SCKCPUC", CPUC, "SCKC-CPU0")
-- GENERATE_CPU_OBJECT(0x0d, SCKD, "SCKCPUD", CPUD, "SCKD-CPU0")
-- GENERATE_CPU_OBJECT(0x0e, SCKE, "SCKCPUE", CPUE, "SCKE-CPU0")
-- GENERATE_CPU_OBJECT(0x0f, SCKF, "SCKCPUF", CPUF, "SCKF-CPU0")
-- GENERATE_CPU_OBJECT(0x10, SCKG, "SCKCPUG", CPUG, "SCKG-CPU0")
-- GENERATE_CPU_OBJECT(0x11, SCKH, "SCKCPUH", CPUH, "SCKH-CPU0")
-- GENERATE_CPU_OBJECT(0x12, SCKI, "SCKCPUI", CPUI, "SCKI-CPU0")
-- GENERATE_CPU_OBJECT(0x13, SCKJ, "SCKCPUJ", CPUJ, "SCKJ-CPU0")
-- GENERATE_CPU_OBJECT(0x14, SCKK, "SCKCPUK", CPUK, "SCKK-CPU0")
-- GENERATE_CPU_OBJECT(0x15, SCKL, "SCKCPUL", CPUL, "SCKL-CPU0")
-- GENERATE_CPU_OBJECT(0x16, SCKM, "SCKCPUM", CPUM, "SCKM-CPU0")
-- GENERATE_CPU_OBJECT(0x17, SCKN, "SCKCPUN", CPUN, "SCKN-CPU0")
-- GENERATE_CPU_OBJECT(0x18, SCKO, "SCKCPUO", CPUO, "SCKO-CPU0")
-- GENERATE_CPU_OBJECT(0x19, SCKP, "SCKCPUP", CPUP, "SCKP-CPU0")
-- GENERATE_CPU_OBJECT(0x1a, SCKQ, "SCKCPUQ", CPUQ, "SCKQ-CPU0")
-- GENERATE_CPU_OBJECT(0x1b, SCKR, "SCKCPUR", CPUR, "SCKR-CPU0")
-- GENERATE_CPU_OBJECT(0x1c, SCKS, "SCKCPUS", CPUS, "SCKS-CPU0")
-- GENERATE_CPU_OBJECT(0x1d, SCKT, "SCKCPUT", CPUT, "SCKT-CPU0")
-- GENERATE_CPU_OBJECT(0x1e, SCKU, "SCKCPUU", CPUU, "SCKU-CPU0")
-- GENERATE_CPU_OBJECT(0x1f, SCKV, "SCKCPUV", CPUV, "SCKV-CPU0")
-+ GENERATE_CPU_OBJECT(0x00, SCK0, "SCKCPU0", CPU0, 0)
-+ GENERATE_CPU_OBJECT(0x01, SCK1, "SCKCPU1", CPU1, 1)
-+ GENERATE_CPU_OBJECT(0x02, SCK2, "SCKCPU2", CPU2, 2)
-+ GENERATE_CPU_OBJECT(0x03, SCK3, "SCKCPU3", CPU3, 3)
-+ GENERATE_CPU_OBJECT(0x04, SCK4, "SCKCPU4", CPU4, 4)
-+ GENERATE_CPU_OBJECT(0x05, SCK5, "SCKCPU5", CPU5, 5)
-+ GENERATE_CPU_OBJECT(0x06, SCK6, "SCKCPU6", CPU6, 6)
-+ GENERATE_CPU_OBJECT(0x07, SCK7, "SCKCPU7", CPU7, 7)
-+ GENERATE_CPU_OBJECT(0x08, SCK8, "SCKCPU8", CPU8, 8)
-+ GENERATE_CPU_OBJECT(0x09, SCK9, "SCKCPU9", CPU9, 9)
-+ GENERATE_CPU_OBJECT(0x0a, SCKA, "SCKCPUA", CPUA, 10)
-+ GENERATE_CPU_OBJECT(0x0b, SCKB, "SCKCPUB", CPUB, 11)
-+ GENERATE_CPU_OBJECT(0x0c, SCKC, "SCKCPUC", CPUC, 12)
-+ GENERATE_CPU_OBJECT(0x0d, SCKD, "SCKCPUD", CPUD, 13)
-+ GENERATE_CPU_OBJECT(0x0e, SCKE, "SCKCPUE", CPUE, 14)
-+ GENERATE_CPU_OBJECT(0x0f, SCKF, "SCKCPUF", CPUF, 15)
-+ GENERATE_CPU_OBJECT(0x10, SCKG, "SCKCPUG", CPUG, 16)
-+ GENERATE_CPU_OBJECT(0x11, SCKH, "SCKCPUH", CPUH, 17)
-+ GENERATE_CPU_OBJECT(0x12, SCKI, "SCKCPUI", CPUI, 18)
-+ GENERATE_CPU_OBJECT(0x13, SCKJ, "SCKCPUJ", CPUJ, 19)
-+ GENERATE_CPU_OBJECT(0x14, SCKK, "SCKCPUK", CPUK, 20)
-+ GENERATE_CPU_OBJECT(0x15, SCKL, "SCKCPUL", CPUL, 21)
-+ GENERATE_CPU_OBJECT(0x16, SCKM, "SCKCPUM", CPUM, 22)
-+ GENERATE_CPU_OBJECT(0x17, SCKN, "SCKCPUN", CPUN, 23)
-+ GENERATE_CPU_OBJECT(0x18, SCKO, "SCKCPUO", CPUO, 24)
-+ GENERATE_CPU_OBJECT(0x19, SCKP, "SCKCPUP", CPUP, 25)
-+ GENERATE_CPU_OBJECT(0x1a, SCKQ, "SCKCPUQ", CPUQ, 26)
-+ GENERATE_CPU_OBJECT(0x1b, SCKR, "SCKCPUR", CPUR, 27)
-+ GENERATE_CPU_OBJECT(0x1c, SCKS, "SCKCPUS", CPUS, 28)
-+ GENERATE_CPU_OBJECT(0x1d, SCKT, "SCKCPUT", CPUT, 29)
-+ GENERATE_CPU_OBJECT(0x1e, SCKU, "SCKCPUU", CPUU, 30)
-+ GENERATE_CPU_OBJECT(0x1f, SCKV, "SCKCPUV", CPUV, 31)
-
- #undef GENERATE_CPU_OBJECT
- }
diff --git a/018-work-around-black-screen.patch b/018-work-around-black-screen.patch
deleted file mode 100644
index 6db05d77d309..000000000000
--- a/018-work-around-black-screen.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From bbd990f83a23c22da787d10c62bd7ff114d32703 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Mon, 18 May 2020 08:21:06 +0200
-Subject: [PATCH 1/1] work around black screen
----
- src/VBox/Additions/x11/Installer/98vboxadd-xclient | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/VBox/Additions/x11/Installer/98vboxadd-xclient b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
-index e7d4e292..7a17a692 100755
---- a/src/VBox/Additions/x11/Installer/98vboxadd-xclient
-+++ b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
-@@ -34,5 +34,4 @@ elif test -z "${SSH_CONNECTION}"; then
- /usr/bin/VBoxClient --checkhostversion
- /usr/bin/VBoxClient --seamless
- /usr/bin/VBoxClient --draganddrop
-- /usr/bin/VBoxClient --vmsvga # In case VMSVGA emulation is enabled
- fi
diff --git a/019-qt-5-15.patch b/019-qt-5-15.patch
deleted file mode 100644
index a669b39d73b1..000000000000
--- a/019-qt-5-15.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp
-index b70d289d..9716781e 100644
---- a/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp
-@@ -17,6 +17,7 @@
-
- /* Qt includes: */
- #include <QPainter>
-+#include <QPainterPath>
-
- /* GUI include */
- #include "UIImageTools.h"
-diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp
-index 4d695f19..406c2dbd 100644
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp
-@@ -19,6 +19,7 @@
- #include <QApplication>
- #include <QHBoxLayout>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStyle>
- #include <QToolButton>
-
-diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
-index 53b545a4..6e38448c 100644
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
-@@ -21,6 +21,7 @@
- #include <QMenu>
- #include <QMoveEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStateMachine>
- #include <QStyle>
- #include <QTimer>
-diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
-index 2f153d80..7b18a66b 100644
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
-@@ -24,6 +24,7 @@
- /* Qt includes: */
- #include <QIcon>
- #include <QWidget>
-+#include <QPainterPath>
-
- /* GUI includes: */
- #include "UILibraryDefs.h"
-diff --git a/src/VBox/Frontends/VirtualBox/src/monitor/UIMonitorCommon.cpp b/src/VBox/Frontends/VirtualBox/src/monitor/UIMonitorCommon.cpp
-index 2f153d80..7b18a66b 100644
---- a/src/VBox/Frontends/VirtualBox/src/monitor/UIMonitorCommon.cpp 2020-06-14 08:30:24.028884238 +0800
-+++ b/src/VBox/Frontends/VirtualBox/src/monitor/UIMonitorCommon.cpp 2020-06-14 08:30:46.948930212 +0800
-@@ -17,6 +17,7 @@
-
- /* Qt includes: */
- #include <QPainter>
-+#include <QPainterPath>
- #include <QXmlStreamReader>
-
-
diff --git a/020-gsoap.patch b/020-gsoap.patch
deleted file mode 100644
index 9a1aa3af7cbf..000000000000
--- a/020-gsoap.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/VBox/Main/webservice/vboxweb.cpp b/src/VBox/Main/webservice/vboxweb.cpp
-index 8dd3ca1b..9d5c9138 100644
---- a/src/VBox/Main/webservice/vboxweb.cpp
-+++ b/src/VBox/Main/webservice/vboxweb.cpp
-@@ -944,7 +944,7 @@ 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 (soap_socket_errno == SOAP_EINTR)
- rv = 0; // re-check if we should terminate
- break;
- }
diff --git a/101-vboxsf-automount.patch b/101-vboxsf-automount.patch
deleted file mode 100644
index 5c665e722c83..000000000000
--- a/101-vboxsf-automount.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This ghetto patch attempts to fix shared folder automounting for guests running
-Linux 4.16, and also suggests an alternative to mount.vboxsf.
-
-diff -uprb VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
---- VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2018-02-26 17:57:30.000000000 +0200
-+++ VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2018-04-07 21:00:05.785735622 +0300
-@@ -346,6 +346,13 @@ static int vbsvcAutoMountSharedFolder(co
- "vboxsf",
- fFlags,
- &mntinf);
-+ if (r == -1 && errno == EINVAL)
-+ {
-+ /* Mainline vboxsf accepts regular mount opts. */
-+ char mount_opts[1024];
-+ snprintf(mount_opts, 1024, "gid=%d,dmode=0770,fmode=0770", mntinf.gid);
-+ r = mount(pszShareName, pszMountPoint, "vboxsf", fFlags, mount_opts);
-+ }
- if (r == 0)
- {
- VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint);
diff --git a/109-include-path.patch1 b/109-include-path.patch1
deleted file mode 100644
index 2b0d516f3016..000000000000
--- a/109-include-path.patch1
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rupN src_orig/VBox/HostDrivers/VBoxNetAdp/linux/Makefile src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
---- src_orig/VBox/HostDrivers/VBoxNetAdp/linux/Makefile 2019-03-11 11:47:24.053811535 +0800
-+++ src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile 2019-03-11 11:50:09.534104474 +0800
-@@ -58,7 +59,7 @@ VBOXMOD_DEFS = \
- RT_WITH_VBOX \
- VBOX_WITH_HARDENING \
- VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
--VBOXMOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
-+VBOXMOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxnetadp/include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
-
- include $(obj)/Makefile-footer.gmk
diff --git a/PKGBUILD b/PKGBUILD
index a68db9d1b9a1..d793a1d1170d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@ pkgname=('virtualbox-svn'
'virtualbox-guest-utils-svn'
'virtualbox-guest-utils-nox-svn'
'virtualbox-ext-vnc-svn')
-pkgver=86044
-pkgrel=2
+pkgver=86698
+pkgrel=1
_vboxsf_commit='5aba938bcabd978e4615186ad7d8617d633e6f30'
arch=('x86_64')
url='http://virtualbox.org'
@@ -67,6 +67,7 @@ source=("VirtualBox::svn+http://www.virtualbox.org/svn/vbox/trunk"
'LocalConfig.kmk'
'vboxservice.service'
'vboxservice-nox.service'
+ 'vboxdrmclient.path'
'vboxdrmclient.service'
'vboxweb.service'
'vboxreload'
@@ -393,8 +394,9 @@ md5sums=('SKIP'
'6e2722bfd7013c1b0174382626ac1b8d'
'ed1341881437455d9735875ddf455fbe'
'9a72e6635976513f442f418431dc6151'
- '8ba9179c4a3516904417d773816dd992'
+ '3cf3dd86ff350a690c978a266f015dcc'
'fcf6bcef98b16849d5c9f048592739c0'
+ '16470fa4b27dc29f65e061b3e613f96d'
'6ab29654246a060561ad2de675105072'
'bc9efed88e0469cd7fc460d5a5cd7b4b'
'6a4e9581a6240b64feee765a1f19e5c3'
diff --git a/vboxdrmclient.path b/vboxdrmclient.path
new file mode 100644
index 000000000000..e1cf64de8ffe
--- /dev/null
+++ b/vboxdrmclient.path
@@ -0,0 +1,6 @@
+[Unit]
+Description=VirtualBox Guest VMSVGA resize client
+ConditionVirtualization=oracle
+
+[Path]
+PathExistsGlob=/dev/dri/renderD*
diff --git a/vboxservice.service b/vboxservice.service
index 7e0c87f0b5fa..50749fea144a 100644
--- a/vboxservice.service
+++ b/vboxservice.service
@@ -1,6 +1,7 @@
[Unit]
Description=VirtualBox Guest Service
ConditionVirtualization=oracle
+Wants=vboxdrmclient.path
[Service]
ExecStartPre=-/usr/bin/modprobe vboxguest
diff --git a/virtualbox-guest-dkms.conf b/virtualbox-guest-dkms.conf
deleted file mode 100644
index 334dac6e644d..000000000000
--- a/virtualbox-guest-dkms.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-## @file
-# Linux DKMS config script for the VirtualBox guest kernel modules
-#
-
-#
-# Copyright (C) 2006-2015 Oracle Corporation
-#
-# This file is part of VirtualBox Open Source Edition (OSE), as
-# available from http://www.virtualbox.org. This file is free software;
-# you can redistribute it and/or modify it under the terms of the GNU
-# General Public License (GPL) as published by the Free Software
-# Foundation, in version 2 as it comes in the "COPYING" file of the
-# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-#
-
-PACKAGE_NAME="vboxguest"
-PACKAGE_VERSION=@VERSION@_OSE
-AUTOINSTALL=yes
-
-# Build only for kernels before Linux 4.16
-BUILD_EXCLUSIVE_KERNEL="^(4\.[0-9]\..*|4\.1[0-5]\..*|3\..*)"
-
-BUILT_MODULE_NAME[0]="vboxguest"
-BUILT_MODULE_LOCATION[0]="vboxguest"
-DEST_MODULE_LOCATION[0]="/kernel/misc"
-
-BUILT_MODULE_NAME[1]="vboxsf"
-BUILT_MODULE_LOCATION[1]="vboxsf"
-DEST_MODULE_LOCATION[1]="/kernel/misc"
-
-BUILT_MODULE_NAME[2]="vboxvideo"
-BUILT_MODULE_LOCATION[2]="vboxvideo"
-DEST_MODULE_LOCATION[2]="/kernel/misc"