moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

virtualbox-ose: update to 6.1.14

Browse source 
The new system liblzf-devel does not (yet) work and needs
further massaging and probably fixing. For now instead use
the liblzf shipped with VirtualBox.

[ci skip]
This commit is contained in:
Jürgen Buchmüller 2020-09-07 09:39:27 +02:00
parent e7d93b117e
commit b3ca34dc8a
6 changed files with 64 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

1
srcpkgs/virtualbox-ose/files/LocalConfig.kmk
View file

@ -4,6 +4,7 @@ VBOX_WITH_LINUX_ADDITIONS = 1
VBOX_WITH_X11_ADDITIONS = 1
VBOX_WITH_TESTCASES =
VBOX_WITH_TESTSUITE =
VBOX_WITH_VIRTIO =
VBOX_WITH_ORIGIN :=
VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)

18
srcpkgs/virtualbox-ose/patches/014-new-gsoap.patch Normal file
View file

@ -0,0 +1,18 @@
Description: fix build failure with new gsoap
Bug-Debian: https://bugs.debian.org/966182
Forwarded: https://www.virtualbox.org/ticket/19634
Author: Gianfranco Costamagna <locutusofborg@debian.org>
--- src/VBox/Main/webservice/vboxweb.cpp
+++ src/VBox/Main/webservice/vboxweb.cpp
@@ -944,7 +944,11 @@ static void doQueuesLoop()
if (rv == 0)
continue; // timeout, not necessary to bother gsoap
// r < 0, errno
+#if GSOAP_VERSION >= 208103
+ if (soap_socket_errno == SOAP_EINTR)
+#else
if (soap_socket_errno(soap.master) == SOAP_EINTR)
+#endif
rv = 0; // re-check if we should terminate
break;
}

12
srcpkgs/virtualbox-ose/patches/016-disable-cloud.patch Normal file
View file

@ -0,0 +1,12 @@
--- Config.kmk
+++ Config.kmk
@@ -802,7 +802,7 @@ endif
# Use new VBoxNetDhcpd instead of old VBoxNetDHCP
VBOX_WITH_DHCPD = 1
# Experimental suport for cloud network integration
-VBOX_WITH_CLOUD_NET = 1
+VBOX_WITH_CLOUD_NET =
## @}

25
srcpkgs/virtualbox-ose/patches/017-libvdeplug-soname.patch Normal file
View file

@ -0,0 +1,25 @@
Description: Revert http://www.virtualbox.org/changeset/36310
The libvdeplug.so symlink is only shipped in the -dev package.
Author: Felix Geyer <fgeyer@debian.org>
Index: virtualbox/include/VBox/VDEPlugSymDefs.h
===================================================================
--- include/VBox/VDEPlugSymDefs.h
+++ include/VBox/VDEPlugSymDefs.h
@@ -1,5 +1,5 @@
/** @file
- * Symbols from libvdeplug.so to be loaded at runtime for DrvVDE.cpp
+ * Symbols from libvdeplug.so.2 to be loaded at runtime for DrvVDE.cpp
*/
/*
@@ -24,7 +24,7 @@
*/
/** The file name of the DBus library */
-#define VBOX_LIB_VDE_PLUG_NAME "libvdeplug.so"
+#define VBOX_LIB_VDE_PLUG_NAME "libvdeplug.so.3"
#define RT_RUNTIME_LOADER_LIB_NAME VBOX_LIB_VDE_PLUG_NAME
/** The name of the loader function */

50
srcpkgs/virtualbox-ose/patches/qt5.15.patch
View file

@ -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>

15
srcpkgs/virtualbox-ose/template
View file

@ -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
@ -18,7 +18,7 @@ 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
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,7 +33,7 @@ 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() {
@ -43,8 +43,9 @@ do_configure() {
do_build() {
export USERNAME="$(whoami)"
sed -i -e "/webtest_LIBS/,/^webtest_/s/.*LIB_.*/\0 z/" \
-e "/vboxwebsrv_LIBS/,/^vboxwebsrv_/s/.*LIB_.*/\0 z/" src/VBox/Main/webservice/Makefile.kmk
vsed -i src/VBox/Main/webservice/Makefile.kmk \
-e "/webtest_LIBS/,/^webtest_/s/.*LIB_.*/\0 z/" \
-e "/vboxwebsrv_LIBS/,/^vboxwebsrv_/s/.*LIB_.*/\0 z/"
source ./env.sh
kmk ${makejobs} KBUILD_VERBOSE=2 all
}