From 18d6577d511b9a1ac36eaae50060133a401e42a3 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Wed, 27 Apr 2011 22:24:53 +0000
Subject: Wed Apr 27 22:24:53 UTC 2011

---
 community/virtualbox/LocalConfig.kmk         |  2 ++
 community/virtualbox/PKGBUILD                | 20 +++++++++++---------
 community/virtualbox/gcc46.patch             | 15 +++++++++++++++
 community/virtualbox/vboxdrv-reference.patch | 12 +++++++-----
 4 files changed, 35 insertions(+), 14 deletions(-)
 create mode 100644 community/virtualbox/gcc46.patch

(limited to 'community/virtualbox')

diff --git a/community/virtualbox/LocalConfig.kmk b/community/virtualbox/LocalConfig.kmk
index 1a17127a0..d0e939ad4 100644
--- a/community/virtualbox/LocalConfig.kmk
+++ b/community/virtualbox/LocalConfig.kmk
@@ -15,3 +15,5 @@ VBOX_WITH_UPDATE_REQUEST =
 VBOX_WITH_VNC := 1
 VBOX_BLD_PYTHON = python2
 VBOX_JAVA_HOME = /opt/java
+VBOX_GCC_WERR =
+VBOX_GCC_WARN =
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index 94a9aba4f..d73767ffb 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 44881 2011-04-12 11:57:31Z ibiru $
+# $Id: PKGBUILD 45439 2011-04-21 19:40:11Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk')
-pkgver=4.0.4
-pkgrel=4
+pkgver=4.0.6
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -15,7 +15,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}
         http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf
         virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch
         10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh
-        18-system-xorg.patch)
+        18-system-xorg.patch gcc46.patch)
 _kernver=2.6.38-ARCH
 
 build() {
@@ -25,6 +25,7 @@ build() {
     patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch"
     patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
     patch -Np1 -i "$srcdir/18-system-xorg.patch"
+    patch -Np1 -i "$srcdir/gcc46.patch"
 
     cp "$srcdir/LocalConfig.kmk" .
 
@@ -202,13 +203,14 @@ package_virtualbox-guest-modules(){
 
     sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-guest-modules.install"
 }
-md5sums=('b4770ca14d1a8cbad9b3eb0e0028ff4b'
-         'bf8007eea0042f745b3c252bbe7586c2'
+md5sums=('cf274f0585c35c5c137e2bd9b48b462a'
+         '7d3ee86e998fa24b07a157add9fb7766'
          '44efb3c4be214daa453a317d527f1f30'
          '32a232b43852b9a08cb11a7bcd64b347'
          '5f85710e0b8606de967716ded7b2d351'
          'ed1341881437455d9735875ddf455fbe'
-         '94514e006e73cc2fa90259a4e0eec04b'
-         '0f3f273cdbc54db221f737ad4f761c11'
+         '9bde5b7dfba5abcd49768052c5409800'
+         'c1a07f044c476a190af8486fe78bee0f'
          '47da2e88de582bb2bab14580a3aa47b1'
-         '8a22b33c9dfaf8fb79bb2d26304e650b')
+         '8a22b33c9dfaf8fb79bb2d26304e650b'
+         'a28b48ff01149acbca4bbe6a676a06da')
diff --git a/community/virtualbox/gcc46.patch b/community/virtualbox/gcc46.patch
new file mode 100644
index 000000000..9786a7287
--- /dev/null
+++ b/community/virtualbox/gcc46.patch
@@ -0,0 +1,15 @@
+diff -Nur VirtualBox-4.0.6_OSE.orig//configure VirtualBox-4.0.6_OSE/configure
+--- VirtualBox-4.0.6_OSE.orig//configure	2011-04-21 03:29:30.000000000 -0700
++++ VirtualBox-4.0.6_OSE/configure	2011-04-21 11:42:57.517216676 -0700
+@@ -412,9 +412,9 @@
+       elif [ $cc_maj -lt 3 \
+              -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
+              -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
+-             -o \( $cc_maj -eq 4 -a $cc_min -gt 5 \) \
++             -o \( $cc_maj -eq 4 -a $cc_min -gt 6 \) \
+              -o $cc_maj -gt 4 ]; then
+-        log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<5"
++        log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<=6"
+         fail really
+       else
+         log_success "found version $cc_ver"
diff --git a/community/virtualbox/vboxdrv-reference.patch b/community/virtualbox/vboxdrv-reference.patch
index ed5e7f377..e7a9179a9 100644
--- a/community/virtualbox/vboxdrv-reference.patch
+++ b/community/virtualbox/vboxdrv-reference.patch
@@ -1,5 +1,6 @@
---- VirtualBox-4.0.2_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
-+++ VirtualBox-4.0.2_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
+diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
+--- VirtualBox-4.0.6_OSE.orig//src/VBox/Frontends/VirtualBox/src/main.cpp	2011-04-21 03:31:05.000000000 -0700
++++ VirtualBox-4.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-04-21 11:10:00.503832646 -0700
 @@ -75,9 +75,8 @@
    "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
    "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
@@ -21,8 +22,9 @@
    "may correct this. Make sure that you do not mix the "
    "OSE version and the PUEL version of VirtualBox."
    );
---- VirtualBox-4.0.2_OSE/src/VBox/Installer/linux/VBox.sh
-+++ VirtualBox-4.0.2_OSE/src/VBox/Installer/linux/VBox.sh
+diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Installer/linux/VBox.sh VirtualBox-4.0.6_OSE/src/VBox/Installer/linux/VBox.sh
+--- VirtualBox-4.0.6_OSE.orig//src/VBox/Installer/linux/VBox.sh	2011-04-21 03:31:18.000000000 -0700
++++ VirtualBox-4.0.6_OSE/src/VBox/Installer/linux/VBox.sh	2011-04-21 11:10:00.503832646 -0700
 @@ -34,7 +34,7 @@
           available for the current kernel (`uname -r`) or it failed to
           load. Please recompile the kernel module and install it by
@@ -40,4 +42,4 @@
 +           /etc/rc.d/vboxdrv restart
  
           and if that is not successful, try to re-install the package.
- 
\ No newline at end of file
+ 
-- 
cgit v1.2.3-54-g00ecf