Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/gambas3/PKGBUILD
	community-staging/luminancehdr/PKGBUILD
	community-staging/luxrays/PKGBUILD
	community-staging/luxrender/PKGBUILD
	community-staging/performous/PKGBUILD
	community-staging/widelands/PKGBUILD
	community/chmsee/PKGBUILD
	community/flac123/PKGBUILD
	community/pam-krb5/PKGBUILD
	community/python-pyxattr/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/python-lxml/PKGBUILD
	extra/usbview/PKGBUILD
	extra/vlc/PKGBUILD
	extra/xorg-server/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-util-linux/PKGBUILD
	staging/bzflag/PKGBUILD
	staging/calligra/PKGBUILD
	staging/enblend-enfuse/PKGBUILD
	staging/gegl/PKGBUILD
	staging/hugin/PKGBUILD
	staging/inkscape/PKGBUILD
	testing/btrfs-progs/PKGBUILD
	testing/btrfs-progs/initcpio-hook-btrfs
	testing/btrfs-progs/initcpio-install-btrfs
	testing/cryptsetup/PKGBUILD
	testing/cryptsetup/encrypt_hook
	testing/empathy/PKGBUILD
	testing/evolution/PKGBUILD
	testing/glibmm/PKGBUILD
	testing/gtkglext/PKGBUILD
	testing/ibus/PKGBUILD
	testing/kmod/PKGBUILD
	testing/udisks2/PKGBUILD
	testing/xf86-video-intel/PKGBUILD

1 files changed, 24 insertions, 14 deletions

diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 5ae72a76f..9e1d74cac 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -12,8 +12,8 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-host-source'
          'virtualbox-libre-guest-utils'
          'virtualbox-libre-guest-source')
-pkgver=4.2.0
-pkgrel=4.1
+pkgver=4.2.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -56,8 +56,9 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         'vboxweb.conf'
         'vboxweb.rc'
         'vboxweb.service'
-        'change_default_driver_dir.patch'
-        'vboxdrv-reference.patch'
+        '001-vboxdrv-reference.patch'
+        '002-change_default_driver_dir.patch'
+        '003-remove_qt_fa_IR.patch'
         'os_blag_64.png'
         'os_blag.png'
         'os_dragora_64.png'
@@ -78,7 +79,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         'os_venenux.png'
         'libre.patch'
         'free-distros.patch')
-md5sums=('691b4134983ce7d89b9fb683305cb647'
+md5sums=('2b65dcd9649e56ac6338670b3fb4a14d'
          '5f85710e0b8606de967716ded7b2d351'
          'ed1341881437455d9735875ddf455fbe'
          '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
@@ -88,8 +89,9 @@ md5sums=('691b4134983ce7d89b9fb683305cb647'
          '7e9483b1069a54f181546083ac7e5469'
          'c159d683ba1947290fc2ad2c64194150'
          'bc9efed88e0469cd7fc460d5a5cd7b4b'
-         '97e193f050574dd272a38e5ee5ebe62b'
          '4f1692638d6740df4c4ad9766ba4e179'
+         '97e193f050574dd272a38e5ee5ebe62b'
+         '866ce76a94fb22cc7b625e07e571f0ad'
          '8538dba8686d7449cb481c9bae9d722a'
          '545c925b46f2ac95e5f8ae407fad101a'
          'f6416f509c2e5460e4dc624e0a57f3c1'
@@ -108,7 +110,7 @@ md5sums=('691b4134983ce7d89b9fb683305cb647'
          'c7951fe6888d939f3a7d0dafe477e82b'
          '4da8eeb2ece7e475fc7a0d1003da26c6'
          '5e4187af59726d71c5be48d0cd816c34'
-         '67cc4c8611890038eb3e4114ae899525'
+         '85141ccd2621a8e004b8f55c9a1f83eb'
          'c7b29fbf4c24a00e8646ca6dd73f38a1')
 
 #_extramodules=extramodules-3.5-LIBRE
@@ -117,15 +119,21 @@ md5sums=('691b4134983ce7d89b9fb683305cb647'
 build() {
     cd "VirtualBox-$pkgver"
 
-    patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
-    patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
-    patch -Np1 -i "$srcdir/libre.patch"
-    patch -Np1 -i "$srcdir/free-distros.patch"
+    # Apply patches
+    for _p in "$srcdir"/*.patch; do
+        [[ -e $_p ]] || continue
+        msg2 "Apply patch ${_p##*/}"
+        patch -Np1 -i "$_p"
+    done
 
- ## Removing Nonfree directories
+ ## Removing Nonfree directories and Nonfree files
     rm -rv "./include/VBox/ExtPack"
     rm -rv "./src/VBox/ExtPacks"
     rm -rv "./src/VBox/Main/src-helper-apps"
+    rm -rv "./src/VBox/Main/include/ExtPackManagerImpl.h"
+    rm -rv "./src/VBox/Main/include/ExtPackUtil.h"
+    rm -rv "./src/VBox/Main/src-all/ExtPackManagerImpl.cpp"
+    rm -rv "./src/VBox/Main/src-all/ExtPackUtil.cpp"
 
  ## Removing Oracle VM VirtualBox Extension Pack icons
     rm -v "./src/VBox/Resources/darwin/virtualbox-vbox-extpack.icns"
@@ -148,7 +156,7 @@ build() {
         --enable-webservice \
         --enable-vde \
         --enable-vnc \
-		--disable-kmods
+        --disable-kmods
 #        --with-linux=/usr/src/linux-${_kernver}
     source ./env.sh
     kmk all
@@ -228,7 +236,7 @@ package_virtualbox-libre() {
     echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg"
 
     #udev and licence
-    install -D -m 0644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+    install -D -m 0644 "$srcdir/VirtualBox-${pkgver}/COPYING" \
         "$pkgdir/usr/share/licenses/virtualbox/LICENSE"
     install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
         "$pkgdir/usr/lib/udev/rules.d/10-vboxdrv.rules"
@@ -333,3 +341,5 @@ package_virtualbox-libre-guest-utils(){
     install -D -m644 vboxservice.service \
         "$pkgdir/usr/lib/systemd/system/vboxservice.service"
 }
+
+# vim:set ts=4 sw=4 et: