diff --git a/srcpkgs/virtualbox-ose/patches/008-root-window.patch b/srcpkgs/virtualbox-ose/patches/008-root-window.patch index 3f803b5980..af5ba1eb87 100644 --- a/srcpkgs/virtualbox-ose/patches/008-root-window.patch +++ b/srcpkgs/virtualbox-ose/patches/008-root-window.patch @@ -1,15 +1,19 @@ ---- src/VBox/Additions/x11/vboxvideo/vboxvideo.h 2015-02-17 02:16:03.290231117 +0100 -+++ src/VBox/Additions/x11/vboxvideo/vboxvideo.h 2015-02-17 02:15:45.074322113 +0100 -@@ -133,12 +133,7 @@ +--- src/VBox/Additions/x11/vboxvideo/vboxvideo.h 2015-03-04 00:38:45.381480285 +0100 ++++ src/VBox/Additions/x11/vboxvideo/vboxvideo.h 2015-03-04 00:40:57.536942966 +0100 +@@ -130,15 +130,7 @@ + #define VBOX_MAX_DRAWABLES 256 /* At random. */ - /** Helper to work round different ways of getting the root window in different - * server versions. */ --#if defined(XORG_VERSION_CURRENT) && XORG_VERSION_CURRENT < 700000000 \ -- && XORG_VERSION_CURRENT >= 100900000 - # define ROOT_WINDOW(pScrn) screenInfo.screens[(pScrn)->scrnIndex]->root + #define VBOXPTR(p) ((VBOXPtr)((p)->driverPrivate)) +- +-/** Helper to work round different ways of getting the root window in different +- * server versions. */ +-#if defined(XORG_VERSION_CURRENT) && XORG_VERSION_CURRENT < 70000000 \ +- && XORG_VERSION_CURRENT >= 10900000 +-# define ROOT_WINDOW(pScrn) screenInfo.screens[(pScrn)->scrnIndex]->root -#else -# define ROOT_WINDOW(pScrn) WindowTable[(pScrn)->scrnIndex] -#endif ++#define ROOT_WINDOW(pScrn) screenInfo.screens[(pScrn)->scrnIndex]->root /** Structure containing all virtual monitor-specific information. */ struct VBoxScreen diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index dafbc644b9..50f5f23736 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -1,14 +1,14 @@ # Template file for 'virtualbox-ose' pkgname=virtualbox-ose -version=4.3.22 -revision=2 +version=4.3.24 +revision=1 wrksrc="VirtualBox-${version}" short_desc="General-purpose full virtualizer for x86 hardware" maintainer="Juan RP " homepage="http://virtualbox.org" license="GPL-2, MPL-1.1, CDDL" distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2" -checksum=0d41e044589d3371f765a98ddc071d9cf9788289f72b7efbb5db64f5488c8eba +checksum=e2123c9b6100fdd52a9b436fe29aa7215fce17c26904583977c1160b11b170cc lib32disabled=yes only_for_archs="i686 x86_64"