Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	extra/cvsps/PKGBUILD
	libre/cdfs-libre/PKGBUILD
	libre/vhba-module-libre/PKGBUILD

53 files changed, 563 insertions, 234 deletions

diff --git a/community/amsn/PKGBUILD b/community/amsn/PKGBUILD
index 04f7dacbd..ec9fa92d6 100644
--- a/community/amsn/PKGBUILD
+++ b/community/amsn/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 71853 2012-06-02 11:00:55Z jlichtblau $
+# $Id: PKGBUILD 81685 2012-12-26 19:27:13Z foutrelis $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jeff Mickey <j@codemac.net>
 
 pkgname=amsn
 pkgver=0.98.9
-pkgrel=1
+pkgrel=2
 pkgdesc="MSN client written in Tcl/Tk"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://amsn.sourceforge.net/"
 license=('GPL2')
 depends=('tk' 'tls')
 makedepends=('libjpeg' 'libpng' 'farstream' 'libv4l')
-optdepends=('farstream: for video conferencing')
+# not compatible with farstream 0.2
+#optdepends=('farstream: for video conferencing')
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver-src.tar.bz2
         $pkgname-$pkgver-v4l2.patch
diff --git a/community/fcitx-anthy/PKGBUILD b/community/fcitx-anthy/PKGBUILD
index 214e0c0c4..bbbd3720e 100644
--- a/community/fcitx-anthy/PKGBUILD
+++ b/community/fcitx-anthy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: PKGBUILD 81663 2012-12-26 08:40:15Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: lh <jason52lh@gmail.com>
 
 pkgname=fcitx-anthy
 pkgver=0.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Fcitx Wrapper for anthy."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx"
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('fcitx>=4.2.5' 'anthy')
 makedepends=('cmake' 'intltool')
 source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
-install='fcitx-anthy.install'
+install=fcitx-anthy.install
 
 build(){
   cd "$srcdir"/${pkgname}-${pkgver}
diff --git a/community/fcitx-anthy/fcitx-anthy.install b/community/fcitx-anthy/fcitx-anthy.install
index c0797237a..6b1b64bdd 100644
--- a/community/fcitx-anthy/fcitx-anthy.install
+++ b/community/fcitx-anthy/fcitx-anthy.install
@@ -1,5 +1,5 @@
 post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff --git a/community/fcitx-googlepinyin/PKGBUILD b/community/fcitx-googlepinyin/PKGBUILD
index 4ed371008..05e1f1783 100644
--- a/community/fcitx-googlepinyin/PKGBUILD
+++ b/community/fcitx-googlepinyin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 80519 2012-11-23 12:06:38Z fyan $
+# $Id: PKGBUILD 81673 2012-12-26 11:44:06Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=fcitx-googlepinyin
 pkgver=0.1.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Fcitx Wrapper for googlepinyin"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx"
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('fcitx>=4.2.0' 'libgooglepinyin>=0.1.2')
 makedepends=('cmake' 'intltool')
 source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
-install='fcitx-googlepinyin.install'
+install=fcitx-googlepinyin.install
 md5sums=('7ee33bbb66d29536819b0d2f73b69713')
 
 build() {
diff --git a/community/fcitx-googlepinyin/fcitx-googlepinyin.install b/community/fcitx-googlepinyin/fcitx-googlepinyin.install
index c0797237a..6b1b64bdd 100644
--- a/community/fcitx-googlepinyin/fcitx-googlepinyin.install
+++ b/community/fcitx-googlepinyin/fcitx-googlepinyin.install
@@ -1,5 +1,5 @@
 post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff --git a/community/fcitx-hangul/PKGBUILD b/community/fcitx-hangul/PKGBUILD
index 6cac5eac1..a89c72a12 100644
--- a/community/fcitx-hangul/PKGBUILD
+++ b/community/fcitx-hangul/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 81140 2012-12-12 01:20:35Z fyan $
+# $Id: PKGBUILD 81667 2012-12-26 11:35:33Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=fcitx-hangul
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Hangul (Korean) support for fcitx"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx/"
@@ -31,5 +31,4 @@ package() {
    make DESTDIR="$pkgdir" install
 }
 
-
 md5sums=('168b51487797879cf41ed6f6d086694a')
diff --git a/community/fcitx-hangul/fcitx-hangul.install b/community/fcitx-hangul/fcitx-hangul.install
index c0797237a..6b1b64bdd 100644
--- a/community/fcitx-hangul/fcitx-hangul.install
+++ b/community/fcitx-hangul/fcitx-hangul.install
@@ -1,5 +1,5 @@
 post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff --git a/community/fcitx-libpinyin/PKGBUILD b/community/fcitx-libpinyin/PKGBUILD
index 407a55f93..7209e0699 100644
--- a/community/fcitx-libpinyin/PKGBUILD
+++ b/community/fcitx-libpinyin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80511 2012-11-23 11:30:00Z fyan $
+# $Id: PKGBUILD 81661 2012-12-26 06:37:02Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: poplarch <poplarch@gmail.com>
 
 pkgname=fcitx-libpinyin
 pkgver=0.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Fcitx Wrapper for libpinyin, Library to deal with pinyin"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/fcitx/fcitx-libpinyin"
diff --git a/community/fcitx-libpinyin/fcitx-libpinyin.install b/community/fcitx-libpinyin/fcitx-libpinyin.install
index c0797237a..6b1b64bdd 100644
--- a/community/fcitx-libpinyin/fcitx-libpinyin.install
+++ b/community/fcitx-libpinyin/fcitx-libpinyin.install
@@ -1,5 +1,5 @@
 post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff --git a/community/fcitx-rime/PKGBUILD b/community/fcitx-rime/PKGBUILD
index 6d9cee68c..69d666fa7 100644
--- a/community/fcitx-rime/PKGBUILD
+++ b/community/fcitx-rime/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: PKGBUILD 81659 2012-12-26 06:28:38Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: lh <jason52lh@gmail.com>
 
 pkgname=fcitx-rime
 pkgver=0.1.2
-pkgrel=2
+pkgrel=3
 _rimever=0.9.3
 pkgdesc="Fcitx Wrapper for librime"
 arch=('i686' 'x86_64')
diff --git a/community/fcitx-rime/fcitx-rime.install b/community/fcitx-rime/fcitx-rime.install
index c0797237a..6b1b64bdd 100644
--- a/community/fcitx-rime/fcitx-rime.install
+++ b/community/fcitx-rime/fcitx-rime.install
@@ -1,5 +1,5 @@
 post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff --git a/community/fcitx-sunpinyin/PKGBUILD b/community/fcitx-sunpinyin/PKGBUILD
index 4bd4678c2..9ad14b20d 100644
--- a/community/fcitx-sunpinyin/PKGBUILD
+++ b/community/fcitx-sunpinyin/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 80506 2012-11-23 11:24:07Z fyan $
+# $Id: PKGBUILD 81657 2012-12-26 06:18:47Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=fcitx-sunpinyin
 pkgver=0.3.9
-pkgrel=2
+pkgrel=3
 pkgdesc="Fcitx Wrapper for sunpinyin, Statistical Language Model based pinyin IME by Sun"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx"
 license=('GPL')
-install='fcitx-sunpinyin.install'
+install=fcitx-sunpinyin.install
 depends=('fcitx>=4.2.5' 'sunpinyin>2.0.3')
 makedepends=('cmake' 'intltool')
 source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
diff --git a/community/fcitx-sunpinyin/fcitx-sunpinyin.install b/community/fcitx-sunpinyin/fcitx-sunpinyin.install
index c0797237a..6b1b64bdd 100644
--- a/community/fcitx-sunpinyin/fcitx-sunpinyin.install
+++ b/community/fcitx-sunpinyin/fcitx-sunpinyin.install
@@ -1,5 +1,5 @@
 post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff --git a/community/fcitx-unikey/PKGBUILD b/community/fcitx-unikey/PKGBUILD
index 3c28836b4..3fad437e1 100644
--- a/community/fcitx-unikey/PKGBUILD
+++ b/community/fcitx-unikey/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 80099 2012-11-16 03:00:26Z fyan $
+# $Id: PKGBUILD 81669 2012-12-26 11:38:22Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=fcitx-unikey
 pkgver=0.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Fcitx Wrapper for unikey"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx"
@@ -11,8 +11,8 @@ license=('GPL')
 depends=('fcitx>=4.2.3')
 optdepends=('qt: To run the fcitx unikey macro editor')
 makedepends=('cmake' 'intltool' 'qt')
-source=(http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz)
-install='fcitx-unikey.install'
+source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
+install=fcitx-unikey.install
 
 build(){
     cd "$srcdir/${pkgname}-${pkgver}"
diff --git a/community/fcitx-unikey/fcitx-unikey.install b/community/fcitx-unikey/fcitx-unikey.install
index c0797237a..6b1b64bdd 100644
--- a/community/fcitx-unikey/fcitx-unikey.install
+++ b/community/fcitx-unikey/fcitx-unikey.install
@@ -1,5 +1,5 @@
 post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff --git a/community/gtkhotkey/PKGBUILD b/community/gtkhotkey/PKGBUILD
new file mode 100644
index 000000000..ea0b42b8d
--- /dev/null
+++ b/community/gtkhotkey/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 81675 2012-12-26 12:18:55Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: kiefer <jorgelmadrid@gmail.com>
+# Contributor: Alessio Sergi <asergi at archlinux dot us>
+# Contributor: Gaute Hope <eg@gaute.vetsj.com>
+# Contributor: Marcos Heredia <chelqo@gmail.com>
+ 
+pkgname=gtkhotkey
+pkgver=0.2.1
+pkgrel=8
+pkgdesc="Platform independent hotkey handling for Gtk+ applications"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/gtkhotkey"
+license=('LGPL3')
+depends=('gtk2')
+makedepends=('intltool')
+options=('!libtool')
+source=("http://launchpad.net/$pkgname/0.2/$pkgver/+download/$pkgname-$pkgver.tar.gz")
+md5sums=('bfdc73e68e9adbe0d506d31a25862914')
+ 
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+ 
+  # doc path fix
+  sed -i '/gtkhotkeydocdir/s/\${prefix}/\${datadir}/g' Makefile.{am,in}
+ 
+  # glib2 fix
+  sed -i 's|glib/gquark\.h|glib.h|' src/gtk-hotkey-error.h
+  sed -i 's|glib/gtypes\.h|glib.h|' src/x11/tomboykeybinder.h
+ 
+  ./configure --prefix=/usr \
+              --disable-static
+  make
+}
+ 
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+ 
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD
index 45ed6e4b6..ccac379d4 100644
--- a/community/pidgin-lwqq/PKGBUILD
+++ b/community/pidgin-lwqq/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 81454 2012-12-21 09:33:44Z fyan $
+# $Id: PKGBUILD 81655 2012-12-26 06:16:37Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=pidgin-lwqq
 pkgver=0.1a
 _pkgver=0.1-a
-pkgrel=2
+pkgrel=3
 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/xiehuc/pidgin-lwqq"
 license=('GPL3')
-depends=('libpurple' 'curl' 'libev' 'hicolor-icon-theme')
+depends=('libpurple' 'curl' 'libev' 'hicolor-icon-theme' 'gtk-update-icon-cache')
 optdepends=('telepathy-haze: Empathy plugin support')
 makedepends=('git' 'cmake')
 install=$pkgname.install
diff --git a/community/pidgin-lwqq/pidgin-lwqq.install b/community/pidgin-lwqq/pidgin-lwqq.install
index c0797237a..6b1b64bdd 100644
--- a/community/pidgin-lwqq/pidgin-lwqq.install
+++ b/community/pidgin-lwqq/pidgin-lwqq.install
@@ -1,5 +1,5 @@
 post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff --git a/community/python2-imaging/PKGBUILD b/community/python2-imaging/PKGBUILD
index fbe0466a0..a583ae718 100644
--- a/community/python2-imaging/PKGBUILD
+++ b/community/python2-imaging/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81607 2012-12-25 00:34:12Z foutrelis $
+# $Id: PKGBUILD 81687 2012-12-26 19:34:45Z foutrelis $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=python2-imaging
 pkgver=1.1.7
-pkgrel=6
+pkgrel=7
 pkgdesc="PIL. Provides image processing capabilities for python"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pythonware.com/products/pil/index.htm"
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index a0f739560..feea10efe 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81283 2012-12-16 01:26:32Z dwallace $
+# $Id: PKGBUILD 81694 2012-12-27 00:16:01Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Antonio Rojas < nqn1976 @ gmail.com >
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,7 +7,7 @@
 # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
 
 pkgname=sage-mathematics
-pkgver=5.4.1
+pkgver=5.5
 pkgrel=1
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
@@ -23,6 +23,8 @@ options=('!makeflags')
 install="${pkgname}.install"
 source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
         'SAGE-notebook.desktop')
+md5sums=('1162b607cf42859e31e81591600960d3'
+         'b82f94383829eee26648feb977e2d89b')
 
 build() {
   cd sage-${pkgver}
@@ -95,5 +97,3 @@ package() {
 }
 
 # vim :set ts=2 sw=2 et:
-md5sums=('069fa0c705a253710a66f76ee9d6168e'
-         'b82f94383829eee26648feb977e2d89b')
diff --git a/community/synapse/PKGBUILD b/community/synapse/PKGBUILD
new file mode 100644
index 000000000..c54dbcd3a
--- /dev/null
+++ b/community/synapse/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 81698 2012-12-27 01:23:31Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Alessio Sergi <asergi at archlinux dot us>
+
+pkgname=synapse
+pkgver=0.2.10
+pkgrel=3
+pkgdesc="A semantic file launcher"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/synapse-project"
+license=('GPL3')
+depends=('gtkhotkey' 'hicolor-icon-theme' 'json-glib' 'libgee' 'libnotify' \
+         'libunique' 'libzeitgeist' 'rest' 'xdg-utils')
+makedepends=('intltool' 'vala')
+optdepends=('banshee: banshee plugin'
+            'bc: calculator plugin'
+            'devhelp: documentation plugin'
+            'gnome-screensaver: screensaver plugin'
+            'gnome-utils: dictionary plugin'
+            'openssh: ssh plugin'
+            'pastebinit: pastebin plugin'
+            'rhythmbox: rhythmbox plugin'
+            'xnoise: xnoise plugin')
+install=$pkgname.install
+source=("https://launchpad.net/$pkgname-project/0.2/$pkgver/+download/$pkgname-$pkgver.tar.gz"
+        "fix-check-desktop.patch"
+        "check-null-exec.patch")
+sha1sums=('6e8a800bdbdded4e167734c8e49d95a9e44998ff'
+          'b64fa4efc4efd01f77f84d19a7a63c10186d0211'
+          'f494e5b36a77421114ce04b7085369abe5c00d68')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # XDG_CURRENT_DESKTOP fix
+  patch -Np1 -i "$srcdir"/fix-check-desktop.patch
+
+  # don't crash on empty Exec field
+  patch -Np1 -i "$srcdir"/check-null-exec.patch
+
+  # DSO fix
+  export LDFLAGS="$LDFLAGS -lm"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/synapse/check-null-exec.patch b/community/synapse/check-null-exec.patch
new file mode 100644
index 000000000..77820ecbb
--- /dev/null
+++ b/community/synapse/check-null-exec.patch
@@ -0,0 +1,16 @@
+diff -Naur synapse-0.2.10.orig/src/core/desktop-file-service.vala synapse-0.2.10/src/core/desktop-file-service.vala
+--- synapse-0.2.10.orig/src/core/desktop-file-service.vala	2012-03-18 20:02:41.000000000 +0100
++++ synapse-0.2.10/src/core/desktop-file-service.vala	2012-12-26 18:07:55.962276823 +0100
+@@ -125,7 +125,11 @@
+         }
+ 
+         name = app_info.get_name ();
+-        exec = app_info.get_executable ();
++        exec = app_info.get_commandline ();
++        if (exec == null)
++        {
++          throw new DesktopFileError.UNINTERESTING_ENTRY ("Unable to get exec for %s".printf (name));
++        }
+ 
+         // check for hidden desktop files
+         if (keyfile.has_key (GROUP, "Hidden") &&
diff --git a/community/synapse/fix-check-desktop.patch b/community/synapse/fix-check-desktop.patch
new file mode 100644
index 000000000..16e039b48
--- /dev/null
+++ b/community/synapse/fix-check-desktop.patch
@@ -0,0 +1,30 @@
+diff -Naur synapse-0.2.10.orig/src/core/desktop-file-service.vala synapse-0.2.10/src/core/desktop-file-service.vala
+--- synapse-0.2.10.orig/src/core/desktop-file-service.vala	2012-03-18 20:02:41.000000000 +0100
++++ synapse-0.2.10/src/core/desktop-file-service.vala	2012-03-19 12:06:43.080443401 +0100
+@@ -248,13 +248,23 @@
+     
+     private void get_environment_type ()
+     {
+-      unowned string? session_var = Environment.get_variable ("DESKTOP_SESSION");
+-      
++      unowned string? session_var;
++      session_var = Environment.get_variable ("XDG_CURRENT_DESKTOP");
++      if (session_var == null)
++      {
++        session_var = Environment.get_variable ("DESKTOP_SESSION");
++      }
++
+       if (session_var == null) return;
+ 
+       string session = session_var.down ();
+ 
+-      if (session.has_prefix ("kde"))
++      if (session.has_prefix ("unity"))
++      {
++        session_type = DesktopFileInfo.EnvironmentType.UNITY;
++        session_type_str = "Unity";
++      }
++      else if (session.has_prefix ("kde"))
+       {
+         session_type = DesktopFileInfo.EnvironmentType.KDE;
+         session_type_str = "KDE";
diff --git a/community/synapse/synapse.install b/community/synapse/synapse.install
new file mode 100644
index 000000000..704cb339e
--- /dev/null
+++ b/community/synapse/synapse.install
@@ -0,0 +1,13 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+post_remove() {
+  post_install "$1"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/xnoise/PKGBUILD b/community/xnoise/PKGBUILD
new file mode 100755
index 000000000..e44b7b3f7
--- /dev/null
+++ b/community/xnoise/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: archtux <antonio dot arias99999 at gmail dot com>
+
+pkgname=xnoise
+pkgver=0.2.14
+pkgrel=5
+pkgdesc="Media player with a slick GUI, great speed and lots of features."
+arch=('i686' 'x86_64')
+url="http://www.xnoise-media-player.com/"
+license=('GPL2')
+depends=('desktop-file-utils' 'gnome-icon-theme' 'gstreamer0.10-base-plugins' 'gtk3' 'libsoup' 'sqlite' 'taglib')
+makedepends=('gettext' 'intltool')
+options=('!libtool')
+install=$pkgname.install
+source=("https://bitbucket.org/shuerhaaken/xnoise/downloads/$pkgname-$pkgver.tar.gz")
+md5sums=('774b52c94d5b1d3de963307835ade35b')
+
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  
+  # Remove obsolete files
+  rm -rf $pkgdir/usr/include $pkgdir/usr/share/vala
+}
diff --git a/community/xnoise/xnoise.install b/community/xnoise/xnoise.install
new file mode 100644
index 000000000..8f2bcd263
--- /dev/null
+++ b/community/xnoise/xnoise.install
@@ -0,0 +1,13 @@
+ 
+post_install() {
+  gtk-update-icon-cache -t -f /usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/cvsps/PKGBUILD b/extra/cvsps/PKGBUILD
index ecd4abfed..a2970a61f 100644
--- a/extra/cvsps/PKGBUILD
+++ b/extra/cvsps/PKGBUILD
@@ -1,41 +1,24 @@
-# $Id: PKGBUILD 151779 2012-03-02 17:28:27Z dan $
+# $Id: PKGBUILD 173886 2012-12-27 03:34:13Z dan $
 # Maintainer:
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
 
 pkgname=cvsps
-pkgver=2.2b1
-pkgrel=1.1
+pkgver=3.2
+pkgrel=1
 pkgdesc="Generating 'patchset' information from a CVS repository"
-url="http://www.cobite.com/cvsps/"
+url="http://www.catb.org/esr/cvsps/"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('zlib')
-source=("http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        call-cvs-q-option.patch
-        cvsps-2.2b1-bufferoverflow.patch
-        cvsps-2.2b1-dynamic-logbuf.patch
-        cvsps-2.2b1-man.patch
-        seperate-CPPFLAGS.patch
-        use-INADDR_NONE-define.patch
-        use-__linux__-define.patch
-        use-offsetof-macro.patch)
-md5sums=('997580e8e283034995b9209076858c68'
-         '06324c5e3c321126b76dc97fc6c00b34'
-         '2910012a11a24d5e4192cf9eae7dd259'
-         '970566460e72cb159426965d6e5763b3'
-         'f9d2ee40e52ecd5096fa9a885418eee1'
-         '6baafbd7512aa52e1b83ed0bead32a6e'
-         'a3a81481c07dcc676f5a82ae07e8ee89'
-         '9e2763315cbda02665c47827d38df459'
-         '8f7e6f09f42f76deeefe24bbfa509150')
+makedepends=('asciidoc')
+source=("http://www.catb.org/~esr/cvsps/cvsps-${pkgver}.tar.gz"
+        cvsps-buffer-overflow.patch)
+md5sums=('4a00c4b0d504078268db7c6c68decc38'
+         '6cfe55ee7f1137f9d2e670502d8cc3c7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  for file in ${source[@]}; do
-      if [[ $file == *.patch ]]; then
-          patch -Np1 < ../$file
-      fi
-  done
+  patch -Np1 < ../cvsps-buffer-overflow.patch
   make prefix=/usr
 }
 
diff --git a/extra/cvsps/cvsps-buffer-overflow.patch b/extra/cvsps/cvsps-buffer-overflow.patch
new file mode 100644
index 000000000..e34fd6ee3
--- /dev/null
+++ b/extra/cvsps/cvsps-buffer-overflow.patch
@@ -0,0 +1,66 @@
+diff -Naur cvsps-3.2.orig/cvsps.c cvsps-3.2/cvsps.c
+--- cvsps-3.2.orig/cvsps.c	2012-12-24 19:23:24.000000000 +0000
++++ cvsps-3.2/cvsps.c	2012-12-27 03:28:24.698076155 +0000
+@@ -1078,17 +1078,16 @@
+ static CvsFile * parse_rcs_file(const char * buff)
+ {
+     char fn[PATH_MAX];
+-    int len = strlen(buff + 10);
++    size_t len = strlen(buff + 10);
+     char * p;
+ 
+     /* once a single file has been parsed ok we set this */
+     static bool path_ok;
+-    
++
+     /* chop the ",v" string and the "LF" */
+     len -= 3;
+     memcpy(fn, buff + 10, len);
+     fn[len] = 0;
+-    
+     if (strncmp(fn, strip_path, strip_path_len) != 0)
+     {
+ 	/* if the very first file fails the strip path,
+@@ -1109,10 +1108,10 @@
+ 
+ 	    while ((p = strstr(p, repository_path)))
+ 		lastp = p++;
+-      
++
+ 	    if (lastp)
+ 	    {
+-		int len = strlen(repository_path);
++		size_t len = strlen(repository_path);
+ 		memcpy(strip_path, fn, lastp - fn + len + 1);
+ 		strip_path_len = lastp - fn + len + 1;
+ 		strip_path[strip_path_len] = 0;
+@@ -1136,16 +1135,26 @@
+ 	 *
+ 	 * For now just ignore such files
+ 	 */
+-	debug(DEBUG_APPWARN, "WARNING: file %s doesn't match strip_path %s. ignoring", 
++	debug(DEBUG_APPWARN, "WARNING: file %s doesn't match strip_path %s. ignoring",
+ 	      fn, strip_path);
+ 	return NULL;
+     }
+ 
+  ok:
+-    path_ok = true;
+-
++     /*
++     fix for rhbz#576076
++     ./cvsps --norc -q --cvs-direct -u -A --root :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot NSS
++     */
++    if(len <= strip_path_len)
++    {
++        debug(DEBUG_APPWARN, "WARNING: file %s doesn't match strip_path %s. ignoring",
++	      fn, strip_path);
++        return NULL;
++    }
+     /* remove from beginning the 'strip_path' string */
+     len -= strip_path_len;
++    path_ok = true;
++
+     memmove(fn, fn + strip_path_len, len);
+     fn[len] = 0;
+ 
diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD
index 5eb884c14..ebc4007af 100644
--- a/extra/rosegarden/PKGBUILD
+++ b/extra/rosegarden/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 164009 2012-07-23 18:45:40Z schiv $
+# $Id: PKGBUILD 173870 2012-12-26 20:57:07Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
 pkgname=rosegarden
-pkgver=12.04
-pkgrel=2
+pkgver=12.12.25
+pkgrel=1
 pkgdesc="MIDI/audio sequencer and notation editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rosegardenmusic.com/"
@@ -23,7 +23,7 @@ optdepends=('lilypond: notation display'
 [ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support')
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('b11f4fcad69df45365d2125181524559')
+md5sums=('8c98e7d3d448b07d9dc079b28bd37eba')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD
index 512f420d5..4594c85c6 100644
--- a/extra/smb4k/PKGBUILD
+++ b/extra/smb4k/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165459 2012-08-20 09:49:18Z giovanni $
+# $Id: PKGBUILD 173880 2012-12-27 00:40:48Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com>
 
 pkgname=smb4k
-pkgver=1.0.4
+pkgver=1.0.5
 pkgrel=1
 pkgdesc="A KDE program that browses samba shares"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=smb4k.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28stable%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('55a09aa0a9513c9b8c5ae6e414a3cc8e')
+md5sums=('b8472b5baad3616858706a7b4bf0427a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 45f2d1121..7cd18bb6a 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=cdfs
 pkgname=cdfs-libre
 pkgver=2.6.27
 pkgrel=34.1
-pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files. (adapted to linux-libre kernel)"
+pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)"
 arch=(i686 x86_64 mips64el)
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
 license=('GPL')
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
index 0f7128226..569568cb1 100644
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 165111 2012-08-11 08:21:11Z allan $
+# $Id: PKGBUILD 173859 2012-12-26 01:09:36Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=linux-libre-api-headers
-_basekernel=3.6
-_sublevel=3
+_basekernel=3.7
+_sublevel=1
 pkgver=${_basekernel}.${_sublevel}
-pkgrel=1.1
-pkgdesc="Kernel headers sanitized for use in userspace (built from linux-libre source)"
+pkgrel=1
+pkgdesc="Kernel headers sanitized for use in userspace"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libc"
 license=('GPL2')
@@ -18,8 +18,8 @@ conflicts=('linux-api-headers')
 replaces=('linux-api-headers')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz")
-md5sums=('a2312edd0265b5b07bd4b50afae2b380'
-         '844bd14e9f58225274e096c31bbb8a8f')
+md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
+         '6f4bb80d3d91b69daf5ccfea836d02df')
 
 build() {
   cd ${srcdir}/linux-${_basekernel}
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index e6461610b..ebdca122c 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -1,11 +1,10 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 # Contributor: Márcio Silva <coadde@lavabit.com>
 
-_pkgname=linux-firmware
 pkgname=linux-libre-firmware
 pkgver=3.7
-pkgrel=2
-pkgdesc='Free firmware files for Linux (built from linux-libre source)'
+pkgrel=4
+pkgdesc='Free firmware files for Linux-libre'
 arch=('any')
 url='http://linux-libre.fsfla.org/'
 license=('GPL2')
@@ -45,6 +44,6 @@ package() {
   make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install
 
   # move WHENCE file to linux-firmware license folder
-  install -d -m755 $pkgdir/usr/share/licenses/$_pkgname
-  mv firmware/WHENCE $pkgdir/usr/share/licenses/$_pkgname
+  install -d -m755 $pkgdir/usr/share/licenses/$pkgname
+  mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname
 }
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 64008c7b6..335d35218 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 _kernver=3.7.1
-_kernrel=1
+_kernrel=2
 pkgname=('linux-libre-kmod-alx')
-_pkgver=2012-12-04-1-u
-pkgver=20121204
+_pkgver=2012-12-19-u
+pkgver=20121219
 pkgrel=1
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
@@ -16,9 +16,9 @@ install=linux-libre-kmod-alx.install
 replaces=('alx' 'alx-driver' 'dkms-alx')
 provides=('alx' 'alx-driver' 'dkms-alx')
 conflicts=('alx' 'alx-driver' 'dkms-alx')
-source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2)
+source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/19/compat-drivers-$_pkgver.tar.bz2)
 
-md5sums=('bc46200e288acb862149a2af11f4b293')
+md5sums=('60756fde830487042a525ff17ccfe7ab')
 
 
 build() {
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 2609ad281..af26e178d 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -9,7 +9,7 @@ _basekernel=3.7
 #_sublevel=1
 #pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}
-pkgrel=3
+pkgrel=3.1
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -91,7 +91,7 @@ build() {
 }
 
 package_libtraceevent-libre() {
-  pkgdesc='Linux kernel trace event library (built from linux-libre source)'
+  pkgdesc='Linux kernel trace event library'
   depends=('glibc')
   replaces=('libtraceevent')
   conflicts=('libtraceevent')
@@ -103,7 +103,7 @@ package_libtraceevent-libre() {
 }
 
 package_perf-libre() {
-  pkgdesc='Linux kernel performance auditing tool (built from linux-libre source)'
+  pkgdesc='Linux kernel performance auditing tool'
   depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind')
   replaces=('perf')  
   conflicts=('perf')
@@ -121,7 +121,7 @@ package_perf-libre() {
 }
 
 package_cpupower-libre() {
-  pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor (built from linux-libre source)'
+  pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor'
   backup=('etc/conf.d/cpupower')
   depends=('bash' 'pciutils')
   replaces=('cpupower' 'cpufrequtils')
@@ -143,7 +143,7 @@ package_cpupower-libre() {
 }
 
 package_x86_energy_perf_policy-libre() {
-  pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS (built from linux-libre source)'
+  pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS'
   depends=('glibc')
   replaces=('x86_energy_perf_policy')
   conflicts=('x86_energy_perf_policy')
@@ -155,7 +155,7 @@ package_x86_energy_perf_policy-libre() {
 }
 
 package_usbip-libre() {
-  pkgdesc='An USB device sharing system over IP network (built from linux-libre source)'
+  pkgdesc='An USB device sharing system over IP network'
   depends=('glib2' 'sysfsutils')
   options=('!libtool')
   replaces=('usbip')
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 29a814519..162169e03 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -12,7 +12,7 @@ pkgbase=linux-libre         # Build stock -LIBRE kernel
 _basekernel=3.7
 _sublevel=1
 pkgver=${_basekernel}.${_sublevel}
-pkgrel=2
+pkgrel=2.1
 _lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 301a1b6c2..61aa977c0 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.7.1-2-LIBRE
+KERNEL_VERSION=3.7.1-2.1-LIBRE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index d6bf55f57..7da492643 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -55,7 +55,7 @@ build() {
 }
 
 package_lirc-libre() {
-  pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (adapted to linux-libre kernel) "
+  pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package) "
   depends=('lirc-utils-libre' 'linux-libre>=3.7' 'linux-libre<3.8')
   replaces=('lirc' 'lirc+pctv')
   conflicts=('lirc')
@@ -72,7 +72,7 @@ package_lirc-libre() {
 }
 
 package_lirc-utils-libre() {
-  pkgdesc="Linux Infrared Remote Control utils (adapted to linux-libre kernel)"
+  pkgdesc="Linux Infrared Remote Control utils"
   depends=('alsa-lib' 'libx11' 'libftdi' 'libirman')
   optdepends=('python2: pronto2lirc utility')
   options=('strip' '!libtool')
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index d3228b177..cf38b1882 100644
--- a/libre/tp_smapi-libre-lts/PKGBUILD
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -12,9 +12,9 @@ pkgname=tp_smapi-libre-lts
 _pkgname=tp_smapi
 _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS
 pkgver=0.41
-pkgrel=9.3
-pkgdesc="Modules for ThinkPad's SMAPI functionality (adapted to linux-libre-lts kernel)"
-arch=('i686' 'x86_64')
+pkgrel=9.4
+pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)"
+arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
 license=('GPL')
 depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 11b515683..d7c900f2a 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -12,8 +12,8 @@ _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
 pkgrel=12.1
-pkgdesc="Modules for ThinkPad's SMAPI functionality (adapted to linux-libre kernel)"
-arch=('i686' 'x86_64')
+pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
+arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
 license=('GPL')
 depends=('linux-libre>=3.7' 'linux-libre<3.8')
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 6467942a6..394379a3c 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -8,8 +8,8 @@ _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20120422
 _extramodules=extramodules-3.7-LIBRE
-pkgrel=15
-pkgdesc="Kernel module that emulates SCSI devices (adapted to linux-libre kernel)"
+pkgrel=15.1
+pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index d836a3a37..0b43cbf0a 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -7,14 +7,14 @@
 
 pkgbase=virtualbox-libre-modules-lts
 pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
-pkgver=4.2.4
-pkgrel=1.1
+pkgver=4.2.6
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
 makedepends=('linux-libre-lts-headers'
-             "virtualbox-libre-host-source>=$pkgver"
-             "virtualbox-libre-guest-source>=$pkgver"
+             "virtualbox-libre-host-dkms>=$pkgver"
+             "virtualbox-libre-guest-dkms>=$pkgver"
              'expac')
 
 build() {
diff --git a/libre/virtualbox-libre-modules-lts/build.sh b/libre/virtualbox-libre-modules-lts/build.sh
index 4c3c29e30..d1bfb72ce 100755
--- a/libre/virtualbox-libre-modules-lts/build.sh
+++ b/libre/virtualbox-libre-modules-lts/build.sh
@@ -6,12 +6,12 @@ if (( $# != 1 )); then
   exit 1
 fi
 
-linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
+linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
+linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686
 
-makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
 makechrootpkg -r /var/lib/archbuild/$1-x86_64
 
 
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index b0b6385df..948465a99 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -6,14 +6,14 @@
 
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
-pkgver=4.2.4
-pkgrel=3
+pkgver=4.2.6
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
 makedepends=('linux-libre-headers'
-             "virtualbox-libre-host-source>=$pkgver"
-             "virtualbox-libre-guest-source>=$pkgver"
+             "virtualbox-libre-host-dkms>=$pkgver"
+             "virtualbox-libre-guest-dkms>=$pkgver"
              'expac')
 
 build() {
@@ -31,7 +31,7 @@ build() {
 }
 
 package_virtualbox-libre-host-modules(){
-  pkgdesc='Host kernel libre modules for VirtualBox'
+  pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)'
   depends=('linux-libre>=3.7' 'linux-libre<3.8')
   provides=("virtualbox-host-modules=${pkgver}")
   replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
@@ -49,7 +49,7 @@ package_virtualbox-libre-host-modules(){
 }
 
 package_virtualbox-libre-guest-modules(){
-  pkgdesc='Guest kernel libre modules for VirtualBox'
+  pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)'
   license=('GPL')
   depends=('linux-libre>=3.7' 'linux-libre<3.8')
   provides=("virtualbox-guest-modules=${pkgver}")
@@ -67,5 +67,4 @@ package_virtualbox-libre-guest-modules(){
   sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-guest-modules.install"
 }
 
-
 # vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules/build.sh b/libre/virtualbox-libre-modules/build.sh
index f798a615d..6152ec21d 100755
--- a/libre/virtualbox-libre-modules/build.sh
+++ b/libre/virtualbox-libre-modules/build.sh
@@ -6,12 +6,12 @@ if (( $# != 1 )); then
   exit 1
 fi
 
-linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
+linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
+linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686
 
-makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
 makechrootpkg -r /var/lib/archbuild/$1-x86_64
 
 
diff --git a/libre/virtualbox-libre/001-vboxdrv-reference.patch b/libre/virtualbox-libre/001-vboxdrv-reference.patch
index 51fd6361c..b75c3c565 100644
--- a/libre/virtualbox-libre/001-vboxdrv-reference.patch
+++ b/libre/virtualbox-libre/001-vboxdrv-reference.patch
@@ -1,88 +1,44 @@
 diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
 --- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:22:13.636083176 +0000
 +++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:48:58.915541368 +0000
-@@ -67,38 +67,34 @@
- 
- /* XXX Temporarily. Don't rely on the user to hack the Makefile himself! */
- QString g_QStrHintLinuxNoMemory = QApplication::tr(
--  "This error means that the kernel driver was either not able to "
-+  "This error means that the kernel libre driver was either not able to "
-   "allocate enough memory or that some mapping operation failed."
-   );
- 
- QString g_QStrHintLinuxNoDriver = QApplication::tr(
--  "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
-+  "The VirtualBox Linux-libre kernel driver (vboxdrv) is either not loaded or "
+@@ -75,10 +75,9 @@
+   "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
    "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
--  "module by executing<br/><br/>"
+   "module by executing<br/><br/>"
 -  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
 -  "as root. If it is available in your distribution, you should install the "
 -  "DKMS package first. This package keeps track of Linux kernel changes and "
 -  "recompiles the vboxdrv kernel module if necessary."
-+  "libre module by executing<br/><br/>"
 +  "  <font color=blue>'pacman -S virtualbox-libre-host-modules'</font><br/><br/>"
-+  "as root. If you don't use our stock kernel libre, install virtualbox-libre-host-source and "
++  "as root. If you don't use our stock kernel, install virtualbox-libre-host-source and "
 +  "execute dkms autoinstall ."
    );
  
  QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
--  "The VirtualBox kernel modules do not match this version of "
-+  "The VirtualBox kernel libre modules do not match this version of "
-   "VirtualBox. The installation of VirtualBox was apparently not "
-   "successful. Please try completely uninstalling and reinstalling "
-   "VirtualBox."
-   );
+@@ -90,11 +89,8 @@
  
  QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
--  "The VirtualBox kernel modules do not match this version of "
+   "The VirtualBox kernel modules do not match this version of "
 -  "VirtualBox. The installation of VirtualBox was apparently not "
 -  "successful. Executing<br/><br/>"
 -  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
 -  "may correct this. Make sure that you do not mix the "
 -  "OSE version and the PUEL version of VirtualBox."
-+  "The VirtualBox kernel libre modules do not match this version of "
-+  "VirtualBox. Reload the modules or if you don't use our stock kernel libre execute<br/><br/> "
++  "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> "
 +  "  <font color=blue>'dkms autoinstall'</font><br/><br/>"
    );
  
  QString g_QStrHintOtherNoDriver = QApplication::tr(
--  "Make sure the kernel module has been loaded successfully."
-+  "Make sure the kernel libre module has been loaded successfully."
-   );
- 
- /* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */
-@@ -590,7 +586,7 @@
-             case VERR_VM_DRIVER_NOT_INSTALLED:
-             case VERR_VM_DRIVER_LOAD_ERROR:
-                 msgText += QApplication::tr (
--                        "<b>Cannot access the kernel driver!</b><br/><br/>");
-+                        "<b>Cannot access the kernel libre driver!</b><br/><br/>");
- # ifdef RT_OS_LINUX
-                 msgText += g_QStrHintLinuxNoDriver;
- # else
-@@ -603,7 +599,7 @@
-                 break;
- # endif
-             case VERR_VM_DRIVER_NOT_ACCESSIBLE:
--                msgText += QApplication::tr ("Kernel driver not accessible");
-+                msgText += QApplication::tr ("Kernel libre driver not accessible");
-                 break;
-             case VERR_VM_DRIVER_VERSION_MISMATCH:
- # ifdef RT_OS_LINUX
 diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh
 --- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:22:13.549415814 +0000
 +++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:56:50.735874087 +0000
-@@ -30,19 +30,20 @@
-     SHUTDOWN="true"
- elif ! lsmod|grep -q vboxdrv; then
+@@ -32,17 +32,18 @@
      cat << EOF
--WARNING: The vboxdrv kernel module is not loaded. Either there is no module
--         available for the current kernel (`uname -r`) or it failed to
+ WARNING: The vboxdrv kernel module is not loaded. Either there is no module
+          available for the current kernel (`uname -r`) or it failed to
 -         load. Please recompile the kernel module and install it by
-+WARNING: The vboxdrv kernel libre module is not loaded. Either there is no module
-+         available for the current kernel libre (`uname -r`) or it failed to
-+         load. Please reinstall the kernel libre module virtualbox-libre-host-modules or
-+         if you don't use our stock kernel libre compile the modules with
++         load. Please reinstall the kernel module virtualbox-libre-host-modules or
++         if you don't use our stock kernel compile the modules with
  
 -           sudo /etc/init.d/vboxdrv setup
 +           sudo dkms autoinstall
@@ -99,14 +55,3 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-
  
           and if that is not successful, try to re-install the package.
  
-@@ -52,9 +53,8 @@
- 
- if [ -f /etc/vbox/module_not_compiled ]; then
-     cat << EOF
--WARNING: The compilation of the vboxdrv.ko kernel module failed during the
-+WARNING: The compilation of the vboxdrv.ko kernel libre module failed during the
-          installation for some reason. Starting a VM will not be possible.
--         Please consult the User Manual for build instructions.
- EOF
- fi
- 
\ No newline at end of file
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index c7ca35aca..a311a0f53 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -8,18 +8,19 @@
 
 pkgbase=virtualbox-libre
 pkgname=('virtualbox-libre'
+         'virtualbox-libre-host-dkms'
+         'virtualbox-libre-guest-dkms'
          'virtualbox-libre-sdk'
-         'virtualbox-libre-host-source'
          'virtualbox-libre-guest-utils'
-         'virtualbox-libre-guest-source')
-pkgver=4.2.4
-pkgrel=2
+         'virtualbox-libre-ext-vnc')
+pkgver=4.2.6
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
 makedepends=('alsa-lib'
              'bin86'
-             'cdrkit-libre'
+             'cdrkit'
              'curl'
              'dev86'
              'gsoap'
@@ -41,7 +42,7 @@ makedepends=('alsa-lib'
              'glu'
              'python2'
              'qt'
-             'sdl-libre'
+             'sdl'
              'sdl_ttf'
              'vde2'
              'xalan-c')
@@ -78,7 +79,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         'os_venenux.png'
         'libre.patch'
         'free-distros.patch')
-md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33'
+md5sums=('d680aeb3b4379b8281527aeb012b2df5'
          '5f85710e0b8606de967716ded7b2d351'
          'ed1341881437455d9735875ddf455fbe'
          '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
@@ -88,7 +89,7 @@ md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33'
          '7e9483b1069a54f181546083ac7e5469'
          'c159d683ba1947290fc2ad2c64194150'
          'bc9efed88e0469cd7fc460d5a5cd7b4b'
-         '4f1692638d6740df4c4ad9766ba4e179'
+         'f4e4c7895ede9c524109589bf16ae660'
          '97e193f050574dd272a38e5ee5ebe62b'
          '8538dba8686d7449cb481c9bae9d722a'
          '545c925b46f2ac95e5f8ae407fad101a'
@@ -109,7 +110,7 @@ md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33'
          '4da8eeb2ece7e475fc7a0d1003da26c6'
          '5e4187af59726d71c5be48d0cd816c34'
          '85141ccd2621a8e004b8f55c9a1f83eb'
-         '54884839546647efd75adb22dbd68337')
+         '6c93159ec2a8f2b132d87cde7202749e')
 
 build() {
     cd "VirtualBox-$pkgver"
@@ -154,31 +155,39 @@ build() {
         --disable-kmods
     source ./env.sh
     kmk all
+
+    # fix python2
     sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
+
     # build rdesktop-vrdp (broken from LocalConfig.kmk)
-    cd src/VBox/RDP/client
+    pushd src/VBox/RDP/client
     cp "$srcdir/LocalConfig.kmk" .
     # fix keymap path FS#32548
     sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk
     kmk all
+    popd
+
+    # build VNC pack
+    pushd src/VBox/ExtPacks/VNC
+    kmk packing
+    popd
 }
 
 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)'
     depends=('curl'
              'libpng'
-             'libvncserver'
              'libxcursor'
              'libxinerama'
              'libxml2'
              'libxmu'
-             'sdl-libre'
+             'sdl'
              'shared-mime-info'
              'virtualbox-libre-host-modules')
     optdepends=('qt: VirtualBox GUI support'
                 'vde2: Virtual Distributed Ethernet support'
                 'virtualbox-libre-sdk: Developer kit'
-                'virtualbox-libre-host-source: Host kernel libre source modules for non-stock kernels'
+                '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')
     replaces=('virtualbox' 'virtualbox-ose')
@@ -277,15 +286,15 @@ package_virtualbox-libre-sdk() {
     mv sdk "$pkgdir/usr/lib/virtualbox"
 }
 
-package_virtualbox-libre-host-source() {
-    pkgdesc='VirtualBox Host kernel libre modules source (DKMS)'
+package_virtualbox-libre-host-dkms() {
+    pkgdesc='VirtualBox Host kernel modules sources'
     depends=('dkms' 'gcc' 'make')
-    provides=("virtualbox-host-source=$pkgver" 'virtualbox-libre-host-modules')
-    replaces=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source')
-    conflicts=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source')
+    provides=("virtualbox-host-dkms=$pkgver" 'virtualbox-libre-host-modules')
+    replaces=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source')
+    conflicts=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source')
     optdepends=('linux-libre-headers'
                 'linux-libre-lts-headers')
-    install=virtualbox-libre-host-source.install
+    install=virtualbox-libre-host-dkms.install
 
     install -dm755 "$pkgdir/usr/src"
     source "VirtualBox-$pkgver/env.sh"
@@ -293,15 +302,15 @@ package_virtualbox-libre-host-source() {
     cp -r src "$pkgdir/usr/src/vboxhost-$pkgver"
 }
 
-package_virtualbox-libre-guest-source() {
-    pkgdesc='VirtualBox Guest kernel libre modules source (DKMS)'
+package_virtualbox-libre-guest-dkms() {
+    pkgdesc='VirtualBox Guest kernel modules sources'
     depends=('dkms' 'gcc' 'make')
-    provides=("virtualbox-guest-source=$pkgver" 'virtualbox-libre-guest-modules')
-    replaces=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source')
-    conflicts=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source')
+    provides=("virtualbox-guest-dkms=$pkgver" 'virtualbox-libre-guest-modules')
+    replaces=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source' 'virtualbox-guest-source' 'virtualbox-libre-guest-source')
+    conflicts=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source'  'virtualbox-guest-source' 'virtualbox-libre-guest-source')
     optdepends=('linux-libre-headers'
                 'linux-libre-lts-headers')
-    install=virtualbox-libre-guest-source.install
+    install=virtualbox-libre-guest-dkms.install
 
     install -dm755 "$pkgdir/usr/src"
     source "VirtualBox-$pkgver/env.sh"
@@ -312,7 +321,7 @@ package_virtualbox-libre-guest-source() {
 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 libre source modules for non-stock kernels')
+    optdepends=('virtualbox-guest-source: 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')
@@ -347,4 +356,18 @@ package_virtualbox-libre-guest-utils(){
         "$pkgdir/usr/lib/systemd/system/vboxservice.service"
 }
 
+package_virtualbox-libre-ext-vnc() {
+    pkgdesc='VirtualBox VNC extension pack'
+    depends=('virtualbox-libre' 'libvncserver')
+    optdepends=('tigervnc: vnc client')
+    replaces=('virtualbox-ext-vnc')
+    conflicts=('virtualbox-ext-vnc')
+    provides=("virtualbox-ext-vnc=$pkgver")
+    install=virtualbox-libre-ext-vnc.install
+
+    source "VirtualBox-$pkgver/env.sh"
+    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/packages"
+    install -Dm644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-${pkgver}.vbox-extpack"
+}
+
 # vim:set ts=4 sw=4 et:
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index db6774542..8004ee99a 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -502,10 +502,10 @@ index 6ae0372..df65e60 100644
          1024, 4,  8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97  },
 diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-index 4c52fb0..fbccfaf 100644
+index c5a4cfe..b3e0247 100644
 --- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-@@ -44,45 +44,33 @@ struct osTypePattern
+@@ -44,46 +44,33 @@ struct osTypePattern
  
  static const osTypePattern gs_OSTypePattern[] =
  {
@@ -523,6 +523,7 @@ index 4c52fb0..fbccfaf 100644
 -    { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" },
 -    { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" },
 -    { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" },
+-    { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" },
 -    { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
 -    { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
 -    { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
@@ -578,7 +579,7 @@ index 4c52fb0..fbccfaf 100644
      { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
      { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" },
      { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -90,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] =
+@@ -91,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] =
      { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" },
      { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" },
  
@@ -587,7 +588,7 @@ index 4c52fb0..fbccfaf 100644
      { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
      { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
      { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -115,15 +103,50 @@ static const osTypePattern gs_OSTypePattern[] =
+@@ -116,15 +103,50 @@ static const osTypePattern gs_OSTypePattern[] =
      { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
      { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
      { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
@@ -646,27 +647,27 @@ index 4c52fb0..fbccfaf 100644
      { QRegExp("L4", Qt::CaseInsensitive), "L4" },
      { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" },
      { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" },
-@@ -136,6 +159,8 @@ static const osTypePattern gs_OSTypePattern[] =
+@@ -137,6 +159,8 @@ static const osTypePattern gs_OSTypePattern[] =
      { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" },
      { QRegExp("Net", Qt::CaseInsensitive), "Netware" },
      { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
-+    
++
 +    /* Other: */
      { QRegExp("Ot", Qt::CaseInsensitive), "Other" },
  };
  
-@@ -230,11 +255,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
+@@ -231,11 +255,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
      /* Create widgets: */
      QVBoxLayout *pMainLayout = new QVBoxLayout(this);
      {
 +        pMainLayout->setContentsMargins(8, 6, 8, 6);
          m_pLabel = new QIRichTextLabel(this);
-+	m_pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
++        m_pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
          m_pNameAndSystemEditor = new UINameAndSystemEditor(this);
 -        pMainLayout->addWidget(m_pLabel);
 -        pMainLayout->addWidget(m_pNameAndSystemEditor);
 -        pMainLayout->addStretch();
-+	m_pNameAndSystemEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
++        m_pNameAndSystemEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
 +        pMainLayout->addWidget(m_pLabel, 1);
 +        pMainLayout->addWidget(m_pNameAndSystemEditor, 1);
      }
@@ -1393,10 +1394,10 @@ index 275e1e6..34171eb 100644
  <context>
      <name>UINetworkManagerDialog</name>
 diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
-index fcaed77..ab92ef9 100644
+index f902373..625da36 100644
 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
 +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
-@@ -4830,6 +4830,10 @@
+@@ -4850,6 +4850,10 @@
        <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
        <translation>نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود.</translation>
      </message>
diff --git a/libre/virtualbox-libre/virtualbox-libre-ext-vnc.install b/libre/virtualbox-libre/virtualbox-libre-ext-vnc.install
new file mode 100644
index 000000000..828a16a1d
--- /dev/null
+++ b/libre/virtualbox-libre/virtualbox-libre-ext-vnc.install
@@ -0,0 +1,25 @@
+#/bin/sh
+
+# arg 1:  the new package version
+post_install() {
+  VBoxManage extpack install "/usr/share/virtualbox/extensions/VNC-${1%%-*}.vbox-extpack" >/dev/null
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_upgrade() {
+  pre_remove "$2"
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install "$1"
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  VBoxManage extpack uninstall 'VNC' >/dev/null
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
new file mode 100644
index 000000000..2d62eae43
--- /dev/null
+++ b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+post_install() {
+  dkms add vboxguest/${1%-*}
+  cat << EOF
+==> To build and install your modules run dkms install vboxguest/${1%-*}
+==> To do this automatically at startup you can add dkms in your DAEMONS
+EOF
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_upgrade() {
+  pre_remove "$2"
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install "$1"
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  # Remove modules using dkms
+  [ -n "${1%-*}" ] && dkms remove vboxguest/${1%-*} --all >/dev/null || true
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
new file mode 100644
index 000000000..8028cb7e0
--- /dev/null
+++ b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
@@ -0,0 +1,30 @@
+#/bin/sh
+
+# arg 1:  the new package version
+post_install() {
+  dkms add vboxhost/${1%-*}
+  cat << EOF
+==> To build and install your modules run dkms install vboxhost/${1%-*}
+==> To do this automatically at startup you can add dkms in your DAEMONS
+EOF
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_upgrade() {
+  pre_remove "$2"
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install "$1"
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  # Remove modules using dkms
+  [ -n "${1%-*}" ] && dkms remove vboxhost/${1%-*} --all >/dev/null || true
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install
index b6d804eb7..90d8a8739 100644
--- a/libre/virtualbox-libre/virtualbox-libre.install
+++ b/libre/virtualbox-libre/virtualbox-libre.install
@@ -30,8 +30,8 @@ post_upgrade() {
   post_install "$1"
   if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
     cat << EOF
-===> Starting with virtualbox-libre version 4.1.6-1, kernel libre modules handling is done by virtualbox-libre-modules.
-===> Use virtualbox-libre-source package if you don't use our stock linux-libre package.
+===> Starting with virtualbox-libre version 4.1.6-1, kernel modules handling is done by virtualbox-libre-host-modules.
+===> Use virtualbox-libre-host-dkms package if you don't use our stock linux-libre package.
 EOF
     fi
 }
diff --git a/pcr/libnatpmp-from-social-repo/PKGBUILD b/pcr/libnatpmp-from-social-repo/PKGBUILD
new file mode 100644
index 000000000..ded1e6ca5
--- /dev/null
+++ b/pcr/libnatpmp-from-social-repo/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Pierre Bourdon <delroth@gmail.com>
+
+pkgname=libnatpmp
+pkgver=20120821
+pkgrel=1
+pkgdesc="A portable and fully compliant implementation of the NAT-PMP protocol"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://miniupnp.free.fr/libnatpmp.html"
+license=('BSD')
+depends=('glibc')
+makedepends=()
+source=(libnatpmp-$pkgver.tar.gz::http://miniupnp.free.fr/files/download.php?file=libnatpmp-$pkgver.tar.gz)
+
+build() {
+    cd "$srcdir/$pkgname-$pkgver"
+    make
+}
+
+package() {
+    cd "$srcdir/$pkgname-$pkgver"
+    make INSTALLPREFIX="$pkgdir/usr" \
+         INSTALLDIRINC="$pkgdir/usr/include/libnatpmp" install
+
+    # Needed by some packages
+    install -m 644 getgateway.h declspec.h "$pkgdir/usr/include/libnatpmp"
+
+    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+md5sums=('d2b9c2dedba3a00deb0e7589982ceced')