Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=02adfe3ac8db8907ce140ce0f2325d518180d4d2
commit 02adfe3ac8db8907ce140ce0f2325d518180d4d2 Author: Marius Cirsta <[email protected]> Date: Tue Nov 15 23:37:35 2016 +0200 virtualbox-5.1.8-1-x86_64 * version bump diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index 7d3d471..b755302 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -4,7 +4,7 @@ pkgname=virtualbox realname=VirtualBox -pkgver=5.1.6 +pkgver=5.1.8 pkgrel=1 pkgdesc="Oracle VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use." url="http://www.virtualbox.org"; @@ -12,19 +12,20 @@ depends=('xerces-c>=2.8.0' 'xalan-c>=1.10.0-2' 'iasl' 'dev86' 'libxslt' 'libxcur 'alsa-lib' 'curl' 'libxmu' 'libuuid' 'libcap' 'qt5-base>=5.7.0' 'qt5-x11extras>=5.7.0' \ 'libvpx>=1.6.0' 'lvm2' 'libgl' 'libxext' 'libx11' 'libpulse' 'libglu' 'libxrandr' 'libxcomposite' \ 'libxinerama') -makedepends=('cdrtools' 'x11-protos' 'mesa' 'qt5-tools' 'mesa-libgl-headers') +makedepends=('cdrtools' 'x11-protos' 'qt5-tools' 'mesa-libgl-headers') rodepends=("virtualbox-modules=$pkgver") groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://download.virtualbox.org/virtualbox/LATEST.TXT | head -n 1" source=(http://download.virtualbox.org/virtualbox/${pkgver}/${realname}-${pkgver}.tar.bz2 \ - 10-vboxdrv.rules LocalConfig.kmk $pkgname.install) + 10-vboxdrv.rules LocalConfig.kmk $pkgname.install fix-build.patch) options=('scriptlet' 'genscriptlet') _F_cd_path="${realname}-${pkgver}" -sha1sums=('b2177b8462fdfb05f864d81d18fc62e867c4587c' \ +sha1sums=('fe968ecbe9f8945220dbd388971cd1ce596cfd22' \ 'aa931ae19edd8585150738f0efd8fedf5175a6d3' \ '5b7ecf8ee9e3b367c485e513ae36d30cbd23eff5' \ - 'f32f69a501794adc5da977060db0e607aee839f0') + 'f32f69a501794adc5da977060db0e607aee839f0' \ + '8fd54edd6e5d9f8a54729b7293b909bba7d87f91') build() { diff --git a/source/xapps-extra/virtualbox/fix-build.patch b/source/xapps-extra/virtualbox/fix-build.patch new file mode 100644 index 0000000..54ce32f --- /dev/null +++ b/source/xapps-extra/virtualbox/fix-build.patch @@ -0,0 +1,55 @@ +Description: Upstream changeset 64324 and 64325 to fix build failure with gcc-7 (and 6.2.0-7 backported patch) + +Index: virtualbox/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp +=================================================================== +--- virtualbox.orig/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp ++++ virtualbox/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp +@@ -110,8 +110,16 @@ + */ + typedef struct USBPROXYURBLNX + { +- /** The kernel URB data */ ++ /** The kernel URB data. */ ++#if RT_GNUC_PREREQ(6, 0) ++ /* gcc 6.2 complains about the [] member of KUrb */ ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wpedantic" ++#endif + struct usbdevfs_urb KUrb; ++#if RT_GNUC_PREREQ(6, 0) ++# pragma GCC diagnostic pop ++#endif + /** Space filler for the isochronous packets. */ + struct usbdevfs_iso_packet_desc aIsocPktsDonUseTheseUseTheOnesInKUrb[8]; + /** Node to link the URB in of the existing lists. */ +@@ -121,11 +129,11 @@ + /** The next linux URB if split up. */ + struct USBPROXYURBLNX *pSplitNext; + /** Don't report these back. */ +- bool fCanceledBySubmit; ++ bool fCanceledBySubmit; + /** This split element is reaped. */ +- bool fSplitElementReaped; ++ bool fSplitElementReaped; + /** Size to transfer in remaining fragments of a split URB */ +- uint32_t cbSplitRemaining; ++ uint32_t cbSplitRemaining; + } USBPROXYURBLNX, *PUSBPROXYURBLNX; + + /** +Index: virtualbox/src/VBox/Main/src-server/linux/HostDnsServiceLinux.cpp +=================================================================== +--- virtualbox.orig/src/VBox/Main/src-server/linux/HostDnsServiceLinux.cpp ++++ virtualbox/src/VBox/Main/src-server/linux/HostDnsServiceLinux.cpp +@@ -34,6 +34,11 @@ + + #include <linux/limits.h> + ++/* Workaround for <sys/cdef.h> defining __flexarr to [] which beats us in ++ * struct inotify_event (char name __flexarr). */ ++#include <sys/cdefs.h> ++#undef __flexarr ++#define __flexarr [0] + #include <sys/inotify.h> + #include <sys/types.h> + #include <sys/socket.h> _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
