summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-07-26 16:43:06 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-07-26 16:43:06 -0300
commita68664d6ff8471e44f261904dae73d4200e092b1 (patch)
treeb53146afa99521aa0df07edff34d1af7f26d9d98
parent9d8e461bb8a66c4ab5c4e4091f008f4562a256fe (diff)
downloadabslibre-a68664d6ff8471e44f261904dae73d4200e092b1.tar.gz
abslibre-a68664d6ff8471e44f261904dae73d4200e092b1.tar.bz2
abslibre-a68664d6ff8471e44f261904dae73d4200e092b1.zip
virtualbox-libre: fixing issues dependencies and updating free-distros.patch
-rw-r--r--libre/virtualbox-libre/PKGBUILD6
-rw-r--r--libre/virtualbox-libre/free-distros.patch24
2 files changed, 27 insertions, 3 deletions
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 32cf31238..84761ac24 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=('virtualbox-libre'
'virtualbox-libre-source'
'virtualbox-libre-parabola-source')
pkgver=4.1.18
-pkgrel=4
+pkgrel=4.1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -194,7 +194,7 @@ package_virtualbox-libre-sdk() {
package_virtualbox-libre-parabola-additions(){
pkgdesc="Additions only for Parabola guests (userspace tools)"
- depends=('virtualbox-parabola-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
+ depends=('virtualbox-libre-parabola-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
replaces=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
conflicts=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
provides=("virtualbox-archlinux-additions=${pkgver}")
@@ -281,4 +281,4 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac'
'4da8eeb2ece7e475fc7a0d1003da26c6'
'5e4187af59726d71c5be48d0cd816c34'
'a9e4724b56ddf99bb2e9a8fab8ad43ba'
- 'bff9fb57834202fb715a4f138f945cb6')
+ 'f7d275fc52e5f3cfafd85646c2914063')
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index 64c876512..7920fb6ab 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -1357,3 +1357,27 @@
};
+--- VirtualBox-4.1.18.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c 2012-06-20 10:09:01.000000000 -0300
++++ VirtualBox-4.1.18/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c 2012-07-26 15:32:55.309812685 -0300
+@@ -622,16 +622,16 @@
+ * Call the common device extension initializer.
+ */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && defined(RT_ARCH_X86)
+- VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux26;
++ VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux;
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && defined(RT_ARCH_AMD64)
+- VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux26_x64;
++ VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux_x64;
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) && defined(RT_ARCH_X86)
+- VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux24;
++ VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux;
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) && defined(RT_ARCH_AMD64)
+- VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux24_x64;
++ VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux_x64;
+ #else
+ # warning "huh? which arch + version is this?"
+- VBOXOSTYPE enmOsType = VBOXOSTYPE_Linux;
++ VBOXOSTYPE enmOsType = VBOXOSTYPE_GNULinux;
+ #endif
+ rc = VBoxGuestInitDevExt(&g_DevExt,
+ g_IOPortBase,