From 483f59a1c25f6796969b7e593c064d2fa818683c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 7 Sep 2020 09:39:27 +0200
Subject: [PATCH] virtualbox-ose: update to 6.1.14

Something goes wrong when building the ACPI stuff yet
I don't see what and why.
---
 srcpkgs/virtualbox-ose/patches/qt5.15.patch | 50 ---------------------
 srcpkgs/virtualbox-ose/template             | 16 +++----
 2 files changed, 8 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/virtualbox-ose/patches/qt5.15.patch

diff --git a/srcpkgs/virtualbox-ose/patches/qt5.15.patch b/srcpkgs/virtualbox-ose/patches/qt5.15.patch
deleted file mode 100644
index daa4bb48e1d..00000000000
--- a/srcpkgs/virtualbox-ose/patches/qt5.15.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp	2020-06-04 18:29:31.000000000 +0200
-+++ -	2020-07-03 22:15:08.774947719 +0200
-@@ -16,6 +16,7 @@
-  */
- 
- /* Qt includes: */
-+#include <QPainterPath>
- #include <QPainter>
- 
- /* GUI include */
---- src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp	2020-06-04 18:29:39.000000000 +0200
-+++ -	2020-07-03 22:31:19.731541404 +0200
-@@ -18,6 +18,7 @@
- /* Qt includes: */
- #include <QApplication>
- #include <QLabel>
-+#include <QPainterPath>
- #include <QPainter>
- #include <QPaintEvent>
- #include <QStyle>
---- src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h	2020-06-04 18:29:39.000000000 +0200
-+++ -	2020-07-03 22:36:58.693069087 +0200
-@@ -22,6 +22,7 @@
- #endif
- 
- /* Qt includes: */
-+#include <QPainterPath>
- #include <QIcon>
- #include <QWidget>
- 
---- src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp	2020-06-04 18:29:39.000000000 +0200
-+++ -	2020-07-03 22:40:03.474499683 +0200
-@@ -20,6 +20,7 @@
- #include <QLabel>
- #include <QMenu>
- #include <QMoveEvent>
-+#include <QPainterPath>
- #include <QPainter>
- #include <QStateMachine>
- #include <QStyle>
---- src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp	2020-06-04 18:29:39.000000000 +0200
-+++ -	2020-07-03 22:42:57.625474621 +0200
-@@ -18,6 +18,7 @@
- /* Qt includes: */
- #include <QApplication>
- #include <QHBoxLayout>
-+#include <QPainterPath>
- #include <QPainter>
- #include <QStyle>
- #include <QToolButton>
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index f1184e6a6fc..d38be3cc7e0 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.10
-revision=2
+version=6.1.14
+revision=1
 wrksrc="VirtualBox-${version%*a}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version%*a}/VirtualBox-$version.tar.bz2"
-checksum=37d8b30c0be82a50c858f3fc70cde967882239b6212bb32e138d3615b423c477
+checksum=91fa05bcfce36316ca93e3927c9550ea66286fff4c5bec900b753fca278ce1a0
 
 nopie=yes
 lib32disabled=yes
@@ -17,8 +17,8 @@ archs="x86_64"
 
 hostmakedepends="acpica-utils dev86 perl pkg-config qt5-tools tar yasm which"
 makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel
- libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel
- libXinerama-devel libxslt-devel opus-devel pam-devel python-devel qt5-x11extras-devel
+ liblzf-devel libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel
+ libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt5-x11extras-devel
  SDL-devel xorg-server-devel"
 
 if [ "$XBPS_MACHINE" = "x86_64" ]; then
@@ -33,12 +33,12 @@ pre_configure() {
 	ln -s /bin/echo makeself
 
 	echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
-	sed -i 's/^check_gcc$/#check_gcc/' configure
+	vsed -i 's/^check_gcc$/#check_gcc/' configure
 }
 
 do_configure() {
 	./configure --disable-docs --disable-java --enable-vde \
-		--disable-python --disable-kmods --nofatal --enable-webservice
+		--disable-kmods --nofatal --enable-webservice
 }
 
 do_build() {
@@ -46,7 +46,7 @@ do_build() {
 	sed -i -e "/webtest_LIBS/,/^webtest_/s/.*LIB_.*/\0 z/" \
 		-e "/vboxwebsrv_LIBS/,/^vboxwebsrv_/s/.*LIB_.*/\0 z/" src/VBox/Main/webservice/Makefile.kmk
 	source ./env.sh
-	kmk ${makejobs} KBUILD_VERBOSE=2 all
+	kmk ${makejobs} KBUILD_VERBOSE=1
 }
 
 do_install() {