Merge branch 'master' of ssh://192.168.254.254:443/~/pakxe

44 files changed, 236 insertions, 146 deletions

diff --git a/extra/atkmm/.footprint.i686 b/extra/atkmm/.footprint.i686
index 62e2299cb..6867b6921 100644
--- a/extra/atkmm/.footprint.i686
+++ b/extra/atkmm/.footprint.i686
@@ -153,7 +153,7 @@ drwxr-xr-x	root/root	usr/share/doc/atkmm-1.6/reference/html/
 -rw-r--r--	root/root	usr/share/doc/atkmm-1.6/reference/html/group__atkmmEnums.html
 -rw-r--r--	root/root	usr/share/doc/atkmm-1.6/reference/html/hierarchy.html
 -rw-r--r--	root/root	usr/share/doc/atkmm-1.6/reference/html/index.html
--rw-r--r--	root/root	usr/share/doc/atkmm-1.6/reference/html/inherit__graph__0.png
+-rw-r--r--	root/root	usr/share/doc/atkmm-1.6/reference/html/inherit_graph_0.png
 -rw-r--r--	root/root	usr/share/doc/atkmm-1.6/reference/html/inherits.html
 -rw-r--r--	root/root	usr/share/doc/atkmm-1.6/reference/html/modules.html
 -rw-r--r--	root/root	usr/share/doc/atkmm-1.6/reference/html/namespaceAtk.html
diff --git a/extra/atkmm/.footprint.x86_64 b/extra/atkmm/.footprint.x86_64
index 62e2299cb..6867b6921 100644
--- a/extra/atkmm/.footprint.x86_64
+++ b/extra/atkmm/.footprint.x86_64
@@ -153,7 +153,7 @@ drwxr-xr-x	root/root	usr/share/doc/atkmm-1.6/reference/html/
 -rw-r--r--	root/root	usr/share/doc/atkmm-1.6/reference/html/group__atkmmEnums.html
 -rw-r--r--	root/root	usr/share/doc/atkmm-1.6/reference/html/hierarchy.html
 -rw-r--r--	root/root	usr/share/doc/atkmm-1.6/reference/html/index.html
--rw-r--r--	root/root	usr/share/doc/atkmm-1.6/reference/html/inherit__graph__0.png
+-rw-r--r--	root/root	usr/share/doc/atkmm-1.6/reference/html/inherit_graph_0.png
 -rw-r--r--	root/root	usr/share/doc/atkmm-1.6/reference/html/inherits.html
 -rw-r--r--	root/root	usr/share/doc/atkmm-1.6/reference/html/modules.html
 -rw-r--r--	root/root	usr/share/doc/atkmm-1.6/reference/html/namespaceAtk.html
diff --git a/extra/atkmm/.md5sum.i686 b/extra/atkmm/.md5sum.i686
index 7a9c70e8a..d22e38a8c 100644
--- a/extra/atkmm/.md5sum.i686
+++ b/extra/atkmm/.md5sum.i686
@@ -1 +1 @@
-d56fe2b29d4c88fa270918e5572fc8cf  atkmm-2.22.5.tar.bz2
+30f8e34c92b14f17ba3029937b2f218a  atkmm-2.22.6.tar.xz
diff --git a/extra/atkmm/.md5sum.x86_64 b/extra/atkmm/.md5sum.x86_64
index 7a9c70e8a..d22e38a8c 100644
--- a/extra/atkmm/.md5sum.x86_64
+++ b/extra/atkmm/.md5sum.x86_64
@@ -1 +1 @@
-d56fe2b29d4c88fa270918e5572fc8cf  atkmm-2.22.5.tar.bz2
+30f8e34c92b14f17ba3029937b2f218a  atkmm-2.22.6.tar.xz
diff --git a/extra/atkmm/Pkgfile b/extra/atkmm/Pkgfile
index 79af1cf09..9c68701a4 100644
--- a/extra/atkmm/Pkgfile
+++ b/extra/atkmm/Pkgfile
@@ -6,9 +6,9 @@
 # Run on: atk,glibmm,libsigc++ 
 
 name=atkmm
-version=2.22.5
+version=2.22.6
 release=1
-source=(http://ftp.gnome.org/pub/GNOME/sources/$name/2.22/$name-$version.tar.bz2)
+source=(http://ftp.gnome.org/pub/GNOME/sources/$name/2.22/$name-$version.tar.xz)
 
 build (){
 	cd $name-$version
diff --git a/extra/avahi-server/.footprint.i686 b/extra/avahi-server/.footprint.i686
index a15fa3e87..37c10e0dc 100644
--- a/extra/avahi-server/.footprint.i686
+++ b/extra/avahi-server/.footprint.i686
@@ -9,12 +9,13 @@ drwxr-xr-x	root/root	etc/avahi/services/
 -rw-r--r--	root/root	etc/avahi/services/ssh.service
 drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	etc/rc.d/init.d/
--rwxr-xr-x	root/root	etc/rc.d/init.d/avahi
 -rwxr-xr-x	root/root	etc/rc.d/init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K13avahid -> ../init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K13avahid -> ../init.d/avahid
+drwxr-xr-x	root/root	etc/rc.d/rc2.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc2.d/K13avahid -> ../init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc3.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S43avahid -> ../init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc4.d/
@@ -23,19 +24,12 @@ drwxr-xr-x	root/root	etc/rc.d/rc5.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S43avahid -> ../init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc6.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K13avahid -> ../init.d/avahid
-drwxr-xr-x	root/root	lib/
-drwxr-xr-x	root/root	lib/systemd/
-drwxr-xr-x	root/root	lib/systemd/system/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/avahi-autoipd
 -rwxr-xr-x	root/root	usr/sbin/avahi-daemon
 -rwxr-xr-x	root/root	usr/sbin/avahi-dnsconfd
 drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/dbus-1/
-drwxr-xr-x	root/root	usr/share/dbus-1/interfaces/
-drwxr-xr-x	root/root	usr/share/dbus-1/system-services/
-drwxr-xr-x	root/root	usr/share/gir-1.0/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/avahi-autoipd.8.gz
diff --git a/extra/avahi-server/.footprint.x86_64 b/extra/avahi-server/.footprint.x86_64
index a15fa3e87..37c10e0dc 100644
--- a/extra/avahi-server/.footprint.x86_64
+++ b/extra/avahi-server/.footprint.x86_64
@@ -9,12 +9,13 @@ drwxr-xr-x	root/root	etc/avahi/services/
 -rw-r--r--	root/root	etc/avahi/services/ssh.service
 drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	etc/rc.d/init.d/
--rwxr-xr-x	root/root	etc/rc.d/init.d/avahi
 -rwxr-xr-x	root/root	etc/rc.d/init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K13avahid -> ../init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K13avahid -> ../init.d/avahid
+drwxr-xr-x	root/root	etc/rc.d/rc2.d/
+lrwxrwxrwx	root/root	etc/rc.d/rc2.d/K13avahid -> ../init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc3.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S43avahid -> ../init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc4.d/
@@ -23,19 +24,12 @@ drwxr-xr-x	root/root	etc/rc.d/rc5.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S43avahid -> ../init.d/avahid
 drwxr-xr-x	root/root	etc/rc.d/rc6.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K13avahid -> ../init.d/avahid
-drwxr-xr-x	root/root	lib/
-drwxr-xr-x	root/root	lib/systemd/
-drwxr-xr-x	root/root	lib/systemd/system/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/avahi-autoipd
 -rwxr-xr-x	root/root	usr/sbin/avahi-daemon
 -rwxr-xr-x	root/root	usr/sbin/avahi-dnsconfd
 drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/dbus-1/
-drwxr-xr-x	root/root	usr/share/dbus-1/interfaces/
-drwxr-xr-x	root/root	usr/share/dbus-1/system-services/
-drwxr-xr-x	root/root	usr/share/gir-1.0/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/avahi-autoipd.8.gz
diff --git a/extra/avahi-server/.md5sum.i686 b/extra/avahi-server/.md5sum.i686
index fdd316db4..fd08362a3 100644
--- a/extra/avahi-server/.md5sum.i686
+++ b/extra/avahi-server/.md5sum.i686
@@ -1,3 +1,2 @@
 e4db89a2a403ff4c47d66ac66fad1f43  avahi-0.6.30.tar.gz
 09877d8619de924d02bc018bcef21150  avahid
-42c2905307c7a5dc6ac4b75f4c3d65a3  network-wired.png
diff --git a/extra/avahi-server/.md5sum.x86_64 b/extra/avahi-server/.md5sum.x86_64
index fdd316db4..fd08362a3 100644
--- a/extra/avahi-server/.md5sum.x86_64
+++ b/extra/avahi-server/.md5sum.x86_64
@@ -1,3 +1,2 @@
 e4db89a2a403ff4c47d66ac66fad1f43  avahi-0.6.30.tar.gz
 09877d8619de924d02bc018bcef21150  avahid
-42c2905307c7a5dc6ac4b75f4c3d65a3  network-wired.png
diff --git a/extra/avahi-server/Pkgfile b/extra/avahi-server/Pkgfile
index 137ca2eaa..f8e8262f3 100644
--- a/extra/avahi-server/Pkgfile
+++ b/extra/avahi-server/Pkgfile
@@ -2,51 +2,54 @@
 # URL: http://www.avahi.org/
 # Maintainer: NuTyX core team 
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: qt, gtk, libdaemon, pygtk, dbus-python
-# Run on: 
+# Depends on: libdaemon
+# Run on: libdaemon
 
 name=avahi-server
 version=0.6.30
-release=1
-source=(http://www.avahi.org/download/avahi-$version.tar.gz\
-	avahid network-wired.png)
+release=2
+source=(http://www.avahi.org/download/avahi-$version.tar.gz
+	avahid)
 
 build() {
 	cd avahi-$version
 	PYTHON=python2 ./configure \
-                --prefix=/usr \
-                --sysconfdir=/etc \
-                --localstatedir=/var/lib \
-                --disable-gtk3 \
-                --disable-qt3 \
-                --disable-monodoc \
-                --disable-doxygen-doc \
-                --disable-xmltoman \
-                --disable-mono \
-                --enable-compat-libdns_sd \
-                --enable-compat-howl \
-                --with-distro=lfs \
-                --with-avahi-priv-access-group=network \
-                --with-autoipd-user=avahi \
-                --with-autoipd-group=avahi \
-                --with-systemdsystemunitdir=/lib/systemd/system \
-		--enable-autoipd 
-	make
-	make DESTDIR=$PKG install
-        mkdir -v -p $PKG/etc/rc.d/init.d
-        mkdir -v -p $PKG/etc/rc.d/rc{0,1,3,4,5,6}.d
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--enable-autoipd \
+		--disable-gtk3 \
+		--disable-gtk \
+		--disable-pygtk \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-monodoc \
+		--disable-doxygen-doc \
+		--disable-xmltoman \
+		--disable-mono \
+		--enable-compat-libdns_sd \
+		--enable-compat-howl \
+		--with-distro=lfs \
+		--with-avahi-priv-access-group=network \
+		--with-autoipd-user=avahi \
+		--with-autoipd-group=avahi \
+		--with-systemdsystemunitdir=/lib/systemd/system
+	for i in avahi-common avahi-core; do
+		make -C $i
+	done
+	for i in avahi-autoipd avahi-daemon avahi-dnsconfd man; do
+		make -C $i
+		make -C $i DESTDIR=$PKG install
+	done
+
+	mkdir -p $PKG/etc/rc.d/{init.d,rc{0,1,2,3,4,5,6}.d}
         install -D -m755 ../avahid $PKG/etc/rc.d/init.d/avahid
 
-        ln -svf ../init.d/avahid $PKG/etc/rc.d/rc3.d/S43avahid
-        ln -svf ../init.d/avahid $PKG/etc/rc.d/rc5.d/S43avahid
-        ln -svf ../init.d/avahid $PKG/etc/rc.d/rc4.d/S43avahid
-        ln -svf ../init.d/avahid $PKG/etc/rc.d/rc0.d/K13avahid
-        ln -svf ../init.d/avahid $PKG/etc/rc.d/rc1.d/K13avahid
-        ln -svf ../init.d/avahid $PKG/etc/rc.d/rc6.d/K13avahid
-	rm -r $PKG/{etc/dbus-1,usr/{include,bin,lib,share/{avahi,locale,applications,man/man{1,5}}}}
-	rm $PKG/lib/systemd/system/avahi-*
-	rm $PKG/usr/share/dbus-1/interfaces/org.freedesktop.Avahi.*
-	rm $PKG/usr/share/dbus-1/system-services/org.freedesktop.Avahi.service
-	rm $PKG/usr/share/gir-1.0/Avahi*
+	for i in 3 4 5; do
+		ln -svf ../init.d/avahid $PKG/etc/rc.d/rc$i.d/S43avahid
+	done
+	for i in 0 1 2 6; do
+		ln -svf ../init.d/avahid $PKG/etc/rc.d/rc$i.d/K13avahid
+	done
+	rm -rf $PKG/{lib,etc/dbus-1,usr/share/{avahi,dbus-1,man/man{1,5}}}
 }
-  
diff --git a/extra/avahi-server/network-wired.png b/extra/avahi-server/network-wired.png
deleted file mode 100644
index 227d0678a..000000000
--- a/extra/avahi-server/network-wired.png
+++ /dev/null
diff --git a/extra/calligra/Pkgfile b/extra/calligra/Pkgfile
index aba151714..1a972e4d9 100644
--- a/extra/calligra/Pkgfile
+++ b/extra/calligra/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer: NuTyX core team
 # Packager: lesibel at free dot fr
 # Depends on: cmake,automoc4,kdelibs,okular,sqlite3,avahi,aspell,libxslt,shared-mime-info,upower,udisks,enchant,jasper,openexr,strigi,xorg-libxtst,soprano,ca-certificates,xdg-utils,qca,polkit-qt,xscreensaver,phonon,shared-desktop-ontologies,attica,xorg-libxcursor,hicolor-icon-theme,docbook-xsl,docbook-xml,libdbusmenu-qt,grantlee,pstoedit,eigen2,kdepimlibs,boost,lcms2,libmysql,glew,libgsf,libkdcraw,libwpg 
-# Run on: kdelibs,okular,,sqlite3,lcms2,eigen2,kdepimlibs,boost,avahi,aspell,libxslt,shared-mime-info,upower,udisks,enchant,jasper,openexr,strigi,xorg-libxtst,soprano,ca-certificates,xdg-utils,qca,polkit-qt,xscreensaver,phonon,shared-desktop-ontologies,attica,xorg-libxcursor,hicolor-icon-theme,docbook-xsl,docbook-xml,libdbusmenu-qt,grantlee,pstoedit,libmysql,glew,libgsf,libkdcraw,libwpg 
+# Run on: kdelibs,okular,sqlite3,lcms2,eigen2,kdepimlibs,boost,avahi,aspell,libxslt,shared-mime-info,upower,udisks,enchant,jasper,openexr,strigi,xorg-libxtst,soprano,ca-certificates,xdg-utils,qca,polkit-qt,xscreensaver,phonon,shared-desktop-ontologies,attica,xorg-libxcursor,hicolor-icon-theme,docbook-xsl,docbook-xml,libdbusmenu-qt,grantlee,pstoedit,libmysql,glew,libgsf,libkdcraw,libwpg 
 
 name=calligra
 version=2.3.82
diff --git a/extra/chromium/.footprint.i686 b/extra/chromium/.footprint.i686
index febbac02c..9bf948565 100644
--- a/extra/chromium/.footprint.i686
+++ b/extra/chromium/.footprint.i686
@@ -215,8 +215,11 @@ drwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/warningOrangeDot.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/warningsErrors.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/ScriptFormatterWorker.js
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/dataGrid.css
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/devTools.css
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/devtools.html
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/inspectorCommon.css
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/networkLogView.css
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/chromium.desktop
diff --git a/extra/chromium/.footprint.x86_64 b/extra/chromium/.footprint.x86_64
index febbac02c..9bf948565 100644
--- a/extra/chromium/.footprint.x86_64
+++ b/extra/chromium/.footprint.x86_64
@@ -215,8 +215,11 @@ drwxr-xr-x	root/root	usr/lib/chromium/resources/inspector/Images/
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/warningOrangeDot.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/Images/warningsErrors.png
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/ScriptFormatterWorker.js
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/dataGrid.css
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/devTools.css
 -rw-r--r--	root/root	usr/lib/chromium/resources/inspector/devtools.html
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/inspectorCommon.css
+-rw-r--r--	root/root	usr/lib/chromium/resources/inspector/networkLogView.css
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/chromium.desktop
diff --git a/extra/chromium/.md5sum.i686 b/extra/chromium/.md5sum.i686
index 50658de68..b16a25381 100644
--- a/extra/chromium/.md5sum.i686
+++ b/extra/chromium/.md5sum.i686
@@ -1,5 +1,6 @@
-9b9cc4251e2695348cee26bd053dac73  chromium-14.0.835.186.tar.bz2
+49ce2d68ce0c68dbc9175dfee97a71c9  chromium-15.0.874.106.tar.bz2
 a4c98df2c9cc60c9fe7cf6b284114e7b  chromium-gcc-4.6.patch
 b0cd6503593e3abb05beba510fa99fd0  chromium.desktop
 ade38bd8683710f4bf5ce4f006a06788  chromium.sh
+1d78eeed9aee022d542e7c095a06378c  nacl.gypi
 86eb5bc546890abba4f9cba6bf3af4ef  webrtc-r240-r242-make-pulseaudio-optional.patch
diff --git a/extra/chromium/.md5sum.x86_64 b/extra/chromium/.md5sum.x86_64
index 50658de68..b16a25381 100644
--- a/extra/chromium/.md5sum.x86_64
+++ b/extra/chromium/.md5sum.x86_64
@@ -1,5 +1,6 @@
-9b9cc4251e2695348cee26bd053dac73  chromium-14.0.835.186.tar.bz2
+49ce2d68ce0c68dbc9175dfee97a71c9  chromium-15.0.874.106.tar.bz2
 a4c98df2c9cc60c9fe7cf6b284114e7b  chromium-gcc-4.6.patch
 b0cd6503593e3abb05beba510fa99fd0  chromium.desktop
 ade38bd8683710f4bf5ce4f006a06788  chromium.sh
+1d78eeed9aee022d542e7c095a06378c  nacl.gypi
 86eb5bc546890abba4f9cba6bf3af4ef  webrtc-r240-r242-make-pulseaudio-optional.patch
diff --git a/extra/chromium/Pkgfile b/extra/chromium/Pkgfile
index c1386ff34..7566cc947 100644
--- a/extra/chromium/Pkgfile
+++ b/extra/chromium/Pkgfile
@@ -6,25 +6,30 @@
 # Run on: gtk,dbus-glib,nss,alsa-lib,xdg-utils,bzip2,libevent,dejavu-ttf,desktop-file-utils,hicolor-icon-theme,keyutils
 
 name=chromium
-version=14.0.835.186
+version=15.0.874.106
+#14.0.835.186
 #12.0.742.100
 release=1
 source=(http://build.chromium.org/official/chromium-$version.tar.bz2
         chromium.desktop
         chromium.sh
         chromium-gcc-4.6.patch
-	webrtc-r240-r242-make-pulseaudio-optional.patch)
+	webrtc-r240-r242-make-pulseaudio-optional.patch
+	nacl.gypi)
+
 
 build() {
   cd $SRC/chromium-$version
 
+  cp ../nacl.gypi chrome/
+
   patch -Np0 -i $SRC/chromium-gcc-4.6.patch
   
   sed -i '/#include <cups\/cups.h>/ a #include <cups/ppd.h>' \
     chrome/browser/ui/webui/print_preview_handler.cc
 
-  patch -d third_party/webrtc -Np1 -i \
-    $SRC/webrtc-r240-r242-make-pulseaudio-optional.patch
+#  patch -d third_party/webrtc -Np1 -i \
+#    $SRC/webrtc-r240-r242-make-pulseaudio-optional.patch
 
 ### Configure
 
@@ -33,14 +38,11 @@ build() {
     -e 's|/usr/bin/python$|\02|g' \
     -e 's|(/usr/bin/python2)\.4$|\1|g' \
     {} +
-  # There are still a lot of relative calls which need a workaround
-  mkdir "$SRC/python2-path"
-  ln -s /usr/bin/python2 "$SRC/python2-path/python"
-  export PATH="$SRC/python2-path:$PATH"
 
-  # We need to disable system_ssl until "next protocol negotiation" support is
-  # available in our nss package.
-  # (See https://bugzilla.mozilla.org/show_bug.cgi?id=547312)
+  # There are still a lot of relative calls which need a workaround
+  mkdir $SRC/python2-path
+  ln -s /usr/bin/python2 $SRC/python2-path/python
+  export PATH=$SRC/python2-path:$PATH
 
   build/gyp_chromium -f make build/all.gyp --depth=. \
     -Dno_strict_aliasing=1 \
diff --git a/extra/chromium/nacl.gypi b/extra/chromium/nacl.gypi
new file mode 100644
index 000000000..05638d6bf
--- /dev/null
+++ b/extra/chromium/nacl.gypi
@@ -0,0 +1,8 @@
+{
+  'targets': [
+    {
+      'target_name': 'nacl',
+      'type': 'static_library',
+    },
+  ],
+}
diff --git a/extra/json-glib/.footprint.i686 b/extra/json-glib/.footprint.i686
index b2007a0d4..f8adebf74 100644
--- a/extra/json-glib/.footprint.i686
+++ b/extra/json-glib/.footprint.i686
@@ -17,9 +17,9 @@ drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/Json-1.0.typelib
 -rwxr-xr-x	root/root	usr/lib/libjson-glib-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libjson-glib-1.0.so -> libjson-glib-1.0.so.0.1400.0
-lrwxrwxrwx	root/root	usr/lib/libjson-glib-1.0.so.0 -> libjson-glib-1.0.so.0.1400.0
--rwxr-xr-x	root/root	usr/lib/libjson-glib-1.0.so.0.1400.0
+lrwxrwxrwx	root/root	usr/lib/libjson-glib-1.0.so -> libjson-glib-1.0.so.0.1400.2
+lrwxrwxrwx	root/root	usr/lib/libjson-glib-1.0.so.0 -> libjson-glib-1.0.so.0.1400.2
+-rwxr-xr-x	root/root	usr/lib/libjson-glib-1.0.so.0.1400.2
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/json-glib-1.0.pc
 drwxr-xr-x	root/root	usr/share/
diff --git a/extra/json-glib/.footprint.x86_64 b/extra/json-glib/.footprint.x86_64
index b2007a0d4..f8adebf74 100644
--- a/extra/json-glib/.footprint.x86_64
+++ b/extra/json-glib/.footprint.x86_64
@@ -17,9 +17,9 @@ drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/Json-1.0.typelib
 -rwxr-xr-x	root/root	usr/lib/libjson-glib-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libjson-glib-1.0.so -> libjson-glib-1.0.so.0.1400.0
-lrwxrwxrwx	root/root	usr/lib/libjson-glib-1.0.so.0 -> libjson-glib-1.0.so.0.1400.0
--rwxr-xr-x	root/root	usr/lib/libjson-glib-1.0.so.0.1400.0
+lrwxrwxrwx	root/root	usr/lib/libjson-glib-1.0.so -> libjson-glib-1.0.so.0.1400.2
+lrwxrwxrwx	root/root	usr/lib/libjson-glib-1.0.so.0 -> libjson-glib-1.0.so.0.1400.2
+-rwxr-xr-x	root/root	usr/lib/libjson-glib-1.0.so.0.1400.2
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/json-glib-1.0.pc
 drwxr-xr-x	root/root	usr/share/
diff --git a/extra/json-glib/.md5sum.i686 b/extra/json-glib/.md5sum.i686
index c48647854..a52229beb 100644
--- a/extra/json-glib/.md5sum.i686
+++ b/extra/json-glib/.md5sum.i686
@@ -1 +1 @@
-830707d4f584313816b0addde5830eb2  json-glib-0.14.0.tar.xz
+2a22832c4654156a35b38ee027f6f065  json-glib-0.14.2.tar.xz
diff --git a/extra/json-glib/.md5sum.x86_64 b/extra/json-glib/.md5sum.x86_64
index c48647854..a52229beb 100644
--- a/extra/json-glib/.md5sum.x86_64
+++ b/extra/json-glib/.md5sum.x86_64
@@ -1 +1 @@
-830707d4f584313816b0addde5830eb2  json-glib-0.14.0.tar.xz
+2a22832c4654156a35b38ee027f6f065  json-glib-0.14.2.tar.xz
diff --git a/extra/json-glib/Pkgfile b/extra/json-glib/Pkgfile
index 1e7f1f641..e4f54785f 100644
--- a/extra/json-glib/Pkgfile
+++ b/extra/json-glib/Pkgfile
@@ -6,7 +6,7 @@
 # Run on:
 
 name=json-glib
-version=0.14.0
+version=0.14.2
 release=1
 source=(http://ftp.gnome.org/pub/GNOME/sources/$name/${version%.*}/$name-$version.tar.xz )
 
diff --git a/extra/kdelibs/.md5sum.i686 b/extra/kdelibs/.md5sum.i686
index 7b744ff8b..a63764b50 100644
--- a/extra/kdelibs/.md5sum.i686
+++ b/extra/kdelibs/.md5sum.i686
@@ -1 +1,3 @@
+2b30cc3e382e99333e7ff388943473e9  kde-applications-menu.patch
 abe4c8f848366bcab16c57bbaeb86f1f  kdelibs-4.7.2.tar.bz2
+7941368d5a65e92bc0058f6d513dce39  kdelibs-nepomuk-unicode.diff
diff --git a/extra/kdelibs/.md5sum.x86_64 b/extra/kdelibs/.md5sum.x86_64
index 7b744ff8b..a63764b50 100644
--- a/extra/kdelibs/.md5sum.x86_64
+++ b/extra/kdelibs/.md5sum.x86_64
@@ -1 +1,3 @@
+2b30cc3e382e99333e7ff388943473e9  kde-applications-menu.patch
 abe4c8f848366bcab16c57bbaeb86f1f  kdelibs-4.7.2.tar.bz2
+7941368d5a65e92bc0058f6d513dce39  kdelibs-nepomuk-unicode.diff
diff --git a/extra/kdelibs/Pkgfile b/extra/kdelibs/Pkgfile
index d4f2aa490..0711789aa 100755
--- a/extra/kdelibs/Pkgfile
+++ b/extra/kdelibs/Pkgfile
@@ -8,11 +8,17 @@
 
 name=kdelibs
 version=4.7.2
-release=1
-source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2)
+release=2
+source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2
+	kde-applications-menu.patch
+	kdelibs-nepomuk-unicode.diff)
 
 build() {
 	cd $name-$version
+
+	patch -p1 -i ../kde-applications-menu.patch
+	patch -p1 -i ../kdelibs-nepomuk-unicode.diff
+
 	sed -i "s/THEME \"default\"/THEME \"Pakxe\"/" plasma/theme.cpp
 	mkdir build
 	cd build
diff --git a/extra/kdelibs/kde-applications-menu.patch b/extra/kdelibs/kde-applications-menu.patch
new file mode 100644
index 000000000..4b513298a
--- /dev/null
+++ b/extra/kdelibs/kde-applications-menu.patch
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/CMakeLists.txt	2009-10-02 14:55:17.000000000 +0000
++++ kdelibs-4.3.98/kded/CMakeLists.txt	2010-01-31 22:16:13.946933892 +0000
+@@ -69,7 +69,7 @@
+ if (WIN32)
+ install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
+ else (WIN32)
+-install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
+ endif (WIN32)
+ install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
+--- kdelibs-4.3.98/kded/kbuildsycoca.cpp	2009-12-04 23:10:18.000000000 +0000
++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp	2010-01-31 22:16:13.962766572 +0000
+@@ -302,7 +302,7 @@
+      if (!m_trackId.isEmpty())
+         g_vfolder->setTrackId(m_trackId);
+ 
+-     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
+ 
+      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
+      entry->setLayoutInfo(kdeMenu->layoutList);
diff --git a/extra/kdelibs/kdelibs-nepomuk-unicode.diff b/extra/kdelibs/kdelibs-nepomuk-unicode.diff
new file mode 100644
index 000000000..6a276447d
--- /dev/null
+++ b/extra/kdelibs/kdelibs-nepomuk-unicode.diff
@@ -0,0 +1,65 @@
+diff --git a/nepomuk/query/querybuilderdata_p.h b/nepomuk/query/querybuilderdata_p.h
+index 055482e..3880e13 100644
+--- a/nepomuk/query/querybuilderdata_p.h
++++ b/nepomuk/query/querybuilderdata_p.h
+@@ -32,6 +32,28 @@
+ #include "query_p.h"
+ #include "groupterm_p.h"
+
++namespace {
++/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle
++/// utf8 chars which use more than one char, ie. wide chars.
++/// Thus, we simply truncate each term at the first wide char.
++QStringList stripExtendedCharsHack(const QStringList& terms) {
++    QStringList newTerms;
++    foreach(const QString& term, terms) {
++        int i = 0;
++        while(i < term.length()) {
++            if(term[i].unicode() > 0x7f) {
++                break;
++            }
++            ++i;
++        }
++        if(i > 0) {
++            newTerms.append(term.left(i));
++        }
++    }
++    return newTerms;
++}
++}
++
+ namespace Nepomuk {
+     namespace Query {
+         class QueryBuilderData
+@@ -246,16 +268,23 @@ namespace Nepomuk {
+                     for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin();
+                          it != m_fullTextSearchTerms.constEnd(); ++it ) {
+                         const QString& varName = it.key();
+-                        const QStringList& terms = it.value();
+-                        // bif:search_excerpt wants a vector of all search terms
+-                        excerptParts
+-                                << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)")
+-                            .arg( terms.join(QLatin1String("','")),
+-                                  varName );
++                        const QStringList terms = stripExtendedCharsHack(it.value());
++                        if(terms.count()) {
++                            // bif:search_excerpt wants a vector of all search terms
++                            excerptParts
++                                    << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)")
++                                       .arg( terms.join(QLatin1String("','")),
++                                             varName );
++                        }
+                     }
+
+-                    return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
+-                        .arg(excerptParts.join(QLatin1String(",")));
++                    if(excerptParts.count()) {
++                        return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
++                                .arg(excerptParts.join(QLatin1String(",")));
++                    }
++                    else {
++                        return QString();
++                    }
+                 }
+                 else {
+                     return QString();
diff --git a/extra/libldap/.footprint.i686 b/extra/libldap/.footprint.i686
index 091bf6899..7c6d6ea79 100644
--- a/extra/libldap/.footprint.i686
+++ b/extra/libldap/.footprint.i686
@@ -7,25 +7,26 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/ldap_features.h
 -rw-r--r--	root/root	usr/include/ldap_schema.h
 -rw-r--r--	root/root	usr/include/ldap_utf8.h
+-rw-r--r--	root/root	usr/include/ldif.h
 -rw-r--r--	root/root	usr/include/slapi-plugin.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/liblber-2.4.so.2 -> liblber-2.4.so.2.6.0
--rw-r--r--	root/root	usr/lib/liblber-2.4.so.2.6.0
+lrwxrwxrwx	root/root	usr/lib/liblber-2.4.so.2 -> liblber-2.4.so.2.7.1
+-rw-r--r--	root/root	usr/lib/liblber-2.4.so.2.7.1
 -rw-r--r--	root/root	usr/lib/liblber.a
 -rw-r--r--	root/root	usr/lib/liblber.la
-lrwxrwxrwx	root/root	usr/lib/liblber.so -> liblber-2.4.so.2.6.0
+lrwxrwxrwx	root/root	usr/lib/liblber.so -> liblber-2.4.so.2.7.1
 lrwxrwxrwx	root/root	usr/lib/liblber.so.2 -> liblber.so
-lrwxrwxrwx	root/root	usr/lib/libldap-2.4.so.2 -> libldap-2.4.so.2.6.0
--rw-r--r--	root/root	usr/lib/libldap-2.4.so.2.6.0
+lrwxrwxrwx	root/root	usr/lib/libldap-2.4.so.2 -> libldap-2.4.so.2.7.1
+-rw-r--r--	root/root	usr/lib/libldap-2.4.so.2.7.1
 -rw-r--r--	root/root	usr/lib/libldap.a
 -rw-r--r--	root/root	usr/lib/libldap.la
-lrwxrwxrwx	root/root	usr/lib/libldap.so -> libldap-2.4.so.2.6.0
+lrwxrwxrwx	root/root	usr/lib/libldap.so -> libldap-2.4.so.2.7.1
 lrwxrwxrwx	root/root	usr/lib/libldap.so.2 -> libldap.so
-lrwxrwxrwx	root/root	usr/lib/libldap_r-2.4.so.2 -> libldap_r-2.4.so.2.6.0
--rw-r--r--	root/root	usr/lib/libldap_r-2.4.so.2.6.0
+lrwxrwxrwx	root/root	usr/lib/libldap_r-2.4.so.2 -> libldap_r-2.4.so.2.7.1
+-rw-r--r--	root/root	usr/lib/libldap_r-2.4.so.2.7.1
 -rw-r--r--	root/root	usr/lib/libldap_r.a
 -rw-r--r--	root/root	usr/lib/libldap_r.la
-lrwxrwxrwx	root/root	usr/lib/libldap_r.so -> libldap_r-2.4.so.2.6.0
+lrwxrwxrwx	root/root	usr/lib/libldap_r.so -> libldap_r-2.4.so.2.7.1
 lrwxrwxrwx	root/root	usr/lib/libldap_r.so.2 -> libldap_r.so
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
@@ -109,6 +110,7 @@ lrwxrwxrwx	root/root	usr/share/man/man3/ldap_dn2ad_canonical.3.gz -> ldap_get_dn
 lrwxrwxrwx	root/root	usr/share/man/man3/ldap_dn2dcedn.3.gz -> ldap_get_dn.3.gz
 lrwxrwxrwx	root/root	usr/share/man/man3/ldap_dn2str.3.gz -> ldap_get_dn.3.gz
 lrwxrwxrwx	root/root	usr/share/man/man3/ldap_dn2ufn.3.gz -> ldap_get_dn.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/ldap_dnfree.3.gz -> ldap_get_dn.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/ldap_dup.3.gz
 lrwxrwxrwx	root/root	usr/share/man/man3/ldap_err2string.3.gz -> ldap_error.3.gz
 lrwxrwxrwx	root/root	usr/share/man/man3/ldap_errlist.3.gz -> ldap_error.3.gz
diff --git a/extra/libldap/.footprint.x86_64 b/extra/libldap/.footprint.x86_64
index 091bf6899..7c6d6ea79 100644
--- a/extra/libldap/.footprint.x86_64
+++ b/extra/libldap/.footprint.x86_64
@@ -7,25 +7,26 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/ldap_features.h
 -rw-r--r--	root/root	usr/include/ldap_schema.h
 -rw-r--r--	root/root	usr/include/ldap_utf8.h
+-rw-r--r--	root/root	usr/include/ldif.h
 -rw-r--r--	root/root	usr/include/slapi-plugin.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/liblber-2.4.so.2 -> liblber-2.4.so.2.6.0
--rw-r--r--	root/root	usr/lib/liblber-2.4.so.2.6.0
+lrwxrwxrwx	root/root	usr/lib/liblber-2.4.so.2 -> liblber-2.4.so.2.7.1
+-rw-r--r--	root/root	usr/lib/liblber-2.4.so.2.7.1
 -rw-r--r--	root/root	usr/lib/liblber.a
 -rw-r--r--	root/root	usr/lib/liblber.la
-lrwxrwxrwx	root/root	usr/lib/liblber.so -> liblber-2.4.so.2.6.0
+lrwxrwxrwx	root/root	usr/lib/liblber.so -> liblber-2.4.so.2.7.1
 lrwxrwxrwx	root/root	usr/lib/liblber.so.2 -> liblber.so
-lrwxrwxrwx	root/root	usr/lib/libldap-2.4.so.2 -> libldap-2.4.so.2.6.0
--rw-r--r--	root/root	usr/lib/libldap-2.4.so.2.6.0
+lrwxrwxrwx	root/root	usr/lib/libldap-2.4.so.2 -> libldap-2.4.so.2.7.1
+-rw-r--r--	root/root	usr/lib/libldap-2.4.so.2.7.1
 -rw-r--r--	root/root	usr/lib/libldap.a
 -rw-r--r--	root/root	usr/lib/libldap.la
-lrwxrwxrwx	root/root	usr/lib/libldap.so -> libldap-2.4.so.2.6.0
+lrwxrwxrwx	root/root	usr/lib/libldap.so -> libldap-2.4.so.2.7.1
 lrwxrwxrwx	root/root	usr/lib/libldap.so.2 -> libldap.so
-lrwxrwxrwx	root/root	usr/lib/libldap_r-2.4.so.2 -> libldap_r-2.4.so.2.6.0
--rw-r--r--	root/root	usr/lib/libldap_r-2.4.so.2.6.0
+lrwxrwxrwx	root/root	usr/lib/libldap_r-2.4.so.2 -> libldap_r-2.4.so.2.7.1
+-rw-r--r--	root/root	usr/lib/libldap_r-2.4.so.2.7.1
 -rw-r--r--	root/root	usr/lib/libldap_r.a
 -rw-r--r--	root/root	usr/lib/libldap_r.la
-lrwxrwxrwx	root/root	usr/lib/libldap_r.so -> libldap_r-2.4.so.2.6.0
+lrwxrwxrwx	root/root	usr/lib/libldap_r.so -> libldap_r-2.4.so.2.7.1
 lrwxrwxrwx	root/root	usr/lib/libldap_r.so.2 -> libldap_r.so
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
@@ -109,6 +110,7 @@ lrwxrwxrwx	root/root	usr/share/man/man3/ldap_dn2ad_canonical.3.gz -> ldap_get_dn
 lrwxrwxrwx	root/root	usr/share/man/man3/ldap_dn2dcedn.3.gz -> ldap_get_dn.3.gz
 lrwxrwxrwx	root/root	usr/share/man/man3/ldap_dn2str.3.gz -> ldap_get_dn.3.gz
 lrwxrwxrwx	root/root	usr/share/man/man3/ldap_dn2ufn.3.gz -> ldap_get_dn.3.gz
+lrwxrwxrwx	root/root	usr/share/man/man3/ldap_dnfree.3.gz -> ldap_get_dn.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/ldap_dup.3.gz
 lrwxrwxrwx	root/root	usr/share/man/man3/ldap_err2string.3.gz -> ldap_error.3.gz
 lrwxrwxrwx	root/root	usr/share/man/man3/ldap_errlist.3.gz -> ldap_error.3.gz
diff --git a/extra/libldap/.md5sum.i686 b/extra/libldap/.md5sum.i686
index d4acaf86a..e809d5692 100644
--- a/extra/libldap/.md5sum.i686
+++ b/extra/libldap/.md5sum.i686
@@ -1 +1 @@
-116fe1e23a7b67686d5e62274367e6c0  openldap-2.4.24.tgz
+f36f3086031dd56ae94f722ffae8df5e  openldap-2.4.26.tgz
diff --git a/extra/libldap/.md5sum.x86_64 b/extra/libldap/.md5sum.x86_64
index d4acaf86a..e809d5692 100644
--- a/extra/libldap/.md5sum.x86_64
+++ b/extra/libldap/.md5sum.x86_64
@@ -1 +1 @@
-116fe1e23a7b67686d5e62274367e6c0  openldap-2.4.24.tgz
+f36f3086031dd56ae94f722ffae8df5e  openldap-2.4.26.tgz
diff --git a/extra/libldap/Pkgfile b/extra/libldap/Pkgfile
index 2070f9b48..1ae60481e 100644
--- a/extra/libldap/Pkgfile
+++ b/extra/libldap/Pkgfile
@@ -6,7 +6,7 @@
 # Run on: cyrus-sasl
 
 name=libldap
-version=2.4.24
+version=2.4.26
 release=1
 source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$version.tgz)
 
diff --git a/extra/libmtp/.footprint.i686 b/extra/libmtp/.footprint.i686
index 8453a2e16..a49dcc083 100644
--- a/extra/libmtp/.footprint.i686
+++ b/extra/libmtp/.footprint.i686
@@ -2,8 +2,7 @@ drwxr-xr-x	root/root	lib/
 drwxr-xr-x	root/root	lib/udev/
 -rwxr-xr-x	root/root	lib/udev/mtp-probe
 drwxr-xr-x	root/root	lib/udev/rules.d/
--rw-r--r--	root/root	lib/udev/rules.d/52-libmtp.rules
--rw-r--r--	root/root	lib/udev/rules.d/libmtp.rules
+-rw-r--r--	root/root	lib/udev/rules.d/69-libmtp.rules
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/mtp-albumart
@@ -13,6 +12,7 @@ lrwxrwxrwx	root/root	usr/bin/mtp-delfile -> mtp-connect
 -rwxr-xr-x	root/root	usr/bin/mtp-detect
 -rwxr-xr-x	root/root	usr/bin/mtp-emptyfolders
 -rwxr-xr-x	root/root	usr/bin/mtp-files
+-rwxr-xr-x	root/root	usr/bin/mtp-filetree
 -rwxr-xr-x	root/root	usr/bin/mtp-folders
 -rwxr-xr-x	root/root	usr/bin/mtp-format
 lrwxrwxrwx	root/root	usr/bin/mtp-getfile -> mtp-connect
@@ -32,14 +32,8 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libmtp.a
 -rwxr-xr-x	root/root	usr/lib/libmtp.la
-lrwxrwxrwx	root/root	usr/lib/libmtp.so -> libmtp.so.8.3.6
-lrwxrwxrwx	root/root	usr/lib/libmtp.so.8 -> libmtp.so.8.3.6
--rwxr-xr-x	root/root	usr/lib/libmtp.so.8.3.6
+lrwxrwxrwx	root/root	usr/lib/libmtp.so -> libmtp.so.9.0.1
+lrwxrwxrwx	root/root	usr/lib/libmtp.so.9 -> libmtp.so.9.0.1
+-rwxr-xr-x	root/root	usr/lib/libmtp.so.9.0.1
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libmtp.pc
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/hal/
-drwxr-xr-x	root/root	usr/share/hal/fdi/
-drwxr-xr-x	root/root	usr/share/hal/fdi/information/
-drwxr-xr-x	root/root	usr/share/hal/fdi/information/20thirdparty/
--rw-r--r--	root/root	usr/share/hal/fdi/information/20thirdparty/libmtp.fdi
diff --git a/extra/libmtp/.footprint.x86_64 b/extra/libmtp/.footprint.x86_64
index 8453a2e16..a49dcc083 100644
--- a/extra/libmtp/.footprint.x86_64
+++ b/extra/libmtp/.footprint.x86_64
@@ -2,8 +2,7 @@ drwxr-xr-x	root/root	lib/
 drwxr-xr-x	root/root	lib/udev/
 -rwxr-xr-x	root/root	lib/udev/mtp-probe
 drwxr-xr-x	root/root	lib/udev/rules.d/
--rw-r--r--	root/root	lib/udev/rules.d/52-libmtp.rules
--rw-r--r--	root/root	lib/udev/rules.d/libmtp.rules
+-rw-r--r--	root/root	lib/udev/rules.d/69-libmtp.rules
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/mtp-albumart
@@ -13,6 +12,7 @@ lrwxrwxrwx	root/root	usr/bin/mtp-delfile -> mtp-connect
 -rwxr-xr-x	root/root	usr/bin/mtp-detect
 -rwxr-xr-x	root/root	usr/bin/mtp-emptyfolders
 -rwxr-xr-x	root/root	usr/bin/mtp-files
+-rwxr-xr-x	root/root	usr/bin/mtp-filetree
 -rwxr-xr-x	root/root	usr/bin/mtp-folders
 -rwxr-xr-x	root/root	usr/bin/mtp-format
 lrwxrwxrwx	root/root	usr/bin/mtp-getfile -> mtp-connect
@@ -32,14 +32,8 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libmtp.a
 -rwxr-xr-x	root/root	usr/lib/libmtp.la
-lrwxrwxrwx	root/root	usr/lib/libmtp.so -> libmtp.so.8.3.6
-lrwxrwxrwx	root/root	usr/lib/libmtp.so.8 -> libmtp.so.8.3.6
--rwxr-xr-x	root/root	usr/lib/libmtp.so.8.3.6
+lrwxrwxrwx	root/root	usr/lib/libmtp.so -> libmtp.so.9.0.1
+lrwxrwxrwx	root/root	usr/lib/libmtp.so.9 -> libmtp.so.9.0.1
+-rwxr-xr-x	root/root	usr/lib/libmtp.so.9.0.1
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libmtp.pc
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/hal/
-drwxr-xr-x	root/root	usr/share/hal/fdi/
-drwxr-xr-x	root/root	usr/share/hal/fdi/information/
-drwxr-xr-x	root/root	usr/share/hal/fdi/information/20thirdparty/
--rw-r--r--	root/root	usr/share/hal/fdi/information/20thirdparty/libmtp.fdi
diff --git a/extra/libmtp/.md5sum.i686 b/extra/libmtp/.md5sum.i686
index 8eba19831..9ffcac598 100644
--- a/extra/libmtp/.md5sum.i686
+++ b/extra/libmtp/.md5sum.i686
@@ -1 +1 @@
-7d3c624d768adba8537f8bc9c0a82cbf  libmtp-1.0.6.tar.gz
+073e1c2a00ba377f68dce47727e185ae  libmtp-1.1.1.tar.gz
diff --git a/extra/libmtp/.md5sum.x86_64 b/extra/libmtp/.md5sum.x86_64
index 8eba19831..9ffcac598 100644
--- a/extra/libmtp/.md5sum.x86_64
+++ b/extra/libmtp/.md5sum.x86_64
@@ -1 +1 @@
-7d3c624d768adba8537f8bc9c0a82cbf  libmtp-1.0.6.tar.gz
+073e1c2a00ba377f68dce47727e185ae  libmtp-1.1.1.tar.gz
diff --git a/extra/libmtp/Pkgfile b/extra/libmtp/Pkgfile
index 95baac517..39f43e1d1 100644
--- a/extra/libmtp/Pkgfile
+++ b/extra/libmtp/Pkgfile
@@ -6,20 +6,14 @@
 # Run on: libusb-compat
 
 name=libmtp
-version=1.0.6
+version=1.1.1
 release=1
-source=(http://switch.dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz\
-	)
+source=(http://switch.dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
 
 build() {
 	cd $name-$version
 	./configure --prefix=/usr
 	make
 	make DESTDIR=$PKG install
-	install -D -m0644 libmtp.rules \
-         $PKG/lib/udev/rules.d/52-libmtp.rules
-	install -D -m0644 libmtp.fdi \
-         $PKG/usr/share/hal/fdi/information/20thirdparty/libmtp.fdi
 	rm -rf $PKG/usr/share/doc
 }
-  
diff --git a/extra/pangomm/.md5sum.i686 b/extra/pangomm/.md5sum.i686
index e26e1681c..7c636280c 100644
--- a/extra/pangomm/.md5sum.i686
+++ b/extra/pangomm/.md5sum.i686
@@ -1 +1 @@
-f259bfb342dc29acf42da923e3459837  pangomm-2.28.3.tar.xz
+f4fe0905ee56e1ff0205005e61d2a66f  pangomm-2.28.4.tar.xz
diff --git a/extra/pangomm/.md5sum.x86_64 b/extra/pangomm/.md5sum.x86_64
index e26e1681c..7c636280c 100644
--- a/extra/pangomm/.md5sum.x86_64
+++ b/extra/pangomm/.md5sum.x86_64
@@ -1 +1 @@
-f259bfb342dc29acf42da923e3459837  pangomm-2.28.3.tar.xz
+f4fe0905ee56e1ff0205005e61d2a66f  pangomm-2.28.4.tar.xz
diff --git a/extra/pangomm/Pkgfile b/extra/pangomm/Pkgfile
index 5dfb2f545..91c54d09e 100644
--- a/extra/pangomm/Pkgfile
+++ b/extra/pangomm/Pkgfile
@@ -6,7 +6,7 @@
 # Run on:
 
 name=pangomm
-version=2.28.3
+version=2.28.4
 release=1
 source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.xz)
 
diff --git a/extra/xorg-xterm/.md5sum.i686 b/extra/xorg-xterm/.md5sum.i686
index 01a8b2c9e..b8b08b6eb 100644
--- a/extra/xorg-xterm/.md5sum.i686
+++ b/extra/xorg-xterm/.md5sum.i686
@@ -1 +1 @@
-bbbe6a4566c04656ec21863351570ac8  xterm-275.tgz
+50ca8ee40e8a0992019f8f35042c9abb  xterm-276.tgz
diff --git a/extra/xorg-xterm/.md5sum.x86_64 b/extra/xorg-xterm/.md5sum.x86_64
index 01a8b2c9e..b8b08b6eb 100644
--- a/extra/xorg-xterm/.md5sum.x86_64
+++ b/extra/xorg-xterm/.md5sum.x86_64
@@ -1 +1 @@
-bbbe6a4566c04656ec21863351570ac8  xterm-275.tgz
+50ca8ee40e8a0992019f8f35042c9abb  xterm-276.tgz
diff --git a/extra/xorg-xterm/Pkgfile b/extra/xorg-xterm/Pkgfile
index 5daf91486..10a0c9346 100644
--- a/extra/xorg-xterm/Pkgfile
+++ b/extra/xorg-xterm/Pkgfile
@@ -6,7 +6,7 @@
 # Run on: expat,fontconfig,freetype,xorg-libice,xorg-libsm,xorg-libx11,xorg-libxau,xorg-libxaw,xorg-libxcb,xorg-libxdmcp,xorg-libxext,xorg-libxft,xorg-libxmu,xorg-libxpm,xorg-libxrender,xorg-libxt
 
 name=xorg-xterm
-version=275
+version=276
 release=1
 source=(ftp://invisible-island.net/xterm/xterm-$version.tgz)