6.1.26-1: Bumped version

7 files changed, 63 insertions, 145 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5cbde639708d..f039cfaa55b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = virtualbox-headless
 	pkgdesc = Powerful x86 virtualization for enterprise as well as home use. Headless build (no GUI, no Java).
-	pkgver = 6.1.18
+	pkgver = 6.1.26
 	pkgrel = 1
 	url = https://virtualbox.org
-	install = virtualbox.install
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -28,13 +27,13 @@ pkgbase = virtualbox-headless
 	optdepends = virtualbox-guest-iso: Guest Additions CD image
 	optdepends = virtualbox-ext-vnc: VNC server support
 	optdepends = virtualbox-sdk: Developer kit
-	provides = virtualbox=6.1.18
+	provides = virtualbox=6.1.26
 	conflicts = virtualbox-ose
 	conflicts = virtualbox
 	replaces = virtualbox-ose
 	replaces = virtualbox
 	backup = etc/vbox/vbox.cfg
-	source = https://download.virtualbox.org/virtualbox/6.1.18/VirtualBox-6.1.18.tar.bz2
+	source = https://download.virtualbox.org/virtualbox/6.1.26/VirtualBox-6.1.26.tar.bz2
 	source = virtualbox.sysusers
 	source = 60-vboxdrv.rules
 	source = 60-vboxguest.rules
@@ -45,29 +44,26 @@ pkgbase = virtualbox-headless
 	source = 001-disable-update.patch
 	source = 005-gsoap-build.patch
 	source = 008-no-vboxvideo.patch
+	source = 009-i3wm.patch
 	source = 012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch
 	source = 013-Makefile.patch
 	source = 017-fix-narrowing-conversion.patch
 	source = 018-xclient.patch
-	source = 019-python3.9.patch
-	source = 020-linux-5-11.patch
-	sha256sums = 108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40
+	sha256sums = 0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
 	sha256sums = 2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c
 	sha256sums = 9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e
 	sha256sums = 033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95
-	sha256sums = 432c3101023e482e1c8e4af3188370425597efd854a7693fe2f97012a402a30a
+	sha256sums = e372841789d7216af625703ec3b7daa6b5834a3e30d746b693d0b2c28e751854
 	sha256sums = 01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce
 	sha256sums = e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f
 	sha256sums = 4001b5927348fe669a541e80526d4f9ea91b883805f102f7d571edbb482a9b9d
 	sha256sums = 9ee947c9b5ec5b25f52d3e72340fc3a57ca6e65a604e15b669ac582a3fb0dc1b
 	sha256sums = 7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46
 	sha256sums = 053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491
+	sha256sums = c1e13ea4340cff681b273408b1e7f38c887ff8dab6923db390aa58d5ae0f82fa
 	sha256sums = 81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024
 	sha256sums = da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9
 	sha256sums = 5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99
 	sha256sums = cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3
-	sha256sums = 039c7b520ae589bc52dc6c0e658f7ec28ca8defb12ccbc32ad9834361d23162c
-	sha256sums = a8fb9e4d0bb662a60953c17df79f60f225aaebf192bbd2319aa2b5d7a8a28bbc
 
 pkgname = virtualbox-headless
-
diff --git a/009-i3wm.patch b/009-i3wm.patch
new file mode 100644
index 000000000000..95b5a71ae5b3
--- /dev/null
+++ b/009-i3wm.patch
@@ -0,0 +1,50 @@
+diff -Naur VirtualBox/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp VirtualBox/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp
+--- VirtualBox/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp	2017-03-08 18:19:53.000000000 +0100
++++ VirtualBox/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp	2017-03-10 10:25:58.876132400 +0100
+@@ -282,7 +282,7 @@
+     /* Get cached available-geometry: */
+     const QRect availableGeometry = m_availableGeometryData.value(iHostScreenIndex);
+     /* Return cached available-geometry if it's valid or screen-geometry otherwise: */
+-    return availableGeometry.isValid() ? availableGeometry :
++    return availableGeometry.isValid() && X11WindowManagerType() != X11WMType_i3 ? availableGeometry :
+            QApplication::desktop()->screenGeometry(iHostScreenIndex);
+ #else /* !VBOX_WS_X11 */
+     /* Redirect call to desktop-widget: */
+diff -Naur VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp
+--- VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp	2017-03-08 18:19:54.000000000 +0100
++++ VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp	2017-03-10 10:23:15.729460200 +0100
+@@ -93,6 +93,9 @@
+                 else
+                 if (QString((const char*)pcData).contains("Xfwm4", Qt::CaseInsensitive))
+                     wmType = X11WMType_Xfwm4;
++                else
++                if (QString((const char*)pcData).contains("i3", Qt::CaseInsensitive))
++                    wmType = X11WMType_i3;
+                 if (pcData)
+                     XFree(pcData);
+             }
+diff -Naur VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h
+--- VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h	2017-03-08 18:19:54.000000000 +0100
++++ VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h	2017-03-10 10:22:11.876123200 +0100
+@@ -27,6 +27,7 @@
+     X11WMType_KWin,
+     X11WMType_Mutter,
+     X11WMType_Xfwm4,
++    X11WMType_i3,
+ };
+ 
+ /** X11: Determines and returns whether the compositing manager is running. */
+diff -Naur VirtualBox/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp VirtualBox/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
+--- VirtualBox/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp	2017-03-08 18:19:58.000000000 +0100
++++ VirtualBox/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp	2017-03-10 10:29:12.549409400 +0100
+@@ -727,6 +727,10 @@
+     /* Enable translucency through Qt API if supported: */
+     if (vboxGlobal().isCompositingManagerRunning())
+         setAttribute(Qt::WA_TranslucentBackground);
++
++    if (X11WindowManagerType() == X11WMType_i3)
++         setWindowFlags(Qt::FramelessWindowHint);
++
+ #endif /* VBOX_WS_X11 */
+ 
+     /* Make sure we have no focus: */
diff --git a/019-python3.9.patch b/019-python3.9.patch
deleted file mode 100644
index c8006d30510c..000000000000
--- a/019-python3.9.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- ./src/libs/xpcom18a4/python/gen_python_deps.py.orig	2020-06-01 05:15:00.905907651 +0100
-+++ ./src/libs/xpcom18a4/python/gen_python_deps.py	2020-06-01 05:15:48.161226499 +0100
-@@ -16,7 +16,7 @@ from __future__ import print_function
- import os,sys
- from distutils.version import StrictVersion
- 
--versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m" ]
-+versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m", "3.9", "3.9m" ]
- prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"]
- known = {}
- 
---- ./configure.orig	2020-06-01 01:15:53.880747364 +0100
-+++ ./configure	2020-06-01 01:17:42.231478707 +0100
-@@ -1992,7 +1992,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 python3.7 python3.7m python3.8 python3.8m"
-+  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 python3.8 python3.8m python3.9 python3.9m"
-   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
---- ./src/libs/xpcom18a4/python/Makefile.kmk.orig	2020-06-01 05:16:07.610357728 +0100
-+++ ./src/libs/xpcom18a4/python/Makefile.kmk	2020-06-01 05:22:44.735037239 +0100
-@@ -26,7 +26,7 @@ endif
- 
- #
- # List of supported Python versions, defining a number of
--# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|DEF]_[INC|LIB] variables
-+# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|DEF]_[INC|LIB] variables
- # which get picked up below.
- #
- ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
-@@ -532,6 +532,52 @@ VBoxPython3_8m_x86_LIBS       = $(VBOX_P
-   endif
-  endif
- endif
-+
-+ifdef VBOX_PYTHON39_INC
-+#
-+# Python 3.9 version
-+#
-+DLLS += VBoxPython3_9
-+VBoxPython3_9_EXTENDS    = VBoxPythonBase
-+VBoxPython3_9_EXTENDS_BY = appending
-+VBoxPython3_9_TEMPLATE   = XPCOM
-+VBoxPython3_9_INCS       = $(VBOX_PYTHON39_INC)
-+VBoxPython3_9_LIBS       = $(VBOX_PYTHON39_LIB)
-+
-+ ifdef VBOX_WITH_32_ON_64_MAIN_API
-+  ifdef VBOX_PYTHON39_LIB_X86
-+DLLS += VBoxPython3_9_x86
-+VBoxPython3_9_x86_EXTENDS    = VBoxPythonBase_x86
-+VBoxPython3_9_x86_EXTENDS_BY = appending
-+VBoxPython3_9_x86_TEMPLATE   = XPCOM
-+VBoxPython3_9_x86_INCS       = $(VBOX_PYTHON39_INC)
-+VBoxPython3_9_x86_LIBS       = $(VBOX_PYTHON39_LIB_X86)
-+  endif
-+ endif
-+endif
-+
-+ifdef VBOX_PYTHON39M_INC
-+#
-+# Python 3.9 version with pymalloc
-+#
-+DLLS += VBoxPython3_9m
-+VBoxPython3_9m_EXTENDS    = VBoxPythonBase_m
-+VBoxPython3_9m_EXTENDS_BY = appending
-+VBoxPython3_9m_TEMPLATE   = XPCOM
-+VBoxPython3_9m_INCS       = $(VBOX_PYTHON39M_INC)
-+VBoxPython3_9m_LIBS       = $(VBOX_PYTHON39M_LIB)
-+
-+ ifdef VBOX_WITH_32_ON_64_MAIN_API
-+  ifdef VBOX_PYTHON39M_LIB_X86
-+DLLS += VBoxPython3_9m_x86
-+VBoxPython3_9m_x86_EXTENDS    = VBoxPythonBase_x86_m
-+VBoxPython3_9m_x86_EXTENDS_BY = appending
-+VBoxPython3_9m_x86_TEMPLATE_   = XPCOM
-+VBoxPython3_9m_x86_INCS       = $(VBOX_PYTHON39M_INC)
-+VBoxPython3_9m_x86_LIBS       = $(VBOX_PYTHON39M_LIB_X86)
-+  endif
-+ endif
-+endif
- 
- ifdef VBOX_PYTHONDEF_INC
- #
---- ./src/libs/xpcom18a4/python/src/module/_xpcom.cpp.orig	2020-06-01 06:01:12.923522302 +0100
-+++ ./src/libs/xpcom18a4/python/src/module/_xpcom.cpp	2020-06-01 06:02:25.704013030 +0100
-@@ -84,7 +84,11 @@ extern PYXPCOM_EXPORT void PyXPCOM_Inter
- #  define MANGLE_MODULE_INIT(a_Name)    RT_CONCAT(a_Name, MODULE_NAME_SUFFIX)
- # endif
- # ifdef VBOX_PYXPCOM_VERSIONED
--#  if   PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x03090000
-+#  if   PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x03100000
-+#   define MODULE_NAME    MANGLE_MODULE_NAME("VBoxPython3_9")
-+#   define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_9)
-+
-+#  elif   PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x03090000
- #   define MODULE_NAME    MANGLE_MODULE_NAME("VBoxPython3_8")
- #   define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_8)
- 
diff --git a/020-linux-5-11.patch b/020-linux-5-11.patch
deleted file mode 100644
index 66b70bf0d97e..000000000000
--- a/020-linux-5-11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-index 7033b45..c8178a6 100644
---- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-@@ -39,6 +39,7 @@
- #endif
- #include <linux/netdevice.h>
- #include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
- #include <linux/rtnetlink.h>
- #include <linux/miscdevice.h>
- #include <linux/inetdevice.h>
diff --git a/LocalConfig.kmk b/LocalConfig.kmk
index c57f4f9aa645..4957ad648864 100644
--- a/LocalConfig.kmk
+++ b/LocalConfig.kmk
@@ -12,7 +12,7 @@ VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
 VBOX_PATH_APP_DOCS := /usr/share/doc/virtualbox
 VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS)
 VBOX_BLD_PYTHON = python
-VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
+VBOX_JAVA_HOME = /usr/lib/jvm/java-8-openjdk
 
 # do not fail on warning
 VBOX_GCC_WERR =
diff --git a/PKGBUILD b/PKGBUILD
index 54b205eca9ff..526ad62a63af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=virtualbox-headless
-pkgver=6.1.18
+pkgver=6.1.26
 _tarver=${pkgver}
 pkgrel=1
 pkgdesc='Powerful x86 virtualization for enterprise as well as home use. Headless build (no GUI, no Java).'
@@ -22,7 +22,6 @@ backup=('etc/vbox/vbox.cfg')
 provides=("virtualbox=${pkgver}")
 replaces=('virtualbox-ose' 'virtualbox')
 conflicts=('virtualbox-ose' 'virtualbox')
-install=virtualbox.install
 source=("https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${_tarver}.tar.bz2"
         'virtualbox.sysusers'
         '60-vboxdrv.rules'
@@ -34,31 +33,29 @@ source=("https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${_tarv
         '001-disable-update.patch'
         '005-gsoap-build.patch'
         '008-no-vboxvideo.patch'
+        '009-i3wm.patch'
         '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch'
         '013-Makefile.patch'
         '017-fix-narrowing-conversion.patch'
         '018-xclient.patch'
-        '019-python3.9.patch'
-        '020-linux-5-11.patch'
         )
 sha256sums=(
-    '108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40'
+    '0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195'
     '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
     '9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e'
     '033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95'
-    '432c3101023e482e1c8e4af3188370425597efd854a7693fe2f97012a402a30a'
+    'e372841789d7216af625703ec3b7daa6b5834a3e30d746b693d0b2c28e751854'
     '01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce'
     'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f'
     '4001b5927348fe669a541e80526d4f9ea91b883805f102f7d571edbb482a9b9d'
     '9ee947c9b5ec5b25f52d3e72340fc3a57ca6e65a604e15b669ac582a3fb0dc1b'
     '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46'
     '053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491'
+    'c1e13ea4340cff681b273408b1e7f38c887ff8dab6923db390aa58d5ae0f82fa'
     '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024'
     'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9'
     '5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99'
     'cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3'
-    '039c7b520ae589bc52dc6c0e658f7ec28ca8defb12ccbc32ad9834361d23162c'
-    'a8fb9e4d0bb662a60953c17df79f60f225aaebf192bbd2319aa2b5d7a8a28bbc'
 )
 
 prepare() {
diff --git a/virtualbox.install b/virtualbox.install
deleted file mode 100644
index ca39579b2a73..000000000000
--- a/virtualbox.install
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  if (( $(vercmp $2 5.0.16-1) < 0 )); then
-    echo '==> Since version 5.0.14-2 kernel modules are provided via dkms'
-    echo '==> Check you have the headers matching your kernel installed'
-  fi
-}
-
-# vim:set ts=2 sw=2 ft=sh et: