From 32bfc6316a2d82dc866718ad223104eb846bdbaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 7 Sep 2020 09:39:27 +0200 Subject: [PATCH] virtualbox-ose: update to 6.1.14 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] --- srcpkgs/virtualbox-ose/files/LocalConfig.kmk | 1 + .../patches/014-new-gsoap.patch | 18 +++++++ .../patches/016-disable-cloud.patch | 12 +++++ .../patches/017-libvdeplug-soname.patch | 25 ++++++++++ srcpkgs/virtualbox-ose/patches/qt5.15.patch | 50 ------------------- srcpkgs/virtualbox-ose/template | 15 +++--- 6 files changed, 64 insertions(+), 57 deletions(-) create mode 100644 srcpkgs/virtualbox-ose/patches/014-new-gsoap.patch create mode 100644 srcpkgs/virtualbox-ose/patches/016-disable-cloud.patch create mode 100644 srcpkgs/virtualbox-ose/patches/017-libvdeplug-soname.patch delete mode 100644 srcpkgs/virtualbox-ose/patches/qt5.15.patch diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk index e8c7cb5cdb6..4f5dcab41b8 100644 --- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk +++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk @@ -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) diff --git a/srcpkgs/virtualbox-ose/patches/014-new-gsoap.patch b/srcpkgs/virtualbox-ose/patches/014-new-gsoap.patch new file mode 100644 index 00000000000..cdfe865fa6d --- /dev/null +++ b/srcpkgs/virtualbox-ose/patches/014-new-gsoap.patch @@ -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 +--- 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; + } diff --git a/srcpkgs/virtualbox-ose/patches/016-disable-cloud.patch b/srcpkgs/virtualbox-ose/patches/016-disable-cloud.patch new file mode 100644 index 00000000000..e04cc06a751 --- /dev/null +++ b/srcpkgs/virtualbox-ose/patches/016-disable-cloud.patch @@ -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 = + ## @} + + + diff --git a/srcpkgs/virtualbox-ose/patches/017-libvdeplug-soname.patch b/srcpkgs/virtualbox-ose/patches/017-libvdeplug-soname.patch new file mode 100644 index 00000000000..442b1e67ca7 --- /dev/null +++ b/srcpkgs/virtualbox-ose/patches/017-libvdeplug-soname.patch @@ -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 + +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 */ + 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 - #include - - /* 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 - #include -+#include - #include - #include - #include ---- 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 - #include - #include - ---- 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 - #include - #include -+#include - #include - #include - #include ---- 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 - #include -+#include - #include - #include - #include diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index f1184e6a6fc..23db4c7f963 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 " @@ -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 }