[arch-commits] Commit in virtualbox/trunk (4 files)
Sébastien Luttringer
seblu at archlinux.org
Tue Feb 17 21:56:54 UTC 2015
Date: Tuesday, February 17, 2015 @ 22:56:54
Author: seblu
Revision: 127883
upgpkg: virtualbox 4.3.22-1
Added:
virtualbox/trunk/008-root-window.patch
Modified:
virtualbox/trunk/PKGBUILD
Deleted:
virtualbox/trunk/008-linux-3.19.patch
virtualbox/trunk/009-xorg-1.17-ugly.patch
--------------------------+
008-linux-3.19.patch | 97 ---------------------------------------------
008-root-window.patch | 15 ++++++
009-xorg-1.17-ugly.patch | 33 ---------------
PKGBUILD | 12 ++---
4 files changed, 20 insertions(+), 137 deletions(-)
Deleted: 008-linux-3.19.patch
===================================================================
--- 008-linux-3.19.patch 2015-02-17 21:56:19 UTC (rev 127882)
+++ 008-linux-3.19.patch 2015-02-17 21:56:54 UTC (rev 127883)
@@ -1,97 +0,0 @@
-Index: src/VBox/Additions/linux/sharedfolders/regops.c
-===================================================================
---- a/src/VBox/Additions/linux/sharedfolders/regops.c (revision 97544)
-+++ b/src/VBox/Additions/linux/sharedfolders/regops.c (revision 97545)
-@@ -108,7 +108,7 @@
- size_t tmp_size;
- size_t left = size;
- ssize_t total_bytes_read = 0;
-- struct inode *inode = file->f_dentry->d_inode;
-+ struct inode *inode = GET_F_DENTRY(file)->d_inode;
- struct sf_glob_info *sf_g = GET_GLOB_INFO(inode->i_sb);
- struct sf_reg_info *sf_r = file->private_data;
- loff_t pos = *off;
-@@ -183,7 +183,7 @@
- size_t tmp_size;
- size_t left = size;
- ssize_t total_bytes_written = 0;
-- struct inode *inode = file->f_dentry->d_inode;
-+ struct inode *inode = GET_F_DENTRY(file)->d_inode;
- struct sf_inode_info *sf_i = GET_INODE_INFO(inode);
- struct sf_glob_info *sf_g = GET_GLOB_INFO(inode->i_sb);
- struct sf_reg_info *sf_r = file->private_data;
-@@ -454,7 +454,7 @@
- #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
- static struct page *sf_reg_nopage(struct vm_area_struct *vma, unsigned long vaddr, int *type)
- # define SET_TYPE(t) *type = (t)
--#else /* LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 0) */
-+#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) */
- static struct page *sf_reg_nopage(struct vm_area_struct *vma, unsigned long vaddr, int unused)
- # define SET_TYPE(t)
- #endif
-@@ -465,7 +465,7 @@
- uint32_t nread = PAGE_SIZE;
- int err;
- struct file *file = vma->vm_file;
-- struct inode *inode = file->f_dentry->d_inode;
-+ struct inode *inode = GET_F_DENTRY(file)->d_inode;
- struct sf_glob_info *sf_g = GET_GLOB_INFO(inode->i_sb);
- struct sf_reg_info *sf_r = file->private_data;
-
-@@ -605,7 +605,7 @@
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
- static int sf_readpage(struct file *file, struct page *page)
- {
-- struct inode *inode = file->f_dentry->d_inode;
-+ struct inode *inode = GET_F_DENTRY(file)->d_inode;
- struct sf_glob_info *sf_g = GET_GLOB_INFO(inode->i_sb);
- struct sf_reg_info *sf_r = file->private_data;
- uint32_t nread = PAGE_SIZE;
-Index: src/VBox/Additions/linux/sharedfolders/dirops.c
-===================================================================
---- a/src/VBox/Additions/linux/sharedfolders/dirops.c (revision 97544)
-+++ b/src/VBox/Additions/linux/sharedfolders/dirops.c (revision 97545)
-@@ -126,15 +126,13 @@
-
- TRACE();
-
-- sf_g = GET_GLOB_INFO(dir->f_dentry->d_inode->i_sb);
-+ inode = GET_F_DENTRY(dir)->d_inode;
-+ sf_i = GET_INODE_INFO(inode);
-+ sf_g = GET_GLOB_INFO(inode->i_sb);
- sf_d = dir->private_data;
-
- BUG_ON(!sf_g);
- BUG_ON(!sf_d);
--
-- inode = dir->f_dentry->d_inode;
-- sf_i = GET_INODE_INFO(inode);
--
- BUG_ON(!sf_i);
-
- if (sf_i->force_reread)
-Index: src/VBox/Additions/linux/sharedfolders/vfsmod.h
-===================================================================
---- a/src/VBox/Additions/linux/sharedfolders/vfsmod.h (revision 97544)
-+++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.h (revision 97545)
-@@ -145,7 +145,7 @@
- # define SET_GLOB_INFO(sb, sf_g) (sb)->s_fs_info = sf_g
- #endif
-
--#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 19) || defined(KERNEL_FC6)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) || defined(KERNEL_FC6)
- /* FC6 kernel 2.6.18, vanilla kernel 2.6.19+ */
- # define GET_INODE_INFO(i) ((struct sf_inode_info *) (i)->i_private)
- # define SET_INODE_INFO(i, sf_i) (i)->i_private = sf_i
-@@ -155,5 +155,11 @@
- # define SET_INODE_INFO(i, sf_i) (i)->u.generic_ip = sf_i
- #endif
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
-+# define GET_F_DENTRY(f) (f->f_path.dentry)
-+#else
-+# define GET_F_DENTRY(f) (f->f_dentry)
- #endif
-
-+#endif
-+
Added: 008-root-window.patch
===================================================================
--- 008-root-window.patch (rev 0)
+++ 008-root-window.patch 2015-02-17 21:56:54 UTC (rev 127883)
@@ -0,0 +1,15 @@
+--- 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 @@
+
+ /** 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
+-#else
+-# define ROOT_WINDOW(pScrn) WindowTable[(pScrn)->scrnIndex]
+-#endif
+
+ /** Structure containing all virtual monitor-specific information. */
+ struct VBoxScreen
Deleted: 009-xorg-1.17-ugly.patch
===================================================================
--- 009-xorg-1.17-ugly.patch 2015-02-17 21:56:19 UTC (rev 127882)
+++ 009-xorg-1.17-ugly.patch 2015-02-17 21:56:54 UTC (rev 127883)
@@ -1,33 +0,0 @@
-diff -ru VirtualBox-4.3.20/src/VBox/Additions/x11/vboxvideo/edid.c VirtualBox-4.3.20b/src/VBox/Additions/x11/vboxvideo/edid.c
---- VirtualBox-4.3.20/src/VBox/Additions/x11/vboxvideo/edid.c 2014-11-21 16:16:53.000000000 +0100
-+++ VirtualBox-4.3.20b/src/VBox/Additions/x11/vboxvideo/edid.c 2015-02-10 16:37:25.656612649 +0100
-@@ -45,6 +45,7 @@
- */
-
- #include <misc.h>
-+#include <xorg/xorg-server.h>
- #include <xf86DDC.h>
- #include <xf86Crtc.h>
- #include "vboxvideo.h"
-diff -ru VirtualBox-4.3.20/src/VBox/Additions/x11/vboxvideo/pointer.c VirtualBox-4.3.20b/src/VBox/Additions/x11/vboxvideo/pointer.c
---- VirtualBox-4.3.20/src/VBox/Additions/x11/vboxvideo/pointer.c 2014-11-21 16:16:53.000000000 +0100
-+++ VirtualBox-4.3.20b/src/VBox/Additions/x11/vboxvideo/pointer.c 2015-02-10 16:31:25.677093405 +0100
-@@ -27,6 +27,7 @@
- #include <iprt/string.h>
- #include "compiler.h"
- #include "cursorstr.h"
-+#include <xorg/xorg-server.h>
- #include "servermd.h"
-
- #include "vboxvideo.h"
-diff -ru VirtualBox-4.3.20/src/VBox/Additions/x11/vboxvideo/vboxvideo.c VirtualBox-4.3.20b/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
---- VirtualBox-4.3.20/src/VBox/Additions/x11/vboxvideo/vboxvideo.c 2014-11-21 16:16:53.000000000 +0100
-+++ VirtualBox-4.3.20b/src/VBox/Additions/x11/vboxvideo/vboxvideo.c 2015-02-10 16:31:48.163313719 +0100
-@@ -72,6 +72,7 @@
- # include "xf86Pci.h"
- #endif
-
-+#include <xorg/xorg-server.h>
- #include "fb.h"
-
- #include "vboxvideo.h"
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-02-17 21:56:19 UTC (rev 127882)
+++ PKGBUILD 2015-02-17 21:56:54 UTC (rev 127883)
@@ -10,8 +10,8 @@
'virtualbox-guest-utils'
'virtualbox-guest-utils-nox'
'virtualbox-ext-vnc')
-pkgver=4.3.20
-pkgrel=6
+pkgver=4.3.22
+pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -65,9 +65,8 @@
'005-gsoap-build.patch'
'006-rdesktop-vrdp-keymap-path.patch'
'007-python2-path.patch'
- '008-linux-3.19.patch'
- '009-xorg-1.17-ugly.patch')
-md5sums=('cf3f25644aa0fae1029e8b362bd4375e'
+ '008-root-window.patch')
+md5sums=('fc21ecc1044dc13cd6c6b601823c6df3'
'4833c8e0524fd2272b24ba0d94aef006'
'6e2722bfd7013c1b0174382626ac1b8d'
'ed1341881437455d9735875ddf455fbe'
@@ -83,8 +82,7 @@
'ecfd13297d7753ebe7b8763ca5b792d9'
'7ea75b242e19440d622eb42a4d6c62c4'
'188ea65918309f737ce28216c2b07c3b'
- 'd8a6630dfc7fe9cd3282947ed0ccf55c'
- '8ae131dea6e4e81e5de77156c9d04dce')
+ '70e61a4f21b9a7a32a98f8c92a469622')
prepare() {
cd "VirtualBox-$pkgver"
More information about the arch-commits
mailing list