Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

1 files changed, 13 insertions, 30 deletions

diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index dc94a2a33..3619c0c1b 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -12,8 +12,8 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-guest-dkms'
          'virtualbox-libre-sdk'
          'virtualbox-libre-guest-utils')
-pkgver=4.2.6
-pkgrel=1.1
+pkgver=4.2.10
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -22,7 +22,7 @@ makedepends=('alsa-lib'
              'cdrkit'
              'curl'
              'dev86'
-             'gsoap'
+             'gsoap=2.8.11-1'
              'iasl'
              'jdk7-openjdk'
              'libidl2'
@@ -39,24 +39,21 @@ makedepends=('alsa-lib'
              'mesa'
              'glu'
              'python2'
-             'qt'
+             'qt4'
              'sdl'
              'sdl_ttf'
              'vde2'
-             'xalan-c')
+             'xalan-c' 'xorg-server-devel' 'xf86driproto' 'libxcomposite')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2"
         '10-vboxdrv.rules'
         '60-vboxguest.rules'
         'LocalConfig.kmk'
-        'vboxservice.conf'
-        'vboxservice.rc'
         'vboxservice.service'
-        'vboxweb.conf'
-        'vboxweb.rc'
         'vboxweb.service'
         '001-vboxdrv-reference.patch'
         '002-change_default_driver_dir.patch'
+        '18-system-xorg.patch'
         'os_blag_64.png'
         'os_blag.png'
         'os_dragora_64.png'
@@ -77,18 +74,15 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         'os_venenux.png'
         'libre.patch'
         'free-distros.patch')
-md5sums=('d680aeb3b4379b8281527aeb012b2df5'
+md5sums=('99349df34caacdecbb7cf3908631c3f3'
          '5f85710e0b8606de967716ded7b2d351'
          'ed1341881437455d9735875ddf455fbe'
          '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
-         '3c08ad30b89add47d3f45121200a5360'
-         '7d9823507206de9b8528a72af2f18d74'
          '07c5f6d86c4b7839d719c8ee0c53653b'
-         '7e9483b1069a54f181546083ac7e5469'
-         'c159d683ba1947290fc2ad2c64194150'
          'bc9efed88e0469cd7fc460d5a5cd7b4b'
          'f4e4c7895ede9c524109589bf16ae660'
          '97e193f050574dd272a38e5ee5ebe62b'
+         '4da461f8c90caa123b47c62479f426b4'
          '8538dba8686d7449cb481c9bae9d722a'
          '545c925b46f2ac95e5f8ae407fad101a'
          'f6416f509c2e5460e4dc624e0a57f3c1'
@@ -166,7 +160,7 @@ build() {
 }
 
 package_virtualbox-libre() {
-    pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets and Oracle VM VirtualBox Extension Pack support removed)'
+    pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets included and nonfree Oracle VM VirtualBox Extension Pack support removed)'
     depends=('curl'
              'libpng'
              'libxcursor'
@@ -176,12 +170,12 @@ package_virtualbox-libre() {
              'sdl'
              'shared-mime-info'
              'virtualbox-libre-host-modules')
-    optdepends=('qt: VirtualBox GUI support'
+    optdepends=('qt4: VirtualBox GUI support'
                 'vde2: Virtual Distributed Ethernet support'
                 'virtualbox-libre-sdk: Developer kit'
                 'virtualbox-libre-host-dkms: Host kernel source modules for non-stock kernels'
                 'net-tools: Host-only or bridged networking support')
-    backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb')
+    backup=('etc/vbox/vbox.cfg')
     replaces=('virtualbox' 'virtualbox-ose')
     conflicts=('virtualbox' 'virtualbox-ose')
     provides=("virtualbox=$pkgver")
@@ -191,7 +185,6 @@ package_virtualbox-libre() {
     cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
     install -dm755 "$pkgdir"/usr/{bin,lib/virtualbox/components,share/virtualbox/nls,share/virtualbox/rdesktop-vrdp-keymaps}
 
-
     #Binaries and Wrapper with Launchers
     install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox"
 
@@ -247,14 +240,9 @@ package_virtualbox-libre() {
     install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
         "$pkgdir/usr/lib/udev/rules.d/10-vboxdrv.rules"
 
-    # install rc.d script
-    install -D -m755 "$srcdir/vboxweb.rc" "$pkgdir/etc/rc.d/vboxweb"
     # install systemd service
     install -D -m644 "$srcdir/vboxweb.service" \
         "$pkgdir/usr/lib/systemd/system/vboxweb.service"
-    # install sample config
-    install -D -m644 "$srcdir/vboxweb.conf" "$pkgdir/etc/conf.d/vboxweb"
-
 }
 
 package_virtualbox-libre-sdk() {
@@ -313,11 +301,10 @@ package_virtualbox-libre-guest-dkms() {
 package_virtualbox-libre-guest-utils(){
     pkgdesc='VirtualBox Guest userspace utilities'
     depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
-    optdepends=('virtualbox-guest-source: Guest kernel source modules for non-stock kernels')
+    optdepends=('virtualbox-libre-guest-dkms: Guest kernel source modules for non-stock kernels')
     provides=("virtualbox-guest-utils=$pkgver")
     replaces=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
     conflicts=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
-    backup=('etc/conf.d/vboxservice')
     install=virtualbox-libre-guest-utils.install
 
     source "VirtualBox-$pkgver/env.sh"
@@ -329,7 +316,7 @@ package_virtualbox-libre-guest-utils(){
         "$pkgdir"/usr/bin/VBoxClient-all
     install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \
         "$pkgdir"/etc/xdg/autostart/vboxclient.desktop
-    install -D vboxvideo_drv_113.so \
+    install -D vboxvideo_drv.so \
         "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so"
     install -d "$pkgdir/usr/lib/xorg/modules/dri"
     install -m755 VBoxOGL*.so "$pkgdir/usr/lib"
@@ -339,10 +326,6 @@ package_virtualbox-libre-guest-utils(){
     # install udev rules
     install -D -m 0644 60-vboxguest.rules \
         "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
-    # install rc.d script
-    install -D -m755 vboxservice.rc "$pkgdir/etc/rc.d/vboxservice"
-    # install sample config
-    install -D -m644 vboxservice.conf "$pkgdir/etc/conf.d/vboxservice"
     # install systemd service file
     install -D -m644 vboxservice.service \
         "$pkgdir/usr/lib/systemd/system/vboxservice.service"