[arch-commits] Commit in virtualbox/trunk (008-root-window.patch PKGBUILD build.sh)

[Sébastien Luttringer]

    Date: Wednesday, March 4, 2015 @ 01:11:40
  Author: seblu
Revision: 128686

upgpkg: virtualbox 4.3.24-1

- fix FS#43944

Added:
  virtualbox/trunk/build.sh
Modified:
  virtualbox/trunk/008-root-window.patch
  virtualbox/trunk/PKGBUILD

-----------------------+
 008-root-window.patch |   20 ++++++++++++--------
 PKGBUILD              |   10 +++++-----
 build.sh              |    3 +++
 3 files changed, 20 insertions(+), 13 deletions(-)

Modified: 008-root-window.patch
===================================================================
--- 008-root-window.patch	2015-03-04 00:10:22 UTC (rev 128685)
+++ 008-root-window.patch	2015-03-04 00:11:40 UTC (rev 128686)
@@ -1,15 +1,19 @@
---- a/src/VBox/Additions/x11/vboxvideo/vboxvideo.h	2015-02-17 02:16:03.290231117 +0100
-+++ b/src/VBox/Additions/x11/vboxvideo/vboxvideo.h	2015-02-17 02:15:45.074322113 +0100
-@@ -133,12 +133,7 @@
+--- a/src/VBox/Additions/x11/vboxvideo/vboxvideo.h	2015-03-04 00:38:45.381480285 +0100
++++ b/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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-04 00:10:22 UTC (rev 128685)
+++ PKGBUILD	2015-03-04 00:11:40 UTC (rev 128686)
@@ -10,8 +10,8 @@
          'virtualbox-guest-utils'
          'virtualbox-guest-utils-nox'
          'virtualbox-ext-vnc')
-pkgver=4.3.22
-pkgrel=2
+pkgver=4.3.24
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -66,7 +66,7 @@
         '006-rdesktop-vrdp-keymap-path.patch'
         '007-python2-path.patch'
         '008-root-window.patch')
-md5sums=('fc21ecc1044dc13cd6c6b601823c6df3'
+md5sums=('c9711ee4a040de131c638168d321f3ff'
          '4833c8e0524fd2272b24ba0d94aef006'
          '6e2722bfd7013c1b0174382626ac1b8d'
          'ed1341881437455d9735875ddf455fbe'
@@ -82,7 +82,7 @@
          'ecfd13297d7753ebe7b8763ca5b792d9'
          '7ea75b242e19440d622eb42a4d6c62c4'
          '188ea65918309f737ce28216c2b07c3b'
-         '70e61a4f21b9a7a32a98f8c92a469622')
+         '7495960c8fd0ac5867b6fa9cd87a64bb')
 
 prepare() {
     cd "VirtualBox-$pkgver"
@@ -290,7 +290,7 @@
 package_virtualbox-guest-utils() {
     pkgdesc='VirtualBox Guest userspace utilities'
     depends=('virtualbox-guest-modules' 'glibc' 'pam' 'libx11' 'libxcomposite'
-             'libxdamage' 'libxext' 'libxfixes' 'libxmu' 'libxt'
+             'libxdamage' 'libxext' 'libxfixes' 'libxmu' 'libxt' 'libxrandr'
              'X-ABI-VIDEODRV_VERSION=19')
     optdepends=('virtualbox-guest-dkms: Guest kernel source modules for non-stock kernels')
     replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')

Added: build.sh
===================================================================
--- build.sh	                        (rev 0)
+++ build.sh	2015-03-04 00:11:40 UTC (rev 128686)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+multilib-build && extra-i686-build


Property changes on: virtualbox/trunk/build.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property