From 10529be75d7b0414808ef34305814da2848eae05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 17 Aug 2016 04:55:20 +0200 Subject: [PATCH] virtualbox-ose: update to 5.1.2 This includes the switch to Qt5. --- .../patches/009-libressl-compat.patch | 45 +++++++++++++++++++ srcpkgs/virtualbox-ose/template | 14 +++--- 2 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/virtualbox-ose/patches/009-libressl-compat.patch diff --git a/srcpkgs/virtualbox-ose/patches/009-libressl-compat.patch b/srcpkgs/virtualbox-ose/patches/009-libressl-compat.patch new file mode 100644 index 00000000000..565b85c63d1 --- /dev/null +++ b/srcpkgs/virtualbox-ose/patches/009-libressl-compat.patch @@ -0,0 +1,45 @@ +--- src/VBox/Runtime/common/crypto/digest-builtin.cpp 2016-07-21 18:28:35.000000000 +0200 ++++ src/VBox/Runtime/common/crypto/digest-builtin.cpp 2016-08-17 04:32:47.564725297 +0200 +@@ -552,7 +552,7 @@ + * OpenSSL EVP. + */ + +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if (OPENSSL_VERSION_NUMBER >= 0x10100000) && !defined(LIBRESSL_VERSION_NUMBER) + /** @impl_interface_method{RTCRDIGESTDESC::pfnNew} */ + static DECLCALLBACK(void*) rtCrDigestOsslEvp_New(void) + { +@@ -588,7 +588,7 @@ + if (fReInit) + { + pEvpType = EVP_MD_CTX_md(pThis); +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if (OPENSSL_VERSION_NUMBER >= 0x10100000) && !defined(LIBRESSL_VERSION_NUMBER) + EVP_MD_CTX_reset(pThis); + # else + EVP_MD_CTX_cleanup(pThis); +@@ -607,7 +607,7 @@ + static DECLCALLBACK(void) rtCrDigestOsslEvp_Delete(void *pvState) + { + EVP_MD_CTX *pThis = (EVP_MD_CTX *)pvState; +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if (OPENSSL_VERSION_NUMBER >= 0x10100000) && !defined(LIBRESSL_VERSION_NUMBER) + EVP_MD_CTX_reset(pThis); + # else + EVP_MD_CTX_cleanup(pThis); +@@ -652,13 +652,13 @@ + NULL, + RTDIGESTTYPE_UNKNOWN, + EVP_MAX_MD_SIZE, +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if (OPENSSL_VERSION_NUMBER >= 0x10100000) && !defined(LIBRESSL_VERSION_NUMBER) + 0, + # else + sizeof(EVP_MD_CTX), + # endif + 0, +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if (OPENSSL_VERSION_NUMBER >= 0x10100000) && !defined(LIBRESSL_VERSION_NUMBER) + rtCrDigestOsslEvp_New, + rtCrDigestOsslEvp_Free, + # else diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index 821214ae094..d8558cbf430 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -1,6 +1,6 @@ # Template file for 'virtualbox-ose' pkgname=virtualbox-ose -version=5.0.24 +version=5.1.2 revision=1 wrksrc="VirtualBox-${version}" short_desc="General-purpose full virtualizer for x86 hardware" @@ -8,18 +8,18 @@ maintainer="Juan RP " homepage="http://virtualbox.org" license="GPL-2, CDDL" distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2" -checksum=9134b04ca21ca23534e2300aab5ab7ff60d21b56bfd2e21504316bfee73afa87 +checksum=03c92e3000d4b905d5b18a6abed757998125a37e5efa7864e62eae2baeabe010 nopie=yes lib32disabled=yes only_for_archs="i686 x86_64" -hostmakedepends="perl pkg-config dev86 yasm acpica-utils" +hostmakedepends="perl pkg-config dev86 yasm acpica-utils qt5-tools" makedepends="libressl-devel libcurl-devel libpng-devel libvpx-devel - alsa-lib-devel pulseaudio-devel SDL-devel qt-devel libXcursor-devel - libXinerama-devel libXcomposite-devel libIDL-devel libglib-devel - pam-devel python-devel libxslt-devel libcap-devel xorg-server-devel - device-mapper-devel docbook-xsl gsoap-devel" + alsa-lib-devel pulseaudio-devel SDL-devel qt5-devel qt5-x11extras-devel + libXcursor-devel libXinerama-devel libXcomposite-devel libIDL-devel + libglib-devel pam-devel python-devel libxslt-devel libcap-devel + xorg-server-devel device-mapper-devel docbook-xsl gsoap-devel" if [ "$XBPS_MACHINE" = "x86_64" ]; then makedepends+=" gcc-c++-multilib"