1944 files changed, 19689 insertions, 79424 deletions

diff --git a/extra/a52dec/PKGBUILD b/extra/a52dec/PKGBUILD
index d0a262da0..4995e372c 100644
--- a/extra/a52dec/PKGBUILD
+++ b/extra/a52dec/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=a52dec
 pkgver=0.7.4
-pkgrel=6.1
+pkgrel=6.2
 pkgdesc="A free library for decoding ATSC A/52 streams"
 url="http://liba52.sourceforge.net/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,12 +13,16 @@ license=('GPL2')
 depends=('glibc')
 options=(!libtool)
 source=("http://liba52.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz"
-        'a52dec-0.7.4-build.patch')
+        'a52dec-0.7.4-build.patch'
+	'configure.patch')
 md5sums=('caa9f5bc44232dc8aeea773fea56be80'
-         'fa16f224a7dceb7613824380abef0052')
+         'fa16f224a7dceb7613824380abef0052'
+         'ccaa978e70cc74b364486bd72fd38d1d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  mv configure.in configure.ac
+  patch -p0 -i "$srcdir/configure.patch"
   patch -Np1 -i "${srcdir}/a52dec-0.7.4-build.patch"
   ./bootstrap
   ./configure --prefix=/usr --enable-shared \
diff --git a/extra/a52dec/configure.patch b/extra/a52dec/configure.patch
new file mode 100644
index 000000000..6f109d824
--- /dev/null
+++ b/extra/a52dec/configure.patch
@@ -0,0 +1,18 @@
+--- configure.in	2002-07-28 05:50:20.000000000 +0200
++++ configure.ac	2013-02-20 10:38:15.263223716 +0100
+@@ -1,12 +1,12 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_PREREQ(2.52)
+-AC_INIT
++AC_INIT([a52dec],[0.7.4])
+ AC_CONFIG_SRCDIR([src/a52dec.c])
+ AC_CONFIG_AUX_DIR(autotools)
+ AC_CONFIG_FILES([Makefile autotools/Makefile include/Makefile test/Makefile
+     doc/Makefile src/Makefile liba52/Makefile libao/Makefile vc++/Makefile])
+-AM_INIT_AUTOMAKE([a52dec],[0.7.4])
+-AM_CONFIG_HEADER(include/config.h)
++AM_INIT_AUTOMAKE
++AC_CONFIG_HEADERS(include/config.h)
+ AM_MAINTAINER_MODE
+ AC_CANONICAL_HOST
+ 
diff --git a/extra/aalib/PKGBUILD b/extra/aalib/PKGBUILD
index de80ea003..a7c274773 100644
--- a/extra/aalib/PKGBUILD
+++ b/extra/aalib/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=aalib
 pkgver=1.4rc5
-pkgrel=9.1
+pkgrel=9.2
 pkgdesc="A portable ASCII art graphic library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://aa-project.sourceforge.net/aalib/"
diff --git a/extra/abiword/PKGBUILD b/extra/abiword/PKGBUILD
deleted file mode 100644
index c712247d6..000000000
--- a/extra/abiword/PKGBUILD
+++ /dev/null
@@ -1,85 +0,0 @@
-# $Id: PKGBUILD 173825 2012-12-24 15:09:23Z jgc $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Maël Lavault <moimael@neuf.fr>
-
-pkgbase=abiword
-pkgname=('abiword' 'abiword-plugins')
-pkgver=2.8.6
-pkgrel=8
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.abisource.com"
-makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice0.8' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' 
-             'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'psiconv')
-options=('!makeflags' '!libtool')
-source=(http://www.abisource.com/downloads/${pkgbase}/${pkgver}/source/${pkgbase}-${pkgver}.tar.gz
-        compat_libwpg_0_9.patch
-	abiword-2.8.6-no-undefined.patch
-        abiword-2.8.6-libpng15.patch
-	abiword-2.8.6-glib-2.31.patch)
-md5sums=('f883b0a7f26229a9c66fd6a1a94381aa'
-         '09446a2ebba8288fc611e88f7cf17298'
-         '42e2614b6e0aad457d91f6ce20b6f225'
-         '40e370e7e88c5437140ef18037abfbd3'
-         '6ec338a27a6fb590c348724ddb545849')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch"
-  # fix a gcc 4.6.x build issue, patch from Fedora
-  patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch"
-  patch -Np0 -i "${srcdir}/abiword-2.8.6-libpng15.patch"
-
-  # Fix build with recent glib, patch from Gentoo
-  patch -Np0 -i "${srcdir}/abiword-2.8.6-glib-2.31.patch"
-
-  libtoolize --force
-  autoreconf
-
-  ./configure --prefix=/usr \
-              --enable-clipart \
-              --enable-templates \
-              --enable-collab-backend-xmpp \
-              --enable-collab-backend-tcp \
-              --enable-collab-backend-service \
-              --disable-collab-backend-sugar \
-              --enable-plugins --without-gnomevfs \
-              --with-gio \
-              --with-goffice \
-              --disable-static \
-              --with-psiconv-config=/nothere
-  make
-}
-
-package_abiword() {
-  pkgdesc="A fully-featured word processor"
-  depends=('fribidi' 'wv' 'goffice0.8' 'librsvg' 'enchant' 'desktop-file-utils')
-  install=$pkgname.install
-  optdepends=('abiword-plugins')
-  conflicts=("abiword-plugins<${pkgver}-${pkgrel}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -i plugins/Makefile \
-      -e 's/ collab / /' \
-      -e 's/ wpg / /' \
-      -e 's/ wmf / /' \
-      -e 's/ grammar / /' \
-      -e 's/ mathview / /' \
-      -e 's/ aiksaurus / /' \
-      -e 's/ latex / /' \
-      -e 's/ ots / /' \
-      -e 's/ wordperfect / /'
-  make DESTDIR="${pkgdir}" install
-}
-
-package_abiword-plugins() {
-  pkgdesc="Additional plugins for Abiword"
-  depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 
-           'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/plugins"
-  for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do
-    make -C ${dir} DESTDIR="${pkgdir}" install
-  done
-}
diff --git a/extra/abiword/abiword-2.8.6-glib-2.31.patch b/extra/abiword/abiword-2.8.6-glib-2.31.patch
deleted file mode 100644
index 8b938cc25..000000000
--- a/extra/abiword/abiword-2.8.6-glib-2.31.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-------------------------------------------------------------------------
-r30479 | hub | 2011-11-29 00:39:09 -0500 (Tue, 29 Nov 2011) | 2 lines
-Changed paths:
-   M /abiword/trunk/src/af/util/xp/ut_go_file.h
-
-Bug 13197: only import glib.h
-Patch by Dominique Leuenberger.
-------------------------------------------------------------------------
-r30602 | hub | 2012-01-30 02:00:38 -0500 (Mon, 30 Jan 2012) | 2 lines
-Changed paths:
-   M /abiword/trunk/goffice-bits/goffice/app/goffice-app.h
-
-Bug 13247 - Fix glib headers. Patch by Funda Wang
-(safe to backport)
-------------------------------------------------------------------------
-Index: src/af/util/xp/ut_go_file.h
-===================================================================
---- src/af/util/xp/ut_go_file.h	(revision 30478)
-+++ src/af/util/xp/ut_go_file.h	(revision 30479)
-@@ -31,7 +31,6 @@
- 
- #include <glib.h>
- #include <gsf/gsf.h>
--#include <glib/gerror.h>
- #include <time.h>
- 
- G_BEGIN_DECLS
-Index: goffice-bits/goffice/app/goffice-app.h
-===================================================================
---- goffice-bits/goffice/app/goffice-app.h	(revision 30601)
-+++ goffice-bits/goffice/app/goffice-app.h	(revision 30602)
-@@ -22,7 +22,7 @@
- #ifndef GOFFICE_APP_H
- #define GOFFICE_APP_H
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
- 
diff --git a/extra/abiword/abiword-2.8.6-libpng15.patch b/extra/abiword/abiword-2.8.6-libpng15.patch
deleted file mode 100644
index 7eded4c83..000000000
--- a/extra/abiword/abiword-2.8.6-libpng15.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD: patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
-
-Fix build with png-1.5.
-
---- plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig	2009-06-25 04:02:06.000000000 +0000
-+++ plugins/bmp/xp/ie_impGraphic_BMP.cpp
-@@ -191,7 +191,10 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap
- 
- 	/* Clean Up Memory Used */
- 		
--	FREEP(m_pPNGInfo->palette);
-+	png_colorp palette;
-+	int num_palette;
-+	png_get_PLTE( m_pPNG, m_pPNGInfo, &palette, &num_palette );
-+	FREEP(palette);
- 	DELETEP(pBB);
- 	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-    
-@@ -313,7 +316,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -332,7 +335,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- 	UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
- 	{
- 		/* Reset error handling for libpng */
--		if (setjmp(m_pPNG->jmpbuf))
-+		if (setjmp(png_jmpbuf(m_pPNG)))
- 		{
- 			png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
- 			return UT_ERROR;
-@@ -372,7 +375,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
- {
- 	/* Reset error handling for libpng */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
- 		return UT_ERROR;
-
-$NetBSD: patch-plugins_garble_xp_abiword-garble-png.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
-
-Fix build with png-1.5.
-
---- plugins/garble/xp/abiword-garble-png.cpp.orig	2009-09-05 15:34:44.000000000 +0000
-+++ plugins/garble/xp/abiword-garble-png.cpp
-@@ -79,7 +79,7 @@ bool abiword_document::garble_png( void*
- 		png_set_strip_alpha( png_ptr );
- 		png_set_interlace_handling( png_ptr );
- 		png_set_bgr( png_ptr );
--		rowbytes = info_ptr->rowbytes;
-+		rowbytes = png_get_rowbytes( png_ptr, info_ptr );
- 		png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
- 	}
- 
-$NetBSD: patch-af,v 1.12 2011/01/15 15:07:11 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig	2009-07-01 04:02:04.000000000 +0000
-+++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
-@@ -185,7 +185,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import
- /** needed for the stejmp context */
- UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
- {
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		DELETEP(m_pPngBB);
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -446,7 +446,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-$NetBSD: patch-ae,v 1.21 2011/01/15 15:07:11 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/af/util/xp/ut_png.cpp.orig	2008-02-24 03:33:07.000000000 +0000
-+++ src/af/util/xp/ut_png.cpp
-@@ -71,7 +71,7 @@ bool UT_PNG_getDimensions(const UT_ByteB
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
diff --git a/extra/abiword/abiword-2.8.6-no-undefined.patch b/extra/abiword/abiword-2.8.6-no-undefined.patch
deleted file mode 100644
index c07000edb..000000000
--- a/extra/abiword/abiword-2.8.6-no-undefined.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am
---- abiword-2.8.6.orig/src/Makefile.am	2009-09-09 15:11:01.000000000 +0200
-+++ abiword-2.8.6/src/Makefile.am	2011-08-02 23:35:51.904761961 +0200
-@@ -107,7 +107,7 @@
- 
- AbiWord_LDFLAGS = \
- 	$(DEPS_LIBS) \
--	--no-undefined \
-+	-Wl,--no-undefined \
- 	-avoid-version \
- 	-export-dynamic \
- 	-headerpad_max_install_names 
-@@ -129,7 +129,7 @@
- 
- abiword_LDFLAGS = \
- 	$(platform_ldflags) \
--	--no-undefined      \
-+	-Wl,--no-undefined      \
- 	-avoid-version      \
- 	-export-dynamic
- 
diff --git a/extra/abiword/compat_libwpg_0_9.patch b/extra/abiword/compat_libwpg_0_9.patch
deleted file mode 100644
index cf36e188e..000000000
--- a/extra/abiword/compat_libwpg_0_9.patch
+++ /dev/null
@@ -1,371 +0,0 @@
-diff -Nur abiword-2.8.6.orig//plugin-configure.m4 abiword-2.8.6/plugin-configure.m4
---- abiword-2.8.6.orig//plugin-configure.m4	2010-06-13 14:17:27.000000000 -0700
-+++ abiword-2.8.6/plugin-configure.m4	2010-12-06 13:59:43.083048588 -0800
-@@ -794,7 +794,7 @@
- AC_SUBST([OPENXML_LIBS])
- 
- 
--wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0"
-+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
- wpg_deps="no"
- 
- if test "$enable_wpg" != ""; then
-@@ -1497,8 +1497,8 @@
- AC_SUBST([EML_LIBS])
- 
- 
--wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0'
-+wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
-diff -Nur abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 abiword-2.8.6/plugins/wordperfect/plugin.m4
---- abiword-2.8.6.orig//plugins/wordperfect/plugin.m4	2010-05-30 07:50:46.000000000 -0700
-+++ abiword-2.8.6/plugins/wordperfect/plugin.m4	2010-12-06 13:59:53.929715254 -0800
-@@ -1,6 +1,6 @@
- 
--wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0'
-+wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
-diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
---- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp	2010-02-06 13:06:11.000000000 -0800
-+++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp	2010-12-06 13:59:53.926381921 -0800
-@@ -60,7 +60,7 @@
- 
- // Stream class
- 
--#include <libwpd/WPXStream.h>
-+#include <libwpd-stream/libwpd-stream.h>
- 
- #include <gsf/gsf-input.h>
- #include <gsf/gsf-infile.h>
-@@ -70,12 +70,7 @@
- #include <libwps/libwps.h>
- #endif
- 
--class AbiWordperfectInputStream :
--#ifdef HAVE_LIBWPS
--	public WPSInputStream
--#else
--    public WPXInputStream
--#endif
-+class AbiWordperfectInputStream : public WPXInputStream
- {
- public:
- 	AbiWordperfectInputStream(GsfInput *input);
-@@ -86,7 +81,7 @@
- 
- 	virtual WPXInputStream * getDocumentOLEStream(const char * name);
- 
--	virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
-+	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
- 	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
- 	virtual long tell();
- 	virtual bool atEOS();
-@@ -98,11 +93,7 @@
- };
- 
- AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) :
--#ifdef HAVE_LIBWPS
--	WPSInputStream(),
--#else
--	WPXInputStream(true),
--#endif
-+	WPXInputStream(),
- 	m_input(input),
- 	m_ole(NULL)
- {
-@@ -117,9 +108,9 @@
- 	g_object_unref(G_OBJECT(m_input));
- }
- 
--const uint8_t * AbiWordperfectInputStream::read(size_t numBytes, size_t &numBytesRead)
-+const unsigned char * AbiWordperfectInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
- {
--	const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL);
-+	const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL);
- 
- 	if (buf == NULL)
- 		numBytesRead = 0;
-@@ -256,19 +247,12 @@
- {
- 	AbiWordperfectInputStream gsfInput(input);
- 
--	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput, true);
-+	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput);
- 
- 	switch (confidence)
- 	{
- 		case WPD_CONFIDENCE_NONE:
--		// libwpd > 0.7.1 reports POOR if the text file is plain text (that _could_ be a WP4x document)
--		// however, we'll let the text importer handle such cases
--		case WPD_CONFIDENCE_POOR: 
- 			return UT_CONFIDENCE_ZILCH;
--		case WPD_CONFIDENCE_LIKELY:
--			return UT_CONFIDENCE_SOSO;
--		case WPD_CONFIDENCE_GOOD:
--			return UT_CONFIDENCE_GOOD;
- 		case WPD_CONFIDENCE_EXCELLENT:
- 			return UT_CONFIDENCE_PERFECT;
- 		default:
-@@ -328,7 +312,7 @@
- UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input)
- {
- 	AbiWordperfectInputStream gsfInput(input);
--	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this));
-+	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL);
- 
- 	if (error != WPD_OK)
- 	{
-@@ -381,9 +365,9 @@
- 	float marginLeft = 1.0f, marginRight = 1.0f;
- 
- 	if (propList["fo:margin-left"])
--		marginLeft = propList["fo:margin-left"]->getFloat();
-+		marginLeft = propList["fo:margin-left"]->getDouble();
- 	if (propList["fo:margin-right"])
--		marginRight = propList["fo:margin-right"]->getFloat();
-+		marginRight = propList["fo:margin-right"]->getDouble();
- 
- 	if (marginLeft != m_leftPageMargin || marginRight != m_rightPageMargin /* || */
- 		/* marginTop != m_marginBottom || marginBottom != m_marginBottom */ )
-@@ -456,15 +440,15 @@
- 	float marginTop = 0.0f, marginBottom = 0.0f;
- 	float marginLeft = 0.0f, marginRight = 0.0f, textIndent = 0.0f;
- 	if (propList["fo:margin-top"])
--	    marginTop = propList["fo:margin-top"]->getFloat();
-+	    marginTop = propList["fo:margin-top"]->getDouble();
- 	if (propList["fo:margin-bottom"])
--	    marginBottom = propList["fo:margin-bottom"]->getFloat();
-+	    marginBottom = propList["fo:margin-bottom"]->getDouble();
- 	if (propList["fo:margin-left"])
--	    marginLeft = propList["fo:margin-left"]->getFloat();
-+	    marginLeft = propList["fo:margin-left"]->getDouble();
- 	if (propList["fo:margin-right"])
--	    marginRight = propList["fo:margin-right"]->getFloat();
-+	    marginRight = propList["fo:margin-right"]->getDouble();
- 	if (propList["fo:text-indent"])
--	    textIndent = propList["fo:text-indent"]->getFloat();
-+	    textIndent = propList["fo:text-indent"]->getDouble();
- 
- 	m_topMargin = marginTop;
- 	m_bottomMargin = marginBottom;
-@@ -487,7 +471,7 @@
- 
- 	float lineSpacing = 1.0f;
- 	if (propList["fo:line-height"])
--		lineSpacing = propList["fo:line-height"]->getFloat();
-+		lineSpacing = propList["fo:line-height"]->getDouble();
- 	
- 	UT_String tmpBuffer;
- 	UT_String_sprintf(tmpBuffer, "; margin-top:%.4fin; margin-bottom:%.4fin; margin-left:%.4fin; margin-right:%.4fin; text-indent:%.4fin; line-height:%.4f",
-@@ -504,7 +488,7 @@
- 			propBuffer += tmpBuffer;
- 			if (i()["style:position"])
- 			{
--				UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getFloat());
-+				UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getDouble());
- 				propBuffer += tmpBuffer;
- 			}
- 
-@@ -640,9 +624,9 @@
- 
- 	// TODO: support spaceAfter
- 	if (propList["fo:margin-left"])
--		marginLeft = propList["fo:margin-left"]->getFloat();
-+		marginLeft = propList["fo:margin-left"]->getDouble();
- 	if (propList["fo:margin-right"])
--		marginRight = propList["fo:margin-right"]->getFloat();
-+		marginRight = propList["fo:margin-right"]->getDouble();
- 
- 	if (marginLeft != m_leftSectionMargin || marginRight != m_rightSectionMargin || m_sectionColumnsCount != columnsCount)
- 		m_bSectionChanged = true;
-@@ -709,9 +693,9 @@
- 	if (propList["style:num-format"])
- 		listType = propList["style:num-format"]->getStr().cstr()[0];
- 	if (propList["text:space-before"])
--		listLeftOffset = propList["text:space-before"]->getFloat();
-+		listLeftOffset = propList["text:space-before"]->getDouble();
- 	if (propList["text:min-label-width"])
--		listMinLabelWidth = propList["text:min-label-width"]->getFloat();
-+		listMinLabelWidth = propList["text:min-label-width"]->getDouble();
- 
- 	if (!m_pCurrentListDefinition || 
- 		m_pCurrentListDefinition->getOutlineHash() != listID ||
-@@ -749,9 +733,9 @@
- 	if (propList["libwpd:level"])
- 		level = propList["libwpd:level"]->getInt();
- 	if (propList["text:space-before"])
--		listLeftOffset = propList["text:space-before"]->getFloat();
-+		listLeftOffset = propList["text:space-before"]->getDouble();
- 	if (propList["text:min-label-width"])
--		listMinLabelWidth = propList["text:min-label-width"]->getFloat();
-+		listMinLabelWidth = propList["text:min-label-width"]->getDouble();
- 
- 	if (!m_pCurrentListDefinition || m_pCurrentListDefinition->getOutlineHash() != listID)
- 	{
-@@ -871,10 +855,10 @@
- 
- 	UT_String_sprintf(tempBuffer, "margin-left:%.4fin; ", m_pCurrentListDefinition->getListLeftOffset(m_iCurrentListLevel)
- 					+ m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel)
--					- (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f));
-+					- (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f));
- 	propBuffer += tempBuffer;
- 	UT_String_sprintf(tempBuffer, "text-indent:%.4fin", - m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel)
--					+ (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f));
-+					+ (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f));
- 	propBuffer += tempBuffer;
- 
- 	listAttribs[attribsCount++] = PT_PROPS_ATTRIBUTE_NAME;
-@@ -1263,7 +1247,7 @@
-     virtual UT_Error _loadFile(GsfInput * input)
- 	{
- 		AbiWordperfectInputStream gsfInput(input);
--		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this));
-+		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this));
- 
- 		if (error != WPS_OK)
- 			{
-@@ -1302,18 +1286,12 @@
- {
- 	AbiWordperfectInputStream gsfInput(input);
- 
--	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput, true);
-+	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput);
- 
- 	switch (confidence)
- 	{
- 		case WPS_CONFIDENCE_NONE:
- 			return UT_CONFIDENCE_ZILCH;
--		case WPS_CONFIDENCE_POOR: 
--			return UT_CONFIDENCE_POOR;
--		case WPS_CONFIDENCE_LIKELY:
--			return UT_CONFIDENCE_SOSO;
--		case WPS_CONFIDENCE_GOOD:
--			return UT_CONFIDENCE_GOOD;
- 		case WPS_CONFIDENCE_EXCELLENT:
- 			return UT_CONFIDENCE_PERFECT;
- 		default:
-diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h
---- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h	2009-06-19 01:55:49.000000000 -0700
-+++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h	2010-12-06 13:59:53.929715254 -0800
-@@ -30,13 +30,7 @@
- #define IE_IMP_WP_H
- 
- #include <stdio.h>
--#ifdef _WIN32
--#define POINT WPX_POINT
--#endif
- #include <libwpd/libwpd.h>
--#ifdef _WIN32
--#undef POINT
--#endif
- #include "ie_imp.h"
- #include "ut_string.h"
- #include "ut_string_class.h"
-@@ -98,7 +92,7 @@
- 					IE_Imp ** ppie);
- };
- 
--class IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl
-+class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface
- {
- public:
-     IE_Imp_WordPerfect(PD_Document * pDocument);
-@@ -154,6 +148,21 @@
-     virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {}
-     virtual void closeTable();
- 
-+    virtual void definePageStyle(const WPXPropertyList&) {}
-+    virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
-+    virtual void defineCharacterStyle(const WPXPropertyList&) {}
-+    virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
-+    virtual void insertSpace() {}
-+    virtual void insertField(const WPXString&, const WPXPropertyList&) {}
-+    virtual void openComment(const WPXPropertyList&) {}
-+    virtual void closeComment() {}
-+    virtual void openTextBox(const WPXPropertyList&) {}
-+    virtual void closeTextBox() {}
-+    virtual void openFrame(const WPXPropertyList&) {}
-+    virtual void closeFrame() {}
-+    virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {}
-+    virtual void insertEquation(const WPXPropertyList&, const WPXString&) {}
-+
-     
- protected:
- 	virtual UT_Error _loadFile(GsfInput * input);
-diff -Nur abiword-2.8.6.orig//plugins/wpg/plugin.m4 abiword-2.8.6/plugins/wpg/plugin.m4
---- abiword-2.8.6.orig//plugins/wpg/plugin.m4	2010-05-30 07:50:46.000000000 -0700
-+++ abiword-2.8.6/plugins/wpg/plugin.m4	2010-12-06 13:59:53.929715254 -0800
-@@ -1,5 +1,5 @@
- 
--wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0"
-+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
- wpg_deps="no"
- 
- if test "$enable_wpg" != ""; then
-diff -Nur abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp
---- abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp	2008-08-15 14:52:32.000000000 -0700
-+++ abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp	2010-12-06 13:59:53.923048588 -0800
-@@ -31,11 +31,10 @@
- #include <gsf/gsf-input-memory.h>
- #include <gsf/gsf-input-stdio.h>
- #include <gsf/gsf-infile-msole.h>
--#include <libwpd/WPXStream.h>
-+#include <libwpd-stream/libwpd-stream.h>
- #include "xap_Module.h"
- 
- using libwpg::WPGraphics;
--using libwpg::WPGString;
- 
- ABI_PLUGIN_DECLARE("WPG")
- 
-@@ -48,7 +47,7 @@
- 	virtual bool isOLEStream();
- 	virtual WPXInputStream * getDocumentOLEStream();
- 	virtual WPXInputStream * getDocumentOLEStream(const char * name);
--	virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
-+	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
- 	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
- 	virtual long tell();
- 	virtual bool atEOS();
-@@ -60,7 +59,7 @@
- };
- 
- AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) :
--	WPXInputStream(true),
-+	WPXInputStream(),
- 	m_input(input),
- 	m_ole(NULL)
- {
-@@ -75,9 +74,9 @@
- 	g_object_unref(G_OBJECT(m_input));
- }
- 
--const uint8_t * AbiWordPerfectGraphicsInputStream::read(size_t numBytes, size_t &numBytesRead)
-+const unsigned char * AbiWordPerfectGraphicsInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
- {
--	const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL);
-+	const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL);
- 
- 	if (buf == NULL)
- 		numBytesRead = 0;
-@@ -245,10 +244,10 @@
- UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg)
- {
- 	AbiWordPerfectGraphicsInputStream gsfInput(input);
--	WPGString svgOutput;
-+	WPXString svgOutput;
- 	if (WPGraphics::generateSVG(&gsfInput, svgOutput))
- 	{
--		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.length(), false);
-+		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
- 		UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
- 		g_object_unref(svgInput);
- 		return result;
diff --git a/extra/abs/PKGBUILD b/extra/abs/PKGBUILD
deleted file mode 100644
index 26ab5ebca..000000000
--- a/extra/abs/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 166403 2012-09-07 16:50:29Z dreisner $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=abs
-pkgver=2.4.4
-pkgrel=1
-pkgdesc="Utilities to download and work with the Arch Build System (ABS)"
-arch=('i686' 'x86_64')
-url="http://projects.archlinux.org/abs.git/"
-license=('GPL')
-depends=('bash' 'rsync')
-backup=(etc/abs.conf)
-source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('7258c739a93e02a4f31f114e9fc3b0ba'
-         'a628f7d5b1cd1e838366b88709690c24')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="${pkgdir}" install
-
-  # Add readme file, and make base /var/abs path
-  install -dm755 "${pkgdir}"/var/abs/local/
-  install -Dm644 README "${pkgdir}"/var/abs/README
-
-  # make adjustments to abs.conf
-  if [[ $CARCH = "i686" ]]; then
-    sed -i -e 's| multilib||' -e 's| !multilib-testing||' "${pkgdir}"/etc/abs.conf
-  fi
-  if [[ $CARCH = "x86_64" ]]; then
-    sed -i '/ARCH=/s|i686|x86_64|' "${pkgdir}"/etc/abs.conf
-  fi
-}
diff --git a/extra/accountsservice/32bit-crash.patch b/extra/accountsservice/32bit-crash.patch
deleted file mode 100644
index 87b5d308e..000000000
--- a/extra/accountsservice/32bit-crash.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4d5166d1833e42d81b854374aa6e73f83a67a70e Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Tue, 27 Nov 2012 23:30:45 +0000
-Subject: Fix a crash on 32bit systems
-
-The login-frequency property of the User interface is defined
-as uint64 type. Therefore, when setting it with g_object_set,
-a 64bit value is collected, and passing an int might lead to
-bad things.
-https://bugs.freedesktop.org/show_bug.cgi?id=57343
----
-diff --git a/src/daemon.c b/src/daemon.c
-index ed3a114..4d6f3ab 100644
---- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -207,7 +207,7 @@ daemon_local_user_is_excluded (Daemon *daemon, const gchar *username, const gcha
- #ifdef HAVE_UTMPX_H
- 
- typedef struct {
--        int frequency;
-+        guint64 frequency;
-         gint64 time;
-         GList *previous_logins;
- } UserAccounting;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index b23aea1fe..a552605ac 100644
--- a/extra/accountsservice/PKGBUILD
+++ b/extra/accountsservice/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 173212 2012-12-13 09:39:25Z heftig $
+# $Id: PKGBUILD 182980 2013-04-16 15:48:01Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=accountsservice
-pkgver=0.6.30
+pkgver=0.6.31
 pkgrel=1
 pkgdesc="D-Bus interface for user account query and manipulation"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ depends=('glib2' 'polkit' 'systemd')
 makedepends=('intltool' 'gobject-introspection' 'vala')
 options=('!libtool')
 source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch)
-md5sums=('8955b53b0ac9036b3f6a91202ff954f1'
+md5sums=('d594f1da95c6a83c0463695ca31815b2'
          '1d5cf127e5aac407fe7c37b2f4fd503c')
 
 build() {
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index d5f9976a7..a2ed61a4a 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 177767 2013-02-08 09:03:20Z andrea $
+# $Id: PKGBUILD 181115 2013-03-31 19:16:36Z stephane $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
-pkgver=1.9.0
-pkgrel=2
+pkgver=1.9.1
+pkgrel=3
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://community.kde.org/KDE_PIM/Akonadi'
 license=('LGPL')
-depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
+depends=('shared-mime-info' 'boost-libs' 'mariadb' 'soprano')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('51ef4c9455f97ce4346c5934174b9da8')
+md5sums=('f150d5e9b4776d683d0b1d64316f0276')
 
 build() {
   mkdir build
@@ -22,7 +22,8 @@ build() {
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
+    -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE \
+    -DQT_QMAKE_EXECUTABLE=qmake-qt4
   make
 }
 
diff --git a/extra/allegro4/PKGBUILD b/extra/allegro4/PKGBUILD
index 2d393ca87..f38637cd8 100644
--- a/extra/allegro4/PKGBUILD
+++ b/extra/allegro4/PKGBUILD
@@ -5,12 +5,12 @@
 
 pkgname=allegro4
 pkgver=4.4.2
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Portable library mainly aimed at video game and multimedia programming (legacy version)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://alleg.sourceforge.net/"
 license=('custom')
-depends=('sh' 'jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor')
+depends=('sh' 'jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'glu')
 makedepends=('cmake' 'libpng' 'mesa')
 source=(http://downloads.sourceforge.net/alleg/allegro-${pkgver}.tar.gz
         LICENSE)
diff --git a/extra/alsa-firmware/PKGBUILD b/extra/alsa-firmware/PKGBUILD
deleted file mode 100644
index 00df415a4..000000000
--- a/extra/alsa-firmware/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 158602 2012-05-05 02:35:11Z dreisner $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Jochen Immendörfer <jochen dot immendoerfer at gmail dot com>
-pkgname=alsa-firmware
-pkgver=1.0.25
-pkgrel=2
-pkgdesc="ALSA firmware package"
-arch=('i686' 'x86_64')
-url="http://alsa-project.org/"
-license=('GPL')
-source=(ftp://ftp.alsa-project.org/pub/firmware/$pkgname-$pkgver.tar.bz2)
-options=(!strip)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --with-hotplug-dir=/usr/lib/firmware
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  # remove files which conflicts with linux-firmware
-  rm -rf ${pkgdir}/usr/lib/firmware/{ess,korg,sb16,yamaha}
-  # remove broken symlinks (broken upstream)
-  rm -rf ${pkgdir}/usr/lib/firmware/turtlebeach
-  # remove empty dir
-  rm -rf ${pkgdir}/usr/bin
-}
-md5sums=('f1939da45b162c83a726c54a470ef139')
diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD
index de97bc77f..204ceef99 100644
--- a/extra/alsa-lib/PKGBUILD
+++ b/extra/alsa-lib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166377 2012-09-07 09:11:49Z tpowa $
+# $Id: PKGBUILD 182774 2013-04-15 06:32:19Z tpowa $
 # Maintainer: judd <jvinet@zeroflux.org>
 
 pkgname=alsa-lib
-pkgver=1.0.26
+pkgver=1.0.27
 pkgrel=1
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,4 +24,4 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
-md5sums=('2dfa35d28471d721e592b616beedf965')
+md5sums=('f090c7dbd0fe57d786d82e411eac2d08')
diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD
index ae5b4f4e8..c03207608 100644
--- a/extra/alsa-plugins/PKGBUILD
+++ b/extra/alsa-plugins/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166381 2012-09-07 09:14:25Z tpowa $
+# $Id: PKGBUILD 182673 2013-04-12 14:23:59Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Daniel Ehlers <danielehlers@mindeye.net>
 
 pkgname=alsa-plugins
-pkgver=1.0.26
+pkgver=1.0.27
 pkgrel=1
 pkgdesc="Extra alsa plugins"
 arch=(i686 x86_64 'mips64el')
@@ -18,14 +18,11 @@ optdepends=('libpulse: PulseAudio plugin'
             'libsamplerate: libsamplerate resampling plugin'
             'speex: libspeexdsp resampling plugin')
 options=('!libtool')
-source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2"
-        alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
-        alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch)
+source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2")
+md5sums=('ada0163e0e84c787bfc929ad0f3f5cb8')
 
 build() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
-  patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
   ./configure --prefix=/usr
   make
 }
@@ -37,6 +34,3 @@ package() {
   install -d "$pkgdir/usr/share/doc/$pkgname"
   install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/"
 }
-md5sums=('4facd408326ef5567a7d4ceb6589e6b0'
-         '50d9adcda20756d063e676a563c201d9'
-         '697c6275f678d86ded2e5092d8a154c9')
diff --git a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch b/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
deleted file mode 100644
index cce4f7e7e..000000000
--- a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r alsa-plugins-1.0.25/a52/pcm_a52.c alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c
---- alsa-plugins-1.0.25/a52/pcm_a52.c	2012-01-25 08:57:07.000000000 +0100
-+++ alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c	2012-06-09 00:42:52.177219012 +0200
-@@ -702,7 +702,6 @@
- 	rec->channels = channels;
- 	rec->format = format;
- 
--	avcodec_init();
- 	avcodec_register_all();
- 
- 	rec->codec = avcodec_find_encoder_by_name("ac3_fixed");
diff --git a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch b/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
deleted file mode 100644
index f4ebbf466..000000000
--- a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Ffmpeg 0.11 (LIBAVCODEC_VERSION_MAJOR = 54) removed the CH_LAYOUT_* aliases for 
-the AV_CH_LAYOUT_* defines.
-
-diff -pru alsa-plugins-1.0.25-original/a52/pcm_a52.c alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c
---- alsa-plugins-1.0.25-original/a52/pcm_a52.c	2012-01-25 08:57:07.000000000 +0100
-+++ alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c	2012-06-01 14:59:47.096671464 +0200
-@@ -441,7 +441,21 @@ static int a52_prepare(snd_pcm_ioplug_t
- #else
-   rec->avctx->sample_fmt = SAMPLE_FMT_S16;
- #endif
--#if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3)
-+#if (LIBAVCODEC_VERSION_MAJOR >= 54)
-+	switch (io->channels) {
-+	case 2:
-+		rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO;
-+		break;
-+	case 4:
-+		rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD;
-+		break;
-+	case 6:
-+		rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1;
-+		break;
-+	default:
-+		break;
-+	}
-+#elif (LIBAVCODEC_VERSION_MAJOR > 52 && LIBAVCODEC_VERSION_MAJOR < 54) || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3)
-	switch (io->channels) {
- 	case 2:
- 		rec->avctx->channel_layout = CH_LAYOUT_STEREO;
diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD
index c59061818..af7ad9d40 100644
--- a/extra/alsa-utils/PKGBUILD
+++ b/extra/alsa-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166379 2012-09-07 09:13:20Z tpowa $
+# $Id: PKGBUILD 183071 2013-04-17 07:11:00Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=alsa-utils
-pkgver=1.0.26
-pkgrel=1
+pkgver=1.0.27
+pkgrel=4
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.alsa-project.org"
@@ -13,11 +13,19 @@ depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc' 'libsamplerate
 makedepends=('xmlto' 'docbook-xsl')
 license=('GPL')
 source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2
-        alsa
-        alsa.conf.d
-        90alsa)
+        90alsa
+        alsa-restore-1.0.27.service.patch
+        alsactl-fix-buffer-overflow-1.0.27.patch
+        arecord-1.0.27.patch)
 backup=(etc/conf.d/alsa)
 
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/alsa-restore-1.0.27.service.patch
+  patch -Np1 -i ${srcdir}/alsactl-fix-buffer-overflow-1.0.27.patch
+  patch -Np1 -i ${srcdir}/arecord-1.0.27.patch
+}
+
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --disable-alsaconf \
@@ -29,14 +37,13 @@ build() {
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-  install -D -m755 ../alsa ${pkgdir}/etc/rc.d/alsa
-  install -D -m644 ../alsa.conf.d ${pkgdir}/etc/conf.d/alsa
   install -D -m755 ../90alsa ${pkgdir}/etc/pm/sleep.d/90alsa
 
   # dir where to save ALSA state
   install -d ${pkgdir}/var/lib/alsa
 }
-md5sums=('4dcf1017fafc91603af96705c073eca9'
-         '2ba1a1cbf653bf1a69f8a720fd6549da'
-         '4c8ae9f976c7df5e271a4cb91ccc7767'
-         '529216f6a46e61a546640e08ea7a0879')
+md5sums=('cbfb21a24f63fb052b3392195639ce48'
+         '529216f6a46e61a546640e08ea7a0879'
+         '0a27f7b80351d6baa274c32d859bf037'
+         'cd577445636542f9f60b420e4ffe3f0f'
+         'cecb38f03bd245d0584bfd63370e9a05')
diff --git a/extra/alsa-utils/alsa-restore-1.0.27.service.patch b/extra/alsa-utils/alsa-restore-1.0.27.service.patch
new file mode 100644
index 000000000..b3a9d48fd
--- /dev/null
+++ b/extra/alsa-utils/alsa-restore-1.0.27.service.patch
@@ -0,0 +1,10 @@
+--- alsa-utils-1.0.27/alsactl/alsa-restore.service.in.old	2013-04-15 14:37:57.326541394 +0200
++++ alsa-utils-1.0.27/alsactl/alsa-restore.service.in	2013-04-15 14:38:10.179673494 +0200
+@@ -12,6 +12,6 @@
+ Conflicts=shutdown.target
+ 
+ [Service]
+-Type=oneshop
++Type=oneshot
+ ExecStart=-@sbindir@/alsactl restore
+ StandardOutput=syslog
diff --git a/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch b/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch
new file mode 100644
index 000000000..d4b526614
--- /dev/null
+++ b/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch
@@ -0,0 +1,25 @@
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Mon, 15 Apr 2013 12:44:13 +0000 (+0200)
+Subject: alsactl: Fix the string size for the lock file contents
+X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=95788fea25c1a59985828d4b91af0772d077600b
+
+alsactl: Fix the string size for the lock file contents
+
+The string length is 10 characters + LF + '\0' = 12 characters.
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+
+diff --git a/alsactl/lock.c b/alsactl/lock.c
+index d34d013..fce208b 100644
+--- a/alsactl/lock.c
++++ b/alsactl/lock.c
+@@ -35,7 +35,7 @@ static int state_lock_(const char *file, int lock, int timeout)
+ 	int fd = -1, err = 0;
+ 	struct flock lck;
+ 	struct stat st;
+-	char lcktxt[11];
++	char lcktxt[12];
+ 	char *nfile;
+ 
+ 	if (!do_lock)
diff --git a/extra/alsa-utils/arecord-1.0.27.patch b/extra/alsa-utils/arecord-1.0.27.patch
new file mode 100644
index 000000000..f9edb2d21
--- /dev/null
+++ b/extra/alsa-utils/arecord-1.0.27.patch
@@ -0,0 +1,24 @@
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 17 Apr 2013 06:34:34 +0000 (+0200)
+Subject: arecord: add a missing break to the capture loop
+X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=b4f34ac26037c10ac51c4bb29203500165848977
+
+arecord: add a missing break to the capture loop
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+
+diff --git a/aplay/aplay.c b/aplay/aplay.c
+index 5bdc39c..000d25b 100644
+--- a/aplay/aplay.c
++++ b/aplay/aplay.c
+@@ -3021,6 +3021,9 @@ static void capture(char *orig_name)
+ 			fd = -1;
+ 		}
+ 
++		if (in_aborting)
++			break;
++
+ 		/* repeat the loop when format is raw without timelimit or
+ 		 * requested counts of data are recorded
+ 		 */
diff --git a/extra/alsaplayer/PKGBUILD b/extra/alsaplayer/PKGBUILD
index 446018b78..40f4b77c9 100644
--- a/extra/alsaplayer/PKGBUILD
+++ b/extra/alsaplayer/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=alsaplayer
 pkgver=0.99.81
-pkgrel=5
+pkgrel=5.1
 pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.alsaplayer.org/"
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index be08ac168..72551800a 100644
--- a/extra/amarok/PKGBUILD
+++ b/extra/amarok/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175977 2013-01-25 14:45:04Z andrea $
+# $Id: PKGBUILD 180679 2013-03-25 19:15:28Z bpiotrowski $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
@@ -6,12 +6,12 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.7.0
-pkgrel=2
+pkgrel=4
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64" 'mips64el')
 url="http://amarok.kde.org/"
 license=('GPL2' 'LGPL2.1' 'FDL')
-depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
+depends=('kdebase-runtime' 'mariadb' 'qtscriptgenerator' 'taglib-extras'
         'liblastfm' 'ffmpeg' 'libofa' 'qjson')
 makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
              'libmygpo-qt' 'mesa' 'clamz')
diff --git a/extra/amarok/amarok-2.5.0-ffmpeg-fixes.patch b/extra/amarok/amarok-2.5.0-ffmpeg-fixes.patch
deleted file mode 100644
index 602fe47f5..000000000
--- a/extra/amarok/amarok-2.5.0-ffmpeg-fixes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -upr amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp
---- amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp	2012-06-07 16:12:22.000000000 +0300
-+++ amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp	2012-06-07 16:14:56.000000000 +0300
-@@ -136,7 +136,7 @@ MusicDNSAudioDecoder::run()
-     foreach( Meta::TrackPtr track, m_tracks )
-     {
-         //TODO replace with "avformat_open_input" since av_open_input_file is deprecated
--        if( av_open_input_file( &pFormatCtx, ( const char * )track->playableUrl().toLocalFile().toAscii(), NULL, 0, NULL ) )
-+        if( avformat_open_input( &pFormatCtx, ( const char * )track->playableUrl().toLocalFile().toAscii(), NULL, NULL ) )
-         {
-             warning() << QLatin1String( "Unable to open input file: " ) + track->playableUrl().toLocalFile();
-             continue;
-@@ -259,4 +259,4 @@ MusicDNSAudioDecoder::run()
- }
- 
- 
--#include "MusicDNSAudioDecoder.moc"
-\ No newline at end of file
-+#include "MusicDNSAudioDecoder.moc"
diff --git a/extra/amarok/contextviewfix.patch b/extra/amarok/contextviewfix.patch
deleted file mode 100644
index 2363b623c..000000000
--- a/extra/amarok/contextviewfix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
-index a23305f..8fa6f9b 100644
---- a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
-+++ b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
-@@ -129,7 +129,8 @@ Context::VerticalToolbarContainment::updateGeometry()
-     if(!view())
-         return;
- 
--    QRectF rect = view()->sceneRect();
-+    // mimic ContextView::resizeEvent(), nothing else seems to work, bug 292895
-+    QRectF rect( view()->pos(), view()->maximumViewportSize() );
-     setGeometry( rect );
-     m_applets->setGeometry( rect );
-     m_applets->refresh();
\ No newline at end of file
diff --git a/extra/amarok/toolbarfix.patch b/extra/amarok/toolbarfix.patch
deleted file mode 100644
index ec012ca74..000000000
--- a/extra/amarok/toolbarfix.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp
---- amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp	2011-12-15 08:36:48.000000000 +0100
-+++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp	2012-01-29 20:20:01.901360205 +0100
-@@ -108,6 +108,17 @@ Context::AppletToolbar::appletRemoved( P
-     }
- }
- 
-+void Context::AppletToolbar::setContainment( Containment * containment )
-+{
-+    m_cont = containment;
-+}
-+
-+Context::Containment *
-+Context::AppletToolbar::containment() const
-+{
-+    return m_cont;
-+}
-+
- QSizeF
- Context::AppletToolbar::sizeHint( Qt::SizeHint which, const QSizeF &constraint ) const
- {
-Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.orig
-Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.rej
-diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.h amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h
---- amarok-2.5.0/src/context/toolbar/AppletToolbar.h	2011-12-15 08:36:48.000000000 +0100
-+++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h	2012-01-29 20:17:52.414686784 +0100
-@@ -55,6 +55,9 @@ class AppletToolbar : public QGraphicsWi
-         
-         void appletRemoved( Plasma::Applet* applet );
- 
-+        void setContainment( Containment * containment );
-+        Containment* containment() const;
-+
-     signals:
-         void showApplet( Plasma::Applet* );
-         void appletAddedToToolbar( Plasma::Applet* applet, int loc );
-Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.h.orig
-diff -rup amarok-2.5.0/src/context/ToolbarView.cpp amarok-2.5.0.new/src/context/ToolbarView.cpp
---- amarok-2.5.0/src/context/ToolbarView.cpp	2011-12-15 08:36:48.000000000 +0100
-+++ amarok-2.5.0.new/src/context/ToolbarView.cpp	2012-01-29 20:17:52.394686782 +0100
-@@ -74,7 +74,9 @@ Context::ToolbarView::ToolbarView( Plasm
-     setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
- 
-     // now we create the toolbar
--    m_toolbar = new AppletToolbar( containment );
-+    m_toolbar = new AppletToolbar(0);
-+    scene->addItem(m_toolbar.data());
-+    m_toolbar.data()->setContainment( qobject_cast<Context::Containment *>(containment) );
-     m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 );
-     m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 );
- 
-@@ -96,7 +98,7 @@ Context::ToolbarView::ToolbarView( Plasm
- 
- Context::ToolbarView::~ToolbarView()
- {
--
-+    delete m_toolbar.data();
- }
- 
- void
-Only in amarok-2.5.0.new/src/context: ToolbarView.cpp.orig
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 2afee0879..40fa035c7 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=amule
 pkgver=10802
-pkgrel=1
+pkgrel=1.1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.amule.org"
diff --git a/extra/anjuta-extras/PKGBUILD b/extra/anjuta-extras/PKGBUILD
index da103ab51..51dd918a2 100644
--- a/extra/anjuta-extras/PKGBUILD
+++ b/extra/anjuta-extras/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169845 2012-10-30 22:23:48Z heftig $
+# $Id: PKGBUILD 183329 2013-04-21 22:08:26Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=anjuta-extras
-pkgver=3.6.0
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="Anjuta Integrated Development Environment extra plugins"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ install=anjuta-extras.install
 url="http://www.anjuta.org/"
 source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('69df64e6e13a6e0683ebaee5a26ee9b9368eda9ed157607d1e6935b52d7f0b9c')
+sha256sums=('115c2f51017aa51edc6bfc7a2d2084e26b29d3df353ed2a92e40f9e3ae28a761')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index b168f485b..d3c7e43b1 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,30 +1,42 @@
-# $Id: PKGBUILD 170895 2012-11-12 22:30:17Z heftig $
+# $Id: PKGBUILD 183314 2013-04-21 22:06:32Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgbase=anjuta
 pkgname=('libanjuta' 'anjuta')
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-makedepends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf' 'gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool')
+license=(GPL)
+makedepends=(gdl vte3 autogen devhelp glade libgda subversion gnome-icon-theme vala dconf
+             gtk-doc yelp-tools gnome-common intltool gobject-introspection itstool gjs
+             python)
 url="http://www.anjuta.org/"
-source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('2cf44120dcf22c4f4f25bbc65d3641c206e627776ab0f3a37ff0059844d581a2')
+source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
+        fix-compile-error.patch anjuta-glade.xml.diff)
+sha256sums=('ef5d8a5032d4c2025e1870bef044fa025f01096a86f8f226eb178688a960c5b9'
+            'd072af4c1c52ce65f84026b83baa642a9bcfa06b10913b356b5cd99d98931b1d'
+            'e480c41a92198c9158f7d66f248b83464e6d0745d5756dae581b204d5439cc4d')
 
 build() {
   cd "$pkgbase-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
+
+  patch -Np1 -i ../fix-compile-error.patch
+  patch -Np1 -i ../anjuta-glade.xml.diff
+
+  # Bump vala version
+  sed -i '/vala/s/-0\.18/-0.20/' configure.ac
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --enable-glade-catalog --enable-compile-warnings=minimum
   make
 }
 
 package_libanjuta(){
   pkgdesc="Anjuta runtime library"
-  depends=('gdl')
+  depends=(gdl)
   conflicts=('anjuta<3.4.4')
 
   cd "$pkgbase-$pkgver/libanjuta"
@@ -35,7 +47,8 @@ package_libanjuta(){
 
 package_anjuta(){
   pkgdesc="GNOME Integrated Development Environment (IDE)"
-  depends=('libanjuta' 'vte3' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf')
+  depends=(libanjuta vte3 autogen devhelp glade libgda subversion gnome-icon-theme vala dconf)
+  groups=('gnome-extra')
 
   install=anjuta.install
 
@@ -44,7 +57,4 @@ package_anjuta(){
 
   cd libanjuta
   make -j1 DESTDIR="$pkgdir" uninstall
-  
-  sed -i "1s|#!/usr/bin/python$|&2|" \
-    $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py
 }
diff --git a/extra/anjuta/anjuta-glade.xml.diff b/extra/anjuta/anjuta-glade.xml.diff
new file mode 100644
index 000000000..a33c530e5
--- /dev/null
+++ b/extra/anjuta/anjuta-glade.xml.diff
@@ -0,0 +1,101 @@
+diff -u -rN anjuta-3.8.1/libanjuta/anjuta-glade.xml anjuta-3.8.0/libanjuta/anjuta-glade.xml
+--- anjuta-3.8.1/libanjuta/anjuta-glade.xml	1970-01-01 01:00:00.000000000 +0100
++++ anjuta-3.8.0/libanjuta/anjuta-glade.xml	2012-09-26 22:53:46.000000000 +0200
+@@ -0,0 +1,97 @@
++<?xml version="1.0" encoding="UTF-8"?>
++
++<glade-catalog name="anjuta" supports="gtkbuilder" 
++ library="gladeanjuta" depends="gtk+">
++
++	<glade-widget-classes>
++		<glade-widget-class name="AnjutaVcsStatusTreeView" title="Status Tree View" 
++		 generic-name="vcsstatus">
++
++			<properties>
++				<property id="show-status" default="True" />
++				<property id="conflicted-selectable" default="True" />
++				<property id="status-codes" ignore="True">
++					<displayable-values>
++						<value id="ANJUTA_VCS_STATUS_MODIFIED" name="Modified" />
++						<value id="ANJUTA_VCS_STATUS_ADDED" name="Added" />
++						<value id="ANJUTA_VCS_STATUS_DELETED" name="Deleted" />
++						<value id="ANJUTA_VCS_STATUS_CONFLICTED" name="Conflicted" />
++						<value id="ANJUTA_VCS_STATUS_UPTODATE" name="Up to date" />
++						<value id="ANJUTA_VCS_STATUS_LOCKED" name="Locked" />
++						<value id="ANJUTA_VCS_STATUS_MISSING" name="Missing" />
++						<value id="ANJUTA_VCS_STATUS_UNVERSIONED" name="Unversioned" />
++						<value id="ANJUTA_VCS_STATUS_IGNORED" name="Ignored" />
++					</displayable-values>
++				</property>
++			</properties>
++		</glade-widget-class>
++
++		<glade-widget-class name="AnjutaDropEntry" title="Drop Entry"
++		 generic-name="dropentry" />
++
++		 <glade-widget-class name="AnjutaFileList" title="File List"
++		 generic-name="filelist">
++		 
++		 	<properties>
++		 		<property id="show-add-button" default="False" />
++		 	</properties>
++		 </glade-widget-class>
++		 
++	     <glade-widget-class name="AnjutaPkgConfigChooser" title="pkg-config chooser" 
++		 generic-name="pkg_config_chooser" />
++
++		<glade-widget-class name="AnjutaColumnTextView" title="Column Text View"
++		 generic-name="columntextview" />
++
++		 <glade-widget-class name="AnjutaFileDropEntry" title="File Drop Entry"
++		 generic-name="filedropentry" />
++		 
++		 <glade-widget-class name="AnjutaEntry" title="Entry" 
++		 generic-name="entry">
++		 	
++		 	<properties>
++		 		<property translatable="True" id="help-text" default="" />
++		 	</properties>
++		 </glade-widget-class>
++
++		 <glade-widget-class name="AnjutaEnvironmentEditor" title="Environment editor"
++		 generic-name="environment_editor" />
++
++		<glade-widget-class name="AnjutaTreeComboBox" title="Tree combo box"
++		 generic-name="combo">
++			<properties>
++				<property id="glade-type" disabled="True"/>
++				<property id="label" disabled="True"/>
++				<property id="use-underline" disabled="True"/>
++				<property id="stock" disabled="True"/>
++			</properties>
++		</glade-widget-class>
++		<glade-widget-class name="AnjutaPmChooserButton" title="Project node chooser"
++		 generic-name="button" parent="AnjutaTreeComboBox">
++			<properties>
++				<property id="glade-type" disabled="True"/>
++				<property id="label" disabled="True"/>
++				<property id="use-underline" disabled="True"/>
++				<property id="stock" disabled="True"/>
++			</properties>
++		</glade-widget-class>
++		<glade-widget-class name="GbfProjectView" title="Project node view"
++		 generic-name="view" parent="GtkTreeView">
++		</glade-widget-class>
++
++	</glade-widget-classes>
++
++	<glade-widget-group name="Anjuta" title="Anjuta">
++		<glade-widget-class-ref name="AnjutaVcsStatusTreeView" />
++		<glade-widget-class-ref name="AnjutaDropEntry" />
++		<glade-widget-class-ref name="AnjutaFileList" />
++		<glade-widget-class-ref name="AnjutaPkgConfigChooser" />
++		<glade-widget-class-ref name="AnjutaColumnTextView" />
++		<glade-widget-class-ref name="AnjutaFileDropEntry" />
++		<glade-widget-class-ref name="AnjutaEntry" />
++		<glade-widget-class-ref name="AnjutaEnvironmentEditor" />
++		<glade-widget-class-ref name="AnjutaTreeComboBox" />
++		<glade-widget-class-ref name="AnjutaPmChooserButton" />
++		<glade-widget-class-ref name="GbfProjectView" />
++	</glade-widget-group>
++</glade-catalog>
diff --git a/extra/anjuta/fix-compile-error.patch b/extra/anjuta/fix-compile-error.patch
new file mode 100644
index 000000000..bc8fa7c41
--- /dev/null
+++ b/extra/anjuta/fix-compile-error.patch
@@ -0,0 +1,24 @@
+diff -u -r anjuta-3.8.0/libanjuta/anjuta-token.c anjuta-3.8.0-fix/libanjuta/anjuta-token.c
+--- anjuta-3.8.0/libanjuta/anjuta-token.c	2013-01-14 22:45:09.000000000 +0100
++++ anjuta-3.8.0-fix/libanjuta/anjuta-token.c	2013-03-31 13:56:11.722332230 +0200
+@@ -329,7 +329,7 @@
+ 	if (string == NULL)
+ 	{
+ 		/* Value doesn't contain a newline */
+-		fprintf (stderr, "(%lu)", length);
++		fprintf (stderr, "(%lu)", (long unsigned)length);
+ 	}
+ 	else
+ 	{
+diff -u -r anjuta-3.8.0/plugins/dir-project/dir-project.c anjuta-3.8.0-fix/plugins/dir-project/dir-project.c
+--- anjuta-3.8.0/plugins/dir-project/dir-project.c	2012-11-19 00:34:57.000000000 +0100
++++ anjuta-3.8.0-fix/plugins/dir-project/dir-project.c	2013-03-31 13:55:35.922610895 +0200
+@@ -268,7 +268,7 @@
+ 			{
+ 				ptr++;
+ 			} while  (*ptr == '?');
+-			g_string_append_printf (regex, "(.{%d})", ptr - next);
++			g_string_append_printf (regex, "(.{%ld})", (long)(ptr - next));
+ 		}
+ 		else if (*ptr == '\\')
+ 		{
diff --git a/extra/anthy/PKGBUILD b/extra/anthy/PKGBUILD
index 56eebd8f5..4aa302790 100644
--- a/extra/anthy/PKGBUILD
+++ b/extra/anthy/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=anthy
 pkgver=9100h
 _filecode=37536
-pkgrel=3.1
+pkgrel=3.2
 pkgdesc='Hiragana text to Kana Kanji mixed text Japanese input method'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://sourceforge.jp/projects/anthy/'
diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD
index 63bd8d3e4..a119da557 100644
--- a/extra/apache/PKGBUILD
+++ b/extra/apache/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166855 2012-09-19 22:46:12Z jgc $
+# $Id: PKGBUILD 180169 2013-03-18 14:04:21Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apache
-pkgver=2.2.23
+pkgver=2.2.24
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf
         etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
         etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
         etc/logrotate.d/httpd)
-depends=('openssl' 'zlib' 'apr-util' 'pcre')
+depends=('openssl' 'zlib' 'apr-util' 'pcre' 'systemd')
 optdepends=('lynx: apachectl status')
 install=apache.install
 _itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01
@@ -39,8 +39,8 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
         httpd
         httpd.service
         arch.layout)
-md5sums=('ca133de0e4b4b15316990a97186b9993'
-         '3289ae3b16e1a2dc633c811d6569abb6'
+md5sums=('91bd1484aca13a7095d6432be37fc7ae'
+         'f8f0d879b5fda028aad7ac9f329e057b'
          'f1d9d41360908ceb2374da55ae99197a'
          'cdfa04985a0efa850976aef01c2a0c40'
          '0930d2d0612eb0a53a0d00aea7e8687f'
diff --git a/extra/apache/apache.install b/extra/apache/apache.install
index 9b74e607c..e7b72b74f 100644
--- a/extra/apache/apache.install
+++ b/extra/apache/apache.install
@@ -1,3 +1,7 @@
 post_install() {
-  systemd-tmpfiles --create usr/lib/tmpfiles.d/apache.conf
+  systemd-tmpfiles --create apache.conf
+}
+
+post_upgrade() {
+  systemd-tmpfiles --create apache.conf
 }
diff --git a/extra/apache/pcre_info.patch b/extra/apache/pcre_info.patch
deleted file mode 100644
index 906a3159e..000000000
--- a/extra/apache/pcre_info.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- httpd-2.2.22/server/util_pcre.c	2005-11-10 16:20:05.000000000 +0100
-+++ httpd-2.2.22/server/util_pcre.c	2012-02-08 11:23:56.273855663 +0100
-@@ -128,6 +128,7 @@
- const char *errorptr;
- int erroffset;
- int options = 0;
-+int nsub;
- 
- if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS;
- if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE;
-@@ -136,8 +137,9 @@
- preg->re_erroffset = erroffset;
- 
- if (preg->re_pcre == NULL) return AP_REG_INVARG;
--
--preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
-+pcre_fullinfo((const pcre *)preg->re_pcre, NULL,
-+               PCRE_INFO_CAPTURECOUNT, &nsub);
-+preg->re_nsub = nsub;
- return 0;
- }
- 
diff --git a/extra/appmenu-qt/PKGBUILD b/extra/appmenu-qt/PKGBUILD
index a501eb811..bd09f5d3f 100644
--- a/extra/appmenu-qt/PKGBUILD
+++ b/extra/appmenu-qt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175130 2013-01-14 17:12:42Z andrea $
+# $Id: PKGBUILD 178947 2013-03-01 10:19:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=appmenu-qt
 pkgver=0.2.6
-pkgrel=3
+pkgrel=4
 pkgdesc="Allows Qt applications to export menus over DBus to a menu applet"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://launchpad.net/appmenu-qt'
@@ -17,6 +17,8 @@ md5sums=('90cce750e5412d43ce075b0a9bdb6782'
          '5db00ca92274c8b1797c204321961189')
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   # FS#33286
   cd ${pkgname}-${pkgver}
   patch -p0 -i "${srcdir}"/appmenu-async.diff
@@ -26,7 +28,7 @@ build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE="Release"
+    -DCMAKE_BUILD_TYPE=Release
   make
 }
 
diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD
index aa9812f84..41cc52485 100644
--- a/extra/apr-util/PKGBUILD
+++ b/extra/apr-util/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172058 2012-11-27 12:16:31Z jgc $
+# $Id: PKGBUILD 183103 2013-04-17 15:00:29Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apr-util
-pkgver=1.5.1
+pkgver=1.5.2
 pkgrel=1
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
 options=('!libtool')
 license=('APACHE')
 source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2")
-md5sums=('9c1db8606e520f201c451ec9a0b095f6')
+md5sums=('89c1348aa79e898d7c34a6206311c9c2')
 
 build() {
   cd "${srcdir}/apr-util-${pkgver}"
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index 873ae87db..1bc3eb9ec 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,70 +1,53 @@
-# $Id: PKGBUILD 176990 2013-02-03 14:59:10Z schiv $
+# $Id: PKGBUILD 182614 2013-04-11 09:00:27Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-# ardour, liblrdf and raptor are heavily dependent on each other. Updating of
-# one package mostly will require an update of all the other packages. I vote
-# for fixed dependencies speaking in terms of versions -- tobias
-
-# SYSLIBS enabled, support still valid; see ardour 2.8.13 rel notes
-# http://ardour.org/node/5263
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+# Contributor: see .contrib
 
 pkgname=ardour
-pkgver=2.8.16
+_pkgname=Ardour3
+pkgver=3.1
 pkgrel=1
-pkgdesc="A multichannel hard disk recorder and digital audio workstation"
+pkgdesc="Professional-grade digital audio workstation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ardour.org/"
 license=('GPL')
-depends=('liblrdf' 'libusb-compat' 'liblo' 'soundtouch'
-         'aubio' 'lilv' 'suil' 'libgnomecanvasmm')
-         # -libgnomecanvas(+libgnomecanvasmm)
-         # +soundtouch (these +/- changes are for SYSLIBS=1)
-         # cwiid removed for https://bugs.archlinux.org/task/28344
-makedepends=('scons' 'boost')
-changelog=$pkgname.changelog
-source=("ftp://ftp.archlinux.org/other/ardour/$pkgname-$pkgver.tar.bz2"
+depends=('liblrdf' 'liblo' 'libsmf' 'lilv>=0.16.0'
+         'aubio' 'libgnomecanvasmm' 'suil>=0.6.12')
+makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz')
+install=$pkgname.install
+source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2"
         "$pkgname.desktop")
-md5sums=('5bafe41df00d25e7a357baaa1038f16d'
-         '8aeaf433ebf781733db48e5a16b0c4da')
+md5sums=('6291ee6e6519a801a6c7255eb005895f'
+         '316bd21ece5e2208a104fd09cac521af')
 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
+prepare() {
+  cd "$srcdir/$_pkgname-$pkgver"
 
-  # ardour defaults to -O3; use this in CFLAGS below
-  sed -i '/-O3/d' SConstruct
+  # python2 fix
+  sed -i 's/python ${SRC}/python2 ${SRC}/' libs/pbd/wscript
+}
 
-  # work around boost linking error (see ardour3 svn r13081)
-  # thanks to Harry Harren for the heads-up
-  CFLAGS+=" -DBOOST_SYSTEM_NO_DEPRECATED"
-  CXXFLAGS+=" -DBOOST_SYSTEM_NO_DEPRECATED"
-  export CFLAGS CXXFLAGS
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  # SSE code is used by default on all arches.
+  [ "$CARCH" == "mips64el" ] && extra=--no-fpu-optimization
 
-  # All unknown arches are considered i686 with SSE.
-  [ "$CARCH" == "mips64el" ] && extra="DIST_TARGET=none"
+  python2 waf configure --prefix=/usr \
+                        --configdir=/etc \
+                        --docs $extra
 
-  scons $MAKEFLAGS ARCH="${CFLAGS/-O[0-9]/-O3}" \
-                   PREFIX="/usr" \
-                   DIST_LIBDIR="lib" \
-                   FREEDESKTOP=0 \
-                   FREESOUND=1 \
-                   SYSLIBS=1 \
-                   $extra
+  python2 waf build $MAKEFLAGS
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
 
-  scons DESTDIR="$pkgdir" install
+  python2 waf install --destdir="$pkgdir"
 
   # install some freedesktop.org compatibility
   install -Dm644 "$srcdir/$pkgname.desktop" \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
-
-  # upstream will not do this
-  # install templates
-  cp -r templates "$pkgdir/usr/share/ardour2/"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/ardour/ardour.changelog b/extra/ardour/ardour.changelog
deleted file mode 100644
index 242d5a78a..000000000
--- a/extra/ardour/ardour.changelog
+++ /dev/null
@@ -1,55 +0,0 @@
-11 Aug 2012 (GMT+8) Ray Rashif <schiv@archlinux.org>
-	* 2.8.14:
-	Upstream release
-	Dep on new (s)lv2 stack (lilv, suil et al replaces slv2)
-	SYSLIBS turned on by upstream decree; see 2.8.13 release notes
-
-15 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 2.8.11-5:
-	Resolve previous issues with slv2 & redland/rasqal/raptor
-		- just needed rebuild of slv2 against latest redland suite [1]
-		- also needed ardour buildsystem patch for raptor2 [1][2]
-		- bring back support for slv2
-
-	[1] https://bugs.archlinux.org/task/25060
-	[2] http://tracker.ardour.org/view.php?id=4179
-
-9 Jul 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 2.8.11-4:
-	Fix build failures and runtime segfaults
-		- gcc 4.6 patch
-		- enable SYSLIBS due to ardour sigc++ issues
-		- remove slv2 dep due to ardour rasqal incompatibility [1][2]
-
-	[1] https://bugs.archlinux.org/task/25060
-	[2] https://ardour.org/node/4301
-
-22 Feb 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 2.8.11-2 :
-	raptor rebuild
-
-9 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 2.8.11-1 :
-	Testing build.
-	Removed libgnomecanvasmm depend (ardour internal).
-	Removed soundtouch makedepend (ardour internal, unneded).
-	Added new depends
-		- slv2 ("LV2" plug-ins support)
-		- rubberband (can "do more" than soundtouch)
-		- libgnomecanvas
-	Not using SYSLIBS because upstream does not support it.
-	Namcap warnings can be ignored; they're ardour internals.
-
-	* PKGBUILD :
-	Minor cosmetic ammendments.
-
-	* ardour.changelog :
-	Added this changelog.
-	Only important changes will be logged.
-
-	* ardour.install :
-	Removed install scriptlet; old and deprecated information.
diff --git a/extra/ardour/ardour.desktop b/extra/ardour/ardour.desktop
index b50f6c952..de68483e1 100644
--- a/extra/ardour/ardour.desktop
+++ b/extra/ardour/ardour.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Ardour
+Name=Ardour 3
 Comment=Multitrack hard disk recorder
-Exec=ardour2
-Icon=/usr/share/ardour2/icons/ardour_icon_48px.png
+Exec=ardour3
+Icon=/usr/share/ardour3/icons/ardour_icon_48px.png
 Terminal=false
 Type=Application
 X-MultipleArgs=false
diff --git a/extra/ardour/ardour.install b/extra/ardour/ardour.install
new file mode 100644
index 000000000..555d7377d
--- /dev/null
+++ b/extra/ardour/ardour.install
@@ -0,0 +1,21 @@
+post_install() {
+  cat << MSG
+  > Ardour 3 has support for native "Linux" VSTs. You may want to export
+  > LXVST_PATH to include any custom directories of *.so VST plug-ins.
+
+  > Please consider supporting Paul Davis, lead developer of Ardour, by
+  > either subscribing or at least donating to the project's cause:
+
+      https://community.ardour.org/s/subscribe
+      https://community.ardour.org/donate
+
+  > With your continued support, Ardour will continue to improve and will
+  > one day no longer be dependent on unstable funding.
+MSG
+}
+
+post_upgrade() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/aspell/PKGBUILD b/extra/aspell/PKGBUILD
index f75ce00b8..5925a20d7 100644
--- a/extra/aspell/PKGBUILD
+++ b/extra/aspell/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=aspell
 pkgver=0.60.6.1
 _pkgmajorver=0.60
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="A spell checker designed to eventually replace Ispell"
 url="http://aspell.net/"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD
index acb82a0b4..39b8b0388 100644
--- a/extra/at-spi2-atk/PKGBUILD
+++ b/extra/at-spi2-atk/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 170879 2012-11-12 21:34:54Z heftig $
+# $Id: PKGBUILD 183331 2013-04-21 22:08:29Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-atk
-pkgver=2.6.2
+pkgver=2.8.1
 pkgrel=1
 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org"
 license=('GPL2')
-depends=('at-spi2-core' 'libx11' 'atk' 'dconf')
+depends=('at-spi2-core' 'libx11' 'atk')
 makedepends=('intltool')
-install=at-spi2-atk.install
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('496c8432e8ab82735145f9af5d45209e9b708bf3c94e527ee091d08641a9bcfa')
+sha256sums=('eb659b94fde6dc0a2f584c9121a5e6d39a4c8aa297d21d8f9032f7a8a775fd06')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD
index e1fa0bc9f..44fb8bc99 100644
--- a/extra/at-spi2-core/PKGBUILD
+++ b/extra/at-spi2-core/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 173097 2012-12-10 22:25:55Z heftig $
+# $Id: PKGBUILD 183332 2013-04-21 22:08:31Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-core
-pkgver=2.6.3
+pkgver=2.8.0
 pkgrel=1
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org"
 license=('GPL2')
-depends=('dbus-core' 'glib2' 'libxtst')
+depends=('dbus' 'glib2' 'libxtst')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('fc4487ae46e847cfd057b329b852cf99923772ecd2ddc29f29670c9f2b15d0ea')
+sha256sums=('1861a30fc7f583d5a567a0ba547db67ce9bd294f0d1c9f7403c96a10a481c458')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/at/PKGBUILD b/extra/at/PKGBUILD
deleted file mode 100644
index 881b5485b..000000000
--- a/extra/at/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 168299 2012-10-08 05:32:58Z eric $
-# Maintainer: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Todd Musall <tmusall@comcast.net>
-
-pkgname=at
-pkgver=3.1.13
-pkgrel=2
-pkgdesc="AT and batch delayed command scheduling utility and daemon"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://packages.qa.debian.org/a/at.html"
-license=('GPL')
-depends=('pam')
-makedepends=('ssmtp')
-backup=('etc/at.deny')
-options=('!makeflags')
-source=(http://ftp.debian.org/debian/pool/main/a/at/at_${pkgver}.orig.tar.gz
-        atd atd.service)
-md5sums=('1da61af6c29e323abaaf13ee1a8dad79'
-         '35574e34829e7df07a3269d4ab646a29'
-         '33976a813f4fe7f5659354601044c6f8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man  \
-              --with-jobdir=/var/spool/atd \
-              --with-atspool=/var/spool/atd
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make IROOT="${pkgdir}" docdir=/usr/share/doc install
-  install -D -m755 "${srcdir}/atd" "${pkgdir}/etc/rc.d/atd"
-  install -D -m644 "${srcdir}/atd.service" "${pkgdir}/usr/lib/systemd/system/atd.service"
-}
diff --git a/extra/at/atd b/extra/at/atd
deleted file mode 100644
index d10a46a3b..000000000
--- a/extra/at/atd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/atd`
-case "$1" in
-  start)
-    stat_busy "Starting ATD Daemon"
-    [ -z "$PID" ] && /usr/sbin/atd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon atd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ATD Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon atd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/at/atd.service b/extra/at/atd.service
deleted file mode 100644
index ba359878c..000000000
--- a/extra/at/atd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=ATD daemon
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/atd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/atk/PKGBUILD b/extra/atk/PKGBUILD
index 75f326579..a6311a06f 100644
--- a/extra/atk/PKGBUILD
+++ b/extra/atk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169846 2012-10-30 22:23:52Z heftig $
+# $Id: PKGBUILD 183330 2013-04-21 22:08:28Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=atk
-pkgver=2.6.0
+pkgver=2.8.0
 pkgrel=1
 pkgdesc="A library providing a set of interfaces for accessibility"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ makedepends=('gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 url='http://www.gtk.org/'
-sha256sums=('eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f')
+sha256sums=('b22519176226f3e07cf6d932b77852e6b6be4780977770704b32d0f4e0686df4')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/atkmm/PKGBUILD b/extra/atkmm/PKGBUILD
index f59fca7d8..2056879b6 100644
--- a/extra/atkmm/PKGBUILD
+++ b/extra/atkmm/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 79583 2010-05-04 15:21:15Z ibiru $
+# $Id: PKGBUILD 183599 2013-04-24 15:17:51Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgbase=atkmm
 pkgname=(atkmm atkmm-docs)
-pkgver=2.22.6
-pkgrel=1.1
+pkgver=2.22.7
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('atk' 'glibmm' 'glibmm-docs' 'libsigc++')
 license=('LGPL')
 options=('!libtool' '!emptydirs')
 url="http://gtkmm.sourceforge.net/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.22/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('0a74295106b9e3ae552b169eb4e098b8b825c4115045b9d5134a6c79a238aeb6')
+sha256sums=('bfbf846b409b4c5eb3a52fa32a13d86936021969406b3dcafd4dd05abd70f91b')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/attica/PKGBUILD b/extra/attica/PKGBUILD
index 4ed745406..fdf102f79 100644
--- a/extra/attica/PKGBUILD
+++ b/extra/attica/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 165443 2012-08-19 15:34:57Z andrea $
+# $Id: PKGBUILD 178948 2013-03-01 10:19:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=attica
 pkgver=0.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc='A Qt library that implements the Open Collaboration Services API'
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kdesupport/attica'
 license=('LGPL')
-depends=('qt')
+depends=('qt4')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('b90983ec5d79e5ddcbc9146fa23cab72')
 
 build() {
-  cd "${srcdir}"
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -24,6 +25,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build"
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/aubio/PKGBUILD b/extra/aubio/PKGBUILD
index 2d064f93d..03e7c7ab7 100644
--- a/extra/aubio/PKGBUILD
+++ b/extra/aubio/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=aubio
 pkgver=0.3.2
-pkgrel=5.1
+pkgrel=5.2
 pkgdesc="A library for audio labelling"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://aubio.org/"
diff --git a/extra/audacious-plugins/PKGBUILD b/extra/audacious-plugins/PKGBUILD
deleted file mode 100644
index f9625a77f..000000000
--- a/extra/audacious-plugins/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 173108 2012-12-11 04:47:03Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=audacious-plugins
-pkgver=3.3.3
-pkgrel=1
-pkgdesc='Plugins for Audacious'
-url='http://audacious-media-player.org/'
-license=('custom:BSD' 'GPL')
-arch=('i686' 'x86_64')
-
-makedepends=("audacious>=${pkgver}"
-             'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
-             'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio' 'libsidplay' 'wavpack'
-             'libnotify' 'lirc-utils' 'curl' 'libmtp'
-             'neon' 'libmms' 'libcue')
-
-optdepends=('oss: Open Sound System v4 output'
-            'alsa-lib: Advanced Linux Sound Arch. output'
-            'pulseaudio: PulseAudio output'
-            'jack2: Jack Audio Connection Kit output'
-            'lame: FileWriter MP3 output'
-            'libvorbis: Vorbis input, FileWriter Vorbis output'
-            'flac: FLAC input, FileWriter FLAC output'
-
-            'mpg123: MP3 input'
-            'faad2: AAC input'
-            'ffmpeg: ffaudio input'
-            'libmodplug: modplug input'
-            'fluidsynth: MIDI FluidSynth backend input'
-            'libcdio: CD Digital Audio input'
-            'libsidplay: Commodore 64 audio input'
-            'wavpack: WavPack input'
-
-            'libnotify: libnotify OSD'
-            'lirc-utils: LIRC'
-            'curl: AudioScrobbler Client'
-            'libmtp: Upload to MTP device'
-
-            'neon: neon-based http transport'
-            'libmms: libmms-based mms transport'
-            'libcue: CUE playlist format')
-
-source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('c7384a2de6e3305f3c3271bb66344f0cbb9bef0e')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--enable-amidiplug \
-		--disable-adplug \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD
index 65441f8cd..1ac22f46f 100644
--- a/extra/audacity/PKGBUILD
+++ b/extra/audacity/PKGBUILD
@@ -18,8 +18,9 @@ sha1sums=('72e634711fb96aac9df445e75e16e12e00c047e6')
 
 build() {
   cd "${srcdir}/${pkgname}-src-${pkgver}"
+  [ "$CARCH" = "mips64el" ] && sse="--disable-sse"
   PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \
-    ./configure --prefix=/usr --docdir=/usr/share/doc/audacity
+    ./configure --prefix=/usr --docdir=/usr/share/doc/audacity $sse
   make
 }
 
diff --git a/extra/audiofile/PKGBUILD b/extra/audiofile/PKGBUILD
index 2ae3967b9..7a55f70a5 100644
--- a/extra/audiofile/PKGBUILD
+++ b/extra/audiofile/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 158087 2012-05-02 16:52:54Z schiv $
+# $Id: PKGBUILD 180118 2013-03-17 17:41:49Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=audiofile
-pkgver=0.3.4
+pkgver=0.3.6
 pkgrel=1
 pkgdesc="Silicon Graphics Audio File Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.68k.org/~michael/audiofile/"
 license=('LGPL')
-depends=('gcc-libs' 'alsa-lib')
+depends=('gcc-libs' 'alsa-lib' 'flac')
 options=('!libtool')
 source=("http://audiofile.68k.org/$pkgname-$pkgver.tar.gz")
-md5sums=('2ed06d64ee552a2ce490f54351b86ccd')
+md5sums=('2731d79bec0acef3d30d2fc86b0b72fd')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/autogen/PKGBUILD b/extra/autogen/PKGBUILD
index b69d3e049..e1ce414c6 100644
--- a/extra/autogen/PKGBUILD
+++ b/extra/autogen/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157991 2012-04-30 17:51:02Z dan $
+# $Id: PKGBUILD 179949 2013-03-13 11:07:49Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@soufly.nl>
 # Contributor: Tor Krill
 
 pkgname=autogen
-pkgver=5.15
+pkgver=5.17.2
 pkgrel=1
 pkgdesc="A tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ depends=('guile' 'libxml2')
 options=('!libtool')
 install=autogen.install
 source=(http://ftp.gnu.org/gnu/${pkgname}/rel${pkgver}/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('5fba3c0e1ec0965061f27e8e79bd6da2'
-         'ed74e586ade1a61f753d391f3849c25b')
+md5sums=('567dd065d24294c5c31517e399c2fcf5'
+         'af72d4d6f27486366e7712c41f61b8fa')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/automoc4/PKGBUILD b/extra/automoc4/PKGBUILD
index ab169d0f1..fbb047771 100644
--- a/extra/automoc4/PKGBUILD
+++ b/extra/automoc4/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 149006 2012-02-05 13:49:43Z andrea $
+# $Id: PKGBUILD 178949 2013-03-01 10:19:23Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=automoc4
 pkgver=0.9.88
-pkgrel=3.1
+pkgrel=4
 pkgdesc="Automatic moc for Qt4"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org/'
 license=('custom')
-depends=('qt')
+depends=('qt4')
 makedepends=('pkgconfig' 'cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
         'license.txt')
@@ -17,7 +17,8 @@ md5sums=('91bf517cb940109180ecd07bc90c69ec'
          '9014edbb7e2f02fe90b2db8707487bce')
 
 build() {
-	cd "${srcdir}"
+    . /etc/profile.d/qt4.sh
+
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \
@@ -27,7 +28,9 @@ build() {
 }
 
 package() {
-    cd "${srcdir}/build"
+    cd build
 	make DESTDIR="${pkgdir}" install
-	install -Dm644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+    install -Dm644 "${srcdir}/license.txt" \
+      "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index 3f8891030..7682e6db2 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 172143 2012-11-30 03:01:06Z bisson $
+# $Id: PKGBUILD 182390 2013-04-09 21:23:22Z eric $
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=5
+pkgrel=6
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
@@ -13,21 +13,23 @@ options=('!libtool' '!emptydirs')
 depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm')
 optdepends=('dbus: communicating with client applications'
             'gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
-            'gtk2: gtk2 bindings')
-[ "$CARCH" != "mips64el" ] && optdepends+=('qt3: qt3 bindings')
-optdepends+=('qt: qt bindings'
+            'gtk2: gtk2 bindings'
+            'qt3: qt3 bindings'
+            'qt4: qt4 bindings'
             'pygtk: avahi-bookmarks, avahi-discover'
             'twisted: avahi-bookmarks')
 [ "$CARCH" != "mips64el" ] && optdepends+=('mono: mono bindings')
 optdepends+=('dbus-python: avahi-discover'
             'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'pygtk' 'intltool' 'python2-dbus'
+makedepends=('qt3' 'qt4' 'pygtk' 'intltool' 'python2-dbus'
              'gobject-introspection' 'gtk3' 'xmltoman')
-[ "$CARCH" != "mips64el" ] && makedepends+=('qt3' 'mono' 'gtk-sharp-2')
+[ "$CARCH" != "mips64el" ] && makedepends+=('mono' 'gtk-sharp-2')
 backup=('etc/avahi/hosts'
         'etc/avahi/avahi-daemon.conf'
         'etc/avahi/services/ssh.service'
-        'etc/avahi/services/sftp-ssh.service')
+        'etc/avahi/services/sftp-ssh.service'
+        'usr/lib/avahi/service-types.db'
+        'usr/share/avahi/service-types')
 source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz"
         'rc.d.patch')
 sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684'
@@ -45,11 +47,13 @@ build() {
 	patch -p1 -i ../rc.d.patch
 
   [ "$CARCH" = "mips64el" ] && \
-    extra="--disable-qt3 --disable-mono"
+    extra="--disable-mono"
+
+	export MOC_QT3=/usr/bin/moc-qt3
+	export MOC_QT4=/usr/bin/moc-qt4
 
 	# pygtk requires python2; make it explicit in case other python are installed: FS#21865
 	PYTHON=python2 \
-	PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -74,6 +78,7 @@ package() {
 
 	cd "${pkgdir}"
 	sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
+	sed -i 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' etc/avahi/avahi-dnsconfd.action
 
 	# howl and mdnsresponder compatability
 	(cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl)
diff --git a/extra/avahi/gnome-nettool.png b/extra/avahi/gnome-nettool.png
deleted file mode 100644
index 227d0678a..000000000
--- a/extra/avahi/gnome-nettool.png
+++ /dev/null
diff --git a/extra/avahi/install b/extra/avahi/install
index 7c75c3dd4..d333389ee 100644
--- a/extra/avahi/install
+++ b/extra/avahi/install
@@ -1,8 +1,8 @@
 post_install() {
-  getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
-  getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null
+	getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
+	getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null
 
-  cat <<EOF
+	cat <<EOF
 ==> The following daemons may be added to DAEMONS in /etc/rc.conf:
 ==> avahi-daemon: the mdns responder, you probably want this.
 ==>               dbus needs to be running when you start it.
@@ -16,6 +16,7 @@ EOF
 }
 
 post_remove() {
-  getent passwd avahi &>/dev/null && userdel avahi >/dev/null
-  getent group avahi &>/dev/null && groupdel avahi >/dev/null
+	getent passwd avahi &>/dev/null && userdel avahi >/dev/null
+	getent group avahi &>/dev/null && groupdel avahi >/dev/null
+	true
 }
diff --git a/extra/avfs/PKGBUILD b/extra/avfs/PKGBUILD
deleted file mode 100644
index 385fcc403..000000000
--- a/extra/avfs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 166454 2012-09-08 02:48:18Z eric $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: K. Piche <kpiche@rogers.com>
-
-pkgname=avfs
-pkgver=1.0.1
-pkgrel=1.1
-pkgdesc="A virtual filesystem that allows browsing of compressed files"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL' 'LGPL')
-url="http://avf.sourceforge.net/"
-depends=('fuse' 'xz' 'perl')
-options=('!emptydirs' '!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/avf/${pkgname}-${pkgver}.tar.bz2{,.asc})
-md5sums=('f0f254d092e54da14bbf3ea22b76da99'
-         'd71607de21819f3d67246473f0bc21f3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --enable-library \
-              --enable-fuse \
-              --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/avfs/avfs-1.0.0-fix_open_missing_mode.patch b/extra/avfs/avfs-1.0.0-fix_open_missing_mode.patch
deleted file mode 100644
index 1e4a0a4d8..000000000
--- a/extra/avfs/avfs-1.0.0-fix_open_missing_mode.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/modules/urar.c	2007-05-14 20:21:23.000000000 +0200
-+++ b/modules/urar.c	2009-02-09 13:48:56.780225932 +0100
-@@ -587,7 +587,7 @@
-     if(res < 0)
-         return res;
- 
--    fd = open(tmpfile, O_RDWR | O_CREAT | O_TRUNC);
-+    fd = open(tmpfile, O_RDWR | O_CREAT | O_TRUNC, 0644);
-     if(fd == -1) {
-         res = -errno; 
-         av_log(AVLOG_ERROR, "RAR: Could not open %s: %s", tmpfile,
diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD
index 8b87b1527..2334186b3 100644
--- a/extra/avidemux/PKGBUILD
+++ b/extra/avidemux/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 171262 2012-11-16 23:35:36Z ibiru $
+# $Id: PKGBUILD 178951 2013-03-01 10:19:37Z andrea $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
 pkgver=2.5.6
-pkgrel=4
+pkgrel=6
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://fixounet.free.fr/avidemux/"
-makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \
+makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \
              'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
              'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse')
 [ "$CARCH" != "mips64el" ] && makedepends+=('libva')
@@ -96,7 +96,7 @@ package_avidemux-gtk() {
 
 package_avidemux-qt() {
   pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
-  depends=("avidemux-cli=${pkgver}" 'qt')
+  depends=("avidemux-cli=${pkgver}" 'qt4')
   install=avidemux.install
 
   cd "${srcdir}/${pkgbase}_${pkgver}"
diff --git a/extra/avidemux/PKGBUILD.WIP b/extra/avidemux/PKGBUILD.WIP
index 361aa2665..c96084eb8 100644
--- a/extra/avidemux/PKGBUILD.WIP
+++ b/extra/avidemux/PKGBUILD.WIP
@@ -3,7 +3,7 @@
 
 pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
-pkgver=2.6.0
+pkgver=2.6.1
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,13 +13,13 @@ makedepends=('cmake' 'libxslt' 'gtk3' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \
              'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva' \
              'libvdpau' 'libdca' 'fribidi' 'glu')
 options=('!makeflags' '!emptydirs')
-#source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
-#sha1sums=('d886d61eab70f7b1972c0ebdeeeb7d2ba8c30cbf')
-source=(http://www.avidemux.org/nightly/source/snapshot_8273.tgz)
-sha1sums=('cf5256ce189a51898a2e1071ffd46cd993f453f2')
+source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
+sha1sums=('a34ffc6409d96c3df30394fbd221e6693ec081ec')
+#source=(http://www.avidemux.org/nightly/source/snapshot_8273.tgz)
+#sha1sums=('cf5256ce189a51898a2e1071ffd46cd993f453f2')
 
 build() {
-mv snapshot_8273 ${pkgbase}_${pkgver}
+#mv snapshot_8273 ${pkgbase}_${pkgver}
 
   cd "${srcdir}/${pkgbase}_${pkgver}"
   sed -i 's|avidemux2|avidemux3|' avidemux2.desktop
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index 39d1d61cc..9631d7030 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -1,32 +1,35 @@
-# $Id: PKGBUILD 176282 2013-01-28 16:48:15Z stephane $
+# $Id: PKGBUILD 181116 2013-03-31 19:16:38Z stephane $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Nick B <Shirakawasuna at gmail _dot_com>
 
 pkgname=avogadro
 pkgver=1.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://avogadro.openmolecules.net/wiki/Main_Page"
 license=('GPL2')
 depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
-makedepends=('cmake' 'boost' 'doxygen' 'mesa')
+makedepends=('cmake' 'boost' 'doxygen' 'mesa-libgl')
 install=avogadro.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	"avogadro-1.1.0-textrel.patch")
+        'boost153.patch')
 md5sums=('f4fbef5ffc69cc312b2316426c36a78d'
-	 '88c68540c0ccce7007e515f1b3fd03ed')
+         'aa2573f78d5dbd85b3cb79e08acde8ab')
 
 build() {
-  patch -Np0 -i ${srcdir}/avogadro-1.1.0-textrel.patch
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/boost153.patch
+  cd ../
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-    -DQT_MKSPECS_RELATIVE=share/qt/mkspecs
+    -DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
   make
 }
 
diff --git a/extra/avogadro/boost153.patch b/extra/avogadro/boost153.patch
new file mode 100644
index 000000000..fd8685974
--- /dev/null
+++ b/extra/avogadro/boost153.patch
@@ -0,0 +1,60 @@
+--- avogadro-1.1.0/libavogadro/src/pythonengine_p.h~	2013-03-29 12:46:16.306165881 +0000
++++ avogadro-1.1.0/libavogadro/src/pythonengine_p.h	2013-03-29 12:45:43.123089622 +0000
+@@ -27,7 +27,9 @@
+ 
+ #include <avogadro/global.h>
+ #include <avogadro/engine.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+ 
+ namespace Avogadro {
+ 
+--- avogadro-1.1.0/libavogadro/src/pythonextension_p.h~	2013-03-29 12:46:32.156043085 +0000
++++ avogadro-1.1.0/libavogadro/src/pythonextension_p.h	2013-03-29 12:47:07.265771087 +0000
+@@ -29,7 +29,9 @@
+ #include <avogadro/extension.h>
+ #include <avogadro/primitive.h>
+ #include <avogadro/glwidget.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+ 
+ #include <QWidget>
+ #include <QList>
+--- avogadro-1.1.0/libavogadro/src/pythontool_p.h~	2013-03-29 12:47:33.335569185 +0000
++++ avogadro-1.1.0/libavogadro/src/pythontool_p.h	2013-03-29 12:47:50.732101147 +0000
+@@ -27,7 +27,9 @@
+ 
+ #include <avogadro/global.h>
+ #include <avogadro/tool.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+ 
+ #include <QObject>
+ #include <QAction>
+--- avogadro-1.1.0/libavogadro/src/pythoninterpreter.h~	2013-03-29 12:50:46.550738652 +0000
++++ avogadro-1.1.0/libavogadro/src/pythoninterpreter.h	2013-03-29 12:51:00.853961341 +0000
+@@ -26,7 +26,9 @@
+ #define PYTHONINTERPRETER_H
+ 
+ #include <avogadro/global.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+ #include <avogadro/primitive.h>
+ #include <QString>
+ 
+--- avogadro-1.1.0/libavogadro/src/pythonscript.h~	2013-03-29 12:52:00.723488935 +0000
++++ avogadro-1.1.0/libavogadro/src/pythonscript.h	2013-03-29 12:52:11.676745364 +0000
+@@ -27,7 +27,9 @@
+ #define PYTHONSCRIPT_H
+ 
+ #include <avogadro/global.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+ 
+ #include "pythonerror.h"
+ 
diff --git a/extra/avogadro/fix-boost.patch b/extra/avogadro/fix-boost.patch
deleted file mode 100644
index 8fb53ef12..000000000
--- a/extra/avogadro/fix-boost.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt~	2011-11-29 18:33:01.777291627 +0000
-+++ avogadro-1.0.3/libavogadro/src/CMakeLists.txt	2011-11-29 18:33:23.480814612 +0000
-@@ -149,7 +149,7 @@
-   endforeach(P_ITEM ${PYTHON_SRCS})
- endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
- 
--QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
-+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
- 
- # you have to add link_directories before you add the target
- if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~	2011-11-29 18:37:15.449506548 +0000
-+++ avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2011-11-29 18:37:52.729831744 +0000
-@@ -11,7 +11,7 @@
- # use all cpp files in this directory
- FILE(GLOB wrapper_SRCS "*.cpp")
- 
--QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
-+QT4_WRAP_CPP(MOC_SRCS moleculelist.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
- 
- ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
- SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
---- avogadro-1.0.3/libavogadro/CMakeLists.txt~	2011-11-29 19:41:34.066938217 +0000
-+++ avogadro-1.0.3/libavogadro/CMakeLists.txt	2011-11-29 19:42:53.084320315 +0000
-@@ -18,7 +18,7 @@
-   # Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp
-   # We should probably scan the header to verify the Q_OBJECT macro is used
-   string(REPLACE ".cpp" ".h" hdr_list "${src_list}")
--  qt4_wrap_cpp(moc_files ${hdr_list})
-+  qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
-   # Now sort out the ui and qrc files, process them as appropriate
-   set(ui_plugin_files)
-   set(qrc_plugin_files)
diff --git a/extra/avogadro/fix-opengl-headers.patch b/extra/avogadro/fix-opengl-headers.patch
deleted file mode 100644
index e6e8bc3b5..000000000
--- a/extra/avogadro/fix-opengl-headers.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- avogadro-1.0.3/libavogadro/src/camera.cpp~	2012-02-27 18:35:52.109999585 +0000
-+++ avogadro-1.0.3/libavogadro/src/camera.cpp	2012-02-27 18:36:27.103053453 +0000
-@@ -25,6 +25,8 @@
- #include "camera.h"
- #include "glwidget.h"
- #include <avogadro/molecule.h>
-+#include <Eigen/LU>
-+#include <GL/glu.h>
- 
- using namespace Eigen;
- 
---- avogadro-1.0.3/libavogadro/src/glpainter_p.cpp~	2012-02-27 18:37:28.535894209 +0000
-+++ avogadro-1.0.3/libavogadro/src/glpainter_p.cpp	2012-02-27 18:37:46.912413557 +0000
-@@ -42,6 +42,7 @@
- #include <QColor>
- #include <QVarLengthArray>
- #include <Eigen/Geometry>
-+#include <GL/glu.h>
- 
- namespace Avogadro
- {
---- avogadro-1.0.3/libavogadro/src/glwidget.cpp~	2012-02-27 18:37:55.099014598 +0000
-+++ avogadro-1.0.3/libavogadro/src/glwidget.cpp	2012-02-27 18:38:30.805395066 +0000
-@@ -70,6 +70,8 @@
- 
- #include <openbabel/mol.h>
- 
-+#include <GL/glu.h>
-+
- using namespace OpenBabel;
- using namespace Eigen;
- 
---- avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp~	2012-02-27 18:36:53.646173944 +0000
-+++ avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp	2012-02-27 18:37:10.739370227 +0000
-@@ -36,6 +36,7 @@
- #include <QFile>
- #include <QDebug>
- #include <Eigen/Geometry>
-+#include <GL/glu.h>
- 
- namespace Avogadro
- {
---- avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp~	2012-02-27 18:38:47.491928000 +0000
-+++ avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp	2012-02-27 18:39:05.735115136 +0000
-@@ -44,6 +44,8 @@
- #include <QComboBox>
- #include <QDebug>
- 
-+#include <GL/glu.h>
-+
- using namespace std;
- using namespace OpenBabel;
- using namespace Eigen;
diff --git a/extra/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch b/extra/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
deleted file mode 100644
index 11f58a505..000000000
--- a/extra/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
+++ /dev/null
@@ -1,778 +0,0 @@
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt
---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt	2011-11-29 18:49:58.520790652 +0100
-@@ -75,6 +75,42 @@
-   zmatrix.h
- )
- 
-+SET(libavogadro_MOC_HDRS
-+  animation.h
-+  atom.h
-+  bond.h
-+  color.h
-+  colorbutton.h
-+  colors/elementcolor.h
-+  cube.h
-+  elementdetail_p.h
-+  elementtranslator.h
-+  engine.h
-+  engines/bsdyengine.h
-+  extension.h
-+  fragment.h
-+  glwidget.h
-+  mesh.h
-+  molecule.h
-+  moleculefile.h
-+  moleculefile_p.h
-+  periodictablescene_p.h
-+  periodictableview.h
-+  plotwidget.h
-+  plugin.h
-+  pluginmanager.h
-+  primitive.h
-+  protein.h
-+  pythonengine_p.h
-+  pythonerror.h
-+  pythonextension_p.h
-+  pythontool_p.h
-+  residue.h
-+  tool.h
-+  toolgroup.h
-+  zmatrix.h
-+)
-+
- set(libavogadro_SRCS ${libavogadro_SRCS} ${libavogadro_UIS})
- # Also add in the qtiocompressor class
- #set(libavogadro_SRCS ${libavogadro_SRCS} ../qtiocompressor/qtiocompressor.cpp)
-@@ -113,7 +148,7 @@
-   endforeach(P_ITEM ${PYTHON_SRCS})
- endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
- 
--qt4_automoc(${libavogadro_SRCS})
-+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
- 
- # you have to add link_directories before you add the target
- if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
-@@ -149,7 +184,7 @@
-     COMMAND ${CMAKE_COMMAND} -E ${header_cmd} "${from}" "${to}")
- endforeach(headerFile ${libavogadro_HDRS})
- 
--add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
-+add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_MOC_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
- set_target_properties(avogadro
-   PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 )
- target_link_libraries(avogadro ${AVO_LINK_LIBRARIES})
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/animation.cpp avogadro-1.0.3-edit/libavogadro/src/animation.cpp
---- avogadro-1.0.3/libavogadro/src/animation.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/animation.cpp	2011-11-29 18:48:47.967839537 +0100
-@@ -224,5 +224,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "animation.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/atom.cpp avogadro-1.0.3-edit/libavogadro/src/atom.cpp
---- avogadro-1.0.3/libavogadro/src/atom.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/atom.cpp	2011-11-29 18:48:39.561218412 +0100
-@@ -293,5 +293,3 @@
-    }
- 
-  } // End namespace Avogadro
--
--#include "atom.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/bond.cpp avogadro-1.0.3-edit/libavogadro/src/bond.cpp
---- avogadro-1.0.3/libavogadro/src/bond.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/bond.cpp	2011-11-29 18:49:00.067773985 +0100
-@@ -166,5 +166,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "bond.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/color.cpp avogadro-1.0.3-edit/libavogadro/src/color.cpp
---- avogadro-1.0.3/libavogadro/src/color.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/color.cpp	2011-11-29 18:49:05.207746140 +0100
-@@ -152,5 +152,3 @@
-     return "Generic Color";
-   }
- }
--
--#include "color.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colorbutton.cpp avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp
---- avogadro-1.0.3/libavogadro/src/colorbutton.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp	2011-11-29 18:49:11.987709410 +0100
-@@ -94,5 +94,3 @@
-   }
- 
- } // end namespace
--
--#include "colorbutton.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp
---- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp	2011-11-29 18:50:11.077389292 +0100
-@@ -63,7 +63,5 @@
- 
- }
- 
--#include "elementcolor.moc"
- //this is a static color plugin...
- //Q_EXPORT_PLUGIN2(elementcolor, Avogadro::ElementColorFactory)
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/cube.cpp avogadro-1.0.3-edit/libavogadro/src/cube.cpp
---- avogadro-1.0.3/libavogadro/src/cube.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/cube.cpp	2011-11-29 18:50:26.357306516 +0100
-@@ -322,5 +322,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "cube.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp
---- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp	2011-11-29 18:50:37.680578505 +0100
-@@ -132,5 +132,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "elementdetail_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp
---- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp	2011-11-29 18:50:48.160521729 +0100
-@@ -401,5 +401,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "elementtranslator.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engine.cpp avogadro-1.0.3-edit/libavogadro/src/engine.cpp
---- avogadro-1.0.3/libavogadro/src/engine.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/engine.cpp	2011-11-29 18:50:54.397154610 +0100
-@@ -377,5 +377,3 @@
-       return m_molecule->bonds();
-   }
- }
--
--#include "engine.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp
---- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp	2011-11-29 18:51:18.733689435 +0100
-@@ -442,7 +442,5 @@
-   }
- 
- }
--
--#include "bsdyengine.moc"
- // This is a static engine...
- // Q_EXPORT_PLUGIN2( bsdyengine, Avogadro::BSDYEngineFactory )
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/extension.cpp avogadro-1.0.3-edit/libavogadro/src/extension.cpp
---- avogadro-1.0.3/libavogadro/src/extension.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/extension.cpp	2011-11-29 18:51:56.360152261 +0100
-@@ -80,5 +80,3 @@
-   }
- 
- }
--
--#include "extension.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/fragment.cpp avogadro-1.0.3-edit/libavogadro/src/fragment.cpp
---- avogadro-1.0.3/libavogadro/src/fragment.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/fragment.cpp	2011-11-29 18:52:01.906788880 +0100
-@@ -82,5 +82,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "fragment.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/glwidget.cpp avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp
---- avogadro-1.0.3/libavogadro/src/glwidget.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp	2011-11-29 18:52:14.346721486 +0100
-@@ -1966,5 +1966,3 @@
-     d->updateCache = true;
-   }
- }
--
--#include "glwidget.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/mesh.cpp avogadro-1.0.3-edit/libavogadro/src/mesh.cpp
---- avogadro-1.0.3/libavogadro/src/mesh.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/mesh.cpp	2011-11-29 18:52:23.033341093 +0100
-@@ -231,5 +231,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "mesh.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/molecule.cpp avogadro-1.0.3-edit/libavogadro/src/molecule.cpp
---- avogadro-1.0.3/libavogadro/src/molecule.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/molecule.cpp	2011-11-29 18:52:33.573283993 +0100
-@@ -1575,5 +1575,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "molecule.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile.cpp avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp
---- avogadro-1.0.3/libavogadro/src/moleculefile.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp	2011-11-29 18:56:26.728687548 +0100
-@@ -22,23 +22,14 @@
-   02110-1301, USA.
-  **********************************************************************/
- 
--#include "moleculefile.h"
-+#include "moleculefile_p.h"
- 
- #include <avogadro/molecule.h>
- 
--#include <QFile>
- #include <QFileInfo>
--#include <QStringList>
--#include <QThread>
- #include <QDebug>
- #include <QPointer>
- 
--#include <openbabel/mol.h>
--#include <openbabel/obconversion.h>
--
--// Included in obconversion.h
--//#include <iostream>
--
- namespace Avogadro {
- 
-   using OpenBabel::OBConversion;
-@@ -578,164 +569,6 @@
-     return false;
-   }
- 
--  class ReadFileThread : public QThread
--  {
--    //    Q_OBJECT 
--
--    public:
--      ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile)
--      {
--      }
--      
--      void addConformer(const OpenBabel::OBMol &conformer)
--      {
--        unsigned int numAtoms = conformer.NumAtoms();
--        std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms);
--        for (unsigned int i = 0; i < numAtoms; ++i)
--          coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray()));
--        m_moleculeFile->m_conformers.push_back(coords);
--      }
--
--      void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol &current)
--      {
--        if (!c) {
--          // this is the first molecule read
--          m_moleculeFile->setConformerFile(true);
--          addConformer(current);
--          return;
--        }
--
--        if (!m_moleculeFile->isConformerFile())
--          return;
--
--        // as long as we are not sure if this really is a 
--        // conformer/trajectory file, add the conformers
--        addConformer(current);
--
--        // performance: check only certain molecule 1-10,20,50
--        switch (c) {
--          case 1:
--          case 2:
--          case 3:
--          case 4:
--          case 5:
--          case 6:
--          case 7:
--          case 8:
--          case 9:
--          case 10:
--          case 20:
--          case 50:
--            break;
--          default:
--            return;
--        }
--
--        if (first.NumAtoms() != current.NumAtoms()) {
--          m_moleculeFile->setConformerFile(false);
--          m_moleculeFile->m_conformers.clear();
--          return;
--        }
--
--        for (unsigned int i = 0; i < first.NumAtoms(); ++i) {
--          OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1);
--          OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1);
--          if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) {
--            m_moleculeFile->setConformerFile(false);
--            m_moleculeFile->m_conformers.clear();
--            return;
--          }    
--        }
--      }
--
--      void run()
--      {
--        // Check that the file can be read from disk
--        if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) {
--          // Cannot read the file
--          m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.")
--                                         .arg(m_moleculeFile->m_fileName));
--          return;
--        }
-- 
--        // Construct the OpenBabel objects, set the file type
--        OpenBabel::OBConversion conv;
--        OpenBabel::OBFormat *inFormat;
--        if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) {
--          // Input format not supported
--          m_moleculeFile->m_error.append(
--              QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType));
--          return;
--        } else {
--          inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data());
--          if (!inFormat || !conv.SetInFormat(inFormat)) {
--            // Input format not supported
--            m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.")
--                                           .arg(m_moleculeFile->m_fileName));
--            return;
--          }
--        }
--
--        // set any options
--        if (!m_moleculeFile->m_fileOptions.isEmpty()) {
--          foreach(const QString &option,
--              m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) {
--            conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS);
--          }
--        }
--
--        // Now attempt to read the molecule in
--        ifstream ifs;
--        ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc
--        if (!ifs) // Should not happen, already checked file could be opened
--          return;
--      
--        // read all molecules
--        OpenBabel::OBMol firstOBMol, currentOBMol;
--        unsigned int c = 0;
--        conv.SetInStream(&ifs);
--        m_moleculeFile->streamposRef().push_back(ifs.tellg());
--        while (ifs.good() && conv.Read(&currentOBMol)) {
--          if (!c)
--            firstOBMol = currentOBMol;
--
--          if (c > 20 && !m_moleculeFile->isConformerFile())
--            m_moleculeFile->setFirstReady(true);
--
--          // detect conformer/trajectory files
--          detectConformers(c, firstOBMol, currentOBMol);
--          // store information about molecule
--          m_moleculeFile->streamposRef().push_back(ifs.tellg());
--          m_moleculeFile->titlesRef().append(currentOBMol.GetTitle());
--          // increment count
--          ++c;
--        }
--        m_moleculeFile->streamposRef().pop_back();
--
--        // signle molecule files are not conformer files
--        if (c == 1) {
--          m_moleculeFile->setConformerFile(false);
--          m_moleculeFile->m_conformers.clear();
--        }
--
--        // check for empty titles
--        for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) {
--          if (!m_moleculeFile->titlesRef()[i].isEmpty())
--            continue;
--
--          QString title;
--          if (m_moleculeFile->isConformerFile())
--            title = tr("Conformer %1").arg(i+1);
--          else
--            title = tr("Molecule %1").arg(i+1);
--        
--          m_moleculeFile->titlesRef()[i] = title;
--        }
--      }
--
--      MoleculeFile *m_moleculeFile;
--  }; // end ReadFileThread class
--
-   MoleculeFile* MoleculeFile::readFile(const QString &fileName,
-       const QString &fileType, const QString &fileOptions, bool wait)
-   {
-@@ -794,6 +627,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "moleculefile.moc"
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile_p.h avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h
---- avogadro-1.0.3/libavogadro/src/moleculefile_p.h	1970-01-01 01:00:00.000000000 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h	2011-11-29 18:57:43.108273764 +0100
-@@ -0,0 +1,202 @@
-+/**********************************************************************
-+  MoleculeFile - Class representing molecule file.
-+
-+  Copyright (C) 2009 Marcus Hanwell, Tim Vandermeersch
-+
-+  This file is part of the Avogadro molecular editor project.
-+  For more information, see <http://avogadro.openmolecules.net/>
-+
-+  Avogadro is free software; you can redistribute it and/or modify
-+  it under the terms of the GNU General Public License as published by
-+  the Free Software Foundation; either version 2 of the License, or
-+  (at your option) any later version.
-+
-+  Avogadro is distributed in the hope that it will be useful,
-+  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+  GNU General Public License for more details.
-+
-+  You should have received a copy of the GNU General Public License
-+  along with this program; if not, write to the Free Software
-+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+  02110-1301, USA.
-+ **********************************************************************/
-+
-+#ifndef MOLECULEFILE_P_H
-+#define MOLECULEFILE_P_H
-+
-+#include "moleculefile.h"
-+
-+#include <openbabel/mol.h>
-+#include <openbabel/obconversion.h>
-+
-+#include <QFile>
-+#include <QStringList>
-+#include <QThread>
-+
-+namespace Avogadro {
-+
-+  using OpenBabel::OBConversion;
-+  using std::ifstream;
-+
-+class ReadFileThread : public QThread
-+{
-+      Q_OBJECT
-+
-+  public:
-+    ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile)
-+    {
-+    }
-+
-+    void addConformer(const OpenBabel::OBMol &conformer)
-+    {
-+      unsigned int numAtoms = conformer.NumAtoms();
-+      std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms);
-+      for (unsigned int i = 0; i < numAtoms; ++i)
-+        coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray()));
-+      m_moleculeFile->m_conformers.push_back(coords);
-+    }
-+
-+    void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol &current)
-+    {
-+      if (!c) {
-+        // this is the first molecule read
-+        m_moleculeFile->setConformerFile(true);
-+        addConformer(current);
-+        return;
-+      }
-+
-+      if (!m_moleculeFile->isConformerFile())
-+        return;
-+
-+      // as long as we are not sure if this really is a
-+      // conformer/trajectory file, add the conformers
-+      addConformer(current);
-+
-+      // performance: check only certain molecule 1-10,20,50
-+      switch (c) {
-+        case 1:
-+        case 2:
-+        case 3:
-+        case 4:
-+        case 5:
-+        case 6:
-+        case 7:
-+        case 8:
-+        case 9:
-+        case 10:
-+        case 20:
-+        case 50:
-+          break;
-+        default:
-+          return;
-+      }
-+
-+      if (first.NumAtoms() != current.NumAtoms()) {
-+        m_moleculeFile->setConformerFile(false);
-+        m_moleculeFile->m_conformers.clear();
-+        return;
-+      }
-+
-+      for (unsigned int i = 0; i < first.NumAtoms(); ++i) {
-+        OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1);
-+        OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1);
-+        if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) {
-+          m_moleculeFile->setConformerFile(false);
-+          m_moleculeFile->m_conformers.clear();
-+          return;
-+        }
-+      }
-+    }
-+
-+    void run()
-+    {
-+      // Check that the file can be read from disk
-+      if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) {
-+        // Cannot read the file
-+        m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.")
-+                                       .arg(m_moleculeFile->m_fileName));
-+        return;
-+      }
-+
-+      // Construct the OpenBabel objects, set the file type
-+      OpenBabel::OBConversion conv;
-+      OpenBabel::OBFormat *inFormat;
-+      if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) {
-+        // Input format not supported
-+        m_moleculeFile->m_error.append(
-+            QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType));
-+        return;
-+      } else {
-+        inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data());
-+        if (!inFormat || !conv.SetInFormat(inFormat)) {
-+          // Input format not supported
-+          m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.")
-+                                         .arg(m_moleculeFile->m_fileName));
-+          return;
-+        }
-+      }
-+
-+      // set any options
-+      if (!m_moleculeFile->m_fileOptions.isEmpty()) {
-+        foreach(const QString &option,
-+            m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) {
-+          conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS);
-+        }
-+      }
-+
-+      // Now attempt to read the molecule in
-+      ifstream ifs;
-+      ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc
-+      if (!ifs) // Should not happen, already checked file could be opened
-+        return;
-+
-+      // read all molecules
-+      OpenBabel::OBMol firstOBMol, currentOBMol;
-+      unsigned int c = 0;
-+      conv.SetInStream(&ifs);
-+      m_moleculeFile->streamposRef().push_back(ifs.tellg());
-+      while (ifs.good() && conv.Read(&currentOBMol)) {
-+        if (!c)
-+          firstOBMol = currentOBMol;
-+
-+        if (c > 20 && !m_moleculeFile->isConformerFile())
-+          m_moleculeFile->setFirstReady(true);
-+
-+        // detect conformer/trajectory files
-+        detectConformers(c, firstOBMol, currentOBMol);
-+        // store information about molecule
-+        m_moleculeFile->streamposRef().push_back(ifs.tellg());
-+        m_moleculeFile->titlesRef().append(currentOBMol.GetTitle());
-+        // increment count
-+        ++c;
-+      }
-+      m_moleculeFile->streamposRef().pop_back();
-+
-+      // signle molecule files are not conformer files
-+      if (c == 1) {
-+        m_moleculeFile->setConformerFile(false);
-+        m_moleculeFile->m_conformers.clear();
-+      }
-+
-+      // check for empty titles
-+      for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) {
-+        if (!m_moleculeFile->titlesRef()[i].isEmpty())
-+          continue;
-+
-+        QString title;
-+        if (m_moleculeFile->isConformerFile())
-+          title = tr("Conformer %1").arg(i+1);
-+        else
-+          title = tr("Molecule %1").arg(i+1);
-+
-+        m_moleculeFile->titlesRef()[i] = title;
-+      }
-+    }
-+
-+    MoleculeFile *m_moleculeFile;
-+};
-+
-+} // end namespace Avogadro
-+
-+#endif // MOLECULEFILE_P_H
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp
---- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp	2011-11-29 18:52:50.259860261 +0100
-@@ -213,5 +213,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "periodictablescene_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictableview.cpp avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp
---- avogadro-1.0.3/libavogadro/src/periodictableview.cpp     2011-11-29 19:30:25.130970122 +0000
-+++ avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp        2011-11-29 18:52:50.259860261 +0100
-@@ -69,4 +69,3 @@
- 
- } // End namespace Avogadro
- 
--#include "periodictableview.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plotwidget.cpp avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp
---- avogadro-1.0.3/libavogadro/src/plotwidget.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp	2011-11-29 18:53:09.389756626 +0100
-@@ -27,7 +27,6 @@
-  **********************************************************************/
- 
- #include "plotwidget.h"
--#include "plotwidget.moc"
- 
- #include <math.h>
- #include <QDebug>
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plugin.cpp avogadro-1.0.3-edit/libavogadro/src/plugin.cpp
---- avogadro-1.0.3/libavogadro/src/plugin.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/plugin.cpp	2011-11-29 18:53:16.016387394 +0100
-@@ -65,5 +65,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "plugin.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp
---- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp	2011-11-29 18:53:23.569679807 +0100
-@@ -784,5 +784,3 @@
-   }
- 
- }
--
--#include "pluginmanager.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/primitive.cpp avogadro-1.0.3-edit/libavogadro/src/primitive.cpp
---- avogadro-1.0.3/libavogadro/src/primitive.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/primitive.cpp	2011-11-29 18:53:29.139649631 +0100
-@@ -77,5 +77,3 @@
-   }
- 
- }
--
--#include "primitive.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/protein.cpp avogadro-1.0.3-edit/libavogadro/src/protein.cpp
---- avogadro-1.0.3/libavogadro/src/protein.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/protein.cpp	2011-11-29 18:53:37.952935219 +0100
-@@ -978,5 +978,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "protein.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt
---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt	2011-11-29 18:58:02.354836165 +0100
-@@ -11,9 +11,9 @@
- # use all cpp files in this directory
- FILE(GLOB wrapper_SRCS "*.cpp")
- 
--qt4_automoc(moleculelist.cpp)
-+QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
- 
--ADD_LIBRARY(python-module MODULE ${wrapper_SRCS})
-+ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
- SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
- SET_TARGET_PROPERTIES(python-module PROPERTIES PREFIX "")
- if (WIN32)
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp
---- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp     2011-11-29 19:26:07.562214311 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp      2011-11-29 19:26:14.538843182 +0100
-@@ -70,4 +70,3 @@
- 
- }
- 
--#include "moleculelist.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp	2011-11-29 18:53:45.492894371 +0100
-@@ -289,5 +289,3 @@
- 
- 
- }
--
--#include "pythonengine_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonerror.cpp avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp
---- avogadro-1.0.3/libavogadro/src/pythonerror.cpp     2011-11-29 19:24:26.949426045 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp      2011-11-29 19:24:41.176015640 +0100
-@@ -112,4 +112,3 @@
- 
- } // namespace
- 
--#include "pythonerror.moc"
-
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp	2011-11-29 18:53:54.082847836 +0100
-@@ -340,5 +340,3 @@
-   }
- 
- }
--
--#include "pythonextension_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp	2011-11-29 18:54:02.269470152 +0100
-@@ -344,5 +344,3 @@
-   }
- 
- }
--
--#include "pythontool_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/residue.cpp avogadro-1.0.3-edit/libavogadro/src/residue.cpp
---- avogadro-1.0.3/libavogadro/src/residue.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/residue.cpp	2011-11-29 18:54:14.316071557 +0100
-@@ -160,6 +160,3 @@
-   }
- 
- } // End namespace Avogadro
--
-- #include "residue.moc"
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/tool.cpp avogadro-1.0.3-edit/libavogadro/src/tool.cpp
---- avogadro-1.0.3/libavogadro/src/tool.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/tool.cpp	2011-11-29 18:55:05.515794184 +0100
-@@ -117,5 +117,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "tool.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/toolgroup.cpp avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp
---- avogadro-1.0.3/libavogadro/src/toolgroup.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp	2011-11-29 18:55:11.699094018 +0100
-@@ -206,5 +206,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "toolgroup.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/zmatrix.cpp avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp
---- avogadro-1.0.3/libavogadro/src/zmatrix.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp	2011-11-29 18:55:17.209064168 +0100
-@@ -149,5 +149,3 @@
- 
- 
- } // End namespace Avogadro
--
--#include "zmatrix.moc"
diff --git a/extra/babl/PKGBUILD b/extra/babl/PKGBUILD
index 99db414f3..35fc6d398 100644
--- a/extra/babl/PKGBUILD
+++ b/extra/babl/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=babl
 pkgver=0.1.10
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Dynamic, any to any, pixel format conversion library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gegl.org/babl/"
diff --git a/extra/banshee/banshee-recent-gpod.patch b/extra/banshee/banshee-recent-gpod.patch
deleted file mode 100644
index afb3a0fd1..000000000
--- a/extra/banshee/banshee-recent-gpod.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d4cd959c4a48ffc9da8fe0983bd31c4647669bf4 Mon Sep 17 00:00:00 2001
-From: William Witt <william@witt-family.net>
-Date: Sat, 30 Jul 2011 21:54:41 -0500
-Subject: [PATCH] - Changed typecast on FileSize to uint in AppleDeviceTrackInfo to comply with libgpod-sharp
-
----
- .../AppleDeviceTrackInfo.cs                        |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-index 178266d..b8549f7 100644
---- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-+++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-@@ -215,7 +215,7 @@ namespace Banshee.Dap.AppleDevice
-             track.CDs = DiscCount;
-             track.CDNumber = DiscNumber;
-             track.TrackLength = (int) Duration.TotalMilliseconds;
--            track.Size = (int)FileSize;
-+            track.Size = (uint)FileSize;
-             track.Grouping = Grouping;
-             try {
-                 track.TimePlayed = LastPlayed;
--- 
-1.7.3.4
diff --git a/extra/banshee/gst-1.0.patch b/extra/banshee/gst-1.0.patch
deleted file mode 100644
index f8fa7a7c2..000000000
--- a/extra/banshee/gst-1.0.patch
+++ /dev/null
@@ -1,1025 +0,0 @@
-From ec14625f10c26ae3646f382ffd804ee28c3d7334 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
-Date: Wed, 19 Sep 2012 11:34:06 +0200
-Subject: [PATCH] Initial port to GStreamer 1.0
-
----
- build/m4/banshee/gstreamer.m4                |   19 +++---
- data/audio-profiles/wav.xml.in               |    5 +-
- libbanshee/banshee-bpmdetector.c             |   11 ++--
- libbanshee/banshee-gst.h                     |    4 +-
- libbanshee/banshee-player-cdda.c             |    5 +-
- libbanshee/banshee-player-dvd.c              |    4 +-
- libbanshee/banshee-player-equalizer.c        |    4 +-
- libbanshee/banshee-player-missing-elements.c |    2 +-
- libbanshee/banshee-player-pipeline.c         |   37 ++++++-----
- libbanshee/banshee-player-private.h          |   13 ++--
- libbanshee/banshee-player-replaygain.c       |   29 ++++-----
- libbanshee/banshee-player-video.c            |   89 +++++++++++++-------------
- libbanshee/banshee-player-vis.c              |   88 ++++++++-----------------
- libbanshee/banshee-player.c                  |   11 ++--
- libbanshee/banshee-ripper.c                  |   16 ++---
- libbanshee/banshee-tagger.c                  |    2 +-
- libbanshee/banshee-transcoder.c              |   19 +++---
- 17 files changed, 156 insertions(+), 202 deletions(-)
-
-diff --git a/build/m4/banshee/gstreamer.m4 b/build/m4/banshee/gstreamer.m4
-index 6267cce..917cf58 100644
---- a/build/m4/banshee/gstreamer.m4
-+++ b/build/m4/banshee/gstreamer.m4
-@@ -1,17 +1,18 @@
- AC_DEFUN([BANSHEE_CHECK_GSTREAMER],
- [
--	GSTREAMER_REQUIRED_VERSION=0.10.26
-+	GSTREAMER_REQUIRED_VERSION=0.11.99
- 	AC_SUBST(GSTREAMER_REQUIRED_VERSION)
- 
- 	PKG_CHECK_MODULES(GST,
--		gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-base-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-plugins-base-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-controller-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-dataprotocol-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-fft-0.10 >= $GSTREAMER_REQUIRED_VERSION)
--
--	GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10 -lgsttag-0.10"
-+		gstreamer-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-base-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-controller-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-audio-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-fft-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-pbutils-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-tag-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-video-1.0 >= $GSTREAMER_REQUIRED_VERSION)
- 
- 	AC_SUBST(GST_CFLAGS)
- 	AC_SUBST(GST_LIBS)
-diff --git a/data/audio-profiles/wav.xml.in b/data/audio-profiles/wav.xml.in
-index 35cd1d2..6dc1bab 100644
---- a/data/audio-profiles/wav.xml.in
-+++ b/data/audio-profiles/wav.xml.in
-@@ -14,10 +14,7 @@
-                 "audioresample"
-                 "audioconvert" 
-                 (+ "audio/x-raw-int, "
--                   "endianness=(int)1234, "
--                   "width=(int)16, "
--                   "depth=(int)16, "
--                   "signed=(boolean)true, "
-+                   "format=(string)S16LE, "
-                    "rate=(int)44100, "
-                    "channels=(int)2" )
-                 "wavenc")
-diff --git a/libbanshee/banshee-bpmdetector.c b/libbanshee/banshee-bpmdetector.c
-index c06ffcb..68b0419 100644
---- a/libbanshee/banshee-bpmdetector.c
-+++ b/libbanshee/banshee-bpmdetector.c
-@@ -30,6 +30,7 @@
- #  include "config.h"
- #endif
- 
-+#include <stdio.h>
- #include <string.h>
- #include <glib/gi18n.h>
- 
-@@ -50,7 +51,7 @@ struct BansheeBpmDetector {
- 
-     /*
-      * You can run this pipeline on the cmd line with:
--     * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin2 ! \
-+     * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin ! \
-      *    audioconvert ! bpmdetect ! fakesink
-      */
- 
-@@ -168,14 +169,14 @@ bbd_new_decoded_pad(GstElement *decodebin, GstPad *pad,
- 
-     g_return_if_fail(detector != NULL);
- 
--    audiopad = gst_element_get_pad(detector->audioconvert, "sink");
-+    audiopad = gst_element_get_static_pad(detector->audioconvert, "sink");
-     
-     if(GST_PAD_IS_LINKED(audiopad)) {
-         g_object_unref(audiopad);
-         return;
-     }
- 
--    caps = gst_pad_get_caps(pad);
-+    caps = gst_pad_query_caps(pad, NULL);
-     str = gst_caps_get_structure(caps, 0);
-     
-     if(!g_strrstr(gst_structure_get_name(str), "audio")) {
-@@ -209,9 +210,9 @@ bbd_pipeline_construct (BansheeBpmDetector *detector)
-         return FALSE;
-     }
-   
--    detector->decodebin = gst_element_factory_make ("decodebin2", "decodebin2");
-+    detector->decodebin = gst_element_factory_make ("decodebin", "decodebin");
-     if (detector->decodebin == NULL) {
--        bbd_raise_error (detector, _("Could not create decodebin2 plugin"), NULL);
-+        bbd_raise_error (detector, _("Could not create decodebin plugin"), NULL);
-         return FALSE;
-     }
- 
-diff --git a/libbanshee/banshee-gst.h b/libbanshee/banshee-gst.h
-index 85662cf..332f356 100644
---- a/libbanshee/banshee-gst.h
-+++ b/libbanshee/banshee-gst.h
-@@ -41,9 +41,11 @@
- #define BANSHEE_GST_ITERATOR_ITERATE(iter,child_type,child_name,free,block) { \
-     gboolean iter##_done = FALSE; \
-     while (!iter##_done) { \
-+        GValue child_value = {0, }; \
-         child_type child_name; \
--        switch (gst_iterator_next (iter, (gpointer)&child_name)) { \
-+        switch (gst_iterator_next (iter, &child_value)) { \
-             case GST_ITERATOR_OK: { \
-+                child_name = (child_type) g_value_get_object(&child_value); \
-                 { block; } \
-                 break; \
-             } \
-diff --git a/libbanshee/banshee-player-cdda.c b/libbanshee/banshee-player-cdda.c
-index 8be2bdd..401edf0 100644
---- a/libbanshee/banshee-player-cdda.c
-+++ b/libbanshee/banshee-player-cdda.c
-@@ -28,7 +28,8 @@
- // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- //
- 
--#include <gst/cdda/gstcddabasesrc.h>
-+#include <stdlib.h>
-+#include <gst/audio/gstaudiocdsrc.h>
- #include "banshee-player-cdda.h"
- 
- // ---------------------------------------------------------------------------
-@@ -46,7 +47,7 @@ bp_cdda_get_cdda_source (GstElement *playbin)
-     
-     g_object_get (playbin, "source", &source, NULL);
-     
--    if (source == NULL || !GST_IS_CDDA_BASE_SRC (source)) {
-+    if (source == NULL || !GST_IS_AUDIO_CD_SRC (source)) {
-         if (source != NULL) {
-             g_object_unref (source);
-         }
-diff --git a/libbanshee/banshee-player-dvd.c b/libbanshee/banshee-player-dvd.c
-index 55d499c..991b506 100644
---- a/libbanshee/banshee-player-dvd.c
-+++ b/libbanshee/banshee-player-dvd.c
-@@ -296,7 +296,7 @@ bp_dvd_go_to_next_chapter (BansheePlayer *player)
- {
-     gint64 index;
-     GstFormat format = gst_format_get_by_nick ("chapter");
--    gst_element_query_position (player->playbin, &format, &index);
-+    gst_element_query_position (player->playbin, format, &index);
-     gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH,
-         GST_SEEK_TYPE_SET, index + 1, GST_SEEK_TYPE_NONE, 0);
- }
-@@ -306,7 +306,7 @@ bp_dvd_go_to_previous_chapter (BansheePlayer *player)
- {
-     gint64 index;
-     GstFormat format = gst_format_get_by_nick ("chapter");
--    gst_element_query_position (player->playbin, &format, &index);
-+    gst_element_query_position (player->playbin, format, &index);
-     gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH,
-         GST_SEEK_TYPE_SET, index - 1, GST_SEEK_TYPE_NONE, 0);
- }
-diff --git a/libbanshee/banshee-player-equalizer.c b/libbanshee/banshee-player-equalizer.c
-index a496ada..0cbb3b7 100644
---- a/libbanshee/banshee-player-equalizer.c
-+++ b/libbanshee/banshee-player-equalizer.c
-@@ -122,7 +122,7 @@ bp_equalizer_set_gain (BansheePlayer *player, guint bandnum, gdouble gain)
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
-     
-     if (player->equalizer != NULL) {
--        GstObject *band;
-+        GObject *band;
- 
-         g_return_if_fail (bandnum < gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer)));
- 
-@@ -188,7 +188,7 @@ bp_equalizer_get_frequencies (BansheePlayer *player, gdouble **freq)
-     count = gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer));
-     
-     for (i = 0; i < count; i++) {
--        GstObject *band;
-+        GObject *band;
-         
-         band = gst_child_proxy_get_child_by_index (GST_CHILD_PROXY (player->equalizer), i);
-         g_object_get (G_OBJECT (band), "freq", &(*freq)[i], NULL);
-diff --git a/libbanshee/banshee-player-missing-elements.c b/libbanshee/banshee-player-missing-elements.c
-index 20804c4..30118c5 100644
---- a/libbanshee/banshee-player-missing-elements.c
-+++ b/libbanshee/banshee-player-missing-elements.c
-@@ -170,7 +170,7 @@ _bp_missing_elements_handle_state_changed (BansheePlayer *player, GstState old,
-     }
-     #endif
-     
--    install_return = gst_install_plugins_async (details, player->install_plugins_context, 
-+    install_return = gst_install_plugins_async ((const gchar * const*) details, player->install_plugins_context, 
-         bp_missing_elements_handle_install_result, player);
-     
-     if (install_return != GST_INSTALL_PLUGINS_STARTED_OK) {
-diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c
-index ed845f3..6c2af35 100644
---- a/libbanshee/banshee-player-pipeline.c
-+++ b/libbanshee/banshee-player-pipeline.c
-@@ -76,7 +76,7 @@ playbin_stream_changed_cb (GstElement * element, BansheePlayer *player)
-     GstMessage *msg;
- 
-     // We're being called from the streaming thread, so don't do anything here
--    msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new ("stream-changed", NULL));
-+    msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new_empty ("stream-changed"));
-     gst_element_post_message (player->playbin, msg);
- }
- 
-@@ -218,6 +218,11 @@ bp_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer userdata)
-             break;
-         }
- 
-+        case GST_MESSAGE_STREAM_START: {
-+            bp_next_track_starting (player);
-+            break;
-+        }
-+
-         case GST_MESSAGE_APPLICATION: {
-             const gchar * name;
-             const GstStructure * s = gst_message_get_structure (message);
-@@ -289,11 +294,11 @@ _bp_pipeline_construct (BansheePlayer *player)
-     
-     // Playbin is the core element that handles autoplugging (finding the right
-     // source and decoder elements) based on source URI and stream content
--    player->playbin = gst_element_factory_make ("playbin2", "playbin");
-+    player->playbin = gst_element_factory_make ("playbin", "playbin");
- 
- #ifdef ENABLE_GAPLESS
-     // FIXME: Connect a proxy about-to-finish callback that will generate a next-track-starting callback.
--    // This can be removed once playbin2 generates its own next-track signal.
-+    // This can be removed once playbin generates its own next-track signal.
-     // bgo#584987 - this is included in >= 0.10.26
-     g_signal_connect (player->playbin, "about-to-finish", G_CALLBACK (bp_about_to_finish_callback), player);
- #endif //ENABLE_GAPLESS
-@@ -305,18 +310,13 @@ _bp_pipeline_construct (BansheePlayer *player)
-     g_signal_connect (player->playbin, "audio-changed", G_CALLBACK (playbin_stream_changed_cb), player);
-     g_signal_connect (player->playbin, "text-changed", G_CALLBACK (playbin_stream_changed_cb), player);
- 
--    // Try to find an audio sink, prefer gconf, which typically is set to auto these days,
--    // fall back on auto, which should work on windows, and as a last ditch, try alsa
--    audiosink = gst_element_factory_make ("gconfaudiosink", "audiosink");
--    if (audiosink == NULL) {
--        audiosink = gst_element_factory_make ("directsoundsink", "audiosink");
--        if (audiosink != NULL) {
--            g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL);
--        } else {
--            audiosink = gst_element_factory_make ("autoaudiosink", "audiosink");
--            if (audiosink == NULL) {
--                audiosink = gst_element_factory_make ("alsasink", "audiosink");
--            }
-+    audiosink = gst_element_factory_make ("directsoundsink", "audiosink");
-+    if (audiosink != NULL) {
-+        g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL);
-+    } else {
-+        audiosink = gst_element_factory_make ("autoaudiosink", "audiosink");
-+        if (audiosink == NULL) {
-+            audiosink = gst_element_factory_make ("alsasink", "audiosink");
-         }
-     }
-     
-@@ -341,7 +341,6 @@ _bp_pipeline_construct (BansheePlayer *player)
-         GstIterator *elem_iter = gst_bin_iterate_recurse (GST_BIN (audiosink));
-         BANSHEE_GST_ITERATOR_ITERATE (elem_iter, GstElement *, element, TRUE, {
-             player->audiosink_has_volume |= g_object_class_find_property (G_OBJECT_GET_CLASS (element), "volume") != NULL;
--            gst_object_unref (element);
-         });
-     }
-     bp_debug ("Audiosink has volume: %s",
-@@ -383,7 +382,7 @@ _bp_pipeline_construct (BansheePlayer *player)
-     }
-    
-     // Ghost pad the audio bin so audio is passed from the bin into the tee
--    teepad = gst_element_get_pad (player->audiotee, "sink");
-+    teepad = gst_element_get_static_pad (player->audiotee, "sink");
-     gst_element_add_pad (player->audiobin, gst_ghost_pad_new ("sink", teepad));
-     gst_object_unref (teepad);
- 
-@@ -411,8 +410,8 @@ _bp_pipeline_construct (BansheePlayer *player)
-     gst_bus_add_watch (bus, bp_pipeline_bus_callback, player);
- 
-     // Link the first tee pad to the primary audio sink queue
--    GstPad *sinkpad = gst_element_get_pad (audiosinkqueue, "sink");
--    pad = gst_element_get_request_pad (player->audiotee, "src%d");
-+    GstPad *sinkpad = gst_element_get_static_pad (audiosinkqueue, "sink");
-+    pad = gst_element_get_request_pad (player->audiotee, "src_%u");
-     g_object_set(player->audiotee, "alloc-pad", pad, NULL);
-     gst_pad_link (pad, sinkpad);
-     gst_object_unref (GST_OBJECT (pad));
-diff --git a/libbanshee/banshee-player-private.h b/libbanshee/banshee-player-private.h
-index 9fed356..9346911 100644
---- a/libbanshee/banshee-player-private.h
-+++ b/libbanshee/banshee-player-private.h
-@@ -42,14 +42,14 @@
- #include <gst/fft/gstfftf32.h>
- #include <gst/pbutils/pbutils.h>
- #include <gst/tag/tag.h>
--#include <gst/interfaces/navigation.h>
-+#include <gst/video/navigation.h>
- 
- #if defined(GDK_WINDOWING_X11)
- #  include <gdk/gdkx.h>
--#  include <gst/interfaces/xoverlay.h>
-+#  include <gst/video/videooverlay.h>
- #elif defined(GDK_WINDOWING_WIN32)
- #  include <gdk/gdkwin32.h>
--#  include <gst/interfaces/xoverlay.h>
-+#  include <gst/video/videooverlay.h>
- #endif
- 
- #include "banshee-gst.h"
-@@ -155,11 +155,11 @@ struct BansheePlayer {
-     // Video State
-     BpVideoDisplayContextType video_display_context_type;
-     #if defined(GDK_WINDOWING_X11)
--    GstXOverlay *xoverlay;
-+    GstVideoOverlay *video_overlay;
-     GdkWindow *video_window;
-     XID video_window_xid;
-     #elif defined(GDK_WINDOWING_WIN32)
--    GstXOverlay *xoverlay;
-+    GstVideoOverlay *video_overlay;
-     GdkWindow *video_window;
-     HWND video_window_xid;
-     #endif
-@@ -179,6 +179,8 @@ struct BansheePlayer {
-     GstFFTF32 *vis_fft;
-     GstFFTF32Complex *vis_fft_buffer;
-     gfloat *vis_fft_sample_buffer;
-+    GstPad *vis_event_probe_pad;
-+    gulong vis_event_probe_id;
-     
-     // Plugin Installer State
-     GdkWindow *window;
-@@ -197,6 +199,7 @@ struct BansheePlayer {
-     // http://replaygain.hydrogenaudio.org/player_scale.html
-     gdouble rg_gain_history[10];
-     gint history_size;
-+    gulong rg_pad_block_id;
- 
-     //dvd navigation
-     GstNavigation *navigation;
-diff --git a/libbanshee/banshee-player-replaygain.c b/libbanshee/banshee-player-replaygain.c
-index a479d4a..e42b197 100644
---- a/libbanshee/banshee-player-replaygain.c
-+++ b/libbanshee/banshee-player-replaygain.c
-@@ -79,17 +79,13 @@ static void on_target_gain_changed (GstElement *rgvolume, GParamSpec *pspec, Ban
-     _bp_rgvolume_print_volume (player);
- }
- 
--static void
--pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data)
-+static GstPadProbeReturn
-+pad_block_cb (GstPad *srcPad, GstPadProbeInfo *info, gpointer user_data)
- {
-     BansheePlayer* player;
- 
--    if (!blocked) {
--        return;
--    }
--
-     player = (BansheePlayer*) user_data;
--    g_return_if_fail (IS_BANSHEE_PLAYER (player));
-+    g_return_val_if_fail (IS_BANSHEE_PLAYER (player), GST_PAD_PROBE_OK);
- 
-     // The pad_block_cb can get triggered multiple times, on different threads.
-     // Lock around the link/unlink code, so we don't end up going through here
-@@ -99,11 +95,9 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data)
-     if ((player->replaygain_enabled && player->rgvolume_in_pipeline) ||
-         (!player->replaygain_enabled && !player->rgvolume_in_pipeline)) {
-         // The pipeline is already in the correct state.  Unblock the pad, and return.
-+        player->rg_pad_block_id = 0;
-         g_mutex_unlock (player->replaygain_mutex);
--        if (gst_pad_is_blocked (srcPad)) {
--            gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player);
--        }
--        return;
-+        return GST_PAD_PROBE_REMOVE;
-     }
- 
-     if (player->rgvolume_in_pipeline) {
-@@ -139,13 +133,12 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data)
-     }
- 
-     // Our state is now consistent
-+    player->rg_pad_block_id = 0;
-     g_mutex_unlock (player->replaygain_mutex);
- 
--    if (gst_pad_is_blocked (srcPad)) {
--        gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player);
--    }
--
-     _bp_rgvolume_print_volume (player);
-+
-+    return GST_PAD_PROBE_REMOVE;
- }
- 
- // ---------------------------------------------------------------------------
-@@ -187,9 +180,9 @@ void _bp_replaygain_pipeline_rebuild (BansheePlayer* player)
-     srcPad = gst_element_get_static_pad (player->before_rgvolume, "src");
- 
-     if (gst_pad_is_active (srcPad) && !gst_pad_is_blocked (srcPad)) {
--        gst_pad_set_blocked_async (srcPad, TRUE, &pad_block_cb, player);
--    } else if (srcPad->block_callback == NULL) {
--        pad_block_cb (srcPad, TRUE, player);
-+        player->rg_pad_block_id = gst_pad_add_probe (srcPad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM, &pad_block_cb, player, NULL);
-+    } else if (!player->rg_pad_block_id) {
-+        pad_block_cb (srcPad, NULL, player);
-     }
- }
- 
-diff --git a/libbanshee/banshee-player-video.c b/libbanshee/banshee-player-video.c
-index b901354..eb95c3f 100644
---- a/libbanshee/banshee-player-video.c
-+++ b/libbanshee/banshee-player-video.c
-@@ -37,54 +37,54 @@
- #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32)
- 
- static gboolean
--bp_video_find_xoverlay (BansheePlayer *player)
-+bp_video_find_video_overlay (BansheePlayer *player)
- {
-     GstElement *video_sink = NULL;
--    GstElement *xoverlay;
--    GstXOverlay *previous_xoverlay;
--    gboolean    found_xoverlay;
-+    GstElement *video_overlay;
-+    GstVideoOverlay *previous_video_overlay;
-+    gboolean    found_video_overlay;
- 
-     g_object_get (player->playbin, "video-sink", &video_sink, NULL);
- 
-     g_mutex_lock (player->video_mutex);
--    previous_xoverlay = player->xoverlay;
-+    previous_video_overlay = player->video_overlay;
- 
-     if (video_sink == NULL) {
--        player->xoverlay = NULL;
--        if (previous_xoverlay != NULL) {
--            gst_object_unref (previous_xoverlay);
-+        player->video_overlay = NULL;
-+        if (previous_video_overlay != NULL) {
-+            gst_object_unref (previous_video_overlay);
-         }
-         g_mutex_unlock (player->video_mutex);
-         return FALSE;
-     }
-    
--    xoverlay = GST_IS_BIN (video_sink)
--        ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_X_OVERLAY)
-+    video_overlay = GST_IS_BIN (video_sink)
-+        ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_VIDEO_OVERLAY)
-         : video_sink;
-     
--    player->xoverlay = GST_IS_X_OVERLAY (xoverlay) ? GST_X_OVERLAY (xoverlay) : NULL;
-+    player->video_overlay = GST_IS_VIDEO_OVERLAY (video_overlay) ? GST_VIDEO_OVERLAY (video_overlay) : NULL;
-     
--    if (previous_xoverlay != NULL) {
--        gst_object_unref (previous_xoverlay);
-+    if (previous_video_overlay != NULL) {
-+        gst_object_unref (previous_video_overlay);
-     }
-         
- #if !defined(GDK_WINDOWING_WIN32) // We can't rely on aspect ratio from dshowvideosink
--    if (player->xoverlay != NULL && g_object_class_find_property (
--        G_OBJECT_GET_CLASS (player->xoverlay), "force-aspect-ratio")) {
--        g_object_set (G_OBJECT (player->xoverlay), "force-aspect-ratio", TRUE, NULL);
-+    if (player->video_overlay != NULL && g_object_class_find_property (
-+        G_OBJECT_GET_CLASS (player->video_overlay), "force-aspect-ratio")) {
-+        g_object_set (G_OBJECT (player->video_overlay), "force-aspect-ratio", TRUE, NULL);
-     }
- #endif
-     
--    if (player->xoverlay != NULL && g_object_class_find_property (
--        G_OBJECT_GET_CLASS (player->xoverlay), "handle-events")) {
--        g_object_set (G_OBJECT (player->xoverlay), "handle-events", FALSE, NULL);
-+    if (player->video_overlay != NULL && g_object_class_find_property (
-+        G_OBJECT_GET_CLASS (player->video_overlay), "handle-events")) {
-+        g_object_set (G_OBJECT (player->video_overlay), "handle-events", FALSE, NULL);
-     }
- 
-     gst_object_unref (video_sink);
--    found_xoverlay = (player->xoverlay != NULL) ? TRUE : FALSE;
-+    found_video_overlay = (player->video_overlay != NULL) ? TRUE : FALSE;
- 
-     g_mutex_unlock (player->video_mutex);
--    return found_xoverlay;
-+    return found_video_overlay;
- }
- 
- #endif /* GDK_WINDOWING_X11 || GDK_WINDOWING_WIN32 */
-@@ -130,27 +130,27 @@ bp_video_sink_element_added (GstBin *videosink, GstElement *element, BansheePlay
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
- 
-     #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32)
--    bp_video_find_xoverlay (player);
-+    bp_video_find_video_overlay (player);
-     #endif
- }
- 
- static void
- bp_video_bus_element_sync_message (GstBus *bus, GstMessage *message, BansheePlayer *player)
- {
--    gboolean found_xoverlay;
-+    gboolean found_video_overlay;
-     
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
- 
-     #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32)
- 
--    if (message->structure == NULL || !gst_structure_has_name (message->structure, "prepare-xwindow-id")) {
-+    if (!gst_is_video_overlay_prepare_window_handle_message (message)) {
-         return;
-     }
- 
--    found_xoverlay = bp_video_find_xoverlay (player);
-+    found_video_overlay = bp_video_find_video_overlay (player);
- 
--    if (found_xoverlay) {
--        gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid);
-+    if (found_video_overlay) {
-+        gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid);
-     }
- 
-     #endif
-@@ -164,7 +164,7 @@ static void
- cb_caps_set (GObject *obj, GParamSpec *pspec, BansheePlayer *p)
- {
-     GstStructure * s = NULL;
--    GstCaps * caps = gst_pad_get_negotiated_caps (GST_PAD (obj));
-+    GstCaps * caps = gst_pad_get_current_caps (GST_PAD (obj));
- 
-     if (G_UNLIKELY (!caps)) {
-         return;
-@@ -219,7 +219,7 @@ _bp_parse_stream_info (BansheePlayer *player)
-     }
- 
-     if (G_LIKELY (vpad)) {
--        GstCaps *caps = gst_pad_get_negotiated_caps (vpad);
-+        GstCaps *caps = gst_pad_get_current_caps (vpad);
-         if (G_LIKELY (caps)) {
-             cb_caps_set (G_OBJECT (vpad), NULL, player);
-             gst_caps_unref (caps);
-@@ -249,21 +249,18 @@ _bp_video_pipeline_setup (BansheePlayer *player, GstBus *bus)
- 
-     player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_GDK_WINDOW;
-     
--    videosink = gst_element_factory_make ("gconfvideosink", "videosink");
-+    videosink = gst_element_factory_make ("autovideosink", "videosink");
-     if (videosink == NULL) {
--        videosink = gst_element_factory_make ("autovideosink", "videosink");
--        if (videosink == NULL) {
--            player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED;
--            videosink = gst_element_factory_make ("fakesink", "videosink");
--            if (videosink != NULL) {
--                g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL);
--            }
-+        player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED;
-+        videosink = gst_element_factory_make ("fakesink", "videosink");
-+        if (videosink != NULL) {
-+            g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL);
-         }
-     }
-     
-     g_object_set (G_OBJECT (player->playbin), "video-sink", videosink, NULL);
-     
--    gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player);
-+    gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player, NULL);
-     g_signal_connect (bus, "sync-message::element", G_CALLBACK (bp_video_bus_element_sync_message), player);
-         
-     if (GST_IS_BIN (videosink)) {
-@@ -349,21 +346,21 @@ bp_video_window_expose (BansheePlayer *player, GdkWindow *window, gboolean direc
- {
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
-     
--    if (direct && player->xoverlay != NULL && GST_IS_X_OVERLAY (player->xoverlay)) {
--        gst_x_overlay_expose (player->xoverlay);
-+    if (direct && player->video_overlay != NULL && GST_IS_VIDEO_OVERLAY (player->video_overlay)) {
-+        gst_video_overlay_expose (player->video_overlay);
-         return;
-     }
- 
--    if (player->xoverlay == NULL && !bp_video_find_xoverlay (player)) {
-+    if (player->video_overlay == NULL && !bp_video_find_video_overlay (player)) {
-         return;
-     }
-     
--    gst_object_ref (player->xoverlay);
-+    gst_object_ref (player->video_overlay);
- 
--    gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid);
--    gst_x_overlay_expose (player->xoverlay);
-+    gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid);
-+    gst_video_overlay_expose (player->video_overlay);
- 
--    gst_object_unref (player->xoverlay);
-+    gst_object_unref (player->video_overlay);
- }
- 
- // MUST be called from the GTK main thread; calling it in OnRealized will do the right thing.
-@@ -379,7 +376,7 @@ bp_video_window_realize (BansheePlayer *player, GdkWindow *window)
- //    //Explicitly create the native window.  GDK_WINDOW_XWINDOW will call this
- //    //function anyway, but this way we can raise a more useful message should it fail.
- //    if (!gdk_window_ensure_native (window)) {
--//        banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstXOverlay!");
-+//        banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstVideoOverlay!");
- //    }
- //#endif
- 
-diff --git a/libbanshee/banshee-player-vis.c b/libbanshee/banshee-player-vis.c
-index 5787c87..7e7dc78 100644
---- a/libbanshee/banshee-player-vis.c
-+++ b/libbanshee/banshee-player-vis.c
-@@ -27,17 +27,17 @@
- //
- 
- #include <math.h>
-+#include <gst/audio/audio.h>
- 
- #include "banshee-player-vis.h"
- 
- #define SLICE_SIZE 735
- 
- static GstStaticCaps vis_data_sink_caps = GST_STATIC_CAPS (
--    "audio/x-raw-float, "
-+    "audio/x-raw, "
-+    "format = (string) " GST_AUDIO_NE(F32) ", "
-     "rate = (int) 44100, "
--    "channels = (int) 2, "
--    "endianness = (int) BYTE_ORDER, "
--    "width = (int) 32"
-+    "channels = (int) 2"
- );
- 
- // ---------------------------------------------------------------------------
-@@ -48,6 +48,7 @@ static void
- bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer userdata)
- {
-     BansheePlayer *player = (BansheePlayer*)userdata;
-+    GstCaps *caps;
-     GstStructure *structure;
-     gint channels, wanted_size;
-     gfloat *data;
-@@ -69,14 +70,16 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u
-         player->vis_thawing = FALSE;
-     }
-     
--    structure = gst_caps_get_structure (gst_buffer_get_caps (buffer), 0);
-+    caps = gst_pad_get_current_caps (pad);
-+    structure = gst_caps_get_structure (caps, 0);
-     gst_structure_get_int (structure, "channels", &channels);
-+    gst_caps_unref (caps);
-     
-     wanted_size = channels * SLICE_SIZE * sizeof (gfloat);
- 
--    gst_adapter_push (player->vis_buffer, gst_buffer_copy (buffer));
-+    gst_adapter_push (player->vis_buffer, gst_buffer_ref (buffer));
-     
--    while ((data = (gfloat *)gst_adapter_peek (player->vis_buffer, wanted_size)) != NULL) {
-+    while ((data = (gfloat *)gst_adapter_map (player->vis_buffer, wanted_size)) != NULL) {
-         gfloat *deinterlaced = g_malloc (wanted_size);
-         gfloat *specbuf = g_new (gfloat, SLICE_SIZE * 2);
- 
-@@ -124,6 +127,7 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u
-         g_free (deinterlaced);
-         g_free (specbuf);
- 
-+        gst_adapter_unmap (player->vis_buffer);
-         gst_adapter_flush (player->vis_buffer, wanted_size);
-     }
- }
-@@ -132,65 +136,28 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u
- // Internal Functions
- // ---------------------------------------------------------------------------
- 
--static void
--_bp_vis_pipeline_block_callback (GstPad *pad, gboolean blocked, gpointer data)
-+static GstPadProbeReturn
-+_bp_vis_pipeline_event_probe (GstPad *pad, GstPadProbeInfo *info, gpointer data)
- {
-     BansheePlayer *player = (BansheePlayer *) data;
-+    GstEvent *event;
- 
--    if (!blocked) {
--        // Set thawing mode (discards buffers that are too old from the queue).
--        player->vis_thawing = TRUE;
--    }
--}
--
--static void
--_bp_vis_pipeline_set_blocked (BansheePlayer *player, gboolean blocked)
--{
--    GstPad *queue_sink;
--
--    if (player->vis_resampler == NULL)
--        return;
--
--    queue_sink = gst_element_get_static_pad (player->vis_resampler, "src");
--
--    gst_pad_set_blocked_async (queue_sink, blocked, _bp_vis_pipeline_block_callback, (gpointer) player);
--
--    gst_object_unref (GST_OBJECT (queue_sink));
--}
--
--static gboolean
--_bp_vis_pipeline_event_probe (GstPad *pad, GstEvent *event, gpointer data)
--{
--    BansheePlayer *player = (BansheePlayer *) data;
-+    if ((info->type & GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM) == 0)
-+        return GST_PAD_PROBE_PASS;
- 
-+    event = GST_EVENT (info->data);
-     switch (GST_EVENT_TYPE (event)) {
-         case GST_EVENT_FLUSH_START:
-         case GST_EVENT_FLUSH_STOP:
-         case GST_EVENT_SEEK:
--        case GST_EVENT_NEWSEGMENT:
-+        case GST_EVENT_SEGMENT:
-         case GST_EVENT_CUSTOM_DOWNSTREAM:
-             player->vis_thawing = TRUE;
- 
-         default: break;
-     }
- 
--    if (player->vis_enabled)
--        return TRUE;
--
--    switch (GST_EVENT_TYPE (event)) {
--    case GST_EVENT_EOS:
--    case GST_EVENT_CUSTOM_DOWNSTREAM_OOB:
--        _bp_vis_pipeline_set_blocked (player, FALSE);
--        break;
--    case GST_EVENT_CUSTOM_DOWNSTREAM:
--    case GST_EVENT_NEWSEGMENT:
--        _bp_vis_pipeline_set_blocked (player, TRUE);
--        break;
--
--    default: break;
--    }
--
--    return TRUE;
-+    return GST_PAD_PROBE_PASS;
- }
- 
- void
-@@ -212,9 +179,8 @@ _bp_vis_pipeline_setup (BansheePlayer *player)
-     // Core elements, if something fails here, it's the end of the world
-     audiosinkqueue = gst_element_factory_make ("queue", "vis-queue");
- 
--    pad = gst_element_get_static_pad (audiosinkqueue, "sink");
--    gst_pad_add_event_probe (pad, G_CALLBACK (_bp_vis_pipeline_event_probe), player);
--    gst_object_unref (GST_OBJECT (pad));
-+    player->vis_event_probe_pad = gst_element_get_static_pad (audiosinkqueue, "sink");
-+    player->vis_event_probe_id = gst_pad_add_probe (player->vis_event_probe_pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, _bp_vis_pipeline_event_probe, player, NULL);
- 
-     resampler = gst_element_factory_make ("audioresample", "vis-resample");
-     converter = gst_element_factory_make ("audioconvert", "vis-convert");
-@@ -255,7 +221,7 @@ _bp_vis_pipeline_setup (BansheePlayer *player)
-                       converter, fakesink, NULL);
-     
-     pad = gst_element_get_static_pad (audiosinkqueue, "sink");
--    teepad = gst_element_get_request_pad (player->audiotee, "src%d");
-+    teepad = gst_element_get_request_pad (player->audiotee, "src_%u");
-     gst_pad_link (teepad, pad);
-     gst_object_unref (GST_OBJECT (teepad));
-     gst_object_unref (GST_OBJECT (pad));
-@@ -270,14 +236,17 @@ _bp_vis_pipeline_setup (BansheePlayer *player)
-     player->vis_resampler = resampler;
-     player->vis_thawing = FALSE;
-     player->vis_enabled = FALSE;
--
--    // Disable the pipeline till we hear otherwise from managed land.
--    _bp_vis_pipeline_set_blocked (player, TRUE);
- }
- 
- void
- _bp_vis_pipeline_destroy (BansheePlayer *player)
- {
-+    if (player->vis_event_probe_pad) {
-+        gst_pad_remove_probe (player->vis_event_probe_pad, player->vis_event_probe_id);
-+        gst_object_unref (GST_OBJECT (player->vis_event_probe_pad));
-+        player->vis_event_probe_pad = NULL;
-+    }
-+
-     if (player->vis_buffer != NULL) {
-         gst_object_unref (player->vis_buffer);
-         player->vis_buffer = NULL;
-@@ -315,6 +284,5 @@ bp_set_vis_data_callback (BansheePlayer *player, BansheePlayerVisDataCallback cb
- 
-     player->vis_data_cb = cb;
- 
--    _bp_vis_pipeline_set_blocked (player, cb == NULL);
-     player->vis_enabled = cb != NULL;
- }
-diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c
-index c655a72..b8f98b8 100644
---- a/libbanshee/banshee-player.c
-+++ b/libbanshee/banshee-player.c
-@@ -250,12 +250,11 @@ bp_set_position (BansheePlayer *player, guint64 time_ms)
- P_INVOKE guint64
- bp_get_position (BansheePlayer *player)
- {
--    static GstFormat format = GST_FORMAT_TIME;
-     gint64 position;
- 
-     g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0);
- 
--    if (player->playbin != NULL && gst_element_query_position (player->playbin, &format, &position)) {
-+    if (player->playbin != NULL && gst_element_query_position (player->playbin, GST_FORMAT_TIME, &position)) {
-         return position / GST_MSECOND;
-     }
-     
-@@ -265,12 +264,11 @@ bp_get_position (BansheePlayer *player)
- P_INVOKE guint64
- bp_get_duration (BansheePlayer *player)
- {
--    static GstFormat format = GST_FORMAT_TIME;
-     gint64 duration;
- 
-     g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0);
- 
--    if (player->playbin != NULL && gst_element_query_duration (player->playbin, &format, &duration)) {
-+    if (player->playbin != NULL && gst_element_query_duration (player->playbin, GST_FORMAT_TIME, &duration)) {
-         return duration / GST_MSECOND;
-     }
-     
-@@ -446,7 +444,6 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
-     gint64 pos = -1;
-     GstState state;
--    GstFormat format = GST_FORMAT_BYTES;
-     gboolean paused = FALSE;
- 
-     // Gstreamer playbin do not support to set suburi during playback
-@@ -454,7 +451,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
-     gst_element_get_state (player->playbin, &state, NULL, 0);
-     paused = (state == GST_STATE_PAUSED);
-     if (state >= GST_STATE_PAUSED) {
--        gst_element_query_position (player->playbin, &format, &pos);
-+        gst_element_query_position (player->playbin, GST_FORMAT_BYTES, &pos);
-         gst_element_set_state (player->playbin, GST_STATE_READY);
-         // Force to wait asynch operation
-         gst_element_get_state (player->playbin, &state, NULL, -1);
-@@ -467,7 +464,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
-     gst_element_get_state (player->playbin, &state, NULL, -1);
- 
-     if (pos != -1) {
--        gst_element_seek_simple (player->playbin, format, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos);
-+        gst_element_seek_simple (player->playbin, GST_FORMAT_BYTES, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos);
-     }
- }
- 
-diff --git a/libbanshee/banshee-ripper.c b/libbanshee/banshee-ripper.c
-index e0e8c85..b3f8fed 100644
---- a/libbanshee/banshee-ripper.c
-+++ b/libbanshee/banshee-ripper.c
-@@ -85,7 +85,6 @@ br_raise_error (BansheeRipper *ripper, const gchar *error, const gchar *debug)
- static gboolean
- br_iterate_timeout (BansheeRipper *ripper)
- {
--    GstFormat format = GST_FORMAT_TIME;
-     GstState state;
-     gint64 position;
-     
-@@ -96,7 +95,7 @@ br_iterate_timeout (BansheeRipper *ripper)
-         return TRUE;
-     }
- 
--    if (!gst_element_query_position (ripper->cddasrc, &format, &position)) {
-+    if (!gst_element_query_position (ripper->cddasrc, GST_FORMAT_TIME, &position)) {
-         return TRUE;
-     }
-     
-@@ -142,8 +141,9 @@ br_encoder_probe_mime_type (GstBin *bin)
-         GstIterator *pad_iter = gst_element_iterate_src_pads (element);
-         
-         BANSHEE_GST_ITERATOR_ITERATE (pad_iter, GstPad *, pad, TRUE, {
--            GstStructure *str = GST_PAD_CAPS (pad) != NULL
--                ? gst_caps_get_structure (GST_PAD_CAPS (pad), 0)
-+            GstCaps *caps = gst_pad_get_current_caps (pad);
-+            GstStructure *str = caps != NULL
-+                ? gst_caps_get_structure (caps, 0)
-                 : NULL;
- 
-             if (str != NULL) {
-@@ -171,11 +171,8 @@ br_encoder_probe_mime_type (GstBin *bin)
-                     preferred_mimetype = mimetype;    
-                 }
-             }
--            
--            gst_object_unref (pad);
-+            gst_caps_unref (caps);
-         });
--        
--        gst_object_unref (element);
-     });
- 
-     return preferred_mimetype;
-@@ -271,7 +268,7 @@ br_pipeline_construct (BansheeRipper *ripper)
-         return FALSE;
-     }
- 
--    ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc");
-+    ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc", NULL);
-     if (ripper->cddasrc == NULL) {
-         br_raise_error (ripper, _("Could not initialize element from cdda URI"), NULL);
-         return FALSE;
-@@ -405,7 +402,6 @@ br_rip_track (BansheeRipper *ripper, gint track_number, gchar *output_path,
-             
-             // We'll warn the user in the UI if we can't tag the encoded audio files
-             *tagging_supported = TRUE;
--            gst_object_unref (element);
-         }
-     });
-     
-diff --git a/libbanshee/banshee-tagger.c b/libbanshee/banshee-tagger.c
-index ca15e8f..762dfa9 100644
---- a/libbanshee/banshee-tagger.c
-+++ b/libbanshee/banshee-tagger.c
-@@ -69,7 +69,7 @@ bt_tag_list_foreach (const GstTagList *list, const gchar *tag, gpointer userdata
- GstTagList *
- bt_tag_list_new ()
- {
--    return gst_tag_list_new ();
-+    return gst_tag_list_new_empty ();
- }
- 
- void
-diff --git a/libbanshee/banshee-transcoder.c b/libbanshee/banshee-transcoder.c
-index 10fc35c..0e241f0 100644
---- a/libbanshee/banshee-transcoder.c
-+++ b/libbanshee/banshee-transcoder.c
-@@ -64,14 +64,13 @@ gst_transcoder_raise_error(GstTranscoder *transcoder, const gchar *error, const
- static gboolean
- gst_transcoder_iterate_timeout(GstTranscoder *transcoder)
- {
--    GstFormat format = GST_FORMAT_TIME;
-     gint64 position;
-     gint64 duration;
- 
-     g_return_val_if_fail(transcoder != NULL, FALSE);
- 
--    if(!gst_element_query_duration(transcoder->pipeline, &format, &duration) ||
--        !gst_element_query_position(transcoder->sink_bin, &format, &position)) {
-+    if(!gst_element_query_duration(transcoder->pipeline, GST_FORMAT_TIME, &duration) ||
-+        !gst_element_query_position(transcoder->sink_bin, GST_FORMAT_TIME, &position)) {
-         return TRUE;
-     }
- 
-@@ -196,14 +195,14 @@ gst_transcoder_new_decoded_pad(GstElement *decodebin, GstPad *pad,
- 
-     g_return_if_fail(transcoder != NULL);
- 
--    audiopad = gst_element_get_pad(transcoder->sink_bin, "sink");
-+    audiopad = gst_element_get_static_pad(transcoder->sink_bin, "sink");
-     
-     if(GST_PAD_IS_LINKED(audiopad)) {
-         g_object_unref(audiopad);
-         return;
-     }
- 
--    caps = gst_pad_get_caps(pad);
-+    caps = gst_pad_query_caps(pad, NULL);
-     str = gst_caps_get_structure(caps, 0);
-     
-     if(!g_strrstr(gst_structure_get_name(str), "audio")) {
-@@ -235,19 +234,19 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder,
-     
-     transcoder->pipeline = gst_pipeline_new("pipeline");
- 
--    source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source");
-+    source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source", NULL);
-     if(source_elem == NULL) {
-         gst_transcoder_raise_error(transcoder, _("Could not create source element"), NULL);
-         return FALSE;
-     }
- 
--    decoder_elem = gst_element_factory_make("decodebin2", "decodebin2");
-+    decoder_elem = gst_element_factory_make("decodebin", "decodebin");
-     if(decoder_elem == NULL) {
--        gst_transcoder_raise_error(transcoder, _("Could not create decodebin2 plugin"), NULL);
-+        gst_transcoder_raise_error(transcoder, _("Could not create decodebin plugin"), NULL);
-         return FALSE;
-     }
-     
--    sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink");
-+    sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink", NULL);
-     if(sink_elem == NULL) {
-         gst_transcoder_raise_error(transcoder, _("Could not create sink element"), NULL);
-         return FALSE;
-@@ -277,7 +276,7 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder,
-          return FALSE;
-     }
- 
--    encoder_pad = gst_element_get_pad(conv_elem, "sink");
-+    encoder_pad = gst_element_get_static_pad(conv_elem, "sink");
-     if(encoder_pad == NULL) {
-         gst_transcoder_raise_error(transcoder, _("Could not get sink pad from encoder"), NULL);
-         return FALSE;
--- 
-1.7.10.4
\ No newline at end of file
diff --git a/extra/baobab/PKGBUILD b/extra/baobab/PKGBUILD
index adcfce1d8..8242786a5 100644
--- a/extra/baobab/PKGBUILD
+++ b/extra/baobab/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 175196 2013-01-16 11:12:55Z jgc $
+# $Id: PKGBUILD 183333 2013-04-21 22:08:32Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=baobab
-pkgver=3.6.4
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="A graphical directory tree analyzer"
 arch=(i686 x86_64 mips64el)
@@ -10,10 +10,10 @@ url="http://gnome.org"
 license=('GPL2')
 depends=('dconf' 'gtk3' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('intltool' 'itstool' 'vala' 'gobject-introspection')
-groups=('gnome-extra')
+groups=('gnome')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e5539558ef3411e14cb165a3e77f2d0451e984722a71a7a7d0f72fe29360cb2e')
+sha256sums=('740c123cbc49f0e479a9c67d7cc7a6330b2a9d3e6a7ffde55665a1130d9209bb')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/barcode/PKGBUILD b/extra/barcode/PKGBUILD
index a6c6d382f..53e113990 100644
--- a/extra/barcode/PKGBUILD
+++ b/extra/barcode/PKGBUILD
@@ -1,31 +1,28 @@
-# $Id: PKGBUILD 143715 2011-11-28 16:39:50Z giovanni $
+# $Id: PKGBUILD 181063 2013-03-31 07:43:24Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=barcode
-pkgver=0.98
-pkgrel=4.1
+pkgver=0.99
+pkgrel=1
 pkgdesc="A tool to convert text strings to printed bars"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/barcode/"
 license=('GPL')
 depends=('glibc')
 install=barcode.install
-source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('7f10c3307b84a19a4ab2fa4b3f2974da')
+source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('cdc504ee1020e27fbfeebcb0718de054')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man \
-              --infodir=/usr/share/info
+  ./configure --prefix=/usr
+
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make prefix="${pkgdir}/usr" MAN1DIR="${pkgdir}/usr/share/man/man1" \
-    MAN3DIR="${pkgdir}/usr/share/man/man3" INFODIR="${pkgdir}/usr/share/info" install || return 1
-  gzip ${pkgdir}/usr/share/info/barcode.info
+  make prefix="${pkgdir}/usr" install
 }
diff --git a/extra/barcode/barcode.install b/extra/barcode/barcode.install
index 2f566fcfd..83966a37d 100644
--- a/extra/barcode/barcode.install
+++ b/extra/barcode/barcode.install
@@ -2,18 +2,18 @@ infodir=/usr/share/info
 filelist=(barcode.info.gz)
 
 post_install() {
-  [ -x usr/bin/install-info ] || return 0
+  [ -x usr/bin/install-info ]
   for file in ${filelist[@]}; do
     install-info $infodir/$file $infodir/dir 2> /dev/null
   done
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
+  [ -x usr/bin/install-info ]
   for file in ${filelist[@]}; do
     install-info --delete $infodir/$file $infodir/dir 2> /dev/null
   done
diff --git a/extra/basket/PKGBUILD b/extra/basket/PKGBUILD
index adfb8d063..9b580c7e3 100644
--- a/extra/basket/PKGBUILD
+++ b/extra/basket/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=basket
 pkgver=1.81
-pkgrel=3
+pkgrel=3.1
 pkgdesc="All-purpose notes taker for KDE."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://basket.kde.org/"
diff --git a/extra/bijiben/PKGBUILD b/extra/bijiben/PKGBUILD
new file mode 100644
index 000000000..52d8bdf85
--- /dev/null
+++ b/extra/bijiben/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 183334 2013-04-21 22:08:33Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=bijiben
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Write out notes, every detail matters"
+arch=(i686 x86_64 mips64el)
+url="https://live.gnome.org/Bijiben"
+license=(GPL)
+depends=(libtracker-sparql clutter-gtk libzeitgeist webkitgtk3 hicolor-icon-theme desktop-file-utils)
+makedepends=(intltool itstool)
+options=(!emptydirs)
+install=bijiben.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('a0965874c68ca8492dcffc25cbf6f51549ff4a005c1fa1d87a1d82021aae7908')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/file-roller/file-roller.install b/extra/bijiben/bijiben.install
index 8b17fa3d4..8b17fa3d4 100644
--- a/extra/file-roller/file-roller.install
+++ b/extra/bijiben/bijiben.install
diff --git a/extra/bin86/PKGBUILD b/extra/bin86/PKGBUILD
index a398fd4df..839cfcfbe 100644
--- a/extra/bin86/PKGBUILD
+++ b/extra/bin86/PKGBUILD
@@ -6,14 +6,16 @@ pkgname=bin86
 pkgver=0.16.19
 pkgrel=1
 pkgdesc="A complete 8086 assembler and loader"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.debath.co.uk/"
 depends=('glibc')
 source=("http://www.debath.co.uk/dev86/$pkgname-$pkgver.tar.gz"
-        bin86-0.16.17-x86_64-1.patch)
+        bin86-0.16.17-x86_64-1.patch
+	bin86-0.16.19-inttypes.patch)
 md5sums=('0a20d79765a6855ce7c8c2d02b23a0f0'
-         '92bdce7b0655cd2e9f83c83fc56d128e')
+         '92bdce7b0655cd2e9f83c83fc56d128e'
+	 '98854f331f03d1f938c3b53eee31aaf8')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -21,6 +23,9 @@ build() {
   if [[ $CARCH = x86_64 ]]; then
      patch -Np1 < "$srcdir/bin86-0.16.17-x86_64-1.patch"
   fi
+  if [[ $CARCH = mips64el ]]; then
+     patch -Np1 < "$srcdir/bin86-0.16.19-inttypes.patch"
+  fi
 
   make PREFIX=/usr
 }
diff --git a/extra/bin86/bin86-0.16.19-inttypes.patch b/extra/bin86/bin86-0.16.19-inttypes.patch
new file mode 100644
index 000000000..0ab0bb97e
--- /dev/null
+++ b/extra/bin86/bin86-0.16.19-inttypes.patch
@@ -0,0 +1,13 @@
+--- bin86-0.16.19.orig/ld/x86_aout.h	2012-07-30 03:17:06.000000000 -0500
++++ bin86-0.16.19/ld/x86_aout.h	2013-05-01 18:18:59.553588866 -0500
+@@ -19,7 +19,9 @@
+ typedef int32_t Long;
+ #define __OUT_OK 1
+ #else
+-typedef char Long[4];
++#define __OUT_OK 1
++#include <inttypes.h>
++typedef int32_t Long;
+ #endif
+ #endif
+ 
diff --git a/extra/bind/127.0.0.zone b/extra/bind/127.0.0.zone
deleted file mode 100644
index 509c311f6..000000000
--- a/extra/bind/127.0.0.zone
+++ /dev/null
@@ -1,11 +0,0 @@
-$ORIGIN 0.0.127.in-addr.arpa.
-
-@			1D IN SOA	localhost. root.localhost. (
-					42		; serial (yyyymmdd##)
-					3H		; refresh
-					15M		; retry
-					1W		; expiry
-					1D )		; minimum ttl
-
-			1D IN NS	localhost.
-1			1D IN PTR	localhost.
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
deleted file mode 100644
index fdd04fa14..000000000
--- a/extra/bind/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 172756 2012-12-04 21:31:54Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-# Contributor: Mario Vazquez <mario_vazq@hotmail.com>
-
-pkgname=bind
-_pkgver=9.9.2-P1
-pkgver=${_pkgver//-/.}
-pkgrel=1
-pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
-url='http://www.isc.org/software/bind/'
-license=('custom:ISC')
-arch=('i686' 'x86_64' 'mips64el')
-options=('!makeflags' '!libtool')
-depends=('openssl' 'krb5' 'libxml2')
-source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
-        'root.hint::http://www.internic.net/zones/named.root'
-        'remove-tools.patch'
-        'tmpfiles.d'
-        'named'
-        'named.conf'
-        'named.conf.d'
-        'named.service'
-        'named.logrotate'
-        'localhost.zone'
-        '127.0.0.zone')
-sha1sums=('9d56db2a86dde8167f7adfb200beee0f51d771a5'
-          'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
-          '14264affa71bcfe7703d0fb7c3556c4c47efaa8b'
-          'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
-          '47f9ac4f6f70bc9167c1cf7859a298531197ad20'
-          'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726'
-          '7848edbfb9a848843f57c11c02b0289eefd42d00'
-          '7de92fff4b90c4821b3b133a05affd186fb93951'
-          '3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b'
-          '76a0d4cd1b913db177a5a375bebc47e5956866ec'
-          '53be0f1437ebe595240d8dbdd819939582b97fb9')
-
-provides=('dns-server')
-
-install=install
-backup=('etc/logrotate.d/named'
-        'etc/conf.d/named'
-        'etc/named.conf')
-
-build() {
-	cd "${srcdir}/bind-${_pkgver}"
-
-	patch -p1 -i ../remove-tools.patch
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-linux-caps \
-		--with-openssl \
-		--with-libxml2 \
-		--with-libtool \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/bind-${_pkgver}"
-
-	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-	make DESTDIR="${pkgdir}" install
-
-	rmdir "${pkgdir}/var/run"
-	install -d "${pkgdir}"/usr/share/doc/bind
-	install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind
-
-	install -D -m755 ../named "${pkgdir}"/etc/rc.d/named
-	install -D -m644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/named.conf
-	install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named
-	install -D -m644 ../named.service "${pkgdir}"/usr/lib/systemd/system/named.service
-	install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named
-	install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf
-
-	install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named
-}
diff --git a/extra/bind/install b/extra/bind/install
deleted file mode 100644
index 287d0e05b..000000000
--- a/extra/bind/install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-	getent group named &>/dev/null || groupadd -g 40 named
-	getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named
-	passwd -l named &>/dev/null
-
-	touch var/log/named.log
-	chown named:named var/log/named.log
-
-	# create an rndc.key if it doesn't already exist
-	if [[ ! -s etc/rndc.key ]]; then
-		usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key
-		chown root:named etc/rndc.key
-		chmod 640 etc/rndc.key
-	fi
-}
-
-pre_remove() {
-	getent passwd named &>/dev/null && userdel named >/dev/null
-	getent group named &>/dev/null && groupdel named >/dev/null
-	return 0
-}
diff --git a/extra/bind/localhost.zone b/extra/bind/localhost.zone
deleted file mode 100644
index e3ff9641c..000000000
--- a/extra/bind/localhost.zone
+++ /dev/null
@@ -1,10 +0,0 @@
-$ORIGIN localhost.
-@			1D IN SOA	@ root (
-					42		; serial (yyyymmdd##)
-					3H		; refresh
-					15M		; retry
-					1W		; expiry
-					1D )		; minimum ttl
-
-			1D IN NS	@
-			1D IN A		127.0.0.1
diff --git a/extra/bind/named b/extra/bind/named
deleted file mode 100755
index 65dd0fe82..000000000
--- a/extra/bind/named
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/named
-
-PIDFILE=/run/named/named.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; }
-
-case "$1" in
-  start)
-    stat_busy "Starting BIND"
-    [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon named
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping BIND"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon named
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  reload)
-    stat_busy "Reloading BIND"
-    [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-    ;;
-  *)
-    echo "usage: $0 {start|stop|reload|restart}"
-esac
-exit 0
diff --git a/extra/bind/named.conf b/extra/bind/named.conf
deleted file mode 100644
index 4aaf19a49..000000000
--- a/extra/bind/named.conf
+++ /dev/null
@@ -1,64 +0,0 @@
-// 
-// /etc/named.conf
-//
-
-options {
-	directory "/var/named";
-	pid-file "/run/named/named.pid";
-	auth-nxdomain yes;
-	datasize default;
-// Uncomment these to enable IPv6 connections support
-// IPv4 will still work:
-//	listen-on-v6 { any; };
-// Add this for no IPv4:
-//	listen-on { none; };
-
-	// Default security settings.
-	allow-recursion { 127.0.0.1; };
-	allow-transfer { none; };
-	allow-update { none; };
-    version none;
-    hostname none;
-    server-id none;
-};
-
-zone "localhost" IN {
-	type master;
-	file "localhost.zone";
-	allow-transfer { any; };
-};
-
-zone "0.0.127.in-addr.arpa" IN {
-	type master;
-	file "127.0.0.zone";
-	allow-transfer { any; };
-};
-
-zone "." IN {
-	type hint;
-	file "root.hint";
-};
-
-//zone "example.org" IN {
-//	type slave;
-//	file "example.zone";
-//	masters {
-//		192.168.1.100; 
-//	};
-//	allow-query { any; };
-//	allow-transfer { any; };
-//};
-
-logging {
-        channel xfer-log {
-                file "/var/log/named.log";
-                print-category yes;
-                print-severity yes;
-                print-time yes;
-                severity info;
-        };
-        category xfer-in { xfer-log; };
-        category xfer-out { xfer-log; };
-        category notify { xfer-log; };
-};
-
diff --git a/extra/bind/named.conf.d b/extra/bind/named.conf.d
deleted file mode 100644
index aecbd2307..000000000
--- a/extra/bind/named.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to BIND
-#
-NAMED_ARGS="-u named"
diff --git a/extra/bind/named.logrotate b/extra/bind/named.logrotate
deleted file mode 100644
index 5f9a47693..000000000
--- a/extra/bind/named.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/named.log {
-   missingok
-   postrotate
-      /bin/kill -HUP `cat /run/named/named.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/extra/bind/named.service b/extra/bind/named.service
deleted file mode 100644
index c21f13f4b..000000000
--- a/extra/bind/named.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Internet domain name server
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/named -f -u named
-ExecReload=/usr/sbin/rndc reload
-ExecStop=/usr/sbin/rndc stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/bind/remove-tools.patch b/extra/bind/remove-tools.patch
deleted file mode 100644
index 29b4c9c5f..000000000
--- a/extra/bind/remove-tools.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur old/bin/Makefile.in new/bin/Makefile.in
---- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
-+++ new/bin/Makefile.in	2011-08-28 19:14:17.025674400 -0700
-@@ -19,7 +19,7 @@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
-+SUBDIRS =	named rndc dnssec tests tools nsupdate \
- 		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
- TARGETS =
- 
diff --git a/extra/bind/tmpfiles.d b/extra/bind/tmpfiles.d
deleted file mode 100644
index 1cfc82d08..000000000
--- a/extra/bind/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d /run/named 0750 named named -
diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index 5cf70124a..8d3a91031 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 174921 2013-01-09 00:32:15Z dreisner $
+# $Id: PKGBUILD 183180 2013-04-18 13:14:56Z dreisner $
 
 # Contributor: FUBAR <mrfubar@gmail.com>
 # Contributor: simo <simo@archlinux.org>
@@ -9,22 +9,20 @@
 
 pkgname=bitlbee
 pkgver=3.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 url='http://www.bitlbee.org/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('openssl' 'glib2')
+depends=('gnutls' 'glib2')
 makedepends=('asciidoc' 'libotr3')
 optdepends=('libotr3: for OTR encryption support'
             'xinetd: to run bitlbee through xinetd')
 source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
         'xinetd'
-        'rc.d'
         'bitlbee.tmpfiles')
 sha1sums=('21e17f082c776566429603b1e8c966983a75ac9e'
           '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
-          '02423c500ac64f673ba26a3395c7c7036c17343e'
           '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
 backup=('etc/bitlbee/bitlbee.conf'
         'etc/bitlbee/motd.txt'
@@ -40,7 +38,7 @@ build() {
     --pidfile=/run/bitlbee/bitlbee.pid \
     --ipcsocket=/run/bitlbee/bitlbee.sock \
     --systemdsystemunitdir=/usr/lib/systemd/system \
-    --ssl=openssl \
+    --ssl=gnutls \
     --strip=0 \
     --otr=plugin
 
@@ -56,6 +54,5 @@ package() {
 
   install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
   install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
-  install -Dm755 "$srcdir/rc.d" "$pkgdir/etc/rc.d/bitlbee"
   install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
 }
diff --git a/extra/bitlbee/install b/extra/bitlbee/install
deleted file mode 100644
index b0dd5511d..000000000
--- a/extra/bitlbee/install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-	getent group bitlbee &>/dev/null || groupadd -r -g 65 bitlbee >/dev/null
-	getent passwd bitlbee &>/dev/null || useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null
-	getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null
-	true
-}
diff --git a/extra/bitlbee/rc.d b/extra/bitlbee/rc.d
deleted file mode 100644
index ade85221a..000000000
--- a/extra/bitlbee/rc.d
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/bitlbee/bitlbee.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-  if [[ ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting bitlbee daemon"
-    if [[ $PID ]] || ! su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee; then
-      stat_fail
-      exit 1
-    else
-      add_daemon bitlbee
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping bitlbee daemon"
-    if [[ -z $PID ]] || ! kill $PID &>/dev/null; then
-      stat_fail
-      exit 1
-    else
-      rm -f "$pidfile"
-      rm_daemon bitlbee
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-    exit 1
-    ;;
-esac
-
-# vim: set ft=sh et ts=2 sw=2:
diff --git a/extra/bitlbee/sbindir.patch b/extra/bitlbee/sbindir.patch
deleted file mode 100644
index 7640508f7..000000000
--- a/extra/bitlbee/sbindir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -aur old/Makefile new/Makefile
---- old/Makefile	2012-02-18 21:55:09.000000000 +1100
-+++ new/Makefile	2012-02-20 18:28:08.716130584 +1100
-@@ -135,8 +135,8 @@
- 
- systemd:
- ifdef SYSTEMDSYSTEMUNITDIR
--	sed 's|@sbindir@|$(BINDIR)|' init/bitlbee.service.in > init/bitlbee.service
--	sed 's|@sbindir@|$(BINDIR)|' init/bitlbee@.service.in > init/bitlbee@.service
-+	sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee.service.in > init/bitlbee.service
-+	sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee@.service.in > init/bitlbee@.service
- endif
- 
- install-systemd:
diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD
index 77f6720f7..2fd923666 100644
--- a/extra/bluedevil/PKGBUILD
+++ b/extra/bluedevil/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 173983 2012-12-31 10:39:10Z andrea $
+# $Id: PKGBUILD 180985 2013-03-29 12:10:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=bluedevil
-pkgver=1.3
+pkgver=1.3.1
 pkgrel=1
 pkgdesc='KDE bluetooth framework'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('3a90e8826eb9f464084bbdafa549bf3e')
+md5sums=('d21ad78030ffd892bb2ae5c78aa37919')
 
 build(){
   mkdir build
diff --git a/extra/bluefish/PKGBUILD b/extra/bluefish/PKGBUILD
index ab7807e37..c2344bb12 100644
--- a/extra/bluefish/PKGBUILD
+++ b/extra/bluefish/PKGBUILD
@@ -1,26 +1,28 @@
-# $Id: PKGBUILD 162427 2012-06-27 03:30:42Z eric $
+# $Id: PKGBUILD 177998 2013-02-12 22:00:51Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=bluefish
-pkgver=2.2.3
+pkgver=2.2.4
 pkgrel=1
 pkgdesc="A powerful HTML editor for experienced web designers and programmers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://bluefish.openoffice.nl/"
 license=('GPL3')
-depends=('gtk3' 'enchant' 'desktop-file-utils' 'hicolor-icon-theme')
+depends=('gtk3' 'enchant' 'python2' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('gucharmap' 'intltool')
 optdepends=('gucharmap: for using the charmap plugin')
 options=('!libtool')
 install=bluefish.install
 source=(http://www.bennewitz.com/bluefish/stable/source/bluefish-${pkgver}.tar.bz2{,.sig})
-sha1sums=('181f28b595f6259441eb13f4aaae60def596b980'
-          'e8c4e3ba0623e476adeb8bf8466044894aa034c8')
+sha1sums=('b65310617b5fd525a8c57f7681e023f6f4496378'
+          '6ff0474602c520e2a638436c5423957cfe4be4d0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-    src/plugin_zencoding/zencoding/{,filters/,actions/}*.py data/lorem-ipsum-generator
+    src/plugin_zencoding/zencoding/{,filters/,actions/}*.py \
+    data/{cssmin.py,jsbeautify,jsmin.py,lorem-ipsum-generator}
+    
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --enable-spell-check --disable-update-databases --disable-xml-catalog-update
   make
diff --git a/extra/bluez/0001-udev-remove-deprecated-function.patch b/extra/bluez/0001-udev-remove-deprecated-function.patch
deleted file mode 100644
index 7dadf5cd1..000000000
--- a/extra/bluez/0001-udev-remove-deprecated-function.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9e850650bd98e9d05fc937489692b26a64924d16 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Sun, 27 May 2012 00:53:36 +0200
-Subject: [PATCH] udev: remove deprecated function
-
-This function has in the past returned "/sys" unconditionally. As of udev-183 it
-is gone, so just replace it with the string.
----
- tools/hid2hci.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/hid2hci.c b/tools/hid2hci.c
-index 45a3a3d..e3a5b2e 100644
---- a/tools/hid2hci.c
-+++ b/tools/hid2hci.c
-@@ -291,7 +291,7 @@ int main(int argc, char *argv[])
- 	if (udev == NULL)
- 		goto exit;
- 
--	snprintf(syspath, sizeof(syspath), "%s/%s", udev_get_sys_path(udev), devpath);
-+	snprintf(syspath, sizeof(syspath), "/sys/%s", devpath);
- 	udev_dev = udev_device_new_from_syspath(udev, syspath);
- 	if (udev_dev == NULL) {
- 		fprintf(stderr, "error: could not find '%s'\n", devpath);
--- 
-1.7.10.2
-
diff --git a/extra/bluez/org.bluez.service b/extra/bluez/org.bluez.service
deleted file mode 100644
index dd7ae8f1c..000000000
--- a/extra/bluez/org.bluez.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[D-BUS Service]
-Name=org.bluez
-Exec=/bin/false
-User=root
-SystemdService=dbus-org.bluez.service
diff --git a/extra/bmp-musepack/PKGBUILD b/extra/bmp-musepack/PKGBUILD
deleted file mode 100644
index 0cde321fb..000000000
--- a/extra/bmp-musepack/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 137709 2011-09-10 13:05:29Z pierre $
-# Maintainer: damir <damir@archlinux.org>
-# Contributor: Nikos Kouremenos <nk@ebox.gr>
-
-pkgname=bmp-musepack
-pkgver=1.2
-pkgrel=4
-pkgdesc="A BMP plugin for playing sounds in Musepack (MPC) format"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://musepack.net/"
-license=('BSD')
-depends=('bmp' 'libmpcdec' 'taglib')
-groups=('bmp-plugins' 'bmp-io-plugins')
-options=('!libtool')
-source=("http://files.musepack.net/linux/plugins/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('5fe0c9d341ca37d05c780a478f829a5f')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/extra/bmp-wma/PKGBUILD b/extra/bmp-wma/PKGBUILD
deleted file mode 100644
index a8b78b1c5..000000000
--- a/extra/bmp-wma/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 137730 2011-09-10 14:26:41Z pierre $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Ewoud Nuyts <ewoud.nuyts@gmail.com>
-
-pkgname=bmp-wma
-pkgver=0.1.1
-pkgrel=4
-pkgdesc="WMA plugin for Beep Media Player"
-url="http://bmp-plugins.berlios.de/novelian/project.php?p=bmp-wma"
-license=('GPL')
-arch=('x86_64' 'i686' 'mips64el')
-depends=('bmp')
-groups=('bmp-plugins' 'bmp-io-plugins')
-options=('!libtool' '!emptydirs')
-source=("http://download.berlios.de/bmp-plugins/${pkgname}-${pkgver}.tar.gz"
-        'bmp-wma-gcc4.patch')
-md5sums=('8dcf3fcdb10e8e2e386f70745812412b'
-         '730eba8f41e989dd8b56c18bcc826cc4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i "${srcdir}/bmp-wma-gcc4.patch"
-  if [ "${CARCH}" != "i686" ]; then
-    export CFLAGS="${CFLAGS} -fPIC"
-  fi
-  ./configure --prefix=/usr --disable-static
-  echo '#define HAVE_LRINTF 1' >> config.h
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/bmp-wma/bmp-wma-gcc4.patch b/extra/bmp-wma/bmp-wma-gcc4.patch
deleted file mode 100644
index 9d773e89e..000000000
--- a/extra/bmp-wma/bmp-wma-gcc4.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- src/libffwma/avcodec.h.orig	2005-10-07 11:49:36.000000000 -0400
-+++ src/libffwma/avcodec.h	2005-10-07 11:51:09.000000000 -0400
-@@ -11,6 +11,43 @@
- extern "C" {
- #endif
- 
-+
-+/**
-+ * AVOption.
-+ */
-+typedef struct AVOption {
-+    /** options' name */
-+    const char *name; /* if name is NULL, it indicates a link to next */
-+    /** short English text help or const struct AVOption* subpointer */
-+    const char *help; //	const struct AVOption* sub;
-+    /** offset to context structure where the parsed value should be stored */
-+    int offset;
-+    /** options' type */
-+    int type;
-+#define FF_OPT_TYPE_BOOL 1      ///< boolean - true,1,on  (or simply presence)
-+#define FF_OPT_TYPE_DOUBLE 2    ///< double
-+#define FF_OPT_TYPE_INT 3       ///< integer
-+#define FF_OPT_TYPE_STRING 4    ///< string (finished with \0)
-+#define FF_OPT_TYPE_MASK 0x1f	///< mask for types - upper bits are various flags
-+//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option
-+#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40)
-+#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80)
-+    /** min value  (min == max   ->  no limits) */
-+    double min;
-+    /** maximum value for double/int */
-+    double max;
-+    /** default boo [0,1]l/double/int value */
-+    double defval;
-+    /**
-+     * default string value (with optional semicolon delimited extra option-list
-+     * i.e.   option1;option2;option3
-+     * defval might select other then first argument as default
-+     */
-+    const char *defstr;
-+#define FF_OPT_MAX_DEPTH 10
-+} AVOption;
-+
-+
- #include "common.h"
- #include <sys/types.h> /* size_t */
- 
-@@ -1396,41 +1433,6 @@
- 
- 
- /**
-- * AVOption.
-- */
--typedef struct AVOption {
--    /** options' name */
--    const char *name; /* if name is NULL, it indicates a link to next */
--    /** short English text help or const struct AVOption* subpointer */
--    const char *help; //	const struct AVOption* sub;
--    /** offset to context structure where the parsed value should be stored */
--    int offset;
--    /** options' type */
--    int type;
--#define FF_OPT_TYPE_BOOL 1      ///< boolean - true,1,on  (or simply presence)
--#define FF_OPT_TYPE_DOUBLE 2    ///< double
--#define FF_OPT_TYPE_INT 3       ///< integer
--#define FF_OPT_TYPE_STRING 4    ///< string (finished with \0)
--#define FF_OPT_TYPE_MASK 0x1f	///< mask for types - upper bits are various flags
--//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option
--#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40)
--#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80)
--    /** min value  (min == max   ->  no limits) */
--    double min;
--    /** maximum value for double/int */
--    double max;
--    /** default boo [0,1]l/double/int value */
--    double defval;
--    /**
--     * default string value (with optional semicolon delimited extra option-list
--     * i.e.   option1;option2;option3
--     * defval might select other then first argument as default
--     */
--    const char *defstr;
--#define FF_OPT_MAX_DEPTH 10
--} AVOption;
--
--/**
-  * Parse option(s) and sets fields in passed structure
-  * @param strct	structure where the parsed results will be written
-  * @param list  list with AVOptions
---- src/libffwma/dsputil.h.orig	2005-10-07 11:51:59.000000000 -0400
-+++ src/libffwma/dsputil.h	2005-10-07 11:52:17.000000000 -0400
-@@ -28,7 +28,6 @@
- #ifndef DSPUTIL_H
- #define DSPUTIL_H
- 
--#include "common.h"
- #include "avcodec.h"
- 
- 
diff --git a/extra/bmp/PKGBUILD b/extra/bmp/PKGBUILD
index d7d716df4..10231f63f 100644
--- a/extra/bmp/PKGBUILD
+++ b/extra/bmp/PKGBUILD
@@ -4,14 +4,14 @@
 
 pkgname=bmp
 pkgver=0.9.7.1
-pkgrel=9.1
+pkgrel=9.2
 pkgdesc="gtk2 port of xmms"
 arch=(i686 x86_64 mips64el)
 url="http://sourceforge.net/projects/beepmp/"
 license=('GPL')
 depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'alsa-lib' 'unzip' 'desktop-file-utils')
 makedepends=('libxt')
-options=('!libtool')
+options=('!libtool' '!makeflags')
 install=bmp.install
 source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz \
         ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch)
diff --git a/extra/bochs/PKGBUILD b/extra/bochs/PKGBUILD
deleted file mode 100644
index 6fb801418..000000000
--- a/extra/bochs/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 166567 2012-09-11 23:15:35Z eric $
-#Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-
-pkgname=bochs
-pkgver=2.6
-pkgrel=1
-pkgdesc="A portable x86 PC emulation software package"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://bochs.sourceforge.net/"
-license=('LGPL')
-depends=('gcc-libs' 'libxrandr')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('7e25e1a4d2f7e0464e8d6381f38741d9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --without-wx --enable-cpu-level=6 \
-              --enable-fpu --enable-3dnow --enable-disasm
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m 644 .bochsrc "${pkgdir}/etc/bochsrc-sample.txt"
-}
diff --git a/extra/bogofilter/PKGBUILD b/extra/bogofilter/PKGBUILD
deleted file mode 100644
index 018f70a54..000000000
--- a/extra/bogofilter/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 146459 2012-01-11 15:21:47Z stephane $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Low Kian Seong <fastmail_low@speedymail.org>
-
-pkgname=bogofilter
-pkgver=1.2.2
-pkgrel=4
-pkgdesc="A fast Bayesian spam filtering tool"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://bogofilter.sourceforge.net"
-depends=('db' 'perl' 'gsl')
-backup=('etc/bogofilter/bogofilter.cf')
-source=(http://sourceforge.net/projects/${pkgname}/files/${pkgname}-current/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4bcabdf8c5e7efefcb508eda7e80eebc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc/bogofilter  \
-              --localstatedir=/var \
-              --enable-transactions
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  mv "${pkgdir}/etc/bogofilter/bogofilter.cf.example" "${pkgdir}/etc/bogofilter/bogofilter.cf"
-
-  install -dm755 "${pkgdir}/usr/share/${pkgname}/contrib"
-  install -m644 contrib/* "${pkgdir}/usr/share/${pkgname}/contrib/"
-}
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 05000c1f0..dc47b2857 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176283 2013-01-28 16:48:15Z stephane $
+# $Id: PKGBUILD 181117 2013-03-31 19:16:40Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
@@ -8,109 +8,105 @@
 
 pkgbase=boost
 pkgname=('boost-libs' 'boost')
-pkgver=1.52.0
+pkgver=1.53.0
 _boostver=${pkgver//./_}
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=2
 url="http://www.boost.org/"
-makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
-source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz)
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
-sha1sums=('1120430030315b0a94b6d63fc04662960db2444c')
+makedepends=('icu>=51.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
+source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
+        boost-1.53.0-python3.patch)
+sha1sums=('0e4ef26cc7780c6bbc63987ef2f29be920e2395b'
+          '34026072a7cb2534164f20e77bb71a5c75093307')
 
 _stagedir="${srcdir}/stagedir"
 
 build() {
-  # set python path for bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools"
-  echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
-  echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> build/v2/user-config.jam
-  echo "using mpi ;" >> build/v2/user-config.jam
-
-  cd "${srcdir}"/${pkgbase}_${_boostver}
-
-  # build bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
-  ./build.sh cc
-
-  _bindir="bin.linuxx86"
-  [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
-  [ "${CARCH}" = "mips64el" ] && _bindir="bin.linuxmips"
-
-  install -d "${_stagedir}"/usr/bin
-  install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam
-
-  # build tools
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/"
-  "${_stagedir}"/usr/bin/bjam --toolset=gcc
-
-  # copy the tools
-  cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin"
-  for i in *;do
-      install -m755 "${i}" "${_stagedir}/usr/bin/${i}"
-  done
-
-  #boostbook needed by quickbook
-  cd "${srcdir}/${pkgbase}_${_boostver}/dist/"
-  cp -r share "${_stagedir}"
-
-  # build libs
-  cd "${srcdir}/${pkgbase}_${_boostver}"
-
-  # default "minimal" install: "release link=shared,static
-  # runtime-link=shared threading=single,multi"
-  # --layout=tagged will add the "-mt" suffix for multithreaded libraries
-  # and installs includes in /usr/include/boost.
-  # --layout=system no longer adds the -mt suffix for multi-threaded libs.
-  # install to ${_stagedir} in preparation for split packaging
-
-  "${_stagedir}"/usr/bin/bjam \
-      release debug-symbols=off threading=multi \
-      runtime-link=shared link=shared,static \
-      cflags=-fno-strict-aliasing \
+   local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})"
+
+   cd "${srcdir}/${pkgbase}_${_boostver}"
+
+   # Fix build errors with python 3
+   sed -i "/PYTHON_ROOT/s/print sys.prefix/print(sys.prefix)/g" bootstrap.sh
+   patch -Np1 -i ../boost-1.53.0-python3.patch
+
+   # Shut up strict aliasing warnings
+   echo "using gcc : : : <compileflags>-fno-strict-aliasing ;" >> ./tools/build/v2/user-config.jam
+   # Add an extra python version. This does not replace anything and python 2.x need to be the default.
+   echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> ./tools/build/v2/user-config.jam
+   # Support for OpenMPI
+   echo "using mpi ;" >> ./tools/build/v2/user-config.jam
+
+   ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2
+
+   _bindir="bin.linuxx86"
+   [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
+   [ "${CARCH}" = "mips64el" ] && _bindir="bin.linuxmips"
+
+   install -d -m 755 "${_stagedir}"/bin
+   install "${srcdir}"/${pkgbase}_${_boostver}/tools/build/v2/engine/${_bindir}/bjam "${_stagedir}"/bin/bjam
+
+   pushd tools
+   for _tool in bcp inspect quickbook compiler_status process_jam_log wave; do
+      "${_stagedir}"/bin/bjam --toolset=gcc $_tool
+   done
+   "${_stagedir}"/bin/bjam --toolset=gcc cflags="-std=gnu++11" library_status
+   popd
+   cp -a dist/bin/* "${_stagedir}"/bin
+
+   #boostbook is needed by quickbook
+   install -d -m 755 "${_stagedir}"/share/boostbook
+   cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/
+
+   # Disable context on mips64el, it needs N32-specific assembly.
+   [ "$CARCH" = "mips64el" ] && extra=--without-context
+
+   # default "minimal" install: "release link=shared,static
+   # runtime-link=shared threading=single,multi"
+   # --layout=tagged will add the "-mt" suffix for multithreaded libraries
+   # and installs includes in /usr/include/boost.
+   # --layout=system no longer adds the -mt suffix for multi-threaded libs.
+   # install to ${_stagedir} in preparation for split packaging
+   "${_stagedir}"/bin/bjam \
+      variant=release \
+      debug-symbols=off \
+      threading=multi \
+      runtime-link=shared \
+      link=shared \
       toolset=gcc \
-      --prefix="${_stagedir}" \
-      -sTOOLS=gcc \
+      python=2.7 \
       --layout=system \
-      ${MAKEFLAGS} \
+      --prefix="${_stagedir}" \
+      $extra \
+      ${JOBS} \
       install
+
+   find ${_stagedir} -name \*.a -exec rm -f {} \;
 }
 
 package_boost() {
-    pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
-    depends=("boost-libs=${pkgver}")
-    optdepends=('python: for python3 bindings'
-                'python2: for python2 bindings'
-		'boost-build: to use boost jam for building your project.')
-
-    install -d "${pkgdir}"/usr/{include,lib,share}
-    # headers/source files
-    cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/
-
-    # static libs
-    cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/
-
-    # utilities (bjam, bcp, pyste)
-    cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/
+   pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
+   depends=("boost-libs=${pkgver}")
+   optdepends=('python: for python bindings'
+               'python2: for python2 bindings'
+               'boost-build: to use boost jam for building your project.')
 
-    #boostbook
-    cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share
+   install -d -m 755 "${pkgdir}"/usr
+   cp -a "${_stagedir}"/{bin,include,share} "${pkgdir}"/usr
 
-    # license
-    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
+   install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \
+      "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
 }
 
 package_boost-libs() {
-    pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
-    depends=('gcc-libs' 'bzip2' 'zlib' 'icu')
-    optdepends=('openmpi: for mpi support')
+   pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
+   depends=('bzip2' 'zlib' 'icu')
+   optdepends=('openmpi: for mpi support')
 
-    install -d "${pkgdir}/usr/lib"
-    #shared libs
-    cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/"
+   install -d -m 755 "${pkgdir}"/usr
+   cp -a "${_stagedir}"/lib "${pkgdir}"/usr
 
-    # license
-    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
+   install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \
+      "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
 }
diff --git a/extra/boost/boost-1.53.0-python3.patch b/extra/boost/boost-1.53.0-python3.patch
new file mode 100644
index 000000000..8d2f59269
--- /dev/null
+++ b/extra/boost/boost-1.53.0-python3.patch
@@ -0,0 +1,96 @@
+diff -Naur boost_1_53_0.ori/libs/mpi/src/python/datatypes.cpp boost_1_53_0/libs/mpi/src/python/datatypes.cpp
+--- boost_1_53_0.ori/libs/mpi/src/python/datatypes.cpp	2007-11-25 13:38:02.000000000 -0500
++++ boost_1_53_0/libs/mpi/src/python/datatypes.cpp	2013-03-11 20:59:57.171732691 -0400
+@@ -13,6 +13,10 @@
+ #include <boost/mpi/python/serialize.hpp>
+ #include <boost/mpi.hpp>
+ 
++#if PY_MAJOR_VERSION >= 3
++#define PyInt_Type PyLong_Type
++#endif
++
+ namespace boost { namespace mpi { namespace python {
+ 
+ void export_datatypes()
+diff -Naur boost_1_53_0.ori/libs/mpi/src/python/py_environment.cpp boost_1_53_0/libs/mpi/src/python/py_environment.cpp
+--- boost_1_53_0.ori/libs/mpi/src/python/py_environment.cpp	2007-11-25 13:38:02.000000000 -0500
++++ boost_1_53_0/libs/mpi/src/python/py_environment.cpp	2013-03-11 21:02:12.961737401 -0400
+@@ -11,6 +11,9 @@
+  *  This file reflects the Boost.MPI "environment" class into Python
+  *  methods at module level.
+  */
++
++#include <locale>
++#include <string>
+ #include <boost/python.hpp>
+ #include <boost/mpi.hpp>
+ 
+@@ -50,11 +53,65 @@
+ 
+   // If anything changed, convert C-style argc/argv into Python argv
+   if (mpi_argv != my_argv)
++  {
++#if PY_MAJOR_VERSION >= 3
++    // Code stolen from py3k/Modules/python.c.
++
++    wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
++    /* We need a second copies, as Python might modify the first one. */
++    wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
++
++    if (!argv_copy || !argv_copy2) {
++      fprintf(stderr, "out of memory\n");
++      return false;
++    }
++
++    std::locale mylocale;
++    mbstate_t mystate;
++
++    const std::codecvt<char, wchar_t, mbstate_t>& myfacet =
++      std::use_facet<std::codecvt<char, wchar_t, mbstate_t> >(mylocale);
++
++    for (int i = 0; i < mpi_argc; i++) 
++    {
++      size_t length = strlen(mpi_argv[i]);
++
++      wchar_t *dest = (wchar_t *) PyMem_Malloc(sizeof(wchar_t) * (length + 1));
++
++      const char *from_next;
++      wchar_t *to_next;
++
++      std::codecvt<wchar_t,char,mbstate_t>::result myresult = 
++        myfacet.out(mystate,
++            mpi_argv[i], mpi_argv[i] + length + 1, from_next,
++            dest, dest+length+1, to_next);
++
++      if (myresult != std::codecvt<wchar_t,char,mbstate_t>::ok )
++      {
++        fprintf(stderr, "failure translating argv\n");
++        return 1;
++      }
++
++      argv_copy2[i] = argv_copy[i] = dest;
++      if (!argv_copy[i])
++          return false;
++    }
++
++    PySys_SetArgv(mpi_argc, argv_copy);
++
++    for (int i = 0; i < mpi_argc; i++) {
++        PyMem_Free(argv_copy2[i]);
++    }
++    PyMem_Free(argv_copy);
++    PyMem_Free(argv_copy2);
++#else
+     PySys_SetArgv(mpi_argc, mpi_argv);
++#endif
++  }
+ 
+-  for (int arg = 0; arg < my_argc; ++arg)
+-    free(my_argv[arg]);
+-  delete [] my_argv;
++  for (int arg = 0; arg < mpi_argc; ++arg)
++    free(mpi_argv[arg]);
++  delete [] mpi_argv;
+ 
+   return true;
+ }
diff --git a/extra/boost/exceptions.patch b/extra/boost/exceptions.patch
deleted file mode 100644
index 9faa71526..000000000
--- a/extra/boost/exceptions.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up boost/numeric/conversion/converter_policies.hpp\~ boost/numeric/conversion/converter_policies.hpp
---- boost/numeric/conversion/converter_policies.hpp~	2008-10-13 11:00:03.000000000 +0200
-+++ boost/numeric/conversion/converter_policies.hpp	2011-07-22 11:46:40.961876274 +0200
-@@ -20,6 +20,7 @@
- 
- #include "boost/mpl/if.hpp"
- #include "boost/mpl/integral_c.hpp"
-+#include "boost/throw_exception.hpp"
- 
- namespace boost { namespace numeric
- {
-@@ -159,9 +160,9 @@ struct def_overflow_handler
-   void operator() ( range_check_result r ) // throw(negative_overflow,positive_overflow)
-   {
-     if ( r == cNegOverflow )
--      throw negative_overflow() ;
-+      boost::throw_exception( negative_overflow() ) ;
-     else if ( r == cPosOverflow )
--           throw positive_overflow() ;
-+      boost::throw_exception( positive_overflow() ) ;
-   }
- } ;
- 
-
-Diff finished.  Fri Jul 22 11:46:49 2011
diff --git a/extra/bootchart/README.patch b/extra/bootchart/README.patch
deleted file mode 100644
index 195052d0a..000000000
--- a/extra/bootchart/README.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4d34b379411f781a494b4775260d550ff61e22e4 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Fri, 16 Mar 2012 01:34:10 +0100
-Subject: [PATCH] README: point to the correct location of the binary
-
----
- README   |    2 +-
- 1 file changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/README b/README
-index fa1d730..1906abb 100644
---- a/README
-+++ b/README
-@@ -6,7 +6,7 @@ Bootchart - a 'startup' graphing tool
- Bootchart is a tool, usually run at system startup, that collects and graphs
- the CPU and disk load of the system as it works. The output of bootchart is
- an SVG graph. Normally, bootchart is invoked as `bootchartd` by the kernel
--by passing "init=/sbin/bootchartd" to the kernel. Bootchart will then fork
-+by passing "init=/usr/bin/bootchartd" to the kernel. Bootchart will then fork
- init off to resume normal system startup, while monitoring and logging
- startup information in the background.
- 
--- 
-1.7.9.5
-
diff --git a/extra/bootchart/build.patch b/extra/bootchart/build.patch
deleted file mode 100644
index 91ca34def..000000000
--- a/extra/bootchart/build.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4d34b379411f781a494b4775260d550ff61e22e4 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Fri, 16 Mar 2012 01:34:10 +0100
-Subject: [PATCH] Makefile: move binary and avoid empty dirs
-
-Install to /usr/bin by default, and don't install an empty /etc.
-
-v2: Adjust README to reflect the change.
----
- Makefile |   10 ++++------
- README   |    2 +-
- 2 files changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 2150ed3..ae432fa 100644
---- a/Makefile
-+++ b/Makefile
-@@ -6,12 +6,10 @@ CC := gcc
- all: bootchartd
- 
- install: bootchartd
--	mkdir -p $(DESTDIR)/sbin
--	mkdir -p $(DESTDIR)/etc
--	mkdir -p $(DESTDIR)/usr/share/doc/bootchart/
--	install -m0755 bootchartd $(DESTDIR)/sbin/
--	install -m0644 bootchartd.conf.example $(DESTDIR)/usr/share/doc/bootchart/
--	install -m0644 README COPYING $(DESTDIR)/usr/share/doc/bootchart/
-+	install -d $(DESTDIR)/usr/bin
-+	install -d $(DESTDIR)/usr/share/doc/bootchart
-+	install -m0755 bootchartd $(DESTDIR)/usr/bin/
-+	install -m0644 README COPYING bootchartd.conf.example $(DESTDIR)/usr/share/doc/bootchart/
- 
- OBJS := log.o svg.o bootchart.o
- 
-diff --git a/README b/README
-index fa1d730..1906abb 100644
---- a/README
-+++ b/README
-@@ -6,7 +6,7 @@ Bootchart - a 'startup' graphing tool
- Bootchart is a tool, usually run at system startup, that collects and graphs
- the CPU and disk load of the system as it works. The output of bootchart is
- an SVG graph. Normally, bootchart is invoked as `bootchartd` by the kernel
--by passing "init=/sbin/bootchartd" to the kernel. Bootchart will then fork
-+by passing "init=/usr/bin/bootchartd" to the kernel. Bootchart will then fork
- init off to resume normal system startup, while monitoring and logging
- startup information in the background.
- 
--- 
-1.7.9.5
-
diff --git a/extra/botan/PKGBUILD b/extra/botan/PKGBUILD
deleted file mode 100644
index 58be3787e..000000000
--- a/extra/botan/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 163218 2012-07-11 00:19:22Z eric $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: d'Ronin <daronin@2600.com>
-
-pkgname=botan
-pkgver=1.10.3
-pkgrel=1
-pkgdesc="Crypto library written in C++"
-license=('BSD')
-arch=('i686' 'x86_64' 'mips64el')
-url="http://botan.randombit.net/"
-depends=('gcc-libs' 'sh')
-makedepends=('python2')
-source=(http://files.randombit.net/botan/Botan-${pkgver}.tbz{,.asc})
-sha1sums=('9f929101bf75c19432f49f57c80d2d26eec91dcb'
-          'd03b220849e3d3b3a49363a0debc266b615d9fca')
-
-build() {
-  cd "${srcdir}/Botan-${pkgver}"
-  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' configure.py
-  ./configure.py --prefix=/usr
-  sed -i 's/-mabi=64//' Makefile # not needed and incorrect on N32
-  make 
-}
-
-package() {
-  cd "${srcdir}/Botan-${pkgver}"
-  make DESTDIR="${pkgdir}/usr" install
-  install -D -m644 doc/license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  find "${pkgdir}/usr/share/doc" -type f -exec chmod 0644 {} \;
-}
-
diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD
index 244fcc7b5..06ac2ba34 100644
--- a/extra/brasero/PKGBUILD
+++ b/extra/brasero/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 170846 2012-11-12 15:20:28Z heftig $
+# $Id: PKGBUILD 183335 2013-04-21 22:08:35Z heftig $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=brasero
-pkgver=3.6.1
-pkgrel=1
+pkgver=3.8.0
+pkgrel=2
 pkgdesc="A disc burning application for Gnome"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org/projects/brasero"
 license=('GPL')
 options=('!libtool' '!emptydirs')
-depends=('gtk3' 'gst-plugins-base' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info'  'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql')
-makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus' 'gobject-introspection' 'gconf' 'itstool' 'docbook-xsl')
+depends=('gtk3' 'gst-plugins-good' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info'  'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql' 'libnotify')
+makedepends=('gtk-doc' 'yelp-tools' 'gnome-common' 'intltool' 'libburn' 'libisofs' 'libnautilus-extension' 'gobject-introspection' 'gconf' 'itstool' 'docbook-xsl')
 optdepends=('libburn: alternative back-end'
             'libisofs: libburn back-end'
             'dvdauthor: video project'
-            'gstreamer0.10-bad-plugins: video project'
             'vcdimager: video project')
 replaces=('nautilus-cd-burner')
 install=brasero.install
+groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d293eb28dc45af3535f09cf91aa6ccc523f3f3d8b7ad3339b5e79b4acc19b932')
+sha256sums=('d98a368a6129e50681e8243c5e0833c32cca699bd50b839c6a551d52b396bce4')
 
 build() {
   cd "$pkgname-$pkgver"
+
+  # Update tracker dep
+  sed -i '/tracker/s/0\.14/0.16/' configure.ac
+  autoreconf -f -v -i
+
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-caches \
       --disable-schemas-compile
diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD
index b810534a3..e1aca1de3 100644
--- a/extra/brltty/PKGBUILD
+++ b/extra/brltty/PKGBUILD
@@ -1,49 +1,44 @@
-# $Id: PKGBUILD 175866 2013-01-23 00:12:57Z eric $
-# Maintainer:
+# $Id: PKGBUILD 183561 2013-04-23 13:10:19Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=brltty
-pkgver=4.4
+pkgver=4.5
 pkgrel=3
 pkgdesc="Braille display driver for Linux/Unix"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mielke.cc/brltty"
-license=('GPL' 'LGPL')
-depends=('libxaw' 'at-spi2-core' 'gpm' 'icu>=50.1.2' 'tcl' 'atk' 'pyrex')
-makedepends=('bluez')
-optdepends=('bluez: bluetooth support')
-backup=(etc/brltty.conf etc/conf.d/brltty.conf)
-options=('!makeflags' '!emptydirs')
+license=(GPL LGPL)
+depends=(libxaw gpm icu tcl cython)
+makedepends=(bluez at-spi2-core)
+optdepends=('bluez: bluetooth support'
+	    'at-spi2-core: X11/GNOME Apps accessibility'
+	    'atk: ATK bridge for X11/GNOME accessibility')
+backup=(etc/brltty.conf)
+options=('!emptydirs')
 install=brltty.install
 source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz
-        'brltty'
-        'brltty.conf'
-	     'brltty.service')
-md5sums=('8ebe96efe679f5f6ccff08928fec5b26'
-         '831ebaf0c56091702929c68805d20c4f'
-         'a8ab8b3dd059e96e1734bc9cdcf844fc'
-         '7acecd700b9f94d76fe4a6ad56cb0448')
+        brltty.service)
+
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|/usr/bin/python|/usr/bin/python2|' Tables/latex-access.ctb
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --mandir=/usr/share/man \
-    --localstatedir=/var \
-    --with-screen-driver=a2 \
+    --with-tables-directory=/usr/share/brltty \
+    --with-screen-driver=lx \
     --enable-gpm \
     --disable-java-bindings \
-    PYTHON=/usr/bin/python2
+    --disable-static
 
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make INSTALL_ROOT="$pkgdir" install
-  install -D -m755 "$srcdir/brltty" "$pkgdir/etc/rc.d/brltty"
-  install -D -m644 "$srcdir/brltty.conf" "$pkgdir/etc/conf.d/brltty.conf"
-  install -D -m644 Documents/brltty.conf "$pkgdir/etc/brltty.conf"
-  install -D -m644 "$srcdir/brltty.service" "$pkgdir/usr/lib/systemd/system/brltty.service"
+  install -Dm644 Documents/brltty.conf "$pkgdir/etc/brltty.conf"
+  install -Dm644 ../brltty.service "$pkgdir/usr/lib/systemd/system/brltty.service"
 }
+md5sums=('7b52fa7746fed41ed344a1f75ce55951'
+         '0cad54bb5470122535f5e3a11d5ca123')
diff --git a/extra/brltty/brltty b/extra/brltty/brltty
deleted file mode 100755
index 5ed21a52d..000000000
--- a/extra/brltty/brltty
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-daemon_name=brltty
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name $brltty_args
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/extra/brltty/brltty.conf b/extra/brltty/brltty.conf
deleted file mode 100644
index 94115e1d5..000000000
--- a/extra/brltty/brltty.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Specify any arguments to pass to brltty here.
-brltty_args=""
\ No newline at end of file
diff --git a/extra/brltty/brltty.service b/extra/brltty/brltty.service
index 1b9d55e32..4ef39c3fc 100644
--- a/extra/brltty/brltty.service
+++ b/extra/brltty/brltty.service
@@ -9,4 +9,4 @@ Type=forking
 PIDFile=/run/brltty.pid
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sysinit.target
diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD
index b2e52439e..6deb7002c 100644
--- a/extra/bzflag/PKGBUILD
+++ b/extra/bzflag/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 169739 2012-10-27 23:41:24Z eric $
+# $Id: PKGBUILD 178623 2013-02-25 23:15:25Z bisson $
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=bzflag
 pkgver=2.4.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Multiplayer 3D tank battle game'
 url='http://bzflag.org/'
 license=('LGPL')
 options=('!libtool')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('curl' 'glew' 'glu' 'sdl')
-makedepends=('mesa') # glu requires <GL/gl.h>
 source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2")
 sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291')
 
diff --git a/extra/cabal-install/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch b/extra/cabal-install/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch
deleted file mode 100644
index f67e34677..000000000
--- a/extra/cabal-install/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 47e1a496c9a7124c28d420afe202e5bbb01ce02e Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Sat, 13 Oct 2012 20:37:09 -0700
-Subject: [PATCH] disable setting jobs due to cabal 1.16.0 bug shipped with
- ghc 7.6.1
-
----
- Distribution/Client/Config.hs | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/Distribution/Client/Config.hs b/Distribution/Client/Config.hs
-index 93e5a52..ecbc6f7 100644
---- a/Distribution/Client/Config.hs
-+++ b/Distribution/Client/Config.hs
-@@ -202,8 +202,7 @@ initialSavedConfig = do
-     },
-     savedInstallFlags    = mempty {
-       installSummaryFile = [toPathTemplate (logsDir </> "build.log")],
--      installBuildReports= toFlag AnonymousReports,
--      installNumJobs     = toFlag (Just numberOfProcessors)
-+      installBuildReports= toFlag AnonymousReports
-     }
-   }
- 
--- 
-1.7.12.3
-
diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD
index 406bd94ce..11149a80e 100644
--- a/extra/cabal-install/PKGBUILD
+++ b/extra/cabal-install/PKGBUILD
@@ -4,12 +4,12 @@
 
 pkgname=cabal-install
 pkgver=1.16.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="The command-line interface for Cabal and Hackage."
 url="http://hackage.haskell.org/package/cabal-install"
 license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-makedepends=('haskell-http=4000.2.7-1' 'haskell-zlib=0.5.4.0-1' 'haskell-mtl=2.1.2-2' 'haskell-network=2.4.1.0-1' 'haskell-random=1.0.1.1-4')
+arch=('i686' 'x86_64')
+makedepends=('haskell-http=4000.2.8-1' 'haskell-zlib=0.5.4.1-1' 'haskell-mtl=2.1.2-3' 'haskell-network=2.4.1.2-1' 'haskell-random=1.0.1.1-5')
 depends=('ghc' 'gmp' 'zlib')
 source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz")
 md5sums=('18e07d5b431d19d94cc5279a5e6fbfee')
diff --git a/extra/cagibi/PKGBUILD b/extra/cagibi/PKGBUILD
index 660fc48d7..ec5b4b969 100644
--- a/extra/cagibi/PKGBUILD
+++ b/extra/cagibi/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 149009 2012-02-05 13:59:12Z andrea $
+# $Id: PKGBUILD 178952 2013-03-01 10:19:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=cagibi
 pkgver=0.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A cache/proxy daemon for SSDP (the discovery part of UPnP)'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org/'
+url='https://projects.kde.org/projects/kdesupport/cagibi/'
 license=('LGPL')
-depends=('qt')
+depends=('qt4')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('af66d89337ef80e8a868d3bb9dd92328')
 
 build() {
-  cd ${srcdir}
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -24,6 +25,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/cairo-perl/PKGBUILD b/extra/cairo-perl/PKGBUILD
index 8906fd484..b6fa0a72c 100644
--- a/extra/cairo-perl/PKGBUILD
+++ b/extra/cairo-perl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160461 2012-06-02 10:25:40Z bluewind $
+# $Id: PKGBUILD 183105 2013-04-17 15:04:54Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cairo-perl
-pkgver=1.082
-pkgrel=2
+pkgver=1.103
+pkgrel=1
 pkgdesc="Perl wrappers for cairo"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
@@ -11,14 +11,11 @@ url="http://gtk2-perl.sourceforge.net/"
 options=('!emptydirs')
 depends=('cairo' 'perl')
 makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Cairo-${pkgver}.tar.gz
-        testsuite.patch)
-md5sums=('cfd61e519ff20023979c255d4040fe06'
-         '6a3ceac304a5a53f8fdd5652d98f6855')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Cairo-${pkgver}.tar.gz)
+md5sums=('c693e5535ed60283c068d92120412f98')
 
 build() {
   cd "${srcdir}/Cairo-${pkgver}"
-  patch -Np1 -i "${srcdir}/testsuite.patch"
   perl Makefile.PL INSTALLDIRS=vendor
   make
 }
diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD
index 657e7e20f..13c45840d 100644
--- a/extra/cairo/PKGBUILD
+++ b/extra/cairo/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 176849 2013-02-01 14:30:42Z andyrtr $
+# $Id: PKGBUILD 178617 2013-02-25 20:45:00Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Brice Carpentier <brice@daknet.org>
 
 pkgname=cairo
-pkgver=1.12.12
-pkgrel=1
+pkgver=1.12.14
+pkgrel=3
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL' 'MPL')
 url="http://cairographics.org/"
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'sh')
-makedepends=('librsvg' 'poppler-glib' 'libspectre' 'gtk-doc') # 'libdrm')
+# depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa>=9.1' 'libgl' 'sh') 
+makedepends=('mesa>=9.1' 'mesa-libgl>=9.1' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc'
+             # for the test suite:
+             'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
+#optdepends=('xcb-util: for XCB backend') # really needed?
 [ "$CARCH" != "mips64el" ] && makedepends+=('valgrind')
-optdepends=('xcb-util: for XCB backend') # really needed?
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
 options=('!libtool')
 source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
-sha1sums=('8e597874da5b861287893d87dd4ab32471e99c82')
+sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -26,18 +28,30 @@ build() {
 	--localstatedir=/var \
 	--disable-static \
 	--enable-tee \
-	--disable-xlib-xcb \
+	--enable-gl \
+	--enable-egl \
+	--enable-svg \
+	--enable-ps \
+	--enable-pdf \
+	--enable-gobject #\
+	# --enable-test-surfaces
+	
+	#--disable-xlib-xcb \
 	# --enable-test-surfaces \ takes ages
 	#--enable-drm # breaks build
+	
   make
 }
 
 #check() {
 #  cd "$srcdir/$pkgname-$pkgver"
-#  make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped
+  #make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped
+#  make test || /bin/true # 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped
 #}
 
 package() {
+  depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa>=9.1' 'libgl' 'sh') 
+
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/cairo/cairo-1.10.0-buggy_gradients.patch b/extra/cairo/cairo-1.10.0-buggy_gradients.patch
deleted file mode 100644
index 368e356d3..000000000
--- a/extra/cairo/cairo-1.10.0-buggy_gradients.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/cairo-xlib-display.c.ubuntu	2010-08-04 11:57:49.000000000 +0200

-+++ b/src/cairo-xlib-display.c	2010-08-04 11:58:28.000000000 +0200

-@@ -353,11 +353,7 @@

-     /* Prior to Render 0.10, there is no protocol support for gradients and

-      * we call function stubs instead, which would silently consume the drawing.

-      */

--#if RENDER_MAJOR == 0 && RENDER_MINOR < 10

-     display->buggy_gradients = TRUE;

--#else

--    display->buggy_gradients = FALSE;

--#endif

-     display->buggy_pad_reflect = FALSE;

-     display->buggy_repeat = FALSE;

diff --git a/extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch b/extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch
deleted file mode 100644
index e43a10312..000000000
--- a/extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2f1d6b27e8b78c77346a5b603114b54400e57d83 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Thu, 07 Jun 2012 09:48:52 +0000
-Subject: cff-subsetting: Ignore charset for non cid fonts
-
-Fixes crash in https://bugzilla.gnome.org/show_bug.cgi?id=677422
----
-diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c
-index db6fdf7..6f0cd66 100644
---- a/src/cairo-cff-subset.c
-+++ b/src/cairo-cff-subset.c
-@@ -1178,14 +1178,16 @@ cairo_cff_font_read_top_dict (cairo_cff_font_t *font)
-         goto fail;
-     font->num_glyphs = _cairo_array_num_elements (&font->charstrings_index);
- 
--    operand = cff_dict_get_operands (font->top_dict, CHARSET_OP, &size);
--    if (font->is_cid && !operand)
--	return CAIRO_INT_STATUS_UNSUPPORTED;
-+    if (font->is_cid) {
-+	 operand = cff_dict_get_operands (font->top_dict, CHARSET_OP, &size);
-+	 if (!operand)
-+	      return CAIRO_INT_STATUS_UNSUPPORTED;
- 
--    decode_integer (operand, &offset);
--    font->charset = font->data + offset;
--    if (font->charset >= font->data_end)
--	return CAIRO_INT_STATUS_UNSUPPORTED;
-+	 decode_integer (operand, &offset);
-+	 font->charset = font->data + offset;
-+	 if (font->charset >= font->data_end)
-+	      return CAIRO_INT_STATUS_UNSUPPORTED;
-+    }
- 
-     if (!font->is_opentype)
-         cairo_cff_font_read_font_metrics (font, font->top_dict);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/cairo/cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch b/extra/cairo/cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch
deleted file mode 100644
index e3bb30580..000000000
--- a/extra/cairo/cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-From f228769dfe5a8b5d73c49a41e95e31ed73a77fb3 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Fri, 08 Jun 2012 16:22:41 +0000
-Subject: polygon-reduce: Reduce broken stopped-edge continuation
-
-This is hopefully a lesser used path and the attempted optimisation to
-continue a stopped edge with a colinear stopped edge highly unlikely and
-lost in the noise of the general inefficiency of the routine. As it was
-broken, rather than attempt to rectify the "optimisation" remove it.
-
-Reported-by: Evangelos Foutras <evangelos@foutrelis.com>
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50852
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-polygon-reduce.c b/src/cairo-polygon-reduce.c
-index 8758070..ea457fe 100644
---- a/src/cairo-polygon-reduce.c
-+++ b/src/cairo-polygon-reduce.c
-@@ -42,6 +42,8 @@
- #include "cairo-freelist-private.h"
- #include "cairo-combsort-inline.h"
- 
-+#define DEBUG_POLYGON 0
-+
- typedef cairo_point_t cairo_bo_point32_t;
- 
- typedef struct _cairo_bo_intersect_ordinate {
-@@ -114,7 +116,6 @@ typedef struct _cairo_bo_event_queue {
- 
- typedef struct _cairo_bo_sweep_line {
-     cairo_bo_edge_t *head;
--    cairo_bo_edge_t *stopped;
-     int32_t current_y;
-     cairo_bo_edge_t *current_edge;
- } cairo_bo_sweep_line_t;
-@@ -476,8 +477,8 @@ edges_compare_x_for_y (const cairo_bo_edge_t *a,
- static inline int
- _line_equal (const cairo_line_t *a, const cairo_line_t *b)
- {
--    return a->p1.x == b->p1.x && a->p1.y == b->p1.y &&
--           a->p2.x == b->p2.x && a->p2.y == b->p2.y;
-+    return (a->p1.x == b->p1.x && a->p1.y == b->p1.y &&
-+	    a->p2.x == b->p2.x && a->p2.y == b->p2.y);
- }
- 
- static int
-@@ -1024,7 +1025,6 @@ static void
- _cairo_bo_sweep_line_init (cairo_bo_sweep_line_t *sweep_line)
- {
-     sweep_line->head = NULL;
--    sweep_line->stopped = NULL;
-     sweep_line->current_y = INT32_MIN;
-     sweep_line->current_edge = NULL;
- }
-@@ -1139,6 +1139,8 @@ edges_colinear (const cairo_bo_edge_t *a, const cairo_bo_edge_t *b)
-      */
-     if (a->edge.line.p1.y == b->edge.line.p1.y) {
- 	return a->edge.line.p1.x == b->edge.line.p1.x;
-+    } else if (a->edge.line.p2.y == b->edge.line.p2.y) {
-+	return a->edge.line.p2.x == b->edge.line.p2.x;
-     } else if (a->edge.line.p1.y < b->edge.line.p1.y) {
- 	return edge_compare_for_y_against_x (b,
- 					     a->edge.line.p1.y,
-@@ -1205,82 +1207,48 @@ _active_edges_to_polygon (cairo_bo_edge_t		*left,
- 			  cairo_polygon_t	        *polygon)
- {
-     cairo_bo_edge_t *right;
-+    unsigned int mask;
- 
--    if (fill_rule == CAIRO_FILL_RULE_WINDING) {
--	while (left != NULL) {
--	    int in_out = left->edge.dir;
--
--	    right = left->next;
--	    if (left->deferred.right == NULL) {
--		while (right != NULL && right->deferred.right == NULL)
--		    right = right->next;
--
--		if (right != NULL && edges_colinear (left, right)) {
--		    /* continuation on left */
--		    left->deferred = right->deferred;
--		    right->deferred.right = NULL;
--		}
--	    }
--
--	    right = left->next;
--	    while (right != NULL) {
--		if (right->deferred.right != NULL)
--		    _cairo_bo_edge_end (right, top, polygon);
--
--		in_out += right->edge.dir;
--		if (in_out == 0) {
--		    cairo_bo_edge_t *next;
--		    cairo_bool_t skip = FALSE;
--
--		    /* skip co-linear edges */
--		    next = right->next;
--		    if (next != NULL)
--			skip = edges_colinear (right, next);
-+    if (fill_rule == CAIRO_FILL_RULE_WINDING)
-+	mask = ~0;
-+    else
-+	mask = 1;
- 
--		    if (! skip)
--			break;
--		}
-+    while (left != NULL) {
-+	int in_out = left->edge.dir;
- 
-+	right = left->next;
-+	if (left->deferred.right == NULL) {
-+	    while (right != NULL && right->deferred.right == NULL)
- 		right = right->next;
--	    }
--
--	    _cairo_bo_edge_start_or_continue (left, right, top, polygon);
- 
--	    left = right;
--	    if (left != NULL)
--		left = left->next;
-+	    if (right != NULL && edges_colinear (left, right)) {
-+		/* continuation on left */
-+		left->deferred = right->deferred;
-+		right->deferred.right = NULL;
-+	    }
- 	}
--    } else {
--	while (left != NULL) {
--	    int in_out = 0;
- 
--	    right = left->next;
--	    while (right != NULL) {
--		if (right->deferred.right != NULL)
--		    _cairo_bo_edge_end (right, top, polygon);
-+	right = left->next;
-+	while (right != NULL) {
-+	    if (right->deferred.right != NULL)
-+		_cairo_bo_edge_end (right, top, polygon);
- 
--		if ((in_out++ & 1) == 0) {
--		    cairo_bo_edge_t *next;
--		    cairo_bool_t skip = FALSE;
--
--		    /* skip co-linear edges */
--		    next = right->next;
--		    if (next != NULL)
--			skip = edges_colinear (right, next);
--
--		    if (! skip)
--			break;
--		}
--
--		right = right->next;
-+	    in_out += right->edge.dir;
-+	    if ((in_out & mask) == 0) {
-+		/* skip co-linear edges */
-+		if (right->next == NULL || !edges_colinear (right, right->next))
-+		    break;
- 	    }
- 
--	    _cairo_bo_edge_start_or_continue (left, right, top, polygon);
--
--	    left = right;
--	    if (left != NULL)
--		left = left->next;
-+	    right = right->next;
- 	}
-+
-+	_cairo_bo_edge_start_or_continue (left, right, top, polygon);
-+
-+	left = right;
-+	if (left != NULL)
-+	    left = left->next;
-     }
- }
- 
-@@ -1303,12 +1271,6 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_event_t   **start_events,
- 
-     while ((event = _cairo_bo_event_dequeue (&event_queue))) {
- 	if (event->point.y != sweep_line.current_y) {
--	    for (e1 = sweep_line.stopped; e1; e1 = e1->next) {
--		if (e1->deferred.right != NULL)
--		     _cairo_bo_edge_end (e1, e1->edge.bottom, polygon);
--	    }
--	    sweep_line.stopped = NULL;
--
- 	    _active_edges_to_polygon (sweep_line.head,
- 				      sweep_line.current_y,
- 				      fill_rule, polygon);
-@@ -1328,23 +1290,6 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_event_t   **start_events,
- 	    if (unlikely (status))
- 		goto unwind;
- 
--	    /* check to see if this is a continuation of a stopped edge */
--	    /* XXX change to an infinitesimal lengthening rule */
--	    for (left = sweep_line.stopped; left; left = left->next) {
--		if (e1->edge.top <= left->edge.bottom &&
--		    edges_colinear (e1, left))
--		{
--		    e1->deferred = left->deferred;
--		    if (left->prev != NULL)
--			left->prev = left->next;
--		    else
--			sweep_line.stopped = left->next;
--		    if (left->next != NULL)
--			left->next->prev = left->prev;
--		    break;
--		}
--	    }
--
- 	    left = e1->prev;
- 	    right = e1->next;
- 
-@@ -1371,14 +1316,8 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_event_t   **start_events,
- 
- 	    _cairo_bo_sweep_line_delete (&sweep_line, e1);
- 
--	    /* first, check to see if we have a continuation via a fresh edge */
--	    if (e1->deferred.right != NULL) {
--		e1->next = sweep_line.stopped;
--		if (sweep_line.stopped != NULL)
--		    sweep_line.stopped->prev = e1;
--		sweep_line.stopped = e1;
--		e1->prev = NULL;
--	    }
-+	    if (e1->deferred.right != NULL)
-+		_cairo_bo_edge_end (e1, e1->edge.bottom, polygon);
- 
- 	    if (left != NULL && right != NULL) {
- 		status = _cairo_bo_event_queue_insert_if_intersect_below_current_y (&event_queue, left, right);
-@@ -1420,10 +1359,6 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_event_t   **start_events,
- 	}
-     }
- 
--    for (e1 = sweep_line.stopped; e1; e1 = e1->next) {
--	if (e1->deferred.right != NULL)
--	    _cairo_bo_edge_end (e1, e1->edge.bottom, polygon);
--    }
-  unwind:
-     _cairo_bo_event_queue_fini (&event_queue);
- 
-@@ -1447,6 +1382,12 @@ _cairo_polygon_reduce (cairo_polygon_t *polygon,
-     if (unlikely (0 == num_events))
- 	return CAIRO_STATUS_SUCCESS;
- 
-+    if (DEBUG_POLYGON) {
-+	FILE *file = fopen ("reduce_in.txt", "w");
-+	_cairo_debug_print_polygon (file, polygon);
-+	fclose (file);
-+    }
-+
-     events = stack_events;
-     event_ptrs = stack_event_ptrs;
-     if (num_events > ARRAY_LENGTH (stack_events)) {
-@@ -1482,10 +1423,16 @@ _cairo_polygon_reduce (cairo_polygon_t *polygon,
- 							 num_events,
- 							 fill_rule,
- 							 polygon);
--     polygon->num_limits = num_limits;
-+    polygon->num_limits = num_limits;
- 
-     if (events != stack_events)
- 	free (events);
- 
-+    if (DEBUG_POLYGON) {
-+	FILE *file = fopen ("reduce_out.txt", "w");
-+	_cairo_debug_print_polygon (file, polygon);
-+	fclose (file);
-+    }
-+
-     return status;
- }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/cairo/git_fixes.diff b/extra/cairo/git_fixes.diff
deleted file mode 100644
index 3fc7ff659..000000000
--- a/extra/cairo/git_fixes.diff
+++ /dev/null
@@ -1,934 +0,0 @@
-From e43f53bf7f3d371116f31f22ab9754b08b5abe7f Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Mon, 22 Oct 2012 12:47:11 +0000
-Subject: version: Post release bump to 1.12.7
-
----
-diff --git a/cairo-version.h b/cairo-version.h
-index dc89a19..c685909 100644
---- a/cairo-version.h
-+++ b/cairo-version.h
-@@ -3,6 +3,6 @@
- 
- #define CAIRO_VERSION_MAJOR 1
- #define CAIRO_VERSION_MINOR 12
--#define CAIRO_VERSION_MICRO 6
-+#define CAIRO_VERSION_MICRO 7
- 
- #endif
---
-cgit v0.9.0.2-2-gbebe
-From 00feb8ce530a472abbde445b52d9ae8c99ec97f0 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Fri, 26 Oct 2012 09:51:31 +0000
-Subject: xlib/shm: Sanity check that the server handles XSendEvent with ShmCompletion
-
-Uli Schlachter suggested it would be wiser to complement our blacklist
-of known broken X/libXext with an explicit roundtrip to check for a
-BadValue error return when we try to use XSendEvent.
-
-Suggested-by: Uli Schlachter <psychon@znc.in>
-Reported-by: Martin Husemann <martin@duskware.de>
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c
-index ec0d334..17594b1 100644
---- a/src/cairo-xlib-surface-shm.c
-+++ b/src/cairo-xlib-surface-shm.c
-@@ -1128,8 +1128,60 @@ _cairo_xlib_shm_surface_is_idle (cairo_surface_t *surface)
-     (((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap)
- 
- static cairo_bool_t
--xorg_has_buggy_send_shm_completion_event(Display *dpy)
-+has_broken_send_shm_event (cairo_xlib_display_t *display,
-+			   cairo_xlib_shm_display_t *shm)
- {
-+    Display *dpy = display->display;
-+    int (*old_handler) (Display *display, XErrorEvent *event);
-+    XShmCompletionEvent ev;
-+    XShmSegmentInfo info;
-+
-+    info.shmid = shmget (IPC_PRIVATE, 0x1000, IPC_CREAT | 0600);
-+    if (info.shmid == -1)
-+	return TRUE;
-+
-+    info.readOnly = FALSE;
-+    info.shmaddr = shmat (info.shmid, NULL, 0);
-+    if (info.shmaddr == (char *) -1) {
-+	shmctl (info.shmid, IPC_RMID, NULL);
-+	return TRUE;
-+    }
-+
-+    ev.type = shm->event;
-+    ev.drawable = shm->window;
-+    ev.major_code = shm->opcode;
-+    ev.minor_code = X_ShmPutImage;
-+
-+    ev.shmseg = info.shmid;
-+    ev.offset = 0;
-+
-+    assert (CAIRO_MUTEX_IS_LOCKED (_cairo_xlib_display_mutex));
-+    _x_error_occurred = FALSE;
-+
-+    XLockDisplay (dpy);
-+    XSync (dpy, False);
-+    old_handler = XSetErrorHandler (_check_error_handler);
-+
-+    XShmAttach (dpy, &info);
-+    XSendEvent (dpy, ev.drawable, False, 0, (XEvent *)&ev);
-+    XShmDetach (dpy, &info);
-+
-+    XSync (dpy, False);
-+    XSetErrorHandler (old_handler);
-+    XUnlockDisplay (dpy);
-+
-+    shmctl (info.shmid, IPC_RMID, NULL);
-+    shmdt (info.shmaddr);
-+
-+    return _x_error_occurred;
-+}
-+
-+static cairo_bool_t
-+xorg_has_buggy_send_shm_completion_event(cairo_xlib_display_t *display,
-+					 cairo_xlib_shm_display_t *shm)
-+{
-+    Display *dpy = display->display;
-+
-     /* As libXext sets the SEND_EVENT bit in the ShmCompletionEvent,
-      * the Xserver may crash if it does not take care when processing
-      * the event type. For instance versions of Xorg prior to 1.11.1
-@@ -1141,8 +1193,12 @@ xorg_has_buggy_send_shm_completion_event(Display *dpy)
-      *
-      * Remove the SendEvent bit (0x80) before doing range checks on event type.
-      */
--    return (strstr (ServerVendor (dpy), "X.Org") != NULL &&
--	    VendorRelease (dpy) < XORG_VERSION_ENCODE(1,11,0,1));
-+    if (strstr (ServerVendor (dpy), "X.Org") != NULL &&
-+	VendorRelease (dpy) < XORG_VERSION_ENCODE(1,11,0,1))
-+	return TRUE;
-+
-+    /* For everyone else check that no error is generated */
-+    return has_broken_send_shm_event (display, shm);
- }
- 
- void
-@@ -1162,6 +1218,15 @@ _cairo_xlib_display_init_shm (cairo_xlib_display_t *display)
-     if (unlikely (shm == NULL))
- 	return;
- 
-+    codes = XInitExtension (display->display, SHMNAME);
-+    if (codes == NULL) {
-+	free (shm);
-+	return;
-+    }
-+
-+    shm->opcode = codes ->major_opcode;
-+    shm->event = codes->first_event;
-+
-     if (unlikely (_pqueue_init (&shm->info))) {
- 	free (shm);
- 	return;
-@@ -1177,16 +1242,12 @@ _cairo_xlib_display_init_shm (cairo_xlib_display_t *display)
- 				 DefaultVisual (display->display, scr),
- 				 CWOverrideRedirect, &attr);
- 
--    if (xorg_has_buggy_send_shm_completion_event(display->display))
-+    if (xorg_has_buggy_send_shm_completion_event(display, shm))
- 	has_pixmap = 0;
- 
-     shm->has_pixmaps = has_pixmap ? MIN_PIXMAP_SIZE : 0;
-     cairo_list_init (&shm->pool);
- 
--    codes = XInitExtension (display->display, SHMNAME);
--    shm->opcode = codes ->major_opcode;
--    shm->event = codes->first_event;
--
-     cairo_list_init (&shm->surfaces);
- 
-     display->shm = shm;
---
-cgit v0.9.0.2-2-gbebe
-From fdd2082f923012a1354be7086d03f78fb166695b Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Fri, 26 Oct 2012 09:51:31 +0000
-Subject: xlib: Check for both X.org and Xorg ServerVendors
-
-Martin Husemann reported that on his NetBSD machine the vendor was being
-reported as "The Xorg Foundation", a non-conformist separatist split of
-the Peoples' Liberation Army^W^W^W "The X.Org Foundation". Simply check
-for both during initialisation.
-
-Reported-by: Martin Husemann <martin@duskware.de>
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-xlib-display.c b/src/cairo-xlib-display.c
-index 67c0673..04c89b2 100644
---- a/src/cairo-xlib-display.c
-+++ b/src/cairo-xlib-display.c
-@@ -315,7 +315,7 @@ _cairo_xlib_device_create (Display *dpy)
-      *    safest to just blacklist all old-versioning-scheme X servers,
-      *    (just using VendorRelease < 70000000), as buggy_repeat=TRUE.
-      */
--    if (strstr (ServerVendor (dpy), "X.Org") != NULL) {
-+    if (_cairo_xlib_vendor_is_xorg (dpy)) {
- 	if (VendorRelease (dpy) >= 60700000) {
- 	    if (VendorRelease (dpy) < 70000000)
- 		display->buggy_repeat = TRUE;
-diff --git a/src/cairo-xlib-private.h b/src/cairo-xlib-private.h
-index d2bd588..c328302 100644
---- a/src/cairo-xlib-private.h
-+++ b/src/cairo-xlib-private.h
-@@ -216,6 +216,13 @@ struct _cairo_xlib_proxy {
-     cairo_surface_t *owner;
- };
- 
-+inline static cairo_bool_t
-+_cairo_xlib_vendor_is_xorg (Display *dpy)
-+{
-+    const char *const vendor = ServerVendor (dpy);
-+    return strstr (vendor, "X.Org") || strstr (vendor, "Xorg");
-+}
-+
- cairo_private cairo_status_t
- _cairo_xlib_surface_get_gc (cairo_xlib_display_t *display,
-                             cairo_xlib_surface_t *surface,
-diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c
-index 17594b1..89f51a9 100644
---- a/src/cairo-xlib-surface-shm.c
-+++ b/src/cairo-xlib-surface-shm.c
-@@ -1193,7 +1193,7 @@ xorg_has_buggy_send_shm_completion_event(cairo_xlib_display_t *display,
-      *
-      * Remove the SendEvent bit (0x80) before doing range checks on event type.
-      */
--    if (strstr (ServerVendor (dpy), "X.Org") != NULL &&
-+    if (_cairo_xlib_vendor_is_xorg (dpy) &&
- 	VendorRelease (dpy) < XORG_VERSION_ENCODE(1,11,0,1))
- 	return TRUE;
- 
---
-cgit v0.9.0.2-2-gbebe
-From d57e652f08f5ff7c334d01bc071962e6a131928f Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Fri, 26 Oct 2012 12:30:01 +0000
-Subject: type1-subset: parse all operators
-
-The PDF at bug 56265 contained a Type 1 font that used the "div"
-operator to compute the glyph width. As the "div" operator was
-not handled by the charstring parser this resulted in an incorrect
-glyph width in the PDF output.
-
-Fix this by upgrading the charstring parsing to handle all Type 1
-operators.
----
-diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
-index 1bdb12b..c7f613a 100644
---- a/src/cairo-type1-subset.c
-+++ b/src/cairo-type1-subset.c
-@@ -137,13 +137,10 @@ typedef struct _cairo_type1_font_subset {
-     int hex_column;
- 
-     struct {
--	int stack[TYPE1_STACKSIZE], sp, top_value;
-+	double stack[TYPE1_STACKSIZE];
-+	int sp;
-     } build_stack;
- 
--    struct {
--	int other_subr_args[TYPE1_STACKSIZE], num_other_subr_args, cur_other_subr_arg;
--    } ps_stack;
--
- 
- } cairo_type1_font_subset_t;
- 
-@@ -742,15 +739,33 @@ use_standard_encoding_glyph (cairo_type1_font_subset_t *font, int index)
-     return CAIRO_INT_STATUS_UNSUPPORTED;
- }
- 
--#define TYPE1_CHARSTRING_COMMAND_ESCAPE		0x0c
--#define TYPE1_CHARSTRING_COMMAND_SEAC		0x0c06
--#define TYPE1_CHARSTRING_COMMAND_SBW		0x0c07
--#define TYPE1_CHARSTRING_COMMAND_HSBW		0x0d
--#define TYPE1_CHARSTRING_COMMAND_CALLSUBR	0x0a
--#define TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR  0x0c10
--#define TYPE1_CHARSTRING_COMMAND_POP	        0x0c11
--
- 
-+#define TYPE1_CHARSTRING_COMMAND_HSTEM		 0x01
-+#define TYPE1_CHARSTRING_COMMAND_VSTEM		 0x03
-+#define TYPE1_CHARSTRING_COMMAND_VMOVETO	 0x04
-+#define TYPE1_CHARSTRING_COMMAND_RLINETO	 0x05
-+#define TYPE1_CHARSTRING_COMMAND_HLINETO	 0x06
-+#define TYPE1_CHARSTRING_COMMAND_VLINETO	 0x07
-+#define TYPE1_CHARSTRING_COMMAND_RRCURVETO	 0x08
-+#define TYPE1_CHARSTRING_COMMAND_CLOSEPATH	 0x09
-+#define TYPE1_CHARSTRING_COMMAND_CALLSUBR	 0x0a
-+#define TYPE1_CHARSTRING_COMMAND_RETURN		 0x0b
-+#define TYPE1_CHARSTRING_COMMAND_ESCAPE		 0x0c
-+#define TYPE1_CHARSTRING_COMMAND_HSBW		 0x0d
-+#define TYPE1_CHARSTRING_COMMAND_ENDCHAR	 0x0e
-+#define TYPE1_CHARSTRING_COMMAND_RMOVETO	 0x15
-+#define TYPE1_CHARSTRING_COMMAND_HMOVETO	 0x16
-+#define TYPE1_CHARSTRING_COMMAND_VHCURVETO	 0x1e
-+#define TYPE1_CHARSTRING_COMMAND_HVCURVETO	 0x1f
-+#define TYPE1_CHARSTRING_COMMAND_DOTSECTION	 0x0c00
-+#define TYPE1_CHARSTRING_COMMAND_VSTEM3		 0x0c01
-+#define TYPE1_CHARSTRING_COMMAND_HSTEM3		 0x0c02
-+#define TYPE1_CHARSTRING_COMMAND_SEAC		 0x0c06
-+#define TYPE1_CHARSTRING_COMMAND_SBW		 0x0c07
-+#define TYPE1_CHARSTRING_COMMAND_DIV		 0x0c0c
-+#define TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR   0x0c10
-+#define TYPE1_CHARSTRING_COMMAND_POP	         0x0c11
-+#define TYPE1_CHARSTRING_COMMAND_SETCURRENTPOINT 0x0c21
- 
- /* Get glyph width and look for seac operatorParse charstring */
- static cairo_status_t
-@@ -765,7 +780,6 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
-     const unsigned char *p;
-     cairo_bool_t last_op_was_integer;
-     int command;
--    int subr_num, i;
- 
-     charstring = malloc (encrypted_charstring_length);
-     if (unlikely (charstring == NULL))
-@@ -785,37 +799,60 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
-         if (*p < 32) {
- 	    command = *p++;
- 	    switch (command) {
--	    case TYPE1_CHARSTRING_COMMAND_HSBW:
--		if (! last_op_was_integer)
--		    return CAIRO_INT_STATUS_UNSUPPORTED;
--
--		font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
-+	    case TYPE1_CHARSTRING_COMMAND_HSTEM:
-+	    case TYPE1_CHARSTRING_COMMAND_VSTEM:
-+	    case TYPE1_CHARSTRING_COMMAND_VMOVETO:
-+	    case TYPE1_CHARSTRING_COMMAND_RLINETO:
-+	    case TYPE1_CHARSTRING_COMMAND_HLINETO:
-+	    case TYPE1_CHARSTRING_COMMAND_VLINETO:
-+	    case TYPE1_CHARSTRING_COMMAND_RRCURVETO:
-+	    case TYPE1_CHARSTRING_COMMAND_CLOSEPATH:
-+	    case TYPE1_CHARSTRING_COMMAND_RMOVETO:
-+	    case TYPE1_CHARSTRING_COMMAND_HMOVETO:
-+	    case TYPE1_CHARSTRING_COMMAND_VHCURVETO:
-+	    case TYPE1_CHARSTRING_COMMAND_HVCURVETO:
-+	    case TYPE1_CHARSTRING_COMMAND_RETURN:
-+	    case TYPE1_CHARSTRING_COMMAND_ENDCHAR:
-+	    default:
- 		font->build_stack.sp = 0;
--		last_op_was_integer = FALSE;
- 		break;
- 
- 	    case TYPE1_CHARSTRING_COMMAND_CALLSUBR:
--		if (font->subset_subrs  &&
--		    last_op_was_integer &&
--		    font->build_stack.top_value >= 0    &&
--		    font->build_stack.top_value < font->num_subrs)
--		{
--		    subr_num = font->build_stack.top_value;
--		    font->build_stack.sp--;
--		    font->subrs[subr_num].used = TRUE;
--		    last_op_was_integer = FALSE;
--		    status = cairo_type1_font_subset_parse_charstring (font,
--								       glyph,
--								       font->subrs[subr_num].subr_string,
--								       font->subrs[subr_num].subr_length);
--		} else {
--		    font->subset_subrs = FALSE;
-+		if (font->subset_subrs && font->build_stack.sp > 0) {
-+		    int subr_num = font->build_stack.stack[--font->build_stack.sp];
-+		    if (subr_num >= 0 && subr_num < font->num_subrs) {
-+			font->subrs[subr_num].used = TRUE;
-+			status = cairo_type1_font_subset_parse_charstring (
-+			                                   font,
-+							   glyph,
-+							   font->subrs[subr_num].subr_string,
-+							   font->subrs[subr_num].subr_length);
-+			break;
-+		    }
- 		}
-+		font->subset_subrs = FALSE;
-+		break;
-+
-+	    case TYPE1_CHARSTRING_COMMAND_HSBW:
-+		if (font->build_stack.sp < 2)
-+		    return CAIRO_INT_STATUS_UNSUPPORTED;
-+
-+		font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
-+		font->build_stack.sp = 0;
- 		break;
- 
- 	    case TYPE1_CHARSTRING_COMMAND_ESCAPE:
- 		command = command << 8 | *p++;
- 		switch (command) {
-+		case TYPE1_CHARSTRING_COMMAND_DOTSECTION:
-+		case TYPE1_CHARSTRING_COMMAND_VSTEM3:
-+		case TYPE1_CHARSTRING_COMMAND_HSTEM3:
-+		case TYPE1_CHARSTRING_COMMAND_SETCURRENTPOINT:
-+		case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR:
-+		default:
-+		    font->build_stack.sp = 0;
-+		    break;
-+
- 		case TYPE1_CHARSTRING_COMMAND_SEAC:
- 		    /* The seac command takes five integer arguments.  The
- 		     * last two are glyph indices into the PS standard
-@@ -823,6 +860,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 		     * glyph is composed from.  All we need to do is to
- 		     * make sure those glyphs are present in the subset
- 		     * under their standard names. */
-+		    if (font->build_stack.sp < 5)
-+			return CAIRO_INT_STATUS_UNSUPPORTED;
-+
- 		    status = use_standard_encoding_glyph (font, font->build_stack.stack[3]);
- 		    if (unlikely (status))
- 			return status;
-@@ -832,55 +872,49 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 			return status;
- 
- 		    font->build_stack.sp = 0;
--		    last_op_was_integer = FALSE;
- 		    break;
- 
- 		case TYPE1_CHARSTRING_COMMAND_SBW:
--		    if (! last_op_was_integer)
-+		    if (font->build_stack.sp < 4)
- 			return CAIRO_INT_STATUS_UNSUPPORTED;
- 
- 		    font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em;
- 		    font->build_stack.sp = 0;
--		    last_op_was_integer = FALSE;
--		    break;
--
--		case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR:
--		    for (i = 0; i < font->build_stack.sp; i++)
--			font->ps_stack.other_subr_args[i] = font->build_stack.stack[i];
--		    font->ps_stack.num_other_subr_args = font->build_stack.sp;
--		    font->ps_stack.cur_other_subr_arg = 0;
--		    font->build_stack.sp = 0;
--		    last_op_was_integer = FALSE;
- 		    break;
- 
--		case TYPE1_CHARSTRING_COMMAND_POP:
--		    if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) {
--			font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++];
--			last_op_was_integer = TRUE;
-+		case TYPE1_CHARSTRING_COMMAND_DIV:
-+		    if (font->build_stack.sp < 2) {
-+			return CAIRO_INT_STATUS_UNSUPPORTED;
- 		    } else {
--			font->subset_subrs = FALSE;
-+			double num1 = font->build_stack.stack[font->build_stack.sp - 2];
-+			double num2 = font->build_stack.stack[font->build_stack.sp - 1];
-+			font->build_stack.sp--;
-+			if (num2 == 0.0)
-+			    return CAIRO_INT_STATUS_UNSUPPORTED;
-+
-+			font->build_stack.stack[font->build_stack.sp - 1] = num1/num2;
- 		    }
- 		    break;
- 
--		default:
--		    font->build_stack.sp = 0;
--		    last_op_was_integer = FALSE;
-+		case TYPE1_CHARSTRING_COMMAND_POP:
-+		    if (font->build_stack.sp < TYPE1_STACKSIZE) {
-+			/* use negative number to prevent it being used as a subr_num */
-+			font->build_stack.stack[font->build_stack.sp++] = -1.0;
-+		    }
- 		    break;
- 		}
- 		break;
--
--	    default:
--		font->build_stack.sp = 0;
--		last_op_was_integer = FALSE;
--		break;
- 	    }
--        } else {
-+	} else {
-             /* integer argument */
--	    p = cairo_type1_font_subset_decode_integer (p, &font->build_stack.top_value);
--	    last_op_was_integer = TRUE;
--	    if (font->build_stack.sp < TYPE1_STACKSIZE)
--		font->build_stack.stack[font->build_stack.sp++] = font->build_stack.top_value;
--        }
-+	    if (font->build_stack.sp < TYPE1_STACKSIZE) {
-+		int val;
-+		p = cairo_type1_font_subset_decode_integer (p, &val);
-+		font->build_stack.stack[font->build_stack.sp++] = val;
-+	    } else {
-+		return CAIRO_INT_STATUS_UNSUPPORTED;
-+	    }
-+	}
-     }
- 
-     free (charstring);
-@@ -1321,7 +1355,6 @@ skip_subrs:
-     for (j = 0; j < font->num_glyphs; j++) {
- 	glyph = font->subset_index_to_glyphs[j];
- 	font->build_stack.sp = 0;
--	font->ps_stack.num_other_subr_args = 0;
- 	status = cairo_type1_font_subset_parse_charstring (font,
- 							   glyph,
- 							   font->glyphs[glyph].encrypted_charstring,
---
-cgit v0.9.0.2-2-gbebe
-From f18199fcfb3b052c198041fc05156ae3d9e6aee7 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sun, 28 Oct 2012 10:04:12 +0000
-Subject: xlib/shm: Check for XShm headers
-
-Not all version of libXext ship the same set of headers, so play safe
-and check during configure that we have the headers we depend upon in
-the code.
-
-Reported-by: Sebastian Haas <sehaas@gmail.com>
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/configure.ac b/configure.ac
-index 7adbeb1..021ec8e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -105,6 +105,10 @@ CAIRO_ENABLE_SURFACE_BACKEND(xlib, Xlib, auto, [
- 		  AC_MSG_RESULT(no),
- 		  AC_MSG_RESULT(assuming no))
-       fi
-+
-+      AC_CHECK_HEADERS([X11/extensions/XShm.h X11/extensions/shmproto.h], [], [],
-+		       [#include <X11/Xlibint.h>
-+			#include <X11/Xproto.h>])
- ])
- 
- CAIRO_ENABLE_SURFACE_BACKEND(xlib_xrender, Xlib Xrender, auto, [
-diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c
-index 89f51a9..a3d4385 100644
---- a/src/cairo-xlib-surface-shm.c
-+++ b/src/cairo-xlib-surface-shm.c
-@@ -41,12 +41,105 @@
- 
- #include "cairo-xlib-private.h"
- #include "cairo-xlib-surface-private.h"
--#include "cairo-image-surface-private.h"
--#include "cairo-mempool-private.h"
-+
-+#if !HAVE_X11_EXTENSIONS_XSHM_H || !HAVE_X11_EXTENSIONS_SHMPROTO_H
-+void _cairo_xlib_display_init_shm (cairo_xlib_display_t *display) {}
-+
-+cairo_surface_t *
-+_cairo_xlib_surface_get_shm (cairo_xlib_surface_t *surface,
-+			     cairo_bool_t overwrite)
-+{
-+    return NULL;
-+}
-+
-+cairo_int_status_t
-+_cairo_xlib_surface_put_shm (cairo_xlib_surface_t *surface)
-+{
-+    ASSERT_NOT_REACHED;
-+    return CAIRO_INT_STATUS_SUCCESS;
-+}
-+
-+cairo_surface_t *
-+_cairo_xlib_surface_create_shm (cairo_xlib_surface_t *other,
-+				pixman_format_code_t format,
-+				int width, int height)
-+{
-+    return NULL;
-+}
-+
-+cairo_surface_t *
-+_cairo_xlib_surface_create_shm__image (cairo_xlib_surface_t *surface,
-+				       pixman_format_code_t format,
-+				       int width, int height)
-+{
-+    return NULL;
-+}
-+
-+cairo_surface_t *
-+_cairo_xlib_surface_create_similar_shm (void *other,
-+					cairo_format_t format,
-+					int width, int height)
-+{
-+    return cairo_image_surface_create (format, width, height);
-+}
-+
-+void
-+_cairo_xlib_shm_surface_mark_active (cairo_surface_t *_shm)
-+{
-+    ASSERT_NOT_REACHED;
-+}
-+
-+void
-+_cairo_xlib_shm_surface_get_ximage (cairo_surface_t *surface,
-+				    XImage *ximage)
-+{
-+    ASSERT_NOT_REACHED;
-+}
-+
-+void *
-+_cairo_xlib_shm_surface_get_obdata (cairo_surface_t *surface)
-+{
-+    ASSERT_NOT_REACHED;
-+    return NULL;
-+}
-+
-+Pixmap
-+_cairo_xlib_shm_surface_get_pixmap (cairo_surface_t *surface)
-+{
-+    ASSERT_NOT_REACHED;
-+    return 0;
-+}
-+
-+XRenderPictFormat *
-+_cairo_xlib_shm_surface_get_xrender_format (cairo_surface_t *surface)
-+{
-+    ASSERT_NOT_REACHED;
-+    return NULL;
-+}
-+
-+cairo_bool_t
-+_cairo_xlib_shm_surface_is_active (cairo_surface_t *surface)
-+{
-+    ASSERT_NOT_REACHED;
-+    return FALSE;
-+}
-+
-+cairo_bool_t
-+_cairo_xlib_shm_surface_is_idle (cairo_surface_t *surface)
-+{
-+    ASSERT_NOT_REACHED;
-+    return TRUE;
-+}
-+
-+void _cairo_xlib_display_fini_shm (cairo_xlib_display_t *display) {}
-+
-+#else
- 
- #include "cairo-damage-private.h"
- #include "cairo-default-context-private.h"
-+#include "cairo-image-surface-private.h"
- #include "cairo-list-inline.h"
-+#include "cairo-mempool-private.h"
- 
- #include <X11/Xlibint.h>
- #include <X11/Xproto.h>
-@@ -1281,5 +1374,5 @@ _cairo_xlib_display_fini_shm (cairo_xlib_display_t *display)
-     free (shm);
-     display->shm = NULL;
- }
--
-+#endif
- #endif
---
-cgit v0.9.0.2-2-gbebe
-From 0e2458697848cf8c89c9d57fa9b64f0ea7bd0877 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sun, 28 Oct 2012 10:08:39 +0000
-Subject: xlib/shm: Use shmstr.h instead of shmproto.h if available
-
-Before it was known as shmproto.h, the wire protocol definition was to
-be found in shmstr.h, so if we don't have the current version of libXext
-try to use the older includes.
-
-Reported-by: Sebastian Haas <sehaas@gmail.com>
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/configure.ac b/configure.ac
-index 021ec8e..f523284 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -106,7 +106,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(xlib, Xlib, auto, [
- 		  AC_MSG_RESULT(assuming no))
-       fi
- 
--      AC_CHECK_HEADERS([X11/extensions/XShm.h X11/extensions/shmproto.h], [], [],
-+      AC_CHECK_HEADERS([X11/extensions/XShm.h X11/extensions/shmproto.h X11/extensions/shmstr.h], [], [],
- 		       [#include <X11/Xlibint.h>
- 			#include <X11/Xproto.h>])
- ])
-diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c
-index a3d4385..44e6284 100644
---- a/src/cairo-xlib-surface-shm.c
-+++ b/src/cairo-xlib-surface-shm.c
-@@ -42,7 +42,7 @@
- #include "cairo-xlib-private.h"
- #include "cairo-xlib-surface-private.h"
- 
--#if !HAVE_X11_EXTENSIONS_XSHM_H || !HAVE_X11_EXTENSIONS_SHMPROTO_H
-+#if !HAVE_X11_EXTENSIONS_XSHM_H || !(HAVE_X11_EXTENSIONS_SHMPROTO_H || HAVE_X11_EXTENSIONS_SHMSTR_H)
- void _cairo_xlib_display_init_shm (cairo_xlib_display_t *display) {}
- 
- cairo_surface_t *
-@@ -144,7 +144,11 @@ void _cairo_xlib_display_fini_shm (cairo_xlib_display_t *display) {}
- #include <X11/Xlibint.h>
- #include <X11/Xproto.h>
- #include <X11/extensions/XShm.h>
-+#if HAVE_X11_EXTENSIONS_SHMPROTO_H
- #include <X11/extensions/shmproto.h>
-+#elif HAVE_X11_EXTENSIONS_SHMSTR_H
-+#include <X11/extensions/shmstr.h>
-+#endif
- #include <sys/ipc.h>
- #include <sys/shm.h>
- 
---
-cgit v0.9.0.2-2-gbebe
-From 5a6e1d680a5bf1c4091e74f999abd611abd92334 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Sun, 28 Oct 2012 10:28:52 +0000
-Subject: type1-subset: restore correct callothersub behavior
-
-that was removed in d57e652f. Without this subsetting of subroutines
-won't work for some fonts.
----
-diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
-index c7f613a..786055a 100644
---- a/src/cairo-type1-subset.c
-+++ b/src/cairo-type1-subset.c
-@@ -141,6 +141,11 @@ typedef struct _cairo_type1_font_subset {
- 	int sp;
-     } build_stack;
- 
-+    struct {
-+	int stack[TYPE1_STACKSIZE];
-+	int sp;
-+    } ps_stack;
-+
- 
- } cairo_type1_font_subset_t;
- 
-@@ -767,7 +772,9 @@ use_standard_encoding_glyph (cairo_type1_font_subset_t *font, int index)
- #define TYPE1_CHARSTRING_COMMAND_POP	         0x0c11
- #define TYPE1_CHARSTRING_COMMAND_SETCURRENTPOINT 0x0c21
- 
--/* Get glyph width and look for seac operatorParse charstring */
-+/* Parse the charstring, including recursing into subroutines. Find
-+ * the glyph width, subroutines called, and glyphs required by the
-+ * SEAC operator. */
- static cairo_status_t
- cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 					  int                        glyph,
-@@ -814,6 +821,7 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 	    case TYPE1_CHARSTRING_COMMAND_RETURN:
- 	    case TYPE1_CHARSTRING_COMMAND_ENDCHAR:
- 	    default:
-+		/* stack clearing operator */
- 		font->build_stack.sp = 0;
- 		break;
- 
-@@ -848,8 +856,8 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 		case TYPE1_CHARSTRING_COMMAND_VSTEM3:
- 		case TYPE1_CHARSTRING_COMMAND_HSTEM3:
- 		case TYPE1_CHARSTRING_COMMAND_SETCURRENTPOINT:
--		case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR:
- 		default:
-+		    /* stack clearing operator */
- 		    font->build_stack.sp = 0;
- 		    break;
- 
-@@ -896,11 +904,25 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 		    }
- 		    break;
- 
-+		case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR:
-+		    if (font->build_stack.sp < 1)
-+			return CAIRO_INT_STATUS_UNSUPPORTED;
-+
-+		    font->build_stack.sp--;
-+		    font->ps_stack.sp = 0;
-+		    while (font->build_stack.sp)
-+			font->ps_stack.stack[font->ps_stack.sp++] = font->build_stack.stack[--font->build_stack.sp];
-+
-+                    break;
-+
- 		case TYPE1_CHARSTRING_COMMAND_POP:
--		    if (font->build_stack.sp < TYPE1_STACKSIZE) {
--			/* use negative number to prevent it being used as a subr_num */
--			font->build_stack.stack[font->build_stack.sp++] = -1.0;
--		    }
-+		    if (font->ps_stack.sp < 1)
-+			return CAIRO_INT_STATUS_UNSUPPORTED;
-+
-+		    /* T1 spec states that if the interpreter does not
-+		     * support executing the callothersub, the results
-+		     * must be taken from the callothersub arguments. */
-+		    font->build_stack.stack[font->build_stack.sp++] = font->ps_stack.stack[--font->ps_stack.sp];
- 		    break;
- 		}
- 		break;
-@@ -1355,6 +1377,7 @@ skip_subrs:
-     for (j = 0; j < font->num_glyphs; j++) {
- 	glyph = font->subset_index_to_glyphs[j];
- 	font->build_stack.sp = 0;
-+	font->ps_stack.sp = 0;
- 	status = cairo_type1_font_subset_parse_charstring (font,
- 							   glyph,
- 							   font->glyphs[glyph].encrypted_charstring,
---
-cgit v0.9.0.2-2-gbebe
-From 0c800dc3f64ee030df1cd0a6a1dcd6df71502dea Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Tue, 30 Oct 2012 08:53:30 +0000
-Subject: type1-subset: ensure subroutine numnber is an integer
-
----
-diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
-index 786055a..dff4a95 100644
---- a/src/cairo-type1-subset.c
-+++ b/src/cairo-type1-subset.c
-@@ -827,15 +827,18 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 
- 	    case TYPE1_CHARSTRING_COMMAND_CALLSUBR:
- 		if (font->subset_subrs && font->build_stack.sp > 0) {
--		    int subr_num = font->build_stack.stack[--font->build_stack.sp];
--		    if (subr_num >= 0 && subr_num < font->num_subrs) {
--			font->subrs[subr_num].used = TRUE;
--			status = cairo_type1_font_subset_parse_charstring (
--			                                   font,
--							   glyph,
--							   font->subrs[subr_num].subr_string,
--							   font->subrs[subr_num].subr_length);
--			break;
-+		    double int_val;
-+		    if (modf(font->build_stack.stack[--font->build_stack.sp], &int_val) == 0.0) {
-+			int subr_num = int_val;
-+			if (subr_num >= 0 && subr_num < font->num_subrs) {
-+			    font->subrs[subr_num].used = TRUE;
-+			    status = cairo_type1_font_subset_parse_charstring (
-+				font,
-+				glyph,
-+				font->subrs[subr_num].subr_string,
-+				font->subrs[subr_num].subr_length);
-+			    break;
-+			}
- 		    }
- 		}
- 		font->subset_subrs = FALSE;
---
-cgit v0.9.0.2-2-gbebe
-From 65176b7380f0d633da514be1febe16f17b99d876 Mon Sep 17 00:00:00 2001
-From: Kevin Tardif <kiyoka@gmail.com>
-Date: Tue, 30 Oct 2012 04:27:27 +0000
-Subject: type1-subset, cff-subset: Plugged 2 memory leaks
-
-- _cairo_type1_font_subset_fini doesn't free font->cleartext
-- _cairo_cff_font_create can exit without freeing font->font_name and/or
-  font->data; _cairo_cff_font_load_opentype_cff is called to allocate
-  font_name, then _cairo_cff_font_load_cff is called to allocate
-  font->data, then _cairo_cff_font_load_cff's return status is checked
-  and if it failed, it jumps to fail1. This can cause font_name to leak
-  since the fail1 target only frees the font variable. In addition,
-  _cairo_cff_font_load_cff can fail -after- allocating data, and then
-  data won't be freed either.
-
-Bug 56566
----
-diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c
-index e3040fc..bd8d5b5 100644
---- a/src/cairo-cff-subset.c
-+++ b/src/cairo-cff-subset.c
-@@ -2787,7 +2787,7 @@ _cairo_cff_font_create (cairo_scaled_font_subset_t  *scaled_font_subset,
-     if (backend->is_synthetic && backend->is_synthetic (scaled_font_subset->scaled_font))
- 	return CAIRO_INT_STATUS_UNSUPPORTED;
- 
--    font = malloc (sizeof (cairo_cff_font_t));
-+    font = calloc (1, sizeof (cairo_cff_font_t));
-     if (unlikely (font == NULL))
-         return _cairo_error (CAIRO_STATUS_NO_MEMORY);
- 
-@@ -2862,11 +2862,11 @@ fail4:
- fail3:
-     free (font->subset_font_name);
- fail2:
--    free (font->data);
--    free (font->font_name);
-     free (font->ps_name);
-     _cairo_array_fini (&font->output);
- fail1:
-+    free (font->data);
-+    free (font->font_name);
-     free (font);
- 
-     return status;
-diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
-index dff4a95..2ec56f1 100644
---- a/src/cairo-type1-subset.c
-+++ b/src/cairo-type1-subset.c
-@@ -1670,6 +1670,8 @@ _cairo_type1_font_subset_fini (cairo_type1_font_subset_t *font)
- 
-     free (font->subset_index_to_glyphs);
- 
-+    free (font->cleartext);
-+
-     return status;
- }
- 
---
-cgit v0.9.0.2-2-gbebe
-From 66625cb46c985321c46b79d2163a4d676d6700ba Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Tue, 30 Oct 2012 12:40:41 +0000
-Subject: xlib: Apply the image offsets to the destination rather the source
-
-So that we can specify the entire source surface as the region to copy
-and not introduce clipping errors.
-
-Fixes regression from
-commit c068691ff57c2f6cd750a54db17393c0e132cb00
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date:   Fri Aug 17 21:33:54 2012 +0100
-
-    xlib/shm: Use an impromptu upload ShmSegment
-
-Reported-by: John Lindgren <john.lindgren@aol.com>
-Reported-by: Kalev Lember <kalevlember@gmail.com>
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56547
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-xlib-render-compositor.c b/src/cairo-xlib-render-compositor.c
-index e325382..74c43e9 100644
---- a/src/cairo-xlib-render-compositor.c
-+++ b/src/cairo-xlib-render-compositor.c
-@@ -179,22 +179,19 @@ copy_image_boxes (void *_dst,
- 		int x2 = _cairo_fixed_integer_part (chunk->base[i].p2.x);
- 		int y2 = _cairo_fixed_integer_part (chunk->base[i].p2.y);
- 
--		rects[j].x = x1;
--		rects[j].y = y1;
--		rects[j].width  = x2 - x1;
--		rects[j].height = y2 - y1;
--		j++;
-+		if (x2 > x1 && y2 > y1) {
-+		    rects[j].x = x1;
-+		    rects[j].y = y1;
-+		    rects[j].width  = x2 - x1;
-+		    rects[j].height = y2 - y1;
-+		    j++;
-+		}
- 	    }
- 	}
--	assert (j == boxes->num_boxes);
- 
- 	XSetClipRectangles (dst->dpy, gc, 0, 0, rects, j, Unsorted);
--
- 	XCopyArea (dst->dpy, src, dst->drawable, gc,
--		   dx, dy,
--		   image->width,  image->height,
--		   0,      0);
--
-+		   0, 0, image->width, image->height, -dx, -dy);
- 	XSetClipMask (dst->dpy, gc, None);
- 
- 	if (rects != stack_rects)
-@@ -337,7 +334,8 @@ draw_image_boxes (void *_dst,
- 
- 	    if (_cairo_xlib_shm_surface_get_pixmap (&image->base)) {
- 		status = copy_image_boxes (dst, image, boxes, dx, dy);
--		goto out;
-+		if (status != CAIRO_INT_STATUS_UNSUPPORTED)
-+		    goto out;
- 	    }
- 	}
-     }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/cairo/git_fixes.patch b/extra/cairo/git_fixes.patch
deleted file mode 100644
index 6ad8979eb..000000000
--- a/extra/cairo/git_fixes.patch
+++ /dev/null
@@ -1,1086 +0,0 @@
-From ede11b2954db19e3ca9d31cef7d04a7bf0e42ddc Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod <behdad@behdad.org>
-Date: Sun, 25 Mar 2012 18:37:14 +0000
-Subject: Fix math in comments
-
----
-diff --git a/src/cairo-arc.c b/src/cairo-arc.c
-index dc07fee..6977e88 100644
---- a/src/cairo-arc.c
-+++ b/src/cairo-arc.c
-@@ -139,7 +139,7 @@ _arc_segments_needed (double	      angle,
- 
-    From that paper, a very practical value of h is:
- 
--	h = 4/3 * tan(angle/4)
-+	h = 4/3 * R * tan(angle/4)
- 
-    This value does not give the spline with minimal error, but it does
-    provide a very good approximation, (6th-order convergence), and the
---
-cgit v0.9.0.2-2-gbebe
-From fba21ef2a4c4eb343668267fda713aedbb6af2a4 Mon Sep 17 00:00:00 2001
-From: Henry (Yu) Song <hsong@sisa.samsung.com>
-Date: Tue, 27 Mar 2012 21:25:37 +0000
-Subject: gl: use font's antialias option to check whether it needs mask
-
-There is need to loop over number of glyphs to check wether the glyph
-image is a ARGB32 as the font's antialias option can be used for checking.
-If antialias is SUBPIXEL or BEST, the glyph surface will be ARGB32,
-otherwise it will be A8 format. Therefore we will only be using
-component-alpha at SUBPIXEL (or better) font quality and only then need
-a mask for multiple pass glyph composition.
----
-diff --git a/src/cairo-gl-glyphs.c b/src/cairo-gl-glyphs.c
-index 832956f..9756ea4 100644
---- a/src/cairo-gl-glyphs.c
-+++ b/src/cairo-gl-glyphs.c
-@@ -427,23 +427,15 @@ _cairo_gl_composite_glyphs (void			*_dst,
- 
-     TRACE ((stderr, "%s\n", __FUNCTION__));
- 
--    /* If any of the glyphs are component alpha, we have to go through a mask,
--     * since only _cairo_gl_surface_composite() currently supports component
--     * alpha.
-+    /* If any of the glyphs require component alpha, we have to go through
-+     * a mask, since only _cairo_gl_surface_composite() currently supports
-+     * component alpha.
-      */
--    if (!dst->base.is_clear && ! info->use_mask && op != CAIRO_OPERATOR_OVER) {
--	for (i = 0; i < info->num_glyphs; i++) {
--	    cairo_scaled_glyph_t *scaled_glyph;
--
--	    if (_cairo_scaled_glyph_lookup (info->font, info->glyphs[i].index,
--					    CAIRO_SCALED_GLYPH_INFO_SURFACE,
--					    &scaled_glyph) == CAIRO_INT_STATUS_SUCCESS &&
--		scaled_glyph->surface->format == CAIRO_FORMAT_ARGB32)
--	    {
--		info->use_mask = TRUE;
--		break;
--	    }
--	}
-+    if (!dst->base.is_clear && ! info->use_mask && op != CAIRO_OPERATOR_OVER &&
-+	(info->font->options.antialias == CAIRO_ANTIALIAS_SUBPIXEL ||
-+	 info->font->options.antialias == CAIRO_ANTIALIAS_BEST))
-+    {
-+	info->use_mask = TRUE;
-     }
- 
-     if (info->use_mask) {
---
-cgit v0.9.0.2-2-gbebe
-From d304f0e57be8036719c3709e2419487326369105 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Wed, 28 Mar 2012 23:32:36 +0000
-Subject: composite-rectangles: Trim extents for SOURCE and CLEAR to the mask
-
-The SOURCE and CLEAR are the odd pair in Cairo's range of operators that
-are bound by the shape/mask, but are unbound by the source. This
-regularly leads to bugs as only track the bound/unbound rectangles and
-confuse the meaning when bound only by the mask.
-
-What is required is that the unbound extents in this case is only
-trimmed by the mask (the bounded extents are still the intersection of
-all).
-
-Fixes bug-source-cu
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-composite-rectangles.c b/src/cairo-composite-rectangles.c
-index 106571e..8c5cd5a 100644
---- a/src/cairo-composite-rectangles.c
-+++ b/src/cairo-composite-rectangles.c
-@@ -147,8 +147,12 @@ _cairo_composite_rectangles_intersect (cairo_composite_rectangles_t *extents,
-     if (! ret && extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK)
- 	return CAIRO_INT_STATUS_NOTHING_TO_DO;
- 
--    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE))
-+    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) {
- 	extents->unbounded = extents->bounded;
-+    } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) {
-+	if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask))
-+	    return CAIRO_INT_STATUS_NOTHING_TO_DO;
-+    }
- 
-     extents->clip = _cairo_clip_reduce_for_composite (clip, extents);
-     if (_cairo_clip_is_all_clipped (extents->clip))
-@@ -199,8 +203,12 @@ _cairo_composite_rectangles_intersect_source_extents (cairo_composite_rectangles
- 	rect.height == extents->bounded.height)
- 	return CAIRO_INT_STATUS_SUCCESS;
- 
--    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE))
-+    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) {
- 	extents->unbounded = extents->bounded;
-+    } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) {
-+	if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask))
-+	    return CAIRO_INT_STATUS_NOTHING_TO_DO;
-+    }
- 
-     clip = extents->clip;
-     extents->clip = _cairo_clip_reduce_for_composite (clip, extents);
-@@ -253,8 +261,12 @@ _cairo_composite_rectangles_intersect_mask_extents (cairo_composite_rectangles_t
- 	mask.height == extents->bounded.height)
- 	return CAIRO_INT_STATUS_SUCCESS;
- 
--    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE))
-+    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) {
- 	extents->unbounded = extents->bounded;
-+    } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) {
-+	if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask))
-+	    return CAIRO_INT_STATUS_NOTHING_TO_DO;
-+    }
- 
-     clip = extents->clip;
-     extents->clip = _cairo_clip_reduce_for_composite (clip, extents);
---
-cgit v0.9.0.2-2-gbebe
-From af6e084dd78fcbb8ecce46c57f655f5e24343b8c Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Thu, 29 Mar 2012 13:48:24 +0000
-Subject: cairoint: Mark PDF surface as requiring the deflate stream output
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairoint.h b/src/cairoint.h
-index 9a8003e..9f20d51 100644
---- a/src/cairoint.h
-+++ b/src/cairoint.h
-@@ -73,7 +73,10 @@
- #include "cairo-compiler-private.h"
- #include "cairo-error-private.h"
- 
--#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_SCRIPT_SURFACE || CAIRO_HAS_XML_SURFACE
-+#if CAIRO_HAS_PDF_SURFACE    || \
-+    CAIRO_HAS_PS_SURFACE     || \
-+    CAIRO_HAS_SCRIPT_SURFACE || \
-+    CAIRO_HAS_XML_SURFACE
- #define CAIRO_HAS_DEFLATE_STREAM 1
- #endif
- 
-@@ -84,7 +87,9 @@
- #define CAIRO_HAS_FONT_SUBSET 1
- #endif
- 
--#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_PDF_SURFACE || CAIRO_HAS_FONT_SUBSET
-+#if CAIRO_HAS_PS_SURFACE  || \
-+    CAIRO_HAS_PDF_SURFACE || \
-+    CAIRO_HAS_FONT_SUBSET
- #define CAIRO_HAS_PDF_OPERATORS 1
- #endif
- 
---
-cgit v0.9.0.2-2-gbebe
-From a965b0f95fdeb567f7ccb51f7c8c47735a61e2d9 Mon Sep 17 00:00:00 2001
-From: Henry (Yu) Song <hsong@sisa.samsung.com>
-Date: Thu, 29 Mar 2012 01:08:51 +0000
-Subject: gl: fix y-axis origin when map_to_image() for non texture GL surface
-
-We need to fix y-axis origin when map a GL surface to image surface for
-non-texture GL surface.
-
-Test cases: extended-blend-alpha-mask, extended-blend-mask.
-Although the image outputs is not right, but the image on the first grid
-(upper-left corner) is correct comparing to image output.
----
-diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c
-index 8bbf939..32ecf63 100644
---- a/src/cairo-gl-surface.c
-+++ b/src/cairo-gl-surface.c
-@@ -985,6 +985,7 @@ _cairo_gl_surface_map_to_image (void      *abstract_surface,
-     unsigned int cpp;
-     cairo_bool_t invert;
-     cairo_status_t status;
-+    int y;
- 
-     /* Want to use a switch statement here but the compiler gets whiny. */
-     if (surface->base.content == CAIRO_CONTENT_COLOR_ALPHA) {
-@@ -1065,7 +1066,12 @@ _cairo_gl_surface_map_to_image (void      *abstract_surface,
- 	glPixelStorei (GL_PACK_ROW_LENGTH, image->stride / cpp);
-     if (invert)
- 	glPixelStorei (GL_PACK_INVERT_MESA, 1);
--    glReadPixels (extents->x, extents->y,
-+
-+    y = extents->y;
-+    if (! _cairo_gl_surface_is_texture (surface))
-+	y = surface->height - extents->y - extents->height;
-+
-+    glReadPixels (extents->x, y,
- 		  extents->width, extents->height,
- 		  format, type, image->data);
-     if (invert)
---
-cgit v0.9.0.2-2-gbebe
-From c77112c5464d7ff21052527f82f4d729cc509291 Mon Sep 17 00:00:00 2001
-From: Uli Schlachter <psychon@znc.in>
-Date: Mon, 02 Apr 2012 18:43:00 +0000
-Subject: xcb: Fix SHM in _get_image()
-
-Commit 2283ab9 introduced a logic error. Instead of falling back to the non-SHM
-path when getting the image via SHM failed, we now did the fallback when getting
-the image via SHM worked (which means that the SHM operation was a waste of
-time).
-
-Signed-off-by: Uli Schlachter <psychon@znc.in>
----
-diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
-index fff4f52..6bedbda 100644
---- a/src/cairo-xcb-surface.c
-+++ b/src/cairo-xcb-surface.c
-@@ -367,7 +367,7 @@ _get_image (cairo_xcb_surface_t		 *surface,
-     if (use_shm) {
- 	image = _get_shm_image (surface, x, y, width, height);
- 	if (image) {
--	    if (image->status) {
-+	    if (image->status == CAIRO_STATUS_SUCCESS) {
- 		_cairo_xcb_connection_release (connection);
- 		return image;
- 	    }
---
-cgit v0.9.0.2-2-gbebe
-From cc247c346b75353f16ab40ac74c54cdd9663d16b Mon Sep 17 00:00:00 2001
-From: Henry (Yu) Song <hsong@sisa.samsung.com>
-Date: Mon, 02 Apr 2012 21:29:47 +0000
-Subject: gl: Remove an unused variable
-
----
-diff --git a/src/cairo-gl-gradient.c b/src/cairo-gl-gradient.c
-index b364b92..ce7c0dd 100644
---- a/src/cairo-gl-gradient.c
-+++ b/src/cairo-gl-gradient.c
-@@ -207,7 +207,6 @@ _cairo_gl_gradient_create (cairo_gl_context_t           *ctx,
-     cairo_status_t status;
-     int tex_width;
-     void *data;
--    cairo_gl_dispatch_t *dispatch = &ctx->dispatch;
- 
-     if ((unsigned int) ctx->max_texture_size / 2 <= n_stops)
- 	return CAIRO_INT_STATUS_UNSUPPORTED;
---
-cgit v0.9.0.2-2-gbebe
-From 7a262fd398c8a1f3c9052e8d9ec459e27ff91b4d Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Wed, 04 Apr 2012 10:23:09 +0000
-Subject: fix bug in _cairo_image_analyze_color
-
----
-diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c
-index 8208a15..e860e1b 100644
---- a/src/cairo-image-surface.c
-+++ b/src/cairo-image-surface.c
-@@ -1130,9 +1130,12 @@ _cairo_image_analyze_color (cairo_image_surface_t      *image)
-     if (image->color != CAIRO_IMAGE_UNKNOWN_COLOR)
- 	return image->color;
- 
--    if (image->format == CAIRO_FORMAT_A1 || image->format == CAIRO_FORMAT_A8)
-+    if (image->format == CAIRO_FORMAT_A1)
- 	return image->color = CAIRO_IMAGE_IS_MONOCHROME;
- 
-+    if (image->format == CAIRO_FORMAT_A8)
-+	return image->color = CAIRO_IMAGE_IS_GRAYSCALE;
-+
-     if (image->format == CAIRO_FORMAT_ARGB32) {
- 	image->color = CAIRO_IMAGE_IS_MONOCHROME;
- 	for (y = 0; y < image->height; y++) {
---
-cgit v0.9.0.2-2-gbebe
-From 70b2856ed3d31b41e69b3d82fb9c5c11c2b3d3d4 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Thu, 05 Apr 2012 23:43:35 +0000
-Subject: type1-subset: use fallback font if glyph widths are calculated
-
-Bug 48349 has a pdf file with a Type 1 font where the glyph widths are
-of the form:
-
-34 9302 19 div hsbw
----
-diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
-index 607ac8e..ba1008a 100644
---- a/src/cairo-type1-subset.c
-+++ b/src/cairo-type1-subset.c
-@@ -751,6 +751,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 	    command = *p++;
- 	    switch (command) {
- 		case TYPE1_CHARSTRING_COMMAND_HSBW:
-+		     if (! last_op_was_integer)
-+			  return CAIRO_INT_STATUS_UNSUPPORTED;
-+
- 		    font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
- 		    font->build_stack.sp = 0;
- 		    last_op_was_integer = FALSE;
-@@ -797,6 +800,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 			    break;
- 
- 			case TYPE1_CHARSTRING_COMMAND_SBW:
-+			     if (! last_op_was_integer)
-+				  return CAIRO_INT_STATUS_UNSUPPORTED;
-+
- 			    font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em;
- 			    font->build_stack.sp = 0;
- 			    last_op_was_integer = FALSE;
---
-cgit v0.9.0.2-2-gbebe
-From a6d955fcc46ae2da8d6f3b2cadeae64c03066461 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Thu, 05 Apr 2012 23:53:50 +0000
-Subject: fix indentation in cairo_type1_font_subset_parse_charstring
-
----
-diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
-index ba1008a..ddef8ae 100644
---- a/src/cairo-type1-subset.c
-+++ b/src/cairo-type1-subset.c
-@@ -1,3 +1,4 @@
-+/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */
- /* cairo - a vector graphics library with display and print output
-  *
-  * Copyright © 2006 Red Hat, Inc
-@@ -750,86 +751,79 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
-         if (*p < 32) {
- 	    command = *p++;
- 	    switch (command) {
--		case TYPE1_CHARSTRING_COMMAND_HSBW:
--		     if (! last_op_was_integer)
--			  return CAIRO_INT_STATUS_UNSUPPORTED;
-+	    case TYPE1_CHARSTRING_COMMAND_HSBW:
-+		if (! last_op_was_integer)
-+		    return CAIRO_INT_STATUS_UNSUPPORTED;
-+
-+		font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
-+		font->build_stack.sp = 0;
-+		last_op_was_integer = FALSE;
-+		break;
-+
-+	    case TYPE1_CHARSTRING_COMMAND_CALLSUBR:
-+		if (font->subset_subrs  &&
-+		    last_op_was_integer &&
-+		    font->build_stack.top_value >= 0    &&
-+		    font->build_stack.top_value < font->num_subrs)
-+		{
-+		    subr_num = font->build_stack.top_value;
-+		    font->subrs[subr_num].used = TRUE;
-+		    last_op_was_integer = FALSE;
-+		    status = cairo_type1_font_subset_parse_charstring (font,
-+								       glyph,
-+								       font->subrs[subr_num].subr_string,
-+								       font->subrs[subr_num].subr_length);
-+		} else {
-+		    font->subset_subrs = FALSE;
-+		}
-+		break;
-+
-+	    case TYPE1_CHARSTRING_COMMAND_ESCAPE:
-+		command = command << 8 | *p++;
-+		switch (command) {
-+		case TYPE1_CHARSTRING_COMMAND_SEAC:
-+		    /* The seac command takes five integer arguments.  The
-+		     * last two are glyph indices into the PS standard
-+		     * encoding give the names of the glyphs that this
-+		     * glyph is composed from.  All we need to do is to
-+		     * make sure those glyphs are present in the subset
-+		     * under their standard names. */
-+		    status = use_standard_encoding_glyph (font, font->build_stack.stack[3]);
-+		    if (unlikely (status))
-+			return status;
-+
-+		    status = use_standard_encoding_glyph (font, font->build_stack.stack[4]);
-+		    if (unlikely (status))
-+			return status;
- 
--		    font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
- 		    font->build_stack.sp = 0;
- 		    last_op_was_integer = FALSE;
- 		    break;
- 
--		case TYPE1_CHARSTRING_COMMAND_CALLSUBR:
--		    if (font->subset_subrs  &&
--			last_op_was_integer &&
--			font->build_stack.top_value >= 0    &&
--			font->build_stack.top_value < font->num_subrs)
--		    {
--			subr_num = font->build_stack.top_value;
--			font->subrs[subr_num].used = TRUE;
--			last_op_was_integer = FALSE;
--			status = cairo_type1_font_subset_parse_charstring (font,
--									   glyph,
--									   font->subrs[subr_num].subr_string,
--									   font->subrs[subr_num].subr_length);
--		    } else {
--			font->subset_subrs = FALSE;
--		    }
-+		case TYPE1_CHARSTRING_COMMAND_SBW:
-+		    if (! last_op_was_integer)
-+			return CAIRO_INT_STATUS_UNSUPPORTED;
-+
-+		    font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em;
-+		    font->build_stack.sp = 0;
-+		    last_op_was_integer = FALSE;
- 		    break;
- 
--		case TYPE1_CHARSTRING_COMMAND_ESCAPE:
--		    command = command << 8 | *p++;
--		    switch (command) {
--			case TYPE1_CHARSTRING_COMMAND_SEAC:
--			    /* The seac command takes five integer arguments.  The
--			     * last two are glyph indices into the PS standard
--			     * encoding give the names of the glyphs that this
--			     * glyph is composed from.  All we need to do is to
--			     * make sure those glyphs are present in the subset
--			     * under their standard names. */
--			    status = use_standard_encoding_glyph (font, font->build_stack.stack[3]);
--			    if (unlikely (status))
--				return status;
--
--			    status = use_standard_encoding_glyph (font, font->build_stack.stack[4]);
--			    if (unlikely (status))
--				return status;
--
--			    font->build_stack.sp = 0;
--			    last_op_was_integer = FALSE;
--			    break;
--
--			case TYPE1_CHARSTRING_COMMAND_SBW:
--			     if (! last_op_was_integer)
--				  return CAIRO_INT_STATUS_UNSUPPORTED;
--
--			    font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em;
--			    font->build_stack.sp = 0;
--			    last_op_was_integer = FALSE;
--			    break;
--
--			case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR:
--			    for (i = 0; i < font->build_stack.sp; i++)
--				font->ps_stack.other_subr_args[i] = font->build_stack.stack[i];
--			    font->ps_stack.num_other_subr_args = font->build_stack.sp;
--			    font->ps_stack.cur_other_subr_arg = 0;
--			    font->build_stack.sp = 0;
--			    last_op_was_integer = FALSE;
--			    break;
--
--			case TYPE1_CHARSTRING_COMMAND_POP:
--			    if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) {
--				font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++];
--				last_op_was_integer = TRUE;
--			    } else {
--				font->subset_subrs = FALSE;
--			    }
--			    break;
--
--			default:
--			    font->build_stack.sp = 0;
--			    last_op_was_integer = FALSE;
--			    break;
-+		case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR:
-+		    for (i = 0; i < font->build_stack.sp; i++)
-+			font->ps_stack.other_subr_args[i] = font->build_stack.stack[i];
-+		    font->ps_stack.num_other_subr_args = font->build_stack.sp;
-+		    font->ps_stack.cur_other_subr_arg = 0;
-+		    font->build_stack.sp = 0;
-+		    last_op_was_integer = FALSE;
-+		    break;
-+
-+		case TYPE1_CHARSTRING_COMMAND_POP:
-+		    if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) {
-+			font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++];
-+			last_op_was_integer = TRUE;
-+		    } else {
-+			font->subset_subrs = FALSE;
- 		    }
- 		    break;
- 
-@@ -837,6 +831,13 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 		    font->build_stack.sp = 0;
- 		    last_op_was_integer = FALSE;
- 		    break;
-+		}
-+		break;
-+
-+	    default:
-+		font->build_stack.sp = 0;
-+		last_op_was_integer = FALSE;
-+		break;
- 	    }
-         } else {
-             /* integer argument */
---
-cgit v0.9.0.2-2-gbebe
-From 8886220b5027296f5b3b95e9c2f93509108d3b9e Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Fri, 06 Apr 2012 00:13:53 +0000
-Subject: type1-subset: if font name is prefixed with a subset tag, strip it off
-
----
-diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
-index ddef8ae..e507abe 100644
---- a/src/cairo-type1-subset.c
-+++ b/src/cairo-type1-subset.c
-@@ -381,6 +381,7 @@ cairo_type1_font_subset_get_fontname (cairo_type1_font_subset_t *font)
- {
-     const char *start, *end, *segment_end;
-     char *s;
-+    int i;
- 
-     segment_end = font->header_segment + font->header_segment_size;
-     start = find_token (font->header_segment, segment_end, "/FontName");
-@@ -406,6 +407,16 @@ cairo_type1_font_subset_get_fontname (cairo_type1_font_subset_t *font)
- 	return CAIRO_INT_STATUS_UNSUPPORTED;
-     }
- 
-+    /* If font name is prefixed with a subset tag, strip it off. */
-+    if (strlen(start) > 7 && start[6] == '+') {
-+	for (i = 0; i < 6; i++) {
-+	    if (start[i] < 'A' || start[i] > 'Z')
-+		break;
-+	}
-+	if (i == 6)
-+	    start += 7;
-+    }
-+
-     font->base.base_font = strdup (start);
-     free (s);
-     if (unlikely (font->base.base_font == NULL))
---
-cgit v0.9.0.2-2-gbebe
-From 8657ca10e34b0034602680b4304d47ecf90ccbfd Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Fri, 06 Apr 2012 11:50:40 +0000
-Subject: fix _cairo_pattern_get_ink_extents to work with snapshot recording surfaces
-
-It had caused pdf bbox sizes to regress to page size bboxes.
----
-diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
-index 27ba004..5b3e177 100644
---- a/src/cairo-pattern.c
-+++ b/src/cairo-pattern.c
-@@ -37,6 +37,7 @@
- #include "cairo-path-private.h"
- #include "cairo-pattern-private.h"
- #include "cairo-recording-surface-private.h"
-+#include "cairo-surface-snapshot-private.h"
- 
- #include <float.h>
- 
-@@ -3666,6 +3667,9 @@ _cairo_pattern_get_ink_extents (const cairo_pattern_t         *pattern,
- 	    (const cairo_surface_pattern_t *) pattern;
- 	cairo_surface_t *surface = surface_pattern->surface;
- 
-+	if (_cairo_surface_is_snapshot (surface))
-+	    surface = _cairo_surface_snapshot_get_target (surface);
-+
- 	if (_cairo_surface_is_recording (surface)) {
- 	    cairo_matrix_t imatrix;
- 	    cairo_box_t box;
---
-cgit v0.9.0.2-2-gbebe
-From 6f28f0b33cb12f3b2dd48c87da0018bd00c17107 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sun, 08 Apr 2012 10:28:59 +0000
-Subject: stroke: Fix misuse of half_line_x for vertical caps on dashes
-
-A typo using half_line_x instead of half_line_y when emitting dashed
-segments of the rectilinear stroke.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-path-stroke-boxes.c b/src/cairo-path-stroke-boxes.c
-index 3e8c5a4..cc9dd19 100644
---- a/src/cairo-path-stroke-boxes.c
-+++ b/src/cairo-path-stroke-boxes.c
-@@ -342,15 +342,15 @@ _cairo_rectilinear_stroker_emit_segments_dashed (cairo_rectilinear_stroker_t *st
- 		    box.p1.x = box.p2.x - half_line_x;
- 		}
- 		if (out_slope.dy >= 0)
--		    box.p1.y -= half_line_x;
-+		    box.p1.y -= half_line_y;
- 		if (out_slope.dy <= 0)
--		    box.p2.y += half_line_x;
-+		    box.p2.y += half_line_y;
- 	    } else {
- 		if (box.p1.y <= box.p2.y) {
- 		    box.p1.y = box.p2.y;
--		    box.p2.y += half_line_x;
-+		    box.p2.y += half_line_y;
- 		} else {
--		    box.p1.y = box.p2.y - half_line_x;
-+		    box.p1.y = box.p2.y - half_line_y;
- 		}
- 		if (out_slope.dx >= 0)
- 		    box.p1.x -= half_line_x;
---
-cgit v0.9.0.2-2-gbebe
-From 113ec6bf0c8ed1ff12293d1ed2a2de9bd5b9904b Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sun, 08 Apr 2012 16:58:13 +0000
-Subject: traps: Clip the trapezoid extents against the clip extents
-
-Just in case the clip polygon turns out to be much larger than the
-operation extents (silly us for not reducing it correctly) and lead to
-catastrophe, such as:
-
-Program received signal SIGSEGV, Segmentation fault.
-pixman_fill_sse2 (bits=<optimized out>, stride=4, bpp=8, x=0, y=0,
-width=3, height=-34811, data=0) at pixman-sse2.c:3369
-3369		    *(uint16_t *)d = data;
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-traps-compositor.c b/src/cairo-traps-compositor.c
-index 284a0be..c49e208 100644
---- a/src/cairo-traps-compositor.c
-+++ b/src/cairo-traps-compositor.c
-@@ -218,8 +218,13 @@ combine_clip_as_traps (const cairo_traps_compositor_t *compositor,
-     _cairo_traps_fini (&traps);
-     cairo_surface_destroy (src);
- 
--    if (status == CAIRO_INT_STATUS_SUCCESS &&
--	(fixup.width < extents->width || fixup.height < extents->height)) {
-+    if (unlikely (status))
-+	return status;
-+
-+    if (! _cairo_rectangle_intersect (&fixup, extents))
-+	return CAIRO_STATUS_SUCCESS;
-+
-+    if (fixup.width < extents->width || fixup.height < extents->height) {
- 	cairo_boxes_t clear;
- 
- 	_cairo_boxes_init (&clear);
---
-cgit v0.9.0.2-2-gbebe
-From de61681574eb7d6e0e497ea7f25797e3d9b20ac4 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Mon, 09 Apr 2012 11:47:34 +0000
-Subject: build: Disable -Wset-but-unused-variable
-
-This is too noisy in the current build, and masking more important
-warnings.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
-index 3eb0104..f1b17f4 100644
---- a/build/configure.ac.warnings
-+++ b/build/configure.ac.warnings
-@@ -21,6 +21,9 @@ MAYBE_WARN="-Wall -Wextra \
- -Wno-missing-field-initializers -Wno-unused-parameter \
- -Wno-attributes -Wno-long-long -Winline"
- 
-+# -Wunused-but-set-variable is too noisy at present
-+NO_WARN="-Wno-unused-but-set-variable"
-+
- dnl Sun Studio 12 likes to rag at us for abusing enums like
- dnl having cairo_status_t variables hold cairo_int_status_t
- dnl values.  It's bad, we know.  Now please be quiet.
-@@ -34,6 +37,8 @@ MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto"
- dnl Also to turn various gcc/glibc-specific preprocessor checks
- MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
- 
-+MAYBE_WARN="$MAYBE_WARN $NO_WARN"
-+
- # invalidate cached value if MAYBE_WARN has changed
- if test "x$cairo_cv_warn_maybe" != "x$MAYBE_WARN"; then
- 	unset cairo_cv_warn_cflags
---
-cgit v0.9.0.2-2-gbebe
-From 7cb5053c0694992320b5f7ea3b91ea497431813b Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Mon, 09 Apr 2012 11:49:20 +0000
-Subject: analysis: Apply the integer translation to the bbox as well
-
-The bbox is used to compute the ink extents (and so the pattern extents
-of a recording surface) and if given an integer translation we failed to
-transform the bbox into the target space.
-
-Fixes mask (pdf).
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-analysis-surface.c b/src/cairo-analysis-surface.c
-index b8abe02..8878f62 100644
---- a/src/cairo-analysis-surface.c
-+++ b/src/cairo-analysis-surface.c
-@@ -220,6 +220,14 @@ _add_operation (cairo_analysis_surface_t *surface,
- 	if (_cairo_matrix_is_integer_translation (&surface->ctm, &tx, &ty)) {
- 	    rect->x += tx;
- 	    rect->y += ty;
-+
-+	    tx = _cairo_fixed_from_int (tx);
-+	    bbox.p1.x += tx;
-+	    bbox.p2.x += tx;
-+
-+	    ty = _cairo_fixed_from_int (ty);
-+	    bbox.p1.y += ty;
-+	    bbox.p2.y += ty;
- 	} else {
- 	    _cairo_matrix_transform_bounding_box_fixed (&surface->ctm,
- 							&bbox, NULL);
---
-cgit v0.9.0.2-2-gbebe
-From 038e4991912656a3239ca82d60056ca129016ba6 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Mon, 09 Apr 2012 08:31:44 +0000
-Subject: pdf: avoid unnecessary use of patterns in mask groups
-
----
-diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
-index 4930e72..78537ce 100644
---- a/src/cairo-pdf-surface.c
-+++ b/src/cairo-pdf-surface.c
-@@ -5703,56 +5703,68 @@ _cairo_pdf_surface_write_mask_group (cairo_pdf_surface_t	*surface,
-     if (unlikely (status))
- 	return status;
- 
--    pattern_res.id = 0;
--    gstate_res.id = 0;
--    status = _cairo_pdf_surface_add_pdf_pattern (surface, group->mask, NULL,
--						 &pattern_res, &gstate_res);
--    if (unlikely (status))
--	return status;
--
--    if (gstate_res.id != 0) {
--	smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
--	if (unlikely (smask_group == NULL))
--	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
--
--	smask_group->width = group->width;
--	smask_group->height = group->height;
--	smask_group->operation = PDF_PAINT;
--	smask_group->source = cairo_pattern_reference (group->mask);
--	smask_group->source_res = pattern_res;
--	status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
--	if (unlikely (status)) {
--	    _cairo_pdf_smask_group_destroy (smask_group);
--	    return status;
--	}
--
--	status = _cairo_pdf_surface_add_smask (surface, gstate_res);
--	if (unlikely (status))
--	    return status;
--
--	status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
-+    if (_can_paint_pattern (group->mask)) {
-+	_cairo_output_stream_printf (surface->output, "q\n");
-+	status = _cairo_pdf_surface_paint_pattern (surface,
-+						   group->mask,
-+						   &group->extents,
-+						   FALSE);
- 	if (unlikely (status))
- 	    return status;
- 
--	_cairo_output_stream_printf (surface->output,
--				     "q /s%d gs /x%d Do Q\n",
--				     gstate_res.id,
--				     smask_group->group_res.id);
-+	_cairo_output_stream_printf (surface->output, "Q\n");
-     } else {
--	status = _cairo_pdf_surface_select_pattern (surface, group->mask, pattern_res, FALSE);
-+	pattern_res.id = 0;
-+	gstate_res.id = 0;
-+	status = _cairo_pdf_surface_add_pdf_pattern (surface, group->mask, NULL,
-+						     &pattern_res, &gstate_res);
- 	if (unlikely (status))
- 	    return status;
- 
--	_cairo_output_stream_printf (surface->output,
--				     "%f %f %f %f re f\n",
--				     bbox.p1.x,
--				     bbox.p1.y,
--				     bbox.p2.x - bbox.p1.x,
--				     bbox.p2.y - bbox.p1.y);
-+	if (gstate_res.id != 0) {
-+	    smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
-+	    if (unlikely (smask_group == NULL))
-+		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
- 
--	status = _cairo_pdf_surface_unselect_pattern (surface);
--	if (unlikely (status))
--	    return status;
-+	    smask_group->width = group->width;
-+	    smask_group->height = group->height;
-+	    smask_group->operation = PDF_PAINT;
-+	    smask_group->source = cairo_pattern_reference (group->mask);
-+	    smask_group->source_res = pattern_res;
-+	    status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
-+	    if (unlikely (status)) {
-+		_cairo_pdf_smask_group_destroy (smask_group);
-+		return status;
-+	    }
-+
-+	    status = _cairo_pdf_surface_add_smask (surface, gstate_res);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    _cairo_output_stream_printf (surface->output,
-+					 "q /s%d gs /x%d Do Q\n",
-+					 gstate_res.id,
-+					 smask_group->group_res.id);
-+	} else {
-+	    status = _cairo_pdf_surface_select_pattern (surface, group->mask, pattern_res, FALSE);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    _cairo_output_stream_printf (surface->output,
-+					 "%f %f %f %f re f\n",
-+					 bbox.p1.x,
-+					 bbox.p1.y,
-+					 bbox.p2.x - bbox.p1.x,
-+					 bbox.p2.y - bbox.p1.y);
-+
-+	    status = _cairo_pdf_surface_unselect_pattern (surface);
-+	    if (unlikely (status))
-+		return status;
-+	}
-     }
- 
-     status = _cairo_pdf_surface_close_group (surface, &mask_group);
-@@ -5764,54 +5776,66 @@ _cairo_pdf_surface_write_mask_group (cairo_pdf_surface_t	*surface,
-     if (unlikely (status))
- 	return status;
- 
--    pattern_res.id = 0;
--    gstate_res.id = 0;
--    status = _cairo_pdf_surface_add_pdf_pattern (surface, group->source, NULL,
--						 &pattern_res, &gstate_res);
--    if (unlikely (status))
--	return status;
--
--    if (gstate_res.id != 0) {
--	smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
--	if (unlikely (smask_group == NULL))
--	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
--
--	smask_group->operation = PDF_PAINT;
--	smask_group->source = cairo_pattern_reference (group->source);
--	smask_group->source_res = pattern_res;
--	status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
--	if (unlikely (status)) {
--	    _cairo_pdf_smask_group_destroy (smask_group);
--	    return status;
--	}
--
--	status = _cairo_pdf_surface_add_smask (surface, gstate_res);
--	if (unlikely (status))
--	    return status;
--
--	status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
-+    if (_can_paint_pattern (group->source)) {
-+	_cairo_output_stream_printf (surface->output, "q\n");
-+	status = _cairo_pdf_surface_paint_pattern (surface,
-+						   group->source,
-+						   &group->extents,
-+						   FALSE);
- 	if (unlikely (status))
- 	    return status;
- 
--	_cairo_output_stream_printf (surface->output,
--				     "q /s%d gs /x%d Do Q\n",
--				     gstate_res.id,
--				     smask_group->group_res.id);
-+	_cairo_output_stream_printf (surface->output, "Q\n");
-     } else {
--	status = _cairo_pdf_surface_select_pattern (surface, group->source, pattern_res, FALSE);
-+	pattern_res.id = 0;
-+	gstate_res.id = 0;
-+	status = _cairo_pdf_surface_add_pdf_pattern (surface, group->source, NULL,
-+						     &pattern_res, &gstate_res);
- 	if (unlikely (status))
- 	    return status;
- 
--	_cairo_output_stream_printf (surface->output,
--				     "%f %f %f %f re f\n",
--				     bbox.p1.x,
--				     bbox.p1.y,
--				     bbox.p2.x - bbox.p1.x,
--				     bbox.p2.y - bbox.p1.y);
-+	if (gstate_res.id != 0) {
-+	    smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
-+	    if (unlikely (smask_group == NULL))
-+		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
- 
--	status = _cairo_pdf_surface_unselect_pattern (surface);
--	if (unlikely (status))
--	    return status;
-+	    smask_group->operation = PDF_PAINT;
-+	    smask_group->source = cairo_pattern_reference (group->source);
-+	    smask_group->source_res = pattern_res;
-+	    status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
-+	    if (unlikely (status)) {
-+		_cairo_pdf_smask_group_destroy (smask_group);
-+		return status;
-+	    }
-+
-+	    status = _cairo_pdf_surface_add_smask (surface, gstate_res);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    _cairo_output_stream_printf (surface->output,
-+					 "q /s%d gs /x%d Do Q\n",
-+					 gstate_res.id,
-+					 smask_group->group_res.id);
-+	} else {
-+	    status = _cairo_pdf_surface_select_pattern (surface, group->source, pattern_res, FALSE);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    _cairo_output_stream_printf (surface->output,
-+					 "%f %f %f %f re f\n",
-+					 bbox.p1.x,
-+					 bbox.p1.y,
-+					 bbox.p2.x - bbox.p1.x,
-+					 bbox.p2.y - bbox.p1.y);
-+
-+	    status = _cairo_pdf_surface_unselect_pattern (surface);
-+	    if (unlikely (status))
-+		return status;
-+	}
-     }
- 
-     status = _cairo_pdf_surface_close_group (surface, NULL);
---
-cgit v0.9.0.2-2-gbebe
-From 9fcbe25c2dcf831783bb0fd20af9754c0b5c409b Mon Sep 17 00:00:00 2001
-From: Maarten Bosmans <mkbosmans@gmail.com>
-Date: Mon, 09 Apr 2012 19:33:50 +0000
-Subject: Protect code using dlfcn.h with CAIRO_HAS_DLSYM
-
----
-diff --git a/configure.ac b/configure.ac
-index cedfebe..5d2e6ec 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -52,6 +52,7 @@ AM_CONDITIONAL(CAIRO_HAS_DL, test "x$have_dl" = "xyes")
- if test "x$have_dlsym" = "xyes"; then
-   AC_DEFINE([CAIRO_HAS_DLSYM], 1, [Define to 1 if dlsym is available])
- fi
-+AM_CONDITIONAL(CAIRO_HAS_DLSYM, test "x$have_dlsym" = "xyes")
- 
- dnl ===========================================================================
- 
-diff --git a/util/Makefile.am b/util/Makefile.am
-index f202f35..82d0a80 100644
---- a/util/Makefile.am
-+++ b/util/Makefile.am
-@@ -12,20 +12,24 @@ endif
- 
- if CAIRO_HAS_TRACE
- SUBDIRS += cairo-trace
-+if CAIRO_HAS_DLSYM
- if CAIRO_HAS_SCRIPT_SURFACE
- if CAIRO_HAS_TEE_SURFACE
- SUBDIRS += cairo-fdr
- endif
- endif
- endif
-+endif
- 
- if BUILD_SPHINX
-+if CAIRO_HAS_DLSYM
- if CAIRO_HAS_SCRIPT_SURFACE
- if CAIRO_HAS_TEE_SURFACE
- SUBDIRS += cairo-sphinx
- endif
- endif
- endif
-+endif
- 
- AM_CPPFLAGS = -I$(top_srcdir)/src \
- 	      -I$(top_builddir)/src \
---
-cgit v0.9.0.2-2-gbebe
-From c7b86ab97be1d3d3ccf43b652832f148a2fcf290 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Tue, 10 Apr 2012 13:04:05 +0000
-Subject: any2ppm: fix missing enumeration warning
-
----
-diff --git a/test/any2ppm.c b/test/any2ppm.c
-index 6b61c47..2403347 100644
---- a/test/any2ppm.c
-+++ b/test/any2ppm.c
-@@ -193,6 +193,7 @@ write_ppm (cairo_surface_t *surface, int fd)
- 	break;
-     case CAIRO_FORMAT_A1:
-     case CAIRO_FORMAT_RGB16_565:
-+    case CAIRO_FORMAT_RGB30:
-     case CAIRO_FORMAT_INVALID:
-     default:
- 	return "unhandled image format";
---
-cgit v0.9.0.2-2-gbebe
-From 09de481ce5f6ed1c38c0d5bf3af7c60642c4c947 Mon Sep 17 00:00:00 2001
-From: Gilles Espinasse <g.esp@free.fr>
-Date: Sat, 07 Apr 2012 21:09:51 +0000
-Subject: Cosmetic configure fix
-
-'how to allow undefined symbols in shared libraries' test should use CAIRO_CC_TRY_FLAG_SILENT or configure display is a bit out of order like this
-
-checking how to allow undefined symbols in shared libraries used by test suite... checking whether gcc supports -Wl,--allow-shlib-undefined... yes
--Wl,--allow-shlib-undefined
-
-Signed-off-by: Gilles Espinasse <g.esp@free.fr>
-Signed-off-by: Uli Schlachter <psychon@znc.in>
----
-diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
-index f1b17f4..3b2c6f3 100644
---- a/build/configure.ac.warnings
-+++ b/build/configure.ac.warnings
-@@ -89,7 +89,7 @@ AC_DEFINE_UNQUOTED([WARN_UNUSED_RESULT], [$cairo_cv_warn_unused_result],
- 
- dnl check linker flags
- AC_CACHE_CHECK([how to allow undefined symbols in shared libraries used by test suite], cairo_cv_test_undefined_ldflags,
--	       [CAIRO_CC_TRY_FLAG([-Wl,--allow-shlib-undefined], [],
-+	       [CAIRO_CC_TRY_FLAG_SILENT([-Wl,--allow-shlib-undefined], [],
- 				  [cairo_cv_test_undefined_ldflags="-Wl,--allow-shlib-undefined]")])
- CAIRO_TEST_UNDEFINED_LDFLAGS="$cairo_cv_test_undefined_ldflags"
- AC_SUBST(CAIRO_TEST_UNDEFINED_LDFLAGS)
---
-cgit v0.9.0.2-2-gbebe
-From 07fc63676dfdaa57ed919ad7be8f59c97c615473 Mon Sep 17 00:00:00 2001
-From: Uli Schlachter <psychon@znc.in>
-Date: Wed, 11 Apr 2012 19:37:55 +0000
-Subject: xlib: Disable fallback compositor with xlib-xcb
-
-When xlib-xcb is enabled, this is just dead code which is never used. Thus, this
-shouldn't hurt. However, this does include cairo-xlib-private.h. Shouldn't be a
-problem? Well, that header contains static inline functions which some compiler
-on Solaris will emit even when they are unused.
-
-This brings us to the real problem: That static inline function refers to a
-function which isn't compiled with xlib-xcb and thus linking fails with
-undefined symbols.
-
-This can be reproduced with GCC by adding a call to
-_cairo_xlib_screen_put_gc(NULL, NULL, 0, 0); to
-_cairo_xlib_fallback_compositor_get.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48489
-Signed-off-by: Uli Schlachter <psychon@znc.in>
----
-diff --git a/src/cairo-xlib-fallback-compositor.c b/src/cairo-xlib-fallback-compositor.c
-index 5391926..7d45cd1 100644
---- a/src/cairo-xlib-fallback-compositor.c
-+++ b/src/cairo-xlib-fallback-compositor.c
-@@ -42,6 +42,8 @@
- 
- #include "cairoint.h"
- 
-+#if !CAIRO_HAS_XLIB_XCB_FUNCTIONS
-+
- #include "cairo-xlib-private.h"
- 
- #include "cairo-compositor-private.h"
-@@ -52,3 +54,5 @@ _cairo_xlib_fallback_compositor_get (void)
-     /* XXX Do something interesting here to mitigate fallbacks ala xcb */
-     return &_cairo_fallback_compositor;
- }
-+
-+#endif /* !CAIRO_HAS_XLIB_XCB_FUNCTIONS */
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/cairo/revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch b/extra/cairo/revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch
deleted file mode 100644
index ffd324252..000000000
--- a/extra/cairo/revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From a73e7ff0186176bc82cd3ae1432c054c1fd3aebd Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sun, 06 Jan 2013 11:29:27 +0000
-Subject: xlib: Simplify source creation by use of map-to-image
-
-We were open-coding the functionality of map-to-image inside the source
-creation routines. so refactor to actually use map-to-image instead.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-xlib-source.c b/src/cairo-xlib-source.c
-index e312222..d08052a 100644
---- a/src/cairo-xlib-source.c
-+++ b/src/cairo-xlib-source.c
-@@ -898,9 +898,6 @@ surface_source (cairo_xlib_surface_t *dst,
-     cairo_surface_pattern_t local_pattern;
-     cairo_status_t status;
-     cairo_rectangle_int_t upload, limit;
--    cairo_matrix_t m;
--    pixman_format_code_t format;
--    int draw_x, draw_y;
- 
-     src = pattern->surface;
-     if (src->type == CAIRO_SURFACE_TYPE_IMAGE &&
-@@ -910,7 +907,6 @@ surface_source (cairo_xlib_surface_t *dst,
- 
- 	cairo_surface_reference (src);
- 
--prepare_shm_image:
- 	proxy = malloc (sizeof(*proxy));
- 	if (unlikely (proxy == NULL)) {
- 	    cairo_surface_destroy (src);
-@@ -954,46 +950,47 @@ prepare_shm_image:
- 	}
-     }
- 
--    if (_cairo_surface_is_image (src))
--	format = ((cairo_image_surface_t *)src)->pixman_format;
--    else
--	format = _cairo_format_to_pixman_format_code (_cairo_format_from_content (src->content));
--    src = _cairo_xlib_surface_create_shm (dst, format,
--					  upload.width, upload.height);
--    if (src == NULL) {
--	if (_cairo_surface_is_image (pattern->surface)) {
--	    draw_x = upload.x;
--	    draw_y = upload.y;
--	    src = cairo_surface_reference (pattern->surface);
--	    goto skip_paint;
--	}
--
--	src = _cairo_image_surface_create_with_pixman_format (NULL,
--							      format,
--							      upload.width,
--							      upload.height,
--							      0);
-+    xsrc = (cairo_xlib_surface_t *)
-+	    _cairo_surface_create_similar_scratch (&dst->base,
-+						   src->content,
-+						   upload.width,
-+						   upload.height);
-+    if (xsrc->base.type != CAIRO_SURFACE_TYPE_XLIB) {
-+	cairo_surface_destroy (src);
-+	cairo_surface_destroy (&xsrc->base);
-+	return None;
-     }
- 
--    _cairo_pattern_init_for_surface (&local_pattern, pattern->surface);
--    cairo_matrix_init_translate (&local_pattern.base.matrix,
--				 upload.x, upload.y);
-+    if (_cairo_surface_is_image (src)) {
-+	status = _cairo_xlib_surface_draw_image (xsrc, (cairo_image_surface_t *)src,
-+						 upload.x, upload.y,
-+						 upload.width, upload.height,
-+						 0, 0);
-+    } else {
-+	cairo_image_surface_t *image;
- 
--    status = _cairo_surface_paint (src,
--				   CAIRO_OPERATOR_SOURCE,
--				   &local_pattern.base,
--				   NULL);
--    _cairo_pattern_fini (&local_pattern.base);
-+	image = _cairo_surface_map_to_image (&xsrc->base, NULL);
- 
--    if (unlikely (status)) {
--	cairo_surface_destroy (src);
--	return _cairo_surface_create_in_error (status);
-+	_cairo_pattern_init_for_surface (&local_pattern, pattern->surface);
-+	cairo_matrix_init_translate (&local_pattern.base.matrix,
-+				     upload.x, upload.y);
-+
-+	status = _cairo_surface_paint (&image->base,
-+				       CAIRO_OPERATOR_SOURCE,
-+				       &local_pattern.base,
-+				       NULL);
-+	_cairo_pattern_fini (&local_pattern.base);
-+
-+	status = _cairo_surface_unmap_image (&xsrc->base, image);
-+	if (unlikely (status)) {
-+	    cairo_surface_destroy (src);
-+	    return _cairo_surface_create_in_error (status);
-+	}
-     }
- 
--    draw_x = draw_y = 0;
--skip_paint:
-     _cairo_pattern_init_static_copy (&local_pattern.base, &pattern->base);
-     if (upload.x | upload.y) {
-+	cairo_matrix_t m;
- 	cairo_matrix_init_translate (&m, -upload.x, -upload.y);
- 	cairo_matrix_multiply (&local_pattern.base.matrix,
- 			       &local_pattern.base.matrix,
-@@ -1001,29 +998,6 @@ skip_paint:
-     }
- 
-     *src_x = *src_y = 0;
--    if (src->device == dst->base.device &&
--	_cairo_xlib_shm_surface_get_pixmap (src)) {
--	    pattern = &local_pattern;
--	    goto prepare_shm_image;
--    }
--
--    xsrc = (cairo_xlib_surface_t *)
--	    _cairo_surface_create_similar_scratch (&dst->base,
--						   src->content,
--						   upload.width,
--						   upload.height);
--    if (xsrc->base.type != CAIRO_SURFACE_TYPE_XLIB) {
--	cairo_surface_destroy (src);
--	cairo_surface_destroy (&xsrc->base);
--	return None;
--    }
--
--    status = _cairo_xlib_surface_draw_image (xsrc, (cairo_image_surface_t *)src,
--					     draw_x, draw_y,
--					     upload.width, upload.height,
--					     0, 0);
--    cairo_surface_destroy (src);
--
-     _cairo_xlib_surface_ensure_picture (xsrc);
-     if (! picture_set_properties (xsrc->display,
- 				  xsrc->picture,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/cairo/revert-xlib-map-to-image-requires-an-extents.patch b/extra/cairo/revert-xlib-map-to-image-requires-an-extents.patch
deleted file mode 100644
index ccc1ebf47..000000000
--- a/extra/cairo/revert-xlib-map-to-image-requires-an-extents.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From dd20c1f4d6419238bbb37fb93a48986f83c6e6c2 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Wed, 09 Jan 2013 12:38:09 +0000
-Subject: xlib: map-to-image requires an extents
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-xlib-source.c b/src/cairo-xlib-source.c
-index d08052a..0689d82 100644
---- a/src/cairo-xlib-source.c
-+++ b/src/cairo-xlib-source.c
-@@ -968,8 +968,9 @@ surface_source (cairo_xlib_surface_t *dst,
- 						 0, 0);
-     } else {
- 	cairo_image_surface_t *image;
-+	cairo_rectangle_int_t map_extents = { 0,0, upload.width,upload.height };
- 
--	image = _cairo_surface_map_to_image (&xsrc->base, NULL);
-+	image = _cairo_surface_map_to_image (&xsrc->base, &map_extents);
- 
- 	_cairo_pattern_init_for_surface (&local_pattern, pattern->surface);
- 	cairo_matrix_init_translate (&local_pattern.base.matrix,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 0d8d9de5f..3194bbae9 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177768 2013-02-08 09:03:22Z andrea $
+# $Id: PKGBUILD 183278 2013-04-20 16:41:10Z heftig $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -17,18 +17,19 @@ pkgname=('calligra-filters'
          'calligra-handbook'
          'calligra-braindump'
          'calligra-flow')
-pkgver=2.6.0
-pkgrel=1
+pkgver=2.6.3
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
-makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
-             'lcms2' 'libmysqlclient' 'freetds' 'xbase' 'libwpg' 'opencolorio'
+makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
+             'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio'
              'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw'
-             'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa')
+             'openjpeg' 'kdegraphics-okular' 'pstoedit')
+[ "$CARCH" != "mips64el" ] && makedepends+=('vc')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('df7c2816d2bbe5e2fe87ea0be3fe668c')
+md5sums=('90d6bb619191abbcc94094379d47e225')
 
 build() {
   mkdir build
@@ -107,7 +108,7 @@ package_calligra-karbon() {
 package_calligra-kexi() {
   pkgdesc="Develop desktop database applications"
   depends=('calligra-libs' 'glew' 'fftw')
-  optdepends=('libmysqlclient: MySQL driver'
+  optdepends=('libmariadbclient: MariaDB driver'
               'freetds: Sybase & MS SQL driver'
               'xbase: XBase driver'
               'calligra-sheets: Spreadsheet-to-Kexi-table import plugin'
@@ -132,6 +133,9 @@ package_calligra-plan() {
 
   cd "${srcdir}"/build/plan
   make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}"/build/3rdparty/kdgantt
+  make DESTDIR="${pkgdir}" install
 }
 
 package_calligra-stage() {
@@ -212,6 +216,7 @@ package_calligra-flow() {
   conflicts=('calligra-flow-doc')
   replaces=('calligra-flow-doc')
   install=calligra-flow.install
+  optdepends=('calligra-karbon: to export the charts in various formats')
 
   cd "${srcdir}"/build/flow
   make DESTDIR="${pkgdir}" install
diff --git a/extra/calligra/lcms24.patch b/extra/calligra/lcms24.patch
deleted file mode 100644
index b2427aff1..000000000
--- a/extra/calligra/lcms24.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h
-+++ b/plugins/colorengines/lcms2/colorspaces/xyz_f32/XyzF32ColorSpace.h
-@@ -22,6 +22,8 @@
- 
- #include <LcmsColorSpace.h>
- #include <KoColorSpaceTraits.h>
-+
-+#define TYPE_XYZA_FLT         (FLOAT_SH(1)|COLORSPACE_SH(PT_XYZ)|EXTRA_SH(1)|CHANNELS_SH(3)|BYTES_SH(4))
- 
- #include <KoColorModelStandardIds.h>
- 
-
diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD
index 4a79b0f63..8deae238c 100644
--- a/extra/caribou/PKGBUILD
+++ b/extra/caribou/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 170864 2012-11-12 20:12:13Z heftig $
+# $Id: PKGBUILD 183337 2013-04-21 22:08:38Z heftig $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Adam Hani Schakaki <krzd@krzd.net>
 
 pkgname=caribou
-pkgver=0.4.4.2
+pkgver=0.4.10
 pkgrel=1
 pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Caribou"
-license=('LGPL')
-depends=('at-spi2-atk' 'pyatspi' 'python2-gobject' 'gtk3' 'libxklavier' 'libgee' 'clutter' 'dconf')
-makedepends=('intltool' 'docbook-xsl')
+license=(LGPL)
+depends=(at-spi2-atk python2-atspi python2-gobject gtk3 libxklavier libgee clutter dconf)
+makedepends=(intltool docbook-xsl gtk2)
 install=caribou.install
 options=(!libtool !emptydirs)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz)
-sha256sums=('22fba681b3e6041494ac4fa41b8286957bade0cc6158c110fe8f3c980af6913d')
+sha256sums=('6480ce3a87cf4f01dd1fb52edbb31a2aa9f5573a0860b67115c86bbcd7b17865')
 
 build() {
   cd $pkgname-$pkgver
@@ -28,6 +28,11 @@ build() {
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
diff --git a/extra/caribou/fix-crash.patch b/extra/caribou/fix-crash.patch
deleted file mode 100644
index 98e5baab9..000000000
--- a/extra/caribou/fix-crash.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a8fb1d8fba1e9557a3370edd62501f0a866c6774 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@unixuser.org>
-Date: Fri, 02 Nov 2012 06:19:47 +0000
-Subject: Fix border-image slice values in antler's gtk CSS
-
-According to CSS spec, border-image slice values are not denoted
-with length units.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=687409
----
-diff --git a/data/antler/style.css b/data/antler/style.css
-index 0e830dc..7553cf6 100644
---- a/data/antler/style.css
-+++ b/data/antler/style.css
-@@ -12,7 +12,7 @@
- .antler-keyboard-button {
-   border-width: 0px;
-   border-radius: 2px;
--  border-image: url("dark-key-border.svg") 2px 2px 2px 2px repeat stretch;
-+  border-image: url("dark-key-border.svg") 2 2 2 2 repeat stretch;
-   font: Sans 14px;
-   background-image: -gtk-gradient (linear,
- 				     left top,
---
-cgit v0.9.0.2
diff --git a/extra/ccrtp/PKGBUILD b/extra/ccrtp/PKGBUILD
index 273657f28..dae0ee4d4 100644
--- a/extra/ccrtp/PKGBUILD
+++ b/extra/ccrtp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 159161 2012-05-16 20:49:22Z andrea $
+# $Id: PKGBUILD 184148 2013-05-02 19:39:49Z eric $
 # Maintainer:
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
@@ -6,8 +6,8 @@
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=ccrtp
-pkgver=2.0.3
-pkgrel=2
+pkgver=2.0.5
+pkgrel=1
 pkgdesc="An implementation of RTP, the real-time transport protocol from the IETF"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/ccrtp/"
@@ -16,17 +16,17 @@ depends=('ucommon' 'libgcrypt')
 options=('!libtool')
 install=$pkgname.install
 source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
-md5sums=('0d57da1b8e212fb634b8951067fbc1e0'
-         '127fa3b293f7a7c3be1d2891c4544453')
+md5sums=('7f462f6b31c68180a93f36b06944fef4'
+         'SKIP')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -Dm644 COPYING.addendum "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/extra/cdargs/PKGBUILD b/extra/cdargs/PKGBUILD
deleted file mode 100644
index 89ab781e4..000000000
--- a/extra/cdargs/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 128462 2011-06-24 02:21:59Z eric $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=cdargs
-pkgver=1.35
-pkgrel=3.1
-pkgdesc="A replacement for 'cd' that includes bookmarks/browsing for faster navigation"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.skamphausen.de/cgi-bin/ska/CDargs"
-depends=('ncurses' 'gcc-libs')
-install=cdargs.install
-source=("http://www.skamphausen.de/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('50be618d67f0b9f2439526193c69c567')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-  
-  cd contrib
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  
-  # install helper scripts
-  cd contrib
-  make DESTDIR="${pkgdir}" install
-  
-  install -d "${pkgdir}/usr/share/cdargs"
-  install $pkgname-{tcsh.csh,bash.sh} "${pkgdir}/usr/share/cdargs"
-}
diff --git a/extra/cdargs/cdargs.install b/extra/cdargs/cdargs.install
deleted file mode 100644
index 2b29beba7..000000000
--- a/extra/cdargs/cdargs.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_install() {
-  echo "cdargs: helper scripts are in /usr/share/cdargs/"
-}
diff --git a/extra/cdparanoia/PKGBUILD b/extra/cdparanoia/PKGBUILD
index 03ea9d041..3d9096993 100644
--- a/extra/cdparanoia/PKGBUILD
+++ b/extra/cdparanoia/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=cdparanoia
 pkgver=10.2
-pkgrel=4.1
+pkgrel=4.2
 pkgdesc="Compact Disc Digital Audio extraction tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xiph.org/paranoia/"
diff --git a/extra/cdrkit/PKGBUILD b/extra/cdrkit/PKGBUILD
deleted file mode 100644
index e7cd1e615..000000000
--- a/extra/cdrkit/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 138030 2011-09-14 23:20:33Z dreisner $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-
-pkgname=cdrkit
-pkgver=1.1.11
-pkgrel=2
-pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction"
-arch=('i686' 'x86_64')
-url="http://cdrkit.org/"
-license=('GPL2')
-depends=('file' 'bzip2' 'perl')
-makedepends=('cmake')
-source=(http://cdrkit.org/releases/$pkgname-$pkgver.tar.gz)
-md5sums=('efe08e2f3ca478486037b053acd512e9')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make PREFIX="$pkgdir/usr" install
-
-  # Make symlinks for cdrtools compatibility
-  cd "$pkgdir/usr/bin"
-  ln -s wodim cdrecord
-  ln -s readom readcd
-  ln -s genisoimage mkisofs
-  ln -s genisoimage mkhybrid
-  ln -s icedax cdda2wav
-
-  cd "$pkgdir/usr/share/man/man1"
-  ln -s wodim.1 cdrecord.1
-  ln -s readom.1 readcd.1
-  ln -s genisoimage.1 mkisofs.1
-  ln -s genisoimage.1 mkhybrid.1
-  ln -s icedax.1 cdda2wav.1
-}
diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD
index 9349f02e7..58d6e2d16 100644
--- a/extra/cfitsio/PKGBUILD
+++ b/extra/cfitsio/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164645 2012-08-01 17:50:06Z andrea $
+# $Id: PKGBUILD 180514 2013-03-22 13:00:52Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=cfitsio
-pkgver=3.310
+pkgver=3.340
 pkgrel=1
 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,16 +13,16 @@ license=('custom')
 depends=('glibc')
 options=('!libtool')
 source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz")
-md5sums=('75b6411751c7f308d45b281b7beb92d6')
+md5sums=('99210838af46b7bf2d945ccbb05e3ad3')
 
 build() {
-  cd "${srcdir}"/${pkgname}
+  cd ${pkgname}
   ./configure --prefix=/usr
   make shared
 }
 
 check() {
-  cd "${srcdir}"/${pkgname}
+  cd ${pkgname}
   make testprog
   LD_LIBRARY_PATH=. ./testprog > testprog.lis
   [[ -z $(diff testprog.lis testprog.out) ]] || return 1
@@ -30,7 +30,7 @@ check() {
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}
+  cd ${pkgname}
   make DESTDIR="${pkgdir}" install
   install -D -m644 License.txt \
     "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
diff --git a/extra/check/PKGBUILD b/extra/check/PKGBUILD
index 6014fbee3..a537d3991 100644
--- a/extra/check/PKGBUILD
+++ b/extra/check/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 171322 2012-11-17 08:55:42Z heftig $
+# $Id: PKGBUILD 183188 2013-04-18 16:03:52Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Jeremy Cowgar <jeremy@cowgar.com>
 
 pkgname=check
-pkgver=0.9.9
+pkgver=0.9.10
 pkgrel=1
 pkgdesc="A unit testing framework for C"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('LGPL')
 options=('!libtool')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('f3702f2fcfc19ce3f62dca66c241a168')
+md5sums=('6d10a8efb9a683467b92b3bce97aeb30')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD
index e3bb815d1..c07352cef 100644
--- a/extra/cheese/PKGBUILD
+++ b/extra/cheese/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 170886 2012-11-12 22:06:48Z heftig $
+# $Id: PKGBUILD 183338 2013-04-21 22:08:39Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cheese
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
-depends=('gtk3' 'gstreamer' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-good' 'clutter-gst' 'clutter-gtk' 'libcanberra' 'libgee' 'gnome-video-effects' 'librsvg' 'gnome-desktop')
-makedepends=('pkgconfig' 'intltool' 'gobject-introspection' 'itstool' 'vala' 'nautilus-sendto')
-optdepends=('nautilus-sendto: Send snapshots'
-            'frei0r-plugins: More camera effects')
+depends=('gtk3' 'gstreamer' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-good' 'clutter-gst' 'clutter-gtk' 'libcanberra' 'gnome-video-effects' 'librsvg' 'gnome-desktop' 'nautilus-sendto' 'hicolor-icon-theme')
+makedepends=('pkgconfig' 'intltool' 'gobject-introspection' 'itstool' 'vala')
+optdepends=('frei0r-plugins: More camera effects')
 groups=('gnome-extra')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org/projects/cheese/"
 install=cheese.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('745262a0db7d0dbe973497a4f36dd4d85b8a42426d8f431e4b6898351ad6459e')
+sha256sums=('e9f7a7855c52451cfc59ffa23962eaa5fda7c9bc629bb975f4328af061d01eeb')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/chemtool/PKGBUILD b/extra/chemtool/PKGBUILD
index bcaf070a3..f667e0cc8 100644
--- a/extra/chemtool/PKGBUILD
+++ b/extra/chemtool/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=chemtool
 pkgver=1.6.13
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="A small program for drawing chemical structures"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
diff --git a/extra/chkrootkit/PKGBUILD b/extra/chkrootkit/PKGBUILD
deleted file mode 100644
index 3e0a2bd04..000000000
--- a/extra/chkrootkit/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 143673 2011-11-28 09:58:36Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=chkrootkit
-pkgver=0.49
-pkgrel=3.1
-pkgdesc="Locally checks for signs of a rootkit"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.chkrootkit.org"
-depends=('sh' 'net-tools')
-license=('BSD')
-source=(http://www.reznor.com/tools/chkrootkit.tar.gz chkrootkit.cron \
-        fix-tools-path.patch backslashes.patch kallsyms.patch)
-md5sums=('304d840d52840689e0ab0af56d6d3a18'
-         'f4b6494270f708bf016e087104681739'
-         '3e5f2d5e2f4fa7a0d780baec9039c07f'
-         '758f892dcf73e8a2a4694662fba366d4'
-         'd087f3aad8a9e97fea496ef83e4f1d48')
-sha1sums=('cec1a3c482b95b20d3a946b07fffb23290abc4a6'
-          '6dda90abf779b6f5c3bacd638e1231f34635575d'
-          '7fcad8117a064f0a6910134e8bb3a55de110650f'
-          'e22546f445c145cf05dbc1a10f7b196fcd1c8202'
-          'dc5b402ee69a7a5ae622ecfd733682516df54e88')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|/var/adm|/var/log|' check_wtmpx.c chklastlog.c chkutmp.c chkwtmp.c
-  patch -p0 -i "${srcdir}/fix-tools-path.patch"
-  patch -p1 -i "${srcdir}/backslashes.patch"
-  patch -p1 -i "${srcdir}/kallsyms.patch"
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  for i in check_wtmpx chkdirs chklastlog chkproc chkrootkit \
-           chkutmp chkwtmp ifpromisc strings-static ; do
-    install -D -m755 $i "${pkgdir}/usr/sbin/$i"
-  done
-  install -D -m744 "${srcdir}/chkrootkit.cron" "${pkgdir}/etc/cron.weekly/chkrootkit"
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/chkrootkit/backslashes.patch b/extra/chkrootkit/backslashes.patch
deleted file mode 100644
index 6ac981441..000000000
--- a/extra/chkrootkit/backslashes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: James R. Van Zandt <jrv@debian.org>
-Description: Two of the chkrootkit messages have unnecessary backslashes (#498063)
---- a/chkrootkit
-+++ b/chkrootkit
-@@ -672,7 +672,7 @@ etc/ld.so.hash sbin/init.zk usr/lib/in.h
-    if [ "`find ${LIBS} -name libproc.a 2> /dev/null`" != "" -a \
-        "$SYSTEM" != "FreeBSD" ]
-    then
--      echo "Possible t0rn v8 \(or variation\) rootkit installed"
-+      echo "Possible t0rn v8 (or variation) rootkit installed"
-    else
-       if [ "${QUIET}" != "t" ]; then echo "nothing found"; fi
-    fi
-@@ -726,7 +726,7 @@ etc/ld.so.hash sbin/init.zk usr/lib/in.h
- 
-    if [ -d ${ROOTDIR}dev/ptyxx -o -r "${ROOTDIR}usr/lib/.ark?" -o \
-         -d ${ROOTDIR}usr/doc/"... " ]; then
--      echo "Possible Ambient's rootkit \(ark\) installed"
-+      echo "Possible Ambient's rootkit (ark) installed"
-    else
-       if [ "${QUIET}" != "t" ]; then echo "nothing found"; fi
-    fi
diff --git a/extra/chkrootkit/chkrootkit.cron b/extra/chkrootkit/chkrootkit.cron
deleted file mode 100644
index 0fc84ded8..000000000
--- a/extra/chkrootkit/chkrootkit.cron
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/sbin/chkrootkit -q
diff --git a/extra/chkrootkit/fix-tools-path.patch b/extra/chkrootkit/fix-tools-path.patch
deleted file mode 100644
index d45f07901..000000000
--- a/extra/chkrootkit/fix-tools-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- chkrootkit
-+++ chkrootkit
-@@ -17,6 +17,8 @@ unalias netstat > /dev/null 2>&1
- unalias ps > /dev/null 2>&1
- unalias dirname > /dev/null 2>&1
- 
-+cd /usr/sbin
-+
- # Workaround for recent GNU coreutils
- _POSIX2_VERSION=199209
- export _POSIX2_VERSION
diff --git a/extra/chkrootkit/kallsyms.patch b/extra/chkrootkit/kallsyms.patch
deleted file mode 100644
index 4e3694aad..000000000
--- a/extra/chkrootkit/kallsyms.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/chkrootkit
-+++ b/chkrootkit
-@@ -308,7 +316,7 @@ lkm ()
-       fi
- 
-       if [ "${EXPERT}" = "t" ]; then
--         [ -r /proc/ksyms ] &&  ${egrep} -i "adore|sebek" < /proc/ksyms 2>/dev/null
-+         [ -r /proc/kallsyms ] &&  ${egrep} -i "adore|sebek" < /proc/kallsyms 2>/dev/null
-          [ -d /proc/knark ] &&  ${ls} -la /proc/knark 2> /dev/null
-          PV=`$ps -V 2>/dev/null| $cut -d " " -f 3 |${awk} -F . '{ print $1 "." $2 $3 }' | ${awk} '{ if ($0 > 3.19) print 3; else if ($0 < 2.015) print 1; else print 2 }'`
-          [ "$PV" = "" ] &&  PV=2
-@@ -318,14 +326,14 @@ lkm ()
-       fi
- 
-       ### adore LKM
--      [ -r /proc/ksyms ] && \
--      if `${egrep} -i adore < /proc/ksyms >/dev/null 2>&1`; then
-+      [ -r /proc/kallsyms ] && \
-+      if `${egrep} -i adore < /proc/kallsyms >/dev/null 2>&1`; then
-          echo "Warning: Adore LKM installed"
-       fi
- 
-       ### sebek LKM (Adore based)
--      [ -r /proc/ksyms ] && \
--      if `${egrep} -i sebek < /proc/ksyms >/dev/null 2>&1`; then
-+      [ -r /proc/kallsyms ] && \
-+      if `${egrep} -i sebek < /proc/kallsyms >/dev/null 2>&1`; then
-          echo "Warning: Sebek LKM installed"
-       fi
- 
diff --git a/extra/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD
index e20caef80..b290cfd3f 100644
--- a/extra/chromaprint/PKGBUILD
+++ b/extra/chromaprint/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 177077 2013-02-05 22:13:13Z bisson $
+# $Id: PKGBUILD 179542 2013-03-06 13:51:08Z bisson $
 # Contributor: Wieland Hoffmann <the_mineo@web.de>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=chromaprint
 pkgver=0.7
-pkgrel=2
+pkgrel=4
 pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source'
 url='http://acoustid.org/chromaprint/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('ffmpeg')
 makedepends=('cmake')
-source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('6a961585e82d26d357eb792216becc0864ddcdb2')
+source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'ffmpeg.patch')
+sha1sums=('6a961585e82d26d357eb792216becc0864ddcdb2'
+          '4c99e8be678ccd0373ab1c0b52c068d6fabe21a2')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 -i ../ffmpeg.patch
+
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/chromaprint/ffmpeg.patch b/extra/chromaprint/ffmpeg.patch
new file mode 100644
index 000000000..4c41ca664
--- /dev/null
+++ b/extra/chromaprint/ffmpeg.patch
@@ -0,0 +1,21 @@
+diff -Naur old/examples/fpcalc.c new/examples/fpcalc.c
+--- old/examples/fpcalc.c	2012-09-06 04:05:36.000000000 +1000
++++ new/examples/fpcalc.c	2013-03-07 00:43:11.950928188 +1100
+@@ -65,6 +65,9 @@
+ 		goto done;
+ 	}
+ 
++	/* request regular signed 16-bit packed format */
++	codec_ctx->request_sample_fmt = AV_SAMPLE_FMT_S16;
++
+ 	if (avcodec_open(codec_ctx, codec) < 0) {
+ 		fprintf(stderr, "ERROR: couldn't open the codec\n");
+ 		goto done;
+@@ -146,6 +149,7 @@
+ 				int ostride[6] = { 2 };
+ 				int len = buffer_size / istride[0];
+ 				if (av_audio_convert(convert_ctx, obuf, ostride, ibuf, istride, len) < 0) {
++					fprintf(stderr, "WARNING: unable to convert %d samples\n", buffer_size);
+ 					break;
+ 				}
+ 				buffer = buffer2;
diff --git a/extra/chromium/PKGBUILD b/extra/chromium/PKGBUILD
deleted file mode 100644
index 56be78816..000000000
--- a/extra/chromium/PKGBUILD
+++ /dev/null
@@ -1,139 +0,0 @@
-# $Id: PKGBUILD 173156 2012-12-11 21:02:48Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=chromium
-pkgver=23.0.1271.97
-pkgrel=1
-pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
-arch=('i686' 'x86_64')
-url="http://www.chromium.org/"
-license=('BSD')
-depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent'
-         'libxss' 'libgcrypt' 'ttf-dejavu' 'desktop-file-utils'
-         'hicolor-icon-theme')
-makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring'
-             'elfutils' 'subversion' 'nacl-toolchain-newlib')
-optdepends=('kdebase-kdialog: needed for file dialogs in KDE')
-backup=('etc/chromium/default')
-install=chromium.install
-source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2
-        chromium.desktop
-        chromium.default
-        chromium.sh
-        chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
-        chromium-ppapi-r0.patch)
-sha256sums=('37ba1289b7066c3206d9b8f51c0a6acde0f3f5550e716a61af32485d8d0dc2e1'
-            '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
-            '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
-            '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9'
-            'c1baf14121502efbc2a31b64029dcafa0e28ca5b71ad0e28a3c6342d18198615'
-            '1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7ed540cdb502fa0aa99c81bd')
-
-build() {
-  cd "$srcdir/chromium-$pkgver"
-
-  # Fix build with glibc 2.16
-  patch -Np1 -i "$srcdir/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch"
-
-  # Fix build without NaCl glibc toolchain (patch from Gentoo)
-  patch -Np0 -i "$srcdir/chromium-ppapi-r0.patch"
-
-  # http://code.google.com/p/chromium/issues/detail?id=109527
-  sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc
-
-  # Missing gyp files in tarball (http://crbug.com/144823)
-  sed -i '/nacl_test_data\.gyp/d' chrome/chrome_tests.gypi
-
-  # Use Python 2
-  find . -type f -exec sed -i -r \
-    -e 's|/usr/bin/python$|&2|g' \
-    -e 's|(/usr/bin/python2)\.4$|\1|g' \
-    {} +
-  # There are still a lot of relative calls which need a workaround
-  mkdir "$srcdir/python2-path"
-  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
-  export PATH="$srcdir/python2-path:$PATH"
-
-  # Prepare NaCL toolchain
-  mkdir -p sdk native_client/toolchain/.tars
-  cp -a /usr/lib/nacl-toolchain-newlib sdk/nacl-sdk
-  tar czf native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk
-  rm -r sdk
-
-  # CFLAGS are passed through release_extra_cflags below
-  export -n CFLAGS CXXFLAGS
-
-  # Silence "identifier 'nullptr' is a keyword in C++11" warnings
-  CFLAGS+=' -Wno-c++0x-compat'
-
-  build/gyp_chromium --depth=. \
-    -Dwerror= \
-    -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
-    -Dlinux_strip_binary=1 \
-    -Dlinux_use_gold_binary=0 \
-    -Dlinux_use_gold_flags=0 \
-    -Drelease_extra_cflags="$CFLAGS" \
-    -Dffmpeg_branding=Chrome \
-    -Dproprietary_codecs=1 \
-    -Duse_system_bzip2=1 \
-    -Duse_system_ffmpeg=0 \
-    -Duse_system_libevent=1 \
-    -Duse_system_libjpeg=1 \
-    -Duse_system_libpng=1 \
-    -Duse_system_libxml=0 \
-    -Duse_system_ssl=0 \
-    -Duse_system_yasm=1 \
-    -Duse_system_zlib=0 \
-    -Duse_gconf=0 \
-    -Ddisable_glibc=1 \
-    -Ddisable_pnacl=1 \
-    -Ddisable_sse2=1
-
-  make chrome chrome_sandbox BUILDTYPE=Release
-}
-
-package() {
-  cd "$srcdir/chromium-$pkgver"
-
-  install -D out/Release/chrome "$pkgdir/usr/lib/chromium/chromium"
-
-  install -Dm4755 -o root -g root out/Release/chrome_sandbox \
-    "$pkgdir/usr/lib/chromium/chromium-sandbox"
-
-  cp out/Release/{*.pak,libffmpegsumo.so,nacl_helper{,_bootstrap}} \
-    out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \
-    "$pkgdir/usr/lib/chromium/"
-
-  if [[ $CARCH == i686 ]]; then
-    rm "$pkgdir/usr/lib/chromium/nacl_irt_x86_64.nexe"
-  fi
-
-  # Allow users to override command-line options
-  install -Dm644 "$srcdir/chromium.default" "$pkgdir/etc/chromium/default"
-
-  cp -a out/Release/locales "$pkgdir/usr/lib/chromium/"
-
-  install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1"
-
-  install -Dm644 "$srcdir/chromium.desktop" \
-    "$pkgdir/usr/share/applications/chromium.desktop"
-
-  for size in 22 24 48 64 128 256; do
-    install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
-      "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
-  done
-
-  for size in 16 32; do
-    install -Dm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \
-      "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
-  done
-
-  install -D "$srcdir/chromium.sh" "$pkgdir/usr/bin/chromium"
-
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/chromium/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch b/extra/chromium/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
deleted file mode 100644
index 1d11a390e..000000000
--- a/extra/chromium/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -upr chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
---- chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h	2012-07-10 10:48:31.000000000 +0300
-+++ chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h	2012-07-11 23:44:11.000000000 +0300
-@@ -243,14 +243,13 @@ struct kernel_rusage {
-   long               ru_nivcsw;
- };
- 
--struct siginfo;
- #if defined(__i386__) || defined(__arm__) || defined(__PPC__)
- 
- /* include/asm-{arm,i386,mips,ppc}/signal.h                                  */
- struct kernel_old_sigaction {
-   union {
-     void             (*sa_handler_)(int);
--    void             (*sa_sigaction_)(int, struct siginfo *, void *);
-+    void             (*sa_sigaction_)(int, siginfo_t *, void *);
-   };
-   unsigned long      sa_mask;
-   unsigned long      sa_flags;
-@@ -287,13 +286,13 @@ struct kernel_sigaction {
-   unsigned long      sa_flags;
-   union {
-     void             (*sa_handler_)(int);
--    void             (*sa_sigaction_)(int, struct siginfo *, void *);
-+    void             (*sa_sigaction_)(int, siginfo_t *, void *);
-   };
-   struct kernel_sigset_t sa_mask;
- #else
-   union {
-     void             (*sa_handler_)(int);
--    void             (*sa_sigaction_)(int, struct siginfo *, void *);
-+    void             (*sa_sigaction_)(int, siginfo_t *, void *);
-   };
-   unsigned long      sa_flags;
-   void               (*sa_restorer)(void);
diff --git a/extra/chromium/chromium-ppapi-r0.patch b/extra/chromium/chromium-ppapi-r0.patch
deleted file mode 100644
index fb7e160c2..000000000
--- a/extra/chromium/chromium-ppapi-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ppapi/ppapi_untrusted.gyp.orig	2012-06-12 10:20:16.000000000 +0200
-+++ ppapi/ppapi_untrusted.gyp	2012-06-12 10:20:52.000000000 +0200
-@@ -80,7 +80,7 @@
-         ],
-       },
-       'conditions': [
--        ['target_arch!="arm"', {
-+        ['target_arch!="arm" and disable_glibc==0', {
-           'variables': {
-             'build_glibc': 1,
-             # NOTE: Use /lib, not /lib64 here; it is a symbolic link which
diff --git a/extra/chromium/chromium.default b/extra/chromium/chromium.default
deleted file mode 100644
index 2632024f1..000000000
--- a/extra/chromium/chromium.default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default settings for chromium. This file is sourced by /usr/bin/chromium
-
-# Options to pass to chromium
-CHROMIUM_FLAGS=""
diff --git a/extra/chromium/chromium.desktop b/extra/chromium/chromium.desktop
deleted file mode 100644
index 18446d40f..000000000
--- a/extra/chromium/chromium.desktop
+++ /dev/null
@@ -1,113 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Chromium
-# Only KDE 4 seems to use GenericName, so we reuse the KDE strings.
-# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413.
-GenericName=Web Browser
-GenericName[ar]=متصفح الشبكة
-GenericName[bg]=Уеб браузър
-GenericName[ca]=Navegador web
-GenericName[cs]=WWW prohlížeč
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής ιστού
-GenericName[en_GB]=Web Browser
-GenericName[es]=Navegador web
-GenericName[et]=Veebibrauser
-GenericName[fi]=WWW-selain
-GenericName[fr]=Navigateur Web
-GenericName[gu]=વેબ બ્રાઉઝર
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hu]=Webböngésző
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ
-GenericName[ko]=웹 브라우저
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Tīmekļa pārlūks
-GenericName[ml]=വെബ് ബ്രൌസര്‍
-GenericName[mr]=वेब ब्राऊजर
-GenericName[nb]=Nettleser
-GenericName[nl]=Webbrowser
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador da Internet
-GenericName[ro]=Navigator de Internet
-GenericName[ru]=Веб-браузер
-GenericName[sl]=Spletni brskalnik
-GenericName[sv]=Webbläsare
-GenericName[ta]=இணைய உலாவி
-GenericName[th]=เว็บเบราว์เซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_HK]=網頁瀏覽器
-GenericName[zh_TW]=網頁瀏覽器
-# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1.
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[fil]=Web Browser
-GenericName[hr]=Web preglednik
-GenericName[id]=Browser Web
-GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର
-GenericName[sk]=WWW prehliadač
-GenericName[sr]=Интернет прегледник
-GenericName[te]=మహాతల అన్వేషి
-GenericName[vi]=Bộ duyệt Web
-# Gnome and KDE 3 uses Comment.
-Comment=Access the Internet
-Comment[ar]=الدخول إلى الإنترنت
-Comment[bg]=Достъп до интернет
-Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন
-Comment[ca]=Accedeix a Internet
-Comment[cs]=Přístup k internetu
-Comment[da]=Få adgang til internettet
-Comment[de]=Internetzugriff
-Comment[el]=Πρόσβαση στο Διαδίκτυο
-Comment[en_GB]=Access the Internet
-Comment[es]=Accede a Internet.
-Comment[et]=Pääs Internetti
-Comment[fi]=Käytä internetiä
-Comment[fil]=I-access ang Internet
-Comment[fr]=Accéder à Internet
-Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો
-Comment[he]=גישה אל האינטרנט
-Comment[hi]=इंटरनेट तक पहुंच स्थापित करें
-Comment[hr]=Pristup Internetu
-Comment[hu]=Internetelérés
-Comment[id]=Akses Internet
-Comment[it]=Accesso a Internet
-Comment[ja]=インターネットにアクセス
-Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ
-Comment[ko]=인터넷 연결
-Comment[lt]=Interneto prieiga
-Comment[lv]=Piekļūt internetam
-Comment[ml]=ഇന്റര്‍‌നെറ്റ് ആക്‌സസ് ചെയ്യുക
-Comment[mr]=इंटरनेटमध्ये प्रवेश करा
-Comment[nb]=Gå til Internett
-Comment[nl]=Verbinding maken met internet
-Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ
-Comment[pl]=Skorzystaj z internetu
-Comment[pt]=Aceder à Internet
-Comment[pt_BR]=Acessar a internet
-Comment[ro]=Accesaţi Internetul
-Comment[ru]=Доступ в Интернет
-Comment[sk]=Prístup do siete Internet
-Comment[sl]=Dostop do interneta
-Comment[sr]=Приступите Интернету
-Comment[sv]=Gå ut på Internet
-Comment[ta]=இணையத்தை அணுகுதல்
-Comment[te]=ఇంటర్నెట్‌ను ఆక్సెస్ చెయ్యండి
-Comment[th]=เข้าถึงอินเทอร์เน็ต
-Comment[tr]=İnternet'e erişin
-Comment[uk]=Доступ до Інтернету
-Comment[vi]=Truy cập Internet
-Comment[zh_CN]=访问互联网
-Comment[zh_HK]=連線到網際網路
-Comment[zh_TW]=連線到網際網路
-Exec=chromium %U
-Terminal=false
-Icon=chromium
-Type=Application
-Categories=GTK;Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
diff --git a/extra/chromium/chromium.install b/extra/chromium/chromium.install
deleted file mode 100644
index d43ea7c35..000000000
--- a/extra/chromium/chromium.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/chromium/chromium.sh b/extra/chromium/chromium.sh
deleted file mode 100755
index ba8a7e683..000000000
--- a/extra/chromium/chromium.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Allow users to override command-line options
-# Based on Gentoo's chromium package (and by extension, Debian's)
-if [[ -f /etc/chromium/default ]]; then
-	. /etc/chromium/default
-fi
-
-# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
-# default CHROMIUM_FLAGS (from /etc/chromium/default)
-CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-$CHROMIUM_FLAGS}
-
-export CHROME_WRAPPER=$(readlink -f "$0")
-export CHROME_DESKTOP=chromium.desktop
-
-exec /usr/lib/chromium/chromium $CHROMIUM_FLAGS "$@"
diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index 402b92d9f..e6a70c6df 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -1,20 +1,17 @@
-# $Id: PKGBUILD 176097 2013-01-27 12:26:02Z tpowa $
+# $Id: PKGBUILD 182654 2013-04-12 07:11:03Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=cifs-utils
-pkgver=5.9
+pkgver=6.0
 pkgrel=1
 pkgdesc="CIFS filesystem user-space tools"
 arch=(i686 x86_64 'mips64el')
 url="http://wiki.samba.org/index.php/LinuxCIFS_utils"
 license=('GPL')
 depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient')
-source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2
-        fix-5.9-credentials.patch)
+source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  # fix credentials
-  patch -Np1 -i ../fix-5.9-credentials.patch
   # systemd support is broken in mount.cifs
   # https://bugs.archlinux.org/task/30958
   ./configure --prefix=/usr --disable-systemd
@@ -27,6 +24,4 @@ package() {
   # set mount.cifs uid, to enable none root mounting form fstab
   chmod +s $pkgdir/usr/bin/mount.cifs
 }
-md5sums=('6aa9c4347780872fefe5823ac06a8ff3')
-md5sums=('7164ad6f7963a31fcbffbe4f14a7cfc6'
-         '2550d43af5bb734307cae22a09cd7710')
+md5sums=('371e007a201be90c16497cd9bd5e2553')
diff --git a/extra/cifs-utils/mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch b/extra/cifs-utils/mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch
deleted file mode 100644
index 8ca3b2674..000000000
--- a/extra/cifs-utils/mount.cifs-fix-up-some-D_FORTIFY_SOURCE-2-warnings.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 900875dbda261dd8a9283bdda3c3dbe551fe0f7c Mon Sep 17 00:00:00 2001
-From: Jeff Layton <jlayton@samba.org>
-Date: Wed, 18 Apr 2012 21:41:05 -0400
-Subject: [PATCH] mount.cifs: fix up some -D_FORTIFY_SOURCE=2 warnings
-
-...and add -D_FORTIFY_SOURCE=2 to the default $CFLAGS.
-
-Signed-off-by: Jeff Layton <jlayton@samba.org>
----
- Makefile.am  |    2 +-
- mount.cifs.c |   10 ++++++----
- mtab.c       |    4 +++-
- 3 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index d95142a..05729ca 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--AM_CFLAGS = -Wall -Wextra -Werror
-+AM_CFLAGS = -Wall -Wextra -Werror -D_FORTIFY_SOURCE=2
- ACLOCAL_AMFLAGS = -I aclocal
- 
- root_sbindir = $(ROOTSBINDIR)
-diff --git a/mount.cifs.c b/mount.cifs.c
-index f0b073e..4f1ea40 100644
---- a/mount.cifs.c
-+++ b/mount.cifs.c
-@@ -928,9 +928,9 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info)
- 				}
- 			} else {
- 				/* domain/username%password */
--				const int max = MAX_DOMAIN_SIZE +
--						MAX_USERNAME_SIZE +
--						MOUNT_PASSWD_SIZE + 2;
-+				const unsigned int max = MAX_DOMAIN_SIZE +
-+							 MAX_USERNAME_SIZE +
-+							 MOUNT_PASSWD_SIZE + 2;
- 				if (strnlen(value, max + 1) >= max + 1) {
- 					fprintf(stderr, "username too long\n");
- 					return EX_USAGE;
-@@ -1603,8 +1603,10 @@ add_mtab(char *devname, char *mountpoint, unsigned long flags, const char *fstyp
- 	mountent.mnt_passno = 0;
- 	rc = addmntent(pmntfile, &mountent);
- 	if (rc) {
-+		int ignore __attribute__((unused));
-+
- 		fprintf(stderr, "unable to add mount entry to mtab\n");
--		ftruncate(fd, statbuf.st_size);
-+		ignore = ftruncate(fd, statbuf.st_size);
- 		rc = EX_FILEIO;
- 	}
- 	tmprc = my_endmntent(pmntfile, statbuf.st_size);
-diff --git a/mtab.c b/mtab.c
-index de545b7..3d42ac0 100644
---- a/mtab.c
-+++ b/mtab.c
-@@ -271,8 +271,10 @@ my_endmntent(FILE *stream, off_t size)
- 
- 	/* truncate file back to "size" -- best effort here */
- 	if (rc) {
-+		int ignore __attribute__((unused));
-+
- 		rc = errno;
--		ftruncate(fd, size);
-+		ignore = ftruncate(fd, size);
- 	}
- 
- 	endmntent(stream);
--- 
-1.7.7.6
-
diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD
index 017aa6688..ed200c025 100644
--- a/extra/cinepaint/PKGBUILD
+++ b/extra/cinepaint/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169741 2012-10-27 23:41:34Z eric $
+# $Id: PKGBUILD 183279 2013-04-20 16:41:11Z heftig $
 # Maintainer: tobias [tobias.archlinux.org]
 # Contributor: tobias [tobias.justdreams.de]
 
 pkgname=cinepaint
 pkgver=1.3
-pkgrel=5
+pkgrel=6
 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL' 'GPL' 'MIT')
@@ -23,18 +23,24 @@ sha1sums=('1982e32b0f461f4fd0ff0fe17a2e81ccd8dbd52b'
           '3dfc9f06f02791aee59b60d33ddf9d305b0f1de5'
           'a4f43aabdbb33d059f1a38442cd6625e4f00c5b9')
 
-build() {
-  cd "${srcdir}/${pkgname}"
+prepare() {
+  cd ${pkgname}
   patch -p1 -i ../cinepaint-libpng15.patch
   patch -p1 -i ../cinepaint-missing-include.patch
   find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} +
   sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in
+  sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' \
+    -e 's|AM_PROG_CC_STDC|AC_PROG_CC|' configure.in
 
-#  aclocal -I aclocal
-#  autoconf
+  aclocal -I aclocal
+  autoconf
   sh autogen.sh
-  
-  LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \
+}
+
+build() {
+  cd ${pkgname}
+  LIBS+="-lstdc++ -lm -lX11" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+    --libdir=/usr/lib --mandir=/usr/share/man \
     --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2
   sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \
     plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile
@@ -42,7 +48,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
+  cd ${pkgname}
   make DESTDIR="${pkgdir}" install
   sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" -e "/libcinepaint.la/d" \
     -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool"
diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index 9b931263d..070495a47 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166755 2012-09-18 13:55:25Z bisson $
+# $Id: PKGBUILD 183595 2013-04-24 06:52:38Z bisson $
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=clamav
-pkgver=0.97.6
+pkgver=0.97.8
 pkgrel=1
 pkgdesc='Anti-virus toolkit for Unix'
 url='http://www.clamav.net/'
@@ -21,7 +21,7 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver
         'logrotate'
         'tmpfiles.d'
         'config.patch')
-sha1sums=('528f774b14b95fdfb8b377f8b41859c48b165e34'
+sha1sums=('078c0ac2b4e69d27eecd7544a8361abcd859e73c'
           'c9d508c1e5972f0f849d8694c1872455fa9e74de'
           'cb116cdab49a810381a515cbcfb6a6c148547f07'
           'df522b0488f3901e491f148c9300f6bae348c605'
@@ -32,11 +32,13 @@ sha1sums=('528f774b14b95fdfb8b377f8b41859c48b165e34'
 
 install=install
 
-build() {
+prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	patch -p1 -i ../config.patch
+}
 
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc/clamav \
diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD
index 11027bc4f..973515ba0 100644
--- a/extra/claws-mail-extra-plugins/PKGBUILD
+++ b/extra/claws-mail-extra-plugins/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 171015 2012-11-14 20:36:10Z andyrtr $
+# $Id: PKGBUILD 179102 2013-03-03 17:28:30Z dreisner $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Mildred <mildred593 at online dot fr>
 
 pkgname=claws-mail-extra-plugins
 pkgver=3.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Extra plugins for claws-mail"
 url="http://www.claws-mail.org/plugins.php?branch=EXT"
 license=('GPL3')
diff --git a/extra/clisp/PKGBUILD b/extra/clisp/PKGBUILD
index e6902bb33..4798ee4cb 100644
--- a/extra/clisp/PKGBUILD
+++ b/extra/clisp/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 pkgname=clisp
 pkgver=2.49
-pkgrel=3
+pkgrel=3.1
 pkgdesc="ANSI Common Lisp interpreter, compiler and debugger"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/cln/PKGBUILD b/extra/cln/PKGBUILD
index 8c3315c87..eabd82720 100644
--- a/extra/cln/PKGBUILD
+++ b/extra/cln/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=cln
 pkgver=1.3.2
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="Class library for numbers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ginac.de/CLN/"
diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD
index 200686e98..54891f7b8 100644
--- a/extra/clutter-gst/PKGBUILD
+++ b/extra/clutter-gst/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 176007 2013-01-25 17:41:45Z ioni $
+# $Id: PKGBUILD 183340 2013-04-21 22:08:41Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=clutter-gst
-pkgver=2.0.0
-pkgrel=1
+pkgver=2.0.2
+pkgrel=2
 pkgdesc="GStreamer bindings for clutter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.clutter-project.org/"
@@ -12,7 +12,7 @@ depends=('clutter' 'gst-plugins-base-libs' 'libxdamage')
 makedepends=('gobject-introspection')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c612926f1e0bbd3c1ad748192cfccf0f15fdff0113db3b983d9f58989431f99a')
+sha256sums=('577957598d6ee407348dc5d78879da2b212ae54fb3071f86f8409e393dde34c4')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD
index e892d95a1..7ef5204a5 100644
--- a/extra/clutter-gtk/PKGBUILD
+++ b/extra/clutter-gtk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 175998 2013-01-25 16:33:00Z ioni $
+# $Id: PKGBUILD 183341 2013-04-21 22:08:42Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=clutter-gtk
-pkgver=1.4.2
+pkgver=1.4.4
 pkgrel=1
 pkgdesc="GTK clutter widget"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('LGPL')
 depends=('clutter' 'gtk3')
 makedepends=('gobject-introspection')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('dc3ec6e90bc742c8a68ed7fa4c0d25b9b376828f1a7f013c363fbaf14f3a6974')
+sha256sums=('bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/clutter-gtk2/PKGBUILD b/extra/clutter-gtk2/PKGBUILD
deleted file mode 100644
index 09c283747..000000000
--- a/extra/clutter-gtk2/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 160400 2012-06-01 15:37:09Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=clutter-gtk2
-_pkgbasename=clutter-gtk
-pkgver=0.10.8
-pkgrel=3
-pkgdesc="GTK clutter widget"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://clutter-project.org/"
-options=('!libtool')
-license=('LGPL')
-depends=('clutter' 'gtk2')
-makedepends=('gobject-introspection' 'gtk-doc')
-source=(http://www.clutter-project.org/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2
-        gir.patch
-        libm.patch)
-sha256sums=('7867f951568871d9f68cbe8a3644fd53d2138f725b7ba61ffc0053eb64e80814'
-            'a7bb2e41b155a293fef3a58f9d0486788564a5da9373b00cc5209bdbdcb1ec66'
-            '7d5532702eb3c18fff2144f8d501f77d3d9c9c23e6904374f05634fea2d7a8ef')
-
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  patch -Np1 -i "$srcdir/gir.patch"
-  patch -Np1 -i "$srcdir/libm.patch"
-  autoreconf -i
-  export CFLAGS+=" -lgthread-2.0"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -r "$pkgdir/usr/share/gtk-doc"
-}
diff --git a/extra/clutter-gtk2/gir.patch b/extra/clutter-gtk2/gir.patch
deleted file mode 100644
index 81b56f3a1..000000000
--- a/extra/clutter-gtk2/gir.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4de105a2bbd201c8e60f3e8777794a4cd532afdc Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@linux.intel.com>
-Date: Tue, 28 Sep 2010 13:52:25 +0000
-Subject: build: Add common CFLAGS to the introspection scanner
-
----
-diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
-index 6e267b4..cec5cce 100644
---- a/clutter-gtk/Makefile.am
-+++ b/clutter-gtk/Makefile.am
-@@ -15,6 +15,8 @@ AM_CPPFLAGS = \
- 	-DCLUTTER_DISABLE_DEPRECATED		\
- 	$(CLUTTER_GTK_DEBUG_CFLAGS)
- 
-+common_cflags = $(CLUTTER_CFLAGS) $(GTK_CFLAGS)
-+
- # please, keep these lists sorted alphabetically
- sources_c = \
- 	$(srcdir)/gtk-clutter-embed.c 		\
-@@ -36,7 +38,7 @@ lib_LTLIBRARIES = libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la
- libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = $(sources_c)
- libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
- libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
--libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(MAINTAINER_CFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS) 
-+libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(common_cflags) $(MAINTAINER_CFLAGS)
- 
- cluttergtkheadersdir = $(includedir)/clutter-1.0/clutter-gtk
- cluttergtkheaders_HEADERS = $(sources_h) $(srcdir)/clutter-gtk.h
-@@ -48,7 +50,7 @@ GtkClutter-@CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) Makefile libc
- 	$(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
- 		--namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
- 		--strip-prefix=GtkClutter \
--		$(INCLUDES) $(AM_CPPFLAGS) \
-+		$(INCLUDES) $(AM_CPPFLAGS) $(common_cflags) \
- 		--add-include-path=$(srcdir) --add-include=path=. \
- 		--include=Clutter-1.0 \
- 		--include=GdkPixbuf-2.0 \
---
-cgit v0.8.3.1-30-gff3a
diff --git a/extra/clutter-gtk2/libm.patch b/extra/clutter-gtk2/libm.patch
deleted file mode 100644
index 17e47ef40..000000000
--- a/extra/clutter-gtk2/libm.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nur clutter-gtk-0.10.8.orig/configure.ac clutter-gtk-0.10.8/configure.ac
---- clutter-gtk-0.10.8.orig/configure.ac	2012-01-21 14:52:17.627228994 +0000
-+++ clutter-gtk-0.10.8/configure.ac	2012-01-21 15:04:37.317308303 +0000
-@@ -57,6 +57,9 @@
- LT_PREREQ([2.2.6])
- LT_INIT([disable-static])
- 
-+AC_CHECK_LIBM
-+AC_SUBST(LIBM)
-+
- m4_define([clutter_req_version], [1.2.0])
- m4_define([gtk_req_version], [2.19.5])
- m4_define([flavour_default], [x11])
-diff -Nur clutter-gtk-0.10.8.orig/examples/Makefile.am clutter-gtk-0.10.8/examples/Makefile.am
---- clutter-gtk-0.10.8.orig/examples/Makefile.am	2012-01-21 14:52:17.600561077 +0000
-+++ clutter-gtk-0.10.8/examples/Makefile.am	2012-01-21 15:00:04.549770032 +0000
-@@ -22,18 +22,18 @@
- 
- gtk_clutter_test_SOURCES = gtk-clutter-test.c
- gtk_clutter_test_DEPENDENCIES = $(common_deps)
--gtk_clutter_test_LDADD = $(common_ldadd)
-+gtk_clutter_test_LDADD = $(common_ldadd) $(LIBM)
- 
- gtk_clutter_events_SOURCES = gtk-clutter-events.c
- gtk_clutter_events_DEPENDENCIES = $(common_deps)
--gtk_clutter_events_LDADD = $(common_ldadd)
-+gtk_clutter_events_LDADD = $(common_ldadd) $(LIBM)
- 
- gtk_clutter_multistage_SOURCES = gtk-clutter-multistage.c
- gtk_clutter_multistage_DEPENDENCIES = $(common_deps)
--gtk_clutter_multistage_LDADD = $(common_ldadd)
-+gtk_clutter_multistage_LDADD = $(common_ldadd) $(LIBM)
- 
- gtk_clutter_viewport_SOURCES = gtk-clutter-viewport.c
- gtk_clutter_viewport_DEPENDENCIES = $(common_deps)
--gtk_clutter_viewport_LDADD = $(common_ldadd)
-+gtk_clutter_viewport_LDADD = $(common_ldadd) $(LIBM)
- 
- EXTRA_DIST = redhand.png
diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD
index 7e89f51bc..2da7dc023 100644
--- a/extra/clutter/PKGBUILD
+++ b/extra/clutter/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 169854 2012-10-30 22:24:23Z heftig $
+# $Id: PKGBUILD 183339 2013-04-21 22:08:40Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=clutter
-pkgver=1.12.2
-pkgrel=1
+pkgver=1.14.2
+pkgrel=2
 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://clutter-project.org/"
 options=('!libtool')
 license=('LGPL')
-depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi')
-makedepends=('gobject-introspection' 'mesa')
+depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon')
+makedepends=('gobject-introspection')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('27a8c4495099ea33de39c2d9a911a2c9e00ffa4dcc8f94fafedbcc752c0ddf13')
+sha256sums=('b2bdf7090f7ba34a69e07a58d43ff8088c81d6dbb56677ae4b103b6cba1920a8')
 
 build() {
   cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --enable-introspection
+  ./configure --prefix=/usr --enable-introspection \
+    --enable-wayland-{backend,compositor} --enable-egl-backend --enable-evdev-input
   make
 }
 
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 08946e8b8..f6ae39a5c 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,24 +1,33 @@
-# $Id: PKGBUILD 172096 2012-11-28 07:27:35Z andrea $
+# $Id: PKGBUILD 179599 2013-03-07 17:46:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
 pkgver=2.8.10.2
-pkgrel=1
+pkgrel=5
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cmake.org/"
 license=('custom')
 depends=('curl' 'libarchive' 'shared-mime-info')
-makedepends=('qt' 'emacs')
-optdepends=('qt: cmake-gui')
+makedepends=('qt5-base' 'emacs')
+optdepends=('qt5-base: cmake-gui')
 install="${pkgname}.install"
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('097278785da7182ec0aea8769d06860c')
+source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
+        'qt4.patch')
+md5sums=('097278785da7182ec0aea8769d06860c'
+         '4933fbe934d3989923f0a60a78dac44e')
 
 build() {
   cd ${pkgname}-${pkgver}
 
+  # qmake refers to Qt5
+  patch -p1 -i "${srcdir}"/qt4.patch
+
+  # Qt is built with reduce-relocations
+  export CFLAGS="${CFLAGS} -fPIC"
+  export CXXFLAGS="${CXXFLAGS} -fPIC"
+
   ./bootstrap --prefix=/usr \
     --mandir=/share/man \
     --docdir=/share/doc/cmake \
diff --git a/extra/cmake/fix-pkg-config.patch b/extra/cmake/fix-pkg-config.patch
deleted file mode 100644
index c9390aec2..000000000
--- a/extra/cmake/fix-pkg-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindPkgConfig.cmake;h=39d3a76abd852df4a32eab5f8d5672fa24a7e4cf;hp=5d93ab151de792b4565cbef1927f372be633f4a6;hb=3ea850a5023060b84dcc0e6f0098c32c28b15807;hpb=ad3d2b450f1c2454cd1a3f416ef97631e2937eef
-
-diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
-index 5d93ab1..39d3a76 100644
---- a/Modules/FindPkgConfig.cmake
-+++ b/Modules/FindPkgConfig.cmake
-@@ -13,11 +13,10 @@
- # When the 'QUIET' argument is set, no status messages will be printed.
- #
- # It sets the following variables:
--#   PKG_CONFIG_FOUND          ... true if pkg-config works on the system
-+#   PKG_CONFIG_FOUND          ... if pkg-config executable was found
- #   PKG_CONFIG_EXECUTABLE     ... pathname of the pkg-config program
- #   PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found
- #                                 (since CMake 2.8.8)
--#   PKG_CONFIG_FOUND          ... if pkg-config executable was found
- #
- # For the following variables two sets of values exist; first one is the
- # common one and has the given PREFIX. The second set contains flags
-@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig
-                                   REQUIRED_VARS PKG_CONFIG_EXECUTABLE
-                                   VERSION_VAR PKG_CONFIG_VERSION_STRING)
- 
-+# This is needed because the module name is "PkgConfig" but the name of
-+# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
-+# handled by FPHSA.
-+set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
-+
- # Unsets the given variables
- macro(_pkgconfig_unset var)
-   set(${var} "" CACHE INTERNAL "")
diff --git a/extra/cmake/qt4.patch b/extra/cmake/qt4.patch
new file mode 100644
index 000000000..0518681f0
--- /dev/null
+++ b/extra/cmake/qt4.patch
@@ -0,0 +1,11 @@
+--- cmake-2.8.10.2/Modules/FindQt4.cmake~	2013-03-07 16:50:35.388399689 +0000
++++ cmake-2.8.10.2/Modules/FindQt4.cmake	2013-03-07 16:51:35.017991029 +0000
+@@ -497,7 +497,7 @@
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
+-find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac
++find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac
+   PATHS
+     ENV QTDIR
+     "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
diff --git a/extra/cmt/PKGBUILD b/extra/cmt/PKGBUILD
index 13fccf484..205ec45e9 100644
--- a/extra/cmt/PKGBUILD
+++ b/extra/cmt/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=cmt
 pkgver=1.16
-pkgrel=3.1
+pkgrel=3.2
 pkgdesc="CMT for LADSPA"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD
index 77eb71628..7a7a29698 100644
--- a/extra/cogl/PKGBUILD
+++ b/extra/cogl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163754 2012-07-19 07:57:34Z heftig $
+# $Id: PKGBUILD 183342 2013-04-21 22:08:43Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=cogl
-pkgver=1.10.4
-pkgrel=1
+pkgver=1.14.0
+pkgrel=2
 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
 arch=(mips64el)
 url="http://www.clutter-project.org/"
@@ -12,11 +12,12 @@ depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango')
 makedepends=('mesa' 'gobject-introspection')
 options=(!libtool !emptydirs)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0b5c9989f1d07dbda000a68640eb7ebf734513d52e3707668c41eed19991adf9')
+sha256sums=('276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8')
 
 build() {
   cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr \
+    --enable-wayland-egl-{platform,server} --enable-gles{1,2}
   make
 }
 
diff --git a/extra/colord-gtk/PKGBUILD b/extra/colord-gtk/PKGBUILD
index 2cf608a6e..0cd7710ce 100644
--- a/extra/colord-gtk/PKGBUILD
+++ b/extra/colord-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175994 2013-01-25 16:27:49Z ioni $
+# $Id: PKGBUILD 180561 2013-03-23 09:51:45Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=colord-gtk
-pkgver=0.1.24
+pkgver=0.1.25
 pkgrel=1
 pkgdesc="GTK integration for libcolord"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('lcms2' 'gtk3' 'colord')
 makedepends=('intltool' 'gobject-introspection' 'vala' 'gtk-doc')
 source=($url/releases/$pkgname-$pkgver.tar.xz)
 options=('!libtool')
-sha1sums=('6711d50d45150e54ebcfcd8d242b6a0d83ac73c2')
+sha1sums=('ffb27568ff25860fbcc09cc32ba05469655b099d')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD
index 5f59b773b..a079913f0 100644
--- a/extra/colord/PKGBUILD
+++ b/extra/colord/PKGBUILD
@@ -1,39 +1,39 @@
-# $Id: PKGBUILD 175992 2013-01-25 16:22:30Z ioni $
+# $Id: PKGBUILD 184190 2013-05-03 11:21:48Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=colord
-pkgver=0.1.28
+pkgver=0.1.34
 pkgrel=1
 pkgdesc="System daemon for managing color devices"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/software/colord"
-license=('GPL2')
-depends=('lcms2' 'libgusb' 'polkit' 'shared-color-profiles' 'sqlite' 'udev')
-makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x')
-source=($url/releases/$pkgname-$pkgver.tar.xz)
+license=(GPL2)
+depends=(lcms2 libgusb polkit shared-color-profiles sqlite udev dconf dbus)
+makedepends=(intltool gobject-introspection vala docbook2x sane bash-completion)
+optdepends=('sane: UseSANE support [/etc/colord.conf]')
 options=('!libtool')
 install=colord.install
-sha1sums=('d53167727ab0f1014ded86675ac8b518c188a88b')
+backup=(etc/colord.conf)
+source=($url/releases/$pkgname-$pkgver.tar.xz)
+sha1sums=('e4168ca34c2ce228276299efaf12d2f9fb7ecb2e')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   
   # put udev files in /usr/lib
   sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
   
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc --libexecdir=/usr/lib/colord \
-    --localstatedir=/var --disable-static \
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname --disable-static \
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --enable-vala
+    --enable-vala --enable-sane --disable-volume-search
   make
 }
 
 package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install \
-    bashcompletiondir=/usr/share/bash-completion/completions
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/crypto++/PKGBUILD b/extra/crypto++/PKGBUILD
index aefbae61b..7bcececdc 100644
--- a/extra/crypto++/PKGBUILD
+++ b/extra/crypto++/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 155988 2012-04-10 20:46:54Z giovanni $
+# $Id: PKGBUILD 179501 2013-03-05 17:32:57Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,9 +6,9 @@
 # Contributor: jlvsimoes <jlvsimoes@oninet.pt>
 
 pkgname=crypto++
-pkgver=5.6.1
-_srcver=561
-pkgrel=4
+pkgver=5.6.2
+_srcver=562
+pkgrel=1
 pkgdesc="A free C++ class library of cryptographic schemes"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cryptopp.com/"
@@ -17,23 +17,22 @@ depends=('gcc-libs')
 makedepends=('unzip')
 source=("http://www.cryptopp.com/cryptopp${_srcver}.zip"
         'libcrypto++.pc'
-        'GNUmakefile.parabola'
-        'gcc4.7.patch')
-md5sums=('96cbeba0907562b077e26bcffb483828'
-         '2337c6edbc552d9142cae8e0854715e7'
-         'c95b2134a8c0a35b173ede32001870d2'
-         'cf26a783d9432e7f9ab7f14d3db3f196')
+        'GNUmakefile.parabola')
+md5sums=('7ed022585698df48e65ce9218f6c6a67'
+         '46de3847c59ad16456fa863eb33e73b2'
+         'c95b2134a8c0a35b173ede32001870d2')
 
 build() {
   cd ${srcdir}
 
-  # Fix gcc 4.7 build
-  patch -Np1 -i "${srcdir}/gcc4.7.patch"
-
   # The upstream build system expects this file to be modified
   # to e.g. use system CFLAGS or use features of modern linkers.
   cp "${srcdir}/GNUmakefile.parabola" GNUmakefile
   make -f GNUmakefile
+
+  sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
+  export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
+  make -f GNUmakefile  
   make libcryptopp.so
 }
 
diff --git a/extra/crypto++/gcc4.7.patch b/extra/crypto++/gcc4.7.patch
deleted file mode 100644
index 55d5a0a0a..000000000
--- a/extra/crypto++/gcc4.7.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- a/algebra.cpp	2010-08-06 18:44:32.000000000 +0200
-+++ b/algebra.cpp	2012-04-10 13:16:53.000000000 +0200
-@@ -58,7 +58,7 @@
- 	Element g[3]={b, a};
- 	unsigned int i0=0, i1=1, i2=2;
- 
--	while (!Equal(g[i1], this->Identity()))
-+	while (!this->Equal(g[i1], this->Identity()))
- 	{
- 		g[i2] = Mod(g[i0], g[i1]);
- 		unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
---- a/eccrypto.cpp	2010-08-06 18:44:28.000000000 +0200
-+++ b/eccrypto.cpp	2012-04-10 13:19:36.000000000 +0200
-@@ -435,7 +435,7 @@
- 	StringSource ssG(param.g, true, new HexDecoder);
- 	Element G;
- 	bool result = GetCurve().DecodePoint(G, ssG, (size_t)ssG.MaxRetrievable());
--	SetSubgroupGenerator(G);
-+	this->SetSubgroupGenerator(G);
- 	assert(result);
- 
- 	StringSource ssN(param.n, true, new HexDecoder);
-@@ -591,7 +591,7 @@
- 	if (level >= 2 && pass)
- 	{
- 		const Integer &q = GetSubgroupOrder();
--		Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : ExponentiateElement(g, q);
-+		Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : this->ExponentiateElement(g, q);
- 		pass = pass && IsIdentity(gq);
- 	}
- 	return pass;
-@@ -629,7 +629,7 @@
- 	typename EC::Point P;
- 	if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size))
- 		BERDecodeError();
--	SetPublicElement(P);
-+	this->SetPublicElement(P);
- }
- 
- template <class EC>
---- a/eccrypto.h	2010-08-06 18:46:24.000000000 +0200
-+++ b/eccrypto.h	2012-04-10 13:23:09.000000000 +0200
-@@ -43,7 +43,7 @@
- 	void Initialize(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero())
- 	{
- 		this->m_groupPrecomputation.SetCurve(ec);
--		SetSubgroupGenerator(G);
-+		this->SetSubgroupGenerator(G);
- 		m_n = n;
- 		m_k = k;
- 	}
-@@ -145,9 +145,9 @@
- 	typedef typename EC::Point Element;
- 
- 	void Initialize(const DL_GroupParameters_EC<EC> &params, const Element &Q)
--		{this->AccessGroupParameters() = params; SetPublicElement(Q);}
-+		{this->AccessGroupParameters() = params; this->SetPublicElement(Q);}
- 	void Initialize(const EC &ec, const Element &G, const Integer &n, const Element &Q)
--		{this->AccessGroupParameters().Initialize(ec, G, n); SetPublicElement(Q);}
-+		{this->AccessGroupParameters().Initialize(ec, G, n); this->SetPublicElement(Q);}
- 
- 	// X509PublicKey
- 	void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size);
-@@ -166,9 +166,9 @@
- 	void Initialize(const EC &ec, const Element &G, const Integer &n, const Integer &x)
- 		{this->AccessGroupParameters().Initialize(ec, G, n); this->SetPrivateExponent(x);}
- 	void Initialize(RandomNumberGenerator &rng, const DL_GroupParameters_EC<EC> &params)
--		{GenerateRandom(rng, params);}
-+		{this->GenerateRandom(rng, params);}
- 	void Initialize(RandomNumberGenerator &rng, const EC &ec, const Element &G, const Integer &n)
--		{GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));}
-+		{this->GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));}
- 
- 	// PKCS8PrivateKey
- 	void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size);
---- a/secblock.h	2012-04-10 13:25:40.000000000 +0200
-+++ b/secblock.h	2012-04-10 13:25:52.000000000 +0200
-@@ -88,7 +88,7 @@
- 
- 	pointer allocate(size_type n, const void * = NULL)
- 	{
--		CheckSize(n);
-+		this->CheckSize(n);
- 		if (n == 0)
- 			return NULL;
- 
---- a/panama.cpp	2010-08-09 14:22:42.000000000 +0200
-+++ b/panama.cpp	2012-04-10 13:50:12.000000000 +0200
-@@ -422,7 +422,7 @@
- {
- 	this->ThrowIfInvalidTruncatedSize(size);
- 
--	PadLastBlock(this->BLOCKSIZE, 0x01);
-+	this->PadLastBlock(this->BLOCKSIZE, 0x01);
- 	
- 	HashEndianCorrectedBlock(this->m_data);
- 
diff --git a/extra/crypto++/libcrypto++.pc b/extra/crypto++/libcrypto++.pc
index 698d761a7..cba33f5f9 100644
--- a/extra/crypto++/libcrypto++.pc
+++ b/extra/crypto++/libcrypto++.pc
@@ -4,8 +4,8 @@ prefix=/usr
 libdir=${prefix}/lib
 includedir=${prefix}/include
 
-Name: libcrypto++-5.6.1
+Name: libcrypto++-5.6.2
 Description: Class library of cryptographic schemes
-Version: 5.6.1
+Version: 5.6.2
 Libs: -L${libdir} -lcryptopp
 Cflags: -I${includedir} 
diff --git a/extra/cups-filters/PKGBUILD b/extra/cups-filters/PKGBUILD
deleted file mode 100644
index 8a74f9597..000000000
--- a/extra/cups-filters/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 173928 2012-12-28 07:19:09Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=cups-filters
-pkgver=1.0.26
-pkgrel=1
-pkgdesc="OpenPrinting CUPS Filters"
-arch=('i686' 'x86_64')
-url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
-license=('GPL')
-depends=('lcms2' 'poppler>=0.20.5' 'qpdf')
-makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check
-optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
-	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
-	    'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly'
-	    'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly')
-backup=(etc/fonts/conf.d/99pdftoopvp.conf)
-options=(!libtool)
-source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz cups-browsed.service)
-md5sums=('38502cb880e1f9be0618e3b2da4c7fec'
-         '2beb8d9cebf20ddcc6c7598aab4812a6')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr  \
-    --sysconfdir=/etc \
-    --enable-avahi \
-    --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-  # drop static lib
-  rm -f ${pkgdir}/usr/lib/*.a
-  
-  # add missing systemd support
-  rm -rf ${pkgdir}/etc/rc.d
-  install -Dm644 ${srcdir}/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service
-}
diff --git a/extra/cups-filters/cups-browsed.service b/extra/cups-filters/cups-browsed.service
deleted file mode 100644
index d434d82f0..000000000
--- a/extra/cups-filters/cups-browsed.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=a daemon to browse the Bonjour broadcasts
-
-[Service]
-ExecStart=/usr/sbin/cups-browsed
-PrivateTmp=yes
-
-[Install]
-Also=cups.service avahi-daemon.service
-WantedBy=printer.target
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 46e94de2e..02a3f657c 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166183 2012-09-05 08:15:25Z andyrtr $
+# $Id: PKGBUILD 180282 2013-03-19 15:32:07Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=1.6.1
-pkgrel=6
+pkgver=1.6.2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.cups.org/"
@@ -15,24 +15,15 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
         cups-no-gcrypt.patch
         cups-no-gzip-man.patch
         cups-systemd-socket.patch
-        cups cups.logrotate cups.pam
-        cupsd-conf-remove-obsolete-browse-directives.patch
-        avahi-missing-in-conditionals.patch
-        recognize-remote-cups-queue-via-dnssd-uri.patch
-        usb-backend-reset-after-job-only-for-specific-devices.patch)
+        cups.logrotate cups.pam)
 #options=('!emptydirs')
-md5sums=('87ade07e3d1efd03c9c3add949cf9c00'
-         '9b8467a1e51d360096b70e2c3c081e6c'
-         '3733c23e77eb503bd94cc368e02830dc'
+md5sums=('13c8b2b2336d42001abe4899766b62dc'
+         '3ba9e3410df1dc3015463d615ef91b3b'
+         'cc4101beccb5ed6deb1c92707a575925'
          '90c30380d4c8cd48a908cfdadae1ea24'
          'b4868b83f7f2d6ec24a1be76509379f0'
-         '9657daa21760bb0b5fa3d8b51d5e01a1'
          'f861b18f4446c43918c8643dcbbd7f6d'
-         '96f82c38f3f540b53f3e5144900acf17'
-         '6bef262b5081051e88cd2ae94fed1867'
-         '9c91b1319f4b20dc323986cb4abbe806'
-         'dcef8dd5614461166cada8a706eebb49'
-         '0779ef8ba1d724ebb3b9bf360deba52b')
+         '96f82c38f3f540b53f3e5144900acf17')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -41,23 +32,14 @@ build() {
   # modified now to the changes done by Gentoo in their svn ebuild
   # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.5.0-systemd-socket.patch?revision=1.1
   patch -Np1 -i ${srcdir}/cups-systemd-socket.patch
-  
+
   # Do not export SSL libs in cups-config
   patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
 
   patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
+
   # don't zip man pages in make install, let makepkg do that / Fedora
   patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
-
-  # upstream bugtracker patches
-  # http://www.cups.org/str.php?L4157 - fix broken default server config
-  patch -Np1 -i ${srcdir}/cupsd-conf-remove-obsolete-browse-directives.patch
-  # http://www.cups.org/str.php?L4156 - In many DNS-SD/Bonjour conditionals Avahi is not considered
-  patch -Np1 -i ${srcdir}/avahi-missing-in-conditionals.patch
-  # http://www.cups.org/str.php?L4158 - DNS-SD-based print queues pointing to CUPS server are not considered remote printers with driver on server
-  patch -Np1 -i ${srcdir}/recognize-remote-cups-queue-via-dnssd-uri.patch
-  # http://cups.org/str.php?L4155 / https://bugs.archlinux.org/task/30965
-  patch -Np0 -i ${srcdir}/usb-backend-reset-after-job-only-for-specific-devices.patch
   
   # Rebuild configure script for not zipping man-pages.
   aclocal -I config-scripts
@@ -118,6 +100,7 @@ backup=(etc/cups/cupsd.conf
         etc/cups/snmp.conf
         etc/cups/printers.conf
         etc/cups/classes.conf
+        etc/cups/cups-files.conf
         etc/cups/subscriptions.conf
         etc/dbus-1/system.d/cups.conf
         etc/logrotate.d/cups
@@ -135,7 +118,6 @@ optdepends=('xdg-utils: xdg .desktop file support')
   # kill the sysv stuff
   rm -rf ${pkgdir}/etc/rc*.d
   rm -rf ${pkgdir}/etc/init.d
-  install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd
   install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
   install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
   
diff --git a/extra/cups/PKGBUILD.16 b/extra/cups/PKGBUILD.16
deleted file mode 100644
index eb8e26473..000000000
--- a/extra/cups/PKGBUILD.16
+++ /dev/null
@@ -1,147 +0,0 @@
-# $Id: PKGBUILD 159509 2012-05-25 16:34:34Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase="cups"
-pkgname=('libcups' 'cups')
-pkgver=1.6.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.cups.org/"
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc'
-             'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi'  'hicolor-icon-theme')
-source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
-        cups-no-export-ssllibs.patch
-        cups-no-gcrypt.patch
-        cups-no-gzip-man.patch
-        cups cups.logrotate cups.pam)
-#options=('!emptydirs')
-md5sums=('07157b243dd11e90e3f654c4d62e7c8a'
-         '9b8467a1e51d360096b70e2c3c081e6c'
-         '3733c23e77eb503bd94cc368e02830dc'
-         'c9159ba1233902ba6ddbbe6885a46b72'
-         '9657daa21760bb0b5fa3d8b51d5e01a1'
-         'f861b18f4446c43918c8643dcbbd7f6d'
-         '96f82c38f3f540b53f3e5144900acf17')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-
-  # Do not export SSL libs in cups-config
-  patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
-
-  patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
-  # don't zip man pages in make install, let makepkg do that / Fedora
-  patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
-  
-  # Rebuild configure script for not zipping man-pages.
-  aclocal -I config-scripts
-  autoconf -I config-scripts
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-     --libdir=/usr/lib \
-     --with-systemdsystemunitdir=/usr/lib/systemd/system \
-     --with-logdir=/var/log/cups \
-     --with-docdir=/usr/share/cups/doc \
-     --with-cups-user=daemon \
-     --with-cups-group=lp \
-     --enable-pam=yes \
-     --enable-raw-printing \
-     --enable-dbus --with-dbusdir=/etc/dbus-1 \
-     --enable-ssl=yes --enable-gnutls \
-     --enable-threads \
-     --enable-avahi\
-     --with-php=/usr/bin/php-cgi \
-     --with-optim="$CFLAGS"
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  #httpAddrGetList(workstation64): FAIL
-  #1 TESTS FAILED!
-  #make[1]: *** [testhttp] Error 1
-  make -k check || /bin/true
-}
-
-package_libcups() {
-pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
-backup=(etc/cups/client.conf)
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-headers install-libs
-  # put this into the libs pkg to make other software find the libs(no pkg-config file included)
-  mkdir -p ${pkgdir}/usr/bin 
-  install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
-  
-  # install client.conf man page and config file
-  install -dm755 ${pkgdir}/usr/share/man/man5
-  #install -Dm644  ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5.gz ${pkgdir}/usr/share/man/man5/
-  install -Dm644  ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/
-  install -dm755 ${pkgdir}/etc/cups
-  touch ${pkgdir}/etc/cups/client.conf
-  echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf
-  echo "ServerName /var/run/cups/cups.sock #  alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf
-  chgrp lp ${pkgdir}/etc/cups/client.conf
-}
-
-package_cups() {
-pkgdesc="The CUPS Printing System - daemon package"
-install=cups.install
-backup=(etc/cups/cupsd.conf
-        etc/cups/snmp.conf
-        etc/cups/printers.conf
-        etc/cups/classes.conf
-        etc/cups/subscriptions.conf
-        etc/dbus-1/system.d/cups.conf
-        etc/logrotate.d/cups
-        etc/pam.d/cups
-        etc/xinetd.d/cups-lpd)
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'libusb' 'dbus-core' 'hicolor-icon-theme')
-optdepends=('xdg-utils: xdg .desktop file support')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-data install-exec
-
-  # this one we ship in the libcups pkg
-  rm -f ${pkgdir}/usr/bin/cups-config
-
-  # kill the sysv stuff
-  rm -rf ${pkgdir}/etc/rc*.d
-  rm -rf ${pkgdir}/etc/init.d
-  install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd
-  install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
-  install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
-  
-  # fix perms on /var/spool and /etc
-  chmod 755 ${pkgdir}/var/spool
-  chmod 755 ${pkgdir}/etc
-
-  # install ssl directory where to store the certs, solves some samba issues
-  install -dm700 -g lp ${pkgdir}/etc/cups/ssl
-  # remove directory from package, we create it in cups rc.d file
-  rm -rf ${pkgdir}/var/run
-
-  # install some more configuration files that will get filled by cupsd
-  touch ${pkgdir}/etc/cups/printers.conf
-  touch ${pkgdir}/etc/cups/classes.conf
-  touch ${pkgdir}/etc/cups/subscriptions.conf 
-  chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,subscriptions.conf}
-  
-  # fix .desktop file
-  sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
-  
-  # compress some driver files, adopted from Fedora
-  find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
-  
-  # remove client.conf man page
-  rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
-  
-  # remove files now part of cups-filters
-  rm -v ${pkgdir}/usr/lib/cups/filter/bannertops
-  rm -v ${pkgdir}/usr/share/cups/banners/*
-  rm -v ${pkgdir}/usr/share/cups/data/testprint
-  # comment out all conversion rules which use any of the removed filters
-  perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs
-}
diff --git a/extra/cups/avahi-missing-in-conditionals.patch b/extra/cups/avahi-missing-in-conditionals.patch
deleted file mode 100644
index b261f58ae..000000000
--- a/extra/cups/avahi-missing-in-conditionals.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -uraN cups/scheduler/client.c cups-new/scheduler/client.c
---- cups/scheduler/client.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/client.c	2012-08-04 20:13:17.082220961 +0200
-@@ -4021,7 +4021,7 @@
- 	    !strncmp(host, "[::1]:", 6));
-   }
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  /*
-   * Check if the hostname is something.local (Bonjour); if so, allow it.
-   */
-@@ -4040,7 +4040,7 @@
- 	      !_cups_strcasecmp(end, ".local.") ||
- 	      !_cups_strncasecmp(end, ".local.:", 8)))
-     return (1);
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-  /*
-   * Check if the hostname is an IP address...
-@@ -4101,7 +4101,7 @@
-     }
-   }
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   for (a = (cupsd_alias_t *)cupsArrayFirst(DNSSDAlias);
-        a;
-        a = (cupsd_alias_t *)cupsArrayNext(DNSSDAlias))
-@@ -4126,7 +4126,7 @@
-         return (1);
-     }
-   }
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-  /*
-   * Check for interface hostname matches...
-diff -uraN cups/scheduler/conf.c cups-new/scheduler/conf.c
---- cups/scheduler/conf.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/conf.c	2012-08-04 20:15:49.830978405 +0200
-@@ -89,9 +89,9 @@
- {
-   { "AccessLog",		&AccessLog,		CUPSD_VARTYPE_STRING },
-   { "AutoPurgeJobs", 		&JobAutoPurge,		CUPSD_VARTYPE_BOOLEAN },
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   { "BrowseDNSSDSubTypes",	&DNSSDSubTypes,		CUPSD_VARTYPE_STRING },
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
-   { "BrowseWebIF",		&BrowseWebIF,		CUPSD_VARTYPE_BOOLEAN },
-   { "Browsing",			&Browsing,		CUPSD_VARTYPE_BOOLEAN },
-   { "CacheDir",			&CacheDir,		CUPSD_VARTYPE_STRING },
-@@ -735,9 +735,9 @@
-   Browsing                 = CUPS_DEFAULT_BROWSING;
-   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cupsdSetString(&DNSSDSubTypes, "_cups,_print");
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
-   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
-diff -uraN cups/scheduler/ipp.c cups-new/scheduler/ipp.c
---- cups/scheduler/ipp.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/ipp.c	2012-08-04 20:13:17.086220978 +0200
-@@ -4813,7 +4813,7 @@
-     ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
-                ippTimeToDate(curtime));
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   if (!ra || cupsArrayFind(ra, "printer-dns-sd-name"))
-   {
-     if (printer->reg_name)
-@@ -4823,7 +4823,7 @@
-       ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE,
-                    "printer-dns-sd-name", 0);
-   }
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-   if (!ra || cupsArrayFind(ra, "printer-error-policy"))
-     ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
-diff -uraN cups/scheduler/main.c cups-new/scheduler/main.c
---- cups/scheduler/main.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/main.c	2012-08-04 20:13:17.090221001 +0200
-@@ -781,9 +781,9 @@
-       * Got an error from select!
-       */
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-       cupsd_printer_t	*p;		/* Current printer */
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
- 
-       if (errno == EINTR)		/* Just interrupted by a signal */
-@@ -824,13 +824,13 @@
- 			job->print_pipes[0], job->print_pipes[1],
- 			job->back_pipes[0], job->back_pipes[1]);
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-       for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
- 	   p;
- 	   p = (cupsd_printer_t *)cupsArrayNext(Printers))
-         cupsdLogMessage(CUPSD_LOG_EMERG, "printer[%s] reg_name=\"%s\"", p->name,
- 	                p->reg_name ? p->reg_name : "(null)");
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-       break;
-     }
diff --git a/extra/cups/cups b/extra/cups/cups
deleted file mode 100755
index 744c8e663..000000000
--- a/extra/cups/cups
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-daemon_name=cupsd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-#. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-        pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/extra/cups/cups-avahi-1-config.patch b/extra/cups/cups-avahi-1-config.patch
deleted file mode 100644
index 304cd2607..000000000
--- a/extra/cups/cups-avahi-1-config.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -up cups-1.5.2/config.h.in.avahi-1-config cups-1.5.2/config.h.in
---- cups-1.5.2/config.h.in.avahi-1-config	2011-06-16 21:12:16.000000000 +0100
-+++ cups-1.5.2/config.h.in	2012-03-14 15:04:51.365347165 +0000
-@@ -390,6 +390,13 @@
- 
- 
- /*
-+ * Do we have Avahi for DNS Service Discovery?
-+ */
-+
-+#undef HAVE_AVAHI
-+
-+
-+/*
-  * Do we have <sys/ioctl.h>?
-  */
- 
-diff -up cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config cups-1.5.2/config-scripts/cups-dnssd.m4
---- cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config	2011-05-12 06:21:56.000000000 +0100
-+++ cups-1.5.2/config-scripts/cups-dnssd.m4	2012-03-14 15:04:51.365347165 +0000
-@@ -23,6 +23,21 @@ AC_ARG_WITH(dnssd-includes, [  --with-dn
- DNSSDLIBS=""
- DNSSD_BACKEND=""
- 
-+AC_ARG_ENABLE(avahi, [  --enable-avahi          turn on DNS Service Discovery support, default=no],
-+	      [if test x$enable_avahi = xyes; then
-+		       AC_MSG_CHECKING(for Avahi)
-+		       if $PKGCONFIG --exists avahi-client; then
-+			       AC_MSG_RESULT(yes)
-+			       CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`"
-+			       DNSSDLIBS="`$PKGCONFIG --libs avahi-client`"
-+			       DNSSD_BACKEND="dnssd"
-+			       AC_DEFINE(HAVE_AVAHI)
-+			       enable_dnssd=no
-+		       else
-+			       AC_MSG_RESULT(no)
-+		       fi
-+	       fi])
-+
- if test x$enable_dnssd != xno; then
- 	AC_CHECK_HEADER(dns_sd.h, [
- 		case "$uname" in
\ No newline at end of file
diff --git a/extra/cups/cups-avahi-2-backend.patch b/extra/cups/cups-avahi-2-backend.patch
deleted file mode 100644
index 00e12a0a3..000000000
--- a/extra/cups/cups-avahi-2-backend.patch
+++ /dev/null
@@ -1,1118 +0,0 @@
-diff -up cups-1.5.3/backend/dnssd.c.avahi-2-backend cups-1.5.3/backend/dnssd.c
---- cups-1.5.3/backend/dnssd.c.avahi-2-backend	2012-05-15 16:53:18.164774446 +0200
-+++ cups-1.5.3/backend/dnssd.c	2012-05-15 17:09:07.684155704 +0200
-@@ -15,14 +15,21 @@
-  *
-  * Contents:
-  *
-+ *   next_txt_record()       - Get next TXT record from a cups_txt_records_t.
-+ *   parse_txt_record_pair() - Read key/value pair in cups_txt_records_t.
-  *   main()                  - Browse for printers.
-  *   browse_callback()       - Browse devices.
-  *   browse_local_callback() - Browse local devices.
-  *   compare_devices()       - Compare two devices.
-  *   exec_backend()          - Execute the backend that corresponds to the
-  *                             resolved service name.
-+ *   device_type()           - Get DNS-SD type enumeration from string.
-  *   get_device()            - Create or update a device.
-  *   query_callback()        - Process query data.
-+ *   avahi_client_callback() - Avahi client callback function.
-+ *   avahi_query_callback()  - Avahi query callback function.
-+ *   avahi_browse_callback() - Avahi browse callback function.
-+ *   find_device()           - Find a device from its name and domain.
-  *   sigterm_handler()       - Handle termination signals...
-  *   unquote()               - Unquote a name string.
-  */
-@@ -33,7 +40,18 @@
- 
- #include "backend-private.h"
- #include <cups/array.h>
--#include <dns_sd.h>
-+#ifdef HAVE_DNSSD
-+#  include <dns_sd.h>
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/lookup.h>
-+#  include <avahi-common/simple-watch.h>
-+#  include <avahi-common/domain.h>
-+#  include <avahi-common/error.h>
-+#  include <avahi-common/malloc.h>
-+#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -53,7 +71,12 @@ typedef enum
- 
- typedef struct
- {
-+#ifdef HAVE_DNSSD
-   DNSServiceRef	ref;			/* Service reference for resolve */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  int		resolved;		/* Did we resolve the device? */
-+#endif /* HAVE_AVAHI */
-   char		*name,			/* Service name */
- 		*domain,		/* Domain name */
- 		*fullName,		/* Full name */
-@@ -65,6 +88,20 @@ typedef struct
- 		sent;			/* Did we list the device? */
- } cups_device_t;
- 
-+typedef struct
-+{
-+  char key[256];
-+  char value[256];
-+
-+#ifdef HAVE_DNSSD
-+  const uint8_t *data;
-+  const uint8_t *datanext;
-+  const uint8_t *dataend;
-+#else /* HAVE_AVAHI */
-+  AvahiStringList *txt;
-+#endif /* HAVE_DNSSD */
-+} cups_txt_records_t;
-+
- 
- /*
-  * Local globals...
-@@ -78,6 +115,7 @@ static int		job_canceled = 0;
-  * Local functions...
-  */
- 
-+#ifdef HAVE_DNSSD
- static void		browse_callback(DNSServiceRef sdRef,
- 			                DNSServiceFlags flags,
- 				        uint32_t interfaceIndex,
-@@ -95,13 +133,6 @@ static void		browse_local_callback(DNSSe
- 					      const char *replyDomain,
- 					      void *context)
- 					      __attribute__((nonnull(1,5,6,7,8)));
--static int		compare_devices(cups_device_t *a, cups_device_t *b);
--static void		exec_backend(char **argv);
--static cups_device_t	*get_device(cups_array_t *devices,
--			            const char *serviceName,
--			            const char *regtype,
--				    const char *replyDomain)
--				    __attribute__((nonnull(1,2,3,4)));
- static void		query_callback(DNSServiceRef sdRef,
- 			               DNSServiceFlags flags,
- 				       uint32_t interfaceIndex,
-@@ -111,10 +142,119 @@ static void		query_callback(DNSServiceRe
- 				       const void *rdata, uint32_t ttl,
- 				       void *context)
- 				       __attribute__((nonnull(1,5,9,11)));
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+static void		avahi_client_callback (AvahiClient *client,
-+					       AvahiClientState state,
-+					       void *context);
-+static void		avahi_browse_callback (AvahiServiceBrowser *browser,
-+					       AvahiIfIndex interface,
-+					       AvahiProtocol protocol,
-+					       AvahiBrowserEvent event,
-+					       const char *serviceName,
-+					       const char *regtype,
-+					       const char *replyDomain,
-+					       AvahiLookupResultFlags flags,
-+					       void *context);
-+#endif /* HAVE_AVAHI */
-+static cups_device_t *	find_device (cups_array_t *devices,
-+				     cups_txt_records_t *txt,
-+				     cups_device_t *dkey);
-+static int		compare_devices(cups_device_t *a, cups_device_t *b);
-+static void		exec_backend(char **argv);
-+static cups_device_t	*get_device(cups_array_t *devices,
-+			            const char *serviceName,
-+			            const char *regtype,
-+				    const char *replyDomain)
-+				    __attribute__((nonnull(1,2,3,4)));
- static void		sigterm_handler(int sig);
- static void		unquote(char *dst, const char *src, size_t dstsize)
- 			    __attribute__((nonnull(1,2)));
- 
-+#ifdef HAVE_AVAHI
-+static AvahiSimplePoll *simple_poll = NULL;
-+static int avahi_got_callback;
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * 'next_txt_record()' - Get next TXT record from a cups_txt_records_t.
-+ */
-+
-+static cups_txt_records_t *
-+next_txt_record (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+  txt->data = txt->datanext;
-+#else /* HAVE_AVAHI */
-+  txt->txt = avahi_string_list_get_next (txt->txt);
-+  if (txt->txt == NULL)
-+    return NULL;
-+#endif /* HAVE_DNSSD */
-+
-+  return txt;
-+}
-+
-+
-+/*
-+ * 'parse_txt_record_pair()' - Read key/value pair in cups_txt_records_t.
-+ */
-+
-+static int
-+parse_txt_record_pair (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+  uint8_t	datalen;
-+  uint8_t	*data = txt->data;
-+  char		*ptr;
-+
-+ /*
-+  * Read a key/value pair starting with an 8-bit length.  Since the
-+  * length is 8 bits and the size of the key/value buffers is 256, we
-+  * don't need to check for overflow...
-+  */
-+
-+  datalen = *data++;
-+  if (!datalen || (data + datalen) > txt->dataend)
-+    return NULL;
-+  txt->datanext = data + datalen;
-+
-+  for (ptr = txt->key; data < txt->datanext && *data != '='; data ++)
-+    *ptr++ = *data;
-+  *ptr = '\0';
-+
-+  if (data < txt->datanext && *data == '=')
-+  {
-+    data++;
-+
-+    if (data < datanext)
-+      memcpy (txt->value, data, txt->datanext - data);
-+    value[txt->datanext - data] = '\0';
-+  }
-+  else
-+    return 1;
-+#else /* HAVE_AVAHI */
-+  char *key, *value;
-+  size_t len;
-+  avahi_string_list_get_pair (txt->txt, &key, &value, &len);
-+  if (len > sizeof (txt->value) - 1)
-+    len = sizeof (txt->value) - 1;
-+
-+  memcpy (txt->value, value, len);
-+  txt->value[len] = '\0';
-+  len = strlen (key);
-+  if (len > sizeof (txt->key) - 1)
-+    len = sizeof (txt->key) - 1;
-+
-+  memcpy (txt->key, key, len);
-+  txt->key[len] = '\0';
-+  avahi_free (key);
-+  avahi_free (value);
-+#endif /* HAVE_AVAHI */
-+
-+  return 0;
-+}
-+
- 
- /*
-  * 'main()' - Browse for printers.
-@@ -125,6 +265,13 @@ main(int  argc,				/* I - Number of comm
-      char *argv[])			/* I - Command-line arguments */
- {
-   const char	*name;			/* Backend name */
-+  cups_array_t	*devices;		/* Device array */
-+  cups_device_t	*device;		/* Current device */
-+  char		uriName[1024];		/* Unquoted fullName for URI */
-+#ifdef HAVE_DNSSD
-+  int		fd;			/* Main file descriptor */
-+  fd_set	input;			/* Input set for select() */
-+  struct timeval timeout;		/* Timeout for select() */
-   DNSServiceRef	main_ref,		/* Main service reference */
- 		fax_ipp_ref,		/* IPP fax service reference */
- 		ipp_ref,		/* IPP service reference */
-@@ -138,12 +285,11 @@ main(int  argc,				/* I - Number of comm
- 		pdl_datastream_ref,	/* AppSocket service reference */
- 		printer_ref,		/* LPD service reference */
- 		riousbprint_ref;	/* Remote IO service reference */
--  int		fd;			/* Main file descriptor */
--  fd_set	input;			/* Input set for select() */
--  struct timeval timeout;		/* Timeout for select() */
--  cups_array_t	*devices;		/* Device array */
--  cups_device_t	*device;		/* Current device */
--  char		uriName[1024];		/* Unquoted fullName for URI */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  AvahiClient	*client;
-+  int		error;
-+#endif /* HAVE_AVAHI */
- #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-   struct sigaction action;		/* Actions for POSIX signals */
- #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-@@ -203,6 +349,49 @@ main(int  argc,				/* I - Number of comm
-   * Browse for different kinds of printers...
-   */
- 
-+#ifdef HAVE_AVAHI
-+  if ((simple_poll = avahi_simple_poll_new ()) == NULL)
-+  {
-+    perror ("ERROR: Unable to create avahi simple poll object");
-+    return (1);
-+  }
-+
-+  client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+			     0, avahi_client_callback, NULL, &error);
-+  if (!client)
-+  {
-+    perror ("DEBUG: Unable to create avahi client");
-+    return (0);
-+  }
-+
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_fax-ipp._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_ipp._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_ipp-tls._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_pdl-datastream._tcp",
-+			     NULL, 0,
-+			     avahi_browse_callback,
-+			     devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_printer._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_riousbprint._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+#endif /* HAVE_AVAHI */
-+#ifdef HAVE_DNSSD
-   if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError)
-   {
-     perror("ERROR: Unable to create service connection");
-@@ -263,6 +452,7 @@ main(int  argc,				/* I - Number of comm
-   riousbprint_ref = main_ref;
-   DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0,
-                    "_riousbprint._tcp", NULL, browse_callback, devices);
-+#endif /* HAVE_DNSSD */
- 
-  /*
-   * Loop until we are killed...
-@@ -270,6 +460,9 @@ main(int  argc,				/* I - Number of comm
- 
-   while (!job_canceled)
-   {
-+    int announce = 0;
-+
-+#ifdef HAVE_DNSSD
-     FD_ZERO(&input);
-     FD_SET(fd, &input);
- 
-@@ -289,11 +482,35 @@ main(int  argc,				/* I - Number of comm
-     }
-     else
-     {
-+      announce = 1;
-+    }
-+#else /* HAVE_AVAHI */
-+    int r;
-+    avahi_got_callback = 0;
-+    r = avahi_simple_poll_iterate (simple_poll, 1);
-+    if (r != 0 && r != EINTR)
-+    {
-+     /*
-+      * We've been told to exit the loop.  Perhaps the connection to
-+      * avahi failed.
-+      */
-+
-+      break;
-+    }
-+
-+    if (avahi_got_callback)
-+      announce = 1;
-+#endif /* HAVE_DNSSD */
-+
-+    if (announce)
-+    {
-      /*
-       * Announce any devices we've found...
-       */
- 
-+#ifdef HAVE_DNSSD
-       DNSServiceErrorType status;	/* DNS query status */
-+#endif /* HAVE_DNSSD */
-       cups_device_t *best;		/* Best matching device */
-       char	device_uri[1024];	/* Device URI */
-       int	count;			/* Number of queries */
-@@ -307,6 +524,7 @@ main(int  argc,				/* I - Number of comm
-         if (device->sent)
- 	  sent ++;
- 
-+#ifdef HAVE_DNSSD
-         if (device->ref)
- 	  count ++;
- 
-@@ -338,14 +556,23 @@ main(int  argc,				/* I - Number of comm
- 	      count ++;
-           }
- 	}
--	else if (!device->sent)
-+	else
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+	if (!device->resolved)
-+	  continue;
-+        else
-+#endif /* HAVE_AVAHI */
-+	if (!device->sent)
- 	{
-+#ifdef HAVE_DNSSD
- 	 /*
- 	  * Got the TXT records, now report the device...
- 	  */
- 
- 	  DNSServiceRefDeallocate(device->ref);
- 	  device->ref = 0;
-+#endif /* HAVE_DNSSD */
- 
-           if (!best)
- 	    best = device;
-@@ -406,6 +633,7 @@ main(int  argc,				/* I - Number of comm
- }
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'browse_callback()' - Browse devices.
-  */
-@@ -494,6 +722,7 @@ browse_local_callback(
- 	  device->fullName);
-   device->sent = 1;
- }
-+#endif /* HAVE_DNSSD */
- 
- 
- /*
-@@ -574,6 +803,41 @@ exec_backend(char **argv)		/* I - Comman
- 
- 
- /*
-+ * 'device_type()' - Get DNS-SD type enumeration from string.
-+ */
-+
-+static int
-+device_type (const char *regtype)
-+{
-+#ifdef HAVE_AVAHI
-+  if (!strcmp(regtype, "_ipp._tcp"))
-+    return (CUPS_DEVICE_IPP);
-+  else if (!strcmp(regtype, "_ipps._tcp") ||
-+	   !strcmp(regtype, "_ipp-tls._tcp"))
-+    return (CUPS_DEVICE_IPPS);
-+  else if (!strcmp(regtype, "_fax-ipp._tcp"))
-+    return (CUPS_DEVICE_FAX_IPP);
-+  else if (!strcmp(regtype, "_printer._tcp"))
-+    return (CUPS_DEVICE_PDL_DATASTREAM);
-+#else
-+  if (!strcmp(regtype, "_ipp._tcp."))
-+    return (CUPS_DEVICE_IPP);
-+  else if (!strcmp(regtype, "_ipps._tcp.") ||
-+	   !strcmp(regtype, "_ipp-tls._tcp."))
-+    return (CUPS_DEVICE_IPPS);
-+  else if (!strcmp(regtype, "_fax-ipp._tcp."))
-+    return (CUPS_DEVICE_FAX_IPP);
-+  else if (!strcmp(regtype, "_printer._tcp."))
-+    return (CUPS_DEVICE_PRINTER);
-+  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
-+    return (CUPS_DEVICE_PDL_DATASTREAM);
-+#endif /* HAVE_AVAHI */
-+
-+  return (CUPS_DEVICE_RIOUSBPRINT);
-+}
-+
-+
-+/*
-  * 'get_device()' - Create or update a device.
-  */
- 
-@@ -594,20 +858,7 @@ get_device(cups_array_t *devices,	/* I -
-   */
- 
-   key.name = (char *)serviceName;
--
--  if (!strcmp(regtype, "_ipp._tcp."))
--    key.type = CUPS_DEVICE_IPP;
--  else if (!strcmp(regtype, "_ipps._tcp.") ||
--	   !strcmp(regtype, "_ipp-tls._tcp."))
--    key.type = CUPS_DEVICE_IPPS;
--  else if (!strcmp(regtype, "_fax-ipp._tcp."))
--    key.type = CUPS_DEVICE_FAX_IPP;
--  else if (!strcmp(regtype, "_printer._tcp."))
--    key.type = CUPS_DEVICE_PRINTER;
--  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
--    key.type = CUPS_DEVICE_PDL_DATASTREAM;
--  else
--    key.type = CUPS_DEVICE_RIOUSBPRINT;
-+  key.type = device_type (regtype);
- 
-   for (device = cupsArrayFind(devices, &key);
-        device;
-@@ -627,8 +878,14 @@ get_device(cups_array_t *devices,	/* I -
-         free(device->domain);
- 	device->domain = strdup(replyDomain);
- 
-+#ifdef HAVE_DNSSD
- 	DNSServiceConstructFullName(fullName, device->name, regtype,
- 	                            replyDomain);
-+#else /* HAVE_AVAHI */
-+	avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+				 serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
- 	free(device->fullName);
- 	device->fullName = strdup(fullName);
-       }
-@@ -648,6 +905,9 @@ get_device(cups_array_t *devices,	/* I -
-   device->domain   = strdup(replyDomain);
-   device->type     = key.type;
-   device->priority = 50;
-+#ifdef HAVE_AVAHI
-+  device->resolved = 0;
-+#endif /* HAVE_AVAHI */
- 
-   cupsArrayAdd(devices, device);
- 
-@@ -655,13 +915,20 @@ get_device(cups_array_t *devices,	/* I -
-   * Set the "full name" of this service, which is used for queries...
-   */
- 
-+#ifdef HAVE_DNSSD
-   DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain);
-+#else /* HAVE_AVAHI */
-+  avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+			   serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
-   device->fullName = strdup(fullName);
- 
-   return (device);
- }
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'query_callback()' - Process query data.
-  */
-@@ -685,7 +952,7 @@ query_callback(
- 		*ptr;			/* Pointer into string */
-   cups_device_t	dkey,			/* Search key */
- 		*device;		/* Device */
--
-+  cups_txt_records_t txt;
- 
-   fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, "
-                   "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
-@@ -719,94 +986,233 @@ query_callback(
-   if ((ptr = strstr(name, "._")) != NULL)
-     *ptr = '\0';
- 
--  if (strstr(fullName, "_ipp._tcp."))
--    dkey.type = CUPS_DEVICE_IPP;
--  else if (strstr(fullName, "_ipps._tcp.") ||
--           strstr(fullName, "_ipp-tls._tcp."))
--    dkey.type = CUPS_DEVICE_IPPS;
--  else if (strstr(fullName, "_fax-ipp._tcp."))
--    dkey.type = CUPS_DEVICE_FAX_IPP;
--  else if (strstr(fullName, "_printer._tcp."))
--    dkey.type = CUPS_DEVICE_PRINTER;
--  else if (strstr(fullName, "_pdl-datastream._tcp."))
--    dkey.type = CUPS_DEVICE_PDL_DATASTREAM;
-+  dkey.type = device_type (fullName);
-+
-+  txt.data = rdata;
-+  txt.dataend = rdata + rdlen;
-+  device = find_device ((cups_array_t *) context, &txt, &dkey);
-+  if (!device)
-+    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+}
-+#endif /* HAVE_DNSSD */
-+
-+
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahi_client_callback()' - Avahi client callback function.
-+ */
-+
-+static void
-+avahi_client_callback(AvahiClient *client,
-+		      AvahiClientState state,
-+		      void *context)
-+{
-+ /*
-+  * If the connection drops, quit.
-+  */
-+
-+  if (state == AVAHI_CLIENT_FAILURE)
-+  {
-+    fprintf (stderr, "ERROR: Avahi connection failed\n");
-+    avahi_simple_poll_quit (simple_poll);
-+  }
-+}
-+
-+
-+/*
-+ * 'avahi_query_callback()' - Avahi query callback function.
-+ */
-+
-+static void
-+avahi_query_callback(AvahiServiceResolver *resolver,
-+		     AvahiIfIndex interface,
-+		     AvahiProtocol protocol,
-+		     AvahiResolverEvent event,
-+		     const char *name,
-+		     const char *type,
-+		     const char *domain,
-+		     const char *host_name,
-+		     const AvahiAddress *address,
-+		     uint16_t port,
-+		     AvahiStringList *txt,
-+		     AvahiLookupResultFlags flags,
-+		     void *context)
-+{
-+  AvahiClient		*client;
-+  cups_device_t		key,
-+			*device;
-+  char			uqname[1024],
-+			*ptr;
-+  cups_txt_records_t	txtr;
-+
-+  client = avahi_service_resolver_get_client (resolver);
-+  if (event != AVAHI_RESOLVER_FOUND)
-+  {
-+    if (event == AVAHI_RESOLVER_FAILURE)
-+    {
-+      fprintf (stderr, "ERROR: %s\n",
-+	       avahi_strerror (avahi_client_errno (client)));
-+    }
-+
-+    avahi_service_resolver_free (resolver);
-+    return;
-+  }
-+
-+ /*
-+  * Set search key for device.
-+  */
-+
-+  key.name = uqname;
-+  unquote (uqname, name, sizeof (uqname));
-+  if ((ptr = strstr(name, "._")) != NULL)
-+    *ptr = '\0';
-+
-+  key.domain = (char *) domain;
-+  key.type = device_type (type);
-+
-+ /*
-+  * Find the device and the the TXT information.
-+  */
-+
-+  txtr.txt = txt;
-+  device = find_device ((cups_array_t *) context, &txtr, &key);
-+  if (device)
-+  {
-+   /*
-+    * Let the main loop know to announce the device.
-+    */
-+
-+    device->resolved = 1;
-+    avahi_got_callback = 1;
-+  }
-   else
--    dkey.type = CUPS_DEVICE_RIOUSBPRINT;
-+    fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name);
- 
--  for (device = cupsArrayFind(devices, &dkey);
-+  avahi_service_resolver_free (resolver);
-+}
-+
-+
-+/*
-+ * 'avahi_browse_callback()' - Avahi browse callback function.
-+ */
-+
-+static void
-+avahi_browse_callback(AvahiServiceBrowser *browser,
-+		      AvahiIfIndex interface,
-+		      AvahiProtocol protocol,
-+		      AvahiBrowserEvent event,
-+		      const char *name,
-+		      const char *type,
-+		      const char *domain,
-+		      AvahiLookupResultFlags flags,
-+		      void *context)
-+{
-+  AvahiClient *client = avahi_service_browser_get_client (browser);
-+
-+  switch (event)
-+  {
-+  case AVAHI_BROWSER_FAILURE:
-+    fprintf (stderr, "ERROR: %s\n",
-+	     avahi_strerror (avahi_client_errno (client)));
-+    avahi_simple_poll_quit (simple_poll);
-+    return;
-+
-+  case AVAHI_BROWSER_NEW:
-+   /*
-+    * This object is new on the network.
-+    */
-+
-+    if (flags & AVAHI_LOOKUP_RESULT_LOCAL)
-+    {
-+     /*
-+      * This comes from the local machine so ignore it.
-+      */
-+
-+      fprintf (stderr, "DEBUG: ignoring local service %s\n", name);
-+    }
-+    else
-+    {
-+     /*
-+      * Create a device entry for it if it doesn't yet exist.
-+      */
-+
-+      get_device ((cups_array_t *)context, name, type, domain);
-+
-+     /*
-+      * Now look for a TXT entry.
-+      */
-+
-+      if (avahi_service_resolver_new (client, interface, protocol,
-+				      name, type, domain,
-+				      AVAHI_PROTO_UNSPEC, 0,
-+				      avahi_query_callback, context) == NULL)
-+      {
-+	fprintf (stderr, "ERROR: failed to resolve service %s: %s\n",
-+		 name, avahi_strerror (avahi_client_errno (client)));
-+      }
-+    }
-+
-+    break;
-+
-+  case AVAHI_BROWSER_REMOVE:
-+  case AVAHI_BROWSER_ALL_FOR_NOW:
-+  case AVAHI_BROWSER_CACHE_EXHAUSTED:
-+    break;
-+  }
-+}
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * 'find_device()' - Find a device from its name and domain.
-+ */
-+
-+static cups_device_t *
-+find_device (cups_array_t *devices,
-+	     cups_txt_records_t *txt,
-+	     cups_device_t *dkey)
-+{
-+  cups_device_t	*device;
-+  char		*ptr;
-+
-+  for (device = cupsArrayFind(devices, dkey);
-        device;
-        device = cupsArrayNext(devices))
-   {
--    if (_cups_strcasecmp(device->name, dkey.name) ||
--        _cups_strcasecmp(device->domain, dkey.domain))
-+    if (_cups_strcasecmp(device->name, dkey->name) ||
-+        _cups_strcasecmp(device->domain, dkey->domain))
-     {
-       device = NULL;
-       break;
-     }
--    else if (device->type == dkey.type)
-+    else if (device->type == dkey->type)
-     {
-      /*
-       * Found it, pull out the priority and make and model from the TXT
-       * record and save it...
-       */
- 
--      const uint8_t	*data,		/* Pointer into data */
--			*datanext,	/* Next key/value pair */
--			*dataend;	/* End of entire TXT record */
--      uint8_t		datalen;	/* Length of current key/value pair */
--      char		key[256],	/* Key string */
--			value[256],	/* Value string */
--			make_and_model[512],
-+      char		make_and_model[512],
- 				      	/* Manufacturer and model */
- 			model[256],	/* Model */
--			device_id[2048];/* 1284 device ID */
--
-+			device_id[2048]; /* 1284 device ID */
- 
-       device_id[0]      = '\0';
-       make_and_model[0] = '\0';
- 
-       strcpy(model, "Unknown");
- 
--      for (data = rdata, dataend = data + rdlen;
--           data < dataend;
--           data = datanext)
-+      for (;;)
-       {
--       /*
--        * Read a key/value pair starting with an 8-bit length.  Since the
--	* length is 8 bits and the size of the key/value buffers is 256, we
--	* don't need to check for overflow...
--	*/
--
--        datalen = *data++;
--
--        if (!datalen || (data + datalen) > dataend)
--	  break;
--
--        datanext = data + datalen;
--
--        for (ptr = key; data < datanext && *data != '='; data ++)
--	  *ptr++ = *data;
--	*ptr = '\0';
-+	char *key;
-+	char *value;
- 
--	if (data < datanext && *data == '=')
--	{
--	  data ++;
--
--	  if (data < datanext)
--	    memcpy(value, data, datanext - data);
--	  value[datanext - data] = '\0';
-+	if (parse_txt_record_pair (txt))
-+	  goto next;
- 
--	  fprintf(stderr, "DEBUG2: query_callback: \"%s=%s\".\n",
--	          key, value);
--	}
--	else
--	{
--	  fprintf(stderr, "DEBUG2: query_callback: \"%s\" with no value.\n",
--	          key);
--	  continue;
--	}
--
--        if (!_cups_strncasecmp(key, "usb_", 4))
-+	key = txt->key;
-+	value = txt->value;
-+        if (!strncasecmp(key, "usb_", 4))
- 	{
- 	 /*
- 	  * Add USB device ID information...
-@@ -861,6 +1267,10 @@ query_callback(
- 	  if (device->type == CUPS_DEVICE_PRINTER)
- 	    device->sent = 1;
- 	}
-+
-+      next:
-+	if (next_txt_record (txt) == NULL)
-+	  break;
-       }
- 
-       if (device->device_id)
-@@ -917,11 +1327,9 @@ query_callback(
-     }
-   }
- 
--  if (!device)
--    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+  return device;
- }
- 
--
- /*
-  * 'sigterm_handler()' - Handle termination signals...
-  */
-diff -up cups-1.5.3/cups/http-support.c.avahi-2-backend cups-1.5.3/cups/http-support.c
---- cups-1.5.3/cups/http-support.c.avahi-2-backend	2012-02-15 02:06:12.000000000 +0100
-+++ cups-1.5.3/cups/http-support.c	2012-05-15 17:04:51.045944634 +0200
-@@ -43,6 +43,10 @@
-  *   http_copy_decode()   - Copy and decode a URI.
-  *   http_copy_encode()   - Copy and encode a URI.
-  *   http_resolve_cb()    - Build a device URI for the given service name.
-+ *   avahi_resolve_uri_client_cb()
-+ *                        - Avahi client callback for resolving URI.
-+ *   avahi_resolve_uri_resolver_cb()
-+ *                        - Avahi resolver callback for resolving URI.
-  */
- 
- /*
-@@ -60,6 +64,11 @@
- #    include <sys/select.h>
- #  endif /* WIN32 */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/lookup.h>
-+#  include <avahi-common/simple-watch.h>
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -127,6 +136,24 @@ static void DNSSD_API	http_resolve_cb(DN
- 					void *context);
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+static void	avahi_resolve_uri_client_cb(AvahiClient *client,
-+					    AvahiClientState state,
-+					    void *simple_poll);
-+static void	avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver,
-+					      AvahiIfIndex interface,
-+					      AvahiProtocol protocol,
-+					      AvahiResolverEvent event,
-+					      const char *name,
-+					      const char *type,
-+					      const char *domain,
-+					      const char *host_name,
-+					      const AvahiAddress *address,
-+					      uint16_t port,
-+					      AvahiStringList *txt,
-+					      AvahiLookupResultFlags flags,
-+					      void *context);
-+#endif /* HAVE_AVAHI */
- 
- /*
-  * 'httpAssembleURI()' - Assemble a uniform resource identifier from its
-@@ -1434,6 +1461,9 @@ _httpResolveURI(
- 
-   if (strstr(hostname, "._tcp"))
-   {
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+    char		*regtype,	/* Pointer to type in hostname */
-+			*domain;	/* Pointer to domain in hostname */
- #ifdef HAVE_DNSSD
- #  ifdef WIN32
- #    pragma comment(lib, "dnssd.lib")
-@@ -1452,6 +1482,17 @@ _httpResolveURI(
-     fd_set		input_set;	/* Input set for select() */
-     struct timeval	stimeout;	/* Timeout value for select() */
- #endif /* HAVE_POLL */
-+#else /* HAVE_AVAHI */
-+    AvahiSimplePoll	*simple_poll;
-+    AvahiClient		*client;
-+    int			error;
-+    struct
-+    {
-+      AvahiSimplePoll	*poll;
-+      _http_uribuf_t	uribuf;
-+    } user_data;
-+#endif /* HAVE_DNSSD */
-+
- 
-     if (options & _HTTP_RESOLVE_STDERR)
-       fprintf(stderr, "DEBUG: Resolving \"%s\"...\n", hostname);
-@@ -1488,9 +1529,16 @@ _httpResolveURI(
-     if (domain)
-       *domain++ = '\0';
- 
-+#ifdef HAVE_DNSSD
-     uribuf.buffer   = resolved_uri;
-     uribuf.bufsize  = resolved_size;
-     uribuf.options  = options;
-+#else
-+    user_data.uribuf.buffer = resolved_uri;
-+    user_data.uribuf.bufsize = resolved_size;
-+    user_data.uribuf.options = options;
-+#endif
-+
-     resolved_uri[0] = '\0';
- 
-     DEBUG_printf(("6_httpResolveURI: Resolving hostname=\"%s\", regtype=\"%s\", "
-@@ -1504,6 +1552,7 @@ _httpResolveURI(
- 
-     uri = NULL;
- 
-+#ifdef HAVE_DNSSD
-     if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
-     {
-       localref = ref;
-@@ -1611,6 +1660,36 @@ _httpResolveURI(
- 
-       DNSServiceRefDeallocate(ref);
-     }
-+#else /* HAVE_AVAHI */
-+    if ((simple_poll = avahi_simple_poll_new ()) != NULL)
-+    {
-+      if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+				      0, avahi_resolve_uri_client_cb,
-+				      &simple_poll, &error)) != NULL)
-+      {
-+	user_data.poll = simple_poll;
-+	if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC,
-+					AVAHI_PROTO_UNSPEC, hostname,
-+					regtype, domain, AVAHI_PROTO_UNSPEC, 0,
-+					avahi_resolve_uri_resolver_cb,
-+					&user_data) != NULL)
-+	{
-+	  avahi_simple_poll_loop (simple_poll);
-+
-+	 /*
-+	  * Collect the result.
-+	  */
-+
-+	  if (resolved_uri[0])
-+	    uri = resolved_uri;
-+	}
-+
-+	avahi_client_free (client);
-+      }
-+
-+      avahi_simple_poll_free (simple_poll);
-+    }
-+#endif /* HAVE_DNSSD */
- 
-     if (options & _HTTP_RESOLVE_STDERR)
-     {
-@@ -1622,13 +1701,13 @@ _httpResolveURI(
-       fputs("STATE: -connecting-to-device,offline-report\n", stderr);
-     }
- 
--#else
-+#else /* HAVE_DNSSD || HAVE_AVAHI */
-    /*
-     * No DNS-SD support...
-     */
- 
-     uri = NULL;
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-     if ((options & _HTTP_RESOLVE_STDERR) && !uri)
-       _cupsLangPrintFilter(stderr, "ERROR", _("Unable to find printer."));
-@@ -1916,6 +1995,115 @@ http_resolve_cb(
- }
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahi_resolve_uri_client_cb()' - Avahi client callback for resolving URI.
-+ */
-+
-+static void
-+avahi_resolve_uri_client_cb (AvahiClient *client,
-+			     AvahiClientState state,
-+			     void *simple_poll)
-+{
-+  DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, "
-+		"simple_poll=%p)\n", client, state, simple_poll));
-+
-+  /*
-+   * If the connection drops, quit.
-+   */
-+
-+  if (state == AVAHI_CLIENT_FAILURE)
-+    avahi_simple_poll_quit (simple_poll);
-+}
-+
-+
-+/*
-+ * 'avahi_resolve_uri_resolver_cb()' - Avahi resolver callback for resolving
-+ *                                     URI.
-+ */
-+
-+static void
-+avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver,
-+			       AvahiIfIndex interface,
-+			       AvahiProtocol protocol,
-+			       AvahiResolverEvent event,
-+			       const char *name,
-+			       const char *type,
-+			       const char *domain,
-+			       const char *host_name,
-+			       const AvahiAddress *address,
-+			       uint16_t port,
-+			       AvahiStringList *txt,
-+			       AvahiLookupResultFlags flags,
-+			       void *context)
-+{
-+  const char		*scheme;	/* URI scheme */
-+  char			rp[256];	/* Remote printer */
-+  AvahiStringList	*pair;
-+  char			*value;
-+  size_t		valueLen = 0;
-+  char			addr[AVAHI_ADDRESS_STR_MAX];
-+  struct
-+  {
-+    AvahiSimplePoll	*poll;
-+    _http_uribuf_t	uribuf;
-+  }		*poll_uribuf = context;
-+
-+  DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, "
-+		"interface=%d, protocol=%d, event=%d, name=\"%s\", "
-+		"type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, "
-+		"port=%d, txt=%p, flags=%d, context=%p)\n",
-+		resolver, interface, protocol, event, name, type, domain,
-+		host_name, address, port, txt, flags, context));
-+
-+  if (event != AVAHI_RESOLVER_FOUND)
-+  {
-+    avahi_service_resolver_free (resolver);
-+    avahi_simple_poll_quit (poll_uribuf->poll);
-+    return;
-+  }
-+
-+ /*
-+  * Figure out the scheme from the full name...
-+  */
-+
-+  if (strstr(type, "_ipp."))
-+    scheme = "ipp";
-+  else if (strstr(type, "_printer."))
-+    scheme = "lpd";
-+  else if (strstr(type, "_pdl-datastream."))
-+    scheme = "socket";
-+  else
-+    scheme = "riousbprint";
-+
-+ /*
-+  * Extract the "remote printer key from the TXT record...
-+  */
-+
-+  if ((pair = avahi_string_list_find (txt, "rp")) != NULL)
-+  {
-+    avahi_string_list_get_pair (pair, NULL, &value, &valueLen);
-+    rp[0] = '/';
-+    memcpy (rp + 1, value, valueLen);
-+    rp[valueLen + 1] = '\0';
-+  }
-+  else
-+    rp[0] = '\0';
-+
-+ /*
-+  * Assemble the final device URI...
-+  */
-+
-+  avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address);
-+  httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer,
-+		  poll_uribuf->uribuf.bufsize, scheme, NULL,
-+		  addr, port, rp);
-+  DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n",
-+		poll_uribuf->uribuf.buffer));
-+  avahi_simple_poll_quit (poll_uribuf->poll);
-+}
-+#endif /* HAVE_AVAHI */
-+
- 
- /*
-  * End of "$Id: http-support.c 10284 2012-02-15 01:06:12Z mike $".
\ No newline at end of file
diff --git a/extra/cups/cups-avahi-3-timeouts.patch b/extra/cups/cups-avahi-3-timeouts.patch
deleted file mode 100644
index daf852a0f..000000000
--- a/extra/cups/cups-avahi-3-timeouts.patch
+++ /dev/null
@@ -1,381 +0,0 @@
-diff -up cups-1.5.2/scheduler/cupsd.h.avahi-3-timeouts cups-1.5.2/scheduler/cupsd.h
---- cups-1.5.2/scheduler/cupsd.h.avahi-3-timeouts	2011-05-11 23:17:34.000000000 +0100
-+++ cups-1.5.2/scheduler/cupsd.h	2012-03-14 15:06:36.509476983 +0000
-@@ -140,6 +140,15 @@ extern const char *cups_hstrerror(int);
- 
- typedef void (*cupsd_selfunc_t)(void *data);
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * Timeout callback function type...
-+ */
-+
-+typedef struct _cupsd_timeout_s cupsd_timeout_t;
-+typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data);
-+#endif /* HAVE_AVAHI */
-+
- 
- /*
-  * Globals...
-@@ -173,6 +182,11 @@ VAR int			Launchd		VALUE(0);
- 					/* Running from launchd */
- #endif /* HAVE_LAUNCH_H */
- 
-+#ifdef HAVE_AVAHI
-+VAR cups_array_t *Timeouts;		/* Timed callbacks for main loop */
-+#endif /* HAVE_AVAHI */
-+
-+
- 
- /*
-  * Prototypes...
-@@ -242,6 +256,20 @@ extern void		cupsdStopSelect(void);
- extern void		cupsdStartServer(void);
- extern void		cupsdStopServer(void);
- 
-+#ifdef HAVE_AVAHI
-+extern void     cupsdInitTimeouts(void);
-+extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv,
-+					 cupsd_timeoutfunc_t cb,
-+					 void *data);
-+extern cupsd_timeout_t *cupsdNextTimeout (long *delay);
-+extern void     cupsdRunTimeout (cupsd_timeout_t *timeout);
-+extern void     cupsdUpdateTimeout (cupsd_timeout_t *timeout,
-+				    const struct timeval *tv);
-+extern void     cupsdRemoveTimeout (cupsd_timeout_t *timeout);
-+#endif /* HAVE_AVAHI */
-+
-+extern int	cupsdRemoveFile(const char *filename);
-+
- 
- /*
-  * End of "$Id: cupsd.h 9766 2011-05-11 22:17:34Z mike $".
-diff -up cups-1.5.2/scheduler/main.c.avahi-3-timeouts cups-1.5.2/scheduler/main.c
---- cups-1.5.2/scheduler/main.c.avahi-3-timeouts	2012-03-14 15:04:17.655305548 +0000
-+++ cups-1.5.2/scheduler/main.c	2012-03-14 15:06:36.511476986 +0000
-@@ -146,6 +146,10 @@ main(int  argc,				/* I - Number of comm
-   int			launchd_idle_exit;
- 					/* Idle exit on select timeout? */
- #endif	/* HAVE_LAUNCHD */
-+#ifdef HAVE_AVAHI
-+  cupsd_timeout_t	*tmo;		/* Next scheduled timed callback */
-+  long			tmo_delay;	/* Time before it must be called */
-+#endif /* HAVE_AVAHI */
- 
- 
- #ifdef HAVE_GETEUID
-@@ -535,6 +539,14 @@ main(int  argc,				/* I - Number of comm
- 
-   httpInitialize();
- 
-+#ifdef HAVE_AVAHI
-+ /*
-+  * Initialize timed callback structures.
-+  */
-+
-+  cupsdInitTimeouts();
-+#endif /* HAVE_AVAHI */
-+
-   cupsdStartServer();
- 
-  /*
-@@ -874,6 +886,16 @@ main(int  argc,				/* I - Number of comm
-     }
- #endif /* __APPLE__ */
- 
-+#ifdef HAVE_AVAHI
-+   /*
-+    * If a timed callback is due, run it.
-+    */
-+
-+    tmo = cupsdNextTimeout (&tmo_delay);
-+    if (tmo && tmo_delay == 0)
-+      cupsdRunTimeout (tmo);
-+#endif /* HAVE_AVAHI */
-+
- #ifndef __APPLE__
-    /*
-     * Update the network interfaces once a minute...
-@@ -1787,6 +1809,10 @@ select_timeout(int fds)			/* I - Number
-   cupsd_job_t		*job;		/* Job information */
-   cupsd_subscription_t	*sub;		/* Subscription information */
-   const char		*why;		/* Debugging aid */
-+#ifdef HAVE_AVAHI
-+  cupsd_timeout_t	*tmo;		/* Timed callback */
-+  long			tmo_delay;	/* Seconds before calling it */
-+#endif /* HAVE_AVAHI */
- 
- 
-  /*
-@@ -1829,6 +1855,19 @@ select_timeout(int fds)			/* I - Number
-   }
- #endif /* __APPLE__ */
- 
-+#ifdef HAVE_AVAHI
-+ /*
-+  * See if there are any scheduled timed callbacks to run.
-+  */
-+
-+  if ((tmo = cupsdNextTimeout(&tmo_delay)) != NULL &&
-+      (now + tmo_delay) < timeout)
-+  {
-+    timeout = tmo_delay;
-+    why = "run a timed callback";
-+  }
-+#endif /* HAVE_AVAHI */
-+
-  /*
-   * Check whether we are accepting new connections...
-   */
-diff -up cups-1.5.2/scheduler/Makefile.avahi-3-timeouts cups-1.5.2/scheduler/Makefile
---- cups-1.5.2/scheduler/Makefile.avahi-3-timeouts	2012-03-14 15:04:17.685305586 +0000
-+++ cups-1.5.2/scheduler/Makefile	2012-03-14 15:06:36.508476980 +0000
-@@ -39,7 +39,8 @@ CUPSDOBJS =	\
- 		server.o \
- 		statbuf.o \
- 		subscriptions.o \
--		sysman.o
-+		sysman.o \
-+		timeout.o
- LIBOBJS =	\
- 		filter.o \
- 		mime.o \
-diff -up cups-1.5.2/scheduler/timeout.c.avahi-3-timeouts cups-1.5.2/scheduler/timeout.c
---- cups-1.5.2/scheduler/timeout.c.avahi-3-timeouts	2012-03-14 15:06:36.552477037 +0000
-+++ cups-1.5.2/scheduler/timeout.c	2012-03-14 15:06:36.552477037 +0000
-@@ -0,0 +1,235 @@
-+/*
-+ * "$Id$"
-+ *
-+ *   Timeout functions for the Common UNIX Printing System (CUPS).
-+ *
-+ *   Copyright (C) 2010, 2011 Red Hat, Inc.
-+ *   Authors:
-+ *     Tim Waugh <twaugh@redhat.com>
-+ *
-+ *   Redistribution and use in source and binary forms, with or without
-+ *   modification, are permitted provided that the following conditions
-+ *   are met:
-+ *
-+ *   Redistributions of source code must retain the above copyright
-+ *   notice, this list of conditions and the following disclaimer.
-+ *
-+ *   Redistributions in binary form must reproduce the above copyright
-+ *   notice, this list of conditions and the following disclaimer in the
-+ *   documentation and/or other materials provided with the distribution.
-+ *
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ *   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ *   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-+ *   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-+ *   OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * Contents:
-+ *
-+ *   cupsdInitTimeouts()  - Initialise timeout structure.
-+ *   cupsdAddTimeout()    - Add a timed callback.
-+ *   cupsdNextTimeout()   - Find the next enabled timed callback.
-+ *   cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it.
-+ *   cupsdRemoveTimeout() - Discard a timed callback.
-+ *   compare_timeouts()   - Compare timed callbacks for array sorting.
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI /* Applies to entire file... */
-+
-+/*
-+ * Include necessary headers...
-+ */
-+
-+#include "cupsd.h"
-+
-+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
-+#  include <malloc.h>
-+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-+
-+#ifdef HAVE_AVAHI
-+#  include <avahi-common/timeval.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+struct _cupsd_timeout_s
-+{
-+  struct timeval when;
-+  int enabled;
-+  cupsd_timeoutfunc_t callback;
-+  void *data;
-+};
-+
-+/*
-+ * Local functions...
-+ */
-+
-+/*
-+ * 'compare_timeouts()' - Compare timed callbacks for array sorting.
-+ */
-+
-+static int
-+compare_addrs (void *p0, void *p1)
-+{
-+  if (p0 == p1)
-+    return (0);
-+  if (p0 < p1)
-+    return (-1);
-+  return (1);
-+}
-+
-+static int
-+compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1)
-+{
-+  int addrsdiff = compare_addrs (p0, p1);
-+  int tvdiff;
-+
-+  if (addrsdiff == 0)
-+    return (0);
-+
-+  if (!p0->enabled || !p1->enabled)
-+  {
-+    if (!p0->enabled && !p1->enabled)
-+      return (addrsdiff);
-+
-+    return (p0->enabled ? -1 : 1);
-+  }
-+
-+  tvdiff = avahi_timeval_compare (&p0->when, &p1->when);
-+  if (tvdiff != 0)
-+    return (tvdiff);
-+
-+  return (addrsdiff);
-+}
-+
-+
-+/*
-+ * 'cupsdInitTimeouts()' - Initialise timeout structures.
-+ */
-+
-+void
-+cupsdInitTimeouts(void)
-+{
-+  Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL);
-+}
-+
-+
-+/*
-+ * 'cupsdAddTimeout()' - Add a timed callback.
-+ */
-+
-+cupsd_timeout_t *				/* O - Timeout handle */
-+cupsdAddTimeout(const struct timeval *tv,	/* I - Absolute time */
-+		cupsd_timeoutfunc_t cb,		/* I - Callback function */
-+		void *data)			/* I - User data */
-+{
-+  cupsd_timeout_t *timeout;
-+
-+  timeout = malloc (sizeof(cupsd_timeout_t));
-+  if (timeout != NULL)
-+  {
-+    timeout->enabled = (tv != NULL);
-+    if (tv)
-+    {
-+      timeout->when.tv_sec = tv->tv_sec;
-+      timeout->when.tv_usec = tv->tv_usec;
-+    }
-+
-+    timeout->callback = cb;
-+    timeout->data = data;
-+    cupsArrayAdd (Timeouts, timeout);
-+  }
-+
-+  return timeout;
-+}
-+
-+
-+/*
-+ * 'cupsdNextTimeout()' - Find the next enabled timed callback.
-+ */
-+
-+cupsd_timeout_t *		/* O - Next enabled timeout or NULL */
-+cupsdNextTimeout(long *delay)	/* O - Seconds before scheduled */
-+{
-+  cupsd_timeout_t *first = cupsArrayFirst (Timeouts);
-+  struct timeval curtime;
-+
-+  if (first && !first->enabled)
-+    first = NULL;
-+
-+  if (first && delay)
-+  {
-+    gettimeofday (&curtime, NULL);
-+    if (avahi_timeval_compare (&curtime, &first->when) > 0)
-+    {
-+      *delay = 0;
-+    } else {
-+      *delay = 1 + first->when.tv_sec - curtime.tv_sec;
-+      if (first->when.tv_usec < curtime.tv_usec)
-+	(*delay)--;
-+    }
-+  }
-+
-+  return (first);
-+}
-+
-+
-+/*
-+ * 'cupsdRunTimeout()' - Run a timed callback.
-+ */
-+
-+void
-+cupsdRunTimeout(cupsd_timeout_t *timeout)	/* I - Timeout */
-+{
-+  if (!timeout)
-+    return;
-+  timeout->enabled = 0;
-+  if (!timeout->callback)
-+    return;
-+  timeout->callback (timeout, timeout->data);
-+}
-+
-+/*
-+ * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it.
-+ */
-+
-+void
-+cupsdUpdateTimeout(cupsd_timeout_t *timeout,	/* I - Timeout */
-+		   const struct timeval *tv)	/* I - Absolute time or NULL */
-+{
-+  cupsArrayRemove (Timeouts, timeout);
-+  timeout->enabled = (tv != NULL);
-+  if (tv)
-+  {
-+    timeout->when.tv_sec = tv->tv_sec;
-+    timeout->when.tv_usec = tv->tv_usec;
-+  }
-+  cupsArrayAdd (Timeouts, timeout);
-+}
-+
-+
-+/*
-+ * 'cupsdRemoveTimeout()' - Discard a timed callback.
-+ */
-+
-+void
-+cupsdRemoveTimeout(cupsd_timeout_t *timeout)	/* I - Timeout */
-+{
-+  cupsArrayRemove (Timeouts, timeout);
-+  free (timeout);
-+}
-+
-+
-+#endif /* HAVE_AVAHI ... from top of file */
-+
-+/*
-+ * End of "$Id$".
-+ */
diff --git a/extra/cups/cups-avahi-4-poll.patch b/extra/cups/cups-avahi-4-poll.patch
deleted file mode 100644
index d7fa5fd56..000000000
--- a/extra/cups/cups-avahi-4-poll.patch
+++ /dev/null
@@ -1,529 +0,0 @@
-diff -up cups-1.5.2/scheduler/avahi.c.avahi-4-poll cups-1.5.2/scheduler/avahi.c
---- cups-1.5.2/scheduler/avahi.c.avahi-4-poll	2012-03-14 15:07:29.477542381 +0000
-+++ cups-1.5.2/scheduler/avahi.c	2012-03-14 15:07:29.477542381 +0000
-@@ -0,0 +1,441 @@
-+/*
-+ * "$Id$"
-+ *
-+ *   Avahi poll implementation for the CUPS scheduler.
-+ *
-+ *   Copyright (C) 2010, 2011 Red Hat, Inc.
-+ *   Authors:
-+ *    Tim Waugh <twaugh@redhat.com>
-+ *
-+ *   Redistribution and use in source and binary forms, with or without
-+ *   modification, are permitted provided that the following conditions
-+ *   are met:
-+ *
-+ *   Redistributions of source code must retain the above copyright
-+ *   notice, this list of conditions and the following disclaimer.
-+ *
-+ *   Redistributions in binary form must reproduce the above copyright
-+ *   notice, this list of conditions and the following disclaimer in the
-+ *   documentation and/or other materials provided with the distribution.
-+ *
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ *   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ *   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-+ *   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-+ *   OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * Contents:
-+ *
-+ *   watch_read_cb         - Read callback for file descriptor
-+ *   watch_write_cb        - Write callback for file descriptor
-+ *   watched_fd_add_select() - Call cupsdAddSelect() as needed
-+ *   watch_new()           - Create a new file descriptor watch
-+ *   watch_free()          - Free a file descriptor watch
-+ *   watch_update()        - Update watched events for a file descriptor
-+ *   watch_get_events()    - Get events that happened for a file descriptor
-+ *   timeout_cb()          - Run a timed Avahi callback
-+ *   timeout_new()         - Set a wakeup time
-+ *   timeout_update()      - Update the expiration time for a timeout
-+ *   timeout_free()        - Free a timeout
-+ *   compare_watched_fds() - Compare watched file descriptors for array sorting
-+ *   avahi_cups_poll_new() - Create a new Avahi main loop object for CUPS
-+ *   avahi_cups_poll_free() - Free an Avahi main loop object for CUPS
-+ *   avahi_cups_poll_get() - Get the abstract poll API structure
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI /* Applies to entire file... */
-+
-+/*
-+ * Include necessary headers...
-+ */
-+
-+#include "cupsd.h"
-+
-+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
-+#  include <malloc.h>
-+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-+
-+#ifdef HAVE_AVAHI
-+#  include <avahi-common/timeval.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+typedef struct
-+{
-+  AvahiCupsPoll *cups_poll;
-+
-+  int fd;
-+  AvahiWatchEvent occurred;
-+  cups_array_t *watches;
-+} cupsd_watched_fd_t;
-+
-+struct AvahiWatch
-+{
-+  cupsd_watched_fd_t *watched_fd;
-+
-+  AvahiWatchEvent events;
-+  AvahiWatchCallback callback;
-+  void *userdata;
-+};
-+
-+struct AvahiTimeout
-+{
-+  AvahiCupsPoll *cups_poll;
-+  AvahiTimeoutCallback callback;
-+  void *userdata;
-+  cupsd_timeout_t *cupsd_timeout;
-+};
-+
-+/*
-+ * Local functions...
-+ */
-+
-+static AvahiWatch *	watch_new(const AvahiPoll *api,
-+				  int fd,
-+				  AvahiWatchEvent events,
-+				  AvahiWatchCallback callback,
-+				  void *userdata);
-+static void		watch_free(AvahiWatch *watch);
-+static void		watch_update(AvahiWatch *watch,
-+				     AvahiWatchEvent events);
-+static AvahiWatchEvent	watch_get_events(AvahiWatch *watch);
-+
-+
-+/*
-+ * 'watch_read_cb' - Read callback for file descriptor
-+ */
-+
-+static void
-+watch_read_cb (void *userdata)
-+{
-+  AvahiWatch *watch;
-+  cupsd_watched_fd_t *watched_fd = userdata;
-+  watched_fd->occurred |= AVAHI_WATCH_IN;
-+  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+       watch;
-+       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
-+  {
-+    if (watch->events & watched_fd->occurred)
-+    {
-+      (watch->callback) (watch, watched_fd->fd,
-+			 AVAHI_WATCH_IN, watch->userdata);
-+      watched_fd->occurred &= ~AVAHI_WATCH_IN;
-+      break;
-+    }
-+  }
-+}
-+
-+
-+/*
-+ * 'watch_write_cb' - Write callback for file descriptor
-+ */
-+
-+static void
-+watch_write_cb (void *userdata)
-+{
-+  AvahiWatch *watch;
-+  cupsd_watched_fd_t *watched_fd = userdata;
-+  watched_fd->occurred |= AVAHI_WATCH_OUT;
-+  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+       watch;
-+       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
-+  {
-+    if (watch->events & watched_fd->occurred)
-+    {
-+      (watch->callback) (watch, watched_fd->fd,
-+			 AVAHI_WATCH_OUT, watch->userdata);
-+      watched_fd->occurred &= ~AVAHI_WATCH_OUT;
-+      break;
-+    }
-+  }
-+}
-+
-+
-+/*
-+ * 'watched_fd_add_select' - Call cupsdAddSelect() as needed
-+ */
-+
-+static int						/* O - Watches? */
-+watched_fd_add_select (cupsd_watched_fd_t *watched_fd)
-+{
-+  AvahiWatch *watch;
-+  cupsd_selfunc_t read_cb = NULL, write_cb = NULL;
-+  int any_watches = 0;
-+
-+  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+       watch;
-+       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
-+  {
-+    any_watches = 1;
-+    if (watch->events & (AVAHI_WATCH_IN |
-+			     AVAHI_WATCH_ERR |
-+			     AVAHI_WATCH_HUP))
-+    {
-+      read_cb = (cupsd_selfunc_t)watch_read_cb;
-+      if (write_cb != NULL)
-+	break;
-+    }
-+
-+    if (watch->events & AVAHI_WATCH_OUT)
-+    {
-+      write_cb = (cupsd_selfunc_t)watch_write_cb;
-+      if (read_cb != NULL)
-+	break;
-+    }
-+  }
-+
-+  if (read_cb || write_cb)
-+    cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd);
-+  else
-+    cupsdRemoveSelect (watched_fd->fd);
-+
-+  return (any_watches);
-+}
-+
-+/*
-+ * 'watch_new' - Create a new file descriptor watch
-+ */
-+
-+static AvahiWatch *
-+watch_new (const AvahiPoll *api,
-+	   int fd,
-+	   AvahiWatchEvent events,
-+	   AvahiWatchCallback callback,
-+	   void *userdata)
-+{
-+  cupsd_watched_fd_t key, *watched_fd;
-+  AvahiCupsPoll *cups_poll = api->userdata;
-+  AvahiWatch *watch = malloc(sizeof(AvahiWatch));
-+  if (watch == NULL)
-+    return (NULL);
-+
-+  watch->events = events;
-+  watch->callback = callback;
-+  watch->userdata = userdata;
-+
-+  key.fd = fd;
-+  watched_fd = cupsArrayFind (cups_poll->watched_fds, &key);
-+  if (watched_fd == NULL)
-+  {
-+    watched_fd = malloc(sizeof(cupsd_watched_fd_t));
-+    if (watched_fd == NULL)
-+    {
-+      free (watch);
-+      return (NULL);
-+    }
-+
-+    watched_fd->fd = fd;
-+    watched_fd->occurred = 0;
-+    watched_fd->cups_poll = cups_poll;
-+    watched_fd->watches = cupsArrayNew (NULL, NULL);
-+    cupsArrayAdd (cups_poll->watched_fds, watched_fd);
-+  }
-+
-+  watch->watched_fd = watched_fd;
-+  cupsArrayAdd(watched_fd->watches, watch);
-+  watched_fd_add_select (watched_fd);
-+  return (watch);
-+}
-+
-+
-+/*
-+ * 'watch_free' - Free a file descriptor watch
-+ */
-+
-+static void
-+watch_free (AvahiWatch *watch)
-+{
-+  cupsd_watched_fd_t *watched_fd = watch->watched_fd;
-+  AvahiCupsPoll *cups_poll = watched_fd->cups_poll;
-+
-+  cupsArrayRemove (watched_fd->watches, watch);
-+  free (watch);
-+
-+  if (!watched_fd_add_select (watched_fd))
-+  {
-+    /* No more watches */
-+    cupsArrayRemove (cups_poll->watched_fds, watched_fd);
-+    free (watched_fd);
-+  }
-+}
-+
-+
-+/*
-+ * 'watch_update' - Update watched events for a file descriptor
-+ */
-+
-+static void
-+watch_update (AvahiWatch *watch,
-+	      AvahiWatchEvent events)
-+{
-+  watch->events = events;
-+  watched_fd_add_select (watch->watched_fd);
-+}
-+
-+
-+/*
-+ * 'watch_get_events' - Get events that happened for a file descriptor
-+ */
-+
-+static AvahiWatchEvent
-+watch_get_events (AvahiWatch *watch)
-+{
-+  return (watch->watched_fd->occurred);
-+}
-+
-+
-+/*
-+ * 'timeout_cb()' - Run a timed Avahi callback
-+ */
-+
-+static void
-+timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata)
-+{
-+  AvahiTimeout *timeout = userdata;
-+  (timeout->callback) (timeout, timeout->userdata);
-+}
-+
-+
-+/*
-+ * 'timeout_new' - Set a wakeup time
-+ */
-+
-+static AvahiTimeout *
-+timeout_new (const AvahiPoll *api,
-+	     const struct timeval *tv,
-+	     AvahiTimeoutCallback callback,
-+	     void *userdata)
-+{
-+  AvahiTimeout *timeout;
-+  AvahiCupsPoll *cups_poll = api->userdata;
-+
-+  timeout = malloc(sizeof(AvahiTimeout));
-+  if (timeout == NULL)
-+    return (NULL);
-+
-+  timeout->cups_poll = cups_poll;
-+  timeout->callback = callback;
-+  timeout->userdata = userdata;
-+  timeout->cupsd_timeout = cupsdAddTimeout (tv,
-+					    (cupsd_timeoutfunc_t)timeout_cb,
-+					    timeout);
-+  cupsArrayAdd (cups_poll->timeouts, timeout);
-+  return (timeout);
-+}
-+
-+
-+/*
-+ * 'timeout_update' - Update the expiration time for a timeout
-+ */
-+
-+static void
-+timeout_update (AvahiTimeout *timeout,
-+		const struct timeval *tv)
-+{
-+  cupsdUpdateTimeout (timeout->cupsd_timeout, tv);
-+}
-+
-+
-+/*
-+ * ' timeout_free' - Free a timeout
-+ */
-+
-+static void
-+timeout_free (AvahiTimeout *timeout)
-+{
-+  cupsArrayRemove (timeout->cups_poll->timeouts, timeout);
-+  cupsdRemoveTimeout (timeout->cupsd_timeout);
-+  free (timeout);
-+}
-+
-+
-+/*
-+ * 'compare_watched_fds' - Compare watched file descriptors for array sorting
-+ */
-+static int
-+compare_watched_fds(cupsd_watched_fd_t *p0,
-+		    cupsd_watched_fd_t *p1)
-+{
-+  /*
-+   * Compare by fd (no two elements have the same fd)
-+   */
-+
-+  if (p0->fd == p1->fd)
-+    return 0;
-+
-+  return (p0->fd < p1->fd ? -1 : 1);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS
-+ */
-+
-+AvahiCupsPoll *
-+avahi_cups_poll_new (void)
-+{
-+  AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll));
-+  if (cups_poll == NULL)
-+    return (NULL);
-+
-+  cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds,
-+					 NULL);
-+  cups_poll->timeouts = cupsArrayNew (NULL, NULL);
-+
-+  cups_poll->api.userdata = cups_poll;
-+  cups_poll->api.watch_new = watch_new;
-+  cups_poll->api.watch_free = watch_free;
-+  cups_poll->api.watch_update = watch_update;
-+  cups_poll->api.watch_get_events = watch_get_events;
-+
-+  cups_poll->api.timeout_new = timeout_new;
-+  cups_poll->api.timeout_update = timeout_update;
-+  cups_poll->api.timeout_free = timeout_free;
-+
-+  return (cups_poll);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS
-+ */
-+void
-+avahi_cups_poll_free (AvahiCupsPoll *cups_poll)
-+{
-+  cupsd_watched_fd_t *watched_fd;
-+
-+  for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds);
-+       watched_fd;
-+       watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds))
-+    cupsArrayClear (watched_fd->watches);
-+
-+  cupsArrayClear (cups_poll->watched_fds);
-+  cupsArrayClear (cups_poll->timeouts);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_get' - Get the abstract poll API structure
-+ */
-+
-+const AvahiPoll *
-+avahi_cups_poll_get (AvahiCupsPoll *cups_poll)
-+{
-+  return (&cups_poll->api);
-+}
-+
-+
-+#endif /* HAVE_AVAHI ... from top of file */
-+
-+/*
-+ * End of "$Id$".
-+ */
-diff -up cups-1.5.2/scheduler/avahi.h.avahi-4-poll cups-1.5.2/scheduler/avahi.h
---- cups-1.5.2/scheduler/avahi.h.avahi-4-poll	2012-03-14 15:07:29.477542381 +0000
-+++ cups-1.5.2/scheduler/avahi.h	2012-03-14 15:07:29.477542381 +0000
-@@ -0,0 +1,69 @@
-+/*
-+ * "$Id$"
-+ *
-+ *   Avahi poll implementation for the CUPS scheduler.
-+ *
-+ *   Copyright (C) 2010, 2011 Red Hat, Inc.
-+ *   Authors:
-+ *    Tim Waugh <twaugh@redhat.com>
-+ *
-+ *   Redistribution and use in source and binary forms, with or without
-+ *   modification, are permitted provided that the following conditions
-+ *   are met:
-+ *
-+ *   Redistributions of source code must retain the above copyright
-+ *   notice, this list of conditions and the following disclaimer.
-+ *
-+ *   Redistributions in binary form must reproduce the above copyright
-+ *   notice, this list of conditions and the following disclaimer in the
-+ *   documentation and/or other materials provided with the distribution.
-+ *
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ *   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ *   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-+ *   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-+ *   OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/publish.h>
-+#endif /* HAVE_AVAHI */
-+
-+#ifdef HAVE_AUTHORIZATION_H
-+#  include <Security/Authorization.h>
-+#endif /* HAVE_AUTHORIZATION_H */
-+
-+
-+#ifdef HAVE_AVAHI
-+typedef struct
-+{
-+    AvahiPoll api;
-+    cups_array_t *watched_fds;
-+    cups_array_t *timeouts;
-+} AvahiCupsPoll;
-+#endif /* HAVE_AVAHI */
-+
-+/*
-+ * Prototypes...
-+ */
-+
-+#ifdef HAVE_AVAHI
-+extern AvahiCupsPoll *	avahi_cups_poll_new(void);
-+extern void		avahi_cups_poll_free(AvahiCupsPoll *cups_poll);
-+extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll);
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * End of "$Id$".
-+ */
-diff -up cups-1.5.2/scheduler/Makefile.avahi-4-poll cups-1.5.2/scheduler/Makefile
---- cups-1.5.2/scheduler/Makefile.avahi-4-poll	2012-03-14 15:06:36.508476980 +0000
-+++ cups-1.5.2/scheduler/Makefile	2012-03-14 15:07:29.476542380 +0000
-@@ -17,6 +17,7 @@ include ../Makedefs
- 
- CUPSDOBJS =	\
- 		auth.o \
-+		avahi.o \
- 		banners.o \
- 		cert.o \
- 		classes.o \
diff --git a/extra/cups/cups-avahi-5-services.patch b/extra/cups/cups-avahi-5-services.patch
deleted file mode 100644
index 820b3c32b..000000000
--- a/extra/cups/cups-avahi-5-services.patch
+++ /dev/null
@@ -1,1272 +0,0 @@
-diff -up cups-1.5.2/cgi-bin/admin.c.avahi-5-services cups-1.5.2/cgi-bin/admin.c
---- cups-1.5.2/cgi-bin/admin.c.avahi-5-services	2011-08-17 22:01:53.000000000 +0100
-+++ cups-1.5.2/cgi-bin/admin.c	2012-03-14 15:08:25.701611799 +0000
-@@ -1643,7 +1643,7 @@ do_config_server(http_t *http)		/* I - H
-       else
- 	local_protocols[0] = '\0';
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-       if (cgiGetVariable("BROWSE_LOCAL_DNSSD"))
-       {
- 	if (local_protocols[0])
-@@ -1651,7 +1651,7 @@ do_config_server(http_t *http)		/* I - H
- 	else
- 	  strcat(local_protocols, "dnssd");
-       }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LDAP
-       if (cgiGetVariable("BROWSE_LOCAL_LDAP"))
-@@ -2718,9 +2718,9 @@ do_menu(http_t *http)			/* I - HTTP conn
- #endif /* HAVE_GSSAPI */
-   cgiSetVariable("KERBEROS", "");
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cgiSetVariable("HAVE_DNSSD", "1");
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LDAP
-   cgiSetVariable("HAVE_LDAP", "1");
-diff -up cups-1.5.2/scheduler/avahi.h.avahi-5-services cups-1.5.2/scheduler/avahi.h
---- cups-1.5.2/scheduler/avahi.h.avahi-5-services	2012-03-14 15:07:29.477542381 +0000
-+++ cups-1.5.2/scheduler/avahi.h	2012-03-14 15:08:25.701611799 +0000
-@@ -3,7 +3,7 @@
-  *
-  *   Avahi poll implementation for the CUPS scheduler.
-  *
-- *   Copyright (C) 2010, 2011 Red Hat, Inc.
-+ *   Copyright (C) 2010, 2011, 2012 Red Hat, Inc.
-  *   Authors:
-  *    Tim Waugh <twaugh@redhat.com>
-  *
-@@ -32,37 +32,40 @@
-  *   OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
--#include <config.h>
-+#ifndef _CUPS_AVAHI_H_
-+#  define _CUPS_AVAHI_H_
- 
--#ifdef HAVE_AVAHI
--#  include <avahi-client/client.h>
--#  include <avahi-client/publish.h>
--#endif /* HAVE_AVAHI */
-+/*
-+ * Include necessary headers...
-+ */
- 
--#ifdef HAVE_AUTHORIZATION_H
--#  include <Security/Authorization.h>
--#endif /* HAVE_AUTHORIZATION_H */
-+#  include <config.h>
- 
-+#  ifdef HAVE_AVAHI
-+#    include <avahi-client/client.h>
-+#    include <avahi-client/publish.h>
-+#  endif /* HAVE_AVAHI */
- 
--#ifdef HAVE_AVAHI
-+#  ifdef HAVE_AVAHI
- typedef struct
- {
-     AvahiPoll api;
-     cups_array_t *watched_fds;
-     cups_array_t *timeouts;
- } AvahiCupsPoll;
--#endif /* HAVE_AVAHI */
-+#  endif /* HAVE_AVAHI */
- 
- /*
-  * Prototypes...
-  */
- 
--#ifdef HAVE_AVAHI
-+#  ifdef HAVE_AVAHI
- extern AvahiCupsPoll *	avahi_cups_poll_new(void);
- extern void		avahi_cups_poll_free(AvahiCupsPoll *cups_poll);
- extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll);
--#endif /* HAVE_AVAHI */
-+#  endif /* HAVE_AVAHI */
- 
-+#endif /* !_CUPS_AVAHI_H_ */
- 
- /*
-  * End of "$Id$".
-diff -up cups-1.5.2/scheduler/client.c.avahi-5-services cups-1.5.2/scheduler/client.c
---- cups-1.5.2/scheduler/client.c.avahi-5-services	2012-01-13 23:00:22.000000000 +0000
-+++ cups-1.5.2/scheduler/client.c	2012-03-14 15:08:25.703611797 +0000
-@@ -4989,7 +4989,7 @@ valid_host(cupsd_client_t *con)		/* I -
- 	    !strncmp(host, "[::1]:", 6));
-   }
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  /*
-   * Check if the hostname is something.local (Bonjour); if so, allow it.
-   */
-@@ -4998,7 +4998,7 @@ valid_host(cupsd_client_t *con)		/* I -
-       (!_cups_strcasecmp(end, ".local") || !_cups_strncasecmp(end, ".local:", 7) ||
-        !_cups_strcasecmp(end, ".local.") || !_cups_strncasecmp(end, ".local.:", 8)))
-     return (1);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
-  /*
-   * Check if the hostname is an IP address...
-diff -up cups-1.5.2/scheduler/conf.c.avahi-5-services cups-1.5.2/scheduler/conf.c
---- cups-1.5.2/scheduler/conf.c.avahi-5-services	2012-03-14 15:04:17.636305526 +0000
-+++ cups-1.5.2/scheduler/conf.c	2012-03-14 15:08:25.706611803 +0000
-@@ -652,7 +652,7 @@ cupsdReadConfiguration(void)
-   Browsing                 = CUPS_DEFAULT_BROWSING;
-   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cupsdSetString(&DNSSDRegType, "_ipp._tcp,_cups");
- #endif /* HAVE_DNSSD */
- 
-diff -up cups-1.5.2/scheduler/dirsvc.c.avahi-5-services cups-1.5.2/scheduler/dirsvc.c
---- cups-1.5.2/scheduler/dirsvc.c.avahi-5-services	2012-03-14 15:04:17.674305572 +0000
-+++ cups-1.5.2/scheduler/dirsvc.c	2012-03-14 15:08:25.709611806 +0000
-@@ -27,6 +27,7 @@
-  *   ldap_connect()             - Start new LDAP connection
-  *   ldap_reconnect()           - Reconnect to LDAP Server
-  *   ldap_disconnect()          - Disconnect from LDAP Server
-+ *   cupsdStartAvahiClient()    - Start an Avahi client if needed
-  *   cupsdStartBrowsing()       - Start sending and receiving broadcast
-  *                                information.
-  *   cupsdStartPolling()        - Start polling servers as needed.
-@@ -40,11 +41,12 @@
-  *   dequote()                  - Remote quotes from a string.
-  *   dnssdAddAlias()            - Add a DNS-SD alias name.
-  *   dnssdBuildTxtRecord()      - Build a TXT record from printer info.
-- *   dnssdComparePrinters()     - Compare the registered names of two printers.
-  *   dnssdDeregisterPrinter()   - Stop sending broadcast information for a
-  *                                printer.
-  *   dnssdPackTxtRecord()       - Pack an array of key/value pairs into the TXT
-  *                                record format.
-+ *   avahiPackTxtRecord()       - Pack an array of key/value pairs into an
-+ *                                AvahiStringList.
-  *   dnssdRegisterCallback()    - DNSServiceRegister callback.
-  *   dnssdRegisterPrinter()     - Start sending broadcast information for a
-  *                                printer or update the broadcast contents.
-@@ -83,6 +85,7 @@
-  */
- 
- #include "cupsd.h"
-+#include <assert.h>
- #include <grp.h>
- 
- #ifdef HAVE_DNSSD
-@@ -97,6 +100,17 @@
- #    endif /* HAVE_SYSTEMCONFIGURATION */
- #  endif /* __APPLE__ */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-common/domain.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+#ifdef HAVE_DNSSD
-+typedef char *cupsd_txt_record_t;
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+typedef AvahiStringList *cupsd_txt_record_t;
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -159,27 +173,38 @@ static void	update_polling(void);
- static void	update_smb(int onoff);
- 
- 
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+static cupsd_txt_record_t dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
-+					      int for_lpd);
-+static void	dnssdDeregisterPrinter(cupsd_printer_t *p);
-+static void	dnssdRegisterPrinter(cupsd_printer_t *p);
-+static void	dnssdStop(void);
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+
- #ifdef HAVE_DNSSD
- #  ifdef HAVE_COREFOUNDATION
- static void	dnssdAddAlias(const void *key, const void *value,
- 		              void *context);
- #  endif /* HAVE_COREFOUNDATION */
--static char	*dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
--		                     int for_lpd);
--static int	dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);
--static void	dnssdDeregisterPrinter(cupsd_printer_t *p);
--static char	*dnssdPackTxtRecord(int *txt_len, char *keyvalue[][2],
--		                    int count);
- static void	dnssdRegisterCallback(DNSServiceRef sdRef,
- 		                      DNSServiceFlags flags,
- 				      DNSServiceErrorType errorCode,
- 				      const char *name, const char *regtype,
- 				      const char *domain, void *context);
--static void	dnssdRegisterPrinter(cupsd_printer_t *p);
--static void	dnssdStop(void);
- static void	dnssdUpdate(void);
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+static AvahiStringList *avahiPackTxtRecord(char *keyvalue[][2],
-+					   int count);
-+static void	avahi_entry_group_cb (AvahiEntryGroup *group,
-+				      AvahiEntryGroupState state,
-+				      void *userdata);
-+static void	avahi_client_cb (AvahiClient *client,
-+				 AvahiClientState state,
-+				 void *userdata);
-+#endif /* HAVE_AVAHI */
-+
- #ifdef HAVE_LDAP
- static const char * const ldap_attrs[] =/* CUPS LDAP attributes */
- 		{
-@@ -283,10 +308,10 @@ cupsdDeregisterPrinter(
-     ldap_dereg_printer(p);
- #endif /* HAVE_LDAP */
- 
--#ifdef HAVE_DNSSD
--  if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+  if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD))
-     dnssdDeregisterPrinter(p);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
- 
- 
-@@ -702,10 +727,10 @@ cupsdRegisterPrinter(cupsd_printer_t *p)
-     slpRegisterPrinter(p); */
- #endif /* HAVE_LIBSLP */
- 
--#ifdef HAVE_DNSSD
--  if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+  if ((BrowseLocalProtocols & BROWSE_DNSSD))
-     dnssdRegisterPrinter(p);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
- 
- 
-@@ -1419,6 +1444,36 @@ ldap_disconnect(LDAP *ld)		/* I - LDAP h
- #endif /* HAVE_LDAP */
- 
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'cupsdStartAvahiClient()' - Start an Avahi client if needed
-+ */
-+
-+void
-+cupsdStartAvahiClient(void)
-+{
-+  int error = 0;
-+
-+  if (!AvahiCupsClient && !AvahiCupsClientConnecting)
-+  {
-+    if (!AvahiCupsPollHandle)
-+      AvahiCupsPollHandle = avahi_cups_poll_new ();
-+
-+    if (AvahiCupsPollHandle)
-+    {
-+      if (avahi_client_new (avahi_cups_poll_get (AvahiCupsPollHandle),
-+			    AVAHI_CLIENT_NO_FAIL,
-+			    avahi_client_cb, NULL,
-+			    &error) != NULL)
-+	AvahiCupsClientConnecting = 1;
-+      else
-+	cupsdLogMessage (CUPSD_LOG_WARN, "Avahi client failed: %d", error);
-+    }
-+  }
-+}
-+#endif /* HAVE_AVAHI */
-+
-+  
- /*
-  * 'cupsdStartBrowsing()' - Start sending and receiving broadcast information.
-  */
-@@ -1542,13 +1597,16 @@ cupsdStartBrowsing(void)
-   else
-     BrowseSocket = -1;
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_DNSSD)
-   {
-+#ifdef HAVE_DNSSD
-     DNSServiceErrorType error;		/* Error from service creation */
-+#endif /* HAVE_DNSSD */
-     cupsd_listener_t	*lis;		/* Current listening socket */
- 
- 
-+#ifdef HAVE_DNSSD
-    /*
-     * First create a "master" connection for all registrations...
-     */
-@@ -1573,6 +1631,7 @@ cupsdStartBrowsing(void)
-       fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
- 
-       cupsdAddSelect(fd, (cupsd_selfunc_t)dnssdUpdate, NULL, NULL);
-+#endif /* HAVE_DNSSD */
- 
-      /*
-       * Then get the port we use for registrations.  If we are not listening
-@@ -1598,17 +1657,23 @@ cupsdStartBrowsing(void)
-       */
- 
-       if (BrowseRemoteProtocols & BROWSE_DNSSD)
--        DNSSDPrinters = cupsArrayNew((cups_array_func_t)dnssdComparePrinters,
--	                             NULL);
-+	  DNSSDPrinters = cupsArrayNew(NULL, NULL);
- 
-      /*
-       * Set the computer name and register the web interface...
-       */
- 
-       cupsdUpdateDNSSDName();
-+
-+#ifdef HAVE_AVAHI
-+      cupsdStartAvahiClient ();
-+#endif /* HAVE_AVAHI */
-+
-+#ifdef HAVE_DNSSD
-     }
--  }
- #endif /* HAVE_DNSSD */
-+  }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LIBSLP
-   if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP)
-@@ -1834,10 +1899,10 @@ cupsdStopBrowsing(void)
-     BrowseSocket = -1;
-   }
- 
--#ifdef HAVE_DNSSD
--  if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+  if ((BrowseLocalProtocols & BROWSE_DNSSD))
-     dnssdStop();
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LIBSLP
-   if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) &&
-@@ -1902,7 +1967,7 @@ cupsdStopPolling(void)
- }
- 
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
-  * 'cupsdUpdateDNSSDName()' - Update the computer name we use for browsing...
-  */
-@@ -1910,8 +1975,14 @@ cupsdStopPolling(void)
- void
- cupsdUpdateDNSSDName(void)
- {
-+#ifdef HAVE_DNSSD
-   DNSServiceErrorType error;		/* Error from service creation */
-   char		webif[1024];		/* Web interface share name */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  int		ret;			/* Error from service creation */
-+  char		webif[AVAHI_LABEL_MAX];	/* Web interface share name */
-+#endif /* HAVE_AVAHI */
- #  ifdef HAVE_SYSTEMCONFIGURATION
-   SCDynamicStoreRef sc;			/* Context for dynamic store */
-   CFDictionaryRef btmm;			/* Back-to-My-Mac domains */
-@@ -2042,6 +2113,7 @@ cupsdUpdateDNSSDName(void)
-     else
-       strlcpy(webif, "CUPS Web Interface", sizeof(webif));
- 
-+#ifdef HAVE_DNSSD
-     if (WebIFRef)
-       DNSServiceRefDeallocate(WebIFRef);
- 
-@@ -2054,9 +2126,45 @@ cupsdUpdateDNSSDName(void)
- 				    NULL)) != kDNSServiceErr_NoError)
-       cupsdLogMessage(CUPSD_LOG_ERROR,
- 		      "DNS-SD web interface registration failed: %d", error);
-+#endif /* HAVE_DNSSD */
-+
-+#ifdef HAVE_AVAHI
-+    if (!AvahiCupsClient)
-+     /*
-+      * Client not yet running.
-+      */
-+      return;
-+
-+    if (AvahiWebIFGroup)
-+      avahi_entry_group_reset (AvahiWebIFGroup);
-+    else
-+      AvahiWebIFGroup = avahi_entry_group_new (AvahiCupsClient,
-+					       avahi_entry_group_cb,
-+					       NULL);
-+
-+    if (AvahiWebIFGroup)
-+    {
-+      ret = avahi_entry_group_add_service (AvahiWebIFGroup,
-+					   AVAHI_IF_UNSPEC,
-+					   AVAHI_PROTO_UNSPEC,
-+					   0, /* flags */
-+					   webif, /* name */
-+					   "_http._tcp", /* type */
-+					   NULL, /* domain */
-+					   NULL, /* host */
-+					   DNSSDPort, /* port */
-+					   "path=/", NULL);
-+      if (ret == 0)
-+	ret = avahi_entry_group_commit (AvahiWebIFGroup);
-+
-+      if (ret != 0)
-+	cupsdLogMessage (CUPSD_LOG_ERROR,
-+			 "Avahi web interface registration failed: %d", ret);
-+    }
-+#endif /* HAVE_AVAHI */
-   }
- }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- 
- #ifdef HAVE_LDAP
-@@ -2334,13 +2442,15 @@ dnssdAddAlias(const void *key,		/* I - K
-                     "Bad Back to My Mac domain in dynamic store!");
- }
- #  endif /* HAVE_COREFOUNDATION */
-+#endif /* HAVE_DNSSD */
- 
- 
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
-  * 'dnssdBuildTxtRecord()' - Build a TXT record from printer info.
-  */
- 
--static char *				/* O - TXT record */
-+static cupsd_txt_record_t		/* O - TXT record */
- dnssdBuildTxtRecord(
-     int             *txt_len,		/* O - TXT record length */
-     cupsd_printer_t *p,			/* I - Printer information */
-@@ -2379,7 +2489,12 @@ dnssdBuildTxtRecord(
-   keyvalue[i  ][0] = "ty";
-   keyvalue[i++][1] = p->make_model ? p->make_model : "Unknown";
- 
--  snprintf(admin_hostname, sizeof(admin_hostname), "%s.local.", DNSSDHostName);
-+  snprintf(admin_hostname, sizeof(admin_hostname),
-+	   "%s.local"
-+#ifdef HAVE_DNSSD
-+	   "." /* terminating dot no good for Avahi */
-+#endif /* HAVE_DNSSD */
-+	   , DNSSDHostName);
-   httpAssembleURIf(HTTP_URI_CODING_ALL, adminurl_str, sizeof(adminurl_str),
-                    "http", NULL, admin_hostname, DNSSDPort, "/%s/%s",
- 		   (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers",
-@@ -2462,19 +2577,12 @@ dnssdBuildTxtRecord(
-   * Then pack them into a proper txt record...
-   */
- 
-+#ifdef HAVE_DNSSD
-   return (dnssdPackTxtRecord(txt_len, keyvalue, i));
--}
--
--
--/*
-- * 'dnssdComparePrinters()' - Compare the registered names of two printers.
-- */
--
--static int				/* O - Result of comparison */
--dnssdComparePrinters(cupsd_printer_t *a,/* I - First printer */
--                     cupsd_printer_t *b)/* I - Second printer */
--{
--  return (_cups_strcasecmp(a->reg_name, b->reg_name));
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  return (avahiPackTxtRecord(keyvalue, i));
-+#endif /* HAVE_AVAHI */
- }
- 
- 
-@@ -2489,6 +2597,10 @@ dnssdDeregisterPrinter(
- {
-   cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdDeregisterPrinter(%s)", p->name);
- 
-+#ifdef HAVE_DNSSD
-+  if (!DNSSDRef)
-+    return;
-+
-  /*
-   * Closing the socket deregisters the service
-   */
-@@ -2524,6 +2636,24 @@ dnssdDeregisterPrinter(
-     free(p->printer_txt);
-     p->printer_txt = NULL;
-   }
-+#endif /* HAVE_DNSSD */
-+
-+#ifdef HAVE_AVAHI
-+  if (p->avahi_group)
-+    {
-+      avahi_entry_group_reset (p->avahi_group);
-+      avahi_entry_group_free (p->avahi_group);
-+      p->avahi_group = NULL;
-+
-+      if (p->ipp_txt)
-+	avahi_string_list_free (p->ipp_txt);
-+
-+      if (p->printer_txt)
-+	avahi_string_list_free (p->printer_txt);
-+
-+      p->ipp_txt = p->printer_txt = NULL;
-+    }
-+#endif /* HAVE_AVAHI */
- 
-  /*
-   * Remove the printer from the array of DNS-SD printers, then clear the
-@@ -2533,8 +2663,10 @@ dnssdDeregisterPrinter(
-   cupsArrayRemove(DNSSDPrinters, p);
-   cupsdClearString(&p->reg_name);
- }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'dnssdPackTxtRecord()' - Pack an array of key/value pairs into the
-  *                          TXT record format.
-@@ -2644,8 +2776,10 @@ dnssdRegisterCallback(
-     LastEvent |= CUPSD_EVENT_PRINTER_MODIFIED;
-   }
- }
-+#endif /* HAVE_DNSSD */
- 
- 
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
-  * 'dnssdRegisterPrinter()' - Start sending broadcast information for a printer
-  *		              or update the broadcast contents.
-@@ -2654,20 +2788,40 @@ dnssdRegisterCallback(
- static void
- dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */
- {
-+#ifdef HAVE_DNSSD
-   DNSServiceErrorType	se;		/* dnssd errors */
-   char			*ipp_txt,	/* IPP TXT record buffer */
- 			*printer_txt,	/* LPD TXT record buffer */
--			name[1024],	/* Service name */
--			*nameptr;	/* Pointer into name */
-+			name[1024];	/* Service name */
-   int			ipp_len,	/* IPP TXT record length */
- 			printer_len,	/* LPD TXT record length */
- 			printer_port;	/* LPD port number */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  int			ret;		/* Error code */
-+  AvahiStringList	*ipp_txt,	/* IPP TXT record */
-+			*printer_txt;	/* LPD TXT record */
-+  char			name[AVAHI_LABEL_MAX],	/* Service name */
-+			fullsubtype[AVAHI_LABEL_MAX]; /* Full subtype */
-+  char			*regtype_copy,	/* Writeable copy of reg type */
-+			*subtype,	/* Current service sub type */
-+			*nextsubtype;	/* Next service sub type */
-+#endif /* HAVE_AVAHI */
-+  char			*nameptr;	/* Pointer into name */
-   const char		*regtype;	/* Registration type */
- 
- 
-+#ifdef HAVE_DNSSD
-+  if (!DNSSDRef)
-+    return;
-+
-   cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
-                   !p->ipp_ref ? "new" : "update");
--
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
-+		  !p->avahi_group ? "new" : "update");
-+#endif /* HAVE_AVAHI */
-  /*
-   * If per-printer sharing was just disabled make sure we're not
-   * registered before returning.
-@@ -2686,12 +2840,36 @@ dnssdRegisterPrinter(cupsd_printer_t *p)
-   if (p->info && strlen(p->info) > 0)
-   {
-     if (DNSSDComputerName)
--      snprintf(name, sizeof(name), "%s @ %s", p->info, DNSSDComputerName);
-+    {
-+     /*
-+      * Make sure there is room for at least 15 characters of
-+      * DNSSDComputerName.
-+      */
-+
-+      assert(sizeof(name) >= 15 + 4);
-+      nameptr = name + strlcpy(name, p->info,
-+			       sizeof(name) - 4 -
-+			       strnlen(DNSSDComputerName, 15));
-+      nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name));
-+      strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name));
-+    }
-     else
-       strlcpy(name, p->info, sizeof(name));
-   }
-   else if (DNSSDComputerName)
--    snprintf(name, sizeof(name), "%s @ %s", p->name, DNSSDComputerName);
-+  {
-+   /*
-+    * Make sure there is room for at least 15 characters of
-+    * DNSSDComputerName.
-+    */
-+
-+    assert(sizeof(name) >= 15 + 4);
-+    nameptr = name + strlcpy(name, p->info,
-+			     sizeof(name) - 4 -
-+			     strnlen(DNSSDComputerName, 15));
-+    nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name));
-+    strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name));
-+  }
-   else
-     strlcpy(name, p->name, sizeof(name));
- 
-@@ -2712,6 +2890,7 @@ dnssdRegisterPrinter(cupsd_printer_t *p)
-   * Register IPP and (optionally) LPD...
-   */
- 
-+#ifdef HAVE_DNSSD
-   ipp_len = 0;				/* anti-compiler-warning-code */
-   ipp_txt = dnssdBuildTxtRecord(&ipp_len, p, 0);
- 
-@@ -2884,6 +3063,209 @@ dnssdRegisterPrinter(cupsd_printer_t *p)
- 
-   if (printer_txt)
-     free(printer_txt);
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  if (!AvahiCupsClient)
-+   /*
-+    * Client not running yet.  The client callback will call us again later.
-+    */
-+    return;
-+
-+  ipp_txt = dnssdBuildTxtRecord(NULL, p, 0);
-+  printer_txt = dnssdBuildTxtRecord(NULL, p, 1);
-+  regtype = (p->type & CUPS_PRINTER_FAX) ? "_fax-ipp._tcp" : DNSSDRegType;
-+
-+  if (p->avahi_group && p->ipp_txt && ipp_txt &&
-+      !avahi_string_list_equal (p->ipp_txt, ipp_txt))
-+  {
-+   /*
-+    * Update the existing registration...
-+    */
-+
-+    avahi_string_list_free (p->ipp_txt);
-+
-+    if (p->printer_txt)
-+      avahi_string_list_free (p->printer_txt);
-+
-+   /*
-+    * Update the service group entry.
-+    */
-+
-+    regtype_copy = strdup (regtype);
-+    subtype = strchr (regtype_copy, ',');
-+    if (subtype)
-+      *subtype = '\0';
-+
-+    cupsdLogMessage (CUPSD_LOG_DEBUG,
-+		     "Updating TXT record for %s (%s)", name, regtype_copy);
-+    ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group,
-+						       AVAHI_IF_UNSPEC,
-+						       AVAHI_PROTO_UNSPEC,
-+						       0, name,
-+						       regtype_copy,
-+						       NULL, ipp_txt);
-+    free (regtype_copy);
-+
-+    if (ret < 0)
-+      goto update_failed;
-+
-+    p->ipp_txt = ipp_txt;
-+    ipp_txt = NULL;
-+
-+    if (BrowseLocalProtocols & BROWSE_LPD)
-+    {
-+      ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group,
-+							 AVAHI_IF_UNSPEC,
-+							 AVAHI_PROTO_UNSPEC,
-+							 0, name,
-+							 "_printer._tcp", NULL,
-+							 printer_txt);
-+      if (ret < 0)
-+	goto update_failed;
-+
-+      p->printer_txt = printer_txt;
-+      printer_txt = NULL;
-+    }
-+
-+    ret = avahi_entry_group_commit (p->avahi_group);
-+    if (ret < 0)
-+    {
-+    update_failed:
-+      cupsdLogMessage (CUPSD_LOG_ERROR,
-+		       "Failed to update TXT record for %s: %d",
-+		       name, ret);
-+      avahi_entry_group_reset (p->avahi_group);
-+      avahi_entry_group_free (p->avahi_group);
-+      p->avahi_group = NULL;
-+      ipp_txt = p->ipp_txt;
-+      p->ipp_txt = NULL;
-+    }
-+  }
-+
-+  if (!p->avahi_group)
-+  {
-+   /*
-+    * Initial registration.  Use the _fax subtype for fax queues...
-+    */
-+
-+    p->avahi_group = avahi_entry_group_new (AvahiCupsClient,
-+					    avahi_entry_group_cb,
-+					    p);
-+
-+    cupsdLogMessage(CUPSD_LOG_DEBUG,
-+		    "Registering Avahi printer %s with name \"%s\" and "
-+		    "type \"%s\"", p->name, name, regtype);
-+
-+    if (!p->avahi_group)
-+    {
-+      ret = 0;
-+      goto add_failed;
-+    }
-+
-+   /*
-+    * Add each service type (DNSSDRegType may contain several,
-+    * separated by commas).
-+    */
-+
-+    subtype = regtype_copy = strdup (regtype);
-+    while (subtype && *subtype)
-+    {
-+      nextsubtype = strchr (subtype, ',');
-+      if (nextsubtype)
-+	*nextsubtype++ = '\0';
-+
-+      if (subtype == regtype_copy)
-+      {
-+       /*
-+	* Main type entry.
-+	*/
-+
-+	cupsdLogMessage (CUPSD_LOG_DEBUG,
-+			 "Adding TXT record for %s (%s)", name, regtype_copy);
-+	ret = avahi_entry_group_add_service_strlst (p->avahi_group,
-+						    AVAHI_IF_UNSPEC,
-+						    AVAHI_PROTO_UNSPEC,
-+						    0, name, regtype_copy,
-+						    NULL, NULL,
-+						    DNSSDPort,
-+						    ipp_txt);
-+      }
-+      else
-+      {
-+       /*
-+	* Sub-type entry.
-+	*/
-+
-+	snprintf (fullsubtype, sizeof(fullsubtype),
-+		  "%s._sub.%s", subtype, regtype_copy);
-+	cupsdLogMessage (CUPSD_LOG_DEBUG,
-+			 "Adding TXT record for %s (%s)", name, fullsubtype);
-+	ret = avahi_entry_group_add_service_subtype (p->avahi_group,
-+						     AVAHI_IF_UNSPEC,
-+						     AVAHI_PROTO_UNSPEC,
-+						     0, name,
-+						     regtype_copy,
-+						     NULL, fullsubtype);
-+      }
-+
-+      if (ret < 0)
-+      {
-+	free (regtype_copy);
-+	goto add_failed;
-+      }
-+
-+      subtype = nextsubtype;
-+    }
-+
-+    free (regtype_copy);
-+    p->ipp_txt = ipp_txt;
-+    ipp_txt = NULL;
-+
-+    if (BrowseLocalProtocols & BROWSE_LPD)
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+		      "Registering Avahi printer %s with name \"%s\" and "
-+		      "type \"_printer._tcp\"", p->name, name);
-+
-+      ret = avahi_entry_group_add_service_strlst (p->avahi_group,
-+						  AVAHI_IF_UNSPEC,
-+						  AVAHI_PROTO_UNSPEC,
-+						  0, name,
-+						  "_printer._tcp", NULL, NULL,
-+						  515,
-+						  printer_txt);
-+      if (ret < 0)
-+	goto add_failed;
-+
-+      p->printer_txt = printer_txt;
-+      printer_txt = NULL;
-+    }
-+
-+    ret = avahi_entry_group_commit (p->avahi_group);
-+
-+    if (ret < 0)
-+    {
-+    add_failed:
-+      cupsdLogMessage (CUPSD_LOG_ERROR,
-+		       "Failed to add Avahi entry for %s: %d",
-+		       name, ret);
-+      if (p->avahi_group)
-+      {
-+	avahi_entry_group_reset (p->avahi_group);
-+	avahi_entry_group_free (p->avahi_group);
-+	p->avahi_group = NULL;
-+      }
-+      ipp_txt = p->ipp_txt;
-+      p->ipp_txt = NULL;
-+    }
-+  }
-+
-+  if (ipp_txt)
-+    avahi_string_list_free (ipp_txt);
-+
-+  if (printer_txt)
-+    avahi_string_list_free (printer_txt);
-+#endif /* HAVE_AVAHI */
- }
- 
- 
-@@ -2896,6 +3278,10 @@ dnssdStop(void)
- {
-   cupsd_printer_t	*p;		/* Current printer */
- 
-+#ifdef HAVE_DNSSD
-+  if (!DNSSDRef)
-+    return;
-+#endif /* HAVE_DNSSD */
- 
-  /*
-   * De-register the individual printers
-@@ -2910,12 +3296,23 @@ dnssdStop(void)
-   * Shutdown the rest of the service refs...
-   */
- 
-+#ifdef HAVE_DNSSD
-   if (WebIFRef)
-   {
-     DNSServiceRefDeallocate(WebIFRef);
-     WebIFRef = NULL;
-   }
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  if (AvahiWebIFGroup)
-+  {
-+    avahi_entry_group_reset (AvahiWebIFGroup);
-+    avahi_entry_group_free (AvahiWebIFGroup);
-+    AvahiWebIFGroup = NULL;
-+  }
-+#endif /* HAVE_AVAHI */
- 
-+#ifdef HAVE_DNSSD
-   if (RemoteRef)
-   {
-     DNSServiceRefDeallocate(RemoteRef);
-@@ -2926,14 +3323,17 @@ dnssdStop(void)
- 
-   DNSServiceRefDeallocate(DNSSDRef);
-   DNSSDRef = NULL;
-+#endif /* HAVE_DNSSD */
- 
-   cupsArrayDelete(DNSSDPrinters);
-   DNSSDPrinters = NULL;
- 
-   DNSSDPort = 0;
- }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'dnssdUpdate()' - Handle DNS-SD queries.
-  */
-@@ -2955,6 +3355,153 @@ dnssdUpdate(void)
- #endif /* HAVE_DNSSD */
- 
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahiPackTxtRecord()' - Pack an array of key/value pairs into an
-+ *                          AvahiStringList.
-+ */
-+
-+static AvahiStringList *		/* O - new string list */
-+avahiPackTxtRecord(char *keyvalue[][2],	/* I - Table of key value pairs */
-+		   int count)		/* I - Number of items in table */
-+{
-+  AvahiStringList *strlst = NULL;
-+  char **elements;
-+  size_t len;
-+  int i = 0;
-+
-+  elements = malloc ((1 + count) * sizeof (char *));
-+  if (!elements)
-+    goto cleanup;
-+
-+  for (i = 0; i < count; i++)
-+    {
-+      len = (1 + strlen (keyvalue[i][0]) +
-+	     (keyvalue[i][1] ? 1 + strlen (keyvalue[i][1]) : 1));
-+      elements[i] = malloc (len * sizeof (char));
-+      if (!elements[i])
-+	goto cleanup;
-+
-+      snprintf (elements[i], len, "%s=%s", keyvalue[i][0], keyvalue[i][1]);
-+    }
-+
-+  strlst = avahi_string_list_new_from_array ((const char **) elements, count);
-+
-+cleanup:
-+  while (--i >= 0)
-+    free (elements[i]);
-+
-+  free (elements);
-+  return (strlst);
-+}
-+
-+
-+/*
-+ * 'avahi_entry_group_cb()' - Avahi entry group callback function.
-+ */
-+static void
-+avahi_entry_group_cb (AvahiEntryGroup *group,
-+		      AvahiEntryGroupState state,
-+		      void *userdata)
-+{
-+  char *name;
-+
-+  if (userdata)
-+    name = ((cupsd_printer_t *) userdata)->reg_name;
-+  else
-+    name = "CUPS web interface";
-+
-+  switch (state)
-+  {
-+  case AVAHI_ENTRY_GROUP_UNCOMMITED:
-+  case AVAHI_ENTRY_GROUP_REGISTERING:
-+    break;
-+
-+  case AVAHI_ENTRY_GROUP_ESTABLISHED:
-+    cupsdLogMessage (CUPSD_LOG_DEBUG,
-+		     "Avahi entry group established for %s", name);
-+    break;
-+
-+  default:
-+    cupsdLogMessage (CUPSD_LOG_DEBUG,
-+		     "Avahi entry group %s has state %d",
-+		     name, state);
-+    break;
-+  }
-+}
-+
-+
-+/*
-+ * 'avahi_client_cb()' - Avahi client callback function.
-+ */
-+static void
-+avahi_client_cb (AvahiClient *client,
-+		 AvahiClientState state,
-+		 void *userdata)
-+{
-+  cupsd_printer_t *printer;
-+  switch (state)
-+  {
-+  case AVAHI_CLIENT_S_RUNNING:
-+   /*
-+    * Avahi client started successfully.
-+    */
-+    AvahiCupsClient = client;
-+    AvahiCupsClientConnecting = 0;
-+    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client started");
-+
-+    cupsdUpdateDNSSDName ();
-+
-+    for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
-+	 printer;
-+	 printer = (cupsd_printer_t *)cupsArrayNext(Printers))
-+      if (Browsing && (BrowseLocalProtocols & BROWSE_DNSSD) &&
-+	  (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT |
-+			      CUPS_PRINTER_SCANNER))) && printer->shared)
-+	dnssdRegisterPrinter (printer);
-+
-+    break;
-+
-+  case AVAHI_CLIENT_CONNECTING:
-+   /*
-+    * No Avahi daemon, client is waiting.
-+    */
-+    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client connecting");
-+    break;
-+
-+  case AVAHI_CLIENT_S_REGISTERING:
-+    /*
-+     * Not yet registered.
-+     */
-+    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client registering");
-+    break;
-+
-+  case AVAHI_CLIENT_FAILURE:
-+   /*
-+    * Avahi client failed, close it to allow a clean restart.
-+    */
-+    cupsdLogMessage (CUPSD_LOG_ERROR,
-+		     "Avahi client failed, "
-+		     "closing client to allow a clean restart");
-+
-+    for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
-+	 printer;
-+	 printer = (cupsd_printer_t *)cupsArrayNext(Printers))
-+      dnssdDeregisterPrinter (printer);
-+
-+    avahi_client_free(client);
-+    AvahiCupsClientConnecting = 0;
-+    AvahiCupsClient = NULL;
-+
-+    break;
-+
-+  default:
-+    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client state: %d", state);
-+  }
-+}
-+#endif /* HAVE_AVAHI */
-+
-+
- /*
-  * 'get_auth_info_required()' - Get the auth-info-required value to advertise.
-  */
-diff -up cups-1.5.2/scheduler/dirsvc.h.avahi-5-services cups-1.5.2/scheduler/dirsvc.h
---- cups-1.5.2/scheduler/dirsvc.h.avahi-5-services	2011-03-21 02:12:14.000000000 +0000
-+++ cups-1.5.2/scheduler/dirsvc.h	2012-03-14 15:08:25.711611808 +0000
-@@ -31,6 +31,10 @@
- #  endif /* HAVE_LDAP_SSL_H */
- #endif /* HAVE_LDAP */
- 
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/publish.h>
-+#endif /* HAVE_AVAHI */
-+
- /*
-  * Browse protocols...
-  */
-@@ -131,19 +135,22 @@ VAR int			PollPipe	VALUE(0);
- VAR cupsd_statbuf_t	*PollStatusBuffer VALUE(NULL);
- 					/* Status buffer for pollers */
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- VAR char		*DNSSDComputerName VALUE(NULL),
- 					/* Computer/server name */
- 			*DNSSDHostName	VALUE(NULL),
- 					/* Hostname */
- 			*DNSSDRegType VALUE(NULL);
- 					/* Bonjour registration type */
--VAR cups_array_t	*DNSSDAlias	VALUE(NULL);
--					/* List of dynamic ServerAlias's */
- VAR int			DNSSDPort	VALUE(0);
- 					/* Port number to register */
- VAR cups_array_t	*DNSSDPrinters	VALUE(NULL);
- 					/* Printers we have registered */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+
-+#ifdef HAVE_DNSSD
-+VAR cups_array_t	*DNSSDAlias	VALUE(NULL);
-+					/* List of dynamic ServerAlias's */
- VAR DNSServiceRef	DNSSDRef	VALUE(NULL),
- 					/* Master DNS-SD service reference */
- 			WebIFRef	VALUE(NULL),
-@@ -152,6 +159,17 @@ VAR DNSServiceRef	DNSSDRef	VALUE(NULL),
- 					/* Remote printer browse reference */
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+VAR AvahiCupsPoll	*AvahiCupsPollHandle	VALUE(NULL);
-+					/* AvahiCupsPoll object */
-+VAR AvahiClient		*AvahiCupsClient	VALUE(NULL);
-+					/* AvahiClient object */
-+VAR int			AvahiCupsClientConnecting	VALUE(0);
-+					/* Is AvahiClient object connecting? */
-+VAR AvahiEntryGroup	*AvahiWebIFGroup	VALUE(NULL);
-+					/* Web interface entry group */
-+#endif /* HAVE_AVAHI */
-+
- #ifdef HAVE_LIBSLP
- VAR SLPHandle		BrowseSLPHandle	VALUE(NULL);
- 					/* SLP API handle */
-@@ -195,13 +213,14 @@ extern void	cupsdRegisterPrinter(cupsd_p
- extern void	cupsdRestartPolling(void);
- extern void	cupsdSaveRemoteCache(void);
- extern void	cupsdSendBrowseList(void);
-+extern void	cupsdStartAvahiClient(void);
- extern void	cupsdStartBrowsing(void);
- extern void	cupsdStartPolling(void);
- extern void	cupsdStopBrowsing(void);
- extern void	cupsdStopPolling(void);
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- extern void	cupsdUpdateDNSSDName(void);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- #ifdef HAVE_LDAP
- extern void	cupsdUpdateLDAPBrowse(void);
- #endif /* HAVE_LDAP */
-diff -up cups-1.5.2/scheduler/ipp.c.avahi-5-services cups-1.5.2/scheduler/ipp.c
---- cups-1.5.2/scheduler/ipp.c.avahi-5-services	2012-03-14 15:04:17.665305560 +0000
-+++ cups-1.5.2/scheduler/ipp.c	2012-03-14 15:08:25.715611813 +0000
-@@ -6099,7 +6099,7 @@ copy_printer_attrs(
-     ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
-                ippTimeToDate(curtime));
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   if (!ra || cupsArrayFind(ra, "printer-dns-sd-name"))
-   {
-     if (printer->reg_name)
-@@ -6109,7 +6109,7 @@ copy_printer_attrs(
-       ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE,
-                    "printer-dns-sd-name", 0);
-   }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
-   if (!ra || cupsArrayFind(ra, "printer-error-policy"))
-     ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
-diff -up cups-1.5.2/scheduler/main.c.avahi-5-services cups-1.5.2/scheduler/main.c
---- cups-1.5.2/scheduler/main.c.avahi-5-services	2012-03-14 15:06:36.511476986 +0000
-+++ cups-1.5.2/scheduler/main.c	2012-03-14 15:08:25.718611817 +0000
-@@ -120,6 +120,10 @@ main(int  argc,				/* I - Number of comm
-   cupsd_listener_t	*lis;		/* Current listener */
-   time_t		current_time,	/* Current time */
- 			activity,	/* Client activity timer */
-+#ifdef HAVE_AVAHI
-+			avahi_client_time, /* Time for next Avahi client
-+					      check */
-+#endif /* HAVE_AVAHI */
- 			browse_time,	/* Next browse send time */
- 			senddoc_time,	/* Send-Document time */
- 			expire_time,	/* Subscription expire time */
-@@ -672,6 +676,9 @@ main(int  argc,				/* I - Number of comm
-   */
- 
-   current_time  = time(NULL);
-+#ifdef HAVE_AVAHI
-+  avahi_client_time = current_time;
-+#endif /* HAVE_AVAHI */
-   browse_time   = current_time;
-   event_time    = current_time;
-   expire_time   = current_time;
-@@ -894,6 +901,16 @@ main(int  argc,				/* I - Number of comm
-     tmo = cupsdNextTimeout (&tmo_delay);
-     if (tmo && tmo_delay == 0)
-       cupsdRunTimeout (tmo);
-+
-+   /*
-+    * Try to restart the Avahi client every 10 seconds if needed...
-+    */
-+
-+    if ((current_time - avahi_client_time) >= 10)
-+    {
-+      avahi_client_time = current_time;
-+      cupsdStartAvahiClient();
-+    }
- #endif /* HAVE_AVAHI */
- 
- #ifndef __APPLE__
-diff -up cups-1.5.2/scheduler/printers.c.avahi-5-services cups-1.5.2/scheduler/printers.c
---- cups-1.5.2/scheduler/printers.c.avahi-5-services	2012-03-14 15:04:17.646305537 +0000
-+++ cups-1.5.2/scheduler/printers.c	2012-03-14 15:08:25.720611819 +0000
-@@ -883,9 +883,9 @@ cupsdDeletePrinter(
-   cupsdClearString(&p->alert);
-   cupsdClearString(&p->alert_description);
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cupsdClearString(&p->pdl);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
-   cupsArrayDelete(p->filetypes);
- 
-@@ -3787,7 +3787,7 @@ add_printer_formats(cupsd_printer_t *p)
-     attr->values[i].string.text = _cupsStrAlloc(mimetype);
-   }
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   {
-     char		pdl[1024];	/* Buffer to build pdl list */
-     mime_filter_t	*filter;	/* MIME filter looping var */
-@@ -3843,7 +3843,7 @@ add_printer_formats(cupsd_printer_t *p)
- 
-     cupsdSetString(&p->pdl, pdl);
-   }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
- 
- 
-diff -up cups-1.5.2/scheduler/printers.h.avahi-5-services cups-1.5.2/scheduler/printers.h
---- cups-1.5.2/scheduler/printers.h.avahi-5-services	2011-03-18 18:42:46.000000000 +0000
-+++ cups-1.5.2/scheduler/printers.h	2012-03-14 15:08:25.721611820 +0000
-@@ -16,6 +16,9 @@
- #ifdef HAVE_DNSSD
- #  include <dns_sd.h>
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include "avahi.h"
-+#endif /* HAVE_AVAHI */
- #include <cups/pwg-private.h>
- 
- 
-@@ -95,16 +98,23 @@ struct cupsd_printer_s
-   time_t	marker_time;		/* Last time marker attributes were updated */
-   _ppd_cache_t	*pc;			/* PPD cache and mapping data */
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   char		*reg_name,		/* Name used for service registration */
--		*pdl,			/* pdl value for TXT record */
--		*ipp_txt,		/* IPP TXT record contents */
-+		*pdl;			/* pdl value for TXT record */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+#ifdef HAVE_DNSSD
-+  char		*ipp_txt,		/* IPP TXT record contents */
- 		*printer_txt;		/* LPD TXT record contents */
-   int		ipp_len,		/* IPP TXT record length */
- 		printer_len;		/* LPD TXT record length */
-   DNSServiceRef	ipp_ref,		/* Reference for _ipp._tcp,_cups */
- 		printer_ref;		/* Reference for _printer._tcp */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  AvahiStringList *ipp_txt,		/* IPP TXT record */
-+		*printer_txt;		/* LPD TXT record */
-+  AvahiEntryGroup *avahi_group;		/* Avahi entry group */
-+#endif /* HAVE_AVAHI */
- };
- 
- 
diff --git a/extra/cups/cups-no-export-ssllibs.patch b/extra/cups/cups-no-export-ssllibs.patch
index 9be3c819b..e227bd182 100644
--- a/extra/cups/cups-no-export-ssllibs.patch
+++ b/extra/cups/cups-no-export-ssllibs.patch
@@ -1,7 +1,7 @@
 diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4
---- cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs	2011-05-11 02:52:08.000000000 +0200
-+++ cups-1.5b1/config-scripts/cups-ssl.m4	2011-05-23 17:47:27.000000000 +0200
-@@ -164,7 +164,7 @@ AC_SUBST(IPPALIASES)
+--- cups-1.6.2/config-scripts/cups-ssl.m4.no-export-ssllibs	2011-05-11 02:52:08.000000000 +0200
++++ cups-1.6.2/config-scripts/cups-ssl.m4	2011-05-23 17:47:27.000000000 +0200
+@@ -180,7 +180,7 @@
  AC_SUBST(SSLFLAGS)
  AC_SUBST(SSLLIBS)
  
@@ -9,4 +9,4 @@ diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/conf
 +EXPORT_SSLLIBS=""
  AC_SUBST(EXPORT_SSLLIBS)
  
- 
+ dnl
diff --git a/extra/cups/cups-no-gcrypt.patch b/extra/cups/cups-no-gcrypt.patch
index 42f71d0d4..4eaff67ce 100644
--- a/extra/cups/cups-no-gcrypt.patch
+++ b/extra/cups/cups-no-gcrypt.patch
@@ -9,12 +9,14 @@ diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/
  	if $PKGCONFIG --exists gnutls; then
  	    have_ssl=1
  	    SSLLIBS=`$PKGCONFIG --libs gnutls`
-@@ -110,16 +109,6 @@
- 	    AC_DEFINE(HAVE_SSL)
+@@ -108,18 +107,6 @@
  	    AC_DEFINE(HAVE_GNUTLS)
  	fi
--
+ 
 -	if test $have_ssl = 1; then
+-	    CUPS_SERVERCERT="ssl/server.crt"
+-	    CUPS_SERVERKEY="ssl/server.key"
+-
 -            if $PKGCONFIG --exists gcrypt; then
 -	        SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
 -	        SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
diff --git a/extra/cups/cups-no-gzip-man.patch.16 b/extra/cups/cups-no-gzip-man.patch.16
deleted file mode 100644
index 69899b9cb..000000000
--- a/extra/cups/cups-no-gzip-man.patch.16
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/config-scripts/cups-manpages.m4
---- cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man	2011-05-12 07:21:56.000000000 +0200
-+++ cups-1.5b1/config-scripts/cups-manpages.m4	2011-05-23 17:25:50.000000000 +0200
-@@ -69,10 +69,10 @@ case "$uname" in
- 		;;
- 	Linux* | GNU* | Darwin*)
- 		# Linux, GNU Hurd, and OS X
--		MAN1EXT=1.gz
--		MAN5EXT=5.gz
--		MAN7EXT=7.gz
--		MAN8EXT=8.gz
-+		MAN1EXT=1
-+		MAN5EXT=5
-+		MAN7EXT=7
-+		MAN8EXT=8
- 		MAN8DIR=8
- 		;;
- 	*)
diff --git a/extra/cups/cupsd-conf-remove-obsolete-browse-directives.patch b/extra/cups/cupsd-conf-remove-obsolete-browse-directives.patch
deleted file mode 100644
index 97636c7f2..000000000
--- a/extra/cups/cupsd-conf-remove-obsolete-browse-directives.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uraN cups/conf/cupsd.conf.in cups-new/conf/cupsd.conf.in
---- cups/conf/cupsd.conf.in	2012-05-25 15:28:25.000000000 +0200
-+++ cups-new/conf/cupsd.conf.in	2012-08-04 20:56:26.699062177 +0200
-@@ -19,8 +19,6 @@
- 
- # Show shared printers on the local network.
- Browsing On
--BrowseOrder allow,deny
--BrowseAllow all
- BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@
- 
- # Default authentication type, when authentication is required...
diff --git a/extra/cups/recognize-remote-cups-queue-via-dnssd-uri.patch b/extra/cups/recognize-remote-cups-queue-via-dnssd-uri.patch
deleted file mode 100644
index 6349bd901..000000000
--- a/extra/cups/recognize-remote-cups-queue-via-dnssd-uri.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -uraN cups/scheduler/printers.c cups-new/scheduler/printers.c
---- cups/scheduler/printers.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/printers.c	2012-08-04 20:58:40.475725544 +0200
-@@ -4829,13 +4829,14 @@
- 		   "printer-make-and-model", NULL,
- 		   "Local System V Printer");
-     }
--    else if (!strncmp(p->device_uri, "ipp://", 6) &&
--	     (strstr(p->device_uri, "/printers/") != NULL ||
--	      strstr(p->device_uri, "/classes/") != NULL ||
--	      ((strstr(p->device_uri, "._ipp.") != NULL ||
--	        strstr(p->device_uri, "._ipps.") != NULL) &&
--	       !strcmp(p->device_uri + strlen(p->device_uri) - 5,
--		       "/cups"))))
-+    else if ((!strncmp(p->device_uri, "ipp://", 6) &&
-+	      (strstr(p->device_uri, "/printers/") != NULL ||
-+	       strstr(p->device_uri, "/classes/") != NULL)) ||
-+	     (!strncmp(p->device_uri, "dnssd://", 8) &&
-+	      (strstr(p->device_uri, "._ipp.") != NULL ||
-+	       strstr(p->device_uri, "._ipps.") != NULL) &&
-+	      !strcmp(p->device_uri + strlen(p->device_uri) - 5,
-+		      "/cups")))
-     {
-      /*
-       * Tell the client this is really a hard-wired remote printer.
diff --git a/extra/cups/usb-backend-reset-after-job-only-for-specific-devices.patch b/extra/cups/usb-backend-reset-after-job-only-for-specific-devices.patch
deleted file mode 100644
index dcf91c833..000000000
--- a/extra/cups/usb-backend-reset-after-job-only-for-specific-devices.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- backend/usb-libusb.c.orig	2012-07-16 19:10:55.000000000 +0200
-+++ backend/usb-libusb.c	2012-08-06 11:01:58.034150159 +0200
-@@ -70,7 +70,7 @@
- 			read_endp,	/* Read endpoint */
- 			protocol,	/* Protocol: 1 = Uni-di, 2 = Bi-di. */
- 			usblp_attached,	/* "usblp" kernel module attached? */
--			opened_for_job;	/* Set to 1 by print_device() */
-+			reset_after_job; /* Set to 1 by print_device() */
-   unsigned int		quirks;		/* Quirks flags */
-   struct libusb_device_handle *handle;	/* Open handle to device */
- } usb_printer_t;
-@@ -122,6 +122,8 @@
- #define USBLP_QUIRK_USB_INIT	0x2	/* needs vendor USB init string */
- #define USBLP_QUIRK_BAD_CLASS	0x4	/* descriptor uses vendor-specific
- 					   Class or SubClass */
-+#define USBLP_QUIRK_RESET	0x4000	/* After printing do a reset
-+					   for clean-up */
- #define USBLP_QUIRK_NO_REATTACH	0x8000	/* After printing we cannot re-attach
- 					   the usblp kernel module */
- 
-@@ -147,9 +149,11 @@
- 	{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt
- 						      Printer M129C */
- 	{ 0x067b, 0x2305, USBLP_QUIRK_BIDIR |
--			  USBLP_QUIRK_NO_REATTACH },
-+			  USBLP_QUIRK_NO_REATTACH |
-+	                  USBLP_QUIRK_RESET },
- 	/* Prolific Technology, Inc. PL2305 Parallel Port
- 	   (USB -> Parallel adapter) */
-+	{ 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices */
- 	{ 0, 0 }
- };
- 
-@@ -256,7 +260,12 @@
-   }
- 
-   g.print_fd = print_fd;
--  g.printer->opened_for_job = 1;
-+
-+ /*
-+  * Some devices need a reset after finishing a job, these devices are
-+  * marked with the USBLP_QUIRK_RESET quirk.
-+  */
-+  g.printer->reset_after_job = (g.printer->quirks & USBLP_QUIRK_RESET ? 1 : 0);
- 
-  /*
-   * If we are printing data from a print driver on stdin, ignore SIGTERM
-@@ -772,7 +781,7 @@
-     * Reset the device to clean up after the job
-     */
- 
--    if (printer->opened_for_job == 1)
-+    if (printer->reset_after_job == 1)
-     {
-       if ((errcode = libusb_reset_device(printer->handle)) < 0)
- 	fprintf(stderr,
-@@ -1288,7 +1297,7 @@
-   }
- 
-   printer->usblp_attached = 0;
--  printer->opened_for_job = 0;
-+  printer->reset_after_job = 0;
- 
-   if (verbose)
-     fputs("STATE: +connecting-to-device\n", stderr);
-@@ -1586,7 +1595,7 @@
-   for (i = 0; quirk_printers[i].vendorId; i++)
-   {
-     if (vendor == quirk_printers[i].vendorId &&
--	product == quirk_printers[i].productId)
-+	(product == 0x0000 || product == quirk_printers[i].productId))
-       return quirk_printers[i].quirks;
-   }
-   return 0;
diff --git a/extra/cvsps/call-cvs-q-option.patch b/extra/cvsps/call-cvs-q-option.patch
deleted file mode 100644
index a754b7c60..000000000
--- a/extra/cvsps/call-cvs-q-option.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 49d7a3e44b54f18b0e2762d8dbb087ad4c2f0276 Mon Sep 17 00:00:00 2001
-From: Yann Dirson <ydirson@altern.org>
-Date: Thu, 15 Jun 2006 09:48:08 +0200
-Subject: [PATCH] Call cvs with -q flag when fetching the log
-
-This gets rid of the neverending output polution cvs sends to stderr,
-which is mostly useless and has a strong potential to hide real problem
-reports
----
- cvsps.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cvsps.c b/cvsps.c
-index d94dfe0..be700ba 100644
---- a/cvsps.c
-+++ b/cvsps.c
-@@ -301,12 +301,12 @@ static void load_from_cvs()
- 	 * which is necessary to fill in the pre_rev stuff for a 
- 	 * PatchSetMember
- 	 */
--	snprintf(cmd, BUFSIZ, "cvs %s %s %s -d '%s<;%s' %s", compress_arg, norc, ltype, date_str, date_str, use_rep_buff);
-+	snprintf(cmd, BUFSIZ, "cvs %s %s -q %s -d '%s<;%s' %s", compress_arg, norc, ltype, date_str, date_str, use_rep_buff);
-     }
-     else
-     {
- 	date_str[0] = 0;
--	snprintf(cmd, BUFSIZ, "cvs %s %s %s %s", compress_arg, norc, ltype, use_rep_buff);
-+	snprintf(cmd, BUFSIZ, "cvs %s %s -q %s %s", compress_arg, norc, ltype, use_rep_buff);
-     }
-     
-     debug(DEBUG_STATUS, "******* USING CMD %s", cmd);
--- 
-1.6.5.GIT
-
diff --git a/extra/cvsps/cvsps-2.2b1-bufferoverflow.patch b/extra/cvsps/cvsps-2.2b1-bufferoverflow.patch
deleted file mode 100644
index 2a82cd4e0..000000000
--- a/extra/cvsps/cvsps-2.2b1-bufferoverflow.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- cvsps-2.2b1/cvsps.c	2010-09-07 18:13:42.760727491 +0200
-+++ cvsps-2.2b1_/cvsps.c	2010-09-07 18:05:11.083729441 +0200
-@@ -1065,17 +1065,16 @@ static CvsFile * parse_file(const char *
- {
-     CvsFile * retval;
-     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 int 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,
-@@ -1096,10 +1095,10 @@ static CvsFile * parse_file(const char *
- 
- 	    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;
-@@ -1114,16 +1113,26 @@ static CvsFile * parse_file(const char *
- 	 *
- 	 * For now just ignore such files
- 	 */
--	debug(DEBUG_APPMSG1, "WARNING: file %s doesn't match strip_path %s. ignoring", 
-+	debug(DEBUG_APPMSG1, "WARNING: file %s doesn't match strip_path %s. ignoring",
- 	      fn, strip_path);
- 	return NULL;
-     }
- 
-  ok:
--    path_ok = 1;
--
-+     /*
-+     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_APPMSG1, "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 = 1;
-+
-     memmove(fn, fn + strip_path_len, len);
-     fn[len] = 0;
- 
diff --git a/extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch b/extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch
deleted file mode 100644
index 03e4e7672..000000000
--- a/extra/cvsps/cvsps-2.2b1-dynamic-logbuf.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-# From: http://ydirson.free.fr/soft/git/cvsps.git
-
-commit 76a9c2aaa0d2957de0bc8f0c0b994abfd1645a50
-Author: David D. Kilzer <ddkilzer@kilzer.net>
-Date:   Mon Jun 20 01:04:34 2005 +0200
-
-    Dynamically allocate the log buffer to prevent warning messages
-    
-    On anoncvs.opensource.apple.com (Apple's anonymous CVS server for
-    WebKit), some very long log entries were included in CVS.  I got tired
-    of cvsps-2.1 truncating them, so I made the 'logbuff' buffer be
-    dynamically allocated.
-
-diff --git i/cache.c w/cache.c
-index 4c51cf7..01a8ed3 100644
---- i/cache.c
-+++ w/cache.c
-@@ -108,10 +108,19 @@ time_t read_cache()
-     int tag_flags = 0;
-     char branchbuff[LOG_STR_MAX] = "";
-     int branch_add = 0;
--    char logbuff[LOG_STR_MAX] = "";
-+    int logbufflen = LOG_STR_MAX + 1;
-+    char * logbuff = malloc(logbufflen);
-     time_t cache_date = -1;
-     int read_version;
- 
-+    if (logbuff == NULL)
-+    {
-+	debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in read_cache", logbufflen);
-+	exit(1);
-+    }
-+
-+    logbuff[0] = 0;
-+
-     if (!(fp = cache_open("r")))
- 	goto out;
- 
-@@ -299,8 +308,19 @@ time_t read_cache()
- 	    else
- 	    {
- 		/* Make sure we have enough in the buffer */
--		if (strlen(logbuff)+strlen(buff)<LOG_STR_MAX)
--		    strcat(logbuff, buff);
-+		int len = strlen(buff);
-+		if (strlen(logbuff) + len >= LOG_STR_MAX)
-+		{
-+		    logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX);
-+		    char * newlogbuff = realloc(logbuff, logbufflen);
-+		    if (newlogbuff == NULL)
-+		    {
-+			debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in read_cache", logbufflen);
-+			exit(1);
-+		    }
-+		    logbuff = newlogbuff;
-+		}
-+		strcat(logbuff, buff);
- 	    }
- 	    break;
- 	case CACHE_NEED_PS_MEMBERS:
-@@ -332,6 +352,7 @@ time_t read_cache()
-  out_close:
-     fclose(fp);
-  out:
-+    free(logbuff);
-     return cache_date;
- }
- 
-diff --git i/cvsps.c w/cvsps.c
-index f0e7d29..db28d7c 100644
---- i/cvsps.c
-+++ w/cvsps.c
-@@ -269,7 +269,8 @@ static void load_from_cvs()
-     PatchSetMember * psm = NULL;
-     char datebuff[26];
-     char authbuff[AUTH_STR_MAX];
--    char logbuff[LOG_STR_MAX + 1];
-+    int logbufflen = LOG_STR_MAX + 1;
-+    char * logbuff = malloc(logbufflen);
-     int loglen = 0;
-     int have_log = 0;
-     char cmd[BUFSIZ];
-@@ -277,6 +278,12 @@ static void load_from_cvs()
-     char use_rep_buff[PATH_MAX];
-     char * ltype;
- 
-+    if (logbuff == NULL)
-+    {
-+	debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in load_from_cvs", logbufflen);
-+	exit(1);
-+    }
-+
-     if (!no_rlog && !test_log_file && cvs_check_cap(CAP_HAVE_RLOG))
-     {
- 	ltype = "rlog";
-@@ -484,25 +491,22 @@ static void load_from_cvs()
- 		 */
- 		if (have_log || !is_revision_metadata(buff))
- 		{
--		    /* if the log buffer is full, that's it.  
--		     * 
--		     * Also, read lines (fgets) always have \n in them
--		     * (unless truncation happens)
--		     * which we count on.  So if truncation happens,
--		     * be careful to put a \n on.
--		     * 
--		     * Buffer has LOG_STR_MAX + 1 for room for \0 if
--		     * necessary
--		     */
--		    if (loglen < LOG_STR_MAX)
-+		    /* If the log buffer is full, try to reallocate more. */
-+		    if (loglen < logbufflen)
- 		    {
- 			int len = strlen(buff);
- 			
--			if (len >= LOG_STR_MAX - loglen)
-+			if (len >= logbufflen - loglen)
- 			{
--			    debug(DEBUG_APPMSG1, "WARNING: maximum log length exceeded, truncating log");
--			    len = LOG_STR_MAX - loglen;
--			    buff[len - 1] = '\n';
-+			    debug(DEBUG_STATUS, "reallocating logbufflen to %d bytes for file %s", logbufflen, file->filename);
-+			    logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX);
-+			    char * newlogbuff = realloc(logbuff, logbufflen);
-+			    if (newlogbuff == NULL)
-+			    {
-+				debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in load_from_cvs", logbufflen);
-+				exit(1);
-+			    }
-+			    logbuff = newlogbuff;
- 			}
- 
- 			debug(DEBUG_STATUS, "appending %s to log", buff);
diff --git a/extra/cvsps/cvsps-2.2b1-man.patch b/extra/cvsps/cvsps-2.2b1-man.patch
deleted file mode 100644
index 3e6816fd5..000000000
--- a/extra/cvsps/cvsps-2.2b1-man.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up cvsps-2.2b1/cvsps.1~ cvsps-2.2b1/cvsps.1
---- cvsps-2.2b1/cvsps.1~	2008-04-02 04:18:44.000000000 +0300
-+++ cvsps-2.2b1/cvsps.1	2010-05-18 21:10:39.000000000 +0300
-@@ -11,7 +11,7 @@ to a collection of files, and all commit
- single 'cvs commit' command).  This information is valuable to seeing the
- big picture of the evolution of a cvs project.  While cvs tracks revision
- information, it is often difficult to see what changes were committed
--'atomically' to the repository.
-+\'atomically' to the repository.
- .SH OPTIONS
- .TP
- .B \-h
-@@ -83,7 +83,7 @@ some hacks which are not generally appli
- disable the use of rlog internally.  Note: rlog is
- required for stable PatchSet numbering.  Use with care.
- .TP
--.B \-\-diffs\-opts <option string>
-+.B \-\-diff\-opts <option string>
- send a custom set of options to diff, for example to increase
- the number of context lines, or change the diff format.
- .TP
-@@ -103,6 +103,7 @@ Override the setting of CVSROOT (overrid
- .TP
- .B \-q
- Be quiet about warnings.
-+.TP
- .B \-A
- Show ancestor branch when a new branch is found.
- .TP
diff --git a/extra/cvsps/cvsps-buffer-overflow.patch b/extra/cvsps/cvsps-buffer-overflow.patch
deleted file mode 100644
index e34fd6ee3..000000000
--- a/extra/cvsps/cvsps-buffer-overflow.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-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/cvsps/seperate-CPPFLAGS.patch b/extra/cvsps/seperate-CPPFLAGS.patch
deleted file mode 100644
index a29923b49..000000000
--- a/extra/cvsps/seperate-CPPFLAGS.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5991e8b0acf1dbe3487c1f246a1d215b346a61f0 Mon Sep 17 00:00:00 2001
-From: Yann Dirson <ydirson@altern.org>
-Date: Sat, 17 Jun 2006 00:03:41 +0200
-Subject: [PATCH] Separate CPPFLAGS from CFLAGS
-
-This allows to set CGLAGS on command-line without interfering with
-preprocessor options
----
- Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 2e34ec6..05ca856 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,8 +1,8 @@
- MAJOR=2
- MINOR=1
- CC?=gcc
--CFLAGS?=-g -O2 -Wall 
--CFLAGS+=-I. -DVERSION=\"$(MAJOR).$(MINOR)\"
-+CFLAGS?=-g -O2 -Wall
-+CPPFLAGS?=-I. -DVERSION=\"$(MAJOR).$(MINOR)\"
- prefix?=/usr/local
- OBJS=\
- 	cbtcommon/debug.o\
--- 
-1.6.5.GIT
-
diff --git a/extra/cvsps/use-INADDR_NONE-define.patch b/extra/cvsps/use-INADDR_NONE-define.patch
deleted file mode 100644
index a1a529187..000000000
--- a/extra/cvsps/use-INADDR_NONE-define.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c498733b4283b3987bdca6949a5e304244b64cfc Mon Sep 17 00:00:00 2001
-From: Pavel Roskin <proski@gnu.org>
-Date: Tue, 13 Jun 2006 00:32:33 -0400
-Subject: [PATCH] Use INADDR_NONE instead of -1 to check inet_addr() result
-
-INADDR_NONE is not equal to -1 on 64-bit systems.
-
-Signed-off-by: Pavel Roskin <proski@gnu.org>
----
- cbtcommon/tcpsocket.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/cbtcommon/tcpsocket.c b/cbtcommon/tcpsocket.c
-index a174007..f31060e 100644
---- a/cbtcommon/tcpsocket.c
-+++ b/cbtcommon/tcpsocket.c
-@@ -198,7 +198,7 @@ convert_address(long *dest, const char *addr_str)
-     memcpy(dest, &ip.s_addr, sizeof(ip.s_addr));
-   }
- #else
--  if ( (*dest = inet_addr(addr_str)) != -1)
-+  if ( (*dest = inet_addr(addr_str)) != INADDR_NONE)
-   {
-     /* nothing */
-   }
--- 
-1.6.5.GIT
-
diff --git a/extra/cvsps/use-__linux__-define.patch b/extra/cvsps/use-__linux__-define.patch
deleted file mode 100644
index 132629593..000000000
--- a/extra/cvsps/use-__linux__-define.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4598349e81068d4af9a893c6433958cf9b4fa835 Mon Sep 17 00:00:00 2001
-From: Pavel Roskin <proski@gnu.org>
-Date: Tue, 13 Jun 2006 00:32:31 -0400
-Subject: [PATCH] Use __linux__ conditional, not LINUX.
-
-__linux__ is defined automatically, LINUX is not.
-
-Signed-off-by: Pavel Roskin <proski@gnu.org>
----
- cbtcommon/tcpsocket.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cbtcommon/tcpsocket.c b/cbtcommon/tcpsocket.c
-index 27cc13a..a174007 100644
---- a/cbtcommon/tcpsocket.c
-+++ b/cbtcommon/tcpsocket.c
-@@ -185,14 +185,14 @@ tcp_connect(int sockfd, const char *rem_addr, unsigned short port)
- int
- convert_address(long *dest, const char *addr_str)
- {
--#ifdef LINUX
-+#ifdef __linux__
-   struct in_addr ip;
- #endif
-   int retval = 0;
-   char errstr[256];
-   
-   /* first try converting "numbers and dots" notation */
--#ifdef LINUX
-+#ifdef __linux__
-   if ( inet_aton(addr_str, &ip) )
-   {
-     memcpy(dest, &ip.s_addr, sizeof(ip.s_addr));
--- 
-1.6.5.GIT
-
diff --git a/extra/cvsps/use-offsetof-macro.patch b/extra/cvsps/use-offsetof-macro.patch
deleted file mode 100644
index ff2961f07..000000000
--- a/extra/cvsps/use-offsetof-macro.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 4fad63b82746ea571edc2ec1100ad3208cf5af08 Mon Sep 17 00:00:00 2001
-From: Eric Hopper <hopper@omnifarious.org>
-Date: Fri, 29 Jun 2007 01:30:09 -0700
-Subject: [PATCH] Use offsetof macro instead of unportable pointer arithmetic.
-
----
- cbtcommon/list.h |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/cbtcommon/list.h b/cbtcommon/list.h
-index 4ee245d..cf4b3ed 100644
---- a/cbtcommon/list.h
-+++ b/cbtcommon/list.h
-@@ -23,6 +23,7 @@
-  */
- 
- #include "inline.h"
-+#include <stddef.h>
- 
- struct list_head {
-         struct list_head *next, *prev;
-@@ -107,6 +108,6 @@ static INLINE void list_splice(struct list_head *list, struct list_head *head)
- }
- 
- #define list_entry(ptr, type, member) \
--        ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
-+   ((type *)((char *)(ptr)-offsetof(type, member)))
- 
- #endif /* _COMMON_LIST_H */
--- 
-1.6.5.GIT
-
diff --git a/extra/cx_freeze/FreezePython.sh b/extra/cx_freeze/FreezePython.sh
deleted file mode 100644
index 5bba21cac..000000000
--- a/extra/cx_freeze/FreezePython.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd /usr/share/cx-freeze
-./FreezePython "$@"
diff --git a/extra/cx_freeze/PKGBUILD b/extra/cx_freeze/PKGBUILD
deleted file mode 100644
index 538710a6a..000000000
--- a/extra/cx_freeze/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 151178 2012-02-25 07:00:37Z pierre $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Roberto Alsina <ralsina@kde.org>
-
-pkgname=cx_freeze
-_tarname=cx_Freeze
-pkgver=4.2.3
-pkgrel=2.1
-pkgdesc="A set of utilities for freezing Python scripts into executables"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.python.net/crew/atuining/cx_Freeze/"
-license=('custom')
-depends=('python2')
-provides=('cxfreeze')
-source=("http://downloads.sourceforge.net/cx-freeze/$_tarname-$pkgver.tar.gz"
-        'FreezePython.sh')
-md5sums=('a524cfd23de5d37e0ec9400ba1ccd6ad'
-         '5cc60d1644eba12a57c22cc1348a4afd')
-
-package() {
-  cd "$srcdir/$_tarname-$pkgver"
-
-  python2 setup.py install --root "$pkgdir/" --optimize 1
-
-  install -d "$pkgdir"/usr/share/cx-freeze/{bases,initscripts}
-  install -m755 source/bases/* "$pkgdir/usr/share/cx-freeze/bases"
-  install -m644 initscripts/* "$pkgdir/usr/share/cx-freeze/initscripts"
-  install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/cx_freeze/COPYING"
-}
diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index 5cd531c36..e35c47f05 100644
--- a/extra/cyrus-sasl/PKGBUILD
+++ b/extra/cyrus-sasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168631 2012-10-13 16:37:23Z thomas $
+# $Id: PKGBUILD 180680 2013-03-25 19:15:31Z bpiotrowski $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 # This package spans multiple repositories. 
@@ -8,13 +8,13 @@ pkgbase=('cyrus-sasl')
 pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 #pkgname=libsasl
 pkgver=2.1.23
-pkgrel=11
+pkgrel=12
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
 options=('!makeflags' '!libtool')
-makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')
+makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl')
 source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
         cyrus-sasl-2.1.19-checkpw.c.patch
         cyrus-sasl-2.1.22-crypt.patch
@@ -196,7 +196,7 @@ package_cyrus-sasl-ldap() {
 
 package_cyrus-sasl-sql() {
   pkgdesc="SQL auxprop module for Cyrus SASL"
-  depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmysqlclient')
+  depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient')
   replaces=('cyrus-sasl-plugins')
 
   cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
diff --git a/extra/dbus-c++/PKGBUILD b/extra/dbus-c++/PKGBUILD
index 70df15dba..4ce19ebfa 100644
--- a/extra/dbus-c++/PKGBUILD
+++ b/extra/dbus-c++/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=dbus-c++
 _pkgname=lib$pkgname
 pkgver=0.9.0
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A C++ API for D-BUS"
 url="http://sourceforge.net/projects/dbus-cplusplus/"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/dbus-glib/PKGBUILD b/extra/dbus-glib/PKGBUILD
index 6cb39ec99..54f4b7bda 100644
--- a/extra/dbus-glib/PKGBUILD
+++ b/extra/dbus-glib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 162401 2012-06-26 20:15:42Z andyrtr $
+# $Id: PKGBUILD 179955 2013-03-13 11:59:13Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=dbus-glib
-pkgver=0.100
+pkgver=0.100.2
 pkgrel=1
 pkgdesc="GLib bindings for DBUS"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ depends=('dbus-core' 'glib2')
 makedepends=('pkgconfig')
 options=('!libtool' '!emptydirs')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d33959a9c0c6a158f5ac6d640316e89e')
+md5sums=('ad0920c7e3aad669163bb59171cf138e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/dcfldd/PKGBUILD b/extra/dcfldd/PKGBUILD
deleted file mode 100644
index bf1732979..000000000
--- a/extra/dcfldd/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 137724 2011-09-10 14:16:18Z pierre $
-# Contributor: Paul Mattal <pjmattal@elys.com>
-# Maintainer: Paul Mattal <pjmattal@elys.com>
-
-pkgname=dcfldd
-pkgver=1.3.4.1
-pkgrel=3.1
-pkgdesc="DCFL (DoD Computer Forensics Lab) dd replacement with hashing"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://dcfldd.sourceforge.net/"
-license=('GPL')
-depends=('glibc')
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver%.*}-${pkgver##*.}.tar.gz")
-md5sums=('952026c872f11b53ce0ec6681a3eef0a')
-sha1sums=('fb1c55f107a6af5ef8703a44d33476e508815913')
-
-build() {
-  cd "$srcdir/$pkgname-${pkgver%.*}-${pkgver##*.}"
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-${pkgver%.*}-${pkgver##*.}"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD
index 576dc22b9..58bcbbabf 100644
--- a/extra/dconf/PKGBUILD
+++ b/extra/dconf/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 170097 2012-11-01 16:50:36Z heftig $
+# $Id: PKGBUILD 183552 2013-04-23 04:49:12Z eric $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=dconf
-pkgver=0.14.1
+pkgver=0.16.0
 pkgrel=1
 pkgdesc="A low-level configuration system."
 arch=(i686 x86_64 'mips64el')
 url="http://live.gnome.org/dconf"
 license=('LGPL2.1')
 depends=('glib2' 'gtk-update-icon-cache')
-makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl')
+makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl' 'python' 'python2')
 optdepends=('gtk3: for dconf-editor')
 install=dconf.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('59c58c5eafa0ebd616287d078f4441d5342870a44634445d324e88fc0287f0b8')
+sha256sums=('192d682b8e160e22506f3fac6847444013c7cdbef188d937a6ae2b357f9134bb')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD
index 8b7b6cbc2..ae77018af 100644
--- a/extra/dcraw/PKGBUILD
+++ b/extra/dcraw/PKGBUILD
@@ -1,47 +1,41 @@
-# $Id: PKGBUILD 167554 2012-10-02 18:35:41Z eric $
+# $Id: PKGBUILD 177853 2013-02-10 10:42:13Z bisson $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=dcraw
-pkgver=9.16
+pkgver=9.17
 pkgrel=1
-pkgdesc="A command line based converter for digicams raw output"
+pkgdesc='Decodes any raw image from any digital camera'
+url='http://www.cybercom.net/~dcoffin/dcraw/'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.cybercom.net/~dcoffin/dcraw/"
 license=('custom')
 depends=('lcms' 'jasper')
-source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('fb73ca3ccd703bd522a759e0366814f0a3411902')
+source=("http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('11a0b20b8f46950dd94e6c1ada313807049a6b27')
 
 build() {
-  cd "${srcdir}/${pkgname}"
-  gcc ${CFLAGS} -O3 -o dcraw dcraw.c \
-    -Wall -Wno-unused-result -Wno-array-bounds \
-    -lm -ljasper -ljpeg -llcms -DLOCALEDIR=\"/usr/share/locale/\"
+	cd "${srcdir}/${pkgname}"
+	gcc ${CFLAGS} ${LDFLAGS} \
+		-o dcraw dcraw.c \
+		-lm -ljasper -ljpeg -llcms \
+		-DLOCALEDIR=\"/usr/share/locale/\"
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
-  install -Dm755 dcraw "${pkgdir}"/usr/bin/dcraw
-  install -Dm644 dcraw.1 "${pkgdir}"/usr/share/man/man1/dcraw.1
-  
-  for langchar in \
-    fr.latin1 it.latin1 de.latin1 pt.latin1 es.latin1 nl.latin1 sv.latin1 \
-    ca.latin1 da.latin1 cs.latin2 hu.latin2 pl.latin2 eo.latin3 ru.koi8-r \
-    zh_TW.big5 zh_CN.gb2312
-  do
-    lang=$(echo $langchar | cut -d. -f1)
-    char=$(echo $langchar | cut -d. -f2-)
-    if [ -f dcraw_${lang}.1 ]; then
-      mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang/man1
-      iconv -f utf-8 -t $char dcraw_$lang.1 > "${pkgdir}"/usr/share/man/$lang/man1/dcraw.1
-      mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1
-      cp dcraw_$lang.1 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1/dcraw.1
-    fi
-    mkdir -p -m 755 "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES
-    msgfmt -o "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES/dcraw.mo dcraw_$lang.po
-  done
+	cd "${srcdir}/${pkgname}"
 
-  install -d "${pkgdir}"/usr/share/licenses/${pkgname}
-  head -25 dcraw.c > "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
+	install -Dm755 dcraw "${pkgdir}"/usr/bin/dcraw
+	install -Dm644 dcraw.1 "${pkgdir}"/usr/share/man/man1/dcraw.1
+	
+	for i in dcraw_*.1; do j=${i#dcraw_}; k=${j%.1}
+		install -Dm644 $i "${pkgdir}"/usr/share/man/$k/man1/dcraw.1
+	done
+
+	for i in dcraw_*.po; do j=${i#dcraw_}; k=${j%.po}
+		install -d "${pkgdir}"/usr/share/locale/$k/LC_MESSAGES
+		msgfmt -o "${pkgdir}"/usr/share/locale/$k/LC_MESSAGES/dcraw.mo $i
+	done
+
+	install -d "${pkgdir}"/usr/share/licenses/${pkgname}
+	head -25 dcraw.c > "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
diff --git a/extra/dcraw/dcraw.install b/extra/dcraw/dcraw.install
deleted file mode 100644
index 26359645a..000000000
--- a/extra/dcraw/dcraw.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  cat << EOF
-
-NOTE for dcraw:
-----
-  ==> dcraw provides the simple commandline tools for raw conversion. If you
-  ==> are looking for a more sophisticated way consider gimp-ufraw, which
-  ==> provides a gimp-plugin and a standalone application that can even convert
-  ==> to 16-bit tiff files (which you can use in cinepaint eg.) So please do a
-  ==> 'pacman -S gimp-ufraw' to get it.
-
-EOF
-}
diff --git a/extra/dcraw/license.txt b/extra/dcraw/license.txt
deleted file mode 100644
index 5803cf601..000000000
--- a/extra/dcraw/license.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-This is a command-line ANSI C program to convert raw photos from
-any digital camera on any computer running any operating system.
-
-No license is required to download and use dcraw.c.  However,
-to lawfully redistribute this code, you must either (a) include
-full source code* for all executable files containing RESTRICTED
-functions, (b) remove all RESTRICTED functions, re-implement them,
-or copy them from an earlier, unrestricted Revision of dcraw.c,
-or (c) purchase a license from the author.
-
-The functions that process Foveon images have been RESTRICTED
-since Revision 1.237.  All other code remains free for all uses.
-
-*If you have not modified dcraw.c in any way, a link to my
-homepage qualifies as "full source code".
-
diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD
index 992d38e9b..e7d7035a2 100644
--- a/extra/devhelp/PKGBUILD
+++ b/extra/devhelp/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 170977 2012-11-14 07:19:21Z heftig $
+# $Id: PKGBUILD 183344 2013-04-21 22:08:46Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgname=devhelp
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="API documentation browser for GNOME"
 arch=(i686 x86_64 'mips64el')
-license=('GPL')
+license=(GPL)
 url="http://live.gnome.org/devhelp/"
-depends=('gconf' 'webkitgtk3' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool' 'python2')
+depends=(webkitgtk3 hicolor-icon-theme)
+makedepends=(pkgconfig intltool python)
 options=('!libtool' '!emptydirs')
 install=devhelp.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('71c6933422bf876745fc10276a2b2ee0f8c4c4ddfe034b3f6380507725fd4e63')
+sha256sums=('4548fb0b17d4716851cf044294a8ee59e72c8de97e793842faf510a6dbfd3c96')
 
 build() {
   cd $pkgname-$pkgver
@@ -27,9 +27,5 @@ build() {
 
 package() {
   cd $pkgname-$pkgver
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain devhelp ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/devhelp/devhelp.install b/extra/devhelp/devhelp.install
index 4db5f6e5c..03f95852c 100644
--- a/extra/devhelp/devhelp.install
+++ b/extra/devhelp/devhelp.install
@@ -1,22 +1,18 @@
-pkgname=devhelp
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 pre_upgrade() {
-  pre_remove
+  if (( $(vercmp $2 3.8.0) < 0 )); then
+    gconfpkg --uninstall devhelp
+  fi
 }
 
 post_upgrade() {
   post_install
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
diff --git a/extra/devilspie/PKGBUILD b/extra/devilspie/PKGBUILD
deleted file mode 100644
index f6b10f601..000000000
--- a/extra/devilspie/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 150942 2012-02-24 09:37:23Z pierre $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Travis Willard <travisw@wmpub.ca> 
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=devilspie
-pkgver=0.22
-pkgrel=5.1
-pkgdesc="x11 window matching utility"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.burtonini.com/blog/computers/devilspie"
-license=('GPL')
-depends=('libwnck')
-makedepends=('pkgconfig' 'intltool' 'gnome-common')
-source=("http://www.burtonini.com/computing/$pkgname-$pkgver.tar.gz")
-md5sums=('4190e12f99ab92c0427e457d9fbfe231')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i -e '/-DG.*_DISABLE_DEPRECATED/d' src/Makefile.am
-  export LIBS="-lX11"
-  ./autogen.sh
-
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr install
-  # Make and install blank config
-  mkdir -p $pkgdir/etc/devilspie
-  echo '(debug)' > $pkgdir/etc/devilspie/example.ds
-}
diff --git a/extra/dhcp/ChangeLog b/extra/dhcp/ChangeLog
deleted file mode 100644
index 9cffaa9d0..000000000
--- a/extra/dhcp/ChangeLog
+++ /dev/null
@@ -1,11 +0,0 @@
-
-2010-07-16  kevin  <kevin@archlinux.org>
-	* dhcp 4.2.0-1
-
-2009-07-19  kevin  <kevin@archlinux.org>
-	* dhcp 4.1.0.p1-1
-	* Adopted RedHat patch to fix bug where dhcpd won't start if ipv6 module
-	  is not loaded.  Fixes FS#12792.
-	* Added /etc/conf.d/dhcp feature contributed by Fabiano Furtado Pessoa
-	  Coelho <fusca14@gmail.com>	
-
diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD
index 849c303cb..13140a531 100644
--- a/extra/dhcp/PKGBUILD
+++ b/extra/dhcp/PKGBUILD
@@ -1,31 +1,30 @@
-# $Id: PKGBUILD 170145 2012-11-03 17:35:36Z heftig $
+# $Id: PKGBUILD 180410 2013-03-21 12:04:16Z jgc $
 # Maintainer: Daniel Isenmann <daniel @archlinux.org>
 
 pkgbase=dhcp
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.4.2
-_pkgver=4.2.4-P2
-
+pkgver=4.2.5
+_pkgver=4.2.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
-makedepends=('bash' 'iproute2' 'net-tools')
+makedepends=('bash' 'iproute2')
 source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
         dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service
-        dhcp-4.1.1-missing-ipv6-not-fatal.patch
-        dhclient-script-pathFixes.patch)
-md5sums=('fe36056f2d274fa4b82a5422f192e65f'
-         '1f20126efd33c34d52a4148db780921f'
+        dhcp-4.2.5-client_script-1.patch
+        dhcp-4.2.5-missing_ipv6-1.patch)
+md5sums=('6489e919ac093d17249270ee9be1020e'
+         '022bc7038b3061cfb31da4736e7ab8a8'
          'c49b1497837ba56c54e401a66e1bab9b'
          '12c2f3ae47ed23eb698eb7f1bfd80f20'
          '8f357e46e1efcbb746f38737a3f977a2'
          '439ee2f145a1e86dd644cb94a854f8e7'
          '588aa85b6fe228c45623185a58d11992'
-         'fd64aeb4f399dcc41ea43089a3811094'
-         '541b415a25a169eaf64b681405f79a80')
+         '9e4dcf90beec15bfcb6631809cdcc780'
+         'da655f02f1cf4d95b4708e84e69edbc8')
 
 build() {
   cd "${srcdir}/${pkgbase}-${_pkgver}"
@@ -34,7 +33,9 @@ build() {
   sed '/^CFLAGS="$CFLAGS/ s/INGS"/INGS -D_GNU_SOURCE"/' -i configure
 
   # Make not having ipv6 non-fatal.
-  patch -Np0 -i "${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch"
+  patch -Np1 -i ../dhcp-4.2.5-missing_ipv6-1.patch
+  # Make dhcp client script suck less.
+  patch -Np1 -i ../dhcp-4.2.5-client_script-1.patch
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
@@ -43,13 +44,10 @@ build() {
       --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases
 
   make
-
-  patch -i "${srcdir}/dhclient-script-pathFixes.patch" client/scripts/linux
 }
 
 package_dhcp(){
   pkgdesc="A DHCP server, client, and relay agent"
-  depends=('openssl>=0.9.8a')
   backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp')
   install=dhcp.install
   
@@ -64,6 +62,9 @@ package_dhcp(){
   install -D -m644 "${srcdir}/dhcpd4.service" "${pkgdir}/usr/lib/systemd/system/dhcpd4.service"
   install -D -m644 "${srcdir}/dhcpd6.service" "${pkgdir}/usr/lib/systemd/system/dhcpd6.service"
 
+  # move back to config. This file is in backup array, so pacman will not overwrite a changed config.
+  mv "${pkgdir}/etc/dhcpd.conf.example" "${pkgdir}/etc/dhcpd.conf"
+
   # Remove dhclient
   make -C client DESTDIR="${pkgdir}" uninstall
   
@@ -73,13 +74,14 @@ package_dhcp(){
 
 package_dhclient(){
   pkgdesc="A standalone DHCP client from the dhcp package"
-  depends=('bash' 'iproute2' 'net-tools')
+  depends=('bash' 'iproute2')
+  provides=('dhcp-client')
 
   cd "${srcdir}/${pkgbase}-${_pkgver}"
   make -C client DESTDIR="${pkgdir}" install
 
-  # move dhclient.conf to dhclient.conf.example
-  mv "${pkgdir}"/etc/dhclient.conf{,.example}
+  install -m755 -d "${pkgdir}/usr/share/dhclient"
+  mv "${pkgdir}/etc/dhclient.conf.example" "${pkgdir}/usr/share/dhclient/"
   
   install -d "${pkgdir}/var/lib/dhclient"
 
diff --git a/extra/dhcp/dhclient-script-pathFixes.patch b/extra/dhcp/dhclient-script-pathFixes.patch
deleted file mode 100644
index a4143ddde..000000000
--- a/extra/dhcp/dhclient-script-pathFixes.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- linux	2011-05-18 20:01:54.000000000 +0000
-+++ linux_new	2011-12-21 18:45:41.487171012 +0000
-@@ -23,7 +23,7 @@
- # of the $1 in its args.
- 
- # 'ip' just looks too weird.  /sbin/ip looks less weird.
--ip=/sbin/ip
-+ip=/usr/sbin/ip
- 
- make_resolv_conf() {
-   if [ x"$new_domain_name_servers" != x ]; then
-@@ -122,9 +122,9 @@
- if [ x$reason = xPREINIT ]; then
-   if [ x$alias_ip_address != x ]; then
-     # Bring down alias interface. Its routes will disappear too.
--    ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0- inet 0
-   fi
--  ifconfig $interface 0 up
-+  /sbin/ifconfig $interface 0 up
- 
-   # We need to give the kernel some time to get the interface up.
-   sleep 1
-@@ -151,25 +151,25 @@
-   if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
- 		[ x$alias_ip_address != x$old_ip_address ]; then
-     # Possible new alias. Remove old alias.
--    ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0- inet 0
-   fi
-   if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
-     # IP address changed. Bringing down the interface will delete all routes,
-     # and clear the ARP cache.
--    ifconfig $interface inet 0 down
-+    /sbin/ifconfig $interface inet 0 down
- 
-   fi
-   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
-      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
- 
--    ifconfig $interface inet $new_ip_address $new_subnet_arg \
-+    /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \
- 					$new_broadcast_arg $mtu_arg
-     # Add a network route to the computed network address.
-     for router in $new_routers; do
-       if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
--	route add -host $router dev $interface
-+	/sbin/route add -host $router dev $interface
-       fi
--      route add default gw $router $metric_arg dev $interface
-+      /sbin/route add default gw $router $metric_arg dev $interface
-     done
-   else
-     # we haven't changed the address, have we changed other options           
-@@ -177,21 +177,21 @@
-     if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then
-       # if we've changed routers delete the old and add the new.
-       for router in $old_routers; do
--        route del default gw $router
-+        /sbin/route del default gw $router
-       done
-       for router in $new_routers; do
-         if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
--	  route add -host $router dev $interface
-+	  /sbin/route add -host $router dev $interface
- 	fi
--	route add default gw $router $metric_arg dev $interface
-+	/sbin/route add default gw $router $metric_arg dev $interface
-       done
-     fi
-   fi
-   if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
-    then
--    ifconfig $interface:0- inet 0
--    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
--    route add -host $alias_ip_address $interface:0
-+    /sbin/ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-+    /sbin/route add -host $alias_ip_address $interface:0
-   fi
-   make_resolv_conf
-   exit_with_hooks 0
-@@ -201,42 +201,42 @@
-    || [ x$reason = xSTOP ]; then
-   if [ x$alias_ip_address != x ]; then
-     # Turn off alias interface.
--    ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0- inet 0
-   fi
-   if [ x$old_ip_address != x ]; then
-     # Shut down interface, which will delete routes and clear arp cache.
--    ifconfig $interface inet 0 down
-+    /sbin/ifconfig $interface inet 0 down
-   fi
-   if [ x$alias_ip_address != x ]; then
--    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
--    route add -host $alias_ip_address $interface:0
-+    /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-+    /sbin/route add -host $alias_ip_address $interface:0
-   fi
-   exit_with_hooks 0
- fi
- 
- if [ x$reason = xTIMEOUT ]; then
-   if [ x$alias_ip_address != x ]; then
--    ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0- inet 0
-   fi
--  ifconfig $interface inet $new_ip_address $new_subnet_arg \
-+  /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \
- 					$new_broadcast_arg $mtu_arg
-   set $new_routers
-   if ping -q -c 1 $1; then
-     if [ x$new_ip_address != x$alias_ip_address ] && \
- 			[ x$alias_ip_address != x ]; then
--      ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
--      route add -host $alias_ip_address dev $interface:0
-+      /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-+      /sbin/route add -host $alias_ip_address dev $interface:0
-     fi
-     for router in $new_routers; do
-       if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
--	route add -host $router dev $interface
-+	/sbin/route add -host $router dev $interface
-       fi
--      route add default gw $router $metric_arg dev $interface
-+      /sbin/route add default gw $router $metric_arg dev $interface
-     done
-     make_resolv_conf
-     exit_with_hooks 0
-   fi
--  ifconfig $interface inet 0 down
-+  /sbin/ifconfig $interface inet 0 down
-   exit_with_hooks 1
- fi
- 
diff --git a/extra/dhcp/dhcp-4.2.5-client_script-1.patch b/extra/dhcp/dhcp-4.2.5-client_script-1.patch
new file mode 100644
index 000000000..e96be1c4c
--- /dev/null
+++ b/extra/dhcp/dhcp-4.2.5-client_script-1.patch
@@ -0,0 +1,648 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2012-08-14
+Initial Package Version: 4.2.4-P1
+Upstream Status:         Rejected by upstream.
+Origin:                  Based on Debian's dhclient-script, but modified for BLFS
+Description:             This patch replaces original linux script for dhcp client with
+                         better one which is based on Debian's dhclient-script, but modified
+                         to be used on LFS/BLFS. It also removes net-tools dependency.
+                         Modified for archlinux: restored exit/enter hooks path.
+
+--- dhcp.orig/client/scripts/linux	2012-07-13 08:10:30.000000000 +0200
++++ dhcp/client/scripts/linux	2012-08-14 21:00:29.786634932 +0200
+@@ -1,318 +1,346 @@
+ #!/bin/bash
++
+ # dhclient-script for Linux. Dan Halbert, March, 1997.
+ # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
+-# No guarantees about this. I'm a novice at the details of Linux
+-# networking.
+-
+-# Notes:
+-
+-# 0. This script is based on the netbsd script supplied with dhcp-970306.
+-
+-# 1. ifconfig down apparently deletes all relevant routes and flushes
+-# the arp cache, so this doesn't need to be done explicitly.
+-
+-# 2. The alias address handling here has not been tested AT ALL.
+-# I'm just going by the doc of modern Linux ip aliasing, which uses
+-# notations like eth0:0, eth0:1, for each alias.
++# Modified for Debian.  Matt Zimmerman and Eloy Paris, December 2003
++# Modified to remove useless tests for antiquated kernel versions that
++# this doesn't even work with anyway, and introduces a dependency on /usr
++# being mounted, which causes cosmetic errors on hosts that NFS mount /usr
++# Andrew Pollock, February 2005
++# Modified to work on point-to-point links. Andrew Pollock, June 2005
++# Modified to support passing the parameters called with to the hooks. Andrew Pollock, November 2005
++# Modified to use the script with Linux From Scratch by Armin K., May 2012
+ 
+-# 3. I have to calculate the network address, and calculate the broadcast
+-# address if it is not supplied. This might be much more easily done
+-# by the dhclient C code, and passed on.
+-
+-# 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious
+-# of the $1 in its args.
+-
+-# 'ip' just looks too weird.  /sbin/ip looks less weird.
+-ip=/sbin/ip
++# The alias handling in here probably still sucks. -mdz
+ 
++# update /etc/resolv.conf based on received values
+ make_resolv_conf() {
+-  if [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+-    chmod 644 /etc/resolv.conf.dhclient
+-    if [ x"$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
+-    elif [ x"$new_domain_name" != x ]; then
+-      # Note that the DHCP 'Domain Name Option' is really just a domain
+-      # name, and that this practice of using the domain name option as
+-      # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
+-    fi
+-    for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
+-    done
+-
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
+-  elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+-    cat /dev/null > /etc/resolv.conf.dhclient6
+-    chmod 644 /etc/resolv.conf.dhclient6
++    local new_resolv_conf
+ 
+-    if [ "x${new_dhcp6_domain_search}" != x ] ; then
+-      echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++    # DHCPv4
++    if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] ||
++       [ -n "$new_domain_name_servers" ]; then
++        new_resolv_conf=/etc/resolv.conf.dhclient-new
++        rm -f $new_resolv_conf
++
++        if [ -n "$new_domain_name" ]; then
++            echo domain ${new_domain_name%% *} >>$new_resolv_conf
++        fi
++
++        if [ -n "$new_domain_search" ]; then
++            if [ -n "$new_domain_name" ]; then
++                domain_in_search_list=""
++                for domain in $new_domain_search; do
++                    if [ "$domain" = "${new_domain_name}" ] ||
++                       [ "$domain" = "${new_domain_name}." ]; then
++                        domain_in_search_list="Yes"
++                    fi
++                done
++                if [ -z "$domain_in_search_list" ]; then
++                    new_domain_search="$new_domain_name $new_domain_search"
++                fi
++            fi
++            echo "search ${new_domain_search}" >> $new_resolv_conf
++        elif [ -n "$new_domain_name" ]; then
++            echo "search ${new_domain_name}" >> $new_resolv_conf
++        fi
++
++        if [ -n "$new_domain_name_servers" ]; then
++            for nameserver in $new_domain_name_servers; do
++                echo nameserver $nameserver >>$new_resolv_conf
++            done
++        else # keep 'old' nameservers
++            sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p /etc/resolv.conf >>$new_resolv_conf
++        fi
++
++        chown --reference=/etc/resolv.conf $new_resolv_conf
++        chmod --reference=/etc/resolv.conf $new_resolv_conf
++        mv -f $new_resolv_conf /etc/resolv.conf
++    # DHCPv6
++    elif [ -n "$new_dhcp6_domain_search" ] || [ -n "$new_dhcp6_name_servers" ]; then
++        new_resolv_conf=/etc/resolv.conf.dhclient-new
++        rm -f $new_resolv_conf
++
++        if [ -n "$new_dhcp6_domain_search" ]; then
++            echo "search ${new_dhcp6_domain_search}" >> $new_resolv_conf
++        fi
++
++        if [ -n "$new_dhcp6_name_servers" ]; then
++            for nameserver in $new_dhcp6_name_servers; do
++                # append %interface to link-local-address nameservers
++                if [ "${nameserver##fe80::}" != "$nameserver" ] ||
++                   [ "${nameserver##FE80::}" != "$nameserver" ]; then
++                    nameserver="${nameserver}%${interface}"
++                fi
++                echo nameserver $nameserver >>$new_resolv_conf
++            done
++        else # keep 'old' nameservers
++            sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p /etc/resolv.conf >>$new_resolv_conf
++        fi
++
++        chown --reference=/etc/resolv.conf $new_resolv_conf
++        chmod --reference=/etc/resolv.conf $new_resolv_conf
++        mv -f $new_resolv_conf /etc/resolv.conf
+     fi
+-    shopt -s nocasematch 
+-    for nameserver in ${new_dhcp6_name_servers} ; do
+-      # If the nameserver has a link-local address
+-      # add a <zone_id> (interface name) to it.
+-      if  [[ "$nameserver" =~ ^fe80:: ]]
+-      then
+-	zone_id="%$interface"
+-      else
+-	zone_id=
+-      fi
+-      echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
+-    done
+-    shopt -u nocasematch 
++}
+ 
+-    mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
+-  fi
++# set host name
++set_hostname() {
++    local current_hostname
++
++    if [ -n "$new_host_name" ]; then
++        current_hostname=$(hostname)
++
++        # current host name is empty, '(none)' or 'localhost' or differs from new one from DHCP
++        if [ -z "$current_hostname" ] ||
++           [ "$current_hostname" = '(none)' ] ||
++           [ "$current_hostname" = 'localhost' ] ||
++           [ "$current_hostname" = "$old_host_name" ]; then
++           if [ "$new_host_name" != "$old_host_name" ]; then
++               hostname "$new_host_name"
++           fi
++        fi
++    fi
+ }
+ 
+-# Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
++# Must be used on exit. Invokes the local dhcp client exit hooks, if any.
+ exit_with_hooks() {
+   exit_status=$1
+-  if [ -f /etc/dhclient-exit-hooks ]; then
+-    . /etc/dhclient-exit-hooks
++  if [ -f /etc/dhclient-exit-hooks ]; then
++    . /etc/dhclient-exit-hooks
+   fi
+-# probably should do something with exit status of the local script
+   exit $exit_status
+ }
+ 
++# The 576 MTU is only used for X.25 and dialup connections
++# where the admin wants low latency.  Such a low MTU can cause
++# problems with UDP traffic, among other things.  As such,
++# disallow MTUs from 576 and below by default, so that broken
++# MTUs are ignored, but higher stuff is allowed (1492, 1500, etc).
++if [ -z "$new_interface_mtu" ] || [ "$new_interface_mtu" -le 576 ]; then
++    new_interface_mtu=''
++fi
++
++# The action starts here
++
+ # Invoke the local dhcp client enter hooks, if they exist.
+-if [ -f /etc/dhclient-enter-hooks ]; then
++if [ -f /etc/dhclient-enter-hooks ]; then
+   exit_status=0
+-  . /etc/dhclient-enter-hooks
+-  # allow the local script to abort processing of this state
+-  # local script must set exit_status variable to nonzero.
++  . /etc/dhclient-enter-hooks
+   if [ $exit_status -ne 0 ]; then
+     exit $exit_status
+   fi
+ fi
+ 
+-###
+-### DHCPv4 Handlers
+-###
+-
+-if [ x$new_broadcast_address != x ]; then
+-  new_broadcast_arg="broadcast $new_broadcast_address"
+-fi
+-if [ x$old_broadcast_address != x ]; then
+-  old_broadcast_arg="broadcast $old_broadcast_address"
+-fi
+-if [ x$new_subnet_mask != x ]; then
+-  new_subnet_arg="netmask $new_subnet_mask"
+-fi
+-if [ x$old_subnet_mask != x ]; then
+-  old_subnet_arg="netmask $old_subnet_mask"
+-fi
+-if [ x$alias_subnet_mask != x ]; then
+-  alias_subnet_arg="netmask $alias_subnet_mask"
+-fi
+-if [ x$new_interface_mtu != x ]; then
+-  mtu_arg="mtu $new_interface_mtu"
+-fi
+-if [ x$IF_METRIC != x ]; then
+-  metric_arg="metric $IF_METRIC"
+-fi
+-
+-if [ x$reason = xMEDIUM ]; then
+-  # Linux doesn't do mediums (ok, ok, media).
+-  exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xPREINIT ]; then
+-  if [ x$alias_ip_address != x ]; then
+-    # Bring down alias interface. Its routes will disappear too.
+-    ifconfig $interface:0- inet 0
+-  fi
+-  ifconfig $interface 0 up
+-
+-  # We need to give the kernel some time to get the interface up.
+-  sleep 1
+-
+-  exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then
+-  exit_with_hooks 0
+-fi
+-  
+-if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
+-   [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
+-  current_hostname=`hostname`
+-  if [ x$current_hostname = x ] || \
+-     [ x$current_hostname = "x(none)" ] || \
+-     [ x$current_hostname = xlocalhost ] || \
+-     [ x$current_hostname = x$old_host_name ]; then
+-    if [ x$new_host_name != x$old_host_name ]; then
+-      hostname "$new_host_name"
+-    fi
+-  fi
+-    
+-  if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
+-		[ x$alias_ip_address != x$old_ip_address ]; then
+-    # Possible new alias. Remove old alias.
+-    ifconfig $interface:0- inet 0
+-  fi
+-  if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
+-    # IP address changed. Bringing down the interface will delete all routes,
+-    # and clear the ARP cache.
+-    ifconfig $interface inet 0 down
++# Execute the operation
++case "$reason" in
+ 
+-  fi
+-  if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+-     [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
++    ### DHCPv4 Handlers
+ 
+-    ifconfig $interface inet $new_ip_address $new_subnet_arg \
+-					$new_broadcast_arg $mtu_arg
+-    # Add a network route to the computed network address.
+-    for router in $new_routers; do
+-      if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+-	route add -host $router dev $interface
+-      fi
+-      route add default gw $router $metric_arg dev $interface
+-    done
+-  else
+-    # we haven't changed the address, have we changed other options           
+-    # that we wish to update?
+-    if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then
+-      # if we've changed routers delete the old and add the new.
+-      for router in $old_routers; do
+-        route del default gw $router
+-      done
+-      for router in $new_routers; do
+-        if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+-	  route add -host $router dev $interface
+-	fi
+-	route add default gw $router $metric_arg dev $interface
+-      done
+-    fi
+-  fi
+-  if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+-   then
+-    ifconfig $interface:0- inet 0
+-    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+-    route add -host $alias_ip_address $interface:0
+-  fi
+-  make_resolv_conf
+-  exit_with_hooks 0
+-fi
++    MEDIUM|ARPCHECK|ARPSEND)
++        # Do nothing
++        ;;
++    PREINIT)
++        # The DHCP client is requesting that an interface be
++        # configured as required in order to send packets prior to
++        # receiving an actual address. - dhclient-script(8)
++
++        # ensure interface is up
++        ip link set dev ${interface} up
++
++        if [ -n "$alias_ip_address" ]; then
++            # flush alias IP from interface
++            ip -4 addr flush dev ${interface} label ${interface}:0
++        fi
++
++        ;;
++
++    BOUND|RENEW|REBIND|REBOOT)
++        set_hostname
++
++        if [ -n "$old_ip_address" ] && [ -n "$alias_ip_address" ] &&
++           [ "$alias_ip_address" != "$old_ip_address" ]; then
++            # alias IP may have changed => flush it
++            ip -4 addr flush dev ${interface} label ${interface}:0
++        fi
++
++        if [ -n "$old_ip_address" ] &&
++           [ "$old_ip_address" != "$new_ip_address" ]; then
++            # leased IP has changed => flush it
++            ip -4 addr flush dev ${interface} label ${interface}
++        fi
++
++        if [ -z "$old_ip_address" ] ||
++           [ "$old_ip_address" != "$new_ip_address" ] ||
++           [ "$reason" = "BOUND" ] || [ "$reason" = "REBOOT" ]; then
++            # new IP has been leased or leased IP changed => set it
++            ip -4 addr add ${new_ip_address}${new_subnet_mask:+/$new_subnet_mask} \
++                ${new_broadcast_address:+broadcast $new_broadcast_address} \
++                dev ${interface} label ${interface}
++
++            if [ -n "$new_interface_mtu" ]; then
++                # set MTU
++                ip link set dev ${interface} mtu ${new_interface_mtu}
++            fi
++
++            # set if_metric if IF_METRIC is set or there's more than one router
++            if_metric="$IF_METRIC"
++            if [ "${new_routers%% *}" != "${new_routers}" ]; then
++                if_metric=${if_metric:-1}
++            fi
++
++            for router in $new_routers; do
++                if [ "$new_subnet_mask" = "255.255.255.255" ]; then
++                    # point-to-point connection => set explicit route
++                    ip -4 route add ${router} dev $interface >/dev/null 2>&1
++                fi
++
++                # set default route
++                ip -4 route add default via ${router} dev ${interface} \
++                    ${if_metric:+metric $if_metric} >/dev/null 2>&1
++
++                if [ -n "$if_metric" ]; then
++                    if_metric=$((if_metric+1))
++                fi
++            done
++        fi
++
++        if [ -n "$alias_ip_address" ] &&
++           [ "$new_ip_address" != "$alias_ip_address" ]; then
++            # separate alias IP given, which may have changed
++            # => flush it, set it & add host route to it
++            ip -4 addr flush dev ${interface} label ${interface}:0
++            ip -4 addr add ${alias_ip_address}${alias_subnet_mask:+/$alias_subnet_mask} \
++                dev ${interface} label ${interface}:0
++            ip -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1
++        fi
++
++        # update /etc/resolv.conf
++        make_resolv_conf
++
++        ;;
++
++    EXPIRE|FAIL|RELEASE|STOP)
++        if [ -n "$alias_ip_address" ]; then
++            # flush alias IP
++            ip -4 addr flush dev ${interface} label ${interface}:0
++        fi
++
++        if [ -n "$old_ip_address" ]; then
++            # flush leased IP
++            ip -4 addr flush dev ${interface} label ${interface}
++        fi
++
++        if [ -n "$alias_ip_address" ]; then
++            # alias IP given => set it & add host route to it
++            ip -4 addr add ${alias_ip_address}${alias_network_arg} \
++                dev ${interface} label ${interface}:0
++            ip -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1
++        fi
++
++        ;;
++
++    TIMEOUT)
++        if [ -n "$alias_ip_address" ]; then
++            # flush alias IP
++            ip -4 addr flush dev ${interface} label ${interface}:0
++        fi
++
++        # set IP from recorded lease
++        ip -4 addr add ${new_ip_address}${new_subnet_mask:+/$new_subnet_mask} \
++            ${new_broadcast_address:+broadcast $new_broadcast_address} \
++            dev ${interface} label ${interface}
++
++        if [ -n "$new_interface_mtu" ]; then
++            # set MTU
++            ip link set dev ${interface} mtu ${new_interface_mtu}
++        fi
++
++        # if there is no router recorded in the lease or the 1st router answers pings
++        if [ -z "$new_routers" ] || ping -q -c 1 "${new_routers%% *}"; then
++            if [ -n "$alias_ip_address" ] &&
++               [ "$new_ip_address" != "$alias_ip_address" ]; then
++                # separate alias IP given => set up the alias IP & add host route to it
++                ip -4 addr add ${alias_ip_address}${alias_subnet_mask:+/$alias_subnet_mask} \
++                    dev ${interface} label ${interface}:0
++                ip -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1
++            fi
++
++            # set if_metric if IF_METRIC is set or there's more than one router
++            if_metric="$IF_METRIC"
++            if [ "${new_routers%% *}" != "${new_routers}" ]; then
++                if_metric=${if_metric:-1}
++            fi
++
++            # set default route
++            for router in $new_routers; do
++                ip -4 route add default via ${router} dev ${interface} \
++                    ${if_metric:+metric $if_metric} >/dev/null 2>&1
++
++                if [ -n "$if_metric" ]; then
++                    if_metric=$((if_metric+1))
++                fi
++            done
++
++            # update /etc/resolv.conf
++            make_resolv_conf
++        else
++            # flush all IPs from interface
++            ip -4 addr flush dev ${interface}
++            exit_with_hooks 1
++        fi
++
++        ;;
++
++    ### DHCPv6 Handlers
++    # TODO handle prefix change: ?based on ${old_ip6_prefix} and ${new_ip6_prefix}?
++
++    PREINIT6)
++        # ensure interface is up
++        ip link set ${interface} up
++
++        # flush any stale global permanent IPs from interface
++        ip -6 addr flush dev ${interface} scope global permanent
++
++        ;;
++
++    BOUND6|RENEW6|REBIND6)
++        if [ "${new_ip6_address}" ] && [ "${new_ip6_prefixlen}" ]; then
++            # set leased IP
++            ip -6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
++                dev ${interface} scope global
++        fi
++
++        # update /etc/resolv.conf
++        if [ "${reason}" = BOUND6 ] ||
++           [ "${new_dhcp6_name_servers}" != "${old_dhcp6_name_servers}" ] ||
++           [ "${new_dhcp6_domain_search}" != "${old_dhcp6_domain_search}" ]; then
++            make_resolv_conf
++        fi
++
++        ;;
++
++    DEPREF6)
++        if [ -z "${cur_ip6_prefixlen}" ]; then
++            exit_with_hooks 1
++        fi
++
++        # set preferred lifetime of leased IP to 0
++        ip -6 addr change ${cur_ip6_address}/${cur_ip6_prefixlen} \
++            dev ${interface} scope global preferred_lft 0
++
++        ;;
++
++    EXPIRE6|RELEASE6|STOP6)
++        if [ -z "${old_ip6_address}" ] || [ -z "${old_ip6_prefixlen}" ]; then
++            exit_with_hooks 1
++        fi
++
++        # delete leased IP
++        ip -6 addr del ${old_ip6_address}/${old_ip6_prefixlen} \
++            dev ${interface}
+ 
+-if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \
+-   || [ x$reason = xSTOP ]; then
+-  if [ x$alias_ip_address != x ]; then
+-    # Turn off alias interface.
+-    ifconfig $interface:0- inet 0
+-  fi
+-  if [ x$old_ip_address != x ]; then
+-    # Shut down interface, which will delete routes and clear arp cache.
+-    ifconfig $interface inet 0 down
+-  fi
+-  if [ x$alias_ip_address != x ]; then
+-    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+-    route add -host $alias_ip_address $interface:0
+-  fi
+-  exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xTIMEOUT ]; then
+-  if [ x$alias_ip_address != x ]; then
+-    ifconfig $interface:0- inet 0
+-  fi
+-  ifconfig $interface inet $new_ip_address $new_subnet_arg \
+-					$new_broadcast_arg $mtu_arg
+-  set $new_routers
+-  if ping -q -c 1 $1; then
+-    if [ x$new_ip_address != x$alias_ip_address ] && \
+-			[ x$alias_ip_address != x ]; then
+-      ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+-      route add -host $alias_ip_address dev $interface:0
+-    fi
+-    for router in $new_routers; do
+-      if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+-	route add -host $router dev $interface
+-      fi
+-      route add default gw $router $metric_arg dev $interface
+-    done
+-    make_resolv_conf
+-    exit_with_hooks 0
+-  fi
+-  ifconfig $interface inet 0 down
+-  exit_with_hooks 1
+-fi
+-
+-###
+-### DHCPv6 Handlers
+-###
+-
+-if [ x$reason = xPREINIT6 ] ; then
+-  # Ensure interface is up.
+-  ${ip} link set ${interface} up
+-
+-  # Remove any stale addresses from aborted clients.
+-  ${ip} -f inet6 addr flush dev ${interface} scope global permanent
+-
+-  exit_with_hooks 0
+-fi
+-
+-if [ x${old_ip6_prefix} != x ] || [ x${new_ip6_prefix} != x ] ; then
+-    echo Prefix ${reason} old=${old_ip6_prefix} new=${new_ip6_prefix}
+-
+-    exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xBOUND6 ] ; then
+-  if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then
+-    exit_with_hooks 2;
+-  fi
+-
+-  ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
+-	dev ${interface} scope global
+-
+-  # Check for nameserver options.
+-  make_resolv_conf
+-
+-  exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xRENEW6 ] || [ x$reason = xREBIND6 ] ; then
+-  if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then
+-    exit_with_hooks 2;
+-  fi
+-
+-  ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
+-	dev ${interface} scope global
+-
+-  # Make sure nothing has moved around on us.
+-
+-  # Nameservers/domains/etc.
+-  if [ "x${new_dhcp6_name_servers}" != "x${old_dhcp6_name_servers}" ] ||
+-     [ "x${new_dhcp6_domain_search}" != "x${old_dhcp6_domain_search}" ] ; then
+-    make_resolv_conf
+-  fi
+-
+-  exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xDEPREF6 ] ; then
+-  if [ x${new_ip6_prefixlen} = x ] ; then
+-    exit_with_hooks 2;
+-  fi
+-
+-  ${ip} -f inet6 addr change ${new_ip6_address}/${new_ip6_prefixlen} \
+-       dev ${interface} scope global preferred_lft 0
+-
+-  exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xEXPIRE6 -o x$reason = xRELEASE6 -o x$reason = xSTOP6 ] ; then
+-  if [ x${old_ip6_address} = x ] || [ x${old_ip6_prefixlen} = x ] ; then
+-    exit_with_hooks 2;
+-  fi
+-
+-  ${ip} -f inet6 addr del ${old_ip6_address}/${old_ip6_prefixlen} \
+-	dev ${interface}
+-
+-  exit_with_hooks 0
+-fi
++        ;;
++esac
+ 
+ exit_with_hooks 0
diff --git a/extra/dhcp/dhcp-4.1.1-missing-ipv6-not-fatal.patch b/extra/dhcp/dhcp-4.2.5-missing_ipv6-1.patch
index cc5ddb843..3a034c052 100644
--- a/extra/dhcp/dhcp-4.1.1-missing-ipv6-not-fatal.patch
+++ b/extra/dhcp/dhcp-4.2.5-missing_ipv6-1.patch
@@ -1,6 +1,15 @@
---- common/discover.c	2009-09-29 21:44:49.000000000 +0200
-+++ common/discover.c_new	2010-06-30 19:40:02.000000000 +0200
-@@ -443,7 +443,7 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2011-11-23
+Initial Package Version: 4.2.2
+Upstream Status: unknown
+Origin: found at fedora
+Description: Allow dhcp4 to work even if the kernel doesn't support ipv6.
+Fixed up by hand to apply to 4.2.2 (to me, it looks identical to the 4.2.0
+version, but patch failed in one hunk when I tried to apply that one).
+
+--- dhcp-4.2.2/common/discover.c.orig	2011-07-19 23:22:48.000000000 +0100
++++ dhcp-4.2.2/common/discover.c	2011-09-06 01:28:15.000000000 +0100
+@@ -455,7 +455,7 @@
  	}
  
  #ifdef DHCPv6
@@ -9,7 +18,7 @@
  		ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
  		if (ifaces->fp6 == NULL) {
  			log_error("Error opening '/proc/net/if_inet6' to "
-@@ -454,6 +454,8 @@
+@@ -466,6 +466,8 @@
  			ifaces->fp = NULL;
  			return 0;
  		}
@@ -18,7 +27,7 @@
  	}
  #endif
  
-@@ -721,7 +723,7 @@
+@@ -733,7 +735,7 @@
  		return 1;
  	}
  #ifdef DHCPv6
@@ -27,12 +36,12 @@
  		if (local_family == AF_INET6)
  			return next_iface6(info, err, ifaces);
  	}
-@@ -740,7 +742,8 @@
+@@ -752,7 +754,8 @@
  	ifaces->sock = -1;
  #ifdef DHCPv6
  	if (local_family == AF_INET6) {
 -		fclose(ifaces->fp6);
-+		if(ifaces->fp6)
++		if (ifaces->fp6)
 +			fclose(ifaces->fp6);
  		ifaces->fp6 = NULL;
  	}
diff --git a/extra/diffstat/PKGBUILD b/extra/diffstat/PKGBUILD
index e4fde9de6..86349c855 100644
--- a/extra/diffstat/PKGBUILD
+++ b/extra/diffstat/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 146517 2012-01-12 10:18:19Z giovanni $
+# $Id: PKGBUILD 183251 2013-04-19 14:34:26Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Matthias-Christian Ott <matthias.christian.at.tiscali.de>
 
 pkgname=diffstat
-pkgver=1.55
-pkgrel=1.1
+pkgver=1.57
+pkgrel=1
 pkgdesc="Display a histogram of diff changes"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://invisible-island.net/diffstat"
 depends=('glibc')
 license=('MIT')
 source=("ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz")
-md5sums=('630d5278f1cd874dc3cc68cff3fddecf')
+md5sums=('a70ae35e479ab91da7eb6023a4e9240a')
 
 build () {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index 7de28e2b6..378680333 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 177788 2013-02-08 18:59:53Z andrea $
+# $Id: PKGBUILD 180024 2013-03-14 20:15:45Z andrea $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=3.0.0
-pkgrel=2
+pkgver=3.1.0
+pkgrel=1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.digikam.org/"
 makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
-             'cmake' 'automoc4' 'doxygen' 'mesa' 'lensfun')
+             'cmake' 'automoc4' 'doxygen' 'lensfun')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('45a9490b2b10b7b42fa9f90b7389eeb248326718')
+sha1sums=('f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd')
 
 build() {
   mkdir build
@@ -24,7 +24,8 @@ build() {
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
-    -DBUILD_tests=OFF
+    -DBUILD_tests=OFF \
+    -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF
   make
 }
 
diff --git a/extra/digikam/boost148.patch b/extra/digikam/boost148.patch
deleted file mode 100644
index 6d3ff585b..000000000
--- a/extra/digikam/boost148.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -u libs/database/imagehistory/imagehistorygraph_boost.h ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h
---- libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-05 08:32:19.837388059 -0500
-+++ ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-05 09:17:27.798341897 -0500
-@@ -1198,7 +1198,7 @@
-             {
-                 boost::dag_shortest_paths(graph, v,
-                                           // we provide a constant weight of 1
--                                          weight_map(boost::ref_property_map<edge_t,int>(weight)).
-+                                          weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
-                                           // Store distance and predecessors in QMaps, wrapped to serve as property maps
-                                           distance_map(VertexIntMapAdaptor(distances)).
-                                           predecessor_map(VertexVertexMapAdaptor(predecessors))
-@@ -1218,7 +1218,7 @@
-             {
-                 boost::dag_shortest_paths(graph, v,
-                                           // we provide a constant weight of 1
--                                          weight_map(boost::ref_property_map<edge_t,int>(weight)).
-+                                          weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
-                                           // Invert the default compare method: With greater, we get the longest path
-                                           distance_compare(std::greater<int>()).
-                                           // will be returned if a node is unreachable
-@@ -1384,14 +1384,15 @@
-         template <class GraphType, typename VertexLessThan>
-         class lessThanMapEdgeToTarget
-         {
-+            typedef typename boost::graph_traits<GraphType>::edge_descriptor edge_descriptor;
-         public:
-             lessThanMapEdgeToTarget(const GraphType& g, VertexLessThan vertexLessThan)
-                 : g(g), vertexLessThan(vertexLessThan) {}
-             const GraphType& g;
-             VertexLessThan vertexLessThan;
--            bool operator()(const Edge& a, const Edge& b)
-+            bool operator()(const edge_descriptor& a, const edge_descriptor& b)
-             {
--                return vertexLessThan(boost::target(a.toEdge(), g), boost::target(b.toEdge(), g));
-+                return vertexLessThan(boost::target(a, g), boost::target(b, g));
-             }
-         };
- 
-@@ -1402,20 +1403,21 @@
-         {
-             typedef std::pair<Vertex, QList<Edge> > VertexInfo;
- 
--            QList<Edge>             outEdges;
-+            typedef typename boost::graph_traits<IncidenceGraph>::edge_descriptor edge_descriptor;
-+            QList<edge_descriptor> outEdges;
-             std::vector<VertexInfo> stack;
- 
-             boost::put(color, u, boost::gray_color);
-             vis.discover_vertex(u, g);
- 
--            outEdges = toEdgeList(boost::out_edges(u, g));
-+            outEdges = toList<edge_descriptor>(boost::out_edges(u, g));
-             // Sort edges. The lessThan we have takes vertices, so we use a lessThan which
-             // maps the given edges to their targets, and calls our vertex lessThan.
-             qSort(outEdges.begin(), outEdges.end(), lessThanMapEdgeToTarget<IncidenceGraph, LessThan>(g, lessThan));
- 
--            foreach(const Edge& e, outEdges)
-+            foreach(const edge_descriptor& e, outEdges)
-             {
--                Vertex v = boost::target(e.toEdge(), g);
-+                Vertex v = boost::target(e, g);
-                 vis.examine_edge(e, g);
-                 boost::default_color_type v_color = boost::get(color, v);
-                 if (v_color == boost::white_color)
diff --git a/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch b/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch
deleted file mode 100644
index 535387b92..000000000
--- a/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- digikam-2.5.0/core/digikam/album/albummanager.h	2012-01-03 02:32:41.000000000 +0200
-+++ digikam-2.5.0/core/digikam/album/albummanager.h	2012-01-05 03:18:16.291639995 +0200
-@@ -831,7 +831,7 @@
-     {
-         foreach(T* t, list)
-         {
--            append(AlbumPointer<T>(t));
-+            this->append(AlbumPointer<T>(t));
-         }
-         return *this;
-     }
---- digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-03 02:32:26.000000000 +0200
-+++ digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-05 03:01:56.965609602 +0200
-@@ -1362,7 +1362,7 @@
-             template <typename VertexType, typename GraphType>
-             void discover_vertex(VertexType u, const GraphType&) const
-             {
--                record(u);
-+                this->record(u);
-             }
-         };
- 
-@@ -1373,7 +1373,7 @@
-             template <typename VertexType, typename GraphType>
-             void discover_vertex(VertexType u, const GraphType&) const
-             {
--                record(u);
-+                this->record(u);
-             }
-         };
- 
---- digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp	2012-01-03 02:32:04.000000000 +0200
-+++ digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp	2012-01-05 01:22:34.009352997 +0200
-@@ -30,6 +30,7 @@
- extern "C"
- {
- #include <utime.h>
-+#include <unistd.h>
- }
- 
- // C++ includes
---- digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp	2012-01-03 02:31:42.000000000 +0200
-+++ digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp	2012-01-05 02:35:01.061054821 +0200
-@@ -78,7 +78,7 @@
- public:
-     WizardPage(KAssistantDialog* dialog, const QString& title)
-     : QWidget(dialog) {
--        setupUi(this);
-+        this->setupUi(this);
-         layout()->setMargin(0);
-         mPage = dialog->addPage(this, title);
-     }
---- digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp	2012-01-03 02:31:34.000000000 +0200
-+++ digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp	2012-01-05 02:17:15.249914790 +0200
-@@ -88,7 +88,7 @@
-     WizardPage ( KAssistantDialog* dialog, const QString& title )
-         : QWidget ( dialog )
-     {
--        setupUi ( this );
-+        this->setupUi ( this );
-         layout()->setMargin ( 0 );
-         mPage = dialog->addPage ( this, title );
-     }
diff --git a/extra/digikam/libkipi140.patch b/extra/digikam/libkipi140.patch
deleted file mode 100644
index a221b5847..000000000
--- a/extra/digikam/libkipi140.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp
-index 0f4030a..b8efb35 100644
---- a/utilities/setup/setupplugins.cpp
-+++ b/utilities/setup/setupplugins.cpp
-@@ -6,8 +6,8 @@
-  * Date        : 2004-01-02
-  * Description : setup Kipi plugins tab.
-  *
-- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
-+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
-@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent)
- 
-     panel->setLayout(mainLayout);
- 
-+#if KIPI_VERSION < 0x010400
-+    d->checkAllBtn->setVisible(false);
-+    d->clearBtn->setVisible(false);
-+#endif
-+
-     initPlugins();
- 
-     // --------------------------------------------------------
-@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
- void SetupPlugins::slotCheckAll()
- {
-     QApplication::setOverrideCursor(Qt::WaitCursor);
-+#if KIPI_VERSION >= 0x010400
-     d->kipiConfig->slotCheckAll();
-+#endif
-     QApplication::restoreOverrideCursor();
- }
- 
- void SetupPlugins::slotClear()
- {
-     QApplication::setOverrideCursor(Qt::WaitCursor);
-+#if KIPI_VERSION >= 0x010400
-     d->kipiConfig->slotClear();
-+#endif
-     QApplication::restoreOverrideCursor();
- }
- 
-diff --git a/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h
-index 271a569..114e0fa 100644
---- a/utilities/setup/setupplugins.h
-+++ b/utilities/setup/setupplugins.h
-@@ -6,8 +6,8 @@
-  * Date        : 2004-01-02
-  * Description : setup Kipi plugins tab.
-  *
-- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
-+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
-
-  
diff --git a/extra/djvulibre/PKGBUILD b/extra/djvulibre/PKGBUILD
index 6ddbcf27a..5bea5a600 100644
--- a/extra/djvulibre/PKGBUILD
+++ b/extra/djvulibre/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=djvulibre
 pkgver=3.5.25.3
 _major=3.5.25
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents"
 url='http://djvu.sourceforge.net/'
 arch=("i686" "x86_64" 'mips64el')
diff --git a/extra/djvulibre/djvulibre.install b/extra/djvulibre/djvulibre.install
deleted file mode 100644
index 3e9bb5c49..000000000
--- a/extra/djvulibre/djvulibre.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  if [ -x usr/bin/gtk-update-icon-cache ]; then  
-    gtk-update-icon-cache -q -f usr/share/icons/hicolor
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/extra/dmidecode/PKGBUILD b/extra/dmidecode/PKGBUILD
index 6f5e9ceba..3c5fe030d 100644
--- a/extra/dmidecode/PKGBUILD
+++ b/extra/dmidecode/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 143727 2011-11-28 17:28:42Z giovanni $
+# $Id: PKGBUILD 183308 2013-04-21 10:54:50Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=dmidecode
-pkgver=2.11
-pkgrel=2
+pkgver=2.12
+pkgrel=1
 pkgdesc="Desktop Management Interface table related utilities"
 arch=('i686' 'x86_64')
 url="http://www.nongnu.org/dmidecode"
 license=('GPL')
 depends=('glibc')
 source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('535487cc041f2db746587cf40a2059f0')
+md5sums=('a406f3cbb27736491698697beeddb781')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch b/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch
new file mode 100644
index 000000000..05223cdb2
--- /dev/null
+++ b/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch
@@ -0,0 +1,26 @@
+From 71aaad9f663efda7032e27c201a7025ff6332a2d Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Thu, 18 Apr 2013 09:47:49 +0100
+Subject: [PATCH] Fix wrong size in memset() call.
+
+Thanks to Dave Reisner.
+---
+ src/ipset.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ipset.c b/src/ipset.c
+index a34ed96..f175fa4 100644
+--- a/src/ipset.c
++++ b/src/ipset.c
+@@ -110,7 +110,7 @@ static int new_add_to_ipset(const char *setname, const struct all_addr *ipaddr,
+       return -1;
+     }
+   
+-  memset(buffer, 0, sizeof(buffer));
++  memset(buffer, 0, BUFF_SZ);
+ 
+   nlh = (struct nlmsghdr *)buffer;
+   nlh->nlmsg_len = NL_ALIGN(sizeof(struct nlmsghdr));
+-- 
+1.8.2.1
+
diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index 4c4798ab2..68e1007dd 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173229 2012-12-14 17:31:42Z dreisner $
+# $Id: PKGBUILD 183176 2013-04-18 12:45:45Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=dnsmasq
-pkgver=2.65
+pkgver=2.66
 pkgrel=1
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
@@ -12,17 +12,20 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc' 'dbus-core')
 install=$pkgname.install
-backup=('etc/dnsmasq.conf'
-        'etc/conf.d/dnsmasq')
-source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz"
-        'dnsmasq.confd'
-        'rc.dnsmasq'
+backup=('etc/dnsmasq.conf')
+source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"
+        '0001-Fix-wrong-size-in-memset-call.patch'
         'dnsmasq.service')
-md5sums=('a91534a5d6f053d5c80f67ef502afa34'
-         '66479e99123faeab83ebaed709ef95b5'
-         '819fbdf6440d710616e6df5f8ca9cdba'
+md5sums=('cd1c70dd66d2e3ad02b66ca6af4ebf20'
+         '05ccefefde68ebdebce5e40d2b3c78be'
          '7ac45726cabef4145db40d758cc7fedf')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 <"$srcdir/0001-Fix-wrong-size-in-memset-call.patch"
+}
+
 build() {
   cd "$pkgname-$pkgver"
 
@@ -30,7 +33,7 @@ build() {
   # compile time opts report properly on startup. yuck.
   sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h
 
-  make
+  make "CFLAGS=$CPPFLAGS $CFLAGS" "LDFLAGS=$LDFLAGS"
 }
 
 package() {
@@ -38,9 +41,6 @@ package() {
 
   make BINDIR=/usr/bin PREFIX=/usr DESTDIR="$pkgdir" install
 
-  install -Dm755 "$srcdir"/rc.dnsmasq "$pkgdir"/etc/rc.d/dnsmasq
-  install -Dm644 "$srcdir"/dnsmasq.confd "$pkgdir/etc/conf.d/dnsmasq"
-
   install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf
   install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf
   install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/usr/lib/systemd/system/dnsmasq.service
diff --git a/extra/dnsmasq/dnsmasq.confd b/extra/dnsmasq/dnsmasq.confd
deleted file mode 100644
index 933b92850..000000000
--- a/extra/dnsmasq/dnsmasq.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# runtime config for dnsmasq
-#
-
-# if unset, dnsmasq will run as nobody.
-DNSMASQ_USER=dnsmasq
-
-# other runtime options. treated as an array.
-DNSMASQ_OPTS=()
diff --git a/extra/dnsmasq/rc.dnsmasq b/extra/dnsmasq/rc.dnsmasq
deleted file mode 100755
index 4030c2896..000000000
--- a/extra/dnsmasq/rc.dnsmasq
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dnsmasq
-
-checkconfig() {
-  local testout
-
-  if ! testout=$(/usr/bin/dnsmasq --test 2>&1); then
-    echo "$testout"
-    return 1
-  fi
-
-  return 0
-}
-
-pidfile=/run/dnsmasq.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-  if [[ ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting DNS/DHCP daemon"
-    if [[ -z $PID ]] && checkconfig &&
-        /usr/bin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \
-                          "--pid-file=$pidfile" \
-                          "${DNSMASQ_OPTS[@]}"; then
-      add_daemon dnsmasq
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DNS/DHCP daemon"
-    if [[ $PID ]] && kill "$PID" &> /dev/null; then
-      # dnsmasq doesn't clean up after itself
-      rm -f "$pidfile"
-      rm_daemon dnsmasq
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  checkconfig)
-    # diagnostics will be printed, with zero/non-zero exit
-    /usr/bin/dnsmasq --test
-    ;;
-  *)
-    echo "usage: $0 <start|stop|restart|checkconfig>"
-esac
-
diff --git a/extra/dnsutils/PKGBUILD b/extra/dnsutils/PKGBUILD
new file mode 100644
index 000000000..1c392a354
--- /dev/null
+++ b/extra/dnsutils/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 180987 2013-03-29 12:51:19Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: kevin <kevin@archlinux.org>
+# Contributor: mario <mario_vazq@hotmail.com>
+
+pkgname=dnsutils
+_pkgver=9.9.2-P2
+pkgver=${_pkgver//-/.}
+pkgrel=1
+pkgdesc='DNS utilities: dig host nslookup'
+url='http://www.isc.org/software/bind/'
+license=('custom:ISC')
+arch=('i686' 'x86_64' 'mips64el')
+options=('!makeflags')
+depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors')
+source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
+        'remove-bind.patch')
+sha1sums=('3aadeaf64164a31a1cf22737ff2eea706792b68d'
+          'bb13bd54134e4d787469be25461a3cc3f5cb57f4')
+
+replaces=('bind-tools' 'host')
+
+build() {
+	cd "${srcdir}/bind-${_pkgver}"
+
+	patch -p1 -i ../remove-bind.patch
+	export STD_CDEFINES='-DDIG_SIGCHASE'
+
+	# hack to remove unused bloat from the binaries
+	CFLAGS+=' -fdata-sections -ffunction-sections'
+	LDFLAGS+=' -Wl,--gc-sections'
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-linux-caps \
+		--with-openssl \
+		--with-idn \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/bind-${_pkgver}"
+	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	cd bin; make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/dnsutils/remove-bind.patch b/extra/dnsutils/remove-bind.patch
new file mode 100644
index 000000000..8d4b49848
--- /dev/null
+++ b/extra/dnsutils/remove-bind.patch
@@ -0,0 +1,25 @@
+diff -aur old/bin/Makefile.in new/bin/Makefile.in
+--- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
++++ new/bin/Makefile.in	2011-08-28 19:16:17.245495043 -0700
+@@ -19,8 +19,7 @@
+ VPATH =		@srcdir@
+ top_srcdir =	@top_srcdir@
+ 
+-SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
+-		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
++SUBDIRS =	dig
+ TARGETS =
+ 
+ @BIND9_MAKE_RULES@
+diff -aur old/lib/Makefile.in new/lib/Makefile.in
+--- old/lib/Makefile.in	2007-06-19 16:47:13.000000000 -0700
++++ new/lib/Makefile.in	2011-08-28 19:17:50.828688599 -0700
+@@ -23,7 +23,7 @@
+ # Attempt to disable parallel processing.
+ .NOTPARALLEL:
+ .NO_PARALLEL:
+-SUBDIRS =	isc isccc dns isccfg bind9 lwres tests
++SUBDIRS =	isc dns isccfg bind9 lwres
+ TARGETS =
+ 
+ @BIND9_MAKE_RULES@
diff --git a/extra/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD
index af3708914..3ff9a11cc 100644
--- a/extra/dosfstools/PKGBUILD
+++ b/extra/dosfstools/PKGBUILD
@@ -1,23 +1,20 @@
-# $Id: PKGBUILD 174137 2013-01-02 14:44:16Z tpowa $
+# $Id: PKGBUILD 179303 2013-03-05 10:42:06Z tpowa $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 pkgname=dosfstools
-pkgver=3.0.13
-pkgrel=2
+pkgver=3.0.16
+pkgrel=1
 pkgdesc="DOS filesystem utilities"
 arch=(i686 x86_64 'mips64el')
 depends=('glibc')
 #source=(http://www.daniel-baumann.ch/software/dosfstools/$pkgname-$pkgver.tar.xz)
 # using debian source, main page is down since quite some time
-source=(http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_3.0.13.orig.tar.xz
-        dosfstools-3.0.12-fix-alloc-rootdir-entry.patch)
+source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.orig.tar.xz{,.sig})
 url="http://www.daniel-baumann.ch/software/dosfstools/"
 license=('GPL2')
 
 build() {
    cd $srcdir/$pkgname-$pkgver
-   # fix https://bugs.archlinux.org/task/33248
-   patch -Np1 -i ${srcdir}/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch
    make
 }
 
@@ -25,5 +22,5 @@ package () {
    cd $srcdir/$pkgname-$pkgver
    make PREFIX=$pkgdir MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install
 }
-md5sums=('c1d851e3fc065a935c7cf919545d239f'
-         'c2be6f2cd1d47297b2d6a8ba237e04eb')
+md5sums=('27aca18aeb8bb0851ccaeb47e7416a6e'
+         'e8b460ab9c27279e652ddbd1ce7fa4b2')
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 7bc08e012..f3846ff4b 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176804 2013-01-31 17:39:45Z andyrtr $
+# $Id: PKGBUILD 182044 2013-04-05 19:28:12Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
@@ -8,13 +8,13 @@
 # --->>> remember to rebuild/bump pigeonhole in one step <<<---
 
 pkgname=dovecot
-pkgver=2.1.14
+pkgver=2.1.16
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dovecot.org/"
 license=("LGPL")
-depends=('krb5' 'openssl' 'sqlite>=3.7.5' 'libmysqlclient>=5.5.10'
+depends=('krb5' 'openssl' 'sqlite>=3.7.5' 'libmariadbclient'
         'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl')
 makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22' 'clucene')
 optdepends=('libldap: ldap plugin'
@@ -23,11 +23,9 @@ provides=('imap-server' 'pop3-server')
 options=('!libtool')
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig}
-        dovecot.sh
         dovecot.tmpfilesd)
-md5sums=('fad7544d7c6d09f9533106e53bfbd243'
-         'a6c15d4e1991900dcfb5eb42d0c030d1'
-         '587159e84e2da6f83d70b3c706ba87cc'
+md5sums=('72abf618cfa678194f9338f6c0aeb47d'
+         'SKIP'
          '342a28251d40f983c98c0d1f1bf3d07d')
 
 build() {
@@ -70,9 +68,6 @@ package() {
   cd ${srcdir}/$pkgname-$pkgver
   make DESTDIR=${pkgdir} install
 
-  # install the launch script
-  install -D -m755 ${srcdir}/$pkgname.sh ${pkgdir}/etc/rc.d/$pkgname
-
   # install example conf files and ssl.conf
   install -d -m755 ${pkgdir}/etc/dovecot/conf.d
   install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/dovecot.conf ${pkgdir}/etc/dovecot/dovecot.conf.sample
diff --git a/extra/dovecot/dovecot.sh b/extra/dovecot/dovecot.sh
deleted file mode 100755
index e8966bd55..000000000
--- a/extra/dovecot/dovecot.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-daemon_name=dovecot
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-#. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-        pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-        start)
-                stat_busy "Starting $daemon_name daemon"
-
-                PID=$(get_pid)
-                if [[ -z $PID ]]; then
-                        [[ -f /var/run/$daemon_name.pid ]] &&
-                                rm -f /var/run/$daemon_name.pid
-                # RUN
-                $daemon_name
-                #
-                if [[ $? -gt 0 ]]; then
-                        stat_fail
-                        exit 1
-                else
-                        echo $(get_pid) > /var/run/$daemon_name.pid
-                        add_daemon $daemon_name
-                        stat_done
-                fi
-                else
-                        stat_fail
-                        exit 1
-                fi
-                ;;
-
-        stop)
-                stat_busy "Stopping $daemon_name daemon"
-                PID=$(get_pid)
-                # KILL
-                [[ -n $PID ]] && kill $PID &> /dev/null
-                #
-                if [[ $? -gt 0 ]]; then
-                        stat_fail
-                        exit 1
-                else
-                        rm -f /var/run/$daemon_name.pid &> /dev/null
-                        rm_daemon $daemon_name
-                        stat_done
-                fi
-                ;;
-
-        restart)
-                $0 stop
-                sleep 3
-                $0 start
-                ;;
-
-        status)
-                stat_busy "Checking $daemon_name status";
-                ck_status $daemon_name
-                ;;
-
-        *)
-                echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index 8fa7fdeae..dd7668585 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 175737 2013-01-20 22:18:44Z dan $
+# $Id: PKGBUILD 178954 2013-03-01 10:20:02Z andrea $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=doxygen
 pkgname=('doxygen' 'doxygen-docs')
 pkgver=1.8.3.1
-pkgrel=1
+pkgrel=2
 license=('GPL')
 arch=(i686 x86_64 'mips64el')
 url="http://www.doxygen.org/"
-makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript'
+makedepends=('gcc-libs' 'flex' 'qt4' 'texlive-core' 'ghostscript'
              'texlive-latexextra' 'graphviz')
 source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
 md5sums=('31b0aaab51c5cab7db9f0ebbe9f85530')
 sha1sums=('289fc809f44b8025d45279deefbaee7680efd88f')
 
 build() {
+  . /etc/profile.d/qt4.sh
   cd "${srcdir}/${pkgbase}-${pkgver}"
   QTDIR=/usr ./configure --prefix /usr --with-doxywizard
   make
@@ -24,7 +25,7 @@ package_doxygen() {
   pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
   depends=('gcc-libs')
   optdepends=('graphviz: for caller/callee graph generation'
-              'qt: for doxywizard')
+              'qt4: for doxywizard')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make INSTALL="${pkgdir}"/usr MAN1DIR=share/man/man1 install
@@ -42,5 +43,3 @@ package_doxygen-docs() {
 
   make INSTALL="${pkgdir}"/usr MAN1DIR=share/man/man1 install_docs
 }
-md5sums=('54245ba38a30f50fd7ae6e62fc05de15')
-sha1sums=('e74240f445e08b782fa7a3de5f0b333901307587')
diff --git a/extra/dssi/PKGBUILD b/extra/dssi/PKGBUILD
index 11549dcef..840977910 100644
--- a/extra/dssi/PKGBUILD
+++ b/extra/dssi/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 151210 2012-02-25 08:01:57Z pierre $
+# $Id: PKGBUILD 178955 2013-03-01 10:20:10Z andrea $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Pajaro
 
 pkgname=dssi
 pkgver=1.1.1
-pkgrel=2.1
+pkgrel=3
 pkgdesc="An API for audio processing plugins & softsynths with UIs"
 arch=(i686 x86_64 'mips64el')
 url="http://dssi.sourceforge.net/"
 license=('LGPL' 'BSD' 'custom')
 depends=('liblo' 'jack')
-makedepends=('ladspa' 'qt')
-optdepends=('qt: example plugins')
+makedepends=('ladspa' 'qt4')
+optdepends=('qt4: example plugins')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
         'license.txt')
@@ -20,6 +20,7 @@ md5sums=('619ab73c883b02dc37ddb37001591f8b'
          '258ca4d0ca28c5c4d4675147621fac18')
 
 build() {
+  . /etc/profile.d/qt4.sh
   cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr
diff --git a/extra/dvd+rw-tools/PKGBUILD b/extra/dvd+rw-tools/PKGBUILD
index 4598c1770..37d949931 100644
--- a/extra/dvd+rw-tools/PKGBUILD
+++ b/extra/dvd+rw-tools/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=dvd+rw-tools
 pkgver=7.1
-pkgrel=4.1
+pkgrel=4.2
 pkgdesc="dvd burning tools"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD
index 61e54a8c4..afb0b16e0 100644
--- a/extra/dvdauthor/PKGBUILD
+++ b/extra/dvdauthor/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175858 2013-01-23 00:12:49Z eric $
+# $Id: PKGBUILD 180308 2013-03-20 02:35:29Z eric $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Travis Willard <travisw@wmpub.ca>
 # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
@@ -6,7 +6,7 @@
 
 pkgname=dvdauthor
 pkgver=0.7.1
-pkgrel=3
+pkgrel=4
 pkgdesc="DVD authoring tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dvdauthor.sourceforge.net/"
diff --git a/extra/dvdauthor/dvdauthor-0.7.0-libpng15.patch b/extra/dvdauthor/dvdauthor-0.7.0-libpng15.patch
deleted file mode 100644
index 2bb636380..000000000
--- a/extra/dvdauthor/dvdauthor-0.7.0-libpng15.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/spuunmux.c
-+++ src/spuunmux.c
-@@ -39,6 +39,7 @@
- #include <netinet/in.h>
- 
- #include <png.h>
-+#include <zlib.h>
- 
- #include "rgb.h"
- #include "common.h"
-@@ -610,7 +611,7 @@
-         png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
-         return -1;
-       } /*if*/
--    if (setjmp(png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(png_ptr)))
-       {
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         fclose(fp);
diff --git a/extra/dvdrip/PKGBUILD b/extra/dvdrip/PKGBUILD
deleted file mode 100644
index e3be37d2f..000000000
--- a/extra/dvdrip/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 143731 2011-11-28 17:39:01Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Fredrik Hammar <Horney_C86@Hotmail.com>
-
-pkgname=dvdrip
-pkgver=0.98.11
-pkgrel=10
-pkgdesc="A Gtk frontend for transcode writen in Perl"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.exit1.org/dvdrip/"
-install=${pkgname}.install
-depends=('perl-gtk2-ex-formfactory' 'transcode' 'imagemagick'
-         'perl-libintl-perl' 'desktop-file-utils' 'perl-event-execflow')
-optdepends=('ogmtools: for ogm/odd video creation'
-            'lsdvd: fast reading of DVD table'
-            'fping: for cluster support')
-source=("http://www.exit1.org/dvdrip/dist/${pkgname}-${pkgver}.tar.gz"
-        'dvdrip.desktop')
-options=('!emptydirs' '!makeflags')
-md5sums=('6dfa4199d451757a37eea233a07da4c0'
-         'e91cf411928fd0500d07a0022b4ef546')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make install DESTDIR="${pkgdir}"
-
-  # remove perllocal.pod and .packlist
-  find ${pkgdir} -name perllocal.pod -delete
-  find ${pkgdir} -name .packlist -delete
-
-  install -Dm644 ${srcdir}/${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -Dm 644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/dvdrip/dvdrip.desktop b/extra/dvdrip/dvdrip.desktop
deleted file mode 100644
index dd19b4aae..000000000
--- a/extra/dvdrip/dvdrip.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=dvd::rip
-Comment=DVD Ripper and Encoder - Backup and compression utility for DVDs
-Exec=/usr/bin/vendor_perl/dvdrip
-Icon=/usr/share/perl5/vendor_perl/Video/DVDRip/icon.xpm
-Terminal=false
-Type=Application
-Categories=Application;AudioVideo;Video;
diff --git a/extra/dvgrab/PKGBUILD b/extra/dvgrab/PKGBUILD
index 9e50f2782..bda720c49 100644
--- a/extra/dvgrab/PKGBUILD
+++ b/extra/dvgrab/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=dvgrab
 pkgver=3.5
-pkgrel=4.1
+pkgrel=4.2
 pkgdesc="Saves audio and video data from an IEEE (FireWire) digital source"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kinodv.org/"
diff --git a/extra/easytag/PKGBUILD b/extra/easytag/PKGBUILD
index bbd047d81..bef1e4ae1 100644
--- a/extra/easytag/PKGBUILD
+++ b/extra/easytag/PKGBUILD
@@ -1,29 +1,46 @@
-# $Id: PKGBUILD 171355 2012-11-17 09:20:41Z eric $
-# Maintainer:
+# $Id: PKGBUILD 178421 2013-02-21 20:49:20Z guillaume $
+# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=easytag
-pkgver=2.1.7
-pkgrel=3
-pkgdesc="Utility for viewing, editing and writing ID3 tags of your MP3 files"
+pkgver=2.1.8
+pkgrel=2
+pkgdesc='Utility for viewing and editing tags for most audio formats'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://easytag.sourceforge.net/'
-depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'speex' 'wavpack' 'libmp4v2' 'desktop-file-utils')
+makedepends=('intltool')
+depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'speex' 'wavpack' 'taglib'
+         'desktop-file-utils' 'hicolor-icon-theme')
 install=${pkgname}.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" easytag-2.1.7-new_libmp4v2.patch)
-md5sums=('9df3e800d80e754670642f2ba5e03539'
-         '0d01887de463585d944777b638a28c85')
+source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz
+        easytag-2.1.8-fix_mixed_declarations_and_code.patch
+        easytag-2.1.8-fix_mime_directory_association.patch)
+sha256sums=('1a2f75c9a70aeb7a404dfaa96e0df0eaaa325df301c58f0f708d0da4c08e65a9'
+            '453d2a102cf482d6d1586b11e531bf267f302aab3ee6b8c43b6bcc61cfa2ede5'
+            '693da67f0c96d51ad363bb9e70a22b402bc7c5058d648981919a115381700cd3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/easytag-2.1.7-new_libmp4v2.patch"
+
+  # Already fixed upstream
+  # http://git.gnome.org/browse/easytag/commit/src/wavpack_tag.c?id=17a33964c32035f6b9986e13726ae3582a126244
+  patch -p0 -i ${srcdir}/easytag-2.1.8-fix_mixed_declarations_and_code.patch
+
+  # Bad Easytag! Bad! You don't know your place!
+  patch -p0 -i ${srcdir}/easytag-2.1.8-fix_mime_directory_association.patch
+
   ./configure --prefix=/usr
   make
 }
 
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -k check
+}
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/extra/easytag/easytag-2.1.7-new_libmp4v2.patch b/extra/easytag/easytag-2.1.7-new_libmp4v2.patch
deleted file mode 100644
index 4a6c315c2..000000000
--- a/extra/easytag/easytag-2.1.7-new_libmp4v2.patch
+++ /dev/null
@@ -1,535 +0,0 @@
-Compability with libmp4v2.so.2 (upstream revision r479)
-
-http://bugs.gentoo.org/409281
-
---- src/mp4_header.c
-+++ src/mp4_header.c
-@@ -204,7 +204,7 @@
-     /* Get size of file */
-     ETFileInfo->size = Get_File_Size(filename);
- 
--    if ((file = MP4Read(filename, 0)) == MP4_INVALID_FILE_HANDLE )
-+    if ((file = MP4Read(filename)) == MP4_INVALID_FILE_HANDLE )
-     {
-         gchar *filename_utf8 = filename_to_display(filename);
-         //g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-@@ -218,7 +218,7 @@
-     {
-         gchar *filename_utf8 = filename_to_display(filename);
-         Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,("Contains no audio track"));
--        MP4Close(file);
-+        MP4Close(file, 0);
-         g_free(filename_utf8);
-         return FALSE;
-     }
-@@ -243,7 +243,7 @@
-     ETFileInfo->mode = MP4GetTrackAudioChannels(file, trackId);
-     ETFileInfo->duration = MP4ConvertFromTrackDuration(file, trackId, MP4GetTrackDuration(file, trackId), MP4_SECS_TIME_SCALE);
- 
--    MP4Close(file);
-+    MP4Close(file, 0);
-     return TRUE;
- }
- 
---- src/mp4_tag.c
-+++ src/mp4_tag.c
-@@ -80,15 +80,9 @@
- {
-     FILE   *file;
-     MP4FileHandle mp4file = NULL;
--    uint16_t track, track_total;
--    uint16_t disk, disktotal;
--    u_int8_t *coverArt;
--    u_int32_t coverSize;
-     Picture *prev_pic = NULL;
--#ifdef NEWMP4
-     gint pic_num;
--#endif
--    
-+
-     if (!filename || !FileTag)
-         return FALSE;
- 
-@@ -102,7 +96,7 @@
-     fclose(file); // We close it cause mp4 opens/closes file itself
- 
-     /* Get data from tag */
--    mp4file = MP4Read(filename, 0);
-+    mp4file = MP4Read(filename);
-     if (mp4file == MP4_INVALID_FILE_HANDLE)
-     {
-         gchar *filename_utf8 = filename_to_display(filename);
-@@ -111,109 +105,134 @@
-         return FALSE;
-     }
- 
-+    const MP4Tags* tags = MP4TagsAlloc();
-+    MP4TagsFetch(tags, mp4file);
-+
-     /* TODO Add error detection */
- 
-     /*********
-      * Title *
-      *********/
--    MP4GetMetadataName(mp4file, &FileTag->title);
-+    if (tags->name)
-+    {
-+        FileTag->title = Try_To_Validate_Utf8_String(tags->name);
-+    }
- 
-     /**********
-      * Artist *
-      **********/
--    MP4GetMetadataArtist(mp4file, &FileTag->artist);
-+    if (tags->artist)
-+    {
-+        FileTag->artist = Try_To_Validate_Utf8_String(tags->artist);
-+    }
-+
-+    /****************
-+     * Album Artist *
-+     ****************/
-+    if (tags->albumArtist)
-+    {
-+        FileTag->album_artist = Try_To_Validate_Utf8_String(tags->albumArtist);
-+    }
- 
-     /*********
-      * Album *
-      *********/
--    MP4GetMetadataAlbum(mp4file, &FileTag->album);
-+    if (tags->album)
-+    {
-+        FileTag->album = Try_To_Validate_Utf8_String(tags->album);
-+    }
- 
-     /**********************
-      * Disk / Total Disks *
-      **********************/
--    if (MP4GetMetadataDisk(mp4file, &disk, &disktotal))
-+    if (tags->disk)
-     {
--        if (disk != 0 && disktotal != 0)
--            FileTag->disc_number = g_strdup_printf("%d/%d",(gint)disk,(gint)disktotal);
--        else if (disk != 0)
--            FileTag->disc_number = g_strdup_printf("%d",(gint)disk);
--        else if (disktotal != 0)
--            FileTag->disc_number = g_strdup_printf("/%d",(gint)disktotal);
--        //if (disktotal != 0)
--        //    FileTag->disk_number_total = g_strdup_printf("%d",(gint)disktotal);
-+        if (tags->disk->index != 0 && tags->disk->total != 0)
-+            FileTag->disc_number = g_strdup_printf("%d/%d",(gint)tags->disk->index,(gint)tags->disk->total);
-+        else if (tags->disk->index != 0)
-+            FileTag->disc_number = g_strdup_printf("%d",(gint)tags->disk->index);
-+        else if (tags->disk->total != 0)
-+            FileTag->disc_number = g_strdup_printf("/%d",(gint)tags->disk->total);
-     }
- 
-     /********
-      * Year *
-      ********/
--    MP4GetMetadataYear(mp4file, &FileTag->year);
-+    if (tags->releaseDate)
-+    {
-+        FileTag->year = Try_To_Validate_Utf8_String(tags->releaseDate);
-+    }
- 
-     /*************************
-      * Track and Total Track *
-      *************************/
--    if (MP4GetMetadataTrack(mp4file, &track, &track_total))
-+    if (tags->track)
-     {
--        if (track != 0)
--            FileTag->track = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,(gint)track); // Just to have numbers like this : '01', '05', '12', ...
--        if (track_total != 0)
--            FileTag->track_total = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,(gint)track_total); // Just to have numbers like this : '01', '05', '12', ...
-+        if (tags->track->index != 0)
-+            FileTag->track = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,(gint)tags->track->index); // Just to have numbers like this : '01', '05', '12', ...
-+        if (tags->track->total != 0)
-+            FileTag->track_total = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,(gint)tags->track->total); // Just to have numbers like this : '01', '05', '12', ...
-     }
- 
-     /*********
-      * Genre *
-      *********/
--    MP4GetMetadataGenre(mp4file, &FileTag->genre);
-+    if (tags->genre)
-+    {
-+        FileTag->genre = Try_To_Validate_Utf8_String(tags->genre);
-+    }
- 
-     /***********
-      * Comment *
-      ***********/
--    MP4GetMetadataComment(mp4file, &FileTag->comment);
-+    if (tags->comments)
-+    {
-+        FileTag->comment = Try_To_Validate_Utf8_String(tags->comments);
-+    }
- 
-     /**********************
-      * Composer or Writer *
-      **********************/
--    MP4GetMetadataWriter(mp4file, &FileTag->composer);
-+    if (tags->composer)
-+    {
-+        FileTag->composer = Try_To_Validate_Utf8_String(tags->composer);
-+    }
- 
-     /*****************
-      * Encoding Tool *
-      *****************/
--    MP4GetMetadataTool(mp4file, &FileTag->encoded_by);
--
--    /* Unimplemented
--    Tempo / BPM
--    MP4GetMetadataTempo(file, &string)
--    */
-+    if (tags->encodedBy)
-+    {
-+        FileTag->encoded_by = Try_To_Validate_Utf8_String(tags->encodedBy);
-+    }
- 
-     /***********
-      * Picture *
-      ***********/
--#ifdef NEWMP4
--    // There version can handle multiple pictures!
--    // Version 1.6 of libmp4v2 introduces an index argument for MP4GetMetadataCoverart
--    for (pic_num = 0; (MP4GetMetadataCoverArt( mp4file, &coverArt, &coverSize,pic_num )); pic_num++)
--#else
--    // There version handle only one picture!
--    if ( MP4GetMetadataCoverArt( mp4file, &coverArt, &coverSize ) )
--#endif
--    {
--        Picture *pic;
--        
--        pic = Picture_Allocate();
--        if (!prev_pic)
--            FileTag->picture = pic;
--        else
--            prev_pic->next = pic;
--        prev_pic = pic;
--
--        pic->size = coverSize;
--        pic->data = coverArt;
--        pic->type = PICTURE_TYPE_FRONT_COVER;
--        pic->description = NULL;
-+    if (tags->artworkCount) {
-+        const MP4TagArtwork* art = tags->artwork; /* artwork != NULL when artworkCount > 0 */
-+        for (pic_num = 0; pic_num < tags->artworkCount; pic_num++, art++)
-+        {
-+            Picture *pic;
-+
-+            pic = Picture_Allocate();
-+            if (!prev_pic)
-+                FileTag->picture = pic;
-+            else
-+                prev_pic->next = pic;
-+            prev_pic = pic;
-+
-+            pic->size = art->size;
-+            pic->data = g_memdup(art->data, pic->size);
-+            pic->type = PICTURE_TYPE_FRONT_COVER;
-+            pic->description = NULL;
-+        }
-     }
- 
- 
-     /* Free allocated data */
--    MP4Close(mp4file);
-+    MP4TagsFree(tags);
-+    MP4Close(mp4file, 0);
- 
-     return TRUE;
- }
-@@ -235,6 +254,7 @@
-     FILE     *file;
-     MP4FileHandle mp4file = NULL;
-     gint error = 0;
-+    gint pic_num;
- 
-     if (!ETFile || !ETFile->FileTag)
-         return FALSE;
-@@ -252,23 +272,25 @@
-     fclose(file);
- 
-     /* Open file for writing */
--    mp4file = MP4Modify(filename,0,0);
-+    mp4file = MP4Modify(filename, 0);
-     if (mp4file == MP4_INVALID_FILE_HANDLE)
-     {
-         Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,_("MP4 format invalid"));
-         return FALSE;
-     }
- 
-+    const MP4Tags* tags = MP4TagsAlloc();
-+    MP4TagsFetch(tags, mp4file);
-+
-     /*********
-      * Title *
-      *********/
-     if (FileTag->title && g_utf8_strlen(FileTag->title, -1) > 0)
-     {
--        MP4SetMetadataName(mp4file, FileTag->title);
-+        MP4TagsSetName(tags, FileTag->title);
-     }else
-     {
--        //MP4DeleteMetadataName(mp4file); // Not available on mpeg4ip-1.2 (only in 1.3)
--        MP4SetMetadataName(mp4file, "");
-+        MP4TagsSetName(tags, "");
-     }
- 
-     /**********
-@@ -276,11 +298,21 @@
-      **********/
-     if (FileTag->artist && g_utf8_strlen(FileTag->artist, -1) > 0)
-     {
--        MP4SetMetadataArtist(mp4file, FileTag->artist);
-+        MP4TagsSetArtist(tags, FileTag->artist);
-+    }else
-+    {
-+        MP4TagsSetArtist(tags, "");
-+    }
-+
-+    /****************
-+     * Album Artist *
-+     ****************/
-+    if (FileTag->artist && g_utf8_strlen(FileTag->artist, -1) > 0)
-+    {
-+        MP4TagsSetAlbumArtist(tags, FileTag->album_artist);
-     }else
-     {
--        //MP4DeleteMetadataArtist(mp4file);
--        MP4SetMetadataArtist(mp4file, "");
-+        MP4TagsSetAlbumArtist(tags, "");
-     }
- 
-     /*********
-@@ -288,22 +320,19 @@
-      *********/
-     if (FileTag->album && g_utf8_strlen(FileTag->album, -1) > 0)
-     {
--        MP4SetMetadataAlbum(mp4file, FileTag->album);
-+        MP4TagsSetAlbum(tags, FileTag->album);
-     }else
-     {
--        //MP4DeleteMetadataAlbum(mp4file);
--        MP4SetMetadataAlbum(mp4file, "");
-+        MP4TagsSetAlbum(tags, "");
-     }
- 
-     /**********************
-      * Disk / Total Disks *
-      **********************/
-+    MP4TagDisk td;
-     if (FileTag->disc_number && g_utf8_strlen(FileTag->disc_number, -1) > 0)
-     //|| FileTag->disc_number_total && g_utf8_strlen(FileTag->disc_number_total, -1) > 0)
-     {
--        uint16_t disk      = 0;
--        uint16_t disktotal = 0;
--
-         /* At the present time, we manage only disk number like '1' or '1/2', we
-          * don't use disk number total... so here we try to decompose */
-         if (FileTag->disc_number)
-@@ -314,27 +343,24 @@
-             {
-                 // A disc_number_total was entered
-                 if ( (tmp+1) && atoi(tmp+1) )
--                    disktotal = atoi(tmp+1);
-+                    td.total = atoi(tmp+1);
- 
-                 // Fill disc_number
-                 *tmp = '\0';
--                disk = atoi(dn_tmp);
-+                td.index = atoi(dn_tmp);
-             }else
-             {
--                disk = atoi(FileTag->disc_number);
-+                td.index = atoi(FileTag->disc_number);
-+                td.total = NULL;
-             }
-             g_free(dn_tmp);
-         }
--        /*if (FileTag->disc_number)
--            disk = atoi(FileTag->disc_number);
--        if (FileTag->disc_number_total)
--            disktotal = atoi(FileTag->disc_number_total);
--        */
--        MP4SetMetadataDisk(mp4file, disk, disktotal);
-+        MP4TagsSetDisk(tags, &td);
-     }else
-     {
--        //MP4DeleteMetadataDisk(mp4file);
--        MP4SetMetadataDisk(mp4file, 0, 0);
-+        td.index = NULL;
-+        td.total = NULL;
-+        MP4TagsSetDisk(tags, &td);
-     }
- 
-     /********
-@@ -342,30 +368,29 @@
-      ********/
-     if (FileTag->year && g_utf8_strlen(FileTag->year, -1) > 0)
-     {
--        MP4SetMetadataYear(mp4file, FileTag->year);
-+        MP4TagsSetReleaseDate(tags, FileTag->year);
-     }else
-     {
--        //MP4DeleteMetadataYear(mp4file);
--        MP4SetMetadataYear(mp4file, "");
-+        MP4TagsSetReleaseDate(tags, "");
-     }
- 
-     /*************************
-      * Track and Total Track *
-      *************************/
-+    MP4TagTrack tt;
-     if ( (FileTag->track       && g_utf8_strlen(FileTag->track, -1) > 0)
-     ||   (FileTag->track_total && g_utf8_strlen(FileTag->track_total, -1) > 0) )
-     {
--        uint16_t track       = 0;
--        uint16_t track_total = 0;
-         if (FileTag->track)
--            track = atoi(FileTag->track);
-+            tt.index = atoi(FileTag->track);
-         if (FileTag->track_total)
--            track_total = atoi(FileTag->track_total);
--        MP4SetMetadataTrack(mp4file, track, track_total);
-+            tt.total = atoi(FileTag->track_total);
-+        MP4TagsSetTrack(tags, &tt);
-     }else
-     {
--        //MP4DeleteMetadataTrack(mp4file);
--        MP4SetMetadataTrack(mp4file, 0, 0);
-+        tt.index = NULL;
-+        tt.total = NULL;
-+        MP4TagsSetTrack(tags, &tt);
-     }
- 
-     /*********
-@@ -373,11 +398,10 @@
-      *********/
-     if (FileTag->genre && g_utf8_strlen(FileTag->genre, -1) > 0 )
-     {
--        MP4SetMetadataGenre(mp4file, FileTag->genre);
-+        MP4TagsSetGenre(tags, FileTag->genre);
-     }else
-     {
--        //MP4DeleteMetadataGenre(mp4file);
--        MP4SetMetadataGenre(mp4file, "");
-+        MP4TagsSetGenre(tags, "");
-     }
- 
-     /***********
-@@ -385,11 +409,10 @@
-      ***********/
-     if (FileTag->comment && g_utf8_strlen(FileTag->comment, -1) > 0)
-     {
--        MP4SetMetadataComment(mp4file, FileTag->comment);
-+        MP4TagsSetComments(tags, FileTag->comment);
-     }else
-     {
--        //MP4DeleteMetadataComment(mp4file);
--        MP4SetMetadataComment(mp4file, "");
-+        MP4TagsSetComments(tags, "");
-     }
- 
-     /**********************
-@@ -397,11 +420,10 @@
-      **********************/
-     if (FileTag->composer && g_utf8_strlen(FileTag->composer, -1) > 0)
-     {
--        MP4SetMetadataWriter(mp4file, FileTag->composer);
-+        MP4TagsSetComposer(tags, FileTag->composer);
-     }else
-     {
--        //MP4DeleteMetadataWriter(mp4file);
--        MP4SetMetadataWriter(mp4file, "");
-+        MP4TagsSetComposer(tags, "");
-     }
- 
-     /*****************
-@@ -409,33 +431,39 @@
-      *****************/
-     if (FileTag->encoded_by && g_utf8_strlen(FileTag->encoded_by, -1) > 0)
-     {
--        MP4SetMetadataTool(mp4file, FileTag->encoded_by);
-+        MP4TagsSetEncodedBy(tags, FileTag->encoded_by);
-     }else
-     {
--        //MP4DeleteMetadataTool(mp4file);
--        MP4SetMetadataTool(mp4file, "");
-+        MP4TagsSetEncodedBy(tags, "");
-     }
- 
-     /***********
-      * Picture *
-      ***********/
-+    Picture *pic = FileTag->picture;
-+    const gint artworkCount = tags->artworkCount;
-+
-+    for (pic_num = 0; pic_num < artworkCount; pic_num++)
-     {
--        // Can handle only one picture...
--        Picture *pic;
-+        MP4TagsRemoveArtwork(tags, 0);
-+    }
- 
--        //MP4DeleteMetadataCoverArt(mp4file);
--        MP4SetMetadataCoverArt(mp4file, NULL, 0);
--        for( pic = FileTag->picture; pic; pic = pic->next )
-+    while (pic)
-+    {
-+        if (pic->data)
-         {
--            if( pic->type == PICTURE_TYPE_FRONT_COVER )
--            {
--                MP4SetMetadataCoverArt(mp4file, pic->data, pic->size);
--            }
-+            MP4TagArtwork art;
-+            art.data = pic->data;
-+            art.size = pic->size;
-+            art.type = MP4_ART_UNDEFINED; // delegate typing to libmp4v2
-+            MP4TagsAddArtwork(tags, &art);
-         }
-+        pic = pic->next;
-     }
- 
--
--    MP4Close(mp4file);
-+    MP4TagsStore(tags, mp4file);
-+    MP4TagsFree(tags);
-+    MP4Close(mp4file, 0);
- 
-     if (error) return FALSE;
-     else       return TRUE;
---- src/picture.c
-+++ src/picture.c
-@@ -326,24 +326,7 @@
-     else if (MESSAGE_BOX_POSITION_MOUSE)
-         gtk_window_set_position(GTK_WINDOW(FileSelectionWindow),GTK_WIN_POS_MOUSE);
- 
--    // Behaviour following the tag type...
--    switch (ETCore->ETFileDisplayed->ETFileDescription->TagType)
--    {
--        case MP4_TAG:
--        {
--            // Only one file can be selected
--            gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(FileSelectionWindow), FALSE);
--            break;
--        }
--
--        // Other tag types
--        default:
--        {
--            gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(FileSelectionWindow), TRUE);
--            break;
--        }
--    }
--
-+    gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(FileSelectionWindow), TRUE);
-     gtk_dialog_set_default_response(GTK_DIALOG(FileSelectionWindow), GTK_RESPONSE_OK);
- 
-     // Starting directory (the same of the current file)
diff --git a/extra/easytag/easytag-2.1.8-fix_mime_directory_association.patch b/extra/easytag/easytag-2.1.8-fix_mime_directory_association.patch
new file mode 100644
index 000000000..49bcd72da
--- /dev/null
+++ b/extra/easytag/easytag-2.1.8-fix_mime_directory_association.patch
@@ -0,0 +1,11 @@
+--- easytag.desktop.in.orig	2013-02-21 21:34:14.651046456 +0100
++++ easytag.desktop.in	2013-02-21 21:34:29.327914099 +0100
+@@ -6,7 +6,7 @@
+ Type=Application
+ Icon=easytag
+ Categories=GTK;AudioVideo;AudioVideoEditing;
+-MimeType=x-directory/normal;inode/directory;audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape;
++MimeType=audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape;
+ Exec=easytag %F
+ Terminal=false
+ StartupNotify=true
diff --git a/extra/easytag/easytag-2.1.8-fix_mixed_declarations_and_code.patch b/extra/easytag/easytag-2.1.8-fix_mixed_declarations_and_code.patch
new file mode 100644
index 000000000..ff7a52a94
--- /dev/null
+++ b/extra/easytag/easytag-2.1.8-fix_mixed_declarations_and_code.patch
@@ -0,0 +1,43 @@
+--- src/wavpack_tag.c
++++ src/wavpack_tag.c
+@@ -82,15 +82,15 @@ gboolean Wavpack_Tag_Write_File (FILE *file_in, gchar *filename_in, vcedit_state
+  */
+ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
+ {
+-    if (!filename || !FileTag)
+-        return FALSE;
+-
+     WavpackContext *wpc;
+     gchar *field, *field2;
+     guint length;
+ 
+     int open_flags = OPEN_TAGS;
+ 
++    if (!filename || !FileTag)
++        return FALSE;
++
+     wpc = WavpackOpenFileInput(filename, NULL, open_flags, 0);
+ 
+     if ( wpc == NULL ) {
+@@ -271,9 +271,6 @@ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
+ 
+ gboolean Wavpack_Tag_Write_File_Tag (ET_File *ETFile)
+ {
+-    if (!ETFile || !ETFile->FileTag)
+-        return FALSE;
+-
+     WavpackContext *wpc;
+ 
+     gchar    *filename = ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value;
+@@ -282,6 +279,9 @@ gboolean Wavpack_Tag_Write_File_Tag (ET_File *ETFile)
+ 
+     int open_flags = OPEN_EDIT_TAGS;
+ 
++    if (!ETFile || !ETFile->FileTag)
++        return FALSE;
++
+     wpc = WavpackOpenFileInput(filename, NULL, open_flags, 0);
+ 
+     if ( wpc == NULL ) {
+--
+cgit v0.9.1
diff --git a/extra/easytag/easytag.install b/extra/easytag/easytag.install
index 660593cf5..18405f04c 100644
--- a/extra/easytag/easytag.install
+++ b/extra/easytag/easytag.install
@@ -1,5 +1,6 @@
 post_install() {
-    update-desktop-database -q
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/extra/ecasound/PKGBUILD b/extra/ecasound/PKGBUILD
deleted file mode 100644
index d83129ee7..000000000
--- a/extra/ecasound/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 168410 2012-10-11 09:44:14Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=ecasound
-pkgver=2.9.0
-pkgrel=1
-pkgdesc="A software package designed for multitrack audio processing"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.eca.cx/ecasound/"
-license=('GPL' 'LGPL')
-depends=('audiofile' 'liblo'
-         'liboil' 'lilv')
-makedepends=('python2' 'ruby')
-optdepends=('python2: ecamonitor, ECI API'
-            'ruby: ECI API'
-            'mpg123: MP3 decoding'
-            'lame: MP3 encoding'
-            'vorbis-tools: Ogg Vorbis decoding/encoding'
-            'faad2: AAC decoding'
-            'faac: AAC encoding'
-            'timidity++: MIDI file input'
-            'libmikmod: tracker module')
-options=('!libtool')
-source=(http://ecasound.seul.org/download/$pkgname-$pkgver.tar.gz)
-md5sums=('05e7d4664cdf4c7a138c098e9506a551')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # use vendor_ruby for ruby files
-  sed -e 's/CONFIG\["sitedir"\]/CONFIG\["vendordir"\]/' -i configure
-
-  PYTHONPATH=/usr/bin/python2 ./configure \
-    --prefix=/usr \
-    --with-python-includes=/usr/include/python2.7 \
-    --with-python-modules=/usr/lib/python2.7
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  # fix for python 2.7
-  sed -i 's:bin/env python:bin/env python2:' \
-    "$pkgdir/usr/bin/ecamonitor"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/ecl/PKGBUILD b/extra/ecl/PKGBUILD
index ace572370..b1b7cb44d 100644
--- a/extra/ecl/PKGBUILD
+++ b/extra/ecl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164666 2012-08-02 09:27:21Z juergen $
+# $Id: PKGBUILD 180165 2013-03-18 13:33:10Z juergen $
 # Contributor: John Proctor <jproctor@prium.net>
 # Maintainer: juergen <juergen@archlinux.org>
 
 pkgname=ecl
-pkgver=12.7.1
+pkgver=12.12.1
 pkgrel=1
 pkgdesc="Embeddable Common Lisp"
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ depends=('bash' 'gmp')
 makedepends=('texinfo')
 provides=('common-lisp' 'cl-asdf')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/project/ecls/ecls/12.7/ecl-12.7.1.tar.gz)
-md5sums=('ce8dd2136fbbc74e44a1c41b32db1f3c')
+source=(http://downloads.sourceforge.net/project/ecls/ecls/12.12/ecl-${pkgver}.tgz)
+md5sums=('014856bdfe265672f9d4b86a060a7aba')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD
index fed53f811..42d4f1c32 100644
--- a/extra/eclipse/PKGBUILD
+++ b/extra/eclipse/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167250 2012-09-29 11:01:30Z ibiru $
+# $Id: PKGBUILD 179518 2013-03-05 19:33:11Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Andrew Wright <andreww@photism.org>
@@ -6,25 +6,24 @@
 # Contributor: Marco Crosio <marco.crosio@gmail.com>
 
 pkgname=eclipse
-pkgver=4.2.1
+pkgver=4.2.2
 pkgrel=1
-_date=201209141800/
+_date=201302041200
 pkgdesc="An IDE for Java and other languages"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://eclipse.org"
 depends=('java-environment' 'gtk2' 'unzip' 'libwebkit' 'libxtst')
 install=${pkgname}.install
 makedepends=('zip')
-conflicts=('xulrunner')
 license=("EPL/1.1")
 source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk.tar.gz"
 	 'eclipse.sh' 'eclipse.desktop' 'eclipse.svg')
-md5sums=('b7e954f547f30704a92fd13895de6d6e'
+md5sums=('daa539af97a5cf4fb8ae1d7675b9625b'
          '7ea99a30fbaf06ec29261541b8eb1e23'
          'ba2cf02c48e6e35bfe3685401c26bb5b'
          '77cff7543ccf7e177cb6667f5a20ce19')
 [ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk-$CARCH.tar.gz"
-[ "$CARCH" = "x86_64" ] && md5sums[0]='256a04925c033602e5dc479542f7a196'
+[ "$CARCH" = "x86_64" ] && md5sums[0]='902102ec85539f4c9342b2c1c4c67f64'
 
 package() {
   # install eclipse
@@ -48,5 +47,5 @@ package() {
   # install icon
   install -Dm644 "$srcdir"/eclipse.svg \
     "$pkgdir"/usr/share/icons/hicolor/scalable/apps/eclipse.svg
-  sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" "$pkgdir"/usr/share/eclipse/plugins/org.apache.ant_1.8.3.v20120321-1730/bin/runant.py
+  sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" "$pkgdir"/usr/share/eclipse/plugins/org.apache.ant_1.8.3.v201301120609/bin/runant.py
 }
diff --git a/extra/ecore/PKGBUILD b/extra/ecore/PKGBUILD
index 07df5e6c7..441deff88 100644
--- a/extra/ecore/PKGBUILD
+++ b/extra/ecore/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=ecore
 pkgver=1.7.5
-pkgrel=1
+pkgrel=1.1
 pkgdesc="OS abstraction layer for e17"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD
index 49678eeb0..1260bc4c1 100644
--- a/extra/edje/PKGBUILD
+++ b/extra/edje/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=edje
 pkgver=1.7.5
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A graphical design and layout library based on Evas"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
diff --git a/extra/efibootmgr/PKGBUILD b/extra/efibootmgr/PKGBUILD
index bc09be45f..d97c9587f 100755
--- a/extra/efibootmgr/PKGBUILD
+++ b/extra/efibootmgr/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=efibootmgr
 pkgver=0.6.0
 pkgrel=1
 pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables."
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://linux.dell.com/efibootmgr/"
 license=('GPL2')
 depends=('zlib' 'pciutils')
diff --git a/extra/efibootmgr/efibootmgr_after_0.5.4_git.patch b/extra/efibootmgr/efibootmgr_after_0.5.4_git.patch
deleted file mode 100755
index 5b9b6f825..000000000
--- a/extra/efibootmgr/efibootmgr_after_0.5.4_git.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c
-index 5db0d9e..199af39 100644
---- a/src/efibootmgr/efibootmgr.c
-+++ b/src/efibootmgr/efibootmgr.c
-@@ -328,6 +328,7 @@ add_to_boot_order(uint16_t num)
- 	/* Now new_data has what we need */
- 	memcpy(&(boot_order.Data), new_data, new_data_size);
- 	boot_order.DataSize = new_data_size;
-+	free(new_data);
- 	return create_or_edit_variable(&boot_order);
- }
- 
-diff --git a/src/include/disk.h b/src/include/disk.h
-index eb93d10..8aa37d7 100644
---- a/src/include/disk.h
-+++ b/src/include/disk.h
-@@ -65,6 +65,9 @@ enum _interface_type {interface_type_unknown,
- 		      ata, atapi, scsi, usb,
- 		      i1394, fibre, i2o, md};
- 
-+
-+unsigned int lcm(unsigned int x, unsigned int y);
-+
- int disk_get_pci(int fd,
- 		 unsigned char *bus,
- 		 unsigned char *device,
-diff --git a/src/lib/disk.c b/src/lib/disk.c
-index 883864f..8ad590b 100644
---- a/src/lib/disk.c
-+++ b/src/lib/disk.c
-@@ -55,7 +55,7 @@ disk_info_from_fd(int fd,
- 		return 1;
- 	}
- 	major = buf.st_dev >> 8;
--	minor = buf.st_dev && 0xFF;
-+	minor = buf.st_dev & 0xFF;
- 
- 	/* IDE disks can have up to 64 partitions, or 6 bits worth,
- 	 * and have one bit for the disk number.
-@@ -420,6 +420,27 @@ get_sector_size(int filedes)
- 	return sector_size;
- }
- 
-+/************************************************************
-+ * lcm
-+ * Requires:
-+ * - numbers of which to find the lowest common multiple
-+ * Modifies: nothing
-+ * Returns:
-+ *  lowest common multiple of x and y
-+ ************************************************************/
-+unsigned int
-+lcm(unsigned int x, unsigned int y)
-+{
-+	unsigned int m = x, n = y, o;
-+
-+	while ((o = m % n)) {
-+		m = n;
-+		n = o;
-+	}
-+
-+	return (x / n) * y;
-+}
-+
- /**
-  * disk_get_partition_info()
-  *  @fd - open file descriptor to disk
-@@ -442,26 +463,27 @@ disk_get_partition_info (int fd,
- 			 uint8_t *mbr_type, uint8_t *signature_type)
- {
- 	legacy_mbr *mbr;
--	void *mbr_unaligned;
-+	void *mbr_sector;
-+	size_t mbr_size;
- 	off_t offset;
- 	int this_bytes_read = 0;
- 	int gpt_invalid=0, mbr_invalid=0;
- 	int rc=0;
- 	int sector_size = get_sector_size(fd);
- 
--	if (sizeof(*mbr) != sector_size)
--		return 1;
--	mbr_unaligned = malloc(sizeof(*mbr)+sector_size-1);
--	mbr = (legacy_mbr *)
--		(((unsigned long)mbr_unaligned + sector_size - 1) &
--		 ~(unsigned long)(sector_size-1));
--	memset(mbr, 0, sizeof(*mbr));
-+
-+	mbr_size = lcm(sizeof(*mbr), sector_size);
-+	if ((rc = posix_memalign(&mbr_sector, sector_size, mbr_size)) != 0)
-+		goto error;
-+	memset(mbr_sector, '\0', mbr_size);
-+
- 	offset = lseek(fd, 0, SEEK_SET);
--	this_bytes_read = read(fd, mbr, sizeof(*mbr));
-+	this_bytes_read = read(fd, mbr_sector, mbr_size);
- 	if (this_bytes_read < sizeof(*mbr)) {
- 		rc=1;
- 		goto error_free_mbr;
- 	}
-+	mbr = (legacy_mbr *)mbr_sector;
- 	gpt_invalid = gpt_disk_get_partition_info(fd, num,
- 						  start, size,
- 						  signature,
-@@ -479,7 +501,8 @@ disk_get_partition_info (int fd,
- 		}
- 	}
-  error_free_mbr:
--	free(mbr_unaligned);
-+	free(mbr_sector);
-+ error:
- 	return rc;
- }
- 
-diff --git a/src/lib/gpt.c b/src/lib/gpt.c
-index d90ddaf..83e7a94 100644
---- a/src/lib/gpt.c
-+++ b/src/lib/gpt.c
-@@ -215,26 +215,24 @@ read_lastoddsector(int fd, uint64_t lba, void *buffer, size_t count)
- static ssize_t
- read_lba(int fd, uint64_t lba, void *buffer, size_t bytes)
- {
--	int sector_size = get_sector_size(fd);
--	off_t offset = lba * sector_size;
-+        int sector_size = get_sector_size(fd);
-+        off_t offset = lba * sector_size;
-         ssize_t bytesread;
--        void *aligned;
--        void *unaligned;
--
--        if (bytes % sector_size)
--                return EINVAL;
-+        void *iobuf;
-+        size_t iobuf_size;
-+        int rc;
- 
--	unaligned = malloc(bytes+sector_size-1);
--	aligned = (void *)
--		(((unsigned long)unaligned + sector_size - 1) &
--		 ~(unsigned long)(sector_size-1));
--	memset(aligned, 0, bytes);
-+        iobuf_size = lcm(bytes, sector_size);
-+        rc = posix_memalign(&iobuf, sector_size, iobuf_size);
-+        if (rc)
-+                return rc;
-+        memset(iobuf, 0, bytes);
- 
- 
--	lseek(fd, offset, SEEK_SET);
--	bytesread = read(fd, aligned, bytes);
--        memcpy(buffer, aligned, bytesread);
--        free(unaligned);
-+        lseek(fd, offset, SEEK_SET);
-+        bytesread = read(fd, iobuf, iobuf_size);
-+        memcpy(buffer, iobuf, bytes);
-+        free(iobuf);
- 
-         /* Kludge.  This is necessary to read/write the last
-            block of an odd-sized disk, until Linux 2.5.x kernel fixes.
diff --git a/extra/efibootmgr/efibootmgr_default_to_grub2.patch b/extra/efibootmgr/efibootmgr_default_to_grub2.patch
deleted file mode 100755
index 35207298f..000000000
--- a/extra/efibootmgr/efibootmgr_default_to_grub2.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c
-index 199af39..3826e03 100644
---- a/src/efibootmgr/efibootmgr.c
-+++ b/src/efibootmgr/efibootmgr.c
-@@ -18,7 +18,7 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- 
--  This must tie the EFI_DEVICE_PATH to /boot/efi/elilo.efi
-+  This must tie the EFI_DEVICE_PATH to /boot/efi/EFI/arch_grub/grubx64.efi
-   The  EFI_DEVICE_PATH will look something like:
-     ACPI device path, length 12 bytes
-     Hardware Device Path, PCI, length 6 bytes
-@@ -26,7 +26,7 @@
-     Media Device Path, Hard Drive, partition XX, length 30 bytes
-     Media Device Path, File Path, length ??
-     End of Hardware Device Path, length 4
--    Arguments passed to elilo, as UCS-2 characters, length ??
-+    Arguments passed to grub2, as UCS-2 characters, length ??
- 
- */
- 
-@@ -780,8 +780,8 @@ usage()
- 	printf("\t-g | --gpt            force disk with invalid PMBR to be treated as GPT\n");
- 	printf("\t-H | --acpi_hid XXXX  set the ACPI HID (used with -i)\n");
- 	printf("\t-i | --iface name     create a netboot entry for the named interface\n");
--	printf("\t-l | --loader name     (defaults to \\elilo.efi)\n");
--	printf("\t-L | --label label     Boot manager display label (defaults to \"Linux\")\n");
-+	printf("\t-l | --loader name     (defaults to \\EFI\\arch_grub\\grubx64.efi)\n");
-+	printf("\t-L | --label label     Boot manager display label (defaults to \"Arch Linux (GRUB2)\")\n");
- 	printf("\t-n | --bootnext XXXX   set BootNext to XXXX (hex)\n");
- 	printf("\t-N | --delete-bootnext delete BootNext\n");
- 	printf("\t-o | --bootorder XXXX,YYYY,ZZZZ,...     explicitly set BootOrder (hex)\n");
-@@ -808,8 +808,8 @@ set_default_opts()
- 	opts.active          = -1;   /* Don't set it */
- 	opts.timeout         = -1;   /* Don't set it */
- 	opts.edd10_devicenum = 0x80;
--	opts.loader          = "\\elilo.efi";
--	opts.label           = "Linux";
-+	opts.loader          = "\\EFI\\arch_grub\\grubx64.efi";
-+	opts.label           = "Arch Linux (GRUB2)";
- 	opts.disk            = "/dev/sda";
- 	opts.iface           = NULL;
- 	opts.part            = 1;
-
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 942c210d7..3b2380f05 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176284 2013-01-28 16:48:16Z stephane $
+# $Id: PKGBUILD 183345 2013-04-21 22:08:47Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
-pkgver=4.0.0
-pkgrel=2
+pkgver=4.0.1
+pkgrel=3
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
@@ -13,16 +13,15 @@ depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'g
 makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
 optdepends=('evolution-data-server: Evolution integration')
 options=(!emptydirs)
-groups=('gnome-extra')
 install=ekiga.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('69c544fb0f2e9cb425b9dae131b01e256ad20fd597f1faf0c28f5930b0f1d998')
+sha256sums=('5f4f491c9496cf65ba057a9345d6bb0278f4eca07bcda5baeecf50bfcd9a4a3b')
 
 build() {
   cd "$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-schemas-install \
-      --disable-scrollkeeper --enable-dbus
+      --disable-scrollkeeper --enable-dbus --enable-avahi
   make
 }
 
diff --git a/extra/ekiga/gcc47.patch b/extra/ekiga/gcc47.patch
deleted file mode 100644
index f12c37524..000000000
--- a/extra/ekiga/gcc47.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From f81a43f2c4ed5e5083e3a850bc7164d11a910358 Mon Sep 17 00:00:00 2001
-From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr>
-Date: Sat, 24 Mar 2012 09:17:40 +0000
-Subject: Fix compile error with gcc 4.7
-
----
-diff --git a/lib/engine/account/bank-impl.h b/lib/engine/account/bank-impl.h
-index e16848e..b0a8775 100644
---- a/lib/engine/account/bank-impl.h
-+++ b/lib/engine/account/bank-impl.h
-@@ -203,7 +203,7 @@ template<typename AccountType>
- void
- Ekiga::BankImpl<AccountType>::add_account (boost::shared_ptr<AccountType> account)
- {
--  add_object (account);
-+  this->add_object (account);
- 
-   account->questions.connect (boost::ref (questions));
- }
-@@ -213,7 +213,7 @@ template<typename AccountType>
- void
- Ekiga::BankImpl<AccountType>::remove_account (boost::shared_ptr<AccountType> account)
- {
--  remove_object (account);
-+  this->remove_object (account);
- }
- 
- #endif
-diff --git a/lib/engine/addressbook/book-impl.h b/lib/engine/addressbook/book-impl.h
-index 711d8d9..4fea7d5 100644
---- a/lib/engine/addressbook/book-impl.h
-+++ b/lib/engine/addressbook/book-impl.h
-@@ -204,7 +204,7 @@ void
- Ekiga::BookImpl<ContactType>::add_contact (boost::shared_ptr<ContactType> contact)
- {
-   contact->questions.connect (boost::ref (questions));
--  add_object (contact);
-+  this->add_object (contact);
- }
- 
- 
-@@ -212,7 +212,7 @@ template<typename ContactType>
- void
- Ekiga::BookImpl<ContactType>::remove_contact (boost::shared_ptr<ContactType> contact)
- {
--  remove_object (contact);
-+  this->remove_object (contact);
- }
- 
- #endif
-diff --git a/lib/engine/addressbook/source-impl.h b/lib/engine/addressbook/source-impl.h
-index a30cd03..630236f 100644
---- a/lib/engine/addressbook/source-impl.h
-+++ b/lib/engine/addressbook/source-impl.h
-@@ -206,7 +206,7 @@ template<typename BookType>
- void
- Ekiga::SourceImpl<BookType>::add_book (boost::shared_ptr<BookType> book)
- {
--  add_object (book);
-+  this->add_object (book);
- 
-   add_connection (book, book->contact_added.connect (boost::bind (boost::ref (contact_added), book, _1)));
- 
-diff --git a/lib/engine/presence/cluster-impl.h b/lib/engine/presence/cluster-impl.h
-index 245a7c6..92074a8 100644
---- a/lib/engine/presence/cluster-impl.h
-+++ b/lib/engine/presence/cluster-impl.h
-@@ -147,7 +147,7 @@ Ekiga::ClusterImpl<HeapType>::add_heap (boost::shared_ptr<HeapType> heap)
- 
-   add_connection (heap, heap->questions.connect (boost::ref (questions)));
- 
--  add_object (heap);
-+  this->add_object (heap);
- }
- 
- template<typename HeapType>
-diff --git a/lib/engine/presence/heap-impl.h b/lib/engine/presence/heap-impl.h
-index d63c491..15fe86f 100644
---- a/lib/engine/presence/heap-impl.h
-+++ b/lib/engine/presence/heap-impl.h
-@@ -160,14 +160,14 @@ Ekiga::HeapImpl<PresentityType>::add_presentity (boost::shared_ptr<PresentityTyp
- {
-   presentity->questions.connect (boost::ref (questions));
- 
--  add_object (presentity);
-+  this->add_object (presentity);
- }
- 
- template<typename PresentityType>
- void
- Ekiga::HeapImpl<PresentityType>::remove_presentity (boost::shared_ptr<PresentityType> presentity)
- {
--  remove_object (presentity);
-+  this->remove_object (presentity);
- }
- 
- #endif
---
-cgit v0.9.0.2
diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD
index 302e795f4..871fa18ee 100644
--- a/extra/elementary/PKGBUILD
+++ b/extra/elementary/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=elementary
 pkgver=1.7.5
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Enlightenment's widget set"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
diff --git a/extra/elfutils/elfutils-0.154-binutils-pr-ld-13621.patch b/extra/elfutils/elfutils-0.154-binutils-pr-ld-13621.patch
deleted file mode 100644
index 06dba1ea6..000000000
--- a/extra/elfutils/elfutils-0.154-binutils-pr-ld-13621.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/tests/run-elflint-self.sh b/tests/run-elflint-self.sh
-index 8aca9e1..d449416 100755
---- a/tests/run-elflint-self.sh
-+++ b/tests/run-elflint-self.sh
-@@ -51,4 +51,4 @@ runtest ../libebl/libebl_sh.so
- runtest ../libebl/libebl_sparc.so
- runtest ../libebl/libebl_x86_64.so
- 
--exit $status
-+test $status == 0 || echo "binutils PR ld/13621 workaround"
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index 36c7e995f..9d9e9657f 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 175859 2013-01-23 00:12:50Z eric $
+# $Id: PKGBUILD 180309 2013-03-20 02:35:30Z eric $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
 
 pkgname=emacs
-pkgver=24.2
-pkgrel=4
+pkgver=24.3
+pkgrel=1
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
 depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
 install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig})
-md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158')
-
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig})
+md5sums=('ea9ed000ca165280265aabb55b9afbd7'
+         '3f6990fabfbe1d5f3cd58bace4eb20f1')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
@@ -29,6 +29,8 @@ package() {
   # remove conflict with ctags package
   mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
   mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
+  # remove conflict with texinfo
+  rm "$pkgdir"/usr/share/info/info.info.gz
   # fix user/root permissions on usr/share files
   find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \;
   # fix perms on /var/games
diff --git a/extra/emacs/emacs-23.3-xgselect_init.patch b/extra/emacs/emacs-23.3-xgselect_init.patch
deleted file mode 100644
index f3168e0e2..000000000
--- a/extra/emacs/emacs-23.3-xgselect_init.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up emacs-23.3/src/xgselect.c.xgselect_init emacs-23.3/src/xgselect.c
---- emacs-23.3/src/xgselect.c.xgselect_init	2011-01-08 18:45:14.000000000 +0100
-+++ emacs-23.3/src/xgselect.c	2011-11-11 13:00:53.211765255 +0100
-@@ -55,6 +55,9 @@ xg_select (max_fds, rfds, wfds, efds, ti
-   do {
-     if (n_gfds > gfds_size) 
-       {
-+        if (gfds_size == 0)
-+          xgselect_initialize ();
-+
-         while (n_gfds > gfds_size) 
-           gfds_size *= 2;
-         xfree (gfds);
diff --git a/extra/emacs/emacs-subversion17.patch b/extra/emacs/emacs-subversion17.patch
deleted file mode 100644
index e7969de81..000000000
--- a/extra/emacs/emacs-subversion17.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From d7afd9288e22c466b63c27e7e11783589b07aeff Mon Sep 17 00:00:00 2001
-From: Karl Pflästerer <k@rl.pflaesterer.de>
-Date: Sat, 12 Feb 2011 01:12:53 +0000
-Subject: Adapt to Subversion change, with no .svn directory in each sub directory.
-
-http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00357.html
-
-* vc/vc-svn.el (vc-svn-registered): Use vc-svn-root.
-(vc-svn-root): New function.  Make vc-svn-responsible-p an alias.
-(vc-svn-repository-hostname): Use "svn info".
----
-(limited to 'lisp/vc/vc-svn.el')
-
-diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
-index aefef50..20c7689 100644
---- a/lisp/vc-svn.el
-+++ b/lisp/vc-svn.el
-@@ -117,17 +117,13 @@ If you want to force an empty list of arguments, use t."
- ;;;###autoload                                (getenv "SVN_ASP_DOT_NET_HACK"))
- ;;;###autoload                           "_svn")
- ;;;###autoload                          (t ".svn"))))
--;;;###autoload     (when (file-readable-p (expand-file-name
--;;;###autoload                             (concat admin-dir "/entries")
--;;;###autoload                             (file-name-directory f)))
-+;;;###autoload     (when (vc-find-root f admin-dir)
- ;;;###autoload       (load "vc-svn")
- ;;;###autoload       (vc-svn-registered f))))
- 
- (defun vc-svn-registered (file)
-   "Check if FILE is SVN registered."
--  (when (file-readable-p (expand-file-name (concat vc-svn-admin-directory
--						   "/entries")
--					   (file-name-directory file)))
-+  (when (vc-svn-root file)
-     (with-temp-buffer
-       (cd (file-name-directory file))
-       (let* (process-file-side-effects
-@@ -275,14 +271,12 @@ Passes either `vc-svn-register-switches' or `vc-register-switches'
- to the SVN command."
-   (apply 'vc-svn-command nil 0 files "add" (vc-switches 'SVN 'register)))
- 
--(defun vc-svn-responsible-p (file)
--  "Return non-nil if SVN thinks it is responsible for FILE."
--  (file-directory-p (expand-file-name vc-svn-admin-directory
--				      (if (file-directory-p file)
--					  file
--					(file-name-directory file)))))
-+(defun vc-svn-root (file)
-+  (vc-find-root file vc-svn-admin-directory))
- 
--(defalias 'vc-svn-could-register 'vc-svn-responsible-p
-+(defalias 'vc-svn-responsible-p 'vc-svn-root)
-+
-+(defalias 'vc-svn-could-register 'vc-svn-root
-   "Return non-nil if FILE could be registered in SVN.
- This is only possible if SVN is responsible for FILE's directory.")
- 
-@@ -594,20 +588,10 @@ and that it passes `vc-svn-global-switches' to it before FLAGS."
- 
- (defun vc-svn-repository-hostname (dirname)
-   (with-temp-buffer
--    (let ((coding-system-for-read
--	   (or file-name-coding-system
--	       default-file-name-coding-system)))
--      (vc-insert-file (expand-file-name (concat vc-svn-admin-directory
--						"/entries")
--					dirname)))
-+    (let (process-file-side-effects)
-+      (vc-svn-command t t dirname "info" "--xml"))
-     (goto-char (point-min))
--    (when (re-search-forward
--	   ;; Old `svn' used name="svn:this_dir", newer use just name="".
--	   (concat "name=\"\\(?:svn:this_dir\\)?\"[\n\t ]*"
--		   "\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?"
--		   "url=\"\\(?1:[^\"]+\\)\""
--                   ;; Yet newer ones don't use XML any more.
--                   "\\|^\ndir\n[0-9]+\n\\(?1:.*\\)") nil t)
-+    (when (re-search-forward "<url>\\(.*\\)</url>" nil t)
-       ;; This is not a hostname but a URL.  This may actually be considered
-       ;; as a feature since it allows vc-svn-stay-local to specify different
-       ;; behavior for different modules on the same server.
---
-cgit v0.9.0.2
diff --git a/extra/emacs/emacs.install b/extra/emacs/emacs.install
index fa9ffeeb1..6712f44ba 100644
--- a/extra/emacs/emacs.install
+++ b/extra/emacs/emacs.install
@@ -1,11 +1,11 @@
 ICON_PATH=usr/share/icons/hicolor
 INFO_DIR=usr/share/info
 
-INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
+INFO_FILES=(ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse
 ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake
-forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
+forms gnus htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode
 org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
-speedbar tramp url vip viper widget woman)
+speedbar srecode tramp url vip viper widget wisent woman)
 
 post_install() {
   gtk-update-icon-cache -q -t -f ${ICON_PATH}
@@ -13,7 +13,7 @@ post_install() {
 
   [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
-    install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+    install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }
 
@@ -27,6 +27,6 @@ pre_remove() {
 
   [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
-    install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+    install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }
diff --git a/extra/embryo/PKGBUILD b/extra/embryo/PKGBUILD
index 9d9c9cfc4..9b41cb23e 100644
--- a/extra/embryo/PKGBUILD
+++ b/extra/embryo/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=embryo
 pkgver=1.7.5
-pkgrel=1
+pkgrel=1.1
 pkgdesc="implementation of a C like scripting language for e17"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
diff --git a/extra/emelfm2/PKGBUILD b/extra/emelfm2/PKGBUILD
deleted file mode 100644
index 899956829..000000000
--- a/extra/emelfm2/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 174286 2013-01-03 23:03:36Z eric $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: contrasutra
-
-pkgname=emelfm2
-pkgver=0.8.2
-pkgrel=1
-pkgdesc="A file manager that implements the popular two-pane design"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://emelfm2.net/"
-depends=('gtk2')
-license=('GPL3')
-source=("http://emelfm2.net/rel/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('d4498285ae77f0d524ce9be11d50a0aae9569e5f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make PREFIX=/usr
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make PREFIX="${pkgdir}/usr" install install_i18n
-
-  install -m 755 "${pkgdir}/usr/share/pixmaps/emelfm2/emelfm2_48.png" \
-      "${pkgdir}/usr/share/pixmaps/emelfm2.png"
-  sed -e '/Icon=/ s^emelfm2/emelfm2_48.png^emelfm2.png^' \
-      -e '/Categories=/ s^;$^;Application;Utility;^' \
-      -i "${pkgdir}/usr/share/applications/emelfm2.desktop"
-}
diff --git a/extra/emotion/PKGBUILD b/extra/emotion/PKGBUILD
index 9fcf6dc4b..cf3c72473 100644
--- a/extra/emotion/PKGBUILD
+++ b/extra/emotion/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=emotion
 pkgver=1.7.5
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Library to easily integrate media playback into EFL applications"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index 225d7a86a..3e2eb0c07 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,35 +1,32 @@
-# $Id: PKGBUILD 175978 2013-01-25 14:51:01Z ioni $
+# $Id: PKGBUILD 183346 2013-04-21 22:08:49Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=empathy
-pkgver=3.6.3
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Empathy"
-license=('GPL2')
-depends=('clutter-gst' 'clutter-gtk' 'folks' 'gcr' 'iso-codes' 'libcanberra' 'libpulse' 'webkitgtk3' 'telepathy-farstream' 'telepathy-glib' 'telepathy-logger' 'telepathy-mission-control')
-makedepends=('intltool' 'itstool' 'docbook-xsl' 'nautilus-sendto')
+license=(GPL2)
+depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkitgtk3 telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control)
+makedepends=(intltool itstool docbook-xsl python2)
 optdepends=('telepathy-gabble: XMPP/Jabber support'
             'telepathy-idle: IRC support'
             'telepathy-salut: Link-local XMPP support'
             'telepathy-rakia: SIP support'
-            'telepathy-haze: libpurple support'
-            'nautilus-sendto: Send files from nautilus')
+            'telepathy-haze: libpurple support')
 options=('!libtool' '!makeflags')
-groups=('gnome-extra')
+groups=(gnome)
 install=empathy.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('eaae20e8e9b8660979ed7a9a65deba61d6d795c6f698e684f21c3821f042704d')
+sha256sums=('45accc06e9c1711741b0f1476971c7e705b57ea0718a2b10ee66c5dd0397b917')
 
 build() {
   cd $pkgname-$pkgver
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
       --sysconfdir=/etc  \
       --libexecdir=/usr/lib/empathy \
-      --disable-static \
-      --disable-schemas-compile \
-      --enable-gst-1.0=yes
+      --disable-static
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD
index 53bf7c365..1ecd13eff 100644
--- a/extra/enblend-enfuse/PKGBUILD
+++ b/extra/enblend-enfuse/PKGBUILD
@@ -1,38 +1,31 @@
-# $Id: PKGBUILD 176285 2013-01-28 16:48:18Z stephane $
+# $Id: PKGBUILD 183281 2013-04-20 16:41:14Z heftig $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=enblend-enfuse
-pkgver=4.0
-pkgrel=9
+pkgver=4.1.1
+pkgrel=1
 pkgdesc="Intelligent blend tool for overlapping picture"
 arch=("i686" "x86_64" 'mips64el')
 license=('GPL')
 url="http://enblend.sourceforge.net"
-depends=('openexr' 'glew' 'libxmi' 'freeglut' 'lcms' 'libpng' 'boost-libs')
+depends=('openexr' 'glew' 'freeglut' 'lcms2' 'boost-libs' 'vigra' 'gsl')
 makedepends=('boost' 'mesa')
 replaces=('enblend')
 conflicts=('enblend')
 provides=('enblend')
 install=${pkgname}.install
-source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz{,.asc} \
-        libpng-1.4.patch enblend-4.0-libpng15.patch)
-sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033'
-          'aac6364b29b0a9d6c61c3db0982f52ce1579e934'
-          'eae6cf48ea082865130302d0b4d1ca0b884a563b'
-          '71e961d90be842eafe9d473d8d70b04b29077036')
+source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('bc18fca3033b031d603b22678b2e680a0ffae1b6')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
-  sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx
-  patch -p1 -i ../libpng-1.4.patch
-  patch -p0 -i ../enblend-4.0-libpng15.patch
-  LIBS="-lboost_system" ./configure --prefix=/usr
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info"
   install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info"
diff --git a/extra/enblend-enfuse/enblend-4.0-libpng15.patch b/extra/enblend-enfuse/enblend-4.0-libpng15.patch
deleted file mode 100644
index d4465ccad..000000000
--- a/extra/enblend-enfuse/enblend-4.0-libpng15.patch
+++ /dev/null
@@ -1,220 +0,0 @@
---- src/vigra_impex/png.cxx
-+++ src/vigra_impex/png.cxx
-@@ -81,7 +81,7 @@
- static void PngError( png_structp png_ptr, png_const_charp error_msg )
- {
-     png_error_message = std::string(error_msg);
--    longjmp( png_ptr->jmpbuf, 1 );
-+    longjmp( png_jmpbuf( png_ptr ), 1 );
- }
- 
- // called on non-fatal errors
-@@ -213,7 +213,7 @@
-         vigra_postcondition( png != 0, "could not create the read struct." );
- 
-         // create info struct
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
-         }
-@@ -221,14 +221,14 @@
-         vigra_postcondition( info != 0, "could not create the info struct." );
- 
-         // init png i/o
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
-         }
-         png_init_io( png, file.get() );
- 
-         // specify that the signature was already read
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
-         }
-@@ -244,13 +244,13 @@
-     void PngDecoderImpl::init()
-     {
-         // read all chunks up to the image data
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
-         png_read_info( png, info );
- 
-         // pull over the header fields
-         int interlace_method, compression_method, filter_method;
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
-         png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
-                       &interlace_method, &compression_method, &filter_method );
-@@ -264,7 +264,7 @@
- 
-         // transform palette to rgb
-         if ( color_type == PNG_COLOR_TYPE_PALETTE) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
-             png_set_palette_to_rgb(png);
-             color_type = PNG_COLOR_TYPE_RGB;
-@@ -273,7 +273,7 @@
- 
-         // expand gray values to at least one byte size
-         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-             png_set_expand_gray_1_2_4_to_8(png);
-             bit_depth = 8;
-@@ -283,7 +283,7 @@
- #if 0
-         // strip alpha channel
-         if ( color_type & PNG_COLOR_MASK_ALPHA ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
-             png_set_strip_alpha(png);
-             color_type ^= PNG_COLOR_MASK_ALPHA;
-@@ -323,12 +323,12 @@
- 
-         // read icc profile
- #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
--        char * dummyName;
-+        png_charpp dummyName;
-         int dummyCompType;
--        char * profilePtr;
-+        png_bytepp profilePtr;
-         png_uint_32 profileLen;
--        if (info->valid & PNG_INFO_iCCP) {
--            png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
-+        if (png_get_valid(png, info, PNG_INFO_iCCP)) {
-+            png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ;
-             iccProfilePtr = (unsigned char *) profilePtr;
-             iccProfileLength = profileLen;
-         }
-@@ -340,7 +340,7 @@
-         // image gamma
-         double image_gamma = 0.45455;
-         if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
-             png_get_gAMA( png, info, &image_gamma );
-         }
-@@ -349,26 +349,26 @@
-         double screen_gamma = 2.2;
- 
-         // set gamma correction
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
-         png_set_gamma( png, screen_gamma, image_gamma );
- #endif
- 
-         // interlace handling, get number of read passes needed
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
-         n_interlace_passes = png_set_interlace_handling(png);
- 
-         // update png library state to reflect any changes that were made
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
-         png_read_update_info( png, info );
- 
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
-         n_channels = png_get_channels(png, info);
- 
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
-         rowsize = png_get_rowbytes(png, info);
- 
-@@ -379,7 +379,7 @@
-     void PngDecoderImpl::nextScanline()
-     {
-         for (int i=0; i < n_interlace_passes; i++) {
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
-             png_read_row(png, row_data.begin(), NULL);
-         }
-@@ -545,7 +545,7 @@
-         vigra_postcondition( png != 0, "could not create the write struct." );
- 
-         // create info struct
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_write_struct( &png, &info );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
-         }
-@@ -556,7 +556,7 @@
-         }
- 
-         // init png i/o
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_write_struct( &png, &info );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
-         }
-@@ -571,7 +571,7 @@
-     void PngEncoderImpl::finalize()
-     {
-         // write the IHDR
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
-         png_set_IHDR( png, info, width, height, bit_depth, color_type,
-                       PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-@@ -579,7 +579,7 @@
- 
-         // set resolution
-         if (x_resolution > 0 && y_resolution > 0) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
-             png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5),
-                          (png_uint_32) (y_resolution / 0.0254 + 0.5),
-@@ -588,7 +588,7 @@
- 
-         // set offset
-         if (position.x > 0 && position.y > 0) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
-             png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
-         }
-@@ -597,12 +597,12 @@
-         // set icc profile
-         if (iccProfile.size() > 0) {
-             png_set_iCCP(png, info, "icc", 0,
--                         (char *)iccProfile.begin(), iccProfile.size());
-+                         iccProfile.begin(), iccProfile.size());
-         }
- #endif
- 
-         // write the info struct
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
-         png_write_info( png, info );
- 
-@@ -634,10 +634,10 @@
-         }
- 
-         // write the whole image
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
-         png_write_image( png, row_pointers.begin() );
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
-         png_write_end(png, info);
-     }
diff --git a/extra/enblend-enfuse/libpng-1.4.patch b/extra/enblend-enfuse/libpng-1.4.patch
deleted file mode 100644
index 3bf852b58..000000000
--- a/extra/enblend-enfuse/libpng-1.4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx enblend-enfuse-3.2/src/vigra_impex/png.cxx
---- enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx	2010-01-19 22:09:36.000000000 -0500
-+++ enblend-enfuse-3.2/src/vigra_impex/png.cxx	2010-01-19 22:13:43.000000000 -0500
-@@ -275,8 +275,8 @@
-         // expand gray values to at least one byte size
-         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
-             if (setjmp(png->jmpbuf))
--                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
--            png_set_gray_1_2_4_to_8(png);
-+                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+            png_set_expand_gray_1_2_4_to_8(png);
-             bit_depth = 8;
-         }
- 
diff --git a/extra/enca/PKGBUILD b/extra/enca/PKGBUILD
index 3481694b1..cc45732a9 100644
--- a/extra/enca/PKGBUILD
+++ b/extra/enca/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=enca
 pkgver=1.14
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Charset analyser and converter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cihar.com/software/enca/"
diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD
index c521f4c4f..fdb45581b 100644
--- a/extra/enlightenment/PKGBUILD
+++ b/extra/enlightenment/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 167950 2012-10-04 04:38:27Z eric $
+# $Id: PKGBUILD 182782 2013-04-15 06:46:47Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=enlightenment
-pkgver=1.0.11
+pkgver=1.0.13
 _themever=1.0.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A fast, flexible, and very extensible Window Manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD' 'custom')
 depends=('libxinerama' 'imlib2' 'perl' 'pango' 'libxcomposite' \
-         'libxdamage' 'libxrandr' 'libpulse' 'audiofile')
+         'libxrandr' 'libpulse')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/e16-${pkgver}.tar.gz \
         http://downloads.sourceforge.net/enlightenment/e16-themes-${_themever}.tar.gz)
-sha1sums=('146028c39b3148fdd3e247dfb29ef8ec6b9cf10d'
+sha1sums=('bcb74385fb6d0732f735f27264ae02b539d136c9'
           'ae34e2df1294198795736bf953bf695aba93b710')
 
 build() {
diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD
index 18edd1fd2..112814b34 100644
--- a/extra/eog-plugins/PKGBUILD
+++ b/extra/eog-plugins/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169864 2012-10-30 22:25:02Z heftig $
+# $Id: PKGBUILD 183348 2013-04-21 22:08:51Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=eog-plugins
-pkgver=3.6.1
-pkgrel=1
+pkgver=3.8.0
+pkgrel=2
 pkgdesc="Plugins for Eye of Gnome"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org/"
@@ -12,9 +12,8 @@ depends=('eog' 'libchamplain' 'libgdata')
 makedepends=('intltool')
 install=eog-plugins.install
 options=('!libtool')
-groups=(gnome-extra)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0270ae05f6cdd9c73472323370c4779f1148c77f3f8890c89fb8488cf83051ac')
+sha256sums=('a7e4822c46654f67ef25cbc82e4c955ee84ecae92cf356e15a136032cff35e78')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD
index 9154b425f..e0dd58e42 100644
--- a/extra/eog/PKGBUILD
+++ b/extra/eog/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 170865 2012-11-12 20:14:53Z heftig $
+# $Id: PKGBUILD 183347 2013-04-21 22:08:50Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=eog
-pkgver=3.6.2
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="Eye of Gnome: An image viewing and cataloging program"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('gnome-desktop' 'libexif' 'lcms2' 'desktop-file-utils' 'exempi' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf')
-makedepends=('gtk-doc' 'intltool' 'itstool')
+arch=(i686 x86_64 mips64el)
+license=(GPL)
+depends=(gnome-desktop libexif lcms2 desktop-file-utils exempi libpeas librsvg gnome-icon-theme dconf)
+makedepends=(gtk-doc intltool itstool)
 install=eog.install
-groups=('gnome-extra')
+groups=(gnome)
 options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5879f26a11fa7cd2fa4038e5c51d31e4959456be4fba570dcde89ed0d966ffda')
+sha256sums=('0f2f6f1eb1a373b2a6f8e5627b20815e5bf13b8c856b67d8f72d2a10b6012f2b')
 
 build() {
   cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+  ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var
   make
 }
diff --git a/extra/epiphany-extensions/PKGBUILD b/extra/epiphany-extensions/PKGBUILD
index 3e8505de1..cca3a1c57 100644
--- a/extra/epiphany-extensions/PKGBUILD
+++ b/extra/epiphany-extensions/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=epiphany-extensions
 pkgver=3.6.0
-pkgrel=1
+pkgrel=1.1
 url="http://www.gnome.org/projects/epiphany/"
 pkgdesc="Various extentions for the Epiphany web browser"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD
index f731f5d6f..3d0b8fe7b 100644
--- a/extra/epiphany/PKGBUILD
+++ b/extra/epiphany/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 169865 2012-10-30 22:25:05Z heftig $
+# $Id: PKGBUILD 183349 2013-04-21 22:08:53Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=epiphany
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 install=epiphany.install
 pkgdesc="A GNOME web browser based on the WebKit rendering engine."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
-         'hicolor-icon-theme' 'gcr' 'gnome-desktop')
-makedepends=('intltool' 'gnome-doc-utils' 'startup-notification')
+depends=('libsoup' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk3' 'nss' 'iso-codes' 'dconf' 'desktop-file-utils'
+         'hicolor-icon-theme' 'gcr' 'gnome-desktop' 'libwnck3')
+makedepends=('intltool' 'gnome-doc-utils' 'startup-notification' 'gobject-introspection')
 options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1b4e33e02f7653489be9c49d182be84da13348b4ad3cb4c09c643898586a6008')
+sha256sums=('8c231bb1af8daf739524bd89aa44873f5936b8a849da49326427486ed825523f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD
index 549a5c6ba..93326438f 100644
--- a/extra/ethtool/PKGBUILD
+++ b/extra/ethtool/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175975 2013-01-25 14:44:35Z ioni $
+# $Id: PKGBUILD 179514 2013-03-05 18:49:59Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Martin Kemp <mdkemp@elys.com>
 
 pkgname=ethtool
-pkgver=3.7
+pkgver=3.8
 pkgrel=1
 epoch=1
 pkgdesc="Utility for controlling network drivers and hardware"
@@ -13,7 +13,7 @@ url="http://www.kernel.org/pub/software/network/ethtool/"
 license=('GPL')
 depends=('glibc')
 source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('f16c8416e6ec917e5753918dc23a60bd')
+md5sums=('7ae96870bc4f9b43f666650ae30f2685')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/extra/ethumb/PKGBUILD b/extra/ethumb/PKGBUILD
index d39e8b973..428ffad6b 100644
--- a/extra/ethumb/PKGBUILD
+++ b/extra/ethumb/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=ethumb
 pkgver=1.7.5
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Thumbnailing library and D-Bus service using EFL"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD
index 2faabaab5..6e2dfabfa 100644
--- a/extra/evas/PKGBUILD
+++ b/extra/evas/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=evas
 pkgver=1.7.5
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A hardware-accelerated canvas API for X-Windows"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD
index a28ee8295..606d4d993 100644
--- a/extra/evas_generic_loaders/PKGBUILD
+++ b/extra/evas_generic_loaders/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175032 2013-01-12 08:15:25Z andyrtr $
+# $Id: PKGBUILD 183282 2013-04-20 16:41:15Z heftig $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=evas_generic_loaders
 pkgver=1.7.5
-pkgrel=2
+pkgrel=4
 pkgdesc="Additional generic loaders for Evas"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
diff --git a/extra/evilwm/LICENSE b/extra/evilwm/LICENSE
deleted file mode 100644
index 6778ede8c..000000000
--- a/extra/evilwm/LICENSE
+++ /dev/null
@@ -1,40 +0,0 @@
-LICENCE
-
-evilwm 1.1
-Copyright (C) 1999-2011 Ciaran Anscomb <evilwm@6809.org.uk>
-
-This is free software.  You can do what you want to it, but if it
-breaks something, you get to pay for the counselling.  The code was
-originally based on aewm, so this is distributed under the same terms,
-which follow.
-
-
-AEWM LICENCE
-
-Copyright (c) 1998-2000 Decklin Foster.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS", WITHOUT ANY EXPRESS
-OR IMPLIED WARRANTIES OF ANY KIND. IN NO EVENT SHALL THE AUTHOR BE
-HELD LIABLE FOR ANY DAMAGES CONNECTED WITH THE USE OF THIS PROGRAM.
-
-You are granted permission to copy, publish, distribute, and/or sell
-copies of this program and any modified versions or derived works,
-provided that this copyright and notice are not removed or altered.
-
-Portions of the code were based on 9wm, which contains this license:
-
-> 9wm is free software, and is Copyright (c) 1994 by David Hogan.
-> Permission is granted to all sentient beings to use this software,
-> to make copies of it, and to distribute those copies, provided
-> that:
->
->     (1) the copyright and licence notices are left intact
->     (2) the recipients are aware that it is free software
->     (3) any unapproved changes in functionality are either
->           (i) only distributed as patches
->       or (ii) distributed as a new program which is not called 9wm
->               and whose documentation gives credit where it is due
->     (4) the author is not held responsible for any defects
->         or shortcomings in the software, or damages caused by it.
->
-> There is no warranty for this software.  Have a nice day.
diff --git a/extra/evilwm/PKGBUILD b/extra/evilwm/PKGBUILD
deleted file mode 100644
index 15425740c..000000000
--- a/extra/evilwm/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 136041 2011-08-22 00:36:55Z eric $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Jochem Kossen <j.kossen@home.nl>
-
-pkgname=evilwm
-pkgver=1.1.0
-pkgrel=1.1
-pkgdesc="A minimalist but usable window manager for the X Window System."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://evilwm.sourceforge.net"
-license=('custom')
-depends=('libxrandr')
-source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz LICENSE)
-md5sums=('5f14cc3019320860c85bb07c60a76bd7'
-         '0941ad3e96597ef75c6310f43a0342a0')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" desktopfilesdir=/usr/share/xsessions install
-  install -D -m644 "$srcdir"/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index 0783d0d53..afb38475a 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 169867 2012-10-30 22:25:11Z heftig $
+# $Id: PKGBUILD 183350 2013-04-21 22:08:55Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evince
-pkgver=3.6.1
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="Simply a document viewer"
 url="http://projects.gnome.org/evince/"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('gtk3' 'libgxps' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas')
-makedepends=('itstool' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection' 'docbook-xsl')
+arch=(i686 x86_64 mips64el)
+license=(GPL)
+depends=(gtk3 libgxps libspectre gsfonts poppler-glib djvulibre gnome-icon-theme t1lib libsecret desktop-file-utils dconf gsettings-desktop-schemas)
+makedepends=(itstool libnautilus-extension texlive-bin intltool gobject-introspection docbook-xsl python)
 optdepends=('texlive-bin: DVI support'
 	    'gvfs: bookmark support and session saving')
-groups=('gnome-extra')
+groups=(gnome)
 install=evince.install
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1b87b2579d438a126391f9044611b472e9f7b5b712e40b5645b0810164bc41b5')
+sha256sums=('cf136d2a025ef486c4e248e0dc134e7a9420557d9edc0df1ceb6a6330fbd4e9a')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr   --sysconfdir=/etc \
       --localstatedir=/var    --libexecdir=/usr/lib/evince \
       --disable-static        --enable-nautilus \
@@ -32,6 +32,6 @@ build() {
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index db565741b..efd0b634c 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 176001 2013-01-25 17:18:47Z ioni $
+# $Id: PKGBUILD 183352 2013-04-21 22:08:58Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.6.3
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Centralized access to appointments and contacts"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ install=$pkgname.install
 url="http://www.gnome.org"
 license=('GPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('37a0d0d4f6c8515e70e34f1e7e1f457f4c7736f35ba0f18c4b4bca0a17db7de0')
+sha256sums=('0425d8b73dcf705840cdf9fc955b3ca05b9aacc6eb2d2d97f159725be3a8b896')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -21,7 +21,7 @@ build() {
       --localstatedir=/var --with-openldap=yes \
       --libexecdir=/usr/lib/evolution-data-server \
       --with-krb5=/usr --with-libdb=/usr \
-      --enable-vala-bindings
+      --enable-vala-bindings --disable-uoa
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
   make
 }
diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD
index 57c2ee4c0..ccd29c2a8 100644
--- a/extra/evolution-ews/PKGBUILD
+++ b/extra/evolution-ews/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 176004 2013-01-25 17:34:07Z ioni $
+# $Id: PKGBUILD 183353 2013-04-21 22:09:00Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=evolution-ews
-pkgver=3.6.3
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="MS Exchange integration through Exchange Web Services"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,12 +12,12 @@ depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
 makedepends=('intltool' 'evolution')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d044bf8f7753d9489d65a5b94b117cef1369d78c57810125fab229368d01fec6')
+sha256sums=('26fea90285189ee0e370ea04baef31bc0907d0cf400a63fafc95631111d378c9')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/evolution --disable-static
+      --libexecdir=/usr/lib/evolution --disable-static --with-krb5
   make
 }
 
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index 10d632a0e..7e9c01626 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 176002 2013-01-25 17:24:35Z ioni $
+# $Id: PKGBUILD 183351 2013-04-21 22:08:56Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution
-pkgver=3.6.3
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Manage your email, contacts and schedule"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf')
-makedepends=('intltool' 'itstool' 'docbook-xsl' 'networkmanager')
+license=(GPL)
+depends=(gnome-desktop evolution-data-server gtkhtml4 libcanberra libpst libytnef psmisc
+         desktop-file-utils hicolor-icon-theme dconf)
+makedepends=(intltool itstool docbook-xsl networkmanager bogofilter spamassassin highlight)
 optdepends=('bogofilter: possible junk filter plugin'
-            'spamassassin: possible junk filter plugin')
+            'spamassassin: possible junk filter plugin'
+            'highlight: text highlight plugin')
 groups=('gnome-extra')
 options=('!libtool' '!emptydirs')
 install=evolution.install
 url=http://www.gnome.org/projects/evolution/
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2c564f3e59cb26663d3e3992c881842815fb8fbc037074475f906030c8c5fd25')
+sha256sums=('89b775c5757ddf791d181c82eaee6ddc42252eb54aa2f5dc5a80ff5b9246803b')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/exempi/PKGBUILD b/extra/exempi/PKGBUILD
index 55259adcb..8b73023f6 100644
--- a/extra/exempi/PKGBUILD
+++ b/extra/exempi/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: André Klitzing <aklitzing@online.de>
 pkgname=exempi
 pkgver=2.2.0
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="A library to parse XMP metadata"
 arch=(i686 x86_64 'mips64el')
 url="http://libopenraw.freedesktop.org/wiki/Exempi"
diff --git a/extra/exiv2/PKGBUILD b/extra/exiv2/PKGBUILD
index 7459a4245..a9a05e49e 100644
--- a/extra/exiv2/PKGBUILD
+++ b/extra/exiv2/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=exiv2
 pkgver=0.23
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Exif and Iptc metadata manipulation library and tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://exiv2.org"
diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD
index 62ae913bb..25fafd531 100644
--- a/extra/exo/PKGBUILD
+++ b/extra/exo/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=exo
 pkgver=0.10.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Extensions to Xfce by os-cillation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
diff --git a/extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch b/extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch
deleted file mode 100644
index a9edca3d7..000000000
--- a/extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From a54bc42cb5f06f06141d8ed2434719bf7c200aaf Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Sun, 23 Dec 2012 00:09:34 +0200
-Subject: [PATCH] Drop HAVE_GIO_UNIX ifdef and load gio-unix-2.0 pkg
-
-This restores exo-open's .desktop file launching functionality.
----
- configure.ac.in | 1 +
- exo-open/main.c | 9 ---------
- 2 files changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/configure.ac.in b/configure.ac.in
-index 0c8b3a1..ec9be67 100644
---- a/configure.ac.in
-+++ b/configure.ac
-@@ -159,6 +159,7 @@ dnl *** Check for required packages ***
- dnl ***********************************
- XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0])
- XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0])
-+XDT_CHECK_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.30.0])
- XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
- XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0])
- XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
-diff --git a/exo-open/main.c b/exo-open/main.c
-index 059fad4..da78f6a 100644
---- a/exo-open/main.c
-+++ b/exo-open/main.c
-@@ -32,9 +32,7 @@
- 
- #include <glib/gstdio.h>
- #include <gio/gio.h>
--#ifdef HAVE_GIO_UNIX
- #include <gio/gdesktopappinfo.h>
--#endif
- #include <exo/exo.h>
- 
- 
-@@ -143,7 +141,6 @@ usage (void)
- static gboolean
- exo_open_launch_desktop_file (const gchar *arg)
- {
--#ifdef HAVE_GIO_UNIX
-   GFile           *gfile;
-   gchar           *contents;
-   gsize            length;
-@@ -191,12 +188,6 @@ exo_open_launch_desktop_file (const gchar *arg)
- #endif
- 
-   return result;
--#else /* !HAVE_GIO_UNIX */
--  g_critical (_("Launching desktop files is not supported when %s is compiled "
--                "without GIO-Unix features."), g_get_prgname ());
--
--  return FALSE;
--#endif
- }
- 
- 
--- 
-1.8.0.2
-
diff --git a/extra/expect/ChangeLog b/extra/expect/ChangeLog
deleted file mode 100644
index f0432ba02..000000000
--- a/extra/expect/ChangeLog
+++ /dev/null
@@ -1,16 +0,0 @@
-2011-01-01  Allan McRae  <allan@archlinux.org> 
-
-    * expect 5.45-2
-    - Package signing rebuild
-
-2011-01-01  kevin  <kevin@archlinux.org> 
-
-    * expect 5.45-1
-    - Added upgrade message about expectk being removed
-    - Have expect conflict with expectk
-
-2010-03-27  kevin  <kevin@archlinux.org> 
-
-    * expect 5.44.1.15-1
-    - Source on sourceforge now and maintained mostly by ActiveState
-    - Added symlink to fix FS#18686 - libexpect.so is not found 
diff --git a/extra/expect/expect.install b/extra/expect/expect.install
deleted file mode 100644
index 2847848a1..000000000
--- a/extra/expect/expect.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_upgrade() {
-  if [ "`vercmp $2 5.45`" -lt 0 ]; then
-    echo "  - expectk has been removed.  Use tclsh instead"
-  fi
-}
diff --git a/extra/faac/PKGBUILD b/extra/faac/PKGBUILD
deleted file mode 100644
index e56599e5d..000000000
--- a/extra/faac/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 159954 2012-05-27 10:22:19Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-# Contributor: Sarah Hay <sarah@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=faac
-pkgver=1.28
-pkgrel=4
-pkgdesc="An AAC audio encoder"
-arch=('i686' 'x86_64')
-url="http://www.audiocoding.com/"
-license=('GPL' 'custom')
-depends=('libmp4v2' 'glibc')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'altivec.patch' 'mp4v2-1.9.patch' 'mp4v2-2.0.0.patch')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -p1 -i ../mp4v2-1.9.patch
-  patch -p0 -i ../mp4v2-2.0.0.patch
-  patch -p0 -i ../altivec.patch
-  find . -type f -print0 | xargs -0 sed -i 's/\r//g'
-  ./bootstrap
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/libfaac/kiss_fft/COPYING \
-    "${pkgdir}"/usr/share/licenses/faac/LICENSE
-}
-md5sums=('80763728d392c7d789cde25614c878f6'
-         'e1ee422ab524fb1f78d178700c3a0e7f'
-         '9d52a17e68fa15ca94e88e1457b94b74'
-         '979ff4f13f36217cb15c92df9fd75f0c')
diff --git a/extra/faac/altivec.patch b/extra/faac/altivec.patch
deleted file mode 100644
index ae461efc3..000000000
--- a/extra/faac/altivec.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-http://bugs.gentoo.org/306881
-
---- configure.in
-+++ configure.in
-@@ -33,7 +33,12 @@
- AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
-                AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
-                             external_mp4v2=no, -lstdc++),
--               external_mp4v2=no, [#include <mp4v2/mp4v2.h>])
-+               external_mp4v2=no, [
-+	       #if defined(__ALTIVEC__)
-+	       #undef bool
-+	       #endif
-+	       #include <mp4v2/mp4v2.h>
-+	       ])
- 
- if test x$external_mp4v2 = xyes; then
-   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
---- frontend/main.c
-+++ frontend/main.c
-@@ -30,6 +30,9 @@
- #endif
- 
- #ifdef HAVE_LIBMP4V2
-+#if defined(__ALTIVEC__)
-+# undef bool
-+#endif
- # include <mp4v2/mp4v2.h>
- #endif
- 
---- common/mp4v2/mpeg4ip.h
-+++ common/mp4v2/mpeg4ip.h
-@@ -123,7 +123,6 @@
- #ifdef __cplusplus
- extern "C" {
- #endif
--char *strcasestr(const char *haystack, const char *needle);
- #ifdef __cplusplus
- }
- #endif
diff --git a/extra/faac/mp4v2-1.9.patch b/extra/faac/mp4v2-1.9.patch
deleted file mode 100644
index 54a63347b..000000000
--- a/extra/faac/mp4v2-1.9.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ur faac-1.28.orig/configure.in faac-1.28/configure.in
---- faac-1.28.orig/configure.in	2009-02-05 02:55:38.000000000 +0200
-+++ faac-1.28/configure.in	2009-07-10 13:21:34.000000000 +0300
-@@ -28,14 +28,17 @@
- AC_CHECK_LIB(gnugetopt, getopt_long)
- 
- AM_CONDITIONAL(WITH_MP4V2, false)
-+AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false)
- 
- AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
-                AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
-                             external_mp4v2=no, -lstdc++),
--               external_mp4v2=no, [#include <mp4.h>])
-+               external_mp4v2=no, [#include <mp4v2/mp4v2.h>])
- 
- if test x$external_mp4v2 = xyes; then
-   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
-+  MY_DEFINE(HAVE_LIBMP4V2)
-+  AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true)
- else
-   if test x$WITHMP4V2 = xyes; then
-      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
-diff -ur faac-1.28.orig/frontend/main.c faac-1.28/frontend/main.c
---- faac-1.28.orig/frontend/main.c	2009-01-24 03:10:20.000000000 +0200
-+++ faac-1.28/frontend/main.c	2009-07-10 13:22:18.000000000 +0300
-@@ -30,7 +30,7 @@
- #endif
- 
- #ifdef HAVE_LIBMP4V2
--# include <mp4.h>
-+# include <mp4v2/mp4v2.h>
- #endif
- 
- #define DEFAULT_TNS     0
-diff -ur faac-1.28.orig/frontend/Makefile.am faac-1.28/frontend/Makefile.am
---- faac-1.28.orig/frontend/Makefile.am	2008-12-16 02:56:00.000000000 +0200
-+++ faac-1.28/frontend/Makefile.am	2009-07-10 13:21:55.000000000 +0300
-@@ -8,5 +8,9 @@
- LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
- else
- INCLUDES = -I$(top_srcdir)/include 
-+if WITH_EXTERNAL_MP4V2
-+LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2
-+else
- LDADD = $(top_builddir)/libfaac/libfaac.la -lm
- endif
-+endif
diff --git a/extra/faac/mp4v2-2.0.0.patch b/extra/faac/mp4v2-2.0.0.patch
deleted file mode 100644
index f4ac8e6d4..000000000
--- a/extra/faac/mp4v2-2.0.0.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-http://bugs.gentoo.org/397575
-http://sourceforge.net/tracker/?func=detail&aid=3476707&group_id=704&atid=100704
-
---- configure.in
-+++ configure.in
-@@ -33,8 +33,8 @@ AC_CHECK_LIB(gnugetopt, getopt_long)
- AM_CONDITIONAL(WITH_MP4V2, false)
- AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false)
- 
--AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
--               AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
-+AC_CHECK_DECLS([MP4Create],
-+               AC_CHECK_LIB(mp4v2, MP4Create, external_mp4v2=yes,
-                             external_mp4v2=no, -lstdc++),
-                external_mp4v2=no, [#include <mp4v2/mp4v2.h>])
- 
-@@ -42,6 +42,7 @@ if test x$external_mp4v2 = xyes; then
-   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
-   MY_DEFINE(HAVE_EXTERNAL_LIBMP4V2)
-   AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true)
-+  AC_CHECK_DECLS([MP4TagsAlloc], [], [], [#include <mp4v2/mp4v2.h>])
- else
-   if test x$WITHMP4V2 = xyes; then
-      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
---- frontend/main.c
-+++ frontend/main.c
-@@ -873,8 +873,12 @@ int main(int argc, char *argv[])
-     if (!faacEncSetConfiguration(hEncoder, myFormat)) {
-         fprintf(stderr, "Unsupported output format!\n");
- #ifdef HAVE_LIBMP4V2
-+#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */
-+        if (container == MP4_CONTAINER) MP4Close(MP4hFile, 0);
-+#else
-         if (container == MP4_CONTAINER) MP4Close(MP4hFile);
- #endif
-+#endif
-         return 1;
-     }
- 
-@@ -885,12 +889,10 @@ int main(int argc, char *argv[])
-         unsigned long ASCLength = 0;
-     char *version_string;
- 
--#ifdef MP4_CREATE_EXTENSIBLE_FORMAT
--    /* hack to compile against libmp4v2 >= 1.0RC3
--     * why is there no version identifier in mp4.h? */
-+#ifdef MP4_DETAILS_ERROR /* r453 fix */
-         MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0);
- #else
--    MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0, 0);
-+        MP4hFile = MP4Create(aacFileName, 0);
- #endif
-         if (!MP4_IS_VALID_FILE_HANDLE(MP4hFile)) {
-             fprintf(stderr, "Couldn't create output file %s\n", aacFileName);
-@@ -905,12 +907,22 @@ int main(int argc, char *argv[])
-     free(ASC);
- 
-     /* set metadata */
-+#if HAVE_DECL_MP4TAGSALLOC
-+    const MP4Tags* tags;
-+    tags = MP4TagsAlloc();
-+    MP4TagsFetch( tags, MP4hFile );
-+#endif
-     version_string = malloc(strlen(faac_id_string) + 6);
-     strcpy(version_string, "FAAC ");
-     strcpy(version_string + 5, faac_id_string);
-+#if !HAVE_DECL_MP4TAGSALLOC
-     MP4SetMetadataTool(MP4hFile, version_string);
-+#else
-+    MP4TagsSetEncodingTool(tags, version_string);
-+#endif
-     free(version_string);
- 
-+#if !HAVE_DECL_MP4TAGSALLOC
-     if (artist) MP4SetMetadataArtist(MP4hFile, artist);
-     if (writer) MP4SetMetadataWriter(MP4hFile, writer);
-     if (title) MP4SetMetadataName(MP4hFile, title);
-@@ -923,8 +935,40 @@ int main(int argc, char *argv[])
-     if (comment) MP4SetMetadataComment(MP4hFile, comment);
-         if (artSize) {
-         MP4SetMetadataCoverArt(MP4hFile, art, artSize);
-+#else
-+    if (artist) MP4TagsSetArtist(tags, artist);
-+    if (writer) MP4TagsSetComposer(tags, writer);
-+    if (title) MP4TagsSetName(tags, title);
-+    if (album) MP4TagsSetAlbum(tags, album);
-+    if (trackno > 0) {
-+        MP4TagTrack tt;
-+        tt.index = trackno;
-+        tt.total = ntracks;
-+        MP4TagsSetTrack(tags, &tt);
-+    }
-+    if (discno > 0) {
-+        MP4TagDisk td;
-+        td.index = discno;
-+        td.total = ndiscs;
-+        MP4TagsSetDisk(tags, &td);
-+    }
-+    if (compilation) MP4TagsSetCompilation(tags, compilation);
-+    if (year) MP4TagsSetReleaseDate(tags, year);
-+    if (genre) MP4TagsSetGenre(tags, genre);
-+    if (comment) MP4TagsSetComments(tags, comment);
-+    if (artSize) {
-+        MP4TagArtwork mp4art;
-+        mp4art.data = art;
-+        mp4art.size = artSize;
-+        mp4art.type = MP4_ART_UNDEFINED; // delegate typing to libmp4v2
-+        MP4TagsAddArtwork( tags, &mp4art );
-+#endif
-         free(art);
-     }
-+#if HAVE_DECL_MP4TAGSALLOC
-+    MP4TagsStore( tags, MP4hFile );
-+    MP4TagsFree( tags );
-+#endif
-     }
-     else
-     {
-@@ -1141,11 +1185,19 @@ int main(int argc, char *argv[])
-         /* clean up */
-         if (container == MP4_CONTAINER)
-         {
-+#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */
-+            MP4Close(MP4hFile, 0);
-+#else
-             MP4Close(MP4hFile);
-+#endif
-             if (optimizeFlag == 1)
-             {
-                 fprintf(stderr, "\n\nMP4 format optimization... ");
-+#ifdef MP4_DETAILS_ERROR /* r453 fix */
-                 MP4Optimize(aacFileName, NULL, 0);
-+#else
-+                MP4Optimize(aacFileName, NULL);
-+#endif
-                 fprintf(stderr, "Done!");
-             }
-         } else
diff --git a/extra/faad2/PKGBUILD b/extra/faad2/PKGBUILD
index b6229e958..6c051bddc 100644
--- a/extra/faad2/PKGBUILD
+++ b/extra/faad2/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=faad2
 pkgver=2.7
-pkgrel=3.1
+pkgrel=3.2
 pkgdesc="ISO AAC audio decoder"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.audiocoding.com/"
diff --git a/extra/fakechroot/PKGBUILD b/extra/fakechroot/PKGBUILD
index 203525ccb..f6bb0d394 100644
--- a/extra/fakechroot/PKGBUILD
+++ b/extra/fakechroot/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 144961 2011-12-12 08:42:45Z allan $
+# $Id: PKGBUILD 182910 2013-04-16 04:51:02Z allan $
 # Maintainer : Allan McRae <allan@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=fakechroot
 pkgver=2.16
-pkgrel=1.1
+pkgrel=2
 pkgdesc="Gives a fake chroot environment"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/fakechroot/fakechroot/wiki"
@@ -14,6 +14,14 @@ install=fakechroot.install
 source=(https://github.com/downloads/fakechroot/fakechroot/fakechroot-${pkgver}.tar.gz)
 md5sums=('3ea5efb76664e787450e0cfcefc1b807')
 
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
+  # https://github.com/fakechroot/fakechroot/issues/10
+  sed -i "s#usr/sbin/chroot#usr/bin/chroot#" test/testtree.sh test/t/chroot.t
+}
+
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   # Somehow not all files use the chroot found by configure.
diff --git a/extra/fakechroot/fakechroot.install b/extra/fakechroot/fakechroot.install
index 2b5eb2100..61c5b73e5 100644
--- a/extra/fakechroot/fakechroot.install
+++ b/extra/fakechroot/fakechroot.install
@@ -3,9 +3,6 @@ post_install() {
 }
 
 post_upgrade() {
-  if [ "$(vercmp $2 2.9-2)" -lt 0 ]; then
-    sed -i -e '/\/usr\/lib\/libfakechroot/d' etc/ld.so.conf
-  fi
   sbin/ldconfig -r .
 }
 
diff --git a/extra/farstream-0.1/PKGBUILD b/extra/farstream-0.1/PKGBUILD
index 7b0a4e533..1bf9a3dfb 100644
--- a/extra/farstream-0.1/PKGBUILD
+++ b/extra/farstream-0.1/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=farstream-0.1
 _pkgname=farstream
 pkgver=0.1.2
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Audio/Video Communications Framework (legacy version)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/Farstream"
@@ -29,8 +29,8 @@ build() {
 
   ./configure \
     --prefix=/usr \
-    --with-package-name='Arch Linux Farstream 0.1 Package' \
-    --with-package-origin='httpw://www.archlinux.org/' \
+    --with-package-name='Parabola Farstream 0.1 Package' \
+    --with-package-origin='https://parabolagnulinux.org/' \
     --disable-static
   make
 }
diff --git a/extra/farstream/PKGBUILD b/extra/farstream/PKGBUILD
index 10f56c670..4b57a7256 100644
--- a/extra/farstream/PKGBUILD
+++ b/extra/farstream/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 170993 2012-11-14 14:37:18Z ibiru $
+# $Id: PKGBUILD 183166 2013-04-18 07:35:04Z eric $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=farstream
-pkgver=0.2.2
+pkgver=0.2.3
 pkgrel=1
 pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework"
 arch=(i686 x86_64 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/Farstream"
-license=('LGPL2.1')
+license=('LGPL')
 depends=('gst-plugins-base-libs' 'libnice')
 makedepends=('gobject-introspection')
 optdepends=('gst-plugins-good' 'gst-plugins-bad')
 conflicts=('farsight2')
 replaces=('farsight2')
 options=(!libtool)
-source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('01c20c1ed014ad4e18e55f1f6caf7877')
+source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('a8971167068b69a6933d3eaaeb9ab448'
+         'SKIP')
 
 build() {
-  cd  $pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr \
     --with-package-name='Parabola GNU/Linux-libre farstream package' \
     --with-package-origin='https://parabolagnulinux.org/' \
diff --git a/extra/farstream/vp8.patch b/extra/farstream/vp8.patch
deleted file mode 100644
index 67009a8ad..000000000
--- a/extra/farstream/vp8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences farstream-0.1.1/gst/fsrtpconference/default-codec-preferences
---- farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences	2012-03-20 12:12:22.644324485 +0100
-+++ farstream-0.1.1/gst/fsrtpconference/default-codec-preferences	2012-03-21 09:32:04.468634455 +0100
-@@ -41,6 +41,8 @@ feedback:nack/pli=
- [video/H263]
- feedback:nack/pli=
- 
-+[video/VP8-DRAFT-IETF-01]
-+
- [video/THEORA]
- #feedback:tfrc=
- feedback:nack/pli=
diff --git a/extra/fbida/PKGBUILD b/extra/fbida/PKGBUILD
index 139f5e9ea..0983a84c9 100644
--- a/extra/fbida/PKGBUILD
+++ b/extra/fbida/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 148710 2012-02-05 11:47:47Z ibiru $
+# $Id: PKGBUILD 177938 2013-02-11 19:29:44Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fbida
-pkgver=2.08
-pkgrel=2.1
+pkgver=2.09
+pkgrel=1
 pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kraxel.org/blog/linux/fbida/"
@@ -11,9 +11,9 @@ license=('GPL2')
 depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig' 'curl')
 makedepends=('libxpm')
 optdepends=('ghostscript: to use fbgs')
-source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9b3693ab26a58194e36b479bffb61ed0')
-sha1sums=('597e0953c68112bf7c363b1ccaa94e72100b116a')
+source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
+sha1sums=('5838b2cb7188481fece6159fccb3b121acd906e7'
+          '18f5660301201326bd9426ce55e9fc217bf720d8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,5 +23,5 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" prefix=/usr install
+  make STRIP="" DESTDIR="${pkgdir}" prefix=/usr install
 }
diff --git a/extra/fbset/PKGBUILD b/extra/fbset/PKGBUILD
index 787008d0f..03dbdc892 100644
--- a/extra/fbset/PKGBUILD
+++ b/extra/fbset/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=fbset
 pkgver=2.1
-pkgrel=4
+pkgrel=4.1
 pkgdesc="Framebuffer setup utility"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://users.telenet.be/geertu/Linux/fbdev/"
diff --git a/extra/fcgi/PKGBUILD b/extra/fcgi/PKGBUILD
index 419c3c9dc..53c6a04c1 100644
--- a/extra/fcgi/PKGBUILD
+++ b/extra/fcgi/PKGBUILD
@@ -20,10 +20,6 @@ md5sums=('d15060a813b91383a9f3c66faf84867e'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 -i "${srcdir}/gcc44-fix-include.patch"
-  libtoolize --force
-  aclocal
-  autoconf
-  automake --foreign
   ./configure --prefix=/usr --build=$CHOST
   make
 }
diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index 4f384f226..e49c98663 100644
--- a/extra/feh/PKGBUILD
+++ b/extra/feh/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 175213 2013-01-16 21:13:09Z bisson $
+# $Id: PKGBUILD 178053 2013-02-14 21:32:25Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=feh
-pkgver=2.8
-pkgrel=2
+pkgver=2.9.1
+pkgrel=1
 pkgdesc='Fast and light imlib2-based image viewer'
 url='http://feh.finalrewind.org/'
 license=('custom:MIT')
@@ -16,7 +16,7 @@ optdepends=('perl: feh-cam, webcam wrapper for feh'
             'imagemagick: support more file formats')
 makedepends=('libxt')
 source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('eeb251d5971cf07e632661ef0b514fc3b0c7aca6')
+sha1sums=('d6effb0bb3074315114b2590722fae9712a531ad')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD
index 711c37e7f..26dbd1109 100644
--- a/extra/fetchmail/PKGBUILD
+++ b/extra/fetchmail/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 173827 2012-12-24 15:21:34Z pierre $
+# $Id: PKGBUILD 183744 2013-04-27 16:59:09Z pierre $
 
 pkgname=fetchmail
-pkgver=6.3.24
+pkgver=6.3.26
 pkgrel=1
 pkgdesc="A remote-mail retrieval utility"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,18 +11,15 @@ depends=('openssl')
 makedepends=('python2')
 optdepends=('tk: for using fetchmailconf'
             'python2: for using fetchmailconf')
-backup=('etc/conf.d/fetchmail')
 options=('!makeflags')
 install='fetchmail.install'
 source=("http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz"
         "http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz.asc"
-        'fetchmail.rc' 'fetchmail.conf' 'fetchmail.tmpfiles' 'fetchmail.service')
-sha1sums=('8cb2aa3a85dd307ccd1899ddbb4463e011048535'
-          'dff091c04ab64c25f7b6af758f93a75b969117e0'
-          'fc25180f1add26df0a3bdaac03fd9d2e3473ff88'
-          '30401729386d6f774c6c36ab8530842166de54a8'
+        'fetchmail.tmpfiles' 'fetchmail.service')
+sha1sums=('de8dbe62a8edfa232ee4278257a1fe67aa1c797a'
+          'SKIP'
           '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6'
-          '11ff81fc8363a54099880da18634b0d1ecf9fa82')
+          '69caf3fd4d4446db3bf53144e4fa8edbdbbfcd10')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -34,8 +31,6 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail"
-  install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail"
   install -d -o 90 -g nobody "${pkgdir}/var/lib/fetchmail"
   install -D -m644 ${srcdir}/fetchmail.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/fetchmail.conf
   install -D -m644 ${srcdir}/fetchmail.service ${pkgdir}/usr/lib/systemd/system/fetchmail.service
diff --git a/extra/fetchmail/fetchmail.conf b/extra/fetchmail/fetchmail.conf
deleted file mode 100644
index dcac2a067..000000000
--- a/extra/fetchmail/fetchmail.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Daemon polling interval
-INTERVAL=60
-
-# Config location
-CONFIG=/etc/fetchmailrc
diff --git a/extra/fetchmail/fetchmail.install b/extra/fetchmail/fetchmail.install
index 81b374c57..5f6dc4911 100644
--- a/extra/fetchmail/fetchmail.install
+++ b/extra/fetchmail/fetchmail.install
@@ -5,7 +5,7 @@ post_install() {
   getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \
       -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
   if [[ ! -d run/fetchmail ]]; then
-    usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf
+    usr/bin/systemd-tmpfiles --create fetchmail.conf
   fi
 }
 
@@ -17,7 +17,7 @@ post_upgrade() {
     usermod -d '/var/lib/fetchmail' -s /bin/false fetchmail
   fi
   if [[ ! -d run/fetchmail ]]; then
-    usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf
+    usr/bin/systemd-tmpfiles --create fetchmail.conf
   fi
 }
 
diff --git a/extra/fetchmail/fetchmail.rc b/extra/fetchmail/fetchmail.rc
deleted file mode 100644
index 4d8b98d40..000000000
--- a/extra/fetchmail/fetchmail.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/fetchmail
-
-PID=`pidof -o %PPID /usr/bin/fetchmail`
-case "$1" in
-  start)
-    stat_busy "Starting fetchmail"
-    [ -z "$PID" ] &&
-      su -c "/usr/bin/fetchmail -d $INTERVAL -f $CONFIG" -s /bin/sh fetchmail
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon fetchmail
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping fetchmail"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon fetchmail
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/fetchmail/fetchmail.service b/extra/fetchmail/fetchmail.service
index 3e7da7545..4653cc587 100644
--- a/extra/fetchmail/fetchmail.service
+++ b/extra/fetchmail/fetchmail.service
@@ -4,8 +4,7 @@ After=network.target
 
 [Service]
 User=fetchmail
-EnvironmentFile=/etc/conf.d/fetchmail
-ExecStart=/usr/bin/fetchmail -d ${INTERVAL} -f ${CONFIG}
+ExecStart=/usr/bin/fetchmail -d 900 -f /etc/fetchmailrc
 RestartSec=1
 
 [Install]
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index ac0db7abd..0e6efae5f 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,31 +1,33 @@
-# $Id: PKGBUILD 172943 2012-12-07 18:27:01Z ibiru $
+# $Id: PKGBUILD 181138 2013-04-01 07:43:20Z bpiotrowski $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=1.0.1
-pkgrel=1
+pkgver=1.2
+pkgrel=2
 epoch=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ffmpeg.org/"
 license=('GPL')
-depends=(alsa-lib bzip2 gsm lame libpulse libtheora libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib libxfixes)
-makedepends=('git')
+depends=(
+      'alsa-lib' 'bzip2' 'fontconfig' 'gsm' 'lame' 'libass'
+      'libbluray' 'libmodplug' 'libpulse' 'libtheora' 'libvorbis' 'libvpx'
+      'opencore-amr' 'openjpeg' 'opus' 'rtmpdump' 'schroedinger' 'sdl' 'speex'
+      'v4l-utils' 'x264' 'xvidcore' 'zlib' 'libxfixes'
+      )
 if [ "${CARCH}" != "mips64el" ]; then
     depends+=('libva')
-    makedepends+=('yasm' 'libvdpau')
+    makedepends=('yasm' 'libvdpau')
 fi
 source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
-md5sums=('dbbb88ce5525dea22b24aaa098a9bcc2')
+sha256sums=('9a39fbc07dae0c893059e07491bcfb1e2409cc220f72b41eed23a04becea5aaf')
 
 build() {
   cd $pkgname-$pkgver
 
   if [ "$CARCH" = "mips64el" ] ; then
-# Make video decoding faster and turn all pixels green.
-#      patch -Np1 -i $srcdir/ffmpeg-loongson.patch
       # Disable runtime CPU detection, video acceleration APIs our hardware doesn't support and ISAs our CPUs don't support.
       extraconf="--disable-runtime-cpudetect --disable-vdpau --disable-vaapi --disable-mips32r2 --disable-mipsdspr1 --disable-mipsdspr2"
   else
@@ -34,31 +36,40 @@ build() {
 
   ./configure \
     --prefix=/usr \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
+    --disable-debug \
+    --disable-static \
+    --enable-avresample \
+    --enable-dxva2 \
+    --enable-fontconfig \
+    --enable-gpl \
+    --enable-libass \
+    --enable-libbluray \
+    --enable-libfreetype \
     --enable-libgsm \
-    --enable-libspeex \
-    --enable-postproc \
-    --enable-shared \
-    --enable-x11grab \
+    --enable-libmodplug \
+    --enable-libmp3lame \
     --enable-libopencore_amrnb \
     --enable-libopencore_amrwb \
-    --enable-libschroedinger \
     --enable-libopenjpeg \
-    --enable-librtmp \
+    --enable-libopus \
     --enable-libpulse \
+    --enable-librtmp \
+    --enable-libschroedinger \
+    --enable-libspeex \
+    --enable-libtheora \
     --enable-libv4l2 \
-    --enable-gpl \
-    --enable-version3 \
+    --enable-libvorbis \
+    --enable-libvpx \
+    --enable-libx264 \
+    --enable-libxvid \
+    --enable-postproc \
     --enable-runtime-cpudetect \
-    --disable-static \
-    --disable-debug \
+    --enable-shared \
+    --enable-vdpau \
+    --enable-version3 \
+    --enable-x11grab \
     $extraconf
-
+ 
   make
   make tools/qt-faststart
   make doc/ff{mpeg,play,server}.1
diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD
index e983d3d2c..068bb2f74 100644
--- a/extra/ffmpegthumbnailer/PKGBUILD
+++ b/extra/ffmpegthumbnailer/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=ffmpegthumbnailer
 pkgver=2.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight video thumbnailer that can be used by file managers."
 url="http://code.google.com/p/ffmpegthumbnailer/"
 license=('GPL2')
diff --git a/extra/ffmpegthumbnailer/ffmpegapi_fix_r241.patch b/extra/ffmpegthumbnailer/ffmpegapi_fix_r241.patch
deleted file mode 100644
index 37e65b059..000000000
--- a/extra/ffmpegthumbnailer/ffmpegapi_fix_r241.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- libffmpegthumbnailer/moviedecoder.cpp.old	2012-05-20 11:57:04.503450287 +0200
-+++ libffmpegthumbnailer/moviedecoder.cpp	2012-05-20 11:57:14.633450566 +0200
-@@ -58,19 +58,26 @@
- void MovieDecoder::initialize(const string& filename)
- {
-     av_register_all();
--    avcodec_init();
-     avcodec_register_all();
- 
-     string inputFile = filename == "-" ? "pipe:" : filename;
-     m_AllowSeek = (filename != "-") && (filename.find("rtsp://") != 0);
--
-+    
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-     if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, inputFile.c_str(), NULL, 0, NULL) != 0)
-+#else
-+	if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, inputFile.c_str(), NULL, NULL) != 0)
-+#endif
-     {
- 		destroy();
-         throw logic_error(string("Could not open input file: ") + filename);
-     }
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-     if (av_find_stream_info(m_pFormatContext) < 0)
-+#else
-+	if (avformat_find_stream_info(m_pFormatContext, NULL) < 0)
-+#endif
-     {
- 		destroy();
-         throw logic_error(string("Could not find stream information"));
-@@ -90,8 +97,12 @@
- 
-     if ((!m_FormatContextWasGiven) && m_pFormatContext)
-     {
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-         av_close_input_file(m_pFormatContext);
-         m_pFormatContext = NULL;
-+#else
-+        avformat_close_input(&m_pFormatContext);
-+#endif
-     }
- 
-     if (m_pPacket)
-@@ -159,7 +170,11 @@
- 
-     m_pVideoCodecContext->workaround_bugs = 1;
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-     if (avcodec_open(m_pVideoCodecContext, m_pVideoCodec) < 0)
-+#else
-+	if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, NULL) < 0)
-+#endif
-     {
-         throw logic_error("Could not open video codec");
-     }
diff --git a/extra/ffmpegthumbnailer/ffmpegthumbnailer.desktop b/extra/ffmpegthumbnailer/ffmpegthumbnailer.desktop
deleted file mode 100644
index 79203e5bc..000000000
--- a/extra/ffmpegthumbnailer/ffmpegthumbnailer.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-[Thumbnailer Entry]
-TryExec=ffmpegthumbnailer
-Exec=ffmpegthumbnailer -s %s -i %u -o %o -c png -f -t 10
-MimeType=video/flv;video/webm;video/mkv;video/mp4;video/mpeg;video/avi;video/ogg;video/quicktime;video/x-avi;video/x-flv;video/x-mp4;video/x-mpeg;video/x-webm;video/x-mkv;application/x-extension-webm;video/x-matroska;video/x-ms-wmv;video/x-msvideo;video/x-msvideo/avi;video/x-theora/ogg;video/x-theora/ogv;video/x-ms-asf;video/x-m4v;
diff --git a/extra/figlet/PKGBUILD b/extra/figlet/PKGBUILD
deleted file mode 100644
index c702dc589..000000000
--- a/extra/figlet/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 160446 2012-06-02 01:31:54Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=figlet
-pkgver=2.2.5
-pkgrel=1
-pkgdesc="A program for making large letters out of ordinary text"
-arch=('i686' 'x86_64')
-url="http://www.figlet.org/"
-license=('BSD')
-depends=('glibc' 'sh')
-source=(ftp://ftp.figlet.org/pub/figlet/program/unix/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('dda696958c161bd71d6590152c94c4f705415727')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DEFAULTFONTDIR=/usr/share/figlet/fonts all
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" BINDIR=/usr/bin MANDIR=/usr/share/man \
-    DEFAULTFONTDIR=/usr/share/figlet/fonts install 
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/file-roller/PKGBUILD b/extra/file-roller/PKGBUILD
deleted file mode 100644
index dde6d1e84..000000000
--- a/extra/file-roller/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 172925 2012-12-06 20:48:57Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=file-roller
-pkgver=3.6.3
-pkgrel=1
-pkgdesc="Archive manipulator for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify')
-makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'itstool' 'docbook-xsl')
-optdepends=('unrar: the RAR uncompression program'
-            'zip: creates PKZIP-compatible .zip files'
-            'p7zip: 7zip compression utility'
-            'arj: ARJ archiver'
-            'unace: extraction tool for the proprietary ace archive format')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-install=file-roller.install
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6d99d7be243d442484ba46505df5e52ffb4e46ea5cd754daba865eccc22c8402')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/file-roller \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD
deleted file mode 100644
index fe9da598a..000000000
--- a/extra/firefox/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 172184 2012-12-01 13:09:12Z foutrelis $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Jakub Schmidtke <sjakub@gmail.com>
-
-pkgname=firefox
-pkgver=17.0.1
-pkgrel=1
-pkgdesc="Standalone web browser from mozilla.org"
-arch=('i686' 'x86_64')
-license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib'
-         'libnotify' 'desktop-file-utils' 'hicolor-icon-theme'
-         'libvpx' 'libevent' 'nss>=3.13.3' 'hunspell' 'sqlite')
-makedepends=('unzip' 'zip' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa'
-             'autoconf2.13' 'libidl2' 'xorg-server-xvfb' 'imake')
-optdepends=('wireless_tools: Location detection via available WiFi networks')
-url="http://www.mozilla.org/projects/firefox"
-install=firefox.install
-options=(!emptydirs)
-source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
-        mozconfig firefox.desktop firefox-install-dir.patch vendor.js shared-libs.patch)
-md5sums=('13d616028eb77de927c29b6655c832c9'
-         '5644c7b42f51013e2023787938fa955e'
-         'eb56667bc1919f2ed93e34bdfc21f7d6'
-         '150ac0fb3ac7b2114c8e8851a9e0516c'
-         '0d053487907de4376d67d8f499c5502b'
-         '52e52f840a49eb1d14be1c0065b03a93')
-
-build() {
-  cd mozilla-release
-
-  cp ../mozconfig .mozconfig
-  patch -Np1 -i ../firefox-install-dir.patch
-  patch -Np1 -i ../shared-libs.patch
-
-  # Fix PRE_RELEASE_SUFFIX
-  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
-    browser/base/Makefile.in
-
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/firefox"
-  export PYTHON="/usr/bin/python2"
-  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
-  unset MAKEFLAGS
-
-  # Enable PGO
-  export MOZ_PGO=1
-  export DISPLAY=:99
-  Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-  _fail=0
-
-  make -f client.mk build || _fail=1
-
-  kill $! || true
-  return $_fail
-}
-
-package() {
-  cd mozilla-release
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
-
-  install -Dm644 ../vendor.js "$pkgdir/usr/lib/firefox/defaults/preferences/vendor.js"
-
-  for i in 16 22 24 32 48 256; do
-      install -Dm644 browser/branding/official/default$i.png \
-        "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png"
-  done
-
-  install -Dm644 ../firefox.desktop \
-    "$pkgdir/usr/share/applications/firefox.desktop"
-
-  # Use system-provided dictionaries
-  rm -rf "$pkgdir"/usr/lib/firefox/{dictionaries,hyphenation}
-  ln -s /usr/share/hunspell "$pkgdir/usr/lib/firefox/dictionaries"
-  ln -s /usr/share/hyphen "$pkgdir/usr/lib/firefox/hyphenation"
-
-  # We don't want the development stuff
-  rm -r "$pkgdir"/usr/{include,lib/firefox-devel,share/idl}
-
-  #workaround for now
-  #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf firefox "$pkgdir/usr/lib/firefox/firefox-bin"
-}
diff --git a/extra/firefox/firefox-install-dir.patch b/extra/firefox/firefox-install-dir.patch
deleted file mode 100644
index 9c115f0eb..000000000
--- a/extra/firefox/firefox-install-dir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk
---- mozilla-release.orig/config/baseconfig.mk	2012-10-09 07:34:41.762092280 +0000
-+++ mozilla-release/config/baseconfig.mk	2012-10-09 07:40:53.052771576 +0000
-@@ -1,9 +1,9 @@
- INCLUDED_AUTOCONF_MK = 1
- 
--includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+includedir := $(includedir)/$(MOZ_APP_NAME)
-+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- DIST = $(DEPTH)/dist
- 
- # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk
---- mozilla-release.orig/js/src/config/baseconfig.mk	2012-10-09 07:34:58.411973276 +0000
-+++ mozilla-release/js/src/config/baseconfig.mk	2012-10-09 07:39:55.143186168 +0000
-@@ -1,7 +1,7 @@
- INCLUDED_AUTOCONF_MK = 1
- 
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- 
- ifneq (,$(filter /%,$(TOP_DIST)))
- DIST = $(TOP_DIST)
diff --git a/extra/firefox/firefox.desktop b/extra/firefox/firefox.desktop
deleted file mode 100644
index 45005dc0f..000000000
--- a/extra/firefox/firefox.desktop
+++ /dev/null
@@ -1,121 +0,0 @@
-[Desktop Entry]
-Name=Firefox
-Name[bn]=ফায়ারফক্স
-Name[eo]=Fajrovulpo
-Name[fi]=Firefox
-Name[pa]=ਫਾਇਰਫੋਕਸ
-Name[tg]=Рӯбоҳи оташин
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Прелистувач на Интернет 
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb 
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
-Comment=Browse the World Wide Web
-Comment[ar]=تصفح الشبكة العنكبوتية العالمية
-Comment[ast]=Restola pela Rede
-Comment[bn]=ইন্টারনেট ব্রাউজ করুন
-Comment[ca]=Navegueu per la web
-Comment[cs]=Prohlížení stránek World Wide Webu
-Comment[da]=Surf på internettet
-Comment[de]=Im Internet surfen
-Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web)
-Comment[es]=Navegue por la web
-Comment[et]=Lehitse veebi
-Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
-Comment[fi]=Selaa Internetin WWW-sivuja
-Comment[fr]=Naviguer sur le Web
-Comment[gl]=Navegar pola rede
-Comment[he]=גלישה ברחבי האינטרנט
-Comment[hr]=Pretražite web
-Comment[hu]=A világháló böngészése
-Comment[it]=Esplora il web
-Comment[ja]=ウェブを閲覧します
-Comment[ko]=웹을 돌아 다닙니다
-Comment[ku]=Li torê bigere
-Comment[lt]=Naršykite internete
-Comment[nb]=Surf på nettet
-Comment[nl]=Verken het internet
-Comment[nn]=Surf på nettet
-Comment[no]=Surf på nettet
-Comment[pl]=Przeglądanie stron WWW 
-Comment[pt]=Navegue na Internet
-Comment[pt_BR]=Navegue na Internet
-Comment[ro]=Navigați pe Internet
-Comment[ru]=Доступ в Интернет
-Comment[sk]=Prehliadanie internetu
-Comment[sl]=Brskajte po spletu
-Comment[sv]=Surfa på webben
-Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ
-Comment[uk]=Перегляд сторінок Інтернету
-Comment[vi]=Để duyệt các trang web
-Comment[zh_CN]=浏览互联网
-Comment[zh_TW]=瀏覽網際網路
-Exec=firefox %u
-Icon=firefox
-Terminal=false
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-StartupNotify=true
-Categories=Network;WebBrowser;
diff --git a/extra/firefox/mozconfig b/extra/firefox/mozconfig
deleted file mode 100644
index c13380e32..000000000
--- a/extra/firefox/mozconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-#ac_add_options --enable-system-cairo
-ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-official-branding
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-#ac_add_options --enable-gstreamer
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-installer
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
diff --git a/extra/firefox/shared-libs.patch b/extra/firefox/shared-libs.patch
deleted file mode 100644
index 1f22b2b0d..000000000
--- a/extra/firefox/shared-libs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in
---- mozilla-release.orig/browser/installer/Makefile.in	2012-07-17 16:19:29.480356991 +0000
-+++ mozilla-release/browser/installer/Makefile.in	2012-07-17 17:32:41.250937293 +0000
-@@ -50,7 +50,7 @@
- MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
- # Some files have been already bundled with xulrunner
- ifndef SYSTEM_LIBXUL
--MOZ_PKG_FATAL_WARNINGS = 1
-+MOZ_PKG_FATAL_WARNINGS = 0
- endif
- 
- MOZ_NONLOCALIZED_PKG_LIST = \
diff --git a/extra/firefox/vendor.js b/extra/firefox/vendor.js
deleted file mode 100644
index d8d606bc1..000000000
--- a/extra/firefox/vendor.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default browser checking.
-pref("browser.shell.checkDefaultBrowser", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);
diff --git a/extra/five-or-more/PKGBUILD b/extra/five-or-more/PKGBUILD
new file mode 100644
index 000000000..7de473167
--- /dev/null
+++ b/extra/five-or-more/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 183355 2013-04-21 22:09:04Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=five-or-more
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Remove colored balls from the board by forming lines"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=five-or-more.install
+url="https://live.gnome.org/Five%20or%20more"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('a050f472dadbb3f44e5cd5e4ab31058a6058f4ccaa03558311706ec0c052b056')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile \
+      --with-scores-user=root --with-scores-group=games
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Remove all scores, we generate them from postinstall
+  rm -rf "$pkgdir/var"
+}
diff --git a/extra/five-or-more/five-or-more.install b/extra/five-or-more/five-or-more.install
new file mode 100644
index 000000000..eb9e34de3
--- /dev/null
+++ b/extra/five-or-more/five-or-more.install
@@ -0,0 +1,35 @@
+_scores=(
+	glines.Small.scores
+	glines.Medium.scores
+	glines.Large.scores
+)
+
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    if [ -e "var/games/$score" ]; then
+      continue
+    fi
+
+    touch "var/games/$score"
+    chown root:games "var/games/$score"
+    chmod 664 "var/games/$score"
+  done
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    rm -f "var/games/$score"
+  done
+}
diff --git a/extra/flac/PKGBUILD b/extra/flac/PKGBUILD
index a95748d48..fa69e9dba 100644
--- a/extra/flac/PKGBUILD
+++ b/extra/flac/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=flac
 pkgname=('flac' 'flac-doc')
 pkgver=1.2.1
-pkgrel=3.1
+pkgrel=3.2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://flac.sourceforge.net/"
 license=('BSD' 'GPL')
diff --git a/extra/flashplugin/PKGBUILD b/extra/flashplugin/PKGBUILD
deleted file mode 100644
index 7698203e9..000000000
--- a/extra/flashplugin/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 173213 2012-12-13 12:39:25Z stephane $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=flashplugin
-_licensefile='PlatformClients_PC_WWEULA_Combined_20100108_1657.pdf'
-pkgver=11.2.202.258
-pkgrel=1
-pkgdesc='Adobe Flash Player'
-url='http://get.adobe.com/flashplayer'
-arch=('i686' 'x86_64')
-depends=('mozilla-common' 'libxt' 'libxpm' 'gtk2' 'nss' 'curl' 'hicolor-icon-theme')
-optdepends=('libvdpau: GPU acceleration on Nvidia card')
-provides=('flashplayer')
-license=('custom')
-options=(!strip)
-install=flashplugin.install
-backup=(etc/adobe/mms.cfg)
-
-if [ "$CARCH" = "i686" ]; then
-    source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.i386.tar.gz"
-            "http://www.adobe.com/products/eulas/pdfs/${_licensefile}"
-            mms.cfg)
-    md5sums=('ed48f0db80969b1df1e9aab9a9276b8a'
-             '94ca2aecb409abfe36494d1a7ec7591d'
-             'f34aae6279b40e0bd2abfb0d9963d7b8')
-elif [ "$CARCH" = "x86_64" ]; then
-    source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.x86_64.tar.gz"
-            "http://www.adobe.com/products/eulas/pdfs/${_licensefile}"
-            mms.cfg)
-    md5sums=('999fec504e6d85b1b995264d796d49bf'
-             '94ca2aecb409abfe36494d1a7ec7591d'
-             'f34aae6279b40e0bd2abfb0d9963d7b8')
-fi
-
-package () {
-    install -Dm755 libflashplayer.so "$pkgdir/usr/lib/mozilla/plugins/libflashplayer.so"
-    if [ "$CARCH" = x86_64 ]; then
-        install -Dm755 usr/lib64/kde4/kcm_adobe_flash_player.so "$pkgdir/usr/lib/kde4/kcm_adobe_flash_player.so"
-    else
-        install -Dm755 usr/lib/kde4/kcm_adobe_flash_player.so "$pkgdir/usr/lib/kde4/kcm_adobe_flash_player.so"
-    fi
-    install -Dm755 usr/bin/flash-player-properties "$pkgdir/usr/bin/flash-player-properties"
-    for i in 16x16 22x22 24x24 32x32 48x48; do
-        install -Dm644 usr/share/icons/hicolor/$i/apps/flash-player-properties.png \
-            "$pkgdir/usr/share/icons/hicolor/$i/apps/flash-player-properties.png"
-    done
-    install -Dm644 usr/share/applications/flash-player-properties.desktop "$pkgdir/usr/share/applications/flash-player-properties.desktop"
-    install -Dm644 usr/share/kde4/services/kcm_adobe_flash_player.desktop "$pkgdir/usr/share/kde4/services/kcm_adobe_flash_player.desktop"
-    install -Dm644 "${_licensefile}" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.pdf"
-    install -Dm644 "$srcdir/mms.cfg" "$pkgdir/etc/adobe/mms.cfg"
-}
diff --git a/extra/flashplugin/flashplugin.install b/extra/flashplugin/flashplugin.install
deleted file mode 100644
index 8018fcba2..000000000
--- a/extra/flashplugin/flashplugin.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-    echo " >> "
-    echo " >> If you have an NVIDIA card that supports libvdpau or Broadcom Crystal HD chips,"
-    echo " >> uncomment EnableLinuxHWVideoDecode=1 from /etc/adobe/mms.cfg."
-    echo " >> If you run into problems, please contact nVidia or Broadcom along with your system config info / driver version."
-    echo " >> "
-}
-
-post_upgrade() {
-    if  [ "$(vercmp $2 10.2.152.27-2)" -lt 0 ]; then
-        post_install $1
-    fi
-}
diff --git a/extra/flashplugin/mms.cfg b/extra/flashplugin/mms.cfg
deleted file mode 100644
index 716525dd0..000000000
--- a/extra/flashplugin/mms.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-#Hardware video decoding
-#EnableLinuxHWVideoDecode=1
diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD
index cf5783bb9..e42d88143 100644
--- a/extra/fltk/PKGBUILD
+++ b/extra/fltk/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.2
-pkgrel=1
+pkgrel=1.1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:LGPL')
 url="http://www.fltk.org/"
diff --git a/extra/fluidsynth/PKGBUILD b/extra/fluidsynth/PKGBUILD
index 45ff9f79b..ae6d2337d 100644
--- a/extra/fluidsynth/PKGBUILD
+++ b/extra/fluidsynth/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=fluidsynth
 pkgver=1.1.6
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications"
 arch=(i686 x86_64 'mips64el')
 url="http://www.fluidsynth.org/"
diff --git a/extra/fluidsynth/fluidsynthd b/extra/fluidsynth/fluidsynthd
deleted file mode 100644
index ca1e8fa6e..000000000
--- a/extra/fluidsynth/fluidsynthd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/fluidsynth ] && . /etc/conf.d/fluidsynth
-
-PID=`pidof -o %PPID /usr/bin/fluidsynth`
-case "$1" in
-   start)
-     stat_busy "Starting Fluidsynth soundfont synthesizer"
-     [ -z "$PID" ] && /usr/bin/fluidsynth -is $FSYNTH_OPTS $FSYNTH_SOUNDFONT > /dev/null 2>&1 &
-     if [ $? -gt 0 ]; then
-       stat_fail
-     else
-       echo $PID > /var/run/fluidsynth.pid
-       add_daemon fluidsynth
-       stat_done
-     fi
-     ;;
-   stop)
-     stat_busy "Stopping Fluidsynth soundfont synthesizer"
-     [ ! -z "$PID" ]  && kill $PID &> /dev/null 2>&1
-     if [ $? -gt 0 ]; then
-       stat_fail
-     else
-       rm /var/run/fluidsynth.pid
-       rm_daemon fluidsynth
-       stat_done
-     fi
-     ;;
-   restart)
-     $0 stop
-     sleep 1
-     $0 start
-     ;;
-   *)
-     echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/fluxbox/PKGBUILD b/extra/fluxbox/PKGBUILD
index 1baacc893..78f3354e9 100644
--- a/extra/fluxbox/PKGBUILD
+++ b/extra/fluxbox/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177083 2013-02-06 03:07:57Z eric $
+# $Id: PKGBUILD 181689 2013-04-04 05:04:01Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fluxbox
-pkgver=1.3.3
+pkgver=1.3.5
 pkgrel=2
 pkgdesc="A lightweight and highly-configurable window manager"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,14 +12,12 @@ depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'imlib2' 'fribid
 optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu utilities')
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.lzma \
-        fluxbox.desktop fluxbox-fix_timer.diff)
-sha1sums=('6892259dd495424291194fde242230cca95abce3'
-          'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8'
-          'bc10368d7a157f83428897e2b7aced7ce620dec3')
+        fluxbox.desktop)
+sha1sums=('495d82ca428949cc2bc85814898b49cf4624b7cb'
+          'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/fluxbox-fix_timer.diff"
   ./configure --prefix=/usr \
     --enable-xft --enable-xinerama \
     --enable-imlib2 --enable-nls
@@ -29,6 +27,8 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
+  sed -i 's/@EXEEXT@//g' "${pkgdir}"/usr/{bin/fluxbox-generate_menu,share/fluxbox/menu}
+
   install -D -m644 ../fluxbox.desktop "${pkgdir}/usr/share/xsessions/fluxbox.desktop"
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/fluxbox/fluxbox-fix_timer.diff b/extra/fluxbox/fluxbox-fix_timer.diff
deleted file mode 100644
index dceb1043b..000000000
--- a/extra/fluxbox/fluxbox-fix_timer.diff
+++ /dev/null
@@ -1,78 +0,0 @@
-From 4d307dcd10af9d817ff5c05fc40ae7487564cb31 Mon Sep 17 00:00:00 2001
-From: Mathias Gumz <akira at fluxbox dot org>
-Date: Sat, 12 Jan 2013 08:24:11 +0000
-Subject: Fix bug: handle the list of Timers not in-place
-
-With commit 541c8c4 we switched from an (manually) ordered list to a
-std::set<> to handle the active timers. The code which checks for overdue
-timers now traverses and modifies the std::set<> in place. This might
-lead to an infinite loop. Examples of such bad behavior are "flickering of
-the tooltip" (bug #3590078) or crashes (bug #3600143) or just insanely high
-cpu load when autoraising windows or submenus.
-
-We now make a copy of the std::set<> traverse this instead of the original.
----
-diff --git a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc
-index f63ea38..dd736dd 100644
---- a/src/FbTk/Timer.cc
-+++ b/src/FbTk/Timer.cc
-@@ -52,6 +52,7 @@
- #endif
- 
- #include <cstdio>
-+#include <vector>
- #include <set>
- 
- 
-@@ -195,32 +196,35 @@ void Timer::updateTimers(int fd) {
-         return;
-     }
- 
-+    // stoping / restarting the timers modifies the list in an upredictable
-+    // way. to avoid problems such as infinite loops we save the current
-+    // (ordered) list of timers into a list and work on it.
-+
-+    ssize_t i;
-+    const ssize_t ts = s_timerlist.size();
-+    std::vector<FbTk::Timer*> timers;
-+
-+    timers.reserve(ts);
-+    for (it = s_timerlist.begin(); it != s_timerlist.end(); ++it ) {
-+        timers.push_back(*it);
-+    }
-+
-     now = FbTime::now();
--    for (it = s_timerlist.begin(); it != s_timerlist.end(); ) {
-+    for (i = 0; i < ts; ++i) {
-+
-+        FbTk::Timer* t = timers[i];
- 
--        // t->fireTimeout() might add timers to the list
--        // this invalidates 'it'. thus we store the current timer
--        Timer* t = *it;
-         if (now < t->getEndTime()) {
-             break;
-         }
- 
-         t->fireTimeout();
--
--        // find the iterator to the timer again
--        // and continue working on the list
--        it = s_timerlist.find(t);
--        it++;
--        s_timerlist.erase(t);
-+        t->stop();
- 
-         if (! t->doOnce()) { // restart the current timer
--            t->m_timing = false;
-             t->start();
--        } else {
--            t->stop();
-         }
-     }
--
- }
- 
- 
---
-cgit v0.9.1
diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD
index 45c2ee704..a929f0a3b 100644
--- a/extra/folks/PKGBUILD
+++ b/extra/folks/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 169873 2012-10-30 22:25:29Z heftig $
+# $Id: PKGBUILD 183356 2013-04-21 22:09:07Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=folks
-pkgver=0.8.0
-pkgrel=1
+pkgver=0.9.1
+pkgrel=3
 pkgdesc="Library to aggregates people into metacontacts"
 arch=(i686 x86_64 'mips64el')
 url="http://telepathy.freedesktop.org/wiki/Folks"
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb' 'libzeitgeist')
-makedepends=('gobject-introspection' 'intltool')
+license=(LGPL2.1)
+depends=(telepathy-glib libgee libxml2 evolution-data-server libzeitgeist libtracker-sparql)
+makedepends=(gobject-introspection intltool)
 install=folks.install
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8c56c7594dd502ef5877e93181136e41f4ea03de4971372a7a04e7f1492eed9d')
+sha256sums=('102b1867355d16e73a837871a058dda13c74fa385908ddda1623893ab0baee4a')
 
 build() {
   cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-schemas-compile
+  ./configure --prefix=/usr --disable-schemas-compile --enable-tracker-backend \
+    --disable-libsocialweb-backend
   make
 }
 
diff --git a/extra/fontconfig/29-replace-bitmap-fonts.conf b/extra/fontconfig/29-replace-bitmap-fonts.conf
index 7ac4483c4..391ffef94 100644
--- a/extra/fontconfig/29-replace-bitmap-fonts.conf
+++ b/extra/fontconfig/29-replace-bitmap-fonts.conf
@@ -1,37 +1,18 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-    <!-- Replace generic bitmap font names by generic font families.
-         These font-families will get replaced by other rules and
-	 default to scaled ones. -->
-    <match target="pattern" name="family">
-        <test name="family" qual="any">
-            <string>Helvetica</string>
-        </test>
-        <edit mode="assign" name="family">
-            <string>Arial</string>
-            <string>Liberation Sans</string>	    
-            <string>sans-serif</string>
-        </edit>
-    </match>
-    <match target="pattern" name="family">
-        <test name="family" qual="any">
-            <string>Courier</string>
-        </test>
-        <edit mode="assign" name="family">
-            <string>Courier New</string>
-            <string>Liberation Mono</string>
-            <string>monospace</string>
-        </edit>
-    </match>
-    <match target="pattern" name="family">
-        <test name="family" qual="any">
-            <string>Times</string>
-        </test>
-        <edit mode="assign" name="family">
-            <string>Times New Roman</string>
-            <string>Liberation Serif</string>
-            <string>serif</string>
-        </edit>
-    </match>
+  <!-- Prefer Microsoft versions of PostScript fonts, as these typically render a lot better on-screen 
+       30-metric-aliases.conf will then also add the free clones of these fonts -->
+  <alias binding="same">
+    <family>Helvetica</family>
+    <prefer><family>Arial</family></prefer>
+  </alias>
+  <alias binding="same">
+    <family>Times</family>
+    <prefer><family>Times New Roman</family></prefer>
+  </alias>
+  <alias binding="same">
+    <family>Courier</family>
+    <prefer><family>Courier New</family></prefer>
+  </alias>
 </fontconfig>
diff --git a/extra/fontconfig/30-urw-aliases.patch b/extra/fontconfig/30-urw-aliases.patch
deleted file mode 100644
index 8077b869e..000000000
--- a/extra/fontconfig/30-urw-aliases.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/conf.d/30-urw-aliases.conf	2009-08-06 16:23:57.000000000 +0100
-+++ b/conf.d/30-urw-aliases.conf	2009-08-06 16:25:07.000000000 +0100
-@@ -29,6 +29,10 @@
- 	  <family>Zapf Dingbats</family>
- 	  <accept><family>Dingbats</family></accept>
- 	</alias>
-+	<alias binding="same">
-+	  <family>ZapfDingbats</family>
-+	  <accept><family>Dingbats</family></accept>
-+	</alias>
- 	<match target="pattern">
- 	  <test name="family">
- 	    <string>Symbol</string>
diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD
index a1b5b0062..d04e83746 100644
--- a/extra/fontconfig/PKGBUILD
+++ b/extra/fontconfig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175209 2013-01-16 17:39:36Z andyrtr $
+# $Id: PKGBUILD 183357 2013-04-21 22:09:09Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=fontconfig
-pkgver=2.10.2
-pkgrel=2
+pkgver=2.10.92
+pkgrel=4
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64 'mips64el')
 url="http://www.fontconfig.org/release/"
@@ -12,13 +12,20 @@ depends=('expat' 'freetype2')
 options=('!libtool')
 install=fontconfig.install
 source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
-        29-replace-bitmap-fonts.conf)
-sha256sums=('8ea8ef56738fd95f0be611015f89614fd4dec79ddac6b3ff26bc4a8338569952'
-            '5addef189c5e01679ce3b610f8864c59980029c98f323f40f8c9080429857fdc')
+        29-replace-bitmap-fonts.conf git_fixes.diff)
+sha256sums=('1162059927120f2321f12917189b524e6b2f09e11ac643278d0bb82634035b22'
+            '2325c478783659e8fce79f5754119934d6ce21f81552f878b740c7b18f9fe0d6'
+            '7dc98137405ee0e5f98f3266a760a4da27d78e3c2bc7b7ef4db6b481df3c39f0')
+
+  # a nice page to test font matching:
+  # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # post release fixes
+  patch -Np1 -i ${srcdir}/git_fixes.diff
+
   # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well
   libtoolize -f
   autoreconf -fi
@@ -43,12 +50,9 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 
-  # not upstream, not in FC and not in Gentoo, this should probably go upstream
-  # meanwhile to satisfy pages like http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html we bring it back
   install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail"
-  pushd $pkgdir/etc/fonts/conf.d
-  ln -s /etc/fonts/conf.avail/29-replace-bitmap-fonts.conf .
-  popd
+  ln -s ../conf.avail/29-replace-bitmap-fonts.conf \
+    "$pkgdir/etc/fonts/conf.d/29-replace-bitmap-fonts.conf"
 
   #Install license
   install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
diff --git a/extra/fontconfig/git_fixes.diff b/extra/fontconfig/git_fixes.diff
new file mode 100644
index 000000000..209cba64c
--- /dev/null
+++ b/extra/fontconfig/git_fixes.diff
@@ -0,0 +1,732 @@
+From 8fd0ed60a62cb7f36b2ade1bd16a66671eaf79da Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Mon, 01 Apr 2013 09:16:28 +0000
+Subject: Bug 62980 - matching native fonts with even :lang=en
+
+Fix the matcher modified by 4eab908c8679a797ac7016b77a93ee41bb11b0fc
+to deal with both strong and weak of FC_LANG as the same location in the score
+---
+diff --git a/src/fcmatch.c b/src/fcmatch.c
+index 68f39ae..2d7b798 100644
+--- a/src/fcmatch.c
++++ b/src/fcmatch.c
+@@ -227,9 +227,10 @@ typedef enum _FcMatcherPriorityDummy {
+ #undef FC_OBJECT
+ 
+ #undef PRI1
+-#define PRI1(n)			\
+-    PRI_ ## n ## _STRONG,	\
+-    PRI_ ## n ## _WEAK
++#define PRI1(n)					\
++    PRI_ ## n,					\
++    PRI_ ## n ## _STRONG = PRI_ ## n,		\
++    PRI_ ## n ## _WEAK = PRI_ ## n
+ 
+ typedef enum _FcMatcherPriority {
+     PRI1(HASH),
+@@ -237,9 +238,8 @@ typedef enum _FcMatcherPriority {
+     PRI1(FOUNDRY),
+     PRI1(CHARSET),
+     PRI_FAMILY_STRONG,
+-    PRI_LANG_STRONG,
+     PRI_POSTSCRIPT_NAME_STRONG,
+-    PRI_LANG_WEAK,
++    PRI1(LANG),
+     PRI_FAMILY_WEAK,
+     PRI_POSTSCRIPT_NAME_WEAK,
+     PRI1(SPACING),
+@@ -910,8 +910,7 @@ FcFontSetSort (FcConfig	    *config FC_UNUSED,
+ 	 * If this node matches any language, go check
+ 	 * which ones and satisfy those entries
+ 	 */
+-	if (nodeps[f]->score[PRI_LANG_STRONG] < 2000 ||
+-	    nodeps[f]->score[PRI_LANG_WEAK] < 2000)
++	if (nodeps[f]->score[PRI_LANG] < 2000)
+ 	{
+ 	    for (i = 0; i < nPatternLang; i++)
+ 	    {
+@@ -935,13 +934,6 @@ FcFontSetSort (FcConfig	    *config FC_UNUSED,
+ 			}
+ 			patternLangSat[i] = FcTrue;
+ 			satisfies = FcTrue;
+-			/* adjust score to ensure it's not more than 10000.0
+-			 * which would means the lang didn't satisfy the requirements
+-			 */
+-			if (nodeps[f]->score[PRI_LANG_STRONG] > 10000.0)
+-			    nodeps[f]->score[PRI_LANG_STRONG] = 10000.0;
+-			if (nodeps[f]->score[PRI_LANG_WEAK] > 10000.0)
+-			    nodeps[f]->score[PRI_LANG_WEAK] = 10000.0;
+ 			break;
+ 		    }
+ 		}
+@@ -949,8 +941,7 @@ FcFontSetSort (FcConfig	    *config FC_UNUSED,
+ 	}
+ 	if (!satisfies)
+ 	{
+-	    nodeps[f]->score[PRI_LANG_STRONG] = 10000.0;
+-	    nodeps[f]->score[PRI_LANG_WEAK] = 10000.0;
++	    nodeps[f]->score[PRI_LANG] = 10000.0;
+ 	}
+     }
+ 
+--
+cgit v0.9.0.2-2-gbebe
+From 18bf57c70aafcad031c0b43756b754dcaf6a756a Mon Sep 17 00:00:00 2001
+From: Sebastian Freundt <hroptatyr@fresse.org>
+Date: Sun, 07 Apr 2013 00:02:58 +0000
+Subject: build-chain, replace INCLUDES directive by AM_CPPFLAGS
+
+As of automake-13.1 the INCLUDES directive is no longer supported.
+An automake run will return with an error.
+
+This changeset simply follows automake's advice to replace INCLUDES
+by AM_CPPFLAGS.
+---
+diff --git a/Tools.mk b/Tools.mk
+index 56766da..f0fa0ec 100644
+--- a/Tools.mk
++++ b/Tools.mk
+@@ -32,7 +32,7 @@ TOOL=./$(DIR)$(EXEEXT_FOR_BUILD)
+ 
+ EXTRA_DIST = $(TARG) $(TMPL) $(TSRC) $(DIST)
+ 
+-INCLUDES = \
++AM_CPPFLAGS = \
+ 	   -I$(builddir) \
+ 	   -I$(srcdir) \
+ 	   -I$(top_builddir)/src \
+@@ -43,7 +43,7 @@ INCLUDES = \
+ 	   $(WARN_CFLAGS)
+ 
+ $(TOOL): $(TSRC) $(ALIAS_FILES)
+-	$(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(INCLUDES)
++	$(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS)
+ 
+ $(TARG): $(TMPL) $(TSRC) $(DEPS)
+ 	$(AM_V_GEN) $(MAKE) $(TOOL) && \
+diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
+index 7f7d1b1..0e10786 100644
+--- a/fc-cache/Makefile.am
++++ b/fc-cache/Makefile.am
+@@ -36,7 +36,7 @@ uninstall-local:
+ 	-$(RM) -rf "$(DESTDIR)$(fc_cachedir)"
+ endif
+ 
+-INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS)
++AM_CPPFLAGS=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS)
+ 
+ bin_PROGRAMS=fc-cache
+ 
+diff --git a/fc-cat/Makefile.am b/fc-cat/Makefile.am
+index b426723..04c1cc4 100644
+--- a/fc-cat/Makefile.am
++++ b/fc-cat/Makefile.am
+@@ -27,7 +27,7 @@ FC_CAT_SRC=${top_srcdir}/fc-cat
+ 
+ SGML = ${FC_CAT_SRC}/fc-cat.sgml
+ 
+-INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
++AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS)
+ 
+ bin_PROGRAMS=fc-cat
+ 
+diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am
+index b2c499d..c58540e 100644
+--- a/fc-list/Makefile.am
++++ b/fc-list/Makefile.am
+@@ -29,7 +29,7 @@ SGML = ${FC_LIST_SRC}/fc-list.sgml
+ 
+ bin_PROGRAMS=fc-list
+ 
+-INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
++AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS)
+ 
+ BUILT_MANS=fc-list.1
+ 
+diff --git a/fc-match/Makefile.am b/fc-match/Makefile.am
+index 0e9e8fd..84afb8b 100644
+--- a/fc-match/Makefile.am
++++ b/fc-match/Makefile.am
+@@ -29,7 +29,7 @@ FC_MATCH_SRC=${top_srcdir}/fc-match
+ 
+ SGML = ${FC_MATCH_SRC}/fc-match.sgml
+ 
+-INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
++AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS)
+ 
+ BUILT_MANS=fc-match.1
+ 
+diff --git a/fc-pattern/Makefile.am b/fc-pattern/Makefile.am
+index 92b0433..c456247 100644
+--- a/fc-pattern/Makefile.am
++++ b/fc-pattern/Makefile.am
+@@ -29,7 +29,7 @@ FC_PATTERN_SRC=${top_srcdir}/fc-pattern
+ 
+ SGML = ${FC_PATTERN_SRC}/fc-pattern.sgml
+ 
+-INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
++AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS)
+ 
+ BUILT_MANS=fc-pattern.1
+ 
+diff --git a/fc-query/Makefile.am b/fc-query/Makefile.am
+index b3ea1e6..73b3f11 100644
+--- a/fc-query/Makefile.am
++++ b/fc-query/Makefile.am
+@@ -29,7 +29,7 @@ FC_QUERY_SRC=${top_srcdir}/fc-query
+ 
+ SGML = ${FC_QUERY_SRC}/fc-query.sgml
+ 
+-INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
++AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
+ 
+ BUILT_MANS=fc-query.1
+ 
+diff --git a/fc-scan/Makefile.am b/fc-scan/Makefile.am
+index 2063405..471a42f 100644
+--- a/fc-scan/Makefile.am
++++ b/fc-scan/Makefile.am
+@@ -29,7 +29,7 @@ FC_SCAN_SRC=${top_srcdir}/fc-scan
+ 
+ SGML = ${FC_SCAN_SRC}/fc-scan.sgml
+ 
+-INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
++AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
+ 
+ BUILT_MANS=fc-scan.1
+ 
+diff --git a/fc-validate/Makefile.am b/fc-validate/Makefile.am
+index 54edec2..782cead 100644
+--- a/fc-validate/Makefile.am
++++ b/fc-validate/Makefile.am
+@@ -29,7 +29,7 @@ FC_VALIDATE_SRC=${top_srcdir}/fc-validate
+ 
+ SGML = ${FC_VALIDATE_SRC}/fc-validate.sgml
+ 
+-INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
++AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
+ 
+ BUILT_MANS=fc-validate.1
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9fd7dd8..066cc03 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -70,7 +70,7 @@ uninstall-ms-import-lib:
+ 
+ endif
+ 
+-INCLUDES = 						\
++AM_CPPFLAGS = 						\
+ 	-I$(top_srcdir)					\
+ 	-I$(top_srcdir)/src				\
+ 	$(FREETYPE_CFLAGS)				\
+--
+cgit v0.9.0.2-2-gbebe
+From 9299155b5247255d6b6687448173056c3ca8d09b Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Tue, 09 Apr 2013 02:34:35 +0000
+Subject: Ensure closing fp on error
+
+---
+diff --git a/src/fchash.c b/src/fchash.c
+index 827b20f..4ea5f37 100644
+--- a/src/fchash.c
++++ b/src/fchash.c
+@@ -220,7 +220,7 @@ FcHashGetSHA256DigestFromFile (const FcChar8 *filename)
+ 
+     ret = FcHashInitSHA256Digest ();
+     if (!ret)
+-	return NULL;
++	goto bail0;
+ 
+     while (!feof (fp))
+     {
+--
+cgit v0.9.0.2-2-gbebe
+From c93a8b8b54afe33e5ecf9870723543cb4058fa94 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Tue, 09 Apr 2013 03:46:30 +0000
+Subject: Obtain fonts data via FT_Face instead of opening a file directly
+
+---
+diff --git a/src/fcfreetype.c b/src/fcfreetype.c
+index 8a037c0..1eecfdb 100644
+--- a/src/fcfreetype.c
++++ b/src/fcfreetype.c
+@@ -1662,7 +1662,7 @@ FcFreeTypeQueryFace (const FT_Face  face,
+     if (!FcPatternAddBool (pat, FC_DECORATIVE, decorative))
+ 	goto bail1;
+ 
+-    hashstr = FcHashGetSHA256DigestFromFile (file);
++    hashstr = FcHashGetSHA256DigestFromFace (face);
+     if (!hashstr)
+ 	goto bail1;
+     if (!FcPatternAddString (pat, FC_HASH, hashstr))
+diff --git a/src/fchash.c b/src/fchash.c
+index 4ea5f37..043d94b 100644
+--- a/src/fchash.c
++++ b/src/fchash.c
+@@ -29,6 +29,9 @@
+ #include "fcint.h"
+ #include <stdio.h>
+ #include <string.h>
++#include <ft2build.h>
++#include FT_TRUETYPE_TABLES_H
++#include FT_TRUETYPE_TAGS_H
+ 
+ #define ROTRN(w, v, n)	((((FcChar32)v) >> n) | (((FcChar32)v) << (w - n)))
+ #define ROTR32(v, n)	ROTRN(32, v, n)
+@@ -204,41 +207,50 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings,
+ }
+ 
+ FcChar8 *
+-FcHashGetSHA256DigestFromFile (const FcChar8 *filename)
++FcHashGetSHA256DigestFromFace (const FT_Face face)
+ {
+-    FILE *fp = fopen ((const char *)filename, "rb");
+-    char ibuf[64];
++    char ibuf[64], *buf = NULL;
+     FcChar32 *ret;
+-    size_t len;
+-    struct stat st;
++    FT_Error err;
++    FT_ULong len = 0, alen, i = 0;
+ 
+-    if (!fp)
++    err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len);
++    if (err != FT_Err_Ok)
+ 	return NULL;
+-
+-    if (FcStat (filename, &st))
++    alen = (len + 63) & ~63;
++    buf = malloc (alen);
++    if (!buf)
++	return NULL;
++    err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)buf, &len);
++    if (err != FT_Err_Ok)
+ 	goto bail0;
++    memset (&buf[len], 0, alen - len);
+ 
+     ret = FcHashInitSHA256Digest ();
+     if (!ret)
+ 	goto bail0;
+ 
+-    while (!feof (fp))
++    while (i <= len)
+     {
+-	if ((len = fread (ibuf, sizeof (char), 64, fp)) < 64)
++	if ((len - i) < 64)
+ 	{
+ 	    long v;
++	    int n;
+ 
+ 	    /* add a padding */
+-	    memset (&ibuf[len], 0, 64 - len);
+-	    ibuf[len] = 0x80;
+-	    if ((64 - len) < 9)
++	    n = len - i;
++	    if (n > 0)
++		memcpy (ibuf, &buf[i], n);
++	    memset (&ibuf[n], 0, 64 - n);
++	    ibuf[n] = 0x80;
++	    if ((64 - n) < 9)
+ 	    {
+ 		/* process a block once */
+ 		FcHashComputeSHA256Digest (ret, ibuf);
+ 		memset (ibuf, 0, 64);
+ 	    }
+ 	    /* set input size at the end */
+-	    v = (long)st.st_size * 8;
++	    v = len * 8;
+ 	    ibuf[63 - 0] =  v        & 0xff;
+ 	    ibuf[63 - 1] = (v >>  8) & 0xff;
+ 	    ibuf[63 - 2] = (v >> 16) & 0xff;
+@@ -252,14 +264,18 @@ FcHashGetSHA256DigestFromFile (const FcChar8 *filename)
+ 	}
+ 	else
+ 	{
+-	    FcHashComputeSHA256Digest (ret, ibuf);
++	    FcHashComputeSHA256Digest (ret, &buf[i]);
+ 	}
++	i += 64;
+     }
+-    fclose (fp);
++    if (buf)
++	free (buf);
+ 
+     return FcHashSHA256ToString (ret);
+ 
+ bail0:
+-    fclose (fp);
++    if (buf)
++	free (buf);
++
+     return NULL;
+ }
+diff --git a/src/fcint.h b/src/fcint.h
+index c45075e..703b983 100644
+--- a/src/fcint.h
++++ b/src/fcint.h
+@@ -47,6 +47,8 @@
+ #include "fcdeprecate.h"
+ #include "fcmutex.h"
+ #include "fcatomic.h"
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ 
+ #ifndef FC_CONFIG_PATH
+ #define FC_CONFIG_PATH "fonts.conf"
+@@ -819,7 +821,7 @@ FcPrivate FcChar8 *
+ FcHashGetSHA256Digest (const FcChar8 *input_strings,
+ 		       size_t         len);
+ FcPrivate FcChar8 *
+-FcHashGetSHA256DigestFromFile (const FcChar8 *filename);
++FcHashGetSHA256DigestFromFace (const FT_Face face);
+ 
+ /* fcinit.c */
+ FcPrivate FcConfig *
+--
+cgit v0.9.0.2-2-gbebe
+From fc5a589abad0e8285f7d95007ebda76536e8fa7d Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Tue, 09 Apr 2013 08:18:43 +0000
+Subject: Revert the previous change and rework to not export freetype API outside fcfreetype.c
+
+---
+diff --git a/src/fcfreetype.c b/src/fcfreetype.c
+index 1eecfdb..22064b3 100644
+--- a/src/fcfreetype.c
++++ b/src/fcfreetype.c
+@@ -1104,7 +1104,10 @@ FcFreeTypeQueryFace (const FT_Face  face,
+     char	    psname[256];
+     const char	    *tmp;
+ 
+-    FcChar8	    *hashstr;
++    FcChar8	    *hashstr = NULL;
++    char	    *fontdata = NULL;
++    FT_Error	    err;
++    FT_ULong	    len = 0, alen;
+ 
+     pat = FcPatternCreate ();
+     if (!pat)
+@@ -1662,12 +1665,22 @@ FcFreeTypeQueryFace (const FT_Face  face,
+     if (!FcPatternAddBool (pat, FC_DECORATIVE, decorative))
+ 	goto bail1;
+ 
+-    hashstr = FcHashGetSHA256DigestFromFace (face);
++    err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len);
++    if (err != FT_Err_Ok)
++	goto bail1;
++    alen = (len + 63) & ~63;
++    fontdata = malloc (alen);
++    if (!fontdata)
++	goto bail1;
++    err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len);
++    if (err != FT_Err_Ok)
++	goto bail1;
++    memset (&fontdata[len], 0, alen - len);
++    hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len);
+     if (!hashstr)
+ 	goto bail1;
+     if (!FcPatternAddString (pat, FC_HASH, hashstr))
+ 	goto bail1;
+-    free (hashstr);
+ 
+     /*
+      * Compute the unicode coverage for the font
+@@ -1756,6 +1769,10 @@ FcFreeTypeQueryFace (const FT_Face  face,
+ bail2:
+     FcCharSetDestroy (cs);
+ bail1:
++    if (hashstr)
++	free (hashstr);
++    if (fontdata)
++	free (fontdata);
+     FcPatternDestroy (pat);
+ bail0:
+     return NULL;
+diff --git a/src/fchash.c b/src/fchash.c
+index 043d94b..1ef1e16 100644
+--- a/src/fchash.c
++++ b/src/fchash.c
+@@ -29,9 +29,6 @@
+ #include "fcint.h"
+ #include <stdio.h>
+ #include <string.h>
+-#include <ft2build.h>
+-#include FT_TRUETYPE_TABLES_H
+-#include FT_TRUETYPE_TAGS_H
+ 
+ #define ROTRN(w, v, n)	((((FcChar32)v) >> n) | (((FcChar32)v) << (w - n)))
+ #define ROTR32(v, n)	ROTRN(32, v, n)
+@@ -207,40 +204,28 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings,
+ }
+ 
+ FcChar8 *
+-FcHashGetSHA256DigestFromFace (const FT_Face face)
++FcHashGetSHA256DigestFromMemory (const char *fontdata,
++				 size_t      length)
+ {
+-    char ibuf[64], *buf = NULL;
++    char ibuf[64];
+     FcChar32 *ret;
+-    FT_Error err;
+-    FT_ULong len = 0, alen, i = 0;
+-
+-    err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len);
+-    if (err != FT_Err_Ok)
+-	return NULL;
+-    alen = (len + 63) & ~63;
+-    buf = malloc (alen);
+-    if (!buf)
+-	return NULL;
+-    err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)buf, &len);
+-    if (err != FT_Err_Ok)
+-	goto bail0;
+-    memset (&buf[len], 0, alen - len);
++    size_t i = 0;
+ 
+     ret = FcHashInitSHA256Digest ();
+     if (!ret)
+-	goto bail0;
++	return NULL;
+ 
+-    while (i <= len)
++    while (i <= length)
+     {
+-	if ((len - i) < 64)
++	if ((length - i) < 64)
+ 	{
+ 	    long v;
+-	    int n;
++	    size_t n;
+ 
+ 	    /* add a padding */
+-	    n = len - i;
++	    n = length - i;
+ 	    if (n > 0)
+-		memcpy (ibuf, &buf[i], n);
++		memcpy (ibuf, &fontdata[i], n);
+ 	    memset (&ibuf[n], 0, 64 - n);
+ 	    ibuf[n] = 0x80;
+ 	    if ((64 - n) < 9)
+@@ -250,7 +235,7 @@ FcHashGetSHA256DigestFromFace (const FT_Face face)
+ 		memset (ibuf, 0, 64);
+ 	    }
+ 	    /* set input size at the end */
+-	    v = len * 8;
++	    v = length * 8;
+ 	    ibuf[63 - 0] =  v        & 0xff;
+ 	    ibuf[63 - 1] = (v >>  8) & 0xff;
+ 	    ibuf[63 - 2] = (v >> 16) & 0xff;
+@@ -264,18 +249,10 @@ FcHashGetSHA256DigestFromFace (const FT_Face face)
+ 	}
+ 	else
+ 	{
+-	    FcHashComputeSHA256Digest (ret, &buf[i]);
++	    FcHashComputeSHA256Digest (ret, &fontdata[i]);
+ 	}
+ 	i += 64;
+     }
+-    if (buf)
+-	free (buf);
+ 
+     return FcHashSHA256ToString (ret);
+-
+-bail0:
+-    if (buf)
+-	free (buf);
+-
+-    return NULL;
+ }
+diff --git a/src/fcint.h b/src/fcint.h
+index 703b983..a662dbf 100644
+--- a/src/fcint.h
++++ b/src/fcint.h
+@@ -47,8 +47,6 @@
+ #include "fcdeprecate.h"
+ #include "fcmutex.h"
+ #include "fcatomic.h"
+-#include <ft2build.h>
+-#include FT_FREETYPE_H
+ 
+ #ifndef FC_CONFIG_PATH
+ #define FC_CONFIG_PATH "fonts.conf"
+@@ -821,7 +819,8 @@ FcPrivate FcChar8 *
+ FcHashGetSHA256Digest (const FcChar8 *input_strings,
+ 		       size_t         len);
+ FcPrivate FcChar8 *
+-FcHashGetSHA256DigestFromFace (const FT_Face face);
++FcHashGetSHA256DigestFromMemory (const char *fontdata,
++				 size_t      length);
+ 
+ /* fcinit.c */
+ FcPrivate FcConfig *
+--
+cgit v0.9.0.2-2-gbebe
+From 77419a4dfdf41ed34dd03e74d0e4e6f89dbc65e1 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Wed, 10 Apr 2013 02:14:39 +0000
+Subject: documented FC_HASH and FC_POSTSCRIPT_NAME
+
+---
+diff --git a/doc/fontconfig-devel.sgml b/doc/fontconfig-devel.sgml
+index 05c5c09..a7b8530 100644
+--- a/doc/fontconfig-devel.sgml
++++ b/doc/fontconfig-devel.sgml
+@@ -196,6 +196,9 @@ convenience for the application's rendering mechanism.
+                                                   default value of familylang,
+                                                   stylelang and fullnamelang
+     prgname        FC_PRGNAME             String  Name of the running program
++    hash           FC_HASH                String  SHA256 hash value of the font data
++                                                  with "sha256:" prefix.
++    postscriptname FC_POSTSCRIPT_NAME     String  Font name in PostScript
+     </programlisting>
+   </sect2>
+ </sect1>
+--
+cgit v0.9.0.2-2-gbebe
+From 03216ccf4ca0808f9c7b9513efcaeb7f4058b575 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Wed, 10 Apr 2013 09:41:22 +0000
+Subject: Bug 63329 - make check fails: .. contents:: :depth: 2
+
+Add back FcHashGetSHA256DigestFromFile() and fall back to it
+when font isn't SFNT-based font because FT_Load_Sfnt_Table
+fails with FT_Err_Invalid_Face_Handle.
+---
+diff --git a/src/fcfreetype.c b/src/fcfreetype.c
+index 22064b3..5e8990d 100644
+--- a/src/fcfreetype.c
++++ b/src/fcfreetype.c
+@@ -1666,17 +1666,29 @@ FcFreeTypeQueryFace (const FT_Face  face,
+ 	goto bail1;
+ 
+     err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len);
+-    if (err != FT_Err_Ok)
+-	goto bail1;
+-    alen = (len + 63) & ~63;
+-    fontdata = malloc (alen);
+-    if (!fontdata)
+-	goto bail1;
+-    err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len);
+-    if (err != FT_Err_Ok)
++    if (err == FT_Err_Ok)
++    {
++	alen = (len + 63) & ~63;
++	fontdata = malloc (alen);
++	if (!fontdata)
++	    goto bail1;
++	err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len);
++	if (err != FT_Err_Ok)
++	    goto bail1;
++	memset (&fontdata[len], 0, alen - len);
++	hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len);
++    }
++    else if (err == FT_Err_Invalid_Face_Handle)
++    {
++	/* font may not support SFNT. falling back to
++	 * read the font data from file directly
++	 */
++	hashstr = FcHashGetSHA256DigestFromFile (file);
++    }
++    else
++    {
+ 	goto bail1;
+-    memset (&fontdata[len], 0, alen - len);
+-    hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len);
++    }
+     if (!hashstr)
+ 	goto bail1;
+     if (!FcPatternAddString (pat, FC_HASH, hashstr))
+diff --git a/src/fchash.c b/src/fchash.c
+index 1ef1e16..92585a6 100644
+--- a/src/fchash.c
++++ b/src/fchash.c
+@@ -204,6 +204,68 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings,
+ }
+ 
+ FcChar8 *
++FcHashGetSHA256DigestFromFile (const FcChar8 *filename)
++{
++    FILE *fp = fopen ((const char *)filename, "rb");
++    char ibuf[64];
++    FcChar32 *ret;
++    size_t len;
++    struct stat st;
++
++    if (!fp)
++	return NULL;
++
++    if (FcStat (filename, &st))
++	goto bail0;
++
++    ret = FcHashInitSHA256Digest ();
++    if (!ret)
++	goto bail0;
++
++    while (!feof (fp))
++    {
++	if ((len = fread (ibuf, sizeof (char), 64, fp)) < 64)
++	{
++	    long v;
++
++	    /* add a padding */
++	    memset (&ibuf[len], 0, 64 - len);
++	    ibuf[len] = 0x80;
++	    if ((64 - len) < 9)
++	    {
++		/* process a block once */
++		FcHashComputeSHA256Digest (ret, ibuf);
++		memset (ibuf, 0, 64);
++	    }
++	    /* set input size at the end */
++	    v = (long)st.st_size * 8;
++	    ibuf[63 - 0] =  v        & 0xff;
++	    ibuf[63 - 1] = (v >>  8) & 0xff;
++	    ibuf[63 - 2] = (v >> 16) & 0xff;
++	    ibuf[63 - 3] = (v >> 24) & 0xff;
++	    ibuf[63 - 4] = (v >> 32) & 0xff;
++	    ibuf[63 - 5] = (v >> 40) & 0xff;
++	    ibuf[63 - 6] = (v >> 48) & 0xff;
++	    ibuf[63 - 7] = (v >> 56) & 0xff;
++	    FcHashComputeSHA256Digest (ret, ibuf);
++	    break;
++	}
++	else
++	{
++	    FcHashComputeSHA256Digest (ret, ibuf);
++	}
++    }
++    fclose (fp);
++
++    return FcHashSHA256ToString (ret);
++
++bail0:
++    fclose (fp);
++
++    return NULL;
++}
++
++FcChar8 *
+ FcHashGetSHA256DigestFromMemory (const char *fontdata,
+ 				 size_t      length)
+ {
+diff --git a/src/fcint.h b/src/fcint.h
+index a662dbf..8919958 100644
+--- a/src/fcint.h
++++ b/src/fcint.h
+@@ -818,6 +818,10 @@ FcFontSetSerialize (FcSerialize *serialize, const FcFontSet * s);
+ FcPrivate FcChar8 *
+ FcHashGetSHA256Digest (const FcChar8 *input_strings,
+ 		       size_t         len);
++
++FcPrivate FcChar8 *
++FcHashGetSHA256DigestFromFile (const FcChar8 *filename);
++
+ FcPrivate FcChar8 *
+ FcHashGetSHA256DigestFromMemory (const char *fontdata,
+ 				 size_t      length);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD
index 3349c343f..df83a5ef7 100644
--- a/extra/fontforge/PKGBUILD
+++ b/extra/fontforge/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=fontforge
 pkgver=20120731_b
-pkgrel=3
+pkgrel=3.1
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://fontforge.sourceforge.net/'
diff --git a/extra/foomatic/PKGBUILD b/extra/foomatic/PKGBUILD
index a40138ff3..1f4b316ac 100644
--- a/extra/foomatic/PKGBUILD
+++ b/extra/foomatic/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163470 2012-07-12 17:32:05Z andyrtr $
+# $Id$
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
  
 pkgbase="foomatic"
-pkgname=('foomatic-db' 'foomatic-filters' 'foomatic-db-engine' 'foomatic-db-nonfree')
-arch=('i686' 'x86_64') # needs to be changed  in the subpackages when makepkg will support it
+pkgname=('foomatic-db' 'foomatic-db-engine')
+arch=('i686' 'x86_64' 'mips64el') # needs to be changed  in the subpackages when makepkg will support it
 _snapdate=20120712
 _filtersver=4.0.17
 _enginever=4.0.8
@@ -13,16 +13,12 @@ epoch=1
 makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash')
 _url1=http://www.openprinting.org/download/foomatic/
 _url2=ftp://ftp.archlinux.org/other/foomatic/
-source=(${_url1}/$pkgbase-filters-${_filtersver}.tar.gz
-        ${_url1}/$pkgbase-db-engine-${_enginever}.tar.gz
-        ${_url2}/$pkgbase-db-4.0-${_snapdate}.tar.gz				# switch after build url1 -> url2
-        ${_url2}/$pkgbase-db-nonfree-${_snapdate}.tar.gz) 			# switch after build url1 -> url2
+source=(${_url1}/$pkgbase-db-engine-${_enginever}.tar.gz
+        ${_url2}/$pkgbase-db-4.0-${_snapdate}.tar.gz)				# switch after build url1 -> url2
 url="http://www.linuxprinting.org/foomatic.html"
 options=('!emptydirs')
-md5sums=('b05f5dcbfe359f198eef3df5b283d896'
-         '5283cd5125a96dc0b35d896326512b1a'
-         '7ea8ed6c34495e237d8071ab5821e871'
-         'da4fbbb3556f56d2f5f922af3face539')
+md5sums=('5283cd5125a96dc0b35d896326512b1a'
+         '7ea8ed6c34495e237d8071ab5821e871')
 
 package_foomatic-db() {
 
@@ -40,22 +36,6 @@ package_foomatic-db() {
    install -v -Dm644 ${srcdir}/${pkgname}-${_snapdate}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
 }
 
-package_foomatic-filters() {
-
- pkgdesc="Foomatic - Filter scripts used by the printer spoolers to convert the incoming PostScript data into the printer's native format."
-# arch=('i686' 'x86_64')
- license=('GPL')
- backup=(etc/foomatic/filter.conf)
- depends=('glibc' 'dbus-core')
- optdepends=('perl:      for the "beh" Backend End Handler used by cups'
-            'net-snmp:  certain (mostly HP) printers need it to work')
-
-   cd ${srcdir}/foomatic-filters-${_filtersver}
-   ./configure --prefix=/usr --sysconfdir=/etc
-   make
-   make DESTDIR=${pkgdir} install
-}
-
 package_foomatic-db-engine() {
 
  pkgdesc="Foomatic - Foomatic's database engine generates PPD files from the data in Foomatic's XML database. It also contains scripts to directly generate print queues and handle jobs."
@@ -75,16 +55,3 @@ package_foomatic-db-engine() {
    # fix permissions
    chmod 755 ${pkgdir}/usr/lib{,/perl5,/perl5/vendor_perl}
 }
-
-package_foomatic-db-nonfree() {
-
- pkgdesc="Foomatic - database extension consisting of manufacturer-supplied PPD files released under non-free licenses"
-# arch=('any')
- license=('custom')
- depends=('perl' 'libxml2' "foomatic-db-engine" 'foomatic-db')
-
-   cd ${srcdir}/foomatic-db-nonfree-${_snapdate}
-   ./configure --prefix=/usr
-   make DESTDIR=${pkgdir} install
-   install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}
diff --git a/extra/four-in-a-row/PKGBUILD b/extra/four-in-a-row/PKGBUILD
new file mode 100644
index 000000000..39fbaaa54
--- /dev/null
+++ b/extra/four-in-a-row/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 183358 2013-04-21 22:09:11Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=four-in-a-row
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Make lines of the same color to win"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'libcanberra' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=four-in-a-row.install
+url="https://live.gnome.org/Four-in-a-row"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('eb44c8508a7d4281df1e52c75a4dc8b31a0de108b94c0f37c4e8d99ea380019d')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/dvdrip/dvdrip.install b/extra/four-in-a-row/four-in-a-row.install
index e111ef946..0730c1a47 100644
--- a/extra/dvdrip/dvdrip.install
+++ b/extra/four-in-a-row/four-in-a-row.install
@@ -1,5 +1,7 @@
 post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
   update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff --git a/extra/fprintd/PKGBUILD b/extra/fprintd/PKGBUILD
index 64fbe4918..8bff32aeb 100644
--- a/extra/fprintd/PKGBUILD
+++ b/extra/fprintd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170104 2012-11-01 20:54:41Z heftig $
+# $Id: PKGBUILD 179628 2013-03-08 22:08:23Z eric $
 # Maintainer:
 # Contributor: Nikolay Rysev <mad.f3ka@gmail.com>
 
 pkgname=fprintd
-pkgver=0.4.1
-pkgrel=5
+pkgver=0.5.0
+pkgrel=1
 pkgdesc="D-Bus service to access fingerprint readers"
 arch=(i686 x86_64 mips64el)
 url="http://www.freedesktop.org/wiki/Software/fprint/fprintd"
@@ -17,7 +17,7 @@ backup=(etc/pam.d/fingerprint-auth)
 _snap=V_${pkgver//./_}
 source=(http://cgit.freedesktop.org/libfprint/$pkgname/snapshot/$_snap.tar.bz2
         fingerprint-auth)
-md5sums=('58fcac035c181dce8f49c374181aa2ae'
+md5sums=('9db46783dc9d75e84d63a3addbaa0507'
          '8c7da9ccd28ec87dd2572ddfb85d563e')
 
 build() {
diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD
index a7ce33b7c..9db4debcb 100644
--- a/extra/freeciv/PKGBUILD
+++ b/extra/freeciv/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 173222 2012-12-14 01:35:42Z eric $
+# $Id: PKGBUILD 178314 2013-02-20 01:15:54Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=freeciv
-pkgver=2.3.3
+pkgver=2.3.4
 pkgrel=1
 pkgdesc="A multiuser clone of the famous Microprose game of Civilization"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme')
 options=('!libtool')
 install=freeciv.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('f3cd76d5b4cc637d1a82398cdb9c1ac9518ce057')
+sha1sums=('974bbadf86c697bd2d4de7abf12d992fb50f1724')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/freeglut/PKGBUILD b/extra/freeglut/PKGBUILD
index d05d24f5c..ad99ff035 100644
--- a/extra/freeglut/PKGBUILD
+++ b/extra/freeglut/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 168622 2012-10-13 15:13:40Z andyrtr $
+# $Id: PKGBUILD 182877 2013-04-15 22:13:33Z heftig $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=freeglut
-pkgver=2.8.0
-pkgrel=2
+pkgver=2.8.1
+pkgrel=1
 pkgdesc="Provides functionality for small OpenGL programs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://freeglut.sourceforge.net/"
@@ -16,8 +16,8 @@ provides=('glut')
 conflicts=('glut')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz)
-md5sums=('5db8651af306bc403fbfd36934a20e1d')
-sha1sums=('4debbe559c6c9841ce1abaddc9d461d17c6083b1')
+md5sums=('918ffbddcffbac83c218bc52355b6d5a')
+sha1sums=('7330b622481e2226c0c9f6d2e72febe96b03f9c4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/freetds/PKGBUILD b/extra/freetds/PKGBUILD
index 99103bbd1..5c044f9ce 100644
--- a/extra/freetds/PKGBUILD
+++ b/extra/freetds/PKGBUILD
@@ -13,16 +13,16 @@ options=('!libtool')
 backup=('etc/freetds/freetds.conf'
         'etc/freetds/locales.conf'
         'etc/freetds/pool.conf')
-source=("ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/${pkgname}-${pkgver}.tar.gz")
-md5sums=('b14db5823980a32f0643d1a84d3ec3ad')
+source=("ftp://ftp.freetds.org/pub/freetds/stable/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('e88e96800c89d62307812315b235eb18')
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd ${pkgname}-${pkgver}
 	./configure --prefix=/usr --sysconfdir=/etc/freetds --mandir=/usr/share/man --enable-msdblib --with-tdsver=7.0
 	make
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd ${pkgname}-${pkgver}
 	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/freetype2/bug35833.patch b/extra/freetype2/bug35833.patch
deleted file mode 100644
index 69ad25402..000000000
--- a/extra/freetype2/bug35833.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 9a55cb7a71286154cb62e947ed1c183450a8004d Mon Sep 17 00:00:00 2001
-From: Werner Lemberg <wl@gnu.org>
-Date: Wed, 14 Mar 2012 13:40:03 +0000
-Subject: Fix Savannah bug #35833.
-
-Based on the patch given in the bug report.
-
-* src/type1/t1load.c (IS_INCREMENTAL): New macro.
-(read_binary_data): Add parameter `incremental'.
-Update all callers using `IS_INCREMENTAL'.
----
-diff --git a/src/type1/t1load.c b/src/type1/t1load.c
-index a0adfd4..4385417 100644
---- a/src/type1/t1load.c
-+++ b/src/type1/t1load.c
-@@ -71,6 +71,13 @@
- #include "t1errors.h"
- 
- 
-+#ifdef FT_CONFIG_OPTION_INCREMENTAL
-+#define IS_INCREMENTAL  ( face->root.internal->incremental_interface != 0 )
-+#else
-+#define IS_INCREMENTAL  0
-+#endif
-+
-+
-   /*************************************************************************/
-   /*                                                                       */
-   /* The macro FT_COMPONENT is used in trace mode.  It is an implicit      */
-@@ -1030,7 +1037,8 @@
-   static int
-   read_binary_data( T1_Parser  parser,
-                     FT_Long*   size,
--                    FT_Byte**  base )
-+                    FT_Byte**  base,
-+                    FT_Bool    incremental )
-   {
-     FT_Byte*  cur;
-     FT_Byte*  limit = parser->root.limit;
-@@ -1065,8 +1073,12 @@
-       }
-     }
- 
--    FT_ERROR(( "read_binary_data: invalid size field\n" ));
--    parser->root.error = T1_Err_Invalid_File_Format;
-+    if( !incremental )
-+    {
-+      FT_ERROR(( "read_binary_data: invalid size field\n" ));
-+      parser->root.error = T1_Err_Invalid_File_Format;
-+    }
-+
-     return 0;
-   }
- 
-@@ -1396,7 +1408,7 @@
- 
-       idx = T1_ToInt( parser );
- 
--      if ( !read_binary_data( parser, &size, &base ) )
-+      if ( !read_binary_data( parser, &size, &base, IS_INCREMENTAL ) )
-         return;
- 
-       /* The binary string is followed by one token, e.g. `NP' */
-@@ -1582,7 +1594,7 @@
-         cur++;                              /* skip `/' */
-         len = parser->root.cursor - cur;
- 
--        if ( !read_binary_data( parser, &size, &base ) )
-+        if ( !read_binary_data( parser, &size, &base, IS_INCREMENTAL ) )
-           return;
- 
-         /* for some non-standard fonts like `Optima' which provides */
-@@ -1871,7 +1883,7 @@
- 
- 
-         parser->root.cursor = start_binary;
--        if ( !read_binary_data( parser, &s, &b ) )
-+        if ( !read_binary_data( parser, &s, &b, IS_INCREMENTAL ) )
-           return T1_Err_Invalid_File_Format;
-         have_integer = 0;
-       }
-@@ -1884,7 +1896,7 @@
- 
- 
-         parser->root.cursor = start_binary;
--        if ( !read_binary_data( parser, &s, &b ) )
-+        if ( !read_binary_data( parser, &s, &b, IS_INCREMENTAL ) )
-           return T1_Err_Invalid_File_Format;
-         have_integer = 0;
-       }
-@@ -2160,9 +2172,7 @@
-       type1->subrs_len   = loader.subrs.lengths;
-     }
- 
--#ifdef FT_CONFIG_OPTION_INCREMENTAL
--    if ( !face->root.internal->incremental_interface )
--#endif
-+    if ( !IS_INCREMENTAL )
-       if ( !loader.charstrings.init )
-       {
-         FT_ERROR(( "T1_Open_Face: no `/CharStrings' array in face\n" ));
---
-cgit v0.9.0.2
diff --git a/extra/freetype2/bug35847.patch b/extra/freetype2/bug35847.patch
deleted file mode 100644
index 683cbc37e..000000000
--- a/extra/freetype2/bug35847.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b43e0f4413b2aafb88be8cb3fb7aaa84ac0b9102 Mon Sep 17 00:00:00 2001
-From: Werner Lemberg <wl@gnu.org>
-Date: Sat, 17 Mar 2012 06:42:43 +0000
-Subject: [type1] Fix Savannah bug #35847.
-
-* src/type1/t1load.c (parse_subrs): Fix the loop exit condition;
-we want to exit when we have run out of data.
----
-diff --git a/src/type1/t1load.c b/src/type1/t1load.c
-index 4385417..5803fde 100644
---- a/src/type1/t1load.c
-+++ b/src/type1/t1load.c
-@@ -1399,9 +1399,10 @@
-       FT_Byte*  base;
- 
- 
--      /* If the next token isn't `dup' we are done. */
--      if ( parser->root.cursor + 4 < parser->root.limit            &&
--           ft_strncmp( (char*)parser->root.cursor, "dup", 3 ) != 0 )
-+      /* If we are out of data, or if the next token isn't `dup', */
-+      /* we are done.                                             */
-+      if ( parser->root.cursor + 4 >= parser->root.limit          ||
-+          ft_strncmp( (char*)parser->root.cursor, "dup", 3 ) != 0 )
-         break;
- 
-       T1_Skip_PS_Token( parser );       /* `dup' */
---
-cgit v0.9.0.2
diff --git a/extra/fsarchiver/PKGBUILD b/extra/fsarchiver/PKGBUILD
index ac9038cbc..7caea4f57 100644
--- a/extra/fsarchiver/PKGBUILD
+++ b/extra/fsarchiver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 160593 2012-06-02 18:42:56Z eric $
+# $Id: PKGBUILD 178753 2013-02-26 16:58:17Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=fsarchiver
-pkgver=0.6.15
+pkgver=0.6.17
 pkgrel=1
 pkgdesc="A safe and flexible file-system backup and deployment tool"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url="http://www.fsarchiver.org/"
 license=('GPL2')
 depends=('bzip2' 'e2fsprogs' 'lzo2' 'xz' 'libgcrypt')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('f55a9022ab692c394b366161c52db0700956e0b2')
+sha1sums=('3b1049b674f3be45ecda5a91a584c7ddc3781e6b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/fssos-nsvs/PKGBUILD b/extra/fssos-nsvs/PKGBUILD
deleted file mode 100644
index 8ead4af7b..000000000
--- a/extra/fssos-nsvs/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167367 2012-10-01 15:08:26Z tomegun $
-# Maintainer: Dale Blount <dale@archlinux.org>
-
-pkgname=fssos-nsvs
-pkgver=0.5
-pkgrel=9
-pkgdesc="NSVS for FSSOS"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://fssos.sourceforge.net/"
-license=('GPL')
-depends=('bash' 'mysql')
-backup=('etc/nsvsd.conf')
-options=('!libtool' '!makeflags')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/sourceforge/fssos/nsvs-$pkgver.tar.gz"
-        'nsvsd'
-	'nsvsd.service')
-
-build() {
-  cd $srcdir/nsvs-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make CFLAGS="${CFLAGS} -D_GNU_SOURCE"
-}
-
-package() {
-  cd $srcdir/nsvs-$pkgver
-  make DESTDIR=$pkgdir install
-  install -D -m755 "$srcdir/nsvsd" "$pkgdir/etc/rc.d/nsvsd"
-  install -D -m644 "$srcdir/nsvsd.service" "$pkgdir/usr/lib/systemd/system/nsvsd.service"
-}
-md5sums=('3f17c2f6339f1a322b712b467023d825'
-         '4dfd9dc0d69b375587e39ab2621d9ea9'
-         '61e970d0704875b1da83cb4e9fc0eef5')
diff --git a/extra/fssos-nsvs/fssos-nsvs.install b/extra/fssos-nsvs/fssos-nsvs.install
deleted file mode 100644
index 253ae64d2..000000000
--- a/extra/fssos-nsvs/fssos-nsvs.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-    if [ -z "`grep '^nsvsd::' /etc/group`" ]; then
-	groupadd -g 83 nsvsd
-    fi
-    if [ -z "`grep '^nsvsd:' /etc/passwd`" ]; then
-	useradd -u 83 -d /tmp -g nsvsd -s /bin/false nsvsd
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    userdel nsvsd &> /dev/null
-    groupdel nsvsd &> /dev/null
-}
diff --git a/extra/fssos-nsvs/nsvsd b/extra/fssos-nsvs/nsvsd
deleted file mode 100755
index f9b4845ab..000000000
--- a/extra/fssos-nsvs/nsvsd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting nsvsd"
-	/usr/sbin/nsvsd -f /etc/nsvsd.conf
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon nsvsd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping nsvsd"
-    kill `cat /var/run/nsvsd.pid` &>/dev/null
-    rm -f /var/run/nsvsd.pid
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon nsvsd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/extra/fssos-nsvs/nsvsd.service b/extra/fssos-nsvs/nsvsd.service
deleted file mode 100644
index 0df5444ab..000000000
--- a/extra/fssos-nsvs/nsvsd.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Name Service Via Sockets Daemon
-
-[Service]
-ExecStart=/usr/sbin/nsvsd -f /etc/nsvsd.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/ftgl/PKGBUILD b/extra/ftgl/PKGBUILD
index 14c9cf343..56828e183 100644
--- a/extra/ftgl/PKGBUILD
+++ b/extra/ftgl/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=ftgl
 _pkgver=2.1.3-rc5
 pkgver=${_pkgver/-/}
-pkgrel=5
+pkgrel=5.1
 pkgdesc="OpenGL library to use arbitrary fonts"
 arch=(i686 x86_64 'mips64el')
 url="http://ftgl.wiki.sourceforge.net/"
diff --git a/extra/fyre/PKGBUILD b/extra/fyre/PKGBUILD
index 496b32468..8505ad5c8 100644
--- a/extra/fyre/PKGBUILD
+++ b/extra/fyre/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169745 2012-10-27 23:41:44Z eric $
+# $Id: PKGBUILD 183283 2013-04-20 16:41:16Z heftig $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fyre
 pkgver=1.0.1
-pkgrel=6
+pkgrel=7
 pkgdesc="Rendering of the Peter de Jong map"
 arch=("i686" "x86_64" 'mips64el')
 url="http://fyre.navi.cx/"
diff --git a/extra/gamin/18_gam_server_deadlocks.patch b/extra/gamin/18_gam_server_deadlocks.patch
new file mode 100644
index 000000000..ef7749675
--- /dev/null
+++ b/extra/gamin/18_gam_server_deadlocks.patch
@@ -0,0 +1,70 @@
+From cc14440eface093548cb3bc7814da11d9a99d283 Mon Sep 17 00:00:00 2001
+From: Anssi Hannula <anssi@mageia.org>
+Date: Wed, 4 Jan 2012 00:23:55 +0200
+Subject: [PATCH] fix possible server deadlock in ih_sub_cancel
+
+ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked.
+However, ih_sub_cancel() locks it again, and locking GMutex recursively
+causes undefined behaviour.
+
+Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach()
+is its only user. Also make the function static so that it won't
+accidentally get used by other files without locking (inotify-helper.h
+is an internal server header).
+
+This should fix the intermittent deadlocks I've been experiencing
+causing KDE applications to no longer start, and probably also
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
+
+Origin: http://bugzilla-attachments.gnome.org/attachment.cgi?id=204537
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gamin/+bug/926862
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
+
+---
+ server/inotify-helper.c |    7 ++-----
+ server/inotify-helper.h |    1 -
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/server/inotify-helper.c b/server/inotify-helper.c
+index d77203e..0789fa4 100644
+--- a/server/inotify-helper.c
++++ b/server/inotify-helper.c
+@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub)
+ 
+ /**
+  * Cancels a subscription which was being monitored.
++ * inotify_lock must be held when calling.
+  */
+-gboolean
++static gboolean
+ ih_sub_cancel (ih_sub_t * sub)
+ {
+-	G_LOCK(inotify_lock);
+-
+-
+ 	if (!sub->cancelled)
+ 	{
+ 		IH_W("cancelling %s\n", sub->pathname);
+@@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub)
+ 		sub_list = g_list_remove (sub_list, sub);
+ 	}
+ 
+-	G_UNLOCK(inotify_lock);
+ 	return TRUE;
+ }
+ 
+diff --git a/server/inotify-helper.h b/server/inotify-helper.h
+index 5d3b6d0..d36b5fd 100644
+--- a/server/inotify-helper.h
++++ b/server/inotify-helper.h
+@@ -34,7 +34,6 @@ gboolean	 ih_startup		(event_callback_t ecb,
+ 					 found_callback_t fcb);
+ gboolean	 ih_running		(void);
+ gboolean	 ih_sub_add		(ih_sub_t *sub);
+-gboolean	 ih_sub_cancel		(ih_sub_t *sub);
+ 
+ /* Return FALSE from 'f' if the subscription should be cancelled */
+ void		 ih_sub_foreach		(void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata));
+-- 
+1.7.7.2
+
diff --git a/extra/gamin/PKGBUILD b/extra/gamin/PKGBUILD
index 77713b212..f3bcff3a3 100644
--- a/extra/gamin/PKGBUILD
+++ b/extra/gamin/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=gamin
 pkgver=0.1.10
-pkgrel=6.1
+pkgrel=7
 pkgdesc='File and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor)'
 url='http://www.gnome.org/~veillard/gamin'
 license=('GPL')
@@ -17,13 +17,18 @@ optdepends=('python2: for the python module.')
 provides=('fam')
 conflicts=('fam')
 source=("http://www.gnome.org/~veillard/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"
-        'fix-deprecated-const.patch')
+        'fix-deprecated-const.patch'
+        '18_gam_server_deadlocks.patch')
 md5sums=('b4ec549e57da470c04edd5ec2876a028'
-         'f679aeb48fe9dd376c8828cc9b6941ab')
+         'f679aeb48fe9dd376c8828cc9b6941ab'
+         '4784359a3206bfa3c0dce1c23468f87f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # https://bugs.archlinux.org/task/33642
+  patch -p1 -i "${srcdir}"/18_gam_server_deadlocks.patch
+
   patch -p1 -i "${srcdir}"/fix-deprecated-const.patch
 
   # python 2
diff --git a/extra/garcon/PKGBUILD b/extra/garcon/PKGBUILD
index fbf467c1e..3369aa8b0 100644
--- a/extra/garcon/PKGBUILD
+++ b/extra/garcon/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 157817 2012-04-30 04:19:28Z foutrelis $
+# $Id: PKGBUILD 184284 2013-05-05 17:44:23Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
 
 pkgname=garcon
-pkgver=0.2.0
+pkgver=0.2.1
 pkgrel=1
 pkgdesc="Implementation of the freedesktop.org menu specification"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://wiki.xfce.org/dev/garcon"
+url="http://www.xfce.org/"
 license=('LGPL')
 groups=('xfce4')
 depends=('glib2' 'libxfce4util')
@@ -15,7 +15,7 @@ makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools')
 replaces=('libxfce4menu')
 options=('!libtool' '!makeflags')
 source=(http://archive.xfce.org/src/xfce/garcon/0.2/garcon-$pkgver.tar.bz2)
-sha256sums=('02dea3edb9c0039eca4748e964c61b0e1cc10f2d7f9ce0c837287ac5fa9ef76c')
+sha256sums=('48b644b8b2ffe597974e2526ca1a5d2d7da6a09c2d434f008dec80e9152701f7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index a41e8ba43..1bf0cec55 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,32 +1,31 @@
-# $Id: PKGBUILD 168695 2012-10-14 06:06:08Z bisson $
+# $Id: PKGBUILD 178956 2013-03-01 10:20:17Z andrea $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
-pkgver=2.7.9
+pkgver=2.8.0
 pkgrel=2
 pkgdesc='Input method server supporting various input methods'
 url='http://hyperrate.com/dir.php?eid=67'
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk2' 'libxtst')
-makedepends=('qt' 'gtk3' 'anthy' 'libchewing')
-optdepends=('qt: support for qt4 input method'
+makedepends=('qt4' 'gtk3' 'anthy' 'libchewing')
+optdepends=('qt4: support for qt4 input method'
             'gtk3: support for gtk3 input method'
             'anthy: support for anthy input method'
             'libchewing: support for chewing input method')
-source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz"
-        'qt4.patch')
-sha1sums=('bd0375188a0d8a74efece0e23f30c16cd4a2f1df'
-          '1c6cdcaa218615e53869bb9d67d7f9d2141e86fe')
+source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('69fe604939bc013f043ff0b4baa63b7951b26c95')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	patch -p1 -i ../qt4.patch
+	source /etc/profile.d/qt4.sh
+	sed 's/lib64/lib/g' -i configure
 	sed '/include suffixes-rule/a \
 		CFLAGS+='"${CFLAGS}"' \
 		LDFLAGS+='"${LDFLAGS}"' \
diff --git a/extra/gcin/qt4.patch b/extra/gcin/qt4.patch
deleted file mode 100644
index 0f3e7876f..000000000
--- a/extra/gcin/qt4.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Naur old/qt4-im/Makefile new/qt4-im/Makefile
---- old/qt4-im/Makefile	2011-12-19 14:52:46.000000000 +1100
-+++ new/qt4-im/Makefile	2012-03-05 09:22:46.732614803 +1100
-@@ -1,5 +1,5 @@
- include ../config.mak
--QT=qt4
-+QT=qt
- QTIM=$(QT)/plugins/inputmethods
- IMMODULES=$(libdir)/$(QTIM)
- 
diff --git a/extra/gconf-editor/PKGBUILD b/extra/gconf-editor/PKGBUILD
index 03cab56c4..fe3da514a 100644
--- a/extra/gconf-editor/PKGBUILD
+++ b/extra/gconf-editor/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 170049 2012-10-31 09:09:59Z jgc $
+# $Id: PKGBUILD 183359 2013-04-21 22:09:12Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gconf-editor
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Graphical gconf registry editor"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('gconf' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils')
 url="http://www.gnome.org"
-groups=('gnome-extra')
 options=(!emptydirs)
 install=gconf-editor.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD
index 04dbecf47..bb5602e78 100644
--- a/extra/gconf/PKGBUILD
+++ b/extra/gconf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170051 2012-10-31 09:24:25Z jgc $
+# $Id: PKGBUILD 179963 2013-03-13 14:27:34Z jgc $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gconf
-pkgver=3.2.5
-pkgrel=3
+pkgver=3.2.6
+pkgrel=1
 pkgdesc="A configuration database system"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
@@ -13,17 +13,11 @@ options=('!libtool')
 install=gconf.install
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-$pkgver.tar.xz
-        gconf-dbus-fix-use-after-free.patch
-        gconf-dbus-fix-shutdown.patch
-        gsettings-schema-convert-dont-fail.patch
         gconf-merge-schema
         gconfpkg
         gconf-reload.patch
         01_xml-gettext-domain.patch)
-sha256sums=('4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6'
-            '76c078218e7c3e93691ddd4d7fd9f5c83d4862d0a0406d17b805f3106b50375d'
-            'ddf55a40a260dd00364b32b3200bd8a76e890070ea6267fbfb322907c0946ab2'
-            'be6f084a31229e8edfd6936005c6bb4f2d1548b777df5937923b4702f7a9ac19'
+sha256sums=('1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c'
             'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028'
             'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898'
             '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694'
@@ -31,10 +25,6 @@ sha256sums=('4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6'
 
 build() {
   cd "GConf-$pkgver"
-  # Upstream fixes from git
-  patch -Np1 -i "$srcdir/gconf-dbus-fix-shutdown.patch"
-  patch -Np1 -i "$srcdir/gsettings-schema-convert-dont-fail.patch"
-  patch -Np1 -i "$srcdir/gconf-dbus-fix-use-after-free.patch"
 
   # Patch from fedora - reloads gconf after installing schemas
   patch -Np1 -i "$srcdir/gconf-reload.patch"
diff --git a/extra/gconf/gconf-dbus-fix-shutdown.patch b/extra/gconf/gconf-dbus-fix-shutdown.patch
deleted file mode 100644
index b294284b2..000000000
--- a/extra/gconf/gconf-dbus-fix-shutdown.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 39299610083e0e7f9b44e62b7f4e51e89693cf89 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Tue, 06 Mar 2012 19:39:06 +0000
-Subject: dbus: fix shutdown
-
-gconftool-2 wasn't properly shutting down gconfd, because
-it was trying to do it before connecting to the daemon.
-
-This commit makes sure that we always first try to connect to
-the daemon before asking it to shutdown.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=671490
----
-diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
-index 442a94b..f167fc5 100644
---- a/gconf/gconf-dbus.c
-+++ b/gconf/gconf-dbus.c
-@@ -2483,7 +2483,13 @@ gconf_shutdown_daemon (GError** err)
- {
-   DBusMessage *message;
- 
--  /* Don't want to spawn it if it's already down */
-+  /* If we haven't reached out to it yet,
-+   * reach out now.
-+   */
-+  if (global_conn == NULL)
-+    gconf_ping_daemon();
-+
-+  /* But we don't want to spawn it if it's already down */
-   if (global_conn == NULL || !service_running)
-     return;
-   
---
-cgit v0.9.0.2
diff --git a/extra/gconf/gconf-dbus-fix-use-after-free.patch b/extra/gconf/gconf-dbus-fix-use-after-free.patch
deleted file mode 100644
index d99b222cc..000000000
--- a/extra/gconf/gconf-dbus-fix-use-after-free.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 84884e9df7ce8c081a1c223c66a799b82545ff1e Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Thu, 18 Oct 2012 20:08:02 +0000
-Subject: gconf-dbus: fix use after free
-
-gconf_engine_get_fuller is accessing freed memory.
-The problem is that it's referencing strings that are owned
-by a D-Bus message, and they go away when the D-Bus message is freed.
-
-This commit addresses the problem by duplicating the strings and
-freeing them later.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=667167
----
-diff --git a/gconf/gconf-dbus-utils.c b/gconf/gconf-dbus-utils.c
-index 6fd5bfa..92f5980 100644
---- a/gconf/gconf-dbus-utils.c
-+++ b/gconf/gconf-dbus-utils.c
-@@ -569,11 +569,11 @@ gconf_dbus_utils_get_entry_values (DBusMessageIter  *main_iter,
- 				   gchar           **schema_name_p)
- {
-   DBusMessageIter  struct_iter;
--  gchar           *key;
-+  const gchar     *key;
-   GConfValue      *value;
-   gboolean         is_default;
-   gboolean         is_writable;
--  gchar           *schema_name;
-+  const gchar     *schema_name;
- 
-   g_return_val_if_fail (dbus_message_iter_get_arg_type (main_iter) == DBUS_TYPE_STRUCT,
- 			FALSE);
-@@ -587,7 +587,7 @@ gconf_dbus_utils_get_entry_values (DBusMessageIter  *main_iter,
-   value = utils_get_value (&struct_iter);
- 
-   dbus_message_iter_next (&struct_iter);
--  schema_name = (gchar *) utils_get_optional_string (&struct_iter);
-+  schema_name = utils_get_optional_string (&struct_iter);
- 
-   dbus_message_iter_next (&struct_iter);
-   dbus_message_iter_get_basic (&struct_iter, &is_default);
-@@ -596,7 +596,7 @@ gconf_dbus_utils_get_entry_values (DBusMessageIter  *main_iter,
-   dbus_message_iter_get_basic (&struct_iter, &is_writable);
- 
-   if (key_p)
--    *key_p = key;
-+    *key_p = g_strdup (key);
- 
-   if (value_p)
-     *value_p = value;
-@@ -604,7 +604,7 @@ gconf_dbus_utils_get_entry_values (DBusMessageIter  *main_iter,
-     gconf_value_free (value);
- 
-   if (schema_name_p)
--    *schema_name_p = schema_name;
-+    *schema_name_p = g_strdup (schema_name);
-   
-   if (is_default_p)
-     *is_default_p = is_default;
-diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
-index f167fc5..5610fcf 100644
---- a/gconf/gconf-dbus.c
-+++ b/gconf/gconf-dbus.c
-@@ -1252,12 +1252,13 @@ gconf_engine_get_fuller (GConfEngine *conf,
-   
-   if (schema_name && schema_name[0] != '/')
-     {
-+      g_free (schema_name);
-       schema_name = NULL;
-     }
-   
-   if (schema_name_p)
--    *schema_name_p = g_strdup (schema_name);
--  
-+    *schema_name_p = schema_name;
-+
-   return val;
- }
- 
-@@ -2402,7 +2403,7 @@ handle_notify (DBusConnection *connection,
- 	       GConfEngine *conf2)
- {
-   GConfEngine *conf;
--  gchar *key, *schema_name;
-+  gchar *key = NULL, *schema_name = NULL;
-   gboolean is_default, is_writable;
-   DBusMessageIter iter;
-   GConfValue *value;
-@@ -2466,6 +2467,8 @@ handle_notify (DBusConnection *connection,
- 
-   if (value)
-     gconf_value_free (value);
-+  g_free (key);
-+  g_free (schema_name);
- 
-   if (!match)
-     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
---
-cgit v0.9.0.2
diff --git a/extra/gconf/gsettings-schema-convert-dont-fail.patch b/extra/gconf/gsettings-schema-convert-dont-fail.patch
deleted file mode 100644
index 92040b343..000000000
--- a/extra/gconf/gsettings-schema-convert-dont-fail.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 02f12f41b031a1c2672e7cf1cb8ebde58288c547 Mon Sep 17 00:00:00 2001
-From: Guido Günther <agx@sigxcpu.org>
-Date: Thu, 23 Feb 2012 20:14:18 +0000
-Subject: gsettings-schema-convert: Don't fail to convert lists without default element
-
----
-diff --git a/gsettings/gsettings-schema-convert b/gsettings/gsettings-schema-convert
-index a60dc35..913cc83 100755
---- a/gsettings/gsettings-schema-convert
-+++ b/gsettings/gsettings-schema-convert
-@@ -854,11 +854,10 @@ class GConfSchema:
-         # Fix the default value to be parsable by GVariant
-         if self.type == 'list':
-             l = self.default.strip()
--            if not (l[0] == '[' and l[-1] == ']'):
--                if not l:
--                    l = '[]'
--                else:
--                    raise GSettingsSchemaConvertException('Cannot parse default list value \'%s\' for key \'%s\'.' % (self.default, self.applyto or self.key))
-+            if not l:
-+                l = '[]'
-+            elif not (l[0] == '[' and l[-1] == ']'):
-+                raise GSettingsSchemaConvertException('Cannot parse default list value \'%s\' for key \'%s\'.' % (self.default, self.applyto or self.key))
-             values = l[1:-1].strip()
-             if not values:
-                 self.default = '[]'
---
-cgit v0.9.0.2
diff --git a/extra/gcr/PKGBUILD b/extra/gcr/PKGBUILD
index c29e0c91c..da1d98e5c 100644
--- a/extra/gcr/PKGBUILD
+++ b/extra/gcr/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 170868 2012-11-12 21:20:07Z heftig $
+# $Id: PKGBUILD 184241 2013-05-04 20:06:54Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gcr
-pkgver=3.6.2
-pkgrel=2
+pkgver=3.8.2
+pkgrel=1
 pkgdesc="A library for bits of crypto UI and parsing"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL2')
 depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt')
-makedepends=('intltool' 'gobject-introspection')
+makedepends=('intltool' 'gobject-introspection' 'python')
 options=(!libtool)
 install=gcr.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
         10-gcr.conf)
-sha256sums=('f709db2435e3635b68d8aa212863e0a8e81b1cc33442852a5183762876c7be9b'
+sha256sums=('a1e615ce2cfd375f383bbdd289935a8e3e16901c3c6f032780847055e8bec2c1'
             '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc')
 
 build() {
diff --git a/extra/gd/PKGBUILD b/extra/gd/PKGBUILD
index a922c95b2..ad03da4a5 100644
--- a/extra/gd/PKGBUILD
+++ b/extra/gd/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=gd
 pkgver=2.0.36RC1
-pkgrel=5.1
+pkgrel=5.2
 pkgdesc="Library for the dynamic creation of images by programmers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libgd.org/"
diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD
index 766e61d64..d4f3401d1 100644
--- a/extra/gdb/PKGBUILD
+++ b/extra/gdb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172148 2012-11-30 04:20:34Z allan $
+# $Id: PKGBUILD 183696 2013-04-27 07:01:47Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdb
-pkgver=7.5.1
+pkgver=7.6
 pkgrel=1
 pkgdesc="The GNU Debugger"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,8 +15,15 @@ backup=('etc/gdb/gdbinit')
 options=('!libtool')
 install=gdb.install
 source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('3f48f468b24447cf24820054ff6e85b1'
-         '31ab569c78a01d3f946c6fe0336175fe')
+md5sums=('fda57170e4d11cdde74259ca575412a8'
+         'SKIP')
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
+}
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/gdb/gdb.install b/extra/gdb/gdb.install
index 986ec547c..e260d0225 100644
--- a/extra/gdb/gdb.install
+++ b/extra/gdb/gdb.install
@@ -1,7 +1,8 @@
 infodir=usr/share/info
-filelist=(annotate.info gdb.info gdb.info-1 gdb.info-2 gdb.info-3 gdb.info-4 gdbint.info gdbint.info-1 gdbint.info-2 stabs.info)
+filelist=(annotate.info gdb.info{,-{1,2,3,4,5,6,7}} gdbint.info{,-{1,2}} stabs.info)
 
 post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
   for file in ${filelist[@]}; do
     install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
@@ -12,6 +13,7 @@ post_upgrade() {
 }
 
 pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
   for file in ${filelist[@]}; do
     install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index 8d781b97a..48c3b8ec4 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 170725 2012-11-10 05:22:37Z heftig $
+# $Id: PKGBUILD 183361 2013-04-21 22:09:16Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gdk-pixbuf2
-pkgver=2.26.5
+pkgver=2.28.1
 pkgrel=1
 pkgdesc="An image loading library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 license=('LGPL2.1')
-depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
+depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11' 'jasper')
 makedepends=('gtk-doc' 'gobject-introspection')
 options=('!libtool')
 install=gdk-pixbuf2.install
 source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84')
+sha256sums=('bea0b743fdb5c3c8e23210f73623ec5f18f9ead2522942897fe739d80b50c2bb')
 
 build() {
   cd gdk-pixbuf-$pkgver
 
   ./configure --prefix=/usr \
-    --without-libjasper \
     --with-x11 \
+    --with-libjasper \
     --with-included-loaders=png
   make
 }
diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD
index 8ccebacfa..aa0992a8f 100644
--- a/extra/gdl/PKGBUILD
+++ b/extra/gdl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170733 2012-11-10 16:00:06Z heftig $
+# $Id: PKGBUILD 183362 2013-04-21 22:09:18Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdl
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="GNOME Docking Library"
 arch=(i686 x86_64 mips64el)
@@ -12,7 +12,7 @@ depends=('gtk3')
 makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e772319f1b133047f54e3c1b7e95a718168071cfef972f981337f6bf570ddf1c')
+sha256sums=('c9911e9eec5a62497fff7e044ca9eaae47354658238e6b9e9a0a744f05b4ebdb')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD
index 6bc85e9f8..471ef2a53 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -1,31 +1,26 @@
-# $Id: PKGBUILD 171020 2012-11-15 06:19:11Z heftig $
+# $Id: PKGBUILD 183315 2013-04-21 22:06:33Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgname=gdm
-pkgver=3.6.2
+pkgbase=gdm
+pkgname=(gdm libgdm)
+pkgver=3.8.1.1
 pkgrel=1
 pkgdesc="Gnome Display Manager"
 arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
 url="http://www.gnome.org"
-backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-environment
-        etc/pam.d/gdm-password etc/pam.d/gdm-smartcard etc/gdm/custom.conf)
-groups=(gnome)
 options=('!libtool')
-depends=(libcanberra gnome-session gnome-settings-daemon metacity upower accountsservice systemd
-         xorg-xrdb nss polkit-gnome xorg-server gnome-icon-theme)
+depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server)
 makedepends=(itstool intltool gnome-doc-utils gobject-introspection)
-optdepends=('gnome-shell: new login interface'
-            'fprintd: fingerprint authentication')
-install=gdm.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+checkdepends=('check')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz
         fix_external_program_directories.patch)
-sha256sums=('fbf41bd68299eccdcf456c0869771999f75d3d9bf0f57ce1038db08b54e8cbb9'
+sha256sums=('16f8141040798ba00be0d718ba24cce927d6412b767d091f9ee5bf93f5800ba8'
             'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgbase-$pkgver
   patch -Np1 -i "$srcdir/fix_external_program_directories.patch"
 
   ./configure \
@@ -45,14 +40,39 @@ build() {
 
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
 
-  make -j1 # race condition building gdm-client.c, does not wait for gdm-client-glue.h
+  make
 }
 
-package() {
-  cd "$pkgname-$pkgver"
+check() {
+  cd $pkgbase-$pkgver
+  make check
+}
+
+package_gdm() {
+  depends+=(libgdm)
+  optdepends=('fprintd: fingerprint authentication')
+  backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-environment
+          etc/pam.d/gdm-password etc/pam.d/gdm-smartcard etc/gdm/custom.conf
+          etc/gdm/Xsession
+          etc/gdm/PostSession/Default etc/gdm/PreSession/Default)
+  groups=(gnome)
+  install=gdm.install
+
+  cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
 
   chmod 1770 "$pkgdir/var/log/gdm"
   chmod 700 "$pkgdir/var/lib/gdm/.config/dconf"
   rm -r "$pkgdir/var/run" "$pkgdir/var/gdm"
+
+### Split libgdm
+  make -C gui/libgdm DESTDIR="$pkgdir" uninstall
+}
+
+package_libgdm() {
+  pkgdesc="GDM support library"
+  depends=(systemd)
+
+  cd $pkgbase-$pkgver
+  make -C gui/libgdm DESTDIR="$pkgdir" install
 }
diff --git a/extra/gdm/gdm b/extra/gdm/gdm
deleted file mode 100755
index c3e635a6d..000000000
--- a/extra/gdm/gdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting GDM"
-    /usr/sbin/gdm &
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      
-      add_daemon gdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping GDM"
-    [ -f /var/run/gdm.pid ] && kill `cat /var/run/gdm.pid` &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon gdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/gdm/gdm-autologin.pam b/extra/gdm/gdm-autologin.pam
deleted file mode 100644
index bc0193df0..000000000
--- a/extra/gdm/gdm-autologin.pam
+++ /dev/null
@@ -1,20 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_permit.so
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_access.so
-account         required        pam_time.so
-account         required        pam_unix.so
-
-password        required        pam_deny.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
diff --git a/extra/gdm/gdm-fingerprint.pam b/extra/gdm/gdm-fingerprint.pam
deleted file mode 100644
index 38fab5782..000000000
--- a/extra/gdm/gdm-fingerprint.pam
+++ /dev/null
@@ -1,20 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_fprintd.so
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_access.so
-account         required        pam_time.so
-account         required        pam_unix.so
-
-password        required        pam_deny.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
diff --git a/extra/gdm/gdm-password.pam b/extra/gdm/gdm-password.pam
deleted file mode 100644
index eed5e1003..000000000
--- a/extra/gdm/gdm-password.pam
+++ /dev/null
@@ -1,22 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_unix.so nullok
-auth            optional        pam_gnome_keyring.so
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_access.so
-account         required        pam_time.so
-account         required        pam_unix.so
-
-password        required        pam_unix.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so force revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_gnome_keyring.so auto_start
diff --git a/extra/gdm/gdm-smartcard.pam b/extra/gdm/gdm-smartcard.pam
deleted file mode 100644
index c5c29e73f..000000000
--- a/extra/gdm/gdm-smartcard.pam
+++ /dev/null
@@ -1,20 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_pkcs11.so wait_for_card card_only
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_access.so
-account         required        pam_time.so
-account         required        pam_unix.so
-
-password        required        pam_pkcs11.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
diff --git a/extra/gdm/gdm-vt-allocation-hack.patch b/extra/gdm/gdm-vt-allocation-hack.patch
deleted file mode 100644
index 56fa5a151..000000000
--- a/extra/gdm/gdm-vt-allocation-hack.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
-index 39def47..03488fd 100644
---- a/daemon/gdm-server.c
-+++ b/daemon/gdm-server.c
-@@ -33,6 +33,8 @@
- #include <grp.h>
- #include <signal.h>
- #include <sys/resource.h>
-+#include <sys/ioctl.h>
-+#include <sys/vt.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server)
-         return out;
- }
- 
-+#ifndef O_NOCTTY
-+# define O_NOCTTY 0
-+#endif
-+
-+static int
-+open_vt (int vtno)
-+{
-+	char *vtname;
-+	int fd;
-+
-+	vtname = g_strdup_printf ("/dev/tty%d", vtno);
-+
-+	do {
-+		errno = 0;
-+		fd = open (vtname, O_RDWR | O_NOCTTY, 0);
-+	} while (errno == EINTR);
-+
-+	g_free (vtname);
-+	return fd;
-+}
-+
-+static gint
-+find_first_probably_free_vt (void)
-+{
-+	int fd, fdv;
-+	int vtno;
-+	unsigned short vtmask;
-+	struct vt_stat vtstat;
-+	guint v_state;
-+
-+	fdv = -1;
-+
-+	do {
-+		errno = 0;
-+		fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0);
-+	} while (errno == EINTR);
-+
-+	if (fd >= 0) {
-+		if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) {
-+			v_state = vtstat.v_state;
-+		} else {
-+			close (fd);
-+			v_state = 0;
-+			fd = -1;
-+		}
-+	} else {
-+		v_state = 0;
-+	}
-+
-+	if (fd < 0) {
-+		do {
-+			errno = 0;
-+			fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0);
-+		} while (errno == EINTR);
-+
-+		if (fd >= 0) {
-+			if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0)
-+				v_state = vtstat.v_state;
-+		}
-+	}
-+
-+	for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) {
-+		/* Is this console in use? */
-+		if (v_state & vtmask)
-+			continue;
-+
-+		/* No, try to open it */
-+		fdv = open_vt (vtno);
-+		if (fdv >= 0)
-+			break;
-+
-+		/* If we're here, kernel indicated that the console was free,
-+		 * but we failed to open it. Just go on to higher VTs. */
-+	}
-+
-+        if (fdv >= 0)
-+                close (fdv);
-+        else
-+		vtno = -1;
-+
-+	if (fd >= 0)
-+		close (fd);
-+
-+	return vtno;
-+}
-+
- char *
- gdm_server_get_display_device (GdmServer *server)
- {
-@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer  *server,
- 
-         if (vtarg != NULL && ! gotvtarg) {
-                 argv[len++] = g_strdup (vtarg);
-+        } else if (!query_in_arglist && !gotvtarg) {
-+                gint vtnum = find_first_probably_free_vt ();
-+
-+                if (vtnum > 0)
-+                        argv [len++] = g_strdup_printf ("vt%d", vtnum);
-         }
- 
-         argv[len++] = NULL;
diff --git a/extra/gdm/gdm-welcome.pam b/extra/gdm/gdm-welcome.pam
deleted file mode 100644
index cc3811c19..000000000
--- a/extra/gdm/gdm-welcome.pam
+++ /dev/null
@@ -1,12 +0,0 @@
-#%PAM-1.0
-auth            required        pam_env.so
-auth            required        pam_permit.so
-
-account         required        pam_nologin.so
-account         required        pam_unix.so
-
-password        required        pam_deny.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so force revoke
diff --git a/extra/gdm/gdm.pam b/extra/gdm/gdm.pam
deleted file mode 100644
index 655299cb7..000000000
--- a/extra/gdm/gdm.pam
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-auth            optional        pam_gnome_keyring.so
-account         required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_gnome_keyring.so auto_start
-password        required        pam_unix.so
diff --git a/extra/gdm/gdm.service b/extra/gdm/gdm.service
deleted file mode 100644
index 0125934d6..000000000
--- a/extra/gdm/gdm.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Gnome Display Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/sbin/gdm -nodaemon
-Restart=always
-
-[Install]
-Alias=display-manager.service
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index ee37af961..c2868be99 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 173080 2012-12-10 11:56:21Z jgc $
+# $Id: PKGBUILD 183363 2013-04-21 22:09:19Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
-pkgver=3.6.2
-pkgrel=2
+pkgver=3.8.1
+pkgrel=1
 pkgdesc="A text editor for GNOME"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf')
-makedepends=('yelp-tools' 'intltool' 'libzeitgeist')
-optdepends=('libzeitgeist: Zeitgeist plugin')
-groups=('gnome-extra')
+arch=(i686 x86_64 mips64el)
+license=(GPL)
+depends=(gtksourceview3 gsettings-desktop-schemas libpeas enchant iso-codes libsm desktop-file-utils python-gobject dconf)
+makedepends=(yelp-tools intltool 'zeitgeist>=0.9.12')
+optdepends=('zeitgeist: Zeitgeist plugin')
+groups=(gnome-extra)
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gedit.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ad4c6837a7e844e000f7cf2c248e636febdcc9b9b9559cf9e27b99392f5735c3')
+sha256sums=('9e0b8a831c6d6d2b82a8f42a0e01ab1f3398fed2cca0b65d0a105d134a5c4dce')
 
 build() {
   cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+  ./configure --prefix=/usr \
       --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib --disable-updater --disable-schemas-compile \
       --enable-python
diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD
index c482458e9..658827ec7 100644
--- a/extra/gegl/PKGBUILD
+++ b/extra/gegl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169746 2012-10-27 23:41:47Z eric $
+# $Id: PKGBUILD 183284 2013-04-20 16:41:17Z heftig $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=gegl
 pkgver=0.2.0
-pkgrel=5
+pkgrel=7
 pkgdesc="Graph based image processing framework"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gegl.org/"
@@ -19,9 +19,13 @@ source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.
 sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573'
           'c10fd988c634fcf0948cc91a51d6528f6f1704ba')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff"
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < "${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff"
   ./configure  --prefix=/usr  --with-sdl --with-openexr --with-librsvg \
     --with-libavformat --with-jasper --disable-docs
   make
diff --git a/extra/genius/PKGBUILD b/extra/genius/PKGBUILD
index aab140682..ba7c13ff5 100644
--- a/extra/genius/PKGBUILD
+++ b/extra/genius/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 154806 2012-03-30 18:41:27Z heftig $
+# $Id: PKGBUILD 179965 2013-03-13 14:34:29Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@soulfly.nl>
 
 pkgname=genius
-pkgver=1.0.15
-pkgrel=1.1
+pkgver=1.0.16
+pkgrel=1
 pkgdesc="Advanced calculator including a mathematical programming language"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.jirka.org/genius.html"
-depends=('vte>=0.26.2' 'gtksourceview2>=2.10.5' 'mpfr>=3.0.0' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.20.0')
+depends=('vte' 'gtksourceview2' 'mpfr' 'desktop-file-utils' 'hicolor-icon-theme')
+makedepends=('intltool' 'gnome-doc-utils')
 options=('!libtool' '!makeflags')
 install=genius.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/genius/1.0/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('941e9d09d9f151f3f36ae190bad3c4e2887a552a301dc99af5fd06f8c5c76377')
+sha256sums=('45ce3e0b02c109588ff9a4c74e7c3541b3de89ea93f20ab08178c51c6ab4fb78')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/geoclue/PKGBUILD b/extra/geoclue/PKGBUILD
index fec20cde7..0122e3915 100644
--- a/extra/geoclue/PKGBUILD
+++ b/extra/geoclue/PKGBUILD
@@ -1,35 +1,27 @@
-# $Id: PKGBUILD 156782 2012-04-23 09:05:31Z ibiru $
+# $Id: PKGBUILD 180261 2013-03-19 00:26:52Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=geoclue
-pkgver=0.12.0
-pkgrel=5
+pkgver=0.12.99
+pkgrel=1
 pkgdesc="Modular geoinformation service built on the D-Bus messaging system."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://geoclue.freedesktop.org/"
-license=('LGPL')
-depends=('dbus-glib' 'libxml2')
+license=(LGPL)
+depends=(dbus-glib libxml2 dconf)
+makedepends=(networkmanager libsoup-gnome gtk-doc)
 optdepends=('networkmanager: geolocation'
-            'gconf: geolocation'
             'libsoup-gnome: Skyhook location provider')
-makedepends=('gconf' 'networkmanager' 'libsoup-gnome' 'gtk-doc')
 options=('!libtool')
-source=(https://launchpad.net/geoclue/trunk/${pkgver%.*}/+download/$pkgname-$pkgver.tar.gz
-        geoclue-gcc46.patch)
-md5sums=('33af8307f332e0065af056ecba65fec2'
-         '0cf8ecc350be702f623ed9a9715818c5')
+install=geoclue.install
+source=(http://freedesktop.org/~hadess/$pkgname-$pkgver.tar.gz)
+md5sums=('779245045bfeeec4853da8baaa3a18e6')
 
 build() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../geoclue-gcc46.patch
-
-  sed -i 's/libnm_glib/libnm-glib/g' configure.ac
-  sed -i '/libsoup-gnome/s/$/ gthread-2.0/' configure.ac
-  autoreconf -f -i
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname --disable-static
   make
 }
 
diff --git a/extra/geoclue/geoclue-gcc46.patch b/extra/geoclue/geoclue-gcc46.patch
deleted file mode 100644
index 11bf48547..000000000
--- a/extra/geoclue/geoclue-gcc46.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 90669619d1d621080ef00dcb8db1c3d206ee0bfe Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Mon, 07 Mar 2011 23:46:15 +0000
-Subject: master: Fix warning with GCC 4.6
-
----
-diff --git a/src/master-provider.c b/src/master-provider.c
-index 790c043..e4ea053 100644
---- a/src/master-provider.c
-+++ b/src/master-provider.c
-@@ -846,10 +846,6 @@ gc_master_provider_initialize_interfaces (GcMasterProvider *provider)
- static gboolean
- gc_master_provider_initialize (GcMasterProvider *provider)
- {
--	GcMasterProviderPrivate *priv;
--	 
--	priv = GET_PRIVATE (provider);
--	
- 	if (!gc_master_provider_initialize_interfaces (provider)) {
- 		return FALSE;
- 	}
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/gstreamer0.10-bad/gstreamer0.10-bad-plugins.install b/extra/geoclue/geoclue.install
index 3a36b0ccb..c25dff2d3 100644
--- a/extra/gstreamer0.10-bad/gstreamer0.10-bad-plugins.install
+++ b/extra/geoclue/geoclue.install
@@ -1,5 +1,5 @@
 post_install() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+    glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
 post_upgrade() {
diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD
index c9dd7b476..f1d5e11d2 100644
--- a/extra/geoip/PKGBUILD
+++ b/extra/geoip/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158109 2012-05-03 01:01:32Z foutrelis $
+# $Id: PKGBUILD 183169 2013-04-18 10:54:20Z juergen $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Manolis Tzanidakis <manolis@archlinux.org>
 
 pkgname=geoip
-pkgver=1.4.8
-pkgrel=2
+pkgver=1.5.0
+pkgrel=1
 pkgdesc="Non-DNS IP-to-country resolver C library & utils"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.maxmind.com/app/c"
@@ -13,7 +13,7 @@ depends=('zlib' 'geoip-database')
 backup=('etc/geoip/GeoIP.conf')
 options=('!libtool' '!emptydirs')
 source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-$pkgver.tar.gz)
-sha256sums=('cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4')
+sha256sums=('d1dbd4f27bcf0e760329f0f9c67a5fc81b4c56efbe0666159934c2bcd38caea2')
 
 build() {
   cd "$srcdir/GeoIP-$pkgver"
diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD
index 70daf9ae4..70c158f18 100644
--- a/extra/ghc/PKGBUILD
+++ b/extra/ghc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177606 2013-02-08 04:14:31Z td123 $
+# $Id: PKGBUILD 183848 2013-04-28 16:50:01Z td123 $
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Special note for devs looking to upgrade this package:
@@ -7,7 +7,7 @@
 #   This implies that all libraries need to be rebuilt when ghc is rebuilt.
 
 pkgname=ghc
-pkgver=7.6.2
+pkgver=7.6.3
 pkgrel=1
 pkgdesc='The Glasgow Haskell Compiler'
 arch=('i686' 'x86_64' 'mips64el')
@@ -72,8 +72,8 @@ replaces=('haskell-array<0.4.0.1'
 source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2"
         "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2"
         'build.mk')
-md5sums=('2585d83e7d8daece2fe0949c6bc42a2c'
-         '8454aaeb4e226ddb66c237c15874a47f'
+md5sums=('986d1f90ca30d60f7b2820d75c6b8ea7'
+         '66aa6177a31cc4b9d7eeb55cb1514918'
          'c367ef26300648ee9b8aca3dee5c9669')
 
 build() {
diff --git a/extra/ghc/silence-gen_contents_index.diff b/extra/ghc/silence-gen_contents_index.diff
deleted file mode 100644
index 6d835f8fb..000000000
--- a/extra/ghc/silence-gen_contents_index.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ghc-7.4.2/libraries/gen_contents_index.original	2012-06-10 22:23:28.810059378 +0000
-+++ ghc-7.4.2/libraries/gen_contents_index	2012-06-10 22:24:00.289814576 +0000
-@@ -47,7 +47,6 @@
- esac
- 
- # Now create the combined contents and index pages
--echo $HADDOCK_ARGS
- $HADDOCK --gen-index --gen-contents -o . \
-          -t "Haskell Hierarchical Libraries" \
-          -p "prologue.txt" \
diff --git a/extra/ghex/PKGBUILD b/extra/ghex/PKGBUILD
index f7d2ea6fb..f70aba975 100644
--- a/extra/ghex/PKGBUILD
+++ b/extra/ghex/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 169880 2012-10-30 22:25:50Z heftig $
-# Maintainer: tobias <tobias@archlinux.org>
+# $Id: PKGBUILD 183364 2013-04-21 22:09:21Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=ghex
-pkgver=3.6.1
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="A simple binary editor for the Gnome desktop"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://live.gnome.org/Ghex"
 depends=('gtk3' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils')
+makedepends=('intltool' 'itstool' 'docbook-xsl')
 options=('!libtool' '!emptydirs')
 install=ghex.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ef74fc5a5a67736391b3fb7fb14f588f3a4441b1aa48d1a6eaa1adb6c0427544')
+sha256sums=('40b08fff065575e91f161904952aaa14919ffe053f3849c47ab567ac93a4d3fc')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/ghostscript/PKGBUILD b/extra/ghostscript/PKGBUILD
deleted file mode 100644
index 959fc1186..000000000
--- a/extra/ghostscript/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 165016 2012-08-08 19:40:49Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgname=ghostscript
-pkgver=9.06
-pkgrel=1
-pkgdesc="An interpreter for the PostScript language"
-arch=('i686' 'x86_64')
-license=('GPL3' 'custom')
-depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms') # 'lcms2' won't get used) # move in libpaper from community?
-makedepends=('gtk2' 'gnutls')
-optdepends=('texlive-core:      needed for dvipdf'
-            'gtk2:              needed for gsx')
-url="http://www.ghostscript.com/"
-source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
-options=('!libtool' '!makeflags')
-md5sums=('46f9ebe40dc52755287b30704270db11')
-
-build() {
-  cd ${srcdir}/ghostscript-${pkgver}
-  
-  # force it to use system-libs
-  rm -rf jpeg libpng zlib jasper expat tiff lcms freetype 
-
-  ./configure --prefix=/usr \
-	--enable-dynamic \
-	--with-ijs \
-	--with-jbig2dec \
-	--with-omni \
-	--with-x \
-	--with-drivers=ALL\
-	--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
-	--with-install-cups \
-	--enable-fontconfig \
-	--enable-freetype \
-	--without-luratech \
-	--with-system-libtiff \
-	--disable-compile-inits #--help # needed for linking with system-zlib
-  make
-
-  # Build IJS
-  cd ${srcdir}/ghostscript-${pkgver}/ijs
-  ./autogen.sh
-  ./configure --prefix=/usr --enable-shared --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/ghostscript-${pkgver}
-  make DESTDIR=${pkgdir} \
-	cups_serverroot=${pkgdir}/etc/cups \
-	cups_serverbin=${pkgdir}/usr/lib/cups install soinstall
-
-  # install missing doc files # http://bugs.archlinux.org/task/18023
-  install -m 644 ${srcdir}/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/ghostscript/$pkgver/doc/
-  
-  mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/
-
-  # remove unwanted localized man-pages
-  rm -rf $pkgdir/usr/share/man/[^man1]*
-
-  # install IJS
-  cd ${srcdir}/ghostscript-${pkgver}/ijs
-  make DESTDIR=${pkgdir} install
-}
diff --git a/extra/ghostscript/svn_rev11948.diff b/extra/ghostscript/svn_rev11948.diff
deleted file mode 100644
index 92abb0d98..000000000
--- a/extra/ghostscript/svn_rev11948.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Modified: trunk/gs/base/gximag3x.c
-===================================================================
---- trunk/gs/base/gximag3x.c	2010-12-10 19:50:53 UTC (rev 11947)
-+++ trunk/gs/base/gximag3x.c	2010-12-11 23:02:25 UTC (rev 11948)
-@@ -241,7 +241,9 @@
- 	    const gs_image3x_mask_t *pixm =
- 		(i == 0 ? &pim->Opacity : &pim->Shape);
- 
--	    *(gs_data_image_t *)&mask[i].image = pixm->MaskDict;
-+            /* Use memcpy because direct assignment breaks ANSI aliasing */
-+            /* rules and causes SEGV with gcc 4.5.1 */
-+            memcpy(&mask[i].image, &pixm->MaskDict, sizeof(pixm->MaskDict));
- 	    mask[i].image.type = type1;
- 	    mask[i].image.BitsPerComponent = pixm->MaskDict.BitsPerComponent;
- 	}
-
diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD
index 6a163257e..3e3406b74 100644
--- a/extra/giflib/PKGBUILD
+++ b/extra/giflib/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=giflib
 pkgver=4.1.6
-pkgrel=5.1
+pkgrel=5.2
 pkgdesc="A library for reading and writing gif images"
 url="http://sourceforge.net/projects/giflib/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +21,7 @@ md5sums=('7125644155ae6ad33dbc9fc15a14735f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i '/AC_PATH_XTRA/d' configure.ac
+  sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
   libtoolize -f
   autoreconf
   ./configure --prefix=/usr --disable-static
diff --git a/extra/gifsicle/PKGBUILD b/extra/gifsicle/PKGBUILD
index 0a425d14c..06654c99b 100644
--- a/extra/gifsicle/PKGBUILD
+++ b/extra/gifsicle/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=gifsicle
 pkgver=1.64
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="A powerful command-line program for creating, editing, manipulating and getting information about GIF images and animations"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lcdf.org/gifsicle/"
diff --git a/extra/gimp-dbp/PKGBUILD b/extra/gimp-dbp/PKGBUILD
deleted file mode 100644
index 478388e45..000000000
--- a/extra/gimp-dbp/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 148736 2012-02-05 11:48:41Z ibiru $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=gimp-dbp
-pkgver=1.1.9
-pkgrel=3.1
-pkgdesc="David's batch processor for the GIMP"
-arch=(i686 x86_64 'mips64el')
-url="http://members.ozemail.com.au/~hodsond/dbp.html"
-license=('GPL')
-depends=('gimp')
-source=(http://www.ozemail.com.au/~hodsond/dbpSrc-${pkgver//./-}.tgz)
-md5sums=('1106625707798ab8ea1317ac6bece1c5')
-
-build() {
-  cd "${srcdir}/dbp-${pkgver}"
-  sed -i "s|<string>|<cstring>|" op.h
-  make
-}
-
-package() {
-  cd "${srcdir}/dbp-${pkgver}"
-  install -D -m755 dbp "${pkgdir}/usr/lib/gimp/2.0/plug-ins/dbp"
-}
diff --git a/extra/gimp-gap/PKGBUILD b/extra/gimp-gap/PKGBUILD
deleted file mode 100644
index 2662f85ba..000000000
--- a/extra/gimp-gap/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 138172 2011-09-18 06:56:19Z eric $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=gimp-gap
-pkgver=2.6.0
-pkgrel=3.2
-pkgdesc="A Plug-In collection to edit and create animations for the Gimp"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.gimp.org/downloads/"
-depends=('gimp' 'xvidcore' 'bash' 'libjpeg')
-makedepends=('intltool')
-options=('!makeflags')
-source=(ftp://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/$pkgname-$pkgver.tar.bz2)
-md5sums=('249ed829de8b78675c0fe4ef4212089f')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  [ "$CARCH" != "i686" ] && CFLAGS+=" -fPIC"
-  sed -ri 's/^gap_(plugins|morph)_LDADD .+$/& -lm/' gap/Makefile.in
-  ./configure --prefix=/usr 
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/extra/gimp-ufraw/PKGBUILD b/extra/gimp-ufraw/PKGBUILD
deleted file mode 100644
index 2880e7ba7..000000000
--- a/extra/gimp-ufraw/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 164834 2012-08-06 23:07:20Z andrea $
-# Maintainer: Tobias Kieslich <tobias@archlinux.org>
-
-pkgname=gimp-ufraw
-pkgver=0.18
-pkgrel=5
-pkgdesc="Standalone or gimp plugin converter for raw files"
-url="http://ufraw.sourceforge.net/"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('gtkimageview' 'exiv2' 'lcms' 'bzip2' 'desktop-file-utils')
-makedepends=('gimp' 'cinepaint')
-optdepends=('gimp: to use the gimp import plugin for raw images'
-            'cinepaint: to use the cinepaint import plugin for raw images')
-install=gimp-ufraw.install
-source=(http://downloads.sourceforge.net/ufraw/ufraw-${pkgver}.tar.gz)
-sha1sums=('41c9ad7aa7f1cbb63a6b0b330b3599b18a7e8cd2')
-
-build() {
-  cd "${srcdir}/ufraw-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --enable-extras \
-              --enable-mime \
-              --enable-openmp
-  sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/ufraw-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}/usr/bin/dcraw"
-}
diff --git a/extra/gimp-ufraw/gimp-ufraw.install b/extra/gimp-ufraw/gimp-ufraw.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/extra/gimp-ufraw/gimp-ufraw.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/extra/git/ChangeLog b/extra/git/ChangeLog
deleted file mode 100644
index f0c15233e..000000000
--- a/extra/git/ChangeLog
+++ /dev/null
@@ -1,57 +0,0 @@
-Simple version bumps are omitted from the following ChangeLog.
-
-2011-08-16 Dan McGee <dan@archlinux.org>
-	Version 1.7.6.1-1
-	* Enable USE_LIBPCRE for `git grep -P` usage
-
-2011-05-05 Dan McGee <dan@archlinux.org>
-	Version 1.7.5.1-1
-	* Byte compile emacs files (FS#20874)
-	* Respect CFLAGS/LDFLAGS (FS#23963)
-
-2011-04-27 Dan McGee <dan@archlinux.org>
-	Version 1.7.5-1
-	* Add missing optdepends for git send-email (FS#20923)
-
-2011-01-05 Dan McGee <dan@archlinux.org>
-	Version 1.7.3.5-1
-	* More flexible git-daemon RC scripts (FS#20575)
-
-2010-10-01 Allan McRae <allan@archlinux.org>
-	Version 1.7.3.1-2
-	* Python 2/3 rebuild
-
-2010-06-29 Dan McGee <dan@archlinux.org>
-	Version 1.7.1.1-1
-	* Add emacs completion files (FS#17968)
-	* Add git-daemon RC scripts (FS#19291)
-
-2009-06-05 Dan McGee <dan@archlinux.org>
-	Version 1.6.3.2-1
-	* Remove gitweb from /usr/share; it needs customization to be helpful
-	* Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683)
-
-2008-09-14 Dan McGee <dan@archlinux.org>
-	Version 1.6.0.2-1
-	* Moved optional depends from install file to optdepends array
-
-2008-06-15 Dan McGee <dan@archlinux.org>
-	Version 1.5.6-1
-	* Removed 'cpio' dependency, clone is now a builtin and no longer needs it
-
-2008-02-02 Dan McGee <dan@archlinux.org>
-	Version 1.5.4-1
-	* Upstream version 1.5.4
-	* Enable pthreads support in pack-objects. To use, set the pack.threads
-	  git config option. Read manpages of pack-objects and config for more
-	  details.
-	* Changelog added (with entries going back a bit).
-
-2008-01-28 Kevin Piche <kevin@archlinux.org>
-	Version 1.5.3.7-2
-	* Updated for new perl policy (vendor dirs)
-	* Change license to GPL2
-
-2007-11-01 Eric Belanger <eric@archlinux.org>
-	Version 1.5.3.5-2
-	* Fix Perl module location
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index bebbc800c..47f0232a9 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177790 2013-02-08 22:44:16Z dan $
+# $Id: PKGBUILD 183712 2013-04-27 12:28:29Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.8.1.3
+pkgver=1.8.2.2
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
@@ -25,8 +25,6 @@ backup=('etc/conf.d/git-daemon.conf')
 install=git.install
 source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz"
         "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz"
-        git-daemon
-        git-daemon.conf
         git-daemon@.service
         git-daemon.socket)
 
@@ -84,7 +82,11 @@ package() {
   sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \
     $(find "$pkgdir" -name '*.py') \
     "$pkgdir"/usr/lib/git-core/git-p4 \
-    "$pkgdir"/usr/share/git/gitview/gitview
+    "$pkgdir"/usr/share/git/gitview/gitview \
+    "$pkgdir"/usr/share/git/remote-helpers/git-remote-bzr \
+    "$pkgdir"/usr/share/git/remote-helpers/git-remote-hg
+  sed -i 's|#![ ]*/usr/bin/python|#!/usr/bin/python2|' \
+    "$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py
 
   # emacs interface
   cd contrib/emacs
@@ -100,18 +102,12 @@ package() {
   # remove perllocal.pod, .packlist, and empty directories.
   rm -rf "$pkgdir"/usr/lib/perl5
 
-  # git daemon script
-  install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon
-  install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
-
-  # systemd stuff
+  # git-daemon via systemd socket activation
   install -D -m 644 "$srcdir"/git-daemon@.service "$pkgdir"/usr/lib/systemd/system/git-daemon@.service
   install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
 }
 
-md5sums=('05fb5ea3792a51cef2becc8d06ea9b87'
-         'b8e050c3c96b0b9fa28a7b7e9413af01'
-         '8e2648910fd5dd4f1c41d3c7fa9e9156'
-         '2e42bf97779a1c6411d89043334c9e78'
+md5sums=('f7407df37facf579dcaa979266cc3c59'
+         '765e8b9bbed49333f78103c6afd1dd0b'
          '042524f942785772d7bd52a1f02fe5ae'
          'f67869315c2cc112e076f0c73f248002')
diff --git a/extra/git/fix-git-build-python.patch b/extra/git/fix-git-build-python.patch
deleted file mode 100644
index 11618a49a..000000000
--- a/extra/git/fix-git-build-python.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Date: Wed, 2 Jan 2013 03:59:35 -0500

-From: Jeff King <peff@peff.net>

-To: Junio C Hamano <gitster@pobox.com>

-Cc: Dan McGee <dan@archlinux.org>, GIT Mailing-list <git@vger.kernel.org>,

-	Florian Achleitner <florian.achleitner.2.6.31@gmail.com>,

-	David Michael Barr <b@rr-dav.id.au>,

-	"Eric S. Raymond" <esr@thyrsus.com>

-Subject: Re: Test failures with python versions when building git 1.8.1

-Message-ID: <20130102085935.GB9328@sigill.intra.peff.net>

-References: <CAEik5nOqge8ix4WGf-h+0Dmz1CanH_XtQdB-CxvPsggSu1-LzQ@mail.gmail.com>

- <7va9ss5fhq.fsf@alter.siamese.dyndns.org>

- <20130102065345.GA8685@sigill.intra.peff.net>

- <7v1ue459yh.fsf@alter.siamese.dyndns.org>

-MIME-Version: 1.0

-Content-Type: text/plain; charset=utf-8

-Content-Disposition: inline

-In-Reply-To: <7v1ue459yh.fsf@alter.siamese.dyndns.org>

-

-On Tue, Jan 01, 2013 at 11:18:46PM -0800, Junio C Hamano wrote:

-

-> Jeff King <peff@peff.net> writes:

-> 

-> > [1] This symlink is doubly wrong, because any use of symbolic links

-> >     in the test scripts needs to depend on the SYMLINKS prereq, and this

-> >     does not.

-> 

-> Yeah, I think we have discussed this once already in

-> 

-> http://thread.gmane.org/gmane.comp.version-control.git/210688/focus=210714

-

-Thanks for the pointer; it looks like nothing productive came of the

-earlier discussion. To give a hat trick of failure to this line of code,

-I notice that the existing code also does not properly put quotes around

-$GIT_BUILD_DIR.

-

-> > [2] In both the current code and what I showed above, the test scripts

-> >     depend on things in contrib/. This is probably a bad idea in

-> >     general, as the quality of what goes into contrib is not as closely

-> >     watched (especially with respect to things like portability).

-> >     Certainly I would not have known to look more carefully at a patch

-> >     to contrib/svn-fe for breakage to the test suite.

-> 

-> As long as such tests are made skippable with appropriate

-> prerequisites, I do not think it is bad to have their tests in t/; I

-> would say it is rather better than having them in contrib/ and leave

-> it not run by anybody, which happened to some of the stuff in

-> contrib/ already.

-

-Good point. While my sense of decorum wants to keep contrib totally

-split out, from a practical point of view, it is better to have more

-people run the tests and report failures than not.

-

-Whether we end up doing something with contrib and tests or not, the

-patch below gives a minimal fix in the meantime. Dan, does it fix your

-problem?

-

--- >8 --

-Subject: [PATCH] t9020: don't run python from $PATH

-

-In t9020, we symlink in a python script from contrib to help

-with the testing. However, we don't munge its #!-line, which

-means we may run the wrong python (we want the one in

-PYTHON_PATH). On top of this, we use a symlink without

-checking the SYMLINKS prereq, and we fail to properly quote

-GIT_BUILD_DIR, which may have spaces.

-

-Instead of symlinking, let's just write a small script which

-will feed the contrib script to PYTHON_PATH. To avoid

-quoting issues, we just export the variables the script

-needs to run.

-

-Signed-off-by: Jeff King <peff@peff.net>

----

- t/t9020-remote-svn.sh | 5 ++++-

- t/test-lib.sh         | 2 +-

- 2 files changed, 5 insertions(+), 2 deletions(-)

-

-diff --git a/t/t9020-remote-svn.sh b/t/t9020-remote-svn.sh

-index 4f2dfe0..416623b 100755

---- a/t/t9020-remote-svn.sh

-+++ b/t/t9020-remote-svn.sh

-@@ -14,7 +14,10 @@ export PATH="$HOME:$PATH"

- 

- # We override svnrdump by placing a symlink to the svnrdump-emulator in .

- export PATH="$HOME:$PATH"

--ln -sf $GIT_BUILD_DIR/contrib/svn-fe/svnrdump_sim.py "$HOME/svnrdump"

-+export GIT_BUILD_DIR

-+write_script svnrdump <<\EOF

-+exec "$PYTHON_PATH" "$GIT_BUILD_DIR"/contrib/svn-fe/svnrdump_sim.py "$@"

-+EOF

- 

- init_git () {

- 	rm -fr .git &&

-diff --git a/t/test-lib.sh b/t/test-lib.sh

-index f50f834..c17db19 100644

---- a/t/test-lib.sh

-+++ b/t/test-lib.sh

-@@ -45,7 +45,7 @@ fi

- fi

- 

- . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS

--export PERL_PATH SHELL_PATH

-+export PERL_PATH SHELL_PATH PYTHON_PATH

- 

- # if --tee was passed, write the output not only to the terminal, but

- # additionally to the file test-results/$BASENAME.out, too.

--- 

-1.8.1.rc3.4.gf3a2f57

-

diff --git a/extra/git/git-daemon b/extra/git/git-daemon
deleted file mode 100644
index 21ba73ed5..000000000
--- a/extra/git/git-daemon
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-daemon_bin="/usr/lib/git-core/git-daemon"
-daemon_name=$(basename $daemon_bin)
-PIDF="/var/run/$daemon_name.pid"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f $PIDF ] && rm -f $PIDF
-      # RUN
-      $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > $PIDF
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f $PIDF &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/extra/git/git-daemon.conf b/extra/git/git-daemon.conf
deleted file mode 100644
index 3f9a12060..000000000
--- a/extra/git/git-daemon.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# path to git repositories served
-GIT_REPO="/srv/git/"
-# see `man git-daemon` for all available options
-# $GIT_REPO will be present twice in most configs
-GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"
diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD
index b7545d160..4de85bfcd 100644
--- a/extra/gjs/PKGBUILD
+++ b/extra/gjs/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id: PKGBUILD 169881 2012-10-30 22:25:52Z heftig $
+# $Id: PKGBUILD 183533 2013-04-22 15:40:22Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gjs
-pkgver=1.34.0
+pkgver=1.36.1
 pkgrel=1
 pkgdesc="Javascript Bindings for GNOME"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://live.gnome.org/Gjs"
-license=('GPL')
-depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js')
+license=(GPL)
+depends=(cairo gobject-introspection 'js>=17.0.0')
 options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3d62c717a0522a36c6faa1eb021872255e3cd285a72786afe23b7cca2e3084cb')
+source=(http://people.gnome.org/~walters/$pkgname-js17-$pkgver.tar.bz2)
+sha256sums=('5826f74fcf20750538f74e2b0059f392eb139996b80b70ca217f5f7a0d117e27')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|python|python2|' scripts/make-tests
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --disable-static
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD
index b4f45e6e9..de2fb9eb6 100644
--- a/extra/glade/PKGBUILD
+++ b/extra/glade/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 172080 2012-11-27 16:33:29Z jgc $
+# $Id: PKGBUILD 183366 2013-04-21 22:09:24Z heftig $
 # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=glade
-pkgver=3.14.2
+pkgver=3.15.0
 pkgrel=1
 pkgdesc="User interface builder for GTK+ and GNOME."
 arch=(i686 x86_64 mips64el)
 license=('GPL' 'LGPL')
 depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject' 'itstool' 'docbook-xsl')
+makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'python2-gobject' 'itstool' 'docbook-xsl')
 optdepends=('python2: Python widgets support'
             'devhelp: help browser')
 options=('!libtool')
 url="http://glade.gnome.org/"
 install=glade.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d2e6b5a20cfdbc0a5ed49122ac7b4e3a10ba140ccfcaba60082e6e2b52a62ac6')
+sha256sums=('4e64f33d8a5ad614279dc7024ed70fe57805526e82244001a33351b1cf13f95c')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/glamor-egl/PKGBUILD b/extra/glamor-egl/PKGBUILD
new file mode 100644
index 000000000..bc7954587
--- /dev/null
+++ b/extra/glamor-egl/PKGBUILD
@@ -0,0 +1,63 @@
+# $Id: PKGBUILD 179700 2013-03-09 11:48:07Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Eugeni Dodonov <eugeni@dodonov.net>
+
+pkgname=glamor-egl
+pkgver=0.5.0
+pkgrel=4
+pkgdesc='OpenGL based 2D rendering acceleration library	'
+arch=('i686' 'x86_64')
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('mesa-libgl')
+makedepends=('xorg-server-devel')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        glamor_utils.h glamor_priv.h glapi.h
+        compat-api.h compiler.h glamor_debug.h glamor_gl_dispatch.h glamor_glext.h
+        git-fixes.patch)
+conflicts=('glamor-git')
+options=('!libtool')
+sha256sums=('5dc8679ccb3e42bf431b6316c7907b9df2db89745d523e04721f34aee6c84991'
+            'fb7db610451d8bb0baaabe3ac618794f535924ac08f62159b08a82ac90a1ed4a'
+            '6ad1b6349325be84aa9fe6f0b3224128f11bcf00a91a7080e40cd7b58a83137c'
+            '5c148a18607f94fcdfebe2838aa77d190cb913e05579a9676c2520219a5e2a6a'
+            '1a5c1059a3757047de064ccd952ab637b73e7e2d55cbccd6dafc60b57aaed1d0'
+            'f883c329e7ec94afafa646b866eaab8a5616761b5ffe2b2837c75d403917944a'
+            'fc3d937f2cb996586d3a9cc7427050d04d2d19d3f745055cc9d3556428a7cf93'
+            'a7fac65474af636995d0181dbf7f8f091d8657260162eb172ae816b75ad98b54'
+            'dcf38a7ac303c1636a3b1b7810dcb6ee65ba7e81b6e590840e164ce0e28010dc'
+            'c56e677456fb8555b009b1d3b95e939b5a38f37c2a345fff48f2b723e44045e9')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
+  # add missing headers - tarball creation buggy
+  cp $srcdir/*.h src/
+
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+
+  autoreconf -vfi
+
+  ./configure --prefix=/usr \
+    --disable-static \
+    --enable-glx-tls \
+    #--with-xorg-conf-dir=/etc/X11/xorg.conf.d
+
+    #--help
+    #--enable-glamor-gles2 \ https://bugs.archlinux.org/task/34284
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make "DESTDIR=${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+  
+  # hack for lib loading with recent Xorg-servers, see FS#34236  and
+  # http://lists.x.org/archives/xorg-devel/2013-March/035719.html
+  
+  # add glamor library path to ld.so.conf.d
+#  install -d ${pkgdir}/etc/ld.so.conf.d
+#  echo "/usr/lib/xorg/modules" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
+}
diff --git a/extra/glamor-egl/compat-api.h b/extra/glamor-egl/compat-api.h
new file mode 100644
index 000000000..1608478f8
--- /dev/null
+++ b/extra/glamor-egl/compat-api.h
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2012 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author: Dave Airlie <airlied@redhat.com>
+ */
+
+/* this file provides API compat between server post 1.13 and pre it,
+   it should be reused inside as many drivers as possible */
+#ifndef COMPAT_API_H
+#define COMPAT_API_H
+
+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
+#endif
+
+#ifndef XF86_HAS_SCRN_CONV
+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
+#endif
+
+#ifndef XF86_SCRN_INTERFACE
+
+#define SCRN_ARG_TYPE int
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr scrn = xf86Screens[(arg1)]
+
+#define SCREEN_ARG_TYPE int
+#define SCREEN_PTR(arg1) ScreenPtr screen = screenInfo.screens[(arg1)]
+
+#define SCREEN_INIT_ARGS_DECL int scrnIndex, ScreenPtr screen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer timeout, pointer read_mask
+#define BLOCKHANDLER_ARGS arg, blockData, timeout, read_mask
+
+#define WAKEUPHANDLER_ARGS_DECL int arg, pointer wakeupData, unsigned long result, pointer read_mask
+#define WAKEUPHANDLER_ARGS arg, wakeupData, result, read_mask
+
+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr screen
+#define CLOSE_SCREEN_ARGS scrnIndex, screen
+
+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
+
+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
+
+#define FREE_SCREEN_ARGS_DECL int arg, int flags
+#define FREE_SCREEN_ARGS	arg, flags
+
+#define VT_FUNC_ARGS_DECL int arg, int flags
+#define VT_FUNC_ARGS(flags) scrn->scrnIndex, (flags)
+
+#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex)
+
+#else
+#define SCRN_ARG_TYPE ScrnInfoPtr
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr scrn = (arg1)
+
+#define SCREEN_ARG_TYPE ScreenPtr
+#define SCREEN_PTR(arg1) ScreenPtr screen = (arg1)
+
+#define SCREEN_INIT_ARGS_DECL ScreenPtr screen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer timeout, pointer read_mask
+#define BLOCKHANDLER_ARGS arg, timeout, read_mask
+
+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask
+#define WAKEUPHANDLER_ARGS arg, result, read_mask
+
+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr screen
+#define CLOSE_SCREEN_ARGS screen
+
+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
+
+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
+#define SWITCH_MODE_ARGS(arg, m) arg, m
+
+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
+#define FREE_SCREEN_ARGS	arg
+
+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
+#define VT_FUNC_ARGS(flags) scrn
+
+#define XF86_ENABLEDISABLEFB_ARG(x) (x)
+
+#endif
+#endif
diff --git a/extra/glamor-egl/compiler.h b/extra/glamor-egl/compiler.h
new file mode 100644
index 000000000..fa2895976
--- /dev/null
+++ b/extra/glamor-egl/compiler.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2011 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Authors:
+ *    Chris Wilson <chris@chris-wilson.co.uk>
+ *
+ *    Copied from sna 
+ *
+ */
+
+#ifndef _GLAMOR_COMPILER_H_
+#define _GLAMOR_COMPILER_H_
+
+#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
+#define likely(expr) (__builtin_expect (!!(expr), 1))
+#define unlikely(expr) (__builtin_expect (!!(expr), 0))
+#define noinline __attribute__((noinline))
+#define fastcall __attribute__((regparm(3)))
+#define must_check __attribute__((warn_unused_result))
+#define constant __attribute__((const))
+#else
+#define likely(expr) (expr)
+#define unlikely(expr) (expr)
+#define noinline
+#define fastcall
+#define must_check
+#define constant
+#endif
+
+#ifdef HAVE_VALGRIND
+#define VG(x) x
+#else
+#define VG(x)
+#endif
+
+#define VG_CLEAR(s) VG(memset(&s, 0, sizeof(s)))
+
+#define COMPILE_TIME_ASSERT(E) ((void)sizeof(char[1 - 2*!(E)]))
+
+#endif /* _SNA_COMPILER_H_ */
diff --git a/extra/glamor-egl/git-fixes.patch b/extra/glamor-egl/git-fixes.patch
new file mode 100644
index 000000000..7a03a225e
--- /dev/null
+++ b/extra/glamor-egl/git-fixes.patch
@@ -0,0 +1,428 @@
+From beeddaae1da253d1a442228a75f80ef40a0204ac Mon Sep 17 00:00:00 2001
+From: Michel Dänzer <michel.daenzer@amd.com>
+Date: Wed, 31 Oct 2012 15:56:00 +0000
+Subject: Don't use glBlitFramebufferEXT for overlapping copies.
+
+According to the GL_EXT_framebuffer_blit spec, the result of doing so is
+undefined. But we need well-defined results. :)
+
+Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+---
+diff --git a/src/glamor_copyarea.c b/src/glamor_copyarea.c
+index 7d06833..4e6f953 100644
+--- a/src/glamor_copyarea.c
++++ b/src/glamor_copyarea.c
+@@ -318,7 +318,8 @@ __glamor_copy_n_to_n(DrawablePtr src,
+ 		dx, dy,
+ 		src_pixmap, dst_pixmap);
+ #ifndef GLAMOR_GLES2
+-	if ((overlaped || glamor_priv->state != RENDER_STATE
++	if (!overlaped &&
++	    (glamor_priv->state != RENDER_STATE
+ 	     || !src_pixmap_priv->base.gl_tex || !dst_pixmap_priv->base.gl_tex)
+ 	    && glamor_copy_n_to_n_fbo_blit(src, dst, gc, box, nbox, dx,
+ 					   dy)) {
+--
+cgit v0.9.0.2-2-gbebe
+From f1457c1c59efdadbad25f01dce9433643d688844 Mon Sep 17 00:00:00 2001
+From: Zhigang Gong <zhigang.gong@linux.intel.com>
+Date: Tue, 13 Nov 2012 02:08:02 +0000
+Subject: glamor_compositerects: Need to initialize region before fallback.
+
+As we need to call DamageRegionAppend even for fallback path,
+we must initialize the region before do that. Pointed by
+Igor Vagulin.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=56940
+
+Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
+---
+diff --git a/src/glamor_compositerects.c b/src/glamor_compositerects.c
+index 5fe1bbf..f1564a2 100644
+--- a/src/glamor_compositerects.c
++++ b/src/glamor_compositerects.c
+@@ -131,16 +131,6 @@ glamor_composite_rectangles(CARD8	 op,
+ 		return;
+ 	}
+ 
+-	pixmap = glamor_get_drawable_pixmap(dst->pDrawable);
+-	priv = glamor_get_pixmap_private(pixmap);
+-
+-	if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(priv))
+-		goto fallback;
+-	if (dst->alphaMap) {
+-		DEBUGF("%s: fallback, dst has an alpha-map\n", __FUNCTION__);
+-		goto fallback;
+-	}
+-
+ 	if ((color->red|color->green|color->blue|color->alpha) <= 0x00ff) {
+ 		switch (op) {
+ 		case PictOpOver:
+@@ -204,6 +194,16 @@ glamor_composite_rectangles(CARD8	 op,
+ 		return;
+ 	}
+ 
++	pixmap = glamor_get_drawable_pixmap(dst->pDrawable);
++	priv = glamor_get_pixmap_private(pixmap);
++
++	if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(priv))
++		goto fallback;
++	if (dst->alphaMap) {
++		DEBUGF("%s: fallback, dst has an alpha-map\n", __FUNCTION__);
++		goto fallback;
++	}
++
+ 	need_free_region = TRUE;
+ 
+ 	DEBUGF("%s: drawable extents (%d, %d),(%d, %d) x %d\n",
+--
+cgit v0.9.0.2-2-gbebe
+From 4a0ac3ff00d70b13e8483d50657187c7abdfc110 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Sat, 29 Dec 2012 06:28:17 +0000
+Subject: glamor: fix make distcheck part 1
+
+This just adds the headers, then it falls over on the sdk_HEADERS
+as it overrides proper install paths by the looks of it.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+---
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 766aac7..e1ee86d 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -20,10 +20,13 @@ AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS) $(LIBDRM_CFLAGS)
+ libglamor_la_LDFLAGS = -avoid-version
+ 
+ libglamor_la_SOURCES = \
++	compat-api.h \
+ 	glamor.c \
+ 	glamor_copyarea.c \
+ 	glamor_copywindow.c \
+ 	glamor_core.c \
++	glamor_debug.h \
++	glamor_gl_dispatch.h \
+ 	glamor_fill.c \
+ 	glamor_fillspans.c \
+ 	glamor_getspans.c \
+@@ -42,6 +45,7 @@ libglamor_la_SOURCES = \
+ 	glamor_copyplane.c\
+ 	glamor_glyphblt.c\
+ 	glamor_polyops.c\
++	glamor_priv.h\
+ 	glamor_pixmap.c\
+ 	glamor_largepixmap.c\
+ 	glamor_picture.c\
+@@ -49,7 +53,9 @@ libglamor_la_SOURCES = \
+ 	glamor_gl_dispatch.c\
+ 	glamor_fbo.c\
+ 	glamor_compositerects.c\
+-	glamor.h
++	glamor_utils.h\
++	glamor.h\
++	glapi.h
+ 
+ sdk_HEADERS = glamor.h
+ 
+--
+cgit v0.9.0.2-2-gbebe
+From c6d9cb1eb4962a15f8bbc869e9fef6d1464165af Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Sat, 29 Dec 2012 06:42:10 +0000
+Subject: glamor: add compiler.h
+
+This is also required for distchecking.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+---
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e1ee86d..55721f6 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -21,6 +21,7 @@ libglamor_la_LDFLAGS = -avoid-version
+ 
+ libglamor_la_SOURCES = \
+ 	compat-api.h \
++	compiler.h \
+ 	glamor.c \
+ 	glamor_copyarea.c \
+ 	glamor_copywindow.c \
+--
+cgit v0.9.0.2-2-gbebe
+From c0729336ae35dcc7e46bcf840d6e9a056d5cdd26 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Sat, 29 Dec 2012 06:42:30 +0000
+Subject: glamor_utils: fix unlikely define use
+
+using a define across a split line expression is failure, compiling
+with warnings shows this up.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+---
+diff --git a/src/glamor_utils.h b/src/glamor_utils.h
+index 36beb49..d307838 100644
+--- a/src/glamor_utils.h
++++ b/src/glamor_utils.h
+@@ -80,8 +80,7 @@
+ 
+ #define pixmap_priv_get_fbo_off(_priv_, _xoff_, _yoff_)		\
+    do {								\
+-	if (unlikely(_priv_ && (_priv_)->type				\
+-		== GLAMOR_TEXTURE_LARGE)) {			\
++	if (unlikely(_priv_ && (_priv_)->type == GLAMOR_TEXTURE_LARGE)) {  \
+ 		*(_xoff_) = - (_priv_)->large.box.x1;	\
+ 		*(_yoff_) = - (_priv_)->large.box.y1;	\
+ 	} else {						\
+--
+cgit v0.9.0.2-2-gbebe
+From 61879504f86c5cb326cc06a5873283234cfbbcd2 Mon Sep 17 00:00:00 2001
+From: Michel Dänzer <michel.daenzer@amd.com>
+Date: Wed, 13 Mar 2013 16:15:33 +0000
+Subject: glamoregl: Use xf86ScreenToScrn()
+
+Fixes crashes when glamor is used for a GPU screen with xserver 1.13 or
+newer.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57200#c17
+
+Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/glamor_egl.c b/src/glamor_egl.c
+index a248aa2..cd0bdc0 100644
+--- a/src/glamor_egl.c
++++ b/src/glamor_egl.c
+@@ -116,7 +116,7 @@ glamor_egl_get_screen_private(ScrnInfoPtr scrn)
+ _X_EXPORT void
+ glamor_egl_make_current(ScreenPtr screen)
+ {
+-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
++	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ 	struct glamor_egl_screen_private *glamor_egl =
+ 	    glamor_egl_get_screen_private(scrn);
+ 
+@@ -139,7 +139,7 @@ glamor_egl_make_current(ScreenPtr screen)
+ _X_EXPORT void
+ glamor_egl_restore_context(ScreenPtr screen)
+ {
+-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
++	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ 	struct glamor_egl_screen_private *glamor_egl =
+ 	    glamor_egl_get_screen_private(scrn);
+ 
+@@ -221,7 +221,7 @@ glamor_create_texture_from_image(struct glamor_egl_screen_private
+ Bool
+ glamor_egl_create_textured_screen(ScreenPtr screen, int handle, int stride)
+ {
+-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
++	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ 	struct glamor_egl_screen_private *glamor_egl;
+ 	PixmapPtr	screen_pixmap;
+ 
+@@ -245,7 +245,7 @@ glamor_egl_create_textured_screen_ext(ScreenPtr screen,
+ 				      int stride,
+ 				      PixmapPtr *back_pixmap)
+ {
+-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
++	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ 	struct glamor_egl_screen_private *glamor_egl;
+ 
+ 	glamor_egl = glamor_egl_get_screen_private(scrn);
+@@ -272,7 +272,7 @@ Bool
+ glamor_egl_create_textured_pixmap(PixmapPtr pixmap, int handle, int stride)
+ {
+ 	ScreenPtr screen = pixmap->drawable.pScreen;
+-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
++	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ 	struct glamor_egl_screen_private *glamor_egl;
+ 	EGLImageKHR image;
+ 	GLuint texture;
+@@ -318,7 +318,7 @@ done:
+ static void
+ _glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
+ {
+-	ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
++	ScrnInfoPtr scrn = xf86ScreenToScrn(pixmap->drawable.pScreen);
+ 	EGLImageKHR image;
+ 	struct glamor_egl_screen_private *glamor_egl =
+ 	    glamor_egl_get_screen_private(scrn);
+@@ -338,7 +338,7 @@ _glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
+ _X_EXPORT void
+ glamor_egl_exchange_buffers(PixmapPtr front, PixmapPtr back)
+ {
+-	ScrnInfoPtr scrn = xf86Screens[front->drawable.pScreen->myNum];
++	ScrnInfoPtr scrn = xf86ScreenToScrn(front->drawable.pScreen);
+ 	struct glamor_egl_screen_private *glamor_egl =
+ 	    glamor_egl_get_screen_private(scrn);
+ 	EGLImageKHR old_front_image;
+@@ -371,7 +371,7 @@ glamor_egl_close_screen(CLOSE_SCREEN_ARGS_DECL)
+ 	PixmapPtr screen_pixmap;
+ 	EGLImageKHR back_image;
+ 
+-	scrn = xf86Screens[screen->myNum];
++	scrn = xf86ScreenToScrn(screen);
+ 	glamor_egl = glamor_egl_get_screen_private(scrn);
+ 	screen_pixmap = screen->GetScreenPixmap(screen);
+ 
+@@ -417,7 +417,7 @@ glamor_egl_has_extension(struct glamor_egl_screen_private *glamor_egl,
+ void
+ glamor_egl_screen_init(ScreenPtr screen)
+ {
+-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
++	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ 	struct glamor_egl_screen_private *glamor_egl =
+ 	    glamor_egl_get_screen_private(scrn);
+ 
+@@ -588,7 +588,7 @@ glamor_gl_dispatch_init(ScreenPtr screen,
+ 			struct glamor_gl_dispatch *dispatch,
+ 			int gl_version)
+ {
+-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
++	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ 	struct glamor_egl_screen_private *glamor_egl =
+ 	    glamor_egl_get_screen_private(scrn);
+ 	if (!glamor_gl_dispatch_init_impl
+--
+cgit v0.9.0.2-2-gbebe
+From 3cd34ba9f0708ab7d816eeee80139257fafcb4ad Mon Sep 17 00:00:00 2001
+From: Armin K <krejzi@email.com>
+Date: Wed, 13 Mar 2013 17:28:57 +0000
+Subject: Silence Automake 1.13 warnings
+
+warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
+
+Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+---
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 55721f6..2140b81 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -12,7 +12,7 @@ endif
+ 
+ instdir = $(moduledir)
+ 
+-INCLUDES = \
++AM_CPPFLAGS = \
+ 	$(XORG_INCS)
+ 
+ AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS) $(LIBDRM_CFLAGS)
+--
+cgit v0.9.0.2-2-gbebe
+From c7241f097ddb4d3bfb832f6b4ee6fafe8b4d2cfe Mon Sep 17 00:00:00 2001
+From: Armin K <krejzi@email.com>
+Date: Wed, 13 Mar 2013 17:28:58 +0000
+Subject: Properly dist necesary headers
+
+Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+---
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2140b81..0879287 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -31,6 +31,7 @@ libglamor_la_SOURCES = \
+ 	glamor_fill.c \
+ 	glamor_fillspans.c \
+ 	glamor_getspans.c \
++	glamor_glext.h \
+ 	glamor_glyphs.c \
+ 	glamor_polyfillrect.c \
+ 	glamor_polylines.c \
+--
+cgit v0.9.0.2-2-gbebe
+From f2d7f1cf351bdc3a8a00fe564cd6a937db3b4e19 Mon Sep 17 00:00:00 2001
+From: Armin K <krejzi@email.com>
+Date: Wed, 13 Mar 2013 17:49:32 +0000
+Subject: First attempt to make libglamor.so shared versioned library
+
+As recommended by Michel in this thread reply:
+http://lists.freedesktop.org/archives/glamor/2013-March/000305.html
+
+v2: Correct shared library location in glamor.pc.in
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=62259
+
+Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+---
+diff --git a/glamor.pc.in b/glamor.pc.in
+index 74ecd2e..5257468 100644
+--- a/glamor.pc.in
++++ b/glamor.pc.in
+@@ -2,12 +2,11 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-moduledir=@moduledir@
+ sdkdir=@sdkdir@
+ GLAMOR_GL_CFLAGS=@GLAMOR_GL_CFLAGS@
+ 
+ Name: glamor
+ Description: X.Org glamor common library.
+ Version: @PACKAGE_VERSION@
+-Cflags: -I${sdkdir} -L${moduledir} -lglamor ${GLAMOR_GL_CFLAGS}
+-
++Cflags: -I${sdkdir} ${GLAMOR_GL_CFLAGS}
++Libs: -L${libdir} -lglamor
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0879287..4beb559 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,4 @@
+-inst_LTLIBRARIES = libglamor.la
++lib_LTLIBRARIES = libglamor.la
+ 
+ # Override these since glamor doesn't need them and the needed files aren't
+ # built (in hw/xfree86/os-support/solaris) until after glamor is built
+@@ -10,14 +10,12 @@ else
+ libglamor_la_LIBADD = $(GL_LIBS)
+ endif
+ 
+-instdir = $(moduledir)
+-
+ AM_CPPFLAGS = \
+ 	$(XORG_INCS)
+ 
+ AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS) $(LIBDRM_CFLAGS)
+ 
+-libglamor_la_LDFLAGS = -avoid-version
++libglamor_la_LDFLAGS = -version-info 0:0:0
+ 
+ libglamor_la_SOURCES = \
+ 	compat-api.h \
+@@ -65,7 +63,8 @@ if EGL
+ LIBGLAMOREGL = libglamoregl.la
+ module_LTLIBRARIES = $(LIBGLAMOREGL)
+ libglamoregl_la_DEPENDENCIES = libglamor.la
+-libglamoregl_la_LDFLAGS = -avoid-version -module $(EGL_LIBS) -lglamor $(GLX_SYS_LIBS)
++libglamoregl_la_LDFLAGS = -avoid-version -module
++libglamoregl_la_LIBADD = $(EGL_LIBS) $(GLX_SYS_LIBS) libglamor.la
+ libglamoregl_la_SOURCES = glamor_eglmodule.c $(top_srcdir)/src/glamor_egl.c
+ libglamoregl_la_CFLAGS = $(AM_CFLAGS) $(GLX_DEFINES) -I$(top_srcdir)/src $(LIBDRM_CFLAGS) $(EGL_CFLAGS)
+ endif
+--
+cgit v0.9.0.2-2-gbebe
+From 81aadb8ae204f58d77a948c8624f1e72659dcdf0 Mon Sep 17 00:00:00 2001
+From: Armin K <krejzi@email.com>
+Date: Wed, 13 Mar 2013 17:49:33 +0000
+Subject: Don't use AC_PROG_LIBTOOL
+
+Autoconf only needs libtool macros which are copied when
+autoreconf is run. There is no need for looking for
+"libtool" program in PATH. This properly disables static
+libraries from being built and installed.
+
+Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+---
+diff --git a/configure.ac b/configure.ac
+index 230543c..5ff6ae1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,7 +37,6 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ AM_MAINTAINER_MODE([enable])
+ 
+ # Initialize libtool
+-AC_PROG_LIBTOOL
+ LT_PREREQ([2.2])
+ LT_INIT([disable-static])
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/glamor-egl/glamor_debug.h b/extra/glamor-egl/glamor_debug.h
new file mode 100644
index 000000000..f0c969b11
--- /dev/null
+++ b/extra/glamor-egl/glamor_debug.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ * Copyright © 1998 Keith Packard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Zhigang Gong <zhigang.gong@gmail.com>
+ *
+ */
+
+#ifndef __GLAMOR_DEBUG_H__
+#define __GLAMOR_DEBUG_H__
+
+
+#define GLAMOR_DELAYED_STRING_MAX 64
+
+#define GLAMOR_DEBUG_NONE                     0
+#define GLAMOR_DEBUG_UNIMPL                   0
+#define GLAMOR_DEBUG_FALLBACK                 1
+#define GLAMOR_DEBUG_TEXTURE_DOWNLOAD         2
+#define GLAMOR_DEBUG_TEXTURE_DYNAMIC_UPLOAD   3
+
+extern void
+AbortServer(void)
+    _X_NORETURN;
+
+#define GLAMOR_PANIC(_format_, ...)			\
+  do {							\
+    LogMessageVerb(X_NONE, 0, "Glamor Fatal Error"	\
+		   " at %32s line %d: " _format_ "\n",	\
+		   __FUNCTION__, __LINE__,		\
+		   ##__VA_ARGS__ );			\
+    exit(1);                                            \
+  } while(0)
+
+
+
+
+#define __debug_output_message(_format_, _prefix_, ...) \
+  LogMessageVerb(X_NONE, 0,				\
+		 "%32s:\t" _format_ ,		\
+		 /*_prefix_,*/				\
+		 __FUNCTION__,				\
+		 ##__VA_ARGS__)
+
+#define glamor_debug_output(_level_, _format_,...)	\
+  do {							\
+    if (glamor_debug_level >= _level_)			\
+      __debug_output_message(_format_,			\
+			     "Glamor debug",		\
+			     ##__VA_ARGS__);		\
+  } while(0)
+
+
+#define glamor_fallback(_format_,...)			\
+  do {							\
+    if (glamor_debug_level >= GLAMOR_DEBUG_FALLBACK)	\
+      __debug_output_message(_format_,			\
+			     "Glamor fallback",		\
+			     ##__VA_ARGS__);} while(0)
+
+
+
+#define glamor_delayed_fallback(_screen_, _format_,...)			\
+  do {									\
+    if (glamor_debug_level >= GLAMOR_DEBUG_FALLBACK)  {			\
+      glamor_screen_private *_glamor_priv_;				\
+      _glamor_priv_ = glamor_get_screen_private(_screen_);		\
+      _glamor_priv_->delayed_fallback_pending = 1;			\
+      snprintf(_glamor_priv_->delayed_fallback_string,			\
+	       GLAMOR_DELAYED_STRING_MAX,				\
+	       "glamor delayed fallback: \t%s " _format_ ,		\
+               __FUNCTION__, ##__VA_ARGS__); } } while(0)
+
+
+#define glamor_clear_delayed_fallbacks(_screen_)			\
+  do {									\
+    if (glamor_debug_level >= GLAMOR_DEBUG_FALLBACK) {			\
+      glamor_screen_private *_glamor_priv_;				\
+	_glamor_priv_ = glamor_get_screen_private(_screen_);		\
+      _glamor_priv_->delayed_fallback_pending = 0;  } } while(0)
+
+#define glamor_report_delayed_fallbacks(_screen_)			\
+  do {									\
+    if (glamor_debug_level >= GLAMOR_DEBUG_FALLBACK) {			\
+      glamor_screen_private *_glamor_priv_;				\
+      _glamor_priv_ = glamor_get_screen_private(_screen_);		\
+      LogMessageVerb(X_INFO, 0, "%s",					\
+		     _glamor_priv_->delayed_fallback_string);		\
+      _glamor_priv_->delayed_fallback_pending = 0;  } } while(0)
+
+#define DEBUGF(str, ...)  do {} while(0)
+//#define DEBUGF(str, ...) ErrorF(str, ##__VA_ARGS__)
+#define DEBUGRegionPrint(x) do {} while (0)
+//#define DEBUGRegionPrint RegionPrint
+
+
+#endif
diff --git a/extra/glamor-egl/glamor_gl_dispatch.h b/extra/glamor-egl/glamor_gl_dispatch.h
new file mode 100644
index 000000000..b3fc3a629
--- /dev/null
+++ b/extra/glamor-egl/glamor_gl_dispatch.h
@@ -0,0 +1,137 @@
+typedef struct glamor_gl_dispatch {
+	/* Transformation functions */
+	void (*glMatrixMode) (GLenum mode);
+	void (*glLoadIdentity) (void);
+	void (*glViewport) (GLint x, GLint y, GLsizei width,
+			    GLsizei height);
+	/* Drawing functions */
+	void (*glRasterPos2i) (GLint x, GLint y);
+
+	/* Vertex Array */
+	void (*glDrawArrays) (GLenum mode, GLint first, GLsizei count);
+
+	/* Elements Array*/
+	void (*glDrawElements) (GLenum mode, GLsizei count, GLenum type, const GLvoid * indices);
+
+	/* Raster functions */
+	void (*glReadPixels) (GLint x, GLint y,
+			      GLsizei width, GLsizei height,
+			      GLenum format, GLenum type, GLvoid * pixels);
+
+	void (*glDrawPixels) (GLsizei width, GLsizei height,
+			      GLenum format, GLenum type,
+			      const GLvoid * pixels);
+	void (*glPixelStorei) (GLenum pname, GLint param);
+	/* Texture Mapping */
+
+	void (*glTexParameteri) (GLenum target, GLenum pname, GLint param);
+	void (*glTexImage2D) (GLenum target, GLint level,
+			      GLint internalFormat,
+			      GLsizei width, GLsizei height,
+			      GLint border, GLenum format, GLenum type,
+			      const GLvoid * pixels);
+	/* 1.1 */
+	void (*glGenTextures) (GLsizei n, GLuint * textures);
+	void (*glDeleteTextures) (GLsizei n, const GLuint * textures);
+	void (*glBindTexture) (GLenum target, GLuint texture);
+	void (*glTexSubImage2D) (GLenum target, GLint level,
+				 GLint xoffset, GLint yoffset,
+				 GLsizei width, GLsizei height,
+				 GLenum format, GLenum type,
+				 const GLvoid * pixels);
+	/* MISC */
+	void (*glFlush) (void);
+	void (*glFinish) (void);
+	void (*glGetIntegerv) (GLenum pname, GLint * params);
+	const GLubyte *(*glGetString) (GLenum name);
+	void (*glScissor) (GLint x, GLint y, GLsizei width,
+			   GLsizei height);
+	void (*glEnable) (GLenum cap);
+	void (*glDisable) (GLenum cap);
+	void (*glBlendFunc) (GLenum sfactor, GLenum dfactor);
+	void (*glLogicOp) (GLenum opcode);
+
+	/* 1.3 */
+	void (*glActiveTexture) (GLenum texture);
+
+	/* GL Extentions */
+	void (*glGenBuffers) (GLsizei n, GLuint * buffers);
+	void (*glBufferData) (GLenum target, GLsizeiptr size,
+			      const GLvoid * data, GLenum usage);
+	GLvoid *(*glMapBuffer) (GLenum target, GLenum access);
+	GLvoid *(*glMapBufferRange) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+	GLboolean (*glUnmapBuffer) (GLenum target);
+	void (*glBindBuffer) (GLenum target, GLuint buffer);
+	void (*glDeleteBuffers) (GLsizei n, const GLuint * buffers);
+
+	void (*glFramebufferTexture2D) (GLenum target, GLenum attachment,
+					GLenum textarget, GLuint texture,
+					GLint level);
+	void (*glBindFramebuffer) (GLenum target, GLuint framebuffer);
+	void (*glDeleteFramebuffers) (GLsizei n,
+				      const GLuint * framebuffers);
+	void (*glGenFramebuffers) (GLsizei n, GLuint * framebuffers);
+	GLenum (*glCheckFramebufferStatus) (GLenum target);
+	void (*glBlitFramebuffer) (GLint srcX0, GLint srcY0, GLint srcX1,
+				   GLint srcY1, GLint dstX0, GLint dstY0,
+				   GLint dstX1, GLint dstY1,
+				   GLbitfield mask, GLenum filter);
+
+	void (*glVertexAttribPointer) (GLuint index, GLint size,
+				       GLenum type, GLboolean normalized,
+				       GLsizei stride,
+				       const GLvoid * pointer);
+	void (*glDisableVertexAttribArray) (GLuint index);
+	void (*glEnableVertexAttribArray) (GLuint index);
+	void (*glBindAttribLocation) (GLuint program, GLuint index,
+				      const GLchar * name);
+
+	void (*glLinkProgram) (GLuint program);
+	void (*glShaderSource) (GLuint shader, GLsizei count,
+				const GLchar * *string,
+				const GLint * length);
+	void (*glUseProgram) (GLuint program);
+	void (*glUniform1i) (GLint location, GLint v0);
+	void (*glUniform1f) (GLint location, GLfloat v0);
+	void (*glUniform4f) (GLint location, GLfloat v0, GLfloat v1,
+			     GLfloat v2, GLfloat v3);
+	void (*glUniform1fv) (GLint location, GLsizei count,
+			      const GLfloat * value);
+	void (*glUniform2fv) (GLint location, GLsizei count,
+			      const GLfloat * value);
+	void (*glUniform4fv) (GLint location, GLsizei count,
+			      const GLfloat * value);
+	void (*glUniformMatrix3fv) (GLint location, GLsizei count,
+		           GLboolean transpose, const GLfloat* value);
+	GLuint (*glCreateProgram) (void);
+	GLuint (*glDeleteProgram) (GLuint);
+	GLuint (*glCreateShader) (GLenum type);
+	void (*glCompileShader) (GLuint shader);
+	void (*glAttachShader) (GLuint program, GLuint shader);
+	void (*glDeleteShader) (GLuint shader);
+	void (*glGetShaderiv) (GLuint shader, GLenum pname,
+			       GLint * params);
+	void (*glGetShaderInfoLog) (GLuint shader, GLsizei bufSize,
+				    GLsizei * length, GLchar * infoLog);
+	void (*glGetProgramiv) (GLuint program, GLenum pname,
+				GLint * params);
+	void (*glGetProgramInfoLog) (GLuint program, GLsizei bufSize,
+				     GLsizei * length, GLchar * infoLog);
+	GLint (*glGetUniformLocation) (GLuint program,
+				       const GLchar * name);
+
+} glamor_gl_dispatch;
+
+
+typedef void *(*get_proc_address_t) (const char *);
+
+_X_EXPORT Bool
+glamor_gl_dispatch_init_impl(struct glamor_gl_dispatch *dispatch,
+			     int gl_version,
+			     get_proc_address_t get_proc_address);
+
+
+_X_EXPORT Bool
+glamor_gl_dispatch_init(ScreenPtr screen,
+			struct glamor_gl_dispatch *dispatch,
+			int gl_version);
diff --git a/extra/glamor-egl/glamor_glext.h b/extra/glamor-egl/glamor_glext.h
new file mode 100644
index 000000000..1f7206b99
--- /dev/null
+++ b/extra/glamor-egl/glamor_glext.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2001 Keith Packard
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Zhigang Gong <zhigang.gong@linux.intel.com>
+ *
+ */
+
+
+#ifdef GLAMOR_GLES2
+
+#define GL_BGRA                                 GL_BGRA_EXT
+#define GL_COLOR_INDEX                          0x1900
+#define GL_BITMAP                               0x1A00
+#define GL_UNSIGNED_INT_8_8_8_8                 0x8035
+#define GL_UNSIGNED_INT_8_8_8_8_REV             0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV          0x8368
+#define GL_UNSIGNED_INT_10_10_10_2              0x8036
+#define GL_UNSIGNED_SHORT_5_6_5_REV             0x8364
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV           0x8366
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV           0x8365
+
+#define GL_PIXEL_PACK_BUFFER              0x88EB
+#define GL_PIXEL_UNPACK_BUFFER            0x88EC
+#define GL_CLAMP_TO_BORDER                0x812D
+
+#define GL_READ_WRITE                     0x88BA
+#define GL_READ_ONLY                      0x88B8
+#define GL_WRITE_ONLY                     0x88B9
+#define GL_STREAM_DRAW                    0x88E0
+#define GL_STREAM_READ                    0x88E1
+#define GL_PACK_ROW_LENGTH                      0x0D02
+#define GL_UNPACK_ROW_LENGTH                    0x0CF2
+
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
+
+#define GL_PACK_INVERT_MESA               0x8758
+#define GL_MAP_UNSYNCHRONIZED_BIT         0x0020
+#define GL_MAP_READ_BIT                   0x0001
+#define GL_MAP_WRITE_BIT                  0x0002
+
+#endif
diff --git a/extra/glamor-egl/glamor_priv.h b/extra/glamor-egl/glamor_priv.h
new file mode 100644
index 000000000..6e80ebdf9
--- /dev/null
+++ b/extra/glamor-egl/glamor_priv.h
@@ -0,0 +1,1016 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Eric Anholt <eric@anholt.net>
+ *
+ */
+#ifndef GLAMOR_PRIV_H
+#define GLAMOR_PRIV_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "compiler.h"
+
+#include <xorg-server.h>
+#ifndef DEBUG
+#define NDEBUG
+#endif
+#include "glamor.h"
+#include "compat-api.h"
+
+#define GL_GLEXT_PROTOTYPES
+
+#ifdef GLAMOR_GLES2
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+
+#define GLAMOR_DEFAULT_PRECISION   "precision mediump float;\n"
+#include "glamor_glext.h"
+#else
+#include <GL/gl.h>
+#include <GL/glext.h>
+#define GLAMOR_DEFAULT_PRECISION
+#endif
+
+#ifdef RENDER
+#include "glyphstr.h"
+#endif
+
+#include "glamor_debug.h"
+
+#include <list.h>
+/* The list.h rename all the function to add xorg_ prefix.
+   We add hack here to avoid the compile error when using
+   old version xserver header file.
+   These will be removed in future. */
+#ifndef xorg_list_entry
+#define xorg_list list
+#define xorg_list_for_each_entry list_for_each_entry
+#define xorg_list_for_each_entry_safe list_for_each_entry_safe
+#define xorg_list_del list_del
+#define xorg_list_add list_add
+#define xorg_list_append list_append
+#define xorg_list_init list_init
+#endif
+
+struct glamor_pixmap_private;
+
+typedef struct glamor_composite_shader {
+	GLuint prog;
+	GLint dest_to_dest_uniform_location;
+	GLint dest_to_source_uniform_location;
+	GLint dest_to_mask_uniform_location;
+	GLint source_uniform_location;
+	GLint mask_uniform_location;
+	GLint source_wh;
+	GLint mask_wh;
+	GLint source_repeat_mode;
+	GLint mask_repeat_mode;
+	union {
+		float source_solid_color[4];
+		struct {
+			struct glamor_pixmap_private *source_priv;
+			PicturePtr source;
+		};
+	};
+
+	union {
+		float mask_solid_color[4];
+		struct {
+			struct glamor_pixmap_private *mask_priv;
+			PicturePtr mask;
+		};
+	};
+} glamor_composite_shader;
+
+enum shader_source {
+	SHADER_SOURCE_SOLID,
+	SHADER_SOURCE_TEXTURE,
+	SHADER_SOURCE_TEXTURE_ALPHA,
+	SHADER_SOURCE_COUNT,
+};
+
+enum shader_mask {
+	SHADER_MASK_NONE,
+	SHADER_MASK_SOLID,
+	SHADER_MASK_TEXTURE,
+	SHADER_MASK_TEXTURE_ALPHA,
+	SHADER_MASK_COUNT,
+};
+
+enum shader_in {
+	SHADER_IN_SOURCE_ONLY,
+	SHADER_IN_NORMAL,
+	SHADER_IN_CA_SOURCE,
+	SHADER_IN_CA_ALPHA,
+	SHADER_IN_COUNT,
+};
+
+struct shader_key {
+	enum shader_source source;
+	enum shader_mask mask;
+	enum shader_in in;
+};
+
+struct blendinfo {
+	Bool dest_alpha;
+	Bool source_alpha;
+	GLenum source_blend;
+	GLenum dest_blend;
+};
+
+typedef struct {
+	INT16 x_src;
+	INT16 y_src;
+	INT16 x_mask;
+	INT16 y_mask;
+	INT16 x_dst;
+	INT16 y_dst;
+	INT16 width;
+	INT16 height;
+} glamor_composite_rect_t;
+
+
+enum glamor_vertex_type {
+	GLAMOR_VERTEX_POS,
+	GLAMOR_VERTEX_SOURCE,
+	GLAMOR_VERTEX_MASK
+};
+
+
+enum gradient_shader {
+	SHADER_GRADIENT_LINEAR,
+	SHADER_GRADIENT_RADIAL,
+	SHADER_GRADIENT_CONICAL,
+	SHADER_GRADIENT_COUNT,
+};
+
+enum gradient_shader_prog {
+	SHADER_GRADIENT_VS_PROG,
+	SHADER_GRADIENT_FS_MAIN_PROG,
+	SHADER_GRADIENT_FS_GETCOLOR_PROG,
+	SHADER_GRADIENT_PROG_COUNT,
+};
+
+struct glamor_screen_private;
+struct glamor_pixmap_private;
+
+enum glamor_gl_flavor {
+	GLAMOR_GL_DESKTOP,	// OPENGL API
+	GLAMOR_GL_ES2		// OPENGL ES2.0 API
+};
+
+#define GLAMOR_CREATE_PIXMAP_CPU  0x100
+#define GLAMOR_CREATE_PIXMAP_FIXUP 0x101
+#define GLAMOR_CREATE_FBO_NO_FBO   0x103
+#define GLAMOR_CREATE_PIXMAP_MAP 0x104
+
+#define GLAMOR_CREATE_TEXTURE_EXACT_SIZE 0x104
+
+#define GLAMOR_NUM_GLYPH_CACHE_FORMATS 2
+
+#define GLAMOR_COMPOSITE_VBO_VERT_CNT (64*1024)
+
+typedef struct {
+	PicturePtr picture;	/* Where the glyphs of the cache are stored */
+	GlyphPtr *glyphs;
+	uint16_t count;
+	uint16_t evict;
+} glamor_glyph_cache_t;
+
+#include "glamor_gl_dispatch.h"
+
+struct glamor_saved_procs { 
+	CloseScreenProcPtr close_screen;
+	CreateGCProcPtr create_gc;
+	CreatePixmapProcPtr create_pixmap;
+	DestroyPixmapProcPtr destroy_pixmap;
+	GetSpansProcPtr get_spans;
+	GetImageProcPtr get_image;
+	CompositeProcPtr composite;
+	CompositeRectsProcPtr composite_rects;
+	TrapezoidsProcPtr trapezoids;
+	GlyphsProcPtr glyphs;
+	ChangeWindowAttributesProcPtr change_window_attributes;
+	CopyWindowProcPtr copy_window;
+	BitmapToRegionProcPtr bitmap_to_region;
+	TrianglesProcPtr triangles;
+	AddTrapsProcPtr addtraps;
+	CreatePictureProcPtr create_picture;
+	DestroyPictureProcPtr destroy_picture;
+	UnrealizeGlyphProcPtr unrealize_glyph;
+};
+
+#ifdef GLAMOR_GLES2
+#define CACHE_FORMAT_COUNT 3
+#else
+#define CACHE_FORMAT_COUNT 2
+#endif
+
+#define CACHE_BUCKET_WCOUNT 4
+#define CACHE_BUCKET_HCOUNT 4
+
+#define GLAMOR_TICK_AFTER(t0, t1) 	\
+	(((int)(t1) - (int)(t0)) < 0)
+
+#define IDLE_STATE 0
+#define RENDER_STATE 1
+#define BLIT_STATE 2
+#define RENDER_IDEL_MAX 32
+
+typedef struct glamor_screen_private {
+	struct glamor_gl_dispatch _dispatch;
+	int yInverted;
+	unsigned int tick;
+	enum glamor_gl_flavor gl_flavor;
+	int has_pack_invert;
+	int has_fbo_blit;
+	int max_fbo_size;
+
+	struct xorg_list fbo_cache[CACHE_FORMAT_COUNT][CACHE_BUCKET_WCOUNT][CACHE_BUCKET_HCOUNT];
+	unsigned long    fbo_cache_watermark;
+
+	/* glamor_solid */
+	GLint solid_prog;
+	GLint solid_color_uniform_location;
+
+	/* vertext/elment_index buffer object for render */
+	GLuint vbo, ebo;
+	int vbo_offset;
+	int vbo_size;
+	char *vb;
+	int vb_stride;
+	Bool has_source_coords, has_mask_coords;
+	int render_nr_verts;
+	glamor_composite_shader composite_shader[SHADER_SOURCE_COUNT]
+						[SHADER_MASK_COUNT]
+						[SHADER_IN_COUNT];
+	glamor_glyph_cache_t glyphCaches[GLAMOR_NUM_GLYPH_CACHE_FORMATS];
+	Bool glyph_cache_initialized;
+
+	/* shaders to restore a texture to another texture.*/
+	GLint finish_access_prog[2];
+	GLint finish_access_revert[2];
+	GLint finish_access_swap_rb[2];
+
+	/* glamor_tile */
+	GLint tile_prog;
+	GLint tile_wh;
+
+	/* glamor gradient, 0 for small nstops, 1 for
+	   large nstops and 2 for dynamic generate. */
+	GLint gradient_prog[SHADER_GRADIENT_COUNT][3];
+	GLint linear_gradient_shaders[SHADER_GRADIENT_PROG_COUNT][3];
+	int linear_max_nstops;
+	GLint radial_gradient_shaders[SHADER_GRADIENT_PROG_COUNT][3];
+	int radial_max_nstops;
+
+	/* glamor trapezoid shader. */
+	GLint trapezoid_prog;
+
+	/* glamor_putimage */
+	GLint put_image_xybitmap_prog;
+	GLint put_image_xybitmap_fg_uniform_location;
+	GLint put_image_xybitmap_bg_uniform_location;
+
+	PixmapPtr *back_pixmap;
+	int screen_fbo;
+	struct glamor_saved_procs saved_procs;
+	char delayed_fallback_string[GLAMOR_DELAYED_STRING_MAX + 1];
+	int delayed_fallback_pending;
+	int flags;
+	int state;
+	unsigned int render_idle_cnt;
+	ScreenPtr screen;
+} glamor_screen_private;
+
+typedef enum glamor_access {
+	GLAMOR_ACCESS_RO,
+	GLAMOR_ACCESS_RW,
+	GLAMOR_ACCESS_WO,
+} glamor_access_t;
+
+#define GLAMOR_FBO_NORMAL     1
+#define GLAMOR_FBO_DOWNLOADED 2
+/* glamor_pixmap_fbo:
+ * @list:    to be used to link to the cache pool list.
+ * @expire:  when push to cache pool list, set a expire count.
+ * 	     will be freed when glamor_priv->tick is equal or
+ * 	     larger than this expire count in block handler.
+ * @pbo_valid: The pbo has a valid copy of the pixmap's data.
+ * @tex:     attached texture.
+ * @fb:      attached fbo.
+ * @pbo:     attached pbo.
+ * @width:   width of this fbo.
+ * @height:  height of this fbo.
+ * @format:  internal format of this fbo's texture.
+ * @type:    internal type of this fbo's texture.
+ * @glamor_priv: point to glamor private data.
+ */
+typedef struct glamor_pixmap_fbo {
+	struct xorg_list list;
+	unsigned int expire;
+	unsigned char pbo_valid;
+	GLuint tex;
+	GLuint fb;
+	GLuint pbo;
+	int width;
+	int height;
+	GLenum format;
+	GLenum type;
+	glamor_screen_private *glamor_priv;
+} glamor_pixmap_fbo;
+
+/*
+ * glamor_pixmap_private - glamor pixmap's private structure.
+ * @gl_fbo:
+ * 	0 		  	- The pixmap doesn't has a fbo attached to it.
+ * 	GLAMOR_FBO_NORMAL 	- The pixmap has a fbo and can be accessed normally.
+ * 	GLAMOR_FBO_DOWNLOADED 	- The pixmap has a fbo and already downloaded to
+ * 				  CPU, so it can only be treated as a in-memory pixmap
+ * 				  if this bit is set.
+ * @gl_tex:  The pixmap is in a gl texture originally.
+ * @is_picture: The drawable is attached to a picture.
+ * @pict_format: the corresponding picture's format.
+ * @pixmap: The corresponding pixmap's pointer.
+ *
+ * For GLAMOR_TEXTURE_LARGE, nbox should larger than 1.
+ * And the box and fbo will both have nbox elements.
+ * and box[i] store the relatively coords in this pixmap
+ * of the fbo[i]. The reason why use boxes not region to
+ * represent this structure is we may need to use overlapped
+ * boxes for one pixmap for some special reason.
+ *
+ * pixmap
+ * ******************
+ * *  fbo0 * fbo1   *
+ * *       *        *
+ * ******************
+ * *  fbo2 * fbo3   *
+ * *       *        *
+ * ******************
+ *
+ * Let's assume the texture has size of 1024x1024
+ * box[0] = {0,0,1024,1024}
+ * box[1] = {1024,0,2048,2048}
+ * ...
+ *
+ * For GLAMOR_TEXTURE_ATLAS nbox should be 1. And box
+ * and fbo both has one elements, and the box store
+ * the relatively coords in the fbo of this pixmap:
+ *
+ * fbo
+ * ******************
+ * *   pixmap       *
+ * *   *********    *
+ * *   *       *    *
+ * *   *********    *
+ * *                *
+ * ******************
+ *
+ * Assume the pixmap is at the (100,100) relatively to
+ * the fbo's origin.
+ * box[0]={100, 100, 1124, 1124};
+ *
+ * Considering large pixmap is not a normal case, to keep
+ * it simple, I designe it as the following way.
+ * When deal with a large pixmap, it split the working
+ * rectangle into serval boxes, and each box fit into a
+ * corresponding fbo. And then the rendering function will
+ * loop from the left-top box to the right-bottom box,
+ * each time, we will set current box and current fbo
+ * to the box and fbo elements. Thus the inner routines
+ * can handle it as normal, only the coords calculation need
+ * to aware of it's large pixmap.
+ *
+ * Currently, we haven't implemented the atlas pixmap.
+ *
+ **/
+
+typedef struct glamor_pixmap_clipped_regions{
+	int block_idx;
+	RegionPtr region;
+} glamor_pixmap_clipped_regions;
+
+#define SET_PIXMAP_FBO_CURRENT(priv, idx) 				\
+  do {									\
+	if (priv->type == GLAMOR_TEXTURE_LARGE) {			\
+		(priv)->large.base.fbo = priv->large.fbo_array[idx]; 	\
+		(priv)->large.box = priv->large.box_array[idx]; 	\
+	}								\
+  } while(0)
+
+typedef struct glamor_pixmap_private_base {
+	glamor_pixmap_type_t type;
+	unsigned char gl_fbo:2;
+	unsigned char is_picture:1;
+	unsigned char gl_tex:1;
+	glamor_pixmap_fbo *fbo;
+	PixmapPtr pixmap;
+	int drm_stride;
+	glamor_screen_private *glamor_priv;
+	PicturePtr picture;
+}glamor_pixmap_private_base_t;
+
+/*
+ * @base.fbo: current fbo.
+ * @box: current fbo's coords in the whole pixmap.
+ * @block_w: block width of this large pixmap.
+ * @block_h: block height of this large pixmap.
+ * @block_wcnt: block count in one block row.
+ * @block_hcnt: block count in one block column.
+ * @nbox: total block count.
+ * @box_array: contains each block's corresponding box.
+ * @fbo_array: contains each block's fbo pointer.
+ *
+ **/
+typedef struct glamor_pixmap_private_large {
+	union {
+		glamor_pixmap_type_t type;
+		glamor_pixmap_private_base_t base;
+	};
+	BoxRec box;
+	int block_w;
+	int block_h;
+	int block_wcnt;
+	int block_hcnt;
+	int nbox;
+	BoxPtr box_array;
+	glamor_pixmap_fbo **fbo_array;
+}glamor_pixmap_private_large_t;
+
+/*
+ * @box: the relative coords in the corresponding fbo.
+ */
+typedef struct glamor_pixmap_private_atlas {
+	union {
+		glamor_pixmap_type_t type;
+		glamor_pixmap_private_base_t base;
+	};
+	BoxRec box;
+}glamor_pixmap_private_atlas_t;
+
+typedef struct glamor_pixmap_private {
+	union {
+		glamor_pixmap_type_t type;
+		glamor_pixmap_private_base_t base;
+		glamor_pixmap_private_large_t large;
+		glamor_pixmap_private_atlas_t atlas;
+	};
+}glamor_pixmap_private;
+
+/* 
+ * Pixmap dynamic status, used by dynamic upload feature.
+ *
+ * GLAMOR_NONE:  initial status, don't need to do anything.
+ * GLAMOR_UPLOAD_PENDING: marked as need to be uploaded to gl texture.
+ * GLAMOR_UPLOAD_DONE: the pixmap has been uploaded successfully.
+ * GLAMOR_UPLOAD_FAILED: fail to upload the pixmap.
+ *
+ * */
+typedef enum glamor_pixmap_status {
+	GLAMOR_NONE,
+	GLAMOR_UPLOAD_PENDING,
+	GLAMOR_UPLOAD_DONE,
+	GLAMOR_UPLOAD_FAILED
+} glamor_pixmap_status_t;
+
+extern DevPrivateKey glamor_screen_private_key;
+extern DevPrivateKey glamor_pixmap_private_key;
+static inline glamor_screen_private *
+glamor_get_screen_private(ScreenPtr screen)
+{
+	return (glamor_screen_private *)
+	    dixLookupPrivate(&screen->devPrivates,
+			     glamor_screen_private_key);
+}
+
+static inline void
+glamor_set_screen_private(ScreenPtr screen, glamor_screen_private *priv)
+{
+	dixSetPrivate(&screen->devPrivates,
+		      glamor_screen_private_key,
+		      priv);
+}
+
+
+
+static inline glamor_pixmap_private *
+glamor_get_pixmap_private(PixmapPtr pixmap)
+{
+	glamor_pixmap_private *priv;
+	priv = dixLookupPrivate(&pixmap->devPrivates,
+				glamor_pixmap_private_key);
+	if (!priv) {
+		glamor_set_pixmap_type(pixmap, GLAMOR_MEMORY);
+		priv = dixLookupPrivate(&pixmap->devPrivates,
+					glamor_pixmap_private_key);
+	}
+	return priv;
+}
+
+void glamor_set_pixmap_private(PixmapPtr pixmap, glamor_pixmap_private *priv);
+
+/**
+ * Returns TRUE if the given planemask covers all the significant bits in the
+ * pixel values for pDrawable.
+ */
+static inline Bool
+glamor_pm_is_solid(DrawablePtr drawable, unsigned long planemask)
+{
+	return (planemask & FbFullMask(drawable->depth)) ==
+	    FbFullMask(drawable->depth);
+}
+
+extern int glamor_debug_level;
+
+/* glamor.c */
+PixmapPtr glamor_get_drawable_pixmap(DrawablePtr drawable);
+
+Bool glamor_destroy_pixmap(PixmapPtr pixmap);
+
+glamor_pixmap_fbo* glamor_pixmap_detach_fbo(glamor_pixmap_private *pixmap_priv);
+void glamor_pixmap_attach_fbo(PixmapPtr pixmap, glamor_pixmap_fbo *fbo);
+glamor_pixmap_fbo * glamor_create_fbo_from_tex(glamor_screen_private *glamor_priv,
+					       int w, int h, GLenum format, GLint tex, int flag);
+glamor_pixmap_fbo * glamor_create_fbo(glamor_screen_private *glamor_priv,
+				      int w, int h, GLenum format, int flag);
+void glamor_destroy_fbo(glamor_pixmap_fbo *fbo);
+void glamor_pixmap_destroy_fbo(glamor_pixmap_private *priv);
+void glamor_purge_fbo(glamor_pixmap_fbo *fbo);
+
+void glamor_init_pixmap_fbo(ScreenPtr screen);
+void glamor_fini_pixmap_fbo(ScreenPtr screen);
+Bool glamor_pixmap_fbo_fixup(ScreenPtr screen, PixmapPtr pixmap);
+void glamor_fbo_expire(glamor_screen_private *glamor_priv);
+
+glamor_pixmap_fbo *
+glamor_create_fbo_array(glamor_screen_private *glamor_priv,
+			int w, int h, GLenum format, int flag,
+			int block_w, int block_h, glamor_pixmap_private *);
+
+/* glamor_copyarea.c */
+RegionPtr
+glamor_copy_area(DrawablePtr src, DrawablePtr dst, GCPtr gc,
+		 int srcx, int srcy, int width, int height, int dstx,
+		 int dsty);
+void glamor_copy_n_to_n(DrawablePtr src, DrawablePtr dst, GCPtr gc,
+			BoxPtr box, int nbox, int dx, int dy, Bool reverse,
+			Bool upsidedown, Pixel bitplane, void *closure);
+
+/* glamor_copywindow.c */
+void glamor_copy_window(WindowPtr win, DDXPointRec old_origin,
+			RegionPtr src_region);
+
+/* glamor_core.c */
+Bool glamor_prepare_access(DrawablePtr drawable, glamor_access_t access);
+void glamor_finish_access(DrawablePtr drawable, glamor_access_t access);
+Bool glamor_prepare_access_window(WindowPtr window);
+void glamor_finish_access_window(WindowPtr window);
+Bool glamor_prepare_access_gc(GCPtr gc);
+void glamor_finish_access_gc(GCPtr gc);
+void glamor_init_finish_access_shaders(ScreenPtr screen);
+void glamor_fini_finish_access_shaders(ScreenPtr screen);
+const Bool glamor_get_drawable_location(const DrawablePtr drawable);
+void glamor_get_drawable_deltas(DrawablePtr drawable, PixmapPtr pixmap,
+				int *x, int *y);
+Bool glamor_stipple(PixmapPtr pixmap, PixmapPtr stipple,
+		    int x, int y, int width, int height,
+		    unsigned char alu, unsigned long planemask,
+		    unsigned long fg_pixel, unsigned long bg_pixel,
+		    int stipple_x, int stipple_y);
+GLint glamor_compile_glsl_prog(glamor_gl_dispatch * dispatch, GLenum type,
+			       const char *source);
+void glamor_link_glsl_prog(glamor_gl_dispatch * dispatch, GLint prog);
+void glamor_get_color_4f_from_pixel(PixmapPtr pixmap,
+				    unsigned long fg_pixel,
+				    GLfloat * color);
+
+int glamor_set_destination_pixmap(PixmapPtr pixmap);
+int glamor_set_destination_pixmap_priv(glamor_pixmap_private *
+				       pixmap_priv);
+void glamor_set_destination_pixmap_fbo(glamor_pixmap_fbo *, int, int, int, int);
+
+/* nc means no check. caller must ensure this pixmap has valid fbo.
+ * usually use the GLAMOR_PIXMAP_PRIV_HAS_FBO firstly. 
+ * */
+void glamor_set_destination_pixmap_priv_nc(glamor_pixmap_private *
+					   pixmap_priv);
+
+glamor_pixmap_fbo *
+glamor_es2_pixmap_read_prepare(PixmapPtr source, int x, int y, int w, int h, GLenum format,
+			       GLenum type, int no_alpha, int revert, int swap_rb);
+
+Bool glamor_set_alu(struct glamor_gl_dispatch *dispatch,
+		    unsigned char alu);
+Bool glamor_set_planemask(PixmapPtr pixmap, unsigned long planemask);
+Bool glamor_change_window_attributes(WindowPtr pWin, unsigned long mask);
+RegionPtr glamor_bitmap_to_region(PixmapPtr pixmap);
+Bool glamor_gl_has_extension(const char *extension);
+int glamor_gl_get_version(void);
+
+#define GLAMOR_GL_VERSION_ENCODE(major, minor) ( \
+          ((major) * 256)                       \
+        + ((minor) *   1))
+
+
+
+
+/* glamor_fill.c */
+Bool glamor_fill(DrawablePtr drawable,
+		 GCPtr gc, int x, int y, int width, int height, Bool fallback);
+Bool glamor_solid(PixmapPtr pixmap, int x, int y, int width, int height,
+		  unsigned char alu, unsigned long planemask,
+		  unsigned long fg_pixel);
+Bool
+glamor_solid_boxes(PixmapPtr pixmap,
+		   BoxPtr box, int nbox,
+		   unsigned long fg_pixel);
+
+/* glamor_fillspans.c */
+void glamor_fill_spans(DrawablePtr drawable,
+		       GCPtr gc,
+		       int n, DDXPointPtr points, int *widths, int sorted);
+
+void glamor_init_solid_shader(ScreenPtr screen);
+void glamor_fini_solid_shader(ScreenPtr screen);
+
+/* glamor_getspans.c */
+void
+
+glamor_get_spans(DrawablePtr drawable,
+		 int wmax,
+		 DDXPointPtr points,
+		 int *widths, int nspans, char *dst_start);
+
+/* glamor_glyphs.c */
+void glamor_glyphs_fini(ScreenPtr screen);
+void glamor_glyphs(CARD8 op,
+		   PicturePtr pSrc,
+		   PicturePtr pDst,
+		   PictFormatPtr maskFormat,
+		   INT16 xSrc,
+		   INT16 ySrc, int nlist, GlyphListPtr list,
+		   GlyphPtr * glyphs);
+
+/* glamor_setspans.c */
+void glamor_set_spans(DrawablePtr drawable, GCPtr gc, char *src,
+		      DDXPointPtr points, int *widths, int n, int sorted);
+
+/* glamor_polyfillrect.c */
+void
+glamor_poly_fill_rect(DrawablePtr drawable,
+		      GCPtr gc, int nrect, xRectangle * prect);
+
+/* glamor_polylines.c */
+void
+
+glamor_poly_lines(DrawablePtr drawable, GCPtr gc, int mode, int n,
+		  DDXPointPtr points);
+
+/* glamor_putimage.c */
+void
+
+glamor_put_image(DrawablePtr drawable, GCPtr gc, int depth, int x, int y,
+		 int w, int h, int leftPad, int format, char *bits);
+void glamor_init_putimage_shaders(ScreenPtr screen);
+void glamor_fini_putimage_shaders(ScreenPtr screen);
+
+/* glamor_render.c */
+Bool
+glamor_composite_clipped_region(CARD8 op,
+				PicturePtr source,
+				PicturePtr mask,
+				PicturePtr dest,
+				glamor_pixmap_private *soruce_pixmap_priv,
+				glamor_pixmap_private *mask_pixmap_priv,
+				glamor_pixmap_private *dest_pixmap_priv,
+				RegionPtr region,
+				int x_source,
+				int y_source,
+				int x_mask,
+				int y_mask,
+				int x_dest,
+				int y_dest);
+
+void glamor_composite(CARD8 op,
+		      PicturePtr pSrc,
+		      PicturePtr pMask,
+		      PicturePtr pDst,
+		      INT16 xSrc,
+		      INT16 ySrc,
+		      INT16 xMask,
+		      INT16 yMask,
+		      INT16 xDst, INT16 yDst, CARD16 width, CARD16 height);
+
+void glamor_init_composite_shaders(ScreenPtr screen);
+void glamor_fini_composite_shaders(ScreenPtr screen);
+void glamor_composite_glyph_rects(CARD8 op,
+				  PicturePtr src, PicturePtr mask,
+				  PicturePtr dst, int nrect,
+				  glamor_composite_rect_t * rects);
+void glamor_composite_rects (CARD8         op,
+			     PicturePtr    pDst,
+			     xRenderColor  *color,
+			     int           nRect,
+			     xRectangle    *rects);
+void glamor_init_trapezoid_shader(ScreenPtr screen);
+void glamor_fini_trapezoid_shader(ScreenPtr screen);
+PicturePtr glamor_convert_gradient_picture(ScreenPtr screen,
+                                           PicturePtr source,
+                                           int x_source,
+                                           int y_source, int width, int height);
+
+Bool glamor_composite_choose_shader(CARD8 op,
+                                    PicturePtr source,
+                                    PicturePtr mask,
+                                    PicturePtr dest,
+			     	    glamor_pixmap_private *source_pixmap_priv,
+			     	    glamor_pixmap_private *mask_pixmap_priv,
+			     	    glamor_pixmap_private *dest_pixmap_priv,
+                                    struct shader_key *s_key,
+				    glamor_composite_shader **shader, 
+				    struct blendinfo *op_info,
+                                    PictFormatShort *psaved_source_format);
+
+void
+glamor_composite_set_shader_blend(glamor_pixmap_private *dest_priv,
+				  struct shader_key *key,
+				  glamor_composite_shader *shader,
+				  struct blendinfo *op_info);
+
+void glamor_setup_composite_vbo(ScreenPtr screen, int n_verts);
+void glamor_emit_composite_vert(ScreenPtr screen,
+                                const float *src_coords,
+                                const float *mask_coords,
+                                const float *dst_coords, int i);
+
+/* glamor_trapezoid.c */
+void glamor_trapezoids(CARD8 op,
+		       PicturePtr src, PicturePtr dst,
+		       PictFormatPtr mask_format, INT16 x_src, INT16 y_src,
+		       int ntrap, xTrapezoid * traps);
+
+/* glamor_tile.c */
+Bool glamor_tile(PixmapPtr pixmap, PixmapPtr tile,
+		 int x, int y, int width, int height,
+		 unsigned char alu, unsigned long planemask,
+		 int tile_x, int tile_y);
+void glamor_init_tile_shader(ScreenPtr screen);
+void glamor_fini_tile_shader(ScreenPtr screen);
+
+/* glamor_gradient.c */
+void glamor_init_gradient_shader(ScreenPtr screen);
+void glamor_fini_gradient_shader(ScreenPtr screen);
+PicturePtr glamor_generate_linear_gradient_picture(ScreenPtr screen,
+                                                   PicturePtr src_picture,
+                                                   int x_source, int y_source,
+                                                   int width, int height,
+                                                   PictFormatShort format);
+PicturePtr glamor_generate_radial_gradient_picture(ScreenPtr screen,
+                                                   PicturePtr src_picture,
+                                                   int x_source, int y_source,
+                                                   int width, int height,
+                                                   PictFormatShort format);
+
+/* glamor_triangles.c */
+void
+
+glamor_triangles(CARD8 op,
+		 PicturePtr pSrc,
+		 PicturePtr pDst,
+		 PictFormatPtr maskFormat,
+		 INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris);
+
+/* glamor_pixmap.c */
+
+void glamor_pixmap_init(ScreenPtr screen);
+void glamor_pixmap_fini(ScreenPtr screen);
+/** 
+ * Download a pixmap's texture to cpu memory. If success,
+ * One copy of current pixmap's texture will be put into
+ * the pixmap->devPrivate.ptr. Will use pbo to map to 
+ * the pointer if possible.
+ * The pixmap must be a gl texture pixmap. gl_fbo and
+ * gl_tex must be 1. Used by glamor_prepare_access.
+ *
+ */
+Bool glamor_download_pixmap_to_cpu(PixmapPtr pixmap,
+				   glamor_access_t access);
+
+void *
+glamor_download_sub_pixmap_to_cpu(PixmapPtr pixmap, int x, int y, int w, int h,
+				  int stride, void *bits, int pbo, glamor_access_t access);
+
+
+/**
+ * Restore a pixmap's data which is downloaded by 
+ * glamor_download_pixmap_to_cpu to its original 
+ * gl texture. Used by glamor_finish_access. 
+ *
+ * The pixmap must be
+ * in texture originally. In other word, the gl_fbo
+ * must be 1.
+ **/
+void glamor_restore_pixmap_to_texture(PixmapPtr pixmap);
+
+/**
+ * According to the flag,
+ * if the flag is GLAMOR_CREATE_FBO_NO_FBO then just ensure
+ * the fbo has a valid texture. Otherwise, it will ensure
+ * the fbo has valid texture and attach to a valid fb.
+ * If the fbo already has a valid glfbo then do nothing.
+ */
+Bool
+glamor_pixmap_ensure_fbo(PixmapPtr pixmap, GLenum format, int flag);
+
+/**
+ * Upload a pixmap to gl texture. Used by dynamic pixmap
+ * uploading feature. The pixmap must be a software pixmap.
+ * This function will change current FBO and current shaders.
+ */
+enum glamor_pixmap_status glamor_upload_pixmap_to_texture(PixmapPtr
+							  pixmap);
+
+Bool
+glamor_upload_sub_pixmap_to_texture(PixmapPtr pixmap, int x, int y, int w, int h,
+				    int stride, void *bits, int pbo);
+
+PixmapPtr
+glamor_get_sub_pixmap(PixmapPtr pixmap, int x, int y,
+		      int w, int h, glamor_access_t access);
+void
+glamor_put_sub_pixmap(PixmapPtr sub_pixmap, PixmapPtr pixmap, int x, int y,
+		      int w, int h, glamor_access_t access);
+
+glamor_pixmap_clipped_regions *
+glamor_compute_clipped_regions(glamor_pixmap_private *priv, RegionPtr region,
+			       int *clipped_nbox, int repeat_type,
+			       int reverse, int upsidedown);
+
+glamor_pixmap_clipped_regions *
+glamor_compute_clipped_regions_ext(glamor_pixmap_private *pixmap_priv,
+				   RegionPtr region,
+				   int *n_region,
+				   int inner_block_w, int inner_block_h,
+			           int reverse, int upsidedown);
+
+glamor_pixmap_clipped_regions *
+glamor_compute_transform_clipped_regions(glamor_pixmap_private *priv, struct pixman_transform *transform,
+					 RegionPtr region, int *n_region, int dx, int dy, int repeat_type,
+			                 int reverse, int upsidedown);
+
+Bool
+glamor_composite_largepixmap_region(CARD8 op,
+			  PicturePtr source,
+			  PicturePtr mask,
+			  PicturePtr dest,
+			  glamor_pixmap_private * source_pixmap_priv,
+			  glamor_pixmap_private * mask_pixmap_priv,
+			  glamor_pixmap_private * dest_pixmap_priv,
+			  RegionPtr region, Bool force_clip,
+			  INT16 x_source,
+			  INT16 y_source,
+			  INT16 x_mask,
+			  INT16 y_mask,
+			  INT16 x_dest, INT16 y_dest,
+			  CARD16 width, CARD16 height);
+
+Bool
+glamor_get_transform_block_size(struct pixman_transform *transform,
+			   int block_w, int block_h,
+			   int *transformed_block_w,
+			   int *transformed_block_h);
+
+void
+glamor_get_transform_extent_from_box(struct pixman_box32 *temp_box,
+		struct pixman_transform *transform);
+
+/**
+ * Upload a picture to gl texture. Similar to the
+ * glamor_upload_pixmap_to_texture. Used in rendering.
+ **/
+enum glamor_pixmap_status
+ glamor_upload_picture_to_texture(PicturePtr picture);
+
+/**
+ * Upload bits to a pixmap's texture. This function will
+ * convert the bits to the specified format/type format
+ * if the conversion is unavoidable.
+ **/
+Bool glamor_upload_bits_to_pixmap_texture(PixmapPtr pixmap, GLenum format, GLenum type,
+					  int no_alpha, int revert, int swap_rb, void *bits);
+
+/**
+ * Destroy all the resources allocated on the uploading
+ * phase, includs the tex and fbo.
+ **/
+void glamor_destroy_upload_pixmap(PixmapPtr pixmap);
+
+int glamor_create_picture(PicturePtr picture);
+
+Bool
+glamor_prepare_access_picture(PicturePtr picture, glamor_access_t access);
+
+void glamor_finish_access_picture(PicturePtr picture, glamor_access_t access);
+
+void glamor_destroy_picture(PicturePtr picture);
+
+/* fixup a fbo to the exact size as the pixmap. */
+Bool
+glamor_fixup_pixmap_priv(ScreenPtr screen, glamor_pixmap_private *pixmap_priv);
+
+void
+glamor_picture_format_fixup(PicturePtr picture,
+			    glamor_pixmap_private * pixmap_priv);
+
+void
+glamor_get_image(DrawablePtr pDrawable, int x, int y, int w, int h,
+		 unsigned int format, unsigned long planeMask, char *d);
+
+void
+glamor_add_traps(PicturePtr pPicture,
+		 INT16 x_off, 
+		 INT16 y_off, int ntrap, xTrap * traps);
+
+RegionPtr
+glamor_copy_plane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
+		  int srcx, int srcy, int w, int h, int dstx, int dsty,
+		  unsigned long bitPlane);
+
+void
+glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
+                    int x, int y, unsigned int nglyph,
+                    CharInfoPtr * ppci, pointer pglyphBase);
+
+void
+glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
+                    int x, int y, unsigned int nglyph,
+                    CharInfoPtr * ppci, pointer pglyphBase);
+
+void
+glamor_push_pixels(GCPtr pGC, PixmapPtr pBitmap,
+		   DrawablePtr pDrawable, int w, int h, int x, int y);
+
+void
+glamor_poly_point(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt,
+		  DDXPointPtr ppt);
+
+void
+glamor_poly_segment(DrawablePtr pDrawable, GCPtr pGC, int nseg,
+		    xSegment *pSeg);
+
+void
+glamor_poly_line(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt,
+		 DDXPointPtr ppt);
+
+void
+glamor_composite_rectangles(CARD8	 op,
+			 PicturePtr	 dst,
+			 xRenderColor	*color,
+			 int		 num_rects,
+			 xRectangle	*rects);
+
+#include"glamor_utils.h"
+
+/* Dynamic pixmap upload to texture if needed. 
+ * Sometimes, the target is a gl texture pixmap/picture,
+ * but the source or mask is in cpu memory. In that case,
+ * upload the source/mask to gl texture and then avoid 
+ * fallback the whole process to cpu. Most of the time,
+ * this will increase performance obviously. */
+
+#define GLAMOR_PIXMAP_DYNAMIC_UPLOAD
+#define GLAMOR_GRADIENT_SHADER
+#define GLAMOR_TRAPEZOID_SHADER
+#define GLAMOR_TEXTURED_LARGE_PIXMAP 1
+#define WALKAROUND_LARGE_TEXTURE_MAP
+#if 0
+#define MAX_FBO_SIZE 32 /* For test purpose only. */
+#endif
+//#define GLYPHS_NO_EDEGEMAP_OVERLAP_CHECK
+#define GLYPHS_EDEGE_OVERLAP_LOOSE_CHECK
+
+#endif				/* GLAMOR_PRIV_H */
diff --git a/extra/glamor-egl/glamor_utils.h b/extra/glamor-egl/glamor_utils.h
new file mode 100644
index 000000000..36beb49ed
--- /dev/null
+++ b/extra/glamor-egl/glamor_utils.h
@@ -0,0 +1,1836 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Zhigang Gong <zhigang.gong@linux.intel.com>
+ *
+ */
+
+#ifndef GLAMOR_PRIV_H
+#error This file can only be included by glamor_priv.h
+#endif
+
+#ifndef __GLAMOR_UTILS_H__
+#define __GLAMOR_UTILS_H__
+
+#define v_from_x_coord_x(_xscale_, _x_)          ( 2 * (_x_) * (_xscale_) - 1.0)
+#define v_from_x_coord_y(_yscale_, _y_)          (-2 * (_y_) * (_yscale_) + 1.0)
+#define v_from_x_coord_y_inverted(_yscale_, _y_) (2 * (_y_) * (_yscale_) - 1.0)
+#define t_from_x_coord_x(_xscale_, _x_)          ((_x_) * (_xscale_))
+#define t_from_x_coord_y(_yscale_, _y_)          (1.0 - (_y_) * (_yscale_))
+#define t_from_x_coord_y_inverted(_yscale_, _y_) ((_y_) * (_yscale_))
+
+#define pixmap_priv_get_dest_scale(_pixmap_priv_, _pxscale_, _pyscale_)  \
+  do {                                                                   \
+    int _w_,_h_;                                                         \
+    PIXMAP_PRIV_GET_ACTUAL_SIZE(_pixmap_priv_, _w_, _h_);                \
+    *(_pxscale_) = 1.0 / _w_;                                            \
+    *(_pyscale_) = 1.0 / _h_;                                            \
+   } while(0)
+
+#define pixmap_priv_get_scale(_pixmap_priv_, _pxscale_, _pyscale_)	\
+   do {									\
+    *(_pxscale_) = 1.0 / (_pixmap_priv_)->base.fbo->width;			\
+    *(_pyscale_) = 1.0 / (_pixmap_priv_)->base.fbo->height;			\
+  } while(0)
+
+#define GLAMOR_PIXMAP_FBO_NOT_EAXCT_SIZE(priv)			\
+   (priv->base.fbo->width != priv->base.pixmap->drawable.width 	\
+      || priv->base.fbo->height != priv->base.pixmap->drawable.height)	\
+
+#define PIXMAP_PRIV_GET_ACTUAL_SIZE(priv, w, h)			\
+  do {								\
+	if (unlikely(priv->type == GLAMOR_TEXTURE_LARGE)) {		\
+		w = priv->large.box.x2 - priv->large.box.x1;	\
+		h = priv->large.box.y2 - priv->large.box.y1;	\
+	} else {						\
+		w = priv->base.pixmap->drawable.width;		\
+		h = priv->base.pixmap->drawable.height;		\
+	}							\
+  } while(0)
+
+#define glamor_pixmap_fbo_fix_wh_ratio(wh, priv)  		\
+  do {								\
+	int actual_w, actual_h;					\
+	PIXMAP_PRIV_GET_ACTUAL_SIZE(priv, actual_w, actual_h);	\
+	wh[0] = (float)priv->base.fbo->width / actual_w;	\
+	wh[1] = (float)priv->base.fbo->height / actual_h;	\
+	wh[2] = 1.0 / priv->base.fbo->width;			\
+	wh[3] = 1.0 / priv->base.fbo->height;			\
+  } while(0)
+
+#define pixmap_priv_get_fbo_off(_priv_, _xoff_, _yoff_)		\
+   do {								\
+	if (unlikely(_priv_ && (_priv_)->type				\
+		== GLAMOR_TEXTURE_LARGE)) {			\
+		*(_xoff_) = - (_priv_)->large.box.x1;	\
+		*(_yoff_) = - (_priv_)->large.box.y1;	\
+	} else {						\
+		*(_xoff_) = 0;					\
+		*(_yoff_) = 0;					\
+	}							\
+   } while(0)
+
+#define xFixedToFloat(_val_) ((float)xFixedToInt(_val_)			\
+			      + ((float)xFixedFrac(_val_) / 65536.0))
+
+#define glamor_picture_get_matrixf(_picture_, _matrix_)			\
+  do {									\
+    int _i_;								\
+    if ((_picture_)->transform)						\
+      {									\
+	for(_i_ = 0; _i_ < 3; _i_++)					\
+	  {								\
+	    (_matrix_)[_i_ * 3 + 0] =					\
+	      xFixedToFloat((_picture_)->transform->matrix[_i_][0]);	\
+	    (_matrix_)[_i_ * 3 + 1] =					\
+	      xFixedToFloat((_picture_)->transform->matrix[_i_][1]);	\
+	    (_matrix_)[_i_ * 3 + 2] = \
+	      xFixedToFloat((_picture_)->transform->matrix[_i_][2]);	\
+	  }								\
+      }									\
+  }  while(0)
+
+#define fmod(x, w)		(x - w * floor((float)x/w))
+
+#define fmodulus(x, w, c)	do {c = fmod(x, w);		\
+				    c = c >= 0 ? c : c + w;}	\
+				while(0)
+/* @x: is current coord
+ * @x2: is the right/bottom edge
+ * @w: is current width or height
+ * @odd: is output value, 0 means we are in an even region, 1 means we are in a
+ * odd region.
+ * @c: is output value, equal to x mod w. */
+#define fodd_repeat_mod(x, x2, w, odd, c)	\
+  do {						\
+	float shift;				\
+	fmodulus((x), w, c); 			\
+	shift = fabs((x) - (c));		\
+	shift = floor(fabs(round(shift)) / w);	\
+	odd = (int)shift & 1;			\
+	if (odd && (((x2 % w) == 0) &&		\
+	    round(fabs(x)) == x2))		\
+		odd = 0;			\
+  } while(0)
+
+/* @txy: output value, is the corrected coords.
+ * @xy: input coords to be fixed up.
+ * @cd: xy mod wh, is a input value.
+ * @wh: current width or height.
+ * @bxy1,bxy2: current box edge's x1/x2 or y1/y2
+ *
+ * case 1:
+ *  ----------
+ *  |  *     |
+ *  |        |
+ *  ----------
+ *  tx = (c - x1) mod w
+ *
+ *  case 2:
+ *     ---------
+ *  *  |       |
+ *     |       |
+ *     ---------
+ *   tx = - (c - (x1 mod w))
+ *
+ *   case 3:
+ *
+ *   ----------
+ *   |        |  *
+ *   |        |
+ *   ----------
+ *   tx = ((x2 mod x) - c) + (x2 - x1)
+ **/
+#define __glamor_repeat_reflect_fixup(txy, xy,		\
+				cd, wh, bxy1, bxy2)	\
+  do {							\
+	cd = wh - cd;					\
+	if ( xy >= bxy1 && xy < bxy2) {			\
+		cd = cd - bxy1;				\
+		fmodulus(cd, wh, txy);			\
+	} else	if (xy < bxy1) {			\
+		float bxy1_mod;				\
+		fmodulus(bxy1, wh, bxy1_mod);		\
+		txy = -(cd - bxy1_mod);			\
+	}						\
+	else if (xy >= bxy2)	{			\
+		float bxy2_mod;				\
+		fmodulus(bxy2, wh, bxy2_mod);		\
+		if (bxy2_mod == 0)			\
+			bxy2_mod = wh;			\
+		txy = (bxy2_mod - cd) + bxy2 - bxy1;	\
+	} else {assert(0); txy = 0;}			\
+  } while(0)
+
+#define _glamor_repeat_reflect_fixup(txy, xy, cd, odd,	\
+				     wh, bxy1, bxy2)	\
+  do {							\
+	if (odd) {					\
+		__glamor_repeat_reflect_fixup(txy, xy, 	\
+			cd, wh, bxy1, bxy2);		\
+	} else						\
+		txy = xy - bxy1;			\
+  } while(0)
+
+#define _glamor_get_reflect_transform_coords(priv, repeat_type,	\
+					    tx1, ty1, 		\
+				            _x1_, _y1_)		\
+  do {								\
+	int odd_x, odd_y;					\
+	float c, d;						\
+	fodd_repeat_mod(_x1_,priv->box.x2,			\
+		    priv->base.pixmap->drawable.width,		\
+		    odd_x, c);					\
+	fodd_repeat_mod(_y1_,	priv->box.y2,			\
+		    priv->base.pixmap->drawable.height,		\
+		    odd_y, d);					\
+	DEBUGF("c %f d %f oddx %d oddy %d \n",			\
+		c, d, odd_x, odd_y);				\
+	DEBUGF("x2 %d x1 %d fbo->width %d \n", priv->box.x2,	\
+		priv->box.x1, priv->base.fbo->width);		\
+	DEBUGF("y2 %d y1 %d fbo->height %d \n", priv->box.y2, 	\
+		priv->box.y1, priv->base.fbo->height);		\
+	_glamor_repeat_reflect_fixup(tx1, _x1_, c, odd_x,	\
+		priv->base.pixmap->drawable.width,		\
+		priv->box.x1, priv->box.x2);			\
+	_glamor_repeat_reflect_fixup(ty1, _y1_, d, odd_y,	\
+		priv->base.pixmap->drawable.height,		\
+		priv->box.y1, priv->box.y2);			\
+   } while(0)
+
+#define _glamor_get_repeat_coords(priv, repeat_type, tx1,	\
+				  ty1, tx2, ty2,		\
+				  _x1_, _y1_, _x2_,		\
+				  _y2_, c, d, odd_x, odd_y)	\
+  do {								\
+	if (repeat_type == RepeatReflect) {			\
+		DEBUGF("x1 y1 %d %d\n",				\
+			_x1_, _y1_ );				\
+		DEBUGF("width %d box.x1 %d \n",			\
+		       (priv)->base.pixmap->drawable.width,	\
+		       priv->box.x1);				\
+		if (odd_x) {					\
+			c = (priv)->base.pixmap->drawable.width	\
+				- c;				\
+			tx1 = c - priv->box.x1;			\
+			tx2 = tx1 - ((_x2_) - (_x1_));		\
+		} else {					\
+			tx1 = c - priv->box.x1;			\
+			tx2 = tx1 + ((_x2_) - (_x1_));		\
+		}						\
+		if (odd_y){					\
+			d = (priv)->base.pixmap->drawable.height\
+			    - d;				\
+			ty1 = d - priv->box.y1;			\
+			ty2 = ty1 - ((_y2_) - (_y1_));		\
+		} else {					\
+			ty1 = d - priv->box.y1;			\
+			ty2 = ty1 + ((_y2_) - (_y1_));		\
+		}						\
+	} else { /* RepeatNormal*/				\
+		tx1 = (c - priv->box.x1);  			\
+		ty1 = (d - priv->box.y1);			\
+		tx2 = tx1 + ((_x2_) - (_x1_));			\
+		ty2 = ty1 + ((_y2_) - (_y1_));			\
+	}							\
+   } while(0)
+
+
+/* _x1_ ... _y2_ may has fractional. */
+#define glamor_get_repeat_transform_coords(priv, repeat_type, tx1,	\
+					   ty1, _x1_, _y1_)		\
+  do {									\
+	DEBUGF("width %d box.x1 %d x2 %d y1 %d y2 %d\n",		\
+		(priv)->base.pixmap->drawable.width,			\
+		priv->box.x1, priv->box.x2, priv->box.y1,		\
+		priv->box.y2);						\
+	DEBUGF("x1 %f y1 %f \n", _x1_, _y1_);				\
+	if (repeat_type != RepeatReflect) {				\
+		tx1 = _x1_ - priv->box.x1;				\
+		ty1 = _y1_ - priv->box.y1;				\
+	} else			\
+		_glamor_get_reflect_transform_coords(priv, repeat_type, \
+				  tx1, ty1, 				\
+				  _x1_, _y1_);				\
+	DEBUGF("tx1 %f ty1 %f \n", tx1, ty1);				\
+   } while(0)
+
+/* _x1_ ... _y2_ must be integer. */
+#define glamor_get_repeat_coords(priv, repeat_type, tx1,		\
+				 ty1, tx2, ty2, _x1_, _y1_, _x2_,	\
+				 _y2_) 					\
+  do {									\
+	int c, d;							\
+	int odd_x = 0, odd_y = 0;					\
+	DEBUGF("width %d box.x1 %d x2 %d y1 %d y2 %d\n",		\
+		(priv)->base.pixmap->drawable.width,			\
+		priv->box.x1, priv->box.x2,				\
+		priv->box.y1, priv->box.y2);				\
+	modulus((_x1_), (priv)->base.pixmap->drawable.width, c); 	\
+	modulus((_y1_), (priv)->base.pixmap->drawable.height, d);	\
+	DEBUGF("c %d d %d \n", c, d);					\
+	if (repeat_type == RepeatReflect) {				\
+		odd_x = abs((_x1_ - c)					\
+			/ (priv->base.pixmap->drawable.width)) & 1;	\
+		odd_y = abs((_y1_ - d)					\
+			/ (priv->base.pixmap->drawable.height)) & 1;	\
+	}								\
+	_glamor_get_repeat_coords(priv, repeat_type, tx1, ty1, tx2, ty2,\
+				  _x1_, _y1_, _x2_, _y2_, c, d,		\
+				  odd_x, odd_y);			\
+   } while(0)
+
+#define glamor_transform_point(matrix, tx, ty, x, y)			\
+  do {									\
+    int _i_;								\
+    float _result_[4];							\
+    for (_i_ = 0; _i_ < 3; _i_++) {					\
+      _result_[_i_] = (matrix)[_i_ * 3] * (x) + (matrix)[_i_ * 3 + 1] * (y)	\
+	+ (matrix)[_i_ * 3 + 2];					\
+    }									\
+    tx = _result_[0] / _result_[2];					\
+    ty = _result_[1] / _result_[2];					\
+  } while(0)
+
+#define _glamor_set_normalize_tpoint(xscale, yscale, _tx_, _ty_,	\
+				     texcoord, yInverted)		\
+  do {									\
+	(texcoord)[0] = t_from_x_coord_x(xscale, _tx_);			\
+	if (likely(yInverted))						\
+		(texcoord)[1] = t_from_x_coord_y_inverted(yscale, _ty_);\
+	else								\
+		(texcoord)[1] = t_from_x_coord_y(yscale, _ty_);		\
+        DEBUGF("normalized point tx %f ty %f \n", (texcoord)[0],	\
+		(texcoord)[1]);						\
+  } while(0)
+
+#define glamor_set_transformed_point(priv, matrix, xscale,		\
+				     yscale, texcoord,			\
+                                     x, y, 				\
+				     yInverted)				\
+  do {									\
+    float tx, ty;							\
+    int fbo_x_off, fbo_y_off;						\
+    pixmap_priv_get_fbo_off(priv, &fbo_x_off, &fbo_y_off);		\
+    glamor_transform_point(matrix, tx, ty, x, y);			\
+    DEBUGF("tx %f ty %f fbooff %d %d \n",				\
+	    tx, ty, fbo_x_off, fbo_y_off);				\
+									\
+    tx += fbo_x_off;							\
+    ty += fbo_y_off;							\
+    (texcoord)[0] = t_from_x_coord_x(xscale, tx);			\
+    if (likely(yInverted))							\
+      (texcoord)[1] = t_from_x_coord_y_inverted(yscale, ty);		\
+    else								\
+      (texcoord)[1] = t_from_x_coord_y(yscale, ty);			\
+    DEBUGF("normalized tx %f ty %f \n", (texcoord)[0], (texcoord)[1]);	\
+  } while(0)
+
+#define glamor_set_transformed_normalize_tri_tcoords(priv,		\
+						     matrix,		\
+						     xscale,		\
+						     yscale,		\
+						     vtx,		\
+						     yInverted,		\
+						     texcoords)		\
+    do {								\
+	glamor_set_transformed_point(priv, matrix, xscale, yscale,	\
+				     texcoords, (vtx)[0], (vtx)[1],	\
+				     yInverted);			\
+	glamor_set_transformed_point(priv, matrix, xscale, yscale,	\
+				     texcoords+2, (vtx)[2], (vtx)[3],	\
+				     yInverted);			\
+	glamor_set_transformed_point(priv, matrix, xscale, yscale,	\
+				     texcoords+4, (vtx)[4], (vtx)[5],	\
+				     yInverted);			\
+    } while (0)
+
+#define glamor_set_transformed_normalize_tcoords_ext( priv,		\
+						  matrix,		\
+						  xscale,		\
+						  yscale,		\
+                                                  tx1, ty1, tx2, ty2,   \
+                                                  yInverted, texcoords,	\
+						  stride)		\
+  do {									\
+    glamor_set_transformed_point(priv, matrix, xscale, yscale,		\
+				 texcoords, tx1, ty1,			\
+				 yInverted);				\
+    glamor_set_transformed_point(priv, matrix, xscale, yscale,		\
+				 texcoords + 1 * stride, tx2, ty1,	\
+				 yInverted);				\
+    glamor_set_transformed_point(priv, matrix, xscale, yscale,		\
+				 texcoords + 2 * stride, tx2, ty2,	\
+				 yInverted);				\
+    glamor_set_transformed_point(priv, matrix, xscale, yscale,		\
+				 texcoords + 3 * stride, tx1, ty2,	\
+				 yInverted);				\
+  } while (0)
+
+#define glamor_set_transformed_normalize_tcoords( priv,			\
+						  matrix,		\
+						  xscale,		\
+						  yscale,		\
+                                                  tx1, ty1, tx2, ty2,   \
+                                                  yInverted, texcoords)	\
+  do {									\
+	glamor_set_transformed_normalize_tcoords_ext( priv,		\
+						  matrix,		\
+						  xscale,		\
+						  yscale,		\
+                                                  tx1, ty1, tx2, ty2,   \
+                                                  yInverted, texcoords,	\
+						  2);			\
+  } while (0)
+
+
+
+#define glamor_set_normalize_tri_tcoords(xscale,		\
+					 yscale,		\
+					 vtx,			\
+					 yInverted,		\
+					 texcoords)		\
+    do {							\
+	_glamor_set_normalize_tpoint(xscale, yscale,		\
+				(vtx)[0], (vtx)[1],		\
+				texcoords,			\
+				yInverted);			\
+	_glamor_set_normalize_tpoint(xscale, yscale,		\
+				(vtx)[2], (vtx)[3],		\
+				texcoords+2,			\
+				yInverted);			\
+	_glamor_set_normalize_tpoint(xscale, yscale,		\
+				(vtx)[4], (vtx)[5],		\
+				texcoords+4,			\
+				yInverted);			\
+    } while (0)
+
+#define glamor_set_repeat_transformed_normalize_tcoords_ext( priv,	\
+							 repeat_type,	\
+							 matrix,	\
+							 xscale,	\
+							 yscale,	\
+							 _x1_, _y1_,	\
+							 _x2_, _y2_,   	\
+							 yInverted,	\
+							 texcoords,	\
+							 stride)	\
+  do {									\
+    if (likely(priv->type != GLAMOR_TEXTURE_LARGE)) {			\
+	glamor_set_transformed_normalize_tcoords_ext(priv, matrix, xscale,	\
+						 yscale, _x1_, _y1_,	\
+						 _x2_, _y2_, yInverted,	\
+						 texcoords, stride);	\
+    } else {								\
+    float tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4;			\
+    float ttx1, tty1, ttx2, tty2, ttx3, tty3, ttx4, tty4;		\
+    DEBUGF("original coords %d %d %d %d\n", _x1_, _y1_, _x2_, _y2_);	\
+    glamor_transform_point(matrix, tx1, ty1, _x1_, _y1_);		\
+    glamor_transform_point(matrix, tx2, ty2, _x2_, _y1_);		\
+    glamor_transform_point(matrix, tx3, ty3, _x2_, _y2_);		\
+    glamor_transform_point(matrix, tx4, ty4, _x1_, _y2_);		\
+    DEBUGF("transformed %f %f %f %f %f %f %f %f\n",			\
+	   tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4);			\
+    glamor_get_repeat_transform_coords((&priv->large), repeat_type, 	\
+				       ttx1, tty1, 			\
+				       tx1, ty1);			\
+    glamor_get_repeat_transform_coords((&priv->large), repeat_type, 	\
+				       ttx2, tty2, 			\
+				       tx2, ty2);			\
+    glamor_get_repeat_transform_coords((&priv->large), repeat_type, 	\
+				       ttx3, tty3, 			\
+				       tx3, ty3);			\
+    glamor_get_repeat_transform_coords((&priv->large), repeat_type, 	\
+				       ttx4, tty4, 			\
+				       tx4, ty4);			\
+    DEBUGF("repeat transformed %f %f %f %f %f %f %f %f\n", ttx1, tty1, 	\
+	    ttx2, tty2,	ttx3, tty3, ttx4, tty4);			\
+    _glamor_set_normalize_tpoint(xscale, yscale, ttx1, tty1,		\
+				 texcoords, yInverted);			\
+    _glamor_set_normalize_tpoint(xscale, yscale, ttx2, tty2,		\
+				 texcoords + 1 * stride, yInverted);	\
+    _glamor_set_normalize_tpoint(xscale, yscale, ttx3, tty3,		\
+				 texcoords + 2 * stride, yInverted);	\
+    _glamor_set_normalize_tpoint(xscale, yscale, ttx4, tty4,		\
+				 texcoords + 3 * stride, yInverted);	\
+   }									\
+  } while (0)
+
+
+#define glamor_set_repeat_transformed_normalize_tcoords( priv,		\
+							 repeat_type,	\
+							 matrix,	\
+							 xscale,	\
+							 yscale,	\
+							 _x1_, _y1_,	\
+							 _x2_, _y2_,   	\
+							 yInverted,	\
+							 texcoords)	\
+  do {									\
+	glamor_set_repeat_transformed_normalize_tcoords_ext( priv,	\
+							 repeat_type,	\
+							 matrix,	\
+							 xscale,	\
+							 yscale,	\
+							 _x1_, _y1_,	\
+							 _x2_, _y2_,   	\
+							 yInverted,	\
+							 texcoords,	\
+							 2);	\
+  } while (0)
+
+#define _glamor_set_normalize_tcoords(xscale, yscale, tx1,		\
+				      ty1, tx2, ty2,			\
+				      yInverted, vertices, stride)	\
+  do {									\
+    /* vertices may be write-only, so we use following			\
+     * temporary variable. */ 						\
+    float _t0_, _t1_, _t2_, _t5_;					\
+    (vertices)[0] = _t0_ = t_from_x_coord_x(xscale, tx1);		\
+    (vertices)[1 * stride] = _t2_ = t_from_x_coord_x(xscale, tx2);	\
+    (vertices)[2 * stride] = _t2_;					\
+    (vertices)[3 * stride] = _t0_;					\
+    if (likely(yInverted)) {							\
+      (vertices)[1] = _t1_ = t_from_x_coord_y_inverted(yscale, ty1);	\
+      (vertices)[2 * stride + 1] = _t5_ = t_from_x_coord_y_inverted(yscale, ty2);\
+    }									\
+    else {								\
+      (vertices)[1] = _t1_ = t_from_x_coord_y(yscale, ty1);		\
+      (vertices)[2 * stride + 1] = _t5_ = t_from_x_coord_y(yscale, ty2);\
+    }									\
+    (vertices)[1 * stride + 1] = _t1_;					\
+    (vertices)[3 * stride + 1] = _t5_;					\
+  } while(0)
+
+#define glamor_set_normalize_tcoords_ext(priv, xscale, yscale,		\
+				     x1, y1, x2, y2,			\
+                                     yInverted, vertices, stride)	\
+  do {									\
+     if (unlikely(priv->type == GLAMOR_TEXTURE_LARGE)) {				\
+	float tx1, tx2, ty1, ty2;					\
+	int fbo_x_off, fbo_y_off;					\
+	pixmap_priv_get_fbo_off(priv, &fbo_x_off, &fbo_y_off);		\
+	tx1 = x1 + fbo_x_off; 						\
+	tx2 = x2 + fbo_x_off;						\
+	ty1 = y1 + fbo_y_off;						\
+	ty2 = y2 + fbo_y_off;						\
+	_glamor_set_normalize_tcoords(xscale, yscale, tx1, ty1,		\
+				   tx2, ty2, yInverted, vertices,	\
+				   stride);				\
+     } else								\
+	_glamor_set_normalize_tcoords(xscale, yscale, x1, y1,		\
+				   x2, y2, yInverted, vertices, stride);\
+ } while(0)
+
+
+#define glamor_set_normalize_tcoords(priv, xscale, yscale,		\
+				     x1, y1, x2, y2,			\
+                                     yInverted, vertices)		\
+  do {									\
+	glamor_set_normalize_tcoords_ext(priv, xscale, yscale,		\
+				     x1, y1, x2, y2,			\
+                                     yInverted, vertices, 2);		\
+ } while(0)
+
+#define glamor_set_repeat_normalize_tcoords_ext(priv, repeat_type,	\
+					    xscale, yscale,		\
+					    _x1_, _y1_, _x2_, _y2_,	\
+	                                    yInverted, vertices, stride)\
+  do {									\
+     if (unlikely(priv->type == GLAMOR_TEXTURE_LARGE)) {				\
+	float tx1, tx2, ty1, ty2;					\
+	if (repeat_type == RepeatPad) {					\
+		tx1 = _x1_ - priv->large.box.x1;			\
+		ty1 = _y1_ - priv->large.box.y1;			\
+		tx2 = tx1 + ((_x2_) - (_x1_));				\
+		ty2 = ty1 + ((_y2_) - (_y1_));				\
+	} else {							\
+	glamor_get_repeat_coords((&priv->large), repeat_type,		\
+				 tx1, ty1, tx2, ty2,			\
+				 _x1_, _y1_, _x2_, _y2_);		\
+	}								\
+	_glamor_set_normalize_tcoords(xscale, yscale, tx1, ty1,		\
+				   tx2, ty2, yInverted, vertices,	\
+				   stride);				\
+     } else								\
+	_glamor_set_normalize_tcoords(xscale, yscale, _x1_, _y1_,	\
+				   _x2_, _y2_, yInverted, vertices,	\
+				   stride);				\
+ } while(0)
+
+
+#define glamor_set_repeat_normalize_tcoords(priv, repeat_type,		\
+					    xscale, yscale,		\
+					    _x1_, _y1_, _x2_, _y2_,	\
+	                                    yInverted, vertices)	\
+  do {									\
+	glamor_set_repeat_normalize_tcoords_ext(priv, repeat_type,	\
+					    xscale, yscale,		\
+					    _x1_, _y1_, _x2_, _y2_,	\
+	                                    yInverted, vertices, 2);	\
+ } while(0)
+
+#define glamor_set_normalize_tcoords_tri_stripe(xscale, yscale,		\
+						x1, y1, x2, y2,		\
+						yInverted, vertices)	\
+    do {								\
+	(vertices)[0] = t_from_x_coord_x(xscale, x1);			\
+	(vertices)[2] = t_from_x_coord_x(xscale, x2);			\
+	(vertices)[6] = (vertices)[2];					\
+	(vertices)[4] = (vertices)[0];					\
+	if (likely(yInverted)) {						\
+	    (vertices)[1] = t_from_x_coord_y_inverted(yscale, y1);	\
+	    (vertices)[7] = t_from_x_coord_y_inverted(yscale, y2);	\
+	}								\
+	else {								\
+	    (vertices)[1] = t_from_x_coord_y(yscale, y1);		\
+	    (vertices)[7] = t_from_x_coord_y(yscale, y2);		\
+	}								\
+	(vertices)[3] = (vertices)[1];					\
+	(vertices)[5] = (vertices)[7];					\
+    } while(0)
+
+#define glamor_set_tcoords(width, height, x1, y1, x2, y2,	\
+			   yInverted, vertices)			\
+    do {							\
+	(vertices)[0] = (x1);					\
+	(vertices)[2] = (x2);					\
+	(vertices)[4] = (vertices)[2];				\
+	(vertices)[6] = (vertices)[0];				\
+	if (likely(yInverted)) {					\
+	    (vertices)[1] = (y1);				\
+	    (vertices)[5] = (y2);				\
+	}							\
+	else {							\
+	    (vertices)[1] = height - (y2);			\
+	    (vertices)[5] = height - (y1);			\
+	}							\
+	(vertices)[3] = (vertices)[1];				\
+	(vertices)[7] = (vertices)[5];				\
+    } while(0)
+
+#define glamor_set_tcoords_ext(width, height, x1, y1, x2, y2,	\
+			       yInverted, vertices, stride)	\
+    do {							\
+	(vertices)[0] = (x1);					\
+	(vertices)[1*stride] = (x2);				\
+	(vertices)[2*stride] = (vertices)[1*stride];		\
+	(vertices)[3*stride] = (vertices)[0];			\
+	if (likely(yInverted)) {				\
+	    (vertices)[1] = (y1);				\
+	    (vertices)[2*stride + 1] = (y2);			\
+	}							\
+	else {							\
+	    (vertices)[1] = height - (y2);			\
+	    (vertices)[2*stride + 1] = height - (y1);		\
+	}							\
+	(vertices)[1*stride + 1] = (vertices)[1];		\
+	(vertices)[3*stride + 1] = (vertices)[2*stride + 1];	\
+    } while(0)
+
+#define glamor_set_normalize_one_vcoord(xscale, yscale, x, y,		\
+					yInverted, vertices)		\
+    do {								\
+	(vertices)[0] = v_from_x_coord_x(xscale, x);			\
+	if (likely(yInverted)) {						\
+	    (vertices)[1] = v_from_x_coord_y_inverted(yscale, y);	\
+	} else {							\
+	    (vertices)[1] = v_from_x_coord_y(yscale, y);		\
+	}								\
+    } while(0)
+
+#define glamor_set_normalize_tri_vcoords(xscale, yscale, vtx,		\
+					 yInverted, vertices)		\
+    do {								\
+	glamor_set_normalize_one_vcoord(xscale, yscale,			\
+					(vtx)[0], (vtx)[1],		\
+					yInverted, vertices);		\
+	glamor_set_normalize_one_vcoord(xscale, yscale,			\
+					(vtx)[2], (vtx)[3],		\
+					yInverted, vertices+2);		\
+	glamor_set_normalize_one_vcoord(xscale, yscale,			\
+					(vtx)[4], (vtx)[5],		\
+					yInverted, vertices+4);		\
+    } while(0)
+
+#define glamor_set_tcoords_tri_strip(width, height, x1, y1, x2, y2,	\
+				     yInverted, vertices)		\
+    do {								\
+	(vertices)[0] = (x1);						\
+	(vertices)[2] = (x2);						\
+	(vertices)[6] = (vertices)[2];					\
+	(vertices)[4] = (vertices)[0];					\
+	if (likely(yInverted)) {						\
+	    (vertices)[1] = (y1);					\
+	    (vertices)[7] = (y2);					\
+	}								\
+	else {								\
+	    (vertices)[1] = height - (y2);				\
+	    (vertices)[7] = height - (y1);				\
+	}								\
+	(vertices)[3] = (vertices)[1];					\
+	(vertices)[5] = (vertices)[7];					\
+    } while(0)
+
+#define glamor_set_normalize_vcoords_ext(priv, xscale, yscale,		\
+				     x1, y1, x2, y2,			\
+                                     yInverted, vertices, stride)	\
+  do {									\
+    int fbo_x_off, fbo_y_off;						\
+    /* vertices may be write-only, so we use following			\
+     * temporary variable. */						\
+    float _t0_, _t1_, _t2_, _t5_;					\
+    pixmap_priv_get_fbo_off(priv, &fbo_x_off, &fbo_y_off);		\
+    (vertices)[0] = _t0_ = v_from_x_coord_x(xscale, x1 + fbo_x_off);	\
+    (vertices)[1 * stride] = _t2_ = v_from_x_coord_x(xscale,		\
+					x2 + fbo_x_off);		\
+    (vertices)[2 * stride] = _t2_;					\
+    (vertices)[3 * stride] = _t0_;					\
+    if (likely(yInverted)) {							\
+      (vertices)[1] = _t1_ = v_from_x_coord_y_inverted(yscale,		\
+				y1 + fbo_y_off);			\
+      (vertices)[2 * stride + 1] = _t5_ =				\
+			v_from_x_coord_y_inverted(yscale,		\
+					y2 + fbo_y_off);		\
+    }									\
+    else {								\
+      (vertices)[1] = _t1_ = v_from_x_coord_y(yscale, y1 + fbo_y_off);	\
+      (vertices)[2 * stride + 1] = _t5_ = v_from_x_coord_y(yscale,	\
+					y2 + fbo_y_off);		\
+    }									\
+    (vertices)[1 * stride + 1] = _t1_;					\
+    (vertices)[3 * stride + 1] = _t5_;					\
+  } while(0)
+
+
+#define glamor_set_normalize_vcoords(priv, xscale, yscale,		\
+				     x1, y1, x2, y2,			\
+                                     yInverted, vertices)		\
+  do {									\
+	glamor_set_normalize_vcoords_ext(priv, xscale, yscale,		\
+				     x1, y1, x2, y2,			\
+                                     yInverted, vertices, 2);		\
+  } while(0)
+
+#define glamor_set_const_ext(params, nparam, vertices, nverts, stride)	\
+    do {								\
+	int _i_ = 0, _j_ = 0;						\
+	for(; _i_ < nverts; _i_++) {					\
+	    for(_j_ = 0; _j_ < nparam; _j_++) {				\
+		vertices[stride*_i_ + _j_] = params[_j_];		\
+	    }								\
+	}								\
+    } while(0)
+
+#define glamor_set_normalize_vcoords_tri_strip(xscale, yscale,		\
+					       x1, y1, x2, y2,		\
+					       yInverted, vertices)	\
+    do {								\
+	(vertices)[0] = v_from_x_coord_x(xscale, x1);			\
+	(vertices)[2] = v_from_x_coord_x(xscale, x2);			\
+	(vertices)[6] = (vertices)[2];					\
+	(vertices)[4] = (vertices)[0];					\
+	if (likely(yInverted)) {						\
+	    (vertices)[1] = v_from_x_coord_y_inverted(yscale, y1);	\
+	    (vertices)[7] = v_from_x_coord_y_inverted(yscale, y2);	\
+	}								\
+	else {								\
+	    (vertices)[1] = v_from_x_coord_y(yscale, y1);		\
+	    (vertices)[7] = v_from_x_coord_y(yscale, y2);		\
+	}								\
+	(vertices)[3] = (vertices)[1];					\
+	(vertices)[5] = (vertices)[7];					\
+    } while(0)
+
+#define glamor_set_normalize_pt(xscale, yscale, x, y,		\
+                                yInverted, pt)			\
+    do {							\
+        (pt)[0] = t_from_x_coord_x(xscale, x);			\
+        if (likely(yInverted)) {					\
+            (pt)[1] = t_from_x_coord_y_inverted(yscale, y);	\
+        } else {						\
+            (pt)[1] = t_from_x_coord_y(yscale, y);		\
+        }							\
+    } while(0)
+
+#define glamor_set_circle_centre(width, height, x, y,	\
+				 yInverted, c)		\
+    do {						\
+        (c)[0] = (float)x;				\
+        if (likely(yInverted)) {				\
+            (c)[1] = (float)y;				\
+        } else {					\
+            (c)[1] = (float)height - (float)y;		\
+        }						\
+    } while(0)
+
+inline static void
+glamor_calculate_boxes_bound(BoxPtr bound, BoxPtr boxes, int nbox)
+{
+	int x_min, y_min;
+	int x_max, y_max;
+	int i;
+	x_min = y_min = MAXSHORT;
+	x_max = y_max = MINSHORT;
+	for (i = 0; i < nbox; i++) {
+		if (x_min > boxes[i].x1)
+			x_min = boxes[i].x1;
+		if (y_min > boxes[i].y1)
+			y_min = boxes[i].y1;
+
+		if (x_max < boxes[i].x2)
+			x_max = boxes[i].x2;
+		if (y_max < boxes[i].y2)
+			y_max = boxes[i].y2;
+	}
+	bound->x1 = x_min;
+	bound->y1 = y_min;
+	bound->x2 = x_max;
+	bound->y2 = y_max;
+}
+
+inline static void
+glamor_translate_boxes(BoxPtr boxes, int nbox, int dx, int dy)
+{
+	int i;
+	for (i = 0; i < nbox; i++) {
+		boxes[i].x1 += dx;
+		boxes[i].y1 += dy;
+		boxes[i].x2 += dx;
+		boxes[i].y2 += dy;
+	}
+}
+
+static inline Bool
+region_is_empty(pixman_region16_t *region)
+{
+	return region->data && region->data->numRects == 0;
+}
+
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
+#endif
+
+#define ALIGN(i,m)	(((i) + (m) - 1) & ~((m) - 1))
+#define MIN(a,b)	((a) < (b) ? (a) : (b))
+#define MAX(a,b)	((a) > (b) ? (a) : (b))
+
+#define glamor_check_fbo_size(_glamor_,_w_, _h_)    ((_w_) > 0 && (_h_) > 0 \
+                                                    && (_w_) <= _glamor_->max_fbo_size  \
+                                                    && (_h_) <= _glamor_->max_fbo_size)
+
+/* For 1bpp pixmap, we don't store it as texture. */
+#define glamor_check_pixmap_fbo_depth(_depth_) (			\
+						_depth_ == 8		\
+						|| _depth_ == 15	\
+						|| _depth_ == 16	\
+						|| _depth_ == 24	\
+						|| _depth_ == 30	\
+						|| _depth_ == 32)
+
+#define GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv) (pixmap_priv && pixmap_priv->base.is_picture == 1)
+#define GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv)    (pixmap_priv && pixmap_priv->base.gl_fbo == GLAMOR_FBO_NORMAL)
+#define GLAMOR_PIXMAP_PRIV_HAS_FBO_DOWNLOADED(pixmap_priv)    (pixmap_priv && (pixmap_priv->base.gl_fbo == GLAMOR_FBO_DOWNLOADED))
+
+/**
+ * Borrow from uxa.
+ */
+static inline CARD32
+format_for_depth(int depth)
+{
+	switch (depth) {
+	case 1:
+		return PICT_a1;
+	case 4:
+		return PICT_a4;
+	case 8:
+		return PICT_a8;
+	case 15:
+		return PICT_x1r5g5b5;
+	case 16:
+		return PICT_r5g6b5;
+	default:
+	case 24:
+		return PICT_x8r8g8b8;
+#if XORG_VERSION_CURRENT >= 10699900
+	case 30:
+		return PICT_x2r10g10b10;
+#endif
+	case 32:
+		return PICT_a8r8g8b8;
+	}
+}
+
+static inline void
+gl_iformat_for_depth(int depth, GLenum * format)
+{
+	switch (depth) {
+#ifndef GLAMOR_GLES2
+	case 1:
+	case 8:
+		*format = GL_ALPHA;
+		break;
+#endif
+	default:
+		*format = GL_RGBA;
+		break;
+       }
+}
+
+static inline CARD32
+format_for_pixmap(PixmapPtr pixmap)
+{
+	glamor_pixmap_private *pixmap_priv;
+	PictFormatShort pict_format;
+
+	pixmap_priv = glamor_get_pixmap_private(pixmap);
+	if (GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv))
+		pict_format = pixmap_priv->base.picture->format;
+	else
+		pict_format = format_for_depth(pixmap->drawable.depth);
+
+	return pict_format;
+}
+
+#define REVERT_NONE       		0
+#define REVERT_NORMAL     		1
+#define REVERT_DOWNLOADING_A1		2
+#define REVERT_UPLOADING_A1		3
+#define REVERT_DOWNLOADING_2_10_10_10 	4
+#define REVERT_UPLOADING_2_10_10_10 	5
+#define REVERT_DOWNLOADING_1_5_5_5  	7
+#define REVERT_UPLOADING_1_5_5_5    	8
+#define REVERT_DOWNLOADING_10_10_10_2 	9
+#define REVERT_UPLOADING_10_10_10_2 	10
+
+#define SWAP_NONE_DOWNLOADING  	0
+#define SWAP_DOWNLOADING  	1
+#define SWAP_UPLOADING	  	2
+#define SWAP_NONE_UPLOADING	3
+
+/*
+ * Map picture's format to the correct gl texture format and type.
+ * no_alpha is used to indicate whehter we need to wire alpha to 1.
+ *
+ * Although opengl support A1/GL_BITMAP, we still don't use it
+ * here, it seems that mesa has bugs when uploading a A1 bitmap.
+ *
+ * Return 0 if find a matched texture type. Otherwise return -1.
+ **/
+#ifndef GLAMOR_GLES2
+static inline int
+glamor_get_tex_format_type_from_pictformat(PictFormatShort format,
+					   GLenum * tex_format,
+					   GLenum * tex_type,
+					   int *no_alpha,
+					   int *revert,
+					   int *swap_rb,
+					   int is_upload)
+
+{
+	*no_alpha = 0;
+	*revert = REVERT_NONE;
+	*swap_rb = is_upload ? SWAP_NONE_UPLOADING : SWAP_NONE_DOWNLOADING;
+	switch (format) {
+	case PICT_a1:
+		*tex_format = GL_ALPHA;
+		*tex_type = GL_UNSIGNED_BYTE;
+		*revert = is_upload ? REVERT_UPLOADING_A1 : REVERT_DOWNLOADING_A1;
+		break;
+	case PICT_b8g8r8x8:
+		*no_alpha = 1;
+	case PICT_b8g8r8a8:
+		*tex_format = GL_BGRA;
+		*tex_type = GL_UNSIGNED_INT_8_8_8_8;
+		break;
+
+	case PICT_x8r8g8b8:
+		*no_alpha = 1;
+	case PICT_a8r8g8b8:
+		*tex_format = GL_BGRA;
+		*tex_type = GL_UNSIGNED_INT_8_8_8_8_REV;
+		break;
+	case PICT_x8b8g8r8:
+		*no_alpha = 1;
+	case PICT_a8b8g8r8:
+		*tex_format = GL_RGBA;
+		*tex_type = GL_UNSIGNED_INT_8_8_8_8_REV;
+		break;
+	case PICT_x2r10g10b10:
+		*no_alpha = 1;
+	case PICT_a2r10g10b10:
+		*tex_format = GL_BGRA;
+		*tex_type = GL_UNSIGNED_INT_2_10_10_10_REV;
+		break;
+	case PICT_x2b10g10r10:
+		*no_alpha = 1;
+	case PICT_a2b10g10r10:
+		*tex_format = GL_RGBA;
+		*tex_type = GL_UNSIGNED_INT_2_10_10_10_REV;
+		break;
+
+	case PICT_r5g6b5:
+		*tex_format = GL_RGB;
+		*tex_type = GL_UNSIGNED_SHORT_5_6_5;
+		break;
+	case PICT_b5g6r5:
+		*tex_format = GL_RGB;
+		*tex_type = GL_UNSIGNED_SHORT_5_6_5_REV;
+		break;
+	case PICT_x1b5g5r5:
+		*no_alpha = 1;
+	case PICT_a1b5g5r5:
+		*tex_format = GL_RGBA;
+		*tex_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
+		break;
+
+	case PICT_x1r5g5b5:
+		*no_alpha = 1;
+	case PICT_a1r5g5b5:
+		*tex_format = GL_BGRA;
+		*tex_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
+		break;
+	case PICT_a8:
+		*tex_format = GL_ALPHA;
+		*tex_type = GL_UNSIGNED_BYTE;
+		break;
+	case PICT_x4r4g4b4:
+		*no_alpha = 1;
+	case PICT_a4r4g4b4:
+		*tex_format = GL_BGRA;
+		*tex_type = GL_UNSIGNED_SHORT_4_4_4_4_REV;
+		break;
+
+	case PICT_x4b4g4r4:
+		*no_alpha = 1;
+	case PICT_a4b4g4r4:
+		*tex_format = GL_RGBA;
+		*tex_type = GL_UNSIGNED_SHORT_4_4_4_4_REV;
+		break;
+
+	default:
+		LogMessageVerb(X_INFO, 0,
+			       "fail to get matched format for %x \n",
+			       format);
+		return -1;
+	}
+	return 0;
+}
+
+/* Currently, we use RGBA to represent all formats. */
+inline static int cache_format(GLenum format)
+{
+	switch (format) {
+	case GL_ALPHA:
+		return 1;
+	case GL_RGBA:
+		return 0;
+	default:
+		return -1;
+	}
+}
+
+#else
+#define IS_LITTLE_ENDIAN  (IMAGE_BYTE_ORDER == LSBFirst)
+
+static inline int
+glamor_get_tex_format_type_from_pictformat(PictFormatShort format,
+					   GLenum * tex_format,
+					   GLenum * tex_type,
+					   int *no_alpha,
+					   int *revert,
+					   int *swap_rb,
+					   int is_upload)
+{
+	int need_swap_rb = 0;
+
+	*no_alpha = 0;
+	*revert = IS_LITTLE_ENDIAN ? REVERT_NONE : REVERT_NORMAL;
+
+	switch (format) {
+	case PICT_b8g8r8x8:
+		*no_alpha = 1;
+	case PICT_b8g8r8a8:
+		*tex_format = GL_RGBA;
+		*tex_type = GL_UNSIGNED_BYTE;
+		need_swap_rb = 1;
+		*revert = IS_LITTLE_ENDIAN ? REVERT_NORMAL : REVERT_NONE;
+		break;
+
+	case PICT_x8r8g8b8:
+		*no_alpha = 1;
+	case PICT_a8r8g8b8:
+		*tex_format = GL_RGBA;
+		*tex_type = GL_UNSIGNED_BYTE;
+		need_swap_rb = 1;
+		break;
+
+	case PICT_x8b8g8r8:
+		*no_alpha = 1;
+	case PICT_a8b8g8r8:
+		*tex_format = GL_RGBA;
+		*tex_type = GL_UNSIGNED_BYTE;
+		break;
+
+	case PICT_x2r10g10b10:
+		*no_alpha = 1;
+	case PICT_a2r10g10b10:
+		*tex_format = GL_RGBA;
+		/* glReadPixmap doesn't support GL_UNSIGNED_INT_10_10_10_2.
+		 * we have to use GL_UNSIGNED_BYTE and do the conversion in
+		 * shader latter.*/
+		*tex_type = GL_UNSIGNED_BYTE;
+		if (is_upload == 1) {
+			if (!IS_LITTLE_ENDIAN)
+				*revert = REVERT_UPLOADING_10_10_10_2;
+			else
+				*revert = REVERT_UPLOADING_2_10_10_10;
+		}
+		else {
+			if (!IS_LITTLE_ENDIAN) {
+				*revert = REVERT_DOWNLOADING_10_10_10_2;
+			}
+			else {
+				*revert = REVERT_DOWNLOADING_2_10_10_10;
+			}
+		}
+		need_swap_rb = 1;
+
+		break;
+
+	case PICT_x2b10g10r10:
+		*no_alpha = 1;
+	case PICT_a2b10g10r10:
+		*tex_format = GL_RGBA;
+		*tex_type = GL_UNSIGNED_BYTE;
+		if (is_upload == 1) {
+			if (!IS_LITTLE_ENDIAN)
+				*revert = REVERT_UPLOADING_10_10_10_2;
+			else
+				*revert = REVERT_UPLOADING_2_10_10_10;
+		}
+		else {
+			if (!IS_LITTLE_ENDIAN) {
+				*revert = REVERT_DOWNLOADING_10_10_10_2;
+			}
+			else {
+				*revert = REVERT_DOWNLOADING_2_10_10_10;
+			}
+		}
+		break;
+
+	case PICT_r5g6b5:
+		*tex_format = GL_RGB;
+		*tex_type = GL_UNSIGNED_SHORT_5_6_5;
+		*revert = IS_LITTLE_ENDIAN ? REVERT_NONE : REVERT_NORMAL;
+
+		break;
+
+	case PICT_b5g6r5:
+		*tex_format = GL_RGB;
+		*tex_type = GL_UNSIGNED_SHORT_5_6_5;
+		need_swap_rb = IS_LITTLE_ENDIAN ? 1 : 0;;
+		break;
+
+	case PICT_x1b5g5r5:
+		*no_alpha = 1;
+	case PICT_a1b5g5r5:
+		*tex_format = GL_RGBA;
+		*tex_type = GL_UNSIGNED_SHORT_5_5_5_1;
+		if (IS_LITTLE_ENDIAN) {
+			*revert = is_upload ? REVERT_UPLOADING_1_5_5_5 : REVERT_DOWNLOADING_1_5_5_5;
+		} else
+			*revert = REVERT_NONE;
+		break;
+
+	case PICT_x1r5g5b5:
+		*no_alpha = 1;
+	case PICT_a1r5g5b5:
+		*tex_format = GL_RGBA;
+		*tex_type = GL_UNSIGNED_SHORT_5_5_5_1;
+		if (IS_LITTLE_ENDIAN) {
+			*revert = is_upload ? REVERT_UPLOADING_1_5_5_5 : REVERT_DOWNLOADING_1_5_5_5;
+		} else
+			*revert = REVERT_NONE;
+		need_swap_rb = 1;
+		break;
+
+	case PICT_a1:
+		*tex_format = GL_ALPHA;
+		*tex_type = GL_UNSIGNED_BYTE;
+		*revert = is_upload ? REVERT_UPLOADING_A1 : REVERT_DOWNLOADING_A1;
+		break;
+
+	case PICT_a8:
+		*tex_format = GL_ALPHA;
+		*tex_type = GL_UNSIGNED_BYTE;
+		*revert = REVERT_NONE;
+		break;
+
+	case PICT_x4r4g4b4:
+		*no_alpha = 1;
+	case PICT_a4r4g4b4:
+		*tex_format = GL_RGBA;
+		*tex_type = GL_UNSIGNED_SHORT_4_4_4_4;
+		*revert = IS_LITTLE_ENDIAN ? REVERT_NORMAL : REVERT_NONE;
+		need_swap_rb = 1;
+		break;
+
+	case PICT_x4b4g4r4:
+		*no_alpha = 1;
+	case PICT_a4b4g4r4:
+		*tex_format = GL_RGBA;
+		*tex_type = GL_UNSIGNED_SHORT_4_4_4_4;
+		*revert = IS_LITTLE_ENDIAN ? REVERT_NORMAL : REVERT_NONE;
+		break;
+
+	default:
+		LogMessageVerb(X_INFO, 0,
+			       "fail to get matched format for %x \n",
+			       format);
+		return -1;
+	}
+
+	if (need_swap_rb)
+		*swap_rb = is_upload ? SWAP_UPLOADING : SWAP_DOWNLOADING;
+	else
+		*swap_rb = is_upload ? SWAP_NONE_UPLOADING : SWAP_NONE_DOWNLOADING;
+	return 0;
+}
+
+inline static int cache_format(GLenum format)
+{
+	switch (format) {
+	case GL_ALPHA:
+		return 2;
+	case GL_RGB:
+		return 1;
+	case GL_RGBA:
+		return 0;
+	default:
+		return -1;
+	}
+}
+
+#endif
+
+
+static inline int
+glamor_get_tex_format_type_from_pixmap(PixmapPtr pixmap,
+				       GLenum * format,
+				       GLenum * type,
+				       int *no_alpha,
+				       int *revert,
+				       int *swap_rb,
+				       int is_upload)
+{
+	glamor_pixmap_private *pixmap_priv;
+	PictFormatShort pict_format;
+
+	pixmap_priv = glamor_get_pixmap_private(pixmap);
+	if (GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv))
+		pict_format = pixmap_priv->base.picture->format;
+	else
+		pict_format = format_for_depth(pixmap->drawable.depth);
+
+	return glamor_get_tex_format_type_from_pictformat(pict_format,
+							  format, type,
+							  no_alpha,
+							  revert,
+							  swap_rb,
+							  is_upload);
+}
+
+
+/* borrowed from uxa */
+static inline Bool
+glamor_get_rgba_from_pixel(CARD32 pixel,
+			   float *red,
+			   float *green,
+			   float *blue, float *alpha, CARD32 format)
+{
+	int rbits, bbits, gbits, abits;
+	int rshift, bshift, gshift, ashift;
+
+	rbits = PICT_FORMAT_R(format);
+	gbits = PICT_FORMAT_G(format);
+	bbits = PICT_FORMAT_B(format);
+	abits = PICT_FORMAT_A(format);
+
+	if (PICT_FORMAT_TYPE(format) == PICT_TYPE_A) {
+		rshift = gshift = bshift = ashift = 0;
+	} else if (PICT_FORMAT_TYPE(format) == PICT_TYPE_ARGB) {
+		bshift = 0;
+		gshift = bbits;
+		rshift = gshift + gbits;
+		ashift = rshift + rbits;
+	} else if (PICT_FORMAT_TYPE(format) == PICT_TYPE_ABGR) {
+		rshift = 0;
+		gshift = rbits;
+		bshift = gshift + gbits;
+		ashift = bshift + bbits;
+#if XORG_VERSION_CURRENT >= 10699900
+	} else if (PICT_FORMAT_TYPE(format) == PICT_TYPE_BGRA) {
+		ashift = 0;
+		rshift = abits;
+		if (abits == 0)
+			rshift = PICT_FORMAT_BPP(format) - (rbits + gbits +
+							    bbits);
+		gshift = rshift + rbits;
+		bshift = gshift + gbits;
+#endif
+	} else {
+		return FALSE;
+	}
+#define COLOR_INT_TO_FLOAT(_fc_, _p_, _s_, _bits_)	\
+  *_fc_ = (((_p_) >> (_s_)) & (( 1 << (_bits_)) - 1))	\
+    / (float)((1<<(_bits_)) - 1)
+
+	if (rbits)
+		COLOR_INT_TO_FLOAT(red, pixel, rshift, rbits);
+	else
+		*red = 0;
+
+	if (gbits)
+		COLOR_INT_TO_FLOAT(green, pixel, gshift, gbits);
+	else
+		*green = 0;
+
+	if (bbits)
+		COLOR_INT_TO_FLOAT(blue, pixel, bshift, bbits);
+	else
+		*blue = 0;
+
+	if (abits)
+		COLOR_INT_TO_FLOAT(alpha, pixel, ashift, abits);
+	else
+		*alpha = 1;
+
+	return TRUE;
+}
+
+inline static Bool glamor_pict_format_is_compatible(PictFormatShort pict_format, int depth)
+{
+	GLenum iformat;
+
+	gl_iformat_for_depth(depth, &iformat);
+	switch (iformat) {
+		case GL_RGBA:
+			return (pict_format == PICT_a8r8g8b8 || pict_format == PICT_x8r8g8b8);
+		case GL_ALPHA:
+			return (pict_format == PICT_a8);
+		default:
+			return FALSE;
+	}
+}
+
+/* return TRUE if we can access this pixmap at DDX driver. */
+inline static Bool glamor_ddx_fallback_check_pixmap(DrawablePtr drawable)
+{
+	PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
+	glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
+	return (!pixmap_priv
+		|| (pixmap_priv->type == GLAMOR_TEXTURE_DRM
+		    || pixmap_priv->type == GLAMOR_MEMORY
+		    || pixmap_priv->type == GLAMOR_DRM_ONLY));
+}
+
+inline static Bool glamor_ddx_fallback_check_gc(GCPtr gc)
+{
+	PixmapPtr pixmap;
+	if (!gc)
+		return TRUE;
+        switch (gc->fillStyle) {
+        case FillStippled:
+        case FillOpaqueStippled:
+                pixmap = gc->stipple;
+                break;
+        case FillTiled:
+                pixmap = gc->tile.pixmap;
+                break;
+	default:
+		pixmap = NULL;
+        }
+	return (!pixmap || glamor_ddx_fallback_check_pixmap(&pixmap->drawable));
+}
+inline static Bool glamor_is_large_pixmap(PixmapPtr pixmap)
+{
+	glamor_pixmap_private *priv;
+
+	priv = glamor_get_pixmap_private(pixmap);
+	return (priv->type == GLAMOR_TEXTURE_LARGE);
+}
+
+inline static Bool glamor_is_large_picture(PicturePtr picture)
+{
+	PixmapPtr pixmap;
+
+	if (picture->pDrawable) {
+		pixmap = glamor_get_drawable_pixmap(picture->pDrawable);
+		return glamor_is_large_pixmap(pixmap);
+	}
+	return FALSE;
+}
+
+inline static Bool glamor_tex_format_is_readable(GLenum format)
+{
+	return ((format == GL_RGBA || format == GL_RGB || format == GL_ALPHA));
+
+}
+
+static inline void _glamor_dump_pixmap_bits(PixmapPtr pixmap, int x, int y, int w, int h)
+{
+	int i,j;
+	unsigned char * p = pixmap->devPrivate.ptr;
+	int stride = pixmap->devKind;
+
+	p = p + y * stride + x;
+
+	for (i = 0; i < h; i++)
+	{
+		ErrorF("line %3d: ", i);
+		for(j = 0; j < w; j++)
+			ErrorF("%2d ", (p[j/8] & (1 << (j%8)))>>(j%8));
+		p += stride;
+		ErrorF("\n");
+	}
+}
+
+static inline void _glamor_dump_pixmap_byte(PixmapPtr pixmap, int x, int y, int w, int h)
+{
+	int i,j;
+	unsigned char * p = pixmap->devPrivate.ptr;
+	int stride = pixmap->devKind;
+
+	p = p + y * stride + x;
+
+	for (i = 0; i < h; i++)
+	{
+		ErrorF("line %3d: ", i);
+		for(j = 0; j < w; j++)
+			ErrorF("%2x ", p[j]);
+		p += stride;
+		ErrorF("\n");
+	}
+}
+
+static inline void _glamor_dump_pixmap_sword(PixmapPtr pixmap, int x, int y, int w, int h)
+{
+	int i,j;
+	unsigned short * p = pixmap->devPrivate.ptr;
+	int stride = pixmap->devKind / 2;
+
+	p = p + y * stride + x;
+
+	for (i = 0; i < h; i++)
+	{
+		ErrorF("line %3d: ", i);
+		for(j = 0; j < w; j++)
+			ErrorF("%2x ", p[j]);
+		p += stride;
+		ErrorF("\n");
+	}
+}
+
+static inline void _glamor_dump_pixmap_word(PixmapPtr pixmap, int x, int y, int w, int h)
+{
+	int i,j;
+	unsigned int * p = pixmap->devPrivate.ptr;
+	int stride = pixmap->devKind / 4;
+
+	p = p + y * stride + x;
+
+	for (i = 0; i < h; i++)
+	{
+		ErrorF("line %3d: ", i);
+		for(j = 0; j < w; j++)
+			ErrorF("%2x ", p[j]);
+		p += stride;
+		ErrorF("\n");
+	}
+}
+
+static inline void glamor_dump_pixmap(PixmapPtr pixmap, int x, int y, int w, int h)
+{
+	w = ((x + w) > pixmap->drawable.width) ? (pixmap->drawable.width - x) : w;
+	h = ((y + h) > pixmap->drawable.height) ? (pixmap->drawable.height - y) : h;
+
+	glamor_prepare_access(&pixmap->drawable, GLAMOR_ACCESS_RO);
+	switch (pixmap->drawable.depth) {
+	case 8:
+		_glamor_dump_pixmap_byte(pixmap, x, y, w, h);
+		break;
+	case 15:
+	case 16:
+		_glamor_dump_pixmap_sword(pixmap, x, y, w, h);
+		break;
+
+	case 24:
+	case 32:
+		_glamor_dump_pixmap_word(pixmap, x, y, w, h);
+		break;
+	case 1:
+		_glamor_dump_pixmap_bits(pixmap, x, y, w, h);
+		break;
+	default:
+		ErrorF("dump depth %d, not implemented.\n", pixmap->drawable.depth);
+	}
+	glamor_finish_access(&pixmap->drawable, GLAMOR_ACCESS_RO);
+}
+
+static inline void _glamor_compare_pixmaps(PixmapPtr pixmap1, PixmapPtr pixmap2,
+                                           int x, int y, int w, int h,
+                                           PictFormatShort short_format,
+                                           int all, int diffs)
+{
+	int i, j;
+	unsigned char * p1 = pixmap1->devPrivate.ptr;
+	unsigned char * p2 = pixmap2->devPrivate.ptr;
+	int line_need_printed = 0;
+	int test_code = 0xAABBCCDD;
+	int little_endian = 0;
+	unsigned char *p_test;
+	int bpp = pixmap1->drawable.depth == 8 ? 1 : 4;
+	int stride = pixmap1->devKind;
+
+	assert(pixmap1->devKind == pixmap2->devKind);
+
+	ErrorF("stride:%d, width:%d, height:%d\n", stride, w, h);
+
+	p1 = p1 + y * stride + x;
+	p2 = p2 + y * stride + x;
+
+	if (all) {
+		for (i = 0; i < h; i++) {
+			ErrorF("line %3d: ", i);
+
+			for (j = 0; j < stride; j++) {
+				if (j % bpp == 0)
+					ErrorF("[%d]%2x:%2x ", j / bpp, p1[j], p2[j]);
+				else
+					ErrorF("%2x:%2x ", p1[j], p2[j]);
+			}
+
+			p1 += stride;
+			p2 += stride;
+			ErrorF("\n");
+		}
+	} else {
+		if (short_format == PICT_a8r8g8b8) {
+			p_test = (unsigned char *) & test_code;
+			little_endian = (*p_test == 0xDD);
+			bpp = 4;
+
+			for (i = 0; i < h; i++) {
+				line_need_printed = 0;
+
+				for (j = 0; j < stride; j++) {
+					if (p1[j] != p2[j] && (p1[j] - p2[j] > diffs || p2[j] - p1[j] > diffs)) {
+						if (line_need_printed) {
+							if (little_endian) {
+								switch (j % 4) {
+									case 2:
+										ErrorF("[%d]RED:%2x:%2x ", j / bpp, p1[j], p2[j]);
+										break;
+									case 1:
+										ErrorF("[%d]GREEN:%2x:%2x ", j / bpp, p1[j], p2[j]);
+										break;
+									case 0:
+										ErrorF("[%d]BLUE:%2x:%2x ", j / bpp, p1[j], p2[j]);
+										break;
+									case 3:
+										ErrorF("[%d]Alpha:%2x:%2x ", j / bpp, p1[j], p2[j]);
+										break;
+								}
+							} else {
+								switch (j % 4) {
+									case 1:
+										ErrorF("[%d]RED:%2x:%2x ", j / bpp, p1[j], p2[j]);
+										break;
+									case 2:
+										ErrorF("[%d]GREEN:%2x:%2x ", j / bpp, p1[j], p2[j]);
+										break;
+									case 3:
+										ErrorF("[%d]BLUE:%2x:%2x ", j / bpp, p1[j], p2[j]);
+										break;
+									case 0:
+										ErrorF("[%d]Alpha:%2x:%2x ", j / bpp, p1[j], p2[j]);
+										break;
+								}
+							}
+						} else {
+							line_need_printed = 1;
+							j = -1;
+							ErrorF("line %3d: ", i);
+							continue;
+						}
+					}
+				}
+
+				p1 += stride;
+				p2 += stride;
+				ErrorF("\n");
+			}
+		} //more format can be added here.
+		else { // the default format, just print.
+			for (i = 0; i < h; i++) {
+				line_need_printed = 0;
+
+				for (j = 0; j < stride; j++) {
+					if (p1[j] != p2[j]) {
+						if (line_need_printed) {
+							ErrorF("[%d]%2x:%2x ", j / bpp, p1[j], p2[j]);
+						} else {
+							line_need_printed = 1;
+							j = -1;
+							ErrorF("line %3d: ", i);
+							continue;
+						}
+					}
+				}
+
+				p1 += stride;
+				p2 += stride;
+				ErrorF("\n");
+			}
+		}
+	}
+}
+
+static inline void glamor_compare_pixmaps(PixmapPtr pixmap1, PixmapPtr pixmap2,
+                                          int x, int y, int w, int h, int all, int diffs)
+{
+	assert(pixmap1->drawable.depth == pixmap2->drawable.depth);
+
+	glamor_prepare_access(&pixmap1->drawable, GLAMOR_ACCESS_RO);
+	glamor_prepare_access(&pixmap2->drawable, GLAMOR_ACCESS_RO);
+
+	_glamor_compare_pixmaps(pixmap1, pixmap2, x, y, w, h, -1, all, diffs);
+
+	glamor_finish_access(&pixmap1->drawable, GLAMOR_ACCESS_RO);
+	glamor_finish_access(&pixmap2->drawable, GLAMOR_ACCESS_RO);
+}
+
+/* This function is used to compare two pictures.
+   If the picture has no drawable, we use fb functions to generate it. */
+static inline void glamor_compare_pictures( ScreenPtr screen,
+                                            PicturePtr fst_picture,
+                                            PicturePtr snd_picture,
+                                            int x_source, int y_source,
+                                            int width, int height,
+                                            int all, int diffs)
+{
+	PixmapPtr fst_pixmap;
+	PixmapPtr snd_pixmap;
+	int fst_generated, snd_generated;
+	int error;
+	int fst_type = -1;
+	int snd_type = -1; // -1 represent has drawable.
+
+	if (fst_picture->format != snd_picture->format) {
+		ErrorF("Different picture format can not compare!\n");
+		return;
+	}
+
+	if (!fst_picture->pDrawable) {
+		fst_type = fst_picture->pSourcePict->type;
+	}
+
+	if (!snd_picture->pDrawable) {
+		snd_type = snd_picture->pSourcePict->type;
+	}
+
+	if ((fst_type != -1) && (snd_type != -1) && (fst_type != snd_type)) {
+		ErrorF("Different picture type will never be same!\n");
+		return;
+	}
+
+	fst_generated = snd_generated = 0;
+
+	if (!fst_picture->pDrawable) {
+		PicturePtr pixman_pic;
+		PixmapPtr pixmap = NULL;
+		PictFormatShort format;
+
+		format = fst_picture->format;
+
+		pixmap = glamor_create_pixmap(screen,
+		                              width, height,
+		                              PIXMAN_FORMAT_DEPTH(format),
+		                              GLAMOR_CREATE_PIXMAP_CPU);
+
+		pixman_pic = CreatePicture(0,
+		                           &pixmap->drawable,
+		                           PictureMatchFormat(screen,
+		                               PIXMAN_FORMAT_DEPTH(format), format),
+		                           0, 0, serverClient, &error);
+
+		fbComposite(PictOpSrc, fst_picture, NULL, pixman_pic,
+		            x_source, y_source,
+		            0, 0,
+		            0, 0,
+		            width, height);
+
+		glamor_destroy_pixmap(pixmap);
+
+		fst_picture = pixman_pic;
+		fst_generated = 1;
+	}
+
+	if (!snd_picture->pDrawable) {
+		PicturePtr pixman_pic;
+		PixmapPtr pixmap = NULL;
+		PictFormatShort format;
+
+		format = snd_picture->format;
+
+		pixmap = glamor_create_pixmap(screen,
+		                              width, height,
+		                              PIXMAN_FORMAT_DEPTH(format),
+		                              GLAMOR_CREATE_PIXMAP_CPU);
+
+		pixman_pic = CreatePicture(0,
+		                           &pixmap->drawable,
+		                           PictureMatchFormat(screen,
+		                               PIXMAN_FORMAT_DEPTH(format), format),
+		                           0, 0, serverClient, &error);
+
+		fbComposite(PictOpSrc, snd_picture, NULL, pixman_pic,
+		            x_source, y_source,
+		            0, 0,
+		            0, 0,
+		            width, height);
+
+		glamor_destroy_pixmap(pixmap);
+
+		snd_picture = pixman_pic;
+		snd_generated = 1;
+	}
+
+	fst_pixmap = glamor_get_drawable_pixmap(fst_picture->pDrawable);
+	snd_pixmap = glamor_get_drawable_pixmap(snd_picture->pDrawable);
+
+	if (fst_pixmap->drawable.depth != snd_pixmap->drawable.depth) {
+		if (fst_generated)
+			glamor_destroy_picture(fst_picture);
+		if (snd_generated)
+			glamor_destroy_picture(snd_picture);
+
+		ErrorF("Different pixmap depth can not compare!\n");
+		return;
+	}
+
+	glamor_prepare_access(&fst_pixmap->drawable, GLAMOR_ACCESS_RO);
+	glamor_prepare_access(&snd_pixmap->drawable, GLAMOR_ACCESS_RO);
+
+	if ((fst_type == SourcePictTypeLinear) ||
+	     (fst_type == SourcePictTypeRadial) ||
+	     (fst_type == SourcePictTypeConical) ||
+	     (snd_type == SourcePictTypeLinear) ||
+	     (snd_type == SourcePictTypeRadial) ||
+	     (snd_type == SourcePictTypeConical)) {
+		x_source = y_source = 0;
+	}
+
+	_glamor_compare_pixmaps(fst_pixmap, snd_pixmap,
+	                        x_source, y_source,
+	                        width, height,
+	                        fst_picture->format, all, diffs);
+
+	glamor_finish_access(&fst_pixmap->drawable, GLAMOR_ACCESS_RO);
+	glamor_finish_access(&snd_pixmap->drawable, GLAMOR_ACCESS_RO);
+
+	if (fst_generated)
+		glamor_destroy_picture(fst_picture);
+	if (snd_generated)
+		glamor_destroy_picture(snd_picture);
+
+	return;
+}
+
+#ifdef __i386__
+static inline unsigned long __fls(unsigned long x)
+{
+        asm("bsr %1,%0"
+            : "=r" (x)
+            : "rm" (x));
+        return x;
+}
+#else
+static inline unsigned long __fls(unsigned long x)
+{
+   int n;
+
+   if (x == 0) return(0);
+   n = 0;
+   if (x <= 0x0000FFFF) {n = n +16; x = x <<16;}
+   if (x <= 0x00FFFFFF) {n = n + 8; x = x << 8;}
+   if (x <= 0x0FFFFFFF) {n = n + 4; x = x << 4;}
+   if (x <= 0x3FFFFFFF) {n = n + 2; x = x << 2;}
+   if (x <= 0x7FFFFFFF) {n = n + 1;}
+   return 31 - n;
+}
+#endif
+
+static inline void glamor_make_current(ScreenPtr screen)
+{
+	glamor_egl_make_current(screen);
+}
+
+static inline void glamor_restore_current(ScreenPtr screen)
+{
+	glamor_egl_restore_context(screen);
+}
+
+#ifdef GLX_USE_SHARED_DISPATCH
+static inline glamor_gl_dispatch *
+glamor_get_dispatch(glamor_screen_private *glamor_priv)
+{
+	if (glamor_priv->flags & GLAMOR_USE_EGL_SCREEN)
+		glamor_make_current(glamor_priv->screen);
+
+	return &glamor_priv->_dispatch;
+}
+
+static inline void
+glamor_put_dispatch(glamor_screen_private *glamor_priv)
+{
+	if (glamor_priv->flags & GLAMOR_USE_EGL_SCREEN)
+		glamor_restore_current(glamor_priv->screen);
+}
+#else
+#warning "Indirect GLX may be broken, need to implement context switch."
+static inline glamor_gl_dispatch *
+glamor_get_dispatch(glamor_screen_private *glamor_priv)
+{
+	return &glamor_priv->_dispatch;
+}
+
+static inline void
+glamor_put_dispatch(glamor_screen_private *glamor_priv)
+{
+}
+
+#endif
+
+#endif
diff --git a/extra/glamor-egl/glapi.h b/extra/glamor-egl/glapi.h
new file mode 100644
index 000000000..d510dac1d
--- /dev/null
+++ b/extra/glamor-egl/glapi.h
@@ -0,0 +1,121 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/**
+ * \mainpage Mesa GL API Module
+ *
+ * \section GLAPIIntroduction Introduction
+ *
+ * The Mesa GL API module is responsible for dispatching all the
+ * gl*() functions.  All GL functions are dispatched by jumping through
+ * the current dispatch table (basically a struct full of function
+ * pointers.)
+ *
+ * A per-thread current dispatch table and per-thread current context
+ * pointer are managed by this module too.
+ *
+ * This module is intended to be non-Mesa-specific so it can be used
+ * with the X/DRI libGL also.
+ */
+
+#ifndef _GLAPI_H
+#define _GLAPI_H
+
+#define GL_GLEXT_PROTOTYPES
+
+#if GLAMOR_GLES2
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#else
+#include <GL/gl.h>
+#include "GL/glext.h"
+#endif
+
+/* Is this needed?  It is incomplete anyway. */
+#ifdef USE_MGL_NAMESPACE
+#define _glapi_set_dispatch _mglapi_set_dispatch
+#define _glapi_get_dispatch _mglapi_get_dispatch
+#define _glapi_set_context _mglapi_set_context
+#define _glapi_get_context _mglapi_get_context
+#define _glapi_Dispatch _mglapi_Dispatch
+#define _glapi_Context _mglapi_Context
+#endif
+
+typedef void (*_glapi_proc)(void);
+struct _glapi_table;
+
+
+#if defined (GLX_USE_TLS)
+
+extern __thread struct _glapi_table * _glapi_tls_Dispatch
+    __attribute__((tls_model("initial-exec")));
+
+extern __thread void * _glapi_tls_Context
+    __attribute__((tls_model("initial-exec")));
+
+extern const struct _glapi_table *_glapi_Dispatch;
+extern const void *_glapi_Context;
+
+# define GET_DISPATCH() _glapi_tls_Dispatch
+# define GET_CURRENT_CONTEXT(C)  C = (typeof(C)) _glapi_tls_Context
+# define SET_CURRENT_CONTEXT(C)  _glapi_tls_Context = (void*)C
+
+#else
+
+extern struct _glapi_table *_glapi_Dispatch;
+extern void *_glapi_Context;
+
+# ifdef THREADS
+
+#  define GET_DISPATCH() \
+     (likely(_glapi_Dispatch) ? _glapi_Dispatch : _glapi_get_dispatch())
+
+#  define GET_CURRENT_CONTEXT(C)  C = (typeof(C)) \
+     (likely(_glapi_Context) ? _glapi_Context : _glapi_get_context())
+
+
+# define SET_CURRENT_CONTEXT(C) do { if (likely(_glapi_Context))   \
+					_glapi_Context = (void*)C; \
+				     else \
+					_glapi_set_context(C); } while(0)
+
+# else
+
+#  define GET_DISPATCH() _glapi_Dispatch
+#  define GET_CURRENT_CONTEXT(C)  C = (typeof(C)) _glapi_Context
+# define SET_CURRENT_CONTEXT(C)  _glapi_Context = (void*)C
+
+# endif
+
+#endif /* defined (GLX_USE_TLS) */
+
+
+extern void
+_glapi_set_context(void *context);
+
+extern void *
+_glapi_get_context(void);
+
+#endif
diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD
index 46d6ed04d..2b35e7372 100644
--- a/extra/glib-networking/PKGBUILD
+++ b/extra/glib-networking/PKGBUILD
@@ -1,30 +1,29 @@
-# $Id: PKGBUILD 170891 2012-11-12 22:12:18Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 183367 2013-04-21 22:09:26Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=glib-networking
-pkgver=2.34.2
+pkgver=2.36.1
 pkgrel=1
 pkgdesc="Network-related giomodules for glib"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schemas')
-makedepends=('intltool')
+license=(GPL2)
+depends=(glib2 libproxy gnutls ca-certificates gsettings-desktop-schemas)
+makedepends=(intltool)
 options=('!libtool')
 install=glib-networking.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('00a92ec7b31f03a2fc1eeff568c0f1664e109b3add8c7042d2d420953f49dfde')
+sha256sums=('e2df2d1943a6193ca471addc58539895da1ae96fdba305dedb937ef56adb57ea')
 
 build() {
-  cd "$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/glib-networking --disable-static
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --libexecdir=/usr/lib/$pkgname --disable-static
   make
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/glib-perl/PKGBUILD b/extra/glib-perl/PKGBUILD
index 083eb6734..8d1ad7ffd 100644
--- a/extra/glib-perl/PKGBUILD
+++ b/extra/glib-perl/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 160471 2012-06-02 10:25:59Z bluewind $
+# $Id: PKGBUILD 183484 2013-04-21 22:21:04Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarah@archlinux.org>
 
 pkgname=glib-perl
-pkgver=1.260
+pkgver=1.280
 pkgrel=1
 pkgdesc="Perl wrappers for glib 2.x, including GObject"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://gtk2-perl.sourceforge.net/"
 options=('!emptydirs')
-depends=('glib2>=2.24.1' 'perl>=5.14')
-makedepends=('perl-extutils-depends>=0.302' 'perl-extutils-pkgconfig>=1.12')
+depends=('glib2' 'perl')
+makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig')
 source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz)
-md5sums=('faa052bdf6e9b87ea30b630c2806e71e')
+md5sums=('1d81a8aec5f7f1182a96cfaaf119d866')
 
 build() {
   cd "${srcdir}/Glib-${pkgver}"
diff --git a/extra/glib/PKGBUILD b/extra/glib/PKGBUILD
index b0137cd5b..ea287c4d3 100644
--- a/extra/glib/PKGBUILD
+++ b/extra/glib/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=glib
 pkgver=1.2.10
-pkgrel=9.1
+pkgrel=9.2
 pkgdesc="Common C routines used by Gtk+ and other libs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD
index c8c95b3b4..dce85cc57 100644
--- a/extra/glibmm/PKGBUILD
+++ b/extra/glibmm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170205 2012-11-05 11:32:48Z jgc $
+# $Id: PKGBUILD 184169 2013-05-03 03:02:45Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=glibmm
 pkgname=('glibmm' 'glibmm-docs')
-pkgver=2.34.1
+pkgver=2.36.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
@@ -12,7 +12,7 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 options=('!libtool')
 url="http://www.gtkmm.org/"
-sha256sums=('b425a52c7e178aeaaaffd02c5497bfd68d0cb8be56cef3620558a80dd5d692c4')
+sha256sums=('f15b65bf5740257be03c69f2f5ae71436ac3011ebeb02274b2b99b796c6837cf')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/glpk/PKGBUILD b/extra/glpk/PKGBUILD
index f4a7dde1a..ba1d6d02e 100644
--- a/extra/glpk/PKGBUILD
+++ b/extra/glpk/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 171320 2012-11-17 07:46:20Z eric $
+# $Id: PKGBUILD 178114 2013-02-16 16:08:40Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: bzklrm <bzklrm@gmail.com>
 # Additional contributors Senjin, Xavier, dundee
 
 pkgname=glpk
-pkgver=4.47
-pkgrel=2
+pkgver=4.48
+pkgrel=1
 pkgdesc="GNU Linear Programming Kit : solve LP, MIP and other problems."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/glpk/glpk.html"
@@ -13,9 +13,8 @@ license=('GPL')
 depends=('glibc')
 options=('!libtool')
 source=(http://ftp.gnu.org/gnu/glpk/${pkgname}-${pkgver}.tar.gz{,.sig})
-sha1sums=('35e16d3167389b6bc75eb51b4b48590db59f789c'
-          'e29069fb4e8e34929a980a8659b3dd7ccd92a676')
-
+sha1sums=('e00c92faa38fd5d865fa27206abbb06680bab7bb'
+          '4b57f5ae0a8114c5307daa6071f9be5967a935d6')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD
index 74e7418b7..3dca99e8e 100644
--- a/extra/glsof/PKGBUILD
+++ b/extra/glsof/PKGBUILD
@@ -7,7 +7,7 @@ _fmver=2.2.0
 _qver=1.0.0
 pkgrel=1
 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://glsof.sourceforge.net/"
 license=('GPL3')
 depends=('sh' 'java-runtime' 'lsof')
diff --git a/extra/glu/PKGBUILD b/extra/glu/PKGBUILD
index 5c75027b2..40424b8b8 100644
--- a/extra/glu/PKGBUILD
+++ b/extra/glu/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 168550 2012-10-13 11:42:49Z andyrtr $
+# $Id: PKGBUILD 178743 2013-02-26 16:19:48Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=glu
 pkgver=9.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Mesa OpenGL Utility library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cgit.freedesktop.org/mesa/glu/"
 license=('LGPL')
 depends=('libgl')
-makedepends=('mesa')
 options=('!libtool')
 source=(ftp://ftp.freedesktop.org/pub/mesa/$pkgname/$pkgname-$pkgver.tar.bz2)
 sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12')
diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD
index 2ba03df74..246240e89 100644
--- a/extra/gmime/PKGBUILD
+++ b/extra/gmime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173089 2012-12-10 21:30:33Z jgc $
+# $Id: PKGBUILD 178917 2013-02-28 18:49:48Z ioni $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gmime
-pkgver=2.6.13
+pkgver=2.6.15
 pkgrel=1
 pkgdesc="Core mime parsing library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('glib2' 'gpgme' 'zlib')
 [ "$CARCH" != "mips64el" ] && makedepends=('gtk-sharp-2')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('42a47a7f9508db3e1cfbb374a23260e75d7fc7696f488a26aa59f5e2d8dac154')
+sha256sums=('b4c2a0b99b82063387cd750a38421ebaa0636f339e67984a84371bcb697dc99a')
 
 build() {
   # get rid of that .wapi errors in fakeroot
diff --git a/extra/gmpc/PKGBUILD b/extra/gmpc/PKGBUILD
deleted file mode 100644
index 284c69467..000000000
--- a/extra/gmpc/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 136735 2011-08-31 19:33:21Z eric $
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@archlinux.org>
-
-pkgname=gmpc
-pkgver=11.8.16
-pkgrel=1.1
-pkgdesc="A GTK2 client for MPD"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://gmpclient.org/home"
-license=('GPL')
-depends=('libunique' 'libmpd' 'libsoup' 'sqlite3' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('gob2' 'intltool' 'vala')
-options=('!libtool')
-install=gmpc.install
-source=(http://download.sarine.nl/Programs/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('223aeb000e41697d8fdf54ccedee89d5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|GNOME;AudioVideo;|GTK;AudioVideo;Player;|' data/gmpc.desktop.in
-  sed -ri 's/(^gmpc_LDADD.*)/\1 -lm/' src/Makefile.in
-  ./configure --prefix=/usr LDADD="-lm"
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/gmpc/gmpc.install b/extra/gmpc/gmpc.install
deleted file mode 100644
index e70c054ec..000000000
--- a/extra/gmpc/gmpc.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/gnokii/PKGBUILD b/extra/gnokii/PKGBUILD
index e04f5a0b1..e79e980f7 100644
--- a/extra/gnokii/PKGBUILD
+++ b/extra/gnokii/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150512 2012-02-18 11:55:01Z pierre $
+# $Id: PKGBUILD 180682 2013-03-25 19:15:33Z bpiotrowski $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,15 +6,15 @@
 
 pkgname=gnokii
 pkgver=0.6.31
-pkgrel=1.1
+pkgrel=3
 pkgdesc="Tools and user space driver for use with mobile phones"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnokii.org/"
 license=('GPL')
 depends=('libusb-compat' 'libxpm' 'bluez' 'libical')
-makedepends=('gtk2' 'libmysqlclient' 'postgresql-libs' 'intltool')
+makedepends=('gtk2' 'libmariadbclient' 'postgresql-libs' 'intltool' 'mariadb')
 optdepends=('gtk2: xgnokii GUI'
-            'libmysqlclient: smsd mysql backend'
+            'libmariadbclient: smsd mysql backend'
             'postgresql-libs: smsd postgresql backend')
 backup=('etc/gnokiirc')
 options=('!libtool' '!makeflags')
diff --git a/extra/gnome-alsamixer/PKGBUILD b/extra/gnome-alsamixer/PKGBUILD
index 272287501..b36e9d567 100644
--- a/extra/gnome-alsamixer/PKGBUILD
+++ b/extra/gnome-alsamixer/PKGBUILD
@@ -21,7 +21,7 @@ sha1sums=('faece601a4329d2b01b9efe65200021538fc066d'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var LIBS=-lm
   make
 }
 
diff --git a/extra/gnome-applets/PKGBUILD b/extra/gnome-applets/PKGBUILD
deleted file mode 100644
index 7ff3ec0d9..000000000
--- a/extra/gnome-applets/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 170135 2012-11-03 12:57:39Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-applets
-pkgver=3.5.92
-pkgrel=1
-pkgdesc="GNOME Applets"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify')
-makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon' 'networkmanager')
-options=(!emptydirs)
-url="http://www.gnome.org"
-install=gnome-applets.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc --libexecdir=/usr/lib/gnome-applets \
-      --localstatedir=/var --disable-static \
-      --disable-scrollkeeper --disable-schemas-install \
-      --without-hal
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-applets-3.0 "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
diff --git a/extra/gnome-applets/gnome-applets.install b/extra/gnome-applets/gnome-applets.install
deleted file mode 100644
index e3441e722..000000000
--- a/extra/gnome-applets/gnome-applets.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gnome-applets
-
-post_install() {
-  gconfpkg --install ${pkgname}
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD
index 7ae8a9b0a..77761149a 100644
--- a/extra/gnome-bluetooth/PKGBUILD
+++ b/extra/gnome-bluetooth/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 171034 2012-11-15 17:49:18Z ibiru $
+# $Id: PKGBUILD 183369 2013-04-21 22:09:32Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-bluetooth
-pkgver=3.6.1
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="The GNOME Bluetooth Subsystem"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/GnomeBluetooth"
 license=('GPL' 'LGPL')
-depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf' 'libnotify')
-makedepends=('intltool' 'nautilus-sendto' 'gobject-introspection' 'itstool' 'docbook-xsl')
+depends=('gtk3' 'hicolor-icon-theme' 'libnotify')
+makedepends=('intltool' 'gobject-introspection' 'itstool' 'docbook-xsl')
 options=('!libtool' '!emptydirs')
 install=gnome-bluetooth.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         61-gnome-bluetooth-rfkill.rules)
-sha256sums=('71d72a4637916450987f69c71d374c5bc1102be6dd9d9d7f923aa924659f768a'
+sha256sums=('70f275922f10ac9f40eb7d57f89193502ee490894b5b721d0f6273432fc97f82'
             '8dd2d3637f380a89e72f65e6c8021e994ccbdc645f1a1b1dbffe74ac9f061f53')
 
 build() {
diff --git a/extra/gnome-bluetooth/gnome-bluetooth.install b/extra/gnome-bluetooth/gnome-bluetooth.install
index 8c991877f..d59dca6e8 100644
--- a/extra/gnome-bluetooth/gnome-bluetooth.install
+++ b/extra/gnome-bluetooth/gnome-bluetooth.install
@@ -1,5 +1,4 @@
 post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
   gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
diff --git a/extra/gcalctool/PKGBUILD b/extra/gnome-calculator/PKGBUILD
index c0c4eae21..97732cd54 100644
--- a/extra/gcalctool/PKGBUILD
+++ b/extra/gnome-calculator/PKGBUILD
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD 170921 2012-11-13 02:09:59Z heftig $
+# $Id: PKGBUILD 183370 2013-04-21 22:09:37Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
-pkgname=gcalctool
-pkgver=6.6.2
+pkgname=gnome-calculator
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="GNOME Scientific calculator"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gtk3' 'dconf')
-makedepends=('intltool' 'yelp-tools')
-groups=('gnome-extra')
+makedepends=('intltool' 'yelp-tools' 'vala')
+groups=('gnome')
+replaces=('gcalctool')
+conflicts=('gcalctool')
 options=(!emptydirs)
 url="http://www.gnome.org"
-install=gcalctool.install
+install=gnome-calculator.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e708a16cc758c3a9fcb07e9c3e45989f7d9d64e2993f440e99707fcea3e1b76c')
+sha256sums=('24ae856c90a3df62c52dc413ceb2c9bad15e7ad146de0469b53c70681a4ad435')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/at-spi2-atk/at-spi2-atk.install b/extra/gnome-calculator/gnome-calculator.install
index 2ef26aaa9..2ef26aaa9 100644
--- a/extra/at-spi2-atk/at-spi2-atk.install
+++ b/extra/gnome-calculator/gnome-calculator.install
diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD
new file mode 100644
index 000000000..5ec4bb961
--- /dev/null
+++ b/extra/gnome-chess/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 183371 2013-04-21 22:09:39Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-chess
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Play the classic two-player boardgame of chess"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg' 'sqlite')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=gnome-chess.install
+url="https://live.gnome.org/Chess"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('f8a756d0e532ee9532745257bcb3514b3e75a0e2fa7e75b7358b59cdaf3a7661')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/firefox/firefox.install b/extra/gnome-chess/gnome-chess.install
index 1a1f4b16b..0730c1a47 100644
--- a/extra/firefox/firefox.install
+++ b/extra/gnome-chess/gnome-chess.install
@@ -1,6 +1,7 @@
 post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
   update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
 }
 
 post_upgrade() {
@@ -10,4 +11,3 @@ post_upgrade() {
 post_remove() {
   post_install
 }
-
diff --git a/extra/gnome-clocks/PKGBUILD b/extra/gnome-clocks/PKGBUILD
new file mode 100644
index 000000000..2e25edaba
--- /dev/null
+++ b/extra/gnome-clocks/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 183372 2013-04-21 22:09:40Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=gnome-clocks
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Clocks applications for GNOME"
+arch=(i686 x86_64 mips64el)
+url="https://www.gnome.org/"
+license=(GPL)
+depends=(gtk3 libcanberra libgweather gnome-desktop libnotify
+         hicolor-icon-theme gnome-themes-standard)
+makedepends=(intltool vala gobject-introspection)
+options=(!libtool)
+groups=(gnome-extra)
+install=gnome-clocks.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz
+        gnome-clocks.css::http://git.gnome.org/browse/gnome-clocks/plain/data/css/gnome-clocks.css?id=${pkgver}
+        button-border-go.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-go.svg?id=${pkgver}
+        button-border-go-active.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-go-active.svg?id=${pkgver}
+        button-border-stop.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-stop.svg?id=${pkgver}
+        button-border-stop-active.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-stop-active.svg?id=${pkgver})
+sha256sums=('6140cc1ae41460c5fc799b2a52d809ed4cf9035a72be7e878160b5e591486d31'
+            '3ce4afb848ea2a2728c53a9f4bfca5f12d9719e3935d1acd2d90056cb1c464fc'
+            'a44df652c8034ccbbc87a62f92ab6efbf6dfabead44e3316b4b9e85d851a6b24'
+            'e12ac57acaa43b25a36d9fd9b6dbe906980a5e8429840d98c604bf28515749e0'
+            'e71fa928cf5812fb1cc4ea62e55176be14716b670c37c7899368b0f8f020876c'
+            '34916c190c259788bcb561f0b4cce73b47a39e50326e1a53a2a91c2725e9d8a3')
+
+build() {
+  cd $pkgname-$pkgver
+
+  # Fix files missing from tarball
+  mkdir data/css
+  cp ../*.{css,svg} data/css
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/gnome-clocks/gnome-clocks.install b/extra/gnome-clocks/gnome-clocks.install
new file mode 100644
index 000000000..b85f1cb47
--- /dev/null
+++ b/extra/gnome-clocks/gnome-clocks.install
@@ -0,0 +1,13 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    gtk-update-icon-cache -q -t -f /usr/share/icons/HighContrast
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD
index 0fce0fd62..d61a15334 100644
--- a/extra/gnome-color-manager/PKGBUILD
+++ b/extra/gnome-color-manager/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 175200 2013-01-16 13:44:28Z jgc $
+# $Id: PKGBUILD 183373 2013-04-21 22:09:42Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-color-manager
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Color profile manager for the GNOME desktop"
 arch=(i686 x86_64 'mips64el')
 url="http://projects.gnome.org/gnome-color-manager/"
 license=(GPL2)
-depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk'
-         'mash' 'shared-color-profiles' 'shared-color-targets' 'gnome-desktop' 'colord-gtk' 'libexif')
-makedepends=('intltool' 'yelp-tools')
+depends=(libcanberra vte3 exiv2 hicolor-icon-theme desktop-file-utils clutter-gtk
+         mash shared-color-profiles shared-color-targets gnome-desktop colord-gtk libexif)
+makedepends=(intltool yelp-tools)
 install=gnome-color-manager.install
 options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c5fb0903d5570c50fbb2347db2222314bef0c57b293302e48e0b73f57f426fb7')
+sha256sums=('61851022ccfa090f21ce027c36cd440597648401aafa2c8b3d3f7787a866bb49')
 
 build(){
   cd $pkgname-$pkgver
diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD
index 9d8eb65d1..9646cffa3 100644
--- a/extra/gnome-contacts/PKGBUILD
+++ b/extra/gnome-contacts/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 170834 2012-11-12 13:27:20Z heftig $
+# $Id: PKGBUILD 183374 2013-04-21 22:09:43Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-contacts
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Contacts Manager for GNOME"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL2')
-groups=(gnome-extra)
+groups=(gnome)
 depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop' 'dconf' 'gnome-online-accounts' 'libgee' 'telepathy-glib' 'cheese')
-makedepends=('intltool' 'vala')
+makedepends=('intltool' 'vala' 'gobject-introspection')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7d1b6a8e395b15bf150062f332348549cf9deb38dfa3aad9994f70e71d8449fa')
+sha256sums=('c9b2ffba754f4e1e37788195c814b12dfbf79b35042cd811b8690f890572edcb')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index 8adae687b..fb2328f0a 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -1,38 +1,34 @@
-# $Id: PKGBUILD 172933 2012-12-07 12:12:32Z heftig $
+# $Id: PKGBUILD 183375 2013-04-21 22:09:45Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-control-center
-pkgver=3.6.3
-pkgrel=3
+pkgver=3.8.1
+pkgrel=1
 pkgdesc="The Control Center for GNOME"
+license=(GPL)
 arch=('i686' 'x86_64' 'mips64el')
-depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus'
-         'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3'
-         'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower' 'libpwquality' 'libsystemd')
-optdepends=('mesa-demos: provides glxinfo for graphics information'
-            'gnome-color-manager: for color management tasks')
-makedepends=('gnome-doc-utils' 'intltool' 'docbook-xsl')
+depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop gnome-menus
+         gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
+         libgtop network-manager-applet sound-theme-freedesktop upower libpwquality
+         gnome-color-manager smbclient modemmanager)
+makedepends=(gnome-doc-utils intltool docbook-xsl)
+optdepends=('gnome-user-share: Bluetooth and WebDAV file sharing'
+            'rygel: media sharing'
+            'vino: screen sharing'
+            'openssh: remote login')
+groups=(gnome)
 url="http://www.gnome.org"
-groups=('gnome')
 install=gnome-control-center.install
-license=('GPL')
 options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        pulse3.0.patch)
-sha256sums=('2ae23972bc64f62b4facd12dd5adce212bda02491eb6e56bbf195332157d21fb'
-            '27f1d518df91ad9687e3e217023d83726c0d44f65b30942e79106e4aad53c916')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('07d7d8e08af6a9ef01754814ecf2d006c58b94a096f0c6ad549c9d0051e4e57a')
 
 build() {
   cd $pkgname-$pkgver
 
-  patch -Np1 -i ../pulse3.0.patch
-  
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-systemd --with-libsocialweb \
-      --disable-update-mimedb \
-      --without-cheese --disable-ibus
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/$pkgname --disable-static
 
   #https://bugzilla.gnome.org/show_bug.cgi?id=656229
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
diff --git a/extra/gnome-control-center/pulse3.0.patch b/extra/gnome-control-center/pulse3.0.patch
deleted file mode 100644
index 203547940..000000000
--- a/extra/gnome-control-center/pulse3.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson@canonical.com>
-Date: Fri, 07 Dec 2012 10:52:09 +0000
-Subject: sound: Fix port handling for the unknown availability case
-
-The current code assumes that port availability transitions will be
-between YES and NO, and doesn't account for the fact that it may also be
-UNKNOWN. This causes spurious entries if the port availability
-transitions between YES and UNKNOWN.
----
-diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c
-index 34ddc0c..2f6cf34 100644
---- a/panels/sound/gvc-mixer-control.c
-+++ b/panels/sound/gvc-mixer-control.c
-@@ -2138,7 +2138,7 @@ update_card (GvcMixerControl      *control,
-                 else {
-                         for (i = 0; i < info->n_ports; i++) {
-                                 if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) {
--                                        if (card_port->available != info->ports[i]->available) {
-+                                        if ((card_port->available == PA_PORT_AVAILABLE_NO) !=  (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) {
-                                                 card_port->available = info->ports[i]->available;
-                                                 g_debug ("sync port availability on card %i, card port name '%s', new available value %i",
-                                                           gvc_mixer_card_get_index (card),
---
-cgit v0.9.0.2
diff --git a/extra/gnome-control-center/systemd-fallback.patch b/extra/gnome-control-center/systemd-fallback.patch
deleted file mode 100644
index 709e54019..000000000
--- a/extra/gnome-control-center/systemd-fallback.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit 9873a7536844f5c38c2a123be58175c2774e5dcc
-Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-Date:   Mon Mar 12 01:12:11 2012 +0100
-
-    Fallback to CK if systemd is not available
-    
-    Be nice to distributions where systemd is optional. This will select
-    the code path at runtime depending on whether the system was booted
-    using systemd.
-
-diff --git a/configure.ac b/configure.ac
-index aee97ac..867f061 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -56,7 +56,7 @@ AC_ARG_ENABLE([systemd],
-               [with_systemd=$enableval],
-               [with_systemd=no])
- if test "$with_systemd" = "yes" ; then
--  SYSTEMD=libsystemd-login
-+  SYSTEMD="libsystemd-login libsystemd-daemon"
-   AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available])
- else
-   SYSTEMD=
-diff --git a/panels/user-accounts/um-user.c b/panels/user-accounts/um-user.c
-index f027754..5ebbe29 100644
---- a/panels/user-accounts/um-user.c
-+++ b/panels/user-accounts/um-user.c
-@@ -37,6 +37,11 @@
- 
- #include <gio/gunixoutputstream.h>
- 
-+#ifdef HAVE_SYSTEMD
-+#  include <systemd/sd-login.h>
-+#  include <systemd/sd-daemon.h>
-+#endif
-+
- #include "um-user.h"
- #include "um-account-type.h"
- #include "um-utils.h"
-@@ -1003,25 +1008,18 @@ um_user_set_password (UmUser      *user,
-         }
- }
- 
--#ifdef HAVE_SYSTEMD
--
--#include <systemd/sd-login.h>
--
- gboolean
- um_user_is_logged_in (UmUser *user)
- {
--  int n_sessions;
--
--  n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0;
--
--  return n_sessions > 0;
--}
-+#ifdef HAVE_SYSTEMD
-+        if (sd_booted () > 0) {
-+                int n_sessions;
- 
--#else
-+                n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL);
- 
--gboolean
--um_user_is_logged_in (UmUser *user)
--{
-+                return n_sessions > 0;
-+        }
-+#endif
-         GVariant *result;
-         GVariantIter *iter;
-         gint n_sessions;
-@@ -1052,8 +1050,6 @@ um_user_is_logged_in (UmUser *user)
-         return n_sessions > 0;
- }
- 
--#endif
--
- void
- um_user_set_automatic_login (UmUser   *user,
-                              gboolean  enabled)
diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD
index a55331c2a..b5833da36 100644
--- a/extra/gnome-desktop/PKGBUILD
+++ b/extra/gnome-desktop/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 170920 2012-11-13 02:08:44Z heftig $
+# $Id: PKGBUILD 183376 2013-04-21 22:09:47Z heftig $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-desktop
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 epoch=1
 pkgdesc="Library with common API for various GNOME modules"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
-depends=('gsettings-desktop-schemas' 'gtk3' 'xkeyboard-config')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool')
+depends=('gsettings-desktop-schemas' 'gtk3' 'xkeyboard-config' 'iso-codes')
+makedepends=('intltool' 'gobject-introspection' 'itstool')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ef15cc0b34a8360fd48ceeb833515790db4de38e6945fb3661f178dc7df70236')
+sha256sums=('79c4790fdfc58a54ee32b2fd20f498f4d563d11fa40ab6599c757e45bee5b13f')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-desktop2/PKGBUILD b/extra/gnome-desktop2/PKGBUILD
index bb65884ac..2900f8d25 100644
--- a/extra/gnome-desktop2/PKGBUILD
+++ b/extra/gnome-desktop2/PKGBUILD
@@ -5,7 +5,7 @@
 _pkgname=gnome-desktop
 pkgname=${_pkgname}2
 pkgver=2.32.1
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc="Library with common API for various GNOME modules (legacy version)"
 arch=(i686 x86_64 mips64el)
 license=(GPL LGPL)
diff --git a/extra/gnome-dictionary/PKGBUILD b/extra/gnome-dictionary/PKGBUILD
index 07aa9a54e..565988e8f 100644
--- a/extra/gnome-dictionary/PKGBUILD
+++ b/extra/gnome-dictionary/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169894 2012-10-30 22:33:54Z heftig $
+# $Id: PKGBUILD 183378 2013-04-21 22:09:49Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=gnome-dictionary
 pkgver=3.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Look up words in dictionary sources"
 arch=(i686 x86_64 mips64el)
 url="http://gnome.org"
@@ -11,7 +11,7 @@ depends=('dconf' 'gtk3')
 makedepends=('intltool' 'itstool' 'docbook-xsl')
 install=$pkgname.install
 options=(!libtool)
-groups=('gnome-extra')
+groups=('gnome')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('1ad03f629bbfe4360fc6d8dd2d7cb4a03e24579068bdd79a25ff5fc5fbff6fa9')
 
diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD
index 83bdd92c3..ebf26d532 100644
--- a/extra/gnome-disk-utility/PKGBUILD
+++ b/extra/gnome-disk-utility/PKGBUILD
@@ -1,29 +1,33 @@
-# $Id: PKGBUILD 169895 2012-10-30 22:34:01Z heftig $
+# $Id: PKGBUILD 183379 2013-04-21 22:09:51Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Silvio Knizek (killermoehre)
 
 pkgname=gnome-disk-utility
-pkgver=3.6.1
-pkgrel=1
+pkgver=3.8.0
+pkgrel=2
 pkgdesc="Disk Management Utility for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
+license=(GPL)
 url="http://www.gnome.org"
-groups=('gnome-extra')
-depends=('gtk3' 'udisks2' 'hicolor-icon-theme' 'libsecret' 'libpwquality' 'desktop-file-utils')
-makedepends=('intltool' 'docbook-xsl')
+groups=(gnome)
+depends=(udisks2 gtk3 libsecret libpwquality libcanberra libdvdread libnotify hicolor-icon-theme desktop-file-utils)
+makedepends=(intltool docbook-xsl gnome-settings-daemon)
 options=('!libtool' '!emptydirs')
 install=gnome-disk-utility.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e848bd0a5787a654e3421c904718c587e1a953fc1b43a21401ca65b329988c32')
+sha256sums=('2657aad8d06e5511bc34ee5ec1ff9426f70b7140b8687be528f693175759bd5e')
 
 build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc
-
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD
index af7bde26a..db1ce515f 100644
--- a/extra/gnome-documents/PKGBUILD
+++ b/extra/gnome-documents/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 170912 2012-11-12 22:48:08Z heftig $
+# $Id: PKGBUILD 183380 2013-04-21 22:09:52Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-documents
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Documents Manager for GNOME"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
-license=('GPL')
-groups=('gnome-extra')
-depends=('clutter-gtk' 'evince' 'gjs' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata'
-         'tracker' 'libzapojit')
-makedepends=('intltool')
+license=(GPL)
+groups=(gnome-extra)
+depends=(evince gjs gtk3 gnome-desktop gnome-online-accounts libgdata
+         tracker libzapojit webkitgtk3)
+makedepends=(intltool gobject-introspection itstool)
 optdepends=('unoconv: Support for Libreoffice document types')
 options=('!libtool')
 install=gnome-documents.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b2b548685c1074cf222a21d747e6daa8f339815219616b12bb4d2e447e2a34c2')
+sha256sums=('7cd05f5f2482ddae797300b233f499cbe410cb22d358bef37a387aff232d4e9f')
 
 build() {
   cd $pkgname-$pkgver
@@ -24,10 +24,16 @@ build() {
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
-    --libexecdir=/usr/lib/gnome-documents
+    --libexecdir=/usr/lib/$pkgname
   make
 }
 
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
diff --git a/extra/gnome-font-viewer/PKGBUILD b/extra/gnome-font-viewer/PKGBUILD
index 16f665982..167a933e3 100644
--- a/extra/gnome-font-viewer/PKGBUILD
+++ b/extra/gnome-font-viewer/PKGBUILD
@@ -1,8 +1,8 @@
-#  $Id: PKGBUILD 172919 2012-12-06 20:22:06Z heftig $
+#  $Id: PKGBUILD 183381 2013-04-21 22:09:54Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-font-viewer
-pkgver=3.6.2
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="GNOME font viewer and thumbnailer"
 arch=(i686 x86_64 mips64el)
@@ -11,10 +11,10 @@ depends=('gtk3' 'desktop-file-utils' 'gnome-desktop')
 makedepends=('intltool')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
-groups=('gnome-extra')
+groups=('gnome')
 install=gnome-font-viewer.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('216a1f1a54cf662533b7a793b250bb01bafb98319bfdbe814f66be54fbefe145')
+sha256sums=('d34f17f026b7c41d8de5c255070c79c938ce69030b3429444e7fb8f2275ff819')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD
deleted file mode 100644
index a10245342..000000000
--- a/extra/gnome-games/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 169898 2012-10-30 22:34:10Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-games
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Some Games for GNOME"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('desktop-file-utils' 'glu' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf')
-makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'vala')
-options=('!emptydirs' '!libtool')
-install=gnome-games.install
-url="http://www.gnome.org"
-groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f016068350ca2a4deceeac0374d5372610b1da07e2c4b356470f3401e6e2a43d')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static --disable-schemas-compile \
-      --with-scores-user=root --with-scores-group=games \
-      --enable-introspection=yes
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Remove all scores, we generate them from postinstall
-  rm -rf "$pkgdir/var"
-
-  sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' "$pkgdir/usr/bin/gnome-sudoku"
-}
diff --git a/extra/gnome-games/gnome-games.install b/extra/gnome-games/gnome-games.install
deleted file mode 100644
index 2fad5db0b..000000000
--- a/extra/gnome-games/gnome-games.install
+++ /dev/null
@@ -1,122 +0,0 @@
-_scores=(glines.Small.scores
-	glines.Medium.scores
-	glines.Large.scores
-	gnibbles.4.0.scores
-	gnibbles.3.0.scores
-	gnibbles.2.0.scores
-	gnibbles.1.0.scores
-	gnibbles.4.1.scores
-	gnibbles.3.1.scores
-	gnibbles.2.1.scores
-	gnibbles.1.1.scores
-	gnobots2.robots2.scores
-	gnobots2.robots2-safe.scores
-	gnobots2.robots2-super-safe.scores
-	gnobots2.robots2_easy.scores
-	gnobots2.robots2_easy-safe.scores
-	gnobots2.robots2_easy-super-safe.scores
-	gnobots2.classic_robots.scores
-	gnobots2.classic_robots-safe.scores
-	gnobots2.classic_robots-super-safe.scores
-	gnobots2.robots_with_safe_teleport.scores
-	gnobots2.robots_with_safe_teleport-safe.scores
-	gnobots2.robots_with_safe_teleport-super-safe.scores
-	gnobots2.nightmare.scores
-	gnobots2.nightmare-safe.scores
-	gnobots2.nightmare-super-safe.scores
-	gnomine.Small.scores
-	gnomine.Medium.scores
-	gnomine.Large.scores
-	gnomine.Custom.scores
-	gnotravex.2x2.scores
-	gnotravex.3x3.scores
-	gnotravex.4x4.scores
-	gnotravex.5x5.scores
-	gnotravex.6x6.scores
-	gnotski.1.scores
-	gnotski.2.scores
-	gnotski.3.scores
-	gnotski.4.scores
-	gnotski.5.scores
-	gnotski.6.scores
-	gnotski.7.scores
-	gnotski.8.scores
-	gnotski.9.scores
-	gnotski.10.scores
-	gnotski.11.scores
-	gnotski.12.scores
-	gnotski.13.scores
-	gnotski.14.scores
-	gnotski.15.scores
-	gnotski.16.scores
-	gnotski.17.scores
-	gnotski.18.scores
-	gnotski.19.scores
-	gnotski.20.scores
-	gnotski.21.scores
-	gnotski.22.scores
-	gnotski.23.scores
-	gnotski.24.scores
-	gnotski.25.scores
-	gnotski.26.scores
-	gnotski.27.scores
-	gnotski.28.scores
-	gnotski.29.scores
-	gnotski.30.scores
-	gnotski.31.scores
-	gnotski.32.scores
-	gnotski.33.scores
-	gnotski.34.scores
-	gnotski.35.scores
-	gnotski.36.scores
-	gnotski.37.scores
-	gtali.Regular.scores
-	gtali.Colors.scores
-	gnome-mahjongg.easy.scores
-	gnome-mahjongg.difficult.scores
-	gnome-mahjongg.confounding.scores
-	gnome-mahjongg.pyramid.scores
-	gnome-mahjongg.tictactoe.scores
-	gnome-mahjongg.cloud.scores
-	gnome-mahjongg.dragon.scores
-	gnome-mahjongg.bridges.scores
-	gnome-mahjongg.ziggurat.scores
-	quadrapassel.scores
-	swell-foop.small.scores
-	swell-foop.normal.scores
-	swell-foop.large.scores)
-
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
-  for score in "${_scores[@]}" ; do
-    if [ -e "var/games/$score" ]; then
-      continue
-    fi
-
-    touch "var/games/$score"
-    chown root:games "var/games/$score"
-    chmod 664 "var/games/$score"
-  done
-}
-
-pre_upgrade() {
-  (( $(vercmp $2 3.3.5) < 0 )) && gconfpkg --uninstall gnome-games
-  return 0
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
-
-  for score in "${_scores[@]}" ; do
-    rm -f "var/games/$score"
-  done
-}
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index c66c73b07..12ec0d911 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 170820 2012-11-12 08:37:05Z heftig $
+#$Id: PKGBUILD 184243 2013-05-04 20:20:08Z heftig $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gnome-keyring
-pkgver=3.6.2
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-keyring.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ae60558d60171325ddd90603328393d35d7b560a70b7ab45c4d2718d01130cd6')
+sha256sums=('f05692bb32db4d1afa65205ac4e68fa2b79107aca2393e237cf38f880cb7b868')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-keyring/gpg-agent-fix-encoding.patch b/extra/gnome-keyring/gpg-agent-fix-encoding.patch
deleted file mode 100644
index e6a7412b3..000000000
--- a/extra/gnome-keyring/gpg-agent-fix-encoding.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From d31a26df7ce8d9c084b9c66fe00458683dde9864 Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@gnome.org>
-Date: Thu, 28 Jun 2012 15:51:54 +0200
-Subject: [PATCH] gpg-agent: Encode passwords when --data was requested
-
- * Use URI encoding to return passwords when gnupg calls us with
-   a --data argument.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=678771
----
- daemon/gpg-agent/gkd-gpg-agent-ops.c |   41 ++++++++++++++++++++++++++++++----
- 1 file changed, 37 insertions(+), 4 deletions(-)
-
-diff --git a/daemon/gpg-agent/gkd-gpg-agent-ops.c b/daemon/gpg-agent/gkd-gpg-agent-ops.c
-index be6c4d3..a1a21ff 100644
---- a/daemon/gpg-agent/gkd-gpg-agent-ops.c
-+++ b/daemon/gpg-agent/gkd-gpg-agent-ops.c
-@@ -632,11 +632,12 @@ command_has_option (gchar *command, gchar *option)
- 	return has_option;
- }
- 
-+static const char HEXC[] = "0123456789abcdef";
-+
- /* Encode a password in hex */
- static gchar*
--encode_password (const gchar *pass)
-+hex_encode_password (const gchar *pass)
- {
--	static const char HEXC[] = "0123456789abcdef";
- 	int j, c;
- 	gchar *enc, *k;
- 
-@@ -656,6 +657,36 @@ encode_password (const gchar *pass)
- 	return enc;
- }
- 
-+static gchar*
-+uri_encode_password (const gchar *value)
-+{
-+	gchar *p;
-+	gchar *result;
-+
-+	/* Just allocate for worst case */
-+	result = egg_secure_alloc ((strlen (value) * 3) + 1);
-+
-+	/* Now loop through looking for escapes */
-+	p = result;
-+	while (*value) {
-+
-+		/* These characters we let through verbatim */
-+		if (*value && (g_ascii_isalnum (*value) || strchr ("_-.", *value) != NULL)) {
-+			*(p++) = *(value++);
-+
-+		/* All others get encoded */
-+		} else {
-+			*(p++) = '%';
-+			*(p++) = HEXC[((unsigned char)*value) >> 4];
-+			*(p++) = HEXC[((unsigned char)*value) & 0x0F];
-+			++value;
-+		}
-+	}
-+
-+	*p = 0;
-+	return result;
-+}
-+
- /* ----------------------------------------------------------------------------------
-  * OPERATIONS
-  */
-@@ -737,10 +768,12 @@ gkd_gpg_agent_ops_getpass (GkdGpgAgentCall *call, gchar *args)
- 	if (password == NULL) {
- 		gkd_gpg_agent_send_reply (call, FALSE, "111 cancelled");
- 	} else if (flags & GKD_GPG_AGENT_PASS_AS_DATA) {
--		gkd_gpg_agent_send_data (call, password);
-+		encoded = uri_encode_password (password);
-+		gkd_gpg_agent_send_data (call, encoded);
- 		gkd_gpg_agent_send_reply (call, TRUE, NULL);
-+		egg_secure_strfree (encoded);
- 	} else {
--		encoded = encode_password (password);
-+		encoded = hex_encode_password (password);
- 		gkd_gpg_agent_send_reply (call, TRUE, encoded);
- 		egg_secure_strfree (encoded);
- 	}
--- 
-1.7.10.2
\ No newline at end of file
diff --git a/extra/gnome-klotski/PKGBUILD b/extra/gnome-klotski/PKGBUILD
new file mode 100644
index 000000000..99d1552d8
--- /dev/null
+++ b/extra/gnome-klotski/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 183386 2013-04-21 22:10:02Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-klotski
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Slide blocks to solve the puzzle"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=gnome-klotski.install
+url="https://live.gnome.org/Klotski"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('85b2936dc9390bb09d622984b169c0d921b99d786fbd0060d39d319c38d31c71')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/gnome-klotski/gnome-klotski.install b/extra/gnome-klotski/gnome-klotski.install
new file mode 100644
index 000000000..0730c1a47
--- /dev/null
+++ b/extra/gnome-klotski/gnome-klotski.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/gnome-mahjongg/PKGBUILD b/extra/gnome-mahjongg/PKGBUILD
new file mode 100644
index 000000000..c6b6fa33b
--- /dev/null
+++ b/extra/gnome-mahjongg/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-mahjongg
+pkgver=3.8.0
+pkgrel=1
+pkgdesc="Disassemble a pile of tiles by removing matching pairs"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=gnome-mahjongg.install
+url="https://live.gnome.org/Mahjongg"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('6995bfae4c145f07764a7825865804232e620bbdf57c0625d0a21d06561ad496')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/gnome-mahjongg/gnome-mahjongg.install b/extra/gnome-mahjongg/gnome-mahjongg.install
new file mode 100644
index 000000000..0730c1a47
--- /dev/null
+++ b/extra/gnome-mahjongg/gnome-mahjongg.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/gnome-media/PKGBUILD b/extra/gnome-media/PKGBUILD
deleted file mode 100644
index e0e00534d..000000000
--- a/extra/gnome-media/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 156827 2012-04-23 09:07:01Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-media
-pkgver=3.4.0
-pkgrel=1
-pkgdesc="GNOME Media Tools"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('libgnome-media-profiles' 'libcanberra' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils')
-url="http://www.gnome.org"
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-install=gnome-media.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a76fac286f24d3836137ddbaab66f05e19eb5fb83cca6e375dbef040765a1d1f')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-media \
-      --localstatedir=/var --disable-static \
-      --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgbase}.schemas" --domain gnome-media-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-
-  rm -rf "${pkgdir}/usr/share/sounds/"
-}
diff --git a/extra/gnome-media/gnome-media.install b/extra/gnome-media/gnome-media.install
deleted file mode 100644
index 97488b6d0..000000000
--- a/extra/gnome-media/gnome-media.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gnome-media
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD
index 3a561a5f5..e819f3217 100644
--- a/extra/gnome-menus/PKGBUILD
+++ b/extra/gnome-menus/PKGBUILD
@@ -1,27 +1,25 @@
-# $Id: PKGBUILD 175187 2013-01-16 10:52:05Z jgc $
+# $Id: PKGBUILD 183388 2013-04-21 22:10:05Z heftig $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-menus
-pkgver=3.6.2
-pkgrel=1
+pkgver=3.8.0
+pkgrel=2
 pkgdesc="GNOME menu specifications"
 arch=('i686' 'x86_64' 'mips64el')
-depends=('glib2' 'python2-gobject')
+depends=('glib2')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 license=('GPL' 'LGPL')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        menus.patch)
-sha256sums=('f6cefb25ce3ca2a0e4cb43894089cc6079bf948230e99bc0e244b380fa84bf4f'
-            'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc')
+        calculator.patch)
+sha256sums=('33c215ae8d815f4a94d2dbfc8c6679fddbbf8026d30da55a350e67ea940ce14f'
+            'e2b17562cd48794075b6bff98cec1fc8ff817728bcea40834144c699cd8680c8')
 
 build() {
   cd "$pkgname-$pkgver"
-
-  patch -Np0 -i "$srcdir/menus.patch"
-
-  PYTHON=/usr/bin/python2 ./configure \
+  patch -Np1 -i ../calculator.patch
+  ./configure \
       --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var  --disable-static
   make
@@ -30,7 +28,4 @@ build() {
 package(){
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
-
-  sed -i "1s|#!/usr/bin/env python$|&2|" \
-    "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py"
 }
diff --git a/extra/gnome-menus/calculator.patch b/extra/gnome-menus/calculator.patch
new file mode 100644
index 000000000..9ff1ed261
--- /dev/null
+++ b/extra/gnome-menus/calculator.patch
@@ -0,0 +1,41 @@
+From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember@gmail.com>
+Date: Thu, 28 Mar 2013 21:54:34 +0000
+Subject: Adapt for gnome-calculator -> gcalctool desktop file rename
+
+gnome-calculator.desktop was renamed back to gcalctool.desktop, at the
+very last minute before the 3.8.0 release.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696816
+---
+diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
+index 84d13ed..503f9ca 100644
+--- a/layout/gnome-applications.menu
++++ b/layout/gnome-applications.menu
+@@ -38,7 +38,6 @@
+         <Not><Filename>file-roller.desktop</Filename></Not>
+         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
+         <Not><Filename>deja-dup-preferences.desktop</Filename></Not>
+-        <Not><Filename>gnome-calculator.desktop</Filename></Not>
+         <Not><Filename>gcalctool.desktop</Filename></Not>
+         <Not><Filename>gucharmap.desktop</Filename></Not>
+         <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
+@@ -251,7 +250,7 @@
+     <Directory>X-GNOME-Utilities.directory</Directory>
+     <Include>
+       <Filename>file-roller.desktop</Filename>
+-      <Filename>gnome-calculator.desktop</Filename>
++      <Filename>gcalctool.desktop</Filename>
+       <Filename>gnome-font-viewer.desktop</Filename>
+       <Filename>gucharmap.desktop</Filename>
+       <Filename>seahorse.desktop</Filename>
+@@ -287,7 +286,6 @@
+         <Not><Filename>gnome-eog.desktop</Filename></Not>
+         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
+         <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
+-        <Not><Filename>gcalctool.desktop</Filename></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Other -->
+--
+cgit v0.9.1
diff --git a/extra/gnome-menus/menus.patch b/extra/gnome-menus/menus.patch
deleted file mode 100644
index bf73e86cd..000000000
--- a/extra/gnome-menus/menus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- layout/applications.menu	2005-06-28 10:16:39.000000000 +0200
-+++ layout/applications.menu	2005-09-12 23:21:20.000000000 +0200
-@@ -7,7 +7,6 @@
-   <Directory>Applications.directory</Directory>
- 
-   <!-- Scan legacy dirs first, as later items take priority -->
--  <KDELegacyDirs/>
-   <LegacyDir>/etc/X11/applnk</LegacyDir>
-   <LegacyDir>/usr/share/gnome/apps</LegacyDir>
- 
-@@ -18,6 +17,14 @@
-   <!-- Read in overrides and child menus from applications-merged/ -->
-   <DefaultMergeDirs/>
- 
-+  <!-- Archlinux submenu -->
-+  <Menu>
-+    <Name>Archlinux</Name>
-+    <Directory>Archlinux.directory</Directory>
-+    <Include>
-+      <Category>Archlinux</Category>
-+    </Include>
-+  </Menu> <!-- End Archlinux -->
-   <!-- Accessories submenu -->
-   <Menu>
-     <Name>Accessories</Name>
diff --git a/extra/gnome-mines/PKGBUILD b/extra/gnome-mines/PKGBUILD
new file mode 100644
index 000000000..5943c2dc1
--- /dev/null
+++ b/extra/gnome-mines/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 183389 2013-04-21 22:10:07Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-mines
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Clear hidden mines from a minefield"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=gnome-mines.install
+url="https://live.gnome.org/Mines"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('81a47cf8eeb81f1d54ccd42b8eb04f5c8a1e6dcc8fd4f1bc714b147a934da633')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/gnome-mines/gnome-mines.install b/extra/gnome-mines/gnome-mines.install
new file mode 100644
index 000000000..0730c1a47
--- /dev/null
+++ b/extra/gnome-mines/gnome-mines.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD
index 64020997a..e1da9bfed 100644
--- a/extra/gnome-nettool/PKGBUILD
+++ b/extra/gnome-nettool/PKGBUILD
@@ -1,26 +1,29 @@
-# $Id: PKGBUILD 169903 2012-10-30 22:34:22Z heftig $
+# $Id: PKGBUILD 184172 2013-05-03 03:24:57Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <kritoke@nospam.gmail.com>
 
 pkgname=gnome-nettool
-pkgver=3.2.0
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="A Collection of GNOME3 Networking Tools."
 arch=(i686 x86_64 mips64el)
-license=('GPL')
-depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme')
-makedepends=('gnome-doc-utils' 'intltool' 'nmap' 'net-tools')
+license=(GPL)
+depends=(gtk3 libgtop dnsutils iputils dconf whois hicolor-icon-theme)
+makedepends=(yelp-tools intltool nmap net-tools)
 optdepends=('nmap: Port scanning'
             'net-tools: Network statistics')
-groups=('gnome-extra')
+groups=(gnome-extra)
 url="http://www.gnome.org"
 install=gnome-nettool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        printf.patch)
+sha256sums=('3a3480dcef181684f3e37d779cfd43f9b21920412aff78501de1695faf194a28'
+            '4b06c0748650996100f710a2d7c90afc8fb75bbdd1984f243f42318d0985229e')
 
 build() {
   cd $pkgname-$pkgver
+  patch -Np1 -i ../printf.patch
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-schemas-compile
   make
diff --git a/extra/gnome-nettool/printf.patch b/extra/gnome-nettool/printf.patch
new file mode 100644
index 000000000..89868411a
--- /dev/null
+++ b/extra/gnome-nettool/printf.patch
@@ -0,0 +1,34 @@
+diff -u -r gnome-nettool-3.8.0/src/info.c gnome-nettool-3.8.0-printf/src/info.c
+--- gnome-nettool-3.8.0/src/info.c	2013-05-02 13:58:40.000000000 +0200
++++ gnome-nettool-3.8.0-printf/src/info.c	2013-05-03 05:20:04.684921458 +0200
+@@ -232,13 +232,13 @@
+ 	text_rx_bytes = util_legible_bytes (netload.bytes_in);
+ 	text_tx_bytes = util_legible_bytes (netload.bytes_out);
+ 
+-	g_sprintf (rx_pkt, "%lld", netload.packets_in);
+-	g_sprintf (tx_pkt, "%lld", netload.packets_out);
++	g_sprintf (rx_pkt, "%" G_GUINT64_FORMAT, netload.packets_in);
++	g_sprintf (tx_pkt, "%" G_GUINT64_FORMAT, netload.packets_out);
+ 
+-	g_sprintf (rx_error, "%lld", netload.errors_in);
+-	g_sprintf (tx_error, "%lld", netload.errors_out);
++	g_sprintf (rx_error, "%" G_GUINT64_FORMAT, netload.errors_in);
++	g_sprintf (tx_error, "%" G_GUINT64_FORMAT, netload.errors_out);
+ 
+-	g_sprintf (collisions, "%lld", netload.collisions);
++	g_sprintf (collisions, "%" G_GUINT64_FORMAT, netload.collisions);
+ 	
+ 	gtk_label_set_text (GTK_LABEL (info->tx_bytes), text_tx_bytes);
+ 	gtk_label_set_text (GTK_LABEL (info->tx), tx_pkt);
+diff -u -r gnome-nettool-3.8.0/src/utils.c gnome-nettool-3.8.0-printf/src/utils.c
+--- gnome-nettool-3.8.0/src/utils.c	2013-05-02 13:58:40.000000000 +0200
++++ gnome-nettool-3.8.0-printf/src/utils.c	2013-05-03 05:21:45.704202804 +0200
+@@ -272,7 +272,7 @@
+ 	    unit = "KiB";
+ 	}
+ 	
+-	result = g_strdup_printf ("%lld.%lld %s", short_rx / 10,
++	result = g_strdup_printf ("%" G_GUINT64_FORMAT ".%" G_GUINT64_FORMAT " %s", short_rx / 10,
+                                   short_rx % 10, unit);
+ 	return result;	
+ }
diff --git a/extra/gnome-nibbles/PKGBUILD b/extra/gnome-nibbles/PKGBUILD
new file mode 100644
index 000000000..528bbeb45
--- /dev/null
+++ b/extra/gnome-nibbles/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-nibbles
+pkgver=3.8.0
+pkgrel=1
+pkgdesc="Guide a worm around a maze"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'libcanberra' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=gnome-nibbles.install
+url="https://live.gnome.org/Nibbles"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('bc1e4f687f1e794ef15a4162492154970300ac682378e59f9471327e5fd0d606')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile \
+      --with-scores-user=root --with-scores-group=games
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Remove all scores, we generate them from postinstall
+  rm -rf "$pkgdir/var"
+}
diff --git a/extra/gnome-nibbles/gnome-nibbles.install b/extra/gnome-nibbles/gnome-nibbles.install
new file mode 100644
index 000000000..8106ea53c
--- /dev/null
+++ b/extra/gnome-nibbles/gnome-nibbles.install
@@ -0,0 +1,40 @@
+_scores=(
+	gnome-nibbles.1.0.scores
+	gnome-nibbles.2.0.scores
+	gnome-nibbles.3.0.scores
+	gnome-nibbles.4.0.scores
+	gnome-nibbles.1.1.scores
+	gnome-nibbles.2.1.scores
+	gnome-nibbles.3.1.scores
+	gnome-nibbles.4.1.scores
+)
+
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    if [ -e "var/games/$score" ]; then
+      continue
+    fi
+
+    touch "var/games/$score"
+    chown root:games "var/games/$score"
+    chmod 664 "var/games/$score"
+  done
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    rm -f "var/games/$score"
+  done
+}
diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD
index af08e2397..b58d1bcfb 100644
--- a/extra/gnome-online-accounts/PKGBUILD
+++ b/extra/gnome-online-accounts/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170937 2012-11-13 16:38:27Z ibiru $
+# $Id: PKGBUILD 183392 2013-04-21 22:10:11Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-online-accounts
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="GNOME service to access online accounts"
 arch=(i686 x86_64 mips64el)
@@ -13,7 +13,7 @@ makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
 options=(!libtool)
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('55d207d2dc5428f41b0a504aa3edd996a6167a5625d9e11d678f33f282935fa7')
+sha256sums=('26c334000ae74832042142a150e7d0c4b5ced4dc24bdb247f75cbb9e3d2e7261')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-panel/PKGBUILD b/extra/gnome-panel/PKGBUILD
deleted file mode 100644
index 45fd7d020..000000000
--- a/extra/gnome-panel/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 170862 2012-11-12 20:11:06Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-panel
-pkgver=3.6.2
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-pkgdesc="The GNOME Panel"
-url="http://www.gnome.org"
-depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf'
-         'gconf' 'telepathy-glib')
-makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra')
-install=gnome-panel.install
-groups=('gnome')
-provides=("gnome-panel-bonobo=${pkgver}")
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-panel \
-      --disable-scrollkeeper \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-panel-3.0 "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
diff --git a/extra/gnome-panel/gnome-panel.install b/extra/gnome-panel/gnome-panel.install
deleted file mode 100644
index 0f9324937..000000000
--- a/extra/gnome-panel/gnome-panel.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gnome-panel
-
-post_install() {
-  gconfpkg --install $pkgname
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
diff --git a/extra/gnome-phone-manager/PKGBUILD b/extra/gnome-phone-manager/PKGBUILD
deleted file mode 100644
index 6ecde393f..000000000
--- a/extra/gnome-phone-manager/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 169906 2012-10-30 22:34:29Z heftig $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=gnome-phone-manager
-pkgver=0.68
-pkgrel=3
-pkgdesc="Control your mobile phone from your GNOME desktop."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://live.gnome.org/PhoneManager"
-license=('GPL')
-depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' 'libcanberra' 'gconf')
-makedepends=('intltool')
-options=('!emptydirs' '!libtool')
-install=gnome-phone-manager.install
-source=(ftp://ftp.archlinux.org/other/gnome-phone-manager/gnome-phone-manager-0.68-git20121019.tar.xz
-        gnome-phone-manager-0.68-eds.patch)
-sha256sums=('885dfa80989c633a5ae8b118c9b7c903e18e44f0e9fc89e6a9bae05da87c9b15'
-            '98d5c2d3034081eebbaa0dac85f53dcc40c8970114f5711aff8c37bab2931a66')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ../gnome-phone-manager-0.68-eds.patch
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-phone-manager "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/extra/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch b/extra/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch
deleted file mode 100644
index 2a36de13a..000000000
--- a/extra/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch
+++ /dev/null
@@ -1,386 +0,0 @@
-diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.c b/cut-n-paste/e-contact-entry/e-contact-entry.c
-index dc8e2e3..d95e5b9 100644
---- a/cut-n-paste/e-contact-entry/e-contact-entry.c
-+++ b/cut-n-paste/e-contact-entry/e-contact-entry.c
-@@ -38,11 +38,6 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- 
--#include <libedataserver/e-source.h>
--#include <libebook/e-book.h>
--#include <libebook/e-book-view.h>
--#include <libebook/e-contact.h>
--
- #include "e-contact-entry.h"
- #include "econtactentry-marshal.h"
- 
-@@ -59,7 +54,7 @@ static int signals[LAST_SIGNAL] = { 0 };
- /* Properties */
- enum {
-   PROP_0, /* TODO: why? */
--  PROP_SOURCE_LIST,
-+  PROP_REGISTRY,
-   PROP_COMPLETE_LENGTH,
- };
- 
-@@ -70,7 +65,7 @@ enum {
- struct EContactEntryPriv {
-   GtkEntryCompletion *completion;
-   GtkListStore *store;
--  ESourceList *source_list;
-+  ESourceRegistry *registry;
-   /* A list of EntryLookup structs we are searching */
-   GList *lookup_entries;
-   /* Number of characters to start searching at */
-@@ -227,7 +222,7 @@ e_contact_entry_display_func (EContact *contact)
-   emails = e_contact_get (contact, E_CONTACT_EMAIL);
-   for (l = emails; l != NULL; l = l->next) {
-     item = g_new0 (EContactEntyItem, 1);
--    item->identifier = item->identifier = g_strdup (l->data);
-+    item->identifier = g_strdup (l->data);
-     item->display_string = g_strdup_printf ("%s <%s>", (char*)e_contact_get_const (contact, E_CONTACT_NAME_OR_ORG), item->identifier);
- 
-     items = g_list_prepend (items, item);
-@@ -276,22 +271,13 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data)
-       return;
- 
-     photo = e_contact_get (contact, E_CONTACT_PHOTO);
--#ifndef HAVE_ECONTACTPHOTOTYPE
--    if (photo) {
--#else
-     if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
--#endif
-       GdkPixbufLoader *loader;
- 
-       loader = gdk_pixbuf_loader_new ();
- 
--#ifndef HAVE_ECONTACTPHOTOTYPE
--      if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data,
--			      photo->length, NULL))
--#else
-       if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data.inlined.data,
- 			      photo->data.inlined.length, NULL))
--#endif
-         pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
- 
-       if (pixbuf) {
-@@ -339,16 +325,15 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data)
-  * The query on the EBookView has completed.
-  */
- static void
--view_completed_cb (EBookView *book_view, EBookViewStatus status, gpointer user_data)
-+view_completed_cb (EBookView *book_view, EBookViewStatus status, const gchar *message, gpointer user_data)
- {
-   EntryLookup *lookup;
-   g_return_if_fail (user_data != NULL);
--  /* TODO: handle status != OK */
--  g_return_if_fail (status == E_BOOK_ERROR_OK);
-   g_return_if_fail (book_view != NULL);
- 
-   lookup = (EntryLookup*)user_data;
-   g_object_unref (lookup->bookview);
-+  lookup->bookview = NULL;
- }
- 
- /**
-@@ -373,8 +358,8 @@ bookview_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer clo
-   lookup->bookview = book_view;
-   g_object_add_weak_pointer ((GObject*)book_view, (gpointer*)&lookup->bookview);
-   
--  g_signal_connect (book_view, "contacts_added", (GCallback)view_contacts_added_cb, lookup);
--  g_signal_connect (book_view, "sequence_complete", (GCallback)view_completed_cb, lookup);
-+  g_signal_connect (book_view, "contacts-added", (GCallback)view_contacts_added_cb, lookup);
-+  g_signal_connect (book_view, "view_complete", (GCallback)view_completed_cb, lookup);
-   
-   e_book_view_start (book_view);
- }
-@@ -396,6 +381,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data)
-       if (lookup->bookview) {
-         e_book_view_stop (lookup->bookview);
-         g_object_unref (lookup->bookview);
-+        lookup->bookview = NULL;
-       }
-     }
-     
-@@ -410,7 +396,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data)
-       if (!lookup->open)
-         continue;
-       
--      if (e_book_async_get_book_view (lookup->book, query, NULL, 11, (EBookBookViewCallback)bookview_cb, lookup) != 0) {
-+      if (e_book_async_get_book_view (lookup->book, query, NULL, MAX_ENTRIES, (EBookBookViewCallback)bookview_cb, lookup) == FALSE) {
-         g_signal_emit (entry, signals[ERROR], 0, _("Cannot create searchable view."));
-       }
-     }
-@@ -458,11 +444,12 @@ book_opened_cb (EBook *book, EBookStatus status, gpointer data)
-  */
- 
- void
--e_contact_entry_set_source_list (EContactEntry *entry,
--    				  ESourceList *source_list)
-+e_contact_entry_set_registry (EContactEntry *entry,
-+    			      ESourceRegistry *registry)
- {
-+  GList *list, *link;
-+  const gchar *extension_name;
-   GError *error = NULL;
--  GSList *list, *l;
- 
-   g_return_if_fail (E_IS_CONTACT_ENTRY (entry));
- 
-@@ -471,58 +458,48 @@ e_contact_entry_set_source_list (EContactEntry *entry,
-     g_list_foreach (entry->priv->lookup_entries, (GFunc)lookup_entry_free, NULL);
-     g_list_free (entry->priv->lookup_entries);
-   }
--  if (entry->priv->source_list) {
--    g_object_unref (entry->priv->source_list);
-+  if (entry->priv->registry) {
-+    g_object_unref (entry->priv->registry);
-   }
- 
-   /* If we have no new sources, disable and return here */
--  if (source_list == NULL) {
-+  if (registry == NULL) {
-     g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE);
--    entry->priv->source_list = NULL;
-+    entry->priv->registry = NULL;
-     entry->priv->lookup_entries = NULL;
-     return;
-   }
- 
--  entry->priv->source_list = source_list;
--  /* So that the list isn't going away underneath us */
--  g_object_ref (entry->priv->source_list);
-+  entry->priv->registry = registry;
-+  /* So that the registry isn't going away underneath us */
-+  g_object_ref (entry->priv->registry);
- 
--  /* That gets us a list of ESourceGroup */
--  list = e_source_list_peek_groups (source_list);
-   entry->priv->lookup_entries = NULL;
- 
--  for (l = list; l != NULL; l = l->next) {
--    ESourceGroup *group = l->data;
--    GSList *sources = NULL, *m;
--    /* That should give us a list of ESource */
--    sources = e_source_group_peek_sources (group);
--    for (m = sources; m != NULL; m = m->next) {
--      ESource *source = m->data;
--      ESource *s = e_source_copy (source);
--      EntryLookup *lookup;
--      char *uri;
-+  extension_name = E_SOURCE_EXTENSION_ADDRESS_BOOK;
-+  list = e_source_registry_list_sources (registry, extension_name);
- 
--      uri = g_strdup_printf("%s/%s", e_source_group_peek_base_uri (group), e_source_peek_relative_uri (source));
--      e_source_set_absolute_uri (s, uri);
--      g_free (uri);
-+  for (link = list; link != NULL; link = g_list_next (link)) {
-+    ESource *source = E_SOURCE (link->data);
-+    EntryLookup *lookup;
- 
--      /* Now add those to the lookup entries list */
--      lookup = g_new0 (EntryLookup, 1);
--      lookup->entry = entry;
--      lookup->status = E_BOOK_ERROR_OK;
--      lookup->open = FALSE;
-+    /* Now add those to the lookup entries list */
-+    lookup = g_new0 (EntryLookup, 1);
-+    lookup->entry = entry;
-+    lookup->status = E_BOOK_ERROR_OK;
-+    lookup->open = FALSE;
- 
--      if ((lookup->book = e_book_new (s, &error)) == NULL) {
--        /* TODO handle this better, fire the error signal I guess */
-+    if ((lookup->book = e_book_new (source, &error)) == NULL) {
-+      /* TODO handle this better, fire the error signal I guess */
-+      if (error) {
-         g_warning ("%s", error->message);
--	g_error_free (error);
--	g_free (lookup);
--      } else {
--        entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup);
--	e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup);
-+        g_error_free (error);
-+        error = NULL;
-       }
--
--      g_object_unref (s);
-+      g_free (lookup);
-+    } else {
-+      entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup);
-+      e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup);
-     }
-   }
- 
-@@ -530,12 +507,12 @@ e_contact_entry_set_source_list (EContactEntry *entry,
-     g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE);
- }
- 
--ESourceList *
--e_contact_entry_get_source_list (EContactEntry *entry)
-+ESourceRegistry *
-+e_contact_entry_get_registry (EContactEntry *entry)
- {
-   g_return_val_if_fail (E_IS_CONTACT_ENTRY (entry), NULL);
- 
--  return entry->priv->source_list;
-+  return entry->priv->registry;
- }
- 
- void
-@@ -601,8 +578,8 @@ e_contact_entry_set_property (GObject *object, guint property_id, const GValue *
-   entry = E_CONTACT_ENTRY (object);
-   
-   switch (property_id) {
--  case PROP_SOURCE_LIST:
--    e_contact_entry_set_source_list (entry, g_value_get_object (value));
-+  case PROP_REGISTRY:
-+    e_contact_entry_set_registry (entry, g_value_get_object (value));
-     break;
-   case PROP_COMPLETE_LENGTH:
-     e_contact_entry_set_complete_length (entry, g_value_get_int (value));
-@@ -620,8 +597,8 @@ e_contact_entry_get_property (GObject *object, guint property_id, GValue *value,
-   entry = E_CONTACT_ENTRY (object);
-   
-   switch (property_id) {
--  case PROP_SOURCE_LIST:
--    g_value_set_object (value, e_contact_entry_get_source_list (entry));
-+  case PROP_REGISTRY:
-+    g_value_set_object (value, e_contact_entry_get_registry (entry));
-     break;
-   case PROP_COMPLETE_LENGTH:
-     g_value_set_int (value, e_contact_entry_get_complete_length (entry));
-@@ -644,7 +621,7 @@ e_contact_entry_finalize (GObject *object)
-     g_list_free (entry->priv->lookup_entries);
-     g_object_unref (entry->priv->completion);
-     g_object_unref (entry->priv->store);
--    g_object_unref (entry->priv->source_list);
-+    g_object_unref (entry->priv->registry);
- 
-     if (entry->priv->display_destroy) {
-       entry->priv->display_destroy (entry->priv->display_func);
-@@ -657,7 +634,7 @@ e_contact_entry_finalize (GObject *object)
- static void
- reset_search_fields (EContactEntry *entry)
- {
--  EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, E_CONTACT_ORG, 0 };
-+  EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, 0 };
- 
-   g_free (entry->priv->search_fields);
-   entry->priv->search_fields = g_new0 (EContactField, G_N_ELEMENTS (fields));
-@@ -716,9 +693,9 @@ e_contact_entry_class_init (EContactEntryClass *klass)
-   object_class->finalize = e_contact_entry_finalize;
- 
-   /* Properties */
--  g_object_class_install_property (object_class, PROP_SOURCE_LIST,
--                                   g_param_spec_object ("source-list", "Source List", "The source list to search for contacts.",
--                                                        E_TYPE_SOURCE_LIST, G_PARAM_READWRITE));
-+  g_object_class_install_property (object_class, PROP_REGISTRY,
-+                                   g_param_spec_object ("registry", "Registry", "Data source registry.",
-+                                                        E_TYPE_SOURCE_REGISTRY, G_PARAM_READWRITE));
-   
-   g_object_class_install_property (object_class, PROP_COMPLETE_LENGTH,
-                                    g_param_spec_int ("complete-length", "Complete length", "Number of characters to start a search on.",
-@@ -771,6 +748,7 @@ lookup_entry_free (EntryLookup *lookup)
-   if (lookup->bookview) {
-     g_warning("EBookView still around");
-     g_object_unref (lookup->bookview);
-+    lookup->bookview = NULL;
-   }
-   if (lookup->book) {
-     g_object_unref (lookup->book);
-diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.h b/cut-n-paste/e-contact-entry/e-contact-entry.h
-index bf6b39b..6fedef7 100644
---- a/cut-n-paste/e-contact-entry/e-contact-entry.h
-+++ b/cut-n-paste/e-contact-entry/e-contact-entry.h
-@@ -23,10 +23,8 @@
- #ifndef CONTACT_ENTRY_H
- #define CONTACT_ENTRY_H
- 
--#include <libedataserver/e-source-group.h>
--#include <libedataserver/e-source-list.h>
--#include <libebook/e-contact.h>
- #include <gtk/gtk.h>
-+#include <libebook/libebook.h>
- 
- G_BEGIN_DECLS
- 
-@@ -71,8 +69,8 @@ GType e_contact_entry_get_type (void);
- 
- GtkWidget *e_contact_entry_new (void);
- 
--void e_contact_entry_set_source_list (EContactEntry *entry, ESourceList *list);
--ESourceList *e_contact_entry_get_source_list (EContactEntry *entry);
-+void e_contact_entry_set_registry (EContactEntry *entry, ESourceRegistry *registry);
-+ESourceRegistry *e_contact_entry_get_registry (EContactEntry *entry);
- 
- void e_contact_entry_set_complete_length(EContactEntry *entry, int length);
- int e_contact_entry_get_complete_length(EContactEntry *entry);
-diff --git a/libgsm/phonemgr-utils.c b/libgsm/phonemgr-utils.c
-index 4e62e10..baef34f 100644
---- a/libgsm/phonemgr-utils.c
-+++ b/libgsm/phonemgr-utils.c
-@@ -27,7 +27,7 @@
- #include <glib.h>
- #include <glib/gstdio.h>
- #include <glib-object.h>
--#include <libebook/e-contact.h>
-+#include <libebook/libebook.h>
- #include <gnokii.h>
- 
- #include <bluetooth/bluetooth.h>
-diff --git a/src/e-phone-entry.c b/src/e-phone-entry.c
-index 5d25622..38f4c2f 100644
---- a/src/e-phone-entry.c
-+++ b/src/e-phone-entry.c
-@@ -31,8 +31,7 @@
- 
- #include <gtk/gtk.h>
- #include <string.h>
--#include <libedataserver/e-source-list.h>
--#include <libedataserverui/e-client-utils.h>
-+#include <libedataserverui/libedataserverui.h>
- #include "e-phone-entry.h"
- 
- #define CONTACT_FORMAT "%s (%s)"
-@@ -181,25 +180,25 @@ e_phone_entry_finalize (GObject *object)
- }
- 
- static void
--add_sources (EContactEntry *entry)
--{
--	ESourceList *source_list;
--
--	if (e_client_utils_get_sources (&source_list,
--					E_CLIENT_SOURCE_TYPE_CONTACTS,
--					NULL)) {
--		e_contact_entry_set_source_list (E_CONTACT_ENTRY (entry),
--						 source_list);
--		g_object_unref (source_list);
--	}
--}
--
--static void
- e_phone_entry_init (EPhoneEntry *entry)
- {
- 	EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_NICKNAME, E_CONTACT_ORG, E_CONTACT_PHONE_MOBILE, 0 };
-+	ESourceRegistry *registry;
-+	GError *error = NULL;
-+
-+	/* XXX This call blocks while a D-Bus connection is made, possibly
-+	 *     requiring activation.  Might be better to create the registry
-+	 *     in main(), pass it to ui_init(), and have e_phone_entry_new()
-+	 *     take it as an argument.  Calling this from main() means if it
-+	 *     fails you can abort cleanly with a console error message. */
-+	registry = e_source_registry_new_sync (NULL, &error);
-+	if (registry == NULL) {
-+		g_error ("%s: %s", G_STRFUNC, error->message);
-+		g_assert_not_reached ();
-+	}
-+	e_contact_entry_set_registry (E_CONTACT_ENTRY (entry), registry);
-+	g_object_unref (registry);
- 
--	add_sources (E_CONTACT_ENTRY (entry));
- 	e_contact_entry_set_search_fields (E_CONTACT_ENTRY (entry), (const EContactField *)fields);
- 	e_contact_entry_set_display_func (E_CONTACT_ENTRY (entry), test_display_func, NULL, NULL);
- 	g_signal_connect (G_OBJECT (entry), "contact_selected",
diff --git a/extra/gnome-phone-manager/gnome-phone-manager.install b/extra/gnome-phone-manager/gnome-phone-manager.install
deleted file mode 100644
index 91212fa2e..000000000
--- a/extra/gnome-phone-manager/gnome-phone-manager.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=gnome-phone-manager
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch b/extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch
deleted file mode 100644
index 2200f9dcf..000000000
--- a/extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2877c3a41b7e8feeb6eb6d6f718f4556ffb0161c Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Mon, 05 Dec 2011 08:10:59 +0000
-Subject: Bug 665309: Adapt to gnome-bluetooth 3.3 API
-
----
-diff --git a/configure.in b/configure.in
-index 101a77f..d0a7651 100644
---- a/configure.in
-+++ b/configure.in
-@@ -13,7 +13,7 @@ dnl Initialize libtool
- AM_PROG_LIBTOOL
- 
- GNOKII_REQS="gnokii >= 0.6.28"
--GNOME_BLUETOOTH_REQS="gnome-bluetooth-1.0 >= 3.0"
-+GNOME_BLUETOOTH_REQS="gnome-bluetooth-1.0 >= 3.3"
- 
- AC_PROG_CC
- AC_PROG_INSTALL
-diff --git a/gnome-bluetooth/phonemgr.c b/gnome-bluetooth/phonemgr.c
-index 9ebac12..fecc367 100644
---- a/gnome-bluetooth/phonemgr.c
-+++ b/gnome-bluetooth/phonemgr.c
-@@ -44,7 +44,7 @@ get_type (const char *address)
- 	gboolean cont;
- 
- 	client = bluetooth_client_new (); 
--	model = bluetooth_client_get_device_model (client, NULL);
-+	model = bluetooth_client_get_device_model (client);
- 	if (model == NULL) {
- 		g_object_unref (client);
- 		return type;
---
-cgit v0.9.0.2
diff --git a/extra/gnome-photos/PKGBUILD b/extra/gnome-photos/PKGBUILD
new file mode 100644
index 000000000..8e8d670bd
--- /dev/null
+++ b/extra/gnome-photos/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 183480 2013-04-21 22:20:19Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=gnome-photos
+pkgver=3.8.0
+pkgrel=1
+pkgdesc="Access, organize, and share your photos on GNOME"
+arch=(i686 x86_64 mips64el)
+url="https://www.gnome.org/"
+license=(GPL)
+depends=(exempi gtk3 libexif librsvg babl gegl gnome-desktop gnome-online-accounts lcms2 tracker hicolor-icon-theme)
+makedepends=(intltool)
+options=(!libtool)
+groups=(gnome-extra)
+install=gnome-photos.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('d5a42a6562eb2bebd404f1b932e105572e64abb0e3160b2834c7898cf090f3de')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/gnome-photos/gnome-photos.install b/extra/gnome-photos/gnome-photos.install
new file mode 100644
index 000000000..847019792
--- /dev/null
+++ b/extra/gnome-photos/gnome-photos.install
@@ -0,0 +1,12 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD
index ce92f72d8..ffe8a4a86 100644
--- a/extra/gnome-power-manager/PKGBUILD
+++ b/extra/gnome-power-manager/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 169907 2012-10-30 22:34:30Z heftig $
+# $Id: PKGBUILD 183393 2013-04-21 22:10:14Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-power-manager
-pkgver=3.6.0
+pkgver=3.8.1
 pkgrel=1
-pkgdesc="Power management tools."
-arch=(i686 x86_64 'mips64el')
+pkgdesc="System power information and statistics"
+arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org/projects/gnome-power-manager/"
-license=('GPL')
-depends=('gtk3' 'upower' 'dconf' 'hicolor-icon-theme')
-makedepends=('intltool')
+license=(GPL)
+depends=(gtk3 upower dconf hicolor-icon-theme)
+makedepends=(intltool)
 options=(!emptydirs)
 install=gnome-power-manager.install
-groups=(gnome-extra)
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('176023d51d544a888bcd07611f2c1adaedfe2e20796f3fb97fba59f6330851c6')
+sha256sums=('f5b5ef2282fae3bcdcc8473af3cc5e32ad7ac7e2444fc93abf00c3d2967361bf')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-robots/PKGBUILD b/extra/gnome-robots/PKGBUILD
new file mode 100644
index 000000000..cc7133763
--- /dev/null
+++ b/extra/gnome-robots/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 183394 2013-04-21 22:10:16Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-robots
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Avoid the robots and make them crash into each other"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'libcanberra' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=gnome-robots.install
+url="https://live.gnome.org/Robots"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('6faeeef5ab9b5002c7ca3cf60ea67e7a66064654ae28c68c233b2ee40459a704')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile \
+      --with-scores-user=root --with-scores-group=games
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Remove all scores, we generate them from postinstall
+  rm -rf "$pkgdir/var"
+}
diff --git a/extra/gnome-robots/gnome-robots.install b/extra/gnome-robots/gnome-robots.install
new file mode 100644
index 000000000..3422e0c8a
--- /dev/null
+++ b/extra/gnome-robots/gnome-robots.install
@@ -0,0 +1,47 @@
+_scores=(
+	gnome-robots2.robots2.scores
+	gnome-robots2.robots2-safe.scores
+	gnome-robots2.robots2-super-safe.scores
+	gnome-robots2.robots2_easy.scores
+	gnome-robots2.robots2_easy-safe.scores
+	gnome-robots2.robots2_easy-super-safe.scores
+	gnome-robots2.classic_robots.scores
+	gnome-robots2.classic_robots-safe.scores
+	gnome-robots2.classic_robots-super-safe.scores
+	gnome-robots2.robots_with_safe_teleport.scores
+	gnome-robots2.robots_with_safe_teleport-safe.scores
+	gnome-robots2.robots_with_safe_teleport-super-safe.scores
+	gnome-robots2.nightmare.scores
+	gnome-robots2.nightmare-safe.scores
+	gnome-robots2.nightmare-super-safe.scores
+)
+
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    if [ -e "var/games/$score" ]; then
+      continue
+    fi
+
+    touch "var/games/$score"
+    chown root:games "var/games/$score"
+    chmod 664 "var/games/$score"
+  done
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    rm -f "var/games/$score"
+  done
+}
diff --git a/extra/gnome-screensaver/PKGBUILD b/extra/gnome-screensaver/PKGBUILD
deleted file mode 100644
index a90034576..000000000
--- a/extra/gnome-screensaver/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 169908 2012-10-30 22:34:33Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-screensaver
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://live.gnome.org/GnomeScreensaver"
-backup=(etc/pam.d/gnome-screensaver)
-depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas' 'libsystemd')
-makedepends=('pkgconfig' 'intltool' 'libxss')
-groups=('gnome')
-options=(!emptydirs)
-install=gnome-screensaver.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-       gnome-screensaver.pam)
-sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
-            'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-screensaver \
-      --localstatedir=/var \
-      --with-mit-ext --with-systemd
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../gnome-screensaver.pam "$pkgdir/etc/pam.d/gnome-screensaver"
-}
diff --git a/extra/gnome-screensaver/gnome-screensaver.install b/extra/gnome-screensaver/gnome-screensaver.install
deleted file mode 100644
index d1a42c6ce..000000000
--- a/extra/gnome-screensaver/gnome-screensaver.install
+++ /dev/null
@@ -1,7 +0,0 @@
-pkgname=gnome-screensaver
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-        gconfpkg --uninstall ${pkgname}
-    fi
-}
diff --git a/extra/gnome-screensaver/gnome-screensaver.pam b/extra/gnome-screensaver/gnome-screensaver.pam
deleted file mode 100644
index 453dae646..000000000
--- a/extra/gnome-screensaver/gnome-screensaver.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth        required     pam_unix_auth.so nullok
-auth        optional     pam_gnome_keyring.so
diff --git a/extra/gnome-screenshot/PKGBUILD b/extra/gnome-screenshot/PKGBUILD
index bd955e1f2..1ff4b40d6 100644
--- a/extra/gnome-screenshot/PKGBUILD
+++ b/extra/gnome-screenshot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170897 2012-11-12 22:32:16Z heftig $
+# $Id: PKGBUILD 183395 2013-04-21 22:10:17Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-screenshot
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Take pictures of your screen"
 arch=(i686 x86_64 mips64el)
@@ -10,10 +10,10 @@ url="http://gnome.org"
 license=('GPL2')
 depends=('dconf' 'gtk3' 'libcanberra')
 makedepends=('intltool')
-groups=('gnome-extra')
+groups=('gnome')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7954424f927c9cf5451d27e78edd10fa80d15345dfdb78bd7bc98f873617f382')
+sha256sums=('113ab0fe98080f888ff8ff15011b21e74b5582576cb5455db47cbfd9e9075a05')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-search-tool/PKGBUILD b/extra/gnome-search-tool/PKGBUILD
index 7a8faea13..30f780663 100644
--- a/extra/gnome-search-tool/PKGBUILD
+++ b/extra/gnome-search-tool/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 169910 2012-10-30 22:34:37Z heftig $
+# $Id: PKGBUILD 183396 2013-04-21 22:10:19Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-search-tool
 pkgver=3.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Utility to search for files"
 arch=(i686 x86_64 mips64el)
 url="http://gnome.org"
 license=('GPL2')
-depends=('gtk3' 'libsm')
+depends=('nautilus' 'libsm')
 makedepends=('intltool' 'yelp-tools')
 install=$pkgname.install
 options=('!emptydirs')
-groups=('gnome-extra')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('a33000cd7d033be4ea50422f0f2cca611da5b79bd0f0875017f105a1bc177f42')
 
diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD
index 552c7f486..1f0f8e8d3 100644
--- a/extra/gnome-session/PKGBUILD
+++ b/extra/gnome-session/PKGBUILD
@@ -1,32 +1,27 @@
-# $Id: PKGBUILD 170916 2012-11-12 23:48:19Z heftig $
+# $Id: PKGBUILD 184166 2013-05-03 02:07:55Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-session
-pkgver=3.6.2
-pkgrel=1
+pkgver=3.8.1
+pkgrel=2
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64 'mips64el')
-license=('GPL' 'LGPL')
-depends=('libsystemd' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3'
-         'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'polkit-gnome'
-         'upower')
-makedepends=('intltool' 'mesa' 'xtrans')
+license=(GPL LGPL)
+depends=(systemd dconf gconf gsettings-desktop-schemas gtk3 gnome-desktop
+         hicolor-icon-theme json-glib libgl libsm libxtst upower)
+makedepends=(intltool mesa gtk-doc xtrans)
 options=('!emptydirs')
 install=gnome-session.install
 url="http://www.gnome.org"
-groups=('gnome')
+groups=(gnome)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
-        gnome-session-3.3.1-llvmpipe.patch timeout.patch)
-sha256sums=('2e3a3466eed4136826e150b639c63beb5c93710346dea2e538adfe5e18d701b4'
-            '59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e'
+        timeout.patch)
+sha256sums=('6c1cf3c0bc86da1dc5ec2d1a7bb3332b15652d4a468c52c5ae894b46b4a14770'
             '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
 
 build() {
   cd $pkgname-$pkgver
 
-  # Allow software rendering
-  patch -Np1 -i ../gnome-session-3.3.1-llvmpipe.patch
-
   # Increase timeout, for slow machines
   patch -Np1 -i ../timeout.patch
 
diff --git a/extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch b/extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch
deleted file mode 100644
index 40da1c9b7..000000000
--- a/extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up gnome-session-3.3.1/data/hardware-compatibility.jx gnome-session-3.3.1/data/hardware-compatibility
---- gnome-session-3.3.1/data/hardware-compatibility.jx	2011-10-21 10:35:39.000000000 -0400
-+++ gnome-session-3.3.1/data/hardware-compatibility	2011-11-03 17:53:17.156407217 -0400
-@@ -20,4 +20,4 @@
- 
- # Gallium has softpipe and llvmpipe
- -softpipe
---llvmpipe
-+#llvmpipe
diff --git a/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
deleted file mode 100644
index eb77bada2..000000000
--- a/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
+++ /dev/null
@@ -1,1476 +0,0 @@
-From f418ff2cd04b233dbffc1129e856630d8c96cd07 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 21 Sep 2012 11:56:53 +0100
-Subject: [PATCH] power and media-keys: Use logind for suspending and
- rebooting the system
-
-Use the new logind features to suspend and resume but making sure we opt out
-of logind handling the sleep and power keys, and also inhibiting for lid close
-auto-suspend if there is an external monitor connected.
-
-Also use a delay inihibit for logind so that we can do actions on suspend like
-blanking the screen using the screensaver and also poking the screensaver on
-resume.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=680689
-
-Conflicts:
-	plugins/power/gsd-power-manager.c
----
- plugins/common/Makefile.am                  |   4 +-
- plugins/common/gsd-power-helper.c           | 203 --------
- plugins/common/gsd-power-helper.h           |  35 --
- plugins/media-keys/gsd-media-keys-manager.c | 156 +++++--
- plugins/power/gsd-power-manager.c           | 697 +++++++++++++++++++---------
- 5 files changed, 594 insertions(+), 501 deletions(-)
- delete mode 100644 plugins/common/gsd-power-helper.c
- delete mode 100644 plugins/common/gsd-power-helper.h
-
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
-index 7e50db4..b0e907c 100644
---- a/plugins/common/Makefile.am
-+++ b/plugins/common/Makefile.am
-@@ -6,9 +6,7 @@ libcommon_la_SOURCES = \
- 	gsd-keygrab.c		\
- 	gsd-keygrab.h		\
- 	gsd-input-helper.c	\
--	gsd-input-helper.h	\
--	gsd-power-helper.c	\
--	gsd-power-helper.h
-+	gsd-input-helper.h
- 
- libcommon_la_CPPFLAGS = \
- 	$(AM_CPPFLAGS)
-diff --git a/plugins/common/gsd-power-helper.c b/plugins/common/gsd-power-helper.c
-deleted file mode 100644
-index 27d0eda..0000000
---- a/plugins/common/gsd-power-helper.c
-+++ /dev/null
-@@ -1,203 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- */
--
--#include "config.h"
--
--#include "gsd-power-helper.h"
--
--#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
--#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
--#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
--
--#define CONSOLEKIT_DBUS_NAME                    "org.freedesktop.ConsoleKit"
--#define CONSOLEKIT_DBUS_PATH_MANAGER            "/org/freedesktop/ConsoleKit/Manager"
--#define CONSOLEKIT_DBUS_INTERFACE_MANAGER       "org.freedesktop.ConsoleKit.Manager"
--
--#ifdef HAVE_SYSTEMD
--static void
--systemd_stop (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "PowerOff",
--                                g_variant_new ("(b)", FALSE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--static void
--systemd_suspend (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "Suspend",
--                                g_variant_new ("(b)", TRUE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--static void
--systemd_hibernate (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "Hibernate",
--                                g_variant_new ("(b)", TRUE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--#else /* HAVE_SYSTEMD */
--
--static void
--consolekit_stop_cb (GObject *source_object,
--                    GAsyncResult *res,
--                    gpointer user_data)
--{
--        GVariant *result;
--        GError *error = NULL;
--
--        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
--                                           res,
--                                           &error);
--        if (result == NULL) {
--                g_warning ("couldn't stop using ConsoleKit: %s",
--                           error->message);
--                g_error_free (error);
--        } else {
--                g_variant_unref (result);
--        }
--}
--
--static void
--consolekit_stop (void)
--{
--        GError *error = NULL;
--        GDBusProxy *proxy;
--
--        /* power down the machine in a safe way */
--        proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
--                                               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--                                               NULL,
--                                               CONSOLEKIT_DBUS_NAME,
--                                               CONSOLEKIT_DBUS_PATH_MANAGER,
--                                               CONSOLEKIT_DBUS_INTERFACE_MANAGER,
--                                               NULL, &error);
--        if (proxy == NULL) {
--                g_warning ("cannot connect to ConsoleKit: %s",
--                           error->message);
--                g_error_free (error);
--                return;
--        }
--        g_dbus_proxy_call (proxy,
--                           "Stop",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           consolekit_stop_cb, NULL);
--        g_object_unref (proxy);
--}
--static void
--upower_sleep_cb (GObject *source_object,
--                 GAsyncResult *res,
--                 gpointer user_data)
--{
--        GVariant *result;
--        GError *error = NULL;
--
--        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
--                                           res,
--                                           &error);
--        if (result == NULL) {
--                g_warning ("couldn't sleep using UPower: %s",
--                           error->message);
--                g_error_free (error);
--        } else {
--                g_variant_unref (result);
--        }
--}
--
--static void
--upower_suspend (GDBusProxy *upower_proxy)
--{
--        g_dbus_proxy_call (upower_proxy,
--                           "Suspend",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           upower_sleep_cb, NULL);
--}
--
--static void
--upower_hibernate (GDBusProxy *upower_proxy)
--{
--        g_dbus_proxy_call (upower_proxy,
--                           "Hibernate",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           upower_sleep_cb, NULL);
--}
--#endif /* HAVE_SYSTEMD */
--
--void
--gsd_power_suspend (GDBusProxy *upower_proxy)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_suspend ();
--#else
--	upower_suspend (upower_proxy);
--#endif
--}
--
--void
--gsd_power_poweroff (void)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_stop ();
--#else
--	consolekit_stop ();
--#endif
--}
--
--void
--gsd_power_hibernate (GDBusProxy *upower_proxy)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_hibernate ();
--#else
--	upower_hibernate (upower_proxy);
--#endif
--}
-diff --git a/plugins/common/gsd-power-helper.h b/plugins/common/gsd-power-helper.h
-deleted file mode 100644
-index e3be14f..0000000
---- a/plugins/common/gsd-power-helper.h
-+++ /dev/null
-@@ -1,35 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- */
--
--#ifndef __GSD_POWER_HELPER_H
--#define __GSD_POWER_HELPER_H
--
--#include <glib.h>
--
--G_BEGIN_DECLS
--
--#include <gio/gio.h>
--
--void gsd_power_suspend   (GDBusProxy *upower_proxy);
--void gsd_power_hibernate (GDBusProxy *upower_proxy);
--void gsd_power_poweroff  (void);
--
--G_END_DECLS
--
--#endif /* __GSD_POWER_HELPER_H */
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index 9c84d7f..a2f277e 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -39,6 +39,7 @@
- #include <gdk/gdkx.h>
- #include <gtk/gtk.h>
- #include <gio/gdesktopappinfo.h>
-+#include <gio/gunixfdlist.h>
- 
- #ifdef HAVE_GUDEV
- #include <gudev/gudev.h>
-@@ -51,7 +52,6 @@
- #include "shortcuts-list.h"
- #include "gsd-osd-window.h"
- #include "gsd-input-helper.h"
--#include "gsd-power-helper.h"
- #include "gsd-enums.h"
- 
- #include <canberra.h>
-@@ -105,6 +105,10 @@ static const gchar introspection_xml[] =
- #define KEY_CURRENT_INPUT_SOURCE "current"
- #define KEY_INPUT_SOURCES        "sources"
- 
-+#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
-+
- #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate))
- 
- typedef struct {
-@@ -148,10 +152,13 @@ struct GsdMediaKeysManagerPrivate
- 
-         /* Power stuff */
-         GSettings       *power_settings;
--        GDBusProxy      *upower_proxy;
-         GDBusProxy      *power_screen_proxy;
-         GDBusProxy      *power_keyboard_proxy;
- 
-+        /* systemd stuff */
-+        GDBusProxy      *logind_proxy;
-+        gint             inhibit_keys_fd;
-+
-         /* Multihead stuff */
-         GdkScreen       *current_screen;
-         GSList          *screens;
-@@ -1618,6 +1625,38 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager)
- }
- 
- static void
-+power_action_suspend (GsdMediaKeysManager *manager)
-+{
-+#ifndef HAVE_SYSTEMD
-+        g_warning ("no systemd support");
-+        return;
-+#endif
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Suspend",
-+                           g_variant_new ("(b)", TRUE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           manager->priv->bus_cancellable,
-+                           NULL, NULL);
-+}
-+
-+static void
-+power_action_hibernate (GsdMediaKeysManager *manager)
-+{
-+#ifndef HAVE_SYSTEMD
-+        g_warning ("no systemd support");
-+        return;
-+#endif
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Hibernate",
-+                           g_variant_new ("(b)", TRUE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           manager->priv->bus_cancellable,
-+                           NULL, NULL);
-+}
-+
-+static void
- do_config_power_action (GsdMediaKeysManager *manager,
-                         const gchar *config_key)
- {
-@@ -1627,14 +1666,14 @@ do_config_power_action (GsdMediaKeysManager *manager,
-                                            config_key);
-         switch (action_type) {
-         case GSD_POWER_ACTION_SUSPEND:
--                gsd_power_suspend (manager->priv->upower_proxy);
-+                power_action_suspend (manager);
-                 break;
-         case GSD_POWER_ACTION_INTERACTIVE:
-         case GSD_POWER_ACTION_SHUTDOWN:
-                 gnome_session_shutdown (manager);
-                 break;
-         case GSD_POWER_ACTION_HIBERNATE:
--                gsd_power_hibernate (manager->priv->upower_proxy);
-+                power_action_hibernate (manager);
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-         case GSD_POWER_ACTION_NOTHING:
-@@ -2248,6 +2287,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
-         }
- #endif /* HAVE_GUDEV */
- 
-+        g_clear_object (&priv->logind_proxy);
-         if (priv->settings) {
-                 g_object_unref (priv->settings);
-                 priv->settings = NULL;
-@@ -2268,11 +2308,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
-                 priv->power_keyboard_proxy = NULL;
-         }
- 
--        if (priv->upower_proxy) {
--                g_object_unref (priv->upower_proxy);
--                priv->upower_proxy = NULL;
--        }
--
-         if (priv->cancellable != NULL) {
-                 g_cancellable_cancel (priv->cancellable);
-                 g_object_unref (priv->cancellable);
-@@ -2363,9 +2398,85 @@ gsd_media_keys_manager_class_init (GsdMediaKeysManagerClass *klass)
- }
- 
- static void
-+inhibit_done (GObject      *source,
-+              GAsyncResult *result,
-+              gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdMediaKeysManager *manager = GSD_MEDIA_KEYS_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit keypresses: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_keys_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_keys_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_keys_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+static void
- gsd_media_keys_manager_init (GsdMediaKeysManager *manager)
- {
-+        GError *error;
-+        GDBusConnection *bus;
-+
-+        error = NULL;
-         manager->priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager);
-+
-+        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-+        if (bus == NULL) {
-+                g_warning ("Failed to connect to system bus: %s",
-+                           error->message);
-+                g_error_free (error);
-+                return;
-+        }
-+
-+        manager->priv->logind_proxy =
-+                g_dbus_proxy_new_sync (bus,
-+                                       0,
-+                                       NULL,
-+                                       SYSTEMD_DBUS_NAME,
-+                                       SYSTEMD_DBUS_PATH,
-+                                       SYSTEMD_DBUS_INTERFACE,
-+                                       NULL,
-+                                       &error);
-+
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("Failed to connect to systemd: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        g_object_unref (bus);
-+
-+        g_debug ("Adding system inhibitors for power keys");
-+        manager->priv->inhibit_keys_fd = -1;
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             g_variant_new ("(ssss)",
-+                                                            "handle-power-key:handle-suspend-key:handle-hibernate-key",
-+                                                            g_get_user_name (),
-+                                                            "GNOME handling keypresses",
-+                                                            "block"),
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_done,
-+                                             manager);
-+
- }
- 
- static void
-@@ -2382,6 +2493,8 @@ gsd_media_keys_manager_finalize (GObject *object)
- 
-         if (media_keys_manager->priv->start_idle_id != 0)
-                 g_source_remove (media_keys_manager->priv->start_idle_id);
-+        if (media_keys_manager->priv->inhibit_keys_fd != -1)
-+                close (media_keys_manager->priv->inhibit_keys_fd);
- 
-         G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object);
- }
-@@ -2401,21 +2514,6 @@ xrandr_ready_cb (GObject             *source_object,
- }
- 
- static void
--upower_ready_cb (GObject             *source_object,
--                 GAsyncResult        *res,
--                 GsdMediaKeysManager *manager)
--{
--        GError *error = NULL;
--
--        manager->priv->upower_proxy = g_dbus_proxy_new_finish (res, &error);
--        if (manager->priv->upower_proxy == NULL) {
--                g_warning ("Failed to get proxy for upower: %s",
--                           error->message);
--                g_error_free (error);
--        }
--}
--
--static void
- power_screen_ready_cb (GObject             *source_object,
-                        GAsyncResult        *res,
-                        GsdMediaKeysManager *manager)
-@@ -2517,16 +2615,6 @@ register_manager (GsdMediaKeysManager *manager)
-                    manager->priv->bus_cancellable,
-                    (GAsyncReadyCallback) on_bus_gotten,
-                    manager);
--
--        g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
--                                  G_DBUS_PROXY_FLAGS_NONE,
--                                  NULL,
--                                  "org.freedesktop.UPower",
--                                  "/org/freedesktop/UPower",
--                                  "org.freedesktop.UPower",
--                                  NULL,
--                                  (GAsyncReadyCallback) upower_ready_cb,
--                                  manager);
- }
- 
- GsdMediaKeysManager *
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 1c594d8..bb7224c 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-  *
-  * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-- * Copyright (C) 2011 Richard Hughes <richard@hughsie.com>
-+ * Copyright (C) 2011-2012 Richard Hughes <richard@hughsie.com>
-  * Copyright (C) 2011 Ritesh Khadgaray <khadgaray@gmail.com>
-  *
-  * This program is free software; you can redistribute it and/or modify
-@@ -32,6 +32,7 @@
- #include <libupower-glib/upower.h>
- #include <libnotify/notify.h>
- #include <canberra-gtk.h>
-+#include <gio/gunixfdlist.h>
- 
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include <libgnome-desktop/gnome-rr.h>
-@@ -43,7 +44,6 @@
- #include "gnome-settings-session.h"
- #include "gsd-enums.h"
- #include "gsd-power-manager.h"
--#include "gsd-power-helper.h"
- 
- #define GNOME_SESSION_DBUS_NAME                 "org.gnome.SessionManager"
- #define GNOME_SESSION_DBUS_PATH                 "/org/gnome/SessionManager"
-@@ -78,6 +78,10 @@
- #define GSD_POWER_MANAGER_RECALL_DELAY                  30 /* seconds */
- #define GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT      30 /* seconds */
- 
-+#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
-+
- /* Keep this in sync with gnome-shell */
- #define SCREENSAVER_FADE_TIME                           10 /* seconds */
- 
-@@ -193,15 +197,21 @@ struct GsdPowerManagerPrivate
-         ca_context              *canberra_context;
-         ca_proplist             *critical_alert_loop_props;
-         guint32                  critical_alert_timeout_id;
--        GDBusProxy              *screensaver_proxy;
-         GDBusProxy              *session_proxy;
-         GDBusProxy              *session_presence_proxy;
-         GpmIdletime             *idletime;
-         GsdPowerIdleMode         current_idle_mode;
--        guint                    lid_close_safety_timer_id;
-         GtkStatusIcon           *status_icon;
-         guint                    xscreensaver_watchdog_timer_id;
-         gboolean                 is_virtual_machine;
-+
-+        /* systemd stuff */
-+        GDBusProxy              *logind_proxy;
-+        gint                     inhibit_lid_switch_fd;
-+        gboolean                 inhibit_lid_switch_taken;
-+        gint                     inhibit_suspend_fd;
-+        gboolean                 inhibit_suspend_taken;
-+        guint                    inhibit_lid_switch_timer_id;
- };
- 
- enum {
-@@ -218,8 +228,8 @@ static GIcon    *engine_get_icon (GsdPowerManager *manager);
- static gchar    *engine_get_summary (GsdPowerManager *manager);
- static void      do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type);
- static void      do_lid_closed_action (GsdPowerManager *manager);
--static void      lock_screensaver (GsdPowerManager *manager);
--static void      kill_lid_close_safety_timer (GsdPowerManager *manager);
-+static void      uninhibit_lid_switch (GsdPowerManager *manager);
-+static gboolean  external_monitor_is_connected (GnomeRRScreen *screen);
- 
- G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT)
- 
-@@ -2049,6 +2059,57 @@ gnome_session_shutdown (void)
- }
- 
- static void
-+action_poweroff (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "PowerOff",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
-+action_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Suspend",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
-+action_hibernate (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Hibernate",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
- do_power_action_type (GsdPowerManager *manager,
-                       GsdPowerActionType action_type)
- {
-@@ -2057,19 +2118,19 @@ do_power_action_type (GsdPowerManager *manager,
- 
-         switch (action_type) {
-         case GSD_POWER_ACTION_SUSPEND:
--                gsd_power_suspend (manager->priv->upower_proxy);
-+                action_suspend (manager);
-                 break;
-         case GSD_POWER_ACTION_INTERACTIVE:
-                 gnome_session_shutdown ();
-                 break;
-         case GSD_POWER_ACTION_HIBERNATE:
--                gsd_power_hibernate (manager->priv->upower_proxy);
-+                action_hibernate (manager);
-                 break;
-         case GSD_POWER_ACTION_SHUTDOWN:
-                 /* this is only used on critically low battery where
-                  * hibernate is not available and is marginally better
-                  * than just powering down the computer mid-write */
--                gsd_power_poweroff ();
-+                action_poweroff (manager);
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-@@ -2141,85 +2202,20 @@ upower_kbd_toggle (GsdPowerManager *manager,
-         return ret;
- }
- 
--static void
--do_lid_open_action (GsdPowerManager *manager)
--{
--        gboolean ret;
--        GError *error = NULL;
--
--        /* play a sound, using sounds from the naming spec */
--        ca_context_play (manager->priv->canberra_context, 0,
--                         CA_PROP_EVENT_ID, "lid-open",
--                         /* TRANSLATORS: this is the sound description */
--                         CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
--                         NULL);
--
--        /* ensure we turn the panel back on after lid open */
--        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_ON,
--                                             &error);
--        if (!ret) {
--                g_warning ("failed to turn the panel on after lid open: %s",
--                           error->message);
--                g_clear_error (&error);
--        }
--
--        /* only toggle keyboard if present and already toggled off */
--        if (manager->priv->upower_kdb_proxy != NULL &&
--            manager->priv->kbd_brightness_old != -1) {
--                ret = upower_kbd_toggle (manager, &error);
--                if (!ret) {
--                        g_warning ("failed to turn the kbd backlight on: %s",
--                                   error->message);
--                        g_error_free (error);
--                }
--        }
--
--        kill_lid_close_safety_timer (manager);
--}
--
- static gboolean
--is_on (GnomeRROutput *output)
-+inhibit_lid_switch_timer_cb (GsdPowerManager *manager)
- {
--	GnomeRRCrtc *crtc;
--
--	crtc = gnome_rr_output_get_crtc (output);
--	if (!crtc)
--		return FALSE;
--	return gnome_rr_crtc_get_current_mode (crtc) != NULL;
--}
--
--static gboolean
--non_laptop_outputs_are_all_off (GnomeRRScreen *screen)
--{
--        GnomeRROutput **outputs;
--        int i;
--
--        outputs = gnome_rr_screen_list_outputs (screen);
--        for (i = 0; outputs[i] != NULL; i++) {
--                if (gnome_rr_output_is_laptop (outputs[i]))
--                        continue;
--
--                if (is_on (outputs[i]))
--                        return FALSE;
-+        if (!external_monitor_is_connected (manager->priv->x11_screen) ||
-+            g_settings_get_boolean (manager->priv->settings,
-+                                    "lid-close-suspend-with-external-monitor")) {
-+                g_debug ("no external monitors for a while; uninhibiting lid close");
-+                uninhibit_lid_switch (manager);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+                return G_SOURCE_REMOVE;
-         }
- 
--        return TRUE;
--}
--
--/* Timeout callback used to check conditions when the laptop's lid is closed but
-- * the machine is not suspended yet.  We try to suspend again, so that the laptop
-- * won't overheat if placed in a backpack.
-- */
--static gboolean
--lid_close_safety_timer_cb (GsdPowerManager *manager)
--{
--        manager->priv->lid_close_safety_timer_id = 0;
--
--        g_debug ("lid has been closed for a while; trying to suspend again");
--        do_lid_closed_action (manager);
--
--        return FALSE;
-+        g_debug ("external monitor still there; trying again later");
-+        return G_SOURCE_CONTINUE;
- }
- 
- /* Sets up a timer to be triggered some seconds after closing the laptop lid
-@@ -2227,82 +2223,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager)
-  * again in the timeout handler to see if we can suspend then.
-  */
- static void
--setup_lid_close_safety_timer (GsdPowerManager *manager)
-+setup_inhibit_lid_switch_timer (GsdPowerManager *manager)
- {
--        if (manager->priv->lid_close_safety_timer_id != 0)
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_debug ("lid close safety timer already set up");
-                 return;
-+        }
-+
-+        g_debug ("setting up lid close safety timer");
- 
--        manager->priv->lid_close_safety_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT,
--                                                                          (GSourceFunc) lid_close_safety_timer_cb,
-+        manager->priv->inhibit_lid_switch_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT,
-+                                                                          (GSourceFunc) inhibit_lid_switch_timer_cb,
-                                                                           manager);
--        g_source_set_name_by_id (manager->priv->lid_close_safety_timer_id, "[GsdPowerManager] lid close safety timer");
-+        g_source_set_name_by_id (manager->priv->inhibit_lid_switch_timer_id, "[GsdPowerManager] lid close safety timer");
- }
- 
- static void
--kill_lid_close_safety_timer (GsdPowerManager *manager)
-+restart_inhibit_lid_switch_timer (GsdPowerManager *manager)
- {
--        if (manager->priv->lid_close_safety_timer_id != 0) {
--                g_source_remove (manager->priv->lid_close_safety_timer_id);
--                manager->priv->lid_close_safety_timer_id = 0;
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_debug ("restarting lid close safety timer");
-+                g_source_remove (manager->priv->inhibit_lid_switch_timer_id);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+                setup_inhibit_lid_switch_timer (manager);
-         }
- }
- 
- static void
--suspend_with_lid_closed (GsdPowerManager *manager)
-+do_lid_open_action (GsdPowerManager *manager)
- {
-         gboolean ret;
-         GError *error = NULL;
--        GsdPowerActionType action_type;
- 
--        /* maybe lock the screen if the lid is closed */
--        lock_screensaver (manager);
--
--        /* we have different settings depending on AC state */
--        if (up_client_get_on_battery (manager->priv->up_client)) {
--                action_type = g_settings_get_enum (manager->priv->settings,
--                                                   "lid-close-battery-action");
--        } else {
--                action_type = g_settings_get_enum (manager->priv->settings,
--                                                   "lid-close-ac-action");
--        }
--
--        /* check we won't melt when the lid is closed */
--        if (action_type != GSD_POWER_ACTION_SUSPEND &&
--            action_type != GSD_POWER_ACTION_HIBERNATE) {
--                if (up_client_get_lid_force_sleep (manager->priv->up_client)) {
--                        g_warning ("to prevent damage, now forcing suspend");
--                        do_power_action_type (manager, GSD_POWER_ACTION_SUSPEND);
--                        return;
--                }
--        }
-+        /* play a sound, using sounds from the naming spec */
-+        ca_context_play (manager->priv->canberra_context, 0,
-+                         CA_PROP_EVENT_ID, "lid-open",
-+                         /* TRANSLATORS: this is the sound description */
-+                         CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
-+                         NULL);
- 
--        /* ensure we turn the panel back on after resume */
-+        /* ensure we turn the panel back on after lid open */
-         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_OFF,
-+                                             GNOME_RR_DPMS_ON,
-                                              &error);
-         if (!ret) {
--                g_warning ("failed to turn the panel off after lid close: %s",
-+                g_warning ("failed to turn the panel on after lid open: %s",
-                            error->message);
-                 g_clear_error (&error);
-         }
- 
--        /* only toggle keyboard if present and not already toggled */
--        if (manager->priv->upower_kdb_proxy &&
--            manager->priv->kbd_brightness_old == -1) {
-+        /* only toggle keyboard if present and already toggled off */
-+        if (manager->priv->upower_kdb_proxy != NULL &&
-+            manager->priv->kbd_brightness_old != -1) {
-                 ret = upower_kbd_toggle (manager, &error);
-                 if (!ret) {
--                        g_warning ("failed to turn the kbd backlight off: %s",
-+                        g_warning ("failed to turn the kbd backlight on: %s",
-                                    error->message);
-                         g_error_free (error);
-                 }
-         }
--
--        do_power_action_type (manager, action_type);
- }
- 
- static void
- do_lid_closed_action (GsdPowerManager *manager)
- {
-+        gboolean ret;
-+        GError *error = NULL;
-+
-         /* play a sound, using sounds from the naming spec */
-         ca_context_play (manager->priv->canberra_context, 0,
-                          CA_PROP_EVENT_ID, "lid-close",
-@@ -2310,21 +2297,22 @@ do_lid_closed_action (GsdPowerManager *manager)
-                          CA_PROP_EVENT_DESCRIPTION, _("Lid has been closed"),
-                          NULL);
- 
-+        /* turn the panel off if the lid is closed (mainly for Dells...) */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_OFF,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel off after lid close: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-         /* refresh RANDR so we get an accurate view of what monitors are plugged in when the lid is closed */
-         gnome_rr_screen_refresh (manager->priv->x11_screen, NULL); /* NULL-GError */
- 
--        /* perform policy action */
--        if (g_settings_get_boolean (manager->priv->settings, "lid-close-suspend-with-external-monitor")
--            || non_laptop_outputs_are_all_off (manager->priv->x11_screen)) {
--                g_debug ("lid is closed; suspending or hibernating");
--                suspend_with_lid_closed (manager);
--        } else {
--                g_debug ("lid is closed; not suspending nor hibernating since some external monitor outputs are still active");
--                setup_lid_close_safety_timer (manager);
--        }
-+        restart_inhibit_lid_switch_timer (manager);
- }
- 
--
- static void
- up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
- {
-@@ -2344,6 +2332,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
-         if (manager->priv->lid_is_closed == tmp)
-                 return;
-         manager->priv->lid_is_closed = tmp;
-+        g_debug ("up changed: lid is now %s", tmp ? "closed" : "open");
- 
-         /* fake a keypress */
-         if (tmp)
-@@ -3302,30 +3291,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass)
- }
- 
- static void
--sleep_cb_screensaver_proxy_ready_cb (GObject *source_object,
--                            GAsyncResult *res,
--                            gpointer user_data)
--{
--        GError *error = NULL;
--        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
--
--        manager->priv->screensaver_proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
--        if (manager->priv->screensaver_proxy == NULL) {
--                g_warning ("Could not connect to gnome-screensaver: %s",
--                           error->message);
--                g_error_free (error);
--                return;
--        }
--
--        /* Finish the upower_notify_sleep_cb() call by locking the screen */
--        g_debug ("gnome-screensaver activated, doing gnome-screensaver lock");
--        g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                           "Lock",
--                           NULL, G_DBUS_CALL_FLAGS_NONE, -1,
--                           NULL, NULL, NULL);
--}
--
--static void
- idle_dbus_signal_cb (GDBusProxy *proxy,
-                      const gchar *sender_name,
-                      const gchar *signal_name,
-@@ -3477,75 +3442,38 @@ out:
- }
- 
- static void
--lock_screensaver (GsdPowerManager *manager)
-+lock_screensaver (GsdPowerManager *manager,
-+                  GSourceFunc      done_cb)
- {
-         gboolean do_lock;
- 
-         do_lock = g_settings_get_boolean (manager->priv->settings_screensaver,
-                                           "lock-enabled");
--        if (!do_lock)
-+        if (!do_lock && done_cb) {
-+                done_cb (manager);
-                 return;
--
--        if (manager->priv->screensaver_proxy != NULL) {
--                g_debug ("doing gnome-screensaver lock");
--                g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                                   "Lock",
--                                   NULL, G_DBUS_CALL_FLAGS_NONE, -1,
--                                   NULL, NULL, NULL);
--        } else {
--                /* connect to the screensaver first */
--                g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
--                                          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--                                          NULL,
--                                          GS_DBUS_NAME,
--                                          GS_DBUS_PATH,
--                                          GS_DBUS_INTERFACE,
--                                          NULL,
--                                          sleep_cb_screensaver_proxy_ready_cb,
--                                          manager);
--        }
--}
--
--static void
--upower_notify_sleep_cb (UpClient *client,
--                        UpSleepKind sleep_kind,
--                        GsdPowerManager *manager)
--{
--        lock_screensaver (manager);
--}
--
--static void
--upower_notify_resume_cb (UpClient *client,
--                         UpSleepKind sleep_kind,
--                         GsdPowerManager *manager)
--{
--        gboolean ret;
--        GError *error = NULL;
--
--        /* this displays the unlock dialogue so the user doesn't have
--         * to move the mouse or press any key before the window comes up */
--        if (manager->priv->screensaver_proxy != NULL) {
--                g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                                   "SimulateUserActivity",
--                                   NULL,
--                                   G_DBUS_CALL_FLAGS_NONE,
--                                   -1, NULL, NULL, NULL);
-         }
- 
--        /* close existing notifications on resume, the system power
--         * state is probably different now */
--        notify_close_if_showing (manager->priv->notification_low);
--        notify_close_if_showing (manager->priv->notification_discharging);
--
--        /* ensure we turn the panel back on after resume */
--        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_ON,
--                                             &error);
--        if (!ret) {
--                g_warning ("failed to turn the panel on after resume: %s",
--                           error->message);
--                g_error_free (error);
--        }
-+        g_dbus_connection_call (manager->priv->connection,
-+                                GS_DBUS_NAME,
-+                                GS_DBUS_PATH,
-+                                GS_DBUS_INTERFACE,
-+                                "Lock",
-+                                NULL, NULL,
-+                                G_DBUS_CALL_FLAGS_NONE, -1,
-+                                NULL, NULL, NULL);
-+
-+        /* Wait until gnome-shell shield animation is done
-+         *
-+         * FIXME: the shell should mark the lock as active
-+         * when the shield is down, then we could wait for
-+         * that. This would also fix the problem that we wait
-+         * needlessly when the shell has already locked the
-+         * screen because it is initiating the suspend.
-+         *
-+         * https://bugzilla.gnome.org/show_bug.cgi?id=685053
-+         */
-+        g_timeout_add (500, done_cb, manager);
- }
- 
- static void
-@@ -3755,6 +3683,287 @@ out:
-         return ret;
- }
- 
-+static void
-+inhibit_lid_switch_done (GObject      *source,
-+                         GAsyncResult *result,
-+                         gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit lid switch: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_lid_switch_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_lid_switch_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_lid_switch_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+static void
-+inhibit_lid_switch (GsdPowerManager *manager)
-+{
-+        GVariant *params;
-+
-+        if (manager->priv->inhibit_lid_switch_taken) {
-+                g_debug ("already inhibited lid-switch");
-+                return;
-+        }
-+        g_debug ("Adding lid switch system inhibitor");
-+        manager->priv->inhibit_lid_switch_taken = TRUE;
-+
-+        params = g_variant_new ("(ssss)",
-+                                "handle-lid-switch",
-+                                g_get_user_name (),
-+                                "Multiple displays attached",
-+                                "block");
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             params,
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_lid_switch_done,
-+                                             manager);
-+}
-+
-+static void
-+uninhibit_lid_switch (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_lid_switch_fd == -1) {
-+                g_debug ("no lid-switch inhibitor");
-+                return;
-+        }
-+        g_debug ("Removing lid switch system inhibitor");
-+        close (manager->priv->inhibit_lid_switch_fd);
-+        manager->priv->inhibit_lid_switch_fd = -1;
-+        manager->priv->inhibit_lid_switch_taken = FALSE;
-+}
-+
-+static void
-+inhibit_suspend_done (GObject      *source,
-+                      GAsyncResult *result,
-+                      gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit suspend: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_suspend_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_suspend_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_suspend_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+/* We take a delay inhibitor here, which causes logind to send a
-+ * PrepareToSleep signal, which gives us a chance to lock the screen
-+ * and do some other preparations.
-+ */
-+static void
-+inhibit_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_suspend_taken) {
-+                g_debug ("already inhibited lid-switch");
-+                return;
-+        }
-+        g_debug ("Adding suspend delay inhibitor");
-+        manager->priv->inhibit_suspend_taken = TRUE;
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             g_variant_new ("(ssss)",
-+                                                            "sleep",
-+                                                            g_get_user_name (),
-+                                                            "GNOME needs to lock the screen",
-+                                                            "delay"),
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_suspend_done,
-+                                             manager);
-+}
-+
-+static void
-+uninhibit_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_suspend_fd == -1) {
-+                g_debug ("no suspend delay inhibitor");
-+                return;
-+        }
-+        g_debug ("Removing suspend delay inhibitor");
-+        close (manager->priv->inhibit_suspend_fd);
-+        manager->priv->inhibit_suspend_fd = -1;
-+        manager->priv->inhibit_suspend_taken = FALSE;
-+}
-+
-+static gboolean
-+randr_output_is_on (GnomeRROutput *output)
-+{
-+	GnomeRRCrtc *crtc;
-+
-+	crtc = gnome_rr_output_get_crtc (output);
-+	if (!crtc)
-+		return FALSE;
-+	return gnome_rr_crtc_get_current_mode (crtc) != NULL;
-+}
-+
-+static gboolean
-+external_monitor_is_connected (GnomeRRScreen *screen)
-+{
-+        GnomeRROutput **outputs;
-+        guint i;
-+
-+        if (g_file_test ("/tmp/external_connected", G_FILE_TEST_EXISTS))
-+                return TRUE;
-+
-+        /* see if we have more than one screen plugged in */
-+        outputs = gnome_rr_screen_list_outputs (screen);
-+        for (i = 0; outputs[i] != NULL; i++) {
-+                if (randr_output_is_on (outputs[i]) &&
-+                    !gnome_rr_output_is_laptop (outputs[i]))
-+                        return TRUE;
-+        }
-+
-+        return FALSE;
-+}
-+
-+static void
-+on_randr_event (GnomeRRScreen *screen, gpointer user_data)
-+{
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+
-+        /* when a second monitor is plugged in, we take the
-+         * handle-lid-switch inhibitor lock of logind to prevent
-+         * it from suspending.
-+         *
-+         * Uninhibiting is done in the inhibit_lid_switch_timer,
-+         * since we want to give users a few seconds when unplugging
-+         * and replugging an external monitor, not suspend right away.
-+         */
-+        if (external_monitor_is_connected (screen) &&
-+            !g_settings_get_boolean (manager->priv->settings,
-+                                     "lid-close-suspend-with-external-monitor")) {
-+                inhibit_lid_switch (manager);
-+                setup_inhibit_lid_switch_timer (manager);
-+        }
-+        else {
-+                restart_inhibit_lid_switch_timer (manager);
-+        }
-+}
-+
-+static gboolean
-+screen_lock_done_cb (gpointer data)
-+{
-+        GsdPowerManager *manager = data;
-+
-+        /* lift the delay inhibit, so logind can proceed */
-+        uninhibit_suspend (manager);
-+
-+        return FALSE;
-+}
-+
-+static void
-+handle_suspend_actions (GsdPowerManager *manager)
-+{
-+        gboolean ret;
-+        GError *error = NULL;
-+
-+        /* ensure we turn the panel back on after resume */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_ON,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel on after resume: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        lock_screensaver (manager, screen_lock_done_cb);
-+}
-+
-+static void
-+handle_resume_actions (GsdPowerManager *manager)
-+{
-+        gboolean ret;
-+        GError *error = NULL;
-+
-+        /* this displays the unlock dialogue so the user doesn't have
-+         * to move the mouse or press any key before the window comes up */
-+        g_dbus_connection_call (manager->priv->connection,
-+                                GS_DBUS_NAME,
-+                                GS_DBUS_PATH,
-+                                GS_DBUS_INTERFACE,
-+                                "SimulateUserActivity",
-+                                NULL, NULL,
-+                                G_DBUS_CALL_FLAGS_NONE, -1,
-+                                NULL, NULL, NULL);
-+
-+        /* close existing notifications on resume, the system power
-+         * state is probably different now */
-+        notify_close_if_showing (manager->priv->notification_low);
-+        notify_close_if_showing (manager->priv->notification_discharging);
-+
-+        /* ensure we turn the panel back on after resume */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_ON,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel on after resume: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        /* set up the delay again */
-+        inhibit_suspend (manager);
-+}
-+
-+static void
-+logind_proxy_signal_cb (GDBusProxy  *proxy,
-+                        const gchar *sender_name,
-+                        const gchar *signal_name,
-+                        GVariant    *parameters,
-+                        gpointer     user_data)
-+{
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        gboolean is_about_to_suspend;
-+
-+        if (g_strcmp0 (signal_name, "PrepareForSleep") != 0)
-+                return;
-+        g_variant_get (parameters, "(b)", &is_about_to_suspend);
-+        if (is_about_to_suspend) {
-+                handle_suspend_actions (manager);
-+        } else {
-+                handle_resume_actions (manager);
-+        }
-+}
-+
- gboolean
- gsd_power_manager_start (GsdPowerManager *manager,
-                          GError **error)
-@@ -3764,6 +3973,25 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         g_debug ("Starting power manager");
-         gnome_settings_profile_start (NULL);
- 
-+        manager->priv->logind_proxy =
-+                g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-+                                               0,
-+                                               NULL,
-+                                               SYSTEMD_DBUS_NAME,
-+                                               SYSTEMD_DBUS_PATH,
-+                                               SYSTEMD_DBUS_INTERFACE,
-+                                               NULL,
-+                                               error);
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return FALSE;
-+        }
-+        g_signal_connect (manager->priv->logind_proxy, "g-signal",
-+                          G_CALLBACK (logind_proxy_signal_cb),
-+                          manager);
-+        /* Set up a delay inhibitor to be informed about suspend attempts */
-+        inhibit_suspend (manager);
-+
-         /* track the active session */
-         manager->priv->session = gnome_settings_session_new ();
-         g_signal_connect (manager->priv->session, "notify::state",
-@@ -3778,10 +4006,6 @@ gsd_power_manager_start (GsdPowerManager *manager,
-                           G_CALLBACK (engine_settings_key_changed_cb), manager);
-         manager->priv->settings_screensaver = g_settings_new ("org.gnome.desktop.screensaver");
-         manager->priv->up_client = up_client_new ();
--        g_signal_connect (manager->priv->up_client, "notify-sleep",
--                          G_CALLBACK (upower_notify_sleep_cb), manager);
--        g_signal_connect (manager->priv->up_client, "notify-resume",
--                          G_CALLBACK (upower_notify_resume_cb), manager);
-         manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client);
-         g_signal_connect (manager->priv->up_client, "device-added",
-                           G_CALLBACK (engine_device_added_cb), manager);
-@@ -3895,6 +4119,9 @@ gsd_power_manager_start (GsdPowerManager *manager,
-                           G_CALLBACK (idle_idletime_reset_cb), manager);
-         g_signal_connect (manager->priv->idletime, "alarm-expired",
-                           G_CALLBACK (idle_idletime_alarm_expired_cb), manager);
-+        g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager);
-+        /* set up initial state */
-+        on_randr_event (manager->priv->x11_screen, manager);
- 
-         /* ensure the default dpms timeouts are cleared */
-         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-@@ -3927,6 +4154,11 @@ gsd_power_manager_stop (GsdPowerManager *manager)
- {
-         g_debug ("Stopping power manager");
- 
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_source_remove (manager->priv->inhibit_lid_switch_timer_id);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+        }
-+
-         if (manager->priv->bus_cancellable != NULL) {
-                 g_cancellable_cancel (manager->priv->bus_cancellable);
-                 g_object_unref (manager->priv->bus_cancellable);
-@@ -3938,8 +4170,6 @@ gsd_power_manager_stop (GsdPowerManager *manager)
-                 manager->priv->introspection_data = NULL;
-         }
- 
--        kill_lid_close_safety_timer (manager);
--
-         g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager);
- 
-         g_clear_object (&manager->priv->connection);
-@@ -3947,6 +4177,19 @@ gsd_power_manager_stop (GsdPowerManager *manager)
-         g_clear_object (&manager->priv->settings);
-         g_clear_object (&manager->priv->settings_screensaver);
-         g_clear_object (&manager->priv->up_client);
-+
-+        if (manager->priv->inhibit_lid_switch_fd != -1) {
-+                close (manager->priv->inhibit_lid_switch_fd);
-+                manager->priv->inhibit_lid_switch_fd = -1;
-+                manager->priv->inhibit_lid_switch_taken = FALSE;
-+        }
-+        if (manager->priv->inhibit_suspend_fd != -1) {
-+                close (manager->priv->inhibit_suspend_fd);
-+                manager->priv->inhibit_suspend_fd = -1;
-+                manager->priv->inhibit_suspend_taken = FALSE;
-+        }
-+
-+        g_clear_object (&manager->priv->logind_proxy);
-         g_clear_object (&manager->priv->x11_screen);
- 
-         g_ptr_array_unref (manager->priv->devices_array);
-@@ -3980,6 +4223,8 @@ static void
- gsd_power_manager_init (GsdPowerManager *manager)
- {
-         manager->priv = GSD_POWER_MANAGER_GET_PRIVATE (manager);
-+        manager->priv->inhibit_lid_switch_fd = -1;
-+        manager->priv->inhibit_suspend_fd = -1;
- }
- 
- static void
--- 
-1.8.0
-
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index 263b5d9cc..def7ad389 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,38 +1,27 @@
-# $Id: PKGBUILD 175198 2013-01-16 13:36:50Z jgc $
+# $Id: PKGBUILD 183398 2013-04-21 22:10:23Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-settings-daemon
-pkgver=3.6.4
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify'
-         'libsystemd' 'libwacom' 'nss' 'pulseaudio' 'pulseaudio-alsa' 'upower')
+         'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg')
 makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl')
 options=('!emptydirs' '!libtool')
 install=gnome-settings-daemon.install
 url="http://www.gnome.org"
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch)
-sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15'
-            '5572b5b3f554ce361353a8db42c26a8f789606f65acc5943a286271603fcb8eb')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('367a770ec7affff3c85a43bc39ced5a02a1b1761780d954329f6b21c0f2efcee')
 
 build() {
   cd $pkgname-$pkgver
 
-  # logind key handling FS#31801, patch from Fedora
-  # rebased onto screensaver.patch
-  patch -Np1 -i ../0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
-
-  aclocal
-  autoconf
-  automake --add-missing
-
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \
-      --enable-systemd --disable-ibus
+      --libexecdir=/usr/lib/gnome-settings-daemon --disable-static
 
   #https://bugzilla.gnome.org/show_bug.cgi?id=656231
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
@@ -43,9 +32,4 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-
-  # Plugins that aren't installed still have schema references
-  # and cause gsettings errors - remove the references we're not using
-  sed -i '/org\.gnome\.settings-daemon\.plugins\.updates/d' \
-    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gschema.xml"
 }
diff --git a/extra/gnome-settings-daemon/screensaver.patch b/extra/gnome-settings-daemon/screensaver.patch
deleted file mode 100644
index bbcfe3430..000000000
--- a/extra/gnome-settings-daemon/screensaver.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From b47e4019a12ac84fba31e1c631d878ce03fa3808 Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos@gmail.com>
-Date: Wed, 17 Oct 2012 22:44:54 +0000
-Subject: power: Add a watchdog to keep X's builtin screen saver disabled
-
-X's builtin screen saver may activate DPMS. Since we want to activate
-DPMS ourselves according to our own policy we must make sure that X's
-screen saver remains disabled.
-
-This code is a copy of the original found in gs-watcher-x11.c from
-gnome-screensaver which stopped being used in GNOME 3.6.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686339
----
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 0e06495..070cf32 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -27,6 +27,7 @@
- #include <stdio.h>
- #include <sys/wait.h>
- #include <glib/gi18n.h>
-+#include <gdk/gdkx.h>
- #include <gtk/gtk.h>
- #include <libupower-glib/upower.h>
- #include <libnotify/notify.h>
-@@ -80,6 +81,8 @@
- /* Keep this in sync with gnome-shell */
- #define SCREENSAVER_FADE_TIME                           10 /* seconds */
- 
-+#define XSCREENSAVER_WATCHDOG_TIMEOUT                   120 /* seconds */
-+
- enum {
-         GSD_POWER_IDLETIME_NULL_ID,
-         GSD_POWER_IDLETIME_DIM_ID,
-@@ -197,6 +200,7 @@ struct GsdPowerManagerPrivate
-         GsdPowerIdleMode         current_idle_mode;
-         guint                    lid_close_safety_timer_id;
-         GtkStatusIcon           *status_icon;
-+        guint                    xscreensaver_watchdog_timer_id;
- };
- 
- enum {
-@@ -3621,6 +3625,77 @@ engine_session_active_changed_cb (GnomeSettingsSession *session,
-         idle_set_mode (manager, GSD_POWER_IDLE_MODE_NORMAL);
- }
- 
-+/* This timer goes off every few minutes, whether the user is idle or not,
-+   to try and clean up anything that has gone wrong.
-+
-+   It calls disable_builtin_screensaver() so that if xset has been used,
-+   or some other program (like xlock) has messed with the XSetScreenSaver()
-+   settings, they will be set back to sensible values (if a server extension
-+   is in use, messing with xlock can cause the screensaver to never get a wakeup
-+   event, and could cause monitor power-saving to occur, and all manner of
-+   heinousness.)
-+
-+   This code was originally part of gnome-screensaver, see
-+   http://git.gnome.org/browse/gnome-screensaver/tree/src/gs-watcher-x11.c?id=fec00b12ec46c86334cfd36b37771cc4632f0d4d#n530
-+ */
-+static gboolean
-+disable_builtin_screensaver (gpointer unused)
-+{
-+        int current_server_timeout, current_server_interval;
-+        int current_prefer_blank,   current_allow_exp;
-+        int desired_server_timeout, desired_server_interval;
-+        int desired_prefer_blank,   desired_allow_exp;
-+
-+        XGetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-+                         &current_server_timeout,
-+                         &current_server_interval,
-+                         &current_prefer_blank,
-+                         &current_allow_exp);
-+
-+        desired_server_timeout  = current_server_timeout;
-+        desired_server_interval = current_server_interval;
-+        desired_prefer_blank    = current_prefer_blank;
-+        desired_allow_exp       = current_allow_exp;
-+
-+        desired_server_interval = 0;
-+
-+        /* I suspect (but am not sure) that DontAllowExposures might have
-+           something to do with powering off the monitor as well, at least
-+           on some systems that don't support XDPMS?  Who know... */
-+        desired_allow_exp = AllowExposures;
-+
-+        /* When we're not using an extension, set the server-side timeout to 0,
-+           so that the server never gets involved with screen blanking, and we
-+           do it all ourselves.  (However, when we *are* using an extension,
-+           we tell the server when to notify us, and rather than blanking the
-+           screen, the server will send us an X event telling us to blank.)
-+        */
-+        desired_server_timeout = 0;
-+
-+        if (desired_server_timeout     != current_server_timeout
-+            || desired_server_interval != current_server_interval
-+            || desired_prefer_blank    != current_prefer_blank
-+            || desired_allow_exp       != current_allow_exp) {
-+
-+                g_debug ("disabling server builtin screensaver:"
-+                         " (xset s %d %d; xset s %s; xset s %s)",
-+                         desired_server_timeout,
-+                         desired_server_interval,
-+                         (desired_prefer_blank ? "blank" : "noblank"),
-+                         (desired_allow_exp ? "expose" : "noexpose"));
-+
-+                XSetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-+                                 desired_server_timeout,
-+                                 desired_server_interval,
-+                                 desired_prefer_blank,
-+                                 desired_allow_exp);
-+
-+                XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-+        }
-+
-+        return TRUE;
-+}
-+
- gboolean
- gsd_power_manager_start (GsdPowerManager *manager,
-                          GError **error)
-@@ -3778,6 +3853,9 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         /* set the initial dim time that can adapt for the user */
-         refresh_idle_dim_settings (manager);
- 
-+        manager->priv->xscreensaver_watchdog_timer_id = g_timeout_add_seconds (XSCREENSAVER_WATCHDOG_TIMEOUT,
-+                                                                               disable_builtin_screensaver,
-+                                                                               NULL);
-         gnome_settings_profile_end (NULL);
-         return TRUE;
- }
-@@ -3829,6 +3907,11 @@ gsd_power_manager_stop (GsdPowerManager *manager)
- 
-         g_clear_object (&manager->priv->idletime);
-         g_clear_object (&manager->priv->status_icon);
-+
-+        if (manager->priv->xscreensaver_watchdog_timer_id > 0) {
-+                g_source_remove (manager->priv->xscreensaver_watchdog_timer_id);
-+                manager->priv->xscreensaver_watchdog_timer_id = 0;
-+        }
- }
- 
- static void
---
-cgit v0.9.0.2
diff --git a/extra/gnome-settings-daemon/systemd-fallback.patch b/extra/gnome-settings-daemon/systemd-fallback.patch
deleted file mode 100644
index da0496623..000000000
--- a/extra/gnome-settings-daemon/systemd-fallback.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-commit b9ded09387f0b99ece97baee18595eb9e86a5b9b
-Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-Date:   Mon Mar 12 01:52:54 2012 +0100
-
-    Fallback to CK if systemd is not available
-    
-    Be nice to distributions where systemd is optional. This will select
-    the code path at runtime depending on whether the system was booted
-    using systemd.
-
-diff --git a/configure.ac b/configure.ac
-index 3b4789f..d522852 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -299,7 +299,7 @@ AC_ARG_ENABLE([systemd],
-               [with_systemd=$enableval],
-               [with_systemd=no])
- if test "$with_systemd" = "yes" ; then
--  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
-+  PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login])
-   AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
-   SESSION_TRACKING=systemd
- else
-diff --git a/gnome-settings-daemon/gnome-settings-session.c b/gnome-settings-daemon/gnome-settings-session.c
-index 5786300..83fe21e 100644
---- a/gnome-settings-daemon/gnome-settings-session.c
-+++ b/gnome-settings-daemon/gnome-settings-session.c
-@@ -30,6 +30,7 @@
- #include "gnome-settings-session.h"
- 
- #ifdef HAVE_SYSTEMD
-+#include <systemd/sd-daemon.h>
- #include <systemd/sd-login.h>
- 
- typedef struct
-@@ -130,10 +131,9 @@ struct GnomeSettingsSessionPrivate
- {
- #ifdef HAVE_SYSTEMD
-         GSource                   *sd_source;
--#else
-+#endif
- 	GDBusProxy		*proxy_session;
- 	GCancellable		*cancellable;
--#endif
- 	gchar			*session_id;
- 	GnomeSettingsSessionState state;
- };
-@@ -237,7 +237,7 @@ sessions_changed (gpointer user_data)
-         return TRUE;
- }
- 
--#else /* HAVE_SYSTEMD */
-+#endif /* HAVE_SYSTEMD */
- 
- static void
- gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy,
-@@ -371,22 +371,25 @@ got_manager_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_d
- 	g_object_unref (proxy_manager);
- }
- 
--#endif /* HAVE_SYSTEMD */
--
- static void
- gnome_settings_session_init (GnomeSettingsSession *session)
- {
- 	session->priv = GNOME_SETTINGS_SESSION_GET_PRIVATE (session);
- 
- #ifdef HAVE_SYSTEMD
--        sd_pid_get_session (getpid(), &session->priv->session_id);
-+        session->priv->sd_source = NULL;
-+
-+        if (sd_booted () > 0) {
-+                sd_pid_get_session (getpid(), &session->priv->session_id);
- 
--        session->priv->sd_source = sd_source_new ();
--        g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
--        g_source_attach (session->priv->sd_source, NULL);
-+                session->priv->sd_source = sd_source_new ();
-+                g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
-+                g_source_attach (session->priv->sd_source, NULL);
- 
--        sessions_changed (session);
--#else
-+                sessions_changed (session);
-+                return;
-+        }
-+#endif
- 	session->priv->cancellable = g_cancellable_new ();
- 
- 	/* connect to ConsoleKit */
-@@ -399,7 +402,6 @@ gnome_settings_session_init (GnomeSettingsSession *session)
- 				  session->priv->cancellable,
- 				  got_manager_proxy_cb,
- 				  session);
--#endif
- }
- 
- static void
-@@ -415,15 +417,17 @@ gnome_settings_session_finalize (GObject *object)
-         if (session->priv->sd_source != NULL) {
-                 g_source_destroy (session->priv->sd_source);
-                 g_source_unref (session->priv->sd_source);
-+                goto out;
-         }
--#else
-+#endif
-+
- 	g_cancellable_cancel (session->priv->cancellable);
- 
- 	if (session->priv->proxy_session != NULL)
- 		g_object_unref (session->priv->proxy_session);
- 	g_object_unref (session->priv->cancellable);
--#endif
- 
-+out:
- 	G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object);
- }
- 
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 8db04e5..9883d76 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -2031,7 +2031,7 @@ systemd_stop (void)
-         g_object_unref (bus);
- }
- 
--#else
-+#endif
- 
- static void
- consolekit_stop_cb (GObject *source_object,
-@@ -2081,7 +2081,6 @@ consolekit_stop (void)
-                            consolekit_stop_cb, NULL);
-         g_object_unref (proxy);
- }
--#endif
- 
- static void
- upower_sleep_cb (GObject *source_object,
-@@ -2135,10 +2134,11 @@ do_power_action_type (GsdPowerManager *manager,
-                  * hibernate is not available and is marginally better
-                  * than just powering down the computer mid-write */
- #ifdef HAVE_SYSTEMD
--                systemd_stop ();
--#else
--                consolekit_stop ();
-+                if (sd_booted () > 0)
-+                        systemd_stop ();
-+                else
- #endif
-+                        consolekit_stop ();
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
diff --git a/extra/gnome-sharp/02_fix_pkg-config_paths.patch b/extra/gnome-sharp/02_fix_pkg-config_paths.patch
new file mode 100644
index 000000000..d8e239032
--- /dev/null
+++ b/extra/gnome-sharp/02_fix_pkg-config_paths.patch
@@ -0,0 +1,49 @@
+## 02_fix_pkg-config_paths.dpatch by Mirco Bauer <meebey@debian.org>
+##
+## Modified by Archlinux: removed libdir change
+
+diff -urNad gnome-sharp-2.24.1~/art/art-sharp-2.0.pc.in gnome-sharp-2.24.1/art/art-sharp-2.0.pc.in
+--- gnome-sharp-2.24.1~/art/art-sharp-2.0.pc.in	2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/art/art-sharp-2.0.pc.in	2009-03-21 19:03:32.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ gapidir=${prefix}/share/gapi-2.0
+diff -urNad gnome-sharp-2.24.1~/gconf/GConf/gconf-sharp-2.0.pc.in gnome-sharp-2.24.1/gconf/GConf/gconf-sharp-2.0.pc.in
+--- gnome-sharp-2.24.1~/gconf/GConf/gconf-sharp-2.0.pc.in	2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/gconf/GConf/gconf-sharp-2.0.pc.in	2009-03-21 19:03:26.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ 
+diff -urNad gnome-sharp-2.24.1~/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in gnome-sharp-2.24.1/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in
+--- gnome-sharp-2.24.1~/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in	2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in	2009-03-21 19:03:20.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ 
+diff -urNad gnome-sharp-2.24.1~/gnome/gnome-sharp-2.0.pc.in gnome-sharp-2.24.1/gnome/gnome-sharp-2.0.pc.in
+--- gnome-sharp-2.24.1~/gnome/gnome-sharp-2.0.pc.in	2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/gnome/gnome-sharp-2.0.pc.in	2009-03-21 19:03:07.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ gapidir=${prefix}/share/gapi-2.0
+diff -urNad gnome-sharp-2.24.1~/gnomevfs/gnome-vfs-sharp-2.0.pc.in gnome-sharp-2.24.1/gnomevfs/gnome-vfs-sharp-2.0.pc.in
+--- gnome-sharp-2.24.1~/gnomevfs/gnome-vfs-sharp-2.0.pc.in	2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/gnomevfs/gnome-vfs-sharp-2.0.pc.in	2009-03-21 19:03:12.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ gapidir=${prefix}/share/gapi-2.0
diff --git a/extra/gnome-sharp/04_initialize_dbus_glib_threading.patch b/extra/gnome-sharp/04_initialize_dbus_glib_threading.patch
new file mode 100644
index 000000000..a7f841718
--- /dev/null
+++ b/extra/gnome-sharp/04_initialize_dbus_glib_threading.patch
@@ -0,0 +1,51 @@
+From e9d06b56a54dcd399d1d3eaaf62bdacb7e07084d Mon Sep 17 00:00:00 2001
+From: Mirco Bauer <meebey@meebey.net>
+Date: Sat, 2 Mar 2013 13:44:46 +0100
+Subject: [PATCH] Explicitly initialize D-Bus GLib threading
+
+When gconf was switched from orbit to dbus it was no longer thread-safe by
+default. This behavior can only get back by explicitly initializing dbus-glib's
+threads. This issue affects multi-threaded GConf# users like Banshee leading
+them to SEGVs.
+
+For more details see:
+https://bugzilla.gnome.org/show_bug.cgi?id=683830
+---
+ gconf/GConf/Client.cs                 |   11 +++++++++++
+ gconf/GConf/gconf-sharp.dll.config.in |    1 +
+ 2 files changed, 12 insertions(+)
+
+diff --git a/gconf/GConf/Client.cs b/gconf/GConf/Client.cs
+index b8cc881..64efc9f 100644
+--- a/gconf/GConf/Client.cs
++++ b/gconf/GConf/Client.cs
+@@ -31,6 +31,17 @@ namespace GConf
+ 		[DllImport("gconf-2")]
+ 		static extern IntPtr gconf_client_get_default ();
+ 
++		[DllImport("dbus-glib-1")]
++		static extern void dbus_g_thread_init ();
++
++		static Client ()
++		{
++			// HACK: we have to initialize dbus' threading else GConf with its
++			// dbus backend will not be thread safe and SEGVs in our face, see:
++			// https://bugzilla.gnome.org/show_bug.cgi?id=683830
++			dbus_g_thread_init();
++		}
++
+ 		public Client ()
+ 		{
+ 			Initialize ();
+diff --git a/gconf/GConf/gconf-sharp.dll.config.in b/gconf/GConf/gconf-sharp.dll.config.in
+index 9fb7d15..f20ddae 100644
+--- a/gconf/GConf/gconf-sharp.dll.config.in
++++ b/gconf/GConf/gconf-sharp.dll.config.in
+@@ -1,3 +1,4 @@
+ <configuration>
+   <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@.4@LIB_SUFFIX@"/>
++  <dllmap dll="dbus-glib-1" target="libdbus-glib-1@LIB_PREFIX@.2@LIB_SUFFIX@"/>
+ </configuration>
+-- 
+1.7.10.4
+
diff --git a/extra/gnome-sharp/PKGBUILD b/extra/gnome-sharp/PKGBUILD
index 33518bbfe..988ecf5da 100644
--- a/extra/gnome-sharp/PKGBUILD
+++ b/extra/gnome-sharp/PKGBUILD
@@ -1,17 +1,21 @@
-# $Id: PKGBUILD 148756 2012-02-05 11:49:19Z ibiru $
+# $Id: PKGBUILD 179961 2013-03-13 13:55:50Z jgc $
 # Maintainer: tobias <tobias@archlinux.org>
 
 pkgbase=gnome-sharp
 pkgname=('gnome-sharp' 'art-sharp' 'gconf-sharp' 'gconf-sharp-peditors' 'libgnome-sharp' 'gnome-vfs-sharp')
 pkgver=2.24.2
-pkgrel=2
+pkgrel=3
 arch=(i686 x86_64)
 license=(LGPL)
 url="http://gtk-sharp.sourceforge.net"
 makedepends=('gtk-sharp-2' 'libgnomeui' 'monodoc')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('3b38f53960c736d4afb8f04204efe98b')
+source=(http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/${pkgbase}-${pkgver}.tar.bz2
+        02_fix_pkg-config_paths.patch
+        04_initialize_dbus_glib_threading.patch)
+md5sums=('3b38f53960c736d4afb8f04204efe98b'
+         'a8c1bf57a384f5fc20a5890f9f1cef5a'
+         '90cd7ea88aaa3011522376153433d115')
 
 build() {
   # get rid of that .wapi errors; thanks to brice
@@ -19,6 +23,8 @@ build() {
   mkdir -p "${MONO_SHARED_DIR}"
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
+  patch -Np1 -i ../04_initialize_dbus_glib_threading.patch
+  patch -Np1 -i ../02_fix_pkg-config_paths.patch
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 73da1e385..23df6af4a 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,26 +1,34 @@
-# $Id: PKGBUILD 170877 2012-11-12 21:32:36Z heftig $
+# $Id: PKGBUILD 183399 2013-04-21 22:10:25Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="The next generation GNOME Shell"
 arch=(i686 x86_64 mips64el)
 url="http://live.gnome.org/GnomeShell"
 license=(GPL2)
-depends=(caribou folks gcr gjs gnome-bluetooth gnome-desktop gnome-menus libcroco libpulse mutter
-         nautilus networkmanager telepathy-logger telepathy-mission-control unzip gdm)
-makedepends=(intltool gnome-doc-utils docbook-xsl)
-optdepends=('network-manager-applet: shell integration for networkmanager')
+depends=(accountsservice caribou evolution-data-server gcr gjs gnome-bluetooth gnome-menus
+         gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas
+         libcanberra-pulse libcroco libgdm libsecret mutter network-manager-applet
+         telepathy-logger telepathy-mission-control unzip)
+makedepends=(intltool gtk-doc gnome-control-center)
+optdepends=('gnome-control-center: System settings')
 options=('!libtool' '!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('86cff93ade1bf6a67ebd339c017d567c7dc849ff8b256a3803306f44c24b44f0')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
+        nm-libexecdir.patch)
+sha256sums=('db0160d7c3fec3858805f218f961534d1a3f1486e005492433d4a28c40f83ac7'
+            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
 
 build() {
   cd $pkgname-$pkgver
+
+  # FS#30747 FS#32730 Problems due to libexecdir different from NM
+  patch -Np1 -i ../nm-libexecdir.patch
+
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-shell \
       --localstatedir=/var --disable-static \
diff --git a/extra/gnome-shell/nm-libexecdir.patch b/extra/gnome-shell/nm-libexecdir.patch
new file mode 100644
index 000000000..5360abdc7
--- /dev/null
+++ b/extra/gnome-shell/nm-libexecdir.patch
@@ -0,0 +1,12 @@
+diff -u -Nr gnome-shell-3.6.3.1/js/ui/components/networkAgent.js gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js
+--- gnome-shell-3.6.3.1/js/ui/components/networkAgent.js	2013-02-20 20:31:03.000000000 +0100
++++ gnome-shell-3.6.3.1-nmlibexecdir/js/ui/components/networkAgent.js	2013-03-10 17:13:46.120907065 +0100
+@@ -686,7 +686,7 @@
+                     } catch(e) { } // ignore errors if key does not exist
+                     let path = binary;
+                     if (!GLib.path_is_absolute(path)) {
+-                        path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
++                        path = GLib.build_filenamev(["/usr/lib/networkmanager", path]);
+                     }
+ 
+                     if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))
diff --git a/extra/gnome-shell/recorder.patch b/extra/gnome-shell/recorder.patch
deleted file mode 100644
index 41134a31a..000000000
--- a/extra/gnome-shell/recorder.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 915524e1ab7d2c5efb95985f30ee2f7c5ca69554 Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos@gmail.com>
-Date: Wed, 02 May 2012 14:44:40 +0000
-Subject: main: Close the recorder instead of pausing it
-
-Pausing means that we will continue to use the same output file when
-the keybinding is activated again. While useful to record a single
-video in chunks, it doesn't seem to be how most users understand the
-keybinding. Closing the recorder will close the file and create a new
-one the next time the keybinding is pressed.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=675128
----
-diff --git a/js/ui/main.js b/js/ui/main.js
-index 3b80297..25ad8d8 100644
---- a/js/ui/main.js
-+++ b/js/ui/main.js
-@@ -110,7 +110,7 @@ function _initRecorder() {
-         }
- 
-         if (recorder.is_recording()) {
--            recorder.pause();
-+            recorder.close();
-             Meta.enable_unredirect_for_screen(global.screen);
-         } else {
-             // read the parameters from GSettings always in case they have changed
---
-cgit v0.9.0.2
diff --git a/extra/gnome-system-log/PKGBUILD b/extra/gnome-system-log/PKGBUILD
index a952afe35..6be59b5f6 100644
--- a/extra/gnome-system-log/PKGBUILD
+++ b/extra/gnome-system-log/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170903 2012-11-12 22:38:11Z heftig $
+# $Id: PKGBUILD 183402 2013-04-21 22:10:29Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-system-log
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="View your system logs"
 arch=(i686 x86_64 mips64el)
@@ -10,10 +10,10 @@ url="http://gnome.org"
 license=('GPL2')
 depends=('dconf' 'gtk3')
 makedepends=('intltool' 'itstool' 'docbook-xsl')
-groups=('gnome-extra')
+groups=('gnome')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7b20e59ca271c755400f68446f1f818d4ee3cc7e7e8fa7ba67a843a4eabdecc1')
+sha256sums=('2393d00e059212b5a1135589d11412c0639fe9e60958ccff1bac238139dd4967')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD
index 969afef75..e4850bb4d 100644
--- a/extra/gnome-system-monitor/PKGBUILD
+++ b/extra/gnome-system-monitor/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169915 2012-10-30 22:34:53Z heftig $
+# $Id: PKGBUILD 183403 2013-04-21 22:10:31Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-system-monitor
-pkgver=3.6.0
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="A system monitor for GNOME"
 arch=(i686 x86_64 'mips64el')
@@ -12,14 +12,14 @@ depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'libsystemd'
 makedepends=('itstool' 'docbook-xsl' 'intltool')
 options=(!emptydirs)
 url="http://www.gnome.org"
-groups=('gnome-extra')
+groups=('gnome')
 install=gnome-system-monitor.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5e427d6c7dbe3cfb87afe3feb93882485f79ce71556e5b855152055d8a6080ab')
+sha256sums=('2d5bdd81c19bc34f83c0ccfde998007df9ef517f5e4bfb5e36513a76c21dce86')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/gnome-system-monitor
   make
 }
 
diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD
index f729dc60d..ac47357d6 100644
--- a/extra/gnome-terminal/PKGBUILD
+++ b/extra/gnome-terminal/PKGBUILD
@@ -1,33 +1,35 @@
-# $Id: PKGBUILD 169916 2012-10-30 22:34:57Z heftig $
+# $Id: PKGBUILD 183404 2013-04-21 22:10:33Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-terminal
-pkgver=3.6.0
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="The GNOME Terminal Emulator"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm')
-makedepends=('gnome-doc-utils' 'intltool' 'gtk2' 'itstool' 'docbook-xsl')
-options=('!emptydirs')
+license=(GPL)
+depends=(vte3 gsettings-desktop-schemas libsm dconf)
+makedepends=(gnome-doc-utils intltool itstool docbook-xsl desktop-file-utils python2 gconf)
+optdepends=('gconf: settings migration when upgrading from older version')
+options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-terminal.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5ee068ca7f4d0e410aabbddee3937559138163d84c00e5bef1e9050beb7409cd')
+sha256sums=('c49afab26973225f41ed35a9d5b5180d6207757e524056656146b30692f39fff')
 
 build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname --disable-static
   make
 }
 
-package() {
-  cd "$pkgname-$pkgver"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
 
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-terminal "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/gnome-terminal/gnome-terminal.install b/extra/gnome-terminal/gnome-terminal.install
index 1d8510f06..260d56cb2 100644
--- a/extra/gnome-terminal/gnome-terminal.install
+++ b/extra/gnome-terminal/gnome-terminal.install
@@ -1,17 +1,13 @@
-pkgname=gnome-terminal
-
 post_install() {
-  gconfpkg --install $pkgname
+  glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if [ -f /usr/share/gconf/schemas/gnome-terminal.schemas ]; then
+    gconfpkg --uninstall gnome-terminal
+  fi
 }
 
 post_upgrade() {
   post_install $1
 }
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}
diff --git a/extra/gnome-tetravex/PKGBUILD b/extra/gnome-tetravex/PKGBUILD
new file mode 100644
index 000000000..28ccd7c14
--- /dev/null
+++ b/extra/gnome-tetravex/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 183405 2013-04-21 22:10:35Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=gnome-tetravex
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Complete the puzzle by matching numbered tiles"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=gnome-tetravex.install
+url="https://live.gnome.org/Tetravex"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('30491c1e9005d8f17f6f9655c3a9b553bcaa16e353719ce1de60630a71150ea3')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/gnome-tetravex/gnome-tetravex.install b/extra/gnome-tetravex/gnome-tetravex.install
new file mode 100644
index 000000000..0730c1a47
--- /dev/null
+++ b/extra/gnome-tetravex/gnome-tetravex.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD
index 0ba082bec..7da4ab696 100644
--- a/extra/gnome-themes-standard/PKGBUILD
+++ b/extra/gnome-themes-standard/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 170909 2012-11-12 22:44:40Z heftig $
+# $Id: PKGBUILD 183406 2013-04-21 22:10:36Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-themes-standard
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Default themes for the GNOME desktop"
-arch=('i686' 'x86_64' 'mips64el')
+arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
-license=('GPL2')
-depends=('cantarell-fonts' 'ttf-dejavu' 'gtk3' 'gtk-engines' 'librsvg')
-makedepends=('intltool')
-groups=('gnome')
-replaces=('gnome-themes')
-conflicts=('gnome-themes')
-options=('!libtool')
+license=(GPL2)
+depends=(cantarell-fonts ttf-dejavu librsvg)
+makedepends=(intltool gtk2 gtk3)
+optdepends=('gtk-engines: HighContrast GTK2 theme')
+groups=(gnome)
+replaces=(gnome-themes)
+conflicts=(gnome-themes)
+options=('!libtool' '!emptydirs')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c41503d0e18e17188c4fd1be5f6a7e90b08564e2a19d9a318b145a56d4455352')
+sha256sums=('5cc1b27a70ca6176343212159236332799b074885867e380ed9b3817e15dd1d1')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD
index 7074505b1..6e7fb614d 100644
--- a/extra/gnome-user-share/PKGBUILD
+++ b/extra/gnome-user-share/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 169920 2012-10-30 22:35:10Z heftig $
+# $Id: PKGBUILD 183409 2013-04-21 22:10:42Z heftig $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-user-share
-pkgver=3.0.4
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="Easy to use user-level file sharing for GNOME."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
 license=('GPL')
-depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra')
-makedepends=('intltool' 'nautilus' 'itstool' 'docbook-xsl')
+depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra' 'dbus-glib')
+makedepends=('intltool' 'libnautilus-extension' 'itstool' 'docbook-xsl')
 options=('!emptydirs' '!libtool')
+groups=('gnome')
 install=gnome-user-share.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e1c8ca73163bf77ce7ca1b92db94cd9c4680a24b940d620996c9331ab79edeb8')
+sha256sums=('ae0638a24cf306b6615639a8706c9b48e8961ae26d7f8b5d65eb26955ca4cc3f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-weather/PKGBUILD b/extra/gnome-weather/PKGBUILD
new file mode 100644
index 000000000..3544e97c1
--- /dev/null
+++ b/extra/gnome-weather/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 183410 2013-04-21 22:10:43Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=gnome-weather
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Access current weather conditions and forecasts"
+arch=(i686 x86_64 mips64el)
+url="https://www.gnome.org/"
+license=(GPL)
+depends=(gtk3 gjs libgweather)
+makedepends=(intltool gobject-introspection)
+options=(!libtool)
+groups=(gnome-extra)
+install=gnome-weather.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('9dbbf0aa50a940894a9ebf63001163a8fa89c3aa8febbddcd3c6c6eefbc00f3d')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/kradio/kradio.install b/extra/gnome-weather/gnome-weather.install
index 460e85d7f..c25dff2d3 100644
--- a/extra/kradio/kradio.install
+++ b/extra/gnome-weather/gnome-weather.install
@@ -1,5 +1,5 @@
 post_install() {
-    xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+    glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
 post_upgrade() {
diff --git a/extra/gnu-efi-libs/PKGBUILD b/extra/gnu-efi-libs/PKGBUILD
index b7d60a78b..f6d0c4c42 100644
--- a/extra/gnu-efi-libs/PKGBUILD
+++ b/extra/gnu-efi-libs/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 176034 2013-01-26 17:25:00Z tpowa $
+# $Id: PKGBUILD 180092 2013-03-16 15:44:29Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer : Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 _pkgver="3.0"
 pkgname="gnu-efi-libs"
-pkgver="${_pkgver}s"
-pkgrel="3"
+pkgver="${_pkgver}t"
+pkgrel="2"
 pkgdesc="Library for building x86_64 and i386 UEFI Applications using GNU toolchain"
 url="http://sourceforge.net/projects/gnu-efi/"
 license=('GPL')
@@ -19,10 +19,8 @@ conflicts=('gnu-efi')
 provides=('gnu-efi')
 replaces=('gnu-efi')
 options=('!strip' '!makeflags')
-source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz"         
-         gnu-efi-libs-x86_64-call-fix.patch
-         disable-ms_abi-flag.patch)
-
+source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz"
+        'disable-ms_abi-flag.patch')         
 _build_gnu-efi-libs-x86_64() {	
 	cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-x86_64"
 	cd "${srcdir}/gnu-efi-${_pkgver}-x86_64/"
@@ -39,8 +37,6 @@ _build_gnu-efi-libs-i386() {
 
 build() {
         cd ${srcdir}/gnu-efi-${_pkgver}
-        # fix http://sourceforge.net/tracker/?func=detail&aid=3576537&group_id=163609&atid=828423
-        # patch -Np1 -i ../gnu-efi-libs-x86_64-call-fix.patch
         # fix broken ms_abi flags, causing weird issues with bootloaders
         patch -Np1 -i ../disable-ms_abi-flag.patch
 	## Fix Makefiles to enable compile for both UEFI arch
@@ -56,14 +52,14 @@ build() {
 
 _package_gnu-efi-libs-x86_64() {
 	cd "${srcdir}/gnu-efi-${_pkgver}-x86_64/"	
-	make ARCH="x86_64" INSTALLROOT="${pkgdir}/usr/" LIBDIR="lib" install
+	make ARCH="x86_64" PREFIX="" INSTALLROOT="${pkgdir}/usr/" LIBDIR="lib" install
 	install -d "${pkgdir}/usr/share/gnu-efi/x86_64/"
 	install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}-x86_64/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/x86_64/"
 }
 
 _package_gnu-efi-libs-i386() {	
 	cd "${srcdir}/gnu-efi-${_pkgver}-i386/"
-	make ARCH="ia32" INSTALLROOT="${pkgdir}/usr/" LIBDIR="${_LIBDIR32}" install
+	make ARCH="ia32" PREFIX="" INSTALLROOT="${pkgdir}/usr/" LIBDIR="${_LIBDIR32}" install
 	install -d "${pkgdir}/usr/share/gnu-efi/i386/"
 	install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}-i386/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/i386/"	
 }
@@ -79,7 +75,5 @@ package() {
 		_package_gnu-efi-libs-i386
 	fi	
 }
-
-md5sums=('11f63d52071f7382f56c9e81d0aece91'
-         '4b5428c51af1981d3eb158d924d6bf85'
-         '6295a103438cace5c40606b083c739fd')
+md5sums=('95916208cf543699799230ac1ea14272'
+         '783755e5f691f4c5c629f94d759b727b')
diff --git a/extra/gnu-efi-libs/disable-ms_abi-flag.patch b/extra/gnu-efi-libs/disable-ms_abi-flag.patch
index 2fb61a1d7..e363e6481 100644
--- a/extra/gnu-efi-libs/disable-ms_abi-flag.patch
+++ b/extra/gnu-efi-libs/disable-ms_abi-flag.patch
@@ -6,8 +6,8 @@ index 38da180..aa1f4de 100644
  
  CPPFLAGS   = -DCONFIG_$(ARCH)
  ifeq ($(GCCNEWENOUGH),1)
--CPPFLAGS   += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args
-+CPPFLAGS   += -maccumulate-outgoing-args
+-CPPFLAGS   += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
++CPPFLAGS   += -maccumulate-outgoing-args --std=c11
  endif
 -CFLAGS	   = $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants
 +CFLAGS	   = $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-stack-protector -fno-merge-constants
diff --git a/extra/gnugo/PKGBUILD b/extra/gnugo/PKGBUILD
index 0d8d15bd0..93053049c 100644
--- a/extra/gnugo/PKGBUILD
+++ b/extra/gnugo/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=gnugo
 pkgver=3.8
-pkgrel=3.1
+pkgrel=3.2
 pkgdesc='Program that plays the game of Go'
 url='http://www.gnu.org/software/gnugo/'
 license=('GPL3' 'custom')
diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD
index 078ac808d..863ea8b3c 100644
--- a/extra/gnumeric/PKGBUILD
+++ b/extra/gnumeric/PKGBUILD
@@ -1,32 +1,50 @@
-# $Id: PKGBUILD 173830 2012-12-24 16:09:54Z jgc $
+# $Id: PKGBUILD 184239 2013-05-04 19:38:00Z foutrelis $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
 pkgname=gnumeric
-pkgver=1.12.0
+pkgver=1.12.2
 pkgrel=1
 pkgdesc="A GNOME Spreadsheet Program"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org/projects/gnumeric/"
 license=('GPL')
 depends=('goffice' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'psiconv' 'pygobject-devel' 'gnome-doc-utils')
+makedepends=('intltool' 'psiconv' 'pygobject-devel' 'gnome-doc-utils'
+             'gobject-introspection' 'optipng')
 optdepends=('python2-gobject: for python plugin support'
             'perl: for perl plugin support'
             'psiconv: for Psion 5 file support'
             'yelp: for viewing the help manual')
 install=gnumeric.install
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+        gnumeric-1.12.1-automake-1.13.patch
+        revert-warnings.patch)
+sha256sums=('d6fda191c1c76be2ede21fe78b8c9f96d39aea82ccfb537775a83bf88d781874'
+            '1eb57b931023d961e9d0f3675fe96b5559270fa38c97401cb06fc7aed9c8e275'
+            'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i ../gnumeric-1.12.1-automake-1.13.patch
+  patch -Np0 -i ../revert-warnings.patch
+
   # Remove invalid mime type. (FS#26338)
   sed -i -e 's/zz-application\/zz-winassoc-xls;//' gnumeric.desktop.in
 
+  autoreconf -fi
+
+  # Fix invalid PNG images to work with libpng 1.6
+  # https://bugzilla.gnome.org/show_bug.cgi?id=699683
+  find -name '*.png' -exec optipng -quiet -force -fix {} +
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --enable-ssindex --disable-schemas-compile
+    --disable-schemas-compile --enable-introspection
   make
 }
 
diff --git a/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch b/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch
new file mode 100644
index 000000000..1ae1fb955
--- /dev/null
+++ b/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch
@@ -0,0 +1,104 @@
+diff -up gnumeric-1.12.0/test/Makefile.am.automake-1_13 gnumeric-1.12.0/test/Makefile.am
+--- gnumeric-1.12.0/test/Makefile.am.automake-1_13	2011-05-18 02:54:24.000000000 +0200
++++ gnumeric-1.12.0/test/Makefile.am	2013-01-05 18:25:56.380686587 +0100
+@@ -25,7 +25,99 @@
+ #
+ # 90xx: Misc stuff.
+ 
+-TESTS = $(sort $(wildcard $(srcdir)/t[0-9][0-9][0-9][0-9]-*.pl))
++TESTS = \
++t1000-statfuns.pl \
++t1001-mathfuns.pl \
++t1002-finfuns.pl \
++t1003-engfuns.pl \
++t1004-textfuns.pl \
++t1005-logfuns.pl \
++t1006-datefuns.pl \
++t1007-dbfuns.pl \
++t1008-infofuns.pl \
++t1009-lookfuns.pl \
++t1010-bitwise.pl \
++t1011-yalta2008.pl \
++t1100-chitest.pl \
++t1101-ftest.pl \
++t1102-ttest.pl \
++t1103-sumif.pl \
++t1104-linest.pl \
++t1800-operators.pl \
++t1900-array.pl \
++t1901-regress.pl \
++t1902-array-intersection.pl \
++t2000-names-insdel.pl \
++t2001-func-help.pl \
++t2002-nonascii-numbers.pl \
++t2003-random-generators.pl \
++t2800-style-optimizer.pl \
++t5900-sc.pl \
++t5901-qpro.pl \
++t5902-applix.pl \
++t5903-sylk.pl \
++t5904-mps.pl \
++t6000-statfuns.pl \
++t6001-mathfuns.pl \
++t6002-objs.pl \
++t6003-lookfuns.pl \
++t6004-chart-tests.pl \
++t6004-finfuns.pl \
++t6100-statfuns-ods.pl \
++t6101-mathfuns-ods.pl \
++t6102-objs-ods.pl \
++t6103-lookfuns-ods.pl \
++t6104-finfuns-ods.pl \
++t7000-goal-seek.pl \
++t7100-solver-blend.pl \
++t7101-solver-afiro.pl \
++t7110-solver-Misra1a.pl \
++t7111-solver-Chwirut2.pl \
++t7112-solver-Chwirut1.pl \
++t7113-solver-Lanczos3.pl \
++t7114-solver-Gauss1.pl \
++t7115-solver-Gauss2.pl \
++t7116-solver-DanWood.pl \
++t7117-solver-Misra1b.pl \
++t7120-solver-Kirby2.pl \
++t7121-solver-Hahn1.pl \
++t7122-solver-Nelson.pl \
++t7123-solver-MGH17.pl \
++t7124-solver-Lanczos1.pl \
++t7125-solver-Lanczos2.pl \
++t7126-solver-Gauss3.pl \
++t7127-solver-Misra1c.pl \
++t7128-solver-Misra1d.pl \
++t7129-solver-Roszman1.pl \
++t7130-solver-ENSO.pl \
++t7140-solver-MGH09.pl \
++t7141-solver-Thurber.pl \
++t7142-solver-BoxBOD.pl \
++t7143-solver-Rat42.pl \
++t7144-solver-MGH10.pl \
++t7145-solver-Eckerle4.pl \
++t7146-solver-Rat43.pl \
++t7147-solver-Bennett5.pl \
++t8000-valgrind.pl \
++t8001-valgrind-xls.pl \
++t8002-valgrind-gnumeric.pl \
++t8003-valgrind-pdf.pl \
++t8004-valgrind-xls-macro.pl \
++t8005-valgrind-chart-fit.pl \
++t8050-valgrind-sstest.pl \
++t8100-null-false.pl \
++t8101-gfree.pl \
++t8102-glade-visible.pl \
++t8103-gtk.pl \
++t8104-glade-parsing.pl \
++t8200-gslice1.pl \
++t8201-gslice2.pl \
++t8202-gslice3.pl \
++t9000-ssindex.pl \
++t9100-number-match.pl \
++t9999-epilogue.pl
++
++
+ SUPPS = common.supp gui.supp t8003-valgrind-pdf.supp
+ 
+ import-db:
diff --git a/extra/gnumeric/revert-warnings.patch b/extra/gnumeric/revert-warnings.patch
new file mode 100644
index 000000000..bf9df5dd7
--- /dev/null
+++ b/extra/gnumeric/revert-warnings.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2013-03-13 16:09:02.355422066 +0000
++++ configure.ac	2013-03-13 16:09:26.701917153 +0000
+@@ -269,8 +269,6 @@
+ 			 -Wchar-subscripts -Wwrite-strings \
+ 			 -Wdeclaration-after-statement -Wnested-externs \
+ 			 -Wmissing-noreturn \
+-			 -Werror=missing-prototypes -Werror=nested-externs \
+-			 -Werror=implicit-function-declaration \
+ 			 -Wmissing-declarations -Wno-pointer-sign \
+ 			 -Werror=format-security -Wbitwise -Wcast-to-as \
+ 			 -Wdefault-bitfield-sign -Wdo-while -Wparen-string \
diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD
index ec2efafb7..9eb7e1c38 100644
--- a/extra/gnuplot/PKGBUILD
+++ b/extra/gnuplot/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173172 2012-12-12 00:31:46Z eric $
+# $Id: PKGBUILD 180538 2013-03-22 21:03:11Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=gnuplot 
-pkgver=4.6.1
+pkgver=4.6.2
 pkgrel=2
 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" 
 arch=('i686' 'x86_64' 'mips64el') 
@@ -12,12 +12,15 @@ url="http://www.gnuplot.info"
 license=('custom') 
 depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua') 
 makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
+options=('!makeflags')
 install=gnuplot.install 
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-sha1sums=('1ea21a628223159b0297ae65fe8293afd5aab3c0')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" 
+        gnuplot-doc2texi-el.patch)
+sha1sums=('88748d4bc9bd41ba8a267a35b6e5b7427cd997cd'
+          '46f381fafa2f6c6e3bfefa1e7b999729e260a2e8')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
 
   # fix default source location; use the GDFONTPATH variable to modify at runtime 
   sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c
@@ -26,28 +29,22 @@ build() {
   -e 's|$(X11ROOT)/X11R6/lib/X11/fonts/Type1|$(X11ROOT)/usr/share/fonts/Type1|' \
   src/variable.c
 
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-              --infodir=/usr/share/info \
+  (cd docs; patch -p0 -i "$srcdir/gnuplot-doc2texi-el.patch")
+
+  ./configure --prefix=/usr \
               --libexecdir=/usr/bin \
               --with-gihdir=/usr/share/gnuplot \
-              --datadir=/usr/share \
-              --with-readline=gnu \
-              --with-texdir=$pkgdir/usr/share/texmf/tex/latex/gnuplot
+              --with-readline=gnu
   make pkglibexecdir=/usr/bin
 }
 
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr libexecdir=$pkgdir/usr/bin \
-         mandir=$pkgdir/usr/share/man \
-        infodir=$pkgdir/usr/share/info \
-        pkglibexecdir=$pkgdir/usr/bin \
-        GIHDIR=$pkgdir/usr/share/gnuplot \
-        datadir=$pkgdir/usr/share install
-
-  install -Dm644 lisp/dotemacs $pkgdir/usr/share/emacs/site-lisp/dotemacs
-  install -Dm644 Copyright $pkgdir/usr/share/licenses/$pkgname/Copyright
-
-  rm -f $pkgdir/usr/share/texmf-dist/ls-R
+  cd "$srcdir/$pkgname-$pkgver"
+  make pkglibexecdir=/usr/bin DESTDIR="$pkgdir" install
+
+  install -Dm644 lisp/dotemacs "$pkgdir/usr/share/emacs/site-lisp/dotemacs"
+  install -Dm644 Copyright "$pkgdir/usr/share/licenses/$pkgname/Copyright"
+
+  rm -f "$pkgdir/usr/share/texmf-dist/ls-R"
 }
diff --git a/extra/gnuplot/gnuplot-doc2texi-el.patch b/extra/gnuplot/gnuplot-doc2texi-el.patch
new file mode 100644
index 000000000..49f7d3f0a
--- /dev/null
+++ b/extra/gnuplot/gnuplot-doc2texi-el.patch
@@ -0,0 +1,13 @@
+Index: doc2texi.el
+===================================================================
+RCS file: /cvsroot/gnuplot/gnuplot/docs/doc2texi.el,v
+retrieving revision 1.32
+diff -r1.32 doc2texi.el
+518c518
+<                   (replace-match (concat "4  " node) nil nil))
+---
+>                   (replace-match (concat "3  " node) nil nil))
+521c521
+<                   (replace-match "5 " nil nil))
+---
+>                   (replace-match "4 " nil nil))
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index cdf5292c7..36d87ad95 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177035 2013-02-04 17:30:30Z andyrtr $
+# $Id: PKGBUILD 180567 2013-03-23 15:06:13Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.1.7
+pkgver=3.1.10
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,8 +15,8 @@ depends=('gcc-libs>=4.7.1-5' 'libtasn1>=3.0' 'readline' 'zlib' 'nettle>=2.4' 'p1
 makedepends=('strace' 'datefudge')
 [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind')
 source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('95c96dfaba0e82e9e6bcb67eab5abf49'
-         'ea9d8c24c1ac2654ae9fe87f69b45e17')
+md5sums=('9e73aa5c3ef3b7358159a31302e25aa7'
+         '062dd4fe7d527dadbb3d9e9fb240510f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnutls/gnutls.install b/extra/gnutls/gnutls.install
index 691f3c69d..48052cc02 100644
--- a/extra/gnutls/gnutls.install
+++ b/extra/gnutls/gnutls.install
@@ -1,5 +1,5 @@
 infodir=usr/share/info
-filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info.gz gnutls-guile.info.gz)
+filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info-5.gz gnutls.info.gz gnutls-guile.info.gz)
 
 post_install() {
   [ -x usr/bin/install-info ] || return 0
diff --git a/extra/gob2/PKGBUILD b/extra/gob2/PKGBUILD
index 71d07567f..a00431b14 100644
--- a/extra/gob2/PKGBUILD
+++ b/extra/gob2/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 145709 2011-12-28 14:25:19Z jgc $
+# $Id: PKGBUILD 183109 2013-04-17 15:27:46Z jgc $
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 
 pkgname=gob2
-pkgver=2.0.18
-pkgrel=1.1
+pkgver=2.0.19
+pkgrel=1
 pkgdesc="GTK Object Builder (GOB) is a simple preprocessor for easily creating GTK objects"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('glib2')
 url="http://www.5z.com/jirka/gob.html"
 source=(http://ftp.5z.com/pub/gob/${pkgname}-${pkgver}.tar.xz)
-md5sums=('cd08248762962aec88100ddaaff4f9e0')
+md5sums=('d7f2e7b96c33458d69b6381e28e4ac69')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gobject-introspection/PKGBUILD b/extra/gobject-introspection/PKGBUILD
index e04c2e419..65e9d14cc 100644
--- a/extra/gobject-introspection/PKGBUILD
+++ b/extra/gobject-introspection/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170882 2012-11-12 22:03:02Z heftig $
+# $Id: PKGBUILD 183411 2013-04-21 22:10:45Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gobject-introspection
-pkgver=1.34.2
+pkgver=1.36.0
 pkgrel=1
 pkgdesc="Introspection system for GObject-based libraries"
 url="https://live.gnome.org/GObjectIntrospection"
@@ -12,7 +12,7 @@ depends=('glib2' 'python2' 'python2-mako')
 makedepends=('cairo')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bc7948a35ce2218922dfb0806679cad21060715cc0c340cf7823eb633cc03429')
+sha256sums=('e3e76d9d428e7534761bf8cdf75338865a4b0872e8052bef51792744608b6383')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD
index f4fb6ff1b..644bd459e 100644
--- a/extra/goffice/PKGBUILD
+++ b/extra/goffice/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 173831 2012-12-24 16:09:55Z jgc $
+# $Id: PKGBUILD 183875 2013-04-29 09:27:35Z jgc $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=goffice
-pkgver=0.10.0
+pkgver=0.10.2
 pkgrel=1
 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ options=('!libtool')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection')
 depends=('librsvg' 'gtk3' 'libgsf' 'libspectre')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('7e7577f69203b03c4966906bcaabc6e87a629efb1684630c2bee7907bed08439')
+sha256sums=('7d38769a7af655c0f0373738c786318734400d71b6bbc8d1ce6b6de99bb95674')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/goffice/use-apiver-for-dirs.patch b/extra/goffice/use-apiver-for-dirs.patch
deleted file mode 100644
index 3d0909da3..000000000
--- a/extra/goffice/use-apiver-for-dirs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.in.orig	2011-09-07 08:45:49.687783970 +0000
-+++ configure.in	2011-09-07 09:12:55.709382840 +0000
-@@ -418,7 +418,7 @@
- fi
- 
- dnl **************************************************
--AC_SUBST(GETTEXT_PACKAGE, goffice-${VERSION})
-+AC_SUBST(GETTEXT_PACKAGE, goffice-${GOFFICE_API_VER})
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
- 	[The package name, for gettext])
- AM_GLIB_GNU_GETTEXT
-@@ -638,9 +638,9 @@
- dnl ******************
- dnl
- dnl These are changed in goffice.c for WIN32 packages
--AC_SUBST(goffice_datadir, '${datadir}/goffice/${VERSION}')
--AC_SUBST(goffice_libdir, '${libdir}/goffice/${VERSION}')
--AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${VERSION}')
-+AC_SUBST(goffice_datadir, '${datadir}/goffice/${GOFFICE_API_VER}')
-+AC_SUBST(goffice_libdir, '${libdir}/goffice/${GOFFICE_API_VER}')
-+AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${GOFFICE_API_VER}')
- AC_SUBST(goffice_localedir, '${prefix}/${DATADIRNAME}/locale')
- dnl
- AC_SUBST(goffice_plugindir, '${goffice_libdir}/plugins')
---- libgoffice.pc.in.orig	2010-02-18 22:49:39.000000000 +0000
-+++ libgoffice.pc.in	2011-09-07 09:18:53.655992532 +0000
-@@ -11,4 +11,4 @@
- Libs.private: @EXTRA_LIBS@
- Cflags: -I${includedir}/libgoffice-@GOFFICE_API_VER@ @EXTRA_INCLUDES@
- 
--PluginDir=${libdir}/goffice/@VERSION@/plugins
-+PluginDir=${libdir}/goffice/@GOFFICE_API_VER@/plugins
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index 9b9ad58ac..a80cb9d90 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173201 2012-12-13 00:53:58Z giovanni $
+# $Id: PKGBUILD 184007 2013-04-30 18:49:43Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gparted
-pkgver=0.14.1
+pkgver=0.16.1
 pkgrel=1
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,18 +14,18 @@ depends=('parted' 'gtkmm' 'hicolor-icon-theme')
 makedepends=('intltool' 'pkg-config' 'gnome-doc-utils')
 optdepends=('dosfstools: for FAT16 and FAT32 partitions'
             'jfsutils: for jfs partitions'
-            'ntfsprogs: for ntfs partitions'
+            'ntfs-3g: for ntfs partitions'
             'reiserfsprogs: for reiser partitions'
             'xfsprogs: for xfs partitions'
             'nilfs-utils: for nilfs2 support'
             'polkit-gnome: to run gparted directly from menu'
             'gpart: for recovering corrupt partition tables'
-            'mtools')
+            'mtools: utilities to access MS-DOS disks')
 install=gparted.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2"
         'org.archlinux.pkexec.gparted.policy')
-md5sums=('1ffe859c70e102a776dffb1ff0a2164a'
-         '27c264cfad8fa413d75954dda7a2dd50')
+md5sums=('3f399bff031b5ce14d11a8c346f4b89c'
+         'c031d7d2b845ccb025b9f83e0ddd5653')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -42,12 +42,11 @@ package() {
   # Install policy file
   install -Dm644 "${srcdir}/org.archlinux.pkexec.gparted.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy"
 
-  # Install launcher script
-  mkdir -p ${pkgdir}/usr/bin
-  echo '#!/bin/sh' > ${pkgdir}/usr/bin/gparted-pkexec
-  echo 'pkexec "/usr/sbin/gparted" "$@"' >> ${pkgdir}/usr/bin/gparted-pkexec
-  chmod 755 ${pkgdir}/usr/bin/gparted-pkexec
+  # We need rename the original script
+  mv "${pkgdir}/usr/sbin/gparted" "${pkgdir}/usr/sbin/gparted.elf"
 
-  # Modify desktop file
-  sed -i -e "s/Exec=.*/Exec=gparted-pkexec/" ${pkgdir}/usr/share/applications/gparted.desktop
+  # Install launcher script
+  echo '#!/bin/sh' > ${pkgdir}/usr/sbin/gparted
+  echo 'pkexec --disable-internal-agent "/usr/sbin/gparted.elf" "$@"' >> ${pkgdir}/usr/sbin/gparted
+  chmod 755 ${pkgdir}/usr/sbin/gparted
 }
diff --git a/extra/gparted/gparted.install b/extra/gparted/gparted.install
index 21b79d2d4..e8f6bed8f 100644
--- a/extra/gparted/gparted.install
+++ b/extra/gparted/gparted.install
@@ -1,9 +1,12 @@
 post_install() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  echo 'If you use a lightweight windowmanager, remember to run'
+  echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable'
+  echo 'graphical authentication, which may be needed for pkexec to work.'
 }
 
 post_upgrade() {
-  post_install $1
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_remove() {
diff --git a/extra/gparted/org.archlinux.pkexec.gparted.policy b/extra/gparted/org.archlinux.pkexec.gparted.policy
index 561cd7d1e..65894a0cc 100644
--- a/extra/gparted/org.archlinux.pkexec.gparted.policy
+++ b/extra/gparted/org.archlinux.pkexec.gparted.policy
@@ -12,7 +12,7 @@
       <allow_inactive>auth_admin</allow_inactive>
       <allow_active>auth_admin</allow_active>
     </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gparted</annotate>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gparted.elf</annotate>
     <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
   </action>
 
diff --git a/extra/gperf/PKGBUILD b/extra/gperf/PKGBUILD
index 446f75b85..5e8c02319 100644
--- a/extra/gperf/PKGBUILD
+++ b/extra/gperf/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=gperf
 pkgver=3.0.4
-pkgrel=4.2
+pkgrel=4.3
 pkgdesc="Perfect hash function generator"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://www.gnu.org/software/gperf/"
diff --git a/extra/gperftools/PKGBUILD b/extra/gperftools/PKGBUILD
index 723950d15..c8ad827ae 100644
--- a/extra/gperftools/PKGBUILD
+++ b/extra/gperftools/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=gperftools
 pkgver=2.0
 pkgrel=4
 pkgdesc="Fast, multi-threaded malloc() and nifty performance analysis tools"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://code.google.com/p/gperftools/"
 license=('BSD')
 depends=('perl')
diff --git a/extra/gphoto2/PKGBUILD b/extra/gphoto2/PKGBUILD
index 46c3a9191..b8e7fdc69 100644
--- a/extra/gphoto2/PKGBUILD
+++ b/extra/gphoto2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173131 2012-12-11 14:42:20Z jgc $
+# $Id: PKGBUILD 179980 2013-03-13 20:13:10Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 pkgname=gphoto2
-pkgver=2.5.0
+pkgver=2.5.1
 pkgrel=1
 pkgdesc="A digital camera download and access program."
 arch=(i686 x86_64 'mips64el')
@@ -11,6 +11,7 @@ url="http://www.gphoto.org"
 license=('GPL' 'LGPL')
 depends=('libgphoto2' 'popt' 'readline')
 source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('03cda6d5b7c647ac4c90d0081f2cb7c7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -22,4 +23,3 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('64c6d291c5bd50388af0c51da71efb59')
diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD
index 4dad37328..d0a89d6e4 100644
--- a/extra/gpsd/PKGBUILD
+++ b/extra/gpsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169832 2012-10-30 19:50:10Z tomegun $
+# $Id: PKGBUILD 183237 2013-04-19 00:40:14Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Giacomo Rizzo <alt@free-os.it>
 
 pkgname=gpsd
-pkgver=3.7
+pkgver=3.8
 pkgrel=1
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,11 +16,11 @@ optdepends=('php: generate a PHP status page for your GPS'
             'php-gd: image support for the PHP status page'
             'pygtk: GUI frontends')
 makedepends=('scons' 'docbook-xsl' 'chrpath')
-backup=('etc/conf.d/gpsd')
+backup=('etc/gpsd.conf')
 options=('!libtool')
 install="${pkgname}.install"
 source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        'gpsd' 'gpsd.conf.d')
+        'gpsd.conf')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -48,17 +48,16 @@ package() {
   export DESTDIR="${pkgdir}"
   scons install
 
-  install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd"
+  install -D -m644 "${srcdir}/gpsd.conf" "${pkgdir}/etc/gpsd.conf"
 
-  sed -i 's|/lib/udev/gpsd|/usr/lib/udev/gpsd|' gpsd.rules
+  install -D -m644 "gpsd.rules" "${pkgdir}/usr/lib/udev/rules.d/25-gpsd-usb.rules"
 
-  install -D -m644 "gpsd.rules" "${pkgdir}/usr/lib/udev/rules.d/99-gpsd-usb.rules"
-
-  sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug
+  sed -i 's|/etc/default/gpsd|/etc/gpsd|' gpsd.hotplug
   install -D -m755 gpsd.hotplug "${pkgdir}/usr/lib/udev/gpsd.hotplug"
 
   # GPSD needs RPATH
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0
+  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps.so.20.0.0
+  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgpsd.so.21.0.0
   chrpath -r /usr/lib/ "${pkgdir}"/usr/bin/{gpsdecode,gpsctl,gpspipe,gpxlogger,lcdgps}
   chrpath -r /usr/lib/ "${pkgdir}"/usr/sbin/{gpsd,gpsdctl}
   chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/gps/{clienthelpers,packet}.so
@@ -70,14 +69,11 @@ package() {
   install -D -m644 packaging/X11/gpsd-logo.png \
     "${pkgdir}/usr/share/gpsd/gpsd-logo.png"
 
-  install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd"
-
   install -D -m644 systemd/gpsd.service "${pkgdir}/usr/lib/systemd/system/gpsd.service"
   install -D -m644 systemd/gpsd.socket "${pkgdir}/usr/lib/systemd/system/gpsd.socket"
 
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-md5sums=('52d9785eaf1a51298bb8900dbde88f98'
-         '07fa4bf23aa998dcb951790b63dbebff'
-         '6602d04bb037bc500424f00f24f58837'
+md5sums=('1a3177b907f25c0ce6d1a0aa22597270'
+         'SKIP'
          '3e963df3f9f7ef3572ecc648ae829315')
diff --git a/extra/gpsd/gpsd b/extra/gpsd/gpsd
deleted file mode 100755
index 2ca7efe26..000000000
--- a/extra/gpsd/gpsd
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/gpsd ] && . /etc/conf.d/gpsd
-
-NAME=gpsd
-DAEMON=/usr/sbin/gpsd
-PIDFILE=/run/gpsd.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-
-case "$1" in
-   start)
-	stat_busy "Starting gpsd"
-	[ -z "$PID" ] && "$DAEMON" -P $PIDFILE -F /run/gpsd.sock ${GPSD_OPTIONS} ${DEVICES}
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		add_daemon $NAME
-		stat_done
-	fi
-   ;;
-   stop)
-	stat_busy "Stopping $NAME"
-	[ ! -z "$PID" ]  && kill $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-	    rm -f $PIDFILE &>/dev/null
-	    rm_daemon $NAME
-	    stat_done
-	fi
-   ;;
-
-   restart)
-	$0 stop
-	sleep 2
-	$0 start
-   ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/gpsd/gpsd.conf.d b/extra/gpsd/gpsd.conf
index 9fef72cb9..9fef72cb9 100644
--- a/extra/gpsd/gpsd.conf.d
+++ b/extra/gpsd/gpsd.conf
diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD
index f60942924..43d0c6294 100644
--- a/extra/gptfdisk/PKGBUILD
+++ b/extra/gptfdisk/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 175868 2013-01-23 00:13:01Z eric $
+# $Id: PKGBUILD 180803 2013-03-26 11:49:32Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Hokum <hokum_at_mail_dot_ru>
 
 pkgname=gptfdisk
-pkgver=0.8.5
-pkgrel=3
+pkgver=0.8.6
+pkgrel=2
 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rodsbooks.com/gdisk/"
@@ -15,11 +15,14 @@ provides=("gdisk=$pkgver")
 conflicts=('gdisk')
 replaces=('gdisk')
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-sha256sums=('15cc691f28212c157e05315662ed6b76ffdcc8de6fc118fa21c81ef5aae84af9')
+sha256sums=('4579cd54842459699970e24720dda7fb0aa217027818623089c321bc62a647b2')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Get rid of annoying debug message (have sent email to upstream author)
+  sed -i '/Entering GPTPart::SetName/d' gptpart.cc
+
   make
 }
 
diff --git a/extra/grantlee/PKGBUILD b/extra/grantlee/PKGBUILD
index fd5284709..3e5bdf542 100644
--- a/extra/grantlee/PKGBUILD
+++ b/extra/grantlee/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 170108 2012-11-02 08:45:56Z andrea $
+# $Id: PKGBUILD 178957 2013-03-01 10:20:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=grantlee
 pkgver=0.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A string template engine based on the Django template system and written in Qt"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gitorious.org/grantlee/pages/Home"
 license=('LGPL3')
-depends=('qt')
+depends=('qt4')
 makedepends=('cmake' 'doxygen')
 source=("http://downloads.grantlee.org/${pkgname}-${pkgver}.tar.gz")
 md5sums=('195763a3238f51f8885881fc8012cd83')
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD
index 1dca65278..7f2a55af9 100644
--- a/extra/graphicsmagick/PKGBUILD
+++ b/extra/graphicsmagick/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168727 2012-10-14 22:47:56Z bisson $
+# $Id: PKGBUILD 179903 2013-03-11 15:24:45Z bisson $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Anton Leontiev <bunder@t-25.ru>
 
 pkgname=graphicsmagick
-pkgver=1.3.17
+pkgver=1.3.18
 pkgrel=1
 pkgdesc='Image processing system'
 url='http://www.graphicsmagick.org/'
@@ -16,7 +16,7 @@ depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz'
          'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz")
-sha1sums=('6428eb4bd19635c833750ac9d56c9b89bef4c975')
+sha1sums=('085c23666adcf88585119cb6aea7efe5c58481d4')
 
 build() {
 	cd "${srcdir}/GraphicsMagick-${pkgver}"
diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD
index 5e504f972..9a254119d 100644
--- a/extra/graphite/PKGBUILD
+++ b/extra/graphite/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 173763 2012-12-22 16:44:26Z andyrtr $
+# $Id: PKGBUILD 179056 2013-03-02 11:28:27Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=graphite
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('cmake' 'freetype2' 'python2')
 # 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') - only for docs - target doesn't install properly
 options=('!libtool' '!emptydirs')
 source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz")
-md5sums=('f5ef3f7f10fa8c3542c6a085a233080b')
+md5sums=('edf70ab2f7d789be219f47b1df00d67e')
 
 build() {
   cd "${srcdir}"
@@ -26,7 +26,7 @@ build() {
 	-DCMAKE_BUILD_TYPE:STRING=Release \
 	-DGRAPHITE2_COMPARE_RENDERER=OFF
   make
-  make docs
+#  make docs
 }
 
 check() {
diff --git a/extra/graphite/pango-graphite.install b/extra/graphite/pango-graphite.install
deleted file mode 100644
index 46bc44611..000000000
--- a/extra/graphite/pango-graphite.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	usr/bin/pango-querymodules >etc/pango/pango.modules
-}
-
-post_upgrade() {
-	post_install $1
-}
-
-pre_remove() {
-        post_install $1
-}
-
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index 1b7a93e67..1a2728ae0 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,47 +1,34 @@
-# $Id: PKGBUILD 173840 2012-12-25 00:34:21Z foutrelis $
+# $Id: PKGBUILD 180579 2013-03-23 23:09:33Z td123 $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
-pkgver=2.28.0
-pkgrel=12
+pkgver=2.30.1
+pkgrel=2.1
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('custom:EPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts')
-case $CARCH in
-    mips64el)
-# r and ocaml aren't ported yet
-# no one's interested on mono
-makedepends=('swig' 'guile' 'lua51' 'perl' 'php' 'python2' 'ruby' 'tk' 'qt')
+makedepends=('swig' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'ruby' 'tk' 'qt4')
 optdepends=('guile: guile bindings'
-            'lua: lua bindings'
-            'perl: perl bindings'
-            'php: php bindings'
-            'python2: python bindings'
-            'ruby: ruby bindings'
-            'tcl: tcl bindings'
-            'qt: gvedit')
-    ;;
-    *)
-makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt')
-optdepends=('mono: sharp bindings'
-            'guile: guile bindings'
             'lua51: lua bindings'
             'ocaml: ocaml bindings'
             'perl: perl bindings'
             'php: php bindings'
             'python2: python bindings'
-            'r: r bindings'
             'ruby: ruby bindings'
             'tcl: tcl bindings'
-            'qt: gvedit')
-esac
+            'qt4: gvedit')
+if [ "$CARCH" != "mips64el" ]; then
+  makedepends+=('mono' 'r')
+  optdepends+=('mono: sharp bindings'
+               'r: r bindings')
+fi
 source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
         'LICENSE')
-sha1sums=('4725d88a13e071ee22e632de551d4a55ca08ee7d'
+sha1sums=('96739220c4bbcf1bd3bd52e7111f4e60497185c6'
           'e78277e502c29abb74b9587a5dc951ec392554ea')
 
 options=('!libtool')
@@ -51,14 +38,20 @@ build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	sed \
-		-e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,})"'":' \
+		-e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-2.0.0/{$CARCH-linux,ruby/backward,})"'":' \
 		-e '/CONFIG/s:site:vendor:' \
 		-i config/config_ruby.rb
+	sed \
+		-e 's:ruby-1.9:ruby-2.0:g' \
+		-e '/LIBPOSTFIX="64"/d' \
+		-i configure
 
-	sed '/LIBPOSTFIX="64"/d' -i configure
 	export PYTHON=python2
 	export LUA=lua5.1
 
+	# install the graph and cgraph api alongside
+	sed 's/@WITH_CGRAPH_FALSE@//g' -i lib/graph/Makefile.in
+
 	./configure --prefix=/usr
 	make || sed '/caml_array_length/d' -i tclpkg/gv/gv_ocaml.cpp # swig goes wonky
 	make
@@ -68,6 +61,9 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 
-	# cf. http://www.graphviz.org/License.php
+	# http://www.graphviz.org/License.php
 	install -Dm644 ../LICENSE "${pkgdir}"/usr/share/licenses/graphviz/LICENSE
+
+	# everything has been built against cgraph, but use graph as default api
+	sed '/#define WITH_CGRAPH 1/d' -i "${pkgdir}"/usr/include/graphviz/types.h
 }
diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD
index 26cbdba3f..d5aff92e5 100644
--- a/extra/grilo-plugins/PKGBUILD
+++ b/extra/grilo-plugins/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 173150 2012-12-11 17:04:18Z heftig $
+# $Id: PKGBUILD 183412 2013-04-21 22:10:47Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=grilo-plugins
-pkgver=0.2.5
+pkgver=0.2.6
 pkgrel=1
 pkgdesc="Plugins for Grilo"
 url="http://www.gnome.org"
 arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
-depends=('grilo' 'sqlite' 'libgcrypt')
+license=(LGPL)
+depends=(grilo sqlite libgcrypt)
 makedepends=(gupnp-av libgdata libquvi gmime rest libtracker-sparql totem-plparser libdmapsharing
              json-glib)
 optdepends=('gupnp-av: uPnP plugin'
             'libgdata: Youtube plugin'
             'libquvi: Youtube plugin, Vimeo plugin'
-            'sqlite: Podcasts plugin'
             'gmime: Podcasts plugin'
             'rest: Blip.tv plugin'
             'libtracker-sparql: Tracker plugin'
@@ -23,11 +22,10 @@ optdepends=('gupnp-av: uPnP plugin'
             'json-glib: TMDb plugin')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('32ae6c8ebf624e5662f209435d8aae6a5db23d7c52d446c9b9479c0b441a3ab3')
+sha256sums=('029ea7fdbb32ff5cc20295b9a1a943f76f39a67ed5bf08a2b33b01cf287a1227')
 
 build() {
   cd $pkgname-$pkgver
-  
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
     --enable-shoutcast
   make
diff --git a/extra/grilo-plugins/tracker-0.14.patch b/extra/grilo-plugins/tracker-0.14.patch
deleted file mode 100644
index c9c79fe7c..000000000
--- a/extra/grilo-plugins/tracker-0.14.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9e00790f40ee498a7359b00e0b11a7523fdd1b3e Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Thu, 19 Jan 2012 09:30:28 +0000
-Subject: build: Support build against tracker 0.13/0.14
-
-https://bugzilla.gnome.org/show_bug.cgi?id=667855
----
-diff --git a/configure.ac b/configure.ac
-index 1fd6743..71aceed 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -134,11 +134,17 @@ PKG_CHECK_MODULES(GMIME, gmime-2.6,
-                                                    HAVE_GMIME=yes,
-                                                    HAVE_GMIME=no)])
- 
--PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.12,
-+PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.14,
-                                   HAVE_TRACKER_SPARQL=yes,
-                                   HAVE_TRACKER_SPARQL=no)
- 
- if test "x$HAVE_TRACKER_SPARQL" = "xno"; then
-+   PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.12,
-+                                     HAVE_TRACKER_SPARQL=yes,
-+                                     HAVE_TRACKER_SPARQL=no)
-+fi
-+
-+if test "x$HAVE_TRACKER_SPARQL" = "xno"; then
-    PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.11,
-                                      HAVE_TRACKER_SPARQL=yes,
-                                      HAVE_TRACKER_SPARQL=no)
---
-cgit v0.9.0.2
diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD
index 4c5659e1d..b0acf3bc0 100644
--- a/extra/grilo/PKGBUILD
+++ b/extra/grilo/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 172922 2012-12-06 20:30:42Z heftig $
+# $Id: PKGBUILD 180276 2013-03-19 13:37:31Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=grilo
-pkgver=0.2.4
+pkgver=0.2.5
 pkgrel=1
 pkgdesc="Framework that provides access to various sources of multimedia content"
 url="http://www.gnome.org"
@@ -13,7 +13,7 @@ makedepends=('gobject-introspection' 'gtk-doc' 'vala')
 optdepends=('grilo-plugins: Plugins for grilo')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('20fa8a5d1b89419c44f9b590a5a793e33d43a5e959ec8686111e631a724644fe')
+sha256sums=('ff281f60bc3afcb70913e61a6447b33ab259b3d89c1441c7e307fc998c050cdc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gsl/PKGBUILD b/extra/gsl/PKGBUILD
index 70ac01816..9119271a8 100644
--- a/extra/gsl/PKGBUILD
+++ b/extra/gsl/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=gsl
 pkgver=1.15
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc="The GNU Scientific Library (GSL) is a modern numerical library for C and C++ programmers"
 url="http://www.gnu.org/software/gsl/gsl.html"
 source=("http://ftp.belnet.be/mirror/ftp.gnu.org/gnu/gsl/$pkgname-$pkgver.tar.gz")
diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD
index f3f45a312..c7347a34b 100644
--- a/extra/gssdp/PKGBUILD
+++ b/extra/gssdp/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 169927 2012-10-30 22:45:20Z heftig $
+# $Id: PKGBUILD 183414 2013-04-21 22:10:50Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gssdp
-pkgver=0.12.2.1
+pkgver=0.14.2
 pkgrel=1
 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gupnp.org/"
-license=('LGPL')
-depends=('libsoup')
-makedepends=('gobject-introspection' 'gtk2' 'gtk-doc')
+license=(LGPL)
+depends=(libsoup)
+makedepends=(gobject-introspection gtk2 gtk-doc vala)
 optdepends=('gtk2: gssdp-device-sniffer')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('928aa257815d044fdbfc740f5799530d41897947b5d7854173f636b36d728414')
+sha256sums=('a1a255ed45b45fbf0004dfc5d8e566551f4857bc16599e7f756965733f9411fc')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD
index fab28eec3..c7b564e55 100644
--- a/extra/gst-libav/PKGBUILD
+++ b/extra/gst-libav/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 176320 2013-01-29 20:24:29Z eric $
+# $Id: PKGBUILD 183690 2013-04-26 16:10:07Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-libav
-pkgver=1.0.5
+pkgver=1.0.7
 pkgrel=1
 pkgdesc="Gstreamer libav Plugin"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('yasm')
 options=(!libtool !emptydirs)
 provides=("gst-ffmpeg=$pkgver-$pkgrel")
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('aef8be665096b3a4e64424fb39d7c5da57faaaf95e9fea6c1bb44295d4fb32d5')
+sha256sums=('aefa679d14e7a6558673cfbf401b9c01f1903bb52e5dc08332e9001d25a7ba7a')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD
index 6e8c3afa5..a4502f3d4 100644
--- a/extra/gst-plugins-base/PKGBUILD
+++ b/extra/gst-plugins-base/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 174936 2013-01-09 12:40:39Z jgc $
+# $Id: PKGBUILD 183686 2013-04-26 16:05:42Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gst-plugins-base
 pkgname=('gst-plugins-base-libs' 'gst-plugins-base')
-pkgver=1.0.5
+pkgver=1.0.7
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Base Plugins"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,11 +12,11 @@ makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libv
 options=(!libtool !emptydirs)
 url="http://gstreamer.freedesktop.org/"
 source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz)
-sha256sums=('37ce6e09b99ef3879111c861ee5090582b4fd4c764e81ab6eb2b2b4dd77d7173')
+sha256sums=('014805e50b696bc06c3862ea656df079fc0b5fef0c10f16e9f085f290545677a')
 
 build() {
   cd $pkgbase-$pkgver
-  sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
+  sed -i -e '/AC_PATH_XTRA/d' configure.ac
   aclocal -I m4 -I common/m4
   autoconf
   automake --add-missing
diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD
index bf922413f..1ead8c8ef 100644
--- a/extra/gst-plugins-good/PKGBUILD
+++ b/extra/gst-plugins-good/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 174938 2013-01-09 13:33:08Z jgc $
+# $Id: PKGBUILD 183687 2013-04-26 16:06:47Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-plugins-good
-pkgver=1.0.5
+pkgver=1.0.7
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Good Plugins"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,11 +12,11 @@ depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' '
 makedepends=('gstreamer' 'speex' 'flac' 'libraw1394')
 options=(!libtool !emptydirs)
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('53bd0b848e7896f1b22548ca4e8be56cf425e5100e121c472dff8272d5140bc5')
+sha256sums=('a016a3b377c86658627aef902b9204108209100b2e88fcc3b695c392af1b4035')
 
 build() {
   cd $pkgname-$pkgver
-  sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
+  sed -i -e '/AC_PATH_XTRA/d' configure.ac
   aclocal -I m4 -I common/m4
   autoconf
   automake --add-missing
diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD
index 35c7fd8cd..a79ca738a 100644
--- a/extra/gst-plugins-ugly/PKGBUILD
+++ b/extra/gst-plugins-ugly/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 175143 2013-01-15 11:34:05Z jgc $
+# $Id: PKGBUILD 183689 2013-04-26 16:08:19Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-plugins-ugly
-pkgver=1.0.5
+pkgver=1.0.7
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Ugly Plugins"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url="http://gstreamer.freedesktop.org/"
 depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
 options=(!libtool !emptydirs)
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('a62a182ea96d9b2783b493b46d531914db9d2ebb9e537e9c84668fe752791331')
+sha256sums=('b78b8cfabe322497da432a0f297dbb21862a033f95e8d4cd8f207eccb5288f2b')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gstreamer-vaapi/PKGBUILD b/extra/gstreamer-vaapi/PKGBUILD
new file mode 100644
index 000000000..6cd486b41
--- /dev/null
+++ b/extra/gstreamer-vaapi/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 183264 2013-04-19 23:02:28Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgbase=gstreamer-vaapi
+pkgname=(gst-vaapi gstreamer0.10-vaapi)
+pkgver=0.5.3
+pkgrel=1
+pkgdesc="GStreamer Multimedia Framework VA Plugins"
+arch=(i686 x86_64)
+license=(LGPL)
+url="http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/"
+makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva)
+options=(!libtool !emptydirs)
+
+source=($url/$pkgbase-${pkgver}.tar.bz2)
+sha1sums=('f99f657c8c19dd008a8066d8b2237aff4a05810d')
+
+prepare() {
+  cd $pkgbase-$pkgver
+  mkdir build-1.0 build-0.10
+}
+
+
+build() {
+  cd $pkgbase-$pkgver/build-1.0
+  ../configure --prefix=/usr --disable-static --with-gstreamer-api=1.0
+  make
+
+  cd ../build-0.10
+  ../configure --prefix=/usr --disable-static --with-gstreamer-api=0.10
+  make
+}
+
+check() {
+  cd $pkgbase-$pkgver/build-1.0
+  make check
+
+  cd ../build-0.10
+  make check
+}
+
+package_gst-vaapi() {
+  depends=(gst-plugins-base gst-plugins-bad libva)
+
+  cd $pkgbase-$pkgver/build-1.0
+  make DESTDIR="$pkgdir" install
+}
+
+package_gstreamer0.10-vaapi() {
+  depends=(gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva)
+
+  cd $pkgbase-$pkgver/build-0.10
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD
index 2d683f430..59733108c 100644
--- a/extra/gstreamer/PKGBUILD
+++ b/extra/gstreamer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 174933 2013-01-09 12:15:29Z jgc $
+# $Id: PKGBUILD 183685 2013-04-26 16:04:28Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gstreamer
-pkgver=1.0.5
+pkgver=1.0.7
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,13 +13,13 @@ optdepends=('sh: feedback script')
 makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
 options=('!libtool')
 source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
-sha256sums=('26c2827567f09a46d0a3bc1e7f8696b2ae72b047306539178079abae487c5b77')
+sha256sums=('68cada7ee24ede23e15dc81ccde11898eed1a7a3c6a2d81a8c31596fccb1b5ce')
 
 build() {
   cd "${srcdir}/gstreamer-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
-    --with-package-name="GStreamer (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/" \
+    --with-package-name="GStreamer (Parabola)" \
+    --with-package-origin="https://parabolagnulinux.org/" \
     --enable-gtk-doc --disable-static
   make
 }
diff --git a/extra/gstreamer0.10-bad/PKGBUILD b/extra/gstreamer0.10-bad/PKGBUILD
deleted file mode 100644
index 6182c5133..000000000
--- a/extra/gstreamer0.10-bad/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 168314 2012-10-08 14:06:19Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gstreamer0.10-bad
-pkgname=('gstreamer0.10-bad' 'gstreamer0.10-bad-plugins')
-pkgver=0.10.23
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('LGPL' 'GPL')
-makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'faac' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi' 'opus')
-url="http://gstreamer.freedesktop.org/"
-options=(!libtool !emptydirs)
-source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.xz)
-md5sums=('e4822fa2cc933768e2998311a1565979')
-
-build() {
-  cd "${srcdir}/gst-plugins-bad-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Bad Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-
-  make
-  sed -e 's/gst sys ext/gst/' -i Makefile
-}
-
-# Disable for now: 2 tests fail, one of them is because of not having a camera during build.
-#check() {
-#  cd "${srcdir}/gst-plugins-bad-${pkgver}"
-#  make check
-#}
-
-package_gstreamer0.10-bad() {
-  pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad)"
-  depends=('gstreamer0.10-base>=0.10.34')
-
-  cd "${srcdir}/gst-plugins-bad-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gstreamer0.10-bad-plugins() {
-  pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad)"
-  depends=("gstreamer0.10-bad=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'faac' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg' 'wildmidi' 'opus')
-  groups=('gstreamer0.10-plugins')
-  install=gstreamer0.10-bad-plugins.install
-
-  cd "${srcdir}/gst-plugins-bad-${pkgver}"
-  make -C gst-libs DESTDIR="${pkgdir}" install
-  make -C ext DESTDIR="${pkgdir}" install
-  make -C sys DESTDIR="${pkgdir}" install
-  make -C gst-libs DESTDIR="${pkgdir}" uninstall
-}
diff --git a/extra/gstreamer0.10-base/PKGBUILD b/extra/gstreamer0.10-base/PKGBUILD
index b86109fbf..c14afe39f 100644
--- a/extra/gstreamer0.10-base/PKGBUILD
+++ b/extra/gstreamer0.10-base/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=('gstreamer0.10-base')
 pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins')
 pkgver=0.10.36
-pkgrel=1.1
+pkgrel=1.2
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('pkgconfig' 'gstreamer0.10>=0.10.35' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection')
@@ -15,8 +15,6 @@ sha256sums=('1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a')
 
 build() {
   cd "${srcdir}/gst-plugins-base-${pkgver}"
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental --disable-gnome_vfs \
     --with-package-name="GStreamer Base Plugins (Parabola)" \
diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD
index 3d0b13a61..eca4778b8 100644
--- a/extra/gstreamer0.10-good/PKGBUILD
+++ b/extra/gstreamer0.10-good/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=gstreamer0.10-good
 pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins')
 pkgver=0.10.31
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev')
 url="http://gstreamer.freedesktop.org/"
@@ -22,8 +22,8 @@ build() {
     --disable-schemas-install \
     --disable-hal \
     --disable-esd \
-    --with-package-name="GStreamer Good Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
+    --with-package-name="GStreamer Good Plugins (Parabola)" \
+    --with-package-origin="https://parabolagnulinux.org/"
 
   make
   sed -e 's/gst sys ext/gst/' -i Makefile
diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD
index ac8eb9344..4f46197a1 100644
--- a/extra/gstreamer0.10-ugly/PKGBUILD
+++ b/extra/gstreamer0.10-ugly/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175144 2013-01-15 11:34:09Z jgc $
+# $Id: PKGBUILD 178131 2013-02-16 22:48:50Z ioni $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gstreamer0.10-ugly
 pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
 pkgver=0.10.19
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
diff --git a/extra/gstreamer0.10/PKGBUILD b/extra/gstreamer0.10/PKGBUILD
index 56f6fa006..1c60ca0e8 100644
--- a/extra/gstreamer0.10/PKGBUILD
+++ b/extra/gstreamer0.10/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 153252 2012-03-12 14:53:39Z jgc $
+# $Id: PKGBUILD 184011 2013-04-30 20:11:04Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gstreamer0.10
 pkgver=0.10.36
-pkgrel=1.1
+pkgrel=2
 pkgdesc="GStreamer Multimedia Framework"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-url="http://gstreamer.freedesktop.org/"
+url="http://gstreamer.com"
 depends=('libxml2' 'glib2')
 optdepends=('sh: feedback script')
-makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
+makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection' 'git')
 options=('!libtool')
-source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
-md5sums=('15389c73e091b1dda915279c388b9cb2')
+source=("git://anongit.freedesktop.org/gstreamer-sdk/gstreamer#commit=ce96cff8e2bf1772dc330387fa98e94f187fc2ab"
+        tests-remove-silly-test_fail_abstract_new-check.patch)
+sha256sums=('SKIP'
+            'd3d3f4f04453831fdb4244bfe174a38c4e6f9f4da5c8c9050dcfa1a6097aad52')
 
 build() {
-  cd "${srcdir}/gstreamer-${pkgver}"
+  cd "${srcdir}/gstreamer"
+  patch -Np1 -i ../tests-remove-silly-test_fail_abstract_new-check.patch
+  sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.ac
+  NOCONFIGURE=1 ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
     --with-package-name="GStreamer (Parabola)" \
     --with-package-origin="https://parabolagnulinux.org/" \
@@ -25,12 +30,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/gstreamer-${pkgver}"
+  cd "${srcdir}/gstreamer"
   make check
 }
 
 package() {
-  cd "${srcdir}/gstreamer-${pkgver}"
+  cd "${srcdir}/gstreamer"
   make DESTDIR="${pkgdir}" install
 
   #Remove unversioned gst-* binaries to get rid of conflicts
diff --git a/extra/gstreamer0.10/tests-remove-silly-test_fail_abstract_new-check.patch b/extra/gstreamer0.10/tests-remove-silly-test_fail_abstract_new-check.patch
new file mode 100644
index 000000000..7524e8fea
--- /dev/null
+++ b/extra/gstreamer0.10/tests-remove-silly-test_fail_abstract_new-check.patch
@@ -0,0 +1,60 @@
+From 5bff3ba949d2ac0a9946c1240e6d4a5bb53fda99 Mon Sep 17 00:00:00 2001
+From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
+Date: Wed, 08 Aug 2012 13:49:23 +0000
+Subject: tests: remove silly test_fail_abstract_new check
+
+Our check would make sure that GLib segfaults when
+someone tries to instantiate an abstract type, which
+is an extremely useful thing to check for.
+
+In newer GLibs this is fixed and we get an abort with
+a g_error() now it seems, so let's just remove this
+check entirely.
+---
+(limited to 'tests/check/gst/gstobject.c')
+
+diff --git a/tests/check/gst/gstobject.c b/tests/check/gst/gstobject.c
+index 6f7ccb8..ce2ed3e 100644
+--- a/tests/check/gst/gstobject.c
++++ b/tests/check/gst/gstobject.c
+@@ -72,19 +72,6 @@ gst_fake_object_get_type (void)
+   return fake_object_type;
+ }
+ 
+-#ifndef HAVE_OSX
+-/* g_object_new on abstract GstObject should fail */
+-GST_START_TEST (test_fail_abstract_new)
+-{
+-  GstObject *object;
+-
+-  ASSERT_CRITICAL (object = g_object_new (gst_object_get_type (), NULL));
+-  fail_unless (object == NULL, "Created an instance of abstract GstObject");
+-}
+-
+-GST_END_TEST;
+-#endif
+-
+ /* g_object_new on GstFakeObject should succeed */
+ GST_START_TEST (test_fake_object_new)
+ {
+@@ -529,18 +516,6 @@ gst_object_suite (void)
+   tcase_add_test (tc_chain, test_fake_object_has_ancestor);
+   //tcase_add_checked_fixture (tc_chain, setup, teardown);
+ 
+-  /* FIXME: GLib shouldn't crash here, but issue a warning and return a NULL
+-   * object, or at least g_error() and then abort properly ... (tpm) */
+-#ifndef HAVE_OSX
+-  /* Disabled for OS/X because a) it's a pretty silly test anyway and
+-   * b) different OS/X versions raise different signals and it isn't worth
+-   * the effort to try and detect which one should be producing which
+-   */
+-  /* SEGV tests go last so we can debug the others */
+-  if (g_getenv ("CK_FORK") == NULL || strcmp (g_getenv ("CK_FORK"), "no") != 0)
+-    tcase_add_test_raise_signal (tc_chain, test_fail_abstract_new, SIGSEGV);
+-#endif
+-
+   return s;
+ }
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD
index 9d64c1f43..ada1ec556 100644
--- a/extra/gthumb/PKGBUILD
+++ b/extra/gthumb/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 169934 2012-10-30 22:45:37Z heftig $
+# $Id: PKGBUILD 183415 2013-04-21 22:10:51Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=gthumb
-pkgver=3.1.2
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="Image browser and viewer for the GNOME Desktop"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
+arch=(i686 x86_64 mips64el)
+license=(GPL)
 url="http://live.gnome.org/gthumb"
-depends=('desktop-file-utils' 'hicolor-icon-theme' 'dconf' 'librsvg' 'clutter-gtk'
-         'gstreamer0.10-base' 'gsettings-desktop-schemas' 'libwebp')
-makedepends=('intltool' 'gnome-doc-utils' 'libchamplain' 'libopenraw' 'exiv2' 'libsoup-gnome'
-             'brasero' 'librsvg' 'libopenraw' 'liboauth')
+depends=(desktop-file-utils hicolor-icon-theme dconf librsvg clutter-gtk
+         gst-plugins-base-libs gsettings-desktop-schemas libwebp libsecret
+         libsoup webkitgtk3 json-glib)
+makedepends=(intltool libchamplain libopenraw exiv2 itstool brasero librsvg libopenraw liboauth docbook-xsl)
 optdepends=('libopenraw: read RAW files'
             'exiv2: metadata support'
             'libchamplain: map viewer'
             'brasero: burn discs'
-            'libsoup-gnome: web albums'
             'liboauth: web albums')
 options=('!libtool' '!emptydirs')
 install=gthumb.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5e7f80b3ffa8a6e06b9f1bf0cfa869f772af4163b842a7f457c9dc68ff7e6f8f')
+sha256sums=('3eacbb9912923fb5da3e7a52be58c6e7470e598b06c1b7b51b76809fc4855b61')
 
 build() {
   cd $pkgname-$pkgver
@@ -37,6 +36,11 @@ build() {
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
diff --git a/extra/gtk-engines/PKGBUILD b/extra/gtk-engines/PKGBUILD
index d6fb51626..7e0a08600 100644
--- a/extra/gtk-engines/PKGBUILD
+++ b/extra/gtk-engines/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=gtk-engines
 pkgver=2.21.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Theme engines for GTK+ 2"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
diff --git a/extra/gtk-qt-engine/PKGBUILD b/extra/gtk-qt-engine/PKGBUILD
deleted file mode 100644
index 7d7f5629a..000000000
--- a/extra/gtk-qt-engine/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 143698 2011-11-28 13:17:55Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Jake VanderKolk <jakevanderkolk@gmail.com>
-
-pkgname=gtk-qt-engine
-pkgver=1.1
-pkgrel=3
-pkgdesc="A GTK engine which makes your GTK2 Apps match your QT theme"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://code.google.com/p/gtk-qt-engine/"
-depends=('libbonoboui' 'kdelibs')
-makedepends=('cmake' 'automoc4' 'pkgconfig')
-source=("http://gtk-qt-engine.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('de8048baef7dfe6c97cd97c463d66152')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-
-  cmake . -DCMAKE_BUILD_TYPE=Release \
-          -DCMAKE_SKIP_RPATH=ON \
-          -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' \
-          -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD
index 2539dc075..343fa0fe4 100644
--- a/extra/gtk-vnc/PKGBUILD
+++ b/extra/gtk-vnc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168733 2012-10-15 02:01:46Z eric $
+# $Id: PKGBUILD 178918 2013-02-28 18:50:22Z ioni $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: lp76 <l.peduto@gmail.com>
 
 pkgname=gtk-vnc
-pkgver=0.5.1
+pkgver=0.5.2
 pkgrel=1
 pkgdesc="A VNC viewer widget for GTK"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ optdepends=('gtk2: GTK2 widget')
 makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2' 'vala' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('1ad1847a23f8ea8fbf2396de46c51ec0900ee3698cde4e205760518cd1e01a40')
+sha256sums=('b51bda7edebb82ab142c292bd1b1493406bc8225a5c834d854bbafef9e9a471f')
 
 build() {
   rm -rf gtk2-build gtk3-build
@@ -35,6 +35,6 @@ build() {
 }
 
 package() {
-  make -C gtk2-build DESTDIR="${pkgdir}" install
-  make -C gtk3-build DESTDIR="${pkgdir}" install
+  make -j1 -C gtk2-build DESTDIR="${pkgdir}" install
+  make -j1 -C gtk3-build DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gtk/PKGBUILD b/extra/gtk/PKGBUILD
index 19864e02c..e77286af0 100644
--- a/extra/gtk/PKGBUILD
+++ b/extra/gtk/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=gtk
 pkgver=1.2.10
-pkgrel=11.1
+pkgrel=11.2
 pkgdesc="The GTK+ toolkit"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
diff --git a/extra/gtk2-perl/PKGBUILD b/extra/gtk2-perl/PKGBUILD
index fa6af1973..7856f69d6 100644
--- a/extra/gtk2-perl/PKGBUILD
+++ b/extra/gtk2-perl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160485 2012-06-02 10:26:22Z bluewind $
+# $Id: PKGBUILD 183485 2013-04-21 22:21:05Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarah@archlinux.org>
 
 pkgname=gtk2-perl
-pkgver=1.244
+pkgver=1.247
 pkgrel=1
 pkgdesc="Perl bindings for GTK+ 2.x"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ depends=('gtk2' 'pango-perl')
 checkdepends=('ttf-dejavu' 'xorg-server-xvfb')
 options=('!emptydirs')
 source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gtk2-${pkgver}.tar.gz)
-md5sums=('191fda807f44a7c82d699838bf544bca')
+md5sums=('b65b0293cce3ac3786c37a7fa508e506')
 
 build() {
   cd "${srcdir}/Gtk2-${pkgver}"
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index 73adbf452..29025bbe6 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172917 2012-12-06 20:16:10Z heftig $
+# $Id: PKGBUILD 180158 2013-03-18 12:05:08Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.14
+pkgver=2.24.17
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
@@ -13,7 +13,7 @@ options=('!libtool')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
         xid-collision-debug.patch)
-sha256sums=('8bd1b8b511a3004e8972badf467ce829e6855cdff15540b9344dc934c68008ac'
+sha256sums=('e947b2b460156d98e8e38930b82458e1d613a71eb26e927f966f7081a640f415'
             'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
 
 build() {
diff --git a/extra/gtk2/fix-stuck-grabs.patch b/extra/gtk2/fix-stuck-grabs.patch
deleted file mode 100644
index accec431e..000000000
--- a/extra/gtk2/fix-stuck-grabs.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From a9fb816a3f64227936f4b25882e4f20ab5018c9c Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Wed, 16 May 2012 21:18:51 +0000
-Subject: Fix a case of 'stuck grab'
-
-This was showing up when using a combo box in list mode. After popping
-up the list, the keyboard grab appeared stuck. What was stuck here is
-only the client-side grab, since we forgot to clean up our grabs
-when receiving an UnmapNotify.
-
-This bug was introduced in 3f6592f60fd15fb353fc84600caefba3054dc892.
-
-[ Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.24 ]
-
-https://bugzilla.gnome.org/show_bug.cgi?id=680346
----
-diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
-index 7cc1000..b96e9f5 100644
---- a/gdk/x11/gdkevents-x11.c
-+++ b/gdk/x11/gdkevents-x11.c
-@@ -1799,16 +1799,15 @@ gdk_event_translate (GdkDisplay *display,
-            * means we hid the window ourselves, so we will have already flipped
-            * the iconified bit off.
-            */
--          if (window)
--            {
--              if (GDK_WINDOW_IS_MAPPED (window))
--                gdk_synthesize_window_state (window,
--                                             0,
--                                             GDK_WINDOW_STATE_ICONIFIED);
--
--              _gdk_xgrab_check_unmap (window, xevent->xany.serial);
--            }
-+          if (window && GDK_WINDOW_IS_MAPPED (window))
-+            gdk_synthesize_window_state (window,
-+                                         0,
-+                                         GDK_WINDOW_STATE_ICONIFIED);
-         }
-+
-+      if (window)
-+        _gdk_xgrab_check_unmap (window, xevent->xany.serial);
-+
-       break;
-       
-     case MapNotify:
---
-cgit v0.9.0.2
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index 335a58360..7e87b3e1e 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 174777 2013-01-07 13:06:57Z jgc $
+# $Id: PKGBUILD 183416 2013-04-21 22:10:54Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
-pkgver=3.6.4
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
-arch=('i686' 'x86_64' 'mips64el')
+arch=(i686 x86_64 mips64el)
 url="http://www.gtk.org/"
 install=gtk3.install
-depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord' 'at-spi2-atk')
-makedepends=('gobject-introspection')
+depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon)
+makedepends=(gobject-introspection)
 options=('!libtool')
 backup=(etc/gtk-3.0/settings.ini)
-license=('LGPL')
+license=(LGPL)
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
         settings.ini)
-sha256sums=('dbda37986f934f986c0bb20f2b0c59f2717a2e5c098370ad69677ff89295f1a1'
+sha256sums=('f43e7c7d7a0e2417225509e88f67799534c69abfbb6f615fc7a895bf15e31255'
             'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
 build() {
     cd "gtk+-$pkgver"
@@ -24,7 +24,10 @@ build() {
         --sysconfdir=/etc \
         --localstatedir=/var \
         --enable-gtk2-dependency \
-        --disable-schemas-compile
+        --disable-schemas-compile \
+        --enable-x11-backend \
+        --enable-broadway-backend \
+        --enable-wayland-backend
 
     #https://bugzilla.gnome.org/show_bug.cgi?id=655517
     sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
diff --git a/extra/gtk3/git-fixes.patch b/extra/gtk3/git-fixes.patch
deleted file mode 100644
index 06041e326..000000000
--- a/extra/gtk3/git-fixes.patch
+++ /dev/null
@@ -1,8346 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 9e24e90..00f38b0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -714,7 +714,6 @@ AM_PATH_GLIB_2_0(glib_required_version, :,
- *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
-   gobject gmodule-no-export)
- 
--dnl
- dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
- dnl
- gtk_save_LIBS=$LIBS
-@@ -748,6 +747,19 @@ else
-     AC_MSG_RESULT([no])
- fi
- 
-+#
-+# Disable deprecation checks for all libraries we depend on on stable branches.
-+# This is so newer versions of those libraries don't cause more warnings with
-+# a stable GTK version.
-+# We don't ever want to turn off deprecation warnings for master however, because
-+# that's where we get rid of deprecated API we use.
-+#
-+if test m4_eval(gtk_minor_version % 2) = 0 ; then
-+  AC_DEFINE_UNQUOTED(GLIB_DISABLE_DEPRECATION_WARNINGS, 1,
-+                     [Disable deprecation warnings from glib])
-+fi
-+
-+dnl
- saved_cflags="$CFLAGS"
- saved_ldflags="$LDFLAGS"
- 
-diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
-index 712f232..5d04cdb 100644
---- a/gdk/quartz/gdkevents-quartz.c
-+++ b/gdk/quartz/gdkevents-quartz.c
-@@ -1439,7 +1439,8 @@ gdk_event_translate (GdkEvent *event,
-         if (dx != 0.0 || dy != 0.0)
-           {
- #ifdef AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
--	    if (gdk_quartz_osx_version() >= GDK_OSX_LION &[nsevent hasPreciseScrollingDeltas])
-+	    if (gdk_quartz_osx_version() >= GDK_OSX_LION &&
-+		[nsevent hasPreciseScrollingDeltas])
-               {
-                 GdkEvent *emulated_event;
- 
-diff --git a/gtk/a11y/gtktextcellaccessible.c b/gtk/a11y/gtktextcellaccessible.c
-index ce5777a..7088780 100644
---- a/gtk/a11y/gtktextcellaccessible.c
-+++ b/gtk/a11y/gtktextcellaccessible.c
-@@ -552,7 +552,6 @@ gtk_text_cell_accessible_get_character_extents (AtkText      *text,
-   gail_renderer = GTK_RENDERER_CELL_ACCESSIBLE (text);
-   g_object_get (gail_renderer, "renderer", &gtk_renderer, NULL);
-   g_object_get (gtk_renderer, "text", &renderer_text, NULL);
--  g_object_unref (gtk_renderer);
-   if (renderer_text == NULL)
-     {
-       g_object_unref (gtk_renderer);
-diff --git a/gtk/gtk-default.css b/gtk/gtk-default.css
-index 2e21518..d084828 100644
---- a/gtk/gtk-default.css
-+++ b/gtk/gtk-default.css
-@@ -715,5 +715,17 @@ GtkCalendar.button:hover {
- }
- 
- .spinner:active {
-+   background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.916667)), to(transparent)),
-+                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.833333)), to(transparent)),
-+                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.75)), to(transparent)),
-+                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.666667)), to(transparent)),
-+                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.583333)), to(transparent)),
-+                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.5)), to(transparent)),
-+                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.416667)), to(transparent)),
-+                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.333333)), to(transparent)),
-+                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.25)), to(transparent)),
-+                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.166667)), to(transparent)),
-+                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.0833333)), to(transparent)),
-+                     -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
-   animation: spinner 1s infinite linear;
- }
-diff --git a/gtk/gtkcsscomputedvalues.c b/gtk/gtkcsscomputedvalues.c
-index 94115a5..b522948 100644
---- a/gtk/gtkcsscomputedvalues.c
-+++ b/gtk/gtkcsscomputedvalues.c
-@@ -499,6 +499,8 @@ gtk_css_computed_values_create_css_animations (GtkCssComputedValues    *values,
-                                               _gtk_css_play_state_value_get (_gtk_css_array_value_get_nth (play_states, i)),
-                                               _gtk_css_fill_mode_value_get (_gtk_css_array_value_get_nth (fill_modes, i)),
-                                               _gtk_css_number_value_get (_gtk_css_array_value_get_nth (iteration_counts, i), 100));
-+
-+          _gtk_css_keyframes_unref (keyframes);
-         }
-       values->animations = g_slist_prepend (values->animations, animation);
-     }
-diff --git a/gtk/gtkcssimagegradient.c b/gtk/gtkcssimagegradient.c
-index a241733..8497339 100644
---- a/gtk/gtkcssimagegradient.c
-+++ b/gtk/gtkcssimagegradient.c
-@@ -79,7 +79,7 @@ fade_pattern (cairo_pattern_t *pattern,
-       cairo_pattern_add_color_stop_rgba (result, o, r, g, b, a * opacity);
-     }
- 
--  return pattern;
-+  return result;
- }
- 
- static cairo_pattern_t *
-@@ -102,7 +102,7 @@ transition_pattern (cairo_pattern_t *start,
-     {
-     case CAIRO_PATTERN_TYPE_LINEAR:
-       cairo_pattern_get_linear_points (start, &sx0, &sy0, &sx1, &sy1);
--      cairo_pattern_get_linear_points (start, &ex0, &ey0, &ex1, &ey1);
-+      cairo_pattern_get_linear_points (end, &ex0, &ey0, &ex1, &ey1);
-       result = cairo_pattern_create_linear ((1 - progress) * sx0 + progress * ex0,
-                                             (1 - progress) * sx1 + progress * ex1,
-                                             (1 - progress) * sy0 + progress * ey0,
-@@ -110,7 +110,7 @@ transition_pattern (cairo_pattern_t *start,
-       break;
-     case CAIRO_PATTERN_TYPE_RADIAL:
-       cairo_pattern_get_radial_circles (start, &sx0, &sy0, &sr0, &sx1, &sy1, &sr1);
--      cairo_pattern_get_radial_circles (start, &ex0, &ey0, &er0, &ex1, &ey1, &er1);
-+      cairo_pattern_get_radial_circles (end, &ex0, &ey0, &er0, &ex1, &ey1, &er1);
-       result = cairo_pattern_create_radial ((1 - progress) * sx0 + progress * ex0,
-                                             (1 - progress) * sy0 + progress * ey0,
-                                             (1 - progress) * sr0 + progress * er0,
-@@ -128,7 +128,7 @@ transition_pattern (cairo_pattern_t *start,
-       double so, sr, sg, sb, sa, eo, er, eg, eb, ea;
- 
-       cairo_pattern_get_color_stop_rgba (start, i, &so, &sr, &sg, &sb, &sa);
--      cairo_pattern_get_color_stop_rgba (start, i, &eo, &er, &eg, &eb, &ea);
-+      cairo_pattern_get_color_stop_rgba (end, i, &eo, &er, &eg, &eb, &ea);
- 
-       cairo_pattern_add_color_stop_rgba (result,
-                                          (1 - progress) * so + progress * eo,
-diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
-index dbc14f0..2f4bd28 100644
---- a/gtk/gtkentrycompletion.c
-+++ b/gtk/gtkentrycompletion.c
-@@ -656,8 +656,7 @@ gtk_entry_completion_set_property (GObject      *object,
-         break;
- 
-       case PROP_TEXT_COLUMN:
--	gtk_entry_completion_set_text_column (completion,
--					      g_value_get_int (value));
-+        priv->text_column = g_value_get_int (value);
-         break;
- 
-       case PROP_INLINE_COMPLETION:
-diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
-index dab06c3..09d6303 100644
---- a/gtk/gtkfilechooserdefault.c
-+++ b/gtk/gtkfilechooserdefault.c
-@@ -6798,7 +6798,7 @@ file_system_model_got_thumbnail (GObject *object, GAsyncResult *res, gpointer da
-   copy_attribute (info, queried, G_FILE_ATTRIBUTE_THUMBNAILING_FAILED);
-   copy_attribute (info, queried, G_FILE_ATTRIBUTE_STANDARD_ICON);
- 
--  _gtk_file_system_model_update_file (model, file, info, FALSE);
-+  _gtk_file_system_model_update_file (model, file, info);
- 
-   g_object_unref (info);
- 
-diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
-index 1e5ffe3..132902b 100644
---- a/gtk/gtkfilesystemmodel.c
-+++ b/gtk/gtkfilesystemmodel.c
-@@ -42,6 +42,9 @@
-  *      the special kind of usage for "search" and "recent-files", where the file chooser gives the model the
-  *      files to be displayed.
-  *
-+ * Internal data structure
-+ * -----------------------
-+ *
-  * Each file is kept in a FileModelNode structure.  Each FileModelNode holds a GFile* and other data.  All the
-  * node structures have the same size, determined at runtime, depending on the number of columns that were passed
-  * to _gtk_file_system_model_new() or _gtk_file_system_model_new_for_directory() (that is, the size of a node is
-@@ -66,7 +69,14 @@
-  *
-  * Each FileModelNode has a node->visible field, which indicates whether the node is visible in the GtkTreeView.
-  * A node may be invisible if, for example, it corresponds to a hidden file and the file chooser is not showing
-- * hidden files.
-+ * hidden files.  Also, a file filter may be explicitly set onto the model, for example, to only show files that
-+ * match "*.jpg".  In this case, node->filtered_out says whether the node failed the filter.  The ultimate
-+ * decision on whether a node is visible or not in the treeview is distilled into the node->visible field.
-+ * The reason for having a separate node->filtered_out field is so that the file chooser can query whether
-+ * a (filtered-out) folder should be made sensitive in the GUI.
-+ *
-+ * Visible rows vs. possibly-invisible nodes
-+ * -----------------------------------------
-  *
-  * Since not all nodes in the model->files array may be visible, we need a way to map visible row indexes from
-  * the treeview to array indexes in our array of files.  And thus we introduce a bit of terminology:
-@@ -95,6 +105,16 @@
-  *
-  * You never access a node->row directly.  Instead, call node_get_tree_row().  That function will validate the nodes
-  * up to the sought one if the node is not valid yet, and it will return a proper 0-based row.
-+ *
-+ * Sorting
-+ * -------
-+ *
-+ * The model implements the GtkTreeSortable interface.  To avoid re-sorting
-+ * every time a node gets added (which would lead to O(n^2) performance during
-+ * the initial population of the model), the model can freeze itself (with
-+ * freeze_updates()) during the intial population process.  When the model is
-+ * frozen, sorting will not happen.  The model will sort itself when the freeze
-+ * count goes back to zero, via corresponding calls to thaw_updates().
-  */
- 
- /*** DEFINES ***/
-@@ -184,6 +204,12 @@ struct _GtkFileSystemModelClass
-   void (*finished_loading) (GtkFileSystemModel *model, GError *error);
- };
- 
-+static void freeze_updates (GtkFileSystemModel *model);
-+static void thaw_updates (GtkFileSystemModel *model);
-+
-+static guint node_get_for_file (GtkFileSystemModel *model,
-+				GFile              *file);
-+
- static void add_file (GtkFileSystemModel *model,
- 		      GFile              *file,
- 		      GFileInfo          *info);
-@@ -263,13 +289,13 @@ node_invalidate_index (GtkFileSystemModel *model, guint id)
- }
- 
- static GtkTreePath *
--gtk_tree_path_new_from_node (GtkFileSystemModel *model, guint id)
-+tree_path_new_from_node (GtkFileSystemModel *model, guint id)
- {
--  guint i = node_get_tree_row (model, id);
-+  guint r = node_get_tree_row (model, id);
- 
--  g_assert (i < model->files->len);
-+  g_assert (r < model->files->len);
- 
--  return gtk_tree_path_new_from_indices (i, -1);
-+  return gtk_tree_path_new_from_indices (r, -1);
- }
- 
- static void
-@@ -278,7 +304,7 @@ emit_row_inserted_for_node (GtkFileSystemModel *model, guint id)
-   GtkTreePath *path;
-   GtkTreeIter iter;
- 
--  path = gtk_tree_path_new_from_node (model, id);
-+  path = tree_path_new_from_node (model, id);
-   ITER_INIT_FROM_INDEX (model, &iter, id);
-   gtk_tree_model_row_inserted (GTK_TREE_MODEL (model), path, &iter);
-   gtk_tree_path_free (path);
-@@ -290,7 +316,7 @@ emit_row_changed_for_node (GtkFileSystemModel *model, guint id)
-   GtkTreePath *path;
-   GtkTreeIter iter;
- 
--  path = gtk_tree_path_new_from_node (model, id);
-+  path = tree_path_new_from_node (model, id);
-   ITER_INIT_FROM_INDEX (model, &iter, id);
-   gtk_tree_model_row_changed (GTK_TREE_MODEL (model), path, &iter);
-   gtk_tree_path_free (path);
-@@ -570,7 +596,7 @@ gtk_file_system_model_get_path (GtkTreeModel *tree_model,
-       
-   g_return_val_if_fail (ITER_IS_VALID (model, iter), NULL);
- 
--  return gtk_tree_path_new_from_node (model, ITER_INDEX (iter));
-+  return tree_path_new_from_node (model, ITER_INDEX (iter));
- }
- 
- static void
-@@ -1097,7 +1123,7 @@ thaw_func (gpointer data)
- {
-   GtkFileSystemModel *model = data;
- 
--  _gtk_file_system_model_thaw_updates (model);
-+  thaw_updates (model);
-   model->dir_thaw_source = 0;
- 
-   return FALSE;
-@@ -1119,7 +1145,7 @@ gtk_file_system_model_got_files (GObject *object, GAsyncResult *res, gpointer da
-     {
-       if (model->dir_thaw_source == 0)
-         {
--          _gtk_file_system_model_freeze_updates (model);
-+          freeze_updates (model);
-           model->dir_thaw_source = gdk_threads_add_timeout_full (IO_PRIORITY + 1,
-                                                                  50,
-                                                                  thaw_func,
-@@ -1168,7 +1194,7 @@ gtk_file_system_model_got_files (GObject *object, GAsyncResult *res, gpointer da
-             {
-               g_source_remove (model->dir_thaw_source);
-               model->dir_thaw_source = 0;
--              _gtk_file_system_model_thaw_updates (model);
-+              thaw_updates (model);
-             }
- 
-           g_signal_emit (model, file_system_model_signals[FINISHED_LOADING], 0, error);
-@@ -1189,13 +1215,19 @@ gtk_file_system_model_query_done (GObject *     object,
-   GtkFileSystemModel *model = data; /* only a valid pointer if not cancelled */
-   GFile *file = G_FILE (object);
-   GFileInfo *info;
-+  guint id;
- 
-   info = g_file_query_info_finish (file, res, NULL);
-   if (info == NULL)
-     return;
- 
-   gdk_threads_enter ();
--  _gtk_file_system_model_update_file (model, file, info, TRUE);
-+
-+  _gtk_file_system_model_update_file (model, file, info);
-+
-+  id = node_get_for_file (model, file);
-+  gtk_file_system_model_sort_node (model, id);
-+
-   gdk_threads_leave ();
- }
- 
-@@ -1433,14 +1465,14 @@ gtk_file_system_model_refilter_all (GtkFileSystemModel *model)
-       return;
-     }
- 
--  _gtk_file_system_model_freeze_updates (model);
-+  freeze_updates (model);
- 
-   /* start at index 1, don't change the editable */
-   for (i = 1; i < model->files->len; i++)
-     node_compute_visibility_and_filters (model, i);
- 
-   model->filter_on_thaw = FALSE;
--  _gtk_file_system_model_thaw_updates (model);
-+  thaw_updates (model);
- }
- 
- /**
-@@ -1775,6 +1807,33 @@ _gtk_file_system_model_get_iter_for_file (GtkFileSystemModel *model,
-   return TRUE;
- }
- 
-+/* When an element is added or removed to the model->files array, we need to
-+ * update the model->file_lookup mappings of (node, index), as the indexes
-+ * change.  This function adds the specified increment to the index in that pair
-+ * if the index is equal or after the specified id.  We use this to slide the
-+ * mappings up or down when a node is added or removed, respectively.
-+ */
-+static void
-+adjust_file_lookup (GtkFileSystemModel *model, guint id, int increment)
-+{
-+  GHashTableIter iter;
-+  gpointer key;
-+  gpointer value;
-+
-+  g_hash_table_iter_init (&iter, model->file_lookup);
-+
-+  while (g_hash_table_iter_next (&iter, &key, &value))
-+    {
-+      guint index = GPOINTER_TO_UINT (value);
-+
-+      if (index >= id)
-+	{
-+	  index += increment;
-+	  g_hash_table_iter_replace (&iter, GUINT_TO_POINTER (index));
-+	}
-+    }
-+}
-+
- /**
-  * add_file:
-  * @model: the model
-@@ -1825,6 +1884,7 @@ remove_file (GtkFileSystemModel *model,
- {
-   FileModelNode *node;
-   guint id;
-+  guint row;
- 
-   g_return_if_fail (GTK_IS_FILE_SYSTEM_MODEL (model));
-   g_return_if_fail (G_IS_FILE (file));
-@@ -1834,17 +1894,22 @@ remove_file (GtkFileSystemModel *model,
-     return;
- 
-   node = get_node (model, id);
--  node_set_visible_and_filtered_out (model, id, FALSE, FALSE);
-+  row = node_get_tree_row (model, id);
-+
-+  node_invalidate_index (model, id);
- 
-   g_hash_table_remove (model->file_lookup, file);
-   g_object_unref (node->file);
-+  adjust_file_lookup (model, id, -1);
- 
-   if (node->info)
-     g_object_unref (node->info);
- 
-   g_array_remove_index (model->files, id);
--  g_hash_table_remove_all (model->file_lookup);
--  /* We don't need to resort, as removing a row doesn't change the sorting order */
-+
-+  /* We don't need to resort, as removing a row doesn't change the sorting order of the other rows */
-+
-+  emit_row_deleted_for_row (model, row);
- }
- 
- /**
-@@ -1852,7 +1917,6 @@ remove_file (GtkFileSystemModel *model,
-  * @model: the model
-  * @file: the file
-  * @info: the new file info
-- * @requires_resort: FIXME: get rid of this argument
-  *
-  * Tells the file system model that the file changed and that the 
-  * new @info should be used for it now.  If the file is not part of 
-@@ -1861,8 +1925,7 @@ remove_file (GtkFileSystemModel *model,
- void
- _gtk_file_system_model_update_file (GtkFileSystemModel *model,
-                                     GFile              *file,
--                                    GFileInfo          *info,
--                                    gboolean            requires_resort)
-+                                    GFileInfo          *info)
- {
-   FileModelNode *node;
-   guint i, id;
-@@ -1894,9 +1957,6 @@ _gtk_file_system_model_update_file (GtkFileSystemModel *model,
- 
-   if (node->visible)
-     emit_row_changed_for_node (model, id);
--
--  if (requires_resort)
--    gtk_file_system_model_sort_node (model, id);
- }
- 
- /**
-@@ -1967,17 +2027,16 @@ _gtk_file_system_model_remove_editable (GtkFileSystemModel *model)
- }
- 
- /**
-- * _gtk_file_system_model_freeze_updates:
-+ * freeze_updates:
-  * @model: a #GtkFileSystemModel
-  *
-- * Freezes most updates on the model, so that performing multiple 
-- * operations on the files in the model do not cause any events.
-- * Use _gtk_file_system_model_thaw_updates() to resume proper 
-- * operations. It is fine to call this function multiple times as
-- * long as freeze and thaw calls are balanced.
-+ * Freezes most updates on the model, so that performing multiple operations on
-+ * the files in the model do not cause any events.  Use thaw_updates() to resume
-+ * proper operations. It is fine to call this function multiple times as long as
-+ * freeze and thaw calls are balanced.
-  **/
--void
--_gtk_file_system_model_freeze_updates (GtkFileSystemModel *model)
-+static void
-+freeze_updates (GtkFileSystemModel *model)
- {
-   g_return_if_fail (GTK_IS_FILE_SYSTEM_MODEL (model));
- 
-@@ -1985,14 +2044,13 @@ _gtk_file_system_model_freeze_updates (GtkFileSystemModel *model)
- }
- 
- /**
-- * _gtk_file_system_model_thaw_updates:
-+ * thaw_updates:
-  * @model: a #GtkFileSystemModel
-  *
-- * Undoes the effect of a previous call to
-- * _gtk_file_system_model_freeze_updates() 
-+ * Undoes the effect of a previous call to freeze_updates() 
-  **/
--void
--_gtk_file_system_model_thaw_updates (GtkFileSystemModel *model)
-+static void
-+thaw_updates (GtkFileSystemModel *model)
- {
-   gboolean stuff_added;
- 
-diff --git a/gtk/gtkfilesystemmodel.h b/gtk/gtkfilesystemmodel.h
-index 2264fcf..575cc23 100644
---- a/gtk/gtkfilesystemmodel.h
-+++ b/gtk/gtkfilesystemmodel.h
-@@ -71,8 +71,7 @@ void                _gtk_file_system_model_add_and_query_file (GtkFileSystemMode
-                                                              const char         *attributes);
- void                _gtk_file_system_model_update_file      (GtkFileSystemModel *model,
-                                                              GFile              *file,
--                                                             GFileInfo          *info,
--                                                             gboolean            requires_resort);
-+                                                             GFileInfo          *info);
- 
- void                _gtk_file_system_model_set_show_hidden  (GtkFileSystemModel *model,
- 							     gboolean            show_hidden);
-@@ -82,8 +81,6 @@ void                _gtk_file_system_model_set_show_files   (GtkFileSystemModel
- 							     gboolean            show_files);
- void                _gtk_file_system_model_set_filter_folders (GtkFileSystemModel *model,
- 							     gboolean            show_folders);
--void                _gtk_file_system_model_freeze_updates   (GtkFileSystemModel *model);
--void                _gtk_file_system_model_thaw_updates     (GtkFileSystemModel *model);
- void                _gtk_file_system_model_clear_cache      (GtkFileSystemModel *model,
-                                                              int                 column);
- 
-diff --git a/gtk/gtkgradient.c b/gtk/gtkgradient.c
-index 3c16fca..8c779d8 100644
---- a/gtk/gtkgradient.c
-+++ b/gtk/gtkgradient.c
-@@ -327,6 +327,7 @@ _gtk_gradient_resolve_full (GtkGradient             *gradient,
-         {
-           rgba = *_gtk_css_rgba_value_get_rgba (val);
-           *dependencies = _gtk_css_dependencies_union (*dependencies, stop_deps);
-+          _gtk_css_value_unref (val);
-         }
-       else
-         {
-@@ -467,7 +468,7 @@ gtk_gradient_fade (GtkGradient *gradient,
- 
-       stop = &g_array_index (gradient->stops, ColorStop, i);
-       color = gtk_symbolic_color_new_alpha (stop->color, opacity);
--      gtk_gradient_add_color_stop (gradient, stop->offset, color);
-+      gtk_gradient_add_color_stop (faded, stop->offset, color);
-       gtk_symbolic_color_unref (color);
-     }
- 
-diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
-index 6f23914..49ee9bc 100644
---- a/gtk/gtkiconhelper.c
-+++ b/gtk/gtkiconhelper.c
-@@ -20,6 +20,7 @@
- #include "config.h"
- 
- #include "gtkiconhelperprivate.h"
-+#include "string.h"
- 
- G_DEFINE_TYPE (GtkIconHelper, _gtk_icon_helper, G_TYPE_OBJECT)
- 
-@@ -466,7 +467,8 @@ _gtk_icon_helper_set_stock_id (GtkIconHelper *self,
- {
-   _gtk_icon_helper_clear (self);
- 
--  if (stock_id != NULL)
-+  if (stock_id != NULL &&
-+      g_strcmp0 (stock_id, "") != 0)
-     {
-       self->priv->storage_type = GTK_IMAGE_STOCK;
-       self->priv->stock_id = g_strdup (stock_id);
-diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c
-index b46dd3a..ef8f3cd 100644
---- a/gtk/gtkmenubutton.c
-+++ b/gtk/gtkmenubutton.c
-@@ -806,6 +806,23 @@ gtk_menu_button_get_menu_model (GtkMenuButton *menu_button)
-   return menu_button->priv->model;
- }
- 
-+static void
-+set_align_widget_pointer (GtkMenuButton *menu_button,
-+                          GtkWidget     *align_widget)
-+{
-+  GtkMenuButtonPrivate *priv;
-+
-+  priv = menu_button->priv;
-+
-+  if (priv->align_widget)
-+    g_object_remove_weak_pointer (G_OBJECT (priv->align_widget), (gpointer *) &priv->align_widget);
-+
-+  priv->align_widget = align_widget;
-+
-+  if (align_widget)
-+    g_object_add_weak_pointer (G_OBJECT (priv->align_widget), (gpointer *) &priv->align_widget);
-+}
-+
- /**
-  * gtk_menu_button_set_align_widget:
-  * @menu_button: a #GtkMenuButton
-@@ -832,10 +849,7 @@ gtk_menu_button_set_align_widget (GtkMenuButton *menu_button,
-   if (priv->align_widget == align_widget)
-     return;
- 
--  priv->align_widget = align_widget;
--
--  if (priv->align_widget)
--    g_object_add_weak_pointer (G_OBJECT (priv->align_widget), (gpointer *) &priv->align_widget);
-+  set_align_widget_pointer (menu_button, align_widget);
- 
-   g_object_notify (G_OBJECT (menu_button), "align-widget");
- }
-@@ -926,8 +940,11 @@ gtk_menu_button_dispose (GObject *object)
-                                             menu_deactivate_cb,
-                                             object);
-       gtk_menu_detach (GTK_MENU (priv->popup));
-+      priv->popup = NULL;
-     }
- 
-+  set_align_widget_pointer (GTK_MENU_BUTTON (object), NULL);
-+
-   g_clear_object (&priv->model);
- 
-   G_OBJECT_CLASS (gtk_menu_button_parent_class)->dispose (object);
-diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
-index 25c5a44..be388c9 100644
---- a/gtk/gtkscale.c
-+++ b/gtk/gtkscale.c
-@@ -221,6 +221,21 @@ gtk_scale_notify (GObject    *object,
-     G_OBJECT_CLASS (gtk_scale_parent_class)->notify (object, pspec);
- }
- 
-+static void
-+gtk_scale_update_style (GtkScale *scale)
-+{
-+  gint slider_length;
-+  GtkRange *range;
-+
-+  range = GTK_RANGE (scale);
-+
-+  gtk_widget_style_get (GTK_WIDGET (scale),
-+                        "slider-length", &slider_length,
-+                        NULL);
-+
-+  gtk_range_set_min_slider_size (range, slider_length);
-+  _gtk_scale_clear_layout (scale);
-+}
- 
- #define add_slider_binding(binding_set, keyval, mask, scroll)              \
-   gtk_binding_entry_add_signal (binding_set, keyval, mask,                 \
-@@ -492,6 +507,7 @@ gtk_scale_init (GtkScale *scale)
- 
-   context = gtk_widget_get_style_context (GTK_WIDGET (scale));
-   gtk_style_context_add_class (context, GTK_STYLE_CLASS_SCALE);
-+  gtk_scale_update_style (scale);
- }
- 
- static void
-@@ -1020,18 +1036,7 @@ gtk_scale_get_mark_label_size (GtkScale        *scale,
- static void
- gtk_scale_style_updated (GtkWidget *widget)
- {
--  gint slider_length;
--  GtkRange *range;
--
--  range = GTK_RANGE (widget);
--  
--  gtk_widget_style_get (widget,
--                        "slider-length", &slider_length,
--                        NULL);
--
--  gtk_range_set_min_slider_size (range, slider_length);
--
--  _gtk_scale_clear_layout (GTK_SCALE (widget));
-+  gtk_scale_update_style (GTK_SCALE (widget));
- 
-   GTK_WIDGET_CLASS (gtk_scale_parent_class)->style_updated (widget);
- }
-diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
-index 541acc3..9062118 100644
---- a/gtk/gtkscrollbar.c
-+++ b/gtk/gtkscrollbar.c
-@@ -115,21 +115,13 @@ gtk_scrollbar_class_init (GtkScrollbarClass *class)
- }
- 
- static void
--gtk_scrollbar_init (GtkScrollbar *scrollbar)
--{
--  GtkStyleContext *context;
--
--  context = gtk_widget_get_style_context (GTK_WIDGET (scrollbar));
--  gtk_style_context_add_class (context, GTK_STYLE_CLASS_SCROLLBAR);
--}
--
--static void
--gtk_scrollbar_style_updated (GtkWidget *widget)
-+gtk_scrollbar_update_style (GtkScrollbar *scrollbar)
- {
--  GtkRange *range = GTK_RANGE (widget);
-   gint slider_length;
-   gboolean fixed_size;
-   gboolean has_a, has_b, has_c, has_d;
-+  GtkRange *range = GTK_RANGE (scrollbar);
-+  GtkWidget *widget = GTK_WIDGET (scrollbar);
- 
-   gtk_widget_style_get (widget,
-                         "min-slider-length", &slider_length,
-@@ -144,7 +136,22 @@ gtk_scrollbar_style_updated (GtkWidget *widget)
-   gtk_range_set_slider_size_fixed (range, fixed_size);
-   _gtk_range_set_steppers (range,
-                            has_a, has_b, has_c, has_d);
-+}
- 
-+static void
-+gtk_scrollbar_init (GtkScrollbar *scrollbar)
-+{
-+  GtkStyleContext *context;
-+
-+  context = gtk_widget_get_style_context (GTK_WIDGET (scrollbar));
-+  gtk_style_context_add_class (context, GTK_STYLE_CLASS_SCROLLBAR);
-+  gtk_scrollbar_update_style (scrollbar);
-+}
-+
-+static void
-+gtk_scrollbar_style_updated (GtkWidget *widget)
-+{
-+  gtk_scrollbar_update_style (GTK_SCROLLBAR (widget));
-   GTK_WIDGET_CLASS (gtk_scrollbar_parent_class)->style_updated (widget);
- }
- 
-diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
-index a18c4cf..7929863 100644
---- a/gtk/gtkscrolledwindow.c
-+++ b/gtk/gtkscrolledwindow.c
-@@ -274,9 +274,6 @@ static void  gtk_scrolled_window_realize               (GtkWidget           *wid
- static void  gtk_scrolled_window_unrealize             (GtkWidget           *widget);
- static void  gtk_scrolled_window_map                   (GtkWidget           *widget);
- static void  gtk_scrolled_window_unmap                 (GtkWidget           *widget);
--static void  gtk_scrolled_window_state_flags_changed   (GtkWidget           *widget,
--                                                        GtkStateFlags        previous_state);
--static void  gtk_scrolled_window_style_updated         (GtkWidget           *widget);
- 
- static void  gtk_scrolled_window_grab_notify           (GtkWidget           *widget,
-                                                         gboolean             was_grabbed);
-@@ -352,8 +349,6 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
-   widget_class->unrealize = gtk_scrolled_window_unrealize;
-   widget_class->map = gtk_scrolled_window_map;
-   widget_class->unmap = gtk_scrolled_window_unmap;
--  widget_class->state_flags_changed = gtk_scrolled_window_state_flags_changed;
--  widget_class->style_updated = gtk_scrolled_window_style_updated;
-   widget_class->grab_notify = gtk_scrolled_window_grab_notify;
- 
-   container_class->add = gtk_scrolled_window_add;
-@@ -3379,14 +3374,13 @@ gtk_scrolled_window_realize (GtkWidget *widget)
-   attributes.wclass = GDK_INPUT_OUTPUT;
-   attributes.visual = gtk_widget_get_visual (widget);
-   attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK |
--    GDK_BUTTON_MOTION_MASK | GDK_TOUCH_MASK;
-+    GDK_BUTTON_MOTION_MASK | GDK_TOUCH_MASK | GDK_EXPOSURE_MASK;
- 
-   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
- 
-   scrolled_window->priv->overshoot_window =
-     gdk_window_new (gtk_widget_get_parent_window (widget),
-                     &attributes, attributes_mask);
--
-   gdk_window_set_user_data (scrolled_window->priv->overshoot_window, widget);
- 
-   child_widget = gtk_bin_get_child (GTK_BIN (widget));
-@@ -3433,37 +3427,6 @@ gtk_scrolled_window_unmap (GtkWidget *widget)
- }
- 
- static void
--_gtk_scrolled_window_update_background (GtkScrolledWindow *scrolled_window)
--{
--  GtkWidget *widget = GTK_WIDGET (scrolled_window);
--
--  if (gtk_widget_get_realized (widget))
--    {
--      GtkStyleContext *context;
--
--      context = gtk_widget_get_style_context (widget);
--      gtk_style_context_set_background (context, scrolled_window->priv->overshoot_window);
--    }
--}
--
--static void
--gtk_scrolled_window_state_flags_changed (GtkWidget     *widget,
--                                         GtkStateFlags  previous_state)
--{
--  _gtk_scrolled_window_update_background (GTK_SCROLLED_WINDOW (widget));
--  gtk_widget_queue_draw (widget);
--}
--
--static void
--gtk_scrolled_window_style_updated (GtkWidget *widget)
--{
--  GTK_WIDGET_CLASS (gtk_scrolled_window_parent_class)->style_updated (widget);
--
--  _gtk_scrolled_window_update_background (GTK_SCROLLED_WINDOW (widget));
--  gtk_widget_queue_draw (widget);
--}
--
--static void
- gtk_scrolled_window_grab_notify (GtkWidget *widget,
-                                  gboolean   was_grabbed)
- {
-diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
-index 5939e88..4b9e1e5 100644
---- a/gtk/gtksettings.c
-+++ b/gtk/gtksettings.c
-@@ -1848,6 +1848,9 @@ gtk_settings_notify (GObject    *object,
-       if (settings_update_fontconfig (settings))
-         gtk_style_context_reset_widgets (priv->screen);
-       break;
-+    case PROP_ENABLE_ANIMATIONS:
-+      gtk_style_context_reset_widgets (priv->screen);
-+      break;
-     case PROP_CURSOR_THEME_NAME:
-     case PROP_CURSOR_THEME_SIZE:
-       settings_update_cursor_theme (settings);
-diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
-index b5b043d..091505a 100644
---- a/gtk/gtksizegroup.c
-+++ b/gtk/gtksizegroup.c
-@@ -746,6 +746,11 @@ compute_dimension (GtkWidget        *widget,
- 		  min_dimension = *minimum;
- 		  nat_dimension = *natural;
- 		}
-+              else if (!gtk_widget_get_mapped (tmp_widget) && priv->ignore_hidden)
-+		{
-+		  min_dimension = 0;
-+		  nat_dimension = 0;
-+		}
- 	      else
- 		{
- 		  if (mode == GTK_SIZE_GROUP_HORIZONTAL)
-@@ -754,11 +759,8 @@ compute_dimension (GtkWidget        *widget,
- 		    gtk_widget_get_preferred_height (tmp_widget, &min_dimension, &nat_dimension);
- 		}
- 
--	      if (gtk_widget_get_mapped (tmp_widget) || !priv->ignore_hidden)
--		{
--		  min_result = MAX (min_result, min_dimension);
--		  nat_result = MAX (nat_result, nat_dimension);
--		}
-+              min_result = MAX (min_result, min_dimension);
-+              nat_result = MAX (nat_result, nat_dimension);
- 
- 	      tmp_list = tmp_list->next;
- 	    }
-diff --git a/gtk/gtktexthandle.c b/gtk/gtktexthandle.c
-index 3738d02..3d06ee4 100644
---- a/gtk/gtktexthandle.c
-+++ b/gtk/gtktexthandle.c
-@@ -122,49 +122,43 @@ _gtk_text_handle_draw (GtkTextHandle         *handle,
- }
- 
- static void
--_gtk_text_handle_update_shape (GtkTextHandle *handle,
--                               GdkWindow     *window)
-+_gtk_text_handle_update_shape (GtkTextHandle         *handle,
-+                               GdkWindow             *window,
-+                               GtkTextHandlePosition  pos)
- {
-   GtkTextHandlePrivate *priv;
-+  cairo_surface_t *surface;
-+  cairo_region_t *region;
-+  cairo_t *cr;
- 
-   priv = handle->priv;
- 
-+  surface =
-+    gdk_window_create_similar_surface (window,
-+                                       CAIRO_CONTENT_COLOR_ALPHA,
-+                                       gdk_window_get_width (window),
-+                                       gdk_window_get_height (window));
-+
-+  cr = cairo_create (surface);
-+  _gtk_text_handle_draw (handle, cr, pos);
-+  cairo_destroy (cr);
-+
-+  region = gdk_cairo_region_create_from_surface (surface);
-+
-   if (gtk_widget_is_composited (priv->parent))
-     gdk_window_shape_combine_region (window, NULL, 0, 0);
-   else
--    {
--      GtkTextHandlePosition pos;
--      cairo_surface_t *surface;
--      cairo_region_t *region;
--      cairo_t *cr;
--
--      if (window == priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_START].window)
--        pos = GTK_TEXT_HANDLE_POSITION_SELECTION_START;
--      else if (window == priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_END].window)
--        pos = GTK_TEXT_HANDLE_POSITION_SELECTION_END;
--      else
--        return;
-+    gdk_window_shape_combine_region (window, region, 0, 0);
- 
--      surface =
--        gdk_window_create_similar_surface (window,
--                                           CAIRO_CONTENT_COLOR_ALPHA,
--                                           gdk_window_get_width (window),
--                                           gdk_window_get_height (window));
-+  gdk_window_input_shape_combine_region (window, region, 0, 0);
- 
--      cr = cairo_create (surface);
--      _gtk_text_handle_draw (handle, cr, pos);
--      cairo_destroy (cr);
--
--      region = gdk_cairo_region_create_from_surface (surface);
--      gdk_window_shape_combine_region (window, region, 0, 0);
--
--      cairo_surface_destroy (surface);
--      cairo_region_destroy (region);
--    }
-+  cairo_surface_destroy (surface);
-+  cairo_region_destroy (region);
- }
- 
- static GdkWindow *
--_gtk_text_handle_create_window (GtkTextHandle *handle)
-+_gtk_text_handle_create_window (GtkTextHandle         *handle,
-+                                GtkTextHandlePosition  pos)
- {
-   GtkTextHandlePrivate *priv;
-   GdkRGBA bg = { 0, 0, 0, 0 };
-@@ -200,7 +194,7 @@ _gtk_text_handle_create_window (GtkTextHandle *handle)
-   gdk_window_set_user_data (window, priv->parent);
-   gdk_window_set_background_rgba (window, &bg);
- 
--  _gtk_text_handle_update_shape (handle, window);
-+  _gtk_text_handle_update_shape (handle, window, pos);
- 
-   return window;
- }
-@@ -307,7 +301,7 @@ _gtk_text_handle_update_window (GtkTextHandle         *handle,
-   gdk_window_destroy (handle_window->window);
- 
-   /* Create new window and apply old state */
--  handle_window->window = _gtk_text_handle_create_window (handle);
-+  handle_window->window = _gtk_text_handle_create_window (handle, pos);
- 
-   if (visible)
-     {
-@@ -531,9 +525,9 @@ _gtk_text_handle_set_relative_to (GtkTextHandle *handle,
-     {
-       priv->relative_to = g_object_ref (window);
-       priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_START].window =
--        _gtk_text_handle_create_window (handle);
-+        _gtk_text_handle_create_window (handle, GTK_TEXT_HANDLE_POSITION_SELECTION_START);
-       priv->windows[GTK_TEXT_HANDLE_POSITION_SELECTION_END].window =
--        _gtk_text_handle_create_window (handle);
-+        _gtk_text_handle_create_window (handle, GTK_TEXT_HANDLE_POSITION_SELECTION_END);
-       priv->realized = TRUE;
-     }
-   else
-@@ -580,6 +574,10 @@ _gtk_text_handle_set_mode (GtkTextHandle     *handle,
-     }
- 
-   priv->mode = mode;
-+
-+  _gtk_text_handle_update_shape (handle,
-+                                 priv->windows[GTK_TEXT_HANDLE_POSITION_CURSOR].window,
-+                                 GTK_TEXT_HANDLE_POSITION_CURSOR);
- }
- 
- GtkTextHandleMode
-diff --git a/po/ga.po b/po/ga.po
-index d0faad3..8d66617 100644
---- a/po/ga.po
-+++ b/po/ga.po
-@@ -4,14 +4,14 @@
- # Seán Ó Ceallaigh <soc@users.sourceforge.net>, 1999.
- # Alastair McKinstry <mckinstry@computer.org>, 2004.
- # Alan Horkan <horkan@maths.tcd.ie>, 2005.
--# Seán de Búrca <leftmostcat@gmail.com>, 2007, 2008, 2009, 2010.
-+# Seán de Búrca <leftmostcat@gmail.com>, 2007, 2008, 2009, 2010, 2012.
- #
- msgid ""
- msgstr ""
- "Project-Id-Version: gtk+.master\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2010-10-01 15:41-0400\n"
--"PO-Revision-Date: 2010-06-08 12:30-0600\n"
-+"POT-Creation-Date: 2012-11-02 03:00-0600\n"
-+"PO-Revision-Date: 2012-11-02 03:16-0600\n"
- "Last-Translator: Seán de Búrca <leftmostcat@gmail.com>\n"
- "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
- "Language: ga\n"
-@@ -20,303 +20,436 @@ msgstr ""
- "Content-Transfer-Encoding: 8bit\n"
- "Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n"
- "%10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n"
-+"X-Generator: Gtranslator 2.91.5\n"
- 
--#: gdk/gdk.c:103
-+#: ../gdk/gdk.c:155
- #, c-format
- msgid "Error parsing option --gdk-debug"
- msgstr "Earráid agus rogha --gdk-debug á parsáil"
- 
--#: gdk/gdk.c:123
-+#: ../gdk/gdk.c:175
- #, c-format
- msgid "Error parsing option --gdk-no-debug"
- msgstr "Earráid agus rogha --gdk-no-debug á parsáil"
- 
- #. Description of --class=CLASS in --help output
--#: gdk/gdk.c:151
-+#: ../gdk/gdk.c:203
- msgid "Program class as used by the window manager"
- msgstr "Aicme chláir mar úsáidte leis an mbainisteoir fuinneoga"
- 
- #. Placeholder in --class=CLASS in --help output
--#: gdk/gdk.c:152
-+#: ../gdk/gdk.c:204
- msgid "CLASS"
- msgstr "AICME"
- 
- #. Description of --name=NAME in --help output
--#: gdk/gdk.c:154
-+#: ../gdk/gdk.c:206
- msgid "Program name as used by the window manager"
- msgstr "Ainm cláir mar úsáidte leis an mbainisteoir fuinneoga"
- 
- #. Placeholder in --name=NAME in --help output
--#: gdk/gdk.c:155
-+#: ../gdk/gdk.c:207
- msgid "NAME"
- msgstr "AINM"
- 
- #. Description of --display=DISPLAY in --help output
--#: gdk/gdk.c:157
-+#: ../gdk/gdk.c:209
- msgid "X display to use"
- msgstr "Taispeáint X le húsáid"
- 
- #. Placeholder in --display=DISPLAY in --help output
--#: gdk/gdk.c:158
-+#: ../gdk/gdk.c:210
- msgid "DISPLAY"
- msgstr "TAISPEÁINT"
- 
--#. Description of --screen=SCREEN in --help output
--#: gdk/gdk.c:160
--msgid "X screen to use"
--msgstr "Scáileán X le húsáid"
--
--#. Placeholder in --screen=SCREEN in --help output
--#: gdk/gdk.c:161
--msgid "SCREEN"
--msgstr "SCÁILEÁN"
--
- #. Description of --gdk-debug=FLAGS in --help output
--#: gdk/gdk.c:164
--#, fuzzy
-+#: ../gdk/gdk.c:213
- msgid "GDK debugging flags to set"
--msgstr "Bratacha dífhabhtaithe GTK+ a shocrú"
-+msgstr "Bratacha dífhabhtaithe GTK+ le socrú"
- 
- #. Placeholder in --gdk-debug=FLAGS in --help output
- #. Placeholder in --gdk-no-debug=FLAGS in --help output
- #. Placeholder in --gtk-debug=FLAGS in --help output
- #. Placeholder in --gtk-no-debug=FLAGS in --help output
--#: gdk/gdk.c:165 gdk/gdk.c:168 gtk/gtkmain.c:533 gtk/gtkmain.c:536
-+#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:454 ../gtk/gtkmain.c:457
- msgid "FLAGS"
- msgstr "BRATACHA"
- 
- #. Description of --gdk-no-debug=FLAGS in --help output
--#: gdk/gdk.c:167
--#, fuzzy
-+#: ../gdk/gdk.c:216
- msgid "GDK debugging flags to unset"
--msgstr "Bratacha dífhabhtaithe GTK+ a dhíshocrú"
-+msgstr "Bratacha dífhabhtaithe GTK+ le díshocrú"
- 
--#: gdk/keyname-table.h:3940
-+#.
-+#. * Translators, the strings in the 'keyboard label' context are
-+#. * display names for keyboard keys. Some of them have prefixes like
-+#. * XF86 or ISO_ - these should be removed in the translation. Similarly,
-+#. * underscores should be replaced by spaces. The prefix 'KP_' stands
-+#. * for 'key pad' and you may want to include that in your translation.
-+#. * Here are some examples of English translations:
-+#. * XF86AudioMute - Audio mute
-+#. * Scroll_lock   - Scroll lock
-+#. * KP_Space      - Space (keypad)
-+#. * Page_Up       - Page up
-+#.
-+#: ../gdk/keyname-table.h:3952
- msgctxt "keyboard label"
- msgid "BackSpace"
- msgstr "BackSpace"
- 
--#: gdk/keyname-table.h:3941
-+#: ../gdk/keyname-table.h:3953
- msgctxt "keyboard label"
- msgid "Tab"
- msgstr "Tab"
- 
--#: gdk/keyname-table.h:3942
-+#: ../gdk/keyname-table.h:3954
- msgctxt "keyboard label"
- msgid "Return"
- msgstr "Return"
- 
--#: gdk/keyname-table.h:3943
-+#: ../gdk/keyname-table.h:3955
- msgctxt "keyboard label"
- msgid "Pause"
- msgstr "Pause"
- 
--#: gdk/keyname-table.h:3944
-+#: ../gdk/keyname-table.h:3956
- msgctxt "keyboard label"
- msgid "Scroll_Lock"
- msgstr "Scroll_Lock"
- 
--#: gdk/keyname-table.h:3945
-+#: ../gdk/keyname-table.h:3957
- msgctxt "keyboard label"
- msgid "Sys_Req"
- msgstr "Sys_Req"
- 
--#: gdk/keyname-table.h:3946
-+#: ../gdk/keyname-table.h:3958
- msgctxt "keyboard label"
- msgid "Escape"
- msgstr "Escape"
- 
--#: gdk/keyname-table.h:3947
-+#: ../gdk/keyname-table.h:3959
- msgctxt "keyboard label"
- msgid "Multi_key"
- msgstr "Multi_key"
- 
--#: gdk/keyname-table.h:3948
-+#: ../gdk/keyname-table.h:3960
- msgctxt "keyboard label"
- msgid "Home"
- msgstr "Home"
- 
--#: gdk/keyname-table.h:3949
-+#: ../gdk/keyname-table.h:3961
- msgctxt "keyboard label"
- msgid "Left"
- msgstr "Left"
- 
--#: gdk/keyname-table.h:3950
-+#: ../gdk/keyname-table.h:3962
- msgctxt "keyboard label"
- msgid "Up"
- msgstr "Up"
- 
--#: gdk/keyname-table.h:3951
-+#: ../gdk/keyname-table.h:3963
- msgctxt "keyboard label"
- msgid "Right"
- msgstr "Right"
- 
--#: gdk/keyname-table.h:3952
-+#: ../gdk/keyname-table.h:3964
- msgctxt "keyboard label"
- msgid "Down"
- msgstr "Down"
- 
--#: gdk/keyname-table.h:3953
-+#: ../gdk/keyname-table.h:3965
- msgctxt "keyboard label"
- msgid "Page_Up"
- msgstr "Page_Up"
- 
--#: gdk/keyname-table.h:3954
-+#: ../gdk/keyname-table.h:3966
- msgctxt "keyboard label"
- msgid "Page_Down"
- msgstr "Page_Down"
- 
--#: gdk/keyname-table.h:3955
-+#: ../gdk/keyname-table.h:3967
- msgctxt "keyboard label"
- msgid "End"
- msgstr "End"
- 
--#: gdk/keyname-table.h:3956
-+#: ../gdk/keyname-table.h:3968
- msgctxt "keyboard label"
- msgid "Begin"
- msgstr "Begin"
- 
--#: gdk/keyname-table.h:3957
-+#: ../gdk/keyname-table.h:3969
- msgctxt "keyboard label"
- msgid "Print"
- msgstr "Print"
- 
--#: gdk/keyname-table.h:3958
-+#: ../gdk/keyname-table.h:3970
- msgctxt "keyboard label"
- msgid "Insert"
- msgstr "Insert"
- 
--#: gdk/keyname-table.h:3959
-+#: ../gdk/keyname-table.h:3971
- msgctxt "keyboard label"
- msgid "Num_Lock"
- msgstr "Num_Lock"
- 
--#: gdk/keyname-table.h:3960
-+#. Translators: KP_ means 'key pad' here
-+#: ../gdk/keyname-table.h:3973
- msgctxt "keyboard label"
- msgid "KP_Space"
- msgstr "KP_Space"
- 
--#: gdk/keyname-table.h:3961
-+#: ../gdk/keyname-table.h:3974
- msgctxt "keyboard label"
- msgid "KP_Tab"
- msgstr "KP_Tab"
- 
--#: gdk/keyname-table.h:3962
-+#: ../gdk/keyname-table.h:3975
- msgctxt "keyboard label"
- msgid "KP_Enter"
- msgstr "KP_Enter"
- 
--#: gdk/keyname-table.h:3963
-+#: ../gdk/keyname-table.h:3976
- msgctxt "keyboard label"
- msgid "KP_Home"
- msgstr "KP_Home"
- 
--#: gdk/keyname-table.h:3964
-+#: ../gdk/keyname-table.h:3977
- msgctxt "keyboard label"
- msgid "KP_Left"
- msgstr "KP_Left"
- 
--#: gdk/keyname-table.h:3965
-+#: ../gdk/keyname-table.h:3978
- msgctxt "keyboard label"
- msgid "KP_Up"
- msgstr "KP_Up"
- 
--#: gdk/keyname-table.h:3966
-+#: ../gdk/keyname-table.h:3979
- msgctxt "keyboard label"
- msgid "KP_Right"
- msgstr "KP_Right"
- 
--#: gdk/keyname-table.h:3967
-+#: ../gdk/keyname-table.h:3980
- msgctxt "keyboard label"
- msgid "KP_Down"
- msgstr "KP_Down"
- 
--#: gdk/keyname-table.h:3968
-+#: ../gdk/keyname-table.h:3981
- msgctxt "keyboard label"
- msgid "KP_Page_Up"
- msgstr "KP_Page_Up"
- 
--#: gdk/keyname-table.h:3969
-+#: ../gdk/keyname-table.h:3982
- msgctxt "keyboard label"
- msgid "KP_Prior"
- msgstr "KP_Prior"
- 
--#: gdk/keyname-table.h:3970
-+#: ../gdk/keyname-table.h:3983
- msgctxt "keyboard label"
- msgid "KP_Page_Down"
- msgstr "KP_Page_Down"
- 
--#: gdk/keyname-table.h:3971
-+#: ../gdk/keyname-table.h:3984
- msgctxt "keyboard label"
- msgid "KP_Next"
- msgstr "KP_Next"
- 
--#: gdk/keyname-table.h:3972
-+#: ../gdk/keyname-table.h:3985
- msgctxt "keyboard label"
- msgid "KP_End"
- msgstr "KP_End"
- 
--#: gdk/keyname-table.h:3973
-+#: ../gdk/keyname-table.h:3986
- msgctxt "keyboard label"
- msgid "KP_Begin"
- msgstr "KP_Begin"
- 
--#: gdk/keyname-table.h:3974
-+#: ../gdk/keyname-table.h:3987
- msgctxt "keyboard label"
- msgid "KP_Insert"
- msgstr "KP_Insert"
- 
--#: gdk/keyname-table.h:3975
-+#: ../gdk/keyname-table.h:3988
- msgctxt "keyboard label"
- msgid "KP_Delete"
- msgstr "KP_Delete"
- 
--#: gdk/keyname-table.h:3976
-+#: ../gdk/keyname-table.h:3989
- msgctxt "keyboard label"
- msgid "Delete"
- msgstr "Delete"
- 
-+#. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
-+#: ../gdk/keyname-table.h:3991
-+msgctxt "keyboard label"
-+msgid "XF86MonBrightnessUp"
-+msgstr "XF86MonBrightnessUp"
-+
-+#: ../gdk/keyname-table.h:3992
-+msgctxt "keyboard label"
-+msgid "XF86MonBrightnessDown"
-+msgstr "XF86MonBrightnessDown"
-+
-+#: ../gdk/keyname-table.h:3993
-+msgctxt "keyboard label"
-+msgid "XF86AudioMute"
-+msgstr "XF86AudioMute"
-+
-+#: ../gdk/keyname-table.h:3994
-+msgctxt "keyboard label"
-+msgid "XF86AudioLowerVolume"
-+msgstr "XF86AudioLowerVolume"
-+
-+#: ../gdk/keyname-table.h:3995
-+msgctxt "keyboard label"
-+msgid "XF86AudioRaiseVolume"
-+msgstr "XF86AudioRaiseVolume"
-+
-+#: ../gdk/keyname-table.h:3996
-+msgctxt "keyboard label"
-+msgid "XF86AudioPlay"
-+msgstr "XF86AudioPlay"
-+
-+#: ../gdk/keyname-table.h:3997
-+msgctxt "keyboard label"
-+msgid "XF86AudioStop"
-+msgstr "XF86AudioStop"
-+
-+#: ../gdk/keyname-table.h:3998
-+msgctxt "keyboard label"
-+msgid "XF86AudioNext"
-+msgstr "XF86AudioNext"
-+
-+#: ../gdk/keyname-table.h:3999
-+msgctxt "keyboard label"
-+msgid "XF86AudioPrev"
-+msgstr "XF86AudioPrev"
-+
-+#: ../gdk/keyname-table.h:4000
-+msgctxt "keyboard label"
-+msgid "XF86AudioRecord"
-+msgstr "XF86AudioRecord"
-+
-+#: ../gdk/keyname-table.h:4001
-+msgctxt "keyboard label"
-+msgid "XF86AudioPause"
-+msgstr "XF86AudioPause"
-+
-+#: ../gdk/keyname-table.h:4002
-+msgctxt "keyboard label"
-+msgid "XF86AudioRewind"
-+msgstr "XF86AudioRewind"
-+
-+#: ../gdk/keyname-table.h:4003
-+msgctxt "keyboard label"
-+msgid "XF86AudioMedia"
-+msgstr "XF86AudioMedia"
-+
-+#: ../gdk/keyname-table.h:4004
-+msgctxt "keyboard label"
-+msgid "XF86ScreenSaver"
-+msgstr "XF86ScreenSaver"
-+
-+#: ../gdk/keyname-table.h:4005
-+msgctxt "keyboard label"
-+msgid "XF86Battery"
-+msgstr "XF86Battery"
-+
-+#: ../gdk/keyname-table.h:4006
-+msgctxt "keyboard label"
-+msgid "XF86Launch1"
-+msgstr "XF86Launch1"
-+
-+#: ../gdk/keyname-table.h:4007
-+msgctxt "keyboard label"
-+msgid "XF86Forward"
-+msgstr "XF86Forward"
-+
-+#: ../gdk/keyname-table.h:4008
-+msgctxt "keyboard label"
-+msgid "XF86Back"
-+msgstr "XF86Back"
-+
-+#: ../gdk/keyname-table.h:4009
-+msgctxt "keyboard label"
-+msgid "XF86Sleep"
-+msgstr "XF86Sleep"
-+
-+#: ../gdk/keyname-table.h:4010
-+msgctxt "keyboard label"
-+msgid "XF86Hibernate"
-+msgstr "XF86Hibernate"
-+
-+#: ../gdk/keyname-table.h:4011
-+msgctxt "keyboard label"
-+msgid "XF86WLAN"
-+msgstr "XF86WLAN"
-+
-+#: ../gdk/keyname-table.h:4012
-+msgctxt "keyboard label"
-+msgid "XF86WebCam"
-+msgstr "XF86WebCam"
-+
-+#: ../gdk/keyname-table.h:4013
-+msgctxt "keyboard label"
-+msgid "XF86Display"
-+msgstr "XF86Display"
-+
-+#: ../gdk/keyname-table.h:4014
-+msgctxt "keyboard label"
-+msgid "XF86TouchpadToggle"
-+msgstr "XF86TouchpadToggle"
-+
-+#: ../gdk/keyname-table.h:4015
-+msgctxt "keyboard label"
-+msgid "XF86WakeUp"
-+msgstr "XF86WakeUp"
-+
-+#: ../gdk/keyname-table.h:4016
-+msgctxt "keyboard label"
-+msgid "XF86Suspend"
-+msgstr "XF86Suspend"
-+
- #. Description of --sync in --help output
--#: gdk/win32/gdkmain-win32.c:54
-+#: ../gdk/win32/gdkmain-win32.c:53
- msgid "Don't batch GDI requests"
- msgstr "Ná baisc iarratais GDI"
- 
- #. Description of --no-wintab in --help output
--#: gdk/win32/gdkmain-win32.c:56
-+#: ../gdk/win32/gdkmain-win32.c:55
- msgid "Don't use the Wintab API for tablet support"
- msgstr "Ná húsáid an API Wintab le tacaíocht táibléid"
- 
- #. Description of --ignore-wintab in --help output
--#: gdk/win32/gdkmain-win32.c:58
-+#: ../gdk/win32/gdkmain-win32.c:57
- msgid "Same as --no-wintab"
- msgstr "Céanna le --no-wintab"
- 
- #. Description of --use-wintab in --help output
--#: gdk/win32/gdkmain-win32.c:60
-+#: ../gdk/win32/gdkmain-win32.c:59
- msgid "Do use the Wintab API [default]"
- msgstr "Úsáid an API Wintab [réamhshocrú]"
- 
- #. Description of --max-colors=COLORS in --help output
--#: gdk/win32/gdkmain-win32.c:62
-+#: ../gdk/win32/gdkmain-win32.c:61
- msgid "Size of the palette in 8 bit mode"
- msgstr "Méid an phailéid sa mhód 8-giotán"
- 
- #. Placeholder in --max-colors=COLORS in --help output
--#: gdk/win32/gdkmain-win32.c:63
-+#: ../gdk/win32/gdkmain-win32.c:62
- msgid "COLORS"
- msgstr "DATHANNA"
- 
--#: gdk/x11/gdkapplaunchcontext-x11.c:312
-+#: ../gdk/x11/gdkapplaunchcontext-x11.c:292
- #, c-format
- msgid "Starting %s"
- msgstr "%s á Thosú"
- 
--#: gdk/x11/gdkapplaunchcontext-x11.c:316
-+#: ../gdk/x11/gdkapplaunchcontext-x11.c:305
- #, c-format
- msgid "Opening %s"
- msgstr "%s á Oscailt"
- 
--#: gdk/x11/gdkapplaunchcontext-x11.c:321
-+#: ../gdk/x11/gdkapplaunchcontext-x11.c:310
- #, c-format
- msgid "Opening %d Item"
- msgid_plural "Opening %d Items"
-@@ -326,63 +459,245 @@ msgstr[2] "%d Mhír á Oscailt"
- msgstr[3] "%d Mír á Oscailt"
- msgstr[4] "%d Mír á Oscailt"
- 
--#. Description of --sync in --help output
--#: gdk/x11/gdkmain-x11.c:96
--msgid "Make X calls synchronous"
--msgstr "Déan sioncronach glaonna X"
-+#: ../gtk/a11y/gtkspinneraccessible.c:40
-+msgctxt "throbbing progress animation widget"
-+msgid "Spinner"
-+msgstr ""
-+
-+#: ../gtk/a11y/gtkspinneraccessible.c:41
-+msgid "Provides visual indication of progress"
-+msgstr ""
-+
-+#: ../gtk/a11y/gtkswitchaccessible.c:63
-+msgctxt "light switch widget"
-+msgid "Switch"
-+msgstr "Lasc"
-+
-+#: ../gtk/a11y/gtkswitchaccessible.c:64
-+msgid "Switches between on and off states"
-+msgstr ""
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:425
-+msgid ""
-+"Select the color you want from the outer ring. Select the darkness or "
-+"lightness of that color using the inner triangle."
-+msgstr ""
-+"Roghnaigh an dath atá uait ón bhfáinne amuigh. Roghnaigh dorchadas nó gile "
-+"an datha sin leis an triantán istigh."
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:451
-+msgid ""
-+"Click the eyedropper, then click a color anywhere on your screen to select "
-+"that color."
-+msgstr ""
-+"Cliceáil an titimeán súile, agus ansin cliceáil dath áit ar bith ar do "
-+"scáileán chun an dath sin a roghnú."
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:461
-+msgid "_Hue:"
-+msgstr "_Lí:"
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:462
-+msgid "Position on the color wheel."
-+msgstr "Ionad ar roth na ndathanna."
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:464
-+msgid "S_aturation:"
-+msgstr "_Sáithiú:"
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:465
-+msgid "Intensity of the color."
-+msgstr "Déine an datha."
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:466
-+msgid "_Value:"
-+msgstr "L_uach:"
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:467
-+msgid "Brightness of the color."
-+msgstr "Gile an datha."
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:468
-+msgid "_Red:"
-+msgstr "_Dearg:"
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:469
-+msgid "Amount of red light in the color."
-+msgstr "Méid sholais dhearg sa dath."
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:470
-+msgid "_Green:"
-+msgstr "_Uaine:"
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:471
-+msgid "Amount of green light in the color."
-+msgstr "Méid sholais uaine sa dath."
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:472
-+msgid "_Blue:"
-+msgstr "_Gorm:"
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:473
-+msgid "Amount of blue light in the color."
-+msgstr "Méid sholais ghorm sa dath."
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:476
-+msgid "Op_acity:"
-+msgstr "Teimhne_acht:"
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:484 ../gtk/deprecated/gtkcolorsel.c:494
-+msgid "Transparency of the color."
-+msgstr "Trédhearcacht an datha."
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:501
-+msgid "Color _name:"
-+msgstr "Ai_nm datha:"
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:516
-+msgid ""
-+"You can enter an HTML-style hexadecimal color value, or simply a color name "
-+"such as 'orange' in this entry."
-+msgstr ""
-+"Is féidir leat luach datha heicsidheachúlach ar stíl HTML a iontráil, nó "
-+"ainm datha mar shampla 'orange' a iontráil san iontráil seo."
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:548
-+msgid "_Palette:"
-+msgstr "_Pailéad:"
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:578
-+msgid "Color Wheel"
-+msgstr "Roth na nDathanna"
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:1072
-+msgid ""
-+"The previously-selected color, for comparison to the color you're selecting "
-+"now. You can drag this color to a palette entry, or select this color as "
-+"current by dragging it to the other color swatch alongside."
-+msgstr ""
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:1078
-+msgid ""
-+"The color you've chosen. You can drag this color to a palette entry to save "
-+"it for use in the future."
-+msgstr ""
-+"An dath atá roghnaithe agat. Is féidir leat an dath seo a tharraingt go "
-+"hiontráil pailéid chun é a shábháil le haghaidh úsáide san am atá le teacht."
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:1084
-+msgid ""
-+"The previously-selected color, for comparison to the color you're selecting "
-+"now."
-+msgstr ""
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:1088
-+msgid "The color you've chosen."
-+msgstr "An dath atá roghnaithe agat."
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:1491
-+msgid "_Save color here"
-+msgstr "_Sábháil dath anseo"
-+
-+#: ../gtk/deprecated/gtkcolorsel.c:1695
-+msgid ""
-+"Click this palette entry to make it the current color. To change this entry, "
-+"drag a color swatch here or right-click it and select \"Save color here.\""
-+msgstr ""
-+
-+#. We emit the response for the Select button manually,
-+#. * since we want to save the color first
-+#.
-+#: ../gtk/deprecated/gtkcolorseldialog.c:201 ../gtk/gtkappchooserdialog.c:574
-+#: ../gtk/gtkcolorchooserdialog.c:150 ../gtk/gtkfontchooserdialog.c:174
-+#: ../gtk/gtkprinteroptionwidget.c:550
-+msgid "_Select"
-+msgstr "_Roghnaigh"
-+
-+#: ../gtk/deprecated/gtkcolorseldialog.c:219
-+msgid "Color Selection"
-+msgstr "Roghnú Datha"
-+
-+#. This is the default text shown in the preview entry, though the user
-+#. can set it. Remember that some fonts only have capital letters.
-+#: ../gtk/deprecated/gtkfontsel.c:124
-+msgid "abcdefghijk ABCDEFGHIJK"
-+msgstr "aábcdeéfghií AÁBCDEÉFGHIÍ"
-+
-+#: ../gtk/deprecated/gtkfontsel.c:393
-+msgid "_Family:"
-+msgstr "_Clann:"
-+
-+#: ../gtk/deprecated/gtkfontsel.c:400
-+msgid "_Style:"
-+msgstr "_Stíl:"
-+
-+#: ../gtk/deprecated/gtkfontsel.c:407
-+msgid "Si_ze:"
-+msgstr "_Méid:"
-+
-+#. create the text entry widget
-+#: ../gtk/deprecated/gtkfontsel.c:584
-+msgid "_Preview:"
-+msgstr "_Réamhamharc:"
-+
-+#: ../gtk/deprecated/gtkfontsel.c:1720 ../gtk/gtkfontchooserdialog.c:183
-+msgid "Font Selection"
-+msgstr "Roghnú Cló"
- 
- #. Translators: this is the license preamble; the string at the end
- #. * contains the URL of the license.
- #.
--#: gtk/gtkaboutdialog.c:101
-+#: ../gtk/gtkaboutdialog.c:104
- #, c-format
--msgid "This program comes with ABSOLUTELY NO WARRANTY; for details, visit %s"
-+msgid ""
-+"This program comes with ABSOLUTELY NO WARRANTY;\n"
-+"for details, visit <a href=\"%s\">%s</a>"
- msgstr ""
- 
--#: gtk/gtkaboutdialog.c:339 gtk/gtkaboutdialog.c:2235
-+#: ../gtk/gtkaboutdialog.c:357
- msgid "License"
- msgstr "Ceadúnas"
- 
--#: gtk/gtkaboutdialog.c:340
-+#: ../gtk/gtkaboutdialog.c:358
- msgid "The license of the program"
- msgstr "Ceadúnas an chláir"
- 
- #. Add the credits button
--#: gtk/gtkaboutdialog.c:621
-+#: ../gtk/gtkaboutdialog.c:751
- msgid "C_redits"
- msgstr "_Admhálacha"
- 
- #. Add the license button
--#: gtk/gtkaboutdialog.c:635
-+#: ../gtk/gtkaboutdialog.c:764
- msgid "_License"
- msgstr "_Ceadúnas"
- 
--#: gtk/gtkaboutdialog.c:839
-+#: ../gtk/gtkaboutdialog.c:980
- msgid "Could not show link"
- msgstr "Níorbh fhéidir nasc a thaispeáint"
- 
--#: gtk/gtkaboutdialog.c:932
-+#: ../gtk/gtkaboutdialog.c:1017
-+msgid "Homepage"
-+msgstr "Leathanach Baile"
-+
-+#: ../gtk/gtkaboutdialog.c:1071
- #, c-format
- msgid "About %s"
- msgstr "Maidir le %s"
- 
--#: gtk/gtkaboutdialog.c:2153
--msgid "Credits"
--msgstr "Admhálacha"
-+#: ../gtk/gtkaboutdialog.c:2399
-+msgid "Created by"
-+msgstr "Cruthaithe ag"
- 
--#: gtk/gtkaboutdialog.c:2185
--msgid "Written by"
--msgstr "Scríofa ag"
--
--#: gtk/gtkaboutdialog.c:2188
-+#: ../gtk/gtkaboutdialog.c:2402
- msgid "Documented by"
- msgstr "Doiciméadaithe ag"
- 
--#: gtk/gtkaboutdialog.c:2200
-+#: ../gtk/gtkaboutdialog.c:2412
- msgid "Translated by"
- msgstr "Aistrithe ag"
- 
--#: gtk/gtkaboutdialog.c:2204
-+#: ../gtk/gtkaboutdialog.c:2417
- msgid "Artwork by"
- msgstr "Maisiúchán le"
- 
-@@ -391,7 +706,7 @@ msgstr "Maisiúchán le"
- #. * translated on keyboards used for your language, don't translate
- #. * this.
- #.
--#: gtk/gtkaccellabel.c:160
-+#: ../gtk/gtkaccellabel.c:159
- msgctxt "keyboard label"
- msgid "Shift"
- msgstr "Shift"
-@@ -401,7 +716,7 @@ msgstr "Shift"
- #. * translated on keyboards used for your language, don't translate
- #. * this.
- #.
--#: gtk/gtkaccellabel.c:166
-+#: ../gtk/gtkaccellabel.c:165
- msgctxt "keyboard label"
- msgid "Ctrl"
- msgstr "Ctrl"
-@@ -411,7 +726,7 @@ msgstr "Ctrl"
- #. * translated on keyboards used for your language, don't translate
- #. * this.
- #.
--#: gtk/gtkaccellabel.c:172
-+#: ../gtk/gtkaccellabel.c:171
- msgctxt "keyboard label"
- msgid "Alt"
- msgstr "Alt"
-@@ -421,7 +736,7 @@ msgstr "Alt"
- #. * translated on keyboards used for your language, don't translate
- #. * this.
- #.
--#: gtk/gtkaccellabel.c:770
-+#: ../gtk/gtkaccellabel.c:805
- msgctxt "keyboard label"
- msgid "Super"
- msgstr "Super"
-@@ -431,7 +746,7 @@ msgstr "Super"
- #. * translated on keyboards used for your language, don't translate
- #. * this.
- #.
--#: gtk/gtkaccellabel.c:783
-+#: ../gtk/gtkaccellabel.c:818
- msgctxt "keyboard label"
- msgid "Hyper"
- msgstr "Hyper"
-@@ -441,37 +756,162 @@ msgstr "Hyper"
- #. * translated on keyboards used for your language, don't translate
- #. * this.
- #.
--#: gtk/gtkaccellabel.c:797
-+#: ../gtk/gtkaccellabel.c:832
- msgctxt "keyboard label"
- msgid "Meta"
- msgstr "Meta"
- 
--#: gtk/gtkaccellabel.c:813
-+#: ../gtk/gtkaccellabel.c:848
- msgctxt "keyboard label"
- msgid "Space"
- msgstr "Space"
- 
--#: gtk/gtkaccellabel.c:816
-+#: ../gtk/gtkaccellabel.c:851
- msgctxt "keyboard label"
- msgid "Backslash"
- msgstr "Backslash"
- 
--#: gtk/gtkbuilderparser.c:343
-+#: ../gtk/gtkappchooserbutton.c:290
-+msgid "Other application..."
-+msgstr "Feidhmchlár eile..."
-+
-+#: ../gtk/gtkappchooserdialog.c:137
-+msgid "Failed to look for applications online"
-+msgstr ""
-+
-+#: ../gtk/gtkappchooserdialog.c:188
-+msgid "_Find applications online"
-+msgstr ""
-+
-+#: ../gtk/gtkappchooserdialog.c:247
-+#, fuzzy
-+msgid "Could not run application"
-+msgstr "Níorbh fhéidir liosta a ghlanadh"
-+
-+#: ../gtk/gtkappchooserdialog.c:260
-+#, fuzzy, c-format
-+msgid "Could not find '%s'"
-+msgstr "Níorbh fhéidir %s a ghléasadh"
-+
-+#: ../gtk/gtkappchooserdialog.c:263
-+#, fuzzy
-+msgid "Could not find application"
-+msgstr "Níorbh fhéidir nasc a thaispeáint"
-+
-+#. Translators: %s is a filename
-+#: ../gtk/gtkappchooserdialog.c:397
-+#, c-format
-+msgid "Select an application to open \"%s\""
-+msgstr ""
-+
-+#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:657
-+#, c-format
-+msgid "No applications available to open \"%s\""
-+msgstr ""
-+
-+#. Translators: %s is a file type description
-+#: ../gtk/gtkappchooserdialog.c:404
-+#, c-format
-+msgid "Select an application for \"%s\" files"
-+msgstr ""
-+
-+#: ../gtk/gtkappchooserdialog.c:406
-+#, c-format
-+msgid "No applications available to open \"%s\" files"
-+msgstr ""
-+
-+#: ../gtk/gtkappchooserdialog.c:422
-+msgid ""
-+"Click \"Show other applications\", for more options, or \"Find applications "
-+"online\" to install a new application"
-+msgstr ""
-+
-+#: ../gtk/gtkappchooserdialog.c:492
-+#, fuzzy
-+msgid "Forget association"
-+msgstr "Déan _dearmad ar an bhfocal faire láithreach"
-+
-+#: ../gtk/gtkappchooserdialog.c:558
-+msgid "Show other applications"
-+msgstr "Taispeáin feidhmchláir eile"
-+
-+#: ../gtk/gtkappchooserwidget.c:606
-+msgid "Default Application"
-+msgstr "Feidhmchlár Réamhshocraithe"
-+
-+#: ../gtk/gtkappchooserwidget.c:744
-+#, fuzzy
-+msgid "Recommended Applications"
-+msgstr "Feidhmchlár"
-+
-+#: ../gtk/gtkappchooserwidget.c:759
-+#, fuzzy
-+msgid "Related Applications"
-+msgstr "Feidhmchlár"
-+
-+#: ../gtk/gtkappchooserwidget.c:773
-+msgid "Other Applications"
-+msgstr "Feidhmchláir Eile"
-+
-+#: ../gtk/gtkapplication.c:1558
-+#, c-format
-+msgid ""
-+"%s cannot quit at this time:\n"
-+"\n"
-+"%s"
-+msgstr ""
-+
-+#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:480
-+#: ../gtk/gtkprintoperation-win32.c:1445
-+msgid "Application"
-+msgstr "Feidhmchlár"
-+
-+#: ../gtk/gtkassistant.c:1008
-+#, fuzzy
-+msgid "C_ontinue"
-+msgstr "_Nasc"
-+
-+#: ../gtk/gtkassistant.c:1011
-+#, fuzzy
-+msgid "Go _Back"
-+msgstr "Ar A_is"
-+
-+#: ../gtk/gtkassistant.c:1015
-+#, fuzzy
-+msgid "_Finish"
-+msgstr "Críochnaithe"
-+
-+#: ../gtk/gtkbuilder-menus.c:220
-+#, fuzzy, c-format
-+msgid "Element <%s> not allowed inside <%s>"
-+msgstr "Ní cheadaítear an eilimint <%s> faoi <%s>"
-+
-+#: ../gtk/gtkbuilder-menus.c:225
-+#, fuzzy, c-format
-+msgid "Element <%s> not allowed at toplevel"
-+msgstr "Ní cheadaítear an eilimint <%s> faoi <%s>"
-+
-+#: ../gtk/gtkbuilder-menus.c:314
-+#, c-format
-+msgid "text may not appear inside <%s>"
-+msgstr ""
-+
-+#: ../gtk/gtkbuilderparser.c:341
- #, c-format
- msgid "Invalid type function on line %d: '%s'"
- msgstr "Feidhm chineáil neamhbhailí ar líne %d: '%s'"
- 
--#: gtk/gtkbuilderparser.c:407
-+#: ../gtk/gtkbuilderparser.c:405
- #, c-format
- msgid "Duplicate object ID '%s' on line %d (previously on line %d)"
- msgstr ""
- 
--#: gtk/gtkbuilderparser.c:859
-+#: ../gtk/gtkbuilderparser.c:865
- #, c-format
- msgid "Invalid root element: '%s'"
- msgstr "Fréamheilimint neamhbhailí: '%s'"
- 
--#: gtk/gtkbuilderparser.c:898
-+#: ../gtk/gtkbuilderparser.c:906
- #, c-format
- msgid "Unhandled tag: '%s'"
- msgstr "Clib gan láimhseáil: '%s'"
-@@ -486,7 +926,7 @@ msgstr "Clib gan láimhseáil: '%s'"
- #. * text direction of RTL and specify "calendar:YM", then the year
- #. * will appear to the right of the month.
- #.
--#: gtk/gtkcalendar.c:883
-+#: ../gtk/gtkcalendar.c:872
- msgid "calendar:MY"
- msgstr "calendar:MY"
- 
-@@ -494,7 +934,7 @@ msgstr "calendar:MY"
- #. * first day of the week to calendar:week_start:1 if you want Monday
- #. * to be the first day of the week, and so on.
- #.
--#: gtk/gtkcalendar.c:921
-+#: ../gtk/gtkcalendar.c:910
- msgid "calendar:week_start:0"
- msgstr "calendar:week_start:0"
- 
-@@ -503,7 +943,7 @@ msgstr "calendar:week_start:0"
- #. *
- #. * If you don't understand this, leave it as "2000"
- #.
--#: gtk/gtkcalendar.c:2006
-+#: ../gtk/gtkcalendar.c:1910
- msgctxt "year measurement template"
- msgid "2000"
- msgstr "2000"
-@@ -518,7 +958,7 @@ msgstr "2000"
- #. * digits. That needs support from your system and locale definition
- #. * too.
- #.
--#: gtk/gtkcalendar.c:2037 gtk/gtkcalendar.c:2719
-+#: ../gtk/gtkcalendar.c:1941 ../gtk/gtkcalendar.c:2633
- #, c-format
- msgctxt "calendar:day:digits"
- msgid "%d"
-@@ -534,7 +974,7 @@ msgstr "%d"
- #. * digits. That needs support from your system and locale definition
- #. * too.
- #.
--#: gtk/gtkcalendar.c:2069 gtk/gtkcalendar.c:2579
-+#: ../gtk/gtkcalendar.c:1973 ../gtk/gtkcalendar.c:2499
- #, c-format
- msgctxt "calendar:week:digits"
- msgid "%d"
-@@ -550,7 +990,7 @@ msgstr "%d"
- #. *
- #. * "%Y" is appropriate for most locales.
- #.
--#: gtk/gtkcalendar.c:2361
-+#: ../gtk/gtkcalendar.c:2268
- msgctxt "calendar year format"
- msgid "%Y"
- msgstr "%Y"
-@@ -558,7 +998,7 @@ msgstr "%Y"
- #. This label is displayed in a treeview cell displaying
- #. * a disabled accelerator key combination.
- #.
--#: gtk/gtkcellrendereraccel.c:272
-+#: ../gtk/gtkcellrendereraccel.c:282
- msgctxt "Accelerator"
- msgid "Disabled"
- msgstr "Díchumasaithe"
-@@ -567,7 +1007,7 @@ msgstr "Díchumasaithe"
- #. * an accelerator key combination that is not valid according
- #. * to gtk_accelerator_valid().
- #.
--#: gtk/gtkcellrendereraccel.c:282
-+#: ../gtk/gtkcellrendereraccel.c:292
- msgctxt "Accelerator"
- msgid "Invalid"
- msgstr "Neamhbhailí"
-@@ -576,155 +1016,290 @@ msgstr "Neamhbhailí"
- #. * an accelerator when the cell is clicked to change the
- #. * acelerator.
- #.
--#: gtk/gtkcellrendereraccel.c:418 gtk/gtkcellrendereraccel.c:675
-+#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:747
- msgid "New accelerator..."
- msgstr "Aicearra nua..."
- 
--#: gtk/gtkcellrendererprogress.c:362 gtk/gtkcellrendererprogress.c:452
-+#: ../gtk/gtkcellrendererprogress.c:372 ../gtk/gtkcellrendererprogress.c:462
- #, c-format
- msgctxt "progress bar label"
- msgid "%d %%"
- msgstr "%d %%"
- 
--#: gtk/gtkcolorbutton.c:176 gtk/gtkcolorbutton.c:445
-+#: ../gtk/gtkcolorbutton.c:188 ../gtk/gtkcolorbutton.c:449
- msgid "Pick a Color"
- msgstr "Roghnaigh Dath"
- 
--#: gtk/gtkcolorbutton.c:336
--msgid "Received invalid color data\n"
--msgstr "Fuair sonraí datha neamhbhailí\n"
-+#: ../gtk/gtkcolorchooserdialog.c:164
-+msgid "Select a Color"
-+msgstr "Roghnaigh Dath"
- 
--#: gtk/gtkcolorsel.c:384
--msgid ""
--"Select the color you want from the outer ring. Select the darkness or "
--"lightness of that color using the inner triangle."
--msgstr ""
--"Roghnaigh an dath atá uait ón bhfáinne amuigh. Roghnaigh dorchadas nó gile "
--"an datha sin leis an triantán istigh."
-+#: ../gtk/gtkcolorchooserwidget.c:281
-+#, c-format
-+msgid "Red %d%%, Green %d%%, Blue %d%%, Alpha %d%%"
-+msgstr "Dearg %d%%, Uaine %d%%, Gorm %d%%, Alfa %d%%"
- 
--#: gtk/gtkcolorsel.c:408
--msgid ""
--"Click the eyedropper, then click a color anywhere on your screen to select "
--"that color."
-+#: ../gtk/gtkcolorchooserwidget.c:287
-+#, c-format
-+msgid "Red %d%%, Green %d%%, Blue %d%%"
-+msgstr "Dearg %d%%, Uaine %d%%, Gorm %d%%"
-+
-+#: ../gtk/gtkcolorchooserwidget.c:360
-+#, c-format
-+msgid "Color: %s"
-+msgstr "Dath: %s"
-+
-+#: ../gtk/gtkcolorchooserwidget.c:419
-+msgctxt "Color name"
-+msgid "Light Scarlet Red"
- msgstr ""
--"Cliceáil an titimeán súile, agus ansin cliceáil dath áit ar bith ar do "
--"scáileán chun an dath sin a roghnú."
- 
--#: gtk/gtkcolorsel.c:417
--msgid "_Hue:"
--msgstr "_Lí:"
-+#: ../gtk/gtkcolorchooserwidget.c:420
-+msgctxt "Color name"
-+msgid "Scarlet Red"
-+msgstr ""
- 
--#: gtk/gtkcolorsel.c:418
--msgid "Position on the color wheel."
--msgstr "Ionad ar roth na ndathanna."
-+#: ../gtk/gtkcolorchooserwidget.c:421
-+msgctxt "Color name"
-+msgid "Dark Scarlet Red"
-+msgstr ""
- 
--#: gtk/gtkcolorsel.c:420
--msgid "_Saturation:"
--msgstr "_Sáithiú:"
-+#: ../gtk/gtkcolorchooserwidget.c:422
-+msgctxt "Color name"
-+msgid "Light Orange"
-+msgstr ""
- 
--#: gtk/gtkcolorsel.c:421
-+#: ../gtk/gtkcolorchooserwidget.c:423
- #, fuzzy
--msgid "Intensity of the color."
--msgstr "Trédhearcacht an datha."
-+msgctxt "Color name"
-+msgid "Orange"
-+msgstr "Raon"
- 
--#: gtk/gtkcolorsel.c:422
--msgid "_Value:"
--msgstr "L_uach:"
-+#: ../gtk/gtkcolorchooserwidget.c:424
-+msgctxt "Color name"
-+msgid "Dark Orange"
-+msgstr ""
- 
--#: gtk/gtkcolorsel.c:423
--msgid "Brightness of the color."
--msgstr "Gile an datha."
-+#: ../gtk/gtkcolorchooserwidget.c:425
-+msgctxt "Color name"
-+msgid "Light Butter"
-+msgstr ""
- 
--#: gtk/gtkcolorsel.c:424
--msgid "_Red:"
--msgstr "_Dearg:"
-+#: ../gtk/gtkcolorchooserwidget.c:426
-+msgctxt "Color name"
-+msgid "Butter"
-+msgstr ""
- 
--#: gtk/gtkcolorsel.c:425
--msgid "Amount of red light in the color."
--msgstr "Méid sholais dhearg sa dath."
-+#: ../gtk/gtkcolorchooserwidget.c:427
-+msgctxt "Color name"
-+msgid "Dark Butter"
-+msgstr ""
- 
--#: gtk/gtkcolorsel.c:426
--msgid "_Green:"
--msgstr "_Uaine:"
-+#: ../gtk/gtkcolorchooserwidget.c:428
-+msgctxt "Color name"
-+msgid "Light Chameleon"
-+msgstr ""
- 
--#: gtk/gtkcolorsel.c:427
--msgid "Amount of green light in the color."
--msgstr "Méid sholais uaine sa dath."
-+#: ../gtk/gtkcolorchooserwidget.c:429
-+msgctxt "Color name"
-+msgid "Chameleon"
-+msgstr ""
- 
--#: gtk/gtkcolorsel.c:428
--msgid "_Blue:"
--msgstr "_Gorm:"
-+#: ../gtk/gtkcolorchooserwidget.c:430
-+msgctxt "Color name"
-+msgid "Dark Chameleon"
-+msgstr ""
- 
--#: gtk/gtkcolorsel.c:429
--msgid "Amount of blue light in the color."
--msgstr "Méid sholais ghorm sa dath."
-+#: ../gtk/gtkcolorchooserwidget.c:431
-+msgctxt "Color name"
-+msgid "Light Sky Blue"
-+msgstr ""
- 
--#: gtk/gtkcolorsel.c:432
--msgid "Op_acity:"
--msgstr "Teimhne_acht:"
-+#: ../gtk/gtkcolorchooserwidget.c:432
-+msgctxt "Color name"
-+msgid "Sky Blue"
-+msgstr ""
- 
--#: gtk/gtkcolorsel.c:439 gtk/gtkcolorsel.c:449
--msgid "Transparency of the color."
--msgstr "Trédhearcacht an datha."
-+#: ../gtk/gtkcolorchooserwidget.c:433
-+msgctxt "Color name"
-+msgid "Dark Sky Blue"
-+msgstr ""
- 
--#: gtk/gtkcolorsel.c:456
--msgid "Color _name:"
--msgstr "Ai_nm datha:"
-+#: ../gtk/gtkcolorchooserwidget.c:434
-+msgctxt "Color name"
-+msgid "Light Plum"
-+msgstr ""
- 
--#: gtk/gtkcolorsel.c:470
--msgid ""
--"You can enter an HTML-style hexadecimal color value, or simply a color name "
--"such as 'orange' in this entry."
-+#: ../gtk/gtkcolorchooserwidget.c:435
-+msgctxt "Color name"
-+msgid "Plum"
- msgstr ""
--"Is féidir leat luach datha heicsidheachúlach ar stíl HTML a iontráil, nó "
--"ainm datha mar shampla 'orange' a iontráil san iontráil seo."
- 
--#: gtk/gtkcolorsel.c:500
--msgid "_Palette:"
--msgstr "_Pailéad:"
-+#: ../gtk/gtkcolorchooserwidget.c:436
-+msgctxt "Color name"
-+msgid "Dark Plum"
-+msgstr ""
- 
--#: gtk/gtkcolorsel.c:529
--msgid "Color Wheel"
--msgstr "Roth na nDathanna"
-+#: ../gtk/gtkcolorchooserwidget.c:437
-+msgctxt "Color name"
-+msgid "Light Chocolate"
-+msgstr ""
- 
--#: gtk/gtkcolorsel.c:988
--msgid ""
--"The previously-selected color, for comparison to the color you're selecting "
--"now. You can drag this color to a palette entry, or select this color as "
--"current by dragging it to the other color swatch alongside."
-+#: ../gtk/gtkcolorchooserwidget.c:438
-+#, fuzzy
-+msgctxt "Color name"
-+msgid "Chocolate"
-+msgstr "C_omhordaigh"
-+
-+#: ../gtk/gtkcolorchooserwidget.c:439
-+msgctxt "Color name"
-+msgid "Dark Chocolate"
- msgstr ""
- 
--#: gtk/gtkcolorsel.c:991
--msgid ""
--"The color you've chosen. You can drag this color to a palette entry to save "
--"it for use in the future."
-+#: ../gtk/gtkcolorchooserwidget.c:440
-+msgctxt "Color name"
-+msgid "Light Aluminum 1"
- msgstr ""
--"An dath atá roghnaithe agat. Is féidir leat an dath seo a tharraingt go "
--"hiontráil pailéid chun é a shábháil le haghaidh úsáide san am atá le teacht."
- 
--#: gtk/gtkcolorsel.c:996
--msgid ""
--"The previously-selected color, for comparison to the color you're selecting "
--"now."
-+#: ../gtk/gtkcolorchooserwidget.c:441
-+msgctxt "Color name"
-+msgid "Aluminum 1"
- msgstr ""
- 
--#: gtk/gtkcolorsel.c:999
--msgid "The color you've chosen."
--msgstr "An dath atá roghnaithe agat."
-+#: ../gtk/gtkcolorchooserwidget.c:442
-+msgctxt "Color name"
-+msgid "Dark Aluminum 1"
-+msgstr ""
-+
-+#: ../gtk/gtkcolorchooserwidget.c:443
-+msgctxt "Color name"
-+msgid "Light Aluminum 2"
-+msgstr ""
-+
-+#: ../gtk/gtkcolorchooserwidget.c:444
-+msgctxt "Color name"
-+msgid "Aluminum 2"
-+msgstr ""
-+
-+#: ../gtk/gtkcolorchooserwidget.c:445
-+msgctxt "Color name"
-+msgid "Dark Aluminum 2"
-+msgstr ""
-+
-+#: ../gtk/gtkcolorchooserwidget.c:459
-+msgctxt "Color name"
-+msgid "Black"
-+msgstr "Dubh"
-+
-+#: ../gtk/gtkcolorchooserwidget.c:460
-+msgctxt "Color name"
-+msgid "Very Dark Gray"
-+msgstr ""
-+
-+#: ../gtk/gtkcolorchooserwidget.c:461
-+msgctxt "Color name"
-+msgid "Darker Gray"
-+msgstr ""
-+
-+#: ../gtk/gtkcolorchooserwidget.c:462
-+msgctxt "Color name"
-+msgid "Dark Gray"
-+msgstr ""
-+
-+#: ../gtk/gtkcolorchooserwidget.c:463
-+#, fuzzy
-+msgctxt "Color name"
-+msgid "Medium Gray"
-+msgstr "Measartha"
-+
-+#: ../gtk/gtkcolorchooserwidget.c:464
-+msgctxt "Color name"
-+msgid "Light Gray"
-+msgstr ""
-+
-+#: ../gtk/gtkcolorchooserwidget.c:465
-+msgctxt "Color name"
-+msgid "Lighter Gray"
-+msgstr ""
-+
-+#: ../gtk/gtkcolorchooserwidget.c:466
-+msgctxt "Color name"
-+msgid "Very Light Gray"
-+msgstr ""
-+
-+#: ../gtk/gtkcolorchooserwidget.c:467
-+msgctxt "Color name"
-+msgid "White"
-+msgstr "Bán"
-+
-+#. translators: label for the custom section in the color chooser
-+#: ../gtk/gtkcolorchooserwidget.c:516
-+msgid "Custom"
-+msgstr "Saincheaptha"
-+
-+#: ../gtk/gtkcolorchooserwidget.c:524
-+#, fuzzy
-+msgid "Create custom color"
-+msgstr "Cruthaigh Fi_llteán"
- 
--#: gtk/gtkcolorsel.c:1396
--msgid "_Save color here"
--msgstr "_Sábháil dath anseo"
-+#: ../gtk/gtkcolorchooserwidget.c:543
-+#, fuzzy, c-format
-+msgid "Custom color %d: %s"
-+msgstr "%sx%s Saincheaptha"
- 
--#: gtk/gtkcolorsel.c:1601
--msgid ""
--"Click this palette entry to make it the current color. To change this entry, "
--"drag a color swatch here or right-click it and select \"Save color here.\""
--msgstr ""
-+#: ../gtk/gtkcoloreditor.c:412
-+msgid "Color Name"
-+msgstr "Ainm Datha"
-+
-+#: ../gtk/gtkcoloreditor.c:457
-+msgctxt "Color channel"
-+msgid "Saturation"
-+msgstr "Sáithiú"
-+
-+#: ../gtk/gtkcoloreditor.c:463
-+msgctxt "Color channel"
-+msgid "Value"
-+msgstr "Luach"
-+
-+#: ../gtk/gtkcoloreditor.c:471
-+msgctxt "Color channel"
-+msgid "S"
-+msgstr "S"
-+
-+#: ../gtk/gtkcoloreditor.c:473
-+msgctxt "Color channel"
-+msgid "V"
-+msgstr "L"
-+
-+#: ../gtk/gtkcoloreditor.c:481 ../gtk/gtkcolorscale.c:301
-+msgctxt "Color channel"
-+msgid "Hue"
-+msgstr "Lí"
-+
-+#: ../gtk/gtkcoloreditor.c:488
-+msgctxt "Color channel"
-+msgid "H"
-+msgstr "Lí"
-+
-+#: ../gtk/gtkcoloreditor.c:496 ../gtk/gtkcolorscale.c:303
-+msgctxt "Color channel"
-+msgid "Alpha"
-+msgstr "Alfa"
-+
-+#: ../gtk/gtkcoloreditor.c:503
-+msgctxt "Color channel"
-+msgid "A"
-+msgstr "A"
-+
-+#: ../gtk/gtkcolorplane.c:438
-+#, fuzzy
-+msgid "Color Plane"
-+msgstr "Ai_nm datha:"
- 
--#: gtk/gtkcolorseldialog.c:189
--msgid "Color Selection"
--msgstr "Roghnú Datha"
-+#: ../gtk/gtkcolorswatch.c:447
-+#, fuzzy
-+msgid "_Customize"
-+msgstr "Méid saincheaptha"
- 
- #. Translate to the default units to use for presenting
- #. * lengths to the user. Translate to default:inch if you
-@@ -732,125 +1307,154 @@ msgstr "Roghnú Datha"
- #. * Do *not* translate it to "predefinito:mm", if it
- #. * it isn't default:mm or default:inch it will not work
- #.
--#: gtk/gtkcustompaperunixdialog.c:116
-+#: ../gtk/gtkcustompaperunixdialog.c:115
- msgid "default:mm"
- msgstr "default:mm"
- 
- #. And show the custom paper dialog
--#: gtk/gtkcustompaperunixdialog.c:374 gtk/gtkprintunixdialog.c:3233
-+#: ../gtk/gtkcustompaperunixdialog.c:397 ../gtk/gtkprintunixdialog.c:3275
- msgid "Manage Custom Sizes"
- msgstr "Bainistigh Méideanna Saincheaptha"
- 
--#: gtk/gtkcustompaperunixdialog.c:534 gtk/gtkpagesetupunixdialog.c:790
-+#: ../gtk/gtkcustompaperunixdialog.c:558 ../gtk/gtkpagesetupunixdialog.c:778
- msgid "inch"
- msgstr "orlach"
- 
--#: gtk/gtkcustompaperunixdialog.c:536 gtk/gtkpagesetupunixdialog.c:788
-+#: ../gtk/gtkcustompaperunixdialog.c:560 ../gtk/gtkpagesetupunixdialog.c:776
- msgid "mm"
- msgstr "mm"
- 
--#: gtk/gtkcustompaperunixdialog.c:581
-+#: ../gtk/gtkcustompaperunixdialog.c:605
- msgid "Margins from Printer..."
- msgstr "Imill ón bPrintéir"
- 
--#: gtk/gtkcustompaperunixdialog.c:747
-+#: ../gtk/gtkcustompaperunixdialog.c:771
- #, c-format
- msgid "Custom Size %d"
- msgstr "Méid Saincheaptha %d"
- 
--#: gtk/gtkcustompaperunixdialog.c:1059
-+#: ../gtk/gtkcustompaperunixdialog.c:1109
- msgid "_Width:"
- msgstr "_Leithead:"
- 
--#: gtk/gtkcustompaperunixdialog.c:1071
-+#: ../gtk/gtkcustompaperunixdialog.c:1120
- msgid "_Height:"
- msgstr "_Airde:"
- 
--#: gtk/gtkcustompaperunixdialog.c:1083
-+#: ../gtk/gtkcustompaperunixdialog.c:1131
- msgid "Paper Size"
- msgstr "Méid Pháipéir"
- 
--#: gtk/gtkcustompaperunixdialog.c:1092
-+#: ../gtk/gtkcustompaperunixdialog.c:1140
- msgid "_Top:"
- msgstr "Ba_rr:"
- 
--#: gtk/gtkcustompaperunixdialog.c:1104
-+#: ../gtk/gtkcustompaperunixdialog.c:1151
- msgid "_Bottom:"
- msgstr "_Bun:"
- 
--#: gtk/gtkcustompaperunixdialog.c:1116
-+#: ../gtk/gtkcustompaperunixdialog.c:1162
- msgid "_Left:"
- msgstr "Ar _Chlé:"
- 
--#: gtk/gtkcustompaperunixdialog.c:1128
-+#: ../gtk/gtkcustompaperunixdialog.c:1173
- msgid "_Right:"
- msgstr "Ar _Dheis:"
- 
--#: gtk/gtkcustompaperunixdialog.c:1169
-+#: ../gtk/gtkcustompaperunixdialog.c:1212
- msgid "Paper Margins"
- msgstr "Imill an Páipéar"
- 
--#: gtk/gtkentry.c:8601 gtk/gtktextview.c:8248
-+#: ../gtk/gtkentry.c:9140 ../gtk/gtktextview.c:8583
- msgid "Input _Methods"
- msgstr "_Modhanna Ionchurtha"
- 
--#: gtk/gtkentry.c:8615 gtk/gtktextview.c:8262
-+#: ../gtk/gtkentry.c:9154 ../gtk/gtktextview.c:8597
- msgid "_Insert Unicode Control Character"
- msgstr "_Ionsáigh Carachtar Rialú Unicode"
- 
--#: gtk/gtkentry.c:10015
--msgid "Caps Lock and Num Lock are on"
--msgstr ""
--
--#: gtk/gtkentry.c:10017
--#, fuzzy
--msgid "Num Lock is on"
--msgstr "Tá Caps Lock ann"
--
--#: gtk/gtkentry.c:10019
-+#: ../gtk/gtkentry.c:10107
- msgid "Caps Lock is on"
- msgstr "Tá Caps Lock ann"
- 
-+#. *
-+#. * SECTION:gtkfilechooserbutton
-+#. * @Short_description: A button to launch a file selection dialog
-+#. * @Title: GtkFileChooserButton
-+#. * @See_also:#GtkFileChooserDialog
-+#. *
-+#. * The #GtkFileChooserButton is a widget that lets the user select a
-+#. * file.  It implements the #GtkFileChooser interface.  Visually, it is a
-+#. * file name with a button to bring up a #GtkFileChooserDialog.
-+#. * The user can then use that dialog to change the file associated with
-+#. * that button.  This widget does not support setting the
-+#. * #GtkFileChooser:select-multiple property to %TRUE.
-+#. *
-+#. * <example>
-+#. * <title>Create a button to let the user select a file in /etc</title>
-+#. * <programlisting>
-+#. * {
-+#. *   GtkWidget *button;
-+#. *
-+#. *   button = gtk_file_chooser_button_new (_("Select a file"),
-+#. *                                         GTK_FILE_CHOOSER_ACTION_OPEN);
-+#. *   gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (button),
-+#. *                                        "/etc");
-+#. * }
-+#. * </programlisting>
-+#. * </example>
-+#. *
-+#. * The #GtkFileChooserButton supports the #GtkFileChooserAction<!-- -->s
-+#. * %GTK_FILE_CHOOSER_ACTION_OPEN and %GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER.
-+#. *
-+#. * <important>
-+#. * The #GtkFileChooserButton will ellipsize the label,
-+#. * and thus will thus request little horizontal space.  To give the button
-+#. * more space, you should call gtk_widget_get_preferred_size(),
-+#. * gtk_file_chooser_button_set_width_chars(), or pack the button in
-+#. * such a way that other interface elements give space to the widget.
-+#. * </important>
-+#.
- #. **************** *
- #. *  Private Macros  *
- #. * ****************
--#: gtk/gtkfilechooserbutton.c:61
--msgid "Select A File"
-+#: ../gtk/gtkfilechooserbutton.c:104
-+msgid "Select a File"
- msgstr "Roghnaigh Comhad"
- 
--#: gtk/gtkfilechooserbutton.c:62 gtk/gtkfilechooserdefault.c:1812
-+#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1819
- msgid "Desktop"
- msgstr "Deasc"
- 
--#: gtk/gtkfilechooserbutton.c:63
-+#: ../gtk/gtkfilechooserbutton.c:106
- msgid "(None)"
- msgstr "(Neamhní)"
- 
--#: gtk/gtkfilechooserbutton.c:2005
-+#: ../gtk/gtkfilechooserbutton.c:2046
- msgid "Other..."
- msgstr "Eile..."
- 
--#: gtk/gtkfilechooserdefault.c:148
-+#: ../gtk/gtkfilechooserdefault.c:152
- msgid "Type name of new folder"
- msgstr "Clóscríobh ainm den fhillteán nua"
- 
--#: gtk/gtkfilechooserdefault.c:938
-+#: ../gtk/gtkfilechooserdefault.c:970
- msgid "Could not retrieve information about the file"
- msgstr "Níorbh fhéidir eolas faoin gcomhad a fháil"
- 
--#: gtk/gtkfilechooserdefault.c:949
-+#: ../gtk/gtkfilechooserdefault.c:981
- msgid "Could not add a bookmark"
- msgstr "Níorbh fhéidir leabharmharc a chur leis"
- 
--#: gtk/gtkfilechooserdefault.c:960
-+#: ../gtk/gtkfilechooserdefault.c:992
- msgid "Could not remove bookmark"
- msgstr "Níorbh fhéidir leabharmharc a bhaint"
- 
--#: gtk/gtkfilechooserdefault.c:971
-+#: ../gtk/gtkfilechooserdefault.c:1003
- msgid "The folder could not be created"
- msgstr "Níorbh fhéidir an fillteán a chruthú"
- 
--#: gtk/gtkfilechooserdefault.c:984
-+#: ../gtk/gtkfilechooserdefault.c:1016
- msgid ""
- "The folder could not be created, as a file with the same name already "
- "exists.  Try using a different name for the folder, or rename the file first."
-@@ -859,11 +1463,26 @@ msgstr ""
- "an ainm céanna.  Bain triail as úsáid ainm difriúil don fhillteán, nó "
- "athainmnigh an comhad ar dtús."
- 
--#: gtk/gtkfilechooserdefault.c:995
-+#: ../gtk/gtkfilechooserdefault.c:1030
-+msgid "You need to choose a valid filename."
-+msgstr ""
-+
-+#: ../gtk/gtkfilechooserdefault.c:1033
-+#, fuzzy, c-format
-+msgid "Cannot create a file under %s as it is not a folder"
-+msgstr "Ní féidir athrú go dtí an fillteán mar níl sé logánta"
-+
-+#: ../gtk/gtkfilechooserdefault.c:1045
-+msgid ""
-+"You may only select folders.  The item that you selected is not a folder; "
-+"try using a different item."
-+msgstr ""
-+
-+#: ../gtk/gtkfilechooserdefault.c:1055
- msgid "Invalid file name"
- msgstr "Ainm comhaid neamhbhailí"
- 
--#: gtk/gtkfilechooserdefault.c:1005
-+#: ../gtk/gtkfilechooserdefault.c:1065
- msgid "The folder contents could not be displayed"
- msgstr "Níorbh fhéidir ábhair an fhillteáin a thaispeáint"
- 
-@@ -871,201 +1490,212 @@ msgstr "Níorbh fhéidir ábhair an fhillteáin a thaispeáint"
- #. * is a hostname. Nautilus and the panel contain the same string
- #. * to translate.
- #.
--#: gtk/gtkfilechooserdefault.c:1555
-+#: ../gtk/gtkfilechooserdefault.c:1591
- #, c-format
- msgid "%1$s on %2$s"
- msgstr "%1$s ar %2$s"
- 
--#: gtk/gtkfilechooserdefault.c:1731
-+#: ../gtk/gtkfilechooserdefault.c:1740
- msgid "Search"
- msgstr "Cuardaigh"
- 
--#: gtk/gtkfilechooserdefault.c:1755 gtk/gtkfilechooserdefault.c:9289
-+#: ../gtk/gtkfilechooserdefault.c:1764 ../gtk/gtkfilechooserdefault.c:4990
- msgid "Recently Used"
- msgstr "Úsáidte le Déanaí"
- 
--#: gtk/gtkfilechooserdefault.c:2409
-+#: ../gtk/gtkfilechooserdefault.c:2363
- msgid "Select which types of files are shown"
- msgstr "Roghnaigh an cineál comhad atá taispeánta"
- 
--#: gtk/gtkfilechooserdefault.c:2768
-+#: ../gtk/gtkfilechooserdefault.c:2722
- #, c-format
- msgid "Add the folder '%s' to the bookmarks"
- msgstr "Cuir an fillteán '%s' leis na leabharmharcanna"
- 
--#: gtk/gtkfilechooserdefault.c:2812
-+#: ../gtk/gtkfilechooserdefault.c:2766
- #, c-format
- msgid "Add the current folder to the bookmarks"
- msgstr "Cuir an fillteán reatha leis na leabharmharcanna"
- 
--#: gtk/gtkfilechooserdefault.c:2814
-+#: ../gtk/gtkfilechooserdefault.c:2768
- #, c-format
- msgid "Add the selected folders to the bookmarks"
- msgstr "Cuir na fillteáin roghnaithe leis na leabharmharcanna"
- 
--#: gtk/gtkfilechooserdefault.c:2852
-+#: ../gtk/gtkfilechooserdefault.c:2806
- #, c-format
- msgid "Remove the bookmark '%s'"
- msgstr "Bain an leabharmharc '%s'"
- 
--#: gtk/gtkfilechooserdefault.c:2854
-+#: ../gtk/gtkfilechooserdefault.c:2808
- #, c-format
- msgid "Bookmark '%s' cannot be removed"
- msgstr "Ní féidir leabharmharc '%s' a bhaint"
- 
--#: gtk/gtkfilechooserdefault.c:2861 gtk/gtkfilechooserdefault.c:3725
-+#: ../gtk/gtkfilechooserdefault.c:2815 ../gtk/gtkfilechooserdefault.c:3701
- msgid "Remove the selected bookmark"
- msgstr "Bain an leabharmharc roghnaithe"
- 
--#: gtk/gtkfilechooserdefault.c:3421
-+#: ../gtk/gtkfilechooserdefault.c:3379
- msgid "Remove"
- msgstr "Bain"
- 
--#: gtk/gtkfilechooserdefault.c:3430
-+#: ../gtk/gtkfilechooserdefault.c:3388
- msgid "Rename..."
- msgstr "Athainmnigh..."
- 
- #. Accessible object name for the file chooser's shortcuts pane
--#: gtk/gtkfilechooserdefault.c:3593
-+#: ../gtk/gtkfilechooserdefault.c:3552
- msgid "Places"
- msgstr "Áiteanna"
- 
- #. Column header for the file chooser's shortcuts pane
--#: gtk/gtkfilechooserdefault.c:3650
-+#: ../gtk/gtkfilechooserdefault.c:3609
- msgid "_Places"
- msgstr "_Áiteanna"
- 
--#: gtk/gtkfilechooserdefault.c:3706
--msgid "_Add"
--msgstr "Cuir _Leis"
--
--#: gtk/gtkfilechooserdefault.c:3713
-+#: ../gtk/gtkfilechooserdefault.c:3689
- msgid "Add the selected folder to the Bookmarks"
- msgstr "Cuir an fillteán roghnaithe leis na Leabharmharcanna"
- 
--#: gtk/gtkfilechooserdefault.c:3718
--msgid "_Remove"
--msgstr "_Bain"
--
--#: gtk/gtkfilechooserdefault.c:3860
-+#: ../gtk/gtkfilechooserdefault.c:3950
- msgid "Could not select file"
- msgstr "Níorbh fhéidir comhad a roghnú"
- 
--#: gtk/gtkfilechooserdefault.c:4035
-+#: ../gtk/gtkfilechooserdefault.c:4175
-+msgid "_Visit this file"
-+msgstr ""
-+
-+#: ../gtk/gtkfilechooserdefault.c:4178
-+#, fuzzy
-+msgid "_Copy file's location"
-+msgstr "Cóipeái_l Suíomh"
-+
-+#: ../gtk/gtkfilechooserdefault.c:4181
- msgid "_Add to Bookmarks"
- msgstr "_Cuir le Leabharmharcanna"
- 
--#: gtk/gtkfilechooserdefault.c:4048
-+#: ../gtk/gtkfilechooserdefault.c:4188
- msgid "Show _Hidden Files"
- msgstr "Taispeáin Com_haid Folaithe"
- 
--#: gtk/gtkfilechooserdefault.c:4055
-+#: ../gtk/gtkfilechooserdefault.c:4191
- msgid "Show _Size Column"
- msgstr "Taispeáin Colún _Méide"
- 
--#: gtk/gtkfilechooserdefault.c:4281
-+#: ../gtk/gtkfilechooserdefault.c:4416
- msgid "Files"
- msgstr "Comhaid"
- 
--#: gtk/gtkfilechooserdefault.c:4332
-+#: ../gtk/gtkfilechooserdefault.c:4467
- msgid "Name"
- msgstr "Ainm"
- 
--#: gtk/gtkfilechooserdefault.c:4355
-+#: ../gtk/gtkfilechooserdefault.c:4490
- msgid "Size"
- msgstr "Méid"
- 
--#: gtk/gtkfilechooserdefault.c:4369
-+#: ../gtk/gtkfilechooserdefault.c:4504
- msgid "Modified"
- msgstr "Athraithe"
- 
- #. Label
--#: gtk/gtkfilechooserdefault.c:4624 gtk/gtkprinteroptionwidget.c:801
-+#: ../gtk/gtkfilechooserdefault.c:4597
- msgid "_Name:"
- msgstr "_Ainm:"
- 
--#: gtk/gtkfilechooserdefault.c:4667
--msgid "_Browse for other folders"
--msgstr "_Brabhsáil ar fhillteáin eile"
--
--#: gtk/gtkfilechooserdefault.c:4937
-+#: ../gtk/gtkfilechooserdefault.c:4828
- msgid "Type a file name"
- msgstr "Clóscríobh ainm comhaid"
- 
-+#: ../gtk/gtkfilechooserdefault.c:4875 ../gtk/gtkfilechooserdefault.c:4886
-+#, fuzzy
-+msgid "Please select a folder below"
-+msgstr "Roghnaigh fillteán"
-+
-+#: ../gtk/gtkfilechooserdefault.c:4881
-+#, fuzzy
-+msgid "Please type a file name"
-+msgstr "Clóscríobh ainm comhaid"
-+
- #. Create Folder
--#: gtk/gtkfilechooserdefault.c:4980
-+#: ../gtk/gtkfilechooserdefault.c:4952
- msgid "Create Fo_lder"
- msgstr "Cruthaigh Fi_llteán"
- 
--#: gtk/gtkfilechooserdefault.c:4990
-+#: ../gtk/gtkfilechooserdefault.c:5000
-+msgid "Search:"
-+msgstr "Cuardaigh:"
-+
-+#: ../gtk/gtkfilechooserdefault.c:5051
- msgid "_Location:"
- msgstr "_Suíomh:"
- 
--#: gtk/gtkfilechooserdefault.c:5194
-+#: ../gtk/gtkfilechooserdefault.c:5502
- msgid "Save in _folder:"
- msgstr "Sábháil i bh_fillteán:"
- 
--#: gtk/gtkfilechooserdefault.c:5196
-+#: ../gtk/gtkfilechooserdefault.c:5504
- msgid "Create in _folder:"
- msgstr "Cruthaigh i bh_fillteán:"
- 
--#: gtk/gtkfilechooserdefault.c:6248
-+#: ../gtk/gtkfilechooserdefault.c:6591
- #, c-format
- msgid "Could not read the contents of %s"
- msgstr "Níorbh fhéidir ábhair %s a léamh"
- 
--#: gtk/gtkfilechooserdefault.c:6252
-+#: ../gtk/gtkfilechooserdefault.c:6595
- msgid "Could not read the contents of the folder"
- msgstr "Níorbh fhéidir ábhair an fhíllteáin a léamh"
- 
--#: gtk/gtkfilechooserdefault.c:6345 gtk/gtkfilechooserdefault.c:6413
--#: gtk/gtkfilechooserdefault.c:6558
-+#: ../gtk/gtkfilechooserdefault.c:6688 ../gtk/gtkfilechooserdefault.c:6756
-+#: ../gtk/gtkfilechooserdefault.c:6936
- msgid "Unknown"
- msgstr "Anaithnid"
- 
--#: gtk/gtkfilechooserdefault.c:6360
-+#: ../gtk/gtkfilechooserdefault.c:6703
- msgid "%H:%M"
- msgstr "%H:%M"
- 
--#: gtk/gtkfilechooserdefault.c:6362
-+#: ../gtk/gtkfilechooserdefault.c:6705
- msgid "Yesterday at %H:%M"
- msgstr "Inné ar a %H:%M"
- 
--#: gtk/gtkfilechooserdefault.c:7028
-+#: ../gtk/gtkfilechooserdefault.c:7407
- msgid "Cannot change to folder because it is not local"
- msgstr "Ní féidir athrú go dtí an fillteán mar níl sé logánta"
- 
--#: gtk/gtkfilechooserdefault.c:7625 gtk/gtkfilechooserdefault.c:7646
-+#: ../gtk/gtkfilechooserdefault.c:8011 ../gtk/gtkfilechooserdefault.c:8032
- #, c-format
- msgid "Shortcut %s already exists"
- msgstr "Tá aicearra %s ann cheana"
- 
--#: gtk/gtkfilechooserdefault.c:7736
-+#: ../gtk/gtkfilechooserdefault.c:8122
- #, c-format
- msgid "Shortcut %s does not exist"
- msgstr "Níl aicearra %s ann"
- 
--#: gtk/gtkfilechooserdefault.c:7997 gtk/gtkprintunixdialog.c:480
-+#: ../gtk/gtkfilechooserdefault.c:8368 ../gtk/gtkprintunixdialog.c:548
- #, c-format
- msgid "A file named \"%s\" already exists.  Do you want to replace it?"
- msgstr "Tá comhad darbh ainm \"%s\" ann cheana. Ar mhaith leat é a athchur?"
- 
--#: gtk/gtkfilechooserdefault.c:8000 gtk/gtkprintunixdialog.c:484
-+#: ../gtk/gtkfilechooserdefault.c:8371 ../gtk/gtkprintunixdialog.c:552
- #, c-format
- msgid ""
- "The file already exists in \"%s\".  Replacing it will overwrite its contents."
- msgstr ""
- "Tá an comhad ann i \"%s\" cheana.  Forscríobhfar a ábhair má ionadaítear é."
- 
--#: gtk/gtkfilechooserdefault.c:8005 gtk/gtkprintunixdialog.c:491
-+#: ../gtk/gtkfilechooserdefault.c:8376 ../gtk/gtkprintunixdialog.c:559
- msgid "_Replace"
- msgstr "_Ionadaigh"
- 
--#: gtk/gtkfilechooserdefault.c:8658
-+#: ../gtk/gtkfilechooserdefault.c:9183
- msgid "Could not start the search process"
- msgstr "Níorbh fhéidir an próiseas cuardaigh a thosú"
- 
--#: gtk/gtkfilechooserdefault.c:8659
-+#: ../gtk/gtkfilechooserdefault.c:9184
- msgid ""
- "The program was not able to create a connection to the indexer daemon.  "
- "Please make sure it is running."
-@@ -1074,221 +1704,192 @@ msgstr ""
- "innéacsóra.\n"
- "Cinntigh go bhfuil sé á rith, le do thoil."
- 
--#: gtk/gtkfilechooserdefault.c:8673
-+#: ../gtk/gtkfilechooserdefault.c:9198
- msgid "Could not send the search request"
- msgstr "Níorbh fhéidir an t-iarratas cuardaigh a sheoladh"
- 
--#: gtk/gtkfilechooserdefault.c:8861
--msgid "Search:"
--msgstr "Cuardaigh:"
--
--#: gtk/gtkfilechooserdefault.c:9466
-+#: ../gtk/gtkfilechooserdefault.c:9808
- #, c-format
- msgid "Could not mount %s"
- msgstr "Níorbh fhéidir %s a ghléasadh"
- 
--#. Translators: this is shown in the feedback for Tab-completion in a file
--#. * chooser's text entry, when the user enters an invalid path.
--#: gtk/gtkfilechooserentry.c:702 gtk/gtkfilechooserentry.c:1169
--msgid "Invalid path"
--msgstr "Conair neamhbhailí"
--
--#. translators: this text is shown when there are no completions
--#. * for something the user typed in a file chooser entry
--#.
--#: gtk/gtkfilechooserentry.c:1101
--msgid "No match"
--msgstr "Gan rud comhoiriúnach"
--
--#. translators: this text is shown when there is exactly one completion
--#. * for something the user typed in a file chooser entry
--#.
--#: gtk/gtkfilechooserentry.c:1112
--msgid "Sole completion"
--msgstr "An comhlánú amháin"
--
--#. translators: this text is shown when the text in a file chooser
--#. * entry is a complete filename, but could be continued to find
--#. * a longer match
--#.
--#: gtk/gtkfilechooserentry.c:1128
--msgid "Complete, but not unique"
--msgstr "Curtha i grích, ach nach uathúil"
--
--#. Translators: this text is shown while the system is searching
--#. * for possible completions for filenames in a file chooser entry.
--#: gtk/gtkfilechooserentry.c:1160
--msgid "Completing..."
--msgstr "Á chur i grích..."
--
--#. hostnames in a local_only file chooser?  user error
--#. Translators: this is shown in the feedback for Tab-completion in a
--#. * file chooser's text entry when the user enters something like
--#. * "sftp://blahblah" in an app that only supports local filenames.
--#: gtk/gtkfilechooserentry.c:1182 gtk/gtkfilechooserentry.c:1207
--msgid "Only local files may be selected"
--msgstr "Is féidir comhaid logánta amháin a roghnú"
--
--#. Another option is to complete the hostname based on the remote volumes that are mounted
--#. Translators: this is shown in the feedback for Tab-completion in a
--#. * file chooser's text entry when the user hasn't entered the first '/'
--#. * after a hostname and yet hits Tab (such as "sftp://blahblah[Tab]")
--#: gtk/gtkfilechooserentry.c:1191
--msgid "Incomplete hostname; end it with '/'"
--msgstr "Óstainm neamhiomlán; cuir '/' ag an deireadh"
--
--#. Translators: this is shown in the feedback for Tab-completion in a file
--#. * chooser's text entry when the user enters a path that does not exist
--#. * and then hits Tab
--#: gtk/gtkfilechooserentry.c:1202
--msgid "Path does not exist"
--msgstr "Níl an conair sin ann"
--
--#: gtk/gtkfilechoosersettings.c:486
--#, c-format
--msgid "Error creating folder '%s': %s"
--msgstr "Earráid agus fillteán '%s' á chruthú: %s"
--
- #. The pointers we return for a GtkFileSystemVolume are opaque tokens; they are
- #. * really pointers to GDrive, GVolume or GMount objects.  We need an extra
- #. * token for the fake "File System" volume.  So, we'll return a pointer to
- #. * this particular string.
- #.
--#: gtk/gtkfilesystem.c:48
-+#: ../gtk/gtkfilesystem.c:47
- msgid "File System"
- msgstr "Córas Comhaid"
- 
--#: gtk/gtkfontbutton.c:142 gtk/gtkfontbutton.c:266
--msgid "Pick a Font"
--msgstr "Roghnaigh Cló"
--
--#. Initialize fields
--#: gtk/gtkfontbutton.c:260
-+#: ../gtk/gtkfontbutton.c:354
- msgid "Sans 12"
- msgstr "Sans 12"
- 
--#: gtk/gtkfontbutton.c:785
-+#: ../gtk/gtkfontbutton.c:436 ../gtk/gtkfontbutton.c:563
-+msgid "Pick a Font"
-+msgstr "Roghnaigh Cló"
-+
-+#: ../gtk/gtkfontbutton.c:1121
- msgid "Font"
- msgstr "Cló"
- 
--#. This is the default text shown in the preview entry, though the user
--#. can set it. Remember that some fonts only have capital letters.
--#: gtk/gtkfontsel.c:103
--msgid "abcdefghijk ABCDEFGHIJK"
--msgstr "aábcdeéfghií AÁBCDEÉFGHIÍ"
--
--#: gtk/gtkfontsel.c:370
--msgid "_Family:"
--msgstr "_Clann:"
--
--#: gtk/gtkfontsel.c:376
--msgid "_Style:"
--msgstr "_Stíl:"
--
--#: gtk/gtkfontsel.c:382
--msgid "Si_ze:"
--msgstr "_Méid:"
--
--#. create the text entry widget
--#: gtk/gtkfontsel.c:559
--msgid "_Preview:"
--msgstr "_Réamhamharc:"
--
--#: gtk/gtkfontsel.c:1659
--msgid "Font Selection"
--msgstr "Roghnú Cló"
--
--#. Remove this icon source so we don't keep trying to
--#. * load it.
--#.
--#: gtk/gtkiconfactory.c:1356
--#, c-format
--msgid "Error loading icon: %s"
--msgstr "Earráid agus deilbhín á luchtú: %s"
-+#: ../gtk/gtkfontchooserwidget.c:110
-+msgid "No fonts matched your search. You can revise your search and try again."
-+msgstr ""
- 
--#: gtk/gtkicontheme.c:1354
--#, c-format
--msgid ""
--"Could not find the icon '%s'. The '%s' theme\n"
--"was not found either, perhaps you need to install it.\n"
--"You can get a copy from:\n"
--"\t%s"
-+#: ../gtk/gtkfontchooserwidget.c:557
-+msgid "Search font name"
- msgstr ""
--"Níorbh fhéidir an deilbhín '%s' a aimsiú. Níor\n"
--"aimsíodh an téama '%s' ach an oiread, b'fhéidir go\n"
--"gcaithfidh tú é a shuiteáil.\n"
--"Is féidir leat cóip a fháil ó:\n"
--"\t%s"
- 
--#: gtk/gtkicontheme.c:1535
-+#: ../gtk/gtkfontchooserwidget.c:891
-+#, fuzzy
-+msgid "Font Family"
-+msgstr "_Clann:"
-+
-+#: ../gtk/gtkicontheme.c:1630
- #, c-format
- msgid "Icon '%s' not present in theme"
- msgstr "Níl deilbhín '%s' ann sa téama"
- 
--#: gtk/gtkicontheme.c:3048
-+#: ../gtk/gtkicontheme.c:3138
- msgid "Failed to load icon"
- msgstr "Theip ar luchtú deilbhín"
- 
--#: gtk/gtkimmodule.c:526
-+#: ../gtk/gtkimmodule.c:515
- msgid "Simple"
- msgstr "Simplí"
- 
--#: gtk/gtkimmulticontext.c:588
-+#: ../gtk/gtkimmulticontext.c:608
- msgctxt "input method menu"
- msgid "System"
- msgstr "Córas"
- 
--#: gtk/gtkimmulticontext.c:598
-+#: ../gtk/gtkimmulticontext.c:618
- msgctxt "input method menu"
- msgid "None"
- msgstr "Neamhní"
- 
--#: gtk/gtkimmulticontext.c:681
-+#: ../gtk/gtkimmulticontext.c:701
- #, c-format
- msgctxt "input method menu"
- msgid "System (%s)"
- msgstr "Córas (%s)"
- 
- #. Open Link
--#: gtk/gtklabel.c:6202
-+#: ../gtk/gtklabel.c:6224
- msgid "_Open Link"
- msgstr "_Oscail Nasc"
- 
- #. Copy Link Address
--#: gtk/gtklabel.c:6214
-+#: ../gtk/gtklabel.c:6236
- msgid "Copy _Link Address"
- msgstr "Cóipeáil Seoladh an _Naisc"
- 
--#: gtk/gtklinkbutton.c:449
-+#: ../gtk/gtk-launch.c:73
-+msgid "APPLICATION [URI...] - launch an APPLICATION with URI."
-+msgstr ""
-+
-+#. Translators: this message will appear after the usage string
-+#. and before the list of options.
-+#: ../gtk/gtk-launch.c:77
-+msgid ""
-+"Launch specified application by its desktop file info\n"
-+"optionally passing list of URIs as arguments."
-+msgstr ""
-+
-+#: ../gtk/gtk-launch.c:89
-+#, fuzzy, c-format
-+msgid "Error parsing commandline options: %s\n"
-+msgstr "Earráid agus deilbhín á luchtú: %s"
-+
-+#: ../gtk/gtk-launch.c:91 ../gtk/gtk-launch.c:104
-+#, c-format
-+msgid "Try \"%s --help\" for more information."
-+msgstr ""
-+
-+#. Translators: the %s is the program name. This error message
-+#. means the user is calling gtk-launch without any argument.
-+#: ../gtk/gtk-launch.c:102
-+#, c-format
-+msgid "%s: missing application name"
-+msgstr ""
-+
-+#: ../gtk/gtk-launch.c:123
-+#, c-format
-+msgid "Creating AppInfo from id not supported on non unix operating systems"
-+msgstr ""
-+
-+#. Translators: the first %s is the program name, the second one
-+#. is the application name.
-+#: ../gtk/gtk-launch.c:131
-+#, c-format
-+msgid "%s: no such application %s"
-+msgstr ""
-+
-+#. Translators: the first %s is the program name, the second one
-+#. is the error message.
-+#: ../gtk/gtk-launch.c:149
-+#, fuzzy, c-format
-+msgid "%s: error launching application: %s\n"
-+msgstr "Earráid agus deilbhín á luchtú: %s"
-+
-+#: ../gtk/gtklinkbutton.c:499
- msgid "Copy URL"
- msgstr "Cóipeáil URL"
- 
--#: gtk/gtklinkbutton.c:601
-+#: ../gtk/gtklinkbutton.c:665
- msgid "Invalid URI"
- msgstr "URI Neamhbhailí"
- 
-+#: ../gtk/gtklockbutton.c:290
-+msgid "Lock"
-+msgstr "Cuir Faoi Ghlas"
-+
-+#: ../gtk/gtklockbutton.c:299
-+msgid "Unlock"
-+msgstr "Díghlasáil"
-+
-+#: ../gtk/gtklockbutton.c:308
-+msgid ""
-+"Dialog is unlocked.\n"
-+"Click to prevent further changes"
-+msgstr ""
-+
-+#: ../gtk/gtklockbutton.c:317
-+msgid ""
-+"Dialog is locked.\n"
-+"Click to make changes"
-+msgstr ""
-+
-+#: ../gtk/gtklockbutton.c:326
-+msgid ""
-+"System policy prevents changes.\n"
-+"Contact your system administrator"
-+msgstr ""
-+
- #. Description of --gtk-module=MODULES in --help output
--#: gtk/gtkmain.c:526
-+#: ../gtk/gtkmain.c:447
- msgid "Load additional GTK+ modules"
- msgstr "Luchtaigh modúil GTK+ breise"
- 
- #. Placeholder in --gtk-module=MODULES in --help output
--#: gtk/gtkmain.c:527
-+#: ../gtk/gtkmain.c:448
- msgid "MODULES"
- msgstr "MODÚIL"
- 
- #. Description of --g-fatal-warnings in --help output
--#: gtk/gtkmain.c:529
-+#: ../gtk/gtkmain.c:450
- msgid "Make all warnings fatal"
- msgstr "Déan marfach gach rabhadh"
- 
- #. Description of --gtk-debug=FLAGS in --help output
--#: gtk/gtkmain.c:532
-+#: ../gtk/gtkmain.c:453
- msgid "GTK+ debugging flags to set"
- msgstr "Bratacha dífhabhtaithe GTK+ a shocrú"
- 
- #. Description of --gtk-no-debug=FLAGS in --help output
--#: gtk/gtkmain.c:535
-+#: ../gtk/gtkmain.c:456
- msgid "GTK+ debugging flags to unset"
- msgstr "Bratacha dífhabhtaithe GTK+ a dhíshocrú"
- 
-@@ -1297,123 +1898,141 @@ msgstr "Bratacha dífhabhtaithe GTK+ a dhíshocrú"
- #. * Do *not* translate it to "predefinito:LTR", if it
- #. * it isn't default:LTR or default:RTL it will not work
- #.
--#: gtk/gtkmain.c:798
-+#: ../gtk/gtkmain.c:704
- msgid "default:LTR"
- msgstr "default:LTR"
- 
--#: gtk/gtkmain.c:863
-+#: ../gtk/gtkmain.c:772
- #, c-format
- msgid "Cannot open display: %s"
- msgstr "Ní féidir taispeáint a oscailt: %s"
- 
--#: gtk/gtkmain.c:922
-+#: ../gtk/gtkmain.c:838
- msgid "GTK+ Options"
- msgstr "Roghanna GTK+"
- 
--#: gtk/gtkmain.c:922
-+#: ../gtk/gtkmain.c:838
- msgid "Show GTK+ Options"
- msgstr "Taispeáin Roghanna GTK+"
- 
--#: gtk/gtkmountoperation.c:491
-+#: ../gtk/gtkmountoperation.c:535
- msgid "Co_nnect"
- msgstr "_Nasc"
- 
--#: gtk/gtkmountoperation.c:558
--msgid "Connect _anonymously"
-+#: ../gtk/gtkmountoperation.c:609
-+#, fuzzy
-+msgid "Connect As"
-+msgstr "_Nasc"
-+
-+#: ../gtk/gtkmountoperation.c:618
-+#, fuzzy
-+msgid "_Anonymous"
- msgstr "Nasc gan _ainm"
- 
--#: gtk/gtkmountoperation.c:567
--msgid "Connect as u_ser:"
--msgstr "Nasc mar ú_sáideoir:"
-+#: ../gtk/gtkmountoperation.c:627
-+msgid "Registered U_ser"
-+msgstr ""
- 
--#: gtk/gtkmountoperation.c:605
--msgid "_Username:"
-+#: ../gtk/gtkmountoperation.c:638
-+#, fuzzy
-+msgid "_Username"
- msgstr "_Ainm úsáideora:"
- 
--#: gtk/gtkmountoperation.c:610
--msgid "_Domain:"
-+#: ../gtk/gtkmountoperation.c:643
-+#, fuzzy
-+msgid "_Domain"
- msgstr "F_earann:"
- 
--#: gtk/gtkmountoperation.c:616
--msgid "_Password:"
-+#: ../gtk/gtkmountoperation.c:649
-+#, fuzzy
-+msgid "_Password"
- msgstr "_Focal faire:"
- 
--#: gtk/gtkmountoperation.c:634
-+#: ../gtk/gtkmountoperation.c:671
- msgid "Forget password _immediately"
- msgstr "Déan _dearmad ar an bhfocal faire láithreach"
- 
--#: gtk/gtkmountoperation.c:644
-+#: ../gtk/gtkmountoperation.c:681
- msgid "Remember password until you _logout"
- msgstr "Meabhraigh focal faire go dtí go _logálann tú amach"
- 
--#: gtk/gtkmountoperation.c:654
-+#: ../gtk/gtkmountoperation.c:691
- msgid "Remember _forever"
- msgstr "Meabhraigh go d_eo"
- 
--#: gtk/gtkmountoperation.c:883
-+#: ../gtk/gtkmountoperation.c:1080
- #, fuzzy, c-format
- msgid "Unknown Application (PID %d)"
- msgstr "Feidhmchlár Anaithnid (pid %d)"
- 
--#: gtk/gtkmountoperation.c:1066
--#, c-format
-+#: ../gtk/gtkmountoperation.c:1263
- msgid "Unable to end process"
- msgstr "Ní féidir deireadh a chur leis an bpróiseas"
- 
--#: gtk/gtkmountoperation.c:1103
-+#: ../gtk/gtkmountoperation.c:1300
- msgid "_End Process"
- msgstr "Cuir _Deireadh Leis an bPróiseas"
- 
--#: gtk/gtkmountoperation-stub.c:64
-+#: ../gtk/gtkmountoperation-stub.c:62
- #, fuzzy, c-format
- msgid "Cannot kill process with PID %d. Operation is not implemented."
- msgstr ""
- "Ní féidir an próiseas le pid %d a mharú. Níl an oibríocht curtha i ngníomh."
- 
- #. translators: this string is a name for the 'less' command
--#: gtk/gtkmountoperation-x11.c:862
-+#: ../gtk/gtkmountoperation-x11.c:954
- msgid "Terminal Pager"
- msgstr "Brabhsálaí Teirminéil"
- 
--#: gtk/gtkmountoperation-x11.c:863
-+#: ../gtk/gtkmountoperation-x11.c:955
- msgid "Top Command"
- msgstr "Ordú Top"
- 
--#: gtk/gtkmountoperation-x11.c:864
-+#: ../gtk/gtkmountoperation-x11.c:956
- msgid "Bourne Again Shell"
- msgstr "Blaosc Bourne Again"
- 
--#: gtk/gtkmountoperation-x11.c:865
-+#: ../gtk/gtkmountoperation-x11.c:957
- msgid "Bourne Shell"
- msgstr "Blaosc Bourne"
- 
--#: gtk/gtkmountoperation-x11.c:866
-+#: ../gtk/gtkmountoperation-x11.c:958
- msgid "Z Shell"
- msgstr "Blaosc Z"
- 
--#: gtk/gtkmountoperation-x11.c:963
-+#: ../gtk/gtkmountoperation-x11.c:1055
- #, fuzzy, c-format
- msgid "Cannot end process with PID %d: %s"
- msgstr "Ní féidir deireadh a chur leis an bpróiseas le pid %d: %s"
- 
--#: gtk/gtknotebook.c:4619 gtk/gtknotebook.c:7170
-+#: ../gtk/gtknotebook.c:5067 ../gtk/gtknotebook.c:7721
- #, c-format
- msgid "Page %u"
- msgstr "Leathanach %u"
- 
--#: gtk/gtkpagesetup.c:596 gtk/gtkpapersize.c:838 gtk/gtkpapersize.c:880
-+#. Translators: the format here is used to build the string that will be rendered
-+#. * in the number emblem.
-+#.
-+#: ../gtk/gtknumerableicon.c:482
-+#, c-format
-+msgctxt "Number format"
-+msgid "%d"
-+msgstr "%d"
-+
-+#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:848
-+#: ../gtk/gtkpapersize.c:888
- msgid "Not a valid page setup file"
- msgstr "Ní comhad socrú leathanaigh bailí é"
- 
--#: gtk/gtkpagesetupunixdialog.c:179
-+#: ../gtk/gtkpagesetupunixdialog.c:167
- msgid "Any Printer"
- msgstr "Printéir ar Bith"
- 
--#: gtk/gtkpagesetupunixdialog.c:179
-+#: ../gtk/gtkpagesetupunixdialog.c:167
- msgid "For portable documents"
- msgstr "Le haghaidh cáipéisí iniompartha"
- 
--#: gtk/gtkpagesetupunixdialog.c:809
-+#: ../gtk/gtkpagesetupunixdialog.c:796
- #, c-format
- msgid ""
- "Margins:\n"
-@@ -1428,239 +2047,229 @@ msgstr ""
- " Barr: %s %s\n"
- " Bun: %s %s"
- 
--#: gtk/gtkpagesetupunixdialog.c:858 gtk/gtkprintunixdialog.c:3284
-+#: ../gtk/gtkpagesetupunixdialog.c:845 ../gtk/gtkprintunixdialog.c:3329
- msgid "Manage Custom Sizes..."
- msgstr "Bainistigh Méideanna Saincheaptha..."
- 
--#: gtk/gtkpagesetupunixdialog.c:909
-+#: ../gtk/gtkpagesetupunixdialog.c:896
- msgid "_Format for:"
- msgstr "_Formáid le:"
- 
--#: gtk/gtkpagesetupunixdialog.c:931 gtk/gtkprintunixdialog.c:3456
-+#: ../gtk/gtkpagesetupunixdialog.c:917 ../gtk/gtkprintunixdialog.c:3477
- msgid "_Paper size:"
- msgstr "Méid an _pháipéir:"
- 
--#: gtk/gtkpagesetupunixdialog.c:962
-+#: ../gtk/gtkpagesetupunixdialog.c:946
- msgid "_Orientation:"
- msgstr "_Treoshuíomh:"
- 
--#: gtk/gtkpagesetupunixdialog.c:1026 gtk/gtkprintunixdialog.c:3518
-+#: ../gtk/gtkpagesetupunixdialog.c:1006 ../gtk/gtkprintunixdialog.c:3531
- msgid "Page Setup"
- msgstr "Socrú Leathanaigh"
- 
--#: gtk/gtkpathbar.c:154
-+#: ../gtk/gtkpathbar.c:159
- msgid "Up Path"
- msgstr "Conair Suas"
- 
--#: gtk/gtkpathbar.c:156
-+#: ../gtk/gtkpathbar.c:161
- msgid "Down Path"
- msgstr "Conair Síos"
- 
--#: gtk/gtkpathbar.c:1497
-+#: ../gtk/gtkpathbar.c:1644
- msgid "File System Root"
- msgstr "Fréamh Chóras Comhaid"
- 
--#: gtk/gtkprintbackend.c:749
-+#: ../gtk/gtkprintbackend.c:750
- msgid "Authentication"
- msgstr "Fíordheimhniú"
- 
--#: gtk/gtkprinteroptionwidget.c:694
--msgid "Not available"
--msgstr "Níl ar fáil"
--
--#: gtk/gtkprinteroptionwidget.c:794
--msgid "Select a folder"
-+#: ../gtk/gtkprinteroptionwidget.c:546
-+#, fuzzy
-+msgid "Select a filename"
- msgstr "Roghnaigh fillteán"
- 
--#: gtk/gtkprinteroptionwidget.c:813
--msgid "_Save in folder:"
--msgstr "_Sábháil i bhfillteán:"
-+#: ../gtk/gtkprinteroptionwidget.c:770
-+msgid "Not available"
-+msgstr "Níl ar fáil"
- 
- #. translators: this string is the default job title for print
- #. * jobs. %s gets replaced by the application name, %d gets replaced
- #. * by the job number.
- #.
--#: gtk/gtkprintoperation.c:190
-+#: ../gtk/gtkprintoperation.c:260
- #, c-format
- msgid "%s job #%d"
- msgstr "%s jab #%d"
- 
--#: gtk/gtkprintoperation.c:1695
-+#: ../gtk/gtkprintoperation.c:1777
- msgctxt "print operation status"
- msgid "Initial state"
- msgstr "Staid tosaigh"
- 
--#: gtk/gtkprintoperation.c:1696
-+#: ../gtk/gtkprintoperation.c:1778
- msgctxt "print operation status"
- msgid "Preparing to print"
- msgstr "Priontáil á ullmhú"
- 
--#: gtk/gtkprintoperation.c:1697
-+#: ../gtk/gtkprintoperation.c:1779
- msgctxt "print operation status"
- msgid "Generating data"
- msgstr "Sonraí á nginiúint"
- 
--#: gtk/gtkprintoperation.c:1698
-+#: ../gtk/gtkprintoperation.c:1780
- msgctxt "print operation status"
- msgid "Sending data"
- msgstr "Sonraí á seoladh"
- 
--#: gtk/gtkprintoperation.c:1699
-+#: ../gtk/gtkprintoperation.c:1781
- msgctxt "print operation status"
- msgid "Waiting"
- msgstr "Ag feitheamh"
- 
--#: gtk/gtkprintoperation.c:1700
-+#: ../gtk/gtkprintoperation.c:1782
- msgctxt "print operation status"
- msgid "Blocking on issue"
- msgstr "Coiscthe mar gheall ar fhadhb"
- 
--#: gtk/gtkprintoperation.c:1701
-+#: ../gtk/gtkprintoperation.c:1783
- msgctxt "print operation status"
- msgid "Printing"
- msgstr "Á Phriontáil"
- 
--#: gtk/gtkprintoperation.c:1702
-+#: ../gtk/gtkprintoperation.c:1784
- msgctxt "print operation status"
- msgid "Finished"
- msgstr "Críochnaithe"
- 
--#: gtk/gtkprintoperation.c:1703
-+#: ../gtk/gtkprintoperation.c:1785
- msgctxt "print operation status"
- msgid "Finished with error"
- msgstr "Críochnaithe le hearráid"
- 
--#: gtk/gtkprintoperation.c:2270
-+#: ../gtk/gtkprintoperation.c:2349
- #, c-format
- msgid "Preparing %d"
- msgstr "%d á ullmhú"
- 
--#: gtk/gtkprintoperation.c:2272 gtk/gtkprintoperation.c:2902
--#, c-format
-+#: ../gtk/gtkprintoperation.c:2351 ../gtk/gtkprintoperation.c:2983
- msgid "Preparing"
- msgstr "Á ullmhú"
- 
--#: gtk/gtkprintoperation.c:2275
-+#: ../gtk/gtkprintoperation.c:2354
- #, c-format
- msgid "Printing %d"
- msgstr "%d á phriontáil"
- 
--#: gtk/gtkprintoperation.c:2932
--#, c-format
-+#: ../gtk/gtkprintoperation.c:3013
- msgid "Error creating print preview"
- msgstr "Earráid agus réamhamharc priontála á chruthú"
- 
--#: gtk/gtkprintoperation.c:2935
--#, c-format
-+#: ../gtk/gtkprintoperation.c:3016
- msgid "The most probable reason is that a temporary file could not be created."
- msgstr "Is dócha gur an chúis ná nárbh fhéidir comhad sealadach a chruthú."
- 
--#: gtk/gtkprintoperation-unix.c:297
-+#: ../gtk/gtkprintoperation-unix.c:307
- msgid "Error launching preview"
- msgstr "Earráid agus réamhamharc á thosú"
- 
--#: gtk/gtkprintoperation-unix.c:470 gtk/gtkprintoperation-win32.c:1447
--msgid "Application"
--msgstr "Feidhmchlár"
--
--#: gtk/gtkprintoperation-win32.c:611
-+#: ../gtk/gtkprintoperation-win32.c:609
- msgid "Printer offline"
- msgstr "Printéir as líne"
- 
--#: gtk/gtkprintoperation-win32.c:613
-+#: ../gtk/gtkprintoperation-win32.c:611
- msgid "Out of paper"
- msgstr "Páipéar ídithe"
- 
- #. Translators: this is a printer status.
--#: gtk/gtkprintoperation-win32.c:615
--#: modules/printbackends/cups/gtkprintbackendcups.c:1998
-+#: ../gtk/gtkprintoperation-win32.c:613
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2126
- msgid "Paused"
- msgstr "Curtha ar sos"
- 
--#: gtk/gtkprintoperation-win32.c:617
-+#: ../gtk/gtkprintoperation-win32.c:615
- msgid "Need user intervention"
- msgstr "Teastaíonn idirghabháil an úsáideora"
- 
--#: gtk/gtkprintoperation-win32.c:717
-+#: ../gtk/gtkprintoperation-win32.c:715
- msgid "Custom size"
- msgstr "Méid saincheaptha"
- 
--#: gtk/gtkprintoperation-win32.c:1539
-+#: ../gtk/gtkprintoperation-win32.c:1537
- msgid "No printer found"
- msgstr "Níor aimsíodh aon phrintéir"
- 
--#: gtk/gtkprintoperation-win32.c:1566
-+#: ../gtk/gtkprintoperation-win32.c:1564
- msgid "Invalid argument to CreateDC"
- msgstr "Argóint neamhbhailí go CreateDC"
- 
--#: gtk/gtkprintoperation-win32.c:1602 gtk/gtkprintoperation-win32.c:1829
-+#: ../gtk/gtkprintoperation-win32.c:1600 ../gtk/gtkprintoperation-win32.c:1827
- msgid "Error from StartDoc"
- msgstr "Earráid ó StartDoc"
- 
--#: gtk/gtkprintoperation-win32.c:1684 gtk/gtkprintoperation-win32.c:1707
--#: gtk/gtkprintoperation-win32.c:1755
-+#: ../gtk/gtkprintoperation-win32.c:1682 ../gtk/gtkprintoperation-win32.c:1705
-+#: ../gtk/gtkprintoperation-win32.c:1753
- msgid "Not enough free memory"
- msgstr "Cuimhne ídithe"
- 
--#: gtk/gtkprintoperation-win32.c:1760
-+#: ../gtk/gtkprintoperation-win32.c:1758
- msgid "Invalid argument to PrintDlgEx"
- msgstr "Argóint neamhbhailí go PrintDlgEx"
- 
--#: gtk/gtkprintoperation-win32.c:1765
-+#: ../gtk/gtkprintoperation-win32.c:1763
- msgid "Invalid pointer to PrintDlgEx"
- msgstr "Pointeoir neamhbhailí go PrintDlgEx"
- 
--#: gtk/gtkprintoperation-win32.c:1770
-+#: ../gtk/gtkprintoperation-win32.c:1768
- msgid "Invalid handle to PrintDlgEx"
- msgstr "Lorgán neamhbhailí chuig PrintDlgEx"
- 
--#: gtk/gtkprintoperation-win32.c:1775
-+#: ../gtk/gtkprintoperation-win32.c:1773
- msgid "Unspecified error"
- msgstr "Earráid gan sonrú"
- 
--#: gtk/gtkprintunixdialog.c:618
-+#: ../gtk/gtkprintunixdialog.c:681
- msgid "Getting printer information failed"
- msgstr "Theip ar fháil eolais printéara"
- 
--#: gtk/gtkprintunixdialog.c:1873
-+#: ../gtk/gtkprintunixdialog.c:1916
- msgid "Getting printer information..."
- msgstr "Eolas printéara á fháil..."
- 
--#: gtk/gtkprintunixdialog.c:2139
-+#: ../gtk/gtkprintunixdialog.c:2184
- msgid "Printer"
- msgstr "Printéir"
- 
- #. Translators: this is the header for the location column in the print dialog
--#: gtk/gtkprintunixdialog.c:2149
-+#: ../gtk/gtkprintunixdialog.c:2194
- msgid "Location"
- msgstr "Suíomh"
- 
- #. Translators: this is the header for the printer status column in the print dialog
--#: gtk/gtkprintunixdialog.c:2160
-+#: ../gtk/gtkprintunixdialog.c:2205
- msgid "Status"
- msgstr "Stádas"
- 
--#: gtk/gtkprintunixdialog.c:2186
-+#: ../gtk/gtkprintunixdialog.c:2231
- msgid "Range"
- msgstr "Raon"
- 
--#: gtk/gtkprintunixdialog.c:2190
-+#: ../gtk/gtkprintunixdialog.c:2235
- msgid "_All Pages"
- msgstr "_Gach Leathanach"
- 
--#: gtk/gtkprintunixdialog.c:2197
-+#: ../gtk/gtkprintunixdialog.c:2240
- msgid "C_urrent Page"
- msgstr "Leathanach _Reatha"
- 
--#: gtk/gtkprintunixdialog.c:2207
-+#: ../gtk/gtkprintunixdialog.c:2248
- msgid "Se_lection"
- msgstr "_Roghnú"
- 
--#: gtk/gtkprintunixdialog.c:2216
-+#: ../gtk/gtkprintunixdialog.c:2254
- msgid "Pag_es:"
- msgstr "_Leathanaigh:"
- 
--#: gtk/gtkprintunixdialog.c:2217
-+#: ../gtk/gtkprintunixdialog.c:2255
- msgid ""
- "Specify one or more page ranges,\n"
- " e.g. 1-3,7,11"
-@@ -1668,28 +2277,28 @@ msgstr ""
- "Sonraigh raon leathanaigh amháin nó níos mó,\n"
- " m.s. 1-3,7,11"
- 
--#: gtk/gtkprintunixdialog.c:2227
-+#: ../gtk/gtkprintunixdialog.c:2264
- msgid "Pages"
- msgstr "Leathanaigh"
- 
--#: gtk/gtkprintunixdialog.c:2240
-+#: ../gtk/gtkprintunixdialog.c:2275
- msgid "Copies"
- msgstr "Cóipeanna"
- 
- #. FIXME chpe: too much space between Copies and spinbutton, put those 2 in a hbox and make it span 2 columns
--#: gtk/gtkprintunixdialog.c:2245
-+#: ../gtk/gtkprintunixdialog.c:2280
- msgid "Copie_s:"
- msgstr "Cóip_eanna:"
- 
--#: gtk/gtkprintunixdialog.c:2263
-+#: ../gtk/gtkprintunixdialog.c:2296
- msgid "C_ollate"
- msgstr "C_omhordaigh"
- 
--#: gtk/gtkprintunixdialog.c:2271
-+#: ../gtk/gtkprintunixdialog.c:2302
- msgid "_Reverse"
- msgstr "_Aisiompaithe"
- 
--#: gtk/gtkprintunixdialog.c:2291
-+#: ../gtk/gtkprintunixdialog.c:2318
- msgid "General"
- msgstr "Ginearálta"
- 
-@@ -1699,168 +2308,168 @@ msgstr "Ginearálta"
- #. Translators: These strings name the possible arrangements of
- #. * multiple pages on a sheet when printing
- #.
--#: gtk/gtkprintunixdialog.c:3017
--#: modules/printbackends/cups/gtkprintbackendcups.c:3508
-+#: ../gtk/gtkprintunixdialog.c:3058
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3686
- msgid "Left to right, top to bottom"
- msgstr "Clé go deas, barr go bun"
- 
--#: gtk/gtkprintunixdialog.c:3017
--#: modules/printbackends/cups/gtkprintbackendcups.c:3508
-+#: ../gtk/gtkprintunixdialog.c:3058
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3686
- msgid "Left to right, bottom to top"
- msgstr "Clé go deas, bun go barr"
- 
--#: gtk/gtkprintunixdialog.c:3018
--#: modules/printbackends/cups/gtkprintbackendcups.c:3509
-+#: ../gtk/gtkprintunixdialog.c:3059
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3687
- msgid "Right to left, top to bottom"
- msgstr "Deas go clé, barr go bun"
- 
--#: gtk/gtkprintunixdialog.c:3018
--#: modules/printbackends/cups/gtkprintbackendcups.c:3509
-+#: ../gtk/gtkprintunixdialog.c:3059
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3687
- msgid "Right to left, bottom to top"
- msgstr "Deas go clé, bun go barr"
- 
--#: gtk/gtkprintunixdialog.c:3019
--#: modules/printbackends/cups/gtkprintbackendcups.c:3510
-+#: ../gtk/gtkprintunixdialog.c:3060
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3688
- msgid "Top to bottom, left to right"
- msgstr "Barr go bun, clé go deas"
- 
--#: gtk/gtkprintunixdialog.c:3019
--#: modules/printbackends/cups/gtkprintbackendcups.c:3510
-+#: ../gtk/gtkprintunixdialog.c:3060
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3688
- msgid "Top to bottom, right to left"
- msgstr "Barr go bunn, deas go clé"
- 
--#: gtk/gtkprintunixdialog.c:3020
--#: modules/printbackends/cups/gtkprintbackendcups.c:3511
-+#: ../gtk/gtkprintunixdialog.c:3061
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3689
- msgid "Bottom to top, left to right"
- msgstr "Bun go barr, clé go deas"
- 
--#: gtk/gtkprintunixdialog.c:3020
--#: modules/printbackends/cups/gtkprintbackendcups.c:3511
-+#: ../gtk/gtkprintunixdialog.c:3061
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3689
- msgid "Bottom to top, right to left"
- msgstr "Barr go bun, deas go clé"
- 
- #. Translators, this string is used to label the option in the print
- #. * dialog that controls in what order multiple pages are arranged
- #.
--#: gtk/gtkprintunixdialog.c:3024 gtk/gtkprintunixdialog.c:3037
--#: modules/printbackends/cups/gtkprintbackendcups.c:3543
-+#: ../gtk/gtkprintunixdialog.c:3065 ../gtk/gtkprintunixdialog.c:3078
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3766
- msgid "Page Ordering"
- msgstr "Cur in Ord Leathanaigh"
- 
--#: gtk/gtkprintunixdialog.c:3053
-+#: ../gtk/gtkprintunixdialog.c:3094
- msgid "Left to right"
- msgstr "Clé go deas"
- 
--#: gtk/gtkprintunixdialog.c:3054
-+#: ../gtk/gtkprintunixdialog.c:3095
- msgid "Right to left"
- msgstr "Deas go clé"
- 
--#: gtk/gtkprintunixdialog.c:3066
-+#: ../gtk/gtkprintunixdialog.c:3107
- msgid "Top to bottom"
- msgstr "Barr go bun"
- 
--#: gtk/gtkprintunixdialog.c:3067
-+#: ../gtk/gtkprintunixdialog.c:3108
- msgid "Bottom to top"
- msgstr "Bun go barr"
- 
--#: gtk/gtkprintunixdialog.c:3307
-+#: ../gtk/gtkprintunixdialog.c:3352
- msgid "Layout"
- msgstr "Leagan Amach"
- 
--#: gtk/gtkprintunixdialog.c:3311
-+#: ../gtk/gtkprintunixdialog.c:3356
- msgid "T_wo-sided:"
- msgstr "_Déthaobhach:"
- 
--#: gtk/gtkprintunixdialog.c:3326
-+#: ../gtk/gtkprintunixdialog.c:3368
- msgid "Pages per _side:"
- msgstr "Leathanaigh sa _taobh:"
- 
--#: gtk/gtkprintunixdialog.c:3343
-+#: ../gtk/gtkprintunixdialog.c:3382
- msgid "Page or_dering:"
- msgstr "Cur in _ord leathanaigh:"
- 
--#: gtk/gtkprintunixdialog.c:3359
-+#: ../gtk/gtkprintunixdialog.c:3395
- msgid "_Only print:"
- msgstr "_Ná priontáil ach:"
- 
- #. In enum order
--#: gtk/gtkprintunixdialog.c:3374
-+#: ../gtk/gtkprintunixdialog.c:3407
- msgid "All sheets"
- msgstr "Gach leathán"
- 
--#: gtk/gtkprintunixdialog.c:3375
-+#: ../gtk/gtkprintunixdialog.c:3408
- msgid "Even sheets"
- msgstr "Leatháin chothroma"
- 
--#: gtk/gtkprintunixdialog.c:3376
-+#: ../gtk/gtkprintunixdialog.c:3409
- msgid "Odd sheets"
- msgstr "Leatháin chorra"
- 
--#: gtk/gtkprintunixdialog.c:3379
-+#: ../gtk/gtkprintunixdialog.c:3412
- msgid "Sc_ale:"
- msgstr "_Scála:"
- 
--#: gtk/gtkprintunixdialog.c:3406
-+#: ../gtk/gtkprintunixdialog.c:3436
- msgid "Paper"
- msgstr "Páipéar"
- 
--#: gtk/gtkprintunixdialog.c:3410
-+#: ../gtk/gtkprintunixdialog.c:3440
- msgid "Paper _type:"
- msgstr "Cineál an pháipéir:"
- 
--#: gtk/gtkprintunixdialog.c:3425
-+#: ../gtk/gtkprintunixdialog.c:3452
- msgid "Paper _source:"
- msgstr "_Foinse an pháipéir:"
- 
--#: gtk/gtkprintunixdialog.c:3440
-+#: ../gtk/gtkprintunixdialog.c:3464
- msgid "Output t_ray:"
- msgstr "T_ráidire aschurtha:"
- 
--#: gtk/gtkprintunixdialog.c:3480
-+#: ../gtk/gtkprintunixdialog.c:3497
- msgid "Or_ientation:"
- msgstr "_Treoshuíomh:"
- 
- #. In enum order
--#: gtk/gtkprintunixdialog.c:3495
-+#: ../gtk/gtkprintunixdialog.c:3509
- msgid "Portrait"
- msgstr "Portráid"
- 
--#: gtk/gtkprintunixdialog.c:3496
-+#: ../gtk/gtkprintunixdialog.c:3510
- msgid "Landscape"
- msgstr "Tírdhreach"
- 
--#: gtk/gtkprintunixdialog.c:3497
-+#: ../gtk/gtkprintunixdialog.c:3511
- msgid "Reverse portrait"
- msgstr "Portráid aisiompaithe"
- 
--#: gtk/gtkprintunixdialog.c:3498
-+#: ../gtk/gtkprintunixdialog.c:3512
- msgid "Reverse landscape"
- msgstr "Tírdhreach aisiompaithe"
- 
--#: gtk/gtkprintunixdialog.c:3543
-+#: ../gtk/gtkprintunixdialog.c:3556
- msgid "Job Details"
- msgstr "Sonraí Jab:"
- 
--#: gtk/gtkprintunixdialog.c:3549
-+#: ../gtk/gtkprintunixdialog.c:3560
- msgid "Pri_ority:"
- msgstr "Tosaí_ocht:"
- 
--#: gtk/gtkprintunixdialog.c:3564
-+#: ../gtk/gtkprintunixdialog.c:3572
- msgid "_Billing info:"
- msgstr "Eolas billeáil"
- 
--#: gtk/gtkprintunixdialog.c:3582
-+#: ../gtk/gtkprintunixdialog.c:3587
- msgid "Print Document"
- msgstr "Priontáil Cáipéis"
- 
- #. Translators: this is one of the choices for the print at option
- #. * in the print dialog
- #.
--#: gtk/gtkprintunixdialog.c:3591
-+#: ../gtk/gtkprintunixdialog.c:3594
- msgid "_Now"
- msgstr "A_nois"
- 
--#: gtk/gtkprintunixdialog.c:3602
-+#: ../gtk/gtkprintunixdialog.c:3603
- msgid "A_t:"
- msgstr "A_g:"
- 
-@@ -1868,7 +2477,7 @@ msgstr "A_g:"
- #. * You can remove the am/pm values below for your locale if they are not
- #. * supported.
- #.
--#: gtk/gtkprintunixdialog.c:3608
-+#: ../gtk/gtkprintunixdialog.c:3609
- msgid ""
- "Specify the time of print,\n"
- " e.g. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm"
-@@ -1876,121 +2485,105 @@ msgstr ""
- "Sonraigh am an phriontála,\n"
- " m.s. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm"
- 
--#: gtk/gtkprintunixdialog.c:3618
-+#: ../gtk/gtkprintunixdialog.c:3617
- msgid "Time of print"
- msgstr "Am priontála"
- 
--#: gtk/gtkprintunixdialog.c:3634
-+#: ../gtk/gtkprintunixdialog.c:3631
- msgid "On _hold"
- msgstr "Ar feit_heamh"
- 
--#: gtk/gtkprintunixdialog.c:3635
-+#: ../gtk/gtkprintunixdialog.c:3632
- msgid "Hold the job until it is explicitly released"
- msgstr "Coinnigh an jab go dtí go scaoiltear é go follasach"
- 
--#: gtk/gtkprintunixdialog.c:3655
-+#: ../gtk/gtkprintunixdialog.c:3650
- msgid "Add Cover Page"
- msgstr "Cuir Leathanach Cumhdaigh Leis"
- 
- #. Translators, this is the label used for the option in the print
- #. * dialog that controls the front cover page.
- #.
--#: gtk/gtkprintunixdialog.c:3664
-+#: ../gtk/gtkprintunixdialog.c:3657
- msgid "Be_fore:"
- msgstr "_Roimh:"
- 
- #. Translators, this is the label used for the option in the print
- #. * dialog that controls the back cover page.
- #.
--#: gtk/gtkprintunixdialog.c:3682
-+#: ../gtk/gtkprintunixdialog.c:3672
- msgid "_After:"
- msgstr "_Tar Éis:"
- 
- #. Translators: this is the tab label for the notebook tab containing
- #. * job-specific options in the print dialog
- #.
--#: gtk/gtkprintunixdialog.c:3700
-+#: ../gtk/gtkprintunixdialog.c:3687
- msgid "Job"
- msgstr "Jab"
- 
--#: gtk/gtkprintunixdialog.c:3766
-+#: ../gtk/gtkprintunixdialog.c:3753
- msgid "Advanced"
- msgstr "Casta"
- 
- #. Translators: this will appear as tab label in print dialog.
--#: gtk/gtkprintunixdialog.c:3804
-+#: ../gtk/gtkprintunixdialog.c:3791
- msgid "Image Quality"
- msgstr "Cáilíocht Íomhá"
- 
- #. Translators: this will appear as tab label in print dialog.
--#: gtk/gtkprintunixdialog.c:3808
-+#: ../gtk/gtkprintunixdialog.c:3795
- msgid "Color"
- msgstr "Dath"
- 
- #. Translators: this will appear as tab label in print dialog.
- #. It's a typographical term, as in "Binding and finishing"
--#: gtk/gtkprintunixdialog.c:3813
-+#: ../gtk/gtkprintunixdialog.c:3800
- msgid "Finishing"
- msgstr "Ag críochnú"
- 
--#: gtk/gtkprintunixdialog.c:3823
-+#: ../gtk/gtkprintunixdialog.c:3810
- msgid "Some of the settings in the dialog conflict"
- msgstr "Tá cuid de na socruithe sa dialóg in aghaidh a chéile"
- 
--#: gtk/gtkprintunixdialog.c:3846
-+#: ../gtk/gtkprintunixdialog.c:3836
- msgid "Print"
- msgstr "Priontáil"
- 
--#: gtk/gtkrc.c:2834
--#, c-format
--msgid "Unable to find include file: \"%s\""
--msgstr "Ní féidir comhad ceanntáisc a aimsiú: \"%s\""
--
--#: gtk/gtkrc.c:3470 gtk/gtkrc.c:3473
--#, c-format
--msgid "Unable to locate image file in pixmap_path: \"%s\""
--msgstr "Ní féidir íomhá chomaid a aimsiú i bpixmap_path: \"%s\""
--
--#: gtk/gtkrecentaction.c:165 gtk/gtkrecentaction.c:173
--#: gtk/gtkrecentchoosermenu.c:615 gtk/gtkrecentchoosermenu.c:623
--#, c-format
--msgid "This function is not implemented for widgets of class '%s'"
--msgstr "Níl an feidhm seo curtha i ngníomh do ghiuirléidí na haicme '%s'"
--
--#: gtk/gtkrecentchooserdefault.c:482
-+#: ../gtk/gtkrecentchooserdefault.c:480
- msgid "Select which type of documents are shown"
- msgstr "Roghnaigh an cineál cáipéisí le taispeáint"
- 
--#: gtk/gtkrecentchooserdefault.c:1138 gtk/gtkrecentchooserdefault.c:1175
-+#: ../gtk/gtkrecentchooserdefault.c:1130 ../gtk/gtkrecentchooserdefault.c:1167
- #, c-format
- msgid "No item for URI '%s' found"
- msgstr "Níor aimsíodh mír le URI '%s'"
- 
--#: gtk/gtkrecentchooserdefault.c:1302
-+#: ../gtk/gtkrecentchooserdefault.c:1294
- msgid "Untitled filter"
- msgstr "Scagaire gan teideal"
- 
--#: gtk/gtkrecentchooserdefault.c:1655
-+#: ../gtk/gtkrecentchooserdefault.c:1647
- msgid "Could not remove item"
- msgstr "Níorbh fhéidir mír a bhaint"
- 
--#: gtk/gtkrecentchooserdefault.c:1699
-+#: ../gtk/gtkrecentchooserdefault.c:1691
- msgid "Could not clear list"
- msgstr "Níorbh fhéidir liosta a ghlanadh"
- 
--#: gtk/gtkrecentchooserdefault.c:1783
-+#: ../gtk/gtkrecentchooserdefault.c:1775
- msgid "Copy _Location"
- msgstr "Cóipeái_l Suíomh"
- 
--#: gtk/gtkrecentchooserdefault.c:1796
-+#: ../gtk/gtkrecentchooserdefault.c:1788
- msgid "_Remove From List"
- msgstr "_Bain den Liosta"
- 
--#: gtk/gtkrecentchooserdefault.c:1805
-+#: ../gtk/gtkrecentchooserdefault.c:1797
- msgid "_Clear List"
- msgstr "_Glan Liosta"
- 
--#: gtk/gtkrecentchooserdefault.c:1819
-+#: ../gtk/gtkrecentchooserdefault.c:1811
- msgid "Show _Private Resources"
- msgstr "Taispeáin _Acmhainní Príobháideacha"
- 
-@@ -2004,21 +2597,21 @@ msgstr "Taispeáin _Acmhainní Príobháideacha"
- #. * user appended or prepended custom menu items to the
- #. * recent chooser menu widget.
- #.
--#: gtk/gtkrecentchoosermenu.c:369
-+#: ../gtk/gtkrecentchoosermenu.c:360
- msgid "No items found"
- msgstr "Níor aimsíodh mír ar bith"
- 
--#: gtk/gtkrecentchoosermenu.c:535 gtk/gtkrecentchoosermenu.c:591
-+#: ../gtk/gtkrecentchoosermenu.c:526 ../gtk/gtkrecentchoosermenu.c:582
- #, c-format
- msgid "No recently used resource found with URI `%s'"
- msgstr "Níor aimsíodh aon acmhainn úsáidte le déanaí leis an URI `%s'"
- 
--#: gtk/gtkrecentchoosermenu.c:802
-+#: ../gtk/gtkrecentchoosermenu.c:792
- #, c-format
- msgid "Open '%s'"
- msgstr "Oscail '%s'"
- 
--#: gtk/gtkrecentchoosermenu.c:832
-+#: ../gtk/gtkrecentchoosermenu.c:822
- msgid "Unknown item"
- msgstr "Mír anaithnid"
- 
-@@ -2027,7 +2620,7 @@ msgstr "Mír anaithnid"
- #. * the %s is the name of the item. Please keep the _ in front
- #. * of the number to give these menu items a mnemonic.
- #.
--#: gtk/gtkrecentchoosermenu.c:843
-+#: ../gtk/gtkrecentchoosermenu.c:833
- #, c-format
- msgctxt "recent menu label"
- msgid "_%d. %s"
-@@ -2036,46 +2629,42 @@ msgstr "_%d. %s"
- #. This is the format that is used for items in a recent files menu.
- #. * The %d is the number of the item, the %s is the name of the item.
- #.
--#: gtk/gtkrecentchoosermenu.c:848
-+#: ../gtk/gtkrecentchoosermenu.c:838
- #, c-format
- msgctxt "recent menu label"
- msgid "%d. %s"
- msgstr "%d. %s"
- 
--#: gtk/gtkrecentmanager.c:980 gtk/gtkrecentmanager.c:993
--#: gtk/gtkrecentmanager.c:1131 gtk/gtkrecentmanager.c:1141
--#: gtk/gtkrecentmanager.c:1194 gtk/gtkrecentmanager.c:1203
--#: gtk/gtkrecentmanager.c:1218
-+#: ../gtk/gtkrecentmanager.c:1010 ../gtk/gtkrecentmanager.c:1023
-+#: ../gtk/gtkrecentmanager.c:1160 ../gtk/gtkrecentmanager.c:1170
-+#: ../gtk/gtkrecentmanager.c:1222 ../gtk/gtkrecentmanager.c:1231
-+#: ../gtk/gtkrecentmanager.c:1246
- #, c-format
- msgid "Unable to find an item with URI '%s'"
- msgstr "Ní féidir mír a aimsiú le URI '%s'"
- 
--#: gtk/gtkspinner.c:456
--msgctxt "throbbing progress animation widget"
--msgid "Spinner"
--msgstr ""
--
--#: gtk/gtkspinner.c:457
--msgid "Provides visual indication of progress"
-+#: ../gtk/gtkrecentmanager.c:2446
-+#, c-format
-+msgid "No registered application with name '%s' for item with URI '%s' found"
- msgstr ""
- 
- #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
--#: gtk/gtkstock.c:313
-+#: ../gtk/gtkstock.c:324
- msgctxt "Stock label"
- msgid "Information"
- msgstr "Eolas"
- 
--#: gtk/gtkstock.c:314
-+#: ../gtk/gtkstock.c:325
- msgctxt "Stock label"
- msgid "Warning"
- msgstr "Rabhadh"
- 
--#: gtk/gtkstock.c:315
-+#: ../gtk/gtkstock.c:326
- msgctxt "Stock label"
- msgid "Error"
- msgstr "Earráid"
- 
--#: gtk/gtkstock.c:316
-+#: ../gtk/gtkstock.c:327
- msgctxt "Stock label"
- msgid "Question"
- msgstr "Ceist"
-@@ -2083,695 +2672,707 @@ msgstr "Ceist"
- #. FIXME these need accelerators when appropriate, and
- #. * need the mnemonics to be rationalized
- #.
--#: gtk/gtkstock.c:321
-+#: ../gtk/gtkstock.c:332
- msgctxt "Stock label"
- msgid "_About"
- msgstr "_Maidir Leis Seo"
- 
--#: gtk/gtkstock.c:322
-+#: ../gtk/gtkstock.c:333
- msgctxt "Stock label"
- msgid "_Add"
- msgstr "Cuir _Leis"
- 
--#: gtk/gtkstock.c:323
-+#: ../gtk/gtkstock.c:334
- msgctxt "Stock label"
- msgid "_Apply"
- msgstr "Cuir i bh_Feidhm"
- 
--#: gtk/gtkstock.c:324
-+#: ../gtk/gtkstock.c:335
- msgctxt "Stock label"
- msgid "_Bold"
- msgstr "_Trom"
- 
--#: gtk/gtkstock.c:325
-+#: ../gtk/gtkstock.c:336
- msgctxt "Stock label"
- msgid "_Cancel"
- msgstr "_Cealaigh"
- 
--#: gtk/gtkstock.c:326
-+#: ../gtk/gtkstock.c:337
- #, fuzzy
- msgctxt "Stock label"
- msgid "_CD-ROM"
- msgstr "_CD-ROM"
- 
--#: gtk/gtkstock.c:327
-+#: ../gtk/gtkstock.c:338
- msgctxt "Stock label"
- msgid "_Clear"
- msgstr "_Glan"
- 
--#: gtk/gtkstock.c:328
-+#: ../gtk/gtkstock.c:339
- msgctxt "Stock label"
- msgid "_Close"
- msgstr "_Dún"
- 
--#: gtk/gtkstock.c:329
-+#: ../gtk/gtkstock.c:340
- msgctxt "Stock label"
- msgid "C_onnect"
- msgstr "_Nasc"
- 
--#: gtk/gtkstock.c:330
-+#: ../gtk/gtkstock.c:341
- msgctxt "Stock label"
- msgid "_Convert"
- msgstr "_Tiontaigh"
- 
--#: gtk/gtkstock.c:331
-+#: ../gtk/gtkstock.c:342
- msgctxt "Stock label"
- msgid "_Copy"
- msgstr "_Cóipeáil"
- 
--#: gtk/gtkstock.c:332
-+#: ../gtk/gtkstock.c:343
- msgctxt "Stock label"
- msgid "Cu_t"
- msgstr "_Gearr"
- 
--#: gtk/gtkstock.c:333
-+#: ../gtk/gtkstock.c:344
- msgctxt "Stock label"
- msgid "_Delete"
- msgstr "_Scrios"
- 
--#: gtk/gtkstock.c:334
-+#: ../gtk/gtkstock.c:345
- msgctxt "Stock label"
- msgid "_Discard"
- msgstr "_Cuir i Leataobh"
- 
--#: gtk/gtkstock.c:335
-+#: ../gtk/gtkstock.c:346
- msgctxt "Stock label"
- msgid "_Disconnect"
- msgstr "_Dínasc"
- 
--#: gtk/gtkstock.c:336
-+#: ../gtk/gtkstock.c:347
- msgctxt "Stock label"
- msgid "_Execute"
- msgstr "_Rith"
- 
--#: gtk/gtkstock.c:337
-+#: ../gtk/gtkstock.c:348
- msgctxt "Stock label"
- msgid "_Edit"
- msgstr "Cuir in _Eagar"
- 
--#: gtk/gtkstock.c:338
-+#: ../gtk/gtkstock.c:349
- #, fuzzy
- msgctxt "Stock label"
- msgid "_File"
- msgstr "Comhad"
- 
--#: gtk/gtkstock.c:339
-+#: ../gtk/gtkstock.c:350
- msgctxt "Stock label"
- msgid "_Find"
- msgstr "_Aimsigh"
- 
--#: gtk/gtkstock.c:340
-+#: ../gtk/gtkstock.c:351
- msgctxt "Stock label"
- msgid "Find and _Replace"
- msgstr "Aimsigh agus _Ionadaigh"
- 
--#: gtk/gtkstock.c:341
-+#: ../gtk/gtkstock.c:352
- msgctxt "Stock label"
- msgid "_Floppy"
- msgstr "Diosca _Bog"
- 
--#: gtk/gtkstock.c:342
-+#: ../gtk/gtkstock.c:353
- msgctxt "Stock label"
- msgid "_Fullscreen"
- msgstr "_Lánscáileán"
- 
--#: gtk/gtkstock.c:343
-+#: ../gtk/gtkstock.c:354
- msgctxt "Stock label"
- msgid "_Leave Fullscreen"
- msgstr "_Fág Lánscáileán"
- 
- #. This is a navigation label as in "go to the bottom of the page"
--#: gtk/gtkstock.c:345
-+#: ../gtk/gtkstock.c:356
- msgctxt "Stock label, navigation"
- msgid "_Bottom"
- msgstr "_Bun:"
- 
- #. This is a navigation label as in "go to the first page"
--#: gtk/gtkstock.c:347
-+#: ../gtk/gtkstock.c:358
- msgctxt "Stock label, navigation"
- msgid "_First"
- msgstr "An _Chéad"
- 
- #. This is a navigation label as in "go to the last page"
--#: gtk/gtkstock.c:349
-+#: ../gtk/gtkstock.c:360
- msgctxt "Stock label, navigation"
- msgid "_Last"
- msgstr "An _Deireanach"
- 
- #. This is a navigation label as in "go to the top of the page"
--#: gtk/gtkstock.c:351
-+#: ../gtk/gtkstock.c:362
- msgctxt "Stock label, navigation"
- msgid "_Top"
- msgstr "Ba_rr:"
- 
- #. This is a navigation label as in "go back"
--#: gtk/gtkstock.c:353
-+#: ../gtk/gtkstock.c:364
- msgctxt "Stock label, navigation"
- msgid "_Back"
- msgstr "Ar A_is"
- 
- #. This is a navigation label as in "go down"
--#: gtk/gtkstock.c:355
-+#: ../gtk/gtkstock.c:366
- msgctxt "Stock label, navigation"
- msgid "_Down"
- msgstr "_Síos"
- 
- #. This is a navigation label as in "go forward"
--#: gtk/gtkstock.c:357
-+#: ../gtk/gtkstock.c:368
- msgctxt "Stock label, navigation"
- msgid "_Forward"
- msgstr "Ar A_ghaidh"
- 
- #. This is a navigation label as in "go up"
--#: gtk/gtkstock.c:359
-+#: ../gtk/gtkstock.c:370
- msgctxt "Stock label, navigation"
- msgid "_Up"
- msgstr "_Siar"
- 
--#: gtk/gtkstock.c:360
-+#: ../gtk/gtkstock.c:371
- #, fuzzy
- msgctxt "Stock label"
- msgid "_Hard Disk"
- msgstr "Diosca _Crua"
- 
--#: gtk/gtkstock.c:361
-+#: ../gtk/gtkstock.c:372
- msgctxt "Stock label"
- msgid "_Help"
- msgstr "Cab_hair"
- 
--#: gtk/gtkstock.c:362
-+#: ../gtk/gtkstock.c:373
- msgctxt "Stock label"
- msgid "_Home"
- msgstr "_Baile"
- 
--#: gtk/gtkstock.c:363
-+#: ../gtk/gtkstock.c:374
- msgctxt "Stock label"
- msgid "Increase Indent"
- msgstr "Méadaigh Eang"
- 
--#: gtk/gtkstock.c:364
-+#: ../gtk/gtkstock.c:375
- msgctxt "Stock label"
- msgid "Decrease Indent"
- msgstr "Laghdaigh Eang"
- 
--#: gtk/gtkstock.c:365
-+#: ../gtk/gtkstock.c:376
- msgctxt "Stock label"
- msgid "_Index"
- msgstr "_Innéacs"
- 
--#: gtk/gtkstock.c:366
-+#: ../gtk/gtkstock.c:377
- msgctxt "Stock label"
- msgid "_Information"
- msgstr "_Eolas"
- 
--#: gtk/gtkstock.c:367
-+#: ../gtk/gtkstock.c:378
- msgctxt "Stock label"
- msgid "_Italic"
- msgstr "Cló _Iodálach"
- 
--#: gtk/gtkstock.c:368
-+#: ../gtk/gtkstock.c:379
- msgctxt "Stock label"
- msgid "_Jump to"
- msgstr "_Léim Go"
- 
- #. This is about text justification, "centered text"
--#: gtk/gtkstock.c:370
-+#: ../gtk/gtkstock.c:381
- msgctxt "Stock label"
- msgid "_Center"
- msgstr "_Láraigh"
- 
- #. This is about text justification
--#: gtk/gtkstock.c:372
-+#: ../gtk/gtkstock.c:383
- msgctxt "Stock label"
- msgid "_Fill"
- msgstr "_Líon"
- 
- #. This is about text justification, "left-justified text"
--#: gtk/gtkstock.c:374
-+#: ../gtk/gtkstock.c:385
- msgctxt "Stock label"
- msgid "_Left"
- msgstr "Ar _Chlé"
- 
- #. This is about text justification, "right-justified text"
--#: gtk/gtkstock.c:376
-+#: ../gtk/gtkstock.c:387
- msgctxt "Stock label"
- msgid "_Right"
- msgstr "Ar _Dheis"
- 
- #. Media label, as in "fast forward"
--#: gtk/gtkstock.c:379
-+#: ../gtk/gtkstock.c:390
- msgctxt "Stock label, media"
- msgid "_Forward"
- msgstr "_Ar Aghaidh"
- 
- #. Media label, as in "next song"
--#: gtk/gtkstock.c:381
-+#: ../gtk/gtkstock.c:392
- msgctxt "Stock label, media"
- msgid "_Next"
- msgstr "Ar _Aghaidh"
- 
- #. Media label, as in "pause music"
--#: gtk/gtkstock.c:383
-+#: ../gtk/gtkstock.c:394
- msgctxt "Stock label, media"
- msgid "P_ause"
- msgstr "_Sos"
- 
- #. Media label, as in "play music"
--#: gtk/gtkstock.c:385
-+#: ../gtk/gtkstock.c:396
- msgctxt "Stock label, media"
- msgid "_Play"
- msgstr "_Seinn"
- 
- #. Media label, as in  "previous song"
--#: gtk/gtkstock.c:387
-+#: ../gtk/gtkstock.c:398
- msgctxt "Stock label, media"
- msgid "Pre_vious"
- msgstr "_Roimhe Seo"
- 
- #. Media label
--#: gtk/gtkstock.c:389
-+#: ../gtk/gtkstock.c:400
- msgctxt "Stock label, media"
- msgid "_Record"
- msgstr "_Taifead"
- 
- #. Media label
--#: gtk/gtkstock.c:391
-+#: ../gtk/gtkstock.c:402
- msgctxt "Stock label, media"
- msgid "R_ewind"
- msgstr "At_ochrais"
- 
- #. Media label
--#: gtk/gtkstock.c:393
-+#: ../gtk/gtkstock.c:404
- msgctxt "Stock label, media"
- msgid "_Stop"
- msgstr "_Stad"
- 
--#: gtk/gtkstock.c:394
-+#: ../gtk/gtkstock.c:405
- msgctxt "Stock label"
- msgid "_Network"
- msgstr "Lío_nra"
- 
--#: gtk/gtkstock.c:395
-+#: ../gtk/gtkstock.c:406
- msgctxt "Stock label"
- msgid "_New"
- msgstr "_Nua"
- 
--#: gtk/gtkstock.c:396
-+#: ../gtk/gtkstock.c:407
- msgctxt "Stock label"
- msgid "_No"
- msgstr "_Níl"
- 
--#: gtk/gtkstock.c:397
-+#: ../gtk/gtkstock.c:408
- msgctxt "Stock label"
- msgid "_OK"
- msgstr "Tá g_o Maith"
- 
--#: gtk/gtkstock.c:398
-+#: ../gtk/gtkstock.c:409
- msgctxt "Stock label"
- msgid "_Open"
- msgstr "_Oscail"
- 
- #. Page orientation
--#: gtk/gtkstock.c:400
-+#: ../gtk/gtkstock.c:411
- msgctxt "Stock label"
- msgid "Landscape"
- msgstr "Tírdhreach"
- 
- #. Page orientation
--#: gtk/gtkstock.c:402
-+#: ../gtk/gtkstock.c:413
- msgctxt "Stock label"
- msgid "Portrait"
- msgstr "Portráid"
- 
- #. Page orientation
--#: gtk/gtkstock.c:404
-+#: ../gtk/gtkstock.c:415
- msgctxt "Stock label"
- msgid "Reverse landscape"
- msgstr "Tírdhreach aisiompaithe"
- 
- #. Page orientation
--#: gtk/gtkstock.c:406
-+#: ../gtk/gtkstock.c:417
- msgctxt "Stock label"
- msgid "Reverse portrait"
- msgstr "Portráid aisiompaithe"
- 
--#: gtk/gtkstock.c:407
-+#: ../gtk/gtkstock.c:418
- msgctxt "Stock label"
- msgid "Page Set_up"
- msgstr "Socrú _Leathanaigh"
- 
--#: gtk/gtkstock.c:408
-+#: ../gtk/gtkstock.c:419
- msgctxt "Stock label"
- msgid "_Paste"
- msgstr "G_reamaigh"
- 
--#: gtk/gtkstock.c:409
-+#: ../gtk/gtkstock.c:420
- msgctxt "Stock label"
- msgid "_Preferences"
- msgstr "_Sainroghanna"
- 
--#: gtk/gtkstock.c:410
-+#: ../gtk/gtkstock.c:421
- msgctxt "Stock label"
- msgid "_Print"
- msgstr "_Priontáil"
- 
--#: gtk/gtkstock.c:411
-+#: ../gtk/gtkstock.c:422
- msgctxt "Stock label"
- msgid "Print Pre_view"
- msgstr "Réamh_amharc Priontála"
- 
--#: gtk/gtkstock.c:412
-+#: ../gtk/gtkstock.c:423
- msgctxt "Stock label"
- msgid "_Properties"
- msgstr "_Airíonna"
- 
--#: gtk/gtkstock.c:413
-+#: ../gtk/gtkstock.c:424
- msgctxt "Stock label"
- msgid "_Quit"
- msgstr "_Scoir"
- 
--#: gtk/gtkstock.c:414
-+#: ../gtk/gtkstock.c:425
- msgctxt "Stock label"
- msgid "_Redo"
- msgstr "_Athfheidhmigh"
- 
--#: gtk/gtkstock.c:415
-+#: ../gtk/gtkstock.c:426
- msgctxt "Stock label"
- msgid "_Refresh"
- msgstr "_Athnuaigh"
- 
--#: gtk/gtkstock.c:416
-+#: ../gtk/gtkstock.c:427
- msgctxt "Stock label"
- msgid "_Remove"
- msgstr "_Bain"
- 
--#: gtk/gtkstock.c:417
-+#: ../gtk/gtkstock.c:428
- msgctxt "Stock label"
- msgid "_Revert"
- msgstr "_Fill"
- 
--#: gtk/gtkstock.c:418
-+#: ../gtk/gtkstock.c:429
- msgctxt "Stock label"
- msgid "_Save"
- msgstr "_Sábháil"
- 
--#: gtk/gtkstock.c:419
-+#: ../gtk/gtkstock.c:430
- msgctxt "Stock label"
- msgid "Save _As"
- msgstr "Sábháil M_ar"
- 
--#: gtk/gtkstock.c:420
-+#: ../gtk/gtkstock.c:431
- msgctxt "Stock label"
- msgid "Select _All"
- msgstr "Roghnaigh _Gach Rud"
- 
--#: gtk/gtkstock.c:421
-+#: ../gtk/gtkstock.c:432
- msgctxt "Stock label"
- msgid "_Color"
- msgstr "_Dath"
- 
--#: gtk/gtkstock.c:422
-+#: ../gtk/gtkstock.c:433
- msgctxt "Stock label"
- msgid "_Font"
- msgstr "_Cló"
- 
- #. Sorting direction
--#: gtk/gtkstock.c:424
-+#: ../gtk/gtkstock.c:435
- msgctxt "Stock label"
- msgid "_Ascending"
- msgstr "_Ardaitheach"
- 
- #. Sorting direction
--#: gtk/gtkstock.c:426
-+#: ../gtk/gtkstock.c:437
- msgctxt "Stock label"
- msgid "_Descending"
- msgstr "Í_slitheach"
- 
--#: gtk/gtkstock.c:427
-+#: ../gtk/gtkstock.c:438
- msgctxt "Stock label"
- msgid "_Spell Check"
- msgstr "_Litriú"
- 
--#: gtk/gtkstock.c:428
-+#: ../gtk/gtkstock.c:439
- msgctxt "Stock label"
- msgid "_Stop"
- msgstr "_Stad"
- 
- #. Font variant
--#: gtk/gtkstock.c:430
-+#: ../gtk/gtkstock.c:441
- msgctxt "Stock label"
- msgid "_Strikethrough"
- msgstr "Líne _Trí"
- 
--#: gtk/gtkstock.c:431
-+#: ../gtk/gtkstock.c:442
- msgctxt "Stock label"
- msgid "_Undelete"
- msgstr "_Díscrios"
- 
- #. Font variant
--#: gtk/gtkstock.c:433
-+#: ../gtk/gtkstock.c:444
- msgctxt "Stock label"
- msgid "_Underline"
- msgstr "_Líne Faoi"
- 
--#: gtk/gtkstock.c:434
-+#: ../gtk/gtkstock.c:445
- msgctxt "Stock label"
- msgid "_Undo"
- msgstr "Cea_laigh"
- 
--#: gtk/gtkstock.c:435
-+#: ../gtk/gtkstock.c:446
- msgctxt "Stock label"
- msgid "_Yes"
- msgstr "_Tá"
- 
- #. Zoom
--#: gtk/gtkstock.c:437
-+#: ../gtk/gtkstock.c:448
- msgctxt "Stock label"
- msgid "_Normal Size"
- msgstr "_Gnáthmhéid"
- 
- #. Zoom
--#: gtk/gtkstock.c:439
-+#: ../gtk/gtkstock.c:450
- msgctxt "Stock label"
- msgid "Best _Fit"
- msgstr "_Scothoiriúint"
- 
--#: gtk/gtkstock.c:440
-+#: ../gtk/gtkstock.c:451
- msgctxt "Stock label"
- msgid "Zoom _In"
- msgstr "Súmáil _Isteach"
- 
--#: gtk/gtkstock.c:441
-+#: ../gtk/gtkstock.c:452
- msgctxt "Stock label"
- msgid "Zoom _Out"
- msgstr "Súmáil _Amach"
- 
--#: gtk/gtktextbufferrichtext.c:650
-+#. Translators: if the "on" state label requires more than three
-+#. * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for
-+#. * the state
-+#.
-+#: ../gtk/gtkswitch.c:337 ../gtk/gtkswitch.c:392 ../gtk/gtkswitch.c:586
-+msgctxt "switch"
-+msgid "ON"
-+msgstr "❙"
-+
-+#. Translators: if the "off" state label requires more than three
-+#. * glyphs then use WHITE CIRCLE (U+25CB) as the text for the state
-+#.
-+#: ../gtk/gtkswitch.c:345 ../gtk/gtkswitch.c:393 ../gtk/gtkswitch.c:615
-+msgctxt "switch"
-+msgid "OFF"
-+msgstr "○"
-+
-+#: ../gtk/gtktextbufferrichtext.c:649
- #, c-format
- msgid "Unknown error when trying to deserialize %s"
- msgstr ""
- 
--#: gtk/gtktextbufferrichtext.c:709
-+#: ../gtk/gtktextbufferrichtext.c:708
- #, c-format
- msgid "No deserialize function found for format %s"
- msgstr ""
- 
--#: gtk/gtktextbufferserialize.c:795 gtk/gtktextbufferserialize.c:821
-+#: ../gtk/gtktextbufferserialize.c:798 ../gtk/gtktextbufferserialize.c:824
- #, c-format
- msgid "Both \"id\" and \"name\" were found on the <%s> element"
- msgstr "Aimsíodh \"id\" agus \"name\" araon ar an eilimint <%s>"
- 
--#: gtk/gtktextbufferserialize.c:805 gtk/gtktextbufferserialize.c:831
-+#: ../gtk/gtktextbufferserialize.c:808 ../gtk/gtktextbufferserialize.c:834
- #, c-format
- msgid "The attribute \"%s\" was found twice on the <%s> element"
- msgstr "Aimsíodh an tréith \"%s\" faoi dhó ar an eilimint <%s>"
- 
--#: gtk/gtktextbufferserialize.c:845
-+#: ../gtk/gtktextbufferserialize.c:850
- #, fuzzy, c-format
- msgid "<%s> element has invalid ID \"%s\""
- msgstr "Tá ca neamhbhailí \"%2$s\" ag eilimint <%1$s>"
- 
--#: gtk/gtktextbufferserialize.c:855
-+#: ../gtk/gtktextbufferserialize.c:860
- #, c-format
- msgid "<%s> element has neither a \"name\" nor an \"id\" attribute"
- msgstr "Níl tréith \"name\" ná \"id\" ag an eilimint <%s>"
- 
--#: gtk/gtktextbufferserialize.c:942
-+#: ../gtk/gtktextbufferserialize.c:947
- #, c-format
- msgid "Attribute \"%s\" repeated twice on the same <%s> element"
- msgstr ""
- 
--#: gtk/gtktextbufferserialize.c:960 gtk/gtktextbufferserialize.c:985
-+#: ../gtk/gtktextbufferserialize.c:965 ../gtk/gtktextbufferserialize.c:990
- #, c-format
- msgid "Attribute \"%s\" is invalid on <%s> element in this context"
- msgstr ""
- 
--#: gtk/gtktextbufferserialize.c:1024
-+#: ../gtk/gtktextbufferserialize.c:1029
- #, c-format
- msgid "Tag \"%s\" has not been defined."
- msgstr "Níor sainmhíníodh an chlib \"%s\"."
- 
--#: gtk/gtktextbufferserialize.c:1036
-+#: ../gtk/gtktextbufferserialize.c:1041
- msgid "Anonymous tag found and tags can not be created."
- msgstr ""
- 
--#: gtk/gtktextbufferserialize.c:1047
-+#: ../gtk/gtktextbufferserialize.c:1052
- #, c-format
- msgid "Tag \"%s\" does not exist in buffer and tags can not be created."
- msgstr ""
- 
--#: gtk/gtktextbufferserialize.c:1146 gtk/gtktextbufferserialize.c:1221
--#: gtk/gtktextbufferserialize.c:1324 gtk/gtktextbufferserialize.c:1398
-+#: ../gtk/gtktextbufferserialize.c:1151 ../gtk/gtktextbufferserialize.c:1226
-+#: ../gtk/gtktextbufferserialize.c:1331 ../gtk/gtktextbufferserialize.c:1405
- #, c-format
- msgid "Element <%s> is not allowed below <%s>"
- msgstr "Ní cheadaítear an eilimint <%s> faoi <%s>"
- 
--#: gtk/gtktextbufferserialize.c:1177
-+#: ../gtk/gtktextbufferserialize.c:1182
- #, c-format
- msgid "\"%s\" is not a valid attribute type"
- msgstr "Ní cineál tréithe bailí é \"%s\""
- 
--#: gtk/gtktextbufferserialize.c:1185
-+#: ../gtk/gtktextbufferserialize.c:1190
- #, c-format
- msgid "\"%s\" is not a valid attribute name"
- msgstr "Ní ainm tréithe bailí é \"%s\""
- 
--#: gtk/gtktextbufferserialize.c:1195
-+#: ../gtk/gtktextbufferserialize.c:1200
- #, c-format
- msgid ""
- "\"%s\" could not be converted to a value of type \"%s\" for attribute \"%s\""
- msgstr ""
- 
--#: gtk/gtktextbufferserialize.c:1204
-+#: ../gtk/gtktextbufferserialize.c:1209
- #, c-format
- msgid "\"%s\" is not a valid value for attribute \"%s\""
- msgstr ""
- 
--#: gtk/gtktextbufferserialize.c:1289
-+#: ../gtk/gtktextbufferserialize.c:1294
- #, c-format
- msgid "Tag \"%s\" already defined"
- msgstr "Sainmhíníodh clib \"%s\" cheana."
- 
--#: gtk/gtktextbufferserialize.c:1300
-+#: ../gtk/gtktextbufferserialize.c:1307
- #, c-format
- msgid "Tag \"%s\" has invalid priority \"%s\""
- msgstr ""
- 
--#: gtk/gtktextbufferserialize.c:1353
-+#: ../gtk/gtktextbufferserialize.c:1360
- #, c-format
- msgid "Outermost element in text must be <text_view_markup> not <%s>"
- msgstr ""
- 
--#: gtk/gtktextbufferserialize.c:1362 gtk/gtktextbufferserialize.c:1378
-+#: ../gtk/gtktextbufferserialize.c:1369 ../gtk/gtktextbufferserialize.c:1385
- #, c-format
- msgid "A <%s> element has already been specified"
- msgstr ""
- 
--#: gtk/gtktextbufferserialize.c:1384
-+#: ../gtk/gtktextbufferserialize.c:1391
- msgid "A <text> element can't occur before a <tags> element"
- msgstr ""
- 
--#: gtk/gtktextbufferserialize.c:1784
-+#: ../gtk/gtktextbufferserialize.c:1790
- msgid "Serialized data is malformed"
- msgstr ""
- 
--#: gtk/gtktextbufferserialize.c:1862
-+#: ../gtk/gtktextbufferserialize.c:1868
- msgid ""
- "Serialized data is malformed. First section isn't GTKTEXTBUFFERCONTENTS-0001"
- msgstr ""
- 
--#: gtk/gtktextutil.c:60
-+#: ../gtk/gtktextutil.c:58
- msgid "LRM _Left-to-right mark"
- msgstr "LRM Marc _Clé-go-deas"
- 
--#: gtk/gtktextutil.c:61
-+#: ../gtk/gtktextutil.c:59
- msgid "RLM _Right-to-left mark"
- msgstr "RLM Marc _Deas-go-clé"
- 
--#: gtk/gtktextutil.c:62
-+#: ../gtk/gtktextutil.c:60
- msgid "LRE Left-to-right _embedding"
- msgstr "LRE _Leabú Clé-go-deas"
- 
--#: gtk/gtktextutil.c:63
-+#: ../gtk/gtktextutil.c:61
- msgid "RLE Right-to-left e_mbedding"
- msgstr "RLE L_eabú Deas-go-clé"
- 
--#: gtk/gtktextutil.c:64
-+#: ../gtk/gtktextutil.c:62
- msgid "LRO Left-to-right _override"
- msgstr "LRO _Sárú Clé-go-deas"
- 
--#: gtk/gtktextutil.c:65
-+#: ../gtk/gtktextutil.c:63
- msgid "RLO Right-to-left o_verride"
- msgstr "RLO Sá_rú Deas-go-clé"
- 
--#: gtk/gtktextutil.c:66
-+#: ../gtk/gtktextutil.c:64
- msgid "PDF _Pop directional formatting"
- msgstr ""
- 
--#: gtk/gtktextutil.c:67
-+#: ../gtk/gtktextutil.c:65
- msgid "ZWS _Zero width space"
- msgstr ""
- 
--#: gtk/gtktextutil.c:68
-+#: ../gtk/gtktextutil.c:66
- msgid "ZWJ Zero width _joiner"
- msgstr ""
- 
--#: gtk/gtktextutil.c:69
-+#: ../gtk/gtktextutil.c:67
- msgid "ZWNJ Zero width _non-joiner"
- msgstr ""
- 
--#: gtk/gtkthemes.c:72
--#, c-format
--msgid "Unable to locate theme engine in module_path: \"%s\","
--msgstr "Ní féidir inneall téama a aimsiú i module_path: \"%s\","
--
--#: gtk/gtkuimanager.c:1505
-+#: ../gtk/gtkuimanager.c:1781
- #, c-format
- msgid "Unexpected start tag '%s' on line %d char %d"
- msgstr ""
- 
--#: gtk/gtkuimanager.c:1595
-+#: ../gtk/gtkuimanager.c:1871
- #, c-format
- msgid "Unexpected character data on line %d char %d"
- msgstr ""
- 
--#: gtk/gtkuimanager.c:2427
-+#: ../gtk/gtkuimanager.c:2694
- msgid "Empty"
- msgstr "Folamh"
- 
--#: gtk/gtkvolumebutton.c:83
-+#: ../gtk/gtkvolumebutton.c:169
- msgid "Volume"
- msgstr "Airde"
- 
--#: gtk/gtkvolumebutton.c:85
-+#: ../gtk/gtkvolumebutton.c:171
- msgid "Turns volume down or up"
- msgstr "Méadaíonn nó laghdaíonn sé seo an airde"
- 
--#: gtk/gtkvolumebutton.c:88
-+#: ../gtk/gtkvolumebutton.c:174
- msgid "Adjusts the volume"
- msgstr "Coigeartaíonn sé seo an airde"
- 
--#: gtk/gtkvolumebutton.c:94 gtk/gtkvolumebutton.c:97
-+#: ../gtk/gtkvolumebutton.c:180 ../gtk/gtkvolumebutton.c:183
- msgid "Volume Down"
- msgstr "Airde Síos"
- 
--#: gtk/gtkvolumebutton.c:96
-+#: ../gtk/gtkvolumebutton.c:182
- msgid "Decreases the volume"
- msgstr "Laghdaíonn sé seo an airde"
- 
--#: gtk/gtkvolumebutton.c:100 gtk/gtkvolumebutton.c:103
-+#: ../gtk/gtkvolumebutton.c:186 ../gtk/gtkvolumebutton.c:189
- msgid "Volume Up"
- msgstr "Airde Suas"
- 
--#: gtk/gtkvolumebutton.c:102
-+#: ../gtk/gtkvolumebutton.c:188
- msgid "Increases the volume"
- msgstr "Méadaíonn sé seo an airde"
- 
--#: gtk/gtkvolumebutton.c:160
-+#: ../gtk/gtkvolumebutton.c:246
- msgid "Muted"
- msgstr "Gan fuaim"
- 
--#: gtk/gtkvolumebutton.c:164
-+#: ../gtk/gtkvolumebutton.c:250
- msgid "Full Volume"
- msgstr "Airde Iomlán"
- 
-@@ -2780,932 +3381,927 @@ msgstr "Airde Iomlán"
- #. * Translate the "%d" to "%Id" if you want to use localised digits,
- #. * or otherwise translate the "%d" to "%d".
- #.
--#: gtk/gtkvolumebutton.c:177
-+#: ../gtk/gtkvolumebutton.c:263
- #, c-format
- msgctxt "volume percentage"
- msgid "%d %%"
- msgstr "%d %%"
- 
--#: gtk/paper_names_offsets.c:4
-+#: ../gtk/paper_names_offsets.c:4
- msgctxt "paper size"
- msgid "asme_f"
- msgstr "asme_f"
- 
--#: gtk/paper_names_offsets.c:5
-+#: ../gtk/paper_names_offsets.c:5
- msgctxt "paper size"
- msgid "A0x2"
- msgstr "A0x2"
- 
--#: gtk/paper_names_offsets.c:6
-+#: ../gtk/paper_names_offsets.c:6
- msgctxt "paper size"
- msgid "A0"
- msgstr "A0"
- 
--#: gtk/paper_names_offsets.c:7
-+#: ../gtk/paper_names_offsets.c:7
- msgctxt "paper size"
- msgid "A0x3"
- msgstr "A0x3"
- 
--#: gtk/paper_names_offsets.c:8
-+#: ../gtk/paper_names_offsets.c:8
- msgctxt "paper size"
- msgid "A1"
- msgstr "A1"
- 
--#: gtk/paper_names_offsets.c:9
-+#: ../gtk/paper_names_offsets.c:9
- msgctxt "paper size"
- msgid "A10"
- msgstr "A10"
- 
--#: gtk/paper_names_offsets.c:10
-+#: ../gtk/paper_names_offsets.c:10
- msgctxt "paper size"
- msgid "A1x3"
- msgstr "A1x3"
- 
--#: gtk/paper_names_offsets.c:11
-+#: ../gtk/paper_names_offsets.c:11
- msgctxt "paper size"
- msgid "A1x4"
- msgstr "A1x4"
- 
--#: gtk/paper_names_offsets.c:12
-+#: ../gtk/paper_names_offsets.c:12
- msgctxt "paper size"
- msgid "A2"
- msgstr "A2"
- 
--#: gtk/paper_names_offsets.c:13
-+#: ../gtk/paper_names_offsets.c:13
- msgctxt "paper size"
- msgid "A2x3"
- msgstr "A2x3"
- 
--#: gtk/paper_names_offsets.c:14
-+#: ../gtk/paper_names_offsets.c:14
- msgctxt "paper size"
- msgid "A2x4"
- msgstr "A2x4"
- 
--#: gtk/paper_names_offsets.c:15
-+#: ../gtk/paper_names_offsets.c:15
- msgctxt "paper size"
- msgid "A2x5"
- msgstr "A2x5"
- 
--#: gtk/paper_names_offsets.c:16
-+#: ../gtk/paper_names_offsets.c:16
- msgctxt "paper size"
- msgid "A3"
- msgstr "A3"
- 
--#: gtk/paper_names_offsets.c:17
-+#: ../gtk/paper_names_offsets.c:17
- msgctxt "paper size"
- msgid "A3 Extra"
- msgstr "A3 Breise"
- 
--#: gtk/paper_names_offsets.c:18
-+#: ../gtk/paper_names_offsets.c:18
- msgctxt "paper size"
- msgid "A3x3"
- msgstr "A3x3"
- 
--#: gtk/paper_names_offsets.c:19
-+#: ../gtk/paper_names_offsets.c:19
- msgctxt "paper size"
- msgid "A3x4"
- msgstr "A3x4"
- 
--#: gtk/paper_names_offsets.c:20
-+#: ../gtk/paper_names_offsets.c:20
- msgctxt "paper size"
- msgid "A3x5"
- msgstr "A3x5"
- 
--#: gtk/paper_names_offsets.c:21
-+#: ../gtk/paper_names_offsets.c:21
- msgctxt "paper size"
- msgid "A3x6"
- msgstr "A3x6"
- 
--#: gtk/paper_names_offsets.c:22
-+#: ../gtk/paper_names_offsets.c:22
- msgctxt "paper size"
- msgid "A3x7"
- msgstr "A3x7"
- 
--#: gtk/paper_names_offsets.c:23
-+#: ../gtk/paper_names_offsets.c:23
- msgctxt "paper size"
- msgid "A4"
- msgstr "A4"
- 
--#: gtk/paper_names_offsets.c:24
-+#: ../gtk/paper_names_offsets.c:24
- msgctxt "paper size"
- msgid "A4 Extra"
- msgstr "A4 Breise"
- 
--#: gtk/paper_names_offsets.c:25
-+#: ../gtk/paper_names_offsets.c:25
- msgctxt "paper size"
- msgid "A4 Tab"
- msgstr "A4 Clib"
- 
--#: gtk/paper_names_offsets.c:26
-+#: ../gtk/paper_names_offsets.c:26
- msgctxt "paper size"
- msgid "A4x3"
- msgstr "A4x3"
- 
--#: gtk/paper_names_offsets.c:27
-+#: ../gtk/paper_names_offsets.c:27
- msgctxt "paper size"
- msgid "A4x4"
- msgstr "A4x4"
- 
--#: gtk/paper_names_offsets.c:28
-+#: ../gtk/paper_names_offsets.c:28
- msgctxt "paper size"
- msgid "A4x5"
- msgstr "A4x5"
- 
--#: gtk/paper_names_offsets.c:29
-+#: ../gtk/paper_names_offsets.c:29
- msgctxt "paper size"
- msgid "A4x6"
- msgstr "A4x6"
- 
--#: gtk/paper_names_offsets.c:30
-+#: ../gtk/paper_names_offsets.c:30
- msgctxt "paper size"
- msgid "A4x7"
- msgstr "A4x7"
- 
--#: gtk/paper_names_offsets.c:31
-+#: ../gtk/paper_names_offsets.c:31
- msgctxt "paper size"
- msgid "A4x8"
- msgstr "A4x8"
- 
--#: gtk/paper_names_offsets.c:32
-+#: ../gtk/paper_names_offsets.c:32
- msgctxt "paper size"
- msgid "A4x9"
- msgstr "A4x9"
- 
--#: gtk/paper_names_offsets.c:33
-+#: ../gtk/paper_names_offsets.c:33
- msgctxt "paper size"
- msgid "A5"
- msgstr "A5"
- 
--#: gtk/paper_names_offsets.c:34
-+#: ../gtk/paper_names_offsets.c:34
- msgctxt "paper size"
- msgid "A5 Extra"
- msgstr "A5 Breise"
- 
--#: gtk/paper_names_offsets.c:35
-+#: ../gtk/paper_names_offsets.c:35
- msgctxt "paper size"
- msgid "A6"
- msgstr "A6"
- 
--#: gtk/paper_names_offsets.c:36
-+#: ../gtk/paper_names_offsets.c:36
- msgctxt "paper size"
- msgid "A7"
- msgstr "A7"
- 
--#: gtk/paper_names_offsets.c:37
-+#: ../gtk/paper_names_offsets.c:37
- msgctxt "paper size"
- msgid "A8"
- msgstr "A8"
- 
--#: gtk/paper_names_offsets.c:38
-+#: ../gtk/paper_names_offsets.c:38
- msgctxt "paper size"
- msgid "A9"
- msgstr "A9"
- 
--#: gtk/paper_names_offsets.c:39
-+#: ../gtk/paper_names_offsets.c:39
- msgctxt "paper size"
- msgid "B0"
- msgstr "B0"
- 
--#: gtk/paper_names_offsets.c:40
-+#: ../gtk/paper_names_offsets.c:40
- msgctxt "paper size"
- msgid "B1"
- msgstr "B1"
- 
--#: gtk/paper_names_offsets.c:41
-+#: ../gtk/paper_names_offsets.c:41
- msgctxt "paper size"
- msgid "B10"
- msgstr "B10"
- 
--#: gtk/paper_names_offsets.c:42
-+#: ../gtk/paper_names_offsets.c:42
- msgctxt "paper size"
- msgid "B2"
- msgstr "B2"
- 
--#: gtk/paper_names_offsets.c:43
-+#: ../gtk/paper_names_offsets.c:43
- msgctxt "paper size"
- msgid "B3"
- msgstr "B3"
- 
--#: gtk/paper_names_offsets.c:44
-+#: ../gtk/paper_names_offsets.c:44
- msgctxt "paper size"
- msgid "B4"
- msgstr "B4"
- 
--#: gtk/paper_names_offsets.c:45
-+#: ../gtk/paper_names_offsets.c:45
- msgctxt "paper size"
- msgid "B5"
- msgstr "B5"
- 
--#: gtk/paper_names_offsets.c:46
-+#: ../gtk/paper_names_offsets.c:46
- msgctxt "paper size"
- msgid "B5 Extra"
- msgstr "B5 Breise"
- 
--#: gtk/paper_names_offsets.c:47
-+#: ../gtk/paper_names_offsets.c:47
- msgctxt "paper size"
- msgid "B6"
- msgstr "B6"
- 
--#: gtk/paper_names_offsets.c:48
-+#: ../gtk/paper_names_offsets.c:48
- msgctxt "paper size"
- msgid "B6/C4"
- msgstr "B6/C4"
- 
--#: gtk/paper_names_offsets.c:49
-+#: ../gtk/paper_names_offsets.c:49
- msgctxt "paper size"
- msgid "B7"
- msgstr "B7"
- 
--#: gtk/paper_names_offsets.c:50
-+#: ../gtk/paper_names_offsets.c:50
- msgctxt "paper size"
- msgid "B8"
- msgstr "B8"
- 
--#: gtk/paper_names_offsets.c:51
-+#: ../gtk/paper_names_offsets.c:51
- msgctxt "paper size"
- msgid "B9"
- msgstr "B9"
- 
--#: gtk/paper_names_offsets.c:52
-+#: ../gtk/paper_names_offsets.c:52
- msgctxt "paper size"
- msgid "C0"
- msgstr "C0"
- 
--#: gtk/paper_names_offsets.c:53
-+#: ../gtk/paper_names_offsets.c:53
- msgctxt "paper size"
- msgid "C1"
- msgstr "C1"
- 
--#: gtk/paper_names_offsets.c:54
-+#: ../gtk/paper_names_offsets.c:54
- msgctxt "paper size"
- msgid "C10"
- msgstr "C10"
- 
--#: gtk/paper_names_offsets.c:55
-+#: ../gtk/paper_names_offsets.c:55
- msgctxt "paper size"
- msgid "C2"
- msgstr "C2"
- 
--#: gtk/paper_names_offsets.c:56
-+#: ../gtk/paper_names_offsets.c:56
- msgctxt "paper size"
- msgid "C3"
- msgstr "C3"
- 
--#: gtk/paper_names_offsets.c:57
-+#: ../gtk/paper_names_offsets.c:57
- msgctxt "paper size"
- msgid "C4"
- msgstr "C4"
- 
--#: gtk/paper_names_offsets.c:58
-+#: ../gtk/paper_names_offsets.c:58
- msgctxt "paper size"
- msgid "C5"
- msgstr "C5"
- 
--#: gtk/paper_names_offsets.c:59
-+#: ../gtk/paper_names_offsets.c:59
- msgctxt "paper size"
- msgid "C6"
- msgstr "C6"
- 
--#: gtk/paper_names_offsets.c:60
-+#: ../gtk/paper_names_offsets.c:60
- msgctxt "paper size"
- msgid "C6/C5"
- msgstr "C6/C5"
- 
--#: gtk/paper_names_offsets.c:61
-+#: ../gtk/paper_names_offsets.c:61
- msgctxt "paper size"
- msgid "C7"
- msgstr "C7"
- 
--#: gtk/paper_names_offsets.c:62
-+#: ../gtk/paper_names_offsets.c:62
- msgctxt "paper size"
- msgid "C7/C6"
- msgstr "C7/C6"
- 
--#: gtk/paper_names_offsets.c:63
-+#: ../gtk/paper_names_offsets.c:63
- msgctxt "paper size"
- msgid "C8"
- msgstr "C8"
- 
--#: gtk/paper_names_offsets.c:64
-+#: ../gtk/paper_names_offsets.c:64
- msgctxt "paper size"
- msgid "C9"
- msgstr "C9"
- 
--#: gtk/paper_names_offsets.c:65
-+#: ../gtk/paper_names_offsets.c:65
- msgctxt "paper size"
- msgid "DL Envelope"
- msgstr "Clúdach DL"
- 
--#: gtk/paper_names_offsets.c:66
-+#: ../gtk/paper_names_offsets.c:66
- msgctxt "paper size"
- msgid "RA0"
- msgstr "RA0"
- 
--#: gtk/paper_names_offsets.c:67
-+#: ../gtk/paper_names_offsets.c:67
- msgctxt "paper size"
- msgid "RA1"
- msgstr "RA1"
- 
--#: gtk/paper_names_offsets.c:68
-+#: ../gtk/paper_names_offsets.c:68
- msgctxt "paper size"
- msgid "RA2"
- msgstr "RA2"
- 
--#: gtk/paper_names_offsets.c:69
-+#: ../gtk/paper_names_offsets.c:69
- msgctxt "paper size"
- msgid "SRA0"
- msgstr "SRA0"
- 
--#: gtk/paper_names_offsets.c:70
-+#: ../gtk/paper_names_offsets.c:70
- msgctxt "paper size"
- msgid "SRA1"
- msgstr "SRA1"
- 
--#: gtk/paper_names_offsets.c:71
-+#: ../gtk/paper_names_offsets.c:71
- msgctxt "paper size"
- msgid "SRA2"
- msgstr "SRA2"
- 
--#: gtk/paper_names_offsets.c:72
-+#: ../gtk/paper_names_offsets.c:72
- msgctxt "paper size"
- msgid "JB0"
- msgstr "JB0"
- 
--#: gtk/paper_names_offsets.c:73
-+#: ../gtk/paper_names_offsets.c:73
- msgctxt "paper size"
- msgid "JB1"
- msgstr "JB1"
- 
--#: gtk/paper_names_offsets.c:74
-+#: ../gtk/paper_names_offsets.c:74
- msgctxt "paper size"
- msgid "JB10"
- msgstr "JB10"
- 
--#: gtk/paper_names_offsets.c:75
-+#: ../gtk/paper_names_offsets.c:75
- msgctxt "paper size"
- msgid "JB2"
- msgstr "JB2"
- 
--#: gtk/paper_names_offsets.c:76
-+#: ../gtk/paper_names_offsets.c:76
- msgctxt "paper size"
- msgid "JB3"
- msgstr "JB3"
- 
--#: gtk/paper_names_offsets.c:77
-+#: ../gtk/paper_names_offsets.c:77
- msgctxt "paper size"
- msgid "JB4"
- msgstr "JB4"
- 
--#: gtk/paper_names_offsets.c:78
-+#: ../gtk/paper_names_offsets.c:78
- msgctxt "paper size"
- msgid "JB5"
- msgstr "JB5"
- 
--#: gtk/paper_names_offsets.c:79
-+#: ../gtk/paper_names_offsets.c:79
- msgctxt "paper size"
- msgid "JB6"
- msgstr "JB6"
- 
--#: gtk/paper_names_offsets.c:80
-+#: ../gtk/paper_names_offsets.c:80
- msgctxt "paper size"
- msgid "JB7"
- msgstr "JB7"
- 
--#: gtk/paper_names_offsets.c:81
-+#: ../gtk/paper_names_offsets.c:81
- msgctxt "paper size"
- msgid "JB8"
- msgstr "JB8"
- 
--#: gtk/paper_names_offsets.c:82
-+#: ../gtk/paper_names_offsets.c:82
- msgctxt "paper size"
- msgid "JB9"
- msgstr "JB9"
- 
--#: gtk/paper_names_offsets.c:83
-+#: ../gtk/paper_names_offsets.c:83
- msgctxt "paper size"
- msgid "jis exec"
- msgstr "jis exec"
- 
--#: gtk/paper_names_offsets.c:84
-+#: ../gtk/paper_names_offsets.c:84
- msgctxt "paper size"
- msgid "Choukei 2 Envelope"
- msgstr "Clúdach Choukei 2"
- 
--#: gtk/paper_names_offsets.c:85
-+#: ../gtk/paper_names_offsets.c:85
- msgctxt "paper size"
- msgid "Choukei 3 Envelope"
- msgstr "Clúdach Choukei 3"
- 
--#: gtk/paper_names_offsets.c:86
-+#: ../gtk/paper_names_offsets.c:86
- msgctxt "paper size"
- msgid "Choukei 4 Envelope"
- msgstr "Clúdach Choukei 4"
- 
--#: gtk/paper_names_offsets.c:87
-+#: ../gtk/paper_names_offsets.c:87
- msgctxt "paper size"
- msgid "hagaki (postcard)"
- msgstr "hagaki (cárta poist)"
- 
--#: gtk/paper_names_offsets.c:88
-+#: ../gtk/paper_names_offsets.c:88
- msgctxt "paper size"
- msgid "kahu Envelope"
- msgstr "Clúdach kahu"
- 
--#: gtk/paper_names_offsets.c:89
-+#: ../gtk/paper_names_offsets.c:89
- msgctxt "paper size"
- msgid "kaku2 Envelope"
- msgstr "Clúdach kaku2"
- 
--#: gtk/paper_names_offsets.c:90
-+#: ../gtk/paper_names_offsets.c:90
- msgctxt "paper size"
- msgid "oufuku (reply postcard)"
- msgstr "oufuku (cárta poist freagartha)"
- 
--#: gtk/paper_names_offsets.c:91
-+#: ../gtk/paper_names_offsets.c:91
- msgctxt "paper size"
- msgid "you4 Envelope"
- msgstr "Clúdach you4"
- 
--#: gtk/paper_names_offsets.c:92
-+#: ../gtk/paper_names_offsets.c:92
- msgctxt "paper size"
- msgid "10x11"
- msgstr "10x11"
- 
--#: gtk/paper_names_offsets.c:93
-+#: ../gtk/paper_names_offsets.c:93
- msgctxt "paper size"
- msgid "10x13"
- msgstr "10x13"
- 
--#: gtk/paper_names_offsets.c:94
-+#: ../gtk/paper_names_offsets.c:94
- msgctxt "paper size"
- msgid "10x14"
- msgstr "10x14"
- 
--#: gtk/paper_names_offsets.c:95 gtk/paper_names_offsets.c:96
-+#: ../gtk/paper_names_offsets.c:95 ../gtk/paper_names_offsets.c:96
- msgctxt "paper size"
- msgid "10x15"
- msgstr "10x15"
- 
--#: gtk/paper_names_offsets.c:97
-+#: ../gtk/paper_names_offsets.c:97
- msgctxt "paper size"
- msgid "11x12"
- msgstr "11x12"
- 
--#: gtk/paper_names_offsets.c:98
-+#: ../gtk/paper_names_offsets.c:98
- msgctxt "paper size"
- msgid "11x15"
- msgstr "11x15"
- 
--#: gtk/paper_names_offsets.c:99
-+#: ../gtk/paper_names_offsets.c:99
- msgctxt "paper size"
- msgid "12x19"
- msgstr "12x19"
- 
--#: gtk/paper_names_offsets.c:100
-+#: ../gtk/paper_names_offsets.c:100
- msgctxt "paper size"
- msgid "5x7"
- msgstr "5x7"
- 
--#: gtk/paper_names_offsets.c:101
-+#: ../gtk/paper_names_offsets.c:101
- msgctxt "paper size"
- msgid "6x9 Envelope"
- msgstr "Clúdach 6x9"
- 
--#: gtk/paper_names_offsets.c:102
-+#: ../gtk/paper_names_offsets.c:102
- msgctxt "paper size"
- msgid "7x9 Envelope"
- msgstr "Clúdach 7x9"
- 
--#: gtk/paper_names_offsets.c:103
-+#: ../gtk/paper_names_offsets.c:103
- msgctxt "paper size"
- msgid "9x11 Envelope"
- msgstr "Clúdach 9x11"
- 
--#: gtk/paper_names_offsets.c:104
-+#: ../gtk/paper_names_offsets.c:104
- msgctxt "paper size"
- msgid "a2 Envelope"
- msgstr "Clúdach a2"
- 
--#: gtk/paper_names_offsets.c:105
-+#: ../gtk/paper_names_offsets.c:105
- msgctxt "paper size"
- msgid "Arch A"
- msgstr "Arch A"
- 
--#: gtk/paper_names_offsets.c:106
-+#: ../gtk/paper_names_offsets.c:106
- msgctxt "paper size"
- msgid "Arch B"
- msgstr "Arch B"
- 
--#: gtk/paper_names_offsets.c:107
-+#: ../gtk/paper_names_offsets.c:107
- msgctxt "paper size"
- msgid "Arch C"
- msgstr "Arch C"
- 
--#: gtk/paper_names_offsets.c:108
-+#: ../gtk/paper_names_offsets.c:108
- msgctxt "paper size"
- msgid "Arch D"
- msgstr "Arch D"
- 
--#: gtk/paper_names_offsets.c:109
-+#: ../gtk/paper_names_offsets.c:109
- msgctxt "paper size"
- msgid "Arch E"
- msgstr "Arch E"
- 
--#: gtk/paper_names_offsets.c:110
-+#: ../gtk/paper_names_offsets.c:110
- msgctxt "paper size"
- msgid "b-plus"
- msgstr "b-plus"
- 
--#: gtk/paper_names_offsets.c:111
-+#: ../gtk/paper_names_offsets.c:111
- msgctxt "paper size"
- msgid "c"
- msgstr "c"
- 
--#: gtk/paper_names_offsets.c:112
-+#: ../gtk/paper_names_offsets.c:112
- msgctxt "paper size"
- msgid "c5 Envelope"
- msgstr "Clúdach c5"
- 
--#: gtk/paper_names_offsets.c:113
-+#: ../gtk/paper_names_offsets.c:113
- msgctxt "paper size"
- msgid "d"
- msgstr "d"
- 
--#: gtk/paper_names_offsets.c:114
-+#: ../gtk/paper_names_offsets.c:114
- msgctxt "paper size"
- msgid "e"
- msgstr "e"
- 
--#: gtk/paper_names_offsets.c:115
-+#: ../gtk/paper_names_offsets.c:115
- msgctxt "paper size"
- msgid "edp"
- msgstr "edp"
- 
--#: gtk/paper_names_offsets.c:116
-+#: ../gtk/paper_names_offsets.c:116
- msgctxt "paper size"
- msgid "European edp"
- msgstr "edp Eorpach"
- 
--#: gtk/paper_names_offsets.c:117
-+#: ../gtk/paper_names_offsets.c:117
- msgctxt "paper size"
- msgid "Executive"
- msgstr "Feidhmeannach"
- 
--#: gtk/paper_names_offsets.c:118
-+#: ../gtk/paper_names_offsets.c:118
- msgctxt "paper size"
- msgid "f"
- msgstr "f"
- 
--#: gtk/paper_names_offsets.c:119
-+#: ../gtk/paper_names_offsets.c:119
- msgctxt "paper size"
- msgid "FanFold European"
- msgstr "FanFold Eorpach"
- 
--#: gtk/paper_names_offsets.c:120
-+#: ../gtk/paper_names_offsets.c:120
- msgctxt "paper size"
- msgid "FanFold US"
- msgstr "FanFold (SAM)"
- 
--#: gtk/paper_names_offsets.c:121
-+#: ../gtk/paper_names_offsets.c:121
- msgctxt "paper size"
- msgid "FanFold German Legal"
- msgstr "Fanfold Dlí Gearmánach"
- 
--#: gtk/paper_names_offsets.c:122
-+#: ../gtk/paper_names_offsets.c:122
- msgctxt "paper size"
- msgid "Government Legal"
- msgstr "Dlí Rialtais"
- 
--#: gtk/paper_names_offsets.c:123
-+#: ../gtk/paper_names_offsets.c:123
- msgctxt "paper size"
- msgid "Government Letter"
- msgstr "Litir Rialtais"
- 
--#: gtk/paper_names_offsets.c:124
-+#: ../gtk/paper_names_offsets.c:124
- msgctxt "paper size"
- msgid "Index 3x5"
- msgstr "Innéacs 3x5"
- 
--#: gtk/paper_names_offsets.c:125
-+#: ../gtk/paper_names_offsets.c:125
- msgctxt "paper size"
- msgid "Index 4x6 (postcard)"
- msgstr "Innéacs 4x6 (cárta poist)"
- 
--#: gtk/paper_names_offsets.c:126
-+#: ../gtk/paper_names_offsets.c:126
- msgctxt "paper size"
- msgid "Index 4x6 ext"
- msgstr "Innéacs 4x6 ext"
- 
--#: gtk/paper_names_offsets.c:127
-+#: ../gtk/paper_names_offsets.c:127
- msgctxt "paper size"
- msgid "Index 5x8"
- msgstr "Innéacs 5x8"
- 
--#: gtk/paper_names_offsets.c:128
-+#: ../gtk/paper_names_offsets.c:128
- msgctxt "paper size"
- msgid "Invoice"
- msgstr "Sonrasc"
- 
--#: gtk/paper_names_offsets.c:129
-+#: ../gtk/paper_names_offsets.c:129
- msgctxt "paper size"
- msgid "Tabloid"
- msgstr "Tablóid"
- 
--#: gtk/paper_names_offsets.c:130
-+#: ../gtk/paper_names_offsets.c:130
- msgctxt "paper size"
- msgid "US Legal"
- msgstr "Dlí (SAM)"
- 
--#: gtk/paper_names_offsets.c:131
-+#: ../gtk/paper_names_offsets.c:131
- msgctxt "paper size"
- msgid "US Legal Extra"
- msgstr "Dlí Breise (SAM)"
- 
--#: gtk/paper_names_offsets.c:132
-+#: ../gtk/paper_names_offsets.c:132
- msgctxt "paper size"
- msgid "US Letter"
- msgstr "Litir (SAM)"
- 
--#: gtk/paper_names_offsets.c:133
-+#: ../gtk/paper_names_offsets.c:133
- msgctxt "paper size"
- msgid "US Letter Extra"
- msgstr "Litir Breise (SAM)"
- 
--#: gtk/paper_names_offsets.c:134
-+#: ../gtk/paper_names_offsets.c:134
- msgctxt "paper size"
- msgid "US Letter Plus"
- msgstr "Litir Plus (SAM)"
- 
--#: gtk/paper_names_offsets.c:135
-+#: ../gtk/paper_names_offsets.c:135
- msgctxt "paper size"
- msgid "Monarch Envelope"
- msgstr "Clúdach Monarch"
- 
--#: gtk/paper_names_offsets.c:136
-+#: ../gtk/paper_names_offsets.c:136
- msgctxt "paper size"
- msgid "#10 Envelope"
- msgstr "Clúdach #10"
- 
--#: gtk/paper_names_offsets.c:137
-+#: ../gtk/paper_names_offsets.c:137
- msgctxt "paper size"
- msgid "#11 Envelope"
- msgstr "Clúdach #11"
- 
--#: gtk/paper_names_offsets.c:138
-+#: ../gtk/paper_names_offsets.c:138
- msgctxt "paper size"
- msgid "#12 Envelope"
- msgstr "Clúdach #12"
- 
--#: gtk/paper_names_offsets.c:139
-+#: ../gtk/paper_names_offsets.c:139
- msgctxt "paper size"
- msgid "#14 Envelope"
- msgstr "Clúdach #14"
- 
--#: gtk/paper_names_offsets.c:140
-+#: ../gtk/paper_names_offsets.c:140
- msgctxt "paper size"
- msgid "#9 Envelope"
- msgstr "Clúdach #9"
- 
--#: gtk/paper_names_offsets.c:141
-+#: ../gtk/paper_names_offsets.c:141
- msgctxt "paper size"
- msgid "Personal Envelope"
- msgstr "Clúdach Pearsanta"
- 
--#: gtk/paper_names_offsets.c:142
-+#: ../gtk/paper_names_offsets.c:142
- msgctxt "paper size"
- msgid "Quarto"
- msgstr "Ceathairfhillte"
- 
--#: gtk/paper_names_offsets.c:143
-+#: ../gtk/paper_names_offsets.c:143
- msgctxt "paper size"
- msgid "Super A"
- msgstr "Super A"
- 
--#: gtk/paper_names_offsets.c:144
-+#: ../gtk/paper_names_offsets.c:144
- msgctxt "paper size"
- msgid "Super B"
- msgstr "Super B"
- 
--#: gtk/paper_names_offsets.c:145
-+#: ../gtk/paper_names_offsets.c:145
- msgctxt "paper size"
- msgid "Wide Format"
- msgstr "Formáid Leathan"
- 
--#: gtk/paper_names_offsets.c:146
-+#: ../gtk/paper_names_offsets.c:146
- msgctxt "paper size"
- msgid "Dai-pa-kai"
- msgstr "Dai-pa-kai"
- 
--#: gtk/paper_names_offsets.c:147
-+#: ../gtk/paper_names_offsets.c:147
- msgctxt "paper size"
- msgid "Folio"
- msgstr "Fóilió"
- 
--#: gtk/paper_names_offsets.c:148
-+#: ../gtk/paper_names_offsets.c:148
- msgctxt "paper size"
- msgid "Folio sp"
- msgstr "Fóilió sp"
- 
--#: gtk/paper_names_offsets.c:149
-+#: ../gtk/paper_names_offsets.c:149
- msgctxt "paper size"
- msgid "Invite Envelope"
- msgstr "Clúdach Cuiridh"
- 
--#: gtk/paper_names_offsets.c:150
-+#: ../gtk/paper_names_offsets.c:150
- msgctxt "paper size"
- msgid "Italian Envelope"
- msgstr "Clúdach Iodálach"
- 
--#: gtk/paper_names_offsets.c:151
-+#: ../gtk/paper_names_offsets.c:151
- msgctxt "paper size"
- msgid "juuro-ku-kai"
- msgstr "juuro-ku-kai"
- 
--#: gtk/paper_names_offsets.c:152
-+#: ../gtk/paper_names_offsets.c:152
- msgctxt "paper size"
- msgid "pa-kai"
- msgstr "pa-kai"
- 
--#: gtk/paper_names_offsets.c:153
-+#: ../gtk/paper_names_offsets.c:153
- msgctxt "paper size"
- msgid "Postfix Envelope"
- msgstr "Clúdach Postfix"
- 
--#: gtk/paper_names_offsets.c:154
-+#: ../gtk/paper_names_offsets.c:154
- msgctxt "paper size"
- msgid "Small Photo"
- msgstr "Grianghraf Beag"
- 
--#: gtk/paper_names_offsets.c:155
-+#: ../gtk/paper_names_offsets.c:155
- msgctxt "paper size"
- msgid "prc1 Envelope"
- msgstr "Clúdach prc1"
- 
--#: gtk/paper_names_offsets.c:156
-+#: ../gtk/paper_names_offsets.c:156
- msgctxt "paper size"
- msgid "prc10 Envelope"
- msgstr "Clúdach prc10"
- 
--#: gtk/paper_names_offsets.c:157
-+#: ../gtk/paper_names_offsets.c:157
- msgctxt "paper size"
- msgid "prc 16k"
- msgstr "prc 16k"
- 
--#: gtk/paper_names_offsets.c:158
-+#: ../gtk/paper_names_offsets.c:158
- msgctxt "paper size"
- msgid "prc2 Envelope"
- msgstr "Clúdach prc2"
- 
--#: gtk/paper_names_offsets.c:159
-+#: ../gtk/paper_names_offsets.c:159
- msgctxt "paper size"
- msgid "prc3 Envelope"
- msgstr "Clúdach prc3"
- 
--#: gtk/paper_names_offsets.c:160
-+#: ../gtk/paper_names_offsets.c:160
- msgctxt "paper size"
- msgid "prc 32k"
- msgstr "prc 32k"
- 
--#: gtk/paper_names_offsets.c:161
-+#: ../gtk/paper_names_offsets.c:161
- msgctxt "paper size"
- msgid "prc4 Envelope"
- msgstr "Clúdach prc4"
- 
--#: gtk/paper_names_offsets.c:162
-+#: ../gtk/paper_names_offsets.c:162
- msgctxt "paper size"
- msgid "prc5 Envelope"
- msgstr "Clúdach prc5"
- 
--#: gtk/paper_names_offsets.c:163
-+#: ../gtk/paper_names_offsets.c:163
- msgctxt "paper size"
- msgid "prc6 Envelope"
- msgstr "Clúdach prc6"
- 
--#: gtk/paper_names_offsets.c:164
-+#: ../gtk/paper_names_offsets.c:164
- msgctxt "paper size"
- msgid "prc7 Envelope"
- msgstr "Clúdach prc7"
- 
--#: gtk/paper_names_offsets.c:165
-+#: ../gtk/paper_names_offsets.c:165
- msgctxt "paper size"
- msgid "prc8 Envelope"
- msgstr "Clúdach prc8"
- 
--#: gtk/paper_names_offsets.c:166
-+#: ../gtk/paper_names_offsets.c:166
- msgctxt "paper size"
- msgid "prc9 Envelope"
- msgstr "Clúdach prc9"
- 
--#: gtk/paper_names_offsets.c:167
-+#: ../gtk/paper_names_offsets.c:167
- msgctxt "paper size"
- msgid "ROC 16k"
- msgstr "ROC 16k"
- 
--#: gtk/paper_names_offsets.c:168
-+#: ../gtk/paper_names_offsets.c:168
- msgctxt "paper size"
- msgid "ROC 8k"
- msgstr "ROC 8k"
- 
--#: gtk/updateiconcache.c:492 gtk/updateiconcache.c:552
--#, c-format
--msgid "different idatas found for symlinked '%s' and '%s'\n"
--msgstr "aimsíodh idata difriúla do '%s' agus '%s' nasctha go siombalach\n"
--
--#: gtk/updateiconcache.c:1374
-+#: ../gtk/updateiconcache.c:1368
- #, c-format
- msgid "Failed to write header\n"
- msgstr "Theip ar scríobh ceanntáisc\n"
- 
--#: gtk/updateiconcache.c:1380
-+#: ../gtk/updateiconcache.c:1374
- #, c-format
- msgid "Failed to write hash table\n"
- msgstr "Theip ar scríobh hais-tábla\n"
- 
--#: gtk/updateiconcache.c:1386
-+#: ../gtk/updateiconcache.c:1380
- #, c-format
- msgid "Failed to write folder index\n"
- msgstr "Theip ar scríobh innéacs fillteáin\n"
- 
--#: gtk/updateiconcache.c:1394
-+#: ../gtk/updateiconcache.c:1388
- #, c-format
- msgid "Failed to rewrite header\n"
- msgstr "Theip ar athscríobh ceanntáisc\n"
- 
--#: gtk/updateiconcache.c:1463
-+#: ../gtk/updateiconcache.c:1482
- #, c-format
- msgid "Failed to open file %s : %s\n"
- msgstr "Theip ar oscailt comhaid %s : %s\n"
- 
--#: gtk/updateiconcache.c:1471
-+#: ../gtk/updateiconcache.c:1490 ../gtk/updateiconcache.c:1520
- #, c-format
- msgid "Failed to write cache file: %s\n"
- msgstr "Theip ar scríobh chomhad taisce: %s\n"
- 
--#: gtk/updateiconcache.c:1507
-+#: ../gtk/updateiconcache.c:1530
- #, c-format
- msgid "The generated cache was invalid.\n"
- msgstr "Bhí an taisce ghinte neamhbhailí.\n"
- 
--#: gtk/updateiconcache.c:1521
-+#: ../gtk/updateiconcache.c:1544
- #, c-format
- msgid "Could not rename %s to %s: %s, removing %s then.\n"
- msgstr "Níorbh fhéidir %s a athainmniú go %s: %s, mar sin %s á bhaint.\n"
- 
--#: gtk/updateiconcache.c:1535
-+#: ../gtk/updateiconcache.c:1558
- #, c-format
- msgid "Could not rename %s to %s: %s\n"
- msgstr "Níorbh fhéidir %s a athainmniú go %s: %s\n"
- 
--#: gtk/updateiconcache.c:1545
-+#: ../gtk/updateiconcache.c:1568
- #, c-format
- msgid "Could not rename %s back to %s: %s.\n"
- msgstr "Níorbh fhéidir %s a athainmniú ar ais go %s: %s\n"
- 
--#: gtk/updateiconcache.c:1572
-+#: ../gtk/updateiconcache.c:1595
- #, c-format
- msgid "Cache file created successfully.\n"
- msgstr "D'éirigh le cruthú an chomhaid taisce.\n"
- 
--#: gtk/updateiconcache.c:1611
-+#: ../gtk/updateiconcache.c:1634
- msgid "Overwrite an existing cache, even if up to date"
- msgstr ""
- 
--#: gtk/updateiconcache.c:1612
-+#: ../gtk/updateiconcache.c:1635
- msgid "Don't check for the existence of index.theme"
- msgstr ""
- 
--#: gtk/updateiconcache.c:1613
-+#: ../gtk/updateiconcache.c:1636
- msgid "Don't include image data in the cache"
- msgstr ""
- 
--#: gtk/updateiconcache.c:1614
-+#: ../gtk/updateiconcache.c:1637
- msgid "Output a C header file"
- msgstr "Cuir comhad ceanntáisc C amach"
- 
--#: gtk/updateiconcache.c:1615
-+#: ../gtk/updateiconcache.c:1638
- msgid "Turn off verbose output"
- msgstr "Díchumasaigh aschur foclach"
- 
--#: gtk/updateiconcache.c:1616
-+#: ../gtk/updateiconcache.c:1639
- msgid "Validate existing icon cache"
- msgstr ""
- 
--#: gtk/updateiconcache.c:1683
-+#: ../gtk/updateiconcache.c:1706
- #, c-format
- msgid "File not found: %s\n"
- msgstr "Comhad gan aimsiú: %s\n"
- 
--#: gtk/updateiconcache.c:1689
-+#: ../gtk/updateiconcache.c:1712
- #, c-format
- msgid "Not a valid icon cache: %s\n"
- msgstr "Ní taisce dheilbhíní bhailí é: %s\n"
- 
--#: gtk/updateiconcache.c:1702
-+#: ../gtk/updateiconcache.c:1725
- #, c-format
- msgid "No theme index file.\n"
- msgstr "Gan chomhad innéacs téama.\n"
- 
--#: gtk/updateiconcache.c:1706
-+#: ../gtk/updateiconcache.c:1729
- #, c-format
- msgid ""
- "No theme index file in '%s'.\n"
-@@ -3716,376 +4312,375 @@ msgstr ""
- "theme-index.\n"
- 
- #. ID
--#: modules/input/imam-et.c:454
-+#: ../modules/input/imam-et.c:452
- msgid "Amharic (EZ+)"
- msgstr "Amáiris (EZ+)"
- 
- #. ID
--#: modules/input/imcedilla.c:92
-+#: ../modules/input/imcedilla.c:90
- msgid "Cedilla"
- msgstr "Straithín"
- 
- #. ID
--#: modules/input/imcyrillic-translit.c:217
-+#: ../modules/input/imcyrillic-translit.c:215
- msgid "Cyrillic (Transliterated)"
- msgstr "Coireallach (Traslitrithe)"
- 
- #. ID
--#: modules/input/iminuktitut.c:127
-+#: ../modules/input/iminuktitut.c:125
- msgid "Inuktitut (Transliterated)"
- msgstr "Ionúitis (Traslitrithe)"
- 
- #. ID
--#: modules/input/imipa.c:145
-+#: ../modules/input/imipa.c:143
- msgid "IPA"
- msgstr "AFI"
- 
- #. ID
--#: modules/input/immultipress.c:31
-+#: ../modules/input/immultipress.c:29
- msgid "Multipress"
- msgstr "Il-bhrú"
- 
- #. ID
--#: modules/input/imthai.c:35
-+#: ../modules/input/imthai.c:33
- msgid "Thai-Lao"
- msgstr "Téalainnis-Láóis"
- 
- #. ID
--#: modules/input/imti-er.c:453
-+#: ../modules/input/imti-er.c:451
- msgid "Tigrigna-Eritrean (EZ+)"
- msgstr "Tigrínis-Eiritréach (EZ+)"
- 
- #. ID
--#: modules/input/imti-et.c:453
-+#: ../modules/input/imti-et.c:451
- msgid "Tigrigna-Ethiopian (EZ+)"
- msgstr "Tigrínis-Aetópach (EZ+)"
- 
- #. ID
--#: modules/input/imviqr.c:244
-+#: ../modules/input/imviqr.c:242
- msgid "Vietnamese (VIQR)"
- msgstr "Vítneaimis (VIQR)"
- 
- #. ID
--#: modules/input/imxim.c:28
-+#: ../modules/input/imxim.c:26
- msgid "X Input Method"
- msgstr "Modh Ionchurtha X"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:811
--#: modules/printbackends/cups/gtkprintbackendcups.c:1020
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:858
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1073
- msgid "Username:"
- msgstr "Ainm Úsáideora:"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:812
--#: modules/printbackends/cups/gtkprintbackendcups.c:1029
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:859
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1082
- msgid "Password:"
- msgstr "Focal Faire:"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:850
--#, c-format
--msgid "Authentication is required to get a file from %s"
--msgstr "Fíordheimhniú de dhíth chun comhad a fháil ó %s"
--
--#: modules/printbackends/cups/gtkprintbackendcups.c:854
--#: modules/printbackends/cups/gtkprintbackendcups.c:1042
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:898
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1095
- #, c-format
- msgid "Authentication is required to print document '%s' on printer %s"
- msgstr "Fíordheimhniú de dhíth chun cáipéis '%s' a phriontáil ar phrintéir %s"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:856
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:900
- #, c-format
- msgid "Authentication is required to print a document on %s"
- msgstr "Fíordheimhniú de dhíth chun cáipéis a phriontáil ar %s"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:860
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:904
- #, c-format
- msgid "Authentication is required to get attributes of job '%s'"
- msgstr "Fíordheimhniú de dhíth chun tréithe jab '%s' a fháil"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:862
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:906
- msgid "Authentication is required to get attributes of a job"
- msgstr "Fíordheimhniú de dhíth chun tréithe jab a fháil"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:866
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:910
- #, c-format
- msgid "Authentication is required to get attributes of printer %s"
- msgstr "Fíordheimhniú de dhíth chun tréithe printéara %s a fháil"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:868
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:912
- msgid "Authentication is required to get attributes of a printer"
- msgstr "Fíordheimhniú de dhíth chun tréithe printéara a fháil"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:871
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:915
- #, c-format
- msgid "Authentication is required to get default printer of %s"
- msgstr "Fíordheimhniú de dhíth chun an printéir réamhshocraithe %s a fháil"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:874
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:918
- #, c-format
- msgid "Authentication is required to get printers from %s"
- msgstr "Fíordheimhniú de dhíth chun printéirí a fháil ó %s"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:877
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:923
-+#, c-format
-+msgid "Authentication is required to get a file from %s"
-+msgstr "Fíordheimhniú de dhíth chun comhad a fháil ó %s"
-+
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:925
- #, c-format
- msgid "Authentication is required on %s"
- msgstr "Fíordheimhniú de dhíth ar %s"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:1014
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1067
- msgid "Domain:"
- msgstr "Fearann:"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:1044
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1097
- #, c-format
- msgid "Authentication is required to print document '%s'"
- msgstr "Fíordheimhniú de dhíth chun cáipéis '%s' a phriontáil"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:1049
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1102
- #, c-format
- msgid "Authentication is required to print this document on printer %s"
- msgstr ""
- "Fíordheimhniú de dhíth chun an cháipéis seo a phriontáil ar phrintéir %s"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:1051
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1104
- msgid "Authentication is required to print this document"
- msgstr "Fíordheimhniú de dhíth chun an cháipéis seo a phriontáil"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:1672
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1666
- #, c-format
- msgid "Printer '%s' is low on toner."
- msgstr "Tonóir gann i bprintéir '%s'."
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:1673
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1667
- #, c-format
- msgid "Printer '%s' has no toner left."
- msgstr "Níl aon tonóir fágtha i bprintéir '%s'."
- 
- #. Translators: "Developer" like on photo development context
--#: modules/printbackends/cups/gtkprintbackendcups.c:1675
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1669
- #, c-format
- msgid "Printer '%s' is low on developer."
- msgstr "Réalóir gann i bprintéir '%s'."
- 
- #. Translators: "Developer" like on photo development context
--#: modules/printbackends/cups/gtkprintbackendcups.c:1677
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1671
- #, c-format
- msgid "Printer '%s' is out of developer."
- msgstr "Níl aon réalóir fágtha i bprintéir '%s'."
- 
- #. Translators: "marker" is one color bin of the printer
--#: modules/printbackends/cups/gtkprintbackendcups.c:1679
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1673
- #, c-format
- msgid "Printer '%s' is low on at least one marker supply."
- msgstr ""
- 
- #. Translators: "marker" is one color bin of the printer
--#: modules/printbackends/cups/gtkprintbackendcups.c:1681
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1675
- #, c-format
- msgid "Printer '%s' is out of at least one marker supply."
- msgstr ""
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:1682
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1676
- #, c-format
- msgid "The cover is open on printer '%s'."
- msgstr "Tá an clúdach ar phrintéir '%s' oscailte."
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:1683
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1677
- #, c-format
- msgid "The door is open on printer '%s'."
- msgstr "Tá an doras ar phrintéir '%s' oscailte."
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:1684
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1678
- #, c-format
- msgid "Printer '%s' is low on paper."
- msgstr "Páipéar gann i bprintéir '%s'."
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:1685
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1679
- #, c-format
- msgid "Printer '%s' is out of paper."
- msgstr "Níl aon pháipéar fágtha i bprintéir '%s'."
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:1686
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1680
- #, fuzzy, c-format
- msgid "Printer '%s' is currently offline."
- msgstr "Tá printéir '%s' as líne faoi láthair."
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:1687
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1681
- #, c-format
- msgid "There is a problem on printer '%s'."
- msgstr "Tá fadhb ann le printéir '%s'."
- 
- #. Translators: this is a printer status.
--#: modules/printbackends/cups/gtkprintbackendcups.c:1995
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2123
- msgid "Paused ; Rejecting Jobs"
- msgstr "Ar Sos ; Jabanna á nDiúltú"
- 
- #. Translators: this is a printer status.
--#: modules/printbackends/cups/gtkprintbackendcups.c:2001
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2129
- msgid "Rejecting Jobs"
- msgstr "Jabanna á nDiúltú"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:2777
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2909
- msgid "Two Sided"
- msgstr "Déthaobhach"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:2778
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2910
- msgid "Paper Type"
- msgstr "Cineál an Pháipéir"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:2779
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2911
- msgid "Paper Source"
- msgstr "Foinse an Pháipéir"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:2780
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2912
- msgid "Output Tray"
- msgstr "Tráidire Aschurtha"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:2781
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2913
- msgid "Resolution"
- msgstr "Taifeach"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:2782
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2914
- msgid "GhostScript pre-filtering"
- msgstr "Réamhscagadh GhostScript"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:2791
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2923
- msgid "One Sided"
- msgstr "Aonthaobhach"
- 
- #. Translators: this is an option of "Two Sided"
--#: modules/printbackends/cups/gtkprintbackendcups.c:2793
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2925
- msgid "Long Edge (Standard)"
- msgstr "Ciumhais Fhada (Caighdeánach)"
- 
- #. Translators: this is an option of "Two Sided"
--#: modules/printbackends/cups/gtkprintbackendcups.c:2795
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2927
- msgid "Short Edge (Flip)"
- msgstr "Ciumhais Ghearr (Smeach)"
- 
- #. Translators: this is an option of "Paper Source"
--#: modules/printbackends/cups/gtkprintbackendcups.c:2797
--#: modules/printbackends/cups/gtkprintbackendcups.c:2799
--#: modules/printbackends/cups/gtkprintbackendcups.c:2807
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2929
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2931
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2939
- msgid "Auto Select"
- msgstr "Roghnaigh go hUathoibríoch"
- 
- #. Translators: this is an option of "Paper Source"
- #. Translators: this is an option of "Resolution"
--#: modules/printbackends/cups/gtkprintbackendcups.c:2801
--#: modules/printbackends/cups/gtkprintbackendcups.c:2803
--#: modules/printbackends/cups/gtkprintbackendcups.c:2805
--#: modules/printbackends/cups/gtkprintbackendcups.c:2809
--#: modules/printbackends/cups/gtkprintbackendcups.c:3295
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2933
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2935
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2937
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2941
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3429
- msgid "Printer Default"
- msgstr "Réamhshocrú Printéara"
- 
- #. Translators: this is an option of "GhostScript"
--#: modules/printbackends/cups/gtkprintbackendcups.c:2811
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2943
- msgid "Embed GhostScript fonts only"
- msgstr "Leabaigh clónna GhostScript amháin"
- 
- #. Translators: this is an option of "GhostScript"
--#: modules/printbackends/cups/gtkprintbackendcups.c:2813
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2945
- msgid "Convert to PS level 1"
- msgstr "Tiontaigh go PS leibhéal 1"
- 
- #. Translators: this is an option of "GhostScript"
--#: modules/printbackends/cups/gtkprintbackendcups.c:2815
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2947
- msgid "Convert to PS level 2"
- msgstr "Tiontaigh go PS leibhéal 2"
- 
- #. Translators: this is an option of "GhostScript"
--#: modules/printbackends/cups/gtkprintbackendcups.c:2817
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2949
- msgid "No pre-filtering"
- msgstr "Gan réamhscagadh"
- 
- #. Translators: "Miscellaneous" is the label for a button, that opens
- #. up an extra panel of settings in a print dialog.
--#: modules/printbackends/cups/gtkprintbackendcups.c:2826
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2958
- msgid "Miscellaneous"
- msgstr "Socruithe Éagsúla"
- 
- #. Translators: These strings name the possible values of the
- #. * job priority option in the print dialog
- #.
--#: modules/printbackends/cups/gtkprintbackendcups.c:3503
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681
- msgid "Urgent"
- msgstr "Práinneach"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:3503
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681
- msgid "High"
- msgstr "Ard"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:3503
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681
- msgid "Medium"
- msgstr "Measartha"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:3503
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681
- msgid "Low"
- msgstr "Íseal"
- 
--#. Cups specific, non-ppd related settings
--#. Translators, this string is used to label the pages-per-sheet option
--#. * in the print dialog
--#.
--#: modules/printbackends/cups/gtkprintbackendcups.c:3527
--msgid "Pages per Sheet"
--msgstr "Leathanaigh sa Leathán"
--
- #. Translators, this string is used to label the job priority option
- #. * in the print dialog
- #.
--#: modules/printbackends/cups/gtkprintbackendcups.c:3564
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3711
- msgid "Job Priority"
- msgstr "Tosaíocht an Jab"
- 
- #. Translators, this string is used to label the billing info entry
- #. * in the print dialog
- #.
--#: modules/printbackends/cups/gtkprintbackendcups.c:3575
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3722
- msgid "Billing Info"
- msgstr "Eolas billeála"
- 
- #. Translators, these strings are names for various 'standard' cover
- #. * pages that the printing system may support.
- #.
--#: modules/printbackends/cups/gtkprintbackendcups.c:3590
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
- msgid "None"
- msgstr "Neamhní"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:3590
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
- msgid "Classified"
- msgstr "Rúnaicmithe"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:3590
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
- msgid "Confidential"
- msgstr "Faoi Rún"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:3590
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
- msgid "Secret"
- msgstr "Rúnda"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:3590
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
- msgid "Standard"
- msgstr "Caighdeánach"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:3590
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
- msgid "Top Secret"
- msgstr "An-Rúnda"
- 
--#: modules/printbackends/cups/gtkprintbackendcups.c:3590
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
- msgid "Unclassified"
- msgstr "Neamhrúnaicmithe"
- 
-+#. Translators, this string is used to label the pages-per-sheet option
-+#. * in the print dialog
-+#.
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3748
-+msgid "Pages per Sheet"
-+msgstr "Leathanaigh sa Leathán"
-+
- #. Translators, this is the label used for the option in the print
- #. * dialog that controls the front cover page.
- #.
--#: modules/printbackends/cups/gtkprintbackendcups.c:3625
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3808
- msgid "Before"
- msgstr "Roimh"
- 
- #. Translators, this is the label used for the option in the print
- #. * dialog that controls the back cover page.
- #.
--#: modules/printbackends/cups/gtkprintbackendcups.c:3640
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3823
- msgid "After"
- msgstr "Tar Éis"
- 
-@@ -4093,14 +4688,14 @@ msgstr "Tar Éis"
- #. * a print job is printed. Possible values are 'now', a specified time,
- #. * or 'on hold'
- #.
--#: modules/printbackends/cups/gtkprintbackendcups.c:3660
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3843
- msgid "Print at"
- msgstr "Priontáil ag"
- 
- #. Translators: this is the name of the option that allows the user
- #. * to specify a time when a print job will be printed.
- #.
--#: modules/printbackends/cups/gtkprintbackendcups.c:3671
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3854
- msgid "Print at time"
- msgstr "Priontáil ag am"
- 
-@@ -4108,109 +4703,223 @@ msgstr "Priontáil ag am"
- #. * size. The two placeholders are replaced with the width and height
- #. * in points. E.g: "Custom 230.4x142.9"
- #.
--#: modules/printbackends/cups/gtkprintbackendcups.c:3706
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3889
- #, c-format
- msgid "Custom %sx%s"
- msgstr "%sx%s Saincheaptha"
- 
--#. default filename used for print-to-file
--#: modules/printbackends/file/gtkprintbackendfile.c:250
--#, c-format
--msgid "output.%s"
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3970
-+#, fuzzy
-+msgid "Printer Profile"
-+msgstr "Printéir as líne"
-+
-+#. TRANSLATORS: this is when color profile information is unavailable
-+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3977
-+#, fuzzy
-+msgid "Unavailable"
-+msgstr "Níl ar fáil"
-+
-+#. TRANSLATORS: when we're running an old CUPS, and
-+#. * it hasn't registered the device with colord
-+#: ../modules/printbackends/cups/gtkprintercups.c:221
-+msgid "Color management unavailable"
-+msgstr ""
-+
-+#. TRANSLATORS: when there is no color profile available
-+#: ../modules/printbackends/cups/gtkprintercups.c:233
-+#, fuzzy
-+msgid "No profile available"
-+msgstr "Níl ar fáil"
-+
-+#. TRANSLATORS: when the color profile has no title
-+#: ../modules/printbackends/cups/gtkprintercups.c:244
-+#, fuzzy
-+msgid "Unspecified profile"
-+msgstr "Earráid gan sonrú"
-+
-+#: ../modules/printbackends/file/gtkprintbackendfile.c:249
-+#, fuzzy
-+msgid "output"
- msgstr "aschur.%s"
- 
--#: modules/printbackends/file/gtkprintbackendfile.c:493
-+#: ../modules/printbackends/file/gtkprintbackendfile.c:521
- msgid "Print to File"
- msgstr "Priontáil go Comhad"
- 
--#: modules/printbackends/file/gtkprintbackendfile.c:570
-+#: ../modules/printbackends/file/gtkprintbackendfile.c:647
- msgid "PDF"
- msgstr "PDF"
- 
--#: modules/printbackends/file/gtkprintbackendfile.c:570
-+#: ../modules/printbackends/file/gtkprintbackendfile.c:647
- msgid "Postscript"
- msgstr "Postscript"
- 
--#: modules/printbackends/file/gtkprintbackendfile.c:570
-+#: ../modules/printbackends/file/gtkprintbackendfile.c:647
- msgid "SVG"
- msgstr "SVG"
- 
--#: modules/printbackends/file/gtkprintbackendfile.c:582
--#: modules/printbackends/test/gtkprintbackendtest.c:503
-+#: ../modules/printbackends/file/gtkprintbackendfile.c:660
-+#: ../modules/printbackends/test/gtkprintbackendtest.c:501
- msgid "Pages per _sheet:"
- msgstr "_Leathanaigh sa leathán:"
- 
--#: modules/printbackends/file/gtkprintbackendfile.c:641
-+#: ../modules/printbackends/file/gtkprintbackendfile.c:719
- msgid "File"
- msgstr "Comhad"
- 
--#: modules/printbackends/file/gtkprintbackendfile.c:651
-+#: ../modules/printbackends/file/gtkprintbackendfile.c:729
- msgid "_Output format"
- msgstr "_Formáid aschurtha"
- 
--#: modules/printbackends/lpr/gtkprintbackendlpr.c:395
-+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:393
- msgid "Print to LPR"
- msgstr "Priontáil go LPR"
- 
--#: modules/printbackends/lpr/gtkprintbackendlpr.c:421
-+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:419
- msgid "Pages Per Sheet"
- msgstr "Leathanaigh sa Leathán"
- 
--#: modules/printbackends/lpr/gtkprintbackendlpr.c:428
-+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:426
- msgid "Command Line"
- msgstr "Líne na n-Orduithe"
- 
- #. SUN_BRANDING
--#: modules/printbackends/papi/gtkprintbackendpapi.c:811
-+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:809
- msgid "printer offline"
- msgstr "printéir as líne"
- 
- #. SUN_BRANDING
--#: modules/printbackends/papi/gtkprintbackendpapi.c:829
-+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:827
- msgid "ready to print"
- msgstr "réidh do phriontáil"
- 
- #. SUN_BRANDING
--#: modules/printbackends/papi/gtkprintbackendpapi.c:832
-+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:830
- msgid "processing job"
- msgstr "jab á phróiseáil"
- 
- #. SUN_BRANDING
--#: modules/printbackends/papi/gtkprintbackendpapi.c:836
-+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:834
- msgid "paused"
- msgstr "curtha ar shos"
- 
- #. SUN_BRANDING
--#: modules/printbackends/papi/gtkprintbackendpapi.c:839
-+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:837
- msgid "unknown"
- msgstr "anaithnid"
- 
- #. default filename used for print-to-test
--#: modules/printbackends/test/gtkprintbackendtest.c:234
-+#: ../modules/printbackends/test/gtkprintbackendtest.c:232
- #, c-format
- msgid "test-output.%s"
- msgstr "aschur-trialach.%s"
- 
--#: modules/printbackends/test/gtkprintbackendtest.c:467
-+#: ../modules/printbackends/test/gtkprintbackendtest.c:465
- msgid "Print to Test Printer"
- msgstr "Priontáil go Printéir Tástála"
- 
--#: tests/testfilechooser.c:207
--#, c-format
--msgid "Could not get information for file '%s': %s"
--msgstr "Níorbh fhéidir eolas a fháil don chomhad '%s': %s"
-+#~ msgid "X screen to use"
-+#~ msgstr "Scáileán X le húsáid"
- 
--#: tests/testfilechooser.c:222
--#, c-format
--msgid "Failed to open file '%s': %s"
--msgstr "Theip ar oscail comhad '%s': %s"
-+#~ msgid "SCREEN"
-+#~ msgstr "SCÁILEÁN"
- 
--#: tests/testfilechooser.c:267
--#, c-format
--msgid ""
--"Failed to load image '%s': reason not known, probably a corrupt image file"
--msgstr ""
--"Theip ar luchtú íomhá '%s': fáth anaithnid, is dócha comhad íomhá truaillithe"
-+#~ msgid "Make X calls synchronous"
-+#~ msgstr "Déan sioncronach glaonna X"
-+
-+#~ msgid "Credits"
-+#~ msgstr "Admhálacha"
-+
-+#~ msgid "Written by"
-+#~ msgstr "Scríofa ag"
-+
-+#~ msgid "Received invalid color data\n"
-+#~ msgstr "Fuair sonraí datha neamhbhailí\n"
-+
-+#, fuzzy
-+#~ msgid "Num Lock is on"
-+#~ msgstr "Tá Caps Lock ann"
-+
-+#~ msgid "_Add"
-+#~ msgstr "Cuir _Leis"
-+
-+#~ msgid "_Remove"
-+#~ msgstr "_Bain"
-+
-+#~ msgid "_Browse for other folders"
-+#~ msgstr "_Brabhsáil ar fhillteáin eile"
-+
-+#~ msgid "Invalid path"
-+#~ msgstr "Conair neamhbhailí"
-+
-+#~ msgid "No match"
-+#~ msgstr "Gan rud comhoiriúnach"
-+
-+#~ msgid "Sole completion"
-+#~ msgstr "An comhlánú amháin"
-+
-+#~ msgid "Complete, but not unique"
-+#~ msgstr "Curtha i grích, ach nach uathúil"
-+
-+#~ msgid "Completing..."
-+#~ msgstr "Á chur i grích..."
-+
-+#~ msgid "Only local files may be selected"
-+#~ msgstr "Is féidir comhaid logánta amháin a roghnú"
-+
-+#~ msgid "Incomplete hostname; end it with '/'"
-+#~ msgstr "Óstainm neamhiomlán; cuir '/' ag an deireadh"
-+
-+#~ msgid "Path does not exist"
-+#~ msgstr "Níl an conair sin ann"
-+
-+#~ msgid "Error creating folder '%s': %s"
-+#~ msgstr "Earráid agus fillteán '%s' á chruthú: %s"
-+
-+#~ msgid ""
-+#~ "Could not find the icon '%s'. The '%s' theme\n"
-+#~ "was not found either, perhaps you need to install it.\n"
-+#~ "You can get a copy from:\n"
-+#~ "\t%s"
-+#~ msgstr ""
-+#~ "Níorbh fhéidir an deilbhín '%s' a aimsiú. Níor\n"
-+#~ "aimsíodh an téama '%s' ach an oiread, b'fhéidir go\n"
-+#~ "gcaithfidh tú é a shuiteáil.\n"
-+#~ "Is féidir leat cóip a fháil ó:\n"
-+#~ "\t%s"
-+
-+#~ msgid "Connect as u_ser:"
-+#~ msgstr "Nasc mar ú_sáideoir:"
-+
-+#~ msgid "_Save in folder:"
-+#~ msgstr "_Sábháil i bhfillteán:"
-+
-+#~ msgid "Unable to find include file: \"%s\""
-+#~ msgstr "Ní féidir comhad ceanntáisc a aimsiú: \"%s\""
-+
-+#~ msgid "Unable to locate image file in pixmap_path: \"%s\""
-+#~ msgstr "Ní féidir íomhá chomaid a aimsiú i bpixmap_path: \"%s\""
-+
-+#~ msgid "This function is not implemented for widgets of class '%s'"
-+#~ msgstr "Níl an feidhm seo curtha i ngníomh do ghiuirléidí na haicme '%s'"
-+
-+#~ msgid "Unable to locate theme engine in module_path: \"%s\","
-+#~ msgstr "Ní féidir inneall téama a aimsiú i module_path: \"%s\","
-+
-+#~ msgid "different idatas found for symlinked '%s' and '%s'\n"
-+#~ msgstr "aimsíodh idata difriúla do '%s' agus '%s' nasctha go siombalach\n"
-+
-+#~ msgid "Could not get information for file '%s': %s"
-+#~ msgstr "Níorbh fhéidir eolas a fháil don chomhad '%s': %s"
-+
-+#~ msgid "Failed to open file '%s': %s"
-+#~ msgstr "Theip ar oscail comhad '%s': %s"
-+
-+#~ msgid ""
-+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
-+#~ msgstr ""
-+#~ "Theip ar luchtú íomhá '%s': fáth anaithnid, is dócha comhad íomhá "
-+#~ "truaillithe"
- 
- #~ msgid "Gdk debugging flags to set"
- #~ msgstr "Bratacha dífhabhtaithe Gdk le socrú"
-diff --git a/po/zh_HK.po b/po/zh_HK.po
-index 64057e3..2305461 100644
---- a/po/zh_HK.po
-+++ b/po/zh_HK.po
-@@ -8,9 +8,9 @@ msgid ""
- msgstr ""
- "Project-Id-Version: gtk+ 3.3.11\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2012-09-05 20:10+0800\n"
--"PO-Revision-Date: 2012-09-05 20:10+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"POT-Creation-Date: 2012-11-07 02:40+0800\n"
-+"PO-Revision-Date: 2012-11-07 02:40+0800\n"
-+"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
- "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
- "Language: zh_TW\n"
- "MIME-Version: 1.0\n"
-@@ -69,7 +69,7 @@ msgstr "準備設定的 GDK 偵錯旗標"
- #. Placeholder in --gdk-no-debug=FLAGS in --help output
- #. Placeholder in --gtk-debug=FLAGS in --help output
- #. Placeholder in --gtk-no-debug=FLAGS in --help output
--#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:453 ../gtk/gtkmain.c:456
-+#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:454 ../gtk/gtkmain.c:457
- msgid "FLAGS"
- msgstr "旗標"
- 
-@@ -698,7 +698,7 @@ msgstr "美工設計"
- #. * translated on keyboards used for your language, don't translate
- #. * this.
- #.
--#: ../gtk/gtkaccellabel.c:156
-+#: ../gtk/gtkaccellabel.c:159
- msgctxt "keyboard label"
- msgid "Shift"
- msgstr "Shift"
-@@ -708,7 +708,7 @@ msgstr "Shift"
- #. * translated on keyboards used for your language, don't translate
- #. * this.
- #.
--#: ../gtk/gtkaccellabel.c:162
-+#: ../gtk/gtkaccellabel.c:165
- msgctxt "keyboard label"
- msgid "Ctrl"
- msgstr "Ctrl"
-@@ -718,7 +718,7 @@ msgstr "Ctrl"
- #. * translated on keyboards used for your language, don't translate
- #. * this.
- #.
--#: ../gtk/gtkaccellabel.c:168
-+#: ../gtk/gtkaccellabel.c:171
- msgctxt "keyboard label"
- msgid "Alt"
- msgstr "Alt"
-@@ -728,7 +728,7 @@ msgstr "Alt"
- #. * translated on keyboards used for your language, don't translate
- #. * this.
- #.
--#: ../gtk/gtkaccellabel.c:802
-+#: ../gtk/gtkaccellabel.c:805
- msgctxt "keyboard label"
- msgid "Super"
- msgstr "Super"
-@@ -738,7 +738,7 @@ msgstr "Super"
- #. * translated on keyboards used for your language, don't translate
- #. * this.
- #.
--#: ../gtk/gtkaccellabel.c:815
-+#: ../gtk/gtkaccellabel.c:818
- msgctxt "keyboard label"
- msgid "Hyper"
- msgstr "Hyper"
-@@ -748,17 +748,17 @@ msgstr "Hyper"
- #. * translated on keyboards used for your language, don't translate
- #. * this.
- #.
--#: ../gtk/gtkaccellabel.c:829
-+#: ../gtk/gtkaccellabel.c:832
- msgctxt "keyboard label"
- msgid "Meta"
- msgstr "Meta"
- 
--#: ../gtk/gtkaccellabel.c:845
-+#: ../gtk/gtkaccellabel.c:848
- msgctxt "keyboard label"
- msgid "Space"
- msgstr "Space"
- 
--#: ../gtk/gtkaccellabel.c:848
-+#: ../gtk/gtkaccellabel.c:851
- msgctxt "keyboard label"
- msgid "Backslash"
- msgstr "Backslash"
-@@ -794,7 +794,7 @@ msgstr "找不到應用程式"
- msgid "Select an application to open \"%s\""
- msgstr "請選擇要用來開啟「%s」的應用程式"
- 
--#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:654
-+#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:657
- #, c-format
- msgid "No applications available to open \"%s\""
- msgstr "沒有程式可開啟「%s」的應用程式"
-@@ -824,23 +824,23 @@ msgstr "消除關聯"
- msgid "Show other applications"
- msgstr "顯示其他的應用程式"
- 
--#: ../gtk/gtkappchooserwidget.c:603
-+#: ../gtk/gtkappchooserwidget.c:606
- msgid "Default Application"
- msgstr "預設的應用程式"
- 
--#: ../gtk/gtkappchooserwidget.c:741
-+#: ../gtk/gtkappchooserwidget.c:744
- msgid "Recommended Applications"
- msgstr "建議的應用程式"
- 
--#: ../gtk/gtkappchooserwidget.c:756
-+#: ../gtk/gtkappchooserwidget.c:759
- msgid "Related Applications"
- msgstr "相關的應用程式"
- 
--#: ../gtk/gtkappchooserwidget.c:770
-+#: ../gtk/gtkappchooserwidget.c:773
- msgid "Other Applications"
- msgstr "其他的應用程式"
- 
--#: ../gtk/gtkapplication.c:1552
-+#: ../gtk/gtkapplication.c:1558
- #, c-format
- msgid ""
- "%s cannot quit at this time:\n"
-@@ -851,20 +851,20 @@ msgstr ""
- "\n"
- "%s"
- 
--#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:475
-+#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:480
- #: ../gtk/gtkprintoperation-win32.c:1445
- msgid "Application"
- msgstr "應用程式"
- 
--#: ../gtk/gtkassistant.c:1004
-+#: ../gtk/gtkassistant.c:1008
- msgid "C_ontinue"
- msgstr "繼續(_O)"
- 
--#: ../gtk/gtkassistant.c:1007
-+#: ../gtk/gtkassistant.c:1011
- msgid "Go _Back"
- msgstr "後退(_B)"
- 
--#: ../gtk/gtkassistant.c:1011
-+#: ../gtk/gtkassistant.c:1015
- msgid "_Finish"
- msgstr "完成(_F)"
- 
-@@ -1003,7 +1003,7 @@ msgstr "無效"
- #. * an accelerator when the cell is clicked to change the
- #. * acelerator.
- #.
--#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:745
-+#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:747
- msgid "New accelerator..."
- msgstr "新增捷徑鍵…"
- 
-@@ -1403,7 +1403,7 @@ msgstr "Caps Lock 已開啟"
- msgid "Select a File"
- msgstr "選取檔案"
- 
--#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1817
-+#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1819
- msgid "Desktop"
- msgstr "桌面"
- 
-@@ -1419,48 +1419,48 @@ msgstr "其他…"
- msgid "Type name of new folder"
- msgstr "請輸入新資料夾名稱"
- 
--#: ../gtk/gtkfilechooserdefault.c:968
-+#: ../gtk/gtkfilechooserdefault.c:970
- msgid "Could not retrieve information about the file"
- msgstr "無法取得關於檔案的資訊"
- 
--#: ../gtk/gtkfilechooserdefault.c:979
-+#: ../gtk/gtkfilechooserdefault.c:981
- msgid "Could not add a bookmark"
- msgstr "無法加入書籤"
- 
--#: ../gtk/gtkfilechooserdefault.c:990
-+#: ../gtk/gtkfilechooserdefault.c:992
- msgid "Could not remove bookmark"
- msgstr "無法移除書籤"
- 
--#: ../gtk/gtkfilechooserdefault.c:1001
-+#: ../gtk/gtkfilechooserdefault.c:1003
- msgid "The folder could not be created"
- msgstr "無法建立資料夾"
- 
--#: ../gtk/gtkfilechooserdefault.c:1014
-+#: ../gtk/gtkfilechooserdefault.c:1016
- msgid ""
- "The folder could not be created, as a file with the same name already "
- "exists.  Try using a different name for the folder, or rename the file first."
- msgstr "此資料夾無法建立，因為已有相同名稱的檔案存在。嘗試使用不同的資料夾名稱，或者先重新命名該檔案。"
- 
--#: ../gtk/gtkfilechooserdefault.c:1028
-+#: ../gtk/gtkfilechooserdefault.c:1030
- msgid "You need to choose a valid filename."
- msgstr "你需要選擇有效的檔案名稱"
- 
--#: ../gtk/gtkfilechooserdefault.c:1031
-+#: ../gtk/gtkfilechooserdefault.c:1033
- #, c-format
- msgid "Cannot create a file under %s as it is not a folder"
- msgstr "不能在 %s 下建立檔案，因為它不是資料夾"
- 
--#: ../gtk/gtkfilechooserdefault.c:1043
-+#: ../gtk/gtkfilechooserdefault.c:1045
- msgid ""
- "You may only select folders.  The item that you selected is not a folder; "
- "try using a different item."
- msgstr "你只能選擇資料夾。你所選取的項目不是資料夾；請嘗試使用不同的項目。"
- 
--#: ../gtk/gtkfilechooserdefault.c:1053
-+#: ../gtk/gtkfilechooserdefault.c:1055
- msgid "Invalid file name"
- msgstr "無效的檔案名稱"
- 
--#: ../gtk/gtkfilechooserdefault.c:1063
-+#: ../gtk/gtkfilechooserdefault.c:1065
- msgid "The folder contents could not be displayed"
- msgstr "無法顯示資料夾內容"
- 
-@@ -1468,218 +1468,218 @@ msgstr "無法顯示資料夾內容"
- #. * is a hostname. Nautilus and the panel contain the same string
- #. * to translate.
- #.
--#: ../gtk/gtkfilechooserdefault.c:1589
-+#: ../gtk/gtkfilechooserdefault.c:1591
- #, c-format
- msgid "%1$s on %2$s"
- msgstr "%1$s 於 %2$s"
- 
--#: ../gtk/gtkfilechooserdefault.c:1738
-+#: ../gtk/gtkfilechooserdefault.c:1740
- msgid "Search"
- msgstr "搜尋"
- 
--#: ../gtk/gtkfilechooserdefault.c:1762 ../gtk/gtkfilechooserdefault.c:4988
-+#: ../gtk/gtkfilechooserdefault.c:1764 ../gtk/gtkfilechooserdefault.c:4990
- msgid "Recently Used"
--msgstr "最近使用的"
-+msgstr "最近使用"
- 
--#: ../gtk/gtkfilechooserdefault.c:2361
-+#: ../gtk/gtkfilechooserdefault.c:2363
- msgid "Select which types of files are shown"
- msgstr "選擇顯示哪種類型的檔案"
- 
--#: ../gtk/gtkfilechooserdefault.c:2720
-+#: ../gtk/gtkfilechooserdefault.c:2722
- #, c-format
- msgid "Add the folder '%s' to the bookmarks"
- msgstr "將資料夾「%s」加入書籤"
- 
--#: ../gtk/gtkfilechooserdefault.c:2764
-+#: ../gtk/gtkfilechooserdefault.c:2766
- #, c-format
- msgid "Add the current folder to the bookmarks"
- msgstr "將目前的資料夾加入書籤"
- 
--#: ../gtk/gtkfilechooserdefault.c:2766
-+#: ../gtk/gtkfilechooserdefault.c:2768
- #, c-format
- msgid "Add the selected folders to the bookmarks"
- msgstr "將已選的資料夾加入書籤"
- 
--#: ../gtk/gtkfilechooserdefault.c:2804
-+#: ../gtk/gtkfilechooserdefault.c:2806
- #, c-format
- msgid "Remove the bookmark '%s'"
- msgstr "移除書籤「%s」"
- 
--#: ../gtk/gtkfilechooserdefault.c:2806
-+#: ../gtk/gtkfilechooserdefault.c:2808
- #, c-format
- msgid "Bookmark '%s' cannot be removed"
- msgstr "無法移除書籤「%s」"
- 
--#: ../gtk/gtkfilechooserdefault.c:2813 ../gtk/gtkfilechooserdefault.c:3699
-+#: ../gtk/gtkfilechooserdefault.c:2815 ../gtk/gtkfilechooserdefault.c:3701
- msgid "Remove the selected bookmark"
- msgstr "移除已選的書籤"
- 
--#: ../gtk/gtkfilechooserdefault.c:3377
-+#: ../gtk/gtkfilechooserdefault.c:3379
- msgid "Remove"
- msgstr "移除"
- 
--#: ../gtk/gtkfilechooserdefault.c:3386
-+#: ../gtk/gtkfilechooserdefault.c:3388
- msgid "Rename..."
- msgstr "重新命名…"
- 
- #. Accessible object name for the file chooser's shortcuts pane
--#: ../gtk/gtkfilechooserdefault.c:3550
-+#: ../gtk/gtkfilechooserdefault.c:3552
- msgid "Places"
- msgstr "位置"
- 
- #. Column header for the file chooser's shortcuts pane
--#: ../gtk/gtkfilechooserdefault.c:3607
-+#: ../gtk/gtkfilechooserdefault.c:3609
- msgid "_Places"
- msgstr "位置(_P)"
- 
--#: ../gtk/gtkfilechooserdefault.c:3687
-+#: ../gtk/gtkfilechooserdefault.c:3689
- msgid "Add the selected folder to the Bookmarks"
- msgstr "將已選的資料夾加入書籤"
- 
--#: ../gtk/gtkfilechooserdefault.c:3948
-+#: ../gtk/gtkfilechooserdefault.c:3950
- msgid "Could not select file"
- msgstr "無法選取檔案"
- 
--#: ../gtk/gtkfilechooserdefault.c:4173
-+#: ../gtk/gtkfilechooserdefault.c:4175
- msgid "_Visit this file"
- msgstr "查閱這個檔案(_V)"
- 
--#: ../gtk/gtkfilechooserdefault.c:4176
-+#: ../gtk/gtkfilechooserdefault.c:4178
- msgid "_Copy file's location"
- msgstr "複製檔案的位置(_C)"
- 
--#: ../gtk/gtkfilechooserdefault.c:4179
-+#: ../gtk/gtkfilechooserdefault.c:4181
- msgid "_Add to Bookmarks"
- msgstr "加入書籤(_A)"
- 
--#: ../gtk/gtkfilechooserdefault.c:4186
-+#: ../gtk/gtkfilechooserdefault.c:4188
- msgid "Show _Hidden Files"
- msgstr "顯示隱藏檔(_H)"
- 
--#: ../gtk/gtkfilechooserdefault.c:4189
-+#: ../gtk/gtkfilechooserdefault.c:4191
- msgid "Show _Size Column"
- msgstr "顯示大小欄位(_S)"
- 
--#: ../gtk/gtkfilechooserdefault.c:4414
-+#: ../gtk/gtkfilechooserdefault.c:4416
- msgid "Files"
- msgstr "檔案"
- 
--#: ../gtk/gtkfilechooserdefault.c:4465
-+#: ../gtk/gtkfilechooserdefault.c:4467
- msgid "Name"
- msgstr "名稱"
- 
--#: ../gtk/gtkfilechooserdefault.c:4488
-+#: ../gtk/gtkfilechooserdefault.c:4490
- msgid "Size"
- msgstr "大小"
- 
--#: ../gtk/gtkfilechooserdefault.c:4502
-+#: ../gtk/gtkfilechooserdefault.c:4504
- msgid "Modified"
- msgstr "已修改"
- 
- #. Label
--#: ../gtk/gtkfilechooserdefault.c:4595
-+#: ../gtk/gtkfilechooserdefault.c:4597
- msgid "_Name:"
- msgstr "名稱(_N):"
- 
--#: ../gtk/gtkfilechooserdefault.c:4826
-+#: ../gtk/gtkfilechooserdefault.c:4828
- msgid "Type a file name"
- msgstr "輸入檔案名稱"
- 
--#: ../gtk/gtkfilechooserdefault.c:4873 ../gtk/gtkfilechooserdefault.c:4884
-+#: ../gtk/gtkfilechooserdefault.c:4875 ../gtk/gtkfilechooserdefault.c:4886
- msgid "Please select a folder below"
- msgstr "請選擇下面的資料夾"
- 
--#: ../gtk/gtkfilechooserdefault.c:4879
-+#: ../gtk/gtkfilechooserdefault.c:4881
- msgid "Please type a file name"
- msgstr "請輸入檔案名稱"
- 
- #. Create Folder
--#: ../gtk/gtkfilechooserdefault.c:4950
-+#: ../gtk/gtkfilechooserdefault.c:4952
- msgid "Create Fo_lder"
- msgstr "建立資料夾(_L)"
- 
--#: ../gtk/gtkfilechooserdefault.c:4998
-+#: ../gtk/gtkfilechooserdefault.c:5000
- msgid "Search:"
- msgstr "搜尋："
- 
--#: ../gtk/gtkfilechooserdefault.c:5049
-+#: ../gtk/gtkfilechooserdefault.c:5051
- msgid "_Location:"
- msgstr "位置(_L):"
- 
--#: ../gtk/gtkfilechooserdefault.c:5500
-+#: ../gtk/gtkfilechooserdefault.c:5502
- msgid "Save in _folder:"
- msgstr "儲存於資料夾(_F):"
- 
--#: ../gtk/gtkfilechooserdefault.c:5502
-+#: ../gtk/gtkfilechooserdefault.c:5504
- msgid "Create in _folder:"
- msgstr "新增於資料夾(_F)："
- 
--#: ../gtk/gtkfilechooserdefault.c:6589
-+#: ../gtk/gtkfilechooserdefault.c:6591
- #, c-format
- msgid "Could not read the contents of %s"
- msgstr "無法讀取 %s 的內容"
- 
--#: ../gtk/gtkfilechooserdefault.c:6593
-+#: ../gtk/gtkfilechooserdefault.c:6595
- msgid "Could not read the contents of the folder"
- msgstr "無法讀取資料夾的內容"
- 
--#: ../gtk/gtkfilechooserdefault.c:6686 ../gtk/gtkfilechooserdefault.c:6754
--#: ../gtk/gtkfilechooserdefault.c:6934
-+#: ../gtk/gtkfilechooserdefault.c:6688 ../gtk/gtkfilechooserdefault.c:6756
-+#: ../gtk/gtkfilechooserdefault.c:6936
- msgid "Unknown"
- msgstr "不明"
- 
--#: ../gtk/gtkfilechooserdefault.c:6701
-+#: ../gtk/gtkfilechooserdefault.c:6703
- msgid "%H:%M"
- msgstr "%H:%M"
- 
--#: ../gtk/gtkfilechooserdefault.c:6703
-+#: ../gtk/gtkfilechooserdefault.c:6705
- msgid "Yesterday at %H:%M"
- msgstr "昨天 %H:%M"
- 
--#: ../gtk/gtkfilechooserdefault.c:7405
-+#: ../gtk/gtkfilechooserdefault.c:7407
- msgid "Cannot change to folder because it is not local"
- msgstr "無法進入資料夾，因為它不是本地資料夾"
- 
--#: ../gtk/gtkfilechooserdefault.c:8009 ../gtk/gtkfilechooserdefault.c:8030
-+#: ../gtk/gtkfilechooserdefault.c:8011 ../gtk/gtkfilechooserdefault.c:8032
- #, c-format
- msgid "Shortcut %s already exists"
- msgstr "捷徑 %s 已經存在"
- 
--#: ../gtk/gtkfilechooserdefault.c:8120
-+#: ../gtk/gtkfilechooserdefault.c:8122
- #, c-format
- msgid "Shortcut %s does not exist"
- msgstr "捷徑 %s 不存在"
- 
--#: ../gtk/gtkfilechooserdefault.c:8366 ../gtk/gtkprintunixdialog.c:548
-+#: ../gtk/gtkfilechooserdefault.c:8368 ../gtk/gtkprintunixdialog.c:548
- #, c-format
- msgid "A file named \"%s\" already exists.  Do you want to replace it?"
- msgstr "名為「%s」的檔案已存在。是否要取代它？"
- 
--#: ../gtk/gtkfilechooserdefault.c:8369 ../gtk/gtkprintunixdialog.c:552
-+#: ../gtk/gtkfilechooserdefault.c:8371 ../gtk/gtkprintunixdialog.c:552
- #, c-format
- msgid ""
- "The file already exists in \"%s\".  Replacing it will overwrite its contents."
- msgstr "該檔案已存在於「%s」。取代它會覆蓋它的內容。"
- 
--#: ../gtk/gtkfilechooserdefault.c:8374 ../gtk/gtkprintunixdialog.c:559
-+#: ../gtk/gtkfilechooserdefault.c:8376 ../gtk/gtkprintunixdialog.c:559
- msgid "_Replace"
- msgstr "取代(_R)"
- 
--#: ../gtk/gtkfilechooserdefault.c:9181
-+#: ../gtk/gtkfilechooserdefault.c:9183
- msgid "Could not start the search process"
- msgstr "無法開始搜尋程序"
- 
--#: ../gtk/gtkfilechooserdefault.c:9182
-+#: ../gtk/gtkfilechooserdefault.c:9184
- msgid ""
- "The program was not able to create a connection to the indexer daemon.  "
- "Please make sure it is running."
- msgstr "此程式無法建立至 indexer 伺服程式的連線。請確認它是否已執行。"
- 
--#: ../gtk/gtkfilechooserdefault.c:9196
-+#: ../gtk/gtkfilechooserdefault.c:9198
- msgid "Could not send the search request"
- msgstr "無法傳送搜尋要求"
- 
--#: ../gtk/gtkfilechooserdefault.c:9806
-+#: ../gtk/gtkfilechooserdefault.c:9808
- #, c-format
- msgid "Could not mount %s"
- msgstr "無法掛載 %s"
-@@ -1842,27 +1842,27 @@ msgstr ""
- "請聯絡你的系統管理員"
- 
- #. Description of --gtk-module=MODULES in --help output
--#: ../gtk/gtkmain.c:446
-+#: ../gtk/gtkmain.c:447
- msgid "Load additional GTK+ modules"
- msgstr "載入額外的 GTK+ 模組"
- 
- #. Placeholder in --gtk-module=MODULES in --help output
--#: ../gtk/gtkmain.c:447
-+#: ../gtk/gtkmain.c:448
- msgid "MODULES"
- msgstr "模組"
- 
- #. Description of --g-fatal-warnings in --help output
--#: ../gtk/gtkmain.c:449
-+#: ../gtk/gtkmain.c:450
- msgid "Make all warnings fatal"
- msgstr "把所有的警告訊息都當成嚴重錯誤"
- 
- #. Description of --gtk-debug=FLAGS in --help output
--#: ../gtk/gtkmain.c:452
-+#: ../gtk/gtkmain.c:453
- msgid "GTK+ debugging flags to set"
- msgstr "準備設定的 GTK+ 偵錯旗標"
- 
- #. Description of --gtk-no-debug=FLAGS in --help output
--#: ../gtk/gtkmain.c:455
-+#: ../gtk/gtkmain.c:456
- msgid "GTK+ debugging flags to unset"
- msgstr "準備去除的 GTK+ 偵錯旗標"
- 
-@@ -1871,73 +1871,73 @@ msgstr "準備去除的 GTK+ 偵錯旗標"
- #. * Do *not* translate it to "predefinito:LTR", if it
- #. * it isn't default:LTR or default:RTL it will not work
- #.
--#: ../gtk/gtkmain.c:706
-+#: ../gtk/gtkmain.c:704
- msgid "default:LTR"
- msgstr "default:LTR"
- 
--#: ../gtk/gtkmain.c:774
-+#: ../gtk/gtkmain.c:772
- #, c-format
- msgid "Cannot open display: %s"
- msgstr "無法開啟畫面：%s"
- 
--#: ../gtk/gtkmain.c:840
-+#: ../gtk/gtkmain.c:838
- msgid "GTK+ Options"
- msgstr "GTK+ 選項"
- 
--#: ../gtk/gtkmain.c:840
-+#: ../gtk/gtkmain.c:838
- msgid "Show GTK+ Options"
- msgstr "顯示 GTK+ 選項"
- 
--#: ../gtk/gtkmountoperation.c:532
-+#: ../gtk/gtkmountoperation.c:535
- msgid "Co_nnect"
- msgstr "連線(_N)"
- 
--#: ../gtk/gtkmountoperation.c:606
-+#: ../gtk/gtkmountoperation.c:609
- msgid "Connect As"
- msgstr "連線身分"
- 
--#: ../gtk/gtkmountoperation.c:615
-+#: ../gtk/gtkmountoperation.c:618
- msgid "_Anonymous"
- msgstr "匿名(_A)"
- 
--#: ../gtk/gtkmountoperation.c:624
-+#: ../gtk/gtkmountoperation.c:627
- msgid "Registered U_ser"
- msgstr "已註冊使用者(_S)"
- 
--#: ../gtk/gtkmountoperation.c:635
-+#: ../gtk/gtkmountoperation.c:638
- msgid "_Username"
- msgstr "使用者名稱(_U)"
- 
--#: ../gtk/gtkmountoperation.c:640
-+#: ../gtk/gtkmountoperation.c:643
- msgid "_Domain"
- msgstr "網域(_D)"
- 
--#: ../gtk/gtkmountoperation.c:646
-+#: ../gtk/gtkmountoperation.c:649
- msgid "_Password"
- msgstr "密碼(_P)"
- 
--#: ../gtk/gtkmountoperation.c:668
-+#: ../gtk/gtkmountoperation.c:671
- msgid "Forget password _immediately"
- msgstr "立刻忘記密碼(_I)"
- 
--#: ../gtk/gtkmountoperation.c:678
-+#: ../gtk/gtkmountoperation.c:681
- msgid "Remember password until you _logout"
- msgstr "記憶密碼到登出之前(_L)"
- 
--#: ../gtk/gtkmountoperation.c:688
-+#: ../gtk/gtkmountoperation.c:691
- msgid "Remember _forever"
- msgstr "永遠記住密碼(_F)"
- 
--#: ../gtk/gtkmountoperation.c:1077
-+#: ../gtk/gtkmountoperation.c:1080
- #, c-format
- msgid "Unknown Application (PID %d)"
- msgstr "不明的應用程式（PID %d）"
- 
--#: ../gtk/gtkmountoperation.c:1260
-+#: ../gtk/gtkmountoperation.c:1263
- msgid "Unable to end process"
- msgstr "無法終止程序"
- 
--#: ../gtk/gtkmountoperation.c:1297
-+#: ../gtk/gtkmountoperation.c:1300
- msgid "_End Process"
- msgstr "終止程序(_E)"
- 
-@@ -1980,14 +1980,14 @@ msgstr "第 %u 頁"
- #. Translators: the format here is used to build the string that will be rendered
- #. * in the number emblem.
- #.
--#: ../gtk/gtknumerableicon.c:481
-+#: ../gtk/gtknumerableicon.c:482
- #, c-format
- msgctxt "Number format"
- msgid "%d"
- msgstr "%d"
- 
--#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:846
--#: ../gtk/gtkpapersize.c:886
-+#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:848
-+#: ../gtk/gtkpapersize.c:888
- msgid "Not a valid page setup file"
- msgstr "不是有效的頁面設定檔案"
- 
-@@ -2046,7 +2046,7 @@ msgstr "向下路徑"
- msgid "File System Root"
- msgstr "檔案系統根"
- 
--#: ../gtk/gtkprintbackend.c:748
-+#: ../gtk/gtkprintbackend.c:750
- msgid "Authentication"
- msgstr "驗證"
- 
-@@ -2112,29 +2112,29 @@ msgctxt "print operation status"
- msgid "Finished with error"
- msgstr "已完成但發生錯誤"
- 
--#: ../gtk/gtkprintoperation.c:2352
-+#: ../gtk/gtkprintoperation.c:2349
- #, c-format
- msgid "Preparing %d"
- msgstr "正在準備 %d"
- 
--#: ../gtk/gtkprintoperation.c:2354 ../gtk/gtkprintoperation.c:2984
-+#: ../gtk/gtkprintoperation.c:2351 ../gtk/gtkprintoperation.c:2983
- msgid "Preparing"
- msgstr "正在準備"
- 
--#: ../gtk/gtkprintoperation.c:2357
-+#: ../gtk/gtkprintoperation.c:2354
- #, c-format
- msgid "Printing %d"
- msgstr "正在打印 %d"
- 
--#: ../gtk/gtkprintoperation.c:3014
-+#: ../gtk/gtkprintoperation.c:3013
- msgid "Error creating print preview"
- msgstr "建立打印預覽時發生錯誤"
- 
--#: ../gtk/gtkprintoperation.c:3017
-+#: ../gtk/gtkprintoperation.c:3016
- msgid "The most probable reason is that a temporary file could not be created."
- msgstr "最可能的原因是無法建立暫存檔案。"
- 
--#: ../gtk/gtkprintoperation-unix.c:302
-+#: ../gtk/gtkprintoperation-unix.c:307
- msgid "Error launching preview"
- msgstr "執行預覽時發生錯誤"
- 
-@@ -3301,7 +3301,7 @@ msgstr "第 %2$d 行第 %3$d 字有非預設的開始標記「%1$s」"
- msgid "Unexpected character data on line %d char %d"
- msgstr "第 %d 行第 %d 字有非預設的字符資料"
- 
--#: ../gtk/gtkuimanager.c:2738
-+#: ../gtk/gtkuimanager.c:2694
- msgid "Empty"
- msgstr "空的"
- 
-diff --git a/po/zh_TW.po b/po/zh_TW.po
-index 785b127..979172e 100644
---- a/po/zh_TW.po
-+++ b/po/zh_TW.po
-@@ -8,9 +8,9 @@ msgid ""
- msgstr ""
- "Project-Id-Version: gtk+ 3.3.11\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2012-09-05 20:10+0800\n"
--"PO-Revision-Date: 2012-09-05 16:20+0800\n"
--"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-+"POT-Creation-Date: 2012-11-07 02:40+0800\n"
-+"PO-Revision-Date: 2012-11-01 22:07+0800\n"
-+"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
- "Language-Team: <>\n"
- "Language: zh_TW\n"
- "MIME-Version: 1.0\n"
-@@ -69,7 +69,7 @@ msgstr "準備設定的 GDK 偵錯旗標"
- #. Placeholder in --gdk-no-debug=FLAGS in --help output
- #. Placeholder in --gtk-debug=FLAGS in --help output
- #. Placeholder in --gtk-no-debug=FLAGS in --help output
--#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:453 ../gtk/gtkmain.c:456
-+#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:454 ../gtk/gtkmain.c:457
- msgid "FLAGS"
- msgstr "旗標"
- 
-@@ -699,7 +699,7 @@ msgstr "美工設計"
- #. * translated on keyboards used for your language, don't translate
- #. * this.
- #.
--#: ../gtk/gtkaccellabel.c:156
-+#: ../gtk/gtkaccellabel.c:159
- msgctxt "keyboard label"
- msgid "Shift"
- msgstr "Shift"
-@@ -709,7 +709,7 @@ msgstr "Shift"
- #. * translated on keyboards used for your language, don't translate
- #. * this.
- #.
--#: ../gtk/gtkaccellabel.c:162
-+#: ../gtk/gtkaccellabel.c:165
- msgctxt "keyboard label"
- msgid "Ctrl"
- msgstr "Ctrl"
-@@ -719,7 +719,7 @@ msgstr "Ctrl"
- #. * translated on keyboards used for your language, don't translate
- #. * this.
- #.
--#: ../gtk/gtkaccellabel.c:168
-+#: ../gtk/gtkaccellabel.c:171
- msgctxt "keyboard label"
- msgid "Alt"
- msgstr "Alt"
-@@ -729,7 +729,7 @@ msgstr "Alt"
- #. * translated on keyboards used for your language, don't translate
- #. * this.
- #.
--#: ../gtk/gtkaccellabel.c:802
-+#: ../gtk/gtkaccellabel.c:805
- msgctxt "keyboard label"
- msgid "Super"
- msgstr "Super"
-@@ -739,7 +739,7 @@ msgstr "Super"
- #. * translated on keyboards used for your language, don't translate
- #. * this.
- #.
--#: ../gtk/gtkaccellabel.c:815
-+#: ../gtk/gtkaccellabel.c:818
- msgctxt "keyboard label"
- msgid "Hyper"
- msgstr "Hyper"
-@@ -749,17 +749,17 @@ msgstr "Hyper"
- #. * translated on keyboards used for your language, don't translate
- #. * this.
- #.
--#: ../gtk/gtkaccellabel.c:829
-+#: ../gtk/gtkaccellabel.c:832
- msgctxt "keyboard label"
- msgid "Meta"
- msgstr "Meta"
- 
--#: ../gtk/gtkaccellabel.c:845
-+#: ../gtk/gtkaccellabel.c:848
- msgctxt "keyboard label"
- msgid "Space"
- msgstr "Space"
- 
--#: ../gtk/gtkaccellabel.c:848
-+#: ../gtk/gtkaccellabel.c:851
- msgctxt "keyboard label"
- msgid "Backslash"
- msgstr "Backslash"
-@@ -795,7 +795,7 @@ msgstr "找不到應用程式"
- msgid "Select an application to open \"%s\""
- msgstr "請選擇要用來開啟「%s」的應用程式"
- 
--#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:654
-+#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:657
- #, c-format
- msgid "No applications available to open \"%s\""
- msgstr "沒有程式可開啟「%s」的應用程式"
-@@ -827,23 +827,23 @@ msgstr "消除關聯"
- msgid "Show other applications"
- msgstr "顯示其他的應用程式"
- 
--#: ../gtk/gtkappchooserwidget.c:603
-+#: ../gtk/gtkappchooserwidget.c:606
- msgid "Default Application"
- msgstr "預設的應用程式"
- 
--#: ../gtk/gtkappchooserwidget.c:741
-+#: ../gtk/gtkappchooserwidget.c:744
- msgid "Recommended Applications"
- msgstr "建議的應用程式"
- 
--#: ../gtk/gtkappchooserwidget.c:756
-+#: ../gtk/gtkappchooserwidget.c:759
- msgid "Related Applications"
- msgstr "相關的應用程式"
- 
--#: ../gtk/gtkappchooserwidget.c:770
-+#: ../gtk/gtkappchooserwidget.c:773
- msgid "Other Applications"
- msgstr "其他的應用程式"
- 
--#: ../gtk/gtkapplication.c:1552
-+#: ../gtk/gtkapplication.c:1558
- #, c-format
- msgid ""
- "%s cannot quit at this time:\n"
-@@ -854,20 +854,20 @@ msgstr ""
- "\n"
- "%s"
- 
--#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:475
-+#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:480
- #: ../gtk/gtkprintoperation-win32.c:1445
- msgid "Application"
- msgstr "應用程式"
- 
--#: ../gtk/gtkassistant.c:1004
-+#: ../gtk/gtkassistant.c:1008
- msgid "C_ontinue"
- msgstr "繼續(_O)"
- 
--#: ../gtk/gtkassistant.c:1007
-+#: ../gtk/gtkassistant.c:1011
- msgid "Go _Back"
- msgstr "後退(_B)"
- 
--#: ../gtk/gtkassistant.c:1011
-+#: ../gtk/gtkassistant.c:1015
- msgid "_Finish"
- msgstr "完成(_F)"
- 
-@@ -1006,7 +1006,7 @@ msgstr "無效"
- #. * an accelerator when the cell is clicked to change the
- #. * acelerator.
- #.
--#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:745
-+#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:747
- msgid "New accelerator..."
- msgstr "新增捷徑鍵…"
- 
-@@ -1406,7 +1406,7 @@ msgstr "Caps Lock 已開啟"
- msgid "Select a File"
- msgstr "選取檔案"
- 
--#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1817
-+#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1819
- msgid "Desktop"
- msgstr "桌面"
- 
-@@ -1422,23 +1422,23 @@ msgstr "其他…"
- msgid "Type name of new folder"
- msgstr "請輸入新資料夾名稱"
- 
--#: ../gtk/gtkfilechooserdefault.c:968
-+#: ../gtk/gtkfilechooserdefault.c:970
- msgid "Could not retrieve information about the file"
- msgstr "無法取得關於檔案的資訊"
- 
--#: ../gtk/gtkfilechooserdefault.c:979
-+#: ../gtk/gtkfilechooserdefault.c:981
- msgid "Could not add a bookmark"
- msgstr "無法加入書籤"
- 
--#: ../gtk/gtkfilechooserdefault.c:990
-+#: ../gtk/gtkfilechooserdefault.c:992
- msgid "Could not remove bookmark"
- msgstr "無法移除書籤"
- 
--#: ../gtk/gtkfilechooserdefault.c:1001
-+#: ../gtk/gtkfilechooserdefault.c:1003
- msgid "The folder could not be created"
- msgstr "無法建立資料夾"
- 
--#: ../gtk/gtkfilechooserdefault.c:1014
-+#: ../gtk/gtkfilechooserdefault.c:1016
- msgid ""
- "The folder could not be created, as a file with the same name already "
- "exists.  Try using a different name for the folder, or rename the file first."
-@@ -1446,26 +1446,26 @@ msgstr ""
- "此資料夾無法建立，因為已有相同名稱的檔案存在。試著使用不同的資料夾名稱，或者"
- "先重新命名該檔案。"
- 
--#: ../gtk/gtkfilechooserdefault.c:1028
-+#: ../gtk/gtkfilechooserdefault.c:1030
- msgid "You need to choose a valid filename."
- msgstr "您需要選擇有效的檔案名稱"
- 
--#: ../gtk/gtkfilechooserdefault.c:1031
-+#: ../gtk/gtkfilechooserdefault.c:1033
- #, c-format
- msgid "Cannot create a file under %s as it is not a folder"
- msgstr "不能在 %s 下建立檔案，因為它不是資料夾"
- 
--#: ../gtk/gtkfilechooserdefault.c:1043
-+#: ../gtk/gtkfilechooserdefault.c:1045
- msgid ""
- "You may only select folders.  The item that you selected is not a folder; "
- "try using a different item."
- msgstr "您只能選擇資料夾。您所選取的項目不是資料夾；請試著使用不同的項目。"
- 
--#: ../gtk/gtkfilechooserdefault.c:1053
-+#: ../gtk/gtkfilechooserdefault.c:1055
- msgid "Invalid file name"
- msgstr "無效的檔案名稱"
- 
--#: ../gtk/gtkfilechooserdefault.c:1063
-+#: ../gtk/gtkfilechooserdefault.c:1065
- msgid "The folder contents could not be displayed"
- msgstr "無法顯示資料夾內容"
- 
-@@ -1473,218 +1473,218 @@ msgstr "無法顯示資料夾內容"
- #. * is a hostname. Nautilus and the panel contain the same string
- #. * to translate.
- #.
--#: ../gtk/gtkfilechooserdefault.c:1589
-+#: ../gtk/gtkfilechooserdefault.c:1591
- #, c-format
- msgid "%1$s on %2$s"
- msgstr "%1$s 於 %2$s"
- 
--#: ../gtk/gtkfilechooserdefault.c:1738
-+#: ../gtk/gtkfilechooserdefault.c:1740
- msgid "Search"
- msgstr "搜尋"
- 
--#: ../gtk/gtkfilechooserdefault.c:1762 ../gtk/gtkfilechooserdefault.c:4988
-+#: ../gtk/gtkfilechooserdefault.c:1764 ../gtk/gtkfilechooserdefault.c:4990
- msgid "Recently Used"
--msgstr "最近使用的"
-+msgstr "最近使用"
- 
--#: ../gtk/gtkfilechooserdefault.c:2361
-+#: ../gtk/gtkfilechooserdefault.c:2363
- msgid "Select which types of files are shown"
- msgstr "選擇顯示哪種類型的檔案"
- 
--#: ../gtk/gtkfilechooserdefault.c:2720
-+#: ../gtk/gtkfilechooserdefault.c:2722
- #, c-format
- msgid "Add the folder '%s' to the bookmarks"
- msgstr "將資料夾「%s」加入書籤"
- 
--#: ../gtk/gtkfilechooserdefault.c:2764
-+#: ../gtk/gtkfilechooserdefault.c:2766
- #, c-format
- msgid "Add the current folder to the bookmarks"
- msgstr "將目前的資料夾加入書籤"
- 
--#: ../gtk/gtkfilechooserdefault.c:2766
-+#: ../gtk/gtkfilechooserdefault.c:2768
- #, c-format
- msgid "Add the selected folders to the bookmarks"
- msgstr "將已選的資料夾加入書籤"
- 
--#: ../gtk/gtkfilechooserdefault.c:2804
-+#: ../gtk/gtkfilechooserdefault.c:2806
- #, c-format
- msgid "Remove the bookmark '%s'"
- msgstr "移除書籤「%s」"
- 
--#: ../gtk/gtkfilechooserdefault.c:2806
-+#: ../gtk/gtkfilechooserdefault.c:2808
- #, c-format
- msgid "Bookmark '%s' cannot be removed"
- msgstr "無法移除書籤「%s」"
- 
--#: ../gtk/gtkfilechooserdefault.c:2813 ../gtk/gtkfilechooserdefault.c:3699
-+#: ../gtk/gtkfilechooserdefault.c:2815 ../gtk/gtkfilechooserdefault.c:3701
- msgid "Remove the selected bookmark"
- msgstr "移除已選的書籤"
- 
--#: ../gtk/gtkfilechooserdefault.c:3377
-+#: ../gtk/gtkfilechooserdefault.c:3379
- msgid "Remove"
- msgstr "移除"
- 
--#: ../gtk/gtkfilechooserdefault.c:3386
-+#: ../gtk/gtkfilechooserdefault.c:3388
- msgid "Rename..."
- msgstr "重新命名…"
- 
- #. Accessible object name for the file chooser's shortcuts pane
--#: ../gtk/gtkfilechooserdefault.c:3550
-+#: ../gtk/gtkfilechooserdefault.c:3552
- msgid "Places"
- msgstr "位置"
- 
- #. Column header for the file chooser's shortcuts pane
--#: ../gtk/gtkfilechooserdefault.c:3607
-+#: ../gtk/gtkfilechooserdefault.c:3609
- msgid "_Places"
- msgstr "位置(_P)"
- 
--#: ../gtk/gtkfilechooserdefault.c:3687
-+#: ../gtk/gtkfilechooserdefault.c:3689
- msgid "Add the selected folder to the Bookmarks"
- msgstr "將已選的資料夾加入書籤"
- 
--#: ../gtk/gtkfilechooserdefault.c:3948
-+#: ../gtk/gtkfilechooserdefault.c:3950
- msgid "Could not select file"
- msgstr "無法選取檔案"
- 
--#: ../gtk/gtkfilechooserdefault.c:4173
-+#: ../gtk/gtkfilechooserdefault.c:4175
- msgid "_Visit this file"
- msgstr "查閱這個檔案(_V)"
- 
--#: ../gtk/gtkfilechooserdefault.c:4176
-+#: ../gtk/gtkfilechooserdefault.c:4178
- msgid "_Copy file's location"
- msgstr "複製檔案的位置(_C)"
- 
--#: ../gtk/gtkfilechooserdefault.c:4179
-+#: ../gtk/gtkfilechooserdefault.c:4181
- msgid "_Add to Bookmarks"
- msgstr "加入書籤(_A)"
- 
--#: ../gtk/gtkfilechooserdefault.c:4186
-+#: ../gtk/gtkfilechooserdefault.c:4188
- msgid "Show _Hidden Files"
- msgstr "顯示隱藏檔(_H)"
- 
--#: ../gtk/gtkfilechooserdefault.c:4189
-+#: ../gtk/gtkfilechooserdefault.c:4191
- msgid "Show _Size Column"
- msgstr "顯示大小欄位(_S)"
- 
--#: ../gtk/gtkfilechooserdefault.c:4414
-+#: ../gtk/gtkfilechooserdefault.c:4416
- msgid "Files"
- msgstr "檔案"
- 
--#: ../gtk/gtkfilechooserdefault.c:4465
-+#: ../gtk/gtkfilechooserdefault.c:4467
- msgid "Name"
- msgstr "名稱"
- 
--#: ../gtk/gtkfilechooserdefault.c:4488
-+#: ../gtk/gtkfilechooserdefault.c:4490
- msgid "Size"
- msgstr "大小"
- 
--#: ../gtk/gtkfilechooserdefault.c:4502
-+#: ../gtk/gtkfilechooserdefault.c:4504
- msgid "Modified"
- msgstr "已修改"
- 
- #. Label
--#: ../gtk/gtkfilechooserdefault.c:4595
-+#: ../gtk/gtkfilechooserdefault.c:4597
- msgid "_Name:"
- msgstr "名稱(_N):"
- 
--#: ../gtk/gtkfilechooserdefault.c:4826
-+#: ../gtk/gtkfilechooserdefault.c:4828
- msgid "Type a file name"
- msgstr "輸入檔案名稱"
- 
--#: ../gtk/gtkfilechooserdefault.c:4873 ../gtk/gtkfilechooserdefault.c:4884
-+#: ../gtk/gtkfilechooserdefault.c:4875 ../gtk/gtkfilechooserdefault.c:4886
- msgid "Please select a folder below"
- msgstr "請選擇下面的資料夾"
- 
--#: ../gtk/gtkfilechooserdefault.c:4879
-+#: ../gtk/gtkfilechooserdefault.c:4881
- msgid "Please type a file name"
- msgstr "請輸入檔案名稱"
- 
- #. Create Folder
--#: ../gtk/gtkfilechooserdefault.c:4950
-+#: ../gtk/gtkfilechooserdefault.c:4952
- msgid "Create Fo_lder"
- msgstr "建立資料夾(_L)"
- 
--#: ../gtk/gtkfilechooserdefault.c:4998
-+#: ../gtk/gtkfilechooserdefault.c:5000
- msgid "Search:"
- msgstr "搜尋："
- 
--#: ../gtk/gtkfilechooserdefault.c:5049
-+#: ../gtk/gtkfilechooserdefault.c:5051
- msgid "_Location:"
- msgstr "位置(_L):"
- 
--#: ../gtk/gtkfilechooserdefault.c:5500
-+#: ../gtk/gtkfilechooserdefault.c:5502
- msgid "Save in _folder:"
- msgstr "儲存於資料夾(_F):"
- 
--#: ../gtk/gtkfilechooserdefault.c:5502
-+#: ../gtk/gtkfilechooserdefault.c:5504
- msgid "Create in _folder:"
- msgstr "新增於資料夾(_F)："
- 
--#: ../gtk/gtkfilechooserdefault.c:6589
-+#: ../gtk/gtkfilechooserdefault.c:6591
- #, c-format
- msgid "Could not read the contents of %s"
- msgstr "無法讀取 %s 的內容"
- 
--#: ../gtk/gtkfilechooserdefault.c:6593
-+#: ../gtk/gtkfilechooserdefault.c:6595
- msgid "Could not read the contents of the folder"
- msgstr "無法讀取資料夾的內容"
- 
--#: ../gtk/gtkfilechooserdefault.c:6686 ../gtk/gtkfilechooserdefault.c:6754
--#: ../gtk/gtkfilechooserdefault.c:6934
-+#: ../gtk/gtkfilechooserdefault.c:6688 ../gtk/gtkfilechooserdefault.c:6756
-+#: ../gtk/gtkfilechooserdefault.c:6936
- msgid "Unknown"
- msgstr "不明"
- 
--#: ../gtk/gtkfilechooserdefault.c:6701
-+#: ../gtk/gtkfilechooserdefault.c:6703
- msgid "%H:%M"
- msgstr "%H:%M"
- 
--#: ../gtk/gtkfilechooserdefault.c:6703
-+#: ../gtk/gtkfilechooserdefault.c:6705
- msgid "Yesterday at %H:%M"
- msgstr "昨天 %H:%M"
- 
--#: ../gtk/gtkfilechooserdefault.c:7405
-+#: ../gtk/gtkfilechooserdefault.c:7407
- msgid "Cannot change to folder because it is not local"
- msgstr "無法進入資料夾，因為它不是本地資料夾"
- 
--#: ../gtk/gtkfilechooserdefault.c:8009 ../gtk/gtkfilechooserdefault.c:8030
-+#: ../gtk/gtkfilechooserdefault.c:8011 ../gtk/gtkfilechooserdefault.c:8032
- #, c-format
- msgid "Shortcut %s already exists"
- msgstr "捷徑 %s 已經存在"
- 
--#: ../gtk/gtkfilechooserdefault.c:8120
-+#: ../gtk/gtkfilechooserdefault.c:8122
- #, c-format
- msgid "Shortcut %s does not exist"
- msgstr "捷徑 %s 不存在"
- 
--#: ../gtk/gtkfilechooserdefault.c:8366 ../gtk/gtkprintunixdialog.c:548
-+#: ../gtk/gtkfilechooserdefault.c:8368 ../gtk/gtkprintunixdialog.c:548
- #, c-format
- msgid "A file named \"%s\" already exists.  Do you want to replace it?"
- msgstr "名為「%s」的檔案已存在。是否要取代它？"
- 
--#: ../gtk/gtkfilechooserdefault.c:8369 ../gtk/gtkprintunixdialog.c:552
-+#: ../gtk/gtkfilechooserdefault.c:8371 ../gtk/gtkprintunixdialog.c:552
- #, c-format
- msgid ""
- "The file already exists in \"%s\".  Replacing it will overwrite its contents."
- msgstr "該檔案已存在於「%s」。取代它會覆蓋它的內容。"
- 
--#: ../gtk/gtkfilechooserdefault.c:8374 ../gtk/gtkprintunixdialog.c:559
-+#: ../gtk/gtkfilechooserdefault.c:8376 ../gtk/gtkprintunixdialog.c:559
- msgid "_Replace"
- msgstr "取代(_R)"
- 
--#: ../gtk/gtkfilechooserdefault.c:9181
-+#: ../gtk/gtkfilechooserdefault.c:9183
- msgid "Could not start the search process"
- msgstr "無法開始搜尋程序"
- 
--#: ../gtk/gtkfilechooserdefault.c:9182
-+#: ../gtk/gtkfilechooserdefault.c:9184
- msgid ""
- "The program was not able to create a connection to the indexer daemon.  "
- "Please make sure it is running."
- msgstr "此程式無法建立至 indexer 伺服程式的連線。請確認它是否已執行。"
- 
--#: ../gtk/gtkfilechooserdefault.c:9196
-+#: ../gtk/gtkfilechooserdefault.c:9198
- msgid "Could not send the search request"
- msgstr "無法傳送搜尋要求"
- 
--#: ../gtk/gtkfilechooserdefault.c:9806
-+#: ../gtk/gtkfilechooserdefault.c:9808
- #, c-format
- msgid "Could not mount %s"
- msgstr "無法掛載 %s"
-@@ -1847,27 +1847,27 @@ msgstr ""
- "請聯絡您的系統管理員"
- 
- #. Description of --gtk-module=MODULES in --help output
--#: ../gtk/gtkmain.c:446
-+#: ../gtk/gtkmain.c:447
- msgid "Load additional GTK+ modules"
- msgstr "載入額外的 GTK+ 模組"
- 
- #. Placeholder in --gtk-module=MODULES in --help output
--#: ../gtk/gtkmain.c:447
-+#: ../gtk/gtkmain.c:448
- msgid "MODULES"
- msgstr "模組"
- 
- #. Description of --g-fatal-warnings in --help output
--#: ../gtk/gtkmain.c:449
-+#: ../gtk/gtkmain.c:450
- msgid "Make all warnings fatal"
- msgstr "把所有的警告訊息都當成嚴重錯誤"
- 
- #. Description of --gtk-debug=FLAGS in --help output
--#: ../gtk/gtkmain.c:452
-+#: ../gtk/gtkmain.c:453
- msgid "GTK+ debugging flags to set"
- msgstr "準備設定的 GTK+ 偵錯旗標"
- 
- #. Description of --gtk-no-debug=FLAGS in --help output
--#: ../gtk/gtkmain.c:455
-+#: ../gtk/gtkmain.c:456
- msgid "GTK+ debugging flags to unset"
- msgstr "準備去除的 GTK+ 偵錯旗標"
- 
-@@ -1876,73 +1876,73 @@ msgstr "準備去除的 GTK+ 偵錯旗標"
- #. * Do *not* translate it to "predefinito:LTR", if it
- #. * it isn't default:LTR or default:RTL it will not work
- #.
--#: ../gtk/gtkmain.c:706
-+#: ../gtk/gtkmain.c:704
- msgid "default:LTR"
- msgstr "default:LTR"
- 
--#: ../gtk/gtkmain.c:774
-+#: ../gtk/gtkmain.c:772
- #, c-format
- msgid "Cannot open display: %s"
- msgstr "無法開啟畫面：%s"
- 
--#: ../gtk/gtkmain.c:840
-+#: ../gtk/gtkmain.c:838
- msgid "GTK+ Options"
- msgstr "GTK+ 選項"
- 
--#: ../gtk/gtkmain.c:840
-+#: ../gtk/gtkmain.c:838
- msgid "Show GTK+ Options"
- msgstr "顯示 GTK+ 選項"
- 
--#: ../gtk/gtkmountoperation.c:532
-+#: ../gtk/gtkmountoperation.c:535
- msgid "Co_nnect"
- msgstr "連線(_N)"
- 
--#: ../gtk/gtkmountoperation.c:606
-+#: ../gtk/gtkmountoperation.c:609
- msgid "Connect As"
- msgstr "連線身分"
- 
--#: ../gtk/gtkmountoperation.c:615
-+#: ../gtk/gtkmountoperation.c:618
- msgid "_Anonymous"
- msgstr "匿名(_A)"
- 
--#: ../gtk/gtkmountoperation.c:624
-+#: ../gtk/gtkmountoperation.c:627
- msgid "Registered U_ser"
- msgstr "已註冊使用者(_S)"
- 
--#: ../gtk/gtkmountoperation.c:635
-+#: ../gtk/gtkmountoperation.c:638
- msgid "_Username"
- msgstr "使用者名稱(_U)"
- 
--#: ../gtk/gtkmountoperation.c:640
-+#: ../gtk/gtkmountoperation.c:643
- msgid "_Domain"
- msgstr "網域(_D)"
- 
--#: ../gtk/gtkmountoperation.c:646
-+#: ../gtk/gtkmountoperation.c:649
- msgid "_Password"
- msgstr "密碼(_P)"
- 
--#: ../gtk/gtkmountoperation.c:668
-+#: ../gtk/gtkmountoperation.c:671
- msgid "Forget password _immediately"
- msgstr "立刻忘記密碼(_I)"
- 
--#: ../gtk/gtkmountoperation.c:678
-+#: ../gtk/gtkmountoperation.c:681
- msgid "Remember password until you _logout"
- msgstr "記憶密碼到登出之前(_L)"
- 
--#: ../gtk/gtkmountoperation.c:688
-+#: ../gtk/gtkmountoperation.c:691
- msgid "Remember _forever"
- msgstr "永遠記住密碼(_F)"
- 
--#: ../gtk/gtkmountoperation.c:1077
-+#: ../gtk/gtkmountoperation.c:1080
- #, c-format
- msgid "Unknown Application (PID %d)"
- msgstr "不明的應用程式（PID %d）"
- 
--#: ../gtk/gtkmountoperation.c:1260
-+#: ../gtk/gtkmountoperation.c:1263
- msgid "Unable to end process"
- msgstr "無法終止程序"
- 
--#: ../gtk/gtkmountoperation.c:1297
-+#: ../gtk/gtkmountoperation.c:1300
- msgid "_End Process"
- msgstr "終止程序(_E)"
- 
-@@ -1985,14 +1985,14 @@ msgstr "第 %u 頁"
- #. Translators: the format here is used to build the string that will be rendered
- #. * in the number emblem.
- #.
--#: ../gtk/gtknumerableicon.c:481
-+#: ../gtk/gtknumerableicon.c:482
- #, c-format
- msgctxt "Number format"
- msgid "%d"
- msgstr "%d"
- 
--#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:846
--#: ../gtk/gtkpapersize.c:886
-+#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:848
-+#: ../gtk/gtkpapersize.c:888
- msgid "Not a valid page setup file"
- msgstr "不是有效的頁面設定檔案"
- 
-@@ -2051,7 +2051,7 @@ msgstr "向下路徑"
- msgid "File System Root"
- msgstr "檔案系統根"
- 
--#: ../gtk/gtkprintbackend.c:748
-+#: ../gtk/gtkprintbackend.c:750
- msgid "Authentication"
- msgstr "驗證"
- 
-@@ -2117,29 +2117,29 @@ msgctxt "print operation status"
- msgid "Finished with error"
- msgstr "已完成但發生錯誤"
- 
--#: ../gtk/gtkprintoperation.c:2352
-+#: ../gtk/gtkprintoperation.c:2349
- #, c-format
- msgid "Preparing %d"
- msgstr "正在準備 %d"
- 
--#: ../gtk/gtkprintoperation.c:2354 ../gtk/gtkprintoperation.c:2984
-+#: ../gtk/gtkprintoperation.c:2351 ../gtk/gtkprintoperation.c:2983
- msgid "Preparing"
- msgstr "正在準備"
- 
--#: ../gtk/gtkprintoperation.c:2357
-+#: ../gtk/gtkprintoperation.c:2354
- #, c-format
- msgid "Printing %d"
- msgstr "正在列印 %d"
- 
--#: ../gtk/gtkprintoperation.c:3014
-+#: ../gtk/gtkprintoperation.c:3013
- msgid "Error creating print preview"
- msgstr "建立列印預覽時發生錯誤"
- 
--#: ../gtk/gtkprintoperation.c:3017
-+#: ../gtk/gtkprintoperation.c:3016
- msgid "The most probable reason is that a temporary file could not be created."
- msgstr "最可能的原因是無法建立暫存檔案。"
- 
--#: ../gtk/gtkprintoperation-unix.c:302
-+#: ../gtk/gtkprintoperation-unix.c:307
- msgid "Error launching preview"
- msgstr "執行預覽時發生錯誤"
- 
-@@ -3306,7 +3306,7 @@ msgstr "第 %2$d 行第 %3$d 字有非預設的開始標記「%1$s」"
- msgid "Unexpected character data on line %d char %d"
- msgstr "第 %d 行第 %d 字有非預設的字元資料"
- 
--#: ../gtk/gtkuimanager.c:2738
-+#: ../gtk/gtkuimanager.c:2694
- msgid "Empty"
- msgstr "空的"
- 
-diff --git a/tests/testappchooser.c b/tests/testappchooser.c
-index 76af238..80e8fb7 100644
---- a/tests/testappchooser.c
-+++ b/tests/testappchooser.c
-@@ -16,6 +16,8 @@
-  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#include "config.h"
-+
- #include <stdlib.h>
- #include <gtk/gtk.h>
- 
-diff --git a/tests/testappchooserbutton.c b/tests/testappchooserbutton.c
-index 92fbb1a..1ab768c 100644
---- a/tests/testappchooserbutton.c
-+++ b/tests/testappchooserbutton.c
-@@ -16,8 +16,9 @@
-  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--#include <stdlib.h>
-+#include "config.h"
- 
-+#include <stdlib.h>
- #include <gtk/gtk.h>
- 
- #define CUSTOM_ITEM "custom-item"
diff --git a/extra/gtk3/wacom.patch b/extra/gtk3/wacom.patch
deleted file mode 100644
index 79ad84fc6..000000000
--- a/extra/gtk3/wacom.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c
---- gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c	2012-05-02 14:45:04.000000000 +0200
-+++ gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c	2012-05-03 18:34:18.034807644 +0200
-@@ -331,6 +331,8 @@
-         input_source = GDK_SOURCE_ERASER;
-       else if (strstr (tmp_name, "cursor"))
-         input_source = GDK_SOURCE_CURSOR;
-+      else if (strstr (tmp_name, "finger"))
-+        input_source = GDK_SOURCE_TOUCHSCREEN;
-       else if (strstr (tmp_name, "wacom") ||
-                strstr (tmp_name, "pen"))
-         input_source = GDK_SOURCE_PEN;
diff --git a/extra/gtkglext/PKGBUILD b/extra/gtkglext/PKGBUILD
index 266007a7c..0e9b76d76 100644
--- a/extra/gtkglext/PKGBUILD
+++ b/extra/gtkglext/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=gtkglext
 pkgver=1.2.0
-pkgrel=9
+pkgrel=9.1
 pkgdesc="opengl extensions for gtk2"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkglext.sourceforge.net/"
@@ -21,9 +21,7 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   patch -Np1 -i "${srcdir}/gtk2.20.patch"
-  sed '/AC_PATH_XTRA/d' -i configure.in
 
-  autoreconf --force --install
   ./configure --prefix=/usr \
               --disable-static
   make
diff --git a/extra/gtkhtml/PKGBUILD b/extra/gtkhtml/PKGBUILD
index 50917eb3c..7733293ac 100644
--- a/extra/gtkhtml/PKGBUILD
+++ b/extra/gtkhtml/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=gtkhtml
 pkgver=3.32.2
-pkgrel=3.1
+pkgrel=3.2
 pkgdesc="A lightweight HTML renderer/editor widget for GTK2"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD
index d04173aa9..b9b8c25df 100644
--- a/extra/gtkhtml4/PKGBUILD
+++ b/extra/gtkhtml4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175194 2013-01-16 11:05:56Z jgc $
+# $Id: PKGBUILD 178231 2013-02-18 16:07:47Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtkhtml4
 _pkgbasename=gtkhtml
-pkgver=4.6.2
+pkgver=4.6.4
 pkgrel=1
 pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool')
 url="http://www.gnome.org"
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('d0578892a5755f3ab661f0312d1a1376f4926afe72e65d83b6890011bc1f9fd7')
+sha256sums=('8c75278a4382150ae2d6e477cbcebf541367be05176edd05669f046e24736a0d')
 
 build() {
     cd "$_pkgbasename-$pkgver"
diff --git a/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch b/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch
deleted file mode 100644
index 06bce4a0f..000000000
--- a/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9ec36544203d4c1b98aa843c2c3ff0a4f725da68 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam.thursfield@codethink.co.uk>
-Date: Thu, 03 May 2012 19:04:20 +0000
-Subject: Bug 672582 - Fix selection behavior inside <iframe>
-
-Since kinetic scrolling was introduced in Gtk+, GtkScrolledWindow
-has had its own GdkWindow. This means we need to use the allocation
-of the GtkScrolledWindow rather than its child GtkHTML widget when we
-want to translate pointer coordinates relative to the iframe, because
-a widget's GtkAllocation is relative to the parent GdkWindow.
-
-(cherry picked from commit 7b7b37745d2f46914be314e4d7aef7a575529345)
----
-diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
-index 697b16e..6284855 100644
---- a/gtkhtml/gtkhtml.c
-+++ b/gtkhtml/gtkhtml.c
-@@ -1823,9 +1823,14 @@ shift_to_iframe_parent (GtkWidget *widget,
-                         gint *y)
- {
- 	while (GTK_HTML (widget)->iframe_parent) {
-+		GtkWidget *scrolled_window;
- 		GtkAllocation allocation;
- 
--		gtk_widget_get_allocation (widget, &allocation);
-+		scrolled_window = gtk_widget_get_parent (widget);
-+
-+		g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), widget);
-+
-+		gtk_widget_get_allocation (scrolled_window, &allocation);
- 
- 		if (x)
- 			*x += allocation.x - GTK_HTML (widget)->engine->x_offset;
---
-cgit v0.9.0.2
diff --git a/extra/gtkimageview/PKGBUILD b/extra/gtkimageview/PKGBUILD
index 4f28a24ca..a0890e70c 100644
--- a/extra/gtkimageview/PKGBUILD
+++ b/extra/gtkimageview/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=gtkimageview
 pkgver=1.6.4
-pkgrel=3.1
+pkgrel=3.2
 pkgdesc="Simple image viewer widget for GTK2"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://trac.bjourne.webfactional.com/"
diff --git a/extra/gtkmm/PKGBUILD b/extra/gtkmm/PKGBUILD
index d5951d437..514ce832c 100644
--- a/extra/gtkmm/PKGBUILD
+++ b/extra/gtkmm/PKGBUILD
@@ -5,7 +5,7 @@
 pkgbase=gtkmm
 pkgname=('gtkmm' 'gtkmm-docs')
 pkgver=2.24.2
-pkgrel=2.1
+pkgrel=2.2
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs')
 license=('LGPL')
diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD
index f50942e08..f48187816 100644
--- a/extra/gtkmm3/PKGBUILD
+++ b/extra/gtkmm3/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169938 2012-10-30 22:45:55Z heftig $
+# $Id: PKGBUILD 184170 2013-05-03 03:05:29Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=gtkmm3
 _pkgbasename=gtkmm
 pkgname=('gtkmm3' 'gtkmm3-docs')
-pkgver=3.6.0
+pkgver=3.8.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt')
@@ -12,7 +12,7 @@ license=('LGPL')
 options=('!libtool' '!emptydirs')
 url="http://www.gtkmm.org/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('888154d5c8acec083aa15e8dab68d977a393ade7257f0630becfa9a223fa2359')
+sha256sums=('d374c6d6d78fd9f61bca737cd7c23452de427a1662de8abf46df784e07e4c95b')
 
 build() {
   cd "$_pkgbasename-$pkgver"
diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD
deleted file mode 100644
index ac67fdbd3..000000000
--- a/extra/gtkpod/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 175123 2013-01-14 08:37:19Z eric $
-# Contributor: Kevin Piche <kevin@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=gtkpod
-pkgver=2.1.3
-pkgrel=1
-pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://gtkpod.sourceforge.net"
-license=('GPL')
-depends=('libanjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk' 'hicolor-icon-theme' 'dconf' 'libwebkit3')
-makedepends=('flex' 'intltool' 'libvorbis' 'faad2')
-optdepends=('libmp4v2: MP4/h264 support'
-            'vorbis-tools: OGG support'
-	    'libvorbis: OGG support'
-            'id3v2: mp3 conversion support'
-            'faad2: m4a conversion support')
-install=gtkpod.install
-options=('!libtool')
-source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz"
-        gtkpod-2.1.3-gdl-3.6.patch)
-md5sums=('57f04578de6e3262a436ec574422b144'
-         '8d725015081bd89bc8f9a4521d170aef')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/gtkpod-2.1.3-gdl-3.6.patch"
-  sed -i 's#python#python2#' scripts/sync-palm-jppy.py
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/gtkpod/gtkpod-2.1.2-anjuta.patch b/extra/gtkpod/gtkpod-2.1.2-anjuta.patch
deleted file mode 100644
index 08c64f71b..000000000
--- a/extra/gtkpod/gtkpod-2.1.2-anjuta.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/anjuta-app.c~	2012-06-01 03:14:23.000000000 -0500
-+++ src/anjuta-app.c	2012-07-25 08:15:37.289630966 -0500
-@@ -501,7 +501,7 @@
-     g_list_free(plugins_dirs);
- 
-     /* Preferences */
--    app->preferences = anjuta_preferences_new(app->plugin_manager);
-+    app->preferences = anjuta_preferences_new(app->plugin_manager, PREF_SCHEMA);
-     g_object_add_weak_pointer(G_OBJECT (app->preferences), (gpointer) &app->preferences);
- 
-     g_signal_connect(app->settings, "changed::" GDL_STYLE, G_CALLBACK(on_gdl_style_changed), app);
diff --git a/extra/gtkpod/gtkpod-2.1.3-gdl-3.6.patch b/extra/gtkpod/gtkpod-2.1.3-gdl-3.6.patch
deleted file mode 100644
index b794fa11b..000000000
--- a/extra/gtkpod/gtkpod-2.1.3-gdl-3.6.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: gtkpod-2.1.2/src/anjuta-action-callbacks.c
-===================================================================
---- gtkpod-2.1.2.orig/src/anjuta-action-callbacks.c
-+++ gtkpod-2.1.2/src/anjuta-action-callbacks.c
-@@ -65,7 +65,7 @@ void
- on_layout_lock_toggle (GtkAction *action, AnjutaApp *app)
- {
- 	if (app->layout_manager)
--		g_object_set (app->layout_manager->master, "locked",
-+		g_object_set (gdl_dock_layout_get_master (app->layout_manager), "locked",
- 					  gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)),
- 					  NULL);
- }
-Index: gtkpod-2.1.2/src/anjuta-app.c
-===================================================================
---- gtkpod-2.1.2.orig/src/anjuta-app.c
-+++ gtkpod-2.1.2/src/anjuta-app.c
-@@ -252,7 +252,7 @@ static void on_gdl_style_changed(GSettin
-     else if (g_strcmp0(pr_style, "Tabs") == 0)
-         style = GDL_SWITCHER_STYLE_TABS;
- 
--    g_object_set(G_OBJECT(app->layout_manager->master), "switcher-style", style, NULL);
-+    g_object_set(G_OBJECT(gdl_dock_layout_get_master (app->layout_manager)), "switcher-style", style, NULL);
-     g_free(pr_style);
- }
- 
-@@ -478,14 +478,14 @@ static void anjuta_app_instance_init(Anj
-     gtk_widget_show(app->dock);
-     gtk_box_pack_end(GTK_BOX (hbox), app->dock, TRUE, TRUE, 0);
- 
--    dockbar = gdl_dock_bar_new(GDL_DOCK(app->dock));
-+    dockbar = gdl_dock_bar_new(G_OBJECT(app->dock));
-     gtk_widget_show(dockbar);
-     gtk_box_pack_start(GTK_BOX (hbox), dockbar, FALSE, FALSE, 0);
- 
--    app->layout_manager = gdl_dock_layout_new(GDL_DOCK (app->dock));
-+    app->layout_manager = gdl_dock_layout_new(G_OBJECT (app->dock));
-     g_signal_connect (app->layout_manager, "notify::dirty",
-             G_CALLBACK (on_layout_dirty_notify), app);
--    g_signal_connect (app->layout_manager->master, "notify::locked",
-+    g_signal_connect (gdl_dock_layout_get_master (app->layout_manager), "notify::locked",
-             G_CALLBACK (on_layout_locked_notify), app);
- 
-     /* UI engine */
diff --git a/extra/gtkpod/gtkpod.install b/extra/gtkpod/gtkpod.install
deleted file mode 100644
index c5d357a38..000000000
--- a/extra/gtkpod/gtkpod.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/extra/gtksourceview2/PKGBUILD b/extra/gtksourceview2/PKGBUILD
index bdd2614ff..8deeee2b1 100644
--- a/extra/gtksourceview2/PKGBUILD
+++ b/extra/gtksourceview2/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=gtksourceview2
 pkgver=2.10.5
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD
index d6c338e45..5e8654b70 100644
--- a/extra/gtksourceview3/PKGBUILD
+++ b/extra/gtksourceview3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170209 2012-11-05 11:49:55Z jgc $
+# $Id: PKGBUILD 183417 2013-04-21 22:10:55Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceview3
 _pkgbasename=gtksourceview
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection' 'glade')
 options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('a9d31df02acc6e9a9547b5ebaee19d1dc4c87b216eb561ee19da69bd1bb1bd0d')
+sha256sums=('f08005bfa5ecb71b05c4046d585ae072f084c90003b281a3ced8d882b96fe3cd')
 
 build() {
   cd "$_pkgbasename-$pkgver"
diff --git a/extra/gts/PKGBUILD b/extra/gts/PKGBUILD
index f3b9c8064..46985e4b0 100644
--- a/extra/gts/PKGBUILD
+++ b/extra/gts/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=gts
 pkgver=0.7.6
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc='Provides useful functions to deal with 3D surfaces meshed with interconnected triangles'
 url='http://gts.sourceforge.net/'
 license=('LGPL')
diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD
index 56aa3fa4b..5093302d1 100644
--- a/extra/gucharmap/PKGBUILD
+++ b/extra/gucharmap/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 170906 2012-11-12 22:40:18Z heftig $
+# $Id: PKGBUILD 183418 2013-04-21 22:10:57Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gucharmap
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Gnome Unicode Charmap"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org"
 depends=('dconf' 'gtk3' 'hicolor-icon-theme')
-makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl')
+makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl' 'desktop-file-utils')
 options=('!libtool' '!emptydirs')
 install=gucharmap.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c3aad2990010ab66225b748e6ac5402cad9f21e908cddf728e57d755c54cc6b2')
+sha256sums=('dc3223c7bd5dac4b979295cf7678c873046f8525f7d6f5562ab98239f563afc1')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/guile/PKGBUILD b/extra/guile/PKGBUILD
index 3ced05d8d..b42673104 100644
--- a/extra/guile/PKGBUILD
+++ b/extra/guile/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=guile
 pkgver=1.8.8
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc="a portable, embeddable Scheme implementation written in C"
 url="http://www.gnu.org/software/guile/"
 arch=(i686 x86_64 'mips64el')
diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD
index e9be3a918..76bcfe845 100644
--- a/extra/gupnp-av/PKGBUILD
+++ b/extra/gupnp-av/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 170152 2012-11-03 17:56:09Z heftig $
+# $Id: PKGBUILD 183420 2013-04-21 22:11:00Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Thijs Vermeir <thijsvermeir@gmail.com>
 # Contributor: Denis Zawada <deno@rootnode.net>
 
 pkgname=gupnp-av
-pkgver=0.10.3
+pkgver=0.12.1
 pkgrel=1
 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gupnp.org/"
-license=('LGPL')
-depends=('gupnp')
-makedepends=('gobject-introspection' 'gtk-doc')
+license=(LGPL)
+depends=(gupnp)
+makedepends=(gobject-introspection gtk-doc vala)
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d0dbb727d87bc9f2dc834455d14a30700b16b41a57e9dcde2e822b378ca8f1e2')
+sha256sums=('7c73f3c1e1c8f552079b8db8971348acf85078c82ed4da883b218bd993fcd4c4')
 
 build() {
   cd $pkgname-$pkgver
@@ -23,6 +23,11 @@ build() {
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
diff --git a/extra/gupnp-dlna/PKGBUILD b/extra/gupnp-dlna/PKGBUILD
new file mode 100644
index 000000000..f42e8dbd9
--- /dev/null
+++ b/extra/gupnp-dlna/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 183421 2013-04-21 22:11:02Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=gupnp-dlna
+pkgver=0.10.1
+pkgrel=1
+pkgdesc="Library to ease DLNA-related bits for applications using gupnp"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://gupnp.org/"
+license=(LGPL)
+depends=(gst-plugins-base-libs)
+makedepends=(gobject-introspection gtk-doc vala)
+options=('!libtool')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('c514ec6edd2a427914ef79fed002f91b875fde127084f21d770401a1d2b95f7b')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make -j1 DESTDIR="$pkgdir" install
+}
diff --git a/extra/gupnp-igd/PKGBUILD b/extra/gupnp-igd/PKGBUILD
index 3d936b173..57e204603 100644
--- a/extra/gupnp-igd/PKGBUILD
+++ b/extra/gupnp-igd/PKGBUILD
@@ -1,33 +1,33 @@
-# $Id: PKGBUILD 159125 2012-05-16 11:29:35Z eric $
+# $Id: PKGBUILD 183422 2013-04-21 22:11:03Z heftig $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor: William Díaz <wdiaz [at] archlinux [dot] us>
 
 pkgname=gupnp-igd
-pkgver=0.2.1
-pkgrel=3
+pkgver=0.2.2
+pkgrel=1
 pkgdesc="A library to handle UPnP IGD port mapping"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gupnp.org"
-license=('LGPL')
-depends=('gupnp' 'python2-gobject2')
-makedepends=('gettext')
+license=(LGPL)
+depends=(gupnp python2-gobject2)
+makedepends=(gettext)
 options=('!libtool' '!makeflags')
-source=(http://www.gupnp.org/sites/all/files/sources/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('409cb45e495dfa61c4ce4a74f8ba06f2784c39e2')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
+sha1sums=('bd24e98b224b3a233b0ab6714638ed4c6bf64b47')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   PYTHON=python2 ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD
index 2d9c0ee6f..498810474 100644
--- a/extra/gupnp/PKGBUILD
+++ b/extra/gupnp/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 169941 2012-10-30 22:46:05Z heftig $
+# $Id: PKGBUILD 183419 2013-04-21 22:10:59Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gupnp
-pkgver=0.18.4
+pkgver=0.20.2
 pkgrel=1
 pkgdesc="An object-oriented UPNP framework"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gupnp.org/"
-license=('LGPL')
-depends=('gssdp' 'util-linux')
-makedepends=('gobject-introspection' 'gtk-doc')
+license=(LGPL)
+depends=(gssdp util-linux)
+makedepends=(gobject-introspection gtk-doc vala) 
 optdepends=('python2: gupnp-binding-tool')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('6b437d5711b212292c6080626b97480268310da636a6cf937ad6119291af78a1')
+sha256sums=('9b27b1bdd16f7f13e28e20bce85a117e577a8183f95615876a9d91f4d4a70812')
 
 build() {
   cd $pkgname-$pkgver
@@ -24,6 +24,11 @@ build() {
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
diff --git a/extra/gutenprint/buildfix.patch b/extra/gutenprint/buildfix.patch
deleted file mode 100644
index 6b17a4029..000000000
--- a/extra/gutenprint/buildfix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up gutenprint-5.2.7/src/cups/commandtocanon.c.build gutenprint-5.2.7/src/cups/commandtocanon.c
---- gutenprint-5.2.7/src/cups/commandtocanon.c.build	2011-06-07 13:32:37.372042304 +0100
-+++ gutenprint-5.2.7/src/cups/commandtocanon.c	2011-06-07 13:32:41.270970750 +0100
-@@ -13,6 +13,7 @@
- 
- #include <cups/cups.h>
- #include <ctype.h>
-+#include <stdio.h>
- #include <stdlib.h>
- 
- 
-diff -up gutenprint-5.2.7/src/cups/commandtoepson.c.build gutenprint-5.2.7/src/cups/commandtoepson.c
---- gutenprint-5.2.7/src/cups/commandtoepson.c.build	2007-12-24 17:19:20.000000000 +0000
-+++ gutenprint-5.2.7/src/cups/commandtoepson.c	2011-06-07 13:32:35.656073794 +0100
-@@ -30,6 +30,7 @@
- 
- #include <cups/cups.h>
- #include <ctype.h>
-+#include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- 
diff --git a/extra/gv/PKGBUILD b/extra/gv/PKGBUILD
index 643e92997..6dc26d148 100644
--- a/extra/gv/PKGBUILD
+++ b/extra/gv/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 154831 2012-03-31 01:32:23Z eric $
+# $Id: PKGBUILD 180131 2013-03-18 05:57:27Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gv
-pkgver=3.7.3.90
-pkgrel=1.1
+pkgver=3.7.4
+pkgrel=1
 pkgdesc="A program to view PostScript and PDF documents"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gv/"
 license=('GPL3')
-depends=('xaw3d>=1.6' 'ghostscript' 'desktop-file-utils')
+depends=('xaw3d' 'ghostscript' 'desktop-file-utils')
+options=('emptydirs')
 install=gv.install
-#source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png)
-source=(ftp://alpha.gnu.org/gnu/gv/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png)
-md5sums=('3eba9b449ccae2537e7d14ce85ca9e66'
-         'cf04652952f2d0903bc7578b4826f50c'
-         'ab0e3879dbe39e59ad1c923020c28a86')
+source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig} gv.desktop)
+sha1sums=('d5bc11a37136dff69248f943a632544a4036b63f'
+          '7d8b7edd60617b189ba39ca982252b0d59c0755d'
+          'b40ccad8a8d837791598075f543edce9aa1f4352')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -27,5 +27,5 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -D -m644 ../gv.desktop "${pkgdir}/usr/share/applications/gv.desktop"
-  install -D -m644 ../gv.png "${pkgdir}/usr/share/pixmaps/gv.png"
+  install -D -m644 src/gv_icon.xbm "${pkgdir}/usr/share/pixmaps/gv.xbm"
 }
diff --git a/extra/gv/gv.desktop b/extra/gv/gv.desktop
index 6332ee859..e75a27653 100644
--- a/extra/gv/gv.desktop
+++ b/extra/gv/gv.desktop
@@ -4,7 +4,7 @@ Name=GV
 MimeType=application/pdf;application/postscript;image/x-eps;application/illustrator
 GenericName=Postscript Viewer
 Exec=gv
-Icon=gv
+Icon=gv.xbm
 Categories=Application;Graphics;Viewer;Office;
 Type=Application
 Terminal=false
diff --git a/extra/gv/gv.png b/extra/gv/gv.png
deleted file mode 100644
index 59e832a48..000000000
--- a/extra/gv/gv.png
+++ /dev/null
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index c4af1c2b7..8c2f5b737 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,23 +1,20 @@
-# $Id: PKGBUILD 175145 2013-01-15 11:34:12Z jgc $
+# $Id: PKGBUILD 183318 2013-04-21 22:06:37Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
-pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.14.2
-pkgrel=3
+pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp' 'gvfs-goa' 'gvfs-mtp')
+pkgver=1.16.1
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3')
+makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup>=2.24.0' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray')
 url="http://www.gnome.org"
 options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
-        fix-paranoia-include.patch)
-sha256sums=('c3bbdac4bc89de82a2ba373799da80d24fb6a038a9893d9b54e2c9429c878fbc'
-            '4385f9c5100bc0e01c59d07bef07737bb8155e60b56d3ee948e0b48ff207ff76')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('e7ec47547ff8029a2e8d81533bdfa870fe4a547c9d7c4e1e946d42d38970b0ac')
 
 build() {
   cd "$pkgbase-$pkgver"
-  patch -Np0 -i ../fix-paranoia-include.patch
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gvfs \
@@ -27,24 +24,28 @@ build() {
 
 package_gvfs() {
   pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
-  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup-gnome' 'udisks2' 'libsecret')
+  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup>=2.24.0' 'udisks2' 'libsecret' 'libbluray')
   optdepends=('gvfs-afc: AFC (mobile devices) support'
               'gvfs-smb: SMB/CIFS (Windows client) support'
               'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
               'gvfs-obexftp: ObexFTP (bluetooth) support'
               'gvfs-afp: Apple Filing Protocol (AFP) support'
+              'gvfs-mtp: MTP device support'
+              'gvfs-goa: gnome-online-accounts support'
               'gtk3: Recent files support')
   install=gvfs.install
 
   cd "$pkgbase-$pkgver"
   sed -e 's/^am__append_4/#am__append_4/' \
       -e 's/^am__append_5/#am__append_5/' \
+      -e 's/^am__append_6/#am__append_6/' \
+      -e 's/^am__append_7/#am__append_7/' \
       -i monitor/Makefile
   make DESTDIR="$pkgdir" install
 
   cd "$pkgdir"
-  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
-  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
+  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp,mtp}
+  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp,mtp}.mount
   rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
   rm usr/share/GConf/gsettings/gvfs-smb.convert
 }
@@ -114,3 +115,25 @@ package_gvfs-afp() {
   install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/"
   install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
 }
+
+package_gvfs-mtp() {
+  pkgdesc="MTP backend for gvfs"
+  depends=("gvfs=$pkgver" 'libmtp')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-mtp "$pkgdir/usr/lib/gvfs/gvfsd-mtp"
+  install -Dm644 mtp.mount "$pkgdir/usr/share/gvfs/mounts/mtp.mount"
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/mtp"
+  make DESTDIR="$pkgdir" install
+}
+
+package_gvfs-goa() {
+  pkgdesc="Gnome Online Accounts (webservices) backend for gvfs"
+  depends=("gvfs=$pkgver" 'gnome-online-accounts')
+  install=gvfs-module.install
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/goa"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/gvfs/do-not-emit-connected-added-signals-at-object-creation.patch b/extra/gvfs/do-not-emit-connected-added-signals-at-object-creation.patch
deleted file mode 100644
index 9369c87bd..000000000
--- a/extra/gvfs/do-not-emit-connected-added-signals-at-object-creation.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ca7743a63721c3dd1c166006539e356412466dcc Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc@gnome.org>
-Date: Sun, 23 Sep 2012 18:51:32 +0000
-Subject: proxy: don't emit connected/added signals at object creation
-
-It's unnecessary to emit those signals when the object is created, and
-it can cause weird side-effects if applications e.g. play a sound on
-signal emission.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=684677
----
-diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
-index 1af6c34..37fc788 100644
---- a/monitor/proxy/gproxyvolumemonitor.c
-+++ b/monitor/proxy/gproxyvolumemonitor.c
-@@ -955,6 +955,7 @@ g_proxy_volume_monitor_constructor (GType                  type,
-   GObjectClass *parent_class;
-   GError *error;
-   const char *dbus_name;
-+  gchar *name_owner;
- 
-   G_LOCK (proxy_vm);
- 
-@@ -1018,7 +1019,12 @@ g_proxy_volume_monitor_constructor (GType                  type,
-   /* listen to when the owner of the service appears/disappears */
-   g_signal_connect (monitor->proxy, "notify::g-name-owner", G_CALLBACK (name_owner_changed), monitor);
-   /* initially seed drives/volumes/mounts if we have an owner */
--  name_owner_changed (G_OBJECT (monitor->proxy), NULL, monitor);
-+  name_owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (monitor->proxy));
-+  if (name_owner != NULL)
-+    {
-+      seed_monitor (monitor);
-+      g_free (name_owner);
-+    }
- 
-   g_hash_table_insert (the_volume_monitors, (gpointer) type, object);
- 
---
-cgit v0.9.0.2
diff --git a/extra/gvfs/fix-paranoia-include.patch b/extra/gvfs/fix-paranoia-include.patch
deleted file mode 100644
index 02856a06f..000000000
--- a/extra/gvfs/fix-paranoia-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- daemon/gvfsbackendcdda.c.orig	2013-01-08 11:19:52.311593338 +0000
-+++ daemon/gvfsbackendcdda.c	2013-01-08 11:20:05.778169190 +0000
-@@ -55,7 +55,7 @@
- #include "gvfsjobenumerate.h"
- 
- #define DO_NOT_WANT_PARANOIA_COMPATIBILITY
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/paranoia.h>
- #include <cdio/cdio.h>
- 
- /* TODO:
diff --git a/extra/gvfs/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch b/extra/gvfs/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch
deleted file mode 100644
index 2d3bcb6c4..000000000
--- a/extra/gvfs/gdaemonmount-Check-for-a-NULL-GMountOperation-when-unmounting.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4a0915c25815647c165e7ca6047f3da84ece04ea Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-Date: Mon, 22 Oct 2012 13:07:04 +0000
-Subject: gdaemonmount: Check for a NULL GMountOperation when unmounting
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686637
----
-diff --git a/client/gdaemonmount.c b/client/gdaemonmount.c
-index 53f22b5..ca77648 100644
---- a/client/gdaemonmount.c
-+++ b/client/gdaemonmount.c
-@@ -330,8 +330,9 @@ g_daemon_mount_unmount_with_operation (GMount *mount,
-   data = g_new0 (AsyncProxyCreate, 1);
-   data->mount = g_object_ref (mount);
-   data->mount_info = daemon_mount->mount_info;
--  data->mount_operation = g_object_ref (mount_operation);
-   data->flags = flags;
-+  if (mount_operation)
-+    data->mount_operation = g_object_ref (mount_operation);
-   if (cancellable)
-     data->cancellable = g_object_ref (cancellable);
- 
---
-cgit v0.9.0.2
diff --git a/extra/gvfs/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch b/extra/gvfs/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch
deleted file mode 100644
index e56a46ac6..000000000
--- a/extra/gvfs/proxy-volume-monitor-Dont-disable-exit_on_close-on-session-bus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5265dff7b56d892917640367414cf5d3f5e7ddb7 Mon Sep 17 00:00:00 2001
-From: Tomas Bzatek <tbzatek@redhat.com>
-Date: Thu, 01 Nov 2012 13:37:37 +0000
-Subject: proxy volume monitor: Don't disable exit_on_close on session bus
-
-We're on shared session bus, let's exit when connection closes
-(usually tied to running desktop session).
-
-https://bugzilla.gnome.org/show_bug.cgi?id=687074
-(cherry picked from commit f70800d655ca6b222625cd72af820f17404bdb4d)
----
-diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
-index 1af6c34..e0d17b7 100644
---- a/monitor/proxy/gproxyvolumemonitor.c
-+++ b/monitor/proxy/gproxyvolumemonitor.c
-@@ -1418,7 +1418,6 @@ g_proxy_volume_monitor_setup_session_bus_connection (void)
-       g_error_free (error);
-       goto out;
-     }
--  g_dbus_connection_set_exit_on_close (the_session_bus, FALSE);
- 
-   the_volume_monitors = g_hash_table_new (g_direct_hash, g_direct_equal);
- 
---
-cgit v0.9.0.2
diff --git a/extra/gvfs/proxy-volume-monitor-Dont-force-close-the-session-bus.patch b/extra/gvfs/proxy-volume-monitor-Dont-force-close-the-session-bus.patch
deleted file mode 100644
index 1a09ef7e6..000000000
--- a/extra/gvfs/proxy-volume-monitor-Dont-force-close-the-session-bus.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 5dfdaf9a18971bf5504a0d3fe00f747a853ee800 Mon Sep 17 00:00:00 2001
-From: Tomas Bzatek <tbzatek@redhat.com>
-Date: Thu, 01 Nov 2012 13:46:10 +0000
-Subject: proxy volume monitor: Don't force-close the session bus
-
-Simple fix to prevent bus closing on GIO module unload.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=687074
----
-diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
-index e0d17b7..df99935 100644
---- a/monitor/proxy/gproxyvolumemonitor.c
-+++ b/monitor/proxy/gproxyvolumemonitor.c
-@@ -1435,7 +1435,6 @@ g_proxy_volume_monitor_teardown_session_bus_connection (void)
-   G_LOCK (proxy_vm);
-   if (the_session_bus != NULL)
-     {
--      g_dbus_connection_close_sync (the_session_bus, NULL, NULL);
-       g_object_unref (the_session_bus);
-       the_session_bus = NULL;
- 
---
-cgit v0.9.0.2
diff --git a/extra/gweled/PKGBUILD b/extra/gweled/PKGBUILD
index 2769eb8f7..7ad07bf6e 100644
--- a/extra/gweled/PKGBUILD
+++ b/extra/gweled/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=gweled
 pkgver=0.9.1
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A puzzle game similar to Bejeweled (aka Diamond Mine)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD
index 9edf2f2db..90cdbe831 100644
--- a/extra/harfbuzz/PKGBUILD
+++ b/extra/harfbuzz/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175869 2013-01-23 00:13:03Z eric $
+# $Id: PKGBUILD 183266 2013-04-20 05:39:22Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=harfbuzz
-pkgver=0.9.9
-pkgrel=3
+pkgver=0.9.16
+pkgrel=1
 pkgdesc="OpenType text shaping engine."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -13,7 +13,7 @@ makedepends=('icu' 'cairo' 'glib2' 'freetype2')
 optdepends=('cairo: hb-view program')
 options=(!libtool)
 source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3d8dd4ebbc38da011485ef181f8ff072b4b0d7e305bbda19b355f217d25169cf')
+sha256sums=('6da7e032f705d8a5c91487cd296628d64975672a5b0c1704829cf2285072c92b')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/haskell-http/PKGBUILD b/extra/haskell-http/PKGBUILD
index 7d99d4eee..621e10490 100644
--- a/extra/haskell-http/PKGBUILD
+++ b/extra/haskell-http/PKGBUILD
@@ -1,40 +1,49 @@
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
 
 _hkgname=HTTP
 pkgname=haskell-http
-pkgver=4000.2.7
+pkgver=4000.2.8
 pkgrel=1
 pkgdesc="A library for client-side HTTP"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.6.2-1' 'sh' 'haskell-network=2.4.1.0-1' 'haskell-parsec=3.1.3-2' 'haskell-mtl=2.1.2-2')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.3-1' 'sh' 'haskell-network=2.4.1.2-1' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
-md5sums=('a9b6fbce9f0a1247b1f523c87987757d')
+md5sums=('94be05278da4e9324aaef6e012e751e2')
 
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+  cd ${_hkgname}-${pkgver}
+
+  runhaskell Setup configure -O -p \
+    --enable-split-objs \
+    --enable-shared \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/${pkgname} \
+    --libsubdir=\$compiler/site-local/\$pkgid
+
+  runhaskell Setup build
+
+  runhaskell Setup haddock
+
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+  cd ${_hkgname}-${pkgver}
+
+  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+
+  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+
+  runhaskell Setup copy --destdir=${pkgdir}
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
+
diff --git a/extra/haskell-http/haskell-http.install b/extra/haskell-http/haskell-http.install
index fdebb1cb8..0593ec4e2 100644
--- a/extra/haskell-http/haskell-http.install
+++ b/extra/haskell-http/haskell-http.install
@@ -1,18 +1,35 @@
-HS_DIR=usr/share/haskell/haskell-http
-post_install() {
-  ${HS_DIR}/register.sh
+pkgname=haskell-http
+
+_register() {
+  usr/share/haskell/${pkgname}/register.sh
+}
+
+_unregister() {
+  usr/share/haskell/${pkgname}/unregister.sh
+}
+
+_gen_contents() {
   (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
+
+post_install() {
+  _register
+  _gen_contents
+}
+
 pre_upgrade() {
-  ${HS_DIR}/unregister.sh
+  _unregister
 }
+
 post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  _register
+  _gen_contents
 }
+
 pre_remove() {
-  ${HS_DIR}/unregister.sh
+  _unregister
 }
+
 post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  _gen_contents
 }
diff --git a/extra/haskell-mtl/PKGBUILD b/extra/haskell-mtl/PKGBUILD
index 6b8198fec..c755c10a8 100644
--- a/extra/haskell-mtl/PKGBUILD
+++ b/extra/haskell-mtl/PKGBUILD
@@ -1,38 +1,49 @@
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 _hkgname=mtl
 pkgname=haskell-mtl
 pkgver=2.1.2
-pkgrel=2
-pkgdesc="Monad transformer library"
+pkgrel=3
+pkgdesc="Monad classes, using functional dependencies"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.6.2-1' 'sh' 'haskell-transformers=0.3.0.0-3')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.3-1' 'sh' 'haskell-transformers=0.3.0.0-4')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
 md5sums=('943c110524d96126bfa0e61f7df1ebcd')
 
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+  cd ${_hkgname}-${pkgver}
+
+  runhaskell Setup configure -O -p \
+    --enable-split-objs \
+    --enable-shared \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/${pkgname} \
+    --libsubdir=\$compiler/site-local/\$pkgid
+
+  runhaskell Setup build
+
+  runhaskell Setup haddock
+
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+  cd ${_hkgname}-${pkgver}
+
+  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+
+  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+
+  runhaskell Setup copy --destdir=${pkgdir}
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
+
diff --git a/extra/haskell-mtl/haskell-mtl.install b/extra/haskell-mtl/haskell-mtl.install
index 9325811e8..17c40da11 100644
--- a/extra/haskell-mtl/haskell-mtl.install
+++ b/extra/haskell-mtl/haskell-mtl.install
@@ -1,18 +1,35 @@
-HS_DIR=usr/share/haskell/haskell-mtl
-post_install() {
-  ${HS_DIR}/register.sh
+pkgname=haskell-mtl
+
+_register() {
+  usr/share/haskell/${pkgname}/register.sh
+}
+
+_unregister() {
+  usr/share/haskell/${pkgname}/unregister.sh
+}
+
+_gen_contents() {
   (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
+
+post_install() {
+  _register
+  _gen_contents
+}
+
 pre_upgrade() {
-  ${HS_DIR}/unregister.sh
+  _unregister
 }
+
 post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  _register
+  _gen_contents
 }
+
 pre_remove() {
-  ${HS_DIR}/unregister.sh
+  _unregister
 }
+
 post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  _gen_contents
 }
diff --git a/extra/haskell-network/PKGBUILD b/extra/haskell-network/PKGBUILD
index e10b3901b..70bbb8aa9 100644
--- a/extra/haskell-network/PKGBUILD
+++ b/extra/haskell-network/PKGBUILD
@@ -1,40 +1,49 @@
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
 
 _hkgname=network
 pkgname=haskell-network
-pkgver=2.4.1.0
+pkgver=2.4.1.2
 pkgrel=1
-pkgdesc="Networking-related facilities"
-url="http://hackage.haskell.org/package/network"
+pkgdesc="Low-level networking interface"
+url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.6.2-1' 'sh' 'haskell-parsec=3.1.3-2')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.3-1' 'sh' 'haskell-parsec=3.1.3-3')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
-md5sums=('45255ad17b04bb2d43c411ab41b727d5')
+md5sums=('032075c35dea5d23923af3928f9a5511')
 
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+  cd ${_hkgname}-${pkgver}
+
+  runhaskell Setup configure -O -p \
+    --enable-split-objs \
+    --enable-shared \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/${pkgname} \
+    --libsubdir=\$compiler/site-local/\$pkgid
+
+  runhaskell Setup build
+
+  runhaskell Setup haddock
+
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+  cd ${_hkgname}-${pkgver}
+
+  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+
+  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+
+  runhaskell Setup copy --destdir=${pkgdir}
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
+
diff --git a/extra/haskell-network/haskell-network.install b/extra/haskell-network/haskell-network.install
index a56c31d0a..e6177f643 100644
--- a/extra/haskell-network/haskell-network.install
+++ b/extra/haskell-network/haskell-network.install
@@ -1,18 +1,35 @@
-HS_DIR=usr/share/haskell/haskell-network
-post_install() {
-  ${HS_DIR}/register.sh
+pkgname=haskell-network
+
+_register() {
+  usr/share/haskell/${pkgname}/register.sh
+}
+
+_unregister() {
+  usr/share/haskell/${pkgname}/unregister.sh
+}
+
+_gen_contents() {
   (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
+
+post_install() {
+  _register
+  _gen_contents
+}
+
 pre_upgrade() {
-  ${HS_DIR}/unregister.sh
+  _unregister
 }
+
 post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  _register
+  _gen_contents
 }
+
 pre_remove() {
-  ${HS_DIR}/unregister.sh
+  _unregister
 }
+
 post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  _gen_contents
 }
diff --git a/extra/haskell-parsec/PKGBUILD b/extra/haskell-parsec/PKGBUILD
index 17acd15a3..02ae2aa0e 100644
--- a/extra/haskell-parsec/PKGBUILD
+++ b/extra/haskell-parsec/PKGBUILD
@@ -1,39 +1,49 @@
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# As generated by cabal2arch 0.7.6
 
 _hkgname=parsec
 pkgname=haskell-parsec
 pkgver=3.1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Monadic parser combinators"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.6.2-1' 'sh' 'haskell-mtl=2.1.2-2' 'haskell-text=0.11.2.3-2')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.3-1' 'sh' 'haskell-mtl=2.1.2-3' 'haskell-text=0.11.2.3-3')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
 md5sums=('d72fc94b81153132c61125a1ec52a4a5')
 
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+  cd ${_hkgname}-${pkgver}
+
+  runhaskell Setup configure -O -p \
+    --enable-split-objs \
+    --enable-shared \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/${pkgname} \
+    --libsubdir=\$compiler/site-local/\$pkgid
+
+  runhaskell Setup build
+
+  runhaskell Setup haddock
+
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+  cd ${_hkgname}-${pkgver}
+
+  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+
+  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+
+  runhaskell Setup copy --destdir=${pkgdir}
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
+
diff --git a/extra/haskell-parsec/haskell-parsec.install b/extra/haskell-parsec/haskell-parsec.install
index dfa0701b9..25f4e6e9b 100644
--- a/extra/haskell-parsec/haskell-parsec.install
+++ b/extra/haskell-parsec/haskell-parsec.install
@@ -1,18 +1,35 @@
-HS_DIR=usr/share/haskell/haskell-parsec
-post_install() {
-  ${HS_DIR}/register.sh
+pkgname=haskell-parsec
+
+_register() {
+  usr/share/haskell/${pkgname}/register.sh
+}
+
+_unregister() {
+  usr/share/haskell/${pkgname}/unregister.sh
+}
+
+_gen_contents() {
   (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
+
+post_install() {
+  _register
+  _gen_contents
+}
+
 pre_upgrade() {
-  ${HS_DIR}/unregister.sh
+  _unregister
 }
+
 post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  _register
+  _gen_contents
 }
+
 pre_remove() {
-  ${HS_DIR}/unregister.sh
+  _unregister
 }
+
 post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  _gen_contents
 }
diff --git a/extra/haskell-random/PKGBUILD b/extra/haskell-random/PKGBUILD
index 4bb275bec..649d2bd84 100644
--- a/extra/haskell-random/PKGBUILD
+++ b/extra/haskell-random/PKGBUILD
@@ -3,35 +3,47 @@
 _hkgname=random
 pkgname=haskell-random
 pkgver=1.0.1.1
-pkgrel=4
-pkgdesc="A basic random number generation library"
+pkgrel=5
+pkgdesc="random number library"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.6.2-1' 'sh')
+depends=('ghc=7.6.3-1' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
 md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538')
 
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+  cd ${_hkgname}-${pkgver}
+
+  runhaskell Setup configure -O -p \
+    --enable-split-objs \
+    --enable-shared \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/${pkgname} \
+    --libsubdir=\$compiler/site-local/\$pkgid
+
+  runhaskell Setup build
+
+  runhaskell Setup haddock
+
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+  cd ${_hkgname}-${pkgver}
+
+  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+
+  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+
+  runhaskell Setup copy --destdir=${pkgdir}
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
 
diff --git a/extra/haskell-random/haskell-random.install b/extra/haskell-random/haskell-random.install
index b6d807e1a..0dc80227b 100644
--- a/extra/haskell-random/haskell-random.install
+++ b/extra/haskell-random/haskell-random.install
@@ -1,18 +1,35 @@
-HS_DIR=usr/share/haskell/haskell-random
-post_install() {
-  ${HS_DIR}/register.sh
+pkgname=haskell-random
+
+_register() {
+  usr/share/haskell/${pkgname}/register.sh
+}
+
+_unregister() {
+  usr/share/haskell/${pkgname}/unregister.sh
+}
+
+_gen_contents() {
   (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
+
+post_install() {
+  _register
+  _gen_contents
+}
+
 pre_upgrade() {
-  ${HS_DIR}/unregister.sh
+  _unregister
 }
+
 post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  _register
+  _gen_contents
 }
+
 pre_remove() {
-  ${HS_DIR}/unregister.sh
+  _unregister
 }
+
 post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  _gen_contents
 }
diff --git a/extra/haskell-text/PKGBUILD b/extra/haskell-text/PKGBUILD
index 658d1b01f..b50b41af4 100644
--- a/extra/haskell-text/PKGBUILD
+++ b/extra/haskell-text/PKGBUILD
@@ -1,38 +1,49 @@
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 _hkgname=text
 pkgname=haskell-text
 pkgver=0.11.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="An efficient packed Unicode text type."
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.6.2-1' 'sh')
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.3-1' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
 md5sums=('7a469d49a7576fb3a18785cb64d4ee6c')
 
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+  cd ${_hkgname}-${pkgver}
+
+  runhaskell Setup configure -O -p \
+    --enable-split-objs \
+    --enable-shared \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/${pkgname} \
+    --libsubdir=\$compiler/site-local/\$pkgid
+
+  runhaskell Setup build
+
+  runhaskell Setup haddock
+
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+  cd ${_hkgname}-${pkgver}
+
+  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+
+  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+
+  runhaskell Setup copy --destdir=${pkgdir}
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
+
diff --git a/extra/haskell-text/haskell-text.install b/extra/haskell-text/haskell-text.install
index 620db3921..44ef4244a 100644
--- a/extra/haskell-text/haskell-text.install
+++ b/extra/haskell-text/haskell-text.install
@@ -1,18 +1,35 @@
-HS_DIR=usr/share/haskell/haskell-text
-post_install() {
-  ${HS_DIR}/register.sh
+pkgname=haskell-text
+
+_register() {
+  usr/share/haskell/${pkgname}/register.sh
+}
+
+_unregister() {
+  usr/share/haskell/${pkgname}/unregister.sh
+}
+
+_gen_contents() {
   (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
+
+post_install() {
+  _register
+  _gen_contents
+}
+
 pre_upgrade() {
-  ${HS_DIR}/unregister.sh
+  _unregister
 }
+
 post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  _register
+  _gen_contents
 }
+
 pre_remove() {
-  ${HS_DIR}/unregister.sh
+  _unregister
 }
+
 post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  _gen_contents
 }
diff --git a/extra/haskell-transformers/PKGBUILD b/extra/haskell-transformers/PKGBUILD
index 9a310e2ba..94006ab2d 100644
--- a/extra/haskell-transformers/PKGBUILD
+++ b/extra/haskell-transformers/PKGBUILD
@@ -1,39 +1,49 @@
-# $Id: PKGBUILD 177613 2013-02-08 04:14:37Z td123 $
-
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: Rémy Oudompheng <remy@archlinux.org>
 
 _hkgname=transformers
 pkgname=haskell-transformers
 pkgver=0.3.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Concrete functor and monad transformers"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.6.2-1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.3-1' 'sh')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
 md5sums=('852dc0b79cc2bcb39136287d3dd385e5')
 
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+  cd ${_hkgname}-${pkgver}
+
+  runhaskell Setup configure -O -p \
+    --enable-split-objs \
+    --enable-shared \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/${pkgname} \
+    --libsubdir=\$compiler/site-local/\$pkgid
+
+  runhaskell Setup build
+
+  runhaskell Setup haddock
+
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+  cd ${_hkgname}-${pkgver}
+
+  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+
+  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+
+  runhaskell Setup copy --destdir=${pkgdir}
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
+
diff --git a/extra/haskell-transformers/haskell-transformers.install b/extra/haskell-transformers/haskell-transformers.install
index eec2af6e1..a59cd9850 100644
--- a/extra/haskell-transformers/haskell-transformers.install
+++ b/extra/haskell-transformers/haskell-transformers.install
@@ -1,18 +1,35 @@
-HS_DIR=usr/share/haskell/haskell-transformers
-post_install() {
-  ${HS_DIR}/register.sh
+pkgname=haskell-transformers
+
+_register() {
+  usr/share/haskell/${pkgname}/register.sh
+}
+
+_unregister() {
+  usr/share/haskell/${pkgname}/unregister.sh
+}
+
+_gen_contents() {
   (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
+
+post_install() {
+  _register
+  _gen_contents
+}
+
 pre_upgrade() {
-  ${HS_DIR}/unregister.sh
+  _unregister
 }
+
 post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  _register
+  _gen_contents
 }
+
 pre_remove() {
-  ${HS_DIR}/unregister.sh
+  _unregister
 }
+
 post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  _gen_contents
 }
diff --git a/extra/haskell-zlib/PKGBUILD b/extra/haskell-zlib/PKGBUILD
index 624f98cb1..2c541b5f3 100644
--- a/extra/haskell-zlib/PKGBUILD
+++ b/extra/haskell-zlib/PKGBUILD
@@ -1,44 +1,49 @@
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package originally generated by cabal2arch 0.7.6
 
 _hkgname=zlib
 pkgname=haskell-zlib
-pkgver=0.5.4.0
+pkgver=0.5.4.1
 pkgrel=1
 pkgdesc="Compression and decompression in the gzip and zlib formats"
-url="http://hackage.haskell.org/package/zlib"
+url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('ghc=7.6.2-1' 'zlib' 'sh')
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.3-1' 'sh' 'zlib')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
-md5sums=('eb5984b936a7c37a0cdaa357149176b2')
+md5sums=('d0d10786d2bbd1d401a8b28a83e88475')
 
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-
-    # ghc 7.6 includes bytestring 0.10
-    sed 's/bytestring == 0.9.*/bytestring == 0.10.*/' -i zlib.cabal
-
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+  cd ${_hkgname}-${pkgver}
+
+  runhaskell Setup configure -O -p \
+    --enable-split-objs \
+    --enable-shared \
+    --prefix=/usr \
+    --docdir=/usr/share/doc/${pkgname} \
+    --libsubdir=\$compiler/site-local/\$pkgid
+
+  runhaskell Setup build
+
+  runhaskell Setup haddock
+
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+  cd ${_hkgname}-${pkgver}
+
+  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
+  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
+
+  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
+
+  runhaskell Setup copy --destdir=${pkgdir}
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
+
diff --git a/extra/haskell-zlib/haskell-zlib.install b/extra/haskell-zlib/haskell-zlib.install
index d387b7b65..a2bb66224 100644
--- a/extra/haskell-zlib/haskell-zlib.install
+++ b/extra/haskell-zlib/haskell-zlib.install
@@ -1,18 +1,35 @@
-HS_DIR=usr/share/haskell/haskell-zlib
-post_install() {
-  ${HS_DIR}/register.sh
+pkgname=haskell-zlib
+
+_register() {
+  usr/share/haskell/${pkgname}/register.sh
+}
+
+_unregister() {
+  usr/share/haskell/${pkgname}/unregister.sh
+}
+
+_gen_contents() {
   (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
+
+post_install() {
+  _register
+  _gen_contents
+}
+
 pre_upgrade() {
-  ${HS_DIR}/unregister.sh
+  _unregister
 }
+
 post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  _register
+  _gen_contents
 }
+
 pre_remove() {
-  ${HS_DIR}/unregister.sh
+  _unregister
 }
+
 post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+  _gen_contents
 }
diff --git a/extra/hddtemp/PKGBUILD b/extra/hddtemp/PKGBUILD
index e2ca08aac..a25f2411b 100644
--- a/extra/hddtemp/PKGBUILD
+++ b/extra/hddtemp/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=hddtemp
 _origver=0.3-beta15
 _patchver=${_origver}-52
 pkgver=${_patchver//-/.}
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Gives you the temperature of your hard drive by reading S.M.A.R.T. information"
 url='https://savannah.nongnu.org/projects/hddtemp/'
 license=('GPL')
diff --git a/extra/hddtemp/hddtemp b/extra/hddtemp/hddtemp
deleted file mode 100644
index 62f090808..000000000
--- a/extra/hddtemp/hddtemp
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PARAMS=
-DRIVES=
-[ -f /etc/conf.d/hddtemp ] && . /etc/conf.d/hddtemp
-PID=$(pidof -o %PPID /usr/sbin/hddtemp)
-case "$1" in
-  start)
-    stat_busy "Starting HDDTemp"
-    [ -z "$PID" ] && /usr/sbin/hddtemp -d $PARAMS $DRIVES
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon hddtemp
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping HDDTemp"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon hddtemp
-      stat_done
-    fi 
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/hddtemp/hddtemp-0.3-beta15-reg-eip.patch b/extra/hddtemp/hddtemp-0.3-beta15-reg-eip.patch
deleted file mode 100644
index 504a0366e..000000000
--- a/extra/hddtemp/hddtemp-0.3-beta15-reg-eip.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-__USE_GNU needs to be in effect when including sys/ucontext.h,
-and signal.h pulls it in in some setups.
-
-diff -up hddtemp-0.3-beta15/src/backtrace.c~ hddtemp-0.3-beta15/src/backtrace.c
---- hddtemp-0.3-beta15/src/backtrace.c~	2006-04-19 05:38:14.000000000 +0300
-+++ hddtemp-0.3-beta15/src/backtrace.c	2010-02-14 21:59:47.000000000 +0200
-@@ -27,13 +27,12 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <linux/ptrace.h>
-+#define __USE_GNU
-+#include <ucontext.h>
- #include <signal.h>
- #include <bits/sigcontext.h>
- #include <sys/param.h>
- 
--#define __USE_GNU
--#include <ucontext.h>
--
- #define MAX_BTSIZE 64
- 
- void backtrace_handler(int n, siginfo_t *ist, void *extra) {
diff --git a/extra/hddtemp/hddtemp.confd b/extra/hddtemp/hddtemp.confd
deleted file mode 100644
index 6a1e18e0b..000000000
--- a/extra/hddtemp/hddtemp.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-PARAMS="-q -l 127.0.0.1"
-DRIVES="/dev/sda"
diff --git a/extra/hddtemp/hddtemp.service b/extra/hddtemp/hddtemp.service
deleted file mode 100644
index bc56d16b0..000000000
--- a/extra/hddtemp/hddtemp.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Hard drive temperature monitor daemon
-
-[Service]
-EnvironmentFile=/etc/conf.d/hddtemp 
-ExecStart=/usr/sbin/hddtemp -dF $PARAMS $DRIVES
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/hdf5-cpp-fortran/PKGBUILD b/extra/hdf5-cpp-fortran/PKGBUILD
index 0308e51ef..39df4f8b9 100644
--- a/extra/hdf5-cpp-fortran/PKGBUILD
+++ b/extra/hdf5-cpp-fortran/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=hdf5-cpp-fortran
 _pkgname=hdf5
 pkgver=1.8.10
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="General purpose library and file format for storing scientific data"
 url="http://www.hdfgroup.org/HDF5/"
 license=('custom')
diff --git a/extra/hdf5-openmpi/PKGBUILD b/extra/hdf5-openmpi/PKGBUILD
index 63b23bbf0..772d20919 100644
--- a/extra/hdf5-openmpi/PKGBUILD
+++ b/extra/hdf5-openmpi/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=hdf5-openmpi
 _pkgname=hdf5
 pkgver=1.8.10
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="General purpose library and file format for storing scientific data (OpenMPI version)"
 url="http://www.hdfgroup.org/HDF5/"
 license=('custom')
diff --git a/extra/hefur/Check-that-added-torrents-from-the-disk-are-still-on.patch b/extra/hefur/Check-that-added-torrents-from-the-disk-are-still-on.patch
deleted file mode 100644
index 8ad67ee74..000000000
--- a/extra/hefur/Check-that-added-torrents-from-the-disk-are-still-on.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From dbd00cfc3805b6f1ff794f7de0b52b1a7893401f Mon Sep 17 00:00:00 2001
-From: Alexandre Bique <bique.alexandre@gmail.com>
-Date: Thu, 15 Nov 2012 20:43:41 +0100
-Subject: [PATCH 07/12] Check that added torrents from the disk are still on
- the disk.
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- hefur/fs-tree-white-list.cc | 20 ++++++++++++++++++++
- hefur/fs-tree-white-list.hh |  1 +
- hefur/torrent-db.hh         |  4 +++-
- 3 files changed, 24 insertions(+), 1 deletion(-)
-
-diff --git a/hefur/fs-tree-white-list.cc b/hefur/fs-tree-white-list.cc
-index f493e95..61714d0 100644
---- a/hefur/fs-tree-white-list.cc
-+++ b/hefur/fs-tree-white-list.cc
-@@ -54,10 +54,30 @@ namespace hefur
-   }
- 
-   void
-+  FsTreeWhiteList::check()
-+  {
-+    std::vector<m::StringRef> keys;
-+    auto db = Hefur::instance().torrentDb();
-+    m::SharedMutex::Locker locker(db->torrents_lock_);
-+    db->torrents_.foreach([this, &keys] (Torrent::Ptr torrent) {
-+        if (::strncmp(torrent->path().c_str(), root_.c_str(), root_.size()))
-+          return;
-+
-+        struct ::stat st;
-+        if (::stat(torrent->path().c_str(), &st) && errno == ENOENT)
-+          keys.push_back(torrent->key());
-+      });
-+
-+    for (auto it = keys.begin(); it != keys.end(); ++it)
-+      db->torrents_.erase(*it);
-+  }
-+
-+  void
-   FsTreeWhiteList::loopScan()
-   {
-     do {
-       scan();
-+      check();
-     } while (!stop_.timedWait(m::time() + rescan_interval_));
-   }
- }
-diff --git a/hefur/fs-tree-white-list.hh b/hefur/fs-tree-white-list.hh
-index c32bcd4..643fb78 100644
---- a/hefur/fs-tree-white-list.hh
-+++ b/hefur/fs-tree-white-list.hh
-@@ -30,6 +30,7 @@ namespace hefur
-      * When a .torrent is found, call TorrentDb::addTorrent().
-      */
-     void scan();
-+    void check();
- 
-   private:
-     /**
-diff --git a/hefur/torrent-db.hh b/hefur/torrent-db.hh
-index a1e5d38..e25ed33 100644
---- a/hefur/torrent-db.hh
-+++ b/hefur/torrent-db.hh
-@@ -17,6 +17,7 @@ namespace hefur
- {
-   class StatHandler;
-   class PeersHandler;
-+  class FsTreeWhiteList;
- 
-   /**
-    * This is the "in memory" torrent database.
-@@ -63,6 +64,7 @@ namespace hefur
-     friend class StatHandler;
-     friend class PeersHandler;
-     friend class FileHandler;
-+    friend class FsTreeWhiteList;
- 
-     /** helper to use torrent->key() as a key for the trie */
-     static inline m::StringRef torrentKey(Torrent::Ptr torrent) {
-@@ -77,7 +79,7 @@ namespace hefur
-     m::Future<bool> cleanup_stop_;
-     m::Thread       cleanup_thread_;
-     m::SharedMutex  torrents_lock_;
--    torrents_type        torrents_;
-+    torrents_type   torrents_;
-   };
- }
- 
--- 
-1.8.0.1
-
diff --git a/extra/hefur/PKGBUILD b/extra/hefur/PKGBUILD
index ca4262d18..78f33fc80 100644
--- a/extra/hefur/PKGBUILD
+++ b/extra/hefur/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 172896 2012-12-06 11:02:02Z pierre $
+# $Id: PKGBUILD 179041 2013-03-01 20:41:07Z andrea $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Alexandre Bique <bique.alexandre@gmail.com>
 
 pkgname=hefur
 pkgver=0.4
-pkgrel=1
+pkgrel=2
 pkgdesc='A standalone and lightweight BitTorrent tracker'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://github.com/abique/hefur'
diff --git a/extra/hefur/Replace-by-amp-in-stat.html.patch b/extra/hefur/Replace-by-amp-in-stat.html.patch
deleted file mode 100644
index a11406a2f..000000000
--- a/extra/hefur/Replace-by-amp-in-stat.html.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6986df22d293b7a149f51d4d8ba4a995645a4560 Mon Sep 17 00:00:00 2001
-From: Alexandre Bique <bique.alexandre@gmail.com>
-Date: Sun, 4 Nov 2012 14:08:47 +0100
-Subject: [PATCH 03/12] Replace & by &amp; in stat.html.
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- www/tpl/stat.html | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/www/tpl/stat.html b/www/tpl/stat.html
-index 3234679..1e3b148 100644
---- a/www/tpl/stat.html
-+++ b/www/tpl/stat.html
-@@ -21,7 +21,7 @@
-     {{*torrents}}
-     <tr>
-       <td>
--        <a href="magnet:?xt=urn:btih:{{info_sha1|b16}}&dn={{name|u}}&tr={{tracker_udp|u}}&tr={{tracker_http|u}}"
-+        <a href="magnet:?xt=urn:btih:{{info_sha1|b16}}&amp;dn={{name|u}}&amp;tr={{tracker_udp|u}}&amp;tr={{tracker_http|u}}"
-            title="Magnet link">
-           <img src="/img/magnet-icon.gif"/>
-         </a>
--- 
-1.8.0.1
-
diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index c7182bfb9..604b8ad6f 100644
--- a/extra/help2man/PKGBUILD
+++ b/extra/help2man/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 176065 2013-01-27 09:20:55Z giovanni $
+# $Id: PKGBUILD 182988 2013-04-16 16:24:02Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 
 pkgname=help2man
-pkgver=1.41.1
+pkgver=1.41.2
 pkgrel=1
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('perl-locale-gettext')
 install=help2man.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('4485615cd699a78eb42444324546942a')
+md5sums=('48cb7fa1d9cca2ebea1844694668c8a8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/hercules/PKGBUILD b/extra/hercules/PKGBUILD
deleted file mode 100644
index 752eea7e7..000000000
--- a/extra/hercules/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 151558 2012-02-27 17:50:18Z pierre $
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-
-pkgname=hercules
-pkgver=3.07
-pkgrel=2.1
-pkgdesc="A software implementation of the mainframe System/370 and ESA/390 architectures"
-url="http://www.hercules-390.org/"
-source=("http://www.hercules-390.org/$pkgname-$pkgver.tar.gz")
-arch=('i686' 'x86_64' 'mips64el')
-license=('custom')
-options=('!libtool')
-depends=('bzip2' 'libgcrypt' 'zlib')
-md5sums=('a12aa1645b0695b25b7fc0c9a3ccab3a')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # Change module extension from .la to .so.
-  sed '/HDL_MODULE_SUFFIX/ s/\.la/.so/' -i hdl.h
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr install
-  install -D -m644 COPYRIGHT \
-    $pkgdir/usr/share/licenses/hercules/qpl1
-}
diff --git a/extra/herqq/PKGBUILD b/extra/herqq/PKGBUILD
deleted file mode 100644
index ccb97cb0e..000000000
--- a/extra/herqq/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=herqq
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="A software library for building UPnP devices (HUPnP)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.herqq.org/"
-license=('GPL')
-depends=('qt')
-source=("http://downloads.sourceforge.net/hupnp/${pkgname}-${pkgver}.zip")
-md5sums=('45a0632f7c7b64bc0fdab852d36c1e61')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  qmake PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/extra/hexedit/PKGBUILD b/extra/hexedit/PKGBUILD
index 0653b7751..d585d744f 100644
--- a/extra/hexedit/PKGBUILD
+++ b/extra/hexedit/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 143768 2011-11-29 01:46:32Z giovanni $
+# $Id: PKGBUILD 179485 2013-03-05 16:24:22Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Paul Mattal <pjmattal@elys.com>
 
 pkgname=hexedit
-pkgver=1.2.12
-pkgrel=5.1
+pkgver=1.2.13
+pkgrel=1
 pkgdesc="Hex Editor for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://rigaux.org/hexedit.html"
 license=('GPL')
 depends=('ncurses')
 source=("http://rigaux.org/${pkgname}-${pkgver}.src.tgz")
-md5sums=('0d2f48610006278cd93359fea9a06d5c')
+md5sums=('a5af1378d028512a9cad27a5ba3e15f9')
 
 build() {
   cd "${srcdir}/${pkgname}"
diff --git a/extra/hplip/PKGBUILD b/extra/hplip/PKGBUILD
deleted file mode 100644
index d003d86ff..000000000
--- a/extra/hplip/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 172170 2012-11-30 15:22:14Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor : Rémy Oudompheng <remy@archlinux.org>
-# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
-
-pkgname=hplip
-pkgver=3.12.11
-pkgrel=2
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com"
-license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-	 'net-snmp>=5.7.1' 'wget')
-makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx')
-optdepends=('cups: for printing support'
-            'python2-dbus: for dbus support'
-            'sane: for scanner support'
-            'python2-imaging: for commandline scanning support'
-            'python2-notify: for Desktop notification support'
-            'rpcbind: for network support'
-            'python2-pyqt: for running hp-toolbox'
-            'python2-gobject2: for running hp-toolbox'
-            'hplip-plugin: binary blobs for specific devices'
-            'libusbx: for advanced usb support')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
-        cups-1.6-buildfix.diff)
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # fix build with cups 1.6 - FC hplip-ipp-accessors.patch
- patch -p1 -i "${srcdir}/cups-1.6-buildfix.diff"
- 
- export PYTHON=python2
- 
- find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' setup.py makeuri.py logcapture.py base/magic.py
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py
- sed -i 's|python ./print.py|python2 ./print.py|' scan.py
- sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
- sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py 
- sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
- sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
- 
- # fix rc script path - FS#31921
- sed -i 's|\/etc\/init.d\/cupsys|\/etc\/rc.d\/cupsd|g' setup.py
- 
- # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
- # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
- # The hpcups driver does not use foomatic-rip
-	local i
-	for i in ppd/hpijs/*.ppd.gz ; do
-		rm -f ${i}.temp
-		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-			gzip > ${i}.temp || return 1
-		mv ${i}.temp ${i}
-	done
-   
- export AUTOMAKE='automake --foreign'
- autoreconf --force --install
-
- ./configure --prefix=/usr \
-             --enable-qt4 \
-             --disable-foomatic-rip-hplip-install \
-             --enable-foomatic-ppd-install \
-             --enable-hpcups-install \
-             --enable-new-hpcups \
-             --enable-cups-ppd-install \
-             --enable-cups-drv-install \
-             --enable-hpijs-install \
-             --enable-foomatic-drv-install \
-             --enable-pp-build \
-             --enable-udev-acl-rules #--help
-
- make
-}
-
-package() {
- #cd "$srcdir/$pkgname-$pkgver"
- cd "$srcdir/$pkgname-${pkgver/.a/a}"
- make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
- # remove config provided by sane and autostart of hp-daemon
- rm -rf "$pkgdir"/etc/{sane.d,xdg}
- # remove HAL .fdi file because HAL is no longer used
- rm -rf "$pkgdir"/usr/share/hal
- # log dir should not be world writeable
- chmod 775 "$pkgdir"/var/log/hp{,/tmp}
-}
-md5sums=('6caadc4a9e49076c284b146e2dce2937'
-         '835d3b854d097f229a32291338fa2320'
-         'ef64578c6cb3ce252dbdcb0f1c2f4a47')
diff --git a/extra/hplip/cups-1.6-buildfix.diff b/extra/hplip/cups-1.6-buildfix.diff
deleted file mode 100644
index 8341a1610..000000000
--- a/extra/hplip/cups-1.6-buildfix.diff
+++ /dev/null
@@ -1,392 +0,0 @@
-diff -up hplip-3.12.6/prnt/cupsext/cupsext.c.ipp_accessors hplip-3.12.6/prnt/cupsext/cupsext.c
---- hplip-3.12.6/prnt/cupsext/cupsext.c.ipp_accessors	2012-06-18 12:41:19.000000000 +0200
-+++ hplip-3.12.6/prnt/cupsext/cupsext.c	2012-07-19 17:11:47.606524137 +0200
-@@ -87,6 +87,46 @@ typedef int Py_ssize_t;
- #define PY_SSIZE_T_MIN INT_MIN
- #endif
- 
-+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
-+#define HAVE_CUPS_1_6 1
-+#endif
-+
-+#ifndef HAVE_CUPS_1_6
-+#define ippGetCount(attr)     attr->num_values
-+#define ippGetGroupTag(attr)  attr->group_tag
-+#define ippGetValueTag(attr)  attr->value_tag
-+#define ippGetName(attr)      attr->name
-+#define ippGetBoolean(attr, element) attr->values[element].boolean
-+#define ippGetInteger(attr, element) attr->values[element].integer
-+#define ippGetStatusCode(ipp) ipp->request.status.status_code
-+#define ippGetString(attr, element, language) attr->values[element].string.text
-+
-+static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp )
-+{
-+    if (!ipp)
-+        return (NULL);
-+    return (ipp->current = ipp->attrs);
-+}
-+
-+static ipp_attribute_t * ippNextAttribute( ipp_t *ipp )
-+{
-+    if (!ipp || !ipp->current)
-+        return (NULL);
-+    return (ipp->current = ipp->current->next);
-+}
-+
-+static int ippSetOperation( ipp_t *ipp, ipp_op_t op )
-+{
-+    ipp->request.op.operation_id = op;
-+    return (1);
-+}
-+
-+static int ippSetRequestId( ipp_t *ipp, int request_id )
-+{
-+    ipp->request.any.request_id = request_id;
-+    return (1);
-+}
-+#endif
- 
- int g_num_options = 0;
- cups_option_t * g_options;
-@@ -333,8 +373,8 @@ PyObject * getPrinters( PyObject * self,
-     request = ippNew();
-     language = cupsLangDefault();
- 
--    request->request.op.operation_id = CUPS_GET_PRINTERS;
--    request->request.any.request_id = 1;
-+    ippSetOperation( request, CUPS_GET_PRINTERS );
-+    ippSetRequestId ( request, 1);
- 
-     ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                   "attributes-charset", NULL, cupsLangEncoding( language ) );
-@@ -378,10 +418,10 @@ PyObject * getPrinters( PyObject * self,
-         ipp_pstate_t state;
-         int i = 0;
- 
--        for ( attr = response->attrs; attr != NULL; attr = attr->next )
-+        for ( attr = ippFirstAttribute( response ); attr != NULL; attr = ippNextAttribute( response ) )
-         {
--            while ( attr != NULL && attr->group_tag != IPP_TAG_PRINTER )
--                attr = attr->next;
-+            while ( attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER )
-+                attr = ippNextAttribute( response );
- 
-             if ( attr == NULL )
-                 break;
-@@ -390,41 +430,41 @@ PyObject * getPrinters( PyObject * self,
-             state = IPP_PRINTER_IDLE;
-             accepting = 0;
- 
--            while ( attr != NULL && attr->group_tag == IPP_TAG_PRINTER )
-+            while ( attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER )
-             {
--                if ( strcmp( attr->name, "printer-name" ) == 0 &&
--                        attr->value_tag == IPP_TAG_NAME )
--                    name = attr->values[ 0 ].string.text;
--
--                else if ( strcmp( attr->name, "device-uri" ) == 0 &&
--                        attr->value_tag == IPP_TAG_URI )
--                    device_uri = attr->values[ 0 ].string.text;
--
--                else if ( strcmp( attr->name, "printer-uri-supported" ) == 0 &&
--                        attr->value_tag == IPP_TAG_URI )
--                    printer_uri = attr->values[ 0 ].string.text;
--
--                else if ( strcmp( attr->name, "printer-info" ) == 0 &&
--                        attr->value_tag == IPP_TAG_TEXT )
--                    info = attr->values[ 0 ].string.text;
--
--                else if ( strcmp( attr->name, "printer-location" ) == 0 &&
--                        attr->value_tag == IPP_TAG_TEXT )
--                    location = attr->values[ 0 ].string.text;
--
--                else if ( strcmp( attr->name, "printer-make-and-model" ) == 0 &&
--                        attr->value_tag == IPP_TAG_TEXT )
--                    make_model = attr->values[ 0 ].string.text;
--
--                else if ( strcmp( attr->name, "printer-state" ) == 0 &&
--                        attr->value_tag == IPP_TAG_ENUM )
--                    state = ( ipp_pstate_t ) attr->values[ 0 ].integer;
--
--                else if (!strcmp(attr->name, "printer-is-accepting-jobs") &&
--                        attr->value_tag == IPP_TAG_BOOLEAN)
--                    accepting = attr->values[ 0 ].boolean;
-+                if ( strcmp( ippGetName( attr ), "printer-name" ) == 0 &&
-+                        ippGetValueTag( attr ) == IPP_TAG_NAME )
-+                    name = ippGetString( attr, 0, NULL );
-+
-+                else if ( strcmp( ippGetName( attr ), "device-uri" ) == 0 &&
-+                        ippGetValueTag( attr ) == IPP_TAG_URI )
-+                    device_uri = ippGetString( attr, 0, NULL );
-+
-+                else if ( strcmp( ippGetName( attr ), "printer-uri-supported" ) == 0 &&
-+                        ippGetValueTag( attr ) == IPP_TAG_URI )
-+                    printer_uri = ippGetString( attr, 0, NULL );
-+
-+                else if ( strcmp( ippGetName( attr ), "printer-info" ) == 0 &&
-+                        ippGetValueTag( attr ) == IPP_TAG_TEXT )
-+                    info = ippGetString( attr, 0, NULL );
-+
-+                else if ( strcmp( ippGetName( attr ), "printer-location" ) == 0 &&
-+                        ippGetValueTag( attr ) == IPP_TAG_TEXT )
-+                    location = ippGetString( attr, 0, NULL );
-+
-+                else if ( strcmp( ippGetName( attr ), "printer-make-and-model" ) == 0 &&
-+                        ippGetValueTag( attr ) == IPP_TAG_TEXT )
-+                    make_model = ippGetString( attr, 0, NULL );
-+
-+                else if ( strcmp( ippGetName( attr ), "printer-state" ) == 0 &&
-+                        ippGetValueTag( attr ) == IPP_TAG_ENUM )
-+                    state = ( ipp_pstate_t ) ippGetInteger( attr, 0 );
-+
-+                else if (!strcmp(ippGetName( attr ), "printer-is-accepting-jobs") &&
-+                        ippGetValueTag( attr ) == IPP_TAG_BOOLEAN)
-+                    accepting = ippGetBoolean( attr, 0 );
- 
--                attr = attr->next;
-+                attr = ippNextAttribute( response );
-             }
- 
-             if ( device_uri == NULL )
-@@ -522,8 +562,8 @@ PyObject * addPrinter( PyObject * self,
-     request = ippNew();
-     language = cupsLangDefault();
- 
--    request->request.op.operation_id = CUPS_ADD_PRINTER;
--    request->request.any.request_id = 1;
-+    ippSetOperation( request, CUPS_ADD_PRINTER );
-+    ippSetRequestId ( request, 1 );
- 
-     ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                   "attributes-charset", NULL, cupsLangEncoding( language ) );
-@@ -568,7 +608,7 @@ PyObject * addPrinter( PyObject * self,
-     }
-     else
-     {
--        status = response->request.status.status_code;
-+        status = ippGetStatusCode( response );
-         //ippDelete( response );
-         r = 1;
-     }
-@@ -631,8 +671,8 @@ PyObject * delPrinter( PyObject * self,
-        */
-     request = ippNew();
- 
--    request->request.op.operation_id = CUPS_DELETE_PRINTER;
--    request->request.op.request_id = 1;
-+    ippSetOperation( request, CUPS_DELETE_PRINTER );
-+    ippSetRequestId ( request, 1 );
- 
-     language = cupsLangDefault();
- 
-@@ -650,7 +690,7 @@ PyObject * delPrinter( PyObject * self,
-      */
-     response = cupsDoRequest( http, request, "/admin/" );
- 
--    if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
-+    if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) )
-     {
-         r = 1;
-     }
-@@ -721,8 +761,8 @@ PyObject * setDefaultPrinter( PyObject *
- 
-     request = ippNew();
- 
--    request->request.op.operation_id = CUPS_SET_DEFAULT;
--    request->request.op.request_id = 1;
-+    ippSetOperation( request, CUPS_SET_DEFAULT );
-+    ippSetRequestId ( request, 1 );
- 
-     language = cupsLangDefault();
- 
-@@ -743,7 +783,7 @@ PyObject * setDefaultPrinter( PyObject *
- 
-     response = cupsDoRequest( http, request, "/admin/" );
- 
--    if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) )
-+    if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) )
-     {
-         r = 1;
-     }
-@@ -797,8 +837,8 @@ PyObject * controlPrinter( PyObject * se
- 
-     request = ippNew();
- 
--    request->request.op.operation_id = op;
--    request->request.op.request_id = 1;
-+    ippSetOperation( request, op );
-+    ippSetRequestId ( request, 1 );
- 
-     language = cupsLangDefault();
- 
-@@ -822,7 +862,7 @@ PyObject * controlPrinter( PyObject * se
- 
-     response = cupsDoRequest(http, request, "/admin/");
- 
--    if (( response != NULL ) && (response->request.status.status_code <= IPP_OK_CONFLICT))
-+    if (( response != NULL ) && (ippGetStatusCode( response ) <= IPP_OK_CONFLICT))
-     {
-         r = 1;
-     }
-@@ -837,7 +877,7 @@ abort:
-     if ( response != NULL )
-         ippDelete( response );
- 
--    return Py_BuildValue( "i", r );;
-+    return Py_BuildValue( "i", r );
- }
- 
- 
-@@ -1116,8 +1156,8 @@ PyObject * getPPDList( PyObject * self,
- 
-     request = ippNew();
- 
--    request->request.op.operation_id = CUPS_GET_PPDS;
--    request->request.op.request_id   = 1;
-+    ippSetOperation( request, CUPS_GET_PPDS );
-+    ippSetRequestId ( request, 1 );
- 
-     language = cupsLangDefault();
- 
-@@ -1143,43 +1183,43 @@ PyObject * getPPDList( PyObject * self,
-     if ((response = cupsDoRequest(http, request, "/")) != NULL)
-     {
- 
--        for (attr = response->attrs; attr; attr = attr->next)
-+        for (attr = ippFirstAttribute( response ); attr; attr = ippNextAttribute( response ))
-         {
-             PyObject *dict;
-             char *ppdname = NULL;
- 
--            while (attr && attr->group_tag != IPP_TAG_PRINTER)
--                attr = attr->next;
-+            while (attr && ippGetGroupTag( attr ) != IPP_TAG_PRINTER)
-+                attr = ippNextAttribute( response );
- 
-             if (!attr)
-                 break;
- 
-             dict = PyDict_New ();
- 
--            for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next)
-+            for (; attr && ippGetGroupTag( attr ) == IPP_TAG_PRINTER; attr = ippNextAttribute( response ))
-             {
-                 PyObject *val = NULL;
- 
--                if (!strcmp (attr->name, "ppd-name") && attr->value_tag == IPP_TAG_NAME)
-+                if (!strcmp (ippGetName( attr ), "ppd-name") && ippGetValueTag( attr ) == IPP_TAG_NAME)
-                 {
--                    ppdname = attr->values[0].string.text;
-+                    ppdname = ippGetString( attr, 0, NULL );
- 
-                     //sprintf( buf, "print '%s'", ppdname);
-                     //PyRun_SimpleString( buf );
-                 }
- 
--                else if (attr->value_tag == IPP_TAG_TEXT || attr->value_tag == IPP_TAG_NAME || attr->value_tag == IPP_TAG_KEYWORD)
--                //else if ((!strcmp (attr->name, "ppd-natural-language") && attr->value_tag == IPP_TAG_LANGUAGE) ||
--                //    (!strcmp (attr->name, "ppd-make-and-model") && attr->value_tag == IPP_TAG_TEXT) ||
--                //    (!strcmp (attr->name, "ppd-make") && attr->value_tag == IPP_TAG_TEXT) ||
--                //    (!strcmp (attr->name, "ppd-device-id") && attr->value_tag == IPP_TAG_TEXT))
-+                else if (ippGetValueTag( attr ) == IPP_TAG_TEXT || ippGetValueTag( attr ) == IPP_TAG_NAME || ippGetValueTag( attr ) == IPP_TAG_KEYWORD)
-+                //else if ((!strcmp (ippGetName( attr ), "ppd-natural-language") && ippGetValueTag( attr ) == IPP_TAG_LANGUAGE) ||
-+                //    (!strcmp (ippGetName( attr ), "ppd-make-and-model") && ippGetValueTag( attr ) == IPP_TAG_TEXT) ||
-+                //    (!strcmp (ippGetName( attr ), "ppd-make") && ippGetValueTag( attr ) == IPP_TAG_TEXT) ||
-+                //    (!strcmp (ippGetName( attr ), "ppd-device-id") && ippGetValueTag( attr ) == IPP_TAG_TEXT))
-                 {
--                    val = PyObj_from_UTF8(attr->values[0].string.text);
-+                    val = PyObj_from_UTF8(ippGetString( attr, 0, NULL ));
-                 }
- 
-                 if (val)
-                 {
--                    PyDict_SetItemString (dict, attr->name, val);
-+                    PyDict_SetItemString (dict, ippGetName( attr ), val);
-                     Py_DECREF (val);
-                 }
-             }
-diff -up hplip-3.12.6/scan/sane/hpaio.c.ipp_accessors hplip-3.12.6/scan/sane/hpaio.c
---- hplip-3.12.6/scan/sane/hpaio.c.ipp_accessors	2012-06-18 12:42:51.000000000 +0200
-+++ hplip-3.12.6/scan/sane/hpaio.c	2012-07-19 17:12:34.557848760 +0200
-@@ -47,6 +47,43 @@
- #define DEBUG_DECLARE_ONLY
- #include "sanei_debug.h"
- 
-+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
-+#define HAVE_CUPS_1_6 1
-+#endif
-+
-+#ifndef HAVE_CUPS_1_6
-+#define ippGetGroupTag(attr)  attr->group_tag
-+#define ippGetValueTag(attr)  attr->value_tag
-+#define ippGetName(attr)      attr->name
-+#define ippGetString(attr, element, language) attr->values[element].string.text
-+
-+static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp )
-+{
-+    if (!ipp)
-+        return (NULL);
-+    return (ipp->current = ipp->attrs);
-+}
-+
-+static ipp_attribute_t * ippNextAttribute( ipp_t *ipp )
-+{
-+    if (!ipp || !ipp->current)
-+        return (NULL);
-+    return (ipp->current = ipp->current->next);
-+}
-+
-+static int ippSetOperation( ipp_t *ipp, ipp_op_t op )
-+{
-+    ipp->request.op.operation_id = op;
-+    return (1);
-+}
-+
-+static int ippSetRequestId( ipp_t *ipp, int request_id )
-+{
-+    ipp->request.any.request_id = request_id;
-+    return (1);
-+}
-+#endif
-+
- static SANE_Device **DeviceList = NULL;
- 
- static int AddDeviceList(char *uri, char *model, SANE_Device ***pd)
-@@ -186,8 +223,8 @@ static int GetCupsPrinters(char ***print
-    /* Assemble the IPP request */
-    request = ippNew();
- 
--   request->request.op.operation_id = CUPS_GET_PRINTERS;
--   request->request.any.request_id  = 1;
-+   ippSetOperation( request, CUPS_GET_PRINTERS );
-+   ippSetRequestId( request, 1 );
- 
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, "utf-8");
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, "en");
-@@ -197,20 +234,20 @@ static int GetCupsPrinters(char ***print
-    if ((response = cupsDoRequest(http, request, "/")) == NULL)
-       goto bugout;
- 
--   for (attr = response->attrs; attr != NULL; attr = attr->next)
-+   for (attr = ippFirstAttribute ( response ); attr != NULL; attr = ippNextAttribute( response ))
-    {
-       /* Skip leading attributes until we hit a printer. */
--      while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER)
--         attr = attr->next;
-+      while (attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER)
-+         attr = ippNextAttribute( response );
- 
-       if (attr == NULL)
-          break;
- 
--      while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
-+      while (attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER)
-       {
--         if (strcmp(attr->name, "device-uri") == 0 && attr->value_tag == IPP_TAG_URI && AddCupsList(attr->values[0].string.text, printer) == 0)
-+         if (strcmp(ippGetName( attr ), "device-uri") == 0 && ippGetValueTag( attr ) == IPP_TAG_URI && AddCupsList(ippGetString( attr, 0, NULL ), printer) == 0)
-             cnt++;
--         attr = attr->next;
-+         attr = ippNextAttribute( response );
-       }
- 
-       if (attr == NULL)
diff --git a/extra/hplip/hplip.install b/extra/hplip/hplip.install
deleted file mode 100644
index 74532cde3..000000000
--- a/extra/hplip/hplip.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  cat << EOF
-
-NOTE
-----
-# If you want to use this driver with sane:
-#  echo "hpaio" >> /etc/sane.d/dll.conf
-
-EOF
-}
-
-post_upgrade() {
-  if [ "`vercmp $2 3.12.4-2`" -lt 0 ]; then
-    # important upgrade notice
-    echo "> Please remove your printer in cups, then add it"
-    echo "> back and reconfigure it to make it work again!"
-  fi
-}
diff --git a/extra/hspell/hspell-1.0.sharedlib.patch b/extra/hspell/hspell-1.0.sharedlib.patch
deleted file mode 100644
index 81467c3e9..000000000
--- a/extra/hspell/hspell-1.0.sharedlib.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: hspell-1.0/Makefile.in
-===================================================================
---- hspell-1.0.orig/Makefile.in
-+++ hspell-1.0/Makefile.in
-@@ -51,7 +51,7 @@ LDFLAGS=@LDFLAGS@
- 
- # Our TARGETS variable chooses what to compile. Some things are
- # optionally compiled depending on --enable-* paramters to configure.
--TARGETS = @TARGETS@
-+TARGETS = @TARGETS@ libhspell.a
- all: $(TARGETS)
- 
- # SEDCMD controls on whether objective-kinuyim - about 130,000 rare verb
-@@ -76,7 +76,8 @@ clean:
- 	      hebrew.wgz.lingsizes.tmp dmask.c install.js \
- 	      spell-he.xpi he.dic he.aff README-he.txt \
- 	      README_he_IL.txt he_IL.dic he_IL.aff he_IL.zip \
--	      specfilter.o specfilter
-+	      specfilter.o specfilter \
-+	      libhspell.so.0 libhspell.so *.lo
- 	rm -f hebeng/install.js hebeng/heb-eng.aff hebeng/heb-eng.dic \
- 	      hebeng/README-he.txt hebeng/README-en-US.txt \
- 	      hebeng/spell-heb-eng.xpi
-@@ -113,6 +114,9 @@ install: all
- 	test -d $(DESTDIR)$(LIBDIR) || mkdir -m 755 -p $(DESTDIR)$(LIBDIR)
- 	cp libhspell.a $(DESTDIR)$(LIBDIR)/
- 	chmod 644 $(DESTDIR)$(LIBDIR)/libhspell.a
-+	cp libhspell.so.0 $(DESTDIR)$(LIBDIR)/
-+	chmod 755 $(DESTDIR)$(LIBDIR)/libhspell.so.0
-+	ln -sf libhspell.so.0 $(DESTDIR)$(LIBDIR)/libhspell.so
- 	test -d $(DESTDIR)$(INCLUDEDIR) || mkdir -m 755 -p $(DESTDIR)$(INCLUDEDIR)
- 	cp hspell.h linginfo.h $(DESTDIR)$(INCLUDEDIR)/
- 	chmod 644 $(DESTDIR)$(INCLUDEDIR)/hspell.h $(DESTDIR)$(INCLUDEDIR)/linginfo.h
-@@ -166,19 +170,30 @@ libhspell.a: dict_radix.o gimatria.o cor
- 	ar cr $@ $^
- 	-ranlib $@
- 
--$(HSPELL_EXECUTABLE): hspell.o tclHash.o libhspell.a
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $(HSPELL_EXECUTABLE) hspell.o tclHash.o libhspell.a $(LIBS)
-+EXTRAOBJECTSPIC=$(EXTRAOBJECTS:.o=.lo)
-+
-+%.lo: %.c
-+	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -o $@ $<
-+
-+libhspell.so.0: dict_radix.lo gimatria.lo corlist.lo libhspell.lo $(EXTRAOBJECTSPIC)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared -Wl,-soname,libhspell.so.0 $^ -lz
-+	ln -sf libhspell.so.0 libhspell.so
-+
-+$(HSPELL_EXECUTABLE): hspell.o tclHash.o libhspell.so.0
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(HSPELL_EXECUTABLE) hspell.o tclHash.o libhspell.so.0 $(LIBS)
- 
- # remember to update this dependency list once in a while...
- libhspell.o dict_radix.o find_sizes.o: dict_radix.h
- dict_radix.o linginfo.o: gzbuffered.h
- libhspell.o mk_he_affix.o: prefixes.c
-+libhspell.lo mk_he_affix.lo: prefixes.c
- hspell.o: hash.h tclHash.h
- tclHash.o: tclHash.h
- corlist.o gimatria.o hspell.o libhspell.o: hspell.h
- hspell.o libhspell.o linginfo.o: linginfo.h hspell.h
- linginfo.o: dmask.c
- specfilter.o: prefixes.c
-+specfilter.lo: prefixes.c
- 
- prefixes.c: genprefixes.pl PrefixBits.pl
- 	$(PERL) -w ./genprefixes.pl >prefixes.c
diff --git a/extra/htdig/PKGBUILD b/extra/htdig/PKGBUILD
index bb2f0f878..2043be927 100644
--- a/extra/htdig/PKGBUILD
+++ b/extra/htdig/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=htdig
 pkgver=3.2.0b6
-pkgrel=8.1
+pkgrel=8.2
 pkgdesc="Scripts and HTML code needed for using ht://Dig as a web search engine"
 url="http://www.htdig.org/"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/htop/ChangeLog b/extra/htop/ChangeLog
deleted file mode 100644
index 94fd62244..000000000
--- a/extra/htop/ChangeLog
+++ /dev/null
@@ -1,25 +0,0 @@
-2012-02-19  Angel Velasquez <angvp@archlinux.org>
-	* Version bump to 1.0.1
-
-2011-10-19  Andrea Scarpino <andrea@archlinux.org>
-    * Enable cgroup support (FS#26155)
-    * Add lsof and strace optional depends (FS#25778)
-    * Fix crash when column is less than 40 (closes FS#25823)
-
-2011-05-17  Angel Velasquez <angvp@archlinux.org>
-	* Added patch to fix --sort-key (closes FS#23224)
-
-2009-09-21  Eric Belanger  <eric@archlinux.org>
-
-	* htop 0.8.3-1
-	* Upstream update
-	* Built with vserver and openvz support (close FS#12755)
-
-2008-12-09  Alexander Fehr  <pizzapunk gmail com>
-
-	* htop-0.8.1-1:
-	* New upstream release
-	* New maintainer
-	* Added patch to fix FS#12235
-	* Enabled Unicode support
-	* Added ChangeLog
diff --git a/extra/htop/PKGBUILD b/extra/htop/PKGBUILD
index e0352434e..3f5cf8e52 100644
--- a/extra/htop/PKGBUILD
+++ b/extra/htop/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=htop
 pkgver=1.0.2
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Interactive process viewer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://htop.sourceforge.net/"
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 6addcfeb1..5ad82dddc 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176286 2013-01-28 16:48:18Z stephane $
+# $Id: PKGBUILD 183285 2013-04-20 16:41:18Z heftig $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=hugin
 pkgver=2012.0.0
-pkgrel=3
+pkgrel=5
 pkgdesc='Panorama photo stitcher'
 url='http://hugin.sourceforge.net/'
 license=('GPL')
diff --git a/extra/hugin/gcc47.patch b/extra/hugin/gcc47.patch
deleted file mode 100644
index 3814b871c..000000000
--- a/extra/hugin/gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur hugin-2011.4.0.orig/src/celeste/Utilities.cpp hugin-2011.4.0/src/celeste/Utilities.cpp
---- hugin-2011.4.0.orig/src/celeste/Utilities.cpp	2012-07-08 15:18:16.864454043 +0000
-+++ hugin-2011.4.0/src/celeste/Utilities.cpp	2012-07-08 15:18:20.341089422 +0000
-@@ -27,6 +27,7 @@
- 
- #include <math.h>
- #include <stdlib.h>
-+#include <unistd.h>
- #include "Utilities.h"
- 
- using namespace std; 
diff --git a/extra/hugin/hugin.install b/extra/hugin/hugin.install
deleted file mode 100644
index 362749233..000000000
--- a/extra/hugin/hugin.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-}
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index 5388d6b25..6145832a7 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175783 2013-01-21 17:03:37Z stephane $
+# $Id: PKGBUILD 180744 2013-03-26 01:47:54Z stephane $
 # Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
 # Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
 
 pkgname=hwloc
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=1
 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('sh' 'pciutils' 'cairo' 'libxml2')
 makedepends=('pkg-config')
 options=('!libtool' '!docs')
 source=(http://www.open-mpi.org/software/hwloc/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('9d02234d6abd5332675957506e4d8144c515e986')
+sha1sums=('f9d9938d427e65257d1745ffc1d10634251cdc09')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/hydrogen/PKGBUILD b/extra/hydrogen/PKGBUILD
deleted file mode 100644
index bce36b141..000000000
--- a/extra/hydrogen/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 175681 2013-01-19 13:13:55Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: K. Piche <kpiche@rogers.com>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=hydrogen
-pkgver=0.9.5.1
-pkgrel=1
-pkgdesc="Advanced Drum Machine"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.hydrogen-music.org/"
-depends=('libarchive' 'liblrdf' 'qt' 'jack')
-makedepends=('scons')
-#options=('!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        lrdf_raptor2.patch
-        install.patch)
-md5sums=('52f3a528705818c65acf546a3be4c6fb'
-         '2124851e890f46158189b5fa90006d40'
-         'ce3a83a069b55e46aa532b55e803c9a5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  export QTDIR=/usr
-  patch -Np1 -i "${srcdir}/lrdf_raptor2.patch"
-  # http://www.assembla.com/spaces/hydrogen/tickets/204
-  patch -Np0 -i "${srcdir}/install.patch"
-  scons prefix=/usr libarchive=1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  scons DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/hydrogen/install.patch b/extra/hydrogen/install.patch
deleted file mode 100644
index 2e6e707a1..000000000
--- a/extra/hydrogen/install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-*** Sconstruct.org	2011-11-06 12:15:40.018119106 +0100
---- Sconstruct	2011-11-06 12:16:21.124122432 +0100
-***************
-*** 298,304 ****
-  
-          for N in glob.glob('./data/i18n/hydrogen.*'):
-              env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N))
-- 	env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
-  
-  	#add every img in ./data/img to the install list. 
-  	os.path.walk("./data/img/",install_images,env) 
---- 298,303 ----
diff --git a/extra/hydrogen/lrdf_raptor2.patch b/extra/hydrogen/lrdf_raptor2.patch
deleted file mode 100644
index ec176b716..000000000
--- a/extra/hydrogen/lrdf_raptor2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -baur hydrogen-0.9.5.old/Sconstruct hydrogen-0.9.5/Sconstruct
---- hydrogen-0.9.5.old/Sconstruct	2011-08-11 18:00:07.889112348 +0800
-+++ hydrogen-0.9.5/Sconstruct	2011-08-11 18:00:34.945632437 +0800
-@@ -83,6 +83,7 @@
- 	includes.append( './' )
- 	includes.append( 'gui/src/' )
- 	includes.append( '3rdparty/install/include' )
-+	includes.append( '/usr/include/raptor2' )
- 
- 	if sys.platform == "darwin":
- 		ldflags.append( '-L/opt/local/lib' )
diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD
index 2ff4ea77a..c6c9576f6 100644
--- a/extra/hylafax/PKGBUILD
+++ b/extra/hylafax/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166869 2012-09-20 09:33:33Z tpowa $
+# $Id: PKGBUILD 178774 2013-02-27 13:50:36Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 pkgname=hylafax
 pkgver=6.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Fax Server"
 arch=('i686' 'x86_64' 'mips64el')
 install='hylafax.install'
@@ -18,7 +18,8 @@ source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz
         hylafax.cron.daily 
         config.local
         faxq.service
-        hfaxd.service)
+        hfaxd.service
+        faxgetty@.service)
 
 build () {
   cd "$srcdir/${pkgname}-${pkgver}"
@@ -42,7 +43,7 @@ package () {
   # add systemd files
   install -D -m644 $srcdir/hfaxd.service $pkgdir/usr/lib/systemd/system/hfaxd.service
   install -D -m644 $srcdir/faxq.service $pkgdir/usr/lib/systemd/system/faxq.service
-
+  install -D -m644 $srcdir/faxgetty@.service $pkgdir/usr/lib/systemd/system/faxgetty@.service
   install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
 }
 md5sums=('d063d45049c8fcbabefe09d662313067'
@@ -51,3 +52,10 @@ md5sums=('d063d45049c8fcbabefe09d662313067'
          '60f2a7e62c256ead4e9238cb31b35b90'
          '832c8e8098e2dfa56040c975b554590c'
          '38a00db6d9d765d130b2d8d3a98e5c24')
+md5sums=('d063d45049c8fcbabefe09d662313067'
+         '6602288a405324d8c8e3c5eac2bf19fd'
+         '52beffe7dc296b4f9ce9fd0387f7804e'
+         '60f2a7e62c256ead4e9238cb31b35b90'
+         '832c8e8098e2dfa56040c975b554590c'
+         '38a00db6d9d765d130b2d8d3a98e5c24'
+         'fe10ea597e786fe8c09e4104fbdf16de')
diff --git a/extra/hylafax/configure-6.0.5.patch b/extra/hylafax/configure-6.0.5.patch
deleted file mode 100644
index e1f1126a5..000000000
--- a/extra/hylafax/configure-6.0.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.old	2011-08-08 10:19:37.619657223 +0200
-+++ configure	2011-08-08 10:20:26.422189170 +0200
-@@ -2882,7 +2882,7 @@
- 	echo '#define HAS_FCHMOD 1'
- 	Note "... configure use of fchmod"
- 	CheckFuncDecl fchmod 'extern int fchmod(int, mode_t);' \
--	    unistd.h libc.h $OSFCNH sys/stat.h
-+	    unistd.h $OSFCNH sys/stat.h libc.h
-     }
-     CheckFuncDecl mknod 'extern int mknod(const char*, mode_t, dev_t);' \
- 	unistd.h sys/stat.h
diff --git a/extra/hylafax/faxgetty@.service b/extra/hylafax/faxgetty@.service
new file mode 100644
index 000000000..476715c19
--- /dev/null
+++ b/extra/hylafax/faxgetty@.service
@@ -0,0 +1,24 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=faxgetty on %I
+Documentation=man:faxgetty(8)
+After=faxq.service hfaxd.service
+
+[Service]
+ExecStart=/usr/lib/fax/faxgetty %I
+Type=simple
+Restart=always
+RestartSec=0
+KillMode=process
+
+KillSignal=SIGTERM
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/extra/hylafax/hylafax-libtiff4.patch b/extra/hylafax/hylafax-libtiff4.patch
deleted file mode 100644
index 4a49511f8..000000000
--- a/extra/hylafax/hylafax-libtiff4.patch
+++ /dev/null
@@ -1,229 +0,0 @@
---- hylafax-6.0.5/configure	2010-09-15 10:42:36.000000000 -0400
-+++ hylafax-5.5.1/configure	2012-01-02 17:44:20.000000000 -0500
-@@ -2531,6 +2566,7 @@
-     Note "... checking TIFF library version"
-     tiff_runlen_t=""
-     cat>t.c<<EOF
-+#include <stdlib.h>
- #include <stdio.h>
- #include "tiffio.h"
- main()
-@@ -2550,8 +2586,18 @@
- 	Note "  Found libtiff version ${lib_ver}"
- 	if [ ${header_ver} -ge 19960307 ]; then
- 	    case ${lib_ver} in
--		3.4)		tiff_runlen_t="uint16" ;;
--		3.[56789])	tiff_runlen_t="uint32" ;;
-+		3.4)		tiff_runlen_t="uint16"
-+				echo '#define TIFFSTRIPBYTECOUNTS uint32'
-+				echo '#define TIFFVERSION TIFF_VERSION'
-+				echo '#define TIFFHEADER TIFFHeader';;
-+		3.[56789])	tiff_runlen_t="uint32"
-+				echo '#define TIFFSTRIPBYTECOUNTS uint32'
-+				echo '#define TIFFVERSION TIFF_VERSION'
-+				echo '#define TIFFHEADER TIFFHeader';;
-+		4.0)		tiff_runlen_t="uint32"
-+				echo '#define TIFFSTRIPBYTECOUNTS uint64'
-+				echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'
-+				echo '#define TIFFHEADER TIFFHeaderClassic';;
- 	    esac
- 	fi
-     else
-@@ -2588,7 +2634,7 @@
- Incompatible TIFF Library.
- 
- HylaFAX ${VERSION} requires TIFF software distribution versions 3.4 through
--3.9.  If you do not have up to date TIFF software on your system
-+4.0.  If you do not have up to date TIFF software on your system
- then you can retrieve it from the location where you obtained this software.
- The Home Page for version 3.5 and later is http://www.remotesensing.org/libtiff/
- EOF
---- hylafax-6.0.5/hfaxd/FileTransfer.c++	2010-09-15 10:42:36.000000000 -0400
-+++ hylafax-5.5.1/hfaxd/FileTransfer.c++	2012-01-02 17:44:19.000000000 -0500
-@@ -164,26 +142,26 @@
-  * a single IFD/image from a TIFF file.
-  */
- typedef struct {
--    TIFFDirEntry	SubFileType;
--    TIFFDirEntry	ImageWidth;
--    TIFFDirEntry	ImageLength;
--    TIFFDirEntry	BitsPerSample;
--    TIFFDirEntry	Compression;
--    TIFFDirEntry	Photometric;
--    TIFFDirEntry	FillOrder;
--    TIFFDirEntry	StripOffsets;
--    TIFFDirEntry	Orientation;
--    TIFFDirEntry	SamplesPerPixel;
--    TIFFDirEntry	RowsPerStrip;
--    TIFFDirEntry	StripByteCounts;
--    TIFFDirEntry	XResolution;
--    TIFFDirEntry	YResolution;
--    TIFFDirEntry	Options;		// T4 or T6
--    TIFFDirEntry	ResolutionUnit;
--    TIFFDirEntry	PageNumber;
--    TIFFDirEntry	BadFaxLines;
--    TIFFDirEntry	CleanFaxData;
--    TIFFDirEntry	ConsecutiveBadFaxLines;
-+    HFClassicTIFFDirEntry	SubFileType;
-+    HFClassicTIFFDirEntry	ImageWidth;
-+    HFClassicTIFFDirEntry	ImageLength;
-+    HFClassicTIFFDirEntry	BitsPerSample;
-+    HFClassicTIFFDirEntry	Compression;
-+    HFClassicTIFFDirEntry	Photometric;
-+    HFClassicTIFFDirEntry	FillOrder;
-+    HFClassicTIFFDirEntry	StripOffsets;
-+    HFClassicTIFFDirEntry	Orientation;
-+    HFClassicTIFFDirEntry	SamplesPerPixel;
-+    HFClassicTIFFDirEntry	RowsPerStrip;
-+    HFClassicTIFFDirEntry	StripByteCounts;
-+    HFClassicTIFFDirEntry	XResolution;
-+    HFClassicTIFFDirEntry	YResolution;
-+    HFClassicTIFFDirEntry	Options;		// T4 or T6
-+    HFClassicTIFFDirEntry	ResolutionUnit;
-+    HFClassicTIFFDirEntry	PageNumber;
-+    HFClassicTIFFDirEntry	BadFaxLines;
-+    HFClassicTIFFDirEntry	CleanFaxData;
-+    HFClassicTIFFDirEntry	ConsecutiveBadFaxLines;
-     uint32		link;			// offset to next directory
-     uint32		xres[2];		// X resolution indirect value
-     uint32		yres[2];		// Y resolution indirect value
-@@ -226,10 +204,10 @@
- 		 * amount of image data and then adding in
- 		 * the expected data for the TIFF headers.
- 		 */
--		uint32* sb;
-+		TIFFSTRIPBYTECOUNTS* sb;
- 		TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb);
- 		file_size = sizeof (DirTemplate) +
--		    sizeof (TIFFHeader) + sizeof (uint16);
-+		    sizeof (TIFFHEADER) + sizeof (uint16);
- 		for (tstrip_t s = 0, ns = TIFFNumberOfStrips(tif); s < ns; s++)
- 		    file_size += sb[s];
- 		reply(code, "%s for %s (%lu bytes).",
-@@ -261,10 +239,10 @@
- 	if (fd >= 0) {
- 	    union {
- 		char buf[512];
--		TIFFHeader h;
-+		TIFFHEADER h;
- 	    } b;
- 	    ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b));
--	    if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFF_VERSION &&
-+	    if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFFVERSION &&
- 	      (b.h.tiff_magic == TIFF_BIGENDIAN ||
- 	       b.h.tiff_magic == TIFF_LITTLEENDIAN)) {
- 		(void) lseek(fd, 0L, SEEK_SET);		// rewind
-@@ -318,12 +296,12 @@
- }
- 
- static void
--getLong(TIFF* tif, TIFFDirEntry& de)
-+getLong(TIFF* tif, HFClassicTIFFDirEntry& de)
- {
-     TIFFGetField(tif, de.tdir_tag, &de.tdir_offset);
- }
- static void
--getShort(TIFF* tif, TIFFDirEntry& de)
-+getShort(TIFF* tif, HFClassicTIFFDirEntry& de)
- {
-     uint16 v;
-     TIFFGetField(tif, de.tdir_tag, &v);
-@@ -343,7 +321,7 @@
- {
-     static DirTemplate templ = {
- #define	TIFFdiroff(v) \
--    (uint32) (sizeof (TIFFHeader) + sizeof (uint16) + \
-+    (uint32) (sizeof (TIFFHEADER) + sizeof (uint16) + \
-       (intptr_t) &(((DirTemplate*) 0)->v))
- 	{ TIFFTAG_SUBFILETYPE,		TIFF_LONG,	1 },
- 	{ TIFFTAG_IMAGEWIDTH,		TIFF_LONG,	1 },
-@@ -368,7 +346,7 @@
- 	0,					// next directory
- 	{ 0, 1 }, { 0, 1 },			// x+y resolutions
-     };
--#define	NTAGS	((TIFFdiroff(link)-TIFFdiroff(SubFileType)) / sizeof (TIFFDirEntry))
-+#define	NTAGS	((TIFFdiroff(link)-TIFFdiroff(SubFileType)) / sizeof (HFClassicTIFFDirEntry))
-     /*
-      * Construct the TIFF header for this IFD using
-      * the preconstructed template above.  We extract
-@@ -377,14 +355,14 @@
-      * of things about the contents of the TIFF file.
-      */
-     struct {
--	TIFFHeader h;
-+	TIFFHEADER h;
- 	uint16	dircount;
- 	u_char	dirstuff[sizeof (templ)];
-     } buf;
-     union { int32 i; char c[4]; } u; u.i = 1;
-     buf.h.tiff_magic = (u.c[0] == 0 ? TIFF_BIGENDIAN : TIFF_LITTLEENDIAN);
--    buf.h.tiff_version = TIFF_VERSION;
--    buf.h.tiff_diroff = sizeof (TIFFHeader);
-+    buf.h.tiff_version = TIFFVERSION;
-+    buf.h.tiff_diroff = sizeof (TIFFHEADER);
-     buf.dircount = (uint16) NTAGS;
-     getLong(tif, templ.SubFileType);
-     getLong(tif, templ.ImageWidth);
-@@ -412,7 +390,7 @@
-     getShort(tif, templ.CleanFaxData);
-     getLong(tif, templ.ConsecutiveBadFaxLines);
-     if (buf.h.tiff_magic == TIFF_BIGENDIAN) {
--	TIFFDirEntry* dp = &templ.SubFileType;
-+	HFClassicTIFFDirEntry* dp = &templ.SubFileType;
- 	for (u_int i = 0; i < NTAGS; i++) {
- 	    if (dp->tdir_type == TIFF_SHORT)
- 		dp->tdir_offset <<= 16;
-@@ -441,7 +419,7 @@
- bool
- HylaFAXServer::sendITIFFData(TIFF* tif, int fdout)
- {
--    uint32* sb;
-+    TIFFSTRIPBYTECOUNTS* sb;
-     (void) TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb);
-     tdata_t buf = _TIFFmalloc(sb[0]);
-     tsize_t bsize = sb[0];
---- hylafax-6.0.5/hfaxd/FileTransfer.c++	2012-01-28 15:27:47.000000000 -0500
-+++ hylafax-5.5.1/hfaxd/FileTransfer.c++	2012-01-28 15:30:12.000000000 -0500
-@@ -69,7 +69,7 @@
- 
- 
- static bool
--isTIFF(const TIFFHeader& h)
-+isTIFF(const TIFFHEADER& h)
- {
-     if (h.tiff_magic != TIFF_BIGENDIAN && h.tiff_magic != TIFF_LITTLEENDIAN)
- 	return (false);
-@@ -82,11 +82,23 @@
-     // byte swap version stamp if opposite byte order
-     if ((u.c[0] == 0) ^ (h.tiff_magic == TIFF_BIGENDIAN))
- 	TIFFSwabShort(&version);
--    return (version == TIFF_VERSION);
-+    return (version == TIFFVERSION);
- }
- 
- 
- /*
-+ * This is copied right from tiff.h in version 3.8.2.  This was necessary
-+ * to localize here because it was removed from tiff.h in version 4.0.
-+ * In tiff.h 3.8.2 it was known as "TIFFDirEntry".
-+ */
-+typedef struct {
-+	uint16		tdir_tag;
-+	uint16		tdir_type;	/* data type */
-+	uint32		tdir_count;	/* number of items; length in spec */
-+	uint32		tdir_offset;	/* byte offset to field data */
-+} HFClassicTIFFDirEntry;
-+ 
-+/*
-  * Record a file transfer in the log file.
-  */
- void
-@@ -957,7 +957,7 @@
- 	if (FileCache::lookup(docname, sb) && S_ISREG(sb.st_mode)) {
- 	    union {
- 		char buf[512];
--		TIFFHeader h;
-+		TIFFHEADER h;
- 	    } b;
- 	    ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b));
- 	    if (cc > 2 && b.buf[0] == '%' && b.buf[1] == '!')
diff --git a/extra/iagno/PKGBUILD b/extra/iagno/PKGBUILD
new file mode 100644
index 000000000..005cc69cd
--- /dev/null
+++ b/extra/iagno/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 183423 2013-04-21 22:11:05Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=iagno
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Dominate the board in a classic version of Reversi"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'libcanberra' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=iagno.install
+url="https://live.gnome.org/Iagno"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('03e96eaada69d95b709e438ccb69911fea330be8827df320c5dff02d75a59efd')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/iagno/iagno.install b/extra/iagno/iagno.install
new file mode 100644
index 000000000..0730c1a47
--- /dev/null
+++ b/extra/iagno/iagno.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD
index 839db9b80..66681ff2d 100644
--- a/extra/ibus/PKGBUILD
+++ b/extra/ibus/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 173164 2012-12-11 22:33:51Z eric $
+# $Id: PKGBUILD 183196 2013-04-18 19:51:15Z eric $
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.MaRS <leemars at gmail dot com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=ibus
-pkgver=1.5.1
+pkgver=1.5.2
 pkgrel=1
 pkgdesc="Next Generation Input Bus for Linux"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ makedepends=('gobject-introspection' 'vala' 'dconf' 'iso-codes' 'intltool')
 options=('!libtool')
 install=ibus.install
 source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('31d732c17d0a103565fa29995c5610e8be8b2dca')
+sha1sums=('a7e1695731b4c954fa8897d091e6dda64e08b28c')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD
index 756c16915..64ad7fd10 100644
--- a/extra/icedtea-web-java7/PKGBUILD
+++ b/extra/icedtea-web-java7/PKGBUILD
@@ -3,15 +3,15 @@
 
 pkgbase=icedtea-web-java7
 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
-pkgver=1.3.1
+pkgver=1.3.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
 license=('GPL2')
-makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany')
+makedepends=('jdk7-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany')
 noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot
 source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
-sha256sums=('20c7fd1eef6c79cbc6478bb01236a3eb2f0af6184eaed24baca59a3c37eafb56')
+md5sums=('94ce02c42c1e4d1411357fb3c1014f67')
 
 _javaver=7
 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
@@ -28,9 +28,8 @@ build() {
       --with-browser-tests \
       --with-firefox=/usr/bin/firefox \
       --with-chromium=/usr/bin/chromium \
-      --with-epiphany=/usr/bin/epiphany \
-      --with-gtk=2      
-  make
+      --with-epiphany=/usr/bin/epiphany
+   make
 }
 
 check() {
@@ -44,8 +43,9 @@ check() {
 package_icedtea-web-java7() {
 
   pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
-  depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils')
+  depends=('jre7-openjdk' 'desktop-file-utils')
   provides=('java-web-start=7')
+  replaces=('icedtea-web')
   install=${pkgname}.install
 
   cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
@@ -77,6 +77,7 @@ package_icedtea-web-java7() {
 package_icedtea-web-java7-doc() {
 
   pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
+  replaces=('icedtea-web-doc')
 
   cd "${srcdir}"/icedtea-web*
   make DESTDIR="${pkgdir}" install-data-local
diff --git a/extra/icedtea-web-java7/fix_firefox_crash.diff b/extra/icedtea-web-java7/fix_firefox_crash.diff
deleted file mode 100644
index cd02aba0a..000000000
--- a/extra/icedtea-web-java7/fix_firefox_crash.diff
+++ /dev/null
@@ -1,228 +0,0 @@
-
-# HG changeset patch
-# User Adam Domurad <adomurad@redhat.com>
-# Date 1340899207 14400
-# Node ID a49edd57b1b332b431222b1c225189fe51676193
-# Parent  d65bd94e0ba9b7c8b9051c7d471b55c2c74ea3f4
-Fixes invalid plugin table error that sometimes occurs.
-The invalid plugin table error was happening when the API that was
-being compiled with had a larger size than that of the browser.
-The plugin now only checks if the minimal subset it uses exists.
-
-diff -r d65bd94e0ba9 -r a49edd57b1b3 plugin/icedteanp/IcedTeaNPPlugin.cc
---- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Fri Jun 08 13:44:25 2012 -0400
-+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Thu Jun 28 12:00:07 2012 -0400
-@@ -2022,105 +2022,48 @@
-   PLUGIN_DEBUG ("plugin_data_destroy return\n");
- }
- 
--// FACTORY FUNCTIONS
--
--// Provides the browser with pointers to the plugin functions that we
--// implement and initializes a local table with browser functions that
--// we may wish to call.  Called once, after browser startup and before
--// the first plugin instance is created.
--// The field 'initialized' is set to true once this function has
--// finished. If 'initialized' is already true at the beginning of
--// this function, then it is evident that NP_Initialize has already
--// been called. There is no need to call this function more than once and
--// this workaround avoids any duplicate calls.
--NPError
--NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable)
-+static bool
-+initialize_browser_functions(const NPNetscapeFuncs* browserTable)
- {
--  PLUGIN_DEBUG ("NP_Initialize\n");
--
--  if ((browserTable == NULL) || (pluginTable == NULL))
-+#if MOZILLA_VERSION_COLLAPSED < 1090100
-+#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->pluginthreadasynccall)
-+#else
-+#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->setvalueforurl)
-+#endif
-+
-+  //Determine the size in bytes, as a difference of the address past the last used field
-+  //And the browser table address
-+  size_t usedSize = (char*)(1 + &NPNETSCAPEFUNCS_LAST_FIELD_USED) - (char*)browserTable;
-+
-+  // compare the reported size versus the size we required
-+  if (browserTable->size < usedSize)
-   {
--    PLUGIN_ERROR ("Browser or plugin function table is NULL.");
--
--    return NPERR_INVALID_FUNCTABLE_ERROR;
-+    return false;
-   }
- 
--  // Ensure that the major version of the plugin API that the browser
--  // expects is not more recent than the major version of the API that
--  // we've implemented.
--  if ((browserTable->version >> 8) > NP_VERSION_MAJOR)
--    {
--      PLUGIN_ERROR ("Incompatible version.");
--
--      return NPERR_INCOMPATIBLE_VERSION_ERROR;
--    }
--
--  // Ensure that the plugin function table we've received is large
--  // enough to store the number of functions that we may provide.
--  if (pluginTable->size < sizeof (NPPluginFuncs))
--    {
--      PLUGIN_ERROR ("Invalid plugin function table.");
--
--      return NPERR_INVALID_FUNCTABLE_ERROR;
--    }
--
--  // Ensure that the browser function table is large enough to store
--  // the number of browser functions that we may use.
--  if (browserTable->size < sizeof (NPNetscapeFuncs))
--    {
--      fprintf (stderr, "ERROR: Invalid browser function table. Some functionality may be restricted.\n");
--    }
--
--  // Store in a local table the browser functions that we may use.
--  browser_functions.size                    = browserTable->size;
--  browser_functions.version                 = browserTable->version;
--  browser_functions.geturlnotify            = browserTable->geturlnotify;
--  browser_functions.geturl                  = browserTable->geturl;
--  browser_functions.posturlnotify           = browserTable->posturlnotify;
--  browser_functions.posturl                 = browserTable->posturl;
--  browser_functions.requestread             = browserTable->requestread;
--  browser_functions.newstream               = browserTable->newstream;
--  browser_functions.write                   = browserTable->write;
--  browser_functions.destroystream           = browserTable->destroystream;
--  browser_functions.status                  = browserTable->status;
--  browser_functions.uagent                  = browserTable->uagent;
--  browser_functions.memalloc                = browserTable->memalloc;
--  browser_functions.memfree                 = browserTable->memfree;
--  browser_functions.memflush                = browserTable->memflush;
--  browser_functions.reloadplugins           = browserTable->reloadplugins;
--  browser_functions.getJavaEnv              = browserTable->getJavaEnv;
--  browser_functions.getJavaPeer             = browserTable->getJavaPeer;
--  browser_functions.getvalue                = browserTable->getvalue;
--  browser_functions.setvalue                = browserTable->setvalue;
--  browser_functions.invalidaterect          = browserTable->invalidaterect;
--  browser_functions.invalidateregion        = browserTable->invalidateregion;
--  browser_functions.forceredraw             = browserTable->forceredraw;
--  browser_functions.getstringidentifier     = browserTable->getstringidentifier;
--  browser_functions.getstringidentifiers    = browserTable->getstringidentifiers;
--  browser_functions.getintidentifier        = browserTable->getintidentifier;
--  browser_functions.identifierisstring      = browserTable->identifierisstring;
--  browser_functions.utf8fromidentifier      = browserTable->utf8fromidentifier;
--  browser_functions.intfromidentifier       = browserTable->intfromidentifier;
--  browser_functions.createobject            = browserTable->createobject;
--  browser_functions.retainobject            = browserTable->retainobject;
--  browser_functions.releaseobject           = browserTable->releaseobject;
--  browser_functions.invoke                  = browserTable->invoke;
--  browser_functions.invokeDefault           = browserTable->invokeDefault;
--  browser_functions.evaluate                = browserTable->evaluate;
--  browser_functions.getproperty             = browserTable->getproperty;
--  browser_functions.setproperty             = browserTable->setproperty;
--  browser_functions.removeproperty          = browserTable->removeproperty;
--  browser_functions.hasproperty             = browserTable->hasproperty;
--  browser_functions.hasmethod               = browserTable->hasmethod;
--  browser_functions.releasevariantvalue     = browserTable->releasevariantvalue;
--  browser_functions.setexception            = browserTable->setexception;
--  browser_functions.pluginthreadasynccall   = browserTable->pluginthreadasynccall;
--#if MOZILLA_VERSION_COLLAPSED >= 1090100
--  browser_functions.getvalueforurl          = browserTable->getvalueforurl;
--  browser_functions.setvalueforurl          = browserTable->setvalueforurl;
--#endif
--
--  // Return to the browser the plugin functions that we implement.
-+  //Ensure any unused fields are NULL
-+  memset(&browser_functions, 0, sizeof(NPNetscapeFuncs));
-+  //Copy fields according to given size
-+  memcpy(&browser_functions, browserTable, browserTable->size);
-+
-+  return true;
-+}
-+
-+/* Set the plugin table to the correct contents, taking care not to write past
-+ * the provided object space */
-+static bool
-+initialize_plugin_table(NPPluginFuncs* pluginTable)
-+{
-+#define NPPLUGINFUNCS_LAST_FIELD_USED (pluginTable->getvalue)
-+
-+  //Determine the size in bytes, as a difference of the address past the last used field
-+  //And the browser table address
-+  size_t usedSize = (char*)(1 + &NPPLUGINFUNCS_LAST_FIELD_USED) - (char*)pluginTable;
-+
-+  // compare the reported size versus the size we required
-+  if (pluginTable->size < usedSize)
-+    return false;
-+
-   pluginTable->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
-   pluginTable->size = sizeof (NPPluginFuncs);
- 
-@@ -2150,6 +2093,68 @@
-   pluginTable->getvalue = NPP_GetValueProcPtr (ITNP_GetValue);
- #endif
- 
-+  return true;
-+}
-+
-+// FACTORY FUNCTIONS
-+
-+// Provides the browser with pointers to the plugin functions that we
-+// implement and initializes a local table with browser functions that
-+// we may wish to call.  Called once, after browser startup and before
-+// the first plugin instance is created.
-+// The field 'initialized' is set to true once this function has
-+// finished. If 'initialized' is already true at the beginning of
-+// this function, then it is evident that NP_Initialize has already
-+// been called. There is no need to call this function more than once and
-+// this workaround avoids any duplicate calls.
-+NPError
-+NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable)
-+{
-+  PLUGIN_DEBUG ("NP_Initialize\n");
-+
-+  if ((browserTable == NULL) || (pluginTable == NULL))
-+  {
-+    PLUGIN_ERROR ("Browser or plugin function table is NULL.");
-+
-+    return NPERR_INVALID_FUNCTABLE_ERROR;
-+  }
-+
-+  // Ensure that the major version of the plugin API that the browser
-+  // expects is not more recent than the major version of the API that
-+  // we've implemented.
-+  if ((browserTable->version >> 8) > NP_VERSION_MAJOR)
-+    {
-+      PLUGIN_ERROR ("Incompatible version.");
-+
-+      return NPERR_INCOMPATIBLE_VERSION_ERROR;
-+    }
-+
-+  // Copy into a global table (browser_functions) the browser functions that we may use.
-+  // If the browser functions needed change, update NPNETSCAPEFUNCS_LAST_FIELD_USED
-+  // within this function
-+  bool browser_functions_supported = initialize_browser_functions(browserTable);
-+
-+  // Check if everything we rely on is supported
-+  if ( !browser_functions_supported )
-+  {
-+	PLUGIN_ERROR ("Invalid browser function table.");
-+
-+	return NPERR_INVALID_FUNCTABLE_ERROR;
-+  }
-+
-+  // Return to the browser the plugin functions that we implement.
-+  // If the plugin functions needed change, update NPPLUGINFUNCS_LAST_FIELD_USED
-+  // within this function
-+  bool plugin_functions_supported = initialize_plugin_table(pluginTable);
-+
-+  // Check if everything we rely on is supported
-+  if ( !plugin_functions_supported )
-+  {
-+    PLUGIN_ERROR ("Invalid plugin function table.");
-+
-+    return NPERR_INVALID_FUNCTABLE_ERROR;
-+  }
-+
-   // Re-setting the above tables multiple times is OK (as the 
-   // browser may change its function locations). However 
-   // anything beyond this point should only run once.
-
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD
deleted file mode 100644
index a4939af38..000000000
--- a/extra/icedtea-web/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 170458 2012-11-07 20:07:26Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=icedtea-web
-pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.3.1
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-url="http://icedtea.classpath.org/wiki/IcedTea-Web"
-license=('GPL2')
-makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany')
-noextract=$pkgname-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot
-source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz)
-sha256sums=('20c7fd1eef6c79cbc6478bb01236a3eb2f0af6184eaed24baca59a3c37eafb56')
-
-_javaver=6
-_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-build() {
-  # extract it
-  cd "$srcdir"
-  LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/$pkgname-$pkgver.tar.gz
-
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=${_jvmdir} \
-      --datarootdir=/usr/share \
-      --with-browser-tests \
-      --with-firefox=/usr/bin/firefox \
-      --with-chromium=/usr/bin/chromium \
-      --with-epiphany=/usr/bin/epiphany \
-      --with-gtk=2
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  # as more tests have been added some are expectged to fail
-  # see http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017566.html
-  make -k check || /bin/true
-}
-
-
-package_icedtea-web() {
-
-  pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
-  depends=('openjdk6' 'gtk2' 'desktop-file-utils')
-  provides=('java-web-start=6')
-  install=$pkgname.install
-
-  cd "$srcdir/$pkgname-$pkgver"
-  # possible make target (see bottom of Makefile.am: install-exec-local install-data-local
-  make DESTDIR="$pkgdir" install-exec-local install-data-local
-
-  # Install desktop files.
-  install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
-  install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
-  install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications
-  # remove splitted doc files
-  rm -rf ${pkgdir}/usr/share/doc
-
-  # link binaries into /usr/bin + jre/bin
-  install -m755 -d ${pkgdir}/usr/bin
-  install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
-  pushd ${pkgdir}/${_jvmdir}/bin
-  for file in *; do
-    ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
-    ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin
-  done
-  popd
-
-  # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
-  install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
-  ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
-}
-
-package_icedtea-web-doc() {
-
-  pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
-
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install-data-local
-  # remove javaws about and man page
-  rm -rf ${pkgdir}/usr/lib
-  rm -rf ${pkgdir}/usr/share/man
-  rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems
-}
diff --git a/extra/icedtea-web/fix_firefox_crash.diff b/extra/icedtea-web/fix_firefox_crash.diff
deleted file mode 100644
index cd02aba0a..000000000
--- a/extra/icedtea-web/fix_firefox_crash.diff
+++ /dev/null
@@ -1,228 +0,0 @@
-
-# HG changeset patch
-# User Adam Domurad <adomurad@redhat.com>
-# Date 1340899207 14400
-# Node ID a49edd57b1b332b431222b1c225189fe51676193
-# Parent  d65bd94e0ba9b7c8b9051c7d471b55c2c74ea3f4
-Fixes invalid plugin table error that sometimes occurs.
-The invalid plugin table error was happening when the API that was
-being compiled with had a larger size than that of the browser.
-The plugin now only checks if the minimal subset it uses exists.
-
-diff -r d65bd94e0ba9 -r a49edd57b1b3 plugin/icedteanp/IcedTeaNPPlugin.cc
---- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Fri Jun 08 13:44:25 2012 -0400
-+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Thu Jun 28 12:00:07 2012 -0400
-@@ -2022,105 +2022,48 @@
-   PLUGIN_DEBUG ("plugin_data_destroy return\n");
- }
- 
--// FACTORY FUNCTIONS
--
--// Provides the browser with pointers to the plugin functions that we
--// implement and initializes a local table with browser functions that
--// we may wish to call.  Called once, after browser startup and before
--// the first plugin instance is created.
--// The field 'initialized' is set to true once this function has
--// finished. If 'initialized' is already true at the beginning of
--// this function, then it is evident that NP_Initialize has already
--// been called. There is no need to call this function more than once and
--// this workaround avoids any duplicate calls.
--NPError
--NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable)
-+static bool
-+initialize_browser_functions(const NPNetscapeFuncs* browserTable)
- {
--  PLUGIN_DEBUG ("NP_Initialize\n");
--
--  if ((browserTable == NULL) || (pluginTable == NULL))
-+#if MOZILLA_VERSION_COLLAPSED < 1090100
-+#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->pluginthreadasynccall)
-+#else
-+#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->setvalueforurl)
-+#endif
-+
-+  //Determine the size in bytes, as a difference of the address past the last used field
-+  //And the browser table address
-+  size_t usedSize = (char*)(1 + &NPNETSCAPEFUNCS_LAST_FIELD_USED) - (char*)browserTable;
-+
-+  // compare the reported size versus the size we required
-+  if (browserTable->size < usedSize)
-   {
--    PLUGIN_ERROR ("Browser or plugin function table is NULL.");
--
--    return NPERR_INVALID_FUNCTABLE_ERROR;
-+    return false;
-   }
- 
--  // Ensure that the major version of the plugin API that the browser
--  // expects is not more recent than the major version of the API that
--  // we've implemented.
--  if ((browserTable->version >> 8) > NP_VERSION_MAJOR)
--    {
--      PLUGIN_ERROR ("Incompatible version.");
--
--      return NPERR_INCOMPATIBLE_VERSION_ERROR;
--    }
--
--  // Ensure that the plugin function table we've received is large
--  // enough to store the number of functions that we may provide.
--  if (pluginTable->size < sizeof (NPPluginFuncs))
--    {
--      PLUGIN_ERROR ("Invalid plugin function table.");
--
--      return NPERR_INVALID_FUNCTABLE_ERROR;
--    }
--
--  // Ensure that the browser function table is large enough to store
--  // the number of browser functions that we may use.
--  if (browserTable->size < sizeof (NPNetscapeFuncs))
--    {
--      fprintf (stderr, "ERROR: Invalid browser function table. Some functionality may be restricted.\n");
--    }
--
--  // Store in a local table the browser functions that we may use.
--  browser_functions.size                    = browserTable->size;
--  browser_functions.version                 = browserTable->version;
--  browser_functions.geturlnotify            = browserTable->geturlnotify;
--  browser_functions.geturl                  = browserTable->geturl;
--  browser_functions.posturlnotify           = browserTable->posturlnotify;
--  browser_functions.posturl                 = browserTable->posturl;
--  browser_functions.requestread             = browserTable->requestread;
--  browser_functions.newstream               = browserTable->newstream;
--  browser_functions.write                   = browserTable->write;
--  browser_functions.destroystream           = browserTable->destroystream;
--  browser_functions.status                  = browserTable->status;
--  browser_functions.uagent                  = browserTable->uagent;
--  browser_functions.memalloc                = browserTable->memalloc;
--  browser_functions.memfree                 = browserTable->memfree;
--  browser_functions.memflush                = browserTable->memflush;
--  browser_functions.reloadplugins           = browserTable->reloadplugins;
--  browser_functions.getJavaEnv              = browserTable->getJavaEnv;
--  browser_functions.getJavaPeer             = browserTable->getJavaPeer;
--  browser_functions.getvalue                = browserTable->getvalue;
--  browser_functions.setvalue                = browserTable->setvalue;
--  browser_functions.invalidaterect          = browserTable->invalidaterect;
--  browser_functions.invalidateregion        = browserTable->invalidateregion;
--  browser_functions.forceredraw             = browserTable->forceredraw;
--  browser_functions.getstringidentifier     = browserTable->getstringidentifier;
--  browser_functions.getstringidentifiers    = browserTable->getstringidentifiers;
--  browser_functions.getintidentifier        = browserTable->getintidentifier;
--  browser_functions.identifierisstring      = browserTable->identifierisstring;
--  browser_functions.utf8fromidentifier      = browserTable->utf8fromidentifier;
--  browser_functions.intfromidentifier       = browserTable->intfromidentifier;
--  browser_functions.createobject            = browserTable->createobject;
--  browser_functions.retainobject            = browserTable->retainobject;
--  browser_functions.releaseobject           = browserTable->releaseobject;
--  browser_functions.invoke                  = browserTable->invoke;
--  browser_functions.invokeDefault           = browserTable->invokeDefault;
--  browser_functions.evaluate                = browserTable->evaluate;
--  browser_functions.getproperty             = browserTable->getproperty;
--  browser_functions.setproperty             = browserTable->setproperty;
--  browser_functions.removeproperty          = browserTable->removeproperty;
--  browser_functions.hasproperty             = browserTable->hasproperty;
--  browser_functions.hasmethod               = browserTable->hasmethod;
--  browser_functions.releasevariantvalue     = browserTable->releasevariantvalue;
--  browser_functions.setexception            = browserTable->setexception;
--  browser_functions.pluginthreadasynccall   = browserTable->pluginthreadasynccall;
--#if MOZILLA_VERSION_COLLAPSED >= 1090100
--  browser_functions.getvalueforurl          = browserTable->getvalueforurl;
--  browser_functions.setvalueforurl          = browserTable->setvalueforurl;
--#endif
--
--  // Return to the browser the plugin functions that we implement.
-+  //Ensure any unused fields are NULL
-+  memset(&browser_functions, 0, sizeof(NPNetscapeFuncs));
-+  //Copy fields according to given size
-+  memcpy(&browser_functions, browserTable, browserTable->size);
-+
-+  return true;
-+}
-+
-+/* Set the plugin table to the correct contents, taking care not to write past
-+ * the provided object space */
-+static bool
-+initialize_plugin_table(NPPluginFuncs* pluginTable)
-+{
-+#define NPPLUGINFUNCS_LAST_FIELD_USED (pluginTable->getvalue)
-+
-+  //Determine the size in bytes, as a difference of the address past the last used field
-+  //And the browser table address
-+  size_t usedSize = (char*)(1 + &NPPLUGINFUNCS_LAST_FIELD_USED) - (char*)pluginTable;
-+
-+  // compare the reported size versus the size we required
-+  if (pluginTable->size < usedSize)
-+    return false;
-+
-   pluginTable->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
-   pluginTable->size = sizeof (NPPluginFuncs);
- 
-@@ -2150,6 +2093,68 @@
-   pluginTable->getvalue = NPP_GetValueProcPtr (ITNP_GetValue);
- #endif
- 
-+  return true;
-+}
-+
-+// FACTORY FUNCTIONS
-+
-+// Provides the browser with pointers to the plugin functions that we
-+// implement and initializes a local table with browser functions that
-+// we may wish to call.  Called once, after browser startup and before
-+// the first plugin instance is created.
-+// The field 'initialized' is set to true once this function has
-+// finished. If 'initialized' is already true at the beginning of
-+// this function, then it is evident that NP_Initialize has already
-+// been called. There is no need to call this function more than once and
-+// this workaround avoids any duplicate calls.
-+NPError
-+NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable)
-+{
-+  PLUGIN_DEBUG ("NP_Initialize\n");
-+
-+  if ((browserTable == NULL) || (pluginTable == NULL))
-+  {
-+    PLUGIN_ERROR ("Browser or plugin function table is NULL.");
-+
-+    return NPERR_INVALID_FUNCTABLE_ERROR;
-+  }
-+
-+  // Ensure that the major version of the plugin API that the browser
-+  // expects is not more recent than the major version of the API that
-+  // we've implemented.
-+  if ((browserTable->version >> 8) > NP_VERSION_MAJOR)
-+    {
-+      PLUGIN_ERROR ("Incompatible version.");
-+
-+      return NPERR_INCOMPATIBLE_VERSION_ERROR;
-+    }
-+
-+  // Copy into a global table (browser_functions) the browser functions that we may use.
-+  // If the browser functions needed change, update NPNETSCAPEFUNCS_LAST_FIELD_USED
-+  // within this function
-+  bool browser_functions_supported = initialize_browser_functions(browserTable);
-+
-+  // Check if everything we rely on is supported
-+  if ( !browser_functions_supported )
-+  {
-+	PLUGIN_ERROR ("Invalid browser function table.");
-+
-+	return NPERR_INVALID_FUNCTABLE_ERROR;
-+  }
-+
-+  // Return to the browser the plugin functions that we implement.
-+  // If the plugin functions needed change, update NPPLUGINFUNCS_LAST_FIELD_USED
-+  // within this function
-+  bool plugin_functions_supported = initialize_plugin_table(pluginTable);
-+
-+  // Check if everything we rely on is supported
-+  if ( !plugin_functions_supported )
-+  {
-+    PLUGIN_ERROR ("Invalid plugin function table.");
-+
-+    return NPERR_INVALID_FUNCTABLE_ERROR;
-+  }
-+
-   // Re-setting the above tables multiple times is OK (as the 
-   // browser may change its function locations). However 
-   // anything beyond this point should only run once.
-
diff --git a/extra/icedtea-web/icedtea-web.install b/extra/icedtea-web/icedtea-web.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/extra/icedtea-web/icedtea-web.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index 0f82798e6..e0765fd80 100644
--- a/extra/icu/PKGBUILD
+++ b/extra/icu/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175870 2013-01-23 00:13:04Z eric $
+# $Id: PKGBUILD 180805 2013-03-26 11:49:34Z foutrelis $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Art Gramlich <art@gramlich-net.com>
 
 pkgname=icu
-pkgver=50.1.2
+pkgver=51.1
 pkgrel=1
 pkgdesc="International Components for Unicode library"
 arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ depends=('gcc-libs>=4.7.1-5' 'sh')
 source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
 	    http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
 	    icu.8198.revert.icu5431.patch)
-md5sums=('beb98aa972219c9fcd9c8a71314943c9'
+md5sums=('6eef33b229d0239d654983028c9c7053'
          'ebd5470fc969c75e52baf4af94a9ee82')
 
 build() {
diff --git a/extra/icu/changeset_32780.diff b/extra/icu/changeset_32780.diff
deleted file mode 100644
index a06c3d2ab..000000000
--- a/extra/icu/changeset_32780.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: /icu/trunk/source/test/intltest/strtest.cpp

-===================================================================

---- /icu/trunk/source/test/intltest/strtest.cpp	(revision 32779)

-+++ /icu/trunk/source/test/intltest/strtest.cpp	(revision 32780)

-@@ -1,5 +1,5 @@

- /********************************************************************

-  * COPYRIGHT: 

-- * Copyright (c) 1997-2011, International Business Machines Corporation and

-+ * Copyright (c) 1997-2012, International Business Machines Corporation and

-  * others. All Rights Reserved.

-  ********************************************************************/

-@@ -95,5 +95,5 @@

- StringTest::Test_U_STRING() {

-     U_STRING_INIT(ustringVar, "aZ0 -", 5);

--    if( sizeof(ustringVar)/sizeof(*ustringVar)!=6 ||

-+    if( u_strlen(ustringVar)!=5 ||

-         ustringVar[0]!=0x61 ||

-         ustringVar[1]!=0x5a ||

-Index: /icu/trunk/source/common/unicode/ustring.h

-===================================================================

---- /icu/trunk/source/common/unicode/ustring.h	(revision 32779)

-+++ /icu/trunk/source/common/unicode/ustring.h	(revision 32780)

-@@ -940,5 +940,5 @@

-  */

- #if defined(U_DECLARE_UTF16)

--#   define U_STRING_DECL(var, cs, length) static const UChar var[(length)+1]=U_DECLARE_UTF16(cs)

-+#   define U_STRING_DECL(var, cs, length) static const UChar *var=(const UChar *)U_DECLARE_UTF16(cs)

-     /**@stable ICU 2.0 */

- #   define U_STRING_INIT(var, cs, length)

-Index: /icu/trunk/source/common/unicode/platform.h

-===================================================================

---- /icu/trunk/source/common/unicode/platform.h	(revision 32779)

-+++ /icu/trunk/source/common/unicode/platform.h	(revision 32780)

-@@ -665,7 +665,7 @@

-      * gcc 4.4 defines the __CHAR16_TYPE__ macro to a usable type but

-      * does not support u"abc" string literals.

--     * C++11 requires support for UTF-16 literals

-+     * C++11 and C11 require support for UTF-16 literals

-      */

--#   if (defined(__cplusplus) && __cplusplus >= 201103L)

-+#   if (defined(__cplusplus) && __cplusplus >= 201103L) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L)

- #       define U_HAVE_CHAR16_T 1

- #   else

-Index: /icu/trunk/source/common/unicode/umachine.h

-===================================================================

---- /icu/trunk/source/common/unicode/umachine.h	(revision 32779)

-+++ /icu/trunk/source/common/unicode/umachine.h	(revision 32780)

-@@ -257,5 +257,5 @@

- /**

-  * \var UChar

-- * Define UChar to be char16_t, if available,

-+ * Define UChar to be UCHAR_TYPE, if that is #defined (for example, to char16_t),

-  * or wchar_t if that is 16 bits wide; always assumed to be unsigned.

-  * If neither is available, then define UChar to be uint16_t.

-@@ -267,8 +267,8 @@

-  * @stable ICU 4.4

-  */

--

--/* Define UChar to be compatible with char16_t or wchar_t if possible. */

--#if U_HAVE_CHAR16_T

--    typedef char16_t UChar;

-+#if defined(UCHAR_TYPE)

-+    typedef UCHAR_TYPE UChar;

-+/* Not #elif U_HAVE_CHAR16_T -- because that is type-incompatible with pre-C++11 callers

-+    typedef char16_t UChar;  */

- #elif U_SIZEOF_WCHAR_T==2

-     typedef wchar_t UChar;

diff --git a/extra/idnkit/PKGBUILD b/extra/idnkit/PKGBUILD
new file mode 100644
index 000000000..3b13aa317
--- /dev/null
+++ b/extra/idnkit/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 180328 2013-03-20 15:10:14Z bisson $
+# Contributor: Igor Nemilentsev <trezorg@gmail.com>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=idnkit
+pkgver=1.0
+pkgrel=2.1
+pkgdesc='Provides functionalities about Internationalized Domain Name processing'
+url='http://www.nic.ad.jp/ja/idn/idnkit/download/'
+license=('custom:BSD')
+arch=('i686' 'x86_64' 'mips64el')
+depends=('glibc')
+options=('!makeflags' '!libtool')
+source=("http://www.nic.ad.jp/ja/idn/idnkit/download/sources/idnkit-${pkgver}-src.tar.gz")
+sha1sums=('7d843ffcf9843b7af02079e5a160520f28c75048')
+
+backup=('etc/idnalias.conf' 'etc/idn.conf')
+
+build() {
+	cd "${srcdir}/idnkit-${pkgver}-src"
+	./configure \
+    --host=$CHOST \
+    --build=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--mandir=/usr/share/man \
+		--enable-static=no
+	make
+}
+
+check() {
+	cd "${srcdir}/idnkit-${pkgver}-src"
+	make check
+}
+
+package() {
+	cd "${srcdir}/idnkit-${pkgver}-src"
+	make DESTDIR="${pkgdir}" install
+	install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	rm "${pkgdir}"/etc/*.sample
+}
diff --git a/extra/ifplugd/ifdown.01-route.sh b/extra/ifplugd/ifdown.01-route.sh
deleted file mode 100755
index cfa0e0069..000000000
--- a/extra/ifplugd/ifdown.01-route.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-# same as up...
-/sbin/route del $1
\ No newline at end of file
diff --git a/extra/ifplugd/ifplugd.action b/extra/ifplugd/ifplugd.action
deleted file mode 100644
index 07895bcad..000000000
--- a/extra/ifplugd/ifplugd.action
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-#
-# ifplugd.action script for Arch Linux
-#
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-plugscript() { # arguments are ifup|ifdown, interface_name
-  for script in /etc/ifplugd/$1.d/*.sh; do
-    [[ -x $script ]] && "$script" $2
-  done
-  return 0
-}
-
-case $2 in
-  up)
-    /etc/rc.d/network ifup "$1"
-    plugscript ifup "$1"
-  ;;
-  down)
-    plugscript ifdown "$1"
-    /etc/rc.d/network ifdown $1
-  ;;
-  *)
-    echo "Wrong arguments" >&2
-  ;;
-esac
-
-exit 1
diff --git a/extra/ifplugd/ifup.01-route.sh b/extra/ifplugd/ifup.01-route.sh
deleted file mode 100755
index 6be07208d..000000000
--- a/extra/ifplugd/ifup.01-route.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# ugly way to load up gateway, since
-# al's net configuration doesn't associate
-# gateways with specific interfaces.
-/sbin/route add $gateway
diff --git a/extra/ifplugd/ifup.02-ntpdate.sh b/extra/ifplugd/ifup.02-ntpdate.sh
deleted file mode 100755
index 4e53daff9..000000000
--- a/extra/ifplugd/ifup.02-ntpdate.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-ntpdate ru.pool.ntp.org | logger
diff --git a/extra/ilmbase/PKGBUILD b/extra/ilmbase/PKGBUILD
index 15d8c2f54..6300c081c 100644
--- a/extra/ilmbase/PKGBUILD
+++ b/extra/ilmbase/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=ilmbase
-pkgver=1.0.3
+pkgver=2.0.0
 pkgrel=1
 depends=('gcc-libs')
 pkgdesc="Base libraries from ILM for OpenEXR"
@@ -10,14 +10,12 @@ arch=(i686 x86_64 mips64el)
 url="http://www.openexr.com"
 license=('custom')
 options=('!libtool')
-source=(https://github.com/downloads/openexr/openexr/$pkgname-$pkgver.tar.gz 
-        ilmbase-IexMath.patch)
-md5sums=('d99962ec7e2bfac0647aaabf6b91d5de'
-         '9c8efaf15f60bccf79749ec879657962')
+source=(http://download.savannah.nongnu.org/releases/openexr/$pkgname-$pkgver.tar.gz
+	ilmbase-IexMath.patch) 
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
-  patch -p0 -i "${srcdir}/ilmbase-IexMath.patch"
+  patch -Np1 -i ${srcdir}/ilmbase-IexMath.patch
   ./configure --prefix=/usr
   make
 }
@@ -33,3 +31,5 @@ package() {
   make DESTDIR="${pkgdir}" install
   install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
+md5sums=('70f1413840c2a228783d1332b8b168e6'
+	 '65f1ec028c9f6fbf3a0abd6a687e9745')
diff --git a/extra/ilmbase/ilmbase-IexMath.patch b/extra/ilmbase/ilmbase-IexMath.patch
index 546034966..c3bd58719 100644
--- a/extra/ilmbase/ilmbase-IexMath.patch
+++ b/extra/ilmbase/ilmbase-IexMath.patch
@@ -1,6 +1,6 @@
---- IexMath/IexMathFpu.cpp.orig	2012-07-26 20:51:55.000000000 +0200
-+++ IexMath/IexMathFpu.cpp	2012-10-04 15:30:47.000000000 +0200
-@@ -27,8 +27,7 @@
+--- ilmbase-2.0.0.orig/IexMath/IexMathFpu.cpp	2013-03-06 18:18:50.000000000 -0500
++++ ilmbase-2.0.0/IexMath/IexMathFpu.cpp	2013-04-23 13:17:40.273193358 -0500
+@@ -53,8 +53,7 @@
  #endif
  
  
diff --git a/extra/ilmbase/tests-compile-fixes.patch b/extra/ilmbase/tests-compile-fixes.patch
deleted file mode 100644
index 27dc24ac6..000000000
--- a/extra/ilmbase/tests-compile-fixes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur ilmbase-1.0.2/Imath/ImathMatrix.h ilmbase-1.0.2.new/Imath/ImathMatrix.h
---- ilmbase-1.0.2/Imath/ImathMatrix.h	2010-07-17 00:48:40.000000000 +0200
-+++ ilmbase-1.0.2.new/Imath/ImathMatrix.h	2011-04-25 10:15:21.121608420 +0200
-@@ -49,6 +49,8 @@
- #include "ImathVec.h"
- #include "ImathShear.h"
- 
-+#include <cstdlib>
-+#include <cstring>
- #include <iostream>
- #include <iomanip>
- 
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 31f133add..86f548a60 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177003 2013-02-03 18:51:00Z eric $
+# $Id: PKGBUILD 183287 2013-04-20 16:41:21Z heftig $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.8.2.3
+pkgver=6.8.4.10
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.imagemagick.org/"
@@ -13,16 +13,18 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
 #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
 source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         perlmagick.rpath.patch)
-sha1sums=('93c8ee2bf982c7c148c4872cd16f85f1073ec869'
-          '23405f80904b1de94ebd7bd6fe2a332471b8c283')
+sha1sums=('8d5529f35f624b83ad925958c977a381ab30c0f7'
+          'e143cf9d530fabf3b58023899b5cc544ba93daec')
 
-build() {
+prepare() {
   cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-
   sed '/AC_PATH_XTRA/d' -i configure.ac
   autoreconf --force --install
-  patch -p0 -i ../perlmagick.rpath.patch
+  patch -p0 -i "${srcdir}/perlmagick.rpath.patch"
+}
 
+build() {
+  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
   ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
     --disable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
     --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
@@ -47,29 +49,27 @@ package_imagemagick() {
               'libxml2: for XML support' 
               'jasper: for JPEG-2000 support' 
               'libpng: for PNG support')
-  backup=('etc/ImageMagick/coder.xml'
-          'etc/ImageMagick/colors.xml'
-          'etc/ImageMagick/delegates.xml'
-          'etc/ImageMagick/log.xml'
-          'etc/ImageMagick/magic.xml'
-          'etc/ImageMagick/mime.xml'
-          'etc/ImageMagick/policy.xml'
-          'etc/ImageMagick/quantization-table.xml'
-          'etc/ImageMagick/thresholds.xml'
-          'etc/ImageMagick/type.xml'
-          'etc/ImageMagick/type-dejavu.xml'
-          'etc/ImageMagick/type-ghostscript.xml'
-          'etc/ImageMagick/type-windows.xml')
+  backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
+          "etc/ImageMagick-${pkgver%%.*}/colors.xml"
+          "etc/ImageMagick-${pkgver%%.*}/delegates.xml"
+          "etc/ImageMagick-${pkgver%%.*}/log.xml"
+          "etc/ImageMagick-${pkgver%%.*}/magic.xml"
+          "etc/ImageMagick-${pkgver%%.*}/mime.xml"
+          "etc/ImageMagick-${pkgver%%.*}/policy.xml"
+          "etc/ImageMagick-${pkgver%%.*}/quantization-table.xml"
+          "etc/ImageMagick-${pkgver%%.*}/thresholds.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type-dejavu.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type-ghostscript.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type-windows.xml")
   options=('!docs' 'libtool' '!emptydirs')
 
   cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make DESTDIR="${pkgdir}" install
-  chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" 
+  make -j1 DESTDIR="${pkgdir}" install
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
   install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
 
 #Cleaning
-  find "${pkgdir}" -name '*.bs' -delete
   rm -f "${pkgdir}"/usr/lib/*.la
 }
 
diff --git a/extra/imagemagick/perlmagick.rpath.patch b/extra/imagemagick/perlmagick.rpath.patch
index 958c0f2ee..a5b1a82e2 100644
--- a/extra/imagemagick/perlmagick.rpath.patch
+++ b/extra/imagemagick/perlmagick.rpath.patch
@@ -1,10 +1,11 @@
---- Makefile.in.orig	2009-05-26 16:22:11.000000000 -0300
-+++ Makefile.in	2009-05-26 16:23:27.000000000 -0300
-@@ -10067,6 +10067,7 @@
+--- Makefile.in.orig	2013-02-21 03:26:56.785156600 -0500
++++ Makefile.in	2013-02-21 03:39:03.102411457 -0500
+@@ -10469,6 +10469,8 @@
  
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER)
  @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
 +@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' quantum/Makefile
  
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
diff --git a/extra/imlib/PKGBUILD b/extra/imlib/PKGBUILD
index f66506dd5..18f4c9140 100644
--- a/extra/imlib/PKGBUILD
+++ b/extra/imlib/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=imlib
 pkgver=1.9.15
-pkgrel=11.1
+pkgrel=11.2
 pkgdesc="General image handling library for X11 and Gtk"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://freshmeat.net/projects/imlib/"
diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD
index 14b64b99b..dd77dbdac 100644
--- a/extra/imlib2/PKGBUILD
+++ b/extra/imlib2/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=imlib2
 pkgver=1.4.5
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
 url="http://sourceforge.net/projects/enlightenment/"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 9535463c4..fe21db8e1 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 175856 2013-01-23 00:12:47Z eric $
+# $Id: PKGBUILD 183288 2013-04-20 16:41:22Z heftig $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 # Contributor: tobias <tobias@archlinux.org>
 
 pkgname=inkscape
 pkgver=0.48.4
-pkgrel=3
+pkgrel=6
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('boost' 'intltool')
-depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.22.0' 'popt'
+depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.22.3' 'popt'
          'python2' 'desktop-file-utils' 'hicolor-icon-theme')
 optdepends=('pstoedit: latex formulas'
             'texlive-core: latex formulas'
@@ -20,13 +20,18 @@ optdepends=('pstoedit: latex formulas'
             'pyxml: some extensions'
             'uniconvertor: reading/writing to some proprietary formats')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c')
+source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
+        inkscape-0.48.4-spuriouscomma.patch)
+sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c'
+          '7d1d5a6d1d2b0926721a994d5889c52890fc57c1')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	
+	# fix FTBS, patch taken from FC
+	patch -Np0 -i ${srcdir}/inkscape-0.48.4-spuriouscomma.patch
 
 	sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
 	sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
diff --git a/extra/inkscape/inkscape-0.48.4-spuriouscomma.patch b/extra/inkscape/inkscape-0.48.4-spuriouscomma.patch
new file mode 100644
index 000000000..bc538068f
--- /dev/null
+++ b/extra/inkscape/inkscape-0.48.4-spuriouscomma.patch
@@ -0,0 +1,11 @@
+--- src/widgets/desktop-widget.h~	2011-07-08 13:25:09.000000000 -0500
++++ src/widgets/desktop-widget.h	2013-02-15 16:04:45.806910365 -0600
+@@ -239,7 +239,7 @@
+ private:
+     GtkWidget *tool_toolbox;
+     GtkWidget *aux_toolbox;
+-    GtkWidget *commands_toolbox,;
++    GtkWidget *commands_toolbox;
+     GtkWidget *snap_toolbox;
+ 
+     static void init(SPDesktopWidget *widget);
diff --git a/extra/inkscape/libpng15.patch b/extra/inkscape/libpng15.patch
deleted file mode 100644
index e24913ed6..000000000
--- a/extra/inkscape/libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp
-+++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp
-@@ -1443,7 +1443,7 @@
-         return NULL;
-     }
-     // Set error handler
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         return NULL;
-     }
---- inkscape-0.48.1/src/helper/png-write.cpp
-+++ inkscape-0.48.1-mod//src/helper/png-write.cpp
-@@ -165,7 +165,7 @@
-     /* Set error handling.  REQUIRED if you aren't supplying your own
-      * error hadnling functions in the png_create_write_struct() call.
-      */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         /* If we get here, we had a problem reading the file */
-         fclose(fp);
-         png_destroy_write_struct(&png_ptr, &info_ptr);
---- inkscape-0.48.1/src/sp-image.cpp
-+++ inkscape-0.48.1-mod//src/sp-image.cpp
-@@ -386,9 +386,13 @@
- 
- #if defined(PNG_iCCP_SUPPORTED)
-                 {
--                    char* name = 0;
-+                    png_charp name = 0;
-                     int compression_type = 0;
--                    char* profile = 0;
-+#if (PNG_LIBPNG_VER < 10500)
-+                    png_charp profile = 0;
-+#else
-+                    png_bytep profile = 0;
-+#endif
-                     png_uint_32 proflen = 0;
-                     if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
- //                                         g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
diff --git a/extra/inkscape/poppler20.patch b/extra/inkscape/poppler20.patch
deleted file mode 100644
index ecb74603f..000000000
--- a/extra/inkscape/poppler20.patch
+++ /dev/null
@@ -1,642 +0,0 @@
-diff -Naur old/src/extension/internal/pdfinput/pdf-parser.cpp new/src/extension/internal/pdfinput/pdf-parser.cpp
---- old/src/extension/internal/pdfinput/pdf-parser.cpp	2011-07-08 20:25:09.468790000 +0200
-+++ new/src/extension/internal/pdfinput/pdf-parser.cpp	2012-05-13 21:07:11.334781215 +0200
-@@ -367,14 +367,14 @@
-     for (i = 0; i < obj->arrayGetLength(); ++i) {
-       obj->arrayGet(i, &obj2);
-       if (!obj2.isStream()) {
--	error(-1, const_cast<char*>("Weird page contents"));
-+	error(errInternal, -1, const_cast<char*>("Weird page contents"));
- 	obj2.free();
- 	return;
-       }
-       obj2.free();
-     }
-   } else if (!obj->isStream()) {
--    error(-1, const_cast<char*>("Weird page contents"));
-+    error(errInternal, -1, const_cast<char*>("Weird page contents"));
-     return;
-   }
-   parser = new Parser(xref, new Lexer(xref, obj), gFalse);
-@@ -419,7 +419,7 @@
- 
-     // too many arguments - something is wrong
-     } else {
--      error(getPos(), const_cast<char*>("Too many args in content stream"));
-+      error(errInternal, getPos(), const_cast<char*>("Too many args in content stream"));
-       if (printCommands) {
- 	printf("throwing away arg: ");
- 	obj.print(stdout);
-@@ -436,7 +436,7 @@
- 
-   // args at end with no command
-   if (numArgs > 0) {
--    error(getPos(), const_cast<char*>("Leftover args in content stream"));
-+    error(errInternal, getPos(), const_cast<char*>("Leftover args in content stream"));
-     if (printCommands) {
-       printf("%d leftovers:", numArgs);
-       for (i = 0; i < numArgs; ++i) {
-@@ -502,7 +502,7 @@
-   name = cmd->getCmd();
-   if (!(op = findOp(name))) {
-     if (ignoreUndef == 0)
--      error(getPos(), const_cast<char*>("Unknown operator '%s'"), name);
-+      error(errInternal, getPos(), const_cast<char*>("Unknown operator '%s'"), name);
-     return;
-   }
- 
-@@ -510,26 +510,26 @@
-   argPtr = args;
-   if (op->numArgs >= 0) {
-     if (numArgs < op->numArgs) {
--      error(getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name);
-+      error(errInternal, getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name);
-       return;
-     }
-     if (numArgs > op->numArgs) {
- #if 0
--      error(getPos(), "Too many (%d) args to '%s' operator", numArgs, name);
-+      error(errInternal, getPos(), "Too many (%d) args to '%s' operator", numArgs, name);
- #endif
-       argPtr += numArgs - op->numArgs;
-       numArgs = op->numArgs;
-     }
-   } else {
-     if (numArgs > -op->numArgs) {
--      error(getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"),
-+      error(errInternal, getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"),
- 	    numArgs, name);
-       return;
-     }
-   }
-   for (i = 0; i < numArgs; ++i) {
-     if (!checkArg(&argPtr[i], op->tchk[i])) {
--      error(getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"),
-+      error(errInternal, getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"),
- 	    i, name, argPtr[i].getTypeName());
-       return;
-     }
-@@ -690,7 +690,7 @@
-     return;
-   }
-   if (!obj1.isDict()) {
--    error(getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName());
-+    error(errInternal, getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName());
-     obj1.free();
-     return;
-   }
-@@ -705,7 +705,7 @@
-     if (state->parseBlendMode(&obj2, &mode)) {
-       state->setBlendMode(mode);
-     } else {
--      error(getPos(), const_cast<char*>("Invalid blend mode in ExtGState"));
-+      error(errInternal, getPos(), const_cast<char*>("Invalid blend mode in ExtGState"));
-     }
-   }
-   obj2.free();
-@@ -764,7 +764,7 @@
-       state->setTransfer(funcs);
-     }
-   } else if (!obj2.isNull()) {
--    error(getPos(), const_cast<char*>("Invalid transfer function in ExtGState"));
-+    error(errInternal, getPos(), const_cast<char*>("Invalid transfer function in ExtGState"));
-   }
-   obj2.free();
- 
-@@ -784,7 +784,7 @@
- 	funcs[0] = Function::parse(&obj3);
- 	if (funcs[0]->getInputSize() != 1 ||
- 	    funcs[0]->getOutputSize() != 1) {
--	  error(getPos(),
-+	  error(errInternal, getPos(),
- 		const_cast<char*>("Invalid transfer function in soft mask in ExtGState"));
- 	  delete funcs[0];
- 	  funcs[0] = NULL;
-@@ -809,11 +809,7 @@
- 	  blendingColorSpace = NULL;
- 	  isolated = knockout = gFalse;
- 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
--#ifdef POPPLER_NEW_COLOR_SPACE_API
- 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
--#else
--	    blendingColorSpace = GfxColorSpace::parse(&obj5);
--#endif
- 	  }
- 	  obj5.free();
- 	  if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
-@@ -840,15 +836,15 @@
- 	    delete funcs[0];
- 	  }
- 	} else {
--	  error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
-+	  error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
- 	}
- 	obj4.free();
-       } else {
--	error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
-+	error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
-       }
-       obj3.free();
-     } else if (!obj2.isNull()) {
--      error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState"));
-+      error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState"));
-     }
-   }
-   obj2.free();
-@@ -876,7 +872,7 @@
-   // check form type
-   dict->lookup(const_cast<char*>("FormType"), &obj1);
-   if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) {
--    error(getPos(), const_cast<char*>("Unknown form type"));
-+    error(errInternal, getPos(), const_cast<char*>("Unknown form type"));
-   }
-   obj1.free();
- 
-@@ -884,7 +880,7 @@
-   dict->lookup(const_cast<char*>("BBox"), &obj1);
-   if (!obj1.isArray()) {
-     obj1.free();
--    error(getPos(), const_cast<char*>("Bad form bounding box"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad form bounding box"));
-     return;
-   }
-   for (i = 0; i < 4; ++i) {
-@@ -1012,19 +1008,11 @@
- 
-   state->setFillPattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-   if (obj.isNull()) {
-     colorSpace = GfxColorSpace::parse(&args[0], NULL);
-   } else {
-     colorSpace = GfxColorSpace::parse(&obj, NULL);
-   }
--#else
--  if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0]);
--  } else {
--    colorSpace = GfxColorSpace::parse(&obj);
--  }
--#endif
-   obj.free();
-   if (colorSpace) {
-     state->setFillColorSpace(colorSpace);
-@@ -1032,7 +1020,7 @@
-     state->setFillColor(&color);
-     builder->updateStyle(state);
-   } else {
--    error(getPos(), const_cast<char*>("Bad color space (fill)"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad color space (fill)"));
-   }
- }
- 
-@@ -1043,19 +1031,11 @@
- 
-   state->setStrokePattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-   if (obj.isNull()) {
-     colorSpace = GfxColorSpace::parse(&args[0], NULL);
-   } else {
-     colorSpace = GfxColorSpace::parse(&obj, NULL);
-   }
--#else
--  if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0]);
--  } else {
--    colorSpace = GfxColorSpace::parse(&obj);
--  }
--#endif
-   obj.free();
-   if (colorSpace) {
-     state->setStrokeColorSpace(colorSpace);
-@@ -1063,7 +1043,7 @@
-     state->setStrokeColor(&color);
-     builder->updateStyle(state);
-   } else {
--    error(getPos(), const_cast<char*>("Bad color space (stroke)"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad color space (stroke)"));
-   }
- }
- 
-@@ -1072,7 +1052,7 @@
-   int i;
- 
-   if (numArgs != state->getFillColorSpace()->getNComps()) {
--    error(getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command"));
-+    error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command"));
-     return;
-   }
-   state->setFillPattern(NULL);
-@@ -1088,7 +1068,7 @@
-   int i;
- 
-   if (numArgs != state->getStrokeColorSpace()->getNComps()) {
--    error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command"));
-+    error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command"));
-     return;
-   }
-   state->setStrokePattern(NULL);
-@@ -1109,7 +1089,7 @@
-       if (!((GfxPatternColorSpace *)state->getFillColorSpace())->getUnder() ||
- 	  numArgs - 1 != ((GfxPatternColorSpace *)state->getFillColorSpace())
- 	                     ->getUnder()->getNComps()) {
--	error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
-+	error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
- 	return;
-       }
-       for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
-@@ -1120,23 +1100,15 @@
-       state->setFillColor(&color);
-       builder->updateStyle(state);
-     }
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-     if (args[numArgs-1].isName() &&
- 	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-       state->setFillPattern(pattern);
-       builder->updateStyle(state);
-     }
--#else
--    if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
--      state->setFillPattern(pattern);
--      builder->updateStyle(state);
--    }
--#endif
- 
-   } else {
-     if (numArgs != state->getFillColorSpace()->getNComps()) {
--      error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
-+      error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
-       return;
-     }
-     state->setFillPattern(NULL);
-@@ -1161,7 +1133,7 @@
- 	       ->getUnder() ||
- 	  numArgs - 1 != ((GfxPatternColorSpace *)state->getStrokeColorSpace())
- 	                     ->getUnder()->getNComps()) {
--	error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
-+	error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
- 	return;
-       }
-       for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
-@@ -1172,23 +1144,15 @@
-       state->setStrokeColor(&color);
-       builder->updateStyle(state);
-     }
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-     if (args[numArgs-1].isName() &&
- 	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-       state->setStrokePattern(pattern);
-       builder->updateStyle(state);
-     }
--#else
--    if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
--      state->setStrokePattern(pattern);
--      builder->updateStyle(state);
--    }
--#endif
- 
-   } else {
-     if (numArgs != state->getStrokeColorSpace()->getNComps()) {
--      error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
-+      error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
-       return;
-     }
-     state->setStrokePattern(NULL);
-@@ -1212,7 +1176,7 @@
- 
- void PdfParser::opLineTo(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in lineto"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in lineto"));
-     return;
-   }
-   state->lineTo(args[0].getNum(), args[1].getNum());
-@@ -1222,7 +1186,7 @@
-   double x1, y1, x2, y2, x3, y3;
- 
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in curveto"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in curveto"));
-     return;
-   }
-   x1 = args[0].getNum();
-@@ -1238,7 +1202,7 @@
-   double x1, y1, x2, y2, x3, y3;
- 
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in curveto1"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in curveto1"));
-     return;
-   }
-   x1 = state->getCurX();
-@@ -1254,7 +1218,7 @@
-   double x1, y1, x2, y2, x3, y3;
- 
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in curveto2"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in curveto2"));
-     return;
-   }
-   x1 = args[0].getNum();
-@@ -1282,7 +1246,7 @@
- 
- void PdfParser::opClosePath(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in closepath"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in closepath"));
-     return;
-   }
-   state->closePath();
-@@ -1298,7 +1262,7 @@
- 
- void PdfParser::opStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1314,7 +1278,7 @@
- 
- void PdfParser::opCloseStroke(Object * /*args[]*/, int /*numArgs*/) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in closepath/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in closepath/stroke"));
-     return;
-   }
-   state->closePath();
-@@ -1331,7 +1295,7 @@
- 
- void PdfParser::opFill(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in fill"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in fill"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1347,7 +1311,7 @@
- 
- void PdfParser::opEOFill(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in eofill"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in eofill"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1363,7 +1327,7 @@
- 
- void PdfParser::opFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in fill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in fill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1376,7 +1340,7 @@
- 
- void PdfParser::opCloseFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in closepath/fill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in closepath/fill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1388,7 +1352,7 @@
- 
- void PdfParser::opEOFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in eofill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in eofill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1399,7 +1363,7 @@
- 
- void PdfParser::opCloseEOFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in closepath/eofill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in closepath/eofill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1440,7 +1404,7 @@
-     doShadingPatternFillFallback((GfxShadingPattern *)pattern, gFalse, eoFill);
-     break;
-   default:
--    error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"),
-+    error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"),
- 	  pattern->getType());
-     break;
-   }
-@@ -1459,7 +1423,7 @@
-     doShadingPatternFillFallback((GfxShadingPattern *)pattern, gTrue, gFalse);
-     break;
-   default:
--    error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"),
-+    error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"),
- 	  pattern->getType());
-     break;
-   }
-@@ -1579,15 +1543,9 @@
-   double *matrix = NULL;
-   GBool savedState = gFalse;
- 
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-   if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
-     return;
-   }
--#else
--  if (!(shading = res->lookupShading(args[0].getName()))) {
--    return;
--  }
--#endif
- 
-   // save current graphics state
-   if (shading->getType() != 2 && shading->getType() != 3) {
-@@ -2156,7 +2114,7 @@
- 
- void PdfParser::opShowText(Object args[], int numArgs) {
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in show"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in show"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2170,7 +2128,7 @@
-   double tx, ty;
- 
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in move/show"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in move/show"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2188,7 +2146,7 @@
-   double tx, ty;
- 
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in move/set/show"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in move/set/show"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2211,7 +2169,7 @@
-   int i;
- 
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in show/space"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in show/space"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2236,7 +2194,7 @@
-     } else if (obj.isString()) {
-       doShowText(obj.getString());
-     } else {
--      error(getPos(), const_cast<char*>("Element of show/space array must be number or string"));
-+      error(errInternal, getPos(), const_cast<char*>("Element of show/space array must be number or string"));
-     }
-     obj.free();
-   }
-@@ -2334,7 +2292,7 @@
- 	if (charProc.isStream()) {
- 	  //parse(&charProc, gFalse); // TODO: parse into SVG font
- 	} else {
--	  error(getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry"));
-+	  error(errInternal, getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry"));
- 	}
- 	//out->endType3Char(state);
- 	if (resDict) {
-@@ -2410,7 +2368,7 @@
-     return;
-   }
-   if (!obj1.isStream()) {
--    error(getPos(), const_cast<char*>("XObject '%s' is wrong type"), name);
-+    error(errInternal, getPos(), const_cast<char*>("XObject '%s' is wrong type"), name);
-     obj1.free();
-     return;
-   }
-@@ -2426,9 +2384,9 @@
- /*    out->psXObject(obj1.getStream(),
-     		   obj3.isStream() ? obj3.getStream() : (Stream *)NULL);*/
-   } else if (obj2.isName()) {
--    error(getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName());
-+    error(errInternal, getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName());
-   } else {
--    error(getPos(), const_cast<char*>("XObject subtype is missing or wrong type"));
-+    error(errInternal, getPos(), const_cast<char*>("XObject subtype is missing or wrong type"));
-   }
-   obj2.free();
-   obj1.free();
-@@ -2559,11 +2517,7 @@
-       }
-     }
-     if (!obj1.isNull()) {
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-       colorSpace = GfxColorSpace::parse(&obj1, NULL);
--#else
--      colorSpace = GfxColorSpace::parse(&obj1);
--#endif
-     } else if (csMode == streamCSDeviceGray) {
-       colorSpace = new GfxDeviceGrayColorSpace();
-     } else if (csMode == streamCSDeviceRGB) {
-@@ -2648,11 +2602,7 @@
- 	  obj2.free();
- 	}
-       }
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-       maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
--#else
--      maskColorSpace = GfxColorSpace::parse(&obj1);
--#endif
-       obj1.free();
-       if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
- 	goto err1;
-@@ -2758,7 +2708,7 @@
-  err2:
-   obj1.free();
-  err1:
--  error(getPos(), const_cast<char*>("Bad image parameters"));
-+  error(errInternal, getPos(), const_cast<char*>("Bad image parameters"));
- }
- 
- void PdfParser::doForm(Object *str) {
-@@ -2783,7 +2733,7 @@
-   // check form type
-   dict->lookup(const_cast<char*>("FormType"), &obj1);
-   if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) {
--    error(getPos(), const_cast<char*>("Unknown form type"));
-+    error(errInternal, getPos(), const_cast<char*>("Unknown form type"));
-   }
-   obj1.free();
- 
-@@ -2791,7 +2741,7 @@
-   dict->lookup(const_cast<char*>("BBox"), &bboxObj);
-   if (!bboxObj.isArray()) {
-     bboxObj.free();
--    error(getPos(), const_cast<char*>("Bad form bounding box"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad form bounding box"));
-     return;
-   }
-   for (i = 0; i < 4; ++i) {
-@@ -2827,11 +2777,7 @@
-     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
-       transpGroup = gTrue;
-       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
--#ifdef POPPLER_NEW_COLOR_SPACE_API
- 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
--#else
--	blendingColorSpace = GfxColorSpace::parse(&obj3);
--#endif
-       }
-       obj3.free();
-       if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {
-@@ -2990,7 +2936,7 @@
-   parser->getObj(&obj);
-   while (!obj.isCmd(const_cast<char*>("ID")) && !obj.isEOF()) {
-     if (!obj.isName()) {
--      error(getPos(), const_cast<char*>("Inline image dictionary key must be a name object"));
-+      error(errInternal, getPos(), const_cast<char*>("Inline image dictionary key must be a name object"));
-       obj.free();
-     } else {
-       key = copyString(obj.getName());
-@@ -3005,7 +2951,7 @@
-     parser->getObj(&obj);
-   }
-   if (obj.isEOF()) {
--    error(getPos(), const_cast<char*>("End of file in inline image"));
-+    error(errInternal, getPos(), const_cast<char*>("End of file in inline image"));
-     obj.free();
-     dict.free();
-     return NULL;
-@@ -3020,11 +2966,11 @@
- }
- 
- void PdfParser::opImageData(Object args[], int numArgs) {
--  error(getPos(), const_cast<char*>("Internal: got 'ID' operator"));
-+  error(errInternal, getPos(), const_cast<char*>("Internal: got 'ID' operator"));
- }
- 
- void PdfParser::opEndImage(Object args[], int numArgs) {
--  error(getPos(), const_cast<char*>("Internal: got 'EI' operator"));
-+  error(errInternal, getPos(), const_cast<char*>("Internal: got 'EI' operator"));
- }
- 
- //------------------------------------------------------------------------
-diff -Naur old/src/extension/internal/pdfinput/svg-builder.cpp new/src/extension/internal/pdfinput/svg-builder.cpp
---- old/src/extension/internal/pdfinput/svg-builder.cpp	2011-07-08 20:25:09.468790000 +0200
-+++ new/src/extension/internal/pdfinput/svg-builder.cpp	2012-05-13 20:45:22.303804308 +0200
-@@ -961,9 +961,7 @@
-     _font_style = sp_repr_css_attr_new();
-     GfxFont *font = state->getFont();
-     // Store original name
--    if (font->getOrigName()) {
--        _font_specification = font->getOrigName()->getCString();
--    } else if (font->getName()) {
-+    if (font->getName()) {
-         _font_specification = font->getName()->getCString();
-     } else {
-         _font_specification = (char*) "Arial";
diff --git a/extra/intel-tbb/PKGBUILD b/extra/intel-tbb/PKGBUILD
index eeb5c309b..0d81df2b6 100644
--- a/extra/intel-tbb/PKGBUILD
+++ b/extra/intel-tbb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 172195 2012-12-02 04:41:05Z stephane $
+# $Id: PKGBUILD 179910 2013-03-11 19:50:39Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Denis Martinez <deuns.martinez AT gmail.com>
 
 pkgname=intel-tbb
-pkgver=4.1_20121003
+pkgver=4.1_20130116
 pkgrel=1
 pkgdesc='High level abstract threading library'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url='http://www.threadingbuildingblocks.org/'
 license=('GPL')
 depends=('gcc-libs')
 source=("http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${pkgver/\./}oss_src.tgz")
-sha1sums=('072333068fa278635582846eaaa22d51c0100e09')
+sha1sums=('fd7ea56612f145a1f9b3d961a424e9d553bab527')
 
 build() {
   cd "${srcdir}"/tbb${pkgver/\./}oss
diff --git a/extra/iptraf-ng/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch b/extra/iptraf-ng/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch
new file mode 100644
index 000000000..ed3c620e6
--- /dev/null
+++ b/extra/iptraf-ng/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch
@@ -0,0 +1,127 @@
+From 72512af1a3f1d55fff73cdfe7b63d9cfe8cc37ab Mon Sep 17 00:00:00 2001
+From: Nikola Pajkovsky <npajkovs@redhat.com>
+Date: Wed, 23 May 2012 16:32:27 +0200
+Subject: [PATCH] token-ring: kernel v3.5 kill off token-ring support
+
+Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
+---
+ src/hostmon.c          | 10 ----------
+ src/iptraf-ng-compat.h |  1 -
+ src/othptab.c          |  6 ------
+ src/packet.c           | 27 ---------------------------
+ src/tcptable.c         |  4 ----
+ 5 files changed, 48 deletions(-)
+
+diff --git a/src/hostmon.c b/src/hostmon.c
+index 40a2b95..72b91f8 100644
+--- a/src/hostmon.c
++++ b/src/hostmon.c
+@@ -1004,16 +1004,6 @@ void hostmon(const struct OPTIONS *options, time_t facilitytime, char *ifptr,
+ 				       FDDI_K_ALEN);
+ 				list = flist;
+ 				break; }
+-			case ARPHRD_IEEE802:
+-			case ARPHRD_IEEE802_TR: {
+-				struct trh_hdr *hdr_trh =
+-					(struct trh_hdr *)pkt.pkt_buf;
+-				memcpy(scratch_saddr, hdr_trh->saddr,
+-				       TR_ALEN);
+-				memcpy(scratch_daddr, hdr_trh->daddr,
+-				       TR_ALEN);
+-				list = flist;
+-				break; }
+ 			default:
+ 				/* unknown link protocol */
+ 				continue;
+diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h
+index d5aee4a..2d9da96 100644
+--- a/src/iptraf-ng-compat.h
++++ b/src/iptraf-ng-compat.h
+@@ -39,7 +39,6 @@
+ #include <linux/if_ether.h>
+ #include <linux/if_packet.h>
+ #include <linux/if_fddi.h>
+-#include <linux/if_tr.h>
+ #include <linux/types.h>
+ #include <linux/isdn.h>
+ 
+diff --git a/src/othptab.c b/src/othptab.c
+index d12cdfd..1181eb1 100644
+--- a/src/othptab.c
++++ b/src/othptab.c
+@@ -193,12 +193,6 @@ struct othptabent *add_othp_entry(struct othptable *table, struct pkt_hdr *pkt,
+ 					      saddr), new_entry->smacaddr);
+ 			convmacaddr((char *) (((struct fddihdr *) packet)->
+ 					      daddr), new_entry->dmacaddr);
+-		} else if ((pkt->pkt_hatype == ARPHRD_IEEE802)
+-			   || (pkt->pkt_hatype == ARPHRD_IEEE802_TR)) {
+-			convmacaddr((char *) (((struct trh_hdr *) packet)->
+-					      saddr), new_entry->smacaddr);
+-			convmacaddr((char *) (((struct trh_hdr *) packet)->
+-					      daddr), new_entry->dmacaddr);
+ 		}
+ 	}
+ 
+diff --git a/src/packet.c b/src/packet.c
+index a43a27a..f3e4304 100644
+--- a/src/packet.c
++++ b/src/packet.c
+@@ -51,24 +51,6 @@ static int in_cksum(u_short * addr, int len)
+ 	return (u_short) (~sum);
+ }
+ 
+-static unsigned int get_tr_ip_offset(char *pkt)
+-{
+-	struct trh_hdr *trh;
+-	unsigned int riflen = 0;
+-
+-	trh = (struct trh_hdr *) pkt;
+-
+-	/*
+-	 * Check if this packet has TR routing information and get
+-	 * its length.
+-	 */
+-	if (trh->saddr[0] & TR_RII)
+-		riflen = (ntohs(trh->rcf) & TR_RCF_LEN_MASK) >> 8;
+-
+-	return sizeof(struct trh_hdr) - TR_MAXRIFLEN + riflen +
+-	    sizeof(struct trllc);
+-}
+-
+ static int packet_adjust(struct pkt_hdr *pkt)
+ {
+ 	int retval = 0;
+@@ -109,15 +91,6 @@ static int packet_adjust(struct pkt_hdr *pkt)
+ 		pkt->pkt_payload += sizeof(struct fddihdr);
+ 		pkt->pkt_len -= sizeof(struct fddihdr);
+ 		break;
+-	case ARPHRD_IEEE802_TR:
+-	case ARPHRD_IEEE802:
+-		pkt->pkt_payload = pkt->pkt_buf;
+-		/* Token Ring patch supplied by Tomas Dvorak */
+-		/* Get the start of the IP packet from the Token Ring frame. */
+-		unsigned int dataoffset = get_tr_ip_offset(pkt->pkt_payload);
+-		pkt->pkt_payload += dataoffset;
+-		pkt->pkt_len -= dataoffset;
+-		break;
+ 	default:
+ 		/* return a NULL packet to signal an unrecognized link */
+ 		/* protocol to the caller.  Hopefully, this switch statement */
+diff --git a/src/tcptable.c b/src/tcptable.c
+index 56c4780..b0e5ccc 100644
+--- a/src/tcptable.c
++++ b/src/tcptable.c
+@@ -620,10 +620,6 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
+ 		} else if (linkproto == ARPHRD_FDDI) {
+ 			convmacaddr((char *) (((struct fddihdr *) packet)->
+ 					      saddr), newmacaddr);
+-		} else if ((linkproto == ARPHRD_IEEE802)
+-			   || (linkproto == ARPHRD_IEEE802_TR)) {
+-			convmacaddr((char *) (((struct trh_hdr *) packet)->
+-					      saddr), newmacaddr);
+ 		}
+ 
+ 		if (tableentry->smacaddr[0] != '\0') {
+-- 
+1.8.1.4
+
diff --git a/extra/iptraf-ng/PKGBUILD b/extra/iptraf-ng/PKGBUILD
index 98d37514e..7274afa72 100644
--- a/extra/iptraf-ng/PKGBUILD
+++ b/extra/iptraf-ng/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=iptraf-ng
 pkgver=1.1.3.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A console-based network monitoring utility (a fork of original iptraf)"
 url="https://fedorahosted.org/iptraf-ng/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,11 +12,14 @@ depends=('ncurses')
 license=('GPL2')
 replaces=('iptraf')
 options=('!libtool')
-source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('1a2c02944b0b012d6a3de96207610fa2')
+source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz
+	0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch)
+md5sums=('1a2c02944b0b012d6a3de96207610fa2'
+         'd5eab1e094b93f0e3a256cf9ccfaa9c3')
 
 build() {
   cd "$pkgname-$pkgver"
+  patch -p1 -i "$srcdir/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --sbindir=/usr/sbin
   make CFLAGS="$CFLAGS -std=gnu99"
diff --git a/extra/irqbalance/irqbalance-2011-08-09.patch b/extra/irqbalance/irqbalance-2011-08-09.patch
deleted file mode 100644
index fcdb8bdbf..000000000
--- a/extra/irqbalance/irqbalance-2011-08-09.patch
+++ /dev/null
@@ -1,1584 +0,0 @@
-diff --git a/ChangeLog b/ChangeLog
-deleted file mode 100644
-index f5e9428..0000000
---- a/ChangeLog
-+++ /dev/null
-@@ -1,3 +0,0 @@
--This is all tracked in the SVN repo.  This file is just here to keep the
--autotools from complaining
--
-diff --git a/Makefile.am b/Makefile.am
-index 9847232..188e34f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -22,17 +22,17 @@
- 
- AUTOMAKE_OPTIONS = no-dependencies
- ACLOCAL_AMFLAGS = -I m4
--EXTRA_DIST = README INSTALL COPYING autogen.sh m4/cap-ng.m4 misc/irqbalance.service
-- 
-+EXTRA_DIST = INSTALL COPYING autogen.sh misc/irqbalance.service
-+
- INCLUDES = -I${top_srcdir} 
--LIBS = $(CAPNG_LDADD) $(GLIB_LIBS) @LIBS@
--AM_CFLAGS = $(GLIB_CFLAGS)
-+AM_CFLAGS = $(LIBCAP_NG_CFLAGS) $(GLIB_CFLAGS)
- AM_CPPFLAGS = -W -Wall -Wshadow -Wformat -Wundef -D_GNU_SOURCE
- noinst_HEADERS = bitmap.h constants.h cpumask.h irqbalance.h non-atomic.h \
- 	types.h
- sbin_PROGRAMS = irqbalance
- irqbalance_SOURCES = activate.c bitmap.c classify.c cputree.c irqbalance.c \
--	irqlist.c numa.c placement.c powermode.c procinterrupts.c
-+	irqlist.c numa.c placement.c procinterrupts.c
-+irqbalance_LDADD = $(LIBCAP_NG_LIBS) $(GLIB_LIBS)
- dist_man_MANS = irqbalance.1
- 
- CONFIG_CLEAN_FILES = debug*.list config/*
-@@ -40,3 +40,6 @@ clean-generic:
- 	rm -rf autom4te*.cache 
- 	rm -f *.rej *.orig *~
- 
-+if LOCAL_GLIB
-+SUBDIRS = glib-local
-+endif
-diff --git a/NEWS b/NEWS
-deleted file mode 100644
-index 7cc0277..0000000
---- a/NEWS
-+++ /dev/null
-@@ -1 +0,0 @@
--No news currently
-diff --git a/README b/README
-deleted file mode 100644
-index e69de29..0000000
-diff --git a/activate.c b/activate.c
-index 292c44a..02fc8dc 100644
---- a/activate.c
-+++ b/activate.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-@@ -31,34 +32,63 @@
- 
- #include "irqbalance.h"
- 
-+static int check_affinity(struct irq_info *info, cpumask_t applied_mask)
-+{
-+	cpumask_t current_mask;
-+	char buf[PATH_MAX];
-+	char *line = NULL;
-+	size_t size = 0;
-+	FILE *file;
-+
-+	sprintf(buf, "/proc/irq/%i/smp_affinity", info->irq);
-+	file = fopen(buf, "r");
-+	if (!file)
-+		return 1;
-+	if (getline(&line, &size, file)==0) {
-+		free(line);
-+		fclose(file);
-+		return 1;
-+	}
-+	cpumask_parse_user(line, strlen(line), current_mask);
-+	fclose(file);
-+	free(line);
-+
-+	return cpus_equal(applied_mask, current_mask);
-+}
- 
- static void activate_mapping(struct irq_info *info, void *data __attribute__((unused)))
- {
- 	char buf[PATH_MAX];
- 	FILE *file;
- 	cpumask_t applied_mask;
-+	int valid_mask = 0;
-+
-+	if ((hint_policy == HINT_POLICY_EXACT) &&
-+	    (!cpus_empty(info->affinity_hint))) {
-+		applied_mask = info->affinity_hint;
-+		valid_mask = 1;
-+	} else if (info->assigned_obj) {
-+		applied_mask = info->assigned_obj->mask;
-+		valid_mask = 1;
-+		if ((hint_policy == HINT_POLICY_SUBSET) &&
-+		    (!cpus_empty(info->affinity_hint)))
-+			cpus_and(applied_mask, applied_mask, info->affinity_hint);
-+	}
- 
- 	/*
-  	 * only activate mappings for irqs that have moved
-  	 */
--	if (!info->moved)
-+	if (!info->moved && (!valid_mask || check_affinity(info, applied_mask)))
- 		return;
- 
- 	if (!info->assigned_obj)
- 		return;
- 
--
- 	sprintf(buf, "/proc/irq/%i/smp_affinity", info->irq);
- 	file = fopen(buf, "w");
- 	if (!file)
- 		return;
- 
--	if ((hint_policy == HINT_POLICY_EXACT) &&
--	    (!cpus_empty(info->affinity_hint)))
--		applied_mask = info->affinity_hint;
--	else
--		applied_mask = info->assigned_obj->mask;
--
- 	cpumask_scnprintf(buf, PATH_MAX, applied_mask);
- 	fprintf(file, "%s", buf);
- 	fclose(file);
-diff --git a/autogen.sh b/autogen.sh
-index 5ad9f14..b792e8b 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -1,4 +1,5 @@
- #! /bin/sh
- set -x -e
-+mkdir -p m4
- # --no-recursive is available only in recent autoconf versions
- autoreconf -fv --install
-diff --git a/classify.c b/classify.c
-index 124dab0..05b3bfb 100644
---- a/classify.c
-+++ b/classify.c
-@@ -52,6 +52,8 @@ static short class_codes[MAX_CLASS] = {
- };
- 
- static GList *interrupts_db;
-+static GList *new_irq_list;
-+static GList *banned_irqs;
- 
- #define SYSDEV_DIR "/sys/bus/pci/devices"
- 
-@@ -63,6 +65,30 @@ static gint compare_ints(gconstpointer a, gconstpointer b)
- 	return ai->irq - bi->irq;
- }
- 
-+void add_banned_irq(int irq)
-+{
-+	struct irq_info find, *new;
-+	GList *entry;
-+
-+	find.irq = irq;
-+	entry = g_list_find_custom(banned_irqs, &find, compare_ints);
-+	if (entry)
-+		return;
-+
-+	new = calloc(sizeof(struct irq_info), 1);
-+	if (!new) {
-+		if (debug_mode)
-+			printf("No memory to ban irq %d\n", irq);
-+		return;
-+	}
-+
-+	new->irq = irq;
-+
-+	banned_irqs = g_list_append(banned_irqs, new);
-+	return;
-+}
-+
-+			
- /*
-  * Inserts an irq_info struct into the intterupts_db list
-  * devpath points to the device directory in sysfs for the 
-@@ -90,6 +116,13 @@ static struct irq_info *add_one_irq_to_db(const char *devpath, int irq)
- 		return NULL;
- 	}
- 
-+	entry = g_list_find_custom(banned_irqs, &find, compare_ints);
-+	if (entry) {
-+		if (debug_mode)
-+			printf("SKIPPING BANNED IRQ %d\n", irq);
-+		return NULL;
-+	}
-+
- 	new = calloc(sizeof(struct irq_info), 1);
- 	if (!new)
- 		return NULL;
-@@ -175,6 +208,43 @@ out:
- 	return new;
- }
- 
-+static int check_for_irq_ban(char *path, int irq)
-+{
-+	char *cmd;
-+	int rc;
-+
-+	if (!banscript)
-+		return 0;
-+
-+	cmd = alloca(strlen(path)+strlen(banscript)+32);
-+	if (!cmd)
-+		return 0;
-+	
-+	sprintf(cmd, "%s %s %d",banscript, path, irq);
-+	rc = system(cmd);
-+
-+	/*
-+ 	 * The system command itself failed
-+ 	 */
-+	if (rc == -1) {
-+		if (debug_mode)
-+			printf("%s failed, please check the --banscript option\n", cmd);
-+		else
-+			syslog(LOG_INFO, "%s failed, please check the --banscript option\n", cmd);
-+		return 0;
-+	}
-+
-+	if (WEXITSTATUS(rc)) {
-+		if (debug_mode)
-+			printf("irq %d is baned by %s\n", irq, banscript);
-+		else
-+			syslog(LOG_INFO, "irq %d is baned by %s\n", irq, banscript);
-+		return 1;
-+	}
-+	return 0;
-+
-+}
-+
- /*
-  * Figures out which interrupt(s) relate to the device we're looking at in dirname
-  */
-@@ -199,6 +269,10 @@ static void build_one_dev_entry(const char *dirname)
- 			irqnum = strtol(entry->d_name, NULL, 10);
- 			if (irqnum) {
- 				sprintf(path, "%s/%s", SYSDEV_DIR, dirname);
-+				if (check_for_irq_ban(path, irqnum)) {
-+					add_banned_irq(irqnum);
-+					continue;
-+				}
- 				new = add_one_irq_to_db(path, irqnum);
- 				if (!new)
- 					continue;
-@@ -221,6 +295,11 @@ static void build_one_dev_entry(const char *dirname)
- 	 */
- 	if (irqnum) {
- 		sprintf(path, "%s/%s", SYSDEV_DIR, dirname);
-+		if (check_for_irq_ban(path, irqnum)) {
-+			add_banned_irq(irqnum);
-+			goto done;
-+		}
-+
- 		new = add_one_irq_to_db(path, irqnum);
- 		if (!new)
- 			goto done;
-@@ -248,6 +327,8 @@ void rebuild_irq_db(void)
- {
- 	DIR *devdir = opendir(SYSDEV_DIR);
- 	struct dirent *entry;
-+	GList *gentry;
-+	struct irq_info *ninfo, *iinfo;
- 
- 	free_irq_db();
- 		
-@@ -263,22 +344,46 @@ void rebuild_irq_db(void)
- 	build_one_dev_entry(entry->d_name);
- 
- 	} while (entry != NULL);
-+
- 	closedir(devdir);
-+
-+	if (!new_irq_list)
-+		return;
-+	gentry = g_list_first(new_irq_list);	
-+	while(gentry) {
-+		ninfo = gentry->data;
-+		iinfo = get_irq_info(ninfo->irq);
-+		new_irq_list = g_list_remove(gentry, ninfo);
-+		if (!iinfo) {
-+			if (debug_mode)
-+				printf("Adding untracked IRQ %d to database\n", ninfo->irq);
-+			interrupts_db = g_list_append(interrupts_db, ninfo);
-+		} else 
-+			free(ninfo);
-+
-+		gentry = g_list_first(new_irq_list);
-+	}
-+	g_list_free(new_irq_list);
-+	new_irq_list = NULL;
-+		
- }
- 
--struct irq_info *add_misc_irq(int irq)
-+struct irq_info *add_new_irq(int irq)
- {
--	struct irq_info *new;
-+	struct irq_info *new, *nnew;
- 
- 	new = calloc(sizeof(struct irq_info), 1);
--	if (!new)
-+	nnew = calloc(sizeof(struct irq_info), 1);
-+	if (!new || !nnew)
- 		return NULL;
- 
- 	new->irq = irq;
- 	new->type = IRQ_TYPE_LEGACY;
- 	new->class = IRQ_OTHER;
- 	new->numa_node = get_numa_node(-1);
-+	memcpy(nnew, new, sizeof(struct irq_info));
- 	interrupts_db = g_list_append(interrupts_db, new);
-+	new_irq_list = g_list_append(new_irq_list, nnew);
- 	return new;
- }
- 
-@@ -307,7 +412,7 @@ struct irq_info *get_irq_info(int irq)
- void migrate_irq(GList **from, GList **to, struct irq_info *info)
- {
- 	GList *entry;
--	struct irq_info find, *tmp;;
-+	struct irq_info find, *tmp;
- 
- 	find.irq = info->irq;
- 	entry = g_list_find_custom(*from, &find, compare_ints);
-@@ -325,18 +430,9 @@ static gint sort_irqs(gconstpointer A, gconstpointer B)
-         a = (struct irq_info*)A;
-         b = (struct irq_info*)B;
- 
--	if (a->class < b->class)
--		return 1;
--	if (a->class > b->class)
--		return -1;
--	if (a->load < b->load)
--		return 1;
--	if (a->load > b->load)
--		return -1;
--	if (a<b)
-+	if (a->class < b->class || a->load < b->load || a < b)
- 		return 1;
-         return -1;
--
- }
- 
- void sort_irq_list(GList **list)
-diff --git a/configure.ac b/configure.ac
-index eed55ba..1230d66 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,49 +1,12 @@
--dnl
--define([AC_INIT_NOTICE],
--[### Generated automatically using autoconf version] AC_ACVERSION [
--### Copyright 2009 Steve Grubb <sgrubb@redhat.com>
--###
--### Permission is hereby granted, free of charge, to any person obtaining a
--### copy of this software and associated documentation files (the "Software"),
--### to deal in the Software without restriction, including without limitation
--### the rights to use, copy, modify, merge, publish, distribute, sublicense,
--### and/or sell copies of the Software, and to permit persons to whom the
--### Software is furnished to do so, subject to the following conditions:
--###
--### The above copyright notice and this permission notice shall be included
--### in all copies or substantial portions of the Software.
--###
--### THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--### IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--### FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
--### THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
--### OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
--### ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
--### OTHER DEALINGS IN THE SOFTWARE.
--###
--### For usage, run `./configure --help'
--### For more detailed information on installation, read the file `INSTALL'.
--###
--### If configuration succeeds, status is in the file `config.status'.
--### A log of configuration tests is in `config.log'.
--])
--
--AC_REVISION($Revision: 1.3 $)dnl
- AC_INIT(irqbalance,1.0.3)
- AC_PREREQ(2.12)dnl
- AM_CONFIG_HEADER(config.h)
- 
--echo Configuring irqbalance $VERSION
--
- AC_CONFIG_MACRO_DIR([m4])
--AC_CANONICAL_TARGET
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE([foreign])
- AM_PROG_LIBTOOL
- AC_SUBST(LIBTOOL_DEPS)
- 
--AC_MSG_NOTICE()
--AC_MSG_NOTICE([Checking for programs])
--
- AC_PROG_CC
- AC_PROG_INSTALL
- AC_PROG_AWK
-@@ -55,9 +18,6 @@ AS_IF([test "$enable_numa" = "no"],[
-   ac_cv_lib_numa_numa_available=no
- ])
- 
--AC_MSG_NOTICE
--AC_MSG_NOTICE([echo Checking for header files])
--
- AC_HEADER_STDC
- AC_CHECK_HEADERS([numa.h])
- 
-@@ -70,10 +30,57 @@ AC_C_CONST
- AC_C_INLINE
- AM_PROG_CC_C_O
- 
--PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])
--LIBCAP_NG_PATH
-+AC_ARG_WITH([glib2],
-+  [AS_HELP_STRING([--without-glib2],
-+    [Don't use system glib2 library. Use local implementation instead.])],
-+  [],
-+  [with_glib2=check])
-+
-+local_glib2=
-+AS_IF(
-+  [test "x$with_glib2" = xyes],
-+  [PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])],
-+  
-+  [test "x$with_glib2" = xno],
-+  [local_glib2="yes"],
-+
-+  [PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28], [], [local_glib2="yes"])]
-+)
-+
-+AS_IF(
-+  [test "x$local_glib2" = xyes],
-+  [
-+  GLIB_CFLAGS=-I./glib-local
-+  GLIB_LIBS=glib-local/libglib.a
-+  AC_SUBST(GLIB_CFLAGS)
-+  AC_SUBST(GLIB_LIBS)
-+  AC_MSG_WARN(Using locale implementation of GList functions)
-+  ]
-+)
-+
-+AM_CONDITIONAL([LOCAL_GLIB], [test "x$local_glib2" = "xyes"])
-+
-+AC_ARG_WITH([libcap-ng],
-+  AS_HELP_STRING([libcap-ng], [Add libcap-ng-support @<:@default=auto@:>@]))
-+
-+AS_IF(
-+  [test "x$libcap_ng" != "xno"],
-+  [
-+  PKG_CHECK_MODULES([LIBCAP_NG], [libcap-ng],
-+    [AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])],
-+    [
-+     AS_IF(
-+       [test "x$libcap_ng" = "xyes"],
-+       [
-+       AC_MSG_ERROR([libcap-ng not found])
-+       ]
-+       )
-+    ]
-+  )
-+  ]
-+)
- 
--AC_OUTPUT(Makefile)
-+AC_OUTPUT(Makefile glib-local/Makefile)
- 
- AC_MSG_NOTICE()
- AC_MSG_NOTICE([irqbalance Version:     $VERSION])
-diff --git a/cputree.c b/cputree.c
-index af4fd3a..9568967 100644
---- a/cputree.c
-+++ b/cputree.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-diff --git a/glib-local/Makefile.am b/glib-local/Makefile.am
-new file mode 100644
-index 0000000..336b56e
---- /dev/null
-+++ b/glib-local/Makefile.am
-@@ -0,0 +1,8 @@
-+## Process this file with automake to produce Makefile.in
-+noinst_LIBRARIES = libglib.a
-+
-+libglib_a_SOURCES = glist.c
-+
-+libglib_a_CFLAGS = @GLIB_CFLAGS@
-+
-+noinst_HEADERS = glib.h glist.h
-diff --git a/glib-local/glib.h b/glib-local/glib.h
-new file mode 100644
-index 0000000..5874892
---- /dev/null
-+++ b/glib-local/glib.h
-@@ -0,0 +1 @@
-+#include <glist.h>
-diff --git a/glib-local/glist.c b/glib-local/glist.c
-new file mode 100644
-index 0000000..6fa1761
---- /dev/null
-+++ b/glib-local/glist.c
-@@ -0,0 +1,381 @@
-+#include <stdlib.h>
-+
-+#include "glist.h"
-+
-+/**
-+ * g_list_free: 
-+ * @list: a #GList
-+ *
-+ * Frees all of the memory used by a #GList.
-+ * The freed elements are returned to the slice allocator.
-+ *
-+ * <note><para>
-+ * If list elements contain dynamically-allocated memory, 
-+ * you should either use g_list_free_full() or free them manually
-+ * first.
-+ * </para></note>
-+ */
-+void
-+g_list_free (GList *list)
-+{
-+	GList *l = list;
-+
-+	while(l) {
-+		GList *tmp = l->next;
-+		free(l);
-+		l = tmp;
-+	}
-+}
-+
-+/**
-+ * g_list_last:
-+ * @list: a #GList
-+ *
-+ * Gets the last element in a #GList.
-+ *
-+ * Returns: the last element in the #GList, 
-+ *     or %NULL if the #GList has no elements
-+ */
-+GList*
-+g_list_last (GList *list)
-+{
-+  if (list)
-+    {
-+      while (list->next)
-+	list = list->next;
-+    }
-+  
-+  return list;
-+}
-+
-+/**
-+ * g_list_append:
-+ * @list: a pointer to a #GList
-+ * @data: the data for the new element
-+ *
-+ * Adds a new element on to the end of the list.
-+ *
-+ * <note><para>
-+ * The return value is the new start of the list, which 
-+ * may have changed, so make sure you store the new value.
-+ * </para></note>
-+ *
-+ * <note><para>
-+ * Note that g_list_append() has to traverse the entire list 
-+ * to find the end, which is inefficient when adding multiple 
-+ * elements. A common idiom to avoid the inefficiency is to prepend 
-+ * the elements and reverse the list when all elements have been added.
-+ * </para></note>
-+ *
-+ * |[
-+ * /&ast; Notice that these are initialized to the empty list. &ast;/
-+ * GList *list = NULL, *number_list = NULL;
-+ *
-+ * /&ast; This is a list of strings. &ast;/
-+ * list = g_list_append (list, "first");
-+ * list = g_list_append (list, "second");
-+ * 
-+ * /&ast; This is a list of integers. &ast;/
-+ * number_list = g_list_append (number_list, GINT_TO_POINTER (27));
-+ * number_list = g_list_append (number_list, GINT_TO_POINTER (14));
-+ * ]|
-+ *
-+ * Returns: the new start of the #GList
-+ */
-+GList*
-+g_list_append (GList	*list,
-+	       gpointer	 data)
-+{
-+  GList *new_list;
-+  GList *last;
-+  
-+  new_list = malloc(sizeof(*new_list));
-+  new_list->data = data;
-+  new_list->next = NULL;
-+  
-+  if (list)
-+    {
-+      last = g_list_last (list);
-+      /* g_assert (last != NULL); */
-+      last->next = new_list;
-+      new_list->prev = last;
-+
-+      return list;
-+    }
-+  else
-+    {
-+      new_list->prev = NULL;
-+      return new_list;
-+    }
-+}
-+
-+static inline GList*
-+_g_list_remove_link (GList *list,
-+		     GList *link)
-+{
-+  if (link)
-+    {
-+      if (link->prev)
-+	link->prev->next = link->next;
-+      if (link->next)
-+	link->next->prev = link->prev;
-+      
-+      if (link == list)
-+	list = list->next;
-+      
-+      link->next = NULL;
-+      link->prev = NULL;
-+    }
-+  
-+  return list;
-+}
-+
-+/**
-+ * g_list_delete_link:
-+ * @list: a #GList
-+ * @link_: node to delete from @list
-+ *
-+ * Removes the node link_ from the list and frees it. 
-+ * Compare this to g_list_remove_link() which removes the node 
-+ * without freeing it.
-+ *
-+ * Returns: the new head of @list
-+ */
-+GList*
-+g_list_delete_link (GList *list,
-+		    GList *link_)
-+{
-+  list = _g_list_remove_link (list, link_);
-+  free (link_);
-+
-+  return list;
-+}
-+
-+/**
-+ * g_list_first:
-+ * @list: a #GList
-+ *
-+ * Gets the first element in a #GList.
-+ *
-+ * Returns: the first element in the #GList, 
-+ *     or %NULL if the #GList has no elements
-+ */
-+GList*
-+g_list_first (GList *list)
-+{
-+  if (list)
-+    {
-+      while (list->prev)
-+	list = list->prev;
-+    }
-+  
-+  return list;
-+}
-+
-+static GList *
-+g_list_sort_merge (GList     *l1, 
-+		   GList     *l2,
-+		   GFunc     compare_func,
-+		   gpointer  user_data)
-+{
-+  GList list, *l, *lprev;
-+  gint cmp;
-+
-+  l = &list; 
-+  lprev = NULL;
-+
-+  while (l1 && l2)
-+    {
-+      cmp = ((GCompareDataFunc) compare_func) (l1->data, l2->data, user_data);
-+
-+      if (cmp <= 0)
-+        {
-+	  l->next = l1;
-+	  l1 = l1->next;
-+        } 
-+      else 
-+	{
-+	  l->next = l2;
-+	  l2 = l2->next;
-+        }
-+      l = l->next;
-+      l->prev = lprev; 
-+      lprev = l;
-+    }
-+  l->next = l1 ? l1 : l2;
-+  l->next->prev = l;
-+
-+  return list.next;
-+}
-+
-+static GList* 
-+g_list_sort_real (GList    *list,
-+		  GFunc     compare_func,
-+		  gpointer  user_data)
-+{
-+  GList *l1, *l2;
-+  
-+  if (!list) 
-+    return NULL;
-+  if (!list->next) 
-+    return list;
-+  
-+  l1 = list; 
-+  l2 = list->next;
-+
-+  while ((l2 = l2->next) != NULL)
-+    {
-+      if ((l2 = l2->next) == NULL) 
-+	break;
-+      l1 = l1->next;
-+    }
-+  l2 = l1->next; 
-+  l1->next = NULL; 
-+
-+  return g_list_sort_merge (g_list_sort_real (list, compare_func, user_data),
-+			    g_list_sort_real (l2, compare_func, user_data),
-+			    compare_func,
-+			    user_data);
-+}
-+
-+/**
-+ * g_list_sort:
-+ * @list: a #GList
-+ * @compare_func: the comparison function used to sort the #GList.
-+ *     This function is passed the data from 2 elements of the #GList 
-+ *     and should return 0 if they are equal, a negative value if the 
-+ *     first element comes before the second, or a positive value if 
-+ *     the first element comes after the second.
-+ *
-+ * Sorts a #GList using the given comparison function.
-+ *
-+ * Returns: the start of the sorted #GList
-+ */
-+/**
-+ * GCompareFunc:
-+ * @a: a value.
-+ * @b: a value to compare with.
-+ * @Returns: negative value if @a &lt; @b; zero if @a = @b; positive
-+ *           value if @a > @b.
-+ *
-+ * Specifies the type of a comparison function used to compare two
-+ * values.  The function should return a negative integer if the first
-+ * value comes before the second, 0 if they are equal, or a positive
-+ * integer if the first value comes after the second.
-+ **/
-+GList *
-+g_list_sort (GList        *list,
-+	     GCompareFunc  compare_func)
-+{
-+  return g_list_sort_real (list, (GFunc) compare_func, NULL);
-+			    
-+}
-+
-+/**
-+ * g_list_length:
-+ * @list: a #GList
-+ *
-+ * Gets the number of elements in a #GList.
-+ *
-+ * <note><para>
-+ * This function iterates over the whole list to 
-+ * count its elements.
-+ * </para></note>
-+ *
-+ * Returns: the number of elements in the #GList
-+ */
-+guint
-+g_list_length (GList *list)
-+{
-+  guint length;
-+  
-+  length = 0;
-+  while (list)
-+    {
-+      length++;
-+      list = list->next;
-+    }
-+  
-+  return length;
-+}
-+
-+/**
-+ * g_list_foreach:
-+ * @list: a #GList
-+ * @func: the function to call with each element's data
-+ * @user_data: user data to pass to the function
-+ *
-+ * Calls a function for each element of a #GList.
-+ */
-+/**
-+ * GFunc:
-+ * @data: the element's data.
-+ * @user_data: user data passed to g_list_foreach() or
-+ *             g_slist_foreach().
-+ *
-+ * Specifies the type of functions passed to g_list_foreach() and
-+ * g_slist_foreach().
-+ **/
-+void
-+g_list_foreach (GList	 *list,
-+		GFunc	  func,
-+		gpointer  user_data)
-+{
-+  while (list)
-+    {
-+      GList *next = list->next;
-+      (*func) (list->data, user_data);
-+      list = next;
-+    }
-+}
-+
-+/**
-+ * g_list_free_full:
-+ * @list: a pointer to a #GList
-+ * @free_func: the function to be called to free each element's data
-+ *
-+ * Convenience method, which frees all the memory used by a #GList, and
-+ * calls the specified destroy function on every element's data.
-+ *
-+ * Since: 2.28
-+ */
-+void
-+g_list_free_full (GList          *list,
-+		  GDestroyNotify  free_func)
-+{
-+  g_list_foreach (list, (GFunc) free_func, NULL);
-+  g_list_free (list);
-+}
-+
-+/**
-+ * g_list_find_custom:
-+ * @list: a #GList
-+ * @data: user data passed to the function
-+ * @func: the function to call for each element. 
-+ *     It should return 0 when the desired element is found
-+ *
-+ * Finds an element in a #GList, using a supplied function to 
-+ * find the desired element. It iterates over the list, calling 
-+ * the given function which should return 0 when the desired 
-+ * element is found. The function takes two #gconstpointer arguments, 
-+ * the #GList element's data as the first argument and the 
-+ * given user data.
-+ *
-+ * Returns: the found #GList element, or %NULL if it is not found
-+ */
-+GList*
-+g_list_find_custom (GList         *list,
-+		    gconstpointer  data,
-+		    GCompareFunc   func)
-+{
-+  g_return_val_if_fail (func != NULL, list);
-+
-+  while (list)
-+    {
-+      if (! func (list->data, data))
-+	return list;
-+      list = list->next;
-+    }
-+
-+  return NULL;
-+}
-diff --git a/glib-local/glist.h b/glib-local/glist.h
-new file mode 100644
-index 0000000..47f2cfe
---- /dev/null
-+++ b/glib-local/glist.h
-@@ -0,0 +1,56 @@
-+#ifndef __G_LIST_H__
-+#define __G_LIST_H__
-+
-+typedef int    gint;
-+typedef unsigned int    guint;
-+typedef void* gpointer;
-+typedef const void *gconstpointer;
-+typedef gint            (*GCompareFunc)         (gconstpointer  a,
-+                                                 gconstpointer  b);
-+typedef gint            (*GCompareDataFunc)     (gconstpointer  a,
-+                                                 gconstpointer  b,
-+						 gpointer       user_data);
-+typedef void            (*GFunc)                (gpointer       data,
-+                                                 gpointer       user_data);
-+typedef void            (*GDestroyNotify)       (gpointer       data);
-+
-+struct _GList;
-+typedef struct _GList GList;
-+
-+struct _GList
-+{
-+  gpointer data;
-+  GList *next;
-+  GList *prev;
-+};
-+
-+/* Doubly linked lists
-+ */
-+void     g_list_free                    (GList            *list);
-+GList*   g_list_append                  (GList            *list,
-+					 gpointer          data);
-+GList*   g_list_delete_link             (GList            *list,
-+					 GList            *link_);
-+GList*   g_list_first                   (GList            *list);
-+GList*   g_list_sort                    (GList            *list,
-+					 GCompareFunc      compare_func);
-+guint    g_list_length                  (GList            *list);
-+void     g_list_foreach                 (GList            *list,
-+					 GFunc             func,
-+					 gpointer          user_data);
-+void     g_list_free_full               (GList            *list,
-+					 GDestroyNotify    free_func);
-+GList*   g_list_find_custom             (GList            *list,
-+					 gconstpointer     data,
-+					 GCompareFunc      func);
-+
-+#define g_list_previous(list)	        ((list) ? (((GList *)(list))->prev) : NULL)
-+#define g_list_next(list)	        ((list) ? (((GList *)(list))->next) : NULL)
-+
-+#define g_return_val_if_fail(expr,val)	do {			\
-+     if (expr) { } else						\
-+       {								\
-+	 return (val);							\
-+       }				} while(0);
-+
-+#endif /* __G_LIST_H__ */
-diff --git a/irqbalance.1 b/irqbalance.1
-index 55fc15f..20105bc 100644
---- a/irqbalance.1
-+++ b/irqbalance.1
-@@ -39,7 +39,11 @@ Causes irqbalance to be run once, after which the daemon exits
- .TP
- 
- .B --debug
--Causes irqbalance to run in the foreground and extra debug information to be printed
-+Causes irqbalance to print extra debug information.  Implies --foreground
-+
-+.TP
-+.B --foreground
-+Causes irqbalance to run in the foreground (without --debug)
- 
- .TP
- .B --hintpolicy=[exact | subset | ignore]
-@@ -62,6 +66,30 @@ average cpu softirq workload, and no cpus are more than 1 standard deviation
- above (and have more than 1 irq assigned to them), attempt to place 1 cpu in
- powersave mode.  In powersave mode, a cpu will not have any irqs balanced to it,
- in an effort to prevent that cpu from waking up without need.
-+
-+.TP
-+.B --banirq=<irqnum>
-+Add the specified irq list to the set of banned irqs. irqbalance will not affect
-+the affinity of any irqs on the banned list, allowing them to be specified
-+manually.  This option is addative and can be specified multiple times
-+
-+.TP
-+.B --banscript=<script>
-+Execute the specified script for each irq that is discovered, passing the sysfs
-+path to the associated device as the first argument, and the irq vector as the
-+second.  An exit value of 0 tells irqbalance that this interrupt should balanced
-+and managed as a normal irq, while a non-zero exit code indicates this irq
-+should be ignored by irqbalance completely (see --banirq above).  Use of this
-+script provides users the ability to dynamically select which irqs get exluded
-+from balancing, and provides an opportunity for manual affinity setting in one
-+single code point.
-+
-+.TP
-+.B --pid=<file>
-+Have irqbalance write its process id to the specified file.  By default no
-+pidfile is written.  The written pidfile is automatically unlinked when
-+irqbalance exits.
-+
- .SH "ENVIRONMENT VARIABLES"
- .TP
- .B IRQBALANCE_ONESHOT
-@@ -75,9 +103,10 @@ Same as --debug
- .B IRQBALANCE_BANNED_CPUS
- Provides a mask of cpus which irqbalance should ignore and never assign interrupts to
- 
-+.SH "SIGNALS"
- .TP
--.B IRQBALANCE_BANNED_INTERRUPTS
--A list of space delimited IRQ numbers that irqbalance should not touch
-+.B SIGHUP
-+Forces a rescan of the available irqs and system topology
- 
- .SH "Homepage"
- http://code.google.com/p/irqbalance
-diff --git a/irqbalance.c b/irqbalance.c
-index 99c5db7..fbe6ac6 100644
---- a/irqbalance.c
-+++ b/irqbalance.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-@@ -27,6 +28,10 @@
- #include <syslog.h>
- #include <unistd.h>
- #include <signal.h>
-+#include <time.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
- #ifdef HAVE_GETOPT_LONG 
- #include <getopt.h>
- #endif
-@@ -39,12 +44,15 @@
- volatile int keep_going = 1;
- int one_shot_mode;
- int debug_mode;
-+int foreground_mode;
- int numa_avail;
--int need_cpu_rescan;
-+int need_rescan;
- extern cpumask_t banned_cpus;
- enum hp_e hint_policy = HINT_POLICY_SUBSET;
- unsigned long power_thresh = ULONG_MAX;
- unsigned long long cycle_count = 0;
-+char *pidfile = NULL;
-+char *banscript = NULL;
- 
- void sleep_approx(int seconds)
- {
-@@ -64,32 +72,45 @@ void sleep_approx(int seconds)
- struct option lopts[] = {
- 	{"oneshot", 0, NULL, 'o'},
- 	{"debug", 0, NULL, 'd'},
-+	{"foreground", 0, NULL, 'f'},
- 	{"hintpolicy", 1, NULL, 'h'},
- 	{"powerthresh", 1, NULL, 'p'},
-+	{"banirq", 1 , NULL, 'i'},
-+	{"banscript", 1, NULL, 'b'},
-+	{"pid", 1, NULL, 's'},
- 	{0, 0, 0, 0}
- };
- 
- static void usage(void)
- {
--	printf("irqbalance [--oneshot | -o] [--debug | -d] [--hintpolicy= | -h [exact|subset|ignore]]\n");
--	printf("	[--powerthresh= | -p <off> | <n>]\n");
-+	printf("irqbalance [--oneshot | -o] [--debug | -d] [--foreground | -f] [--hintpolicy= | -h [exact|subset|ignore]]\n");
-+	printf("	[--powerthresh= | -p <off> | <n>] [--banirq= | -i <n>]\n");
- }
- 
- static void parse_command_line(int argc, char **argv)
- {
- 	int opt;
- 	int longind;
-+	unsigned long val;
- 
- 	while ((opt = getopt_long(argc, argv,
--		"odh:p:",
-+		"odfh:i:p:s:",
- 		lopts, &longind)) != -1) {
- 
- 		switch(opt) {
- 			case '?':
- 				usage();
- 				exit(1);
-+				break;
-+			case 'b':
-+				banscript = strdup(optarg);
-+				break;
- 			case 'd':
- 				debug_mode=1;
-+				foreground_mode=1;
-+				break;
-+			case 'f':
-+				foreground_mode=1;
- 				break;
- 			case 'h':
- 				if (!strncmp(optarg, "exact", strlen(optarg)))
-@@ -103,6 +124,14 @@ static void parse_command_line(int argc, char **argv)
- 					exit(1);
- 				}
- 				break;
-+			case 'i':
-+				val = strtoull(optarg, NULL, 10);
-+				if (val == ULONG_MAX) {
-+					usage();
-+					exit(1);
-+				}
-+				add_banned_irq((int)val);
-+				break;
- 			case 'p':
- 				if (!strncmp(optarg, "off", strlen(optarg)))
- 					power_thresh = ULONG_MAX;
-@@ -117,6 +146,9 @@ static void parse_command_line(int argc, char **argv)
- 			case 'o':
- 				one_shot_mode=1;
- 				break;
-+			case 's':
-+				pidfile = optarg;
-+				break;
- 		}
- 	}
- }
-@@ -172,18 +204,34 @@ static void handler(int signum)
- 	keep_going = 0;
- }
- 
-+static void force_rescan(int signum)
-+{
-+	if (cycle_count)
-+		need_rescan = 1;
-+}
-+
- int main(int argc, char** argv)
- {
--	struct sigaction action;
-+	struct sigaction action, hupaction;
- 
- #ifdef HAVE_GETOPT_LONG
- 	parse_command_line(argc, argv);
- #else
--	if (argc>1 && strstr(argv[1],"--debug"))
-+	if (argc>1 && strstr(argv[1],"--debug")) {
- 		debug_mode=1;
-+		foreground_mode=1;
-+	}
-+	if (argc>1 && strstr(argv[1],"--foreground"))
-+		foreground_mode=1;
- 	if (argc>1 && strstr(argv[1],"--oneshot"))
- 		one_shot_mode=1;
- #endif
-+
-+	/*
-+ 	 * Open the syslog connection
-+ 	 */
-+	openlog(argv[0], 0, LOG_DAEMON);
-+
- 	if (getenv("IRQBALANCE_BANNED_CPUS"))  {
- 		cpumask_parse_user(getenv("IRQBALANCE_BANNED_CPUS"), strlen(getenv("IRQBALANCE_BANNED_CPUS")), banned_cpus);
- 	}
-@@ -212,17 +260,35 @@ int main(int argc, char** argv)
- 
- 
- 	/* On single core UP systems irqbalance obviously has no work to do */
--	if (core_count<2) 
-+	if (core_count<2) {
-+		char *msg = "Balaincing is ineffective on systems with a "
-+			    "single cache domain.  Shutting down\n";
-+
-+		if (debug_mode)
-+			printf("%s", msg);
-+		else
-+			syslog(LOG_INFO, "%s", msg);
- 		exit(EXIT_SUCCESS);
-+	}
- 	/* On dual core/hyperthreading shared cache systems just do a one shot setup */
- 	if (cache_domain_count==1)
- 		one_shot_mode = 1;
- 
--	if (!debug_mode)
-+	if (!foreground_mode) {
-+		int pidfd = -1;
- 		if (daemon(0,0))
- 			exit(EXIT_FAILURE);
-+		/* Write pidfile */
-+		if (pidfile && (pidfd = open(pidfile,
-+			O_WRONLY | O_CREAT | O_EXCL | O_TRUNC,
-+			S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) >= 0) {
-+			char str[16];
-+			snprintf(str, sizeof(str), "%u\n", getpid());
-+			write(pidfd, str, strlen(str));
-+			close(pidfd);
-+		}
-+	}
- 
--	openlog(argv[0], 0, LOG_DAEMON);
- 
- #ifdef HAVE_LIBCAP_NG
- 	// Drop capabilities
-@@ -236,6 +302,11 @@ int main(int argc, char** argv)
- 	parse_proc_interrupts();
- 	parse_proc_stat();
- 
-+	hupaction.sa_handler = force_rescan;
-+	sigemptyset(&hupaction.sa_mask);
-+	hupaction.sa_flags = 0;
-+	sigaction(SIGHUP, &hupaction, NULL);
-+
- 	while (keep_going) {
- 		sleep_approx(SLEEP_INTERVAL);
- 		if (debug_mode)
-@@ -247,8 +318,8 @@ int main(int argc, char** argv)
- 		parse_proc_stat();
- 
- 		/* cope with cpu hotplug -- detected during /proc/interrupts parsing */
--		if (need_cpu_rescan) {
--			need_cpu_rescan = 0;
-+		if (need_rescan) {
-+			need_rescan = 0;
- 			/* if there's a hotplug event we better turn off power mode for a bit until things settle */
- 			power_mode = 0;
- 			if (debug_mode)
-@@ -282,5 +353,10 @@ int main(int argc, char** argv)
- 
- 	}
- 	free_object_tree();
-+
-+	/* Remove pidfile */
-+	if (!foreground_mode && pidfile)
-+		unlink(pidfile);
-+
- 	return EXIT_SUCCESS;
- }
-diff --git a/irqbalance.h b/irqbalance.h
-index 4e85325..e46f31f 100644
---- a/irqbalance.h
-+++ b/irqbalance.h
-@@ -9,6 +9,7 @@
- #include <stdint.h>
- #include <glib.h>
- #include <syslog.h>
-+#include <limits.h>
- 
- #include "types.h"
- #ifdef HAVE_NUMA_H
-@@ -40,7 +41,6 @@ void dump_tree(void);
- 
- void activate_mappings(void);
- void account_for_nic_stats(void);
--void check_power_mode(void);
- void clear_cpu_tree(void);
- void pci_numa_scan(void);
- 
-@@ -64,10 +64,11 @@ enum hp_e {
- extern int debug_mode;
- extern int one_shot_mode;
- extern int power_mode;
--extern int need_cpu_rescan;
-+extern int need_rescan;
- extern enum hp_e hint_policy;
- extern unsigned long long cycle_count;
- extern unsigned long power_thresh;
-+extern char *banscript;
- 
- /*
-  * Numa node access routines
-@@ -103,10 +104,11 @@ extern int get_cpu_count(void);
-  */
- extern void rebuild_irq_db(void);
- extern void free_irq_db(void);
-+extern void add_banned_irq(int irq);
- extern void for_each_irq(GList *list, void (*cb)(struct irq_info *info,  void *data), void *data);
- extern struct irq_info *get_irq_info(int irq);
- extern void migrate_irq(GList **from, GList **to, struct irq_info *info);
--extern struct irq_info *add_misc_irq(int irq);
-+extern struct irq_info *add_new_irq(int irq);
- #define irq_numa_node(irq) ((irq)->numa_node)
- 
- 
-diff --git a/irqlist.c b/irqlist.c
-index c29ee84..2523173 100644
---- a/irqlist.c
-+++ b/irqlist.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-@@ -45,6 +46,7 @@ struct load_balance_info {
- 	unsigned int num_within;
- 	unsigned int num_over;
- 	unsigned int num_under;
-+	unsigned int num_powersave;
- 	struct topo_obj *powersave;
- };
- 
-@@ -106,13 +108,16 @@ static void migrate_overloaded_irqs(struct topo_obj *obj, void *data)
- 	struct load_balance_info *info = data;
- 	int deviation;
- 
-+	if (obj->powersave_mode)
-+		info->num_powersave++;
-+
- 	/*
-  	 * Don't rebalance irqs on objects whos load is below the average
-  	 */
- 	if (obj->load <= info->avg_load) {
- 		if ((obj->load + info->std_deviation) <= info->avg_load) {
- 			info->num_under++;
--			if (!info->powersave)
-+			if (power_thresh != ULONG_MAX && !info->powersave)
- 				if (!obj->powersave_mode)
- 					info->powersave = obj;
- 		} else
-@@ -172,13 +177,13 @@ void update_migration_status(void)
- {
- 	struct load_balance_info info;
- 	find_overloaded_objs(cpus, info);
--	if (cycle_count > 5) {
-+	if (power_thresh != ULONG_MAX && cycle_count > 5) {
- 		if (!info.num_over && (info.num_under >= power_thresh) && info.powersave) {
- 			syslog(LOG_INFO, "cpu %d entering powersave mode\n", info.powersave->number);
- 			info.powersave->powersave_mode = 1;
- 			if (g_list_length(info.powersave->interrupts) > 0)
- 				for_each_irq(info.powersave->interrupts, force_irq_migration, NULL);
--		} else if (info.num_over) {
-+		} else if ((info.num_over) && (info.num_powersave)) {
- 			syslog(LOG_INFO, "Load average increasing, re-enabling all cpus for irq balancing\n");
- 			for_each_object(cpus, clear_powersave_mode, NULL);
- 		}
-diff --git a/m4/cap-ng.m4 b/m4/cap-ng.m4
-deleted file mode 100644
-index 0024edc..0000000
---- a/m4/cap-ng.m4
-+++ /dev/null
-@@ -1,40 +0,0 @@
--# libcap-ng.m4 - Checks for the libcap-ng support
--# 	Copyright (c) 2009 Steve Grubb sgrubb@redhat.com
--#
--AC_DEFUN([LIBCAP_NG_PATH],
--[
--  AC_ARG_WITH(libcap-ng,
--    [  --with-libcap-ng=[auto/yes/no]  Add Libcap-ng support [default=auto]],,
--    with_libcap_ng=auto)
--
--  # Check for Libcap-ng API
--  #
--  # libcap-ng detection
--
--  if test x$with_libcap_ng = xno ; then
--      have_libcap_ng=no;
--  else
--      # Start by checking for header file
--      AC_CHECK_HEADER(cap-ng.h, capng_headers=yes, capng_headers=no)
--
--      # See if we have libcap-ng library
--      AC_CHECK_LIB(cap-ng, capng_clear,
--	         CAPNG_LDADD=-lcap-ng,)
--
--      # Check results are usable
--      if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then
--         AC_MSG_ERROR(libcap-ng support was requested and the library was not found)
--      fi
--      if test x$CAPNG_LDADD != x -a $capng_headers = no ; then
--         AC_MSG_ERROR(libcap-ng libraries found but headers are missing)
--      fi
--  fi
--  AC_SUBST(CAPNG_LDADD)
--  AC_MSG_CHECKING(whether to use libcap-ng)
--  if test x$CAPNG_LDADD != x ; then
--      AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])
--      AC_MSG_RESULT(yes)
--  else
--      AC_MSG_RESULT(no)
--  fi
--])
-diff --git a/misc/irqbalance.env b/misc/irqbalance.env
-new file mode 100644
-index 0000000..bd87e3d
---- /dev/null
-+++ b/misc/irqbalance.env
-@@ -0,0 +1,26 @@
-+# irqbalance is a daemon process that distributes interrupts across
-+# CPUS on SMP systems.  The default is to rebalance once every 10
-+# seconds.  This is the environment file that is specified to systemd via the 
-+# EnvironmentFile key in the service unit file (or via whatever method the init
-+# system you're using has. 
-+#
-+# ONESHOT=yes
-+#    after starting, wait for a minute, then look at the interrupt
-+#    load and balance it once; after balancing exit and do not change
-+#    it again.
-+#IRQBALANCE_ONESHOT=
-+
-+#
-+# IRQBALANCE_BANNED_CPUS
-+#    64 bit bitmask which allows you to indicate which cpu's should
-+#    be skipped when reblancing irqs.  Cpu numbers which have their 
-+#    corresponding bits set to one in this mask will not have any
-+#    irq's assigned to them on rebalance
-+#
-+#IRQBALANCE_BANNED_CPUS=
-+
-+#
-+# IRQBALANCE_ARGS
-+#    append any args here to the irqbalance daemon as documented in the man page
-+#
-+#IRQBALANCE_ARGS=
-diff --git a/misc/irqbalance.service b/misc/irqbalance.service
-index f349616..3139a83 100644
---- a/misc/irqbalance.service
-+++ b/misc/irqbalance.service
-@@ -3,9 +3,8 @@ Description=irqbalance daemon
- After=syslog.target
- 
- [Service]
--EnvironmentFile=/etc/sysconfig/irqbalance
--Type=forking
--ExecStart=/usr/sbin/irqbalance $ONESHOT
-+EnvironmentFile=/path/to/irqbalance.env
-+ExecStart=/usr/sbin/irqbalance --foreground $IRQBALANCE_ARGS
- 
- [Install]
- WantedBy=multi-user.target
-diff --git a/numa.c b/numa.c
-index 710ed67..96703bd 100644
---- a/numa.c
-+++ b/numa.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-@@ -106,11 +107,11 @@ void build_numa_node_list(void)
- static void free_numa_node(gpointer data)
- {
- 	struct topo_obj *obj = data;
--	if (data == &unspecified_node)
--		return;
--
- 	g_list_free(obj->children);
--	free(data);
-+	g_list_free(obj->interrupts);
-+
-+	if (data != &unspecified_node)
-+		free(data);
- }
- 
- void free_numa_node_list(void)
-diff --git a/placement.c b/placement.c
-index 108ccc9..1172849 100644
---- a/placement.c
-+++ b/placement.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhoramn@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-@@ -48,7 +49,7 @@ static void find_best_object(struct topo_obj *d, void *data)
- 	/*
-  	 * Don't consider the unspecified numa node here
-  	 */
--	if ((d->obj_type == OBJ_TYPE_NODE) && (d->number == -1))
-+	if (numa_avail && (d->obj_type == OBJ_TYPE_NODE) && (d->number == -1))
- 		return;
- 
- 	/*
-diff --git a/powermode.c b/powermode.c
-deleted file mode 100644
-index 82ba490..0000000
---- a/powermode.c
-+++ /dev/null
-@@ -1,34 +0,0 @@
--/* 
-- * Copyright (C) 2006, Intel Corporation
-- * 
-- * This file is part of irqbalance
-- *
-- * This program file is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License as published by the
-- * Free Software Foundation; version 2 of the License.
-- * 
-- * This program is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-- * for more details.
-- * 
-- * You should have received a copy of the GNU General Public License
-- * along with this program in a file named COPYING; if not, write to the 
-- * Free Software Foundation, Inc., 
-- * 51 Franklin Street, Fifth Floor, 
-- * Boston, MA 02110-1301 USA
-- */
--#include "config.h"
--#include <stdio.h>
--#include <stdlib.h>
--#include <unistd.h>
--#include <stdint.h>
--#include <string.h>
--
--#include "irqbalance.h"
--
--
--void check_power_mode(void)
--{
--}
--
-diff --git a/procinterrupts.c b/procinterrupts.c
-index 4d3b07b..431fffa 100644
---- a/procinterrupts.c
-+++ b/procinterrupts.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-@@ -32,6 +33,8 @@
- 
- #define LINESIZE 4096
- 
-+extern cpumask_t banned_cpus;
-+
- static int proc_int_has_msi = 0;
- static int msi_found_in_sysfs = 0;
- 
-@@ -80,8 +83,12 @@ void parse_proc_interrupts(void)
- 		c++;
- 		number = strtoul(line, NULL, 10);
- 		info = get_irq_info(number);
--		if (!info)
--			info = add_misc_irq(number);
-+		if (!info) {
-+			if (!cycle_count)
-+				continue;
-+			need_rescan = 1;
-+			info = add_new_irq(number);
-+		}
- 
- 		count = 0;
- 		cpunr = 0;
-@@ -97,7 +104,7 @@ void parse_proc_interrupts(void)
- 			cpunr++;
- 		}
- 		if (cpunr != core_count) 
--			need_cpu_rescan = 1;
-+			need_rescan = 1;
- 
- 		info->last_irq_count = info->irq_count;		
- 		info->irq_count = count;
-@@ -217,6 +224,9 @@ void parse_proc_stat(void)
- 
- 		cpunr = strtoul(&line[3], NULL, 10);
- 
-+		if (cpu_isset(cpunr, banned_cpus))
-+			continue;
-+
- 		rc = sscanf(line, "%*s %*d %*d %*d %*d %*d %d %d", &irq_load, &softirq_load);
- 		if (rc < 2)
- 			break;	
diff --git a/extra/ivtv-utils/PKGBUILD b/extra/ivtv-utils/PKGBUILD
deleted file mode 100644
index 8ae4c3c15..000000000
--- a/extra/ivtv-utils/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 155905 2012-04-09 00:12:19Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=ivtv-utils
-pkgver=1.4.1
-pkgrel=5
-pkgdesc="Userspace utilities for Hauppauge PVR cards"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://ivtvdriver.org"
-source=("http://dl.ivtvdriver.org/ivtv/stable/${pkgname}-${pkgver}.tar.gz"
-        "http://dl.ivtvdriver.org/ivtv/firmware/ivtv-firmware.tar.gz")
-depends=('gcc-libs')
-md5sums=('3a4219d698262ca2b28e41f0f547b0a2'
-         'b9a871f1c569025be9c48a77b3515faf')
- 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" PREFIX=/usr install
-
-  cd "${srcdir}"
-  for file in v4l-cx2341x-dec.fw  v4l-cx2341x-enc.fw v4l-pvrusb2-24xxx-01.fw  v4l-pvrusb2-29xxx-01.fw v4l-cx2341x-init.mpg; do
-    install -D -m644 $file "${pkgdir}/usr/lib/firmware/$file"
-  done
-
-  # FS#15133 - files already provided by the kernel-headers package
-  rm -rf "${pkgdir}"/usr/include
-  # Resolve conflict with v4l-utils
-  rm -f "${pkgdir}"/usr/bin/v4l2-ctl
-}
diff --git a/extra/jack/PKGBUILD b/extra/jack/PKGBUILD
index 5c5fb2c5c..657c8e04d 100644
--- a/extra/jack/PKGBUILD
+++ b/extra/jack/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=jack
 _longname=jack-audio-connection-kit
 pkgver=0.121.3
-pkgrel=7
+pkgrel=7.1
 pkgdesc="A low-latency audio server"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
diff --git a/extra/jade/PKGBUILD b/extra/jade/PKGBUILD
index 88a9508cd..8c5652ff8 100644
--- a/extra/jade/PKGBUILD
+++ b/extra/jade/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=jade
 pkgver=1.2.1
-pkgrel=8
+pkgrel=8.1
 _debpatch=47.1
 pkgdesc="James Clark's DSSSL Engine"
 url='http://www.jclark.com/jade/'
diff --git a/extra/java-commons-daemon/PKGBUILD b/extra/java-commons-daemon/PKGBUILD
index f4db99a74..fda87ac94 100644
--- a/extra/java-commons-daemon/PKGBUILD
+++ b/extra/java-commons-daemon/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 pkgname=('java-commons-daemon' 'java-jsvc')
 pkgbase=java-commons-daemon
-pkgver=1.0.12
+pkgver=1.0.15
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://commons.apache.org/daemon/'
 license=('APACHE')
 _libname=commons-daemon
 source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz)
-sha256sums=('09135e4f3a26ebdd6d3035e2e7f631568af06beae32808527217373e3e31a9d0')
+sha256sums=('11ee57d2c6b281589c1497b2f88180553f06d5ac1560ce1841e05f89f0342432')
 makedepends=('apache-ant' 'docbook2x' 'docbook-xsl')
 
 build() {
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index b611231dc..b73b5eedc 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175162 2013-01-15 18:14:28Z andyrtr $
+# $Id: PKGBUILD 183615 2013-04-25 15:56:01Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -7,18 +7,18 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk'
          'openjdk7-src' 'openjdk7-doc')
 pkgbase=java7-openjdk
 _java_ver=7
-_updatever=u9
-_icedtea_ver=2.3.4
+_updatever=u21
+_icedtea_ver=2.3.9
 
 # check "${srcdir}/icedtea7"/Makefile.am
-_CORBA_CHANGESET=dc9234e25ab0
-_JAXP_CHANGESET=aa3654afea12
-_JAXWS_CHANGESET=7182233cc27e
-_JDK_CHANGESET=96d4f04f2b7c
-_LANGTOOLS_CHANGESET=946195011b30
-_OPENJDK_CHANGESET=8bd8e70d4a03
+_CORBA_CHANGESET=47a6bf94ce11
+_JAXP_CHANGESET=d2142901bcb7
+_JAXWS_CHANGESET=b1877762d45c
+_JDK_CHANGESET=8e91101e36f0
+_LANGTOOLS_CHANGESET=fd956199cb82
+_OPENJDK_CHANGESET=12b96a57263c
 
-_HOTSPOT_CHANGESET=beecf0b9e760 # see "${srcdir}/icedtea7"/hotspot.map
+_HOTSPOT_CHANGESET=ad5a321edea2 # see "${srcdir}/icedtea7"/hotspot.map
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
@@ -50,22 +50,22 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
-sha256sums=('ea859f37fb20904ffd40802a41396326f7e301fa6873d88d01bf4afef5a60ca8'
-            '3ea7c4acd4c2f7b91588231427a8685010f8ce7eb0b9610457d6a35bf2afd6bd'
-            '911a049e735c1ab0dfa65426ada7a11494d51fec88126d34588b23f06ef7acf8'
-            'cc9a95c09be36753f9dd5aacd961400deddbdb757f8ea547cd7073f7ab7b87b7'
-            '7e694d90969413972a51ad1202f3c042b1eca92591e43f1f94f4421a6be5c590'
-            'afba9798a4f2407bdf2cd58d0a99d94bb76ae15aec6ad9cfa0375fb255b0032b'
-            'a9f56fbd58047adc9296800cd9c534375ef052074cd40ebc0da1f7db6ce09144'
-            'de7a5397a83bb7c7be2458809b576133e8a3b75dc62d62d2f2983b97c220dc4f'
+sha256sums=('7e1fdd4c53c9772337c971b6f6f8058dabd99d7f4c4fcc85c88d836c9005c6da'
+            '651f99364e451d79156c879b8c8e47b8568fb3b4e4d28ebc38d36028acbed8bc'
+            '7346565688c3f01872af2c16a491233325ad5e924475dc89ff01f50582814934'
+            '8cad2dfee2d5e58a217193dcc9650debe519f72df7c136a15311195c9a1b48d6'
+            'b8e109ac705b95e5605280c8ae13319a128e16eac950a455bfa30364ae4192cc'
+            '349009abfc8df1575336648bebd8a5ff0cb0f2ad045f6b661d88691411881d5e'
+            '2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12'
+            'c184f29b13626e7327f58e4c1df506daf2b57d8084b7a2d2106504ab0fd5eaac'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
             'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea'
             'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4'
-            '2ec2c6d3a8b62c5743bf8c50c358d98f6a86219d1d8b70645bcc0e1707670410'
+            'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
             '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd'
-            'faf5fbaf24c33c101d58bacf8b93c1dbe08a0cbde4c596d5b4a6e28dd4b18f0a'
-            '84d3b91cc57c67b2cf2ddb7fe5abcf1e88b5a151565aaecf4b595c7ce8f3fee9')
+            'b7c045b08ad55a9f79390c104fa846d0e7dbb49fccffb2fab2a3824b6b19c9c8'
+            '89d99d8ac269ca66e2e279aff652d5aac938a35faec93cd8cff8f048052bd3ce')
 
 noextract=("${_OPENJDK_CHANGESET}.tar.gz"
            "${_CORBA_CHANGESET}.tar.gz"
@@ -82,11 +82,6 @@ noextract=("${_OPENJDK_CHANGESET}.tar.gz"
   
 build() {
   cd "${srcdir}/icedtea-${_icedtea_ver}"
-
-  unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-  
-  # default is to build with first found java-environment found in our repos - is jdk7-openjdk
-  [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh
   
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
@@ -135,7 +130,6 @@ package_jre7-openjdk-headless() {
               'fontconfig: needed for Java Mauve support - libmawt.so')
   provides=('java-runtime-headless=7')
   conflicts=('openjdk6')
-  #  replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
   backup=(etc/profile.d/jre.sh
           etc/profile.d/jre.csh
           etc/java-7-openjdk/calendars.properties
@@ -249,7 +243,7 @@ package_jre7-openjdk-headless() {
 }
 	 
 package_jre7-openjdk() {
-  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs -Full Java runtime environment - needed for executing Java GUI and Webstart programs"
+  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Full Java runtime environment - needed for executing Java GUI and Webstart programs"
   depends=('jre7-openjdk-headless' 'xdg-utils' 'hicolor-icon-theme')
   optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
              'alsa-lib: for basic sound support'
@@ -289,7 +283,7 @@ package_jdk7-openjdk() {
   depends=('jre7-openjdk')
   provides=('java-environment=7')
   conflicts=('java-environment')
-  #  replaces=('openjdk6')
+  replaces=('openjdk6')
   backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh)
 
   cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
@@ -337,7 +331,8 @@ package_jdk7-openjdk() {
 
 package_openjdk7-src() {
   pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources"
-
+  replaces=('openjdk6-src')
+  
   install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \
              ${pkgdir}/${_jvmdir}/src.zip
 }
diff --git a/extra/java7-openjdk/disable_Werror.diff b/extra/java7-openjdk/disable_Werror.diff
deleted file mode 100644
index fa8887a10..000000000
--- a/extra/java7-openjdk/disable_Werror.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- openjdk/hotspot/make/linux/makefiles/gcc.make	2012-06-07 16:30:51.000000000 +0200
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make.new	2012-06-14 15:32:44.967695139 +0200
-@@ -150,7 +150,7 @@
- endif
- 
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
-+#WARNINGS_ARE_ERRORS = -Werror
- 
- # Except for a few acceptable ones
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
diff --git a/extra/java7-openjdk/jdk7-openjdk.profile b/extra/java7-openjdk/jdk7-openjdk.profile
index 91265cc86..89a6a82a0 100644
--- a/extra/java7-openjdk/jdk7-openjdk.profile
+++ b/extra/java7-openjdk/jdk7-openjdk.profile
@@ -1,6 +1 @@
-export J2SDKDIR=/usr/lib/jvm/java-7-openjdk
-export J2REDIR=$J2SDKDIR/jre
 export JAVA_HOME=/usr/lib/jvm/java-7-openjdk
-
-# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING'
-# in /etc/profile.d/jre7.sh
diff --git a/extra/java7-openjdk/jre7-openjdk.profile b/extra/java7-openjdk/jre7-openjdk.profile
index c86ce857a..b267392e5 100644
--- a/extra/java7-openjdk/jre7-openjdk.profile
+++ b/extra/java7-openjdk/jre7-openjdk.profile
@@ -1,5 +1,4 @@
-export J2REDIR=/usr/lib/jvm/java-7-openjdk/jre
 export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre}
 
-# enable this for non-reparenting window managers
+# Enable this for non-reparenting window managers
 #export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/extra/java7-openjdk/jre7-openjdk.profile.csh b/extra/java7-openjdk/jre7-openjdk.profile.csh
index a9aed27d1..c4009af2e 100644
--- a/extra/java7-openjdk/jre7-openjdk.profile.csh
+++ b/extra/java7-openjdk/jre7-openjdk.profile.csh
@@ -1,5 +1,4 @@
-setenv J2REDIR "/usr/lib/jvm/java-7-openjdk/jre"
 setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre"
 
-# enable this for non-reparenting window managers
+# Enable this for non-reparenting window managers
 #setenv _JAVA_AWT_WM_NONREPARENTING 1
diff --git a/extra/js/PKGBUILD b/extra/js/PKGBUILD
index dd4efd388..08b23ec77 100644
--- a/extra/js/PKGBUILD
+++ b/extra/js/PKGBUILD
@@ -1,47 +1,37 @@
-# $Id: PKGBUILD 132237 2011-07-21 21:43:04Z ibiru $
+# $Id: PKGBUILD 183636 2013-04-25 18:14:18Z ioni $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
+
 pkgname=js
-pkgver=1.8.5
-pkgrel=3.1
+pkgver=17.0.0
+pkgrel=1
 pkgdesc="JavaScript interpreter and libraries"
-arch=(i686 x86_64 'mips64el')
-url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5"
-license=('GPL2')
-depends=('nspr' 'gcc-libs')
-makedepends=('python2' 'zip')
-replaces=('spidermonkey')
-conflicts=('spidermonkey')
-source=(http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
-        js185-destdir.patch)
-md5sums=('a4574365938222adca0a6bd33329cb32'
-         '364834a8391888642c53d78c3a949d94')
-build() {
-  cd "$srcdir/$pkgname-$pkgver/js/src"
-
-  if [ "$CARCH" = "mips64el" ]; then
-      # Force disabling JIT.
-      sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
-          assembler/wtf/Platform.h
-      sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' Makefile.{in,ref}
-      extraconf="--disable-methodjit --disable-tracejit"
-  fi
+arch=(i686 x86_64)
+url="https://developer.mozilla.org/En/SpiderMonkey/17"
+license=(MPL)
+depends=(nspr gcc-libs libffi readline)
+makedepends=(python2 zip)
+options=(!staticlibs)
+source=(http://ftp.mozilla.org/pub/mozilla.org/js/mozjs$pkgver.tar.gz)
+md5sums=('20b6f8f1140ef6e47daa3b16965c9202')
 
-  patch -Np0 -i $srcdir/js185-destdir.patch
-
-  ./configure --prefix=/usr --with-system-nspr \
-     --enable-threadsafe $extraconf
+build() {
+  unset CPPFLAGS
+  cd mozjs$pkgver/js/src
 
+  ./configure --prefix=/usr --with-system-nspr --with-system-ffi \
+     --enable-readline --enable-threadsafe
   make
 }
 
+check() {
+  cd mozjs$pkgver/js/src
+  make check
+}
+
 package() {
-  cd "$srcdir/$pkgname-$pkgver/js/src"
+  cd mozjs$pkgver/js/src
   make DESTDIR="$pkgdir" install
-
-  install -m 0755 shell/js ${pkgdir}/usr/bin
-
-  #cleanup
-  rm -f "${pkgdir}/usr/lib/libmozjs185-1.0.a"
+  find "$pkgdir"/usr/{lib/pkgconfig,include} -type f -exec chmod -x {} +
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/js/js185-destdir.patch b/extra/js/js185-destdir.patch
deleted file mode 100644
index 87b7b53b3..000000000
--- a/extra/js/js185-destdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-#https://bugzilla.mozilla.org/show_bug.cgi?id=628723
-
---- Makefile.in.old	2011-04-10 04:21:19.918608008 -0700
-+++ Makefile.in	2011-04-10 04:21:58.088607992 -0700
-@@ -888,8 +888,8 @@
- ifeq (,$(HOST_BIN_SUFFIX))
- 	mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
- 	@[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER)
--	ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
--	ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
-+	ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER)
-+	ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER)
- endif
- endif
- ifneq (,$(IMPORT_LIBRARY))
diff --git a/extra/js185/PKGBUILD b/extra/js185/PKGBUILD
new file mode 100644
index 000000000..28b851668
--- /dev/null
+++ b/extra/js185/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 183425 2013-04-21 22:11:08Z heftig $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=js185
+pkgver=1.0.0
+pkgrel=2
+pkgdesc="JavaScript interpreter and libraries (legacy)"
+arch=(i686 x86_64 mips64el)
+url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5"
+license=(MPL)
+depends=(nspr gcc-libs)
+makedepends=(python2 zip)
+options=(!staticlibs)
+source=(http://ftp.mozilla.org/pub/mozilla.org/js/$pkgname-$pkgver.tar.gz)
+md5sums=('a4574365938222adca0a6bd33329cb32')
+
+build() {
+  cd js-1.8.5/js/src
+
+  if [ "$CARCH" = "mips64el" ]; then
+     #Force disabling JIT.
+     sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
+         assembler/wtf/Platform.h
+     sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' Makefile.{in,ref}
+     extraconf="--disable-methodjit --disable-tracejit"
+  fi
+
+  # _FORTIFY_SOURCE causes configure error
+  unset CPPFLAGS
+
+  ./configure --prefix=/usr --with-system-nspr \
+     --enable-threadsafe $extraconf
+  make
+}
+
+package() {
+  cd js-1.8.5/js/src
+  make DESTDIR="$pkgdir" install
+  install -Dm755 shell/js "$pkgdir/usr/bin/js"
+  find "$pkgdir"/usr/{lib/pkgconfig,include} -type f -exec chmod -x {} +
+
+  # Bad symlinks (absolute, including DESTDIR!)
+  cd "$pkgdir/usr/lib"
+  ln -sf libmozjs185.so.1.0.0 libmozjs185.so.1.0
+  ln -sf libmozjs185.so.1.0 libmozjs185.so
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/json-glib/PKGBUILD b/extra/json-glib/PKGBUILD
index 649a47d70..accf2d8f1 100644
--- a/extra/json-glib/PKGBUILD
+++ b/extra/json-glib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169945 2012-10-30 22:46:18Z heftig $
+# $Id: PKGBUILD 183001 2013-04-16 19:33:50Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=json-glib
-pkgver=0.15.2
+pkgver=0.16.0
 pkgrel=1
 pkgdesc="JSON library built on GLib"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,8 +11,8 @@ license=('GPL')
 depends=('glib2')
 makedepends=('gobject-introspection')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.15/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('f090cd94acc85989e033d72028fa70863d05092ae5bba6b454e70c132b24cdde')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::4}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('e4a3fd2f399e4c148aad608e6ed0a94095f2ddde9dd12f5aa2f072ecae5c1d37')
 
 build(){
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/k3b/PKGBUILD b/extra/k3b/PKGBUILD
index 44933ae4b..a01b5989c 100644
--- a/extra/k3b/PKGBUILD
+++ b/extra/k3b/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 176360 2013-01-31 01:11:52Z eric $
+# $Id: PKGBUILD 178132 2013-02-16 22:48:51Z ioni $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=k3b
 pkgver=2.0.2
-pkgrel=7
+pkgrel=8
 pkgdesc="Feature-rich and easy to handle CD burning application"
 arch=("i686" "x86_64" 'mips64el')
 url="http://sourceforge.net/projects/k3b/"
diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD
index 2302572c2..c2073e40c 100644
--- a/extra/kactivities/PKGBUILD
+++ b/extra/kactivities/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177628 2013-02-08 08:55:48Z andrea $
+# $Id: PKGBUILD 181874 2013-04-05 08:54:16Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kactivities
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='API for using and interacting with the Activity Manager'
@@ -11,7 +11,7 @@ license=('GPL' 'FDL')
 depends=('nepomuk-core')
 makedepends=('cmake' 'automoc4' 'mesa')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('4d788f21019cbbe0c27ab3eef51a75125d9966b8')
+sha1sums=('bde79ed3db93d5fa72e1081a6638c5cb777f495e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD
index 5f3e1eca8..fcfb80276 100644
--- a/extra/kdeaccessibility-jovie/PKGBUILD
+++ b/extra/kdeaccessibility-jovie/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177655 2013-02-08 08:56:13Z andrea $
+# $Id: PKGBUILD 181901 2013-04-05 08:54:45Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-jovie
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='A text to speech application'
@@ -13,11 +13,13 @@ depends=('kdebase-runtime' 'speech-dispatcher')
 makedepends=('cmake' 'automoc4')
 replaces=('kdeaccessibility-kttsd')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz")
-sha1sums=('2a233f871ef51037d086ace9d9c4beea35aa2d2d')
+source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz"
+        "jovie-speechd-fix.patch::http://bugsfiles.kde.org/attachment.cgi?id=78588")
+sha1sums=('3292fb9a1bbae4cfe2e37073b004f78e23936f6d'
+          'f106707ec2c325719afe8e919d58ffa2574f6e45')
 
 build() {
-  cd "${srcdir}"
+  patch -Np1 -d jovie-${pkgver} < ${srcdir}/jovie-speechd-fix.patch
   mkdir build
   cd build
   cmake ../jovie-${pkgver} \
diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD
index 12b30b3f4..5ee3c4ca1 100644
--- a/extra/kdeaccessibility-kaccessible/PKGBUILD
+++ b/extra/kdeaccessibility-kaccessible/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177656 2013-02-08 08:56:15Z andrea $
+# $Id: PKGBUILD 181902 2013-04-05 08:54:46Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kaccessible
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Provides accessibility services like focus tracking and a screenreader'
@@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility')
 depends=('kdelibs' 'speech-dispatcher')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz")
-sha1sums=('8c571b52cb2c369511fb1583d7638b7373dee94a')
+sha1sums=('453235676a1991e5f448497f8aa61d0e7ddd54f2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD
index 6dea89ddc..f36140438 100644
--- a/extra/kdeaccessibility-kmag/PKGBUILD
+++ b/extra/kdeaccessibility-kmag/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177657 2013-02-08 08:56:15Z andrea $
+# $Id: PKGBUILD 181903 2013-04-05 08:54:47Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmag
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Screen Magnifier'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz")
-sha1sums=('5adef3bdec46245e31093046b3375561cd9abacd')
+sha1sums=('4bcb0153663ab67eafba4cb450b62891133b4ab2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD
index 569da1b07..987c79534 100644
--- a/extra/kdeaccessibility-kmousetool/PKGBUILD
+++ b/extra/kdeaccessibility-kmousetool/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177658 2013-02-08 08:56:16Z andrea $
+# $Id: PKGBUILD 181904 2013-04-05 08:54:49Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmousetool
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz")
-sha1sums=('562703967fe7c66eeb9545c62d2e997003456287')
+sha1sums=('d6778d9393b0a1cfa597565bc77771b78d98422f')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD
index eb7fb5fe8..d9ceb3629 100644
--- a/extra/kdeaccessibility-kmouth/PKGBUILD
+++ b/extra/kdeaccessibility-kmouth/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177659 2013-02-08 08:56:17Z andrea $
+# $Id: PKGBUILD 181905 2013-04-05 08:54:50Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmouth
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Speech Synthesizer Frontend'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz")
-sha1sums=('6c4724df688578169788775d105197c3f7eaf701')
+sha1sums=('3ed90ae8a113264ef9b8c176c905f3d365443766')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD
index b232c618e..8dd4f42cd 100644
--- a/extra/kdeadmin/PKGBUILD
+++ b/extra/kdeadmin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177660 2013-02-08 08:56:20Z andrea $
+# $Id: PKGBUILD 183526 2013-04-22 11:05:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -6,15 +6,15 @@ pkgbase=kdeadmin
 pkgname=('kdeadmin-kcron'
          'kdeadmin-ksystemlog'
          'kdeadmin-kuser')
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeadmin')
-makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common')
+makedepends=('cmake' 'automoc4' 'kdelibs' 'kdebase-runtime' 'kdepimlibs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'syslog-path.patch')
-sha1sums=('d6f66f9a5d6a42b80e130654a62dfe61ce82dd94'
+sha1sums=('885f63b846e9e8d1485c9261544efb2ab0eea58e'
           '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
 
 build() {
diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD
index 3d6899f14..0bcee92ba 100644
--- a/extra/kdeartwork/PKGBUILD
+++ b/extra/kdeartwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177661 2013-02-08 08:56:20Z andrea $
+# $Id: PKGBUILD 181907 2013-04-05 08:54:52Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -12,16 +12,15 @@ pkgname=('kdeartwork-colorschemes'
          'kdeartwork-styles'
          'kdeartwork-wallpapers'
          'kdeartwork-weatherwallpapers')
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeartwork')
-makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace'
-             'libkexiv2' 'mesa')
+makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('7ec00b2108eb0207653ebe3c95c67503a20b1967')
+sha1sums=('000146f17a31d1257959e274f952e5a2f55f0a00')
 
 build() {
 	cd $srcdir
diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD
index c9980310e..d6189f849 100644
--- a/extra/kdebase-konsole/PKGBUILD
+++ b/extra/kdebase-konsole/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177662 2013-02-08 08:56:21Z andrea $
+# $Id: PKGBUILD 181908 2013-04-05 08:54:53Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebase-konsole
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://kde.org/applications/system/konsole/'
@@ -12,7 +12,7 @@ groups=('kde' 'kdebase')
 depends=('kdebase-runtime' 'kdebase-lib')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz")
-sha1sums=('9e4fdfe34a896dc80c1c1fd3f1e790e8c435c56f')
+sha1sums=('171824f4d06c66a4373274da01cad84853bec821')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index b7598924f..f31ea3cfc 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 177641 2013-02-08 08:55:59Z andrea $
+# $Id: PKGBUILD 181887 2013-04-05 08:54:31Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,10 +17,9 @@ groups=('kde')
 depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate'
          'qimageblitz' 'polkit-kde' 'xorg-xprop' 'libxdamage'
          'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
-         'xorg-xrdb' 'libgles' 'libegl' 'libxres' 'xorg-xrandr'
-         'xorg-xmessage' 'libusb-compat' 'kde-base-artwork'
-         'xcb-util-renderutil' 'xcb-util-image' 'ttf-font')
-makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager' 'mesa')
+         'xorg-xrdb' 'libxres' 'xorg-xrandr' 'xorg-xmessage' 'libusb-compat'
+         'kde-base-artwork' 'xcb-util-renderutil' 'xcb-util-image' 'ttf-font')
+makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager')
 optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces'
             'appmenu-qt: menu applications over dbus')
 install="${pkgname}.install"
@@ -28,7 +27,7 @@ backup=('usr/share/config/kdm/kdmrc')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
         'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
-sha1sums=('dca9aae963c2db95ef69c13f751c2cb22dbf2200'
+sha1sums=('12b10e8bea44f3aafa0c8d776eadfee14d71c3f8'
           '660eae40a707d2711d8d7f32a93214865506b795'
           '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
diff --git a/extra/kdebase-workspace/fix-freeze.patch b/extra/kdebase-workspace/fix-freeze.patch
deleted file mode 100644
index 1926baebc..000000000
--- a/extra/kdebase-workspace/fix-freeze.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/kwin/tabbox/clientmodel.cpp b/kwin/tabbox/clientmodel.cpp
-index 9591bab..a67d979 100644
---- a/kwin/tabbox/clientmodel.cpp
-+++ b/kwin/tabbox/clientmodel.cpp
-@@ -188,7 +188,7 @@ void ClientModel::createClientList(int desktop, bool partialReset)
-     switch(tabBox->config().clientSwitchingMode()) {
-     case TabBoxConfig::FocusChainSwitching: {
-         TabBoxClient* c = start;
--        if (!c) {
-+        if (!tabBox->isInFocusChain(c)) {
-             QSharedPointer<TabBoxClient> firstClient = tabBox->firstClientFocusChain().toStrongRef();
-             if (firstClient) {
-                 c = firstClient.data();
-diff --git a/kwin/tabbox/tabbox.cpp b/kwin/tabbox/tabbox.cpp
-index d96d0bd..7a08d37 100644
---- a/kwin/tabbox/tabbox.cpp
-+++ b/kwin/tabbox/tabbox.cpp
-@@ -112,6 +112,14 @@ QWeakPointer< TabBoxClient > TabBoxHandlerImpl::firstClientFocusChain() const
-     }
- }
- 
-+bool TabBoxHandlerImpl::isInFocusChain(TabBoxClient *client) const
-+{
-+    if (TabBoxClientImpl *c = static_cast<TabBoxClientImpl*>(client)) {
-+        return Workspace::self()->globalFocusChain().contains(c->client());
-+    }
-+    return false;
-+}
-+
- int TabBoxHandlerImpl::nextDesktopFocusChain(int desktop) const
- {
-     return m_tabBox->nextDesktopFocusChain(desktop);
-diff --git a/kwin/tabbox/tabbox.h b/kwin/tabbox/tabbox.h
-index 6652f93..bba0b39 100644
---- a/kwin/tabbox/tabbox.h
-+++ b/kwin/tabbox/tabbox.h
-@@ -52,6 +52,7 @@ public:
-     virtual QString desktopName(int desktop) const;
-     virtual QWeakPointer< TabBoxClient > nextClientFocusChain(TabBoxClient* client) const;
-     virtual QWeakPointer< TabBoxClient > firstClientFocusChain() const;
-+    virtual bool isInFocusChain (TabBoxClient* client) const;
-     virtual int nextDesktopFocusChain(int desktop) const;
-     virtual int numberOfDesktops() const;
-     virtual TabBoxClientList stackingOrder() const;
-diff --git a/kwin/tabbox/tabboxhandler.h b/kwin/tabbox/tabboxhandler.h
-index 7abddfc..d9a6122 100644
---- a/kwin/tabbox/tabboxhandler.h
-+++ b/kwin/tabbox/tabboxhandler.h
-@@ -119,6 +119,7 @@ public:
-      * @since 4.9.1
-      **/
-     virtual QWeakPointer<TabBoxClient> firstClientFocusChain() const = 0;
-+    virtual bool isInFocusChain(TabBoxClient* client) const = 0;
-     /**
-     * @param client The client whose desktop name should be retrieved
-     * @return The desktop name of the given TabBoxClient. If the client is
diff --git a/extra/kdebase-workspace/fix-krunner-crash.patch b/extra/kdebase-workspace/fix-krunner-crash.patch
deleted file mode 100644
index 2bdf0b512..000000000
--- a/extra/kdebase-workspace/fix-krunner-crash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libs/plasmagenericshell/panelshadows.cpp b/libs/plasmagenericshell/panelshadows.cpp
-index ee55571..2f45153 100644
---- a/libs/plasmagenericshell/panelshadows.cpp
-+++ b/libs/plasmagenericshell/panelshadows.cpp
-@@ -122,7 +122,7 @@ void PanelShadows::Private::initPixmap(const QString &element)
- {
- #ifdef Q_WS_X11
-     QPixmap pix = q->pixmap(element);
--    if (pix.handle() == 0) {
-+    if (!pix.isNull() && pix.handle() == 0) {
-         Pixmap xPix = XCreatePixmap(QX11Info::display(), QX11Info::appRootWindow(), pix.width(), pix.height(), 32);
-         QPixmap tempPix = QPixmap::fromX11Pixmap(xPix, QPixmap::ExplicitlyShared);
-         tempPix.fill(Qt::transparent);
diff --git a/extra/kdebase-workspace/fix-mesa9.patch b/extra/kdebase-workspace/fix-mesa9.patch
deleted file mode 100644
index 4c5fca408..000000000
--- a/extra/kdebase-workspace/fix-mesa9.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-commit 6cf057777555a5d0c834de3a0165a62916cf3b40
-Author: Fredrik Höglund <fredrik@kde.org>
-Date:   Tue Oct 30 18:20:00 2012 +0100
-
-    kwin/glx: Avoid MSAA configs in initBufferConfigs()
-    
-    It appears that we're accidentally choosing an MSAA config with the
-    Intel driver in Mesa 9.0. So change the algorithm to take the values
-    of GLX_SAMPLES and GLX_SAMPLE_BUFFERS into account.
-    
-    Found by Kenneth Graunke.
-
-diff --git a/kwin/scene_opengl_glx.cpp b/kwin/scene_opengl_glx.cpp
-index 1fe2f18..cf7933b 100644
---- a/kwin/scene_opengl_glx.cpp
-+++ b/kwin/scene_opengl_glx.cpp
-@@ -270,12 +270,15 @@ bool SceneOpenGL::initBufferConfigs()
-     fbcbuffer_nondb = NULL;
- 
-     for (int i = 0; i < 2; i++) {
--        int back, stencil, depth, caveat, alpha;
-+        int back, stencil, depth, caveat, msaa_buffers, msaa_samples, alpha;
-         back = i > 0 ? INT_MAX : 1;
-         stencil = INT_MAX;
-         depth = INT_MAX;
-         caveat = INT_MAX;
-+        msaa_buffers = INT_MAX;
-+        msaa_samples = INT_MAX;
-         alpha = 0;
-+
-         for (int j = 0; j < cnt; j++) {
-             XVisualInfo *vi;
-             int visual_depth;
-@@ -322,10 +325,26 @@ bool SceneOpenGL::initBufferConfigs()
-                                  GLX_CONFIG_CAVEAT, &caveat_value);
-             if (caveat_value > caveat)
-                 continue;
-+
-+            int msaa_buffers_value;
-+            glXGetFBConfigAttrib(display(), fbconfigs[j], GLX_SAMPLE_BUFFERS,
-+                                 &msaa_buffers_value);
-+            if (msaa_buffers_value > msaa_buffers)
-+                continue;
-+
-+            int msaa_samples_value;
-+            glXGetFBConfigAttrib(display(), fbconfigs[j], GLX_SAMPLES,
-+                                 &msaa_samples_value);
-+            if (msaa_samples_value > msaa_samples)
-+                continue;
-+
-             back = back_value;
-             stencil = stencil_value;
-             depth = depth_value;
-             caveat = caveat_value;
-+            msaa_buffers = msaa_buffers_value;
-+            msaa_samples = msaa_samples_value;
-+
-             if (i > 0)
-                 fbcbuffer_nondb = fbconfigs[ j ];
-             else
diff --git a/extra/kdebase-workspace/fixpath.patch b/extra/kdebase-workspace/fixpath.patch
deleted file mode 100644
index be2b8383e..000000000
--- a/extra/kdebase-workspace/fixpath.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
-@@ -34,22 +34,6 @@
- MALLOC_CHECK_=2 
- export MALLOC_CHECK_
- 
--# in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
--  qbindir=`$bindir/kde4-config --qt-binaries`
--  if [ -n "$qbindir" ]; then
--    case $PATH in
--      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
--      *) PATH=$qbindir:$PATH; export PATH;;
--    esac
--  fi
--  case $PATH in
--    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
--    *) PATH=$bindir:$PATH; export PATH;;
--  esac
--fi
--
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -206,7 +190,7 @@
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
- 
--libpath=`kde4-config --path lib | tr : '\n'`
-+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
- 
- for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
-   for file in "$prefix"*.sh; do
diff --git a/extra/kdebase-workspace/kdm b/extra/kdebase-workspace/kdm
deleted file mode 100644
index 799d58f4b..000000000
--- a/extra/kdebase-workspace/kdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/kdm)
-case "$1" in
-  start)
-    stat_busy "Starting KDE Desktop Manager"
-    [ -z "$PID" ] && /usr/bin/kdm &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon kdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping KDE Desktop Manager"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon kdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/kdebase-workspace/logind-support.patch b/extra/kdebase-workspace/logind-support.patch
deleted file mode 100644
index 9de205400..000000000
--- a/extra/kdebase-workspace/logind-support.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Lukas Tinkl <lukas@kde.org>
-Date: Fri, 05 Oct 2012 09:57:13 +0000
-Subject: store the filedescriptor in a member variable
-X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=a18b78d7da8cb8d627ad2e85f666bfcf1a2721e1
----
-store the filedescriptor in a member variable
-
-make systemd-inhibit work as intended, PowerDevil now handles
-power/sleep/lid buttons as intended
-
-BUG: 307412
----
-
-
---- a/powerdevil/daemon/powerdevilpolicyagent.cpp
-+++ b/powerdevil/daemon/powerdevilpolicyagent.cpp
-@@ -29,7 +29,6 @@
- #include <QtDBus/QDBusPendingReply>
- #include <QtDBus/QDBusConnectionInterface>
- #include <QtDBus/QDBusServiceWatcher>
--#include <QtDBus/QDBusUnixFileDescriptor>
- 
- #include <KGlobal>
- #include <KDebug>
-@@ -225,6 +224,9 @@
-         onActiveSessionChanged(m_activeSessionPath);
- 
-         // inhibit systemd handling of power/sleep/lid buttons
-+        // http://www.freedesktop.org/wiki/Software/systemd/inhibit
-+        kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing);
-+
-         QVariantList args;
-         args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what
-         args << "PowerDevil"; // who
-@@ -232,8 +234,9 @@
-         args << "block"; // mode
-         QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args);
-         desc.waitForFinished();
--        if (desc.isValid() && desc.value().isValid()) {
--            kDebug() << "systemd powersave events handling inhibited";
-+        if (desc.isValid()) {
-+            m_systemdInhibitFd = desc.value();
-+            kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor();
-         }
-         else
-             kWarning() << "failed to inhibit systemd powersave handling";
-
---- a/powerdevil/daemon/powerdevilpolicyagent.h
-+++ b/powerdevil/daemon/powerdevilpolicyagent.h
-@@ -27,6 +27,7 @@
- #include <QtCore/QWeakPointer>
- 
- #include <QtDBus/QDBusContext>
-+#include <QtDBus/QDBusUnixFileDescriptor>
- 
- #include <kdemacros.h>
- 
-@@ -108,6 +109,7 @@
-     QString m_activeSessionPath;
-     QWeakPointer< QDBusInterface > m_sdSessionInterface;
-     QWeakPointer< QDBusInterface > m_sdSeatInterface;
-+    QDBusUnixFileDescriptor m_systemdInhibitFd;
- 
-     // ConsoleKit support
-     bool m_ckAvailable;
-
diff --git a/extra/kdebase-workspace/logind-support2.patch b/extra/kdebase-workspace/logind-support2.patch
deleted file mode 100644
index e36757f6a..000000000
--- a/extra/kdebase-workspace/logind-support2.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-commit 80e9e6e48ff5b84962f3a8543ee06bcd4f122623
-Author: Lukáš Tinkl <lukas@kde.org>
-Date:   Tue Oct 30 11:32:52 2012 +0100
-
-    move systemd inhibition initialization to a slot
-    
-    and call it on resume. It looks like the filedescriptor
-    goes away when you suspend so we need to recreate it.
-    
-    BUG: 307412
-
-diff --git a/powerdevil/daemon/powerdevilcore.cpp b/powerdevil/daemon/powerdevilcore.cpp
-index df79667..7f24cbb 100644
---- a/powerdevil/daemon/powerdevilcore.cpp
-+++ b/powerdevil/daemon/powerdevilcore.cpp
-@@ -127,8 +127,6 @@ void Core::onBackendReady()
-             this, SLOT(onAcAdapterStateChanged(PowerDevil::BackendInterface::AcAdapterState)));
-     connect(m_backend, SIGNAL(batteryRemainingTimeChanged(qulonglong)),
-             this, SLOT(onBatteryRemainingTimeChanged(qulonglong)));
--    connect(m_backend, SIGNAL(resumeFromSuspend()),
--            this, SLOT(onResumeFromSuspend()));
-     connect(KIdleTime::instance(), SIGNAL(timeoutReached(int,int)),
-             this, SLOT(onKIdleTimeoutReached(int,int)));
-     connect(KIdleTime::instance(), SIGNAL(resumingFromIdle()),
-@@ -139,6 +137,9 @@ void Core::onBackendReady()
-     // Set up the policy agent
-     PowerDevil::PolicyAgent::instance()->init();
- 
-+    connect(m_backend, SIGNAL(resumeFromSuspend()),
-+            this, SLOT(onResumeFromSuspend()));
-+
-     // Initialize the action pool, which will also load the needed startup actions.
-     PowerDevil::ActionPool::instance()->init(this);
- 
-@@ -601,6 +602,7 @@ void Core::onResumeFromSuspend()
-                                              "/ScreenSaver",
-                                              QDBusConnection::sessionBus());
-     iface.SimulateUserActivity();
-+    PowerDevil::PolicyAgent::instance()->setupSystemdInhibition();
- 
-     emit resumingFromSuspend();
- }
-diff --git a/powerdevil/daemon/powerdevilpolicyagent.cpp b/powerdevil/daemon/powerdevilpolicyagent.cpp
-index 70588db..0777846 100644
---- a/powerdevil/daemon/powerdevilpolicyagent.cpp
-+++ b/powerdevil/daemon/powerdevilpolicyagent.cpp
-@@ -88,6 +88,7 @@ PolicyAgent *PolicyAgent::instance()
- PolicyAgent::PolicyAgent(QObject* parent)
-     : QObject(parent)
-     , m_sdAvailable(false)
-+    , m_systemdInhibitFd(-1)
-     , m_ckAvailable(false)
-     , m_sessionIsBeingInterrupted(false)
-     , m_lastCookie(0)
-@@ -223,23 +224,7 @@ void PolicyAgent::onSessionHandlerRegistered(const QString & serviceName)
- 
-         onActiveSessionChanged(m_activeSessionPath);
- 
--        // inhibit systemd handling of power/sleep/lid buttons
--        // http://www.freedesktop.org/wiki/Software/systemd/inhibit
--        kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing);
--
--        QVariantList args;
--        args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what
--        args << "PowerDevil"; // who
--        args << "KDE handles power events"; // why
--        args << "block"; // mode
--        QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args);
--        desc.waitForFinished();
--        if (desc.isValid()) {
--            m_systemdInhibitFd = desc.value();
--            kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor();
--        }
--        else
--            kWarning() << "failed to inhibit systemd powersave handling";
-+        setupSystemdInhibition();
- 
-         kDebug() << "systemd support initialized";
-     } else if (serviceName == CONSOLEKIT_SERVICE) {
-@@ -552,6 +537,31 @@ void PolicyAgent::releaseAllInhibitions()
-     }
- }
- 
-+void PolicyAgent::setupSystemdInhibition()
-+{
-+    if (m_systemdInhibitFd.fileDescriptor() != -1)
-+        return;
-+
-+    // inhibit systemd handling of power/sleep/lid buttons
-+    // http://www.freedesktop.org/wiki/Software/systemd/inhibit
-+    QDBusInterface managerIface(SYSTEMD_LOGIN1_SERVICE, SYSTEMD_LOGIN1_PATH, SYSTEMD_LOGIN1_MANAGER_IFACE, QDBusConnection::systemBus());
-+    kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing);
-+
-+    QVariantList args;
-+    args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what
-+    args << "PowerDevil"; // who
-+    args << "KDE handles power events"; // why
-+    args << "block"; // mode
-+    QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args);
-+    desc.waitForFinished();
-+    if (desc.isValid()) {
-+        m_systemdInhibitFd = desc.value();
-+        kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor();
-+    }
-+    else
-+        kWarning() << "failed to inhibit systemd powersave handling";
-+}
-+
- }
- 
- #include "powerdevilpolicyagent.moc"
-diff --git a/powerdevil/daemon/powerdevilpolicyagent.h b/powerdevil/daemon/powerdevilpolicyagent.h
-index a046497..f1e8c03 100644
---- a/powerdevil/daemon/powerdevilpolicyagent.h
-+++ b/powerdevil/daemon/powerdevilpolicyagent.h
-@@ -74,6 +74,8 @@ public:
- 
-     RequiredPolicies unavailablePolicies();
- 
-+    void setupSystemdInhibition();
-+
- public Q_SLOTS:
-     // Exported slots
-     uint AddInhibition(uint types, const QString &appName, const QString &reason);
diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD
index c6825ffad..5857aec70 100644
--- a/extra/kdebase/PKGBUILD
+++ b/extra/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177643 2013-02-08 08:56:01Z andrea $
+# $Id: PKGBUILD 181889 2013-04-05 08:54:33Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -11,7 +11,7 @@ pkgname=('kdebase-dolphin'
          'kdebase-konq-plugins'
          'kdebase-lib'
          'kdebase-plasma')
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -19,7 +19,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz")
-sha1sums=('5b0127bd946286f52d98a1779eabf65e416a66c3')
+sha1sums=('7f505292e95b35205cec3baa67e9e9b24f79b9b9')
 
 build() {
 	cd ${srcdir}
diff --git a/extra/kdebase/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff b/extra/kdebase/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
deleted file mode 100644
index 9f328ec60..000000000
--- a/extra/kdebase/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
+++ /dev/null
@@ -1,232 +0,0 @@
-diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-index f92cab5..af16954 100644
---- a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-+++ b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-@@ -193,7 +193,8 @@ KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* infor
-     m_additionalInfoTextColor(),
-     m_overlay(),
-     m_rating(),
--    m_roleEditor(0)
-+    m_roleEditor(0),
-+    m_oldRoleEditor(0)
- {
- }
- 
-@@ -203,6 +204,7 @@ KStandardItemListWidget::~KStandardItemListWidget()
-     m_textInfo.clear();
- 
-     delete m_roleEditor;
-+    delete m_oldRoleEditor;
- }
- 
- void KStandardItemListWidget::setLayout(Layout layout)
-@@ -609,13 +611,16 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const
-                        this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
-             disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
-                        this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
--            // Do not delete the role editor using deleteLater() because we might be
--            // inside a nested event loop which has been started by one of its event
--            // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
--            m_roleEditor->deleteWhenIdle();
-+            m_oldRoleEditor = m_roleEditor;
-+            m_roleEditor->hide();
-             m_roleEditor = 0;
-         }
-         return;
-+    } else if (m_oldRoleEditor) {
-+        // Delete the old editor before constructing the new one to
-+        // prevent a memory leak.
-+        m_oldRoleEditor->deleteLater();
-+        m_oldRoleEditor = 0;
-     }
- 
-     Q_ASSERT(!m_roleEditor);
-@@ -1267,21 +1272,19 @@ QRectF KStandardItemListWidget::roleEditingRect(const QByteArray& role) const
- 
- void KStandardItemListWidget::closeRoleEditor()
- {
-+    disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
-+               this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
-+    disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
-+               this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
-+
-     if (m_roleEditor->hasFocus()) {
-         // If the editing was not ended by a FocusOut event, we have
-         // to transfer the keyboard focus back to the KItemListContainer.
-         scene()->views()[0]->parentWidget()->setFocus();
-     }
- 
--    disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
--               this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
--    disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
--               this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
--
--    // Do not delete the role editor using deleteLater() because we might be
--    // inside a nested event loop which has been started by one of its event
--    // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
--    m_roleEditor->deleteWhenIdle();
-+    m_oldRoleEditor = m_roleEditor;
-+    m_roleEditor->hide();
-     m_roleEditor = 0;
- }
- 
-diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.h b/dolphin/src/kitemviews/kstandarditemlistwidget.h
-index 787722d..386f60e 100644
---- a/dolphin/src/kitemviews/kstandarditemlistwidget.h
-+++ b/dolphin/src/kitemviews/kstandarditemlistwidget.h
-@@ -241,6 +241,7 @@ private:
-     QPixmap m_rating;
- 
-     KItemListRoleEditor* m_roleEditor;
-+    KItemListRoleEditor* m_oldRoleEditor;
- 
-     friend class KStandardItemListWidgetInformant; // Accesses private static methods to be able to
-                                                    // share a common layout calculation
-diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-index 78dbfe9..1e4b5fd 100644
---- a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-+++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-@@ -26,9 +26,7 @@ KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
-     KTextEdit(parent),
-     m_index(0),
-     m_role(),
--    m_blockFinishedSignal(false),
--    m_eventHandlingLevel(0),
--    m_deleteAfterEventHandling(false)
-+    m_blockFinishedSignal(false)
- {
-     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-@@ -66,20 +64,6 @@ QByteArray KItemListRoleEditor::role() const
-     return m_role;
- }
- 
--void KItemListRoleEditor::deleteWhenIdle()
--{
--    if (m_eventHandlingLevel > 0) {
--        // We are handling an event at the moment. It could be that we
--        // are in a nested event loop run by contextMenuEvent() or a
--        // call of mousePressEvent() which results in drag&drop.
--        // -> do not call deleteLater() to prevent a crash when we
--        //    return from the nested event loop.
--        m_deleteAfterEventHandling = true;
--    } else {
--        deleteLater();
--    }
--}
--
- bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
- {
-     if (watched == parentWidget() && event->type() == QEvent::Resize) {
-@@ -91,42 +75,13 @@ bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
- 
- bool KItemListRoleEditor::event(QEvent* event)
- {
--    ++m_eventHandlingLevel;
--
-     if (event->type() == QEvent::FocusOut) {
-         QFocusEvent* focusEvent = static_cast<QFocusEvent*>(event);
-         if (focusEvent->reason() != Qt::PopupFocusReason) {
-             emitRoleEditingFinished();
-         }
-     }
--
--    const int result = KTextEdit::event(event);
--    --m_eventHandlingLevel;
--
--    if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
--        // Schedule this object for deletion and make sure that we do not try
--        // to deleteLater() again when the DeferredDelete event is received.
--        deleteLater();
--        m_deleteAfterEventHandling = false;
--    }
--
--    return result;
--}
--
--bool KItemListRoleEditor::viewportEvent(QEvent* event)
--{
--    ++m_eventHandlingLevel;
--    const bool result = KTextEdit::viewportEvent(event);
--    --m_eventHandlingLevel;
--
--    if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
--        // Schedule this object for deletion and make sure that we do not try
--        // to deleteLater() again when the DeferredDelete event is received.
--        deleteLater();
--        m_deleteAfterEventHandling = false;
--    }
--
--    return result;
-+    return KTextEdit::event(event);
- }
- 
- void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
-@@ -144,8 +99,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
-         return;
-     case Qt::Key_Enter:
-     case Qt::Key_Return:
--        // TODO: find a better way to fix the bug 309760
--        clearFocus(); // emitRoleEditingFinished(); results in a crash
-+        emitRoleEditingFinished();
-         event->accept();
-         return;
-     default:
-diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.h b/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-index a2f7058..aa2c977 100644
---- a/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-+++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-@@ -47,15 +47,6 @@ public:
-     void setRole(const QByteArray& role);
-     QByteArray role() const;
- 
--    /**
--     * Calls deleteLater() if no event is being handled at the moment.
--     * Otherwise, the deletion is deferred until the event handling is
--     * finished. This prevents that the deletion happens inside a nested
--     * event loop which might be run in contextMenuEvent() or
--     * mouseMoveEvent() because this would probably cause a crash.
--     */
--    void deleteWhenIdle();
--
-     virtual bool eventFilter(QObject* watched, QEvent* event);
- 
- signals:
-@@ -64,7 +55,6 @@ signals:
- 
- protected:
-     virtual bool event(QEvent* event);
--    virtual bool viewportEvent(QEvent* event);
-     virtual void keyPressEvent(QKeyEvent* event);
- 
- private slots:
-@@ -85,8 +75,6 @@ private:
-     int m_index;
-     QByteArray m_role;
-     bool m_blockFinishedSignal;
--    int m_eventHandlingLevel;
--    bool m_deleteAfterEventHandling;
- };
- 
- #endif
-diff --git a/dolphin/src/views/dolphinview.cpp b/dolphin/src/views/dolphinview.cpp
-index 70a7394..0e97c5a 100644
---- a/dolphin/src/views/dolphinview.cpp
-+++ b/dolphin/src/views/dolphinview.cpp
-@@ -1227,11 +1227,14 @@ void DolphinView::updateViewState()
- 
-         QSet<int> selectedItems = selectionManager->selectedItems();
- 
--        for (QList<KUrl>::iterator it = m_selectedUrls.begin(); it != m_selectedUrls.end(); ++it) {
-+        QList<KUrl>::iterator it = m_selectedUrls.begin();
-+        while (it != m_selectedUrls.end()) {
-             const int index = m_model->index(*it);
-             if (index >= 0) {
-                 selectedItems.insert(index);
--                m_selectedUrls.erase(it);
-+                it = m_selectedUrls.erase(it);
-+            } else {
-+                 ++it;
-             }
-         }
- 
diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD
index 5fabf21af..d22555678 100644
--- a/extra/kdebindings-kimono/PKGBUILD
+++ b/extra/kdebindings-kimono/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177663 2013-02-08 08:56:22Z andrea $
+# $Id: PKGBUILD 181909 2013-04-05 08:54:54Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-kimono
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the KDE libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
 optdepends=('kdepimlibs: akonadi bindings')
 conflicts=('kdebindings-csharp')
 source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz")
-sha1sums=('1022ce1dad2cc1154a22dc111a687551478c2468')
+sha1sums=('b5ada2536a4f59b4016fc4e71d91da029ced8103')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD
index b2e143323..3500e07f3 100644
--- a/extra/kdebindings-korundum/PKGBUILD
+++ b/extra/kdebindings-korundum/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177664 2013-02-08 08:56:23Z andrea $
+# $Id: PKGBUILD 181910 2013-04-05 08:54:55Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-korundum
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Ruby bindings for libraries created by the KDE community"
 url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum"
@@ -17,17 +17,16 @@ optdepends=('kdegraphics-okular: okular bindings'
 conflicts=('kdebindings-ruby')
 source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz"
         'ruby19.patch')
-sha1sums=('c8257b61c546df77c98d83ce32759359118d7c9d'
+sha1sums=('147bb8aacf8805ccde57f1d3d96e67633f317202'
           'c074f027bac3b9bffe70a2c2304a6a7be12be034')
 
 build() {
-  cd "${srcdir}/korundum-${pkgver}"
+  cd korundum-${pkgver}
   patch -p1 -i "${srcdir}/ruby19.patch"
+  cd ../
 
-  cd "${srcdir}"
   mkdir build
   cd build
-
   cmake ../korundum-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DKDE4_BUILD_TESTS=OFF \
@@ -39,6 +38,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdebindings-korundum/korundum-4.8.0-ruby19.patch b/extra/kdebindings-korundum/korundum-4.8.0-ruby19.patch
deleted file mode 100644
index ac4d32ae9..000000000
--- a/extra/kdebindings-korundum/korundum-4.8.0-ruby19.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up korundum-4.8.0/src/krubypluginfactory.cpp.ruby19 korundum-4.8.0/src/krubypluginfactory.cpp
---- korundum-4.8.0/src/krubypluginfactory.cpp.ruby19	2011-07-27 13:37:29.000000000 -0500
-+++ korundum-4.8.0/src/krubypluginfactory.cpp	2012-02-17 08:30:38.785635819 -0600
-@@ -39,7 +39,7 @@
- extern "C" {
- extern VALUE rb_load_path;
- extern VALUE qt_internal_module;
--void Init_prelude(void);
-+// void Init_prelude(void);
- }
- 
- //
-@@ -165,7 +165,7 @@ QObject *KRubyPluginFactory::create(cons
- #if RUBY_VERSION >= 0x10900
-     VALUE gem = rb_define_module("Gem");
-     rb_const_set(gem, rb_intern("Enable"), Qtrue);
--    Init_prelude(); 
-+//    Init_prelude(); 
- #endif
- 
-     ruby_incpush(QFile::encodeName(program.path()));
-@@ -342,7 +342,7 @@ int kdemain(int argc, char **argv)
- #if RUBY_VERSION >= 0x10900
-     VALUE gem = rb_define_module("Gem");
-     rb_const_set(gem, rb_intern("Enable"), Qtrue);
--    Init_prelude();                                             
-+//    Init_prelude();                                             
- #endif
- 
-     ruby_incpush(QFile::encodeName(program.path()));
diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD
index 94815277b..899fc6f82 100644
--- a/extra/kdebindings-kross/PKGBUILD
+++ b/extra/kdebindings-kross/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 177665 2013-02-08 08:56:24Z andrea $
+# $Id: PKGBUILD 181911 2013-04-05 08:54:56Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-kross
 pkgname=('kdebindings-kross-python'
 #         'kdebindings-kross-ruby'
          'kdebindings-kross-java')
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment')
 source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz")
-sha1sums=('4d7a6c7e0716984c230ac684b46629cd299cec53')
+sha1sums=('70726de496531b50010156b224bc807b72f85441')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD
index a73502976..f178e7d9a 100644
--- a/extra/kdebindings-perlkde/PKGBUILD
+++ b/extra/kdebindings-perlkde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177666 2013-02-08 08:56:27Z andrea $
+# $Id: PKGBUILD 181912 2013-04-05 08:54:57Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlkde
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Perl bindings for the KDE libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde"
@@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
             'kdegraphics-okular' 'kdesdk-kate')
 source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz")
-sha1sums=('83af5b1c34e93a46395d974b82e819f2649ac5ca')
+sha1sums=('b57da1f88e147ff8ec25527ab7ff0ccad64ca7db')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD
index 91905cf8b..db2bcb48a 100644
--- a/extra/kdebindings-perlqt/PKGBUILD
+++ b/extra/kdebindings-perlqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177637 2013-02-08 08:55:56Z andrea $
+# $Id: PKGBUILD 181883 2013-04-05 08:54:26Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlqt
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Perl bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt"
@@ -12,7 +12,7 @@ groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'perl-list-moreutils')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz")
-sha1sums=('2e7bba884c5461ae17ecdc46e294d2e00d99a3a5')
+sha1sums=('808aa907b5953ad2c2abb4015da5ddc01d1e2afb')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index a0127b51c..cf9c08f7c 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 177634 2013-02-08 08:55:53Z andrea $
+# $Id: PKGBUILD 181880 2013-04-05 08:54:23Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-python
 pkgname=('kdebindings-python'
          'kdebindings-python2'
          'kdebindings-python-common')
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ groups=('kdebindings')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
              'pyqt' 'qscintilla' 'python2-sip' 'python-sip' 'mesa')
              source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
-sha1sums=('d587d16363d2184320faf3636ac92f9b50ef5720')
+sha1sums=('a17d533fca8126970ec8886f55297f1005df3eb5')
 
 build() {
   export PYTHONDONTWRITEBYTECODE="TRUE"
diff --git a/extra/kdebindings-python/pyqt495.patch b/extra/kdebindings-python/pyqt495.patch
deleted file mode 100644
index b8a9df258..000000000
--- a/extra/kdebindings-python/pyqt495.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Mon, 01 Oct 2012 18:47:56 +0000
-Subject: Remove duplicated QVector<int> definition, since it's in PyQt now.
-X-Git-Url: http://quickgit.kde.org/?p=pykde4.git&amp;a=commitdiff&amp;h=017822bd0dfc83fe9a7a483ecc33f4aab839a3c6
----
-Remove duplicated QVector<int> definition, since it's in PyQt now.
-Simon, if you have time, please review if everything is OK.
-
-CCMAIL: simon@simonzone.com
----
-
-
---- a/sip/kdecore/typedefs.sip
-+++ b/sip/kdecore/typedefs.sip
-@@ -951,78 +951,4 @@
- %End
- };
- 
--%MappedType QVector<int>
--{
--%TypeHeaderCode
--#include <qvector.h>
--%End
--
--%ConvertFromTypeCode
--    // Create the list.
--    PyObject *l;
--
--    if ((l = PyList_New(sipCpp->size())) == NULL)
--        return NULL;
--
--    // Set the list elements.
--    for (int i = 0; i < sipCpp->size(); ++i)
--    {
--        int t = (sipCpp->at(i));
--
--#if PY_MAJOR_VERSION >= 3        
--        PyObject *tobj = PyLong_FromLong(t);
--#else
--        PyObject *tobj = PyInt_FromLong(t);
--#endif
--
--        PyList_SET_ITEM(l, i, tobj);
--    }
--
--    return l;
--%End
--
--%ConvertToTypeCode
--    // Check the type if that is all that is required.
--    if (sipIsErr == NULL)
--    {
--        if (!PyList_Check(sipPy))
--            return 0;
--
--        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
--            PyObject *tobj = PyList_GET_ITEM(sipPy, i);
--#if PY_MAJOR_VERSION >= 3
--            if (!PyNumber_Check(tobj))
--#else
--            if (!PyInt_Check(tobj))
--#endif
--                return 0;
--        }
--        return 1;
--    }
--
--    QVector<int> *qv = new QVector<int>;
-- 
--    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--    {
--        PyObject *tobj = PyList_GET_ITEM(sipPy, i);
-- #if PY_MAJOR_VERSION >= 3
--        int t = PyLong_AsLong (tobj);
--#else
--        int t = PyInt_AS_LONG (tobj);
--#endif
--
--        if (*sipIsErr)
--        {
--            delete qv;
--            return 0;
--        }
--
--        qv->append(t);
--    }
-- 
--    *sipCppPtr = qv;
-- 
--    return sipGetState(sipTransferObj);
--%End
--};
--
-+
-
diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD
index d0606e012..14cc17fe5 100644
--- a/extra/kdebindings-qtruby/PKGBUILD
+++ b/extra/kdebindings-qtruby/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177639 2013-02-08 08:55:57Z andrea $
+# $Id: PKGBUILD 181885 2013-04-05 08:54:28Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qtruby
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Ruby bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby"
@@ -13,10 +13,9 @@ depends=('kdebindings-smokeqt' 'ruby')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-ruby')
 source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz")
-sha1sums=('0a6a8617d34153d87d59a610e38e870f41e4ea25')
+sha1sums=('5db91d696af4c9bcb784921ff7aa937bbc38ed01')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../qtruby-${pkgver} \
@@ -29,6 +28,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD
index 1f30d3e4f..4504adaab 100644
--- a/extra/kdebindings-qyoto/PKGBUILD
+++ b/extra/kdebindings-qyoto/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177638 2013-02-08 08:55:56Z andrea $
+# $Id: PKGBUILD 181884 2013-04-05 08:54:27Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qyoto
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto"
@@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-csharp')
 source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz")
-sha1sums=('cbb36bd0d83fa34c9afe929913738d3acc807ee8')
+sha1sums=('eaeb11ace135a0c9daceaa03067f056255d77dc8')
 
 build() {
   mkdir build
diff --git a/extra/kdebindings-qyoto/cmake2810.patch b/extra/kdebindings-qyoto/cmake2810.patch
deleted file mode 100644
index 9c0343a27..000000000
--- a/extra/kdebindings-qyoto/cmake2810.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake.cmake_2_8_10 qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake
---- qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake.cmake_2_8_10	2012-08-13 04:00:53.000000000 -0500
-+++ qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake	2012-11-06 15:31:18.719822193 -0600
-@@ -84,6 +84,9 @@ endif (CMAKE_CSharp_COMPILER)
- get_filename_component(script_dir ${CMAKE_CURRENT_LIST_FILE} PATH)
- 
- # configure variables set in this file for fast reload later on
--configure_file(${script_dir}/CMakeCSharpCompiler.cmake.in
--  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY)
-+ if(NOT CMAKE_PLATFORM_INFO_DIR) # pre-2.8.10
-+   set(CMAKE_PLATFORM_INFO_DIR ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY})
-+ endif()
-+ configure_file(${script_dir}/CMakeCSharpCompiler.cmake.in
-+   ${CMAKE_PLATFORM_INFO_DIR}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY)
- set(CMAKE_CSharp_COMPILER_ENV_VAR "CSC")
diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD
index 685b86707..c0ab79396 100644
--- a/extra/kdebindings-smokegen/PKGBUILD
+++ b/extra/kdebindings-smokegen/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177631 2013-02-08 08:55:50Z andrea $
+# $Id: PKGBUILD 181877 2013-04-05 08:54:20Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokegen
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A general purpose C++ parser with a plugin infrastructure"
 url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen"
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz")
-sha1sums=('435dd2e087ab527d0c81e1eb883f689a457a40c2')
+sha1sums=('2593b298e9b0f4f504612f42a928a2144313b4b4')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD
index 2d578e237..8009bc25d 100644
--- a/extra/kdebindings-smokekde/PKGBUILD
+++ b/extra/kdebindings-smokekde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177636 2013-02-08 08:55:55Z andrea $
+# $Id: PKGBUILD 181882 2013-04-05 08:54:25Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokekde
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Language independent library for KDE bindings"
 url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde"
@@ -18,7 +18,7 @@ optdepends=('kdesdk-kate: Kate bindings'
             'kdepimlibs: akonadi bindings')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz")
-sha1sums=('bcf9bb164a209b1c5f4870440f01809a3486c1e4')
+sha1sums=('8f99c5a53634532f6d8d02dc5f7ec0ffba194f4a')
 
 build() {
   mkdir build
diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD
index d8d0c9e93..b596ae297 100644
--- a/extra/kdebindings-smokeqt/PKGBUILD
+++ b/extra/kdebindings-smokeqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177632 2013-02-08 08:55:51Z andrea $
+# $Id: PKGBUILD 181878 2013-04-05 08:54:21Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokeqt
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Language independent library for Qt bindings"
 url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt"
@@ -13,7 +13,7 @@ depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla')
 makedepends=('cmake' 'automoc4' 'mesa')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz")
-sha1sums=('68c3b9bdf1b378014268d60ec657f457d784e3ec')
+sha1sums=('6a5743917aec02e6044c711c63acd229c67eff7b')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD
index 48df7d152..a2927a093 100644
--- a/extra/kdeedu-analitza/PKGBUILD
+++ b/extra/kdeedu-analitza/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177650 2013-02-08 08:56:09Z andrea $
+# $Id: PKGBUILD 181896 2013-04-05 08:54:41Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-analitza
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A library to add mathematical features to your program"
 url="https://projects.kde.org/projects/kde/kdeedu/analitza"
@@ -10,9 +10,9 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'mesa')
+makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz")
-sha1sums=('d4b5b1db869594768b1c685e64d9cab5c3229a8e')
+sha1sums=('e4acd6859140c3860eead695c2f20195b8df0a4a')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD
index c1e67698c..b22760123 100644
--- a/extra/kdeedu-blinken/PKGBUILD
+++ b/extra/kdeedu-blinken/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177667 2013-02-08 08:56:28Z andrea $
+# $Id: PKGBUILD 181913 2013-04-05 08:54:57Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-blinken
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Memory Enhancement Game"
 url="http://kde.org/applications/education/blinken/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz")
-sha1sums=('acb82e55a84f4205f388f782b4bb7593263ca614')
+sha1sums=('884c9bd072325b3fc3e06da5c875516c6ee1f728')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD
index 4e8a233a5..41d6337f4 100644
--- a/extra/kdeedu-cantor/PKGBUILD
+++ b/extra/kdeedu-cantor/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177668 2013-02-08 08:56:29Z andrea $
+# $Id: PKGBUILD 181914 2013-04-05 08:54:58Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-cantor
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="KDE Frontend to Mathematical Software"
 url="http://kde.org/applications/education/cantor/"
@@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend'
             'r: R backend')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz")
-sha1sums=('6132287443ffc9e99d9ff738582e81ea2fe22b4a')
+sha1sums=('7611cb379889f87908931ba25a2de9072de75e22')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD
index 69b6d3572..e7fbd371e 100644
--- a/extra/kdeedu-kalgebra/PKGBUILD
+++ b/extra/kdeedu-kalgebra/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177669 2013-02-08 08:56:30Z andrea $
+# $Id: PKGBUILD 181915 2013-04-05 08:54:59Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalgebra
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Graph Calculator"
 url="http://kde.org/applications/education/kalgebra/"
@@ -10,10 +10,10 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza')
-makedepends=('cmake' 'automoc4' 'mesa')
+makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz")
-sha1sums=('ce15669276e49c5385f53fae0a4a41bc22b5c1f6')
+sha1sums=('f029006b89aa75e6584836a90832f5130fff49b5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD
index 111d60e89..bb35a302c 100644
--- a/extra/kdeedu-kalzium/PKGBUILD
+++ b/extra/kdeedu-kalzium/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177670 2013-02-08 08:56:31Z andrea $
+# $Id: PKGBUILD 181916 2013-04-05 08:55:00Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalzium
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Periodic Table of Elements"
 url="http://kde.org/applications/education/kalzium/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'avogadro' 'ocaml' 'facile' 'chemical-mime-data')
 makedepends=('cmake' 'automoc4' 'mesa')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz")
-sha1sums=('5723203d9b8c8369b3e78494bf2cbbaa17faee58')
+sha1sums=('bf4c5b19905d83dede215b672d6b2911eb6d57cc')
 
 build() {
   mkdir build
diff --git a/extra/kdeedu-kalzium/fix-linking.patch b/extra/kdeedu-kalzium/fix-linking.patch
deleted file mode 100644
index 6b0c1df7c..000000000
--- a/extra/kdeedu-kalzium/fix-linking.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit ffac09556f6f3d5d758bac9ba2b91117e6014ea7
-Author: Christoph Feck <christoph@maxiom.de>
-Date:   Fri Nov 2 17:31:48 2012 +0100
-
-    SVN_SILENT link
-    
-    If possible, please include this build fix in 4.9.3 tag.
-    
-    BUG: 308939
-    CCMAIL: kde-release-team@kde.org
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 03eabf3..c8f425a 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -138,7 +138,7 @@ target_link_libraries(kalzium ${KDE4_KHTML_LIBRARY} ${KDE4_KNEWSTUFF3_LIBS} ${KD
- if (OPENBABEL2_FOUND)
-    target_link_libraries(kalzium ${OPENBABEL2_LIBRARIES})
-    if (EIGEN2_FOUND AND Avogadro_FOUND)
--      target_link_libraries(kalzium compoundviewer avogadro)
-+      target_link_libraries(kalzium ${QT_QTOPENGL_LIBRARY} compoundviewer avogadro)
-    endif (EIGEN2_FOUND AND Avogadro_FOUND)
- endif (OPENBABEL2_FOUND)
- 
diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD
index 1eb182959..2e53ef4fe 100644
--- a/extra/kdeedu-kanagram/PKGBUILD
+++ b/extra/kdeedu-kanagram/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177671 2013-02-08 08:56:32Z andrea $
+# $Id: PKGBUILD 181917 2013-04-05 08:55:01Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kanagram
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Letter Order Game"
 url="http://kde.org/applications/education/kanagram/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz")
-sha1sums=('7794c54b370c605f9a96fb2faea87dc674fc364e')
+sha1sums=('2536db114e6be17baf1556293c95b70fe83aa609')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD
index a8deec9a8..2b18d08f2 100644
--- a/extra/kdeedu-kbruch/PKGBUILD
+++ b/extra/kdeedu-kbruch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177672 2013-02-08 08:56:33Z andrea $
+# $Id: PKGBUILD 181918 2013-04-05 08:55:02Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kbruch
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Exercise Fractions"
 url="http://kde.org/applications/education/kbruch/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz")
-sha1sums=('b8a0d164cdfbf227e164eeaae57bb7adfcc06929')
+sha1sums=('2ba86ec27e9890734dc6a74528b6082f31caa8aa')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD
index 611820d55..ac0f591de 100644
--- a/extra/kdeedu-kgeography/PKGBUILD
+++ b/extra/kdeedu-kgeography/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177673 2013-02-08 08:56:34Z andrea $
+# $Id: PKGBUILD 181919 2013-04-05 08:55:03Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kgeography
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Geography Trainer"
 url="http://kde.org/applications/education/kgeography/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz")
-sha1sums=('1674ee6238593ab2a8bdc11e19ebe0e5a007e978')
+sha1sums=('14cd9d3d788a9f0068af3e10f26f0375b5c7251a')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD
index aff2237a6..d085c2164 100644
--- a/extra/kdeedu-khangman/PKGBUILD
+++ b/extra/kdeedu-khangman/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177674 2013-02-08 08:56:35Z andrea $
+# $Id: PKGBUILD 181920 2013-04-05 08:55:05Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-khangman
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Hangman Game"
 url="http://kde.org/applications/education/khangman/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz")
-sha1sums=('fc7286ccc2a70a4c6fb3e28417007ffc966e16a2')
+sha1sums=('2795c1ada9898854fe3a8ffd8a92c8ad5cd3eb04')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD
index 224fcde65..e061351eb 100644
--- a/extra/kdeedu-kig/PKGBUILD
+++ b/extra/kdeedu-kig/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177675 2013-02-08 08:56:37Z andrea $
+# $Id: PKGBUILD 181921 2013-04-05 08:55:07Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kig
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Interactive Geometry"
 url="http://kde.org/applications/education/kig/"
@@ -13,10 +13,9 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz")
-sha1sums=('42504e6358f5d1f7685c8d2663efa5bce5464b93')
+sha1sums=('0066e645cd11d239678aa90ede938daf4dd0942d')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../kig-${pkgver} \
@@ -27,7 +26,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 
   # Use the python2 executable
diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD
index ef76f56c6..ef2084d3e 100644
--- a/extra/kdeedu-kiten/PKGBUILD
+++ b/extra/kdeedu-kiten/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177676 2013-02-08 08:56:38Z andrea $
+# $Id: PKGBUILD 181922 2013-04-05 08:55:08Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kiten
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Japanese Reference/Study Tool"
 url="http://kde.org/applications/education/kiten/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz")
-sha1sums=('269d08e841d0697ddda8b310e90c059aa8d85201')
+sha1sums=('7aa2d6889c932639ded77eac33b9ae09ed7bbc45')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD
index b1db203e6..5586b694f 100644
--- a/extra/kdeedu-klettres/PKGBUILD
+++ b/extra/kdeedu-klettres/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177677 2013-02-08 08:56:39Z andrea $
+# $Id: PKGBUILD 181923 2013-04-05 08:55:10Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-klettres
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Learn The Alphabet"
 url="http://kde.org/applications/education/klettres/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz")
-sha1sums=('22cd76e4808925225855d0f9d1b80e2b60eb02a9')
+sha1sums=('101cd33b6e099174358d1ac754747cdf17cf6ba5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD
index 4a27077e1..9d747bd0c 100644
--- a/extra/kdeedu-kmplot/PKGBUILD
+++ b/extra/kdeedu-kmplot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177678 2013-02-08 08:56:41Z andrea $
+# $Id: PKGBUILD 181924 2013-04-05 08:55:11Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kmplot
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Mathematical Function Plotter"
 url="http://kde.org/applications/education/kmplot/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz")
-sha1sums=('2e4641e4f368965d3d63b682c237d879609704d6')
+sha1sums=('938f0888702e3d294aba8084b4268d883fd7514e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD
index 9393801c6..d905f8177 100644
--- a/extra/kdeedu-kstars/PKGBUILD
+++ b/extra/kdeedu-kstars/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177679 2013-02-08 08:56:42Z andrea $
+# $Id: PKGBUILD 181925 2013-04-05 08:55:13Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kstars
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Desktop Planetarium"
 url="http://kde.org/applications/education/kstars/"
@@ -10,10 +10,10 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'wcslib' 'libindi')
-makedepends=('cmake' 'automoc4' 'eigen' 'mesa')
+makedepends=('cmake' 'automoc4' 'eigen')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz")
-sha1sums=('3b5542ddccf7b9a7d96649a26b0dffd1fb029046')
+sha1sums=('ce99c18862505eac3da729e666315d0b27daec1e')
 
 build() {
   mkdir build
diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD
index 5a77e55ee..bc82e740d 100644
--- a/extra/kdeedu-ktouch/PKGBUILD
+++ b/extra/kdeedu-ktouch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177680 2013-02-08 08:56:43Z andrea $
+# $Id: PKGBUILD 181926 2013-04-05 08:55:14Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-ktouch
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Touch Typing Tutor"
 url="http://kde.org/applications/education/ktouch/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'mesa')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz")
-sha1sums=('3a37cb717e7edc88f73c94ee4e328c79234071bd')
+sha1sums=('7a7c44b1bf64fdc5109be9d1b6d1481db6a1848f')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD
index 73ead070b..ec4d03e9b 100644
--- a/extra/kdeedu-kturtle/PKGBUILD
+++ b/extra/kdeedu-kturtle/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177681 2013-02-08 08:56:45Z andrea $
+# $Id: PKGBUILD 181927 2013-04-05 08:55:16Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kturtle
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Educational Programming Environment"
 url="http://kde.org/applications/education/kturtle/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz")
-sha1sums=('275d42b8947a038f1f1f1661177ab24ddcf512f1')
+sha1sums=('c14cb19822fc101100938e4fcde0d50b16216cff')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD
index 65de4ba4e..b490bc1ef 100644
--- a/extra/kdeedu-kwordquiz/PKGBUILD
+++ b/extra/kdeedu-kwordquiz/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177682 2013-02-08 08:56:46Z andrea $
+# $Id: PKGBUILD 181928 2013-04-05 08:55:18Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kwordquiz
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Flash Card Trainer"
 url="http://kde.org/applications/education/kwordquiz/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz")
-sha1sums=('3fde5dc7973e1d35b634faa892113d553d342ad0')
+sha1sums=('e21947d795f1025ee7766ac9c47bbe879b5d1a0e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD
index f6954a72b..e693b1c14 100644
--- a/extra/kdeedu-marble/PKGBUILD
+++ b/extra/kdeedu-marble/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177645 2013-02-08 08:56:05Z andrea $
+# $Id: PKGBUILD 181891 2013-04-05 08:54:35Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-marble
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Desktop Globe"
 url="http://kde.org/applications/education/marble/"
@@ -14,10 +14,9 @@ makedepends=('cmake' 'automoc4' 'gpsd')
 optdepends=('gpsd: gps support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz")
-sha1sums=('c1db6b1785ca1ad230de6da0e67ee84bf7e3a2cd')
+sha1sums=('e4ba6aaaa5f861f715a7c4881dd78ed1deb03a36')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../marble-${pkgver} \
@@ -28,6 +27,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD
index 042fd1443..2d493d971 100644
--- a/extra/kdeedu-pairs/PKGBUILD
+++ b/extra/kdeedu-pairs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177683 2013-02-08 08:56:48Z andrea $
+# $Id: PKGBUILD 181929 2013-04-05 08:55:19Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-pairs
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A memory and pairs game for KDE"
 url="https://projects.kde.org/projects/kde/kdeedu/pairs"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/pairs-${pkgver}.tar.xz")
-sha1sums=('d59acdd58dc696938aca225b7ca0fd75294f769d')
+sha1sums=('24b556965b7cf11bdafb85706d8c4e3c1c3aad1e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD
index fedc43677..84096fdd2 100644
--- a/extra/kdeedu-parley/PKGBUILD
+++ b/extra/kdeedu-parley/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177684 2013-02-08 08:56:49Z andrea $
+# $Id: PKGBUILD 181930 2013-04-05 08:55:21Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-parley
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Vocabulary Trainer"
 url="http://kde.org/applications/education/parley/"
@@ -11,12 +11,12 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
+optdepends=('kdebindings-kross-python: scripting support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz")
-sha1sums=('9de22027fdb57fb516a0ae63d95341361ea939db')
+sha1sums=('1e9e568c2a4dce6a61a51164c43b3930efe99664')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../parley-${pkgver} \
@@ -27,6 +27,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD
index 028f5e173..f7efcc4c9 100644
--- a/extra/kdeedu-rocs/PKGBUILD
+++ b/extra/kdeedu-rocs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177685 2013-02-08 08:56:51Z andrea $
+# $Id: PKGBUILD 181931 2013-04-05 08:55:22Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-rocs
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Rocs Graph Theory"
 url="http://kde.org/applications/education/rocs/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz")
-sha1sums=('6e1d757518931a0ee41378a04e06cd66d51d6b9e')
+sha1sums=('ab7e357732fec3a7ecccce586c6de51b829267ed')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD
index f78233ab6..41c16e5f4 100644
--- a/extra/kdeedu-step/PKGBUILD
+++ b/extra/kdeedu-step/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177686 2013-02-08 08:56:52Z andrea $
+# $Id: PKGBUILD 181932 2013-04-05 08:55:24Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-step
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Interactive Physical Simulator"
 url="http://kde.org/applications/education/step/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl')
 makedepends=('cmake' 'automoc4' 'eigen' 'mesa')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz")
-sha1sums=('879c3afe9fe912447ac9c80396d242ac5bad021b')
+sha1sums=('ff5fccd47113b598b688b87226b23072047bf990')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegames-bomber/PKGBUILD b/extra/kdegames-bomber/PKGBUILD
index 4dc97bcff..a39e7c4a9 100644
--- a/extra/kdegames-bomber/PKGBUILD
+++ b/extra/kdegames-bomber/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177687 2013-02-08 08:56:53Z andrea $
+# $Id: PKGBUILD 181933 2013-04-05 08:55:25Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-bomber
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A single player arcade game"
 url="http://kde.org/applications/games/bomber/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/bomber-${pkgver}.tar.xz")
-sha1sums=('d9aaba9642c7e18977aa02805e9a418d2d806c28')
+sha1sums=('7f5e955127da33c7589103628cac356e6ebe4141')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-bovo/PKGBUILD b/extra/kdegames-bovo/PKGBUILD
index 9d4f8700a..4846be599 100644
--- a/extra/kdegames-bovo/PKGBUILD
+++ b/extra/kdegames-bovo/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177688 2013-02-08 08:56:55Z andrea $
+# $Id: PKGBUILD 181934 2013-04-05 08:55:27Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-bovo
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A Gomoku like game for two players"
 url="http://kde.org/applications/games/bovo/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/bovo-${pkgver}.tar.xz")
-sha1sums=('34320de58e63537bc021ca1ad5280593f2cd1482')
+sha1sums=('9af42dbd99c552adcba59deeaa6407b2465bde87')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-granatier/PKGBUILD b/extra/kdegames-granatier/PKGBUILD
index d5eac7b41..cc8a534c2 100644
--- a/extra/kdegames-granatier/PKGBUILD
+++ b/extra/kdegames-granatier/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177689 2013-02-08 08:56:56Z andrea $
+# $Id: PKGBUILD 181935 2013-04-05 08:55:29Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-granatier
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A clone of the classic Bomberman game"
 url="http://kde.org/applications/games/granatier/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/granatier-${pkgver}.tar.xz")
-sha1sums=('38c644961b479e34d837648c3dc6c5f8e890d9b5')
+sha1sums=('36ac5fe97d2ea06038f0a2f7e58d0949a6d72cd8')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kapman/PKGBUILD b/extra/kdegames-kapman/PKGBUILD
index 87d3d98f6..d7a3cfd2c 100644
--- a/extra/kdegames-kapman/PKGBUILD
+++ b/extra/kdegames-kapman/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177691 2013-02-08 08:56:58Z andrea $
+# $Id: PKGBUILD 181937 2013-04-05 08:55:31Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kapman
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A clone of the well known game Pac-Man"
 url="http://kde.org/applications/games/kapman/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kapman-${pkgver}.tar.xz")
-sha1sums=('cece24fa54d36497cdd43f627588a0c5110599fc')
+sha1sums=('b2a8122fbebc364dee64707ccc720e62eb1af66a')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-katomic/PKGBUILD b/extra/kdegames-katomic/PKGBUILD
index 2687dcafb..2e022d966 100644
--- a/extra/kdegames-katomic/PKGBUILD
+++ b/extra/kdegames-katomic/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177692 2013-02-08 08:56:59Z andrea $
+# $Id: PKGBUILD 181938 2013-04-05 08:55:33Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-katomic
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A fun and educational game built around molecular geometry"
 url="http://kde.org/applications/games/katomic/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/katomic-${pkgver}.tar.xz")
-sha1sums=('4f34335251331f0abcdc801400f4fb821fcb9a63')
+sha1sums=('c7d3fc2dc10ce90092d229f1a879a0081e26cd8b')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kblackbox/PKGBUILD b/extra/kdegames-kblackbox/PKGBUILD
index 25e9ee9ff..54a3fcc66 100644
--- a/extra/kdegames-kblackbox/PKGBUILD
+++ b/extra/kdegames-kblackbox/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177693 2013-02-08 08:57:00Z andrea $
+# $Id: PKGBUILD 181939 2013-04-05 08:55:34Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kblackbox
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A game of hide and seek played on a grid of boxes"
 url="http://kde.org/applications/games/kblackbox/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kblackbox-${pkgver}.tar.xz")
-sha1sums=('5babfbd66211655da8a45155fd136451a6d782ca')
+sha1sums=('3d29652827a4fba86615a424f5a5b0bcffc184b7')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kblocks/PKGBUILD b/extra/kdegames-kblocks/PKGBUILD
index 3b801c112..8bfba5757 100644
--- a/extra/kdegames-kblocks/PKGBUILD
+++ b/extra/kdegames-kblocks/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177694 2013-02-08 08:57:02Z andrea $
+# $Id: PKGBUILD 181940 2013-04-05 08:55:36Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kblocks
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="The classic falling blocks game"
 url="http://kde.org/applications/games/kblocks/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kblocks-${pkgver}.tar.xz")
-sha1sums=('969e5de340ed2052b42bf1e0b8a5da3dce41f3da')
+sha1sums=('be903b314547ccdc0eee335a34bac00bc769c3b7')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kbounce/PKGBUILD b/extra/kdegames-kbounce/PKGBUILD
index 30350f569..168954593 100644
--- a/extra/kdegames-kbounce/PKGBUILD
+++ b/extra/kdegames-kbounce/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177695 2013-02-08 08:57:03Z andrea $
+# $Id: PKGBUILD 181941 2013-04-05 08:55:37Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kbounce
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A single player arcade game with the elements of puzzle"
 url="http://kde.org/applications/games/kbounce/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kbounce-${pkgver}.tar.xz")
-sha1sums=('e59c9386f3a8accf2f58b223ec45fe52e92e2871')
+sha1sums=('1f27198383237538791eccad15c7ca6da946826e')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kbreakout/PKGBUILD b/extra/kdegames-kbreakout/PKGBUILD
index f3017449e..d88fab1c1 100644
--- a/extra/kdegames-kbreakout/PKGBUILD
+++ b/extra/kdegames-kbreakout/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177696 2013-02-08 08:57:05Z andrea $
+# $Id: PKGBUILD 181942 2013-04-05 08:55:39Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kbreakout
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A Breakout-like game"
 url="http://kde.org/applications/games/kbreakout/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kbreakout-${pkgver}.tar.xz")
-sha1sums=('caea3b85d3583dbebe403d5b5dccd0ad626ff39c')
+sha1sums=('3c93764ffcb0f1eb444b52ae7ef7c7134728178e')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kdiamond/PKGBUILD b/extra/kdegames-kdiamond/PKGBUILD
index f9cf30bcf..c1b9db498 100644
--- a/extra/kdegames-kdiamond/PKGBUILD
+++ b/extra/kdegames-kdiamond/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177697 2013-02-08 08:57:06Z andrea $
+# $Id: PKGBUILD 181943 2013-04-05 08:55:40Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kdiamond
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A single player puzzle game"
 url="http://kde.org/applications/games/kdiamond/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kdiamond-${pkgver}.tar.xz")
-sha1sums=('4c587c26e547ad8ace040df5d6f4208aa1116cb2')
+sha1sums=('57b6525cd17fa69e99d596441aa10c626766846b')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kfourinline/PKGBUILD b/extra/kdegames-kfourinline/PKGBUILD
index d8024ef2a..8f9e2407f 100644
--- a/extra/kdegames-kfourinline/PKGBUILD
+++ b/extra/kdegames-kfourinline/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177698 2013-02-08 08:57:07Z andrea $
+# $Id: PKGBUILD 181944 2013-04-05 08:55:44Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kfourinline
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A four-in-a-row game"
 url="http://kde.org/applications/games/kfourinline/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kfourinline-${pkgver}.tar.xz")
-sha1sums=('147afa6ebe5df5d93d6564aeec0ddfd54d894797')
+sha1sums=('b587f56bf5f095ec44da271e04b325f6dcc5c5f0')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kgoldrunner/PKGBUILD b/extra/kdegames-kgoldrunner/PKGBUILD
index 98608e86a..b781284f9 100644
--- a/extra/kdegames-kgoldrunner/PKGBUILD
+++ b/extra/kdegames-kgoldrunner/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177699 2013-02-08 08:57:08Z andrea $
+# $Id: PKGBUILD 181945 2013-04-05 08:55:47Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kgoldrunner
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A game of action and puzzle solving"
 url="http://kde.org/applications/games/kgoldrunner/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kgoldrunner-${pkgver}.tar.xz")
-sha1sums=('87ba1974279e7785beeeaeb776e3d12d1ee5abdf')
+sha1sums=('8c44b9992239d379d64c7979c1cd4ec56c5aa80f')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kigo/PKGBUILD b/extra/kdegames-kigo/PKGBUILD
index 5b8237b4d..77ff440f8 100644
--- a/extra/kdegames-kigo/PKGBUILD
+++ b/extra/kdegames-kigo/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177700 2013-02-08 08:57:09Z andrea $
+# $Id: PKGBUILD 181946 2013-04-05 08:55:49Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kigo
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="An open-source implementation of the popular Go game"
 url="http://kde.org/applications/games/kigo/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'gnugo')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kigo-${pkgver}.tar.xz")
-sha1sums=('0dcee4587b9c57847bf8c2c7e0d2450c386aa969')
+sha1sums=('229b2631b89b31bb1661a10c6de2770842c48e85')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-killbots/PKGBUILD b/extra/kdegames-killbots/PKGBUILD
index afa44fd54..b90198d0f 100644
--- a/extra/kdegames-killbots/PKGBUILD
+++ b/extra/kdegames-killbots/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177701 2013-02-08 08:57:12Z andrea $
+# $Id: PKGBUILD 181947 2013-04-05 08:55:50Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-killbots
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A simple game of evading killer robots"
 url="http://kde.org/applications/games/killbots/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/killbots-${pkgver}.tar.xz")
-sha1sums=('0fe272b75230c2a12b05275166fe0d3e50491e9e')
+sha1sums=('87100f1fcb1e3547939406d6d4a4b8b2582831c8')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kiriki/PKGBUILD b/extra/kdegames-kiriki/PKGBUILD
index c69c8db15..84f36f6db 100644
--- a/extra/kdegames-kiriki/PKGBUILD
+++ b/extra/kdegames-kiriki/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177702 2013-02-08 08:57:14Z andrea $
+# $Id: PKGBUILD 181948 2013-04-05 08:55:52Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kiriki
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="An addictive and fun dice game"
 url="http://kde.org/applications/games/kiriki/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kiriki-${pkgver}.tar.xz")
-sha1sums=('57b17dccf458a7260732c8d1c3724451a104fdf1')
+sha1sums=('f3ec86d168cc21fe22adb610121df62a6280ff1d')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kjumpingcube/PKGBUILD b/extra/kdegames-kjumpingcube/PKGBUILD
index 9fd142502..0ca441995 100644
--- a/extra/kdegames-kjumpingcube/PKGBUILD
+++ b/extra/kdegames-kjumpingcube/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177703 2013-02-08 08:57:16Z andrea $
+# $Id: PKGBUILD 181949 2013-04-05 08:55:53Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kjumpingcube
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A simple tactical game"
 url="http://kde.org/applications/games/kjumpingcube/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kjumpingcube-${pkgver}.tar.xz")
-sha1sums=('1f42e117175b75ae994ea5141ec52a4f2516bdce')
+sha1sums=('c81585d2e46ec0783d58e6d0068b75fd82ddd382')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-klickety/PKGBUILD b/extra/kdegames-klickety/PKGBUILD
index 0077a3be9..88055e0bc 100644
--- a/extra/kdegames-klickety/PKGBUILD
+++ b/extra/kdegames-klickety/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177704 2013-02-08 08:57:17Z andrea $
+# $Id: PKGBUILD 181950 2013-04-05 08:55:55Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-klickety
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="An adaptation of the Clickomania game"
 url="http://kde.org/applications/games/klickety/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/klickety-${pkgver}.tar.xz")
-sha1sums=('28d7e93f5b93f898f0364b86406adafa52f46891')
+sha1sums=('54548dd1ebad1481ecda5a50df7e72a43a6a8cbb')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-klines/PKGBUILD b/extra/kdegames-klines/PKGBUILD
index 311f96885..bbc7b1eb1 100644
--- a/extra/kdegames-klines/PKGBUILD
+++ b/extra/kdegames-klines/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177705 2013-02-08 08:57:21Z andrea $
+# $Id: PKGBUILD 181951 2013-04-05 08:55:56Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-klines
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A simple but highly addictive, one player game"
 url="http://kde.org/applications/games/klines/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/klines-${pkgver}.tar.xz")
-sha1sums=('0886b2c788725034f4b8367a6f5db16344a87159')
+sha1sums=('e8bb9a43ca3207f961bcae60312af37f226d7ec0')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kmahjongg/PKGBUILD b/extra/kdegames-kmahjongg/PKGBUILD
index 0a748bf60..893cf1b5d 100644
--- a/extra/kdegames-kmahjongg/PKGBUILD
+++ b/extra/kdegames-kmahjongg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177706 2013-02-08 08:57:23Z andrea $
+# $Id: PKGBUILD 181952 2013-04-05 08:55:57Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kmahjongg
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A tile matching game for one or two players"
 url="http://kde.org/applications/games/kmahjongg/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkmahjongg' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmahjongg-${pkgver}.tar.xz")
-sha1sums=('9a2532fac72ccac404379e02c2a5d0e649fc04fe')
+sha1sums=('c54467341866d975a25529b70033bb0f45920d11')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kmines/PKGBUILD b/extra/kdegames-kmines/PKGBUILD
index 0b721fd79..ceb877d7f 100644
--- a/extra/kdegames-kmines/PKGBUILD
+++ b/extra/kdegames-kmines/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177707 2013-02-08 08:57:24Z andrea $
+# $Id: PKGBUILD 181953 2013-04-05 08:55:59Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kmines
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="The classic Minesweeper game"
 url="http://kde.org/applications/games/kmines/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmines-${pkgver}.tar.xz")
-sha1sums=('59eeead2673b8ac6dfd0e7aab22bc27206a9d12a')
+sha1sums=('5b0775fb30fe59c017651d80658cc59f1358b7a4')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-knavalbattle/PKGBUILD b/extra/kdegames-knavalbattle/PKGBUILD
index 913048ff3..dd864f225 100644
--- a/extra/kdegames-knavalbattle/PKGBUILD
+++ b/extra/kdegames-knavalbattle/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177708 2013-02-08 08:57:26Z andrea $
+# $Id: PKGBUILD 181954 2013-04-05 08:56:04Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-knavalbattle
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A ship sinking game"
 url="http://kde.org/applications/games/knavalbattle/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/knavalbattle-${pkgver}.tar.xz")
-sha1sums=('a52486a7f3109633ce340981c6c1706312b69606')
+sha1sums=('668a3b98bd5d64ff1d35dc1f46ec2f4a5aa188fe')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-knetwalk/PKGBUILD b/extra/kdegames-knetwalk/PKGBUILD
index cc9d30369..37830a9c3 100644
--- a/extra/kdegames-knetwalk/PKGBUILD
+++ b/extra/kdegames-knetwalk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177709 2013-02-08 08:57:27Z andrea $
+# $Id: PKGBUILD 181955 2013-04-05 08:56:05Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-knetwalk
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Connect all the terminals to the server, in as few turns as possible"
 url="http://kde.org/applications/games/knetwalk/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/knetwalk-${pkgver}.tar.xz")
-sha1sums=('bb6587f4f008c1bfcfed728f7d0e48de031a49e4')
+sha1sums=('6b5a992d5a6ca4ddb41561bdf9d2b83be0091962')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kolf/PKGBUILD b/extra/kdegames-kolf/PKGBUILD
index 14046a4dd..a6b86bccb 100644
--- a/extra/kdegames-kolf/PKGBUILD
+++ b/extra/kdegames-kolf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177710 2013-02-08 08:57:28Z andrea $
+# $Id: PKGBUILD 181956 2013-04-05 08:56:07Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kolf
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A miniature golf game with 2d top-down view"
 url="http://kde.org/applications/games/kolf/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kolf-${pkgver}.tar.xz")
-sha1sums=('d91e64df3397b76940603963e32ff44357e67d4e')
+sha1sums=('148fe1a39763b97daaa3e4257b1f0e80e34cc723')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kollision/PKGBUILD b/extra/kdegames-kollision/PKGBUILD
index b89795b60..be8fcebae 100644
--- a/extra/kdegames-kollision/PKGBUILD
+++ b/extra/kdegames-kollision/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177711 2013-02-08 08:57:29Z andrea $
+# $Id: PKGBUILD 181957 2013-04-05 08:56:08Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kollision
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A simple ball dodging game"
 url="http://kde.org/applications/games/kollision/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kollision-${pkgver}.tar.xz")
-sha1sums=('edaa3f7bc9b15982e2aae6b7e97ce05dcf70fea8')
+sha1sums=('19f085adcf6477e4b69f554721e5a82a3754d8de')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-konquest/PKGBUILD b/extra/kdegames-konquest/PKGBUILD
index 80a523a65..344bb8545 100644
--- a/extra/kdegames-konquest/PKGBUILD
+++ b/extra/kdegames-konquest/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177712 2013-02-08 08:57:31Z andrea $
+# $Id: PKGBUILD 181958 2013-04-05 08:56:10Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-konquest
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="The KDE version of Gnu-Lactic"
 url="http://kde.org/applications/games/konquest/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/konquest-${pkgver}.tar.xz")
-sha1sums=('b09b6cdb70a5a9b423215679c4db044768f4338a')
+sha1sums=('acb21acfab00f8a5a03105fad6100cec513958ff')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kpatience/PKGBUILD b/extra/kdegames-kpatience/PKGBUILD
index 4aa0cb6ec..81bcb63aa 100644
--- a/extra/kdegames-kpatience/PKGBUILD
+++ b/extra/kdegames-kpatience/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177713 2013-02-08 08:57:32Z andrea $
+# $Id: PKGBUILD 181959 2013-04-05 08:56:12Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kpatience
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Offers a selection of solitaire card games"
 url="http://kde.org/applications/games/kpat/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kpat-${pkgver}.tar.xz")
-sha1sums=('a77aed1c84363e76fc8aab49125b62f4b0d657b1')
+sha1sums=('9a4309cbadd8214cb2dd8ab1cd8bae4c20194cff')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kreversi/PKGBUILD b/extra/kdegames-kreversi/PKGBUILD
index 1d5c764fa..7b06a93c8 100644
--- a/extra/kdegames-kreversi/PKGBUILD
+++ b/extra/kdegames-kreversi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177714 2013-02-08 08:57:33Z andrea $
+# $Id: PKGBUILD 181960 2013-04-05 08:56:14Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kreversi
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A simple one player strategy game played against the computer"
 url="http://kde.org/applications/games/kreversi/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kreversi-${pkgver}.tar.xz")
-sha1sums=('0bb2b856a1097289a69cd01d33e4208a54c62e1f')
+sha1sums=('a79e1b20849e419037c28febad0422a634a0585b')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kshisen/PKGBUILD b/extra/kdegames-kshisen/PKGBUILD
index 61a46ca5d..b195f9205 100644
--- a/extra/kdegames-kshisen/PKGBUILD
+++ b/extra/kdegames-kshisen/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177715 2013-02-08 08:57:35Z andrea $
+# $Id: PKGBUILD 181961 2013-04-05 08:56:16Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kshisen
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A solitaire-like game played using the standard set of Mahjong tiles"
 url="http://kde.org/applications/games/kshisen/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'libkmahjongg')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kshisen-${pkgver}.tar.xz")
-sha1sums=('19a9ae4b91afb3890a207d3a5c6d139f0b5a9300')
+sha1sums=('df41aac7d3048ccfdbd55b62872643c7325b9722')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ksirk/PKGBUILD b/extra/kdegames-ksirk/PKGBUILD
index f1d8f863a..b1cae4943 100644
--- a/extra/kdegames-ksirk/PKGBUILD
+++ b/extra/kdegames-ksirk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177716 2013-02-08 08:57:36Z andrea $
+# $Id: PKGBUILD 181962 2013-04-05 08:56:17Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ksirk
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A computerized version of a well known strategy game"
 url="http://kde.org/applications/games/ksirk/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksirk-${pkgver}.tar.xz")
-sha1sums=('a40e6d13bbbf396335744e443ef2f6cbfa003b5b')
+sha1sums=('d64786e76fa87f8f99962a3676c82ae48f3e7841')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ksnakeduel/PKGBUILD b/extra/kdegames-ksnakeduel/PKGBUILD
index 17f89f99a..ab5bab7ad 100644
--- a/extra/kdegames-ksnakeduel/PKGBUILD
+++ b/extra/kdegames-ksnakeduel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177717 2013-02-08 08:57:37Z andrea $
+# $Id: PKGBUILD 181963 2013-04-05 08:56:19Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ksnakeduel
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A simple snake duel game"
 url="http://kde.org/applications/games/ksnakeduel/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksnakeduel-${pkgver}.tar.xz")
-sha1sums=('36b5dfd4df30c401fd90b174eee1d1f1910b1818')
+sha1sums=('b359a1bfdcba0fdd872c27d0d94ddbd4e1726676')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kspaceduel/PKGBUILD b/extra/kdegames-kspaceduel/PKGBUILD
index 627b6a093..88908f240 100644
--- a/extra/kdegames-kspaceduel/PKGBUILD
+++ b/extra/kdegames-kspaceduel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177718 2013-02-08 08:57:40Z andrea $
+# $Id: PKGBUILD 181964 2013-04-05 08:56:20Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kspaceduel
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Each of two possible players controls a satellite spaceship orbiting the sun"
 url="http://kde.org/applications/games/kspaceduel/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kspaceduel-${pkgver}.tar.xz")
-sha1sums=('6f0c9700aebfb2f309cc3260493db4b26563e21b')
+sha1sums=('2f1cbca7dea4e70d923bef72a2c57ad733712998')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ksquares/PKGBUILD b/extra/kdegames-ksquares/PKGBUILD
index ee5796451..0e3b1a4e9 100644
--- a/extra/kdegames-ksquares/PKGBUILD
+++ b/extra/kdegames-ksquares/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177719 2013-02-08 08:57:41Z andrea $
+# $Id: PKGBUILD 181965 2013-04-05 08:56:22Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ksquares
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A modeled after the well known pen and paper based game of Dots and Boxes"
 url="http://kde.org/applications/games/ksquares/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksquares-${pkgver}.tar.xz")
-sha1sums=('1a814d64694e4a435d4c08ccf0c0003e199818f2')
+sha1sums=('76651a698b03488cec1af125fb27bcf2d509c30a')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ksudoku/PKGBUILD b/extra/kdegames-ksudoku/PKGBUILD
index 1ceac1f1b..2a921fa49 100644
--- a/extra/kdegames-ksudoku/PKGBUILD
+++ b/extra/kdegames-ksudoku/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177720 2013-02-08 08:57:42Z andrea $
+# $Id: PKGBUILD 181966 2013-04-05 08:56:23Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ksudoku
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A logic-based symbol placement puzzle"
 url="http://kde.org/applications/games/ksudoku/"
@@ -10,10 +10,10 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4' 'mesa')
+makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksudoku-${pkgver}.tar.xz")
-sha1sums=('07db527cbfdbaf65da1a7f2d63b51aa8055a94c5')
+sha1sums=('91fcb7a9daa58340a2e73131add8e78e3121ae9b')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ktuberling/PKGBUILD b/extra/kdegames-ktuberling/PKGBUILD
index 5ebcff324..19df71454 100644
--- a/extra/kdegames-ktuberling/PKGBUILD
+++ b/extra/kdegames-ktuberling/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177721 2013-02-08 08:57:44Z andrea $
+# $Id: PKGBUILD 181967 2013-04-05 08:56:25Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ktuberling
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A simple constructor game suitable for children and adults alike"
 url="http://kde.org/applications/games/ktuberling/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ktuberling-${pkgver}.tar.xz")
-sha1sums=('82a14f5c8b4d95b02a7e430ba5340203feecdef8')
+sha1sums=('e2431b70470c37b9f46514fc62932ac7f225f6b7')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kubrick/PKGBUILD b/extra/kdegames-kubrick/PKGBUILD
index 38732db94..1d16c112d 100644
--- a/extra/kdegames-kubrick/PKGBUILD
+++ b/extra/kdegames-kubrick/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177722 2013-02-08 08:57:45Z andrea $
+# $Id: PKGBUILD 181968 2013-04-05 08:56:27Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kubrick
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Based on the famous Rubik's Cube"
 url="http://kde.org/applications/games/kubrick/"
@@ -10,10 +10,10 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4' 'mesa')
+makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kubrick-${pkgver}.tar.xz")
-sha1sums=('a8011960b054f6dbf43906836894b5c4a9bca3b3')
+sha1sums=('a112aa326c024e7bf224ecdcfe79122e9605d988')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-lskat/PKGBUILD b/extra/kdegames-lskat/PKGBUILD
index caca3118f..5b5bd4531 100644
--- a/extra/kdegames-lskat/PKGBUILD
+++ b/extra/kdegames-lskat/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177723 2013-02-08 08:57:47Z andrea $
+# $Id: PKGBUILD 181969 2013-04-05 08:56:28Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-lskat
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Lieutenant Skat is a fun and engaging card game for two players"
 url="http://kde.org/applications/games/lskat/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/lskat-${pkgver}.tar.xz")
-sha1sums=('0e8a52cd04be1debb31d80b095cb76afcd5ceb78')
+sha1sums=('a3f3450e446b365d7171552ddd00ab84f589b943')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-palapeli/PKGBUILD b/extra/kdegames-palapeli/PKGBUILD
index 34ab8f7f4..5ead324a0 100644
--- a/extra/kdegames-palapeli/PKGBUILD
+++ b/extra/kdegames-palapeli/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177724 2013-02-08 08:57:48Z andrea $
+# $Id: PKGBUILD 181970 2013-04-05 08:56:29Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-palapeli
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A single-player jigsaw puzzle game"
 url="http://kde.org/applications/games/palapeli/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/palapeli-${pkgver}.tar.xz")
-sha1sums=('da5a7b197e6a641c4882d15e85923303e2646567')
+sha1sums=('df69d8a792aa1283c4842b2e26d24c37c284380a')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-picmi/PKGBUILD b/extra/kdegames-picmi/PKGBUILD
index 51b6b2b0c..2630cfe8e 100644
--- a/extra/kdegames-picmi/PKGBUILD
+++ b/extra/kdegames-picmi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177725 2013-02-08 08:57:49Z andrea $
+# $Id: PKGBUILD 181971 2013-04-05 08:56:31Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-picmi
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A nonogram logic game for KDE"
 url="http://kde.org/applications/games/picmi/"
@@ -15,7 +15,7 @@ replaces=('picmi')
 conflicts=('picmi')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/picmi-${pkgver}.tar.xz")
-sha1sums=('fddda723e0168ec52e05e7e4791164f4c5b7eb6c')
+sha1sums=('04a01a90bce152759c8f638b780df22fe6266c1c')
 
 build() {
   mkdir build
diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD
deleted file mode 100644
index 6e58f035d..000000000
--- a/extra/kdegames/PKGBUILD
+++ /dev/null
@@ -1,435 +0,0 @@
-# $Id: PKGBUILD 174692 2013-01-05 13:21:25Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdegames
-pkgname=('kdegames-bomber'
-         'kdegames-bovo'
-         'kdegames-granatier'
-         'kdegames-kajongg'
-         'kdegames-kapman'
-         'kdegames-katomic'
-         'kdegames-kblackbox'
-         'kdegames-kblocks'
-         'kdegames-kbounce'
-         'kdegames-kbreakout'
-         'kdegames-kdiamond'
-         'kdegames-kfourinline'
-         'kdegames-kgoldrunner'
-         'kdegames-kigo'
-         'kdegames-killbots'
-         'kdegames-kiriki'
-         'kdegames-kjumpingcube'
-         'kdegames-klines'
-         'kdegames-klickety'
-         'kdegames-kmahjongg'
-         'kdegames-kmines'
-         'kdegames-knavalbattle'
-         'kdegames-knetwalk'
-         'kdegames-kolf'
-         'kdegames-kollision'
-         'kdegames-konquest'
-         'kdegames-kpatience'
-         'kdegames-kreversi'
-         'kdegames-kshisen'
-         'kdegames-ksirk'
-         'kdegames-ksnakeduel'
-         'kdegames-kspaceduel'
-         'kdegames-ksquares'
-         'kdegames-ksudoku'
-         'kdegames-ktuberling'
-         'kdegames-kubrick'
-         'kdegames-libkdegames'
-         'kdegames-libkmahjongg'
-         'kdegames-lskat'
-         'kdegames-palapeli')
-pkgver=4.9.5
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-makedepends=('cmake' 'automoc4' 'twisted' 'kdebindings-python2'
-             'openal' 'mesa')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('fffc38218cf81247fd19f700e6d42066eb9faa99')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2
-	make
-}
-
-package_kdegames-bomber() {
-	pkgdesc='Arcade Bombing Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/bomber/"
-	install='kdegames.install'
-	cd $srcdir/build/bomber
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-bovo() {
-	pkgdesc='Five-in-a-row Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/bovo/"
-	install='kdegames.install'
-	cd $srcdir/build/bovo
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-granatier() {
-	pkgdesc='Granatier'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
-	url="http://kde.org/applications/games/granatier/"
-	install='kdegames.install'
-	cd $srcdir/build/granatier
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kajongg() {
-	pkgdesc='The ancient Chinese board game for 4 players'
-	depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python2' 'twisted')
-        url="http://www.kde.org/applications/games/kajongg/"
-	install='kdegames.install'
-	cd $srcdir/build/kajongg
-	make DESTDIR=$pkgdir install
-
-	# Use the python2 executable
-	find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
-
-package_kdegames-kapman() {
-	pkgdesc='Eat pills escaping ghosts'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kapman/"
-	install='kdegames.install'
-	cd $srcdir/build/kapman
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-katomic() {
-	pkgdesc='Sokoban-like Logic Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/katomic/"
-	install='kdegames.install'
-	cd $srcdir/build/katomic
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-knavalbattle() {
-	pkgdesc='Naval Battle'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/knavalbattle/"
-	install='kdegames-knavalbattle.install'
-    replaces=('kdegames-kbattleship')
-    conflicts=('kdegames-kbattleship')
-    cd $srcdir/build/knavalbattle
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kblackbox() {
-	pkgdesc='Blackbox Logic Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kblackbox/"
-	install='kdegames.install'
-	cd $srcdir/build/kblackbox
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kblocks() {
-	pkgdesc='Falling Blocks Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kblocks/"
-	install='kdegames.install'
-	cd $srcdir/build/kblocks
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbounce() {
-	pkgdesc='Ball Bouncing Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kbounce/"
-	install='kdegames.install'
-	cd $srcdir/build/kbounce
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbreakout() {
-	pkgdesc='Breakout-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kbreakout/"
-	install='kdegames.install'
-	cd $srcdir/build/kbreakout
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kdiamond() {
-	pkgdesc='Three-in-a-row game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kdiamond/"
-	install='kdegames.install'
-	cd $srcdir/build/kdiamond
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kfourinline() {
-	pkgdesc='Four-in-a-row Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kfourinline/"
-	install='kdegames-kfourinline.install'
-	cd $srcdir/build/kfourinline
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kgoldrunner() {
-	pkgdesc='A game of action and puzzle-solving'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
-	url="http://kde.org/applications/games/kgoldrunner/"
-	install='kdegames.install'
-	cd $srcdir/build/kgoldrunner
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kigo() {
-	pkgdesc='Go Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo')
-	url="http://kde.org/applications/games/kigo/"
-	install='kdegames-kigo.install'
-	cd $srcdir/build/kigo
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-killbots() {
-	pkgdesc='Killbots'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/killbots/"
-	install='kdegames.install'
-	cd $srcdir/build/killbots
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kiriki() {
-	pkgdesc='Yahtzee-like Dice Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kiriki/"
-	install='kdegames.install'
-	cd $srcdir/build/kiriki
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kjumpingcube() {
-	pkgdesc='Territory Capture Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kjumpingcube/"
-	install='kdegames.install'
-	cd $srcdir/build/kjumpingcube
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-klickety() {
-	pkgdesc='Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	replaces=('kdegames-ksame')
-	conflicts=('kdegames-ksame')
-	url="http://kde.org/applications/games/ksame/"
-	install='kdegames.install'
-	cd $srcdir/build/klickety
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-klines() {
-	pkgdesc='Tactical Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/klines/"
-	install='kdegames.install'
-	cd $srcdir/build/klines
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kmahjongg() {
-	pkgdesc='Mahjongg Solitaire'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
-	url="http://kde.org/applications/games/kmahjongg/"
-	install='kdegames.install'
-	cd $srcdir/build/kmahjongg
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kmines() {
-	pkgdesc='Minesweeper-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kmines/"
-	install='kdegames.install'
-	cd $srcdir/build/kmines
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-knetwalk() {
-	pkgdesc='Network Construction Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/knetwalk/"
-	install='kdegames.install'
-	cd $srcdir/build/knetwalk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kolf() {
-	pkgdesc='Miniature Golf'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kolf/"
-	install='kdegames-kolf.install'
-	cd $srcdir/build/kolf
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kollision() {
-	pkgdesc='A simple ball dodging game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kollision/"
-	install='kdegames.install'
-	cd $srcdir/build/kollision
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-konquest() {
-	pkgdesc='Galactic Strategy Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/konquest/"
-	install='kdegames.install'
-	cd $srcdir/build/konquest
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kpatience() {
-	pkgdesc='Patience Card Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kpatience/"
-	install='kdegames-kpatience.install'
-	replaces=('kdegames-kpat')
-	cd $srcdir/build/kpat
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kreversi() {
-	pkgdesc='Reversi Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kreversi/"
-	install='kdegames.install'
-	cd $srcdir/build/kreversi
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kshisen() {
-	pkgdesc='Shisen-Sho Mahjongg-like Tile Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
-	url="http://kde.org/applications/games/kshisen/"
-	install='kdegames.install'
-	cd $srcdir/build/kshisen
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksirk() {
-	pkgdesc='World Domination Strategy Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ksirk/"
-	install='kdegames.install'
-	cd $srcdir/build/ksirk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kspaceduel() {
-	pkgdesc='Space Arcade Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kspaceduel/"
-	install='kdegames-kspaceduel.install'
-	cd $srcdir/build/kspaceduel
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksquares() {
-	pkgdesc='Connect the dots to create squares'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ksquares/"
-	install='kdegames.install'
-	cd $srcdir/build/ksquares
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksudoku() {
-	pkgdesc='KSudoku, Sudoku game & more for KDE'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ksudoku/"
-	install='kdegames.install'
-	cd $srcdir/build/ksudoku
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksnakeduel() {
-	pkgdesc='Snake-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ksnakeduel/"
-	install='kdegames.install'
-    replaces=('kdegames-ktron')
-    conflicts=('kdegames-ktron')
-	cd $srcdir/build/ksnakeduel
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ktuberling() {
-	pkgdesc='Picture Game for Children'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ktuberling/"
-	install='kdegames-ktuberling.install'
-	cd $srcdir/build/ktuberling
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kubrick() {
-	pkgdesc='A 3-D game based on Rubik´s Cube'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kubrick/"
-	install='kdegames.install'
-	cd $srcdir/build/kubrick
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-libkdegames() {
-	pkgdesc='KDE game library'
-	groups=()
-	depends=('kdelibs' 'openal')
-	cd $srcdir/build/libkdegames
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-libkmahjongg() {
-	pkgdesc='Library used for loading and rendering of Mahjongg tilesets'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/libkmahjongg
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-lskat() {
-	pkgdesc='Card Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/lskat/"
-	install='kdegames-lskat.install'
-	cd $srcdir/build/lskat
-	make DESTDIR=$pkgdir install
-}
-
-package_kdegames-palapeli() {
-	pkgdesc='Jigsaw puzzle game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/palapeli/"
-	install='kdegames-palapeli.install'
-	cd $srcdir/build/palapeli
-	make DESTDIR=$pkgdir install
-}
diff --git a/extra/kdegames/kdegames-kbattleship.install b/extra/kdegames/kdegames-kbattleship.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/extra/kdegames/kdegames-kbattleship.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdegames/kdegames-kfourinline.install b/extra/kdegames/kdegames-kfourinline.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/extra/kdegames/kdegames-kfourinline.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdegames/kdegames-kigo.install b/extra/kdegames/kdegames-kigo.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/extra/kdegames/kdegames-kigo.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdegames/kdegames-knavalbattle.install b/extra/kdegames/kdegames-knavalbattle.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/extra/kdegames/kdegames-knavalbattle.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdegames/kdegames-kolf.install b/extra/kdegames/kdegames-kolf.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/extra/kdegames/kdegames-kolf.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdegames/kdegames-kpatience.install b/extra/kdegames/kdegames-kpatience.install
deleted file mode 100644
index 3af34a012..000000000
--- a/extra/kdegames/kdegames-kpatience.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdegames/kdegames-kreversi.install b/extra/kdegames/kdegames-kreversi.install
deleted file mode 100644
index 4623e6e49..000000000
--- a/extra/kdegames/kdegames-kreversi.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	ggz-config -i -f -m usr/share/ggz/kreversi.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/kreversi.dsc ]; then
-		ggz-config -r -m usr/share/ggz/kreversi.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/extra/kdegames/kdegames-kspaceduel.install b/extra/kdegames/kdegames-kspaceduel.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/extra/kdegames/kdegames-kspaceduel.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdegames/kdegames-ksquares.install b/extra/kdegames/kdegames-ksquares.install
deleted file mode 100644
index 5a619897d..000000000
--- a/extra/kdegames/kdegames-ksquares.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	ggz-config -i -f -m usr/share/ggz/ksquares.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/ksquares.dsc ]; then
-		ggz-config -r -m usr/share/ggz/ksquares.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/extra/kdegames/kdegames-ktuberling.install b/extra/kdegames/kdegames-ktuberling.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/extra/kdegames/kdegames-ktuberling.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdegames/kdegames-lskat.install b/extra/kdegames/kdegames-lskat.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/extra/kdegames/kdegames-lskat.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdegames/kdegames-palapeli.install b/extra/kdegames/kdegames-palapeli.install
deleted file mode 100644
index c77e68041..000000000
--- a/extra/kdegames/kdegames-palapeli.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdegames/kdegames.install b/extra/kdegames/kdegames.install
deleted file mode 100644
index e70c054ec..000000000
--- a/extra/kdegames/kdegames.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD
index f24028c38..cf66051ce 100644
--- a/extra/kdegraphics-gwenview/PKGBUILD
+++ b/extra/kdegraphics-gwenview/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177726 2013-02-08 08:57:51Z andrea $
+# $Id: PKGBUILD 181972 2013-04-05 08:56:32Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-gwenview
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A fast and easy to use image viewer for KDE"
 url="http://kde.org/applications/graphics/gwenview/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'mesa')
 optdepends=('kipi-plugins: extra plugins to share photos')
 install=$pkgname.install
 source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz")
-sha1sums=('bdd429ead26780a27fd4b0b1132ad1f82ffc153e')
+sha1sums=('6872a50b2fda3bed717e0fc1b367b02ad80550dd')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD
index 90a0ec872..1045cc935 100644
--- a/extra/kdegraphics-kamera/PKGBUILD
+++ b/extra/kdegraphics-kamera/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177727 2013-02-08 08:57:52Z andrea $
+# $Id: PKGBUILD 181973 2013-04-05 08:56:33Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kamera
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Configure Kamera"
 url="http://kde.org/applications/graphics/kamera/"
@@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'libgphoto2')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz")
-sha1sums=('70f1f2d3497ad7f14aff53a26a842e2ce11279de')
+sha1sums=('5ee6904705c1d323c7c0d780d0ecf65f93175981')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD
index a47e99676..b830f104a 100644
--- a/extra/kdegraphics-kcolorchooser/PKGBUILD
+++ b/extra/kdegraphics-kcolorchooser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177728 2013-02-08 08:57:54Z andrea $
+# $Id: PKGBUILD 181974 2013-04-05 08:56:35Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kcolorchooser
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Color Chooser"
 url="http://kde.org/applications/graphics/kcolorchooser/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz")
-sha1sums=('ccfdcae91def40db6bd03662dda1cd5e38fcf4f7')
+sha1sums=('71d7e8415c4583ef72598bb4a50d8b2c7c83a8e6')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD
index 68362cda2..70ded10d1 100644
--- a/extra/kdegraphics-kgamma/PKGBUILD
+++ b/extra/kdegraphics-kgamma/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177729 2013-02-08 08:57:56Z andrea $
+# $Id: PKGBUILD 181975 2013-04-05 08:56:36Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kgamma
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A monitor calibration tool"
 url="http://kde.org/applications/graphics/kgamma/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'libxxf86vm')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz")
-sha1sums=('203b06bbbfebfa559808ff7652fa4b0ecd69e914')
+sha1sums=('4f6e5269500800da897643246363b9c18ce36843')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD
index ca48ea5f9..c0b634ac5 100644
--- a/extra/kdegraphics-kolourpaint/PKGBUILD
+++ b/extra/kdegraphics-kolourpaint/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177730 2013-02-08 08:57:58Z andrea $
+# $Id: PKGBUILD 181976 2013-04-05 08:56:38Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kolourpaint
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Paint Program"
 url="http://kde.org/applications/graphics/kolourpaint/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz")
-sha1sums=('0204f884a8047eb57cb8dc212438d6faf9e9802b')
+sha1sums=('54c0999d3ce68ff4a28c879ac3743d22c76b0937')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD
index ed2cf0d44..7806cdc65 100644
--- a/extra/kdegraphics-kruler/PKGBUILD
+++ b/extra/kdegraphics-kruler/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177731 2013-02-08 08:57:59Z andrea $
+# $Id: PKGBUILD 181977 2013-04-05 08:56:40Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kruler
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Screen Ruler"
 url="http://kde.org/applications/graphics/kruler/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz")
-sha1sums=('16e2de9bf6af8c8c43317deec6f35a1e19b0e9ad')
+sha1sums=('9424591fe16cd1930f0a6bf89fcf7b56c0560227')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD
index f17c66cfe..5ede0b711 100644
--- a/extra/kdegraphics-ksaneplugin/PKGBUILD
+++ b/extra/kdegraphics-ksaneplugin/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177732 2013-02-08 08:58:00Z andrea $
+# $Id: PKGBUILD 181978 2013-04-05 08:56:41Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksaneplugin
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A scan plugin that implements the scanning"
 url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz")
-sha1sums=('4bed9373e93333365ee250cd3a6553085fb90723')
+sha1sums=('076c7ed01024c91bc690fe07e495e37444dbcdd5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD
index abe5be034..89a304a93 100644
--- a/extra/kdegraphics-ksnapshot/PKGBUILD
+++ b/extra/kdegraphics-ksnapshot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177733 2013-02-08 08:58:02Z andrea $
+# $Id: PKGBUILD 181979 2013-04-05 08:56:43Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksnapshot
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Screen Capture Program"
 url="http://kde.org/applications/graphics/ksnapshot/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('kipi-plugins')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz")
-sha1sums=('c2e091d8bfccf2b1594453115e7068b6a3cb6c3e')
+sha1sums=('4f3167a98d300a56abe91fb56785afc350439cbf')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD
index b11740857..73d531b60 100644
--- a/extra/kdegraphics-mobipocket/PKGBUILD
+++ b/extra/kdegraphics-mobipocket/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177734 2013-02-08 08:58:03Z andrea $
+# $Id: PKGBUILD 181980 2013-04-05 08:56:44Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-mobipocket
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A collection of plugins to handle mobipocket files"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket"
@@ -15,7 +15,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('a4e0e9519d0af2a38e96560f7023c36d1a1169ea')
+sha1sums=('657d912c5addd8b770309f125a16d6bd852141ac')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD
index ebdf81fb6..0e277b544 100644
--- a/extra/kdegraphics-okular/PKGBUILD
+++ b/extra/kdegraphics-okular/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177633 2013-02-08 08:55:52Z andrea $
+# $Id: PKGBUILD 181879 2013-04-05 08:54:22Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-okular
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc='Document Viewer'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('kdegraphics-mobipocket: mobipocket support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz")
-sha1sums=('f91cca852cf8c2cc57b8fe5b2d66653efdb8d079')
+sha1sums=('fcd0c725300c50ea04ec8e05b7d7035bf26afc79')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD
index 80a065a3c..bf8a6e46d 100644
--- a/extra/kdegraphics-strigi-analyzer/PKGBUILD
+++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177735 2013-02-08 08:58:05Z andrea $
+# $Id: PKGBUILD 181981 2013-04-05 08:56:46Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-strigi-analyzer
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Strigi analyzers for various graphics file formats"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('b83e278a1ceae6f75f9be20214c04fb0d3fb2bd0')
+sha1sums=('3d09bd886eb8f94a0492748e2500af539b5aa339')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD
index 599720d77..e21186540 100644
--- a/extra/kdegraphics-svgpart/PKGBUILD
+++ b/extra/kdegraphics-svgpart/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177736 2013-02-08 08:58:07Z andrea $
+# $Id: PKGBUILD 181982 2013-04-05 08:56:47Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-svgpart
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A KPart for viewing SVGs"
 url="https://projects.kde.org/projects/kde/kdegraphics/svgpart"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz")
-sha1sums=('4354f205246a14c457bf4ea11eed8a163da09915')
+sha1sums=('a361a8361fb123cb4b6498dba3b2d88293d88344')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD
index afb21b35a..7bb788f5d 100644
--- a/extra/kdegraphics-thumbnailers/PKGBUILD
+++ b/extra/kdegraphics-thumbnailers/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177737 2013-02-08 08:58:08Z andrea $
+# $Id: PKGBUILD 181983 2013-04-05 08:56:49Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-thumbnailers
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Thumbnailers for various graphics file formats"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('6bce25bfdff1376b79c8024ac1ed87acf33235df')
+sha1sums=('7a3688aa23050967927e569f2b8d8c6841bf2401')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdelibs/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch b/extra/kdelibs/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
deleted file mode 100644
index 5aadeb883..000000000
--- a/extra/kdelibs/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 73283f1332e90fbb6fe0caa39a038cb16b83a54c Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Wed, 5 Dec 2012 22:42:25 +0100
-Subject: [PATCH] Revert "Also check parent mimetypes in
- protocolForArchiveMimetype()."
-
-This reverts commit 4f296cfbced2c4ad54beec8f500ed2d3fc04ee05.
-It breaks opening odt and other zip-based files in external apps.
-That's what I get for delegating the testing :-)
-BUG: 311214
----
- kio/kio/kprotocolmanager.cpp |   19 +------------------
- 1 files changed, 1 insertions(+), 18 deletions(-)
-
-diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp
-index 3f1cadd..502a3e6 100644
---- a/kio/kio/kprotocolmanager.cpp
-+++ b/kio/kio/kprotocolmanager.cpp
-@@ -47,7 +47,6 @@
- #include <ksharedconfig.h>
- #include <kstandarddirs.h>
- #include <kurl.h>
--#include <kmimetype.h>
- #include <kmimetypetrader.h>
- #include <kprotocolinfofactory.h>
- 
-@@ -1190,23 +1189,7 @@ QString KProtocolManager::protocolForArchiveMimetype( const QString& mimeType )
-             }
-         }
-     }
--    const QString prot = d->protocolForArchiveMimetypes.value(mimeType);
--    if (!prot.isEmpty())
--        return prot;
--
--    // Check parent mimetypes
--    KMimeType::Ptr mime = KMimeType::mimeType(mimeType);
--    if (mime) {
--        const QStringList parentMimeTypes = mime->allParentMimeTypes();
--        Q_FOREACH(const QString& parentMimeType, parentMimeTypes) {
--            const QString res = d->protocolForArchiveMimetypes.value(parentMimeType);
--            if (!res.isEmpty()) {
--                return res;
--            }
--        }
--    }
--
--    return QString();
-+    return d->protocolForArchiveMimetypes.value(mimeType);
- }
- 
- #undef PRIVATE_DATA
--- 
-1.7.7
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
deleted file mode 100644
index 4d7f51fa5..000000000
--- a/extra/kdelibs/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 173891 2012-12-27 10:11:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.9.4
-pkgrel=4
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kdelibs'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
-        'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
-        'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
-        'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit'
-        'media-player-info' 'libxtst' 'libutempter')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
-        'kde-applications-menu.patch' 'archlinux-menu.patch'
-        '0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch'
-        'fix-crash-on-open-with.patch')
-sha1sums=('b2fe70261207a96a26b5d8789379f134e3e070be'
-          '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          'f5d203932f67ab6d87c794e9cb78a3b1a22ef747'
-          '8faa5984ba37e9c6da04bc64f1fe21cd24f1cf07')
-
-build() {
-       cd "${srcdir}"/${pkgname}-${pkgver}
-
-       # avoid file conflict with gnome-menus
-       patch -p1 -i "${srcdir}"/kde-applications-menu.patch
-       # add Archlinux menu entry
-       patch -p1 -i "${srcdir}"/archlinux-menu.patch
-
-       # Fixed upstream
-       patch -p1 -i "${srcdir}"/0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
-       patch -p1 -i "${srcdir}"/fix-crash-on-open-with.patch
-
-       cd "${srcdir}"
-       mkdir build
-       cd build
-       cmake ../${pkgname}-${pkgver} \
-               -DCMAKE_BUILD_TYPE=Release \
-               -DCMAKE_SKIP_RPATH=ON \
-               -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
-               -DCMAKE_INSTALL_PREFIX=/usr \
-               -DSYSCONF_INSTALL_DIR=/etc \
-               -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
-               -DKDE_DEFAULT_HOME='.kde4' \
-               -DWITH_FAM=OFF \
-               -DWITH_HUpnp=OFF
-       make
-}
-
-package() {
-       cd "${srcdir}"/build
-       make DESTDIR="${pkgdir}" install
-
-       # cert bundle seems to be hardcoded
-       # link it to the one from ca-certificates
-       rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-       ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-}
diff --git a/extra/kdelibs/archlinux-menu.patch b/extra/kdelibs/archlinux-menu.patch
deleted file mode 100644
index 546784fa2..000000000
--- a/extra/kdelibs/archlinux-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/applications.menu	2010-01-31 19:28:11.000000000 +0000
-+++ kdelibs-4.3.98/kded/applications.menu	2010-01-31 22:25:53.556043077 +0000
-@@ -16,11 +16,19 @@
- 	</DefaultLayout>
- 	<Layout>
- 		<Merge type="menus"/>
-+		<Menuname>Arch Linux</Menuname>
- 		<Menuname>Applications</Menuname>
- 		<Merge type="files"/>
- 	</Layout>
- 
- 	<Menu>
-+		<Name>Arch Linux</Name>                                                                                                   
-+		<Directory>Archlinux.directory</Directory>                                                                               
-+		<Include>                                                                                                                
-+			<Category>Archlinux</Category>                                                                                           
-+		</Include>
-+	</Menu>
-+	<Menu>
- 		<Name>Applications</Name>
- 		<Directory>kde-unknown.directory</Directory>
- 		<OnlyUnallocated/>
diff --git a/extra/kdelibs/fix-crash-on-open-with.patch b/extra/kdelibs/fix-crash-on-open-with.patch
deleted file mode 100644
index 60556386d..000000000
--- a/extra/kdelibs/fix-crash-on-open-with.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 0820b3173aff4f0f3c803a9e75e726024da38ee5
-Author: David Faure <faure@kde.org>
-Date:   Thu Dec 6 11:55:05 2012 +0100
-
-    Fix crash when no service was selected (user clicked on "Open With...")
-
-diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp
-index 6d84800..6de0380 100644
---- a/kparts/browserrun.cpp
-+++ b/kparts/browserrun.cpp
-@@ -304,7 +304,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable(const QString& _
-                          this, SLOT(slotCopyToTempFileResult(KJob*)) );
-                 return Delayed; // We'll continue after the job has finished
-             }
--            if (selectedService) {
-+            if (selectedService && question.selectedService()) {
-                 *selectedService = question.selectedService();
-                 // KRun will use this when starting an app
-                 KRun::setPreferredService(question.selectedService()->desktopEntryName());
diff --git a/extra/kdelibs/kde-applications-menu.patch b/extra/kdelibs/kde-applications-menu.patch
deleted file mode 100644
index 4b513298a..000000000
--- a/extra/kdelibs/kde-applications-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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.install b/extra/kdelibs/kdelibs.install
deleted file mode 100644
index c77e68041..000000000
--- a/extra/kdelibs/kdelibs.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD
index b8e4ebbe7..876edb059 100644
--- a/extra/kdelibs3/PKGBUILD
+++ b/extra/kdelibs3/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 169753 2012-10-27 23:42:09Z eric $
+# $Id: PKGBUILD 184257 2013-05-05 07:01:52Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kdelibs3
 pkgver=3.5.10
-pkgrel=15
+pkgrel=18
 pkgdesc='KDE3 Core Libraries'
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
-depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
+depends=('libxslt' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
          'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
-makedepends=('cups' 'hspell')
+makedepends=('cups' 'hspell' 'optipng')
 optdepends=('hspell: for Hebrew spell-checking support')
 options=('libtool' '!makeflags')
 install=kdelibs3.install
@@ -28,70 +28,59 @@ source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz
 sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82'
           'c8ca21e4848a627760746d0a8a64bf4f90684c3e'
           '50c9de71b102507fb78b192ecc22a5fc3e031bc3'
-          'fbd6e773edf3e8bb8e1272629984025e041da2ca'
+          'd63d51c8fef5e521b4a9a8efa050a0c8ce6f94bf'
           '5fbbf7a5e2032878815fa055bfb5020f478d2b25'
           '35e56fe4c5f71685e64b13f448dcacc620166e06'
           '50e92950498463defb9149ffcf8cbc2e8cd1063b'
           'e5f5b8c060a2db9cedb82bf18caadfa869921779'
           '6a6c544b3336bfe89bb17ef737d783a7ec006c6c')
 
-build() {
-	cd "$srcdir"/kdelibs-${pkgver}
-
-	. /etc/profile.d/qt3.sh
-	. "$srcdir"/kde3.profile
-
-	patch -p0 -i "$srcdir"/kde-3.5-1074156.patch
-	patch -p1 -i "$srcdir"/acinclude.patch
-	patch -p1 -i "$srcdir"/kde4-compatibility.patch
-	patch -p1 -i "${srcdir}"/openssl.patch
-	patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch
-	patch -p1 -i "${srcdir}"/kdelibs3-cups16.patch
-
-	sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
-	make -f admin/Makefile.common cvs
+prepare() {
+  cd kdelibs-${pkgver}
+  patch -p0 -i "$srcdir"/kde-3.5-1074156.patch
+  patch -p1 -i "$srcdir"/acinclude.patch
+  patch -p1 -i "$srcdir"/kde4-compatibility.patch
+  patch -p1 -i "${srcdir}"/openssl.patch
+  patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch
+  patch -p1 -i "${srcdir}"/kdelibs3-cups16.patch
+  pushd pics/crystalsvg
+  optipng -quiet -force -fix cr{16,22,32,48,64,128}-app-kttsd.png cr22-app-password.png \
+    cr16-filesys-folder_green{,_open}.png cr32-action-today.png
+  popd
+  optipng -quiet -force -fix interfaces/kimproxy/library/icons/cr48-action-presence_offline.png
+}
 
-	./configure --prefix=/opt/kde \
-		--with-distribution='Arch Linux' \
-		--with-alsa \
-		--disable-debug \
-		--disable-dnssd \
-		--disable-dnotify \
-		--enable-inotify \
-		--enable-sendfile \
-		--without-lua \
-		--with-hspell \
-		--enable-gcc-hidden-visibility \
-		--enable-final \
-		--enable-new-ldflags LDFLAGS="${LDFLAGS} -L/opt/qt/lib" \
-		--without-arts \
-		--disable-libfam
-	make
+build() {
+  cd kdelibs-${pkgver}
+  ./configure --prefix=/opt/kde --with-distribution='Arch Linux' \
+    --with-alsa --disable-dnssd --disable-dnotify \
+    --enable-inotify --enable-sendfile --with-hspell \
+    --enable-gcc-hidden-visibility --enable-final \
+    --without-arts --without-lua --disable-libfam
+  make
 }
 
 package() {
-	cd "$srcdir"/kdelibs-${pkgver}
+  cd kdelibs-${pkgver}
 
-	make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install
 
-	# disable broken kconf_update by default
-	install -D -m644 "$srcdir"/kconf_updaterc \
-      "$pkgdir"/opt/kde/share/config/kconf_updaterc
+# disable broken kconf_update by default
+  install -D -m644 "$srcdir"/kconf_updaterc "$pkgdir"/opt/kde/share/config/kconf_updaterc
 
-	# install KDE3 profile
-	install -D -m755 "$srcdir"/kde3.profile "$pkgdir"/etc/profile.d/kde3.sh
-	# make KDE3 styles available to Qt3
-	install -d -m755 "$pkgdir"/opt/qt/plugins
-	ln -sf /opt/kde/lib/kde3/plugins/styles "$pkgdir"/opt/qt/plugins/styles
+# install KDE3 profile
+  install -D -m755 "$srcdir"/kde3.profile "$pkgdir"/etc/profile.d/kde3.sh
+# make KDE3 styles available to Qt3
+  install -d -m755 "$pkgdir"/usr/lib/qt3/plugins
+  ln -sf /opt/kde/lib/kde3/plugins/styles "$pkgdir"/usr/lib/qt3/plugins/styles
 
-	# cert bundle seems to be hardcoded
-	# link it to the one from ca-certificates
-	rm -f "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt
-	ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt
+# cert bundle seems to be hardcoded
+# link it to the one from ca-certificates
+  ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt
 
-	# we don't have khelpcenter anyway
-	rm -rf "$pkgdir"/opt/kde/share/doc
+# we don't have khelpcenter anyway
+  rm -rf "$pkgdir"/opt/kde/share/doc
 
-	install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
-	echo '/opt/kde/lib' > "${pkgdir}"/etc/ld.so.conf.d/kdelibs3.conf
+  install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
+  echo '/opt/kde/lib' > "${pkgdir}"/etc/ld.so.conf.d/kdelibs3.conf
 }
diff --git a/extra/kdelibs3/kde3.profile b/extra/kdelibs3/kde3.profile
index ef09631ff..61e7c43ca 100755
--- a/extra/kdelibs3/kde3.profile
+++ b/extra/kdelibs3/kde3.profile
@@ -1,6 +1 @@
 export PATH=$PATH:/opt/kde/bin
-if [ ! -z $XDG_DATA_DIRS ]; then
-  export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/kde/share
-else
-  export XDG_DATA_DIRS=/opt/kde/share
-fi
diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD
index b9abf554c..1253e97a9 100644
--- a/extra/kdemultimedia-audiocd-kio/PKGBUILD
+++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177738 2013-02-08 08:58:10Z andrea $
+# $Id: PKGBUILD 181984 2013-04-05 08:56:50Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-audiocd-kio
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Kioslave for accessing audio CDs"
 url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio'
@@ -14,7 +14,7 @@ groups=('kde' 'kdemultimedia')
 replaces=('kdemultimedia-kioslave')
 conflicts=('kdemultimedia-kioslave')
 source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz")
-sha1sums=('eac83c813e4176ee4e7ea967aa640f2f9b727b98')
+sha1sums=('83d5f79e60b2b867047fd36f7a33af70087581d5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD
index 8e721031a..c1ae97488 100644
--- a/extra/kdemultimedia-dragonplayer/PKGBUILD
+++ b/extra/kdemultimedia-dragonplayer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177739 2013-02-08 08:58:13Z andrea $
+# $Id: PKGBUILD 181985 2013-04-05 08:56:52Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-dragonplayer
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A multimedia player where the focus is on simplicity, instead of
 features"
@@ -14,7 +14,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz")
-sha1sums=('15052cadb7614ec6396cbfe36a2cd710f4ac6ace')
+sha1sums=('e4abf7618516e25d8943700d4509212c43ef67a1')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
index 607598284..626e06d9e 100644
--- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
+++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177740 2013-02-08 08:58:14Z andrea $
+# $Id: PKGBUILD 181986 2013-04-05 08:56:53Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-ffmpegthumbs
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc='FFmpeg-based thumbnail creator for video files'
 url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs'
@@ -12,7 +12,7 @@ groups=('kde' 'kdemultimedia')
 depends=('kdelibs' 'ffmpeg')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz")
-sha1sums=('7ce2edec3efd081bb65f58455c7db476e09d8bd0')
+sha1sums=('acd089018480ae879d241968a3be1627fb2b3298')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD
index 9d33b8c22..ed1866155 100644
--- a/extra/kdemultimedia-juk/PKGBUILD
+++ b/extra/kdemultimedia-juk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177741 2013-02-08 08:58:16Z andrea $
+# $Id: PKGBUILD 181987 2013-04-05 08:56:54Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-juk
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc='A jukebox, tagger and music collection manager'
 url='http://kde.org/applications/multimedia/juk/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'taglib')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz")
-sha1sums=('6282aab725db4165ec93e48db8c1f0efd7df0add')
+sha1sums=('4ffb1275369dfd645a99449705ba1651e9bd3885')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD
index 62e72bbeb..14e7df9c8 100644
--- a/extra/kdemultimedia-kmix/PKGBUILD
+++ b/extra/kdemultimedia-kmix/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177742 2013-02-08 08:58:18Z andrea $
+# $Id: PKGBUILD 181988 2013-04-05 08:56:56Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-kmix
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="KDE volume control program"
 url='http://kde.org/applications/multimedia/kmix/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz")
-sha1sums=('ac67042a7411aea76a35c0ea07603fa1e3242c5a')
+sha1sums=('26617eeac172e3375cd097c8350ebdb32412e9fa')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD
index 2f6831195..cdf1f4e19 100644
--- a/extra/kdemultimedia-kscd/PKGBUILD
+++ b/extra/kdemultimedia-kscd/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 177743 2013-02-08 08:58:19Z andrea $
+# $Id: PKGBUILD 181989 2013-04-05 08:56:57Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-kscd
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="KDE CD player"
 url='http://kde.org/applications/multimedia/kscd/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdemultimedia')
-depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'libmusicbrainz3')
+depends=('kdebase-runtime' 'libmusicbrainz3')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz")
-sha1sums=('8648888c571382b4473f9fd9f9d376db14c16bc6')
+sha1sums=('10b7d920fc70b4001e6f7d20e643eb2b09a42dfa')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../kscd-${pkgver} \
@@ -27,6 +26,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD
index 03226829a..29ca294dd 100644
--- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD
+++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177744 2013-02-08 08:58:22Z andrea $
+# $Id: PKGBUILD 181990 2013-04-05 08:56:58Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-mplayerthumbs
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="MPlayer based thumbnail generator for video files"
 url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs'
@@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime' 'mplayer')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz")
-sha1sums=('baf779c57ca342cced59bd88d17d48782ab0f212')
+sha1sums=('80f35eb2e30382984cb3529c4226f911f5e2c30a')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD
index a264302dd..d3b1a94a0 100644
--- a/extra/kdenetwork/PKGBUILD
+++ b/extra/kdenetwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177745 2013-02-08 08:58:24Z andrea $
+# $Id: PKGBUILD 181991 2013-04-05 08:57:00Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -6,11 +6,10 @@ pkgbase=kdenetwork
 pkgname=('kdenetwork-filesharing'
          'kdenetwork-kdnssd'
          'kdenetwork-kget'
-         'kdenetwork-kopete'
          'kdenetwork-kppp'
          'kdenetwork-krdc'
          'kdenetwork-krfb')
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -22,7 +21,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
     'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'use-libotr3.patch')
-sha1sums=('974bd9aea71a583563667e7cdc4749fe9d5bd82e'
+sha1sums=('972526be8275a8adcb6e4fa51188a5dad83a0b14'
           '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
 
 build() {
@@ -70,18 +69,6 @@ package_kdenetwork-kget() {
 	make DESTDIR=$pkgdir install
 }
 
-package_kdenetwork-kopete() {
-	pkgdesc='Instant Messenger'
-	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn'
-	         'libidn' 'qimageblitz' 'libgadu' 'mediastreamer')
-	url="http://kde.org/applications/internet/kopete/"
-	install='kdenetwork-kopete.install'
-	cd $srcdir/build/kopete
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kopete
-	make DESTDIR=$pkgdir install
-}
-
 package_kdenetwork-kppp() {
 	pkgdesc='Internet Dial-Up Tool'
 	depends=('kdebase-runtime' 'ppp')
diff --git a/extra/kdenetwork/gcc47.patch b/extra/kdenetwork/gcc47.patch
deleted file mode 100644
index 78af901dc..000000000
--- a/extra/kdenetwork/gcc47.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc	2012/05/03 16:03:23	1292761
-+++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc	2012/05/03 16:11:00	1292762
-@@ -31,6 +31,7 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <netdb.h>
-+#include <unistd.h>
- #endif
- 
- #include <cstring>
---- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc	2012/05/03 16:03:23	1292761
-+++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc	2012/05/03 16:11:00	1292762
-@@ -27,6 +27,12 @@
- 
- #include "talk/base/ssladapter.h"
- 
-+#ifdef POSIX
-+extern "C" {
-+#include <unistd.h>
-+}
-+#endif
-+
- #if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL)
- #ifdef WIN32
- #define SSL_USE_SCHANNEL 1
---- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h	2012/05/03 16:03:23	1292761
-+++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h	2012/05/03 16:11:00	1292762
-@@ -198,15 +198,6 @@
- }
- 
- template<class CTYPE>
--size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
--  va_list args;
--  va_start(args, format);
--  size_t len = vsprintfn(buffer, buflen, format, args);
--  va_end(args);
--  return len;
--}
--
--template<class CTYPE>
- size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format,
-                  va_list args) {
-   int len = vsnprintf(buffer, buflen, format, args);
-@@ -217,6 +208,15 @@
-   return len;
- }
- 
-+template<class CTYPE>
-+size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
-+  va_list args;
-+  va_start(args, format);
-+  size_t len = vsprintfn(buffer, buflen, format, args);
-+  va_end(args);
-+  return len;
-+}
-+
- ///////////////////////////////////////////////////////////////////////////////
- // Allow safe comparing and copying ascii (not UTF-8) with both wide and
- // non-wide character strings.
diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD
index 8d1572907..91f844737 100644
--- a/extra/kdepim-runtime/PKGBUILD
+++ b/extra/kdepim-runtime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177630 2013-02-08 08:55:49Z andrea $
+# $Id: PKGBUILD 181876 2013-04-05 08:54:20Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepim-runtime
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc='Extends the functionality of kdepim'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkgapi' 'libkolab')
 makedepends=('cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('6cfa320c03dce508d9982767c9718c98606f301f')
+sha1sums=('110715ca80a67b8fce7566379fe7a058fdca100d')
 
 build() {
 	mkdir build
diff --git a/extra/kdepim-runtime/fix-carddav-support.patch b/extra/kdepim-runtime/fix-carddav-support.patch
deleted file mode 100644
index 25c281307..000000000
--- a/extra/kdepim-runtime/fix-carddav-support.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit bec63a313160ec6dc1833029d5e99746779ed3f4
-Author: Gregory Oestreicher <greg@kamago.net>
-Date:   Tue May 15 21:19:17 2012 +0200
-
-    Add a prop-filter in the CardDAV requests
-    
-    BUG: 299482
-    FIXED-IN: 4.8.4
-
-diff --git a/resources/dav/protocols/carddavprotocol.cpp b/resources/dav/protocols/carddavprotocol.cpp
-index 38eca17..9c58653 100644
---- a/resources/dav/protocols/carddavprotocol.cpp
-+++ b/resources/dav/protocols/carddavprotocol.cpp
-@@ -35,6 +35,12 @@ CarddavProtocol::CarddavProtocol()
-   propElement.appendChild( document.createElementNS( "DAV:", "resourcetype" ) );
-   propElement.appendChild( document.createElementNS( "DAV:", "getetag" ) );
- 
-+  QDomElement filterElement = document.createElementNS( "urn:ietf:params:xml:ns:carddav", "filter" );
-+  queryElement.appendChild( filterElement );
-+  QDomElement propfilterElement = document.createElementNS( "urn:ietf:params:xml:ns:carddav", "prop-filter" );
-+  propfilterElement.setAttribute( "name", "FN" );
-+  filterElement.appendChild( propfilterElement );
-+
-   mItemsQueries << document;
- }
- 
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index 7fa1af302..e10c14e1f 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177746 2013-02-08 08:58:25Z andrea $
+# $Id: PKGBUILD 182386 2013-04-09 20:40:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -20,8 +20,8 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-ktimetracker'
          'kdepim-ktnef'
          'kdepim-libkdepim')
-pkgver=4.10.0
-pkgrel=1
+pkgver=4.10.2
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -29,14 +29,15 @@ groups=('kde' 'kdepim')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
              'kde-agent' 'nepomuk-widgets')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'boost152.patch')
-sha1sums=('6074fcea53b10c3660c5cc9a00b65e777840fdc4'
-          '652de82dcc1c45de3123898ba46e1962bb0ed6d4')
+        "kleopatra-build-fix.patch::http://bugsfiles.kde.org/attachment.cgi?id=78592"
+        'fix-completion.patch')
+sha1sums=('61b74cb3bf541040e09252d4dcfaea8a876a2859'
+          '61a7e31e7daee3358c442d3ac5f74171b45ae2c9'
+          '92a44c7b1697de519b09265a3b68e7d73d4c024e')
 
 build() {
-    cd ${pkgbase}-${pkgver}
-    patch -p1 -i "${srcdir}"/boost152.patch
-    cd ../
+    patch -Np1 -d ${pkgbase}-${pkgver} < ${srcdir}/kleopatra-build-fix.patch
+    patch -Np1 -d ${pkgbase}-${pkgver} < ${srcdir}/fix-completion.patch
 
 	mkdir build
 	cd build
diff --git a/extra/kdepim/boost152.patch b/extra/kdepim/boost152.patch
deleted file mode 100644
index c82b092f1..000000000
--- a/extra/kdepim/boost152.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- kdepim-4.10.0/kleopatra/models/keylistmodel.cpp~	2013-01-31 09:40:34.270651208 +0000
-+++ kdepim-4.10.0/kleopatra/models/keylistmodel.cpp	2013-01-31 09:41:26.570259714 +0000
-@@ -60,9 +60,9 @@
- #ifdef _WIN32_WCE
- #define BOOST_ALL_NO_LIB
- #endif
--#include <boost/graph/adjacency_list.hpp>
- 
- #ifndef Q_MOC_RUN // QTBUG-22829
-+#include <boost/graph/adjacency_list.hpp>
- #include <boost/graph/topological_sort.hpp>
- #endif
- 
diff --git a/extra/kdepim/fix-build.patch b/extra/kdepim/fix-build.patch
deleted file mode 100644
index 7060e814f..000000000
--- a/extra/kdepim/fix-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdepim-4.9.0/kleopatra/CMakeLists.txt~	2012-07-30 08:06:15.031181647 +0000
-+++ kdepim-4.9.0/kleopatra/CMakeLists.txt	2012-07-30 08:07:13.594082584 +0000
-@@ -365,7 +365,7 @@
- endif(KDEPIM_MOBILE_UI)
- 
- add_definitions ( -DKDE_DEFAULT_DEBUG_AREA=5151 )
--
-+add_definitions ( -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED )
- 
- kde4_add_app_icon(_kleopatra_mainwindow_SRCS "hi*-app-kleopatra.png")
- kde4_add_executable(kleopatra_bin ${_kleopatra_SRCS} ${_kleopatra_mainwindow_SRCS} ${_kleopatra_uiserver_SRCS} ${_kleopatra_libkdepim_SRCS} )
diff --git a/extra/kdepim/fix-completion.patch b/extra/kdepim/fix-completion.patch
new file mode 100644
index 000000000..c2edefe00
--- /dev/null
+++ b/extra/kdepim/fix-completion.patch
@@ -0,0 +1,182 @@
+commit 6a06c57f52a00018d607085efa7570deb91dc707
+Author: David Faure <faure@kde.org>
+Date:   Mon Apr 8 17:41:39 2013 +0200
+
+    Fix kmail autocompletion from akonadi.
+    
+    My commit 02f5f0214e made autocompletion from nepomuk work better, but broke
+    completion from akonadi. I kept the "keywords" based code, but now it's only
+    used for the special case of nickname-based search (because the nickname shouldn't
+    appear in the completion item). For everything else it really doesn't make sense
+    to have a search engine (akonadi/nepomuk) on top of a search engine
+    (the one inside KCompletion).
+    
+    This time I verified that:
+    * nepomuk search still works
+    * contacts from akonadi work again
+    * contact groups from akonadi work (after previous commit)
+    * nickname-search in akonadi still doesn't work, but it didn't before. More work
+    needed for that one. This is the only reason to keep KMailCompletion around btw,
+    everything else would work without it.
+    
+    BUG: 259949
+    FIXED-IN: 4.10.3
+
+diff --git a/libkdepim/addresseelineedit.cpp b/libkdepim/addresseelineedit.cpp
+index b7b11be..ec4caf9 100644
+--- a/libkdepim/addresseelineedit.cpp
++++ b/libkdepim/addresseelineedit.cpp
+@@ -30,6 +30,8 @@
+ #include "completionordereditor.h"
+ #endif
+ 
++#include "kmailcompletion.h"
++
+ #include <Akonadi/Contact/ContactSearchJob>
+ #include <Akonadi/Contact/ContactGroupSearchJob>
+ #include <Akonadi/CollectionFetchJob>
+@@ -77,6 +79,10 @@
+ 
+ using namespace KPIM;
+ 
++namespace KPIM {
++  typedef QMap< QString, QPair<int,int> > CompletionItemsMap;
++}
++
+ class AddresseeLineEditStatic
+ {
+   public:
+@@ -496,11 +502,9 @@ void AddresseeLineEdit::Private::addCompletionItem( const QString &string, int w
+     s_static->completionItemMap.insert( string, qMakePair( weight, completionItemSource ) );
+   }
+ 
+-  if ( keyWords == 0 ) {
+-    s_static->completion->addItem( string, weight );
+-  } else {
+-    s_static->completion->addItemWithKeys( string, weight, keyWords );
+-  }
++  s_static->completion->addItem(string, weight);
++  if (keyWords && !keyWords->isEmpty())
++    s_static->completion->addItemWithKeys(string, weight, keyWords); // see kmailcompletion.cpp
+ }
+ 
+ const QStringList KPIM::AddresseeLineEdit::Private::adjustedCompletionItems( bool fullSearch )
+@@ -1348,17 +1352,13 @@ void AddresseeLineEdit::addItem( const Akonadi::Item &item, int weight, int sour
+ void AddresseeLineEdit::addContactGroup( const KABC::ContactGroup &group, int weight, int source )
+ {
+   d->addCompletionItem( group.name(), weight, source );
+-  QStringList keyWords;
+-  keyWords.append( group.name() );
+-  d->addCompletionItem( group.name(), weight, source, &keyWords );
+ }
+ 
+ void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int source )
+ {
+   const QStringList emails = addr.emails();
+   QStringList::ConstIterator it;
+-  const int prefEmailWeight = 1;     //increment weight by prefEmailWeight
+-  int isPrefEmail = prefEmailWeight; //first in list is preferredEmail
++  int isPrefEmail = 1; //first in list is preferredEmail
+   QStringList::ConstIterator end( emails.constEnd() );
+   for ( it = emails.constBegin(); it != end; ++it ) {
+     //TODO: highlight preferredEmail
+@@ -1368,40 +1368,6 @@ void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int
+     const QString nickName  = addr.nickName();
+     QString fullEmail       = addr.fullEmail( email );
+ 
+-    // Prepare keywords (for CompletionShell, CompletionPopup)
+-    QStringList keyWords;
+-    const QString realName  = addr.realName();
+-
+-    if ( !givenName.isEmpty() && !familyName.isEmpty() ) {
+-      keyWords.append( givenName  + QLatin1Char( ' ' ) + familyName );
+-      keyWords.append( familyName + QLatin1Char( ' ' ) + givenName );
+-      keyWords.append( familyName + QLatin1String( ", " ) + givenName );
+-    } else if ( !givenName.isEmpty() ) {
+-      keyWords.append( givenName );
+-    } else if ( !familyName.isEmpty() ) {
+-      keyWords.append( familyName );
+-    }
+-
+-    if ( !nickName.isEmpty() ) {
+-      keyWords.append( nickName );
+-    }
+-
+-    if ( !realName.isEmpty() ) {
+-      keyWords.append( realName );
+-    }
+-
+-    keyWords.append( email );
+-
+-    /* KMailCompletion does not have knowledge about identities, it stores emails and
+-     * keywords for each email. KMailCompletion::allMatches does a lookup on the
+-     * keywords and returns an ordered list of emails. In order to get the preferred
+-     * email before others for each identity we use this little trick.
+-     * We remove the <blank> in adjustedCompletionItems.
+-     */
+-    if ( isPrefEmail == prefEmailWeight ) {
+-      fullEmail.replace( QLatin1String( " <" ), QLatin1String( "  <" ) );
+-    }
+-
+     // Prepare "givenName" + ' ' + "familyName"
+     QString fullName = givenName;
+     if (!familyName.isEmpty()) {
+@@ -1413,12 +1379,16 @@ void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int
+     // Finally, we can add the completion items
+     if (!fullName.isEmpty()) {
+       const QString address = KPIMUtils::normalizedAddress(fullName, email, QString());
+-      d->addCompletionItem(address, weight + isPrefEmail, source, &keyWords);
++      if (fullEmail != address) {
++        // This happens when fullEmail contains a middle name, while our own fullName+email only has "first last".
++        // Let's offer both, the fullEmail with 3 parts, looks a tad formal.
++        d->addCompletionItem(address, weight + isPrefEmail, source);
++      }
+     }
+ 
+-    if ( !nickName.isEmpty() ) {
+-      const QString address = KPIMUtils::normalizedAddress(nickName, email, QString());
+-      d->addCompletionItem(address, weight + isPrefEmail, source, &keyWords);
++    QStringList keyWords;
++    if (!nickName.isEmpty()) {
++      keyWords.append(nickName);
+     }
+ 
+     d->addCompletionItem( fullEmail, weight + isPrefEmail, source, &keyWords );
+diff --git a/libkdepim/addresseelineedit.h b/libkdepim/addresseelineedit.h
+index 4e6784b..b2af4a9 100644
+--- a/libkdepim/addresseelineedit.h
++++ b/libkdepim/addresseelineedit.h
+@@ -27,7 +27,6 @@
+ #ifndef KDEPIM_ADDRESSEELINEEDIT_H
+ #define KDEPIM_ADDRESSEELINEEDIT_H
+ 
+-#include "kmailcompletion.h"
+ #include "kdepim_export.h"
+ 
+ #include "ldap/ldapclient.h"
+@@ -50,10 +49,6 @@ namespace KABC {
+   class ContactGroup;
+ }
+ 
+-namespace KPIM {
+-  typedef QMap< QString, QPair<int,int> > CompletionItemsMap;
+-}
+-
+ namespace Nepomuk2 {
+   namespace Query {
+     class Result;
+diff --git a/libkdepim/kmailcompletion.h b/libkdepim/kmailcompletion.h
+index e8574cc..93771d3 100644
+--- a/libkdepim/kmailcompletion.h
++++ b/libkdepim/kmailcompletion.h
+@@ -32,7 +32,9 @@ namespace KPIM {
+ 
+ /**
+  * KMailCompletion allows lookup of email addresses by keyword.
+- * Typically a keywods would be firstname, lastname, nickname or domain.
++ * This is used for lookup by nickname, since we don't want the nickname to appear in the final email.
++ * E.g. you have a nickname "idiot" for your boss, you want to type "idiot" but you want the completion
++ * to offer "Full Name <email@domain>", without the nickname being visible.
+  */
+ class KMailCompletion : public KCompletion
+ {
diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD
index 8442c6cdf..c63165180 100644
--- a/extra/kdepimlibs/PKGBUILD
+++ b/extra/kdepimlibs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177626 2013-02-08 08:55:46Z andrea $
+# $Id: PKGBUILD 181872 2013-04-05 08:54:13Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepimlibs
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="KDE PIM Libraries"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('nepomuk-core' 'gpgme' 'akonadi' 'libical' 'prison' 'qjson')
 makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl')
 install='kdepimlibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('cf51d06ffd49de44312d5fae52b6fb7fb044459f')
+sha1sums=('ab163597d36b5457f9bcb0328f21c35777fffc34')
 
 build() {
   mkdir build
diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD
index 89fea98a6..7e329405a 100644
--- a/extra/kdeplasma-addons/PKGBUILD
+++ b/extra/kdeplasma-addons/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177747 2013-02-08 08:58:28Z andrea $
+# $Id: PKGBUILD 181993 2013-04-05 08:57:05Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -77,7 +77,7 @@ pkgname=('kdeplasma-addons-applets-bball'
          'kdeplasma-addons-wallpapers-qmlwallpapers'
          'kdeplasma-addons-wallpapers-virus'
          'kdeplasma-addons-wallpapers-weather')
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -86,7 +86,7 @@ groups=('kde' 'kdeplasma-addons')
 makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen'
              'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'mesa')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('665e7126813c9a900e6c6d5f379175f98969d7a8')
+sha1sums=('26c59eb5738f9efbb94c7109b108ec09d7008ba6')
 
 build() {
 	mkdir build
diff --git a/extra/kdeplasma-addons/fix-spell-crash.patch b/extra/kdeplasma-addons/fix-spell-crash.patch
deleted file mode 100644
index 75c26c6ad..000000000
--- a/extra/kdeplasma-addons/fix-spell-crash.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-commit 124e35885b8cd1b593b7b83a070bd0bdb5758661
-Author: Simeon Bird <bladud@gmail.com>
-Date:   Fri Oct 19 21:16:34 2012 -0400
-
-    Fix the plasma spellchecker's 'foreign language' support.
-    Previously this caused segfaults (even if not used) because
-    it called setLanguage(), which is not thread-safe, in match().
-    
-    Instead, this patch constructs a new speller safely for each new
-    language, without deleting the old one. Old spellers are instead
-    deleted on the teardown() signal.
-    
-    While we're at it, amend the language detection so that the user
-    can type natural language names (eg, 'german') and have the
-    spell-checker find the right language.
-    
-    REVIEW: 106244
-    BUG: 303831
-    BUG: 264779
-    FIXED-IN: 4.9.3
-
-diff --git a/runners/spellchecker/spellcheck.cpp b/runners/spellchecker/spellcheck.cpp
-index 672732d..cc6aeb2 100644
---- a/runners/spellchecker/spellcheck.cpp
-+++ b/runners/spellchecker/spellcheck.cpp
-@@ -24,6 +24,7 @@
- // #include <KDebug>
- #include <KGlobal>
- #include <KIcon>
-+#include <QSet>
- 
- SpellCheckRunner::SpellCheckRunner(QObject* parent, const QVariantList &args)
-     : Plasma::AbstractRunner(parent, args)
-@@ -43,13 +44,64 @@ void SpellCheckRunner::init()
- {
-     Plasma::AbstractRunner::init();
- 
--    //store all language names, makes it posible to type "spell german TERM" if english locale is set
-+    //Connect prepare and teardown signals
-+    connect(this, SIGNAL(prepare()), this, SLOT(loaddata()));
-+    connect(this, SIGNAL(teardown()), this, SLOT(destroydata()));
-+}
-+
-+//Load a default dictionary and some locale names
-+void SpellCheckRunner::loaddata()
-+{
-+    //Load the default speller, with the default language
-+    if (!m_spellers.contains("")) {
-+        m_spellers[""] = QSharedPointer<Sonnet::Speller> (new Sonnet::Speller(""));
-+    }
-+    //store all language names, makes it possible to type "spell german TERM" if english locale is set
-+    //Need to construct a map between natual language names and names the spell-check recognises.
-     KLocale *locale = KGlobal::locale();
--    QStringList codes = locale->allLanguagesList();
--    foreach (const QString &code, codes) {
--        const QString name = locale->languageCodeToName(code);
--        m_languages[name.toLower()] = code;
-+    const QStringList avail = m_spellers[""]->availableLanguages();
-+    //We need to filter the available languages so that we associate the natural language
-+    //name (eg. 'german') with one sub-code.
-+    QSet<QString> families;
-+    //First get the families
-+    foreach (const QString &code, avail) {
-+        families +=code.left(2);
-+    }
-+    //Now for each family figure out which is the main code.
-+    foreach (const QString &fcode,families) {
-+        QStringList family = avail.filter(fcode);
-+        QString code;
-+        //If we only have one code, use it.
-+        //If a string is the default language, use it
-+        if (family.contains(m_spellers[""]->language())) {
-+            code = m_spellers[""]->language();
-+        } else if (fcode == QLatin1String("en")) {
-+            //If the family is english, default to en_US.
-+            if (family.contains("en_US")) {
-+                code = QLatin1String("en_US");
-+            }
-+        } else if (family.contains(fcode+QLatin1String("_")+fcode.toUpper())) {
-+            //If we have a speller of the form xx_XX, try that.
-+            //This gets us most European languages with more than one spelling.
-+            code =  fcode+QLatin1String("_")+fcode.toUpper();
-+        } else {
-+            //Otherwise, pick the first value as it is highest priority.
-+            code = family.first();
-+        }
-+        //Finally, add code to the map.
-+        const QString name = locale->languageCodeToName(fcode);
-+        if (!name.isEmpty()) {
-+            m_languages[name.toLower()] = code;
-+        }
-+//         kDebug() << "SPELL lang: " << fcode<< "::"<< name << "  :  " << code;
-     }
-+
-+}
-+
-+void SpellCheckRunner::destroydata()
-+{
-+    //Clear the data arrays to save memory
-+    m_spellers.clear();
- }
- 
- void SpellCheckRunner::reloadConfiguration()
-@@ -73,13 +125,52 @@ void SpellCheckRunner::reloadConfiguration()
-     setSyntaxes(syns);
- }
- 
-+/* Take the input query, split into a list, and see if it contains a language to spell in.
-+ * Return the empty string if we can't match a language. */
-+QString SpellCheckRunner::findlang(const QStringList& terms)
-+{
-+    //If first term is a language code (like en_GB), set it as the spell-check language
-+    if (terms.count() >= 1 && m_spellers[""]->availableLanguages().contains(terms[0])) {
-+        return terms[0];
-+    }
-+    //If we have two terms and the first is a language name (eg 'french'),
-+    //set it as the available language
-+    else if (terms.count() >=2) {
-+        QString code;
-+        {
-+            //Is this a descriptive language name?
-+            QMap<QString, QString>::const_iterator it = m_languages.constFind(terms[0].toLower());
-+            if (it != m_languages.constEnd()) {
-+                code = *it;
-+            }
-+            //Maybe it is a subset of a language code?
-+            else {
-+                QStringList codes = QStringList(m_languages.values()).filter(terms[0]);
-+                if (!codes.isEmpty()) {
-+                    code = codes.first();
-+                }
-+            }
-+        }
-+
-+        if (!code.isEmpty()) {
-+            //We found a valid language! Check still available
-+            const QStringList avail = m_spellers[""]->availableLanguages();
-+            //Does the spell-checker like it?
-+            if (avail.contains(code)) {
-+                return code;
-+            }
-+        }
-+        //FIXME: Support things like 'british english' or 'canadian french'
-+    }
-+    return QLatin1String("");
-+}
-+
- void SpellCheckRunner::match(Plasma::RunnerContext &context)
- {
-     if (!context.isValid()) {
-         return;
-     }
- 
--
-     const QString term = context.query();
-     QString query = term;
- 
-@@ -88,53 +179,46 @@ void SpellCheckRunner::match(Plasma::RunnerContext &context)
-         if (query.left(len) != m_triggerWord) {
-             return;
-         }
--
--        QString language = m_speller.defaultLanguage();
-         query = query.mid(len).trimmed();
--        QStringList terms = query.split(' ');
--
--        //two terms specified, check if first is a language
--        QString customLanguage;
--        if (terms.count() == 2) {
--            customLanguage = terms[0];
--            query = terms[1];
--        }
--        //three terms specified, check if first two are a language, e.g. "american english"
--        if (terms.count() == 3) {
--            customLanguage = terms[0] + ' ' + terms[1];
--            query = terms[2];
--        }
--
--        if (!customLanguage.isEmpty()) {
--            language = customLanguage;
--            m_speller.setLanguage(language);
-+    }
- 
--            //not valid, maybe it is a language name, not a code
--            if (!m_speller.isValid()) {
--                QHash<QString, QString>::const_iterator it = m_languages.constFind(language.toLower());
--                //is a valid language name
--                if (it != m_languages.constEnd()) {
--                    language = *it;
-+    //Pointer to speller object with our chosen language
-+    QSharedPointer<Sonnet::Speller> speller = m_spellers[""];
-+
-+    if (speller->isValid()) {
-+        QStringList terms = query.split(' ', QString::SkipEmptyParts);
-+        QString lang = findlang(terms);
-+        //If we found a language, create a new speller object using it.
-+        if (!lang.isEmpty()) {
-+            //First term is the language
-+            terms.removeFirst();
-+            //New speller object if we don't already have one
-+            if (!m_spellers.contains(lang)) {
-+                QMutexLocker lock (&m_spellLock);
-+                //Check nothing happened while we were acquiring the lock
-+                if (!m_spellers.contains(lang)) {
-+                    m_spellers[lang] = QSharedPointer<Sonnet::Speller>(new Sonnet::Speller(lang));
-                 }
-             }
-+            speller = m_spellers[lang];
-+            //Rejoin the strings
-+            query = terms.join(QLatin1String(" "));
-         }
--
--        m_speller.setLanguage(language);
-     }
- 
--    if (query.size() < 3) {
-+    if (query.size() < 2) {
-         return;
-     }
- 
-     Plasma::QueryMatch match(this);
-     match.setType(Plasma::QueryMatch::InformationalMatch);
- 
--    if (m_speller.isValid()) {
-+    if (speller->isValid()) {
-         QStringList suggestions;
--        const bool correct = m_speller.checkAndSuggest(query,suggestions);
-+        const bool correct = speller->checkAndSuggest(query,suggestions);
-         if (correct) {
-             match.setIcon(KIcon(QLatin1String( "checkbox" )));
--            match.setText(i18n("Correct"));
-+            match.setText(i18n("Correct")+QLatin1String(": ")+query);
-         } else {
-             match.setIcon(KIcon(QLatin1String( "edit-delete" )));
-             const QString recommended = i18n("Suggested words: %1", suggestions.join(i18nc("seperator for a list of words", ", ")));
-diff --git a/runners/spellchecker/spellcheck.h b/runners/spellchecker/spellcheck.h
-index 492c370..ca65452 100644
---- a/runners/spellchecker/spellcheck.h
-+++ b/runners/spellchecker/spellcheck.h
-@@ -22,6 +22,7 @@
- #include <sonnet/speller.h>
- 
- #include <plasma/abstractrunner.h>
-+#include <QSharedPointer>
- 
- /**
-  * This checks the spelling of query
-@@ -41,12 +42,17 @@ public:
- 
- protected slots:
-     void init();
-+    void loaddata();
-+    void destroydata();
- 
- private:
-+    QString findlang(const QStringList &terms);
-+
-     QString m_triggerWord;
--    QHash<QString, QString> m_languages;//key=language name, value=language code
-+    QMap<QString, QString> m_languages;//key=language name, value=language code
-     bool m_requireTriggerWord;
--    Sonnet::Speller m_speller;
-+    QMap<QString, QSharedPointer<Sonnet::Speller> > m_spellers; //spellers
-+    QMutex m_spellLock; //Lock held when constructing a new speller
- };
- 
- K_EXPORT_PLASMA_RUNNER(spellcheckrunner, SpellCheckRunner)
diff --git a/extra/kdeplasma-addons/kdeplasma-addons-applets.install b/extra/kdeplasma-addons/kdeplasma-addons-applets.install
deleted file mode 100644
index c4ef46ba8..000000000
--- a/extra/kdeplasma-addons/kdeplasma-addons-applets.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index 8d37b5c26..f9df83069 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=kdeplasma-applets-networkmanagement
 epoch=1
-pkgver=0.9.0.7
+pkgver=0.9.0.8
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,10 +17,9 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic
             'openconnect: Cisco AnyConnect compatible VPN client')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/networkmanagement-${pkgver}.tar.bz2")
-sha256sums=('926e9bbbc848219ea6314cc84325216397732c8ad1b94ba41b5c9e53b54773b2')
+sha256sums=('c3b4458faf3bea75c5952ffe20b55724246c9cc3cd751a484b3e1832240d3ad6')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../networkmanagement-${pkgver} \
@@ -30,6 +29,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD
index 771f26d87..43e615cbd 100644
--- a/extra/kdesdk-kate/PKGBUILD
+++ b/extra/kdesdk-kate/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 177635 2013-02-08 08:55:54Z andrea $
+# $Id: PKGBUILD 181881 2013-04-05 08:54:24Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdesdk-kate
 pkgname=('kdebase-katepart'
          'kdebase-kwrite'
          'kdesdk-kate')
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
-makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python2')
+makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python')
 source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz"
         'pkgbuild-syntax-highlight.patch')
-sha1sums=('9754f1acd55278d529c4e7a5a778b5cec51e73b9'
+sha1sums=('117850ca1728c309310f23a5ac2d583cfdfd29c7'
           'dc70306c507083cf9b4bb1c536858742292fa1bf')
 
 build() {
@@ -25,8 +25,7 @@ build() {
   cmake ../kate-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
+    -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
@@ -49,9 +48,8 @@ package_kdebase-kwrite() {
 
   cd build/kwrite
   make DESTDIR="${pkgdir}" install
-  cd ../../
 
-  cd build/doc/kwrite
+  cd ../../build/doc/kwrite
   make DESTDIR="${pkgdir}" install
 }
 
@@ -62,12 +60,11 @@ package_kdesdk-kate() {
   url="http://www.kde.org/applications/utilities/kate/"
   install='kdesdk-kate.install'
   optdepends=('kdebase-konsole: open a terminal in Kate'
-              'kdebindings-python2: python bindings')
+              'kdebindings-python: python bindings')
 
   cd build/kate
   make DESTDIR="${pkgdir}" install
-  cd ../../
 
-  cd build/doc/kate
+  cd ../../build/doc/kate
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD
index 414b37c3a..608519fbc 100644
--- a/extra/kdesdk/PKGBUILD
+++ b/extra/kdesdk/PKGBUILD
@@ -1,26 +1,22 @@
-# $Id: PKGBUILD 177748 2013-02-08 08:58:30Z andrea $
+# $Id: PKGBUILD 181994 2013-04-05 08:57:10Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=kdesdk
 pkgname=('kdesdk-cervisia'
          'kdesdk-dolphin-plugins'
+         'kdesdk-dev-utils'
+         'kdesdk-dev-scripts'
          'kdesdk-kapptemplate'
          'kdesdk-kcachegrind'
-         'kdesdk-kioslave'
-         'kdesdk-kmtrace'
+         'kdesdk-kioslaves'
          'kdesdk-kompare'
-         'kdesdk-kpartloader'
-         'kdesdk-kprofilemethod'
-         'kdesdk-kstartperf'
-         'kdesdk-kuiviewer'
          'kdesdk-lokalize'
          'kdesdk-okteta'
          'kdesdk-poxml'
-         'kdesdk-scripts'
-         'kdesdk-strigi-analyzer'
+         'kdesdk-strigi-analyzers'
          'kdesdk-umbrello')
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -30,8 +26,8 @@ makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs'
              'kdebase-lib')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'fix-python2-path.patch')
-sha1sums=('e4aaaf5357ecb3dfc87014abb01af807731557df'
-          '923cabd7a877cf9a68efeb24fbf3d5827e1d949e')
+sha1sums=('0cedb222c469f7e465486ac744806e52f762b413'
+          '07db42bbcae402c292eebf002e549b04162621c5')
 
 build() {
 	cd ${srcdir}/${pkgbase}-${pkgver}
@@ -56,22 +52,32 @@ package_kdesdk-cervisia() {
 	install='kdesdk-cervisia.install'
 	cd $srcdir/build/cervisia
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/cervisia
-	make DESTDIR=$pkgdir install
+}
+
+package_kdesdk-dev-utils() {
+    pkgdesc='Small utilities for developers using KDE/Qt libs/frameworks'
+    url="https://projects.kde.org/projects/kde/kdesdk/kde-dev-utils"
+    depends=('kdebase-runtime')
+    conflicts=('kdesdk-kmtrace' 'kdesdk-kpartloader' 'kdesdk-kprofilemethod'
+              'kdesdk-kstartperf' 'kdesdk-kuiviewer')
+    replaces=('kdesdk-kmtrace' 'kdesdk-kpartloader' 'kdesdk-kprofilemethod'
+              'kdesdk-kstartperf' 'kdesdk-kuiviewer')
+    install='kdesdk-dev-utils.install'
+    cd $srcdir/build/kde-dev-utils
+    make DESTDIR=$pkgdir install
 }
 
 package_kdesdk-dolphin-plugins() {
 	pkgdesc='Extra Dolphin plugins'
+    url="https://projects.kde.org/projects/kde/kdesdk/dolphin-plugins"
 	depends=('kdebase-dolphin')
     optdepends=('bzr: bazaar support'
                 'git: git support'
                 'mercurial: hg support'
                 'subversion: svn support')
 	install='kdesdk.install'
-    for i in bazaar git hg svn; do
-        cd $srcdir/build/dolphin-plugins/$i
-    	make DESTDIR=$pkgdir install
-    done
+    cd $srcdir/build/dolphin-plugins
+  	make DESTDIR=$pkgdir install
 }
 
 package_kdesdk-kapptemplate() {
@@ -81,8 +87,6 @@ package_kdesdk-kapptemplate() {
 	install='kdesdk.install'
 	cd $srcdir/build/kapptemplate
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kapptemplate
-	make DESTDIR=$pkgdir install
 }
 
 package_kdesdk-kcachegrind() {
@@ -93,28 +97,20 @@ package_kdesdk-kcachegrind() {
 	install='kdesdk-kcachegrind.install'
 	cd $srcdir/build/kcachegrind
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcachegrind
-	make DESTDIR=$pkgdir install
 
-        # Fix python 2 path
-        sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-                "${pkgdir}"/usr/bin/hotshot2calltree
+    # Fix python 2 path
+    sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+      "${pkgdir}"/usr/bin/hotshot2calltree
 }
 
-package_kdesdk-kioslave() {
-	pkgdesc='KDED Subversion Module'
+package_kdesdk-kioslaves() {
+	pkgdesc='KIO-Slaves'
+    url="https://projects.kde.org/projects/kde/kdesdk/kdesdk-kioslaves"
 	depends=('kdebase-runtime' 'subversion')
-        install='kdesdk.install'
-	cd $srcdir/build/kioslave
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kmtrace() {
-	pkgdesc='A KDE tool to assist with malloc debugging using glibc´s "mtrace" functionality'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kmtrace
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmtrace
+    install='kdesdk.install'
+    replaces=('kdesdk-kioslave')
+    conflicts=('kdesdk-kioslave')
+	cd $srcdir/build/kdesdk-kioslaves
 	make DESTDIR=$pkgdir install
 }
 
@@ -125,61 +121,20 @@ package_kdesdk-kompare() {
 	install='kdesdk-kompare.install'
 	cd $srcdir/build/kompare
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kompare
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kpartloader() {
-	pkgdesc='A test application for KParts'
-	depends=('kdebase-runtime')
-	install='kdesdk.install'
-	cd $srcdir/build/kpartloader
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kprofilemethod() {
-	pkgdesc='Macros helping to profile'
-	cd $srcdir/build/kprofilemethod
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kspy() {
-	pkgdesc='An Object Inspector for Qt/KDE applications'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kspy
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kstartperf() {
-	pkgdesc='Startup time measurement tool for KDE applications'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/kstartperf
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kuiviewer() {
-	pkgdesc='Qt Designer UI File Viewer'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/kuiviewer/"
-	install='kdesdk-kuiviewer.install'
-	cd $srcdir/build/kuiviewer
-	make DESTDIR=$pkgdir install
 }
 
 package_kdesdk-lokalize() {
 	pkgdesc='Computer-Aided Translation System'
-	depends=('kdebase-runtime' 'kdebindings-python2' 'kdesdk-strigi-analyzer')
+	depends=('kdebase-runtime' 'kdebindings-python2' 'kdesdk-strigi-analyzers')
 	url="http://kde.org/applications/development/lokalize/"
 	optdepends=('translate-toolkit: enable extra python script')
 	install='kdesdk-lokalize.install'
 	cd $srcdir/build/lokalize
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/lokalize
-	make DESTDIR=$pkgdir install
 
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/share/apps/lokalize/scripts/odf/xliffmerge.py
+    # Fix python 2 path
+    sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+      "${pkgdir}"/usr/share/apps/lokalize/scripts/odf/xliffmerge.py
 }
 
 package_kdesdk-okteta() {
@@ -191,45 +146,39 @@ package_kdesdk-okteta() {
 	install='kdesdk-okteta.install'
 	cd $srcdir/build/okteta
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/okteta
-	make DESTDIR=$pkgdir install
 }
 
 package_kdesdk-poxml() {
 	pkgdesc='Translates DocBook XML files using gettext po files'
-	depends=('qt' 'antlr2')
+    url="https://projects.kde.org/projects/kde/kdesdk/poxml"
+	depends=('qt4' 'antlr2')
 	cd $srcdir/build/poxml
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/poxml
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-scheck() {
-	pkgdesc='An interface style to highlight accel and style guide conflicts'
-	depends=('kdebase-runtime')
-	cd $srcdir/build/scheck
-	make DESTDIR=$pkgdir install
 }
 
-package_kdesdk-scripts() {
-	pkgdesc='KDE SDK scripts'
+package_kdesdk-dev-scripts() {
+	pkgdesc='Scripts and setting files useful during development of KDE software'
+    url="https://projects.kde.org/projects/kde/kdesdk/kde-dev-scripts"
 	depends=('python2')
-	cd $srcdir/build/scripts
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/scripts
+    replaces=('kdesdk-scripts')
+    conflicts=('kdesdk-scripts')
+	cd $srcdir/build/kde-dev-scripts
 	make DESTDIR=$pkgdir install
 
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/bin/{zonetab2pot,kde-systemsettings-tree}.py
-  sed -i 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/bin/{kdelnk2desktop.py,kde_generate_export_header}
+    # Fix python 2 path
+    sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+      "${pkgdir}"/usr/bin/{zonetab2pot,kde-systemsettings-tree}.py
+    sed -i 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \
+      "${pkgdir}"/usr/bin/{kdelnk2desktop.py,kde_generate_export_header}
 }
 
-package_kdesdk-strigi-analyzer() {
-	pkgdesc='Strigi-Analyzer for KDE SDK'
+package_kdesdk-strigi-analyzers() {
+	pkgdesc='Analyzer plugins for strigi'
+    url="https://projects.kde.org/projects/kde/kdesdk/kdesdk-strigi-analyzers"
 	depends=('kdelibs')
-	cd $srcdir/build/strigi-analyzer
+    conflicts=('kdesdk-strigi-analyzer')
+    replaces=('kdesdk-strigi-analyzer')
+	cd $srcdir/build/kdesdk-strigi-analyzers
 	make DESTDIR=$pkgdir install
 }
 
@@ -241,10 +190,8 @@ package_kdesdk-umbrello() {
 	install='kdesdk-umbrello.install'
 	cd $srcdir/build/umbrello
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/umbrello
-	make DESTDIR=$pkgdir install
-
-  # Fix python 2 path
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/share/apps/umbrello/headings/heading.py
+    
+    # Fix python 2 path
+    sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+      "${pkgdir}"/usr/share/apps/umbrello/headings/heading.py
 }
diff --git a/extra/kdesdk/fix-python2-path.patch b/extra/kdesdk/fix-python2-path.patch
index 720487031..9e9a442c0 100644
--- a/extra/kdesdk/fix-python2-path.patch
+++ b/extra/kdesdk/fix-python2-path.patch
@@ -20,13 +20,3 @@
  
  try: convert()
  except: print 'error occured'
---- kdesdk-4.5.80/scripts/svn2log.sh~	2010-11-24 11:46:24.863333337 +0100
-+++ kdesdk-4.5.80/scripts/svn2log.sh	2010-11-24 11:46:24.896666669 +0100
-@@ -17,6 +17,6 @@
- svn cat svn://anonsvn.kde.org/home/kde/trunk/kde-common/accounts > /tmp/accounts.$PPID
- 
- echo "Creating changelog...";
--svn log -v --xml $1 | python $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
-+svn log -v --xml $1 | python2 $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
- 
- rm /tmp/accounts.$PPID
\ No newline at end of file
diff --git a/extra/kdesdk/kdesdk-kuiviewer.install b/extra/kdesdk/kdesdk-dev-utils.install
index 5495fb1b5..5495fb1b5 100644
--- a/extra/kdesdk/kdesdk-kuiviewer.install
+++ b/extra/kdesdk/kdesdk-dev-utils.install
diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD
index 0099b9c87..3bb85591b 100644
--- a/extra/kdetoys/PKGBUILD
+++ b/extra/kdetoys/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177749 2013-02-08 08:58:31Z andrea $
+# $Id: PKGBUILD 181995 2013-04-05 08:57:11Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -6,7 +6,7 @@ pkgbase=kdetoys
 pkgname=('kdetoys-amor'
          'kdetoys-kteatime'
          'kdetoys-ktux')
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdetoys')
 makedepends=('cmake' 'automoc4' 'kdebase-workspace')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('bc795b4b5bd4ea3ea362f9684f0236bed172abd1')
+sha1sums=('3fa4fc9b9ec04e9967b9a326d9dc26c3055b5e2b')
 
 build() {
 	cd $srcdir
@@ -34,8 +34,6 @@ package_kdetoys-amor() {
 	install='kdetoys.install'
 	cd $srcdir/build/amor
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/amor
-	make DESTDIR=$pkgdir install
 }
 
 package_kdetoys-kteatime() {
@@ -44,8 +42,6 @@ package_kdetoys-kteatime() {
 	install='kdetoys.install'
 	cd $srcdir/build/kteatime
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kteatime
-	make DESTDIR=$pkgdir install
 }
 
 package_kdetoys-ktux() {
diff --git a/extra/kdeutils-ark/PKGBUILD b/extra/kdeutils-ark/PKGBUILD
deleted file mode 100644
index 752755377..000000000
--- a/extra/kdeutils-ark/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 172878 2012-12-06 08:23:12Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-ark
-pkgver=4.9.4
-pkgrel=1
-pkgdesc='Archiving Tool'
-url='http://kde.org/applications/utilities/ark/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeutils')
-depends=('kdebase-runtime' 'kdebase-lib' 'libarchive' 'qjson')
-makedepends=('cmake' 'automoc4')
-optdepends=('p7zip' 'zip' 'unzip' 'unrar')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz")
-sha1sums=('074aece141ec229b5d72b39e4d31af4e5b4550cb')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ark-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-  cd $srcdir/build/doc
-  make DESTDIR=$pkgdir install
-}
diff --git a/extra/kdeutils-ark/kdeutils-ark.install b/extra/kdeutils-ark/kdeutils-ark.install
deleted file mode 100644
index 78681144b..000000000
--- a/extra/kdeutils-ark/kdeutils-ark.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_update() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD
index 947e45d4b..ef475d26c 100644
--- a/extra/kdeutils-filelight/PKGBUILD
+++ b/extra/kdeutils-filelight/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177751 2013-02-08 08:58:34Z andrea $
+# $Id: PKGBUILD 181997 2013-04-05 08:57:14Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-filelight
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc='View disk usage information'
 url='http://kde.org/applications/utilities/filelight'
@@ -15,7 +15,7 @@ replaces=('filelight')
 conflicts=('filelight')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz")
-sha1sums=('c2cec34c1de2dd3aacbbf88a8b04ff4fcca7de5d')
+sha1sums=('1047e985fead8655b9eac888315b007844b34a68')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD
index cf6c29fbe..ffed0078f 100644
--- a/extra/kdeutils-kcalc/PKGBUILD
+++ b/extra/kdeutils-kcalc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177752 2013-02-08 08:58:35Z andrea $
+# $Id: PKGBUILD 181998 2013-04-05 08:57:16Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kcalc
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc='Scientific Calculator'
 url='http://kde.org/applications/utilities/kcalc/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz")
-sha1sums=('b898128f942c3890e8fb182d0833cd58d5f036da')
+sha1sums=('45f2a3eb557891e3c47a00dafb9ad3bd64bde4d8')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD
index f932fc9ea..56b5dc47d 100644
--- a/extra/kdeutils-kcharselect/PKGBUILD
+++ b/extra/kdeutils-kcharselect/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177753 2013-02-08 08:58:36Z andrea $
+# $Id: PKGBUILD 181999 2013-04-05 08:57:20Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kcharselect
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc='Character Selector'
 url="http://kde.org/applications/utilities/kcharselect/"
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz")
-sha1sums=('86e5543dcb2f217ce66d5629daf4e91ec134b0e9')
+sha1sums=('2e5b06c4be689097f3999ff772bc12373fa81e7c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD
index 9bfba21a3..beae8ecdf 100644
--- a/extra/kdeutils-kdf/PKGBUILD
+++ b/extra/kdeutils-kdf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177754 2013-02-08 08:58:38Z andrea $
+# $Id: PKGBUILD 182000 2013-04-05 08:57:21Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kdf
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 url="http://kde.org/applications/system/kdiskfree/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz")
-sha1sums=('b90e73fb7f17797cedd3b7c1915f1c8a1423eeb2')
+sha1sums=('e7f230d14188c45c226513e110ee664a4ad89cb9')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD
index 4057681bb..bccbec104 100644
--- a/extra/kdeutils-kfloppy/PKGBUILD
+++ b/extra/kdeutils-kfloppy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177755 2013-02-08 08:58:39Z andrea $
+# $Id: PKGBUILD 182001 2013-04-05 08:57:23Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kfloppy
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc='Floppy Formatter'
 url='http://kde.org/applications/utilities/kfloppy/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz")
-sha1sums=('5aa1d135c53cf8fa5a9498f48c3e426855336af4')
+sha1sums=('c79e9660ebea09aea2caffb8424e3621f30d3346')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD
index 34d744ac5..50906c08e 100644
--- a/extra/kdeutils-kgpg/PKGBUILD
+++ b/extra/kdeutils-kgpg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177756 2013-02-08 08:58:40Z andrea $
+# $Id: PKGBUILD 182002 2013-04-05 08:57:24Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kgpg
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc='A GnuPG frontend'
 url='http://kde.org/applications/utilities/kgpg/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz")
-sha1sums=('aee248358d9ba4aa2676dd7ff910205b37ea92b9')
+sha1sums=('fbe8df63cbfbff616493267253b03e153e2bbc40')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD
index d58d2004b..7a5d53809 100644
--- a/extra/kdeutils-kremotecontrol/PKGBUILD
+++ b/extra/kdeutils-kremotecontrol/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kremotecontrol
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc='Configure your remote controls for use with applications'
 url='http://kde.org/applications/utilities/kremotecontrol/'
@@ -15,7 +15,7 @@ replaces=('kdeutils-kdelirc')
 conflicts=('kdeutils-kdelirc')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz")
-sha1sums=('ceb8c1f4d86e705c469aa82b259d961e43cf4fcb')
+sha1sums=('e74d4724afef6fdfb5b4a95e35672b3e3d8e9b5c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD
index eda60e9e2..ed9c895d2 100644
--- a/extra/kdeutils-ktimer/PKGBUILD
+++ b/extra/kdeutils-ktimer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177758 2013-02-08 08:58:43Z andrea $
+# $Id: PKGBUILD 182004 2013-04-05 08:57:27Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-ktimer
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc='Countdown Launcher'
 url='http://kde.org/applications/utilities/ktimer/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz")
-sha1sums=('1d7d9299177cc7c6648fc50d6565ee4b7be1e2d5')
+sha1sums=('2348d09267f173201b1ce426f0831e444602545d')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD
index 3b15afe1d..4c97bbec9 100644
--- a/extra/kdeutils-kwallet/PKGBUILD
+++ b/extra/kdeutils-kwallet/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177759 2013-02-08 08:58:44Z andrea $
+# $Id: PKGBUILD 182005 2013-04-05 08:57:29Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kwallet
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc='Wallet Management Tool'
 url='http://kde.org/applications/system/kwalletmanager/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz")
-sha1sums=('6fcebed46c29f6a39b665fa3877e833dc9a58633')
+sha1sums=('2a566c85aec79e8d08afe996224029714cd38b6e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-print-manager/PKGBUILD b/extra/kdeutils-print-manager/PKGBUILD
index bbfbc9ce8..7d4f12592 100644
--- a/extra/kdeutils-print-manager/PKGBUILD
+++ b/extra/kdeutils-print-manager/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177779 2013-02-08 12:51:41Z andrea $
+# $Id: PKGBUILD 182006 2013-04-05 08:57:30Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-print-manager
-pkgver=4.10.0
-pkgrel=2
+pkgver=4.10.2
+pkgrel=1
 pkgdesc="A tool for managing print jobs and printers"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdeutils/print-manager'
@@ -15,7 +15,7 @@ replaces=('print-manager' 'kdeutils-printer-applet' 'kdeadmin-system-config-prin
 conflicts=('print-manager')
 groups=('kde' 'kdeutils')
 source=("http://download.kde.org/stable/${pkgver}/src/print-manager-${pkgver}.tar.xz")
-sha1sums=('182a514ed62baf1892be6c4b1977260ba365c634')
+sha1sums=('67aaa15e157612e50547ce9cd35bcd06ce1fac22')
 
 build() {
   mkdir build
diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD
index 41f5abd3c..5e0548047 100644
--- a/extra/kdeutils-superkaramba/PKGBUILD
+++ b/extra/kdeutils-superkaramba/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177761 2013-02-08 08:58:48Z andrea $
+# $Id: PKGBUILD 182007 2013-04-05 08:57:32Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-superkaramba
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc='An engine for cool desktop eyecandy'
 url='http://kde.org/applications/utilities/superkaramba/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz")
-sha1sums=('a4555c43c0fb30ee876ffa19517e0a74ca7b9bc1')
+sha1sums=('5c701c7d95cef873fd0767726a6042d02844c0f2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD
index 8d410bfdc..b2c41eba7 100644
--- a/extra/kdeutils-sweeper/PKGBUILD
+++ b/extra/kdeutils-sweeper/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177762 2013-02-08 08:58:49Z andrea $
+# $Id: PKGBUILD 182008 2013-04-05 08:57:33Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-sweeper
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc='System Cleaner'
 url='http://kde.org/applications/utilities/sweeper'
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz")
-sha1sums=('613c3e5f4c8f1e0a64f4a35ffa58f504d1d4c4b7')
+sha1sums=('b817768cbf7c47ba8d0f61c714849e9074cebc43')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD
index f08f3fff7..a3f066062 100644
--- a/extra/kdevelop-php/PKGBUILD
+++ b/extra/kdevelop-php/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170180 2012-11-04 07:52:57Z andrea $
+# $Id: PKGBUILD 183678 2013-04-26 13:20:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdevelop-php
-pkgver=1.4.1
-_pkgver=4.4.1
+pkgver=1.5.0
+_pkgver=4.5.0
 pkgrel=1
 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt')
 replaces=('kdevelop-php-docs')
 conflicts=('kdevelop-php-docs')
 source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
-sha1sums=('f3523acfc27d0fd68c2b1f970b4ac42dcda38ced'
-          '3a1b20c4527abf489df20a23177dd9befc2e1d3c')
+sha1sums=('778a1711c15458952e1e4765722a0839390f636c'
+          'fa282f0ace43d36a785e608c421c91437596fc79')
 
 build() {
   mkdir build
diff --git a/extra/kdevelop-python/PKGBUILD b/extra/kdevelop-python/PKGBUILD
index 1a5551ab5..acbcf2f6e 100644
--- a/extra/kdevelop-python/PKGBUILD
+++ b/extra/kdevelop-python/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 172007 2012-11-26 13:00:02Z andrea $
+# $Id: PKGBUILD 184199 2013-05-03 13:03:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdevelop-python
-pkgver=1.4.1
+pkgver=1.5.0
 pkgrel=1
 pkgdesc="Python language and documentation plugin for KDevelop"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('kdevelop')
 makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt')
 source=("http://download.kde.org/stable/kdevelop/kdev-python/${pkgver}/src/kdev-python-v${pkgver}.tar.bz2")
-sha1sums=('b887811d9a79eee3323cf3ad1be093c5801d31d6')
+sha1sums=('fb9af112910c5655ce52bf9cfef19bacbab4f62f')
 
 build() {
   mkdir build
diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD
index 7e50d20e7..a9b9f3059 100644
--- a/extra/kdevelop/PKGBUILD
+++ b/extra/kdevelop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170179 2012-11-04 07:52:07Z andrea $
+# $Id: PKGBUILD 183676 2013-04-26 13:20:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevelop
-pkgver=4.4.1
+pkgver=4.5.0
 pkgrel=1
 pkgdesc="A C/C++ development environment for KDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ optdepends=('kdesdk-okteta: hex editor'
             'qt-doc: qt documentation integration')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('31bd10ffdbf2a6f2b3a75ecc8c1877d1bcc5b685')
+sha1sums=('21cdff814b5840d4b62b105b53c0b128e35c3c9f')
 
 build() {
   mkdir build
diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD
index 14db29b72..68ac479b1 100644
--- a/extra/kdevplatform/PKGBUILD
+++ b/extra/kdevplatform/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 171963 2012-11-25 14:40:16Z andrea $
+# $Id: PKGBUILD 183674 2013-04-26 13:19:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevplatform
-pkgver=1.4.1
-_pkgver=4.4.1
-pkgrel=2
+pkgver=1.5.0
+_pkgver=4.5.0
+pkgrel=1
 pkgdesc="A C/C++ development platform for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kdevelop.org/"
@@ -15,7 +15,7 @@ optdepends=("kdesdk-kompare: difference checking")
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('48f2b40256e96aa015fa40978d5a9a93056fba75')
+sha1sums=('c5b887fdd9fe065ff8be5641859c80c020ba625e')
 
 build() {
   mkdir build
diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD
index 685356631..05e032d0f 100644
--- a/extra/kdewebdev/PKGBUILD
+++ b/extra/kdewebdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177763 2013-02-08 08:58:51Z andrea $
+# $Id: PKGBUILD 182009 2013-04-05 08:57:36Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -7,7 +7,7 @@ pkgname=('kdewebdev-kfilereplace'
          'kdewebdev-kimagemapeditor'
          'kdewebdev-klinkstatus'
          'kdewebdev-kommander')
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -15,7 +15,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdewebdev')
 makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('0dc717ad88762d0cd68a92683d47a6055d5c2538')
+sha1sums=('3ab68cf5fefbfe09826e659a097d21821771a5b9')
 
 build() {
 	cd $srcdir
diff --git a/extra/kexec-tools/PKGBUILD b/extra/kexec-tools/PKGBUILD
index 7c50cd51c..335458d4b 100644
--- a/extra/kexec-tools/PKGBUILD
+++ b/extra/kexec-tools/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 170845 2012-11-12 15:18:26Z tpowa $
+# $Id: PKGBUILD 182155 2013-04-08 13:04:10Z tpowa $
 # Contributor: Camille Moncelier <pix@devlife.org>, simo <simo@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kexec-tools
-pkgver=2.0.3
-pkgrel=2
+pkgver=2.0.4
+pkgrel=1
 pkgdesc="Load another kernel from the currently executing Linux kernel"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kernel.org/pub/linux/utils/kernel/kexec/"
 source=("ftp://ftp.archlinux.org/other/kexec-tools/kexec-tools-${pkgver}.tar.bz2"
+        # upstream tarballs broken with bsdtar!
         #"http://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-${pkgver}.tar.bz2"
-        'kexec' 
-        'kexec.conf.d')
+        )
 depends=('gawk' 'zlib' 'xz')
 backup=('etc/conf.d/kexec')
 license=('GPL2')
@@ -29,9 +29,5 @@ package() {
   mv $pkgdir/usr/sbin $pkgdir/sbin
 
   install -D -m644 kexec/kexec.8 $pkgdir/usr/share/man/man8/kexec.8
-  install -D -m644 $srcdir/kexec.conf.d $pkgdir/etc/conf.d/kexec
-  install -D -m755 $srcdir/kexec $pkgdir/etc/rc.d/kexec
 }
-md5sums=('3d9ff82e8e16165b9e79ded271c08348'
-         'be059a103e5989519d22fca99f860a64'
-         '9ca7e31d2c5c66c436a9a2baf20ad9b2')
+md5sums=('4713026758923f5f3968905291b991ee')
diff --git a/extra/kexec-tools/kexec-tools-2.0.0-purgatory-makefile.patch b/extra/kexec-tools/kexec-tools-2.0.0-purgatory-makefile.patch
deleted file mode 100644
index 0c029c8f4..000000000
--- a/extra/kexec-tools/kexec-tools-2.0.0-purgatory-makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up kexec-tools-2.0.0/purgatory/Makefile.orig kexec-tools-2.0.0/purgatory/Makefile
---- kexec-tools-2.0.0/purgatory/Makefile.orig	2011-03-10 11:39:22.100799291 -0500
-+++ kexec-tools-2.0.0/purgatory/Makefile	2011-03-10 11:39:36.422736886 -0500
-@@ -55,14 +55,14 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATO
- 			-I$(srcdir)/util_lib/include \
- 			-I$(shell $(CC) -print-file-name=include)
- $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\
--			--no-undefined -nostartfiles -nostdlib -nodefaultlibs \
-+			-nostartfiles -nostdlib -nodefaultlibs \
- 			-e purgatory_start -r
- 
- $(PURGATORY): $(PURGATORY_OBJS)
- 	$(MKDIR) -p $(@D)
- 	$(CC) $(LDFLAGS) -o $@ $^
- 
--#	$(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB)
-+#	$(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB)
- 
- echo::
- 	@echo "PURGATORY_SRCS $(PURGATORY_SRCS)"
diff --git a/extra/kile/PKGBUILD b/extra/kile/PKGBUILD
deleted file mode 100644
index d9d97012c..000000000
--- a/extra/kile/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 171257 2012-11-16 22:52:10Z allan $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=kile
-pkgver=2.1.3
-pkgrel=2
-pkgdesc="A user friendly TeX/LaTeX frontend for KDE"
-arch=("i686" "x86_64")
-license=('GPL2')
-url="http://kile.sourceforge.net/"
-depends=('kdebase-runtime' 'texlive-core' 'kdebase-katepart')
-makedepends=('cmake' 'automoc4')
-optdepends=('kdebase-konsole: embedded terminal')
-install=${pkgname}.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-sha1sums=('1a80748d5f01f359b5e5c28140ec90691f0166c5')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/kile/kile.install b/extra/kile/kile.install
deleted file mode 100644
index 9fe93eeac..000000000
--- a/extra/kile/kile.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-        update-mime-database usr/share/mime &> /dev/null
-        update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD
index d31664fdb..f1de285d1 100644
--- a/extra/kismet/PKGBUILD
+++ b/extra/kismet/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=kismet
 pkgver=2011_03_R2
 _realver="${pkgver//_/-}"
-pkgrel=5
+pkgrel=5.1
 pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kismetwireless.net/"
diff --git a/extra/kobodeluxe/PKGBUILD b/extra/kobodeluxe/PKGBUILD
index 1671dc7c5..c7cf2efbf 100644
--- a/extra/kobodeluxe/PKGBUILD
+++ b/extra/kobodeluxe/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=kobodeluxe
 pkgver=0.5.1
-pkgrel=3.1
+pkgrel=3.2
 pkgdesc="An enhanced version of Akira Higuchi's game XKobo, an addictive space shoot'em up"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.olofson.net/kobodl/"
diff --git a/extra/kradio/PKGBUILD b/extra/kradio/PKGBUILD
deleted file mode 100644
index fb902ba5e..000000000
--- a/extra/kradio/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 165496 2012-08-21 08:58:19Z eric $
-# Maintainer:
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=kradio
-pkgver=4.0.6
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
-pkgdesc="A comfortable KDE internet and AM/FM radio application"
-url="http://kradio.sourceforge.net/"
-depends=('kdebase-runtime' 'libmms' 'ffmpeg')
-[ "$CARCH" != "mips64el" ] && depends+=('lirc-utils')
-makedepends=('automoc4' 'cmake' 'boost')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/$pkgname/kradio4-$pkgver.tar.bz2"{,.asc})
-md5sums=('ee9214156465e0416bb369f78b4a5eae'
-         'f43706e63d24788f2278bada7b10cc6f')
-
-build() {
-  cd "$srcdir"
-  mkdir build
-  cd build
-  cmake ../${pkgname}4-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "$srcdir/build"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/extra/kshutdown/PKGBUILD b/extra/kshutdown/PKGBUILD
deleted file mode 100644
index cf8efe0e2..000000000
--- a/extra/kshutdown/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 172105 2012-11-28 13:15:50Z stephane $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=kshutdown
-pkgver=3.0beta5
-pkgrel=1
-pkgdesc="Shutdown Utility for KDE"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://kshutdown.sourceforge.net/"
-license=('GPL')
-depends=('kdebase-workspace')
-makedepends=('cmake' 'automoc4')
-install='kshutdown.install'
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip")
-sha1sums=('108e27a7d1cef505c296656f92ab071d8c53bce3')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/ktorrent/groupmiewmodel.diff b/extra/ktorrent/groupmiewmodel.diff
deleted file mode 100644
index f16bdc57b..000000000
--- a/extra/ktorrent/groupmiewmodel.diff
+++ /dev/null
@@ -1,87 +0,0 @@
-commit 1009ba89b5d603ae7f1a95ef65a818c760c367cf
-Author: Joris Guisson <joris.guisson@gmail.com>
-Date:   Mon Oct 22 20:07:21 2012 +0200
-
-    Backport to 4.3: Fix crash in GroupViewModel when dragging torrents over groups
-    
-    BUG: 308733
-
-diff --git a/ktorrent/groups/groupviewmodel.cpp b/ktorrent/groups/groupviewmodel.cpp
-index f2e99d2..b4dca7e 100644
---- ktorrent/groups/groupviewmodel.cpp
-+++ ktorrent/groups/groupviewmodel.cpp
-@@ -55,6 +55,9 @@ namespace kt
- 	QVariant GroupViewModel::data(const QModelIndex& index, int role) const
- 	{
- 		Item* item = (Item*)index.internalPointer();
-+        if(!item)
-+            return QVariant();
-+        
- 		switch(role)
- 		{
- 			case Qt::DisplayRole:
-@@ -72,6 +75,9 @@ namespace kt
- 			return false;
- 		
- 		Item* item = (Item*)index.internalPointer();
-+        if(!item)
-+            return false;
-+        
- 		Group* group = item->group;
- 		QString new_name = value.toString();
- 		if(new_name.isEmpty() || gman->find(new_name))
-@@ -96,13 +102,16 @@ namespace kt
- 			return 1;
- 		
- 		Item* item = (Item*)parent.internalPointer();
--		return item->children.size();
-+        if(!item)
-+            return 0;
-+        else
-+            return item->children.size();
- 	}
- 
- 	QModelIndex GroupViewModel::parent(const QModelIndex& child) const
- 	{
- 		Item* item = (Item*)child.internalPointer();
--		if(!item->parent)
-+		if(!item || !item->parent)
- 			return QModelIndex();
- 		else
- 			return createIndex(item->parent->row, 0, (void*)item->parent);
-@@ -114,7 +123,7 @@ namespace kt
- 			return createIndex(row, column, (void*)&root);
- 		
- 		Item* item = (Item*)parent.internalPointer();
--		if(row < 0 || row >= item->children.count())
-+		if(!item || row < 0 || row >= item->children.count())
- 			return QModelIndex();
- 		
- 		return createIndex(row, column, (void*)&item->children.at(row));
-@@ -157,7 +166,7 @@ namespace kt
- 	Qt::ItemFlags GroupViewModel::flags(const QModelIndex& index) const
- 	{
- 		Item* item = (Item*)index.internalPointer();
--		if(item->group && !item->group->isStandardGroup())
-+		if(item && item->group && !item->group->isStandardGroup())
- 			return Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled;
- 		else
- 			return Qt::ItemIsEnabled;
-@@ -218,8 +227,11 @@ namespace kt
- 	
- 	bool GroupViewModel::removeRows(int row, int count, const QModelIndex& parent)
- 	{
-+        Item* item = (Item*)parent.internalPointer();
-+        if(!item)
-+            return false;
-+        
- 		beginRemoveRows(parent, row, row + count);
--		Item* item = (Item*)parent.internalPointer();
- 		for(int i = 0; i < count; i++)
- 			item->children.removeAt(row);
- 		int row_index = 0;
-@@ -436,3 +448,4 @@ namespace kt
- 
- 
- }
-+
diff --git a/extra/ktorrent/httpserver.patch b/extra/ktorrent/httpserver.patch
deleted file mode 100644
index 71c616db0..000000000
--- a/extra/ktorrent/httpserver.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/webinterface/httpserver.cpp.old
-+++ plugins/webinterface/httpserver.cpp
-@@ -29,6 +29,7 @@
- #include <ktemporaryfile.h>
- #include <k3streamsocket.h>
- #include <k3resolver.h>
-+#include <time.h>
- 
- #include <qfileinfo.h>
- #include <qstringlist.h> 
diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD
index 2545b0593..9ddd39c29 100644
--- a/extra/kwebkitpart/PKGBUILD
+++ b/extra/kwebkitpart/PKGBUILD
@@ -1,20 +1,22 @@
-# $Id: PKGBUILD 171905 2012-11-23 07:53:25Z andrea $
+# $Id: PKGBUILD 179888 2013-03-10 21:31:07Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kwebkitpart
-pkgver=1.3.1
-pkgrel=1
+pkgver=1.3.2
+pkgrel=2
 pkgdesc="A WebKit browser component for KDE"
 url="https://projects.kde.org/projects/extragear/base/kwebkitpart/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-depends=('kdebase-runtime')
+depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('aec1820fe59ea8f4fe62c81503560f8e')
+source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('2df1c70371b99e5f638fff702f789ba1')
 
 build() {
+  sed -i '/add_subdirectory(kdelauncher)/d' ${pkgname}-${pkgver}/CMakeLists.txt
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
diff --git a/extra/lablgtk/PKGBUILD b/extra/lablgtk/PKGBUILD
index 87e8c74fd..e48745faf 100644
--- a/extra/lablgtk/PKGBUILD
+++ b/extra/lablgtk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149580 2012-02-08 15:00:33Z tpowa $
+# $Id: PKGBUILD 177911 2013-02-10 17:58:16Z eric $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=lablgtk
@@ -15,11 +15,15 @@ source=(http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/$pkgname-$pkgver.tar.
 md5sums=('73a797e3a459190fdcaa8288935f6fb9')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir"/$pkgname-$pkgver
   make configure 
   make 
   make opt 
-  make  PREFIX=$pkgdir/usr LIBDIR=$pkgdir/usr/lib/ocaml BINDIR=$pkgdir/usr/bin \
-    INSTALLDIR=$pkgdir/usr/lib/ocaml/lablgtk DLLDIR=$pkgdir/usr/lib/ocaml/stublibs install
-  rm -r $pkgdir/usr/bin
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make  PREFIX="$pkgdir"/usr LIBDIR="$pkgdir"/usr/lib/ocaml BINDIR="$pkgdir"/usr/bin \
+    INSTALLDIR="$pkgdir"/usr/lib/ocaml/lablgtk DLLDIR="$pkgdir"/usr/lib/ocaml/stublibs install
+  rm -r "$pkgdir"/usr/bin
 }
diff --git a/extra/ladspa/PKGBUILD b/extra/ladspa/PKGBUILD
index be50e285b..596c6104e 100644
--- a/extra/ladspa/PKGBUILD
+++ b/extra/ladspa/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=ladspa
 pkgver=1.13
-pkgrel=4
+pkgrel=4.1
 pkgdesc="Linux Audio Developer's Simple Plugin API (LADSPA)"
 arch=("i686" "x86_64" 'mips64el')
 license=('LGPL')
diff --git a/extra/ladspa/hardcode-path.patch b/extra/ladspa/hardcode-path.patch
deleted file mode 100644
index 821c2001c..000000000
--- a/extra/ladspa/hardcode-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/search.c.orig	2008-11-07 00:38:18.000000000 +0100
-+++ src/search.c	2008-11-07 00:50:51.000000000 +0100
-@@ -83,6 +83,8 @@
- 	dlclose(pcFilename);
- 	free(pcFilename);
-       }
-+    } else {
-+      free(pcFilename);
-     }
-   }
- }
-@@ -99,13 +101,10 @@
- 
-   pcLADSPAPath = getenv("LADSPA_PATH");
-   if (!pcLADSPAPath) {
--    fprintf(stderr,
--	    "Warning: You do not have a LADSPA_PATH "
--	    "environment variable set.\n");
--    return;
-+    pcStart = "/usr/lib/ladspa/";
-+  } else {
-+    pcStart = pcLADSPAPath;
-   }
--  
--  pcStart = pcLADSPAPath;
-   while (*pcStart != '\0') {
-     pcEnd = pcStart;
-     while (*pcEnd != ':' && *pcEnd != '\0')
diff --git a/extra/lame/PKGBUILD b/extra/lame/PKGBUILD
index e7b961259..68bd0114d 100644
--- a/extra/lame/PKGBUILD
+++ b/extra/lame/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=lame
 pkgver=3.99.5
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://lame.sourceforge.net/"
diff --git a/extra/lapack/Makefile.blas b/extra/lapack/Makefile.blas
deleted file mode 100644
index 46b3eeb79..000000000
--- a/extra/lapack/Makefile.blas
+++ /dev/null
@@ -1,148 +0,0 @@
-include ../../make.inc
-
-#######################################################################
-#  This is the makefile to create a library for the BLAS.
-#  The files are grouped as follows:
-#
-#       SBLAS1 -- Single precision real BLAS routines
-#       CBLAS1 -- Single precision complex BLAS routines
-#       DBLAS1 -- Double precision real BLAS routines
-#       ZBLAS1 -- Double precision complex BLAS routines
-#
-#       CB1AUX -- Real BLAS routines called by complex routines
-#       ZB1AUX -- D.P. real BLAS routines called by d.p. complex
-#                 routines
-#
-#      ALLBLAS -- Auxiliary routines for Level 2 and 3 BLAS
-#
-#       SBLAS2 -- Single precision real BLAS2 routines
-#       CBLAS2 -- Single precision complex BLAS2 routines
-#       DBLAS2 -- Double precision real BLAS2 routines
-#       ZBLAS2 -- Double precision complex BLAS2 routines
-#
-#       SBLAS3 -- Single precision real BLAS3 routines
-#       CBLAS3 -- Single precision complex BLAS3 routines
-#       DBLAS3 -- Double precision real BLAS3 routines
-#       ZBLAS3 -- Double precision complex BLAS3 routines
-#
-#  The library can be set up to include routines for any combination
-#  of the four precisions.  To create or add to the library, enter make
-#  followed by one or more of the precisions desired.  Some examples:
-#       make single
-#       make single complex
-#       make single double complex complex16
-#  Note that these commands are not safe for parallel builds.
-#
-#  Alternatively, the commands
-#       make all
-#  or
-#       make
-#  without any arguments creates a library of all four precisions.
-#  The name of the library is held in BLASLIB, which is set in the
-#  top-level make.inc
-#
-#  To remove the object files after the library is created, enter
-#       make clean
-#  To force the source files to be recompiled, enter, for example,
-#       make single FRC=FRC
-#
-#---------------------------------------------------------------------
-#
-#  Edward Anderson, University of Tennessee
-#  March 26, 1990
-#  Susan Ostrouchov, Last updated September 30, 1994
-#  ejr, May 2006.
-#
-#######################################################################
-
-all: $(BLASLIB)
- 
-#---------------------------------------------------------
-#  Comment out the next 6 definitions if you already have
-#  the Level 1 BLAS.
-#---------------------------------------------------------
-SBLAS1 = isamax.o sasum.o saxpy.o scopy.o sdot.o snrm2.o \
-	srot.o srotg.o sscal.o sswap.o sdsdot.o srotmg.o srotm.o
-$(SBLAS1): $(FRC)
-
-CBLAS1 = scabs1.o scasum.o scnrm2.o icamax.o caxpy.o ccopy.o \
-	cdotc.o cdotu.o csscal.o crotg.o cscal.o cswap.o csrot.o
-$(CBLAS1): $(FRC)
-
-DBLAS1 = idamax.o dasum.o daxpy.o dcopy.o ddot.o dnrm2.o \
-	drot.o drotg.o dscal.o dsdot.o dswap.o drotmg.o drotm.o
-$(DBLAS1): $(FRC)
-
-ZBLAS1 = dcabs1.o dzasum.o dznrm2.o izamax.o zaxpy.o zcopy.o \
-	zdotc.o zdotu.o zdscal.o zrotg.o zscal.o zswap.o zdrot.o
-$(ZBLAS1): $(FRC)
-
-CB1AUX = isamax.o sasum.o saxpy.o scopy.o snrm2.o sscal.o
-$(CB1AUX): $(FRC)
-
-ZB1AUX = idamax.o dasum.o daxpy.o dcopy.o dnrm2.o dscal.o
-$(ZB1AUX): $(FRC)
-
-#---------------------------------------------------------------------
-#  The following line defines auxiliary routines needed by both the
-#  Level 2 and Level 3 BLAS.  Comment it out only if you already have
-#  both the Level 2 and 3 BLAS.
-#---------------------------------------------------------------------
-ALLBLAS  = lsame.o xerbla.o xerbla_array.o
-$(ALLBLAS) : $(FRC)
-
-#---------------------------------------------------------
-#  Comment out the next 4 definitions if you already have
-#  the Level 2 BLAS.
-#---------------------------------------------------------
-SBLAS2 = sgemv.o sgbmv.o ssymv.o ssbmv.o sspmv.o \
-	strmv.o stbmv.o stpmv.o strsv.o stbsv.o stpsv.o \
-	sger.o ssyr.o sspr.o ssyr2.o sspr2.o
-$(SBLAS2): $(FRC)
-
-CBLAS2 = cgemv.o cgbmv.o chemv.o chbmv.o chpmv.o \
-	ctrmv.o ctbmv.o ctpmv.o ctrsv.o ctbsv.o ctpsv.o \
-	cgerc.o cgeru.o cher.o chpr.o cher2.o chpr2.o
-$(CBLAS2): $(FRC)
-
-DBLAS2 = dgemv.o dgbmv.o dsymv.o dsbmv.o dspmv.o \
-	dtrmv.o dtbmv.o dtpmv.o dtrsv.o dtbsv.o dtpsv.o \
-	dger.o dsyr.o dspr.o dsyr2.o dspr2.o
-$(DBLAS2): $(FRC)
-
-ZBLAS2 = zgemv.o zgbmv.o zhemv.o zhbmv.o zhpmv.o \
-	ztrmv.o ztbmv.o ztpmv.o ztrsv.o ztbsv.o ztpsv.o \
-	zgerc.o zgeru.o zher.o zhpr.o zher2.o zhpr2.o
-$(ZBLAS2): $(FRC)
-
-#---------------------------------------------------------
-#  Comment out the next 4 definitions if you already have
-#  the Level 3 BLAS.
-#---------------------------------------------------------
-SBLAS3 = sgemm.o ssymm.o ssyrk.o ssyr2k.o strmm.o strsm.o 
-$(SBLAS3): $(FRC)
-
-CBLAS3 = cgemm.o csymm.o csyrk.o csyr2k.o ctrmm.o ctrsm.o \
-	chemm.o cherk.o cher2k.o
-$(CBLAS3): $(FRC)
-
-DBLAS3 = dgemm.o dsymm.o dsyrk.o dsyr2k.o dtrmm.o dtrsm.o
-$(DBLAS3): $(FRC)
-
-ZBLAS3 = zgemm.o zsymm.o zsyrk.o zsyr2k.o ztrmm.o ztrsm.o \
-	zhemm.o zherk.o zher2k.o
-$(ZBLAS3): $(FRC)
-
-ALLOBJ=$(SBLAS1) $(SBLAS2) $(SBLAS3) $(DBLAS1) $(DBLAS2) $(DBLAS3)	\
-	$(CBLAS1) $(CBLAS2) $(CBLAS3) $(ZBLAS1) \
-	$(ZBLAS2) $(ZBLAS3) $(ALLBLAS)
-
-clean:
-	rm -f *.o libblas.a libblas.so*
-
-static: $(ALLOBJ)
-	ar ruv libblas.a $(ALLOBJ)
-	ranlib libblas.a
-
-shared: $(ALLOBJ)
-	cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.3.0 $(ALLOBJ) -lm -lgfortran -lc
diff --git a/extra/lapack/Makefile.lapack b/extra/lapack/Makefile.lapack
deleted file mode 100644
index a56436723..000000000
--- a/extra/lapack/Makefile.lapack
+++ /dev/null
@@ -1,461 +0,0 @@
- include ../make.inc
-
-#######################################################################
-#  This is the makefile to create a library for LAPACK.
-#  The files are organized as follows:
-#       ALLAUX  -- Auxiliary routines called from all precisions
-#
-#       SCLAUX  -- Auxiliary routines called from both REAL and COMPLEX.
-#       DZLAUX  -- Auxiliary routines called from both DOUBLE and COMPLEX*16.
-#
-#       DSLASRC -- Double-single mixed precision real routines called from
-#                  single, single-extra and double precision real LAPACK
-#                  routines (i.e. from SLASRC, SXLASRC, DLASRC).
-#       ZCLASRC -- Double-single mixed precision complex routines called from
-#                  single, single-extra and double precision complex LAPACK
-#                  routines (i.e. from CLASRC, CXLASRC, ZLASRC).
-#
-#       SLASRC  -- Single precision real LAPACK routines
-#       SXLASRC -- Single precision real LAPACK routines using extra
-#                  precision.
-#       CLASRC  -- Single precision complex LAPACK routines
-#       CXLASRC -- Single precision complex LAPACK routines using extra
-#                  precision.
-#       DLASRC  -- Double precision real LAPACK routines
-#       DXLASRC -- Double precision real LAPACK routines using extra
-#                  precision.
-#       ZLASRC  -- Double precision complex LAPACK routines
-#       ZXLASRC -- Double precision complex LAPACK routines using extra
-#                  precision.   
-#
-#  The library can be set up to include routines for any combination
-#  of the four precisions.  To create or add to the library, enter make
-#  followed by one or more of the precisions desired.  Some examples:
-#       make single
-#       make single complex
-#       make single double complex complex16
-#  Alternatively, the command
-#       make
-#  without any arguments creates a library of all four precisions.
-#  The library is called
-#       lapack.a
-#  and is created at the next higher directory level.
-#
-#  To remove the object files after the library is created, enter
-#       make clean
-#  On some systems, you can force the source files to be recompiled by
-#  entering (for example)
-#       make single FRC=FRC
-#
-#  ***Note***
-#  The functions lsame, second, dsecnd, slamch, and dlamch may have
-#  to be installed before compiling the library.  Refer to the
-#  installation guide, LAPACK Working Note 41, for instructions.
-#
-#######################################################################
-
-ALLAUX = ilaenv.o ieeeck.o lsamen.o xerbla.o xerbla_array.o iparmq.o	\
-    ilaprec.o ilatrans.o ilauplo.o iladiag.o chla_transtype.o \
-    ../INSTALL/ilaver.o ../INSTALL/lsame.o ../INSTALL/slamch.o
-
-SCLAUX = \
-   sbdsdc.o \
-   sbdsqr.o sdisna.o slabad.o slacpy.o sladiv.o slae2.o  slaebz.o \
-   slaed0.o slaed1.o slaed2.o slaed3.o slaed4.o slaed5.o slaed6.o \
-   slaed7.o slaed8.o slaed9.o slaeda.o slaev2.o slagtf.o \
-   slagts.o slamrg.o slanst.o \
-   slapy2.o slapy3.o slarnv.o \
-   slarra.o slarrb.o slarrc.o slarrd.o slarre.o slarrf.o slarrj.o \
-   slarrk.o slarrr.o slaneg.o \
-   slartg.o slaruv.o slas2.o  slascl.o \
-   slasd0.o slasd1.o slasd2.o slasd3.o slasd4.o slasd5.o slasd6.o \
-   slasd7.o slasd8.o slasda.o slasdq.o slasdt.o \
-   slaset.o slasq1.o slasq2.o slasq3.o slasq4.o slasq5.o slasq6.o \
-   slasr.o  slasrt.o slassq.o slasv2.o spttrf.o sstebz.o sstedc.o \
-   ssteqr.o ssterf.o slaisnan.o sisnan.o \
-   slartgp.o slartgs.o \
-    ../INSTALL/second_$(TIMER).o
-
-DZLAUX = \
-   dbdsdc.o \
-   dbdsqr.o ddisna.o dlabad.o dlacpy.o dladiv.o dlae2.o  dlaebz.o \
-   dlaed0.o dlaed1.o dlaed2.o dlaed3.o dlaed4.o dlaed5.o dlaed6.o \
-   dlaed7.o dlaed8.o dlaed9.o dlaeda.o dlaev2.o dlagtf.o \
-   dlagts.o dlamrg.o dlanst.o \
-   dlapy2.o dlapy3.o dlarnv.o \
-   dlarra.o dlarrb.o dlarrc.o dlarrd.o dlarre.o dlarrf.o dlarrj.o \
-   dlarrk.o dlarrr.o dlaneg.o \
-   dlartg.o dlaruv.o dlas2.o  dlascl.o \
-   dlasd0.o dlasd1.o dlasd2.o dlasd3.o dlasd4.o dlasd5.o dlasd6.o \
-   dlasd7.o dlasd8.o dlasda.o dlasdq.o dlasdt.o \
-   dlaset.o dlasq1.o dlasq2.o dlasq3.o dlasq4.o dlasq5.o dlasq6.o \
-   dlasr.o  dlasrt.o dlassq.o dlasv2.o dpttrf.o dstebz.o dstedc.o \
-   dsteqr.o dsterf.o dlaisnan.o disnan.o \
-   dlartgp.o dlartgs.o \
-   ../INSTALL/dlamch.o ../INSTALL/dsecnd_$(TIMER).o
-
-SLASRC = \
-   sgbbrd.o sgbcon.o sgbequ.o sgbrfs.o sgbsv.o  \
-   sgbsvx.o sgbtf2.o sgbtrf.o sgbtrs.o sgebak.o sgebal.o sgebd2.o \
-   sgebrd.o sgecon.o sgeequ.o sgees.o  sgeesx.o sgeev.o  sgeevx.o \
-   sgegs.o  sgegv.o  sgehd2.o sgehrd.o sgelq2.o sgelqf.o \
-   sgels.o  sgelsd.o sgelss.o sgelsx.o sgelsy.o sgeql2.o sgeqlf.o \
-   sgeqp3.o sgeqpf.o sgeqr2.o sgeqr2p.o sgeqrf.o sgeqrfp.o sgerfs.o \
-   sgerq2.o sgerqf.o sgesc2.o sgesdd.o sgesv.o  sgesvd.o sgesvx.o \
-   sgetc2.o sgetf2.o sgetri.o \
-   sggbak.o sggbal.o sgges.o  sggesx.o sggev.o  sggevx.o \
-   sggglm.o sgghrd.o sgglse.o sggqrf.o \
-   sggrqf.o sggsvd.o sggsvp.o sgtcon.o sgtrfs.o sgtsv.o  \
-   sgtsvx.o sgttrf.o sgttrs.o sgtts2.o shgeqz.o \
-   shsein.o shseqr.o slabrd.o slacon.o slacn2.o \
-   slaein.o slaexc.o slag2.o  slags2.o slagtm.o slagv2.o slahqr.o \
-   slahrd.o slahr2.o slaic1.o slaln2.o slals0.o slalsa.o slalsd.o \
-   slangb.o slange.o slangt.o slanhs.o slansb.o slansp.o \
-   slansy.o slantb.o slantp.o slantr.o slanv2.o \
-   slapll.o slapmt.o \
-   slaqgb.o slaqge.o slaqp2.o slaqps.o slaqsb.o slaqsp.o slaqsy.o \
-   slaqr0.o slaqr1.o slaqr2.o slaqr3.o slaqr4.o slaqr5.o \
-   slaqtr.o slar1v.o slar2v.o ilaslr.o ilaslc.o \
-   slarf.o  slarfb.o slarfg.o slarfgp.o slarft.o slarfx.o slargv.o \
-   slarrv.o slartv.o  \
-   slarz.o  slarzb.o slarzt.o slaswp.o slasy2.o slasyf.o \
-   slatbs.o slatdf.o slatps.o slatrd.o slatrs.o slatrz.o slatzm.o \
-   slauu2.o slauum.o sopgtr.o sopmtr.o sorg2l.o sorg2r.o \
-   sorgbr.o sorghr.o sorgl2.o sorglq.o sorgql.o sorgqr.o sorgr2.o \
-   sorgrq.o sorgtr.o sorm2l.o sorm2r.o \
-   sormbr.o sormhr.o sorml2.o sormlq.o sormql.o sormqr.o sormr2.o \
-   sormr3.o sormrq.o sormrz.o sormtr.o spbcon.o spbequ.o spbrfs.o \
-   spbstf.o spbsv.o  spbsvx.o \
-   spbtf2.o spbtrf.o spbtrs.o spocon.o spoequ.o sporfs.o sposv.o  \
-   sposvx.o spotf2.o  spotri.o  spstrf.o spstf2.o \
-   sppcon.o sppequ.o \
-   spprfs.o sppsv.o  sppsvx.o spptrf.o spptri.o spptrs.o sptcon.o \
-   spteqr.o sptrfs.o sptsv.o  sptsvx.o spttrs.o sptts2.o srscl.o  \
-   ssbev.o  ssbevd.o ssbevx.o ssbgst.o ssbgv.o  ssbgvd.o ssbgvx.o \
-   ssbtrd.o sspcon.o sspev.o  sspevd.o sspevx.o sspgst.o \
-   sspgv.o  sspgvd.o sspgvx.o ssprfs.o sspsv.o  sspsvx.o ssptrd.o \
-   ssptrf.o ssptri.o ssptrs.o sstegr.o sstein.o sstev.o  sstevd.o sstevr.o \
-   sstevx.o \
-   ssycon.o ssyev.o  ssyevd.o ssyevr.o ssyevx.o ssygs2.o \
-   ssygst.o ssygv.o  ssygvd.o ssygvx.o ssyrfs.o ssysv.o  ssysvx.o \
-   ssytd2.o ssytf2.o ssytrd.o ssytrf.o ssytri.o ssytri2.o ssytri2x.o \
-   ssyswapr.o ssytrs.o ssytrs2.o ssyconv.o \
-   stbcon.o \
-   stbrfs.o stbtrs.o stgevc.o stgex2.o stgexc.o stgsen.o \
-   stgsja.o stgsna.o stgsy2.o stgsyl.o stpcon.o stprfs.o stptri.o \
-   stptrs.o \
-   strcon.o strevc.o strexc.o strrfs.o strsen.o strsna.o strsyl.o \
-   strti2.o strtri.o strtrs.o stzrqf.o stzrzf.o sstemr.o \
-   slansf.o spftrf.o spftri.o spftrs.o ssfrk.o stfsm.o stftri.o stfttp.o \
-   stfttr.o stpttf.o stpttr.o strttf.o strttp.o \
-   sgejsv.o  sgesvj.o  sgsvj0.o  sgsvj1.o \
-   sgeequb.o ssyequb.o spoequb.o sgbequb.o \
-   sbbcsd.o slapmr.o sorbdb.o sorcsd.o \
-   sgeqrt.o sgeqrt2.o sgeqrt3.o sgemqrt.o \
-   stpqrt.o stpqrt2.o stpmqrt.o stprfb.o
-
-DSLASRC = spotrs.o sgetrs.o spotrf.o sgetrf.o 
-
-ifdef USEXBLAS
-SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o		\
-   sla_gercond.o sla_gerpvgrw.o ssysvxx.o ssyrfsx.o			\
-   sla_syrfsx_extended.o sla_syamv.o sla_syrcond.o sla_syrpvgrw.o	\
-   sposvxx.o sporfsx.o sla_porfsx_extended.o sla_porcond.o		\
-   sla_porpvgrw.o sgbsvxx.o sgbrfsx.o sla_gbrfsx_extended.o		\
-   sla_gbamv.o sla_gbrcond.o sla_gbrpvgrw.o sla_lin_berr.o slarscl2.o	\
-   slascl2.o sla_wwaddw.o
-endif
-
-CLASRC = \
-   cbdsqr.o cgbbrd.o cgbcon.o cgbequ.o cgbrfs.o cgbsv.o  cgbsvx.o \
-   cgbtf2.o cgbtrf.o cgbtrs.o cgebak.o cgebal.o cgebd2.o cgebrd.o \
-   cgecon.o cgeequ.o cgees.o  cgeesx.o cgeev.o  cgeevx.o \
-   cgegs.o  cgegv.o  cgehd2.o cgehrd.o cgelq2.o cgelqf.o \
-   cgels.o  cgelsd.o cgelss.o cgelsx.o cgelsy.o cgeql2.o cgeqlf.o cgeqp3.o \
-   cgeqpf.o cgeqr2.o cgeqr2p.o cgeqrf.o cgeqrfp.o cgerfs.o \
-   cgerq2.o cgerqf.o cgesc2.o cgesdd.o cgesv.o  cgesvd.o  \
-   cgesvx.o cgetc2.o cgetf2.o cgetri.o \
-   cggbak.o cggbal.o cgges.o  cggesx.o cggev.o  cggevx.o cggglm.o \
-   cgghrd.o cgglse.o cggqrf.o cggrqf.o \
-   cggsvd.o cggsvp.o \
-   cgtcon.o cgtrfs.o cgtsv.o  cgtsvx.o cgttrf.o cgttrs.o cgtts2.o chbev.o  \
-   chbevd.o chbevx.o chbgst.o chbgv.o  chbgvd.o chbgvx.o chbtrd.o \
-   checon.o cheev.o  cheevd.o cheevr.o cheevx.o chegs2.o chegst.o \
-   chegv.o  chegvd.o chegvx.o cherfs.o chesv.o  chesvx.o chetd2.o \
-   chetf2.o chetrd.o \
-   chetrf.o chetri.o chetri2.o chetri2x.o cheswapr.o \
-   chetrs.o chetrs2.o chgeqz.o chpcon.o chpev.o  chpevd.o \
-   chpevx.o chpgst.o chpgv.o  chpgvd.o chpgvx.o chprfs.o chpsv.o  \
-   chpsvx.o \
-   chptrd.o chptrf.o chptri.o chptrs.o chsein.o chseqr.o clabrd.o \
-   clacgv.o clacon.o clacn2.o clacp2.o clacpy.o clacrm.o clacrt.o cladiv.o \
-   claed0.o claed7.o claed8.o \
-   claein.o claesy.o claev2.o clags2.o clagtm.o \
-   clahef.o clahqr.o \
-   clahrd.o clahr2.o claic1.o clals0.o clalsa.o clalsd.o clangb.o clange.o clangt.o \
-   clanhb.o clanhe.o \
-   clanhp.o clanhs.o clanht.o clansb.o clansp.o clansy.o clantb.o \
-   clantp.o clantr.o clapll.o clapmt.o clarcm.o claqgb.o claqge.o \
-   claqhb.o claqhe.o claqhp.o claqp2.o claqps.o claqsb.o \
-   claqr0.o claqr1.o claqr2.o claqr3.o claqr4.o claqr5.o \
-   claqsp.o claqsy.o clar1v.o clar2v.o ilaclr.o ilaclc.o \
-   clarf.o  clarfb.o clarfg.o clarft.o clarfgp.o \
-   clarfx.o clargv.o clarnv.o clarrv.o clartg.o clartv.o \
-   clarz.o  clarzb.o clarzt.o clascl.o claset.o clasr.o  classq.o \
-   claswp.o clasyf.o clatbs.o clatdf.o clatps.o clatrd.o clatrs.o clatrz.o \
-   clatzm.o clauu2.o clauum.o cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o  \
-   cpbsvx.o cpbtf2.o cpbtrf.o cpbtrs.o cpocon.o cpoequ.o cporfs.o \
-   cposv.o  cposvx.o cpotf2.o cpotri.o cpstrf.o cpstf2.o \
-   cppcon.o cppequ.o cpprfs.o cppsv.o  cppsvx.o cpptrf.o cpptri.o cpptrs.o \
-   cptcon.o cpteqr.o cptrfs.o cptsv.o  cptsvx.o cpttrf.o cpttrs.o cptts2.o \
-   crot.o   cspcon.o cspmv.o  cspr.o   csprfs.o cspsv.o  \
-   cspsvx.o csptrf.o csptri.o csptrs.o csrscl.o cstedc.o \
-   cstegr.o cstein.o csteqr.o \
-   csycon.o csymv.o \
-   csyr.o csyrfs.o csysv.o  csysvx.o csytf2.o csytrf.o csytri.o csytri2.o csytri2x.o \
-   csyswapr.o csytrs.o csytrs2.o csyconv.o \
-   ctbcon.o ctbrfs.o ctbtrs.o ctgevc.o ctgex2.o \
-   ctgexc.o ctgsen.o ctgsja.o ctgsna.o ctgsy2.o ctgsyl.o ctpcon.o \
-   ctprfs.o ctptri.o \
-   ctptrs.o ctrcon.o ctrevc.o ctrexc.o ctrrfs.o ctrsen.o ctrsna.o \
-   ctrsyl.o ctrti2.o ctrtri.o ctrtrs.o ctzrqf.o ctzrzf.o cung2l.o cung2r.o \
-   cungbr.o cunghr.o cungl2.o cunglq.o cungql.o cungqr.o cungr2.o \
-   cungrq.o cungtr.o cunm2l.o cunm2r.o cunmbr.o cunmhr.o cunml2.o \
-   cunmlq.o cunmql.o cunmqr.o cunmr2.o cunmr3.o cunmrq.o cunmrz.o \
-   cunmtr.o cupgtr.o cupmtr.o icmax1.o scsum1.o cstemr.o \
-   chfrk.o ctfttp.o clanhf.o cpftrf.o cpftri.o cpftrs.o ctfsm.o ctftri.o \
-   ctfttr.o ctpttf.o ctpttr.o ctrttf.o ctrttp.o \
-   cgeequb.o cgbequb.o csyequb.o cpoequb.o cheequb.o \
-   cbbcsd.o clapmr.o cunbdb.o cuncsd.o \
-   cgeqrt.o cgeqrt2.o cgeqrt3.o cgemqrt.o \
-   ctpqrt.o ctpqrt2.o ctpmqrt.o ctprfb.o
-
-ifdef USEXBLAS
-CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx_extended.o cla_geamv.o \
-   cla_gercond_c.o cla_gercond_x.o cla_gerpvgrw.o \
-   csysvxx.o csyrfsx.o cla_syrfsx_extended.o cla_syamv.o \
-   cla_syrcond_c.o cla_syrcond_x.o cla_syrpvgrw.o \
-   cposvxx.o cporfsx.o cla_porfsx_extended.o \
-   cla_porcond_c.o cla_porcond_x.o cla_porpvgrw.o \
-   cgbsvxx.o cgbrfsx.o cla_gbrfsx_extended.o cla_gbamv.o \
-   cla_gbrcond_c.o cla_gbrcond_x.o cla_gbrpvgrw.o \
-   chesvxx.o cherfsx.o cla_herfsx_extended.o cla_heamv.o \
-   cla_hercond_c.o cla_hercond_x.o cla_herpvgrw.o \
-   cla_lin_berr.o clarscl2.o clascl2.o cla_wwaddw.o
-endif
-
-ZCLASRC = cpotrs.o cgetrs.o cpotrf.o cgetrf.o 
-
-DLASRC = \
-   dgbbrd.o dgbcon.o dgbequ.o dgbrfs.o dgbsv.o  \
-   dgbsvx.o dgbtf2.o dgbtrf.o dgbtrs.o dgebak.o dgebal.o dgebd2.o \
-   dgebrd.o dgecon.o dgeequ.o dgees.o  dgeesx.o dgeev.o  dgeevx.o \
-   dgegs.o  dgegv.o  dgehd2.o dgehrd.o dgelq2.o dgelqf.o \
-   dgels.o  dgelsd.o dgelss.o dgelsx.o dgelsy.o dgeql2.o dgeqlf.o \
-   dgeqp3.o dgeqpf.o dgeqr2.o dgeqr2p.o dgeqrf.o dgeqrfp.o dgerfs.o \
-   dgerq2.o dgerqf.o dgesc2.o dgesdd.o dgesv.o  dgesvd.o dgesvx.o  \
-   dgetc2.o dgetf2.o dgetrf.o dgetri.o \
-   dgetrs.o dggbak.o dggbal.o dgges.o  dggesx.o dggev.o  dggevx.o \
-   dggglm.o dgghrd.o dgglse.o dggqrf.o \
-   dggrqf.o dggsvd.o dggsvp.o dgtcon.o dgtrfs.o dgtsv.o  \
-   dgtsvx.o dgttrf.o dgttrs.o dgtts2.o dhgeqz.o \
-   dhsein.o dhseqr.o dlabrd.o dlacon.o dlacn2.o \
-   dlaein.o dlaexc.o dlag2.o  dlags2.o dlagtm.o dlagv2.o dlahqr.o \
-   dlahrd.o dlahr2.o dlaic1.o dlaln2.o dlals0.o dlalsa.o dlalsd.o \
-   dlangb.o dlange.o dlangt.o dlanhs.o dlansb.o dlansp.o \
-   dlansy.o dlantb.o dlantp.o dlantr.o dlanv2.o \
-   dlapll.o dlapmt.o \
-   dlaqgb.o dlaqge.o dlaqp2.o dlaqps.o dlaqsb.o dlaqsp.o dlaqsy.o \
-   dlaqr0.o dlaqr1.o dlaqr2.o dlaqr3.o dlaqr4.o dlaqr5.o \
-   dlaqtr.o dlar1v.o dlar2v.o iladlr.o iladlc.o \
-   dlarf.o  dlarfb.o dlarfg.o dlarfgp.o dlarft.o dlarfx.o \
-   dlargv.o dlarrv.o dlartv.o  \
-   dlarz.o  dlarzb.o dlarzt.o dlaswp.o dlasy2.o dlasyf.o \
-   dlatbs.o dlatdf.o dlatps.o dlatrd.o dlatrs.o dlatrz.o dlatzm.o dlauu2.o \
-   dlauum.o dopgtr.o dopmtr.o dorg2l.o dorg2r.o \
-   dorgbr.o dorghr.o dorgl2.o dorglq.o dorgql.o dorgqr.o dorgr2.o \
-   dorgrq.o dorgtr.o dorm2l.o dorm2r.o \
-   dormbr.o dormhr.o dorml2.o dormlq.o dormql.o dormqr.o dormr2.o \
-   dormr3.o dormrq.o dormrz.o dormtr.o dpbcon.o dpbequ.o dpbrfs.o \
-   dpbstf.o dpbsv.o  dpbsvx.o \
-   dpbtf2.o dpbtrf.o dpbtrs.o dpocon.o dpoequ.o dporfs.o dposv.o  \
-   dposvx.o dpotf2.o dpotrf.o dpotri.o dpotrs.o dpstrf.o dpstf2.o \
-   dppcon.o dppequ.o \
-   dpprfs.o dppsv.o  dppsvx.o dpptrf.o dpptri.o dpptrs.o dptcon.o \
-   dpteqr.o dptrfs.o dptsv.o  dptsvx.o dpttrs.o dptts2.o drscl.o  \
-   dsbev.o  dsbevd.o dsbevx.o dsbgst.o dsbgv.o  dsbgvd.o dsbgvx.o \
-   dsbtrd.o  dspcon.o dspev.o  dspevd.o dspevx.o dspgst.o \
-   dspgv.o  dspgvd.o dspgvx.o dsprfs.o dspsv.o  dspsvx.o dsptrd.o \
-   dsptrf.o dsptri.o dsptrs.o dstegr.o dstein.o dstev.o  dstevd.o dstevr.o \
-   dstevx.o \
-   dsycon.o dsyev.o  dsyevd.o dsyevr.o \
-   dsyevx.o dsygs2.o dsygst.o dsygv.o  dsygvd.o dsygvx.o dsyrfs.o \
-   dsysv.o  dsysvx.o \
-   dsytd2.o dsytf2.o dsytrd.o dsytrf.o dsytri.o dsytri2.o dsytri2x.o \
-   dsyswapr.o dsytrs.o dsytrs2.o dsyconv.o \
-   dtbcon.o dtbrfs.o dtbtrs.o dtgevc.o dtgex2.o dtgexc.o dtgsen.o \
-   dtgsja.o dtgsna.o dtgsy2.o dtgsyl.o dtpcon.o dtprfs.o dtptri.o \
-   dtptrs.o \
-   dtrcon.o dtrevc.o dtrexc.o dtrrfs.o dtrsen.o dtrsna.o dtrsyl.o \
-   dtrti2.o dtrtri.o dtrtrs.o dtzrqf.o dtzrzf.o dstemr.o \
-   dsgesv.o dsposv.o dlag2s.o slag2d.o dlat2s.o \
-   dlansf.o dpftrf.o dpftri.o dpftrs.o dsfrk.o dtfsm.o dtftri.o dtfttp.o \
-   dtfttr.o dtpttf.o dtpttr.o dtrttf.o dtrttp.o \
-   dgejsv.o  dgesvj.o  dgsvj0.o  dgsvj1.o \
-   dgeequb.o dsyequb.o dpoequb.o dgbequb.o \
-   dbbcsd.o dlapmr.o dorbdb.o dorcsd.o \
-   dgeqrt.o dgeqrt2.o dgeqrt3.o dgemqrt.o \
-   dtpqrt.o dtpqrt2.o dtpmqrt.o dtprfb.o
-
-ifdef USEXBLAS
-DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx_extended.o dla_geamv.o		\
-   dla_gercond.o dla_gerpvgrw.o dsysvxx.o dsyrfsx.o			\
-   dla_syrfsx_extended.o dla_syamv.o dla_syrcond.o dla_syrpvgrw.o	\
-   dposvxx.o dporfsx.o dla_porfsx_extended.o dla_porcond.o		\
-   dla_porpvgrw.o dgbsvxx.o dgbrfsx.o dla_gbrfsx_extended.o		\
-   dla_gbamv.o dla_gbrcond.o dla_gbrpvgrw.o dla_lin_berr.o dlarscl2.o	\
-   dlascl2.o dla_wwaddw.o
-endif
-
-ZLASRC = \
-   zbdsqr.o zgbbrd.o zgbcon.o zgbequ.o zgbrfs.o zgbsv.o  zgbsvx.o \
-   zgbtf2.o zgbtrf.o zgbtrs.o zgebak.o zgebal.o zgebd2.o zgebrd.o \
-   zgecon.o zgeequ.o zgees.o  zgeesx.o zgeev.o  zgeevx.o \
-   zgegs.o  zgegv.o  zgehd2.o zgehrd.o zgelq2.o zgelqf.o \
-   zgels.o  zgelsd.o zgelss.o zgelsx.o zgelsy.o zgeql2.o zgeqlf.o zgeqp3.o \
-   zgeqpf.o zgeqr2.o zgeqr2p.o zgeqrf.o zgeqrfp.o zgerfs.o zgerq2.o zgerqf.o \
-   zgesc2.o zgesdd.o zgesv.o  zgesvd.o zgesvx.o zgetc2.o zgetf2.o zgetrf.o \
-   zgetri.o zgetrs.o \
-   zggbak.o zggbal.o zgges.o  zggesx.o zggev.o  zggevx.o zggglm.o \
-   zgghrd.o zgglse.o zggqrf.o zggrqf.o \
-   zggsvd.o zggsvp.o \
-   zgtcon.o zgtrfs.o zgtsv.o  zgtsvx.o zgttrf.o zgttrs.o zgtts2.o zhbev.o  \
-   zhbevd.o zhbevx.o zhbgst.o zhbgv.o  zhbgvd.o zhbgvx.o zhbtrd.o \
-   zhecon.o zheev.o  zheevd.o zheevr.o zheevx.o zhegs2.o zhegst.o \
-   zhegv.o  zhegvd.o zhegvx.o zherfs.o zhesv.o  zhesvx.o zhetd2.o \
-   zhetf2.o zhetrd.o \
-   zhetrf.o zhetri.o zhetri2.o zhetri2x.o zheswapr.o \
-   zhetrs.o zhetrs2.o zhgeqz.o zhpcon.o zhpev.o  zhpevd.o \
-   zhpevx.o zhpgst.o zhpgv.o  zhpgvd.o zhpgvx.o zhprfs.o zhpsv.o  \
-   zhpsvx.o \
-   zhptrd.o zhptrf.o zhptri.o zhptrs.o zhsein.o zhseqr.o zlabrd.o \
-   zlacgv.o zlacon.o zlacn2.o zlacp2.o zlacpy.o zlacrm.o zlacrt.o zladiv.o \
-   zlaed0.o zlaed7.o zlaed8.o \
-   zlaein.o zlaesy.o zlaev2.o zlags2.o zlagtm.o \
-   zlahef.o zlahqr.o \
-   zlahrd.o zlahr2.o zlaic1.o zlals0.o zlalsa.o zlalsd.o zlangb.o zlange.o \
-   zlangt.o zlanhb.o \
-   zlanhe.o \
-   zlanhp.o zlanhs.o zlanht.o zlansb.o zlansp.o zlansy.o zlantb.o \
-   zlantp.o zlantr.o zlapll.o zlapmt.o zlaqgb.o zlaqge.o \
-   zlaqhb.o zlaqhe.o zlaqhp.o zlaqp2.o zlaqps.o zlaqsb.o \
-   zlaqr0.o zlaqr1.o zlaqr2.o zlaqr3.o zlaqr4.o zlaqr5.o \
-   zlaqsp.o zlaqsy.o zlar1v.o zlar2v.o ilazlr.o ilazlc.o \
-   zlarcm.o zlarf.o  zlarfb.o \
-   zlarfg.o zlarft.o zlarfgp.o \
-   zlarfx.o zlargv.o zlarnv.o zlarrv.o zlartg.o zlartv.o \
-   zlarz.o  zlarzb.o zlarzt.o zlascl.o zlaset.o zlasr.o  \
-   zlassq.o zlaswp.o zlasyf.o \
-   zlatbs.o zlatdf.o zlatps.o zlatrd.o zlatrs.o zlatrz.o zlatzm.o zlauu2.o \
-   zlauum.o zpbcon.o zpbequ.o zpbrfs.o zpbstf.o zpbsv.o  \
-   zpbsvx.o zpbtf2.o zpbtrf.o zpbtrs.o zpocon.o zpoequ.o zporfs.o \
-   zposv.o  zposvx.o zpotf2.o zpotrf.o zpotri.o zpotrs.o zpstrf.o zpstf2.o \
-   zppcon.o zppequ.o zpprfs.o zppsv.o  zppsvx.o zpptrf.o zpptri.o zpptrs.o \
-   zptcon.o zpteqr.o zptrfs.o zptsv.o  zptsvx.o zpttrf.o zpttrs.o zptts2.o \
-   zrot.o   zspcon.o zspmv.o  zspr.o   zsprfs.o zspsv.o  \
-   zspsvx.o zsptrf.o zsptri.o zsptrs.o zdrscl.o zstedc.o \
-   zstegr.o zstein.o zsteqr.o \
-   zsycon.o zsymv.o \
-   zsyr.o zsyrfs.o zsysv.o  zsysvx.o zsytf2.o zsytrf.o zsytri.o zsytri2.o zsytri2x.o \
-   zsyswapr.o zsytrs.o zsytrs2.o zsyconv.o \
-   ztbcon.o ztbrfs.o ztbtrs.o ztgevc.o ztgex2.o \
-   ztgexc.o ztgsen.o ztgsja.o ztgsna.o ztgsy2.o ztgsyl.o ztpcon.o \
-   ztprfs.o ztptri.o \
-   ztptrs.o ztrcon.o ztrevc.o ztrexc.o ztrrfs.o ztrsen.o ztrsna.o \
-   ztrsyl.o ztrti2.o ztrtri.o ztrtrs.o ztzrqf.o ztzrzf.o zung2l.o \
-   zung2r.o zungbr.o zunghr.o zungl2.o zunglq.o zungql.o zungqr.o zungr2.o \
-   zungrq.o zungtr.o zunm2l.o zunm2r.o zunmbr.o zunmhr.o zunml2.o \
-   zunmlq.o zunmql.o zunmqr.o zunmr2.o zunmr3.o zunmrq.o zunmrz.o \
-   zunmtr.o zupgtr.o \
-   zupmtr.o izmax1.o dzsum1.o zstemr.o \
-   zcgesv.o zcposv.o zlag2c.o clag2z.o zlat2c.o \
-   zhfrk.o ztfttp.o zlanhf.o zpftrf.o zpftri.o zpftrs.o ztfsm.o ztftri.o \
-   ztfttr.o ztpttf.o ztpttr.o ztrttf.o ztrttp.o \
-   zgeequb.o zgbequb.o zsyequb.o zpoequb.o zheequb.o \
-   zbbcsd.o zlapmr.o zunbdb.o zuncsd.o \
-   zgeqrt.o zgeqrt2.o zgeqrt3.o zgemqrt.o \
-   ztpqrt.o ztpqrt2.o ztpmqrt.o ztprfb.o
-
-ifdef USEXBLAS
-ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o		\
-   zla_gercond_c.o zla_gercond_x.o zla_gerpvgrw.o zsysvxx.o zsyrfsx.o	\
-   zla_syrfsx_extended.o zla_syamv.o zla_syrcond_c.o zla_syrcond_x.o	\
-   zla_syrpvgrw.o zposvxx.o zporfsx.o zla_porfsx_extended.o		\
-   zla_porcond_c.o zla_porcond_x.o zla_porpvgrw.o zgbsvxx.o zgbrfsx.o	\
-   zla_gbrfsx_extended.o zla_gbamv.o zla_gbrcond_c.o zla_gbrcond_x.o	\
-   zla_gbrpvgrw.o zhesvxx.o zherfsx.o zla_herfsx_extended.o		\
-   zla_heamv.o zla_hercond_c.o zla_hercond_x.o zla_herpvgrw.o		\
-   zla_lin_berr.o zlarscl2.o zlascl2.o zla_wwaddw.o
-endif
-
-ALLOBJ = $(SLASRC) $(DLASRC) $(DSLASRC) $(CLASRC) $(ZLASRC) $(ZCLASRC) \
-   $(SCLAUX) $(DZLAUX) $(ALLAUX)
-
-ifdef USEXBLAS
-ALLXOBJ = $(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC)
-endif
-
-all: ../$(LAPACKLIB)
-
-../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ)
-	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ)
-	$(RANLIB) $@
-
-single: $(SLASRC) $(DSLASRC) $(SXLASRC) $(SCLAUX) $(ALLAUX)
-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(DSLASRC) \
-	$(SXLASRC) $(SCLAUX) $(ALLAUX) $(ALLXAUX)
-	$(RANLIB) ../$(LAPACKLIB)
-
-complex: $(CLASRC) $(ZCLASRC) $(CXLASRC) $(SCLAUX) $(ALLAUX)
-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ZCLASRC) \
-	$(CXLASRC) $(SCLAUX) $(ALLAUX) $(ALLXAUX)
-	$(RANLIB) ../$(LAPACKLIB)
-
-double: $(DLASRC) $(DSLASRC) $(DXLASRC) $(DZLAUX) $(ALLAUX)
-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(DLASRC) $(DSLASRC) \
-	$(DXLASRC) $(DZLAUX) $(ALLAUX) $(ALLXAUX)
-	$(RANLIB) ../$(LAPACKLIB)
-
-complex16: $(ZLASRC) $(ZCLASRC) $(ZXLASRC) $(DZLAUX) $(ALLAUX)
-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ZCLASRC) \
-	$(ZXLASRC) $(DZLAUX) $(ALLAUX) $(ALLXAUX)
-	$(RANLIB) ../$(LAPACKLIB)
-
-$(ALLAUX): $(FRC)
-$(SCLAUX): $(FRC)
-$(DZLAUX): $(FRC)
-$(SLASRC): $(FRC)
-$(CLASRC): $(FRC)
-$(DLASRC): $(FRC)
-$(ZLASRC): $(FRC)
-$(ZCLASRC): $(FRC)
-$(DSLASRC): $(FRC)
-ifdef USEXBLAS
-$(SXLASRC): $(FRC)
-$(CXLASRC): $(FRC)
-$(DXLASRC): $(FRC)
-$(ZXLASRC): $(FRC)
-endif
-
-FRC:
-	@FRC=$(FRC)
-
-clean:
-	rm -f *.o liblapack*
-
-static: $(ALLOBJ) $(ALLXOBJ)
-	ar ruv liblapack.a $(ALLOBJ)
-	ranlib liblapack.a
-
-shared: $(ALLOBJ) $(ALLXOBJ)
-	cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.4.1 $(ALLOBJ) -L.. -lblas -lm -lgfortran -lc
diff --git a/extra/latex2rtf/PKGBUILD b/extra/latex2rtf/PKGBUILD
index b2032ff4f..52d9adb96 100644
--- a/extra/latex2rtf/PKGBUILD
+++ b/extra/latex2rtf/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=latex2rtf
 pkgver=2.2.1c
-pkgrel=2
+pkgrel=2.1
 pkgdesc="LaTeX to RTF converter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://latex2rtf.sourceforge.net/"
diff --git a/extra/lbreakout2/PKGBUILD b/extra/lbreakout2/PKGBUILD
index 35042f76b..fef07448e 100644
--- a/extra/lbreakout2/PKGBUILD
+++ b/extra/lbreakout2/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=lbreakout2
 pkgver=2.6.4
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A breakout game with nice effects, graphics, and sounds"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://lgames.sourceforge.net"
diff --git a/extra/lcms/PKGBUILD b/extra/lcms/PKGBUILD
index e2feb050e..58eb3e723 100644
--- a/extra/lcms/PKGBUILD
+++ b/extra/lcms/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=lcms
 pkgver=1.19
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc="Lightweight color management development library/engine"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
diff --git a/extra/ldb/PKGBUILD b/extra/ldb/PKGBUILD
new file mode 100644
index 000000000..8c4a64db0
--- /dev/null
+++ b/extra/ldb/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 182651 2013-04-12 07:10:22Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Christian Hesse <mail@eworm.de>
+# Contributor: Marco A Rojas <marquicus at gmail dot com>
+
+pkgname=ldb
+pkgver=1.1.15
+pkgrel=1
+pkgdesc="A schema-less, ldap like, API and database"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://ldb.samba.org/"
+source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+license=('GPL3')
+depends=('talloc' 'tevent' 'tdb' 'popt')
+makedepends=('python2')
+optdepends=('python2: for python bindings')
+
+build() {
+	cd ${srcdir}/${pkgname}-${pkgver}
+
+	# change to use python2
+	sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" buildtools/bin/waf
+	export PYTHON=/usr/bin/python2
+
+	./configure --prefix=/usr \
+		--disable-rpath \
+		--disable-rpath-install \
+		--bundled-libraries=NONE \
+		--builtin-libraries=replace \
+                --with-modulesdir=/usr/lib/ldb/modules \
+                --with-privatelibdir=/usr/lib/ldb
+	make
+}
+
+package() {
+	cd ${srcdir}/${pkgname}-${pkgver}
+
+	make DESTDIR=${pkgdir}/ install
+}
+md5sums=('97ee9b455f6a547fb2b3b5a7836c41d7')
diff --git a/extra/lensfun/PKGBUILD b/extra/lensfun/PKGBUILD
index b0a300d7d..39c211128 100644
--- a/extra/lensfun/PKGBUILD
+++ b/extra/lensfun/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 162692 2012-06-28 10:33:24Z tpowa $
+# $Id: PKGBUILD 182923 2013-04-16 07:16:05Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=lensfun
-pkgver=0.2.6
+pkgver=0.2.7
 pkgrel=1
 pkgdesc="Database of photographic lenses and a library that allows advanced access to the database"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ depends=('glibc' 'glib2')
 makedepends=('python2' 'libpng' 'doxygen')
 source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 
-build() {
+prepare() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     if [ "$CARCH" = "mips64el" ]; then
       confflags="--vectorization="
@@ -20,7 +20,11 @@ build() {
       confflags=""
     fi
     sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' configure
-    ./configure \
+}
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+   ./configure \
         --prefix=/usr \
         --libdir=/usr/lib ${confflags}
     make all
@@ -30,4 +34,4 @@ package() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     make INSTALL_PREFIX="$pkgdir" install
 }
-md5sums=('740e4749db04da0a597630dd6339b966')
+md5sums=('6061cc2d00a42d3e62512878426fc841')
diff --git a/extra/lesstif/PKGBUILD b/extra/lesstif/PKGBUILD
index 59769dff4..7afd28d0a 100644
--- a/extra/lesstif/PKGBUILD
+++ b/extra/lesstif/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=lesstif
 pkgver=0.95.2
-pkgrel=4
+pkgrel=4.1
 pkgdesc="LGPL'd re-implementation of Motif"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lesstif.org/"
diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD
index 70f0ffc81..abce75267 100644
--- a/extra/leveldb/PKGBUILD
+++ b/extra/leveldb/PKGBUILD
@@ -1,22 +1,19 @@
-# $Id: PKGBUILD 169703 2012-10-26 19:01:07Z dreisner $
+# $Id: PKGBUILD 178002 2013-02-13 01:27:04Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: feydaykyn <feydaykyn@yahoo.fr>
 
 pkgname=leveldb
-pkgver=1.7.0
+pkgver=1.9.0
 pkgrel=1
 pkgdesc="A fast and lightweight key/value database library"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="https://code.google.com/p/leveldb/"
 license=('BSD')
 depends=('gperftools' 'snappy')
 source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha1sums=('82332ac97d48ad5da02aab4785658c06d0351be1')
+sha1sums=('4d832277120912211998a2334fb975b995d51885')
 
 build() {
-  # buildsys doesn't play nicely with -Wl,--as-needed
-  LDFLAGS=-Wl,-O1,--sort-common,-z,relro
-
   make -C "$pkgname-$pkgver"
 }
 
@@ -32,7 +29,7 @@ package() {
       "$pkgdir"/usr/share/doc/"$pkgname"
 
   # libraries
-  install -m755 -t "$pkgdir/usr/lib" "libleveldb.so.${pkgver%.?*}" libleveldb.a
+  install -m644 -t "$pkgdir/usr/lib" "libleveldb.so.${pkgver%.?*}" libleveldb.a
   cp -P libleveldb.so{,.1} "$pkgdir/usr/lib"
 
   # headers
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index 3094b6bf6..8cb92af07 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177576 2013-02-07 16:27:21Z andyrtr $
+# $Id: PKGBUILD 180226 2013-03-18 16:47:18Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=lftp
-pkgver=4.4.3
+pkgver=4.4.5
 pkgrel=1
 pkgdesc="Sophisticated command line based FTP client"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file')
 url="http://lftp.yar.ru/"
 backup=('etc/lftp.conf')
 source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('59351bc6fd71e65485cb0b5dd6dbf07a')
+md5sums=('a8abdc87a00174571908ffaf5cdffd45')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/lftp/lftp-4.3.8-gets.patch b/extra/lftp/lftp-4.3.8-gets.patch
deleted file mode 100644
index d4a11804e..000000000
--- a/extra/lftp/lftp-4.3.8-gets.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up lftp-4.3.8/lib/stdio.in.h.gets lftp-4.3.8/lib/stdio.in.h
---- lftp-4.3.8/lib/stdio.in.h.gets	2012-07-22 15:07:15.101115146 -0400
-+++ lftp-4.3.8/lib/stdio.in.h	2012-07-22 15:08:09.777098512 -0400
-@@ -702,10 +702,12 @@ _GL_WARN_ON_USE (getline, "getline is un
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning; besides, C11
-    removed it.  */
-+#if defined gets
- #undef gets
- #if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-+#endif // if defined gets
- 
- 
- #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
diff --git a/extra/libart-lgpl/PKGBUILD b/extra/libart-lgpl/PKGBUILD
index ab2a6ca23..9b978f0ab 100644
--- a/extra/libart-lgpl/PKGBUILD
+++ b/extra/libart-lgpl/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libart-lgpl
 pkgver=2.3.21
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc="A library for high-performance 2D graphics"
 url="http://www.levien.com/libart/"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/libass/PKGBUILD b/extra/libass/PKGBUILD
index 65c8e49fa..36ae62b0d 100644
--- a/extra/libass/PKGBUILD
+++ b/extra/libass/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libass
 pkgver=0.10.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A portable library for SSA/ASS subtitles rendering"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/libass/"
diff --git a/extra/libbluedevil/PKGBUILD b/extra/libbluedevil/PKGBUILD
index ca13cfce1..04b1f6cc2 100644
--- a/extra/libbluedevil/PKGBUILD
+++ b/extra/libbluedevil/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 157802 2012-04-29 17:04:04Z andrea $
+# $Id: PKGBUILD 180983 2013-03-29 12:07:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libbluedevil
-pkgver=1.9.2
-pkgrel=1.1
-pkgdesc='A Qt wrapper for bluez used in the new KDE bluetooth stack'
+pkgver=1.9.3
+pkgrel=1
+pkgdesc='A Qt4 wrapper for bluez used in the new KDE bluetooth stack'
 arch=('i686' 'x86_64' 'mips64el')
 url="https://projects.kde.org/projects/playground/libs/libbluedevil"
 license=('GPL')
-depends=('qt' 'bluez')
+depends=('qt4' 'bluez')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('b492db1825b239e5185c543badb21c26')
+md5sums=('fcb1480feba45dcd076b3ee54150bdf5')
 
-build(){
-  cd "${srcdir}"
+build() {
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -24,6 +23,6 @@ build(){
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libbsd/LICENSE b/extra/libbsd/LICENSE
new file mode 100644
index 000000000..7dcbfc2ba
--- /dev/null
+++ b/extra/libbsd/LICENSE
@@ -0,0 +1,28 @@
+/*-
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
diff --git a/extra/libbsd/PKGBUILD b/extra/libbsd/PKGBUILD
new file mode 100644
index 000000000..e22966655
--- /dev/null
+++ b/extra/libbsd/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 180872 2013-03-27 14:45:32Z tpowa $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
+
+pkgname=libbsd
+pkgver=0.4.2
+pkgrel=1
+pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://libbsd.freedesktop.org"
+license=('custom')
+depends=('glibc')
+source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.gz)
+md5sums=('591fc9de4ca22f78cf87a94e648a92f4')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR=$pkgdir install
+  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD
index 4d327419d..290f72f9f 100644
--- a/extra/libburn/PKGBUILD
+++ b/extra/libburn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 174977 2013-01-09 20:07:29Z andyrtr $
+# $Id: PKGBUILD 180384 2013-03-20 20:56:09Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=libburn
-pkgver=1.2.6
+pkgver=1.2.8
 pkgrel=1
 pkgdesc="Library for reading, mastering and writing optical discs"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('GPL')
 depends=('glibc')
 source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig})
 options=('!libtool' '!emptydirs')
-md5sums=('fe556fa15dea046974b11a4c7f1b67a8'
-         'b3d721debd0c151e8e3eb0a6a2e223ab')
+md5sums=('2838ff6fdd32e69394305f97f806002b'
+         'b67455e5a50d2d956d45591529575408')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libcaca/PKGBUILD b/extra/libcaca/PKGBUILD
index cce8347dd..bde93f54a 100644
--- a/extra/libcaca/PKGBUILD
+++ b/extra/libcaca/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libcaca
 pkgver=0.99.beta18
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Color AsCii Art library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
diff --git a/extra/libcdio-paranoia/PKGBUILD b/extra/libcdio-paranoia/PKGBUILD
index 5c5541dd1..b57d888fe 100644
--- a/extra/libcdio-paranoia/PKGBUILD
+++ b/extra/libcdio-paranoia/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=libcdio-paranoia
-pkgver=10.2+0.90
+pkgver=10.2+0.90+1
 pkgrel=1
 pkgdesc="CD paranoia libraries from libcdio"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,27 +11,17 @@ license=('GPL' 'LGPL')
 url="http://www.gnu.org/software/libcdio/"
 depends=('libcdio')
 options=('!libtool')
-source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2{,.sig}
-        header-fix.patch)
-md5sums=('432e9f1c5ceb645c4bca9db3f9297437'
-         '39766404d473ecda66c2f3a932d1c57c'
-         '1ebb33a1cfe00181de31138ef001e01b')
+source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2{,.sig})
+md5sums=('e79e196864dd3b1ca87a01345abbda07'
+         'SKIP')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i ../header-fix.patch
-  sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
-  aclocal
-  autoconf
-  automake --add-missing
+  cd "${pkgname}-${pkgver}"
   ./configure --prefix=/usr --enable-cpp-progs --disable-static --disable-example-progs
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
   make -j1 DESTDIR="${pkgdir}" install
-  
-  #sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \
-  #  $pkgdir/usr/include/cdio/cdio_config.h
 }
diff --git a/extra/libcdio-paranoia/header-fix.patch b/extra/libcdio-paranoia/header-fix.patch
deleted file mode 100644
index 15cf0e0e2..000000000
--- a/extra/libcdio-paranoia/header-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- include/cdio/paranoia/Makefile.am.orig	2013-01-08 10:40:32.237218755 +0000
-+++ include/cdio/paranoia/Makefile.am	2013-01-08 10:41:22.269997804 +0000
-@@ -3,8 +3,8 @@
- ########################################################
- #
- 
--libcdioincludedir=$(includedir)/cdio
--dist_libcdioinclude_HEADERS = cdda.h paranoia.h 
-+cdio_paranoia_includedir=$(includedir)/cdio/paranoia
-+dist_cdio_paranoia_include_HEADERS = cdda.h paranoia.h 
- 
- EXTRA_DIST = version.h.in
- BUILT_SOURCES = version.h
diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD
index 26943ec65..044f5cf7c 100644
--- a/extra/libchamplain/PKGBUILD
+++ b/extra/libchamplain/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 163767 2012-07-19 08:35:19Z heftig $
+# $Id: PKGBUILD 183426 2013-04-21 22:11:10Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Michael Kanis <mkanis@gmx.de>
 
 pkgname=libchamplain
 pkgver=0.12.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Gtk3 widget for displaying rasterized maps"
 url="http://projects.gnome.org/libchamplain/"
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 options=('!libtool')
-depends=('clutter-gtk' 'libsoup-gnome' 'cairo' 'sqlite')
+depends=('clutter-gtk' 'libsoup' 'cairo' 'sqlite')
 makedepends=('gobject-introspection' 'gtk-doc' 'vala')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('3d03d4e6892305a3b5b78e0718e486f6a13271df33d82383fd8361ef71f3e658')
diff --git a/extra/libcl/PKGBUILD b/extra/libcl/PKGBUILD
deleted file mode 100644
index 913418b46..000000000
--- a/extra/libcl/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 165264 2012-08-14 17:01:07Z ibiru $
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=libcl
-pkgver=1.1
-_pkgver=304.37
-pkgrel=3
-pkgdesc="OpenCL library and ICD loader from NVIDIA"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('gcc-libs')
-license=('custom')
-options=('!strip')
-
-if [ "$CARCH" = "i686" ]; then
-    _arch='x86'
-    _pkg="NVIDIA-Linux-${_arch}-${_pkgver}"
-    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${_pkgver}/${_pkg}.run")
-    md5sums=('ee3e97109201ab954c96860e28ada611')
-elif [ "$CARCH" = "x86_64" ]; then
-    _arch='x86_64'
-    _pkg="NVIDIA-Linux-${_arch}-${_pkgver}-no-compat32"
-    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${_pkgver}/${_pkg}.run")
-    md5sums=('65fce562c0df3def06012db9ff6bafa1')
-fi
-build() {
-    cd $srcdir
-    sh ${_pkg}.run --extract-only
-}
-
-package() {
-    cd $srcdir/${_pkg}
-    install -D -m755 libOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1.0.0
-    ln -s /usr/lib/libOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1
-    ln -s /usr/lib/libOpenCL.so.1 $pkgdir/usr/lib/libOpenCL.so
-    install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/extra/libconfig/PKGBUILD b/extra/libconfig/PKGBUILD
index 9d9b23ba9..f51543e1c 100644
--- a/extra/libconfig/PKGBUILD
+++ b/extra/libconfig/PKGBUILD
@@ -19,7 +19,7 @@ md5sums=('b6ee0ce2b3ef844bad7cac2803a90634')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --build=$CHOST --host=$CHOST
   make
 }
 
diff --git a/extra/libcroco/PKGBUILD b/extra/libcroco/PKGBUILD
index 05ca39828..b3c2e3935 100644
--- a/extra/libcroco/PKGBUILD
+++ b/extra/libcroco/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libcroco
 pkgver=0.6.8
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A CSS parsing library"
 arch=('x86_64' 'i686' 'mips64el')
 depends=('glib2' 'libxml2')
diff --git a/extra/libdbusmenu-qt/PKGBUILD b/extra/libdbusmenu-qt/PKGBUILD
index d2279c606..3192cf128 100644
--- a/extra/libdbusmenu-qt/PKGBUILD
+++ b/extra/libdbusmenu-qt/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 156245 2012-04-16 13:16:43Z andrea $
+# $Id: PKGBUILD 178965 2013-03-01 10:21:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libdbusmenu-qt
 pkgver=0.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that provides a Qt implementation of the DBusMenu spec"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/libdbusmenu-qt"
 license=('GPL')
-depends=('qt')
+depends=('qt4')
 makedepends=('cmake' 'doxygen' 'qjson')
 source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('9a49484927669cd2ec91b3bf9ba8b79e')
 
 build() {
-  cd "${srcdir}"
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -24,6 +25,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build"
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libdc1394/PKGBUILD b/extra/libdc1394/PKGBUILD
index 6c44f7d49..45290239b 100644
--- a/extra/libdc1394/PKGBUILD
+++ b/extra/libdc1394/PKGBUILD
@@ -1,32 +1,20 @@
-# $Id: PKGBUILD 137888 2011-09-12 08:33:12Z andrea $
+# $Id: PKGBUILD 180144 2013-03-18 09:10:25Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdc1394
-pkgver=2.1.3
-pkgrel=2.1
+pkgver=2.2.1
+pkgrel=1
 pkgdesc="High level programming interface to control IEEE 1394 based cameras"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://sourceforge.net/projects/libdc1394/"
-depends=('libraw1394>=2.0.7' 'libusb')
+depends=('libraw1394' 'libusb')
 options=('!libtool' '!emptydirs')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'rename-usb_init.patch'
-        'videodev-compile-fix.patch')
-md5sums=('d8b2cbfae1b329fdeaa638da80427334'
-         'bc7a4146b4d2d688305d0d42c4111941'
-         '9dd11c96241b14073c3a7dd7e270fb7a')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('5c4b78bb8265d6dc971433ec1da381ab')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # FS#25652
-  patch -p2 -i "${srcdir}"/rename-usb_init.patch
-  # Fix build when linux/video.h exists
-  patch -p2 -i "${srcdir}"/videodev-compile-fix.patch
-
-  
-  autoreconf -i
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/libdca/PKGBUILD b/extra/libdca/PKGBUILD
index 17c4def29..578ca3866 100644
--- a/extra/libdca/PKGBUILD
+++ b/extra/libdca/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libdca
 pkgver=0.0.5
-pkgrel=3.1
+pkgrel=3.2
 pkgdesc="Free library for decoding DTS Coherent Acoustics streams"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/libdiscid/PKGBUILD b/extra/libdiscid/PKGBUILD
index 29cf9da44..8e4ef4e50 100644
--- a/extra/libdiscid/PKGBUILD
+++ b/extra/libdiscid/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 174288 2013-01-03 23:42:31Z eric $
+# $Id: PKGBUILD 182706 2013-04-13 00:27:30Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Eric Gillingham <sysrq@sysrq.tk>
 
 pkgname=libdiscid
-pkgver=0.3.0
+pkgver=0.5.0
 pkgrel=1
 pkgdesc="A Library for creating MusicBrainz DiscIDs"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('LGPL')
 depends=('glibc')
 options=('!libtool')
 source=("http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pkgname}-${pkgver}.tar.gz")
-md5sums=('17e51260062b7583e5981c82cf618127')
+md5sums=('a029355e53db1c2c24cc34a6d3e3b626')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libdmapsharing/PKGBUILD b/extra/libdmapsharing/PKGBUILD
index 72589e32f..8f3a61365 100644
--- a/extra/libdmapsharing/PKGBUILD
+++ b/extra/libdmapsharing/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 175982 2013-01-25 15:12:09Z ioni $
+# $Id: PKGBUILD 183628 2013-04-25 17:51:21Z ioni $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libdmapsharing
-pkgver=2.9.16
+pkgver=2.9.17
 pkgrel=1
 pkgdesc="A library that implements the DMAP family of protocols"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL2.1')
 depends=('libsoup' 'avahi' 'gst-plugins-base-libs' 'gdk-pixbuf2')
 options=('!libtool')
 source=(http://www.flyn.org/projects/libdmapsharing/$pkgname-$pkgver.tar.gz)
-md5sums=('5b2fbf46efc95a503ed95094c72b34d2')
+md5sums=('089e70ed4fb3b92dcd956b80dbf3ffc9')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libdmtx/PKGBUILD b/extra/libdmtx/PKGBUILD
index f7d067d42..c33f5eb13 100644
--- a/extra/libdmtx/PKGBUILD
+++ b/extra/libdmtx/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libdmtx
 pkgver=0.7.4
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A software for reading and writing Data Matrix 2D barcodes"
 url="http://www.libdmtx.org/"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index 2aefac902..022ca05c1 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175502 2013-01-17 14:41:27Z andyrtr $
+# $Id: PKGBUILD 183612 2013-04-25 11:57:24Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.41
-pkgrel=1
+pkgver=2.4.44
+pkgrel=2
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64 'mips64el')
 license=('custom')
@@ -15,26 +15,18 @@ options=('!libtool')
 url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
         no-pthread-stubs.patch
-        COPYING
-        buildfix.diff)
-sha256sums=('52b3ca670df43fc9f5164f0f55fa40b008de297c0ceedab7c77c30bf9022f212'
-            '3915aaff4d5b0ed523c3144911e7f79ee812dece0e3933c13a88dddcf5912ded'
-            '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93'
-            '9b293bbe682381b6822b5abfb1b1ce713185bcefde255d300367b26f47102ddc')
+        COPYING)
+sha256sums=('42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2'
+            'c2d2e8575dac9d08f1271b2cfa68ac3b42e69f99efe6e3a7e20064f22f7e28ab'
+            '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
 
 build() {
   cd $pkgname-$pkgver
   patch -Np1 -i ../no-pthread-stubs.patch
 
-  # man/Makefile,in is missing
-  patch -Np1 -i ${srcdir}/buildfix.diff
-
   #libtoolize --force
   autoreconf --force --install
-  ./configure --prefix=/usr \
-      --enable-udev \
-      --enable-omap-experimental-api \
-      --enable-exynos-experimental-api
+  ./configure --prefix=/usr --enable-udev
   make
 }
 
diff --git a/extra/libdrm/buildfix.diff b/extra/libdrm/buildfix.diff
deleted file mode 100644
index 879fbf1b8..000000000
--- a/extra/libdrm/buildfix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 10cc9a4..1776610 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -348,7 +348,6 @@ AC_CONFIG_FILES([
- 	tests/vbltest/Makefile
- 	include/Makefile
- 	include/drm/Makefile
--	man/Makefile
- 	libdrm.pc])
- AC_OUTPUT
diff --git a/extra/libdrm/git_fixes.diff b/extra/libdrm/git_fixes.diff
deleted file mode 100644
index dc80155f2..000000000
--- a/extra/libdrm/git_fixes.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
-index 19441f3..eb9dd32 100644
---- a/intel/intel_bufmgr_gem.c
-+++ b/intel/intel_bufmgr_gem.c
-@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem)
- 				      bufmgr_gem->vma_cache.next,
- 				      vma_list);
- 		assert(bo_gem->map_count == 0);
--		DRMLISTDEL(&bo_gem->vma_list);
-+		DRMLISTDELINIT(&bo_gem->vma_list);
- 
- 		if (bo_gem->mem_virtual) {
- 			munmap(bo_gem->mem_virtual, bo_gem->bo.size);
diff --git a/extra/libdrm/no-pthread-stubs.patch b/extra/libdrm/no-pthread-stubs.patch
index 3b05ce18d..d49e397b7 100644
--- a/extra/libdrm/no-pthread-stubs.patch
+++ b/extra/libdrm/no-pthread-stubs.patch
@@ -102,3 +102,20 @@ diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
  
  libdrm_exynos_la_SOURCES = exynos_drm.c
  
+--- libdrm-2.4.44/freedreno/Makefile.am	2013-04-19 00:59:07.000000000 +0200
++++ libdrm-2.4.44/freedreno/Makefile.am.new	2013-04-19 17:19:03.153950143 +0200
+@@ -2,13 +2,12 @@
+ 	$(WARN_CFLAGS) \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/freedreno \
+-	$(PTHREADSTUBS_CFLAGS) \
+ 	-I$(top_srcdir)/include/drm
+ 
+ libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la
+ libdrm_freedreno_ladir = $(libdir)
+ libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+-libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
++libdrm_freedreno_la_LIBADD = ../libdrm.la
+ 
+ libdrm_freedreno_la_SOURCES = \
+ 	freedreno_device.c \
diff --git a/extra/libdv/PKGBUILD b/extra/libdv/PKGBUILD
index 1c7302970..dc4a66075 100644
--- a/extra/libdv/PKGBUILD
+++ b/extra/libdv/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libdv
 pkgver=1.0.0
-pkgrel=4.1
+pkgrel=4.2
 pkgdesc="The Quasar DV codec (libdv) is a software codec for DV video"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libdv.sourceforge.net/"
diff --git a/extra/libdvbpsi/PKGBUILD b/extra/libdvbpsi/PKGBUILD
index e10dff9e9..4bdad975b 100644
--- a/extra/libdvbpsi/PKGBUILD
+++ b/extra/libdvbpsi/PKGBUILD
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD 143078 2011-11-22 13:07:42Z giovanni $
+# $Id: PKGBUILD 184029 2013-05-01 14:46:54Z foutrelis $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=libdvbpsi
 pkgver=0.2.2
-pkgrel=1.1
+pkgrel=1
+epoch=1
 pkgdesc="A library designed for decoding and generation of MPEG TS and DVB PSI tables"
 arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
+license=('LGPL2.1')
 depends=('glibc')
 options=('!libtool')
 replaces=('libdvbpsi4' 'libdvbpsi5')
diff --git a/extra/libdvdcss/PKGBUILD b/extra/libdvdcss/PKGBUILD
index bec7d2a35..41146c232 100644
--- a/extra/libdvdcss/PKGBUILD
+++ b/extra/libdvdcss/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 160018 2012-05-28 02:15:20Z eric $
+# $Id: PKGBUILD 180007 2013-03-14 11:52:25Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: arjan <arjan@archlinux.org>
 # Contributor Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=libdvdcss
-pkgver=1.2.12
+pkgver=1.2.13
 pkgrel=1
 pkgdesc="A portable abstraction library for DVD decryption"
 url="http://www.videolan.org/libdvdcss"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc')
-options=('!libtool')
+options=('!libtool' '!docs' '!emptydirs')
 source=(http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2218a193900e3203aa10dc24cdf54275')
+sha1sums=('1a4a5e55c7529da46386c1c333340eee2c325a77')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,5 +23,5 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libebml/PKGBUILD b/extra/libebml/PKGBUILD
index 61a8c71ea..b898acb29 100644
--- a/extra/libebml/PKGBUILD
+++ b/extra/libebml/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 143796 2011-11-29 12:02:45Z giovanni $
+# $Id: PKGBUILD 180600 2013-03-24 12:10:12Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: 03/08/04 <lefungus@altern.org>
 
 pkgname=libebml
-pkgver=1.2.2
-pkgrel=2.1
+pkgver=1.3.0
+pkgrel=1
 pkgdesc="Extensible Binary Meta Language library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dl.matroska.org/downloads/libebml/"
 license=('LGPL')
 depends=('gcc-libs')
 source=("http://dl.matroska.org/downloads/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('726cc2bd1a525929ff35ff9854c0ebab')
+md5sums=('efec729bf5a51e649e1d9d1f61c0ae7a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/make/linux"
diff --git a/extra/libffado/60-ffado.rules b/extra/libffado/60-ffado.rules
deleted file mode 100644
index 6ab8ef851..000000000
--- a/extra/libffado/60-ffado.rules
+++ /dev/null
@@ -1,27 +0,0 @@
-SUBSYSTEM!="firewire", GOTO="ffado_end"
-
-ATTR{vendor}=="0x000166", GROUP="audio", ENV{ID_FFADO}="1" # TC GROUP A/S
-ATTR{vendor}=="0x0001f2", GROUP="audio", ENV{ID_FFADO}="1" # Mark of the Unicorn, Inc.
-ATTR{vendor}=="0x0003db", GROUP="audio", ENV{ID_FFADO}="1" # Apogee Electronics Corp.
-ATTR{vendor}=="0x000595", GROUP="audio", ENV{ID_FFADO}="1" # Alesis Corporation
-ATTR{vendor}=="0x0007f5", GROUP="audio", ENV{ID_FFADO}="1" # Bridgeco Co AG
-ATTR{vendor}=="0x000a92", GROUP="audio", ENV{ID_FFADO}="1" # Presonus Corporation
-ATTR{vendor}=="0x000aac", GROUP="audio", ENV{ID_FFADO}="1" # TerraTec Electronic GmbH
-ATTR{vendor}=="0x000d6c", GROUP="audio", ENV{ID_FFADO}="1" # M-Audio
-ATTR{vendor}=="0x000f1b", GROUP="audio", ENV{ID_FFADO}="1" # Ego Systems Inc.
-ATTR{vendor}=="0x000ff2", GROUP="audio", ENV{ID_FFADO}="1" # Loud Technologies Inc.
-ATTR{vendor}=="0x001260", GROUP="audio", ENV{ID_FFADO}="1" # Stanton Magnetics,inc.
-ATTR{vendor}=="0x00130e", GROUP="audio", ENV{ID_FFADO}="1" # Focusrite Audio Engineering Limited
-ATTR{vendor}=="0x001486", GROUP="audio", ENV{ID_FFADO}="1" # Echo Digital Audio Corporation
-ATTR{vendor}=="0x001564", GROUP="audio", ENV{ID_FFADO}="1" # BEHRINGER Spezielle Studiotechnik GmbH
-ATTR{vendor}=="0x001c2d", GROUP="audio", ENV{ID_FFADO}="1" # FlexRadio Systems
-ATTR{vendor}=="0x001c6a", GROUP="audio", ENV{ID_FFADO}="1" # Weiss Engineering Ltd.
-ATTR{vendor}=="0x0040ab", GROUP="audio", ENV{ID_FFADO}="1" # ROLAND DG CORPORATION
-
-# The devices below abuse another Vendor's ID, and therefore we need more advanced rules for those.
-
-ATTR{vendor}=="0x00000a", ATTR{model}=="0x030000", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # CME, Matrix K FW
-ATTR{vendor}=="0x00000f", ATTR{model}=="0x01006?", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # Mackie, Onyx Firewire
-ATTR{vendor}=="0x000a35", ATTR{units}=="0x000a35:0x00000[12]", GROUP="audio", ENV{ID_FFADO}="1" # RME
-
-LABEL="ffado_end"
diff --git a/extra/libffado/fix-segfault-on-close.patch b/extra/libffado/fix-segfault-on-close.patch
deleted file mode 100644
index c81b97e40..000000000
--- a/extra/libffado/fix-segfault-on-close.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: /trunk/libffado/src/debugmodule/debugmodule.h

-===================================================================

---- /trunk/libffado/src/debugmodule/debugmodule.h (revision 1763)

-+++ /trunk/libffado/src/debugmodule/debugmodule.h (revision 1999)

-@@ -283,6 +283,10 @@

- void hexDumpQuadlets( quadlet_t *data_start, unsigned int length );

- 

-+class DebugModuleManager;

-+

- class DebugModule {

- public:

-+    friend class DebugModuleManager;

-+

-     enum {

-         eDL_Message      = DEBUG_LEVEL_MESSAGE,

-@@ -333,4 +337,5 @@

-     std::string   m_name;

-     debug_level_t m_level;

-+    DebugModuleManager* m_manager;

- };

- 

-Index: /trunk/libffado/src/debugmodule/debugmodule.cpp

-===================================================================

---- /trunk/libffado/src/debugmodule/debugmodule.cpp (revision 1763)

-+++ /trunk/libffado/src/debugmodule/debugmodule.cpp (revision 1999)

-@@ -84,5 +84,6 @@

- //              << endl;

- //     }

--    if ( !DebugModuleManager::instance()->unregisterModule( *this ) ) {

-+

-+    if (m_manager && !m_manager->unregisterModule( *this ) ) {

-         cerr << "Could not unregister DebugModule at DebugModuleManager"

-              << endl;

-@@ -263,12 +264,9 @@

- DebugModuleManager::~DebugModuleManager()

- {

--    // cleanin up leftover modules

--    for ( DebugModuleVectorIterator it = m_debugModules.begin();

--          it != m_debugModules.end();

--          ++it )

-+    // cleaning up leftover modules

-+    while (!m_debugModules.empty())

-     {

--        fprintf(stderr,"Cleaning up leftover debug module: %s\n",(*it)->getName().c_str());

--        m_debugModules.erase( it );

--        delete *it;

-+        DebugModule *mod = m_debugModules.back();

-+        unregisterModule(*mod);

-     }

- 

-@@ -455,4 +453,6 @@

-     } else {

-         m_debugModules.push_back( &debugModule );

-+        if (debugModule.m_manager == NULL)

-+                debugModule.m_manager = this;

-     }

-     return true;

-@@ -469,4 +469,6 @@

-         if ( *it == &debugModule ) {

-             m_debugModules.erase( it );

-+            if (debugModule.m_manager == this)

-+                debugModule.m_manager = NULL;

-             return true;

-         }

diff --git a/extra/libffado/libffado-gcc47.patch b/extra/libffado/libffado-gcc47.patch
deleted file mode 100644
index f296956a5..000000000
--- a/extra/libffado/libffado-gcc47.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur libffado-2.0.1-old/src/bebob/bebob_dl_mgr.cpp libffado-2.0.1/src/bebob/bebob_dl_mgr.cpp
---- libffado-2.0.1-old/src/bebob/bebob_dl_mgr.cpp	2009-05-17 23:42:38.000000000 +1000
-+++ libffado-2.0.1/src/bebob/bebob_dl_mgr.cpp	2012-04-29 15:26:29.011454798 +1000
-@@ -35,6 +35,7 @@
- 
- #include <cstdio>
- #include <cstring>
-+#include <unistd.h>
- 
- namespace BeBoB {
-     enum {
-diff -Naur libffado-2.0.1-old/src/ffadodevice.cpp libffado-2.0.1/src/ffadodevice.cpp
---- libffado-2.0.1-old/src/ffadodevice.cpp	2008-11-23 21:25:32.000000000 +1000
-+++ libffado-2.0.1/src/ffadodevice.cpp	2012-04-29 15:26:54.883998052 +1000
-@@ -34,6 +34,7 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <unistd.h>
- 
- #include <assert.h>
- 
-diff -Naur libffado-2.0.1-old/src/fireworks/fireworks_device.cpp libffado-2.0.1/src/fireworks/fireworks_device.cpp
---- libffado-2.0.1-old/src/fireworks/fireworks_device.cpp	2009-11-23 00:40:08.000000000 +1000
-+++ libffado-2.0.1/src/fireworks/fireworks_device.cpp	2012-04-29 15:27:24.123105334 +1000
-@@ -44,6 +44,7 @@
- #define FIREWORKS_MIN_FIRMWARE_VERSION 0x04080000
- 
- #include <sstream>
-+#include <unistd.h>
- using namespace std;
- 
- // FireWorks is the platform used and developed by ECHO AUDIO
-diff -Naur libffado-2.0.1-old/src/libieee1394/IsoHandlerManager.cpp libffado-2.0.1/src/libieee1394/IsoHandlerManager.cpp
---- libffado-2.0.1-old/src/libieee1394/IsoHandlerManager.cpp	2010-04-18 05:15:54.000000000 +1000
-+++ libffado-2.0.1/src/libieee1394/IsoHandlerManager.cpp	2012-04-29 15:27:44.515816147 +1000
-@@ -34,6 +34,7 @@
- #include "libutil/Configuration.h"
- 
- #include <cstring>
-+#include <unistd.h>
- #include <assert.h>
- 
- IMPL_DEBUG_MODULE( IsoHandlerManager, IsoHandlerManager, DEBUG_LEVEL_NORMAL );
-diff -Naur libffado-2.0.1-old/support/dbus/test-dbus.cpp libffado-2.0.1/support/dbus/test-dbus.cpp
---- libffado-2.0.1-old/support/dbus/test-dbus.cpp	2008-04-27 03:30:41.000000000 +1000
-+++ libffado-2.0.1/support/dbus/test-dbus.cpp	2012-04-29 15:28:31.531047923 +1000
-@@ -24,6 +24,7 @@
- #include <argp.h>
- #include <stdlib.h>
- #include <iostream>
-+#include <unistd.h>
- #include <signal.h>
- 
- #include "controlclient.h"
diff --git a/extra/libfontenc/PKGBUILD b/extra/libfontenc/PKGBUILD
index 0fc71ae21..a38f23821 100644
--- a/extra/libfontenc/PKGBUILD
+++ b/extra/libfontenc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151844 2012-03-03 13:37:37Z andyrtr $
+# $Id: PKGBUILD 183670 2013-04-26 12:46:35Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libfontenc
-pkgver=1.1.1
-pkgrel=1.1
+pkgver=1.1.2
+pkgrel=1
 pkgdesc="X11 font encoding library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -12,7 +12,7 @@ depends=('zlib')
 makedepends=('pkgconfig' 'xproto>=7.0.18')
 options=('!libtool')
 source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('90bdd53d75585dd0f06ad7bc23faccd8a01bb733')
+sha256sums=('a9a4efed3359b2e80161bb66b65038fac145137fa134e71335264cbc23b02f62')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libfprint/PKGBUILD b/extra/libfprint/PKGBUILD
index 805838bf4..7d0da7296 100644
--- a/extra/libfprint/PKGBUILD
+++ b/extra/libfprint/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=libfprint
 pkgver=0.5.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Library for fingerprint readers"
 arch=(i686 x86_64 mips64el)
 url="http://www.freedesktop.org/wiki/Software/fprint/libfprint"
diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD
index c6d50d193..84c993286 100644
--- a/extra/libgda/PKGBUILD
+++ b/extra/libgda/PKGBUILD
@@ -1,31 +1,30 @@
-# $Id: PKGBUILD 156892 2012-04-23 09:08:29Z ibiru $
+# $Id: PKGBUILD 184204 2013-05-03 19:46:09Z heftig $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=libgda
-pkgver=5.0.3
-pkgrel=1
+pkgver=5.1.2
+pkgrel=2
 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup'
-         'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring'
+         'libmariadbclient' 'postgresql-libs' 'python2' 'libsecret'
          'hicolor-icon-theme' 'desktop-file-utils' 'graphviz' 'gdk-pixbuf2'
          'iso-codes' 'openssl' 'libgcrypt' 'libldap')
 makedepends=('intltool' 'gobject-introspection' 'gtk-doc' 'vala')
-[ "$CARCH" != "mips64el" ] && makedepends+=('openjdk6')
 options=('!libtool')
 url="http://www.gnome-db.org"
 install=libgda.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('82d204361b794103c366bb690484d25814bfc653cb97da0dfcf7c0a13409d1cc')
+sha256sums=('59c4416a151297a406091fcfe7af781ea88af3381d10b365ba73b1eb8e23b6c5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i '1s/python$/&2/' libgda-report/RML/trml*/trml*.py
   ./configure --prefix=/usr --sysconfdir=/etc \
       --with-bdb=/usr --with-bdb-libdir-name=lib \
-      --disable-static --enable-json
+      --disable-static --enable-json --enable-gda-gi
   make
 }
 
diff --git a/extra/libgdata/PKGBUILD b/extra/libgdata/PKGBUILD
index f46623925..5dc7da933 100644
--- a/extra/libgdata/PKGBUILD
+++ b/extra/libgdata/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 169948 2012-10-30 22:46:31Z heftig $
+# $Id: PKGBUILD 183428 2013-04-21 22:11:14Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgdata
-pkgver=0.13.2
+pkgver=0.13.3
 pkgrel=1
 pkgdesc="GLib-based library for accessing online service APIs using the GData protocol"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('libsoup-gnome' 'liboauth' 'gcr' 'gnome-online-accounts')
+depends=('libsoup' 'liboauth' 'gcr' 'gnome-online-accounts')
 makedepends=('intltool' 'gobject-introspection')
 url="http://www.gnome.org"
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3dc4e3529b4bf13d4ae4ef7cc4d74c3b5c90bd96e7d9fa83db2066a2b9a36330')
+sha256sums=('4bf52706b2ab404f8b128e000509acd9937facf26916d3e907a3db8653f73637')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libgdiplus/PKGBUILD b/extra/libgdiplus/PKGBUILD
index 9553d8b3b..50688d4a1 100644
--- a/extra/libgdiplus/PKGBUILD
+++ b/extra/libgdiplus/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libgdiplus
 pkgver=2.10
-pkgrel=3
+pkgrel=3.1
 pkgdesc="An Open Source Implementation of the GDI+ API"
 arch=(i686 x86_64 'mips64el')
 license=('MPL' 'LGPL')
diff --git a/extra/libgdiplus/gdiplus-png14.patch b/extra/libgdiplus/gdiplus-png14.patch
deleted file mode 100644
index d13260812..000000000
--- a/extra/libgdiplus/gdiplus-png14.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/pngcodec.c.orig	2010-01-16 23:47:17.000000000 +0100
-+++ src/pngcodec.c	2010-01-16 23:49:49.000000000 +0100
-@@ -352,7 +352,7 @@
- 						info_ptr->palette[i].blue,
- 						info_ptr->palette[i].green,
- 						info_ptr->palette[i].red,
--						info_ptr->trans[i]); /* alpha */
-+						info_ptr->trans_alpha[i]); /* alpha */
- 			}
- 		}
- 
-@@ -418,7 +418,7 @@
- 		}
- 
- 		if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) {
--			png_set_gray_1_2_4_to_8(png_ptr);
-+			png_set_expand_gray_1_2_4_to_8(png_ptr);
- 		}
- 
- 		if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD
index 370eb783c..4784fa300 100644
--- a/extra/libgee/PKGBUILD
+++ b/extra/libgee/PKGBUILD
@@ -1,27 +1,34 @@
-# $Id: PKGBUILD 175984 2013-01-25 15:31:43Z ioni $
+# $Id: PKGBUILD 183429 2013-04-21 22:11:15Z heftig $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libgee
-pkgver=0.6.7
+pkgver=0.10.1
 pkgrel=1
 pkgdesc="GObject collection library"
 url="http://live.gnome.org/Libgee"
-license=('LGPL2.1')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('glib2')
-makedepends=('gobject-introspection')
+license=(LGPL2.1)
+arch=(i686 x86_64 mips64el)
+depends=(glib2)
+makedepends=(gobject-introspection vala)
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b512bf1785fbbb6a264be5fac325c42d4e96cc560b22e3f19ea5b01b1414106d')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('f50c103107314daee6dc68054e359d5169a19c562902e323ba798b380a2a2c96')
 
 build() {
-    cd $pkgname-$pkgver
-    ./configure --prefix=/usr --disable-static
-    make
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  # generates a bazillion traps - make sure systemd's core_pattern
+  # is deactivated, or you'll DoS the journal and the system
+  #make check
 }
 
 package() {
-    cd $pkgname-$pkgver
-    make DESTDIR="$pkgdir" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/libgee06/PKGBUILD b/extra/libgee06/PKGBUILD
new file mode 100644
index 000000000..a5419fab7
--- /dev/null
+++ b/extra/libgee06/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 183430 2013-04-21 22:11:17Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=libgee06
+_pkgname=libgee
+pkgver=0.6.8
+pkgrel=1
+pkgdesc="GObject collection library (legacy)"
+url="http://live.gnome.org/Libgee"
+license=(LGPL2.1)
+arch=(i686 x86_64 mips64el)
+depends=(glib2)
+makedepends=(gobject-introspection)
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('a61f8d796173d41f6144a030d4bd22461f0bb3fa18a3ebe02341b315feebf5d3')
+
+build() {
+    cd $_pkgname-$pkgver
+    ./configure --prefix=/usr --disable-static
+    make
+}
+
+package() {
+    cd $_pkgname-$pkgver
+    make DESTDIR="$pkgdir" install
+}
diff --git a/extra/libgksu/PKGBUILD b/extra/libgksu/PKGBUILD
index c260783c6..614346b97 100644
--- a/extra/libgksu/PKGBUILD
+++ b/extra/libgksu/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libgksu
 pkgver=2.0.12
-pkgrel=5
+pkgrel=5.1
 pkgdesc="gksu authorization library"
 arch=(i686 x86_64 'mips64el')
 url="http://www.nongnu.org/gksu/index.html"
@@ -41,6 +41,8 @@ build() {
 
   touch NEWS README
 
+  sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
+
   intltoolize --force --copy --automake
   autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc \
diff --git a/extra/libgme/PKGBUILD b/extra/libgme/PKGBUILD
index 4b7bd8e04..b3eba7e68 100644
--- a/extra/libgme/PKGBUILD
+++ b/extra/libgme/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libgme
 pkgver=0.6.0
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc="Video game music file emulation/playback library"
 url="http://game-music-emu.googlecode.com/"
 license=('LGPL')
diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD
index 919e6472c..f8f357351 100644
--- a/extra/libgnome-keyring/PKGBUILD
+++ b/extra/libgnome-keyring/PKGBUILD
@@ -1,18 +1,19 @@
-#$Id: PKGBUILD 169951 2012-10-30 22:46:41Z heftig $
+#$Id: PKGBUILD 183431 2013-04-21 22:11:18Z heftig $
 #Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=libgnome-keyring
-pkgver=3.6.0
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="GNOME keyring client library"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 depends=('dbus-core' 'glib2' 'libgcrypt')
 makedepends=('intltool' 'gobject-introspection')
+optdepends=('gnome-keyring: key storage service (or use any other service implementing org.freedesktop.secrets)')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6dca37fb7b37f800f498031ffe303a567410bec09a9bdd877a18865dafcc9830')
+sha256sums=('a8646f2bc62ef903be422946a6356b0718f7a4cbb29b5bdd35a84136f6b82f76')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libgnome-media-profiles/PKGBUILD b/extra/libgnome-media-profiles/PKGBUILD
deleted file mode 100644
index 0b3e1d109..000000000
--- a/extra/libgnome-media-profiles/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 148822 2012-02-05 11:51:50Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=libgnome-media-profiles
-pkgver=3.0.0
-pkgrel=3
-pkgdesc="Library for management of audio recording profiles"
-arch=(i686 x86_64 mips64el)
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('gconf' 'gtk3' 'gstreamer0.10-base-plugins')
-makedepends=('intltool' 'gnome-doc-utils')
-options=('!emptydirs' '!libtool')
-install=libgnome-media-profiles.install
-source=(http://download.gnome.org/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('ab1288e53a8fccca3e8fa59757ef586901e236e09a737a1178eeb8d74428c061')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --disable-static -disable-scrollkeeper \
-    --disable-schemas-install
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-audio-profiles "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/libgnome-media-profiles/libgnome-media-profiles.install b/extra/libgnome-media-profiles/libgnome-media-profiles.install
deleted file mode 100644
index 22b4c8f12..000000000
--- a/extra/libgnome-media-profiles/libgnome-media-profiles.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=libgnome-media-profiles
-
-post_install(){
-    usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-    pre_remove $1
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/extra/libgnome/PKGBUILD b/extra/libgnome/PKGBUILD
index 9dc26cebf..f34b4214c 100644
--- a/extra/libgnome/PKGBUILD
+++ b/extra/libgnome/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 151073 2012-02-24 17:58:01Z ibiru $ 
+# $Id: PKGBUILD 178221 2013-02-18 14:05:53Z jgc $ 
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libgnome
 pkgname=('libgnome' 'libgnome-data')
 pkgver=2.32.1
-pkgrel=3.1
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-makedepends=('intltool' 'gnome-vfs>=2.24.4' 'libbonobo>=2.32.1' 'gconf>=2.32.3' 'gvfs>=1.8.1' 'libcanberra>=0.28')
+makedepends=('intltool' 'gnome-vfs' 'libbonobo' 'gconf' 'gvfs' 'libcanberra')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2)
@@ -23,7 +23,7 @@ build() {
 
 package_libgnome() {
     pkgdesc="Common libraries for GNOME"
-    depends=("libgnome-data=${pkgver}" 'gnome-vfs>=2.24.4' 'libbonobo>=2.32.1' 'gconf>=2.32.3' 'gvfs>=1.8.1' 'libcanberra>=0.28')
+    depends=("libgnome-data=${pkgver}" 'gnome-vfs' 'libbonobo' 'gconf' 'gvfs' 'libcanberra')
 
     cd "${srcdir}/${pkgbase}-${pkgver}"
 
diff --git a/extra/libgnome/libgnome.install b/extra/libgnome/libgnome.install
index db4e04d4d..a36ed4725 100644
--- a/extra/libgnome/libgnome.install
+++ b/extra/libgnome/libgnome.install
@@ -13,5 +13,5 @@ post_upgrade() {
 }
 
 pre_remove() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
diff --git a/extra/libgnomecanvas/PKGBUILD b/extra/libgnomecanvas/PKGBUILD
index 81a795df5..eab871f90 100644
--- a/extra/libgnomecanvas/PKGBUILD
+++ b/extra/libgnomecanvas/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libgnomecanvas
 pkgver=2.30.3
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc="The GNOME Canvas library"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
diff --git a/extra/libgnomeui/PKGBUILD b/extra/libgnomeui/PKGBUILD
index f14bac79b..1fd7ac8b7 100644
--- a/extra/libgnomeui/PKGBUILD
+++ b/extra/libgnomeui/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libgnomeui
 pkgver=2.24.5
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="User Interface library for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD
index 0247eecad..9569ef05a 100644
--- a/extra/libgphoto2/PKGBUILD
+++ b/extra/libgphoto2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 173128 2012-12-11 14:42:12Z jgc $
+# $Id: PKGBUILD 179978 2013-03-13 20:08:25Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Gundersen <teg@jklm.no>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=libgphoto2
-pkgver=2.5.0
+pkgver=2.5.1
 pkgrel=1
 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs."
 arch=(i686 x86_64 'mips64el')
@@ -15,7 +15,7 @@ depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat' 'libusb')
 install=libgphoto2.install
 options=('libtool')
 source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz)
-md5sums=('ea9b3b07a3738c0a77958d6fe13ae524')
+md5sums=('92780eb4baf7b512b86b5e7300ec91a5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD
index b3a4c710f..9e258f208 100644
--- a/extra/libgpod/PKGBUILD
+++ b/extra/libgpod/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libgpod
 pkgver=0.8.2
-pkgrel=6
+pkgrel=6.1
 pkgdesc="A shared library to access the contents of an iPod"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD
index c79366337..cc70210f6 100644
--- a/extra/libgsf/PKGBUILD
+++ b/extra/libgsf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170960 2012-11-14 03:19:40Z heftig $
+# $Id: PKGBUILD 178924 2013-02-28 19:13:21Z ioni $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=libgsf
-pkgver=1.14.25
+pkgver=1.14.26
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats"
@@ -13,7 +13,7 @@ options=('!libtool')
 depends=('libxml2' 'gdk-pixbuf2' 'bzip2')
 makedepends=('intltool' 'gobject-introspection')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz)
-sha256sums=('127548f07e07951984fb139c3f89d65b9e471aefe6555387de03e1113944d1a2')
+sha256sums=('8919e725aadd785380350c8dec7427d82cf33164bc9a9a549df9440a0c3da6d5')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libgtkhtml/PKGBUILD b/extra/libgtkhtml/PKGBUILD
index ef51454c3..82a8a5a5a 100644
--- a/extra/libgtkhtml/PKGBUILD
+++ b/extra/libgtkhtml/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libgtkhtml
 pkgver=2.11.1
-pkgrel=4.1
+pkgrel=4.2
 pkgdesc="An HTML library for GTK"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
diff --git a/extra/libgusb/PKGBUILD b/extra/libgusb/PKGBUILD
index 5fb10ca3b..500d0b250 100644
--- a/extra/libgusb/PKGBUILD
+++ b/extra/libgusb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170681 2012-11-09 12:30:03Z jgc $
+# $Id: PKGBUILD 183627 2013-04-25 17:50:55Z ioni $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libgusb
-pkgver=0.1.4
+pkgver=0.1.6
 pkgrel=1
 pkgdesc="GLib wrapper around libusb1"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,16 +12,16 @@ depends=('udev' 'libusbx')
 makedepends=('gobject-introspection')
 source=(http://people.freedesktop.org/~hughsient/releases/$pkgname-$pkgver.tar.xz)
 options=('!libtool')
-sha256sums=('64294a649e54df2009545f47577f41438ec50c2fc571dd7b08cf32cb14de37b9')
+sha256sums=('900103ff24a851ef8395b992236ced0aedb4c265ef2264f6ad8349300095198b')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --disable-static
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD
index 0749908f3..0ddf4e0c7 100644
--- a/extra/libgweather/PKGBUILD
+++ b/extra/libgweather/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 170931 2012-11-13 12:56:29Z heftig $
+# $Id: PKGBUILD 183432 2013-04-21 22:11:21Z heftig $
 # Maintainer: Jan de Groot  <jgc@archlinux.org>
 
 pkgname=libgweather
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="Provides access to weather information from the net"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-depends=('libsoup-gnome' 'gnome-icon-theme' 'gtk3')
+depends=('libsoup' 'gnome-icon-theme' 'gtk3')
 makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org/"
@@ -15,7 +15,7 @@ install=libgweather.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         gettext-not-xml.patch
         no_external_gettext.patch)
-sha256sums=('0f2aeff290751590ca51e806c3d09054bf87b86b63b89f5179043a9b3fa8a0b0'
+sha256sums=('4649f51a881ec375853a782ec1cd279f242baa4b6c1b9ebe09614ac65dd6081a'
             '40325e0b5464ebb75eaad3c9292c0bab7b15cfefb93011d9ccc0ab82635a9533'
             'f07ac07a70ad4999c3acd5d5b82aabd8831e6a45beb9aaed239f212057ded672')
 
diff --git a/extra/libgxps/PKGBUILD b/extra/libgxps/PKGBUILD
index c1767ac9f..bb661a5b8 100644
--- a/extra/libgxps/PKGBUILD
+++ b/extra/libgxps/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156904 2012-04-23 09:08:44Z ibiru $
+# $Id: PKGBUILD 179109 2013-03-03 17:28:36Z dreisner $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libgxps
 pkgver=0.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="XPS Documents library"
 arch=(i686 x86_64 'mips64el')
 url="https://live.gnome.org/libgxps"
diff --git a/extra/libical/PKGBUILD b/extra/libical/PKGBUILD
index d3fe322f5..4d5dfdad5 100644
--- a/extra/libical/PKGBUILD
+++ b/extra/libical/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libical
 pkgver=0.48
-pkgrel=1
+pkgrel=1.1
 pkgdesc="An open source reference implementation of the icalendar data type and serialization format"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://sourceforge.net/projects/freeassociation/'
diff --git a/extra/libidn/PKGBUILD b/extra/libidn/PKGBUILD
index 711371780..a6cb39355 100644
--- a/extra/libidn/PKGBUILD
+++ b/extra/libidn/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162005 2012-06-18 08:51:29Z ronald $
+# $Id: PKGBUILD 178107 2013-02-16 09:56:28Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jan de Groot <jgc.archlinux.org>
 # Contributor: Eric Johnson <eric.archlinux.org>
 
 pkgname=libidn
-pkgver=1.25
+pkgver=1.26
 pkgrel=1
 pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications"
 url="http://www.gnu.org/software/libidn/"
@@ -15,7 +15,7 @@ makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 install=libidn.install
-sha1sums=('92e64fd5a6428bda6ade2c3cde475b76455cd7dd')
+sha1sums=('b1cb40646a96dadbfc41d060d23dfb382eec1128')
 	
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD
index 65e03b54d..df025d12b 100644
--- a/extra/libindi/PKGBUILD
+++ b/extra/libindi/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libindi
 pkgver=0.9.6
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation"
 url="http://www.indilib.org/index.php?title=Main_Page"
 license=('GPL2')
diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD
index 51223e71f..d70689935 100644
--- a/extra/libisoburn/PKGBUILD
+++ b/extra/libisoburn/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 174985 2013-01-09 20:25:17Z andyrtr $
+# $Id: PKGBUILD 180386 2013-03-20 20:56:13Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Gour <Gour <gour@mail.inet.hr>
 
 pkgname=libisoburn
-pkgver=1.2.6
+pkgver=1.2.8
 pkgrel=1
 pkgdesc="frontend for libraries libburn and libisofs"
 url="http://libburnia.pykix.org/wiki/Libisoburn"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-depends=('libburn>=1.2.6' 'libisofs>=1.2.6' 'readline')
+depends=('libburn>=1.2.8' 'libisofs>=1.2.8' 'readline')
 options=('!libtool')
 install=${pkgname}.install
 source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('1db39e96f8d0370bfe571e21ba62df3f'
-         '67b3c568140b7a4a27f3efdc74bcf3c2')
+md5sums=('1f02aa98d56c4b3e568e641a91640ecc'
+         '766281eec985df34f584aabd6963d71d')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD
index 6bdeca2e1..9faf3acd4 100644
--- a/extra/libisofs/PKGBUILD
+++ b/extra/libisofs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 174979 2013-01-09 20:11:39Z andyrtr $
+# $Id: PKGBUILD 180385 2013-03-20 20:56:10Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Hugo Doria <hugodoria@gmail.com>
 # Contributor: Bjorn Martensen
 
 pkgname=libisofs
-pkgver=1.2.6
+pkgver=1.2.8
 pkgrel=1
 pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ license=('GPL')
 depends=('acl' 'zlib')
 source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig})
 options=('!libtool')
-md5sums=('e3b0eebd7523f64020178aaba5d71c88'
-         '5b8159f7c0cd39a3ce4bd74c4d91253a')
+md5sums=('9d3515929b80a08daa6423b8312be8c1'
+         'f30c694e856d9c44df864b30b2139000')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libkate/PKGBUILD b/extra/libkate/PKGBUILD
index 922352299..8212c746c 100644
--- a/extra/libkate/PKGBUILD
+++ b/extra/libkate/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=libkate
 pkgver=0.4.1
-pkgrel=3.1
+pkgrel=3.2
 pkgdesc="A karaoke and text codec for embedding in ogg"
 url="http://libkate.googlecode.com/"
 license=('BSD')
diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD
index 7dd36b7bc..10f1067c8 100644
--- a/extra/libkcddb/PKGBUILD
+++ b/extra/libkcddb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177651 2013-02-08 08:56:10Z andrea $
+# $Id: PKGBUILD 181897 2013-04-05 08:54:42Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkcddb
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="KDE CDDB library"
 url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdemultimedia-kioslave')
 conflicts=('kdemultimedia-kioslave')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('44bc8f69f7f98be741b0d0bb618ff9cc3601b4e1')
+sha1sums=('c9e8d93ecf9f238bf12d98d27fc20421af5ae240')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD
index a81438a15..def39a721 100644
--- a/extra/libkcompactdisc/PKGBUILD
+++ b/extra/libkcompactdisc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177652 2013-02-08 08:56:11Z andrea $
+# $Id: PKGBUILD 181898 2013-04-05 08:54:43Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkcompactdisc
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A library for interfacing with CDs"
 url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdemultimedia-kioslave')
 conflicts=('kdemultimedia-kioslave')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('f59941162f95f1a61415491d4382f366a20a3c8a')
+sha1sums=('dcd95e3b197a871a21cd50f70edc5039b7835ef4')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD
index 4cb0c9ef6..3a6a38d8c 100644
--- a/extra/libkdcraw/PKGBUILD
+++ b/extra/libkdcraw/PKGBUILD
@@ -1,33 +1,33 @@
-# $Id: PKGBUILD 177646 2013-02-08 08:56:06Z andrea $
+# $Id: PKGBUILD 183096 2013-04-17 14:16:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdcraw
-pkgver=4.10.0
-pkgrel=1
+pkgver=4.10.2
+pkgrel=2
 pkgdesc="A C++ interface used to decode RAW picture"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'lcms')
+depends=('kdelibs' 'lcms2')
 makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('c332fcba9a06f6650cb8ce4652e91af9de3b43bc')
+sha1sums=('639bf3bf9a872cccbb39e5d16188dfa1d895463a')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_LCMS2=ON
   make
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD
index f76c833e6..7504f857e 100644
--- a/extra/libkdeedu/PKGBUILD
+++ b/extra/libkdeedu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177644 2013-02-08 08:56:04Z andrea $
+# $Id: PKGBUILD 181890 2013-04-05 08:54:34Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdeedu
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Libraries used by KDE Education applications"
 url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 replaces=('kdeedu-libkdeedu' 'kdeedu-data')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('ecee7596db004e74c9b59e5a1d31689b839b3791')
+sha1sums=('2c0f6ebfc1e51919da0313b0a93d149dfd1d0be7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkdegames/PKGBUILD b/extra/libkdegames/PKGBUILD
index c5855188e..3be84aa86 100644
--- a/extra/libkdegames/PKGBUILD
+++ b/extra/libkdegames/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177653 2013-02-08 08:56:12Z andrea $
+# $Id: PKGBUILD 181899 2013-04-05 08:54:43Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdegames
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Common code and data for many KDE games"
 url="https://projects.kde.org/projects/kde/kdegames/libkdegames"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegames-libkdegames')
 conflicts=('kdegames-libkdegames')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('6488769e87fe357c8b228c7d4e96ed6726955c9d')
+sha1sums=('3a08bf0f98c00a02363da1a61beea61ad1e01b5b')
 
 build() {
   mkdir build
diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD
index d5cf05b87..2613f5d4d 100644
--- a/extra/libkexiv2/PKGBUILD
+++ b/extra/libkexiv2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177647 2013-02-08 08:56:07Z andrea $
+# $Id: PKGBUILD 181893 2013-04-05 08:54:37Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkexiv2
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="A library to manipulate pictures metadata"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('7a9d00c0a25549bfe28453143ec78965a8aa6a4a')
+sha1sums=('02dce6eaf48c14f134f220eeed494d74d41f7226')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD
index 23c08fe82..5870d56f7 100644
--- a/extra/libkipi/PKGBUILD
+++ b/extra/libkipi/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkipi
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="An interface to use kipi-plugins from a KDE application"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi"
@@ -14,7 +14,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('43cb9159d42f34bd0a96de934a78da5a9ce118b7')
+sha1sums=('3098759c56c8fa89bc087de60d8709c7f76dc7a6')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkmahjongg/PKGBUILD b/extra/libkmahjongg/PKGBUILD
index c86deffe3..78fb97a6a 100644
--- a/extra/libkmahjongg/PKGBUILD
+++ b/extra/libkmahjongg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177654 2013-02-08 08:56:12Z andrea $
+# $Id: PKGBUILD 181900 2013-04-05 08:54:44Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkmahjongg
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Common code, backgrounds and tile sets for games using Mahjongg tiles"
 url="https://projects.kde.org/projects/kde/kdegames/libmahjongg"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegames-libkmahjongg')
 conflicts=('kdegames-libkmahjongg')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('594edd2bb1a5f3981a6361db94da84da6b35d818')
+sha1sums=('58a8d3deb165cf9041c5b606a67275b3e276c428')
 
 build() {
   mkdir build
diff --git a/extra/libkolab/PKGBUILD b/extra/libkolab/PKGBUILD
index e9a7a37d8..fddc5e5db 100644
--- a/extra/libkolab/PKGBUILD
+++ b/extra/libkolab/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 174981 2013-01-09 20:16:01Z andrea $
+# $Id: PKGBUILD 182679 2013-04-12 14:31:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkolab
-pkgver=0.4.1
+pkgver=0.4.2
 pkgrel=1
 pkgdesc="Advanced Kolab Object Handling Library"
 url='http://git.kolab.org/libkolab/'
@@ -11,8 +11,8 @@ license=('GPL')
 depends=('libkolabxml' 'kdepimlibs')
 makedepends=('cmake' 'automoc4' 'boost')
 source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.gpg})
-md5sums=('16c4d513fd41f498348ab401a79cdaf6'
-         '18e76021f9b91df75c798ef24962de06')
+md5sums=('76c112b18c1c0928af5e6e9733a424d3'
+         '2b289570a6ca6d8105b2865a953fa36d')
 
 build() {
   mkdir build
diff --git a/extra/libkolabxml/PKGBUILD b/extra/libkolabxml/PKGBUILD
index 550e217e7..bf56184d1 100644
--- a/extra/libkolabxml/PKGBUILD
+++ b/extra/libkolabxml/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 176289 2013-01-28 16:48:21Z stephane $
+# $Id: PKGBUILD 182677 2013-04-12 14:30:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkolabxml
-pkgver=0.8.1
-pkgrel=2
+pkgver=0.8.4
+pkgrel=1
 pkgdesc="Kolab XML Format Schema Definitions Library"
 url='http://git.kolab.org/libkolabxml/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('xerces-c' 'boost-libs')
-makedepends=('cmake' 'boost' 'xsd')
+makedepends=('cmake' 'boost' 'xsd' 'qt4')
 source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.gpg})
-md5sums=('a02541b35153334c69ee1845dfe464c6'
-         'f5e9bc4a21a5bf06baec084435812cc4')
+md5sums=('64887f52c6629bbd8e2390d591ef5892'
+         '55fcdaff82818c4a0eac50570db31e53')
 
 build() {
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DQT_QMAKE_EXECUTABLE=qmake-qt4
   make
 }
 
diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD
index 2d5dc1b1a..138a5b0e2 100644
--- a/extra/libksane/PKGBUILD
+++ b/extra/libksane/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177649 2013-02-08 08:56:09Z andrea $
+# $Id: PKGBUILD 181895 2013-04-05 08:54:39Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libksane
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="An image scanning library"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane"
@@ -14,7 +14,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('c101b028ef540b14a0041b6433f522f52622c783')
+sha1sums=('3b9b83974dd2cdabe0cbe5fd3904ced1413a756b')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libktorrent/magnet.patch b/extra/libktorrent/magnet.patch
deleted file mode 100644
index 5db76c101..000000000
--- a/extra/libktorrent/magnet.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-commit 5107e4b7a050d7533f44801f5f5f5694203fd3b5
-Author: Joris Guisson <joris.guisson@gmail.com>
-Date:   Wed Jul 11 20:16:43 2012 +0200
-
-    Make sure all trackers are used of a magnet link
-    
-    BUG: 302997
-    BUG: 303269
-
-diff --git a/src/magnet/magnetlink.cpp b/src/magnet/magnetlink.cpp
-index 525bfa5..43168dc 100644
---- a/src/magnet/magnetlink.cpp
-+++ b/src/magnet/magnetlink.cpp
-@@ -19,13 +19,14 @@
-  ***************************************************************************/
- 
- #include "magnetlink.h"
-+#include <QUrl>
- #include <QStringList>
- #include <util/log.h>
- #include <util/error.h>
- 
- namespace bt
- {
--	
-+
- 	MagnetLink::MagnetLink()
- 	{
- 	}
-@@ -44,7 +45,7 @@ namespace bt
- 	{
- 		parse(mlink);
- 	}
--	
-+
- 	MagnetLink::~MagnetLink()
- 	{
- 	}
-@@ -64,83 +65,114 @@ namespace bt
- 	{
- 		return info_hash == mlink.infoHash();
- 	}
--	
-+
-+	static KUrl::List GetTrackers(const KUrl & url)
-+	{
-+		KUrl::List result;
-+		const QString encoded_query = QString::fromLatin1(url.encodedQuery());
-+		const QString item = QLatin1String("tr=");
-+		if(encoded_query.length() <= 1)
-+			return result;
-+
-+		const QStringList items = encoded_query.split(QString(QLatin1Char('&')), QString::SkipEmptyParts);
-+		const int len = item.length();
-+		for(QStringList::ConstIterator it = items.begin(); it != items.end(); ++it)
-+		{
-+			if((*it).startsWith(item))
-+			{
-+				if((*it).length() > len)
-+				{
-+					QString str = (*it).mid(len);
-+					str.replace(QLatin1Char('+'), QLatin1Char(' '));   // + in queries means space.
-+					result.push_back(QUrl::fromPercentEncoding(str.toLatin1()));
-+				}
-+			}
-+		}
-+
-+		return result;
-+	}
-+
- 	void MagnetLink::parse(const QString& mlink)
- 	{
- 		KUrl url(mlink);
--		if (url.protocol() != "magnet")
-+		if(url.protocol() != "magnet")
- 		{
--			Out(SYS_GEN|LOG_NOTICE) << "Invalid protocol of magnet link "
--				<< mlink << endl;
-+			Out(SYS_GEN | LOG_NOTICE) << "Invalid protocol of magnet link "
-+			                          << mlink << endl;
- 			return;
- 		}
--		
-+
- 		torrent_url = url.queryItem("to");
- 		//magnet://description-of-content.btih.HASH(-HASH)*.dht/path/file?x.pt=&x.to=
- 
- 		// TODO automatically select these files and prefetches from here
- 		path = url.queryItem("pt");
--		if ( path.isEmpty() && url.hasPath() && url.path() != "/" ) {
-+		if(path.isEmpty() && url.hasPath() && url.path() != "/")
-+		{
- 			// TODO find out why RemoveTrailingSlash does not work
- 			path = url.path(KUrl::RemoveTrailingSlash).remove(QRegExp("^/"));
- 		}
- 
- 		QString xt = url.queryItem("xt");
--		if ( xt.isEmpty()
--		     || !xt.startsWith("urn:btih:") ) {
-+		if(xt.isEmpty()
-+		        || !xt.startsWith("urn:btih:"))
-+		{
- 			QRegExp btihHash("([^\\.]+).btih");
--			if ( btihHash.indexIn(url.host()) != -1 ) {
-+			if(btihHash.indexIn(url.host()) != -1)
-+			{
- 				QString primaryHash = btihHash.cap(1).split("-")[0];
--				xt = "urn:btih:"+primaryHash;
--			} else {
--				Out(SYS_GEN|LOG_NOTICE) << "No hash found in magnet link "
--					<< mlink << endl;
-+				xt = "urn:btih:" + primaryHash;
-+			}
-+			else
-+			{
-+				Out(SYS_GEN | LOG_NOTICE) << "No hash found in magnet link "
-+				                          << mlink << endl;
- 				return;
- 			}
- 		}
--		
-+
- 		QString ih = xt.mid(9);
--		if (ih.length() != 40 && ih.length() != 32)
-+		if(ih.length() != 40 && ih.length() != 32)
- 		{
--			Out(SYS_GEN|LOG_NOTICE) << "Hash has not valid length in magnet link "
--				<< mlink << endl;
-+			Out(SYS_GEN | LOG_NOTICE) << "Hash has not valid length in magnet link "
-+			                          << mlink << endl;
- 			return;
- 		}
--		
-+
- 		try
- 		{
--			if (ih.length() == 32)
-+			if(ih.length() == 32)
- 				ih = base32ToHexString(ih);
- 
- 			Uint8 hash[20];
--			memset(hash,0,20);
--			for (int i = 0;i < 20;i++)
-+			memset(hash, 0, 20);
-+			for(int i = 0; i < 20; i++)
- 			{
--				Uint8 low = charToHex(ih[2*i + 1]);
--				Uint8 high = charToHex(ih[2*i]);
-+				Uint8 low = charToHex(ih[2 * i + 1]);
-+				Uint8 high = charToHex(ih[2 * i]);
- 				hash[i] = (high << 4) | low;
- 			}
--			
-+
- 			info_hash = SHA1Hash(hash);
--			tracker_urls = url.queryItem("tr").split(",");
-+			tracker_urls = GetTrackers(url);
- 			name = url.queryItem("dn");
- 			magnet_string = mlink;
- 		}
--		catch (...)
-+		catch(...)
- 		{
--			Out(SYS_GEN|LOG_NOTICE) << "Invalid magnet link " << mlink << endl;
-+			Out(SYS_GEN | LOG_NOTICE) << "Invalid magnet link " << mlink << endl;
- 		}
- 	}
--	
-+
- 	Uint8 MagnetLink::charToHex(const QChar& ch)
- 	{
--		if (ch.isDigit())
-+		if(ch.isDigit())
- 			return ch.digitValue();
--		
--		if (!ch.isLetter())
-+
-+		if(!ch.isLetter())
- 			throw bt::Error("Invalid char");
--		
--		if (ch.isLower())
-+
-+		if(ch.isLower())
- 			return 10 + ch.toAscii() - 'a';
- 		else
- 			return 10 + ch.toAscii() - 'A';
-@@ -155,28 +187,28 @@ namespace bt
- 		QString str = s.toUpper();
- 		// 32 base32 chars -> 40 hex chars
- 		// 4 base32 chars -> 5 hex chars
--		for (int i = 0; i < 8; i++)
-+		for(int i = 0; i < 8; i++)
- 		{
- 			part = 0;
--			for (int j = 0; j < 4; j++)
-+			for(int j = 0; j < 4; j++)
- 			{
--				ch = str[i*4 + j];
--				if (ch.isDigit() && (ch.digitValue() < 2 || ch.digitValue() > 7))
-+				ch = str[i * 4 + j];
-+				if(ch.isDigit() && (ch.digitValue() < 2 || ch.digitValue() > 7))
- 					throw bt::Error("Invalid char");
- 
--				if (ch.isDigit())
--					 tmp = ch.digitValue() + 24;
-+				if(ch.isDigit())
-+					tmp = ch.digitValue() + 24;
- 				else
- 					tmp = ch.toAscii() - 'A';
--				part = part + (tmp << 5*(3-j));
-+				part = part + (tmp << 5 * (3 - j));
- 			}
- 
- 			// part is a Uint32 with 20 bits (5 hex)
--			for (int j = 0; j < 5; j++)
-+			for(int j = 0; j < 5; j++)
- 			{
--				tmp = (part >> 4*(4-j)) & 0xf;
--				if (tmp >= 10)
--					ret.append(QChar((tmp-10) + 'a'));
-+				tmp = (part >> 4 * (4 - j)) & 0xf;
-+				if(tmp >= 10)
-+					ret.append(QChar((tmp - 10) + 'a'));
- 				else
- 					ret.append(QChar(tmp + '0'));
- 			}
diff --git a/extra/liblastfm/PKGBUILD b/extra/liblastfm/PKGBUILD
index aeadccd9f..b2fcc3171 100644
--- a/extra/liblastfm/PKGBUILD
+++ b/extra/liblastfm/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 175971 2013-01-25 14:23:37Z andrea $
+# $Id: PKGBUILD 181867 2013-04-05 02:24:25Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: XazZ <xazz.xazz [AT] googlemail.com>
 
 pkgname=liblastfm
-pkgver=1.0.6
+pkgver=1.0.7
 pkgrel=1
-pkgdesc="A Qt C++ library for the Last.fm webservices"
+pkgdesc="A Qt4 C++ library for the Last.fm webservices"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/lastfm/liblastfm/'
-license=('GPL')
-depends=('qt' 'fftw' 'libsamplerate')
+license=('GPL3')
+depends=('qt4' 'fftw' 'libsamplerate')
 makedepends=('cmake')
 source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/lastfm/${pkgname}/tarball/${pkgver}")
-sha1sums=('cd84cf61d315c9739b3b65e31c2854a6b1a38630')
+sha1sums=('b679bf76272b05373efcc2a8f3ee809599607853')
 
 build() {
   mkdir build
   cd build
-  cmake ../lastfm-${pkgname}-5826fe6 \
+  cmake ../lastfm-${pkgname}-* \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib \
diff --git a/extra/liblastfm/no-ftools.patch b/extra/liblastfm/no-ftools.patch
deleted file mode 100644
index e8480c36d..000000000
--- a/extra/liblastfm/no-ftools.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- mxcl-liblastfm-3539836/admin/findsrc.rb~	2010-09-19 10:35:34.783333338 +0200
-+++ mxcl-liblastfm-3539836/admin/findsrc.rb	2010-09-19 10:35:57.730000003 +0200
-@@ -1,6 +1,6 @@
- #!/usr/bin/ruby
- require 'find'
--require "#{File.dirname __FILE__}/platform"
-+require "#{Dir.getwd}/admin/platform.rb"
- 
- def findsrc dir='.'
-   excludes = ['.svn','.git','_include','tests','_build']
---- mxcl-liblastfm-3539836/admin/qpp~	2010-09-19 10:36:09.276666670 +0200
-+++ mxcl-liblastfm-3539836/admin/qpp	2010-09-19 10:36:16.926666670 +0200
-@@ -2,9 +2,8 @@
- # Creates a qmake .pro file for all valid SOURCES, HEADERS, FORMS and
- # RESOURCES under each argument to ARGV as directories
- 
--cwd=File.dirname __FILE__
- require 'find'
--require "#{cwd}/findsrc"
-+require "#{Dir.getwd}/admin/findsrc.rb"
- 
- sources = Array.new
- headers = Array.new
---- mxcl-liblastfm-3539836/admin/Makefile.rb~	2010-09-19 10:35:38.086666671 +0200
-+++ mxcl-liblastfm-3539836/admin/Makefile.rb	2010-09-19 10:36:05.816666671 +0200
-@@ -4,9 +4,8 @@
- # and then creates the directory _include and creates files named after the 
- # class names in there which #include the file that contains the class
- 
--cwd = File.dirname( __FILE__ )
- require 'find'
--require "#{cwd}/platform.rb"
-+require "#{Dir.getwd}/admin/platform.rb"
- 
- 
- ######################################################################### defs
diff --git a/extra/liblo/PKGBUILD b/extra/liblo/PKGBUILD
index 7cc6981a4..5bc4b86c6 100644
--- a/extra/liblo/PKGBUILD
+++ b/extra/liblo/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=liblo
 pkgver=0.26
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc="Lightweight OSC implementation: an implementation of the Open Sound Control protocol for POSIX systems"
 arch=(i686 x86_64 'mips64el')
 url="http://plugin.org.uk/liblo/"
diff --git a/extra/liblouis/PKGBUILD b/extra/liblouis/PKGBUILD
index b6f9f226b..13984580f 100644
--- a/extra/liblouis/PKGBUILD
+++ b/extra/liblouis/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 176085 2013-01-27 11:24:27Z ioni $
+# $Id: PKGBUILD 183433 2013-04-21 22:11:25Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=liblouis
 pkgver=2.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Open-source braille translator and back-translator"
 arch=(mips64el)
 url="http://code.google.com/p/liblouis/"
 license=('GPL3')
 depends=(glibc)
-makedepends=(help2man python2)
-optdepends=('python2: for python bindings')
+makedepends=(help2man python2 python)
 options=(!libtool)
 install=liblouis.install
 source=(http://liblouis.googlecode.com/files/$pkgname-$pkgver.tar.gz)
@@ -29,7 +28,6 @@ package() {
   cd python
   LD_PRELOAD+=":$srcdir/$pkgname-$pkgver/liblouis/.libs/liblouis.so"
   python2 setup.py install --root="$pkgdir" --prefix="/usr" --optimize=1
-
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "$pkgdir"/usr/bin/lou_harnessGenerator
+  python setup.py install --root="$pkgdir" --prefix="/usr" --optimize=1
 }
 # vim:set ts=2 sw=2 et:
diff --git a/extra/liblqr/PKGBUILD b/extra/liblqr/PKGBUILD
index f221285f8..798a2c6e2 100644
--- a/extra/liblqr/PKGBUILD
+++ b/extra/liblqr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150613 2012-02-18 22:56:34Z pierre $
+# $Id: PKGBUILD 182915 2013-04-16 05:57:47Z eric $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=liblqr
-pkgver=0.4.1
-pkgrel=3
+pkgver=0.4.2
+pkgrel=1
 pkgdesc="A seam-carving C/C++ library called Liquid Rescale"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://liblqr.wikidot.com/"
@@ -12,7 +12,7 @@ depends=('glib2')
 makedepends=('pkgconfig')
 options=('!libtool' '!emptydirs')
 source=("http://liblqr.wikidot.com/local--files/en:download-page/$pkgname-1-$pkgver.tar.bz2")
-md5sums=('0e24ed3c9fcdcb111062640764d7b87a')
+md5sums=('915643d993da97e10665d48c0bf8f3d0')
 
 build() {
   cd "$srcdir/$pkgname-1-$pkgver"
diff --git a/extra/liblrdf/md5.patch b/extra/liblrdf/md5.patch
deleted file mode 100644
index 1c43b12e9..000000000
--- a/extra/liblrdf/md5.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- liblrdf-0.4.0.orig/src/lrdf_md5.h
-+++ liblrdf-0.4.0/src/lrdf_md5.h
-@@ -32,6 +32,15 @@
- #ifndef __MD5_H__
- #define __MD5_H__
-
-+/* Change function names to prevent symbol conflicts */
-+#define md5_init _lrdf_md5_init
-+#define md5_buffer _lrdf_md5_buffer
-+#define md5_sig_from_string _lrdf_md5_sig_from_string
-+#define md5_finish _lrdf_md5_finish
-+#define md5_process _lrdf_md5_process
-+#define md5_sig_to_string _lrdf_md5_sig_to_string
-+#define md5_get_result _lrdf_md5_get_result
-+
- /*
-  * Size of a standard MD5 signature in bytes.  This definition is for
-  * external programs only.  The MD5 routines themselves reference the
diff --git a/extra/liblrdf/pkgconfig-raptor.patch b/extra/liblrdf/pkgconfig-raptor.patch
deleted file mode 100644
index c68f1f1b5..000000000
--- a/extra/liblrdf/pkgconfig-raptor.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- liblrdf-0.4.0/lrdf.pc.in.orig	2011-10-03 19:28:16.702773254 +0000
-+++ liblrdf-0.4.0/lrdf.pc.in	2011-10-03 19:28:43.003017477 +0000
-@@ -7,4 +7,5 @@
- Version: @VERSION@
- Description: liblrdf, a lightweight RDF library with extensions for LADSPA
- Libs: -L${libdir} -llrdf
--Cflags: -I${includedir} 
-+Libs.private: @RAPTOR_LIBS@
-+Cflags: @RAPTOR_CFLAGS@ -I${includedir} 
diff --git a/extra/liblrdf/raptor2.diff b/extra/liblrdf/raptor2.diff
deleted file mode 100644
index 77f1ad0e3..000000000
--- a/extra/liblrdf/raptor2.diff
+++ /dev/null
@@ -1,193 +0,0 @@
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -4,5 +4,5 @@ lib_LTLIBRARIES = liblrdf.la
- noinst_HEADERS = lrdf_md5.h md5_loc.h ladspa.h
- 
- liblrdf_la_SOURCES = lrdf.c lrdf_multi.c md5.c
--liblrdf_la_LIBADD = -lraptor
-+liblrdf_la_LIBADD = -lraptor2
- liblrdf_la_LDFLAGS = -version-info @LRDF_LIBTOOL_VERSION@
---- src/lrdf.c
-+++ src/lrdf.c
-@@ -18,6 +18,7 @@
- static unsigned int lrdf_uid = 0;	/* A unique(ish) id to append to genid's to
- 					 * avoid clashses */
- 
-+static raptor_world *world = NULL;
- static lrdf_statement *triples = NULL;
- static lrdf_statement *free_triples;
- static lrdf_string_hash *resources_hash[LRDF_HASH_SIZE];
-@@ -43,8 +44,7 @@ static void lrdf_remove_triple_hash(lrdf_triple_hash ** tbl,
- 				    lrdf_hash hash, lrdf_statement * s);
- static void lrdf_add_closure_hash(lrdf_closure_hash ** tbl,
- 				  lrdf_hash subject, lrdf_hash object);
--static void lrdf_store(void *user_data,
--		       const raptor_statement * statement);
-+static void lrdf_store(void *user_data, raptor_statement * statement);
- void lrdf_free_statements(lrdf_statement * s);
- void lrdf_copy_statement(lrdf_statement * from, lrdf_statement * to);
- void lrdf_rebuild_taxonomic_closure(lrdf_closure_hash ** fwd_tbl,
-@@ -71,7 +71,7 @@ void lrdf_init()
-     unsigned int i;
-     struct timeval tv;
- 
--    raptor_init();
-+    world = raptor_new_world();
-     lrdf_more_triples(256);
- 
-     /* A UID to add to genids to make them safer */
-@@ -112,7 +112,8 @@ void lrdf_more_triples(int count)
- 
- void lrdf_cleanup()
- {
--    raptor_finish();
-+    raptor_free_world(world);
-+    world = NULL;
- 
-     lrdf_free_string_hash(resources_hash);
-     lrdf_free_string_hash(literals_hash);
-@@ -232,26 +233,29 @@ void lrdf_remove_matches(lrdf_statement *pattern)
-     }
- }
- 
--static void lrdf_store(void *user_data, const raptor_statement * statement)
-+static const char *lrdf_term_as_string(char *tmp, int tmp_len,
-+				       const raptor_term *term)
-+{
-+    switch (term->type) {
-+    case RAPTOR_TERM_TYPE_URI:
-+	return (const char *) raptor_uri_as_string(term->value.uri);
-+    case RAPTOR_TERM_TYPE_LITERAL:
-+	return (const char *) term->value.literal.string;
-+    case RAPTOR_TERM_TYPE_BLANK:
-+	snprintf(tmp, tmp_len, "_:%s.%x", term->value.blank.string, lrdf_uid);
-+	return tmp;
-+    default:
-+	return "(?)";
-+    }
-+}
-+
-+static void lrdf_store(void *user_data, raptor_statement * statement)
- {
-     lrdf_statement *s = lrdf_alloc_statement();
-     char tmps[128], tmpp[128], tmpo[128];
--    char *subj = (char *) statement->subject,
--	 *pred = (char *) statement->predicate,
--	 *obj = (char *) statement->object;
--
--    if (statement->subject_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
--	snprintf(tmps, 127, "_:%s.%x", subj, lrdf_uid);
--	subj = tmps;
--    }
--    if (statement->predicate_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
--	snprintf(tmpp, 127, "_:%s.%x", pred, lrdf_uid);
--	pred = tmpp;
--    }
--    if (statement->object_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
--	snprintf(tmpo, 127, "_:%s.%x", obj, lrdf_uid);
--	obj = tmpo;
--    }
-+    const char *subj = lrdf_term_as_string(tmps, 128, statement->subject),
-+	       *pred = lrdf_term_as_string(tmpp, 128, statement->predicate),
-+	       *obj = lrdf_term_as_string(tmpo, 128, statement->object);
- 
-     s->shash = lrdf_gen_hash(subj);
-     s->phash = lrdf_gen_hash(pred);
-@@ -261,7 +265,7 @@ static void lrdf_store(void *user_data, const raptor_statement * statement)
- 
-     s->subject = lrdf_check_hash(resources_hash, s->shash, subj);
-     s->predicate = lrdf_check_hash(resources_hash, s->phash, pred);
--    if (statement->object_type == RAPTOR_IDENTIFIER_TYPE_LITERAL) {
-+    if (statement->object->type == RAPTOR_TERM_TYPE_LITERAL) {
- 	s->object = lrdf_check_hash(literals_hash, s->ohash, obj);
- 	s->object_type = lrdf_literal;
-     } else {
-@@ -537,28 +541,22 @@ void lrdf_rebuild_taxonomic_closure(lrdf_closure_hash ** fwd_tbl,
-     free(pathto);
- }
- 
--static void lrdf_error_handler(void *data, raptor_locator * locator,
--			       const char *message);
-+static void lrdf_log_handler(void *data, raptor_log_message *message);
- 
--static void lrdf_error_handler(void *data, raptor_locator * locator,
--			       const char *message)
-+static void lrdf_log_handler(void *data, raptor_log_message *message)
- {
--    fprintf(stderr, "liblrdf: error - ");
--    raptor_print_locator(stderr, locator);
--    fprintf(stderr, " - %s\n", message);
--
--    raptor_parse_abort((raptor_parser*)data);
--}
-+    const char *severity = "error";
-+    if (message->level == RAPTOR_LOG_LEVEL_WARN) {
-+	severity = "warning";
-+    }
- 
--static void lrdf_warning_handler(void *data, raptor_locator * locator,
--				 const char *message);
-+    fprintf(stderr, "liblrdf: %s - ", severity);
-+    raptor_locator_print(message->locator, stderr);
-+    fprintf(stderr, " - %s\n", message->text);
- 
--static void lrdf_warning_handler(void *data, raptor_locator * locator,
--				 const char *message)
--{
--    fprintf(stderr, "liblrdf: warning - ");
--    raptor_print_locator(stderr, locator);
--    fprintf(stderr, " - %s\n", message);
-+    if (message->level != RAPTOR_LOG_LEVEL_WARN) {
-+	raptor_parser_parse_abort((raptor_parser*)data);
-+    }
- }
- 
- 
-@@ -593,15 +591,15 @@ int lrdf_read_file_intl(const char *uri)
-     lrdf_hash source;
- 
-     //printf("lrdf: reading %s\n", uri);
--    ruri = raptor_new_uri(uri);
--    furi = raptor_new_uri(uri);
-+    ruri = raptor_new_uri(world, (const unsigned char *) uri);
-+    furi = raptor_new_uri(world, (const unsigned char *) uri);
-     source = lrdf_gen_hash(uri);
-     lrdf_check_hash(resources_hash, source, uri);
- 
-     if (strstr(uri, ".rdf")) {
--	parser = raptor_new_parser("rdfxml");
-+	parser = raptor_new_parser(world, "rdfxml");
-     } else {
--	parser = raptor_new_parser("ntriples");
-+	parser = raptor_new_parser(world, "ntriples");
-     }
-     if (!parser) {
- 	fprintf(stderr, "liblrdf: failed to create parser\n");
-@@ -609,12 +607,11 @@ int lrdf_read_file_intl(const char *uri)
- 	return 1;
-     }
- 
--    raptor_set_error_handler(parser, parser, lrdf_error_handler);
--    raptor_set_warning_handler(parser, NULL, lrdf_warning_handler);
--    raptor_set_statement_handler(parser, &source, lrdf_store);
--    raptor_set_default_generate_id_parameters(parser, NULL, ++lrdf_uid);
-+    raptor_world_set_log_handler(world, parser, lrdf_log_handler);
-+    raptor_parser_set_statement_handler(parser, &source, lrdf_store);
-+    raptor_world_set_generate_bnodeid_parameters(world, NULL, ++lrdf_uid);
- 
--    if (raptor_parse_file(parser, furi, ruri)) {
-+    if (raptor_parser_parse_file(parser, furi, ruri)) {
- 	raptor_free_uri(furi);
- 	raptor_free_uri(ruri);
- 	raptor_free_parser(parser);
---- configure.ac
-+++ configure.ac
-@@ -18,7 +18,7 @@
- AC_HEADER_STDC
- AC_CHECK_HEADERS([errno.h limits.h stdlib.h string.h unistd.h])
- 
--PKG_CHECK_MODULES(RAPTOR, raptor >= 0.9.11)
-+PKG_CHECK_MODULES(RAPTOR, raptor2 >= 0.9.11)
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
diff --git a/extra/libmatroska/PKGBUILD b/extra/libmatroska/PKGBUILD
index 7d567ba64..56203f478 100644
--- a/extra/libmatroska/PKGBUILD
+++ b/extra/libmatroska/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 143895 2011-11-30 19:46:58Z giovanni $
+# $Id: PKGBUILD 180602 2013-03-24 12:53:07Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor 03/08/04 <lefungus@altern.org>
 
 pkgname=libmatroska
-pkgver=1.3.0
-pkgrel=2.1
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="Matroska library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dl.matroska.org/downloads/libmatroska/"
 license=('LGPL')
 depends=('libebml')
 source=("http://dl.matroska.org/downloads/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('f4a8c411f09d39c754eb726efd616043')
+md5sums=('5b83155019589b04a49f9db923b5bf74')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/make/linux"
diff --git a/extra/libmikmod/libmikmod-3.1.12-64bit-fix.diff b/extra/libmikmod/libmikmod-3.1.12-64bit-fix.diff
deleted file mode 100644
index cd7800881..000000000
--- a/extra/libmikmod/libmikmod-3.1.12-64bit-fix.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-Date: Sun, 04 Jul 2004 11:53:23 +0200
-From: Josselin Mouette
-Subject: Re: sdl 64bit problem [PATCH]
-
-Le sam, 03/07/2004 � 18:20 +0200, Hans-Frieder Vogt a �crit :
-> Hi list,
->
-> I found the problem that lead to the distorted sound in tuxracer on AMD64. It
-> may have also been the cause for the other reported sound problems with SDL.
-> The problem is not in SDL, but in SDL-mixer.
-> There, music files (*.it, and probably others as well) are incorrectly read on
-> all 64 bit architectures but Alpha, due to an incorrect data type definition.
-> The attached patch should solve the problem for all 64 bit architectures on
-> Linux, since at least cpp defines _LP64 and __LP64__ for them.
-> _LP64 indicates that long ints and pointers are 64 bits, but integers are 32
-> bits.
-> I am not sure whether the usage of _LP64 is also standard for the commercial
-> compilers, and for other Unixes, but at least Solaris 9 defines _LP64 in the
-> 64 bit environment as well.
->
-> Josselin,
-> could you include this patch into your next debian packages?
-
-diff -ru libmikmod-3.1.12.orig/include/mikmod.h.in libmikmod-3.1.12/include/mikmod.h.in
---- libmikmod-3.1.12.orig/include/mikmod.h.in	2007-12-15 01:24:19.000000000 -0800
-+++ libmikmod-3.1.12/include/mikmod.h.in	2009-10-05 00:18:56.000000000 -0700
-@@ -85,7 +85,7 @@
- 
- @DOES_NOT_HAVE_SIGNED@
- 
--#if defined(__arch64__) || defined(__alpha) || defined(__x86_64)
-+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(_LP64)
- /* 64 bit architectures */
- 
- typedef signed char     SBYTE;      /* 1 byte, signed */
-diff -ru libmikmod-3.1.12.orig/include/mikmod_internals.h libmikmod-3.1.12/include/mikmod_internals.h
---- libmikmod-3.1.12.orig/include/mikmod_internals.h	2007-12-15 04:24:51.000000000 -0800
-+++ libmikmod-3.1.12/include/mikmod_internals.h	2009-10-05 00:19:15.000000000 -0700
-@@ -50,7 +50,7 @@
- /*========== More type definitions */
- 
- /* SLONGLONG: 64bit, signed */
--#if defined (__arch64__) || defined(__alpha)
-+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(_LP64)
- typedef long		SLONGLONG;
- #define NATIVE_64BIT_INT
- #elif defined(__WATCOMC__)
diff --git a/extra/libmikmod/libmikmod-3.1.12-exitcrash-fix.diff b/extra/libmikmod/libmikmod-3.1.12-exitcrash-fix.diff
deleted file mode 100644
index fe62892b5..000000000
--- a/extra/libmikmod/libmikmod-3.1.12-exitcrash-fix.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Date: 15 Apr 2002 11:01:19 +0200
-From: Guillaume Cottenceau <gc@mandrakesoft.com>
-
-Unfortunately, I should have double checked that the following
-fix (authored by Dave Goehrig <dave@cthulhu-burger.org>, not me),
-was really in the CVS... it's not, as of stable 1.2.3 at least.
-Please include it, it fixes a segfault on exiting a program which
-disabled MOD music during its execution.
-
-diff -ru libmikmod-3.1.12.orig/playercode/virtch_common.c libmikmod-3.1.12/playercode/virtch_common.c
---- libmikmod-3.1.12.orig/playercode/virtch_common.c	2007-12-15 01:26:53.000000000 -0800
-+++ libmikmod-3.1.12/playercode/virtch_common.c	2009-10-05 00:37:12.000000000 -0700
-@@ -347,7 +347,7 @@
- 
- void VC1_SampleUnload(SWORD handle)
- {
--	if (handle<MAXSAMPLEHANDLES) {
-+	if (Samples && handle<MAXSAMPLEHANDLES) {
- 		if (Samples[handle])
- 			free(Samples[handle]);
- 		Samples[handle]=NULL;
diff --git a/extra/libmikmod/libmikmod-3.1.12-md_sngchn-fix.diff b/extra/libmikmod/libmikmod-3.1.12-md_sngchn-fix.diff
deleted file mode 100644
index 45cc355ae..000000000
--- a/extra/libmikmod/libmikmod-3.1.12-md_sngchn-fix.diff
+++ /dev/null
@@ -1,112 +0,0 @@
-This patch fixes "buffer overflow due to md_numchn - ID: 1630158"
-
-diff -ru libmikmod-3.1.12.orig/playercode/mplayer.c libmikmod-3.1.12/playercode/mplayer.c
---- libmikmod-3.1.12.orig/playercode/mplayer.c	2007-12-15 01:26:28.000000000 -0800
-+++ libmikmod-3.1.12/playercode/mplayer.c	2009-10-04 23:48:36.000000000 -0700
-@@ -52,6 +52,8 @@
-    will wait */
- /*static*/ MODULE *pf = NULL;
- 
-+#define NUMVOICES(mod)	(md_sngchn < (mod)->numvoices ? md_sngchn : (mod)->numvoices)
-+
- #define	HIGH_OCTAVE		2	/* number of above-range octaves */
- 
- static	UWORD oldperiods[OCTAVE*2]={
-@@ -248,14 +250,14 @@
- 	MP_VOICE *a;
- 	ULONG t,k,tvol,pp;
- 
--	for (t=0;t<md_sngchn;t++)
-+	for (t=0;t<NUMVOICES(mod);t++)
- 		if (((mod->voice[t].main.kick==KICK_ABSENT)||
- 			 (mod->voice[t].main.kick==KICK_ENV))&&
- 		   Voice_Stopped_internal(t))
- 			return t;
- 
- 	tvol=0xffffffUL;t=-1;a=mod->voice;
--	for (k=0;k<md_sngchn;k++,a++) {
-+	for (k=0;k<NUMVOICES(mod);k++,a++) {
- 		/* allow us to take over a nonexisting sample */
- 		if (!a->main.s)
- 			return k;
-@@ -2249,12 +2251,12 @@
- 
- 	switch (dat) {
- 	case 0x0: /* past note cut */
--		for (t=0;t<md_sngchn;t++)
-+		for (t=0;t<NUMVOICES(mod);t++)
- 			if (mod->voice[t].master==a)
- 				mod->voice[t].main.fadevol=0;
- 		break;
- 	case 0x1: /* past note off */
--		for (t=0;t<md_sngchn;t++)
-+		for (t=0;t<NUMVOICES(mod);t++)
- 			if (mod->voice[t].master==a) {
- 				mod->voice[t].main.keyoff|=KEY_OFF;
- 				if ((!(mod->voice[t].venv.flg & EF_ON))||
-@@ -2263,7 +2265,7 @@
- 			}
- 		break;
- 	case 0x2: /* past note fade */
--		for (t=0;t<md_sngchn;t++)
-+		for (t=0;t<NUMVOICES(mod);t++)
- 			if (mod->voice[t].master==a)
- 				mod->voice[t].main.keyoff|=KEY_FADE;
- 		break;
-@@ -2318,7 +2320,7 @@
- 	SAMPLE *s;
- 
- 	mod->totalchn=mod->realchn=0;
--	for (channel=0;channel<md_sngchn;channel++) {
-+	for (channel=0;channel<NUMVOICES(mod);channel++) {
- 		aout=&mod->voice[channel];
- 		i=aout->main.i;
- 		s=aout->main.s;
-@@ -2736,7 +2738,7 @@
- 			if (a->dct!=DCT_OFF) {
- 				int t;
- 
--				for (t=0;t<md_sngchn;t++)
-+				for (t=0;t<NUMVOICES(mod);t++)
- 					if ((!Voice_Stopped_internal(t))&&
- 					   (mod->voice[t].masterchn==channel)&&
- 					   (a->main.sample==mod->voice[t].main.sample)) {
-@@ -2978,6 +2980,11 @@
- 	if (!(mod->voice=(MP_VOICE*)_mm_calloc(md_sngchn,sizeof(MP_VOICE))))
- 		return 1;
- 
-+	/* mod->numvoices was used during loading to clamp md_sngchn.
-+	   After loading it's used to remember how big mod->voice is.
-+	*/
-+	mod->numvoices = md_sngchn;
-+
- 	Player_Init_internal(mod);
- 	return 0;
- }
-@@ -3086,7 +3093,7 @@
- 		pf->patbrk=0;
- 		pf->vbtick=pf->sngspd;
- 
--		for (t=0;t<md_sngchn;t++) {
-+		for (t=0;t<NUMVOICES(pf);t++) {
- 			Voice_Stop_internal(t);
- 			pf->voice[t].main.i=NULL;
- 			pf->voice[t].main.s=NULL;
-@@ -3111,7 +3118,7 @@
- 		pf->patbrk=0;
- 		pf->vbtick=pf->sngspd;
- 
--		for (t=0;t<md_sngchn;t++) {
-+		for (t=0;t<NUMVOICES(pf);t++) {
- 			Voice_Stop_internal(t);
- 			pf->voice[t].main.i=NULL;
- 			pf->voice[t].main.s=NULL;
-@@ -3138,7 +3145,7 @@
- 		pf->sngpos=pos;
- 		pf->vbtick=pf->sngspd;
- 
--		for (t=0;t<md_sngchn;t++) {
-+		for (t=0;t<NUMVOICES(pf);t++) {
- 			Voice_Stop_internal(t);
- 			pf->voice[t].main.i=NULL;
- 			pf->voice[t].main.s=NULL;
diff --git a/extra/libmikmod/libmikmod-CVE-2009-0179.patch b/extra/libmikmod/libmikmod-CVE-2009-0179.patch
deleted file mode 100644
index 0c47e6545..000000000
--- a/extra/libmikmod/libmikmod-CVE-2009-0179.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur libmikmod-3.1.11.orig/loaders/load_xm.c libmikmod-3.1.11/loaders/load_xm.c
---- libmikmod-3.1.11.orig/loaders/load_xm.c	2004-01-21 18:43:53.000000000 +0100
-+++ libmikmod-3.1.11/loaders/load_xm.c	2008-04-16 04:30:45.000000000 +0200
-@@ -622,7 +622,8 @@
- 				/* read the remainder of the header */
- 				for(u=headend-_mm_ftell(modreader);u;u--) _mm_read_UBYTE(modreader);
- 
--				if(_mm_eof(modreader)) {
-+				/* last instrument is at the end of file in version 0x0104 */
-+				if(_mm_eof(modreader) && (mh->version<0x0104 || t<of.numins-1)) {
- 					free(nextwav);free(wh);
- 					nextwav=NULL;wh=NULL;
- 					_mm_errno = MMERR_LOADING_SAMPLEINFO;
-diff -ur libmikmod-3.1.11.orig/playercode/mloader.c libmikmod-3.1.11/playercode/mloader.c
---- libmikmod-3.1.11.orig/playercode/mloader.c	2004-01-21 18:43:53.000000000 +0100
-+++ libmikmod-3.1.11/playercode/mloader.c	2008-04-16 04:30:45.000000000 +0200
-@@ -450,10 +450,12 @@
- 	if (!l->Init || l->Init()) {
- 		_mm_rewind(modreader);
- 		ok = l->Load(curious);
--		/* propagate inflags=flags for in-module samples */
--		for (t = 0; t < of.numsmp; t++)
--			if (of.samples[t].inflags == 0)
--				of.samples[t].inflags = of.samples[t].flags;
-+		if (ok) {
-+			/* propagate inflags=flags for in-module samples */
-+			for (t = 0; t < of.numsmp; t++)
-+				if (of.samples[t].inflags == 0)
-+					of.samples[t].inflags = of.samples[t].flags;
-+		}
- 	} else
- 		ok = 0;
- 
diff --git a/extra/libmng/PKGBUILD b/extra/libmng/PKGBUILD
index 51ca93ae3..588dff8de 100644
--- a/extra/libmng/PKGBUILD
+++ b/extra/libmng/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137860 2011-09-12 05:28:13Z eric $
+# $Id: PKGBUILD 178306 2013-02-19 21:06:05Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libmng
 pkgver=1.0.10
-pkgrel=4.1
+pkgrel=4.2
 pkgdesc="A collection of routines used to create and manipulate MNG format graphics files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libmng.com/"
@@ -15,6 +15,7 @@ md5sums=('eaf1476a3bb29f6190bca660e6abef16')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's/AM_C_PROTOTYPES//' makefiles/configure.in
   ln -s makefiles/configure.in .
   ln -s makefiles/Makefile.am .
   sed -i '/^AM_C_PROTOTYPES$/d' configure.in  # removed in recent automake
diff --git a/extra/libmodplug/PKGBUILD b/extra/libmodplug/PKGBUILD
index 2d4fe05b7..fd25e0373 100644
--- a/extra/libmodplug/PKGBUILD
+++ b/extra/libmodplug/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=libmodplug
 pkgver=0.8.8.4
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="A MOD playing library"
 arch=(i686 x86_64 'mips64el')
 url="http://modplug-xmms.sourceforge.net/"
diff --git a/extra/libmp3splt/PKGBUILD b/extra/libmp3splt/PKGBUILD
index 35ad2aeb5..05e91dd5b 100644
--- a/extra/libmp3splt/PKGBUILD
+++ b/extra/libmp3splt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166724 2012-09-17 05:18:15Z tpowa $
+# $Id: PKGBUILD 182921 2013-04-16 07:10:02Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libmp3splt
-pkgver=0.7.3
+pkgver=0.8.2
 pkgrel=1
 pkgdesc="Library for splitting mp3 and ogg files without decoding"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,10 +13,14 @@ makedepends=('libtool' 'git')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz")
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
   libtoolize --copy --force
   ./autogen.sh
+}
+
+build() {
+   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
@@ -25,4 +29,4 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir/ install
 }
-md5sums=('f63e41774514e9e05272e16b92182ce5')
+md5sums=('562b39b6788f8128b7185b83f14ca516')
diff --git a/extra/libmp4v2/PKGBUILD b/extra/libmp4v2/PKGBUILD
index f3dbacfc9..c5b765fc1 100644
--- a/extra/libmp4v2/PKGBUILD
+++ b/extra/libmp4v2/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=libmp4v2
 pkgver=2.0.0
-pkgrel=2
+pkgrel=2.1
 pkgdesc="MPEG-4 library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL')
diff --git a/extra/libmpcdec/PKGBUILD b/extra/libmpcdec/PKGBUILD
index 02b2bdf10..c47c3ea4a 100644
--- a/extra/libmpcdec/PKGBUILD
+++ b/extra/libmpcdec/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libmpcdec
 pkgver=1.2.6
-pkgrel=3.1
+pkgrel=3.2
 pkgdesc="Musepack decoding library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://musepack.net/"
diff --git a/extra/libmpd/PKGBUILD b/extra/libmpd/PKGBUILD
index 43f365938..f7a4017a7 100644
--- a/extra/libmpd/PKGBUILD
+++ b/extra/libmpd/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libmpd
 pkgver=11.8.17
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="Signal based wrapper around libmpdclient"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client"
diff --git a/extra/libmpdclient/PKGBUILD b/extra/libmpdclient/PKGBUILD
index be0e68d40..b69acc914 100644
--- a/extra/libmpdclient/PKGBUILD
+++ b/extra/libmpdclient/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 153242 2012-03-12 13:45:57Z bisson $
+# $Id: PKGBUILD 182606 2013-04-10 23:43:13Z bisson $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=libmpdclient
-pkgver=2.7
-pkgrel=1.1
+pkgver=2.8
+pkgrel=1
 pkgdesc='Asynchronous API library for interfacing MPD in the C, C++ & Objective C languages'
-url='http://mpd.wikia.com/wiki/ClientLib:libmpdclient'
+url='http://www.musicpd.org/libs/libmpdclient/'
 license=('custom:BSD')
 arch=('i686' 'x86_64' 'mips64el')
+source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('7e23c760296fe47e9e4108a0eba6fef08cfe4db8')
+
 options=('!libtool')
-source=("http://downloads.sourceforge.net/project/musicpd/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('f97e35525851eb192d3799f0dabe32915c56b96b')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --disable-static
+	./configure --prefix=/usr --disable-static --disable-documentation
 	make
 }
 
diff --git a/extra/libmsn/PKGBUILD b/extra/libmsn/PKGBUILD
index 0fc891526..e64b58dee 100644
--- a/extra/libmsn/PKGBUILD
+++ b/extra/libmsn/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=libmsn
 pkgver=4.2.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A reusable, open-source, fully documented library for connecting to Microsoft's MSN"
 url="http://sourceforge.net/projects/libmsn/"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD
index 550ced111..27ab1f9f9 100644
--- a/extra/libmtp/PKGBUILD
+++ b/extra/libmtp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166960 2012-09-23 11:44:00Z tomegun $
+# $Id: PKGBUILD 180848 2013-03-26 23:07:40Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 
 pkgname=libmtp
-pkgver=1.1.5
+pkgver=1.1.6
 pkgrel=1
 pkgdesc="Library implementation of the Media Transfer Protocol"
 arch=("i686" "x86_64" "mips64el")
@@ -24,4 +24,4 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('f80e45c0e6e5798c434bb1c26a7b602d')
+md5sums=('87835626dbcf39e62bfcdd4ae6da2063')
diff --git a/extra/libmusicbrainz4/PKGBUILD b/extra/libmusicbrainz4/PKGBUILD
deleted file mode 100644
index c9a71ab86..000000000
--- a/extra/libmusicbrainz4/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 159207 2012-05-18 00:45:43Z eric $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Max Fehrm max.fehrm@gmail.com
-
-pkgname=libmusicbrainz4
-pkgver=4.0.3
-pkgrel=1
-pkgdesc="Library That Provides Access to the MusicBrainz Server"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://musicbrainz.org/"
-license=('LGPL2.1')
-depends=('neon')
-makedepends=('cmake')
-source=(https://github.com/downloads/metabrainz/libmusicbrainz/libmusicbrainz-$pkgver.tar.gz)
-md5sums=('19b43a543d338751e9dc524f6236892b')
-
-build() {
-  cd libmusicbrainz-$pkgver
-  cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr
-  make
-}
-
-package() {
-  cd libmusicbrainz-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/extra/libmygpo-qt/PKGBUILD b/extra/libmygpo-qt/PKGBUILD
index 74e1a1fb6..50f62378d 100644
--- a/extra/libmygpo-qt/PKGBUILD
+++ b/extra/libmygpo-qt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 171967 2012-11-25 14:53:14Z andrea $
+# $Id: PKGBUILD 182786 2013-04-15 10:09:42Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libmygpo-qt
-pkgver=1.0.6
-pkgrel=2
+pkgver=1.0.7
+pkgrel=1
 pkgdesc="A C++/Qt client library for gpodder.net"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wiki.gpodder.org/wiki/Libmygpo-qt"
@@ -12,7 +12,7 @@ license=('LGPL2.1')
 depends=('qjson')
 makedepends=('cmake' 'doxygen')
 source=("http://stefan.derkits.at/files/${pkgname}/${pkgname}.${pkgver}.tar.gz")
-md5sums=('dd07ccc88eac954a3860aeda96aab7b1')
+md5sums=('447e60c8c695b4280a0e20c71abacf49')
 
 build() {
   mkdir build
diff --git a/extra/libnice/PKGBUILD b/extra/libnice/PKGBUILD
index 4412273b1..b84b61ecf 100644
--- a/extra/libnice/PKGBUILD
+++ b/extra/libnice/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: William Díaz <wdiaz@archlinux.us>
 
 pkgname=libnice
-pkgver=0.1.3
+pkgver=0.1.4
 pkgrel=1
 pkgdesc="An implementation of the IETF's draft ICE (for p2p UDP data streams)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,15 +14,15 @@ makedepends=('gstreamer' 'gstreamer0.10')
 optdepends=('gstreamer' 'gstreamer0.10')
 options=('!libtool')
 source=(http://nice.freedesktop.org/releases/$pkgname-$pkgver.tar.gz)
+md5sums=('315c457b092980a4a9a0bea9f0723cce')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --disable-static
   make
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
-md5sums=('1a0907605f852dcda32a3b3daf38d36c')
diff --git a/extra/libnl1/PKGBUILD b/extra/libnl1/PKGBUILD
index 6eba5f569..57a4c8f5c 100644
--- a/extra/libnl1/PKGBUILD
+++ b/extra/libnl1/PKGBUILD
@@ -1,28 +1,26 @@
-# $Id: PKGBUILD 150908 2012-02-23 13:56:22Z heftig $
+# $Id: PKGBUILD 182913 2013-04-16 05:29:35Z eric $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=libnl1
-pkgver=1.1
-pkgrel=1.1
+pkgver=1.1.3
+pkgrel=1
 pkgdesc="Library for applications dealing with netlink sockets (Legacy version)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.infradead.org/~tgr/libnl/"
 license=('GPL')
 depends=('glibc')
-source=("http://www.infradead.org/~tgr/libnl/files/libnl-${pkgver}.tar.gz"
-        'fix-compilation.patch')
-md5sums=('ae970ccd9144e132b68664f98e7ceeb1'
-         'e1f5e82c8aa1b3ad025c7b588178de1e')
+options=('!staticlibs')
+source=("http://www.infradead.org/~tgr/libnl/files/libnl-${pkgver}.tar.gz")
+md5sums=('4e4fa2197f4412b20c2952325d674b12')
 
 build() {
-  cd ${srcdir}/libnl-${pkgver}
-  patch -Np1 -i ${srcdir}/fix-compilation.patch
+  cd libnl-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/libnl-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd libnl-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libnl1/fix-compilation.patch b/extra/libnl1/fix-compilation.patch
deleted file mode 100644
index 891562a39..000000000
--- a/extra/libnl1/fix-compilation.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libnl-1.1.orig/include/netlink-local.h	2008-01-14 16:48:45.000000000 +0100
-+++ libnl-1.1/include/netlink-local.h	2009-06-26 11:15:33.186011844 +0200
-@@ -26,6 +26,7 @@
- #include <sys/socket.h>
- #include <inttypes.h>
- #include <assert.h>
-+#include <limits.h>
- 
- #include <arpa/inet.h>
- #include <netdb.h>
diff --git a/extra/liboauth/PKGBUILD b/extra/liboauth/PKGBUILD
index d0fd67678..4472590fd 100644
--- a/extra/liboauth/PKGBUILD
+++ b/extra/liboauth/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 145266 2011-12-20 18:56:18Z heftig $
+# $Id: PKGBUILD 183475 2013-04-21 22:15:57Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Martin Häger <martin.haeger@gmail.com>
 
 pkgname=liboauth
-pkgver=0.9.6
-pkgrel=1.1
+pkgver=1.0.1
+pkgrel=1
 pkgdesc='C library implementing OAuth Core RFC 5849'
 arch=(mips64el)
 url='http://liboauth.sourceforge.net'
@@ -13,7 +13,7 @@ license=('MIT')
 depends=('curl')
 options=('!libtool')
 source=("$url/pool/$pkgname-$pkgver.tar.gz")
-sha256sums=('9fa0f9d86ac4fbdd8c17d4c242ceef33096e8cf3b1834d9198ccc0cbf8b0f207')
+sha256sums=('5087d32fe1db7b588246a7de64fc0c2464c95efdebb2c7fe6f482d9b00e68d8b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libofa/PKGBUILD b/extra/libofa/PKGBUILD
index e1c7ef90b..7ae65d413 100644
--- a/extra/libofa/PKGBUILD
+++ b/extra/libofa/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libofa
 pkgver=0.9.3
-pkgrel=4
+pkgrel=4.1
 pkgdesc="An open-source audio fingerprint by MusicIP"
 arch=(i686 x86_64 'mips64el')
 url="http://code.google.com/p/musicip-libofa/"
diff --git a/extra/libofx/PKGBUILD b/extra/libofx/PKGBUILD
index b82443e8b..f4b69312f 100644
--- a/extra/libofx/PKGBUILD
+++ b/extra/libofx/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165144 2012-08-11 18:49:23Z eric $
+# $Id: PKGBUILD 183162 2013-04-18 06:30:55Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgbase=libofx
 pkgname=('libofx' 'libofx-doc')
-pkgver=0.9.5
+pkgver=0.9.8
 pkgrel=1
 pkgdesc="API for the OFX banking standard"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,13 +11,11 @@ url="http://libofx.sourceforge.net"
 license=('GPL')
 depends=('opensp' 'curl' 'libxml++')
 checkdepends=('gnupg')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz libofx-gcc47.patch)
-sha1sums=('7e5245d68a0f3f7efad2fd809b2afbbff6ba0e73'
-          '6c327e24543cb8ba901bfb204343a85c68264654')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
+sha1sums=('e0159d77c4458eb937871373db85c9f392e86554')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
-  patch -p1 -i "$srcdir/libofx-gcc47.patch"
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/libofx/libofx-gcc47.patch b/extra/libofx/libofx-gcc47.patch
deleted file mode 100644
index 899fe09e0..000000000
--- a/extra/libofx/libofx-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff
---- libofx-0.9.4.orig/ofxconnect/ofxpartner.cpp	2011-03-30 22:30:50.000000000 +0000
-+++ libofx-0.9.4/ofxconnect/ofxpartner.cpp	2012-04-17 06:08:38.711940892 +0000
-@@ -37,6 +37,7 @@
- #include <vector>
- #include <algorithm>
- #include <string.h>
-+#include <unistd.h>
- 
- using std::string;
- using std::vector;
diff --git a/extra/liboil/PKGBUILD b/extra/liboil/PKGBUILD
index daa4f8302..9ec93a1a9 100644
--- a/extra/liboil/PKGBUILD
+++ b/extra/liboil/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=liboil
 pkgver=0.3.17
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc="Library of simple functions that are optimized for various CPUs."
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
diff --git a/extra/liborigin2/PKGBUILD b/extra/liborigin2/PKGBUILD
index 3af418eac..bbb3bd0b8 100644
--- a/extra/liborigin2/PKGBUILD
+++ b/extra/liborigin2/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 152212 2012-03-05 08:56:10Z ibiru $
+# $Id: PKGBUILD 178967 2013-03-01 10:21:49Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgbase=liborigin2
 pkgname=('liborigin2' 'liborigin2-docs')
 pkgver=20110829
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://soft.proindependent.com/liborigin2/"
 license=('GPL3')
-makedepends=('doxygen' 'qt' 'boost')
+makedepends=('doxygen' 'qt4' 'boost')
 replaces=('liborigin')
 provides=('liborigin')
 source=(http://download.berlios.de/qtiplot/${pkgbase}-20110829.zip
@@ -22,6 +22,8 @@ sha1sums=('13851b17b21ec49375e4f5dfbd3ab4b9bf72f5be'
 build() {
 	cd "${srcdir}/${pkgbase}"
 
+    . /etc/profile.d/qt4.sh
+
 	install -Dm644 "${srcdir}/liborigin.pro.archlinux" ./liborigin2.pro
         install -Dm644 "${srcdir}/tree.hh" ./tree.hh # get the header back like it was in previous releases
 	qmake liborigin2.pro QMAKESPEC=linux-g++
diff --git a/extra/libots/PKGBUILD b/extra/libots/PKGBUILD
index 83095f411..ea0ec73c9 100644
--- a/extra/libots/PKGBUILD
+++ b/extra/libots/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libots
 pkgver=0.5.0
-pkgrel=3.1
+pkgrel=3.2
 pkgdesc='Open Text Summarizer'
 url='http://libots.sourceforge.net/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,6 +19,7 @@ build() {
 	cd "${srcdir}/ots-${pkgver}"
 	touch gtk-doc.make
 	sed -i -e 's/en.xml$//' dic/Makefile.am
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
 	libtoolize --force
 	aclocal
 	automake --add-missing --force
diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD
index 4fbc36af2..bfac9d035 100644
--- a/extra/libpeas/PKGBUILD
+++ b/extra/libpeas/PKGBUILD
@@ -1,26 +1,32 @@
-# $Id: PKGBUILD 169954 2012-10-30 22:46:53Z heftig $
+# $Id: PKGBUILD 183434 2013-04-21 22:11:27Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libpeas
-pkgver=1.6.1
-pkgrel=1
+pkgver=1.8.0
+pkgrel=2
 pkgdesc="A GObject-based plugins engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
-license=('GPL2')
-depends=('gtk3' 'hicolor-icon-theme' 'gobject-introspection')
-makedepends=('gtk-doc' 'intltool' 'python2-gobject' 'gjs' 'seed' 'glade')
-optdepends=('gjs: gobject-based plugin engine - gjs runtime loader'
-            'seed: gobject-based plugin engine - seed runtime loader')
+license=(GPL2)
+depends=(gtk3 hicolor-icon-theme gobject-introspection)
+makedepends=(gtk-doc intltool python-gobject python2-gobject seed glade)
+optdepends=('seed: gobject-based plugin engine - seed runtime loader')
+if [ "$CARCH" != "mips64el" ]; then
+  makedepends+=(gjs)
+  optdepends+=('gjs: gobject-based plugin engine - gjs runtime loader')
+fi
 options=('!libtool')
 install=libpeas.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('7f133f44101594e0f96a0e5fe69c5893cde500f3edf916f680467dfd74de5c39')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz
+        js17.patch)
+sha256sums=('ffbad2d2aad8237722342432f9737a2ba5a2022e1b8171ab57db67995ce2e0fe'
+            '1a023c402e34203f13f3ffbb27afc9bbe46003cf2c911ceb2a0fc02742e9c889')
 
 build() {
   cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var
+  patch -Np1 -i ../js17.patch
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc --localstatedir=/var --enable-compile-warnings=no
   make
 }
 
diff --git a/extra/libpeas/js17.patch b/extra/libpeas/js17.patch
new file mode 100644
index 000000000..b0f7d041d
--- /dev/null
+++ b/extra/libpeas/js17.patch
@@ -0,0 +1,24 @@
+diff -u -r libpeas-1.8.0/loaders/gjs/peas-extension-gjs.c libpeas-1.8.0-js17/loaders/gjs/peas-extension-gjs.c
+--- libpeas-1.8.0/loaders/gjs/peas-extension-gjs.c	2013-01-05 20:32:04.000000000 +0100
++++ libpeas-1.8.0-js17/loaders/gjs/peas-extension-gjs.c	2013-04-03 00:22:56.726029598 +0200
+@@ -362,7 +362,7 @@
+ 
+           if (!JS_GetElement (gexten->js_context, JSVAL_TO_OBJECT (js_retval),
+                               nth_out_arg++, &js_value) ||
+-              js_value == JSVAL_VOID)
++              js_value.asBits == JSVAL_VOID.asBits)
+             {
+               g_warning ("Error failed to get out argument %i", nth_out_arg);
+               return FALSE;
+diff -u -r libpeas-1.8.0/loaders/gjs/peas-plugin-loader-gjs.c libpeas-1.8.0-js17/loaders/gjs/peas-plugin-loader-gjs.c
+--- libpeas-1.8.0/loaders/gjs/peas-plugin-loader-gjs.c	2012-08-15 12:40:31.000000000 +0200
++++ libpeas-1.8.0-js17/loaders/gjs/peas-plugin-loader-gjs.c	2013-04-03 00:19:12.884403305 +0200
+@@ -279,7 +279,7 @@
+ 
+       if (!JS_GetPropertyById (js_context, ginfo->extensions,
+                                prop_name_id, &prop_extension_ctor) ||
+-          prop_extension_ctor != extension_ctor)
++          prop_extension_ctor.asBits != extension_ctor.asBits)
+         continue;
+ 
+       if (!JS_IdToValue (js_context, prop_name_id, &prop_name_val) ||
diff --git a/extra/libplist/PKGBUILD b/extra/libplist/PKGBUILD
index 718869420..92283fb24 100644
--- a/extra/libplist/PKGBUILD
+++ b/extra/libplist/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 156914 2012-04-23 09:08:57Z ibiru $
+# $Id: PKGBUILD 183073 2013-04-17 10:22:07Z tomegun $
+# Maintainer : Tom Gundersen <teg@jklm.no>
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Gabriel Martinez < reitaka at gmail dot com >
 
 pkgname=libplist
-pkgver=1.8
-pkgrel=2
+pkgver=1.10
+pkgrel=1
 pkgdesc="A library to handle Apple Property List format whereas it's binary or XML"
 url="http://libimobiledevice.org/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +13,6 @@ license=('GPL2' 'LGPL2.1')
 depends=('glib2' 'libxml2' 'python2')
 makedepends=('cmake' 'swig')
 source=(http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2)
-sha256sums=('a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec')
 
 build() {
   mkdir build
@@ -28,3 +28,4 @@ package() {
   cd build
   make DESTDIR="$pkgdir" install
 }
+md5sums=('fe642d0c8602d70c408994555c330dd1')
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index ade47bb39..90581e839 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 169446 2012-10-21 10:49:41Z ibiru $
+# $Id: PKGBUILD 182372 2013-04-09 18:14:06Z ioni $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Travis Willard <travis@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=libpng
-pkgver=1.5.13
-_apngver=1.5.13
-pkgrel=1.1
+pkgver=1.5.15
+_apngver=1.5.15
+pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libpng.org/pub/png/libpng.html"
@@ -16,8 +16,8 @@ depends=('zlib' 'sh')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz"
         "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz")
-md5sums=('0b607a685da977f1bfc96e1c47055183'
-         '23c8765aa6ca188c0575386d5ea8fe70')
+md5sums=('e3122e7b5b5c36c034a4624c65f8a9d8'
+         '3ae9ea7e4bd201f0b25e25cd6049b094')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libproxy/PKGBUILD b/extra/libproxy/PKGBUILD
index 0ba1fb26e..70f9e5041 100644
--- a/extra/libproxy/PKGBUILD
+++ b/extra/libproxy/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libproxy
-pkgver=0.4.7
-pkgrel=2
+pkgver=0.4.11
+pkgrel=1
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
@@ -14,19 +14,13 @@ optdepends=('kdelibs: KDE configuration module'
             'python2: Python bindings')
 makedepends=('cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 'perl')
 url="http://libproxy.googlecode.com"
-source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz
-        libproxy-0.4.7-unistd.patch)
+source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool')
-md5sums=('509e03a488a61cd62bfbaf3ab6a2a7a5'
-         'e90c03f296e553ace347b46f4fea3625')
+md5sums=('3cd1ae2a4abecf44b3f24d6639d2cd84')
 
 build() {
   cd "${srcdir}"
 
-  # Fix build with GCC 4.7 (patch from Fedora)
-  patch -d "${pkgname}-${pkgver}" -Np1 -i \
-    "${srcdir}/libproxy-0.4.7-unistd.patch"
-
   mkdir build
   cd build
   cmake \
diff --git a/extra/libproxy/libproxy-0.4.7-unistd.patch b/extra/libproxy/libproxy-0.4.7-unistd.patch
deleted file mode 100644
index 803f81970..000000000
--- a/extra/libproxy/libproxy-0.4.7-unistd.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libproxy-0.4.7/libproxy/url.cpp.orig	2012-02-28 21:05:15.572948027 +0000
-+++ libproxy-0.4.7/libproxy/url.cpp	2012-02-28 21:05:45.635937474 +0000
-@@ -27,6 +27,7 @@
- #define close _close
- #endif
- #include <fcntl.h> // For ::open()
-+#include <unistd.h> // For ::read() and ::close()
- #include <cstring> // For memcpy()
- #include <sstream> // For int/string conversion (using stringstream)
- #include <cstdio>  // For sscanf()
---- libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp.orig	2012-02-28 21:06:01.552943358 +0000
-+++ libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp	2012-02-28 21:11:21.429953982 +0000
-@@ -18,6 +18,7 @@
-  ******************************************************************************/
- 
- #include <sys/stat.h>
-+#include <unistd.h>
- #include <cstdlib>
- #include <map>
- #include <fstream>
---- libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp.orig	2012-02-28 21:06:11.637943033 +0000
-+++ libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp	2012-02-28 21:11:46.560961409 +0000
-@@ -17,6 +17,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
-  ******************************************************************************/
- 
-+#include <unistd.h> // for ::gethostname()
- #include <cstring> // ?
- 
- #include "../extension_pacrunner.hpp"
---- libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp.orig	2012-02-28 21:06:29.615943614 +0000
-+++ libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp	2012-02-28 21:12:35.530965553 +0000
-@@ -17,6 +17,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
-  ******************************************************************************/
- 
-+#include <unistd.h> // for ::gethostname()
- #include "../extension_pacrunner.hpp"
- using namespace libproxy;
- 
diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
index 8df864d61..f11ef2bd8 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 176290 2013-01-28 16:48:23Z stephane $
+# $Id: PKGBUILD 183115 2013-04-17 16:05:23Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libpst
 pkgname=('libpst' 'libpst-docs')
-pkgver=0.6.54
-pkgrel=3
+pkgver=0.6.58
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.five-ten-sg.com/libpst/"
 license=('GPL')
-makedepends=('python2' 'boost')
+makedepends=('python2' 'boost' 'libgsf')
 source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz)
-sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84')
+sha1sums=('c398d58b8b5106725f1659c900305c6385c0773e')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -21,7 +21,7 @@ build() {
 
 package_libpst() {
   pkgdesc="Outlook .pst file converter"
-  depends=('gcc-libs')
+  depends=('gcc-libs' 'libgsf')
   optdepends=('boost-libs: for libpst python interface')
   options=('!libtool' '!docs')
 
@@ -31,7 +31,7 @@ package_libpst() {
 
 package_libpst-docs() {
   pkgdesc="Documentation for Outlook .pst file converter"
-  options=('!libtool')
+  options=('!libtool' 'docs')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install-htmlDATA
diff --git a/extra/libpwquality/PKGBUILD b/extra/libpwquality/PKGBUILD
index 4f479520e..12361009f 100644
--- a/extra/libpwquality/PKGBUILD
+++ b/extra/libpwquality/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libpwquality
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 pkgdesc="Library for password quality checking and generating random passwords"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('cracklib')
 optdepends=('python2: Python bindings')
 makedepends=('python2')
 source=(https://fedorahosted.org/releases/l/i/libpwquality/$pkgname-$pkgver.tar.bz2)
-md5sums=('8827419118064539db70090cbed5cb21')
+md5sums=('beb56c9028a713d936e04cc3c50c541d')
 
 build() {
     cd "$pkgname-$pkgver"
@@ -22,7 +22,8 @@ build() {
     PYTHON=python2 ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
-        --disable-static
+        --disable-static \
+        --with-python-rev=2.7
     make
 }
 
diff --git a/extra/libqmi/PKGBUILD b/extra/libqmi/PKGBUILD
new file mode 100644
index 000000000..d3a6d6fd4
--- /dev/null
+++ b/extra/libqmi/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 183435 2013-04-21 22:11:28Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgname=libqmi
+pkgver=1.2.0
+pkgrel=2
+pkgdesc="QMI modem protocol helper library"
+arch=(i686 x86_64 mips64el)
+url="http://cgit.freedesktop.org/libqmi"
+license=(GPL2)
+depends=(glib2 bash)
+makedepends=(gtk-doc python)
+options=('!libtool')
+source=($url/snapshot/$pkgname-$pkgver.tar.xz)
+sha256sums=('4c0fe5fedd33dffd60d845c571243a2f25834019c159377d8df2c7cf5ff3a515')
+
+build() {
+  cd $pkgname-$pkgver
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/libqzeitgeist/PKGBUILD b/extra/libqzeitgeist/PKGBUILD
index 74d91942e..b8defc8e1 100644
--- a/extra/libqzeitgeist/PKGBUILD
+++ b/extra/libqzeitgeist/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 147936 2012-01-28 11:01:16Z andrea $
+# $Id: PKGBUILD 178968 2013-03-01 10:21:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libqzeitgeist
 pkgver=0.8.0
-pkgrel=2.1
+pkgrel=3
 pkgdesc="A Qt interface to the Zeitgeist event tracking system"
-url="https://projects.kde.org/projects/kdesupport/libqzeitgeist"
+url='https://projects.kde.org/projects/kdesupport/libqzeitgeist'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('qt')
+depends=('qt4')
 makedepends=('cmake' 'automoc4' 'python2' 'zeitgeist')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'set-declarative-installation-dir.patch')
@@ -16,10 +16,12 @@ md5sums=('97bdea6a1865db7d5f29c93e3a492f24'
          '712013e582acb73296e41ad842d0da01')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  . /etc/profile.d/qt4.sh
+
+  cd ${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}"/set-declarative-installation-dir.patch
+  cd ../
 
-  cd "${srcdir}"
   # Fix python2 path
   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
     ${pkgname}-${pkgver}/scripts/onto2cpp.py
@@ -29,11 +31,11 @@ build() {
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
 	-DCMAKE_INSTALL_PREFIX=/usr \
-    -DDECLARATIVE_IMPORT_PREFIX=/usr/lib/qt/imports/
+    -DDECLARATIVE_IMPORT_PREFIX=/usr/lib/qt4/imports/
   make
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libraw1394/PKGBUILD b/extra/libraw1394/PKGBUILD
index ba417d299..ad2963bdb 100644
--- a/extra/libraw1394/PKGBUILD
+++ b/extra/libraw1394/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149545 2012-02-08 13:57:56Z tpowa $
+# $Id: PKGBUILD 180142 2013-03-18 09:02:21Z jgc $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=libraw1394
-pkgver=2.0.7
-pkgrel=2.1
+pkgver=2.1.0
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2.1')
 pkgdesc="Provides an API to the Linux IEEE1394 (FireWire) driver"
@@ -12,7 +12,8 @@ depends=('glibc')
 makedepends=('pkgconfig')
 url="https://ieee1394.wiki.kernel.org/index.php/Main_Page"
 options=(!libtool)
-source=(ftp://ftp.kernel.org/pub/linux/libs/ieee1394/${pkgname}-${pkgver}.tar.bz2)
+source=(ftp://ftp.kernel.org/pub/linux/libs/ieee1394/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('0b3126d8158d156de9da2ff4d861c47857acc4318a7ac260258015a22071964f')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
@@ -24,4 +25,3 @@ package () {
    cd "${srcdir}/${pkgname}-${pkgver}"
    make DESTDIR="${pkgdir}" install
 }
-md5sums=('997ef18ab8e2e21f3966dff00e92be28')
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 9ba810361..e3be4a21c 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176340 2013-01-30 18:38:35Z andyrtr $
+# $Id: PKGBUILD 183292 2013-04-20 16:41:28Z heftig $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -15,31 +15,26 @@ pkgname=('libreoffice-common'
 	'libreoffice-writer'
 	'libreoffice-en-US'
 	'libreoffice-postgresql-connector'
-	'libreoffice-extension-pdfimport'
-	'libreoffice-extension-presenter-screen'
 	'libreoffice-extension-presentation-minimizer'
 	'libreoffice-extension-report-builder'
-	'libreoffice-scripting-beanshell'
-	'libreoffice-scripting-javascript'
-	'libreoffice-extension-scripting-python'
 	'libreoffice-extension-wiki-publisher'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=3.6.5.2
-pkgver=3.6.5
-pkgrel=1
+_LOver=4.0.2.2
+pkgver=4.0.2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost'
-             'apache-ant' 'gperf' 'poppler>=0.22.0' 'kdelibs' 'gconf' 'cppunit'
+             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost'
+             'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit'
              'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
-             'glu' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene'
+             'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez'
              # the runtime dependencies
-             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=50.1.2" 
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite>=1.2.0' 'lcms2'
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'translate-toolkit' 'xdg-utils'
+             "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
+             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" 
+             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.3' 
+             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
 	         'ttf-dejavu') # to satisfy regression tests
 
 # http://download.documentfoundation.org/mirrors/all.html
@@ -49,15 +44,11 @@ _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
 #_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
 _additional_source_url="http://dev-www.libreoffice.org/src"
 _additional_source_url2="http://dev-www.libreoffice.org/extern"
-source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
-	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz
 	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	${_additional_source_url}/94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 	${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
 	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 	${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
@@ -76,23 +67,31 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
 	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 	${_additional_source_url}/9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2
-	${_additional_source_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-	${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
-	${_additional_source_url}/3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2
+	${_additional_source_url}/dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2
+	${_additional_source_url}/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
+	${_additional_source_url}/8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2
+	${_additional_source_url}/54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2
+	${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	${_additional_source_url}/libcdr-0.0.11.tar.bz2
+	${_additional_source_url}/libmspub-0.0.5.tar.bz2
+	${_additional_source_url}/libvisio-0.0.25.tar.bz2
 	make-pyuno-work-with-system-wide-module-install.diff
-	libreoffice-common.sh libreoffice-common.csh)
-noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
-	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+	libreoffice-common.sh libreoffice-common.csh
+	gcc48_1.diff
+	gcc48_2.diff
+	remove_unused_vars.diff
+	gcc48_3.diff
+	gcc48_4.diff
+	gcc48_5.diff)
+noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2
-	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-	0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
+	dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2
+	b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
 	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
 	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@@ -110,19 +109,21 @@ noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
 	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
 	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
 	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('b99c80c841dc0cb4461a2ddb5362dc60'
-         'e8b3964f2505e719ba987ac4c753d235'
-         '6b28c8457c71597e405de54a6941f740'
-         '18f577b374d60b3c760a3a3350407632'
+	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+	8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2
+	54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2
+	0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+	libcdr-0.0.11.tar.bz2
+	libmspub-0.0.5.tar.bz2
+	libvisio-0.0.25.tar.bz2)
+md5sums=('2c92879fa8c50d0071c4703afb7d10bf'
+         '22e99e58aa32417dd7c132f40ae7654b'
+         '8b61fbfa6bcd18213b5744f2b8a289b0'
          'f02578f5218f217a9f20e9c30e119c6a'
-         '94e7f271e38c976462558b4278590178'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         'ada24d37d8d638b3d8a9985e80bc2978'
          '2a177023f9ea8ec8bd00837605c5df1b'
          'a7983f859eafb2677d7ff386a023bc40'
          '3c219630e4302863a9a83d0efde889db'
@@ -141,32 +142,53 @@ md5sums=('b99c80c841dc0cb4461a2ddb5362dc60'
          'db60e4fde8dd6d6807523deb71ee34dc'
          'ba2930200c9f019c2d93a8c88c651a0f'
          '9f9e15966b5624834157fe3d748312bc'
-         '6097739c841f671cb21332b9cc593ae7'
-         '0d2dcdfbf28d6208751b33057f5361f0'
-         '3c0037fb07dea2f0bbae8386fa7c6a9a'
+         'dc3d21a3921931096d6e80f6701f6763'
+         'b2371dc7cf4811c9d32146eec913d296'
+         '8755aac23317494a9028569374dc87b2'
+         '54e578c91b1b68e69c72be22adcb2195'
+         '0168229624cfac409e766913506961a8'
+         '17410483b5b5f267aa18b7e00b65e6e0'
          '185d60944ea767075d27247c3162b3bc'
-         '97bf43dda273d79ff90c848ab53b0e3c'
-         'abcb1b0a7deaffe13ab3d7ca70becb49'
-         '72790a4103da259a55cadd66db931d00')
+         '107a3d18f637b342684b3c21eb0fcd7d'
+         '881c4628ec5f54d47f35d5d19e335662'
+         '92bde158f249b9b27f76f48cc65a0242'
+         '07d2bf5ad839a394cca008b3ec6e7bb1'
+         '4195735a80876ae812fca5736b50192a'
+         'e7e4b3e70e99e5cba8f8dfcacf3b0d87'
+         '941aab11a42c8052cc1999434ae82bcd'
+         'caf426e9eefb99108adba6cf231de348'
+         'c367454b402720eea064280d0dfb291b'
+         '69aef9ea67856714e0ad3b5600b49bd7'
+         '424c346c52d1a3ee7b1008cdcf89ed82'
+         'aed5397524af27a8cceced54a30edf23')
 
 build() {
 
-	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
-	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
-	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
-        cd ${srcdir}/libreoffice-core-$_LOver
+#	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
+#	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
+#	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
 
+    cd ${srcdir}/libreoffice-$_LOver
+    
+    # fix exttextcat build error
+    # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp]
+    unset CPPFLAGS
+
+    # git commits from 2013-03-09 with "GCC" to fix gcc 4.8 issues
+#    patch -Np1 -i ${srcdir}/gcc48_1.diff
+#    patch -Np1 -i ${srcdir}/gcc48_2.diff
+#    patch -Np1 -i ${srcdir}/remove_unused_vars.diff
+#    patch -Np1 -i ${srcdir}/gcc48_3.diff
+#    patch -Np1 -i ${srcdir}/gcc48_4.diff
+#    patch -Np1 -i ${srcdir}/gcc48_5.diff
+    
 	# move external sources into place
 	mkdir ${srcdir}/ext_sources &&	pushd ${srcdir}/ext_sources
 	for source in "${noextract[@]}"; do
 	  ln -s ${srcdir}/$source .
 	done
 	popd
-	
-	ln -s ../libreoffice-help-$_LOver/helpcontent2 .
-	ln -s ../libreoffice-translations-$_LOver/translations .
-    
+   
     # fix not upstreamable pyuno paths - patch taken from Debian
     patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
     
@@ -177,25 +199,25 @@ build() {
 		esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 	done
-	
-	# python2 fix
-	export PYTHON=python2
+
+
+    # qt4 fix
+    sed -i "s:qmake:qmake-qt4:g" configure.ac
 
 	#autoconf -f
 
 	# non-SMP test build
 	#export MAKEFLAGS="-j1"
-	#./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
+	#./configure --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
 
 	./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
 		--with-unix-wrapper="libreoffice" \
 		--enable-split-app-modules \
-		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
+		--with-parallelism=${MAKEFLAGS/-j/} \
 		--with-external-tar="${srcdir}/ext_sources" \
 		--disable-fetch-external \
 		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
 		--libdir=/usr/lib --mandir=/usr/share/man \
-		--disable-verbose \
 		--with-lang="" \
 		--enable-crashdump \
 		--enable-dbus \
@@ -205,27 +227,29 @@ build() {
 		--disable-kde\
 		--enable-kde4\
 		--enable-gtk3 \
+		--enable-gstreamer \
 		--enable-lockdown\
-		--enable-mergelibs \
 		--enable-opengl \
 		--enable-odk\
-		--enable-ext-scripting-beanshell \
-		--enable-ext-scripting-javascript \
+		--enable-python=system \
+		--enable-scripting-beanshell \
+		--enable-scripting-javascript \
 		--enable-ext-wiki-publisher \
 		--enable-ext-nlpsolver \
 		--disable-ext-mysql-connector \
 		--with-system-mysql \
-		--enable-librsvg=system \
 		--without-fonts\
 		--without-afms\
-		--without-ppds\
 		--without-system-libwps\
 		--without-system-libcdr \
 		--without-system-mdds\
 		--without-myspell-dicts \
 		--without-system-libvisio \
 		--without-system-libcmis \
+		--without-system-libmspub \
 		--without-system-libexttextcat \
+		--without-system-orcus \
+		--without-system-liblangtag \
 		--without-system-jfreereport \
 		--without-system-apache-commons \
 		--with-system-dicts \
@@ -238,22 +262,22 @@ build() {
 		--with-system-libwpg \
 		--with-system-libwps \
 		--with-system-redland\
-		--without-system-saxon\
-		--disable-mozilla \
 		--without-system-mozilla \
-		--without-system-mozilla-headers \
+		--without-system-npapi-headers \
 		--with-ant-home="/usr/share/apache-ant"\
 		--without-system-boost\
 		--with-system-cairo\
 		--with-system-libs\
 		--with-system-mythes\
 		--with-system-headers\
-		--with-system-hsqldb \
+		--without-system-hsqldb \
 		--with-alloc=system\
 		--with-system-clucene\
-		--without-system-servlet-api \
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS
+		--without-system-servlet-api
+
+#		--enable-mergelibs \ # https://bugs.archlinux.org/task/34414
+
+#		--without-ppds\ # breaks spadmin permission
 
 #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
 
@@ -274,38 +298,38 @@ package_libreoffice-common() {
 
  pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
  install=libreoffice-common.install
- depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
-          'nspr' 'libsm' 'redland' 'hyphen' 'graphite>=1.2.0' "icu>=50.1.2" 'clucene' 'lcms2'
+ depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib'
+          'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.3"
           'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'
              'libcups:          adds printing support'
-             'gconf:            adds additional gnome support'
-             'nss:              adds support for signed files/macros'
              'pstoedit:         translates PostScript and PDF graphics into other vector formats'
              'libmythes:        for use in thesaurus'
              'beanshell:        interactive java -- good for prototyping /macros'
              'vigra:            C++ computer vision library, usable in Basebmp'
              'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
+             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import'
              'sane:             for scanner access'
              'unixodbc:         adds ODBC database support'
-             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress'
+             'gst-plugins-base-libs:        + some gstr-plugins to support multimedia content, e.g. in impress'
              'gtk2:             for browser plugin')
  backup=(etc/libreoffice/sofficerc
          etc/libreoffice/bootstraprc
          etc/libreoffice/psprint.conf)
  groups=('libreoffice')
- provides=('go-openoffice')
+ provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
+           'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript'	'libreoffice-extension-scripting-python')
  conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
+ replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
+           'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python')
 
  # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
  done
  # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/common_list.txt`; do
    dirname=`dirname $file`
    # check if directory has been already been created - some are missing like manpages
    [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
@@ -323,7 +347,7 @@ package_libreoffice-common() {
  cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
  ln -vsf /etc/libreoffice/psprint.conf .
  
- # set python-uno PYTHON path
+ # allow to preset desired VLC
  install -dm755 ${pkgdir}/etc/profile.d
  install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
  
@@ -336,23 +360,30 @@ package_libreoffice-common() {
  rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar
  rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
  rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
+ 
+ # make pyuno find its modules
+ install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages
+ ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.3/site-packages/uno.py
+ ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.3/site-packages/unohelper.py
+  
+ # workaround all packages now depend on that file
+ cp  ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
 }
 
 package_libreoffice-base() {
  pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI."
  install=libreoffice-base.install
- depends=('libreoffice-common' 'hsqldb-java')
+ depends=('libreoffice-common')
  optdepends=('libreoffice-postgresql-connector')
- backup=()
  groups=('libreoffice')
  replaces=('libreoffice')
 
  # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/base_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
  done
  # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/base_list.txt`; do
    dirname=`dirname $file`
    # check if directory has been already been created - some are missing like manpages
    [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
@@ -368,15 +399,15 @@ package_libreoffice-postgresql-connector() {
  replaces=('libreoffice')
 
  # workaround double entries in the file list
- mv ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig
- sort ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt
+ mv ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig
+ sort ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt
  
  # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
  done
  # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do
    dirname=`dirname $file`
    # check if directory has been already been created - some are missing like manpages
    [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
@@ -389,17 +420,16 @@ package_libreoffice-calc() {
  pkgdesc="Spreadsheet application for LibreOffice."
  install=libreoffice-calc.install
  depends=('libreoffice-common' 'lpsolve' )
- optdepends=()
- backup=()
+ #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332
  groups=('libreoffice')
  replaces=('libreoffice')
  
  # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/calc_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
  done
  # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/calc_list.txt`; do
    dirname=`dirname $file`
    # check if directory has been already been created - some are missing like manpages
    [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
@@ -412,17 +442,15 @@ package_libreoffice-draw() {
  pkgdesc="Drawing Application for LibreOffice."
  install=libreoffice-draw.install
  depends=('libreoffice-common')
- optdepends=()
- backup=()
  groups=('libreoffice')
  replaces=('libreoffice')
  
  # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/draw_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
  done
  # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/draw_list.txt`; do
    dirname=`dirname $file`
    # check if directory has been already been created - some are missing like manpages
    [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
@@ -433,17 +461,15 @@ package_libreoffice-draw() {
 
 package_libreoffice-gnome() {
  pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib'
- optdepends=()
- backup=()
+ depends=('libreoffice-common' 'gtk2' 'gconf') # gconf pulls in gtk3
  groups=('libreoffice')
  
  # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/gnome_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
  done
  # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/gnome_list.txt`; do
    dirname=`dirname $file`
    # check if directory has been already been created - some are missing like manpages
    [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
@@ -457,16 +483,15 @@ package_libreoffice-impress() {
  install=libreoffice-impress.install
  depends=('libreoffice-common')
  optdepends=('glu:             for the OGLTrans extension')
- backup=()
  groups=('libreoffice')
  replaces=('libreoffice')
  
  # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/impress_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
  done
  # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/impress_list.txt`; do
    dirname=`dirname $file`
    # check if directory has been already been created - some are missing like manpages
    [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
@@ -483,11 +508,11 @@ package_libreoffice-kde4() {
  groups=('libreoffice')
  
  # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde4_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
  done
  # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde4_list.txt`; do
    dirname=`dirname $file`
    # check if directory has been already been created - some are missing like manpages
    [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
@@ -499,17 +524,15 @@ package_libreoffice-kde4() {
 package_libreoffice-math() {
  pkgdesc="Equation Editor Application for LibreOffice."
  depends=('libreoffice-common')
- optdepends=()
- backup=()
  groups=('libreoffice')
  replaces=('libreoffice')
  
  # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/math_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
  done
  # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/math_list.txt`; do
    dirname=`dirname $file`
    # check if directory has been already been created - some are missing like manpages
    [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
@@ -521,16 +544,14 @@ package_libreoffice-math() {
 package_libreoffice-sdk() {
  pkgdesc="Software Development Kit for LibreOffice."
  depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- optdepends=()
- backup=()
  groups=('libreoffice')
  
  # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
  done
  # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_list.txt`; do
    dirname=`dirname $file`
    # check if directory has been already been created - some are missing like manpages
    [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
@@ -538,23 +559,21 @@ package_libreoffice-sdk() {
    mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
  done
  
-  # fix environment path to keep compatibility with openjdk6 and openjdk7
+  # fix environment path to keep compatibility with other java-environments
   sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
 }
 
 package_libreoffice-sdk-doc() {
  pkgdesc="Software Development Kit documentation for LibreOffice"
  depends=('libreoffice-common' 'libreoffice-sdk')
- optdepends=()
- backup=()
  groups=('libreoffice')
  
  # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
  done
  # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do
    dirname=`dirname $file`
    # check if directory has been already been created - some are missing like manpages
    [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
@@ -571,22 +590,24 @@ package_libreoffice-writer() {
  install=libreoffice-writer.install
  depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
  optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- backup=()
  groups=('libreoffice')
  replaces=('libreoffice')
 
  # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/writer_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
  done
  # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/writer_list.txt`; do
    dirname=`dirname $file`
    # check if directory has been already been created - some are missing like manpages
    [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
    # mv file from fakeinstall to pkgdir
    mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
  done
+ 
+ # for workaround this file belongs now to common
+ rm ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
 }
 
 package_libreoffice-en-US() {
@@ -597,11 +618,11 @@ package_libreoffice-en-US() {
   conflicts=(openoffice-en-US)
 
  # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do
    install -dm755 ${pkgdir}/${directory/\%dir/}
  done
  # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do
    dirname=`dirname $file`
    # check if directory has been already been created - some are missing like manpages
    [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
@@ -610,26 +631,6 @@ package_libreoffice-en-US() {
  done
 }
 
-package_libreoffice-extension-pdfimport() {
-
- pkgdesc="This extension allows you to import and modify PDF documents"
- depends=('libreoffice-common' 'poppler')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
-}
-
-package_libreoffice-extension-presenter-screen() {
-
- pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
-}
-
 package_libreoffice-extension-presentation-minimizer() {
 
  pkgdesc="This extension reduce the file size of the current presentation"
@@ -637,7 +638,7 @@ package_libreoffice-extension-presentation-minimizer() {
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
+	unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
 }
 
 package_libreoffice-extension-report-builder() {
@@ -648,39 +649,7 @@ package_libreoffice-extension-report-builder() {
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
-}
-
-package_libreoffice-scripting-beanshell() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services}
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
-}
-
-package_libreoffice-scripting-javascript() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services}
-	mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/
-	mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
-}
-
-package_libreoffice-extension-scripting-python() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice-common' 'python2')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
+	unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
 }
 
 package_libreoffice-extension-wiki-publisher() {
@@ -691,7 +660,7 @@ package_libreoffice-extension-wiki-publisher() {
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
+	unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
 }
 
 package_libreoffice-extension-nlpsolver() {
@@ -702,5 +671,5 @@ package_libreoffice-extension-nlpsolver() {
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
+	unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
 }
diff --git a/extra/libreoffice/PKGBUILD.36 b/extra/libreoffice/PKGBUILD.36
deleted file mode 100644
index 71ee72c1c..000000000
--- a/extra/libreoffice/PKGBUILD.36
+++ /dev/null
@@ -1,715 +0,0 @@
-# $Id: PKGBUILD 160067 2012-05-29 19:20:54Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	'libreoffice-postgresql-connector'
-	'libreoffice-extension-pdfimport'
-	'libreoffice-extension-presenter-screen'
-	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder'
-	'libreoffice-scripting-beanshell'
-	'libreoffice-scripting-javascript'
-	'libreoffice-extension-scripting-python'
-	'libreoffice-extension-wiki-publisher'
-	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built
-_LOver=3.6.0.4
-pkgver=3.6.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL3')
-url="http://www.libreoffice.org/"
-makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost'
-             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit'
-             'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
-             'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene'
-              #'saxon' - currently broken 
-             # the runtime dependencies
-             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" 
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
-	         'ttf-dejavu') # to satisfy regression tests
-
-# http://download.documentfoundation.org/mirrors/all.html
-# http://wiki.documentfoundation.org/Mirrors
-
-_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
-_additional_source_url="http://dev-www.libreoffice.org/src"
-_additional_source_url2="http://dev-www.libreoffice.org/extern"
-source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
-	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	${_additional_source_url}/a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 
-	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-	${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	${_additional_source_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-	${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
-	${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
-	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	buildfix.diff
-	libreoffice-common.sh libreoffice-common.csh)
-noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 
-	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-	0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
-	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('67cf97e86c75363238a371f64ef5f606'
-         '8422b0c4c797abeefed3ee4490586dd2'
-         '6cc8fa86be8c657ba23434c6c8d99416'
-         '18f577b374d60b3c760a3a3350407632'
-         'f02578f5218f217a9f20e9c30e119c6a'
-         'a9a1db27688bad49418667b434d29c1f'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         'ada24d37d8d638b3d8a9985e80bc2978'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         'af3c3acf618de6108d65fcdc92b492e1'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '0ff7d225d087793c8c2c680d77aac3e7'
-         '6097739c841f671cb21332b9cc593ae7'
-         '0d2dcdfbf28d6208751b33057f5361f0'
-         'ce5a1def34578b75959ac31210f031f6'
-         '185d60944ea767075d27247c3162b3bc'
-         '234e91ac65945ce1ab1e3839780e90f7'
-         'f0e72d0e1bc93a50a3aa9d31350b156c'
-         '867c682b45f477f916786e00c45d7ab7')
-
-build() {
-
-	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
-	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
-	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
-        cd ${srcdir}/libreoffice-core-$_LOver
-
-	# move external sources into place
-	mkdir ${srcdir}/ext_sources &&	pushd ${srcdir}/ext_sources
-	for source in "${noextract[@]}"; do
-	  ln -s ${srcdir}/$source .
-	done
-	popd
-	
-	ln -s ../libreoffice-help-$_LOver/helpcontent2 .
-	ln -s ../libreoffice-translations-$_LOver/translations .
-
-	# buildfixes & bugfixes
-    patch -Np1 -i ${srcdir}/buildfix.diff
-    
-	#use the CFLAGS but remove the LibO overridden ones
-	for i in $CFLAGS; do
-		case "$i" in
-			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
-		esac
-        ARCH_FLAGS="$ARCH_FLAGS $i"
-	done
-	
-	# python2 fix
-	export PYTHON=python2
-
-	#autoconf -f
-
-	# non-SMP test build
-	#export MAKEFLAGS="-j1"
-	#./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-
-	./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-		--with-unix-wrapper="libreoffice" \
-		--enable-split-app-modules \
-		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
-		--with-external-tar="${srcdir}/ext_sources" \
-		--disable-fetch-external \
-		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
-		--libdir=/usr/lib --mandir=/usr/share/man \
-		--disable-verbose \
-		--with-lang="" \
-		--enable-crashdump \
-		--enable-dbus \
-		--enable-evolution2\
-		--enable-gio\
-		--disable-gnome-vfs\
-		--disable-kde\
-		--enable-kde4\
-		--enable-gtk3 \
-		--enable-lockdown\
-		--enable-mergelibs \
-		--enable-opengl \
-		--enable-odk\
-		--enable-ext-scripting-beanshell \
-		--enable-ext-scripting-javascript \
-		--enable-ext-wiki-publisher \
-		--enable-ext-nlpsolver \
-		--disable-ext-mysql-connector \
-		--with-system-mysql \
-		--enable-librsvg=system \
-		--without-fonts\
-		--without-afms\
-		--without-ppds\
-		--without-system-libwps\
-		--without-system-libcdr \
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--without-system-libvisio \
-		--without-system-libcmis \
-		--without-system-libexttextcat \
-		--without-system-jfreereport \
-		--without-system-apache-commons \
-		--with-system-dicts \
-		--with-external-dict-dir=/usr/share/hunspell \
-		--with-external-hyph-dir=/usr/share/hyphen \
-		--with-external-thes-dir=/usr/share/mythes \
-		--with-system-beanshell \
-		--with-system-cppunit\
-		--with-system-graphite\
-		--with-system-libwpg \
-		--with-system-libwps \
-		--with-system-redland\
-		--without-system-saxon\
-		--disable-mozilla \
-		--without-system-mozilla \
-		--without-system-mozilla-headers \
-		--with-ant-home="/usr/share/apache-ant"\
-		--without-system-boost\
-		--with-system-cairo\
-		--with-system-libs\
-		--with-system-mythes\
-		--with-system-headers\
-		--with-system-hsqldb \
-		--with-alloc=system\
-		--with-system-clucene\
-		--without-system-servlet-api \
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-	touch src.downloaded
-	#./download
-	make
-	# fake installation to create split file lists
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
-}
-
-#check() {
-#	cd ${srcdir}/build
-#	make check
-#}
-
-package_libreoffice-common() {
-
- pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
- install=libreoffice-common.install
- depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
-          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
-          #'saxon'
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'libcups:          adds printing support'
-             'gconf:            adds additional gnome support'
-             'nss:              adds support for signed files/macros'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'poppler:          for shipped pdfimport extension'
-             'libmythes:        for use in thesaurus'
-             'beanshell:        interactive java -- good for prototyping /macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
-             'clucene:          full-text search engine library needed in the help section'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
- backup=(etc/libreoffice/sofficerc
-         etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf)
- groups=('libreoffice')
- provides=('go-openoffice')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
- 
- # set python-uno PYTHON path
- install -dm755 ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
- 
- # move bash-completion files to its new place
- install -dm755 ${pkgdir}/usr/share/bash-completion/completions
- mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
- rm -rf ${pkgdir}/etc/bash_completion.d
- 
- # some files would conflict
- rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar
- rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
- rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI."
- install=libreoffice-base.install
- depends=('libreoffice-common' 'hsqldb-java')
- optdepends=('libreoffice-postgresql-connector')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-postgresql-connector() {
- pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
- depends=('libreoffice-base' 'postgresql-libs')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # no file-list so far
- install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry
- 
- # create directories from *list.txt file
-# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-#   install -dm755 ${pkgdir}/${directory/\%dir/}
-# done
-# # install files into the pkg from fakeinstall dir
-# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-#   dirname=`dirname $file`
-#   # check if directory has been already been created - some are missing like manpages
-#   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-#   # mv file from fakeinstall to pkgdir
-#   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
-# done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- install=libreoffice-calc.install
- depends=('libreoffice-common' 'lpsolve' )
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- install=libreoffice-draw.install
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib'
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- install=libreoffice-impress.install
- depends=('libreoffice-common')
- optdepends=('mesa:             for the OGLTrans extension')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
-  # fix environment path to keep compatibility with openjdk6 and openjdk7
-  #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:"          /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
-  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Application for LibreOffice."
- install=libreoffice-writer.install
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-en-US() {
-  pkgdesc="English (US) language pack for LibreOffice"
-  #arch=('any')
-  provides=('openoffice-en-US' 'libreoffice-langpack')
-  replaces=(openoffice-en-US)
-  conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-pdfimport() {
-
- pkgdesc="This extension allows you to import and modify PDF documents"
- depends=('libreoffice-common' 'poppler')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
-}
-
-package_libreoffice-extension-presenter-screen() {
-
- pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
-}
-
-package_libreoffice-extension-presentation-minimizer() {
-
- pkgdesc="This extension reduce the file size of the current presentation"
- depends=('libreoffice-common' 'gcc-libs')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
-}
-
-package_libreoffice-extension-report-builder() {
-
- pkgdesc="This extension creates smart-looking database reports"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
-}
-
-package_libreoffice-scripting-beanshell() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services}
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
-}
-
-package_libreoffice-scripting-javascript() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services}
-	mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/
-	mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
-}
-
-package_libreoffice-extension-scripting-python() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice-common' 'python2')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
-}
-
-package_libreoffice-extension-wiki-publisher() {
-
- pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-package_libreoffice-extension-nlpsolver() {
-
- pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
diff --git a/extra/libreoffice/PKGBUILD.40 b/extra/libreoffice/PKGBUILD.40
deleted file mode 100644
index 31cb1806e..000000000
--- a/extra/libreoffice/PKGBUILD.40
+++ /dev/null
@@ -1,648 +0,0 @@
-# $Id: PKGBUILD 171359 2012-11-17 09:47:33Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	'libreoffice-postgresql-connector'
-	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder'
-	'libreoffice-extension-wiki-publisher'
-	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.0.0.2
-pkgver=4.0.0
-pkgrel=0.rc2.1
-arch=('i686' 'x86_64')
-license=('LGPL3')
-url="http://www.libreoffice.org/"
-makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost'
-             'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit'
-             'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
-             'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez'
-             # the runtime dependencies
-             "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=50.1-2" 
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.20.5' 
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
-	         'ttf-dejavu') # to satisfy regression tests
-
-# http://download.documentfoundation.org/mirrors/all.html
-# http://wiki.documentfoundation.org/Mirrors
-
-#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
-_additional_source_url="http://dev-www.libreoffice.org/src"
-_additional_source_url2="http://dev-www.libreoffice.org/extern"
-source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz
-	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	${_additional_source_url}/9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2
-	${_additional_source_url}/dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2
-	${_additional_source_url}/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
-	${_additional_source_url}/8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2
-	${_additional_source_url}/54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2
-	${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	${_additional_source_url}/libcdr-0.0.9.tar.bz2
-	${_additional_source_url}/libmspub-0.0.3.tar.bz2
-	${_additional_source_url}/libvisio-0.0.24.tar.bz2
-	make-pyuno-work-with-system-wide-module-install.diff
-	libreoffice-common.sh libreoffice-common.csh)
-noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2
-	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2
-	b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
-	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2
-	54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2
-	0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-	libcdr-0.0.9.tar.bz2
-	libmspub-0.0.3.tar.bz2
-	libvisio-0.0.24.tar.bz2)
-md5sums=('d861dfa6d29851b3266ead28ba3ed7dc'
-         'bf488979d1d66744d082e34fc9e429cd'
-         '4cc5d35ec71c3f4d11464a61b389f7cb'
-         'f02578f5218f217a9f20e9c30e119c6a'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         'af3c3acf618de6108d65fcdc92b492e1'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '9f9e15966b5624834157fe3d748312bc'
-         'dc3d21a3921931096d6e80f6701f6763'
-         'b2371dc7cf4811c9d32146eec913d296'
-         '8755aac23317494a9028569374dc87b2'
-         '54e578c91b1b68e69c72be22adcb2195'
-         '0168229624cfac409e766913506961a8'
-         '185d60944ea767075d27247c3162b3bc'
-         '3c0037fb07dea2f0bbae8386fa7c6a9a'
-         'b2db54b6e96287ac995d7ed654ace4fc'
-         '1962a4183bac8a247989af17ef8882ea'
-         '97bf43dda273d79ff90c848ab53b0e3c'
-         'abcb1b0a7deaffe13ab3d7ca70becb49'
-         '72790a4103da259a55cadd66db931d00')
-
-build() {
-
-	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
-	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
-	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
-    cd ${srcdir}/libreoffice-$_LOver
-
-	# move external sources into place
-	mkdir ${srcdir}/ext_sources &&	pushd ${srcdir}/ext_sources
-	for source in "${noextract[@]}"; do
-	  ln -s ${srcdir}/$source .
-	done
-	popd
-   
-    # fix not upstreamable pyuno paths - patch taken from Debian
-#    patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
-    
-	#use the CFLAGS but remove the LibO overridden ones
-	for i in $CFLAGS; do
-		case "$i" in
-			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
-		esac
-        ARCH_FLAGS="$ARCH_FLAGS $i"
-	done
-
-	#autoconf -f
-
-	# non-SMP test build
-	#export MAKEFLAGS="-j1"
-	#./configure --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
-
-	./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
-		--with-unix-wrapper="libreoffice" \
-		--enable-split-app-modules \
-		--with-parallelism=${MAKEFLAGS/-j/} \
-		--with-external-tar="${srcdir}/ext_sources" \
-		--disable-fetch-external \
-		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
-		--libdir=/usr/lib --mandir=/usr/share/man \
-		--disable-verbose \
-		--with-lang="" \
-		--enable-crashdump \
-		--enable-dbus \
-		--enable-evolution2\
-		--enable-gio\
-		--disable-gnome-vfs\
-		--disable-kde\
-		--enable-kde4\
-		--enable-gtk3 \
-		--enable-gstreamer \
-		--enable-lockdown\
-		--enable-mergelibs \
-		--enable-opengl \
-		--enable-odk\
-		--enable-python=system \
-		--enable-scripting-beanshell \
-		--enable-scripting-javascript \
-		--enable-ext-wiki-publisher \
-		--enable-ext-nlpsolver \
-		--disable-ext-mysql-connector \
-		--with-system-mysql \
-		--without-fonts\
-		--without-afms\
-		--without-ppds\
-		--without-system-libwps\
-		--without-system-libcdr \
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--without-system-libvisio \
-		--without-system-libcmis \
-		--without-system-libmspub \
-		--without-system-libexttextcat \
-		--without-system-orcus \
-		--without-system-liblangtag \
-		--without-system-jfreereport \
-		--without-system-apache-commons \
-		--with-system-dicts \
-		--with-external-dict-dir=/usr/share/hunspell \
-		--with-external-hyph-dir=/usr/share/hyphen \
-		--with-external-thes-dir=/usr/share/mythes \
-		--with-system-beanshell \
-		--with-system-cppunit\
-		--with-system-graphite\
-		--with-system-libwpg \
-		--with-system-libwps \
-		--with-system-redland\
-		--without-system-mozilla \
-		--without-system-npapi-headers \
-		--with-ant-home="/usr/share/apache-ant"\
-		--without-system-boost\
-		--with-system-cairo\
-		--with-system-libs\
-		--with-system-mythes\
-		--with-system-headers\
-		--with-system-hsqldb \
-		--with-alloc=system\
-		--with-system-clucene\
-		--without-system-servlet-api
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-	touch src.downloaded
-	#./download
-	make
-	# fake installation to create split file lists
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check
-}
-
-#check() {
-#	cd ${srcdir}/build
-#	make check
-#}
-
-package_libreoffice-common() {
-
- pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
- install=libreoffice-common.install
- depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6"
-          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2' 'poppler>=0.20.5' 
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') # 'orbit2')
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'libcups:          adds printing support'
-             'dbus-glib:        adds dbus support'
-             'nss:              adds support for signed files/macros'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'libmythes:        for use in thesaurus'
-             'beanshell:        interactive java -- good for prototyping /macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gst-plugins-base-libs:        + some gstr-plugins to support multimedia content, e.g. in impress'
-             'gtk2:             for browser plugin')
- backup=(etc/libreoffice/sofficerc
-         etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf)
- groups=('libreoffice')
- provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
-           'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript'	'libreoffice-extension-scripting-python')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
-           'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/common_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
- 
- # set VLC and if needed python-uno PYTHON path
- install -dm755 ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
- 
- # move bash-completion files to its new place
- install -dm755 ${pkgdir}/usr/share/bash-completion/completions
- mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
- rm -rf ${pkgdir}/etc/bash_completion.d
- 
- # some files would conflict
- rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar
- rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
- rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI."
- install=libreoffice-base.install
- depends=('libreoffice-common' 'hsqldb-java')
- optdepends=('libreoffice-postgresql-connector')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-postgresql-connector() {
- pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
- depends=('libreoffice-base' 'postgresql-libs')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # workaround double entries in the file list
- mv ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig
- sort ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- install=libreoffice-calc.install
- depends=('libreoffice-common' 'lpsolve' )
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/calc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/calc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- install=libreoffice-draw.install
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/draw_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/draw_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'gtk2' 'gtk3' 'gconf')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/gnome_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/gnome_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- install=libreoffice-impress.install
- depends=('libreoffice-common')
- optdepends=('glu:             for the OGLTrans extension')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/impress_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/impress_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde4_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde4_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/math_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/math_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
-  # fix environment path to keep compatibility with openjdk6 and openjdk7
-  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Application for LibreOffice."
- install=libreoffice-writer.install
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/writer_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/writer_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-en-US() {
-  pkgdesc="English (US) language pack for LibreOffice"
-  #arch=('any')
-  provides=('openoffice-en-US' 'libreoffice-langpack')
-  replaces=(openoffice-en-US)
-  conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-presentation-minimizer() {
-
- pkgdesc="This extension reduce the file size of the current presentation"
- depends=('libreoffice-common' 'gcc-libs')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
-}
-
-package_libreoffice-extension-report-builder() {
-
- pkgdesc="This extension creates smart-looking database reports"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
-}
-
-package_libreoffice-extension-wiki-publisher() {
-
- pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-package_libreoffice-extension-nlpsolver() {
-
- pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
diff --git a/extra/libreoffice/buildfix.diff b/extra/libreoffice/buildfix.diff
deleted file mode 100644
index 327b10bb1..000000000
--- a/extra/libreoffice/buildfix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- libreoffice-core-3.5.99.1/sdext/Module_sdext.mk	2012-06-07 13:57:10.000000000 +0200
-+++ libreoffice-core-3.5.99.1/sdext/Module_sdext.mk.new	2012-06-09 18:21:03.376024873 +0200
-@@ -49,9 +49,6 @@
-     StaticLibrary_pdfimport_s \
- ))
- 
--$(eval $(call gb_Module_add_check_targets,sdext,\
--    CppunitTest_pdfimport \
--))
- endif
- 
- ifeq ($(ENABLE_PRESENTER_SCREEN),YES)
diff --git a/extra/libreoffice/buildfix_icu49.diff b/extra/libreoffice/buildfix_icu49.diff
deleted file mode 100644
index 7a774dee0..000000000
--- a/extra/libreoffice/buildfix_icu49.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=410307
-
---- i18npool/source/breakiterator/data/char_in.txt
-+++ i18npool/source/breakiterator/data/char_in.txt
-@@ -15,7 +15,7 @@
- $CR          = [\p{Grapheme_Cluster_Break = CR}];
- $LF          = [\p{Grapheme_Cluster_Break = LF}];
- $Control     = [\p{Grapheme_Cluster_Break = Control}];
--$Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
-+# $Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
- $Extend      = [\p{Grapheme_Cluster_Break = Extend}];
- $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
- $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1];
-@@ -72,7 +72,7 @@
- [^$Control $CR $LF] $Extend;
- 
- [^$Control $CR $LF] $SpacingMark;
--$Prepend [^$Control $CR $LF];
-+# $Prepend [^$Control $CR $LF];
- 
- 
- ## -------------------------------------------------
-@@ -94,7 +94,7 @@
- 
- $Extend      [^$Control $CR $LF];
- $SpacingMark [^$Control $CR $LF];
--[^$Control $CR $LF] $Prepend;
-+# [^$Control $CR $LF] $Prepend;
- 
- 
- ## -------------------------------------------------
---- i18npool/source/breakiterator/data/char.txt
-+++ i18npool/source/breakiterator/data/char.txt
-@@ -16,7 +16,7 @@
- $CR          = [\p{Grapheme_Cluster_Break = CR}];
- $LF          = [\p{Grapheme_Cluster_Break = LF}];
- $Control     = [\p{Grapheme_Cluster_Break = Control}];
--$Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
-+# $Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
- $Extend      = [\p{Grapheme_Cluster_Break = Extend}];
- $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
- # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data
diff --git a/extra/libreoffice/fix_broken_hebrew_wordwrapping.diff b/extra/libreoffice/fix_broken_hebrew_wordwrapping.diff
deleted file mode 100644
index ba4850c77..000000000
--- a/extra/libreoffice/fix_broken_hebrew_wordwrapping.diff
+++ /dev/null
@@ -1,360 +0,0 @@
-From 20c24114143d6d38774b56a142fd4ae05094308e Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Sun, 13 May 2012 21:41:30 +0000
-Subject: Resolves: fdo#49849 implement Unicode 6.1 hebrew line breaking rules
-
-i.e.  sync with svn diff -c 31071
-http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr/line.txt
-
-Change-Id: I I I41b3d02f1a0da3b83a9684f29d466660d96254c6
----
-diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
-index 14051d4..ffd590c 100644
---- a/i18npool/qa/cppunit/test_breakiterator.cxx
-+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
-@@ -42,6 +42,7 @@
- #include <unotest/bootstrapfixturebase.hxx>
- 
- #include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
- 
- #include <string.h>
- 
-@@ -58,6 +59,9 @@ public:
-     void testWeak();
-     void testAsian();
-     void testThai();
-+#if TODO
-+    void testNorthernThai();
-+#endif
- 
-     CPPUNIT_TEST_SUITE(TestBreakIterator);
-     CPPUNIT_TEST(testLineBreaking);
-@@ -71,6 +71,9 @@
-     CPPUNIT_TEST(testWeak);
-     CPPUNIT_TEST(testAsian);
-     CPPUNIT_TEST(testThai);
-+#if TODO
-+    CPPUNIT_TEST(testNorthernThai);
-+#endif
-     CPPUNIT_TEST_SUITE_END();
- 
- private:
-@@ -80,28 +83,46 @@
-     uno::Reference<i18n::XBreakIterator> m_xBreak;
- };
- 
--//See https://bugs.freedesktop.org/show_bug.cgi?id=31271 for motivation
- void TestBreakIterator::testLineBreaking()
- {
--    ::rtl::OUString aTest1(RTL_CONSTASCII_USTRINGPARAM("(some text here)"));
--
-     i18n::LineBreakHyphenationOptions aHyphOptions;
-     i18n::LineBreakUserOptions aUserOptions;
-     lang::Locale aLocale;
- 
--    aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
--    aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
--
-+    //See https://bugs.freedesktop.org/show_bug.cgi?id=31271
-     {
--        //Here we want the line break to leave text here) on the next line
--        i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions);
--        CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6);
-+         ::rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)"));
-+
-+        aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
-+        aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
-+
-+        {
-+            //Here we want the line break to leave text here) on the next line
-+            i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions);
-+            CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6);
-+        }
-+
-+        {
-+            //Here we want the line break to leave "here)" on the next line
-+            i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions);
-+            CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11);
-+        }
-     }
- 
-+    //See https://bugs.freedesktop.org/show_bug.cgi?id=49849
-     {
--        //Here we want the line break to leave "here)" on the next line
--        i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions);
--        CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11);
-+        const sal_Unicode HEBREW1[] = { 0x05DE, 0x05D9, 0x05DC, 0x05D9, 0x5DD };
-+        ::rtl::OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1));
-+        ::rtl::OUString aTest(rtl::OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear());
-+
-+        aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("he"));
-+        aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IL"));
-+
-+        {
-+            //Here we want the line break to happen at the whitespace
-+            i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, aTest.getLength()-1, aLocale, 0, aHyphOptions, aUserOptions);
-+            CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == aWord.getLength()+1);
-+        }
-     }
- }
- 
-@@ -295,27 +320,29 @@ void TestBreakIterator::testThai()
-     aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th"));
-     aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH"));
- 
--    i18n::Boundary aBounds;
--    {
--        const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
--        ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1));
--        aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
--            i18n::WordType::DICTIONARY_WORD, true);
--        CPPUNIT_ASSERT_MESSAGE("Should skip full word",
--            aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
--    }
-+    const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
-+    ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1));
-+    i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
-+        i18n::WordType::DICTIONARY_WORD, true);
-+    CPPUNIT_ASSERT_MESSAGE("Should skip full word",
-+        aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
-+}
- 
--#ifdef TODO
--    {
--        const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
--        ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
--        aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
--            i18n::WordType::DICTIONARY_WORD, true);
--        CPPUNIT_ASSERT_MESSAGE("Should skip full word",
--            aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
--    }
--#endif
-+#if TODO
-+void TestBreakIterator::testNorthernThai()
-+{
-+    lang::Locale aLocale;
-+    aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nod"));
-+    aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH"));
-+
-+    const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
-+    ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
-+    i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
-+        i18n::WordType::DICTIONARY_WORD, true);
-+    CPPUNIT_ASSERT_MESSAGE("Should skip full word",
-+        aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
- }
-+#endif
- 
- void TestBreakIterator::setUp()
- {
-diff --git a/i18npool/source/breakiterator/data/README b/i18npool/source/breakiterator/data/README
-new file mode 100644
-index 0000000..8d7598d
---- a/dev/null
-+++ b/i18npool/source/breakiterator/data/README
-@@ -0,0 +1,12 @@
-+The originals of these come from svn checkout
-+http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr they no
-+longer appear in the icu tarballs, but are in icu's svn
-+
-+At various stages these copies have been customized and are not horribly out of
-+sync. It unclear which diffs from the base versions are deliberate and which
-+are now accidental :-(
-+
-+We need to review the various issues referenced in the commits that caused
-+custimizations and see if they're still relevant or not, write regression tests
-+for them, if any are still relavant then apply the changes back on top of the
-+latest versions.
-diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt
-index cbabee6..91c8f3d 100644
---- a/i18npool/source/breakiterator/data/line.txt
-+++ b/i18npool/source/breakiterator/data/line.txt
-@@ -61,11 +61,13 @@ $BB = [:LineBreak =  Break_Before:];
- $BK = [:LineBreak =  Mandatory_Break:];
- $B2 = [:LineBreak =  Break_Both:];
- $CB = [:LineBreak =  Contingent_Break:];
-+$CJ = [:LineBreak =  Conditional_Japanese_Starter:];
- $CL = [:LineBreak =  Close_Punctuation:] ;
- $CM = [:LineBreak =  Combining_Mark:];
- $CR = [:LineBreak =  Carriage_Return:];
- $EX = [:LineBreak =  Exclamation:];
- $GL = [:LineBreak =  Glue:];
-+$HL = [:LineBreak =  Hebrew_Letter:];
- $HY = [:LineBreak =  Hyphen:];
- $H2 = [:LineBreak =  H2:];
- $H3 = [:LineBreak =  H3:];
-@@ -77,7 +79,7 @@ $JV = [:LineBreak =  JV:];
- $JT = [:LineBreak =  JT:];
- $LF = [:LineBreak =  Line_Feed:];
- $NL = [:LineBreak =  Next_Line:];
--$NS = [:LineBreak =  Nonstarter:];
-+$NS = [[:LineBreak =  Nonstarter:] $CJ];
- $NU = [:LineBreak =  Numeric:];
- $OP = [[:LineBreak =  Open_Punctuation:] - $DG];
- $PO = [:LineBreak =  Postfix_Numeric:];
-@@ -118,6 +120,7 @@ $B2cm = $B2 $CM*;
- $CLcm = $CL $CM*;
- $EXcm = $EX $CM*;
- $GLcm = $GL $CM*;
-+$HLcm = $HL $CM*;
- $HYcm = $HY $CM*;
- $H2cm = $H2 $CM*;
- $H3cm = $H3 $CM*;
-@@ -150,6 +153,7 @@ $B2 $CM+;
- $CL $CM+;
- $EX $CM+;
- $GL $CM+;
-+$HL $CM+;
- $HY $CM+;
- $H2 $CM+;
- $H3 $CM+;
-@@ -186,7 +190,7 @@ $CANT_CM = [ $SP $BK $CR $LF $NL $ZW $CM];       # Bases that can't take CMs
- #            so for this one case we need to manually list out longer sequences.
- #
- $AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP];
--$AL_FOLLOW_CM   = [$CL $EX $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
-+$AL_FOLLOW_CM   = [$CL $EX $HL $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
- $AL_FOLLOW      = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM];
- 
- 
-@@ -320,8 +324,13 @@ $LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm);
- $BBcm [^$CB];                                  #  $BB  x
- $BBcm $LB20NonBreaks $CM*;
- 
-+# LB 21a Don't break after Hebrew + Hyphen
-+#   HL (HY | BA) x
-+#  
-+$HLcm ($HYcm | $BAcm) [^$CB]?;
-+
- # LB 22
--$ALcm    $INcm;
-+($ALcm | $HLcm) $INcm;
- $CM+     $INcm;     #  by rule 10, any otherwise unattached CM behaves as AL
- $IDcm    $INcm;
- $INcm    $INcm;
-@@ -331,16 +340,18 @@ $NUcm    $INcm;
- # $LB 23
- $IDcm  $POcm;
- $ALcm  $NUcm;       # includes $LB19
-+$HLcm  $NUcm;
- $CM+   $NUcm;       # Rule 10, any otherwise unattached CM behaves as AL
- $NUcm  $ALcm;
-+$NUcm  $HLcm;
- 
- #
- # LB 24
- #
- $PRcm $IDcm;
- $ALcm $PRcm;
--$PRcm $ALcm;
--$POcm $ALcm;
-+$PRcm ($ALcm | $HLcm);
-+$POcm ($ALcm | $HLcm);
- 
- #
- # LB 25   Numbers.
-@@ -361,8 +372,8 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm);
- 
- # LB 28   Do not break between alphabetics
- #
--$ALcm $ALcm;
--$CM+ $ALcm;      # The $CM+ is from rule 10, and unattached CM is treated as AL
-+($ALcm | $HLcm) ($ALcm | $HLcm);
-+$CM+ ($ALcm | $HLcm);      # The $CM+ is from rule 10, an unattached CM is treated as AL
- 
- # LB 29
- $IScm ($ALcm | $NUcm);
-@@ -371,11 +382,9 @@ $IScm ($ALcm | $NUcm);
- # Rule 30   Do not break between letters, numbers or ordinary symbols
- #           and opening or closing punctuation
- #
--($ALcm | $NUcm) $OPcm;
-+($ALcm | $HLcm | $NUcm) $OPcm;
- $CM+ $OPcm;
--$CLcm ($ALcm | $NUcm);
--
--
-+$CLcm ($ALcm | $HLcm | $NUcm);
- 
- #
- #  Reverse Rules.
-@@ -391,6 +400,7 @@ $CM+ $B2;
- $CM+ $CL;
- $CM+ $EX;
- $CM+ $GL;
-+$CM+ $HL;
- $CM+ $HY;
- $CM+ $H2;
- $CM+ $H3;
-@@ -544,24 +554,25 @@ $CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM];     #  . x (BA | HY | NS)
- $CM* [$LB20NonBreaks-$CM] $CM* $BB;                   #  BB x .
- [^$CB] $CM* $BB;                                      # 
- 
--
-+# LB21a
-+[^$CB] $CM* ($HY | $BA) $CM* $HL;
- 
- # LB 22
--$CM* $IN $CM* $ALPlus;
-+$CM* $IN $CM* ($ALPlus | $HL);
- $CM* $IN $CM* $ID;
- $CM* $IN $CM* $IN;
- $CM* $IN $CM* $NU;
- 
- # LB 23
- $CM* $PO $CM* $ID;
--$CM* $NU $CM* $ALPlus;
--$CM* $ALPlus $CM* $NU;
-+$CM* $NU $CM* ($ALPlus | $HL);
-+$CM* ($ALPlus | $HL) $CM* $NU;
- 
- # LB 24
- $CM* $ID $CM* $PR;
- $CM* $PR $CM* $ALPlus;
--$CM* $ALPlus $CM* $PR;
--$CM* $ALPlus $CM* $PO;
-+$CM* ($ALPlus | $HL) $CM* $PR;
-+$CM* ($ALPlus | $HL) $CM* $PO;
- 
- $CM* $ALPlus $CM* ($IS | $SY | $HY)+ / $SP;
- $CM* $NU+ $CM* $HY+ / $SP;
-@@ -580,15 +591,14 @@ $CM* $PO $CM* ($H3 | $H2 | $JT | $JV | $JL);
- $CM* ($H3 | $H2 | $JT | $JV | $JL) $CM* $PR;
- 
- # LB 28
--$CM* $ALPlus $CM* $ALPlus;
--
-+$CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL);
- 
- # LB 29
- $CM* ($NU | $ALPlus) $CM* $IS+ [^$SP];
- 
- # LB 30
--$CM* $OP $CM* ($NU | $ALPlus);
--$CM* ($NU | $ALPlus) $CM* ($CL | $SY)+ [^$SP];
-+$CM* $OP $CM* ($ALPlus | $HL | $NU);
-+$CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP];
- 
- 
- ## -------------------------------------------------
-@@ -609,6 +619,9 @@ $SP+ $CM* $QU;
- $SP+ $CM* $CL;
- $SP+ $CM* $B2;
- 
-+# LB 21
-+$CM* ($HY | $BA) $CM* $HL;
-+
- # LB 18
- ($CM* ($IS | $SY))+ $CM* $NU;
- $CL $CM* ($NU | $IS | $SY);
-@@ -629,6 +642,6 @@ $dictionary $dictionary;
- #  turn off rule chaining.  We don't want to move more
- #  than necessary.
- #
--[$CM $OP $QU $CL $B2 $PR $HY $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $dictionary];
-+[$CM $OP $QU $CL $B2 $PR $HY $BA $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $BA $dictionary];
- $dictionary $dictionary;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/libreoffice/gcc48_1.diff b/extra/libreoffice/gcc48_1.diff
new file mode 100644
index 000000000..7ee6bd249
--- /dev/null
+++ b/extra/libreoffice/gcc48_1.diff
@@ -0,0 +1,52 @@
+From 6bea5311d70f518444fe3218cf0b6f49bd93cc34 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Fri, 08 Mar 2013 09:36:44 +0000
+Subject: Work around GCC 4.8 -Werror=unused-local-typedefs in boost
+
+Change-Id: Ib137c5c5764333d7a878c5e996e6983a277d3856
+---
+diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
+index 2fcae8c..fde6fa6 100644
+--- a/boost/UnpackedTarball_boost.mk
++++ b/boost/UnpackedTarball_boost.mk
+@@ -52,6 +52,8 @@ boost_patches += boost_1_44_0-clang-warnings.patch
+ # in GCC-4.7 experimental":
+ boost_patches += boost_1_44_0-gthreads.patch
+ 
++boost_patches += boost_1_44_0-gcc4.8.patch
++
+ $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
+ 
+ $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))
+diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch
+new file mode 100644
+index 0000000..9fc603e
+--- a/dev/null
++++ b/boost/boost_1_44_0-gcc4.8.patch
+@@ -0,0 +1,24 @@
++--- misc/boost_1_44_0/boost/bind/arg.hpp
+++++ misc/build/boost_1_44_0/boost/bind/arg.hpp
++@@ -35,6 +35,8 @@
++     {
++         // static assert I == is_placeholder<T>::value
++         typedef char T_must_be_placeholder[ I == is_placeholder<T>::value? 1: -1 ];
+++        T_must_be_placeholder dummy; (void) dummy;
+++            // silence -Werror=unused-local-typedefs (GCC 4.8)
++     }
++ };
++ 
++--- misc/boost_1_44_0/boost/concept/detail/general.hpp
+++++ misc/build/boost_1_44_0/boost/concept/detail/general.hpp
++@@ -68,7 +68,9 @@
++ #  define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr )             \
++     typedef ::boost::concepts::detail::instantiate<          \
++     &::boost::concepts::requirement_<ModelFnPtr>::failed>    \
++-      BOOST_PP_CAT(boost_concept_check,__LINE__)
+++      BOOST_PP_CAT(boost_concept_check,__LINE__); \
+++    BOOST_PP_CAT(boost_concept_check,__LINE__) BOOST_PP_CAT(boost_concept_check_dummy,__LINE__)()
+++        // silence -Werror=unused-local-typedefs (GCC 4.8)
++ 
++ }}
++ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/libreoffice/gcc48_2.diff b/extra/libreoffice/gcc48_2.diff
new file mode 100644
index 000000000..559adddfa
--- /dev/null
+++ b/extra/libreoffice/gcc48_2.diff
@@ -0,0 +1,45 @@
+From c6cfd44717643b0630b5f8fd3262c243fdaaf239 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Fri, 08 Mar 2013 09:54:45 +0000
+Subject: Work around GCC 4.8 -Werror=format= in python3
+
+...complainging that "‘PyArg_ParseTuple’ is an unrecognized format function
+type."
+
+Change-Id: I125af6669010c4c9c1a18cc7c1a4895acc89338b
+---
+diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk
+index d8c0862..87adff0 100644
+--- a/python3/UnpackedTarball_python3.mk
++++ b/python3/UnpackedTarball_python3.mk
+@@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
+ 	python3/python-3.3.0-ssl.patch.1 \
+ 	python3/python-3.3.0-implicit-int.patch.1 \
+ 	python3/python-3.3.0-ffi-clang.patch.1 \
++	python3/python-3.3.0-gcc-4.8.patch.1 \
+ ))
+ 
+ ifneq ($(OS),WNT)
+diff --git a/python3/python-3.3.0-gcc-4.8.patch.1 b/python3/python-3.3.0-gcc-4.8.patch.1
+new file mode 100644
+index 0000000..8fb7107
+--- a/dev/null
++++ b/python3/python-3.3.0-gcc-4.8.patch.1
+@@ -0,0 +1,15 @@
++--- Python-3.3.0/Include/modsupport.h	2012-09-29 10:00:26.000000000 +0200
+++++ Python-3.3.0/Include/modsupport.h	2013-03-08 10:46:28.671938738 +0100
++@@ -26,7 +26,11 @@
++ /* Due to a glitch in 3.2, the _SizeT versions weren't exported from the DLL. */
++ #if !defined(PY_SSIZE_T_CLEAN) || !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
++ PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...);
++-PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3);
+++PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...)
+++#ifdef PY_SSIZE_T_CLEAN
+++    Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3)
+++#endif
+++    ;
++ PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *,
++                                                   const char *, char **, ...);
++ PyAPI_FUNC(int) PyArg_ValidateKeywordArguments(PyObject *);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/libreoffice/gcc48_3.diff b/extra/libreoffice/gcc48_3.diff
new file mode 100644
index 000000000..395fe7928
--- /dev/null
+++ b/extra/libreoffice/gcc48_3.diff
@@ -0,0 +1,46 @@
+From 52c5eb20fd96d63e17cb9cd18912030131bcc787 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Fri, 08 Mar 2013 09:59:05 +0000
+Subject: -Werror=unused-local-typedefs (GCC 4.8)
+
+Change-Id: Ib1dedbe8e273463fa47573486d67dc9d509953db
+---
+diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+index f8267c6..810470e 100644
+--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
++++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+@@ -608,7 +608,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
+     putenv(strdup(osJavaHome.getStr()));
+ #endif
+ 
+-    typedef jint JNICALL JNI_InitArgs_Type(void *);
+     typedef jint JNICALL JNI_CreateVM_Type(JavaVM **, JNIEnv **, void *);
+     rtl::OUString sSymbolCreateJava(
+             RTL_CONSTASCII_USTRINGPARAM("JNI_CreateJavaVM"));
+diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+index 8c4f129..2694218 100644
+--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
++++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+@@ -201,8 +201,6 @@ void ClientBox::DeleteRemoved()
+ 
+     if ( ! m_vRemovedEntries.empty() )
+     {
+-        typedef std::vector< TClientBoxEntry >::iterator ITER;
+-
+         m_vRemovedEntries.clear();
+     }
+ 
+diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
+index cd7df65..1eb94c9 100644
+--- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
++++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
+@@ -225,7 +225,6 @@ void MasterPageObserver::Implementation::AddEventListener (
+ 
+         // Tell the new listener about all the master pages that are
+         // currently in use.
+-        typedef ::std::vector<String> StringList;
+         MasterPageContainer::iterator aDocumentIterator;
+         for (aDocumentIterator=maUsedMasterPages.begin();
+              aDocumentIterator!=maUsedMasterPages.end();
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/libreoffice/gcc48_4.diff b/extra/libreoffice/gcc48_4.diff
new file mode 100644
index 000000000..4dd92c7aa
--- /dev/null
+++ b/extra/libreoffice/gcc48_4.diff
@@ -0,0 +1,223 @@
+From 72c62e0e83598862e1c6e00e4264d7720aa94e41 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Fri, 08 Mar 2013 10:45:35 +0000
+Subject: -Werror=unused-local-typedefs (GCC 4.8)
+
+Change-Id: I873813e30e44712d6793bad91938eb847b55a7bb
+---
+diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch
+index 9fc603e..2d2beeb 100644
+--- a/boost/boost_1_44_0-gcc4.8.patch
++++ b/boost/boost_1_44_0-gcc4.8.patch
+@@ -1,3 +1,45 @@
++--- misc/boost_1_44_0/boost/algorithm/string/detail/finder.hpp
+++++ misc/build/boost_1_44_0/boost/algorithm/string/detail/finder.hpp
++@@ -142,7 +142,6 @@
++                     ForwardIteratorT End,
++                     std::forward_iterator_tag ) const
++                 {
++-                    typedef ForwardIteratorT input_iterator_type;
++                     typedef iterator_range<ForwardIteratorT> result_type;
++ 
++                     first_finder_type first_finder(
++@@ -263,7 +262,6 @@
++                     ForwardIteratorT End,
++                     unsigned int N) const
++                 {
++-                    typedef ForwardIteratorT input_iterator_type;
++                     typedef iterator_range<ForwardIteratorT> result_type;
++ 
++                     // Sanity check
++@@ -298,7 +296,6 @@
++                     ForwardIteratorT End,
++                     unsigned int N) const
++                 {
++-                    typedef ForwardIteratorT input_iterator_type;
++                     typedef iterator_range<ForwardIteratorT> result_type;
++ 
++                     // Sanity check
++@@ -362,7 +359,6 @@
++                 unsigned int N,
++                 std::random_access_iterator_tag )
++             {
++-                typedef ForwardIteratorT input_iterator_type;
++                 typedef iterator_range<ForwardIteratorT> result_type;
++ 
++                 if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) )
++@@ -436,7 +432,6 @@
++                 unsigned int N,
++                 std::random_access_iterator_tag )
++             {
++-                typedef ForwardIteratorT input_iterator_type;
++                 typedef iterator_range<ForwardIteratorT> result_type;
++ 
++                 if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) )
+ --- misc/boost_1_44_0/boost/bind/arg.hpp
+ +++ misc/build/boost_1_44_0/boost/bind/arg.hpp
+ @@ -35,6 +35,8 @@
+@@ -22,3 +64,163 @@
+  
+  }}
+  
++--- misc/boost_1_44_0/boost/date_time/date_parsing.hpp
+++++ misc/build/boost_1_44_0/boost/date_time/date_parsing.hpp
++@@ -113,7 +113,6 @@
++         spec_str = "mdy";
++       }
++ 
++-      typedef typename date_type::year_type year_type;
++       typedef typename date_type::month_type month_type;
++       unsigned pos = 0;
++       unsigned short year(0), month(0), day(0);
++@@ -159,7 +158,7 @@
++     parse_undelimited_date(const std::string& s) {
++       int offsets[] = {4,2,2};
++       int pos = 0;
++-      typedef typename date_type::year_type year_type;
+++      //typedef typename date_type::year_type year_type;
++       //typename date_type::ymd_type ymd((year_type::min)(),1,1);
++       unsigned short y = 0, m = 0, d = 0;
++ 
++--- misc/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp
+++++ misc/build/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp
++@@ -36,7 +36,6 @@
++     boost::io::ios_flags_saver iflags(os);
++     typedef local_date_time time_type;//::utc_time_type typename 
++     typedef date_time::time_facet<time_type, CharT> custom_time_facet;
++-    typedef std::time_put<CharT> std_time_facet;
++     std::ostreambuf_iterator<CharT> oitr(os);
++ 
++     if(std::has_facet<custom_time_facet>(os.getloc())) {
++@@ -123,7 +122,6 @@
++              const boost::local_time::local_time_period& p) {
++     boost::io::ios_flags_saver iflags(os);
++     typedef boost::date_time::time_facet<local_date_time, CharT> custom_facet;
++-    typedef std::time_put<CharT> std_time_facet;
++     std::ostreambuf_iterator<CharT> oitr(os);
++     if (std::has_facet<custom_facet>(os.getloc())) {
++       std::use_facet<custom_facet>(os.getloc()).put(oitr, os, os.fill(), p);
++--- misc/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp
+++++ misc/build/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp
++@@ -47,7 +47,6 @@
++              const ptime& p) {
++     boost::io::ios_flags_saver iflags(os);
++     typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet;
++-    typedef std::time_put<CharT>                  std_ptime_facet;
++     std::ostreambuf_iterator<CharT> oitr(os);
++     if (std::has_facet<custom_ptime_facet>(os.getloc()))
++       std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p);
++@@ -114,7 +113,6 @@
++              const boost::posix_time::time_period& p) {
++     boost::io::ios_flags_saver iflags(os);
++     typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet;
++-    typedef std::time_put<CharT>                  std_time_facet;
++     std::ostreambuf_iterator<CharT> oitr(os);
++     if (std::has_facet<custom_ptime_facet>(os.getloc())) {
++       std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p);
++@@ -180,7 +178,6 @@
++   {
++     boost::io::ios_flags_saver iflags(os);
++     typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet;
++-    typedef std::time_put<CharT>                  std_ptime_facet;
++     std::ostreambuf_iterator<CharT> oitr(os);
++     if (std::has_facet<custom_ptime_facet>(os.getloc()))
++       std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), td);
++--- misc/boost_1_44_0/boost/date_time/string_convert.hpp
+++++ misc/build/boost_1_44_0/boost/date_time/string_convert.hpp
++@@ -21,7 +21,6 @@
++   inline
++   std::basic_string<OutputT> convert_string_type(const std::basic_string<InputT>& inp_str)
++   {
++-    typedef std::basic_string<InputT> input_type;
++     typedef std::basic_string<OutputT> output_type;
++     output_type result;
++     result.insert(result.begin(), inp_str.begin(), inp_str.end());
++--- misc/boost_1_44_0/boost/date_time/strings_from_facet.hpp
+++++ misc/build/boost_1_44_0/boost/date_time/strings_from_facet.hpp
++@@ -35,7 +35,6 @@
++ {
++   typedef std::basic_string<charT> string_type;
++   typedef std::vector<string_type> collection_type;
++-  typedef std::basic_ostringstream<charT> ostream_type;
++   typedef std::ostreambuf_iterator<charT> ostream_iter_type;
++   typedef std::basic_ostringstream<charT> stringstream_type;
++   typedef std::time_put<charT>           time_put_facet_type;
++@@ -85,7 +84,6 @@
++ {
++   typedef std::basic_string<charT> string_type;
++   typedef std::vector<string_type> collection_type;
++-  typedef std::basic_ostringstream<charT> ostream_type;
++   typedef std::ostreambuf_iterator<charT> ostream_iter_type;
++   typedef std::basic_ostringstream<charT> stringstream_type;
++   typedef std::time_put<charT>           time_put_facet_type;
++--- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp
+++++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp
++@@ -39,8 +39,6 @@
++ 
++     template <typename Array, typename IdxGen, typename Call_Type>
++     static void call(Array& a, const IdxGen& idgen, Call_Type c) {
++-      typedef typename Array::index_range index_range_;
++-      typedef typename Array::index index_;
++       idgen_helper<N-1>::call(a,idgen[c],c);
++     }
++   };
++@@ -50,8 +48,6 @@
++ 
++     template <typename Array, typename IdxGen, typename Call_Type>
++     static void call(Array& a, const IdxGen& idgen, Call_Type) {
++-      typedef typename Array::index_range index_range_;
++-      typedef typename Array::index index_;
++       a[ idgen ];
++     }
++   };
++--- misc/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
+++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
++@@ -307,7 +307,6 @@
++ #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
++         typedef impl::grammar_helper_base<GrammarT> helper_base_t;
++         typedef grammar_helper_list<GrammarT> helper_list_t;
++-        typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
++ 
++         helper_list_t&  helpers =
++ # if !defined(__GNUC__) || (__GNUC__ > 2)
++@@ -318,6 +317,7 @@
++ 
++ # if (defined(BOOST_MSVC) && (BOOST_MSVC < 1300)) \
++     || defined(BOOST_INTEL_CXX_VERSION)
+++        typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
++         for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i)
++             (*i)->undefine(self);
++ # else
++--- misc/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp
+++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp
++@@ -47,7 +47,6 @@
++         typename parser_result<self_t, ScannerT>::type
++         parse(ScannerT const& scan) const
++         {
++-            typedef typename parser_result<self_t, ScannerT>::type result_t;
++             typedef typename ScannerT::value_t value_t;
++             typedef typename ScannerT::iterator_t iterator_t;
++ 
++--- misc/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp
+++++ misc/build/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp
++@@ -140,7 +140,6 @@
++         parse(ScannerT const& scan) const
++         {
++             typedef typename parser_result<ParserT, ScannerT>::type result_t;
++-            typedef typename ScannerT::iterator_t iterator_t;
++ 
++             result_t hit = this->subject().parse(scan);
++             if (!hit)
++--- misc/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp
+++++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp
++@@ -49,8 +49,6 @@
++         typename parser_result<self_t, ScannerT>::type
++         parse(ScannerT const& scan) const
++         {
++-            typedef typename parser_result<self_t, ScannerT>::type result_t;
++-            typedef typename ScannerT::value_t      value_t;
++             typedef typename ScannerT::iterator_t   iterator_t;
++ 
++             iterator_t const s(scan.first);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/libreoffice/gcc48_5.diff b/extra/libreoffice/gcc48_5.diff
new file mode 100644
index 000000000..f63571039
--- /dev/null
+++ b/extra/libreoffice/gcc48_5.diff
@@ -0,0 +1,34 @@
+From 157ce65588ec8ef4ff8f805f7b8a64fefdd9edec Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Fri, 08 Mar 2013 11:07:11 +0000
+Subject: Work around GCC 4.8 -Werror=virtual-move-assign
+
+...complaining that "defaulted move assignment for ‘cppcanvas::SpriteCanvas’
+calls a non-trivial move assignment operator for virtual base
+‘cppcanvas::BitmapCanvas’."
+
+Change-Id: I4dc92176dbec62f0ae4fa7d2842073077ecb8fc3
+---
+diff --git a/cppcanvas/inc/cppcanvas/spritecanvas.hxx b/cppcanvas/inc/cppcanvas/spritecanvas.hxx
+index 59aa3da..6a606b3 100644
+--- a/cppcanvas/inc/cppcanvas/spritecanvas.hxx
++++ b/cppcanvas/inc/cppcanvas/spritecanvas.hxx
+@@ -24,6 +24,7 @@
+ #include <osl/diagnose.h>
+ #include <basegfx/vector/b2dsize.hxx>
+ 
++#include <boost/noncopyable.hpp>
+ #include <boost/shared_ptr.hpp>
+ 
+ 
+@@ -48,7 +49,7 @@ namespace cppcanvas
+ 
+     /** SpriteCanvas interface
+      */
+-    class SpriteCanvas : public virtual BitmapCanvas
++    class SpriteCanvas : public virtual BitmapCanvas, private boost::noncopyable
+     {
+     public:
+         virtual bool                    updateScreen( bool bUpdateAll ) const = 0;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/libreoffice/git_fixes.diff b/extra/libreoffice/git_fixes.diff
deleted file mode 100644
index a4cd891cb..000000000
--- a/extra/libreoffice/git_fixes.diff
+++ /dev/null
@@ -1,743 +0,0 @@
-From 427529801dee122250e44d2311b34651db92bbdb Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Tue, 21 Aug 2012 16:55:11 +0000
-Subject: Typo
-
-Change-Id: I41fd1463b6432818ee36e7f90e920a5fd98c7106
-(cherry picked from commit 1316cfe8a72f7c7bc2f5ad7644a2d4c54b77fc8b)
-
-Signed-off-by: Eike Rathke <erack@redhat.com>
----
-diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
-index d929787..55ebaca 100644
---- a/desktop/source/app/app.cxx
-+++ b/desktop/source/app/app.cxx
-@@ -194,7 +194,7 @@ void removeTree(OUString const & url) {
-     osl::FileBase::RC rc = osl::Directory::remove(url);
-     SAL_WARN_IF(
-         rc != osl::FileBase::E_None, "desktop",
--        "cannot remove directory " << url << ": " +rc);
-+        "cannot remove directory " << url << ": " << +rc);
-         // at least on Windows XP removing some existing directories fails with
-         // osl::FileBase::E_ACCESS because they are read-only; but keeping those
-         // directories around should be harmless once they are empty
---
-cgit v0.9.0.2-2-gbebe
-From b4f8acb41165a28b2db47acd3c6b624a4c507c54 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Fri, 24 Aug 2012 14:06:15 +0000
-Subject: Fix removeRdbFiles (caused extension update to fail)
-
-removeRdbFiles suffered from a confusion that ImplementationInfo.uri denotes the
-corresponding component (.so, .jar, etc.), but not the .rdb file.  So removing
-an .rdb file silently failed to remove the corresponding implementations, so re-
-installing a similar enough .rdb (as typically happens during extension update)
-would fail due to duplicate implementation names.
-
-Change-Id: I25d4ff72656c99a3af509eef09e89c18cfd0aabe
-Reviewed-on: https://gerrit.libreoffice.org/476
-Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
-Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
----
-diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
-index c3bdba3..7fd1e4a 100644
---- a/cppuhelper/source/defaultbootstrap.cxx
-+++ b/cppuhelper/source/defaultbootstrap.cxx
-@@ -130,9 +130,10 @@ struct ImplementationInfo: private boost::noncopyable {
-         rtl::OUString const & theName, rtl::OUString const & theLoader,
-         rtl::OUString const & theUri, rtl::OUString const & thePrefix,
-         css::uno::Reference< css::uno::XComponentContext > const &
--            theAlienContext):
-+            theAlienContext,
-+        rtl::OUString const & theRdbFile):
-         name(theName), loader(theLoader), uri(theUri), prefix(thePrefix),
--        alienContext(theAlienContext)
-+        alienContext(theAlienContext), rdbFile(theRdbFile)
-     {}
- 
-     explicit ImplementationInfo(rtl::OUString const & theName): name(theName) {}
-@@ -142,6 +143,7 @@ struct ImplementationInfo: private boost::noncopyable {
-     rtl::OUString const uri;
-     rtl::OUString const prefix;
-     css::uno::Reference< css::uno::XComponentContext > const alienContext;
-+    rtl::OUString const rdbFile;
-     std::vector< rtl::OUString > services;
-     std::vector< rtl::OUString > singletons;
- };
-@@ -149,12 +151,12 @@ struct ImplementationInfo: private boost::noncopyable {
- struct Implementation: private boost::noncopyable {
-     Implementation(
-         rtl::OUString const & name, rtl::OUString const & loader,
--        rtl::OUString const & uri,
--        rtl::OUString const & prefix = rtl::OUString(),
--        css::uno::Reference< css::uno::XComponentContext > const &
--            alienContext
--                = css::uno::Reference< css::uno::XComponentContext >()):
--        info(new ImplementationInfo(name, loader, uri, prefix, alienContext)),
-+        rtl::OUString const & uri, rtl::OUString const & prefix,
-+        css::uno::Reference< css::uno::XComponentContext > const & alienContext,
-+        rtl::OUString const & rdbFile):
-+        info(
-+            new ImplementationInfo(
-+                name, loader, uri, prefix, alienContext, rdbFile)),
-         loaded(false)
-     {}
- 
-@@ -466,7 +468,7 @@ void Parser::handleImplementation() {
-     implementation_.reset(
-         new Implementation(
-             attrImplementation_, attrLoader_, attrUri_, attrPrefix_,
--            alienContext_));
-+            alienContext_, reader_.getUrl()));
-     if (!data_->namedImplementations.insert(
-             NamedImplementations::value_type(
-                 attrImplementation_, implementation_)).
-@@ -1502,7 +1504,9 @@ bool ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) {
-         boost::shared_ptr< Implementation > impl(
-             new Implementation(
-                 name, readLegacyRdbString(uri, implKey, "UNO/ACTIVATOR"),
--                readLegacyRdbString(uri, implKey, "UNO/LOCATION")));
-+                readLegacyRdbString(uri, implKey, "UNO/LOCATION"),
-+                rtl::OUString(),
-+                css::uno::Reference< css::uno::XComponentContext >(), uri));
-         if (!data_.namedImplementations.insert(
-                 NamedImplementations::value_type(name, impl)).
-             second)
-@@ -1744,7 +1748,7 @@ void ServiceManager::removeRdbFiles(std::vector< rtl::OUString > const & uris) {
-                  j != data_.namedImplementations.end();)
-             {
-                 assert(j->second.get() != 0);
--                if (j->second->info->uri == *i) {
-+                if (j->second->info->rdbFile == *i) {
-                     clear.push_back(j->second);
-                     //TODO: The below leaves data_ in an inconsistent state upon
-                     // exceptions:
---
-cgit v0.9.0.2-2-gbebe
-From 6d261e7aac12a876acb6496085e5329632595d39 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Fri, 24 Aug 2012 14:45:20 +0000
-Subject: fdo#53968 etc.: Fix more "doesn't start after upgrade" problems
-
-* fdo#53968 revealed that multiple soffice.bin instances can run removeTree in
-  parallel.  Therefore, demoted failures from exceptions to SAL_WARNs.  (And
-  keeping fingers crossed.)
-
-* a8cdce148c76c93c5d41820610d6e6ac175e03a7 "fdo#53655: Ignore failure to remove
-  directories (as happens on Windows XP)" was due to a forgotten
-  osl::Directory::close before calling osl::Directory::remove after all.
-
-* UserInstallations have been seen in the wild where no extensions were
-  installed per-user (any longer), but user/uno_packages/cache/registry/
-  com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files
-  contained data nevertheless.  To reliably clean out any old junk,
-  refreshBundledExtensionsDir has been extended to cleanExtensionsCache which in
-  tandem with an extended Desktop::SynchronizeExtensionRepositories now cleanly
-  re-installs all bundled, shared, and per-user extensions after a LO upgrade.
-
-Change-Id: Ic6b5b6c1945d76eb3a65b6cd4512a657b7a835a0
-Reviewed-on: https://gerrit.libreoffice.org/477
-Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
-Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
----
-diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
-index 25b6352..c830b02 100644
---- a/desktop/inc/app.hxx
-+++ b/desktop/inc/app.hxx
-@@ -203,6 +203,7 @@ class Desktop : public Application
- 
-         sal_Bool                        m_bMinimized;
-         sal_Bool                        m_bInvisible;
-+        bool                            m_bCleanedExtensionCache;
-         bool                            m_bServicesRegistered;
-         sal_uInt16                          m_nAppEvents;
-         BootstrapError                  m_aBootstrapError;
-diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
-index 55ebaca..5fb653b 100644
---- a/desktop/source/app/app.cxx
-+++ b/desktop/source/app/app.cxx
-@@ -147,77 +147,81 @@ namespace {
- 
- void removeTree(OUString const & url) {
-     osl::Directory dir(url);
--    switch (dir.open()) {
-+    osl::FileBase::RC rc = dir.open();
-+    switch (rc) {
-     case osl::FileBase::E_None:
-         break;
-     case osl::FileBase::E_NOENT:
-         return; //TODO: SAL_WARN if recursive
-     default:
--        throw css::uno::RuntimeException(
--            "cannot open directory " + url,
--            css::uno::Reference< css::uno::XInterface >());
-+        SAL_WARN("desktop", "cannot open directory " << url << ": " << +rc);
-+        return;
-     }
-     for (;;) {
-         osl::DirectoryItem i;
--        osl::FileBase::RC rc = dir.getNextItem(i, SAL_MAX_UINT32);
-+        rc = dir.getNextItem(i, SAL_MAX_UINT32);
-         if (rc == osl::FileBase::E_NOENT) {
-             break;
-         }
-         if (rc != osl::FileBase::E_None) {
--            throw css::uno::RuntimeException(
--                ("cannot iterate directory " + url + ": "
--                 + OUString::valueOf(static_cast< sal_Int32 >(rc))),
--                css::uno::Reference< css::uno::XInterface >());
-+            SAL_WARN(
-+                "desktop","cannot iterate directory " << url << ": " << +rc);
-+            break;
-         }
-         osl::FileStatus stat(
-             osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName |
-             osl_FileStatus_Mask_FileURL);
-         rc = i.getFileStatus(stat);
-         if (rc != osl::FileBase::E_None) {
--            throw css::uno::RuntimeException(
--                ("cannot stat in directory " + url + ": "
--                 + OUString::valueOf(static_cast< sal_Int32 >(rc))),
--                css::uno::Reference< css::uno::XInterface >());
-+            SAL_WARN(
-+                "desktop", "cannot stat in directory " << url << ": " << +rc);
-+            continue;
-         }
-         if (stat.getFileType() == osl::FileStatus::Directory) { //TODO: symlinks
-             removeTree(stat.getFileURL());
-         } else {
-             rc = osl::File::remove(stat.getFileURL());
--            if (rc != osl::FileBase::E_None) {
--                throw css::uno::RuntimeException(
--                    ("cannot remove file " + stat.getFileURL() + ": "
--                     + OUString::valueOf(static_cast< sal_Int32 >(rc))),
--                    css::uno::Reference< css::uno::XInterface >());
--            }
-+            SAL_WARN_IF(
-+                rc != osl::FileBase::E_None, "desktop",
-+                "cannot remove file " << stat.getFileURL() << ": " << +rc);
-         }
-     }
--    osl::FileBase::RC rc = osl::Directory::remove(url);
-+    if (dir.isOpen()) {
-+        rc = dir.close();
-+        SAL_WARN_IF(
-+            rc != osl::FileBase::E_None, "desktop",
-+            "cannot close directory " << url << ": " << +rc);
-+    }
-+    rc = osl::Directory::remove(url);
-     SAL_WARN_IF(
-         rc != osl::FileBase::E_None, "desktop",
-         "cannot remove directory " << url << ": " << +rc);
--        // at least on Windows XP removing some existing directories fails with
--        // osl::FileBase::E_ACCESS because they are read-only; but keeping those
--        // directories around should be harmless once they are empty
- }
- 
--// Remove any existing UserInstallation's user/extensions/bundled cache
--// remaining from old installations.  Apparently due to the old
--// share/prereg/bundled mechanism (disabled since
--// 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying
--// share/prereg/bundled to avoid startup crashes"), that cache could contain
--// corrupted information (like a UNO component registered twice, which got
--// changed from active to passive registration in one LO version, but the
--// version of the corresponding bundled extension only incremented in a later LO
--// version).  At least in theory, this function could be removed again once no
--// UserInstallation can be poisoned by that old share/prereg/bundled mechanism
--// any more.  (But then Desktop::SynchronizeExtensionRepositories might need to
--// be revisited, see 2d2b19dea1ab401b1b4971ff5b12b87bb11fd666 "Force
--// ExtensionManager resync when the implementation changes" which effectively
--// got reverted again now.  Now, a mismatch between a UserInstallation's
--// user/extensions/bundled and an installation's share/extensions will always be
--// detected here and lead to a removal of user/extensions/bundled, so that
--// Desktop::SynchronizeExtensionRepositories will then definitely resync
--// share/extensions.)
-+// Remove any existing UserInstallation's extensions cache data remaining from
-+// old installations.  This addresses at least two problems:
-+//
-+// For one, apparently due to the old share/prereg/bundled mechanism (disabled
-+// since 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying
-+// share/prereg/bundled to avoid startup crashes"), the user/extensions/bundled
-+// cache could contain corrupted information (like a UNO component registered
-+// twice, which got changed from active to passive registration in one LO
-+// version, but the version of the corresponding bundled extension only
-+// incremented in a later LO version).
-+//
-+// For another, UserInstallations have been seen in the wild where no extensions
-+// were installed per-user (any longer), but user/uno_packages/cache/registry/
-+// com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files
-+// contained data nevertheless.
-+//
-+// When a LO upgrade is detected (i.e., no/ user/extensions/bundled/buildid or
-+// one containing an old build ID), then user/extensions/bundled,
-+// user/extensions/shared, and user/uno_packages/cache/registry/
-+// com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc are
-+// removed.  That should prevent any problems starting the service manager due
-+// to old junk.  Later on in Desktop::SynchronizeExtensionRepositories, the
-+// removed cache data is recreated.
-+//
- // As a special case, if you create a UserInstallation with LO >= 3.6.1, then
- // run an old LO <= 3.5.x using share/prereg/bundled on the same
- // UserInstallation (so that it partially overwrites user/extensions/bundled,
-@@ -230,33 +234,50 @@ void removeTree(OUString const & url) {
- // <= 3.5.x messed with user/extensions/bundled in the meantime, then it would
- // have rewritten the unorc (dropping the token), and LO >= 3.6.1 can detect
- // that.
--void refreshBundledExtensionsDir() {
-+//
-+// Multiple instances of soffice.bin can execute this code in parallel for a
-+// single UserInstallation, as it is called before OfficeIPCThread is set up.
-+// Therefore, any errors here only lead to SAL_WARNs.
-+//
-+// At least in theory, this function could be removed again once no
-+// UserInstallation can be poisoned by old junk any more.
-+bool cleanExtensionCache() {
-     OUString buildId(
-         "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}");
-     rtl::Bootstrap::expandMacros(buildId); //TODO: detect failure
--    OUString dir("$BUNDLED_EXTENSIONS_USER");
--    rtl::Bootstrap::expandMacros(dir); //TODO: detect failure
--    OUString url(dir + "/buildid");
--    OUString nonPrereg(
--        "${$BUNDLED_EXTENSIONS_USER/registry/"
--        "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc:"
--        "LIBO_NON_PREREG_BUNDLED_EXTENSIONS}");
--    rtl::Bootstrap::expandMacros(nonPrereg);
--    if (nonPrereg == "TRUE") {
--        osl::File f(url);
--        switch (f.open(osl_File_OpenFlag_Read)) {
-+    OUString extDir(
-+        "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
-+        ":UserInstallation}/user/extensions");
-+    rtl::Bootstrap::expandMacros(extDir); //TODO: detect failure
-+    OUString bundledDir = extDir + "/bundled";
-+    OUString buildIdFile(bundledDir + "/buildid");
-+    OUString bundledRcFile(
-+        "$BUNDLED_EXTENSIONS_USER/registry/"
-+        "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc");
-+    rtl::Bootstrap::expandMacros(bundledRcFile); //TODO: detect failure
-+    rtl::Bootstrap bundledRc(bundledRcFile);
-+    OUString nonPrereg;
-+    if (bundledRc.getHandle() == 0
-+        || (bundledRc.getFrom("LIBO_NON_PREREG_BUNDLED_EXTENSIONS", nonPrereg)
-+            && nonPrereg == "TRUE"))
-+    {
-+        osl::File f(buildIdFile);
-+        osl::FileBase::RC rc = f.open(osl_File_OpenFlag_Read);
-+        switch (rc) {
-         case osl::FileBase::E_None:
-             {
-                 rtl::ByteSequence s1;
--                osl::FileBase::RC rc = f.readLine(s1);
--                if (f.close() != osl::FileBase::E_None) {
--                    SAL_WARN(
--                        "desktop", "cannot close " + url + " after reading");
--                }
-+                rc = f.readLine(s1);
-+                osl::FileBase::RC rc2 = f.close();
-+                SAL_WARN_IF(
-+                    rc2 != osl::FileBase::E_None, "desktop",
-+                    "cannot close " << buildIdFile << " after reading: "
-+                        << +rc2);
-                 if (rc != osl::FileBase::E_None) {
--                    throw css::uno::RuntimeException(
--                        "cannot read from " + url,
--                        css::uno::Reference< css::uno::XInterface >());
-+                    SAL_WARN(
-+                        "desktop",
-+                        "cannot read from " << buildIdFile << ": " << +rc);
-+                    break;
-                 }
-                 OUString s2(
-                     reinterpret_cast< char const * >(s1.getConstArray()),
-@@ -264,53 +285,56 @@ void refreshBundledExtensionsDir() {
-                     // using ISO 8859-1 avoids any and all conversion errors;
-                     // the content should only be a subset of ASCII, anyway
-                 if (s2 == buildId) {
--                    return;
-+                    return false;
-                 }
-                 break;
-             }
-         case osl::FileBase::E_NOENT:
-             break;
-         default:
--            throw css::uno::RuntimeException(
--                "cannot open " + url + " for reading",
--                css::uno::Reference< css::uno::XInterface >());
-+            SAL_WARN(
-+                "desktop",
-+                "cannot open " << buildIdFile << " for reading: " << +rc);
-+            break;
-         }
-     }
--    removeTree(dir);
--    switch (osl::Directory::createPath(dir)) {
--    case osl::FileBase::E_None:
--    case osl::FileBase::E_EXIST:
--        break;
--    default:
--        throw css::uno::RuntimeException(
--            "cannot create path " + dir,
--            css::uno::Reference< css::uno::XInterface >());
--    }
--    osl::File f(url);
--    if (f.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create) !=
--        osl::FileBase::E_None)
--    {
--        throw css::uno::RuntimeException(
--            "cannot open " + url + " for writing",
--            css::uno::Reference< css::uno::XInterface >());
-+    removeTree(extDir);
-+    OUString userRcFile(
-+        "$UNO_USER_PACKAGES_CACHE/registry/"
-+        "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc");
-+    rtl::Bootstrap::expandMacros(userRcFile); //TODO: detect failure
-+    osl::FileBase::RC rc = osl::File::remove(userRcFile);
-+    SAL_WARN_IF(
-+        rc != osl::FileBase::E_None && rc != osl::FileBase::E_NOENT, "desktop",
-+        "cannot remove file " << userRcFile << ": " << +rc);
-+    rc = osl::Directory::createPath(bundledDir);
-+    SAL_WARN_IF(
-+        rc != osl::FileBase::E_None && rc != osl::FileBase::E_EXIST, "desktop",
-+        "cannot create path " << bundledDir << ": " << +rc);
-+    osl::File f(buildIdFile);
-+    rc = f.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create);
-+    if (rc != osl::FileBase::E_None) {
-+        SAL_WARN(
-+            "desktop",
-+            "cannot open " << buildIdFile << " for writing: " << +rc);
-+        return true;
-     }
-     rtl::OString buf(OUStringToOString(buildId, RTL_TEXTENCODING_UTF8));
-         // using UTF-8 avoids almost all conversion errors (and buildid
-         // containing single surrogate halves should never happen, anyway); the
-         // content should only be a subset of ASCII, anyway
--    sal_uInt64 n;
--    if (f.write(buf.getStr(), buf.getLength(), n) != osl::FileBase::E_None
--        || n != static_cast< sal_uInt32 >(buf.getLength()))
--    {
--        throw css::uno::RuntimeException(
--            "cannot write to " + url,
--            css::uno::Reference< css::uno::XInterface >());
--    }
--    if (f.close() != osl::FileBase::E_None) {
--        throw css::uno::RuntimeException(
--            "cannot close " + url + " after writing",
--            css::uno::Reference< css::uno::XInterface >());
--    }
-+    sal_uInt64 n = 0;
-+    rc = f.write(buf.getStr(), buf.getLength(), n);
-+    SAL_WARN_IF(
-+        (rc != osl::FileBase::E_None
-+         || n != static_cast< sal_uInt32 >(buf.getLength())),
-+        "desktop",
-+        "cannot write to " << buildIdFile << ": " << +rc << ", " << n);
-+    rc = f.close();
-+    SAL_WARN_IF(
-+        rc != osl::FileBase::E_None, "desktop",
-+        "cannot close " << buildIdFile << " after writing: " << +rc);
-+    return true;
- }
- 
- }
-@@ -538,7 +562,8 @@ rtl::OUString ReplaceStringHookProc( const rtl::OUString& rStr )
- }
- 
- Desktop::Desktop()
--: m_bServicesRegistered( false )
-+: m_bCleanedExtensionCache( false )
-+, m_bServicesRegistered( false )
- , m_aBootstrapError( BE_OK )
- {
-     RTL_LOGFILE_TRACE( "desktop (cd100003) ::Desktop::Desktop" );
-@@ -553,7 +578,7 @@ void Desktop::Init()
-     RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::Init" );
-     SetBootstrapStatus(BS_OK);
- 
--    refreshBundledExtensionsDir();
-+    m_bCleanedExtensionCache = cleanExtensionCache();
- 
-     // We need to have service factory before going further, but see fdo#37195.
-     // Doing this will mmap common.rdb, making it not overwritable on windows,
-diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
-index dd01d9b..a6221a9 100644
---- a/desktop/source/app/check_ext_deps.cxx
-+++ b/desktop/source/app/check_ext_deps.cxx
-@@ -51,6 +51,7 @@
- #include "com/sun/star/deployment/ExtensionManager.hpp"
- #include "com/sun/star/deployment/LicenseException.hpp"
- #include "com/sun/star/deployment/ui/LicenseDialog.hpp"
-+#include <com/sun/star/task/OfficeRestartManager.hpp>
- #include <com/sun/star/task/XJob.hpp>
- #include <com/sun/star/task/XJobExecutor.hpp>
- #include <com/sun/star/task/XInteractionApprove.hpp>
-@@ -77,12 +78,15 @@ class SilentCommandEnv
-                                       task::XInteractionHandler,
-                                       ucb::XProgressHandler >
- {
-+    uno::Reference<uno::XComponentContext> mxContext;
-     Desktop    *mpDesktop;
-     sal_Int32   mnLevel;
-     sal_Int32   mnProgress;
- 
- public:
--             SilentCommandEnv( Desktop* pDesktop );
-+    SilentCommandEnv(
-+        uno::Reference<uno::XComponentContext> const & xContext,
-+        Desktop* pDesktop );
-     virtual ~SilentCommandEnv();
- 
-     // XCommandEnvironment
-@@ -105,12 +109,14 @@ public:
- };
- 
- //-----------------------------------------------------------------------------
--SilentCommandEnv::SilentCommandEnv( Desktop* pDesktop )
--{
--    mpDesktop = pDesktop;
--    mnLevel = 0;
--    mnProgress = 25;
--}
-+SilentCommandEnv::SilentCommandEnv(
-+    uno::Reference<uno::XComponentContext> const & xContext,
-+    Desktop* pDesktop ):
-+    mxContext( xContext ),
-+    mpDesktop( pDesktop ),
-+    mnLevel( 0 ),
-+    mnProgress( 25 )
-+{}
- 
- //-----------------------------------------------------------------------------
- SilentCommandEnv::~SilentCommandEnv()
-@@ -144,10 +150,9 @@ void SilentCommandEnv::handle( Reference< task::XInteractionRequest> const & xRe
- 
-     if ( request >>= licExc )
-     {
--        uno::Reference< uno::XComponentContext > xContext = comphelper_getProcessComponentContext();
-         uno::Reference< ui::dialogs::XExecutableDialog > xDialog(
-             deployment::ui::LicenseDialog::create(
--            xContext, VCLUnoHelper::GetInterface( NULL ),
-+            mxContext, VCLUnoHelper::GetInterface( NULL ),
-             licExc.ExtensionName, licExc.Text ) );
-         sal_Int16 res = xDialog->execute();
-         if ( res == ui::dialogs::ExecutableDialogResults::CANCEL )
-@@ -416,7 +421,20 @@ sal_Bool Desktop::CheckExtensionDependencies()
- void Desktop::SynchronizeExtensionRepositories()
- {
-     RTL_LOGFILE_CONTEXT(aLog,"desktop (jl) ::Desktop::SynchronizeExtensionRepositories");
--    dp_misc::syncRepositories( new SilentCommandEnv( this ) );
-+    uno::Reference< uno::XComponentContext > context(
-+        comphelper_getProcessComponentContext());
-+    uno::Reference< ucb::XCommandEnvironment > silent(
-+        new SilentCommandEnv(context, this));
-+    if (m_bCleanedExtensionCache) {
-+        deployment::ExtensionManager::get(context)->reinstallDeployedExtensions(
-+            true, "user", Reference<task::XAbortChannel>(), silent);
-+        task::OfficeRestartManager::get(context)->requestRestart(
-+            silent->getInteractionHandler());
-+    } else {
-+        // reinstallDeployedExtensions above already calls syncRepositories
-+        // internally:
-+        dp_misc::syncRepositories(m_bCleanedExtensionCache, silent);
-+    }
- }
- 
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
-index 29ded17..7795e309 100644
---- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
-+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
-@@ -1124,7 +1124,7 @@ void ExtensionCmdQueue::acceptLicense( const uno::Reference< deployment::XPackag
- 
- void ExtensionCmdQueue::syncRepositories( const uno::Reference< uno::XComponentContext > &xContext )
- {
--    dp_misc::syncRepositories( new ProgressCmdEnv( xContext, NULL, OUSTR("Extension Manager") ) );
-+    dp_misc::syncRepositories( false, new ProgressCmdEnv( xContext, NULL, OUSTR("Extension Manager") ) );
- }
- 
- void ExtensionCmdQueue::stop()
-diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h
-index 29fd140..06e67aa 100644
---- a/desktop/source/deployment/inc/dp_misc.h
-+++ b/desktop/source/deployment/inc/dp_misc.h
-@@ -154,8 +154,10 @@ void TRACE(::rtl::OUString const & sText);
-     recently added or removed.
- */
- DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
--void syncRepositories(::com::sun::star::uno::Reference<
--                      ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv);
-+void syncRepositories(
-+    bool force,
-+    ::com::sun::star::uno::Reference<
-+        ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv);
- 
- }
- 
-diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
-index 68403f1..b3c21b4 100644
---- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
-+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
-@@ -1205,9 +1205,10 @@ uno::Sequence< uno::Sequence<Reference<deploy::XPackage> > >
-    }
- }
- 
--//only to be called from unopkg!!!
-+// Only to be called from unopkg or soffice bootstrap (with force=true in the
-+// latter case):
- void ExtensionManager::reinstallDeployedExtensions(
--    OUString const & repository,
-+    sal_Bool force, OUString const & repository,
-     Reference<task::XAbortChannel> const & xAbortChannel,
-     Reference<ucb::XCommandEnvironment> const & xCmdEnv )
-     throw (deploy::DeploymentException,
-@@ -1220,10 +1221,11 @@ void ExtensionManager::reinstallDeployedExtensions(
-             xPackageManager = getPackageManager(repository);
- 
-         ::osl::MutexGuard guard(getMutex());
--        xPackageManager->reinstallDeployedPackages(xAbortChannel, xCmdEnv);
-+        xPackageManager->reinstallDeployedPackages(
-+            force, xAbortChannel, xCmdEnv);
-         //We must sync here, otherwise we will get exceptions when extensions
-         //are removed.
--        dp_misc::syncRepositories(xCmdEnv);
-+        dp_misc::syncRepositories(force, xCmdEnv);
-         const uno::Sequence< Reference<deploy::XPackage> > extensions(
-             xPackageManager->getDeployedPackages(xAbortChannel, xCmdEnv));
- 
-diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
-index 22e2d41..ec1edbc 100644
---- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
-+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
-@@ -182,7 +182,7 @@ public:
-             css::uno::RuntimeException);
- 
-     virtual void SAL_CALL reinstallDeployedExtensions(
--        ::rtl::OUString const & repository,
-+        sal_Bool force, ::rtl::OUString const & repository,
-         css::uno::Reference< css::task::XAbortChannel> const & xAbortChannel,
-         css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv )
-         throw (
-diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
-index 8a08320c..8e3d109 100644
---- a/desktop/source/deployment/manager/dp_manager.cxx
-+++ b/desktop/source/deployment/manager/dp_manager.cxx
-@@ -1164,14 +1164,14 @@ PackageManagerImpl::getDeployedPackages(
- //ToDo: the function must not call registerPackage, do this in
- //XExtensionManager.reinstallDeployedExtensions
- void PackageManagerImpl::reinstallDeployedPackages(
--    Reference<task::XAbortChannel> const &  /*xAbortChannel*/,
-+    sal_Bool force, Reference<task::XAbortChannel> const &  /*xAbortChannel*/,
-     Reference<XCommandEnvironment> const & xCmdEnv_ )
-     throw (deployment::DeploymentException,
-            CommandFailedException, CommandAbortedException,
-            lang::IllegalArgumentException, RuntimeException)
- {
-     check();
--    if (office_is_running())
-+    if (!force && office_is_running())
-         throw RuntimeException(
-             OUSTR("You must close any running Office process before "
-                   "reinstalling packages!"), static_cast<OWeakObject *>(this) );
-diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
-index 3b335d7..3c7f8d9 100644
---- a/desktop/source/deployment/manager/dp_manager.h
-+++ b/desktop/source/deployment/manager/dp_manager.h
-@@ -236,6 +236,7 @@ public:
-                css::uno::RuntimeException);
- 
-     virtual void SAL_CALL reinstallDeployedPackages(
-+        sal_Bool force,
-         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-         css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-         throw (css::deployment::DeploymentException,
-diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
-index b225db6..9ed579f 100644
---- a/desktop/source/deployment/misc/dp_misc.cxx
-+++ b/desktop/source/deployment/misc/dp_misc.cxx
-@@ -591,7 +591,7 @@ void TRACE(::rtl::OString const & sText)
- }
- 
- void syncRepositories(
--    Reference<ucb::XCommandEnvironment> const & xCmdEnv)
-+    bool force, Reference<ucb::XCommandEnvironment> const & xCmdEnv)
- {
-     OUString sDisable;
-     ::rtl::Bootstrap::get( OUSTR( "DISABLE_EXTENSION_SYNCHRONIZATION" ), sDisable, OUString() );
-@@ -602,7 +602,8 @@ void syncRepositories(
-     //synchronize shared before bundled otherewise there are
-     //more revoke and registration calls.
-     sal_Bool bModified = false;
--    if (needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("shared")))
-+    if (force
-+        || needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("shared")))
-         || needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("bundled"))))
-     {
-         xExtensionManager =
-diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
-index 43faed5..ef16ea1 100644
---- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
-+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
-@@ -392,7 +392,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
-         //synching is done in XExtensionManager.reinstall
-         if (!subcmd_gui && ! subCommand.equals(OUSTR("reinstall"))
-             && ! dp_misc::office_is_running())
--            dp_misc::syncRepositories(xCmdEnv);
-+            dp_misc::syncRepositories(false, xCmdEnv);
- 
-         if ( subcmd_add || subCommand == "remove" )
-         {
-@@ -436,7 +436,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
-                      RTL_CONSTASCII_STRINGPARAM("reinstall") ))
-         {
-             xExtensionManager->reinstallDeployedExtensions(
--                repository, Reference<task::XAbortChannel>(), xCmdEnv);
-+                false, repository, Reference<task::XAbortChannel>(), xCmdEnv);
-         }
-         else if ( subCommand == "list" )
-         {
-diff --git a/offapi/com/sun/star/deployment/XExtensionManager.idl b/offapi/com/sun/star/deployment/XExtensionManager.idl
-index b68ab20..2912e45 100644
---- a/offapi/com/sun/star/deployment/XExtensionManager.idl
-+++ b/offapi/com/sun/star/deployment/XExtensionManager.idl
-@@ -260,6 +260,9 @@ interface XExtensionManager
-         <p>
-         Please use this in case of suspected cache inconsistencies only.
-         </p>
-+        @param force
-+               set to true when called during soffice bootstrap after cleaning
-+               old extension cache
-         @param repositroy
-                the name of the repository
-         @param xAbortChannel
-@@ -268,6 +271,7 @@ interface XExtensionManager
-                command environment for error and progress handling
-     */
-     void reinstallDeployedExtensions(
-+        [in] boolean force,
-         [in] string repository,
-         [in] com::sun::star::task::XAbortChannel xAbortChannel,
-         [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv )
-diff --git a/offapi/com/sun/star/deployment/XPackageManager.idl b/offapi/com/sun/star/deployment/XPackageManager.idl
-index 12e7e0e..39ff04a 100644
---- a/offapi/com/sun/star/deployment/XPackageManager.idl
-+++ b/offapi/com/sun/star/deployment/XPackageManager.idl
-@@ -225,12 +225,16 @@ interface XPackageManager
-         Please use this in case of suspected cache inconsistencies only.
-         </p>
- 
-+        @param force
-+               set to true when called during soffice bootstrap after cleaning
-+               old extension cache
-         @param xAbortChannel
-                abort channel to asynchronously abort the adding process
-         @param xCmdEnv
-                command environment for error and progress handling
-     */
-     void reinstallDeployedPackages(
-+        [in] boolean force,
-         [in] com::sun::star::task::XAbortChannel xAbortChannel,
-         [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv )
-         raises (DeploymentException,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/libreoffice/librelogo.diff b/extra/libreoffice/librelogo.diff
new file mode 100644
index 000000000..c17143225
--- /dev/null
+++ b/extra/libreoffice/librelogo.diff
@@ -0,0 +1,43 @@
+From 939daba04c25a9a3b7be2f3df39692453cf9a304 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Thu, 21 Mar 2013 14:57:18 +0000
+Subject: Missing dependency of librelogo on writer
+
+...at least due to dependency of librelogo.xcd on writer.xcd, see
+82c53d537a05dadf4d7fd7ea41292897bf2d47c7 "Missing dependency."
+
+Otherwise, having librelogo installed but not writer will cause an uncaught
+RuntimeException from configmgr::Components::parseXcdFiles
+(configmgr/source/components.cxx) early on in soffice.bin.
+
+(cherry picked from commit 4e69b35674882d8d675a677940805b187cad0bc3)
+Conflicts:
+	setup_native/source/packinfo/packinfo_office.txt
+
+Change-Id: I97565fe5c790ed182bb27fd722c650acf8a8ee08
+Reviewed-on: https://gerrit.libreoffice.org/2898
+Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
+Reviewed-by: Andras Timar <atimar@suse.com>
+Reviewed-by: Petr Mladek <pmladek@suse.cz>
+Tested-by: Petr Mladek <pmladek@suse.cz>
+---
+diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
+index 3e8c89e..cbf8c490 100644
+--- a/setup_native/source/packinfo/packinfo_office.txt
++++ b/setup_native/source/packinfo/packinfo_office.txt
+@@ -314,10 +314,10 @@ End
+ Start
+ module = "gid_Module_Optional_Pyuno_LibreLogo"
+ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-librelogo"
+-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, SUNWPython"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer,SUNWPython"
+ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo"
+-freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
+-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01"
++freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer"
++requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer"
+ copyright = "2012 The Document Foundation"
+ solariscopyright = "solariscopyrightfile"
+ vendor = "The Document Foundation"
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/libreoffice/libreoffice-common.csh b/extra/libreoffice/libreoffice-common.csh
index 5efa39404..502512189 100644
--- a/extra/libreoffice/libreoffice-common.csh
+++ b/extra/libreoffice/libreoffice-common.csh
@@ -1,5 +1,3 @@
-#setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program
-
 # to force a certain look'n feel
 
 #setenv SAL_USE_VCLPLUGIN gen
diff --git a/extra/libreoffice/libreoffice-common.sh b/extra/libreoffice/libreoffice-common.sh
index 795867125..7bfdcf7f6 100644
--- a/extra/libreoffice/libreoffice-common.sh
+++ b/extra/libreoffice/libreoffice-common.sh
@@ -1,5 +1,3 @@
-#export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program"
-
 # to force a certain look'n feel
 
 #export SAL_USE_VCLPLUGIN=gen
diff --git a/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff b/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
index e86548136..3317b3ca5 100644
--- a/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
+++ b/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
@@ -17,9 +17,9 @@ index f93ac5e..92a2891 100644
 --- a/pyuno/source/module/uno.py
 +++ b/pyuno/source/module/uno.py
 @@ -26,8 +26,12 @@
- # for a copy of the LGPLv3 License.
+ #   except in compliance with the License. You may obtain a copy of
+ #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  #
- #*************************************************************************
 +import os
  import sys
  
@@ -33,12 +33,12 @@ diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/o
 index 610ac5f..df243d0 100755
 --- a/scripting/source/pyprov/officehelper.py
 +++ b/scripting/source/pyprov/officehelper.py
-@@ -53,7 +53,7 @@ def bootstrap():
+@@ -44,7 +44,7 @@ def bootstrap():
          if "UNO_PATH" in os.environ:
              sOffice = os.environ["UNO_PATH"]
          else:
 -            sOffice = "" # lets hope for the best
 +            sOffice = "/usr/lib/libreoffice/program"
          sOffice = os.path.join(sOffice, "soffice")
-         if platform.startswith("win"): 
+         if platform.startswith("win"):
              sOffice += ".exe"
diff --git a/extra/libreoffice/remove_unused_vars.diff b/extra/libreoffice/remove_unused_vars.diff
new file mode 100644
index 000000000..7970b913c
--- /dev/null
+++ b/extra/libreoffice/remove_unused_vars.diff
@@ -0,0 +1,26 @@
+From 305bf19e390aebdf2d20ea052a92f782e8d1185c Mon Sep 17 00:00:00 2001
+From: Thomas Arnhold <thomas@arnhold.org>
+Date: Sun, 24 Feb 2013 17:39:08 +0000
+Subject: loplugin: unused variables
+
+And some fallout.
+
+Change-Id: I8dfc12f3566e72d79d4f9930284c92577aa485a1
+---
+(limited to 'sd/source/ui/toolpanel/controls/MasterPageObserver.cxx')
+
+diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
+index 1d27c9d..cd7df65 100644
+--- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
++++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
+@@ -226,8 +226,6 @@ void MasterPageObserver::Implementation::AddEventListener (
+         // Tell the new listener about all the master pages that are
+         // currently in use.
+         typedef ::std::vector<String> StringList;
+-        StringList aNewMasterPages;
+-        StringList aRemovedMasterPages;
+         MasterPageContainer::iterator aDocumentIterator;
+         for (aDocumentIterator=maUsedMasterPages.begin();
+              aDocumentIterator!=maUsedMasterPages.end();
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD
index 824f558fb..86a7df1e0 100644
--- a/extra/librsvg/PKGBUILD
+++ b/extra/librsvg/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169956 2012-10-30 22:47:03Z heftig $
+# $Id: PKGBUILD 183436 2013-04-21 22:11:30Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=librsvg
-pkgver=2.36.4
-pkgrel=1.1
+pkgver=2.37.0
+pkgrel=1
 pkgdesc="A SVG viewing library"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
@@ -12,10 +12,10 @@ makedepends=('intltool' 'gtk2' 'gtk3' 'gobject-introspection')
 optdepends=('gtk3: for rsvg-view-3'
             'gtk2: gtk2 SVG engine module')
 options=('!libtool' '!emptydirs')
-url="http://librsvg.sourceforge.net/"
+url="https://live.gnome.org/LibRsvg"
 install=librsvg.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2')
+sha256sums=('06c57dbcb29369d147b4e6ff4257c42ae5120c504c30fb567a27034ee30fd835')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libsamplerate/PKGBUILD b/extra/libsamplerate/PKGBUILD
index fdd02dc4f..bd788e0d2 100644
--- a/extra/libsamplerate/PKGBUILD
+++ b/extra/libsamplerate/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libsamplerate
 pkgver=0.1.8
-pkgrel=1.2
+pkgrel=1.3
 pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mega-nerd.com/SRC/index.html"
diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD
index dc71c6b8f..0d1a717b1 100644
--- a/extra/libsecret/PKGBUILD
+++ b/extra/libsecret/PKGBUILD
@@ -2,17 +2,17 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsecret
-pkgver=0.12
-pkgrel=2
+pkgver=0.15
+pkgrel=1
 pkgdesc='library for storing and retrieving passwords and other secrets.'
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="https://live.gnome.org/Libsecret"
 depends=('glib2' 'libgcrypt')
-makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
+makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'vala')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('323db75a5e73058d3eb95597d9f798fd715ec7d58f500be84628b8f9a0617c01')
+sha256sums=('33e728b843efbe099483376ff5a3469260ee4b6ce035c7730909ac3793cb0fb8')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libsidplay/PKGBUILD b/extra/libsidplay/PKGBUILD
index 1331d9dd4..fc1089abe 100644
--- a/extra/libsidplay/PKGBUILD
+++ b/extra/libsidplay/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libsidplay
 pkgver=1.36.59
-pkgrel=5.1
+pkgrel=5.2
 pkgdesc="A library for playing SID music files."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://critical.ch/distfiles/"
diff --git a/extra/libsigc++/PKGBUILD b/extra/libsigc++/PKGBUILD
index 59a9b4a03..47e2fd029 100644
--- a/extra/libsigc++/PKGBUILD
+++ b/extra/libsigc++/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 166999 2012-09-24 17:45:03Z jgc $
+# $Id: PKGBUILD 183319 2013-04-21 22:06:38Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=libsigc++
 pkgname=('libsigc++' 'libsigc++-docs')
-pkgver=2.2.11
+pkgver=2.3.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://libsigc.sourceforge.net/"
 makedepends=('gcc-libs')
 options=('!libtool' '!emptydirs')
-source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.2/${pkgbase}-${pkgver}.tar.xz")
-sha256sums=('9834045f74f56752c2c6b3cdc195c30ab8314ad22dc8e626d6f67f940f1e4957')
+source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.3/${pkgbase}-${pkgver}.tar.xz")
+sha256sums=('67d05852b31fdb267c9fdcecd40b046a11aa54d884435e99e3c60dd20cd60393')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/libsndfile/PKGBUILD b/extra/libsndfile/PKGBUILD
index 088e1ddf1..3c408ba4c 100644
--- a/extra/libsndfile/PKGBUILD
+++ b/extra/libsndfile/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libsndfile
 pkgver=1.0.25
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc="A C library for reading and writing files containing sampled sound"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mega-nerd.com/libsndfile"
diff --git a/extra/libsocialweb/PKGBUILD b/extra/libsocialweb/PKGBUILD
index d0bc80db8..4802c033a 100644
--- a/extra/libsocialweb/PKGBUILD
+++ b/extra/libsocialweb/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 172299 2012-12-02 08:28:48Z ibiru $
+# $Id: PKGBUILD 183438 2013-04-21 22:11:34Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libsocialweb
 pkgver=0.25.21
-pkgrel=1
+pkgrel=2
 pkgdesc="A personal social data server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'gconf' 'libsoup-gnome' 'rest' 'dbus-glib' 'libgnome-keyring'
-         'json-glib' 'networkmanager')
-makedepends=('intltool' 'gtk-doc' 'vala' 'gobject-introspection')
+license=(GPL2)
+depends=(glib2 gconf 'libsoup>=2.24.0' rest dbus-glib libgnome-keyring
+         json-glib networkmanager)
+makedepends=(intltool gtk-doc vala gobject-introspection)
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
        libsocialweb-gir-fix.patch)
diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD
index 454c97b0f..51d518a4b 100644
--- a/extra/libsoup/PKGBUILD
+++ b/extra/libsoup/PKGBUILD
@@ -1,49 +1,34 @@
-# $Id: PKGBUILD 175189 2013-01-16 10:55:26Z jgc $
+# $Id: PKGBUILD 183606 2013-04-24 20:33:35Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgbase=libsoup
-pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.40.3
+pkgname=libsoup
+pkgver=2.42.2
 pkgrel=1
+pkgdesc="GNOME HTTP Library"
 arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
-makedepends=('glib2' 'libxml2' 'sqlite' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking' 'python2')
+license=(LGPL)
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+depends=(glib2 libxml2 glib-networking sqlite)
+makedepends=(intltool gobject-introspection python2)
+provides=("libsoup-gnome=$pkgver-$pkgrel")
+conflicts=(libsoup-gnome)
+replaces=(libsoup-gnome)
 options=('!libtool' '!emptydirs')
-sha256sums=('82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('1f4f9cc55ba483dc8defea0c3f97cc507dc48384c5529179e29c1e6d05630dbf')
 
 build() {
-  cd "$pkgbase-$pkgver"
-  sed -i -e 's/env python/python2/' libsoup/tld-parser.py
+  cd $pkgname-$pkgver
+
+  # Python3 has UnicodeDecodeErrors
+  sed -i -e '1s/python$/&2/' libsoup/tld-parser.py
+
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static
   make
 }
 
-package_libsoup() {
-  pkgdesc="GNOME HTTP Library - base library"
-  depends=('glib2' 'libxml2' 'glib-networking')
-
-  cd "$pkgbase-$pkgver"
+package() {
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-
-  rm -f "$pkgdir"/usr/lib/libsoup-gnome-2.4.*
-  rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-gnome-2.4.pc"
-  rm -rf "$pkgdir/usr/include/libsoup-gnome-2.4"
-  rm -f "$pkgdir/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib"
-}
-
-package_libsoup-gnome() {
-  pkgdesc="GNOME HTTP Library - GNOME libraries"
-  depends=("libsoup=$pkgver" 'libgnome-keyring' 'sqlite')
-
-  cd "$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  rm -f "$pkgdir"/usr/lib/libsoup-2.4.*
-  rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-2.4.pc"
-  rm -rf "$pkgdir/usr/include/libsoup-2.4"
-  rm -rf "$pkgdir/usr/share"
-  rm -f "$pkgdir/usr/lib/girepository-1.0/Soup-2.4.typelib"
 }
diff --git a/extra/libspectre/PKGBUILD b/extra/libspectre/PKGBUILD
index 025881c24..fddc1b1c3 100644
--- a/extra/libspectre/PKGBUILD
+++ b/extra/libspectre/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libspectre
 pkgver=0.2.7
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="Small library for rendering Postscript documents"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
diff --git a/extra/libspiro/PKGBUILD b/extra/libspiro/PKGBUILD
index b8a49701c..706f208fe 100644
--- a/extra/libspiro/PKGBUILD
+++ b/extra/libspiro/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libspiro
 pkgver=20071029
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc='Simplifies the drawing of beautiful curves'
 url='http://libspiro.sourceforge.net/'
 license=('GPL')
diff --git a/extra/libssh/PKGBUILD b/extra/libssh/PKGBUILD
index ed8bb0695..b836561e8 100644
--- a/extra/libssh/PKGBUILD
+++ b/extra/libssh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 172472 2012-12-03 12:34:31Z tomegun $
+# $Id: PKGBUILD 180604 2013-03-24 15:55:47Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: ice-man <icemanf@gmail.com>
 # Contributor: sergeantspoon <sergeantspoon@archlinux.us>
 
 pkgname=libssh
-pkgver=0.5.3
+pkgver=0.5.4
 pkgrel=1
 pkgdesc="Library for accessing ssh client services through C libraries"
 url="http://www.libssh.org/"
@@ -13,7 +13,7 @@ license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('openssl')
 makedepends=('cmake' 'doxygen')
-source=("https://red.libssh.org/attachments/download/38/${pkgname}-${pkgver}.tar.gz")
+source=("https://red.libssh.org/attachments/download/41/${pkgname}-${pkgver}.tar.gz")
 
 build() {
   cd "${srcdir}"
@@ -29,4 +29,4 @@ package(){
   cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('9ad01838d3b89d98e900e0f6260a88cc')
+md5sums=('b8b4e733c13dfabae33b2688ef82dacc')
diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD
index 46394ed83..26476cc91 100644
--- a/extra/libtasn1/PKGBUILD
+++ b/extra/libtasn1/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173800 2012-12-24 00:28:32Z andyrtr $
+# $Id: PKGBUILD 183190 2013-04-18 16:15:55Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=libtasn1
-pkgver=3.2
+pkgver=3.3
 pkgrel=1
 pkgdesc="The ASN.1 library used in GNUTLS"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ depends=('glibc' 'texinfo')
 options=('!libtool')
 install=libtasn1.install
 source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('1b07629163025b9693aae9b8957842b2'
-         '67bdae9b78ac7bbfa2ab24c7d46bd577')
+md5sums=('2bdd687f487c50a0382b99553866a6e0'
+         'SKIP')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libtasn1/buffer_overflow_fix.diff b/extra/libtasn1/buffer_overflow_fix.diff
deleted file mode 100644
index c1e71015c..000000000
--- a/extra/libtasn1/buffer_overflow_fix.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-From aa6e97f68d6c8d06f531d9b6bb462dc1c0720f77 Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-Date: Sun, 25 Nov 2012 14:16:24 +0100
-Subject: [PATCH] corrected possible buffer overflow in parser errors.
-
----
- lib/ASN1.c |    6 +++---
- lib/ASN1.y |    6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/lib/ASN1.c b/lib/ASN1.c
-index 2a60527..df6fb64 100644
---- a/lib/ASN1.c
-+++ b/lib/ASN1.c
-@@ -119,7 +119,7 @@ static unsigned int line_number;	/* line number describing the
- 					   parser position inside the
- 					   file */
- static char last_error[ASN1_MAX_ERROR_DESCRIPTION_SIZE] = "";
--static char last_error_token[ASN1_MAX_NAME_SIZE+1] = ""; /* used when expected errors occur */
-+static char last_error_token[ASN1_MAX_ERROR_DESCRIPTION_SIZE+1] = ""; /* used when expected errors occur */
- static char last_token[ASN1_MAX_NAME_SIZE+1] = ""; /* last token find in the file
- 					   to parse before the 'parse
- 					   error' */
-@@ -3283,7 +3283,7 @@ _asn1_yyerror (const char *s)
-       strcmp (last_token, "TeletexString") == 0 ||
-       strcmp (last_token, "BMPString") == 0)
-     {
--      snprintf (last_error_token, ASN1_MAX_ERROR_DESCRIPTION_SIZE,
-+      snprintf (last_error_token, sizeof(last_error_token),
-                 "%s", last_token);
-       fprintf(stderr, 
-                "%s:%u: Warning: %s is a built-in ASN.1 type.\n",
-@@ -3294,7 +3294,7 @@ _asn1_yyerror (const char *s)
- 
-   if (result_parse != ASN1_NAME_TOO_LONG)
-     {
--      snprintf (last_error, ASN1_MAX_ERROR_DESCRIPTION_SIZE,
-+      snprintf (last_error, sizeof(last_error),
-                 "%s:%u: Error: %s near '%s'", file_name,
-                 line_number, s, last_token);
-       result_parse = ASN1_SYNTAX_ERROR;
-diff --git a/lib/ASN1.y b/lib/ASN1.y
-index 874eb13..e0add54 100644
---- a/lib/ASN1.y
-+++ b/lib/ASN1.y
-@@ -42,7 +42,7 @@ static unsigned int line_number;	/* line number describing the
- 					   parser position inside the
- 					   file */
- static char last_error[ASN1_MAX_ERROR_DESCRIPTION_SIZE] = "";
--static char last_error_token[ASN1_MAX_NAME_SIZE+1] = ""; /* used when expected errors occur */
-+static char last_error_token[ASN1_MAX_ERROR_DESCRIPTION_SIZE+1] = ""; /* used when expected errors occur */
- static char last_token[ASN1_MAX_NAME_SIZE+1] = ""; /* last token find in the file
- 					   to parse before the 'parse
- 					   error' */
-@@ -869,7 +869,7 @@ _asn1_yyerror (const char *s)
-       strcmp (last_token, "TeletexString") == 0 ||
-       strcmp (last_token, "BMPString") == 0)
-     {
--      snprintf (last_error_token, ASN1_MAX_ERROR_DESCRIPTION_SIZE,
-+      snprintf (last_error_token, sizeof(last_error_token),
-                 "%s", last_token);
-       fprintf(stderr, 
-                "%s:%u: Warning: %s is a built-in ASN.1 type.\n",
-@@ -880,7 +880,7 @@ _asn1_yyerror (const char *s)
- 
-   if (result_parse != ASN1_NAME_TOO_LONG)
-     {
--      snprintf (last_error, ASN1_MAX_ERROR_DESCRIPTION_SIZE,
-+      snprintf (last_error, sizeof(last_error),
-                 "%s:%u: Error: %s near '%s'", file_name,
-                 line_number, s, last_token);
-       result_parse = ASN1_SYNTAX_ERROR;
--- 
-1.7.2.5
-
diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD
index 5d29aeb67..08e987e47 100644
--- a/extra/libtiff/PKGBUILD
+++ b/extra/libtiff/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libtiff
 pkgver=4.0.3
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Library for manipulation of TIFF images"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.remotesensing.org/libtiff/"
diff --git a/extra/libtiger/PKGBUILD b/extra/libtiger/PKGBUILD
index 2b99ce106..35f4736ce 100644
--- a/extra/libtiger/PKGBUILD
+++ b/extra/libtiger/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libtiger
 pkgver=0.3.4
-pkgrel=3.1
+pkgrel=3.2
 pkgdesc="A rendering library for Kate streams using Pango and Cairo"
 url="http://libtiger.googlecode.com/"
 license=('LGPL')
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 3a9cbcd30..728f89d57 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 176291 2013-01-28 16:48:24Z stephane $
+# $Id: PKGBUILD 181124 2013-03-31 19:16:50Z stephane $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
-pkgver=0.16.7
+pkgver=0.16.9
 pkgrel=2
 epoch=1
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
@@ -14,7 +14,7 @@ depends=('boost-libs' 'geoip' 'python2')
 makedepends=('boost')
 options=('!libtool' '!emptydirs')
 source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('94b132a17d8f6a5345937731343398be8d31f170')
+sha1sums=('4335c8b275f041d6d34a493b21f2d7234ffca34b')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libva-intel-driver/PKGBUILD b/extra/libva-intel-driver/PKGBUILD
index daebd5ba6..e822af1bc 100644
--- a/extra/libva-intel-driver/PKGBUILD
+++ b/extra/libva-intel-driver/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170694 2012-11-09 19:58:58Z ibiru $
+# $Id: PKGBUILD 182376 2013-04-09 18:36:11Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libva-intel-driver
-pkgver=1.0.19
+pkgver=1.0.20
 pkgrel=1
 pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family."
 arch=('i686' 'x86_64')
@@ -12,11 +12,11 @@ depends=('libva')
 options=('!libtool')
 replaces=('libva-driver-intel')
 source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('9b1c92ca2b59b3b150fd45cb01775e0c114a41a7')
+sha1sums=('0aeba2d78f02c4f2c13b519c468e04fa88b2ae3e')
 
 build() {
   cd $pkgname-$pkgver
-  ./autogen.sh --prefix=/usr
+  ./configure --prefix=/usr
   make
 }
 
diff --git a/extra/libva-intel-driver/build-fix.patch b/extra/libva-intel-driver/build-fix.patch
deleted file mode 100644
index 0127b06cf..000000000
--- a/extra/libva-intel-driver/build-fix.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 73ccb0c88d53298befa6a896d2bb39a041169b36 Mon Sep 17 00:00:00 2001
-From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-Date: Fri, 06 Apr 2012 15:24:36 +0000
-Subject: dri: cope with drm_state changes.
-
-Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
----
-diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
-index 3bea253..20fed99 100644
---- a/src/i965_drv_video.c
-+++ b/src/i965_drv_video.c
-@@ -2380,7 +2380,7 @@ i965_PutSurface(VADriverContextP ctx,
-                 unsigned int flags) /* de-interlacing flags */
- {
-     struct i965_driver_data *i965 = i965_driver_data(ctx); 
--    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-+    struct dri_state *dri_state = (struct dri_state *)ctx->drm_state;
-     struct i965_render_state *render_state = &i965->render_state;
-     struct dri_drawable *dri_drawable;
-     union dri_buffer *buffer;
-@@ -2393,7 +2393,7 @@ i965_PutSurface(VADriverContextP ctx,
-     int pp_flag = 0;
- 
-     /* Currently don't support DRI1 */
--    if (dri_state->driConnectedFlag != VA_DRI2)
-+    if (dri_state->base.auth_type != VA_DRM_AUTH_DRI2)
-         return VA_STATUS_ERROR_UNKNOWN;
- 
-     /* Some broken sources such as H.264 conformance case FM2_SVA_C
-diff --git a/src/intel_driver.c b/src/intel_driver.c
-index 4e6df81..b34d9a1 100644
---- a/src/intel_driver.c
-+++ b/src/intel_driver.c
-@@ -29,7 +29,7 @@
- 
- #include <assert.h>
- 
--#include <va/va_dricommon.h>
-+#include <va/va_drmcommon.h>
- 
- #include "intel_batchbuffer.h"
- #include "intel_memman.h"
-@@ -50,15 +50,17 @@ Bool
- intel_driver_init(VADriverContextP ctx)
- {
-     struct intel_driver_data *intel = intel_driver_data(ctx);
--    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-+    struct drm_state * const drm_state = (struct drm_state *)ctx->drm_state;
-     int has_exec2, has_bsd, has_blt;
- 
--    assert(dri_state);
--    assert(dri_state->driConnectedFlag == VA_DRI2 || 
--           dri_state->driConnectedFlag == VA_DRI1);
-+    assert(drm_state);
-+    assert(drm_state->auth_type == VA_DRM_AUTH_DRI1 ||
-+           drm_state->auth_type == VA_DRM_AUTH_DRI2 ||
-+           drm_state->auth_type == VA_DRM_AUTH_CUSTOM);
- 
--    intel->fd = dri_state->fd;
--    intel->dri2Enabled = (dri_state->driConnectedFlag == VA_DRI2);
-+    intel->fd = drm_state->fd;
-+    intel->dri2Enabled = (drm_state->auth_type == VA_DRM_AUTH_DRI2 ||
-+                          drm_state->auth_type == VA_DRM_AUTH_CUSTOM);
- 
-     if (!intel->dri2Enabled) {
-         return False;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD
index 2922dc84a..7781d7219 100644
--- a/extra/libva/PKGBUILD
+++ b/extra/libva/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168381 2012-10-09 16:30:41Z ibiru $
+# $Id: PKGBUILD 182375 2013-04-09 18:35:29Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libva
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.1.1
+pkgrel=1
 pkgdesc="Video Acceleration (VA) API for Linux"
 arch=('i686' 'x86_64')
 url="http://freedesktop.org/wiki/Software/vaapi"
@@ -14,7 +14,7 @@ optdepends=('libva-vdpau-driver: vdpau back-end for nvidia'
             'libva-intel-driver: back-end for intel cards')
 options=('!libtool')
 source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('af6e912ea86a6378992f5783390ab9cb8e5cadf9')
+sha1sums=('755e488677a196c9ac18b8c0d11aa2a56e050306')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libva/libva-1.1.0-wayland1.patch b/extra/libva/libva-1.1.0-wayland1.patch
new file mode 100644
index 000000000..020981276
--- /dev/null
+++ b/extra/libva/libva-1.1.0-wayland1.patch
@@ -0,0 +1,336 @@
+--- libva-1.1.0.orig/configure.ac	2012-10-04 08:30:51.000000000 -0500
++++ libva-1.1.0/configure.ac	2013-03-05 14:20:21.109767813 -0500
+@@ -78,7 +78,7 @@
+ m4_define([libdrm_version], [2.4])
+ 
+ # Wayland minimum version number
+-m4_define([wayland_api_version], [0.95.0])
++m4_define([wayland_api_version], [1.0.0])
+ 
+ AC_PREREQ(2.57)
+ AC_INIT([libva], [libva_version], [waldo.bastian@intel.com], libva)
+--- libva-1.1.0.orig/test/common/va_display_wayland.c	2012-09-28 09:04:28.000000000 -0500
++++ libva-1.1.0/test/common/va_display_wayland.c	2013-03-05 15:06:59.082134052 -0500
+@@ -33,42 +33,39 @@
+ 
+ struct display {
+     struct wl_display          *display;
++    struct wl_registry         *registry;
+     struct wl_compositor       *compositor;
+     struct wl_shell            *shell;
+     struct wl_shell_surface    *shell_surface;
+     struct wl_surface          *surface;
+     unsigned int                ref_count;
+     int                         event_fd;
+-    unsigned int                event_mask;
+ };
+ 
+ static struct display *g_display;
+ 
+ static void
+-display_handle_global(
+-    struct wl_display *display,
+-    uint32_t           id,
+-    const char        *interface,
+-    uint32_t           version,
+-    void              *data
++registry_handle_global(
++    void               *data,
++    struct wl_registry *registry,
++    uint32_t            id,
++    const char         *interface,
++    uint32_t            version
+ )
+ {
+     struct display * const d = data;
+ 
+     if (strcmp(interface, "wl_compositor") == 0)
+-        d->compositor = wl_display_bind(display, id, &wl_compositor_interface);
++        d->compositor =
++            wl_registry_bind(registry, id, &wl_compositor_interface, 1);
+     else if (strcmp(interface, "wl_shell") == 0)
+-        d->shell = wl_display_bind(display, id, &wl_shell_interface);
++        d->shell = wl_registry_bind(registry, id, &wl_shell_interface, 1);
+ }
+ 
+-static int
+-event_mask_update(uint32_t mask, void *data)
+-{
+-    struct display * const d = data;
+-
+-    d->event_mask = mask;
+-    return 0;
+-}
++static const struct wl_registry_listener registry_listener = {
++    registry_handle_global,
++    NULL,
++};
+ 
+ static VADisplay
+ va_open_display_wayland(void)
+@@ -91,9 +88,10 @@
+             return NULL;
+         }
+         wl_display_set_user_data(d->display, d);
+-        wl_display_add_global_listener(d->display, display_handle_global, d);
+-        d->event_fd = wl_display_get_fd(d->display, event_mask_update, d);
+-        wl_display_iterate(d->display, d->event_mask);
++        d->registry = wl_display_get_registry(d->display);
++        wl_registry_add_listener(d->registry, &registry_listener, d);
++        d->event_fd = wl_display_get_fd(d->display);
++        wl_display_dispatch(d->display);
+ 
+         d->ref_count = 1;
+         g_display = d;
+@@ -182,6 +180,7 @@
+          dst_rect->x, dst_rect->y, dst_rect->width, dst_rect->height
+      );
+ 
++    wl_surface_commit(d->surface);
+     wl_display_flush(d->display);
+     return VA_STATUS_SUCCESS;
+ }
+--- libva-1.1.0.orig/test/putsurface/putsurface_wayland.c	2012-09-28 09:04:28.000000000 -0500
++++ libva-1.1.0/test/putsurface/putsurface_wayland.c	2013-03-05 14:45:49.783865254 -0500
+@@ -102,7 +102,7 @@
+     struct wl_display  *display;
+     struct wl_compositor *compositor;
+     struct wl_shell    *shell;
+-    uint32_t            mask;
++    struct wl_registry *registry;
+     int                 event_fd;
+ };
+ 
+@@ -153,7 +153,7 @@
+     if (wl_drawable->redraw_pending) {
+         wl_display_flush(d->display);
+         while (wl_drawable->redraw_pending)
+-            wl_display_iterate(wl_drawable->display, WL_DISPLAY_READABLE);
++            wl_display_dispatch(wl_drawable->display);
+     }
+ 
+     va_status = vaGetSurfaceBufferWl(va_dpy, va_surface, VA_FRAME_PICTURE, &buffer);
+@@ -169,35 +169,33 @@
+     wl_display_flush(d->display);
+     wl_drawable->redraw_pending = 1;
+     callback = wl_surface_frame(wl_drawable->surface);
++    wl_surface_commit(wl_drawable->surface);
+     wl_callback_add_listener(callback, &frame_callback_listener, wl_drawable);
+     return VA_STATUS_SUCCESS;
+ }
+ 
+ static void
+-display_handle_global(
+-    struct wl_display *display,
+-    uint32_t           id,
+-    const char        *interface,
+-    uint32_t           version,
+-    void              *data
++registry_handle_global(
++    void               *data,
++    struct wl_registry *registry,
++    uint32_t            id,
++    const char         *interface,
++    uint32_t            version
+ )
+ {
+     struct display * const d = data;
+ 
+     if (strcmp(interface, "wl_compositor") == 0)
+-        d->compositor = wl_display_bind(display, id, &wl_compositor_interface);
++        d->compositor =
++            wl_registry_bind(registry, id, &wl_compositor_interface, 1);
+     else if (strcmp(interface, "wl_shell") == 0)
+-        d->shell = wl_display_bind(display, id, &wl_shell_interface);
++        d->shell = wl_registry_bind(registry, id, &wl_shell_interface, 1);
+ }
+ 
+-static int
+-event_mask_update(uint32_t mask, void *data)
+-{
+-    struct display * const d = data;
+-
+-    d->mask = mask;
+-    return 0;
+-}
++static const struct wl_registry_listener registry_listener = {
++    registry_handle_global,
++    NULL,
++};
+ 
+ static void *
+ open_display(void)
+@@ -213,9 +211,10 @@
+         return NULL;
+ 
+     wl_display_set_user_data(d->display, d);
+-    wl_display_add_global_listener(d->display, display_handle_global, d);
+-    d->event_fd = wl_display_get_fd(d->display, event_mask_update, d);
+-    wl_display_iterate(d->display, d->mask);
++    d->registry = wl_display_get_registry(d->display);
++    wl_registry_add_listener(d->registry, &registry_listener, d);
++    d->event_fd = wl_display_get_fd(d->display);
++    wl_display_dispatch(d->display);
+     return d->display;
+ }
+ 
+@@ -298,9 +297,6 @@
+     if (check_event == 0)
+         return 0;
+ 
+-    if (!(d->mask & WL_DISPLAY_READABLE))
+-        return 0;
+-
+     tv.tv_sec  = 0;
+     tv.tv_usec = 0;
+     do {
+@@ -313,7 +309,7 @@
+             break;
+         }
+         if (retval == 1)
+-            wl_display_iterate(d->display, WL_DISPLAY_READABLE);
++            wl_display_dispatch(d->display);
+     } while (retval > 0);
+ 
+ #if 0
+--- libva-1.1.0.orig/va/wayland/va_wayland_drm.c	2012-09-28 09:04:28.000000000 -0500
++++ libva-1.1.0/va/wayland/va_wayland_drm.c	2013-03-05 14:52:34.952330711 -0500
+@@ -44,6 +44,7 @@
+     struct va_wayland_context   base;
+     void                       *handle;
+     struct wl_drm              *drm;
++    struct wl_registry         *registry;
+     void                       *drm_interface;
+     unsigned int                is_authenticated        : 1;
+ } VADisplayContextWaylandDRM;
+@@ -142,6 +143,28 @@
+     }
+ }
+ 
++static void
++registry_handle_global(
++    void               *data,
++    struct wl_registry *registry,
++    uint32_t            id,
++    const char         *interface,
++    uint32_t            version
++)
++{
++    struct va_wayland_drm_context *wl_drm_ctx = data;
++
++    if (strcmp(interface, "wl_drm") == 0) {
++        wl_drm_ctx->drm =
++            wl_registry_bind(wl_drm_ctx->registry, id, wl_drm_ctx->drm_interface, 1);
++    }
++}
++
++static const struct wl_registry_listener registry_listener = {
++    registry_handle_global,
++    NULL,
++};
++
+ bool
+ va_wayland_drm_create(VADisplayContextP pDisplayContext)
+ {
+@@ -168,14 +191,6 @@
+     drm_state->auth_type = 0;
+     ctx->drm_state       = drm_state;
+ 
+-    id = wl_display_get_global(ctx->native_dpy, "wl_drm", 1);
+-    if (!id) {
+-        wl_display_roundtrip(ctx->native_dpy);
+-        id = wl_display_get_global(ctx->native_dpy, "wl_drm", 1);
+-        if (!id)
+-            return false;
+-    }
+-
+     wl_drm_ctx->handle = dlopen(LIBWAYLAND_DRM_NAME, RTLD_LAZY|RTLD_LOCAL);
+     if (!wl_drm_ctx->handle)
+         return false;
+@@ -185,8 +200,14 @@
+     if (!wl_drm_ctx->drm_interface)
+         return false;
+ 
+-    wl_drm_ctx->drm =
+-        wl_display_bind(ctx->native_dpy, id, wl_drm_ctx->drm_interface);
++    wl_drm_ctx->registry = wl_display_get_registry(ctx->native_dpy);
++    wl_registry_add_listener(wl_drm_ctx->registry, &registry_listener, wl_drm_ctx);
++    wl_display_roundtrip(ctx->native_dpy);
++
++    /* registry_handle_global should have been called by the
++     * wl_display_roundtrip above
++     */
++
+     if (!wl_drm_ctx->drm)
+         return false;
+ 
+--- libva-1.1.0.orig/va/wayland/va_wayland_emgd.c	2012-09-28 09:04:28.000000000 -0500
++++ libva-1.1.0/va/wayland/va_wayland_emgd.c	2013-03-05 14:55:57.359895989 -0500
+@@ -40,6 +40,7 @@
+     struct wl_emgd             *emgd;
+     void                       *emgd_interface;
+     unsigned int                is_created      : 1;
++    struct wl_registry         *registry;
+ } VADisplayContextWaylandEMGD;
+ 
+ static inline void
+@@ -86,6 +87,28 @@
+     }
+ }
+ 
++static void
++registry_handle_global(
++    void               *data,
++    struct wl_registry *registry,
++    uint32_t            id,
++    const char         *interface,
++    uint32_t            version
++)
++{
++    VADisplayContextWaylandEMGD *wl_emgd_ctx = data;
++
++    if (strcmp(interface, "wl_emgd") == 0) {
++        wl_emgd_ctx->emgd =
++            wl_registry_bind(registry, id, wl_emgd_ctx->emgd_interface, 1);
++    }
++}
++
++static const struct wl_registry_listener registry_listener = {
++    registry_handle_global,
++    NULL,
++};
++
+ bool
+ va_wayland_emgd_create(VADisplayContextP pDisplayContext)
+ {
+@@ -112,14 +135,6 @@
+     drm_state->auth_type = 0;
+     ctx->drm_state       = drm_state;
+ 
+-    id = wl_display_get_global(ctx->native_dpy, "wl_emgd", 1);
+-    if (!id) {
+-        wl_display_roundtrip(ctx->native_dpy);
+-        id = wl_display_get_global(ctx->native_dpy, "wl_emgd", 1);
+-        if (!id)
+-            return false;
+-    }
+-
+     wl_emgd_ctx->handle = dlopen(LIBWAYLAND_EMGD_NAME, RTLD_LAZY|RTLD_LOCAL);
+     if (!wl_emgd_ctx->handle)
+         return false;
+@@ -129,8 +144,13 @@
+     if (!wl_emgd_ctx->emgd_interface)
+         return false;
+ 
+-    wl_emgd_ctx->emgd =
+-        wl_display_bind(ctx->native_dpy, id, wl_emgd_ctx->emgd_interface);
++    wl_emgd_ctx->registry = wl_display_get_registry(ctx->native_dpy);
++    wl_registry_add_listener(wl_emgd_ctx->registry, &registry_listener, wl_emgd_ctx);
++    wl_display_roundtrip(ctx->native_dpy);
++
++    /* registry_handle_global should have been called by the
++     * wl_display_roundtrip above
++     */
+     if (!wl_emgd_ctx->emgd)
+         return false;
+     return true;
diff --git a/extra/libva/libva.install b/extra/libva/libva.install
deleted file mode 100644
index 4d8b8e24a..000000000
--- a/extra/libva/libva.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_upgrade() { 
-    if  [ "$(vercmp $2 1.0.15-1)" -lt 0 ]; then
-        echo 'Starting with libva version 1.0.15, the intel back-end is now in libva-driver-intel.'
-    fi
-}
diff --git a/extra/libvdpau/PKGBUILD b/extra/libvdpau/PKGBUILD
index 05c4ffb54..f62047d91 100644
--- a/extra/libvdpau/PKGBUILD
+++ b/extra/libvdpau/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libvdpau
 pkgver=0.6
 pkgrel=1
 pkgdesc="Nvidia VDPAU library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url='http://cgit.freedesktop.org/~aplattner/libvdpau'
 depends=('gcc-libs')
 conflicts=('nvidia-utils<190.42-2')
diff --git a/extra/libvisual/PKGBUILD b/extra/libvisual/PKGBUILD
index d55da1ece..2209f5fee 100644
--- a/extra/libvisual/PKGBUILD
+++ b/extra/libvisual/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libvisual
 pkgver=0.4.0
-pkgrel=4.1
+pkgrel=4.2
 pkgdesc="Abstraction library that comes between applications and audio visualisation plugins"
 arch=("i686" "x86_64" 'mips64el')
 url="http://sourceforge.net/projects/libvisual/"
diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD
index c3c807c50..147aa5e14 100644
--- a/extra/libvncserver/PKGBUILD
+++ b/extra/libvncserver/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=libvncserver
 pkgver=0.9.9
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libvncserver.sourceforge.net/"
diff --git a/extra/libvorbis/PKGBUILD b/extra/libvorbis/PKGBUILD
index 69857d8da..0dbef78ca 100644
--- a/extra/libvorbis/PKGBUILD
+++ b/extra/libvorbis/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=libvorbis
 pkgver=1.3.3
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="Vorbis codec library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xiph.org/vorbis/"
diff --git a/extra/libvpx/PKGBUILD b/extra/libvpx/PKGBUILD
index 93d3a494f..6b4cbf122 100644
--- a/extra/libvpx/PKGBUILD
+++ b/extra/libvpx/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=libvpx
 pkgver=1.1.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="The VP8 Codec SDK"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.webmproject.org/"
diff --git a/extra/libwacom/PKGBUILD b/extra/libwacom/PKGBUILD
index 332c26613..c271d60cf 100644
--- a/extra/libwacom/PKGBUILD
+++ b/extra/libwacom/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 164253 2012-07-28 20:26:26Z eric $
+# $Id: PKGBUILD 180845 2013-03-26 22:37:55Z eric $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libwacom
-pkgver=0.6
+pkgver=0.7
 pkgrel=1
 pkgdesc="Library to identify Wacom tablets and their features"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Libwacom"
 license=('MIT')
-depends=('glib2' 'systemd-tools')
+depends=('glib2' 'systemd')
 options=('!libtool')
 source=(http://sourceforge.net/projects/linuxwacom/files/libwacom/$pkgname-$pkgver.tar.bz2)
-sha256sums=('7115690698edc87deec482f0b2526567b858475d2135b5f8ccc946e5e76ec01d')
+sha256sums=('210c48b595461ebee63b1a846a6eb1d8f029b49d02ccbde34eadf551a5a68a78')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD
index 0f94f49b3..dfb345317 100644
--- a/extra/libwebp/PKGBUILD
+++ b/extra/libwebp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173085 2012-12-10 13:18:07Z heftig $
+# $Id: PKGBUILD 181251 2013-04-02 15:58:04Z heftig $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jon Nordby <jononor@gmail.com>
 
 pkgname=libwebp
-pkgver=0.2.1
+pkgver=0.3.0
 pkgrel=1
 pkgdesc="WebP library and conversion tools"
 arch=('x86_64' 'i686' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('libpng' 'libjpeg')
 options=('!libtool')
 source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha256sums=('894e08b8b0043cf007cc1ca893f33d73784565a6e64b0e7aefb201a687392314')
+sha256sums=('8903fca40ece603b9cb20d32105168da7e2a33bebbd4d89001a3c8741ef03ddb')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libwmf/PKGBUILD b/extra/libwmf/PKGBUILD
index 730f64506..e191aa27f 100644
--- a/extra/libwmf/PKGBUILD
+++ b/extra/libwmf/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libwmf
 pkgver=0.2.8.4
-pkgrel=9.1
+pkgrel=9.2
 pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wvware.sourceforge.net/libwmf.html"
diff --git a/extra/libwnck/PKGBUILD b/extra/libwnck/PKGBUILD
index 14b93a70f..ad37e028e 100644
--- a/extra/libwnck/PKGBUILD
+++ b/extra/libwnck/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot  <jgc@archlinux.org>
 pkgname=libwnck
 pkgver=2.30.7
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="Window Navigator Construction Kit"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD
index 7b3688e6d..72701a12b 100644
--- a/extra/libwnck3/PKGBUILD
+++ b/extra/libwnck3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170860 2012-11-12 20:09:16Z heftig $
+# $Id: PKGBUILD 182596 2013-04-10 21:34:12Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libwnck3
 _pkgbasename=libwnck
-pkgver=3.4.4
+pkgver=3.4.5
 pkgrel=1
 pkgdesc="Window Navigator Construction Kit (GTK+3)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 url="http://www.gnome.org/"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('a545a23ea7681fafae033b4f68b69ef022d446a9325286291bb8882b9016a130')
+sha256sums=('560f9709405fb33500c2f79efabdb1c4056866dec281f354ad3da97181fbf381')
 
 build() {
     cd "$_pkgbasename-$pkgver"
diff --git a/extra/libwpd/PKGBUILD b/extra/libwpd/PKGBUILD
index 0f4425672..785d92ef6 100644
--- a/extra/libwpd/PKGBUILD
+++ b/extra/libwpd/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 156639 2012-04-22 00:00:22Z andyrtr $
+# $Id: PKGBUILD 183192 2013-04-18 16:39:00Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=libwpd
-pkgver=0.9.4
+pkgver=0.9.6
 pkgrel=1
 pkgdesc="Library for importing WordPerfect (tm) documents"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libwpd.sourceforge.net/"
 license=('LGPL')
-depends=('gcc-libs')
-makedepends=('libgsf>=1.14.20')
+depends=('gcc-libs' 'zlib')
+makedepends=('libgsf>=1.14.26')
 options=('!libtool' '!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d30d1726c3b113db70daaae423dd4448')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+md5sums=('63f476b892bf783072854b98d2fc4fa2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libwpg/PKGBUILD b/extra/libwpg/PKGBUILD
index 583f095a8..3f9194bbf 100644
--- a/extra/libwpg/PKGBUILD
+++ b/extra/libwpg/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libwpg
 pkgver=0.2.1
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="Library for importing and converting Corel WordPerfect(tm) Graphics images."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libwpg.sourceforge.net/"
diff --git a/extra/libwps/PKGBUILD b/extra/libwps/PKGBUILD
index 0c39c8543..9384d2a88 100644
--- a/extra/libwps/PKGBUILD
+++ b/extra/libwps/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 166173 2012-09-05 06:04:00Z andyrtr $
+# $Id: PKGBUILD 183268 2013-04-20 07:13:33Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Robert McCathie <archaur at rmcc dot com dot au>
 
 pkgname=libwps
-pkgver=0.2.7
+pkgver=0.2.8
 pkgrel=1
 pkgdesc="a Microsoft Works file word processor format import filter library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libwps.sourceforge.net/"
 license=('LGPL')
-depends=('libwpd>=0.9.4')
+depends=('libwpd>=0.9.6')
 makedepends=('boost')
 options=(!libtool)
 source=("http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2")
-md5sums=('d197bd6211669a2fa4ca648faf04bcb1')
+md5sums=('78196c097db366fac66841d032b1ddac')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD
index acdc995ed..867f03f25 100644
--- a/extra/libx11/PKGBUILD
+++ b/extra/libx11/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160633 2012-06-02 21:43:25Z andyrtr $
+# $Id: PKGBUILD 178618 2013-02-25 20:45:01Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libx11
 pkgver=1.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -11,12 +11,8 @@ depends=('libxcb' 'xproto' 'kbproto')
 makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto')
 options=('!libtool')
 license=('custom')
-source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2
-        xorg.sh
-        xorg.csh)
-sha256sums=('c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86'
-            '1a1b5db0320579958fba24774bae7984a1b1b8c647ac6fbd4d8937178c48ed46'
-            '96c85ccbdcb056540f2e2b6cf48dea067f80260c16957ee401c49cf94cea5894')
+source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2)
+sha256sums=('c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86')
 
 build() {
   cd "${srcdir}/libX11-${pkgver}"
@@ -24,7 +20,7 @@ build() {
   make
 }
 
-package() {
+check() {
   cd "${srcdir}/libX11-${pkgver}"
   make check
 }
@@ -33,9 +29,6 @@ package() {
   cd "${srcdir}/libX11-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
-  install -m755 -d "${pkgdir}/etc/profile.d"
-  install -m755 "${srcdir}/"xorg.{sh,csh} "${pkgdir}/etc/profile.d/"
-
   install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD
index 0d1aeff8b..c646844a3 100644
--- a/extra/libxcb/PKGBUILD
+++ b/extra/libxcb/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 174025 2013-01-01 19:16:09Z andyrtr $
+# $Id: PKGBUILD 177994 2013-02-12 20:05:14Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libxcb
 pkgver=1.9
-pkgrel=2
+pkgrel=3
 pkgdesc="X11 client-side library"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xcb.freedesktop.org/"
 depends=('xcb-proto>=1.7' 'libxdmcp' 'libxau')
 makedepends=('pkgconfig' 'libxslt' 'python2')
@@ -20,7 +20,7 @@ sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061'
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch"
-  PYTHON=/usr/bin/python2 
+  export PYTHON=/usr/bin/python2 
   ./autogen.sh --prefix=/usr \
     --enable-xinput \
     --enable-xkb \
diff --git a/extra/libxfce4util/PKGBUILD b/extra/libxfce4util/PKGBUILD
index 7d100380e..b8a6dee86 100644
--- a/extra/libxfce4util/PKGBUILD
+++ b/extra/libxfce4util/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157821 2012-04-30 04:19:32Z foutrelis $
+# $Id: PKGBUILD 184282 2013-05-05 17:43:38Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=libxfce4util
-pkgver=4.10.0
+pkgver=4.10.1
 pkgrel=1
 pkgdesc="Basic utility non-GUI functions for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('glib2')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc')
 options=('!libtool')
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('0979fee12880bb5f011ab38d6c7cc9afe5fd68eb96ccda895cb56dbc16e7608e')
+sha256sums=('e82cd1ad715c02a385b3cf6646cb89aa3c4724446dac1d7e424971df12f6cfbb')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libxfcegui4/PKGBUILD b/extra/libxfcegui4/PKGBUILD
index 3241a75b9..5306a69b6 100644
--- a/extra/libxfcegui4/PKGBUILD
+++ b/extra/libxfcegui4/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libxfcegui4
 pkgver=4.10.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Various Gtk widgets for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
diff --git a/extra/libxfont/PKGBUILD b/extra/libxfont/PKGBUILD
index f4a577a89..9079e706d 100644
--- a/extra/libxfont/PKGBUILD
+++ b/extra/libxfont/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libxfont
 pkgver=1.4.5
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="X11 font rasterisation library"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD
index 154b784de..1c9e25068 100644
--- a/extra/libxi/PKGBUILD
+++ b/extra/libxi/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 175509 2013-01-17 15:47:55Z andyrtr $
+# $Id: PKGBUILD 182037 2013-04-05 19:09:17Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxi
-pkgver=1.6.2
+pkgver=1.7.1
 pkgrel=1
 pkgdesc="X11 Input extension library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org"
 depends=('libxext' 'inputproto')
-makedepends=('pkgconfig' 'xorg-util-macros')
+makedepends=('pkgconfig' 'xorg-util-macros' 'libxfixes')
 options=(!libtool)
 license=('custom')
 source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2)
-sha256sums=('3250fd34cdd099a15b78abdb87c7e1a9b7a2188ab893f273e90d831dbc604058')
+sha256sums=('e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5')
 
 build() {
   cd "${srcdir}/libXi-${pkgver}"
diff --git a/extra/libxkbcommon/PKGBUILD b/extra/libxkbcommon/PKGBUILD
new file mode 100644
index 000000000..7a4dd7345
--- /dev/null
+++ b/extra/libxkbcommon/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 181161 2013-04-01 20:10:49Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Mladen Pejakovic <pejakm@gmail.com>
+
+pkgname=libxkbcommon
+pkgver=0.3.0
+pkgrel=1
+pkgdesc="Keyboard handling library using XKB data"
+arch=(i686 x86_64 mips64el)
+url="http://xkbcommon.org/"
+license=(custom)
+depends=(xkeyboard-config)
+makedepends=(doxygen xorg-util-macros)
+options=('!libtool')
+source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz")
+md5sums=('22a046100738f99b4cc0297aa210f4e4')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/extra/libxkbui/PKGBUILD b/extra/libxkbui/PKGBUILD
index 37b0fcf5b..6ed803c75 100644
--- a/extra/libxkbui/PKGBUILD
+++ b/extra/libxkbui/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libxkbui
 pkgver=1.0.2
-pkgrel=4
+pkgrel=4.1
 pkgdesc="X11 keyboard UI presentation library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
diff --git a/extra/libxmi/PKGBUILD b/extra/libxmi/PKGBUILD
index e8cedeacf..9d5921c27 100644
--- a/extra/libxmi/PKGBUILD
+++ b/extra/libxmi/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libxmi
 pkgver=1.2
-pkgrel=5
+pkgrel=5.1
 pkgdesc="A library for rasterizing 2-D vector graphics"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libxmi/libxmi.html"
@@ -17,7 +17,6 @@ md5sums=('4e6935484f0ad71b531920bf4c546b47')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  autoreconf --force --install
   ./configure --prefix=/usr --infodir=/usr/share/info
   make
 }
diff --git a/extra/libxml2/CVE-2011-0216.patch b/extra/libxml2/CVE-2011-0216.patch
deleted file mode 100644
index dfc99d4de..000000000
--- a/extra/libxml2/CVE-2011-0216.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 69f04562f75212bfcabecd190ea8b06ace28ece2
-Author: Daniel Veillard <veillard@redhat.com>
-Date:   Fri Aug 19 11:05:04 2011 +0800
-
-    Fix an off by one error in encoding
-    
-    this off by one error doesn't seems to reproduce on linux
-    but the error is real.
-
-diff --git a/encoding.c b/encoding.c
-index d1140bf..fb0c38a 100644
---- a/encoding.c
-+++ b/encoding.c
-@@ -1928,7 +1928,7 @@ xmlCharEncFirstLineInt(xmlCharEncodingHandler *handler, xmlBufferPtr out,
-     if (in == NULL) return(-1);
- 
-     /* calculate space available */
--    written = out->size - out->use;
-+    written = out->size - out->use - 1; /* count '\0' */
-     toconv = in->use;
-     /*
-      * echo '<?xml version="1.0" encoding="UCS4"?>' | wc -c => 38
-@@ -2059,7 +2059,7 @@ xmlCharEncInFunc(xmlCharEncodingHandler * handler, xmlBufferPtr out,
-     toconv = in->use;
-     if (toconv == 0)
-         return (0);
--    written = out->size - out->use;
-+    written = out->size - out->use -1; /* count '\0' */
-     if (toconv * 2 >= written) {
-         xmlBufferGrow(out, out->size + toconv * 2);
-         written = out->size - out->use - 1;
diff --git a/extra/libxml2/CVE-2011-1944.patch b/extra/libxml2/CVE-2011-1944.patch
deleted file mode 100644
index 62dd5d229..000000000
--- a/extra/libxml2/CVE-2011-1944.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-commit d7958b21e7f8c447a26bb2436f08402b2c308be4
-Author: Chris Evans <scarybeasts@gmail.com>
-Date:   Wed Mar 23 08:13:06 2011 +0800
-
-    Fix some potential problems on reallocation failures
-    
-    The count was incremented before the allocation
-    and not fixed in case of failure
-    * xpath.c: corrects a few instances where the available count of some
-               structure is updated before we know the allocation actually
-               succeeds
-
-diff --git a/xpath.c b/xpath.c
-index 8b56189..608fe00 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -3522,13 +3522,13 @@ xmlXPathNodeSetAddNs(xmlNodeSetPtr cur, xmlNodePtr node, xmlNsPtr ns) {
-     } else if (cur->nodeNr == cur->nodeMax) {
-         xmlNodePtr *temp;
- 
--        cur->nodeMax *= 2;
--	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *
-+	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *
- 				      sizeof(xmlNodePtr));
- 	if (temp == NULL) {
- 	    xmlXPathErrMemory(NULL, "growing nodeset\n");
- 	    return;
- 	}
-+        cur->nodeMax *= 2;
- 	cur->nodeTab = temp;
-     }
-     cur->nodeTab[cur->nodeNr++] = xmlXPathNodeSetDupNs(node, ns);
-@@ -3627,14 +3627,14 @@ xmlXPathNodeSetAddUnique(xmlNodeSetPtr cur, xmlNodePtr val) {
-     } else if (cur->nodeNr == cur->nodeMax) {
-         xmlNodePtr *temp;
- 
--        cur->nodeMax *= 2;
--	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *
-+	temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *
- 				      sizeof(xmlNodePtr));
- 	if (temp == NULL) {
- 	    xmlXPathErrMemory(NULL, "growing nodeset\n");
- 	    return;
- 	}
- 	cur->nodeTab = temp;
-+        cur->nodeMax *= 2;
-     }
-     if (val->type == XML_NAMESPACE_DECL) {
- 	xmlNsPtr ns = (xmlNsPtr) val;
-@@ -3738,14 +3738,14 @@ xmlXPathNodeSetMerge(xmlNodeSetPtr val1, xmlNodeSetPtr val2) {
- 	} else if (val1->nodeNr == val1->nodeMax) {
- 	    xmlNodePtr *temp;
- 
--	    val1->nodeMax *= 2;
--	    temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax *
-+	    temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * 2 *
- 					     sizeof(xmlNodePtr));
- 	    if (temp == NULL) {
- 	        xmlXPathErrMemory(NULL, "merging nodeset\n");
- 		return(NULL);
- 	    }
- 	    val1->nodeTab = temp;
-+	    val1->nodeMax *= 2;
- 	}
- 	if (n2->type == XML_NAMESPACE_DECL) {
- 	    xmlNsPtr ns = (xmlNsPtr) n2;
-@@ -3907,14 +3907,14 @@ xmlXPathNodeSetMergeAndClear(xmlNodeSetPtr set1, xmlNodeSetPtr set2,
- 	    } else if (set1->nodeNr >= set1->nodeMax) {
- 		xmlNodePtr *temp;
- 
--		set1->nodeMax *= 2;
- 		temp = (xmlNodePtr *) xmlRealloc(
--		    set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr));
-+		    set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr));
- 		if (temp == NULL) {
- 		    xmlXPathErrMemory(NULL, "merging nodeset\n");
- 		    return(NULL);
- 		}
- 		set1->nodeTab = temp;
-+		set1->nodeMax *= 2;
- 	    }
- 	    if (n2->type == XML_NAMESPACE_DECL) {
- 		xmlNsPtr ns = (xmlNsPtr) n2;
-@@ -3991,14 +3991,14 @@ xmlXPathNodeSetMergeAndClearNoDupls(xmlNodeSetPtr set1, xmlNodeSetPtr set2,
- 	    } else if (set1->nodeNr >= set1->nodeMax) {
- 		xmlNodePtr *temp;
- 
--		set1->nodeMax *= 2;
- 		temp = (xmlNodePtr *) xmlRealloc(
--		    set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr));
-+		    set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr));
- 		if (temp == NULL) {
- 		    xmlXPathErrMemory(NULL, "merging nodeset\n");
- 		    return(NULL);
- 		}
- 		set1->nodeTab = temp;
-+		set1->nodeMax *= 2;
- 	    }
- 	    set1->nodeTab[set1->nodeNr++] = n2;
- 	}
diff --git a/extra/libxml2/CVE-2011-2834.patch b/extra/libxml2/CVE-2011-2834.patch
deleted file mode 100644
index cfc61e0c9..000000000
--- a/extra/libxml2/CVE-2011-2834.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-commit 1d4526f6f4ec8d18c40e2a09b387652a6c1aa2cd
-Author: Daniel Veillard <veillard@redhat.com>
-Date:   Tue Oct 11 16:34:34 2011 +0800
-
-    Fix missing error status in XPath evaluation
-    
-    Started by Chris Evans, I added a few more place where the
-    error should have been set in the evaluation context.
-
-diff --git a/xpath.c b/xpath.c
-index bcee2ea..d9d902c 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -2485,6 +2485,7 @@ valuePush(xmlXPathParserContextPtr ctxt, xmlXPathObjectPtr value)
-                                              sizeof(ctxt->valueTab[0]));
-         if (tmp == NULL) {
-             xmlGenericError(xmlGenericErrorContext, "realloc failed !\n");
-+            ctxt->error = XPATH_MEMORY_ERROR;
-             return (0);
-         }
-         ctxt->valueMax *= 2;
-@@ -9340,6 +9341,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) {
- 		if ( (ch & 0xc0) != 0xc0 ) {
- 		    xmlGenericError(xmlGenericErrorContext,
- 			"xmlXPathTranslateFunction: Invalid UTF8 string\n");
-+                    /* not asserting an XPath error is probably better */
- 		    break;
- 		}
- 		/* then skip over remaining bytes for this char */
-@@ -9347,6 +9349,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) {
- 		    if ( (*cptr++ & 0xc0) != 0x80 ) {
- 			xmlGenericError(xmlGenericErrorContext,
- 			    "xmlXPathTranslateFunction: Invalid UTF8 string\n");
-+                        /* not asserting an XPath error is probably better */
- 			break;
- 		    }
- 		if (ch & 0x80) /* must have had error encountered */
-@@ -13410,6 +13413,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
-                         xmlGenericError(xmlGenericErrorContext,
-             "xmlXPathCompOpEval: variable %s bound to undefined prefix %s\n",
-                                     (char *) op->value4, (char *)op->value5);
-+                        ctxt->error = XPATH_UNDEF_PREFIX_ERROR;
-                         return (total);
-                     }
- 		    val = xmlXPathVariableLookupNS(ctxt->context,
-@@ -13464,6 +13468,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
-             "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n",
-                                     (char *)op->value4, (char *)op->value5);
-                             xmlXPathPopFrame(ctxt, frame);
-+                            ctxt->error = XPATH_UNDEF_PREFIX_ERROR;
-                             return (total);
-                         }
-                         func = xmlXPathFunctionLookupNS(ctxt->context,
-@@ -14042,6 +14047,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
-     }
-     xmlGenericError(xmlGenericErrorContext,
-                     "XPath: unknown precompiled operation %d\n", op->op);
-+    ctxt->error = XPATH_INVALID_OPERAND;
-     return (total);
- }
- 
diff --git a/extra/libxml2/CVE-2011-3905.patch b/extra/libxml2/CVE-2011-3905.patch
deleted file mode 100644
index 53373b7da..000000000
--- a/extra/libxml2/CVE-2011-3905.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-commit 77404b8b69bc122d12231807abf1a837d121b551
-Author: Chris Evans <scarybeasts@gmail.com>
-Date:   Wed Dec 14 16:18:25 2011 +0800
-
-    Make sure the parser returns when getting a Stop order
-    
-    patch backported from chromiun bug fixes, assuming author is Chris
-
-diff --git a/parser.c b/parser.c
-index 21d7aa3..4e5dcb9 100644
---- a/parser.c
-+++ b/parser.c
-@@ -4949,7 +4949,8 @@ xmlParsePI(xmlParserCtxtPtr ctxt) {
- 		    (ctxt->sax->processingInstruction != NULL))
- 		    ctxt->sax->processingInstruction(ctxt->userData,
- 		                                     target, NULL);
--		ctxt->instate = state;
-+		if (ctxt->instate != XML_PARSER_EOF)
-+		    ctxt->instate = state;
- 		return;
- 	    }
- 	    buf = (xmlChar *) xmlMallocAtomic(size * sizeof(xmlChar));
-@@ -5029,7 +5030,8 @@ xmlParsePI(xmlParserCtxtPtr ctxt) {
- 	} else {
- 	    xmlFatalErr(ctxt, XML_ERR_PI_NOT_STARTED, NULL);
- 	}
--	ctxt->instate = state;
-+	if (ctxt->instate != XML_PARSER_EOF)
-+	    ctxt->instate = state;
-     }
- }
- 
-@@ -9589,6 +9591,8 @@ xmlParseElement(xmlParserCtxtPtr ctxt) {
-     else
- 	name = xmlParseStartTag(ctxt);
- #endif /* LIBXML_SAX1_ENABLED */
-+    if (ctxt->instate == XML_PARSER_EOF)
-+	return;
-     if (name == NULL) {
- 	spacePop(ctxt);
-         return;
-@@ -10975,6 +10979,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) {
- 		else
- 		    name = xmlParseStartTag(ctxt);
- #endif /* LIBXML_SAX1_ENABLED */
-+		if (ctxt->instate == XML_PARSER_EOF)
-+		    goto done;
- 		if (name == NULL) {
- 		    spacePop(ctxt);
- 		    ctxt->instate = XML_PARSER_EOF;
-@@ -11161,7 +11167,9 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) {
- 		  else
- 		    xmlParseEndTag1(ctxt, 0);
- #endif /* LIBXML_SAX1_ENABLED */
--		if (ctxt->nameNr == 0) {
-+		if (ctxt->instate == XML_PARSER_EOF) {
-+		    /* Nothing */
-+		} else if (ctxt->nameNr == 0) {
- 		    ctxt->instate = XML_PARSER_EPILOG;
- 		} else {
- 		    ctxt->instate = XML_PARSER_CONTENT;
diff --git a/extra/libxml2/CVE-2011-3919.patch b/extra/libxml2/CVE-2011-3919.patch
deleted file mode 100644
index b307e57d2..000000000
--- a/extra/libxml2/CVE-2011-3919.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 5bd3c061823a8499b27422aee04ea20aae24f03e
-Author: Daniel Veillard <veillard@redhat.com>
-Date:   Fri Dec 16 18:53:35 2011 +0800
-
-    Fix an allocation error when copying entities
-
-diff --git a/parser.c b/parser.c
-index 4e5dcb9..c55e41d 100644
---- a/parser.c
-+++ b/parser.c
-@@ -2709,7 +2709,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
- 
- 		buffer[nbchars++] = '&';
- 		if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) {
--		    growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
-+		    growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE);
- 		}
- 		for (;i > 0;i--)
- 		    buffer[nbchars++] = *cur++;
diff --git a/extra/libxml2/largefile64.patch b/extra/libxml2/largefile64.patch
deleted file mode 100644
index 29be82760..000000000
--- a/extra/libxml2/largefile64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libxml2-2.6.32.dfsg.orig/libxml.h
-+++ libxml2-2.6.32.dfsg/libxml.h
-@@ -13,6 +13,9 @@
- #ifndef _LARGEFILE_SOURCE
- #define _LARGEFILE_SOURCE
- #endif
-+#ifndef _LARGEFILE64_SOURCE
-+#define _LARGEFILE64_SOURCE
-+#endif
- #ifndef _FILE_OFFSET_BITS
- #define _FILE_OFFSET_BITS 64
- #endif
diff --git a/extra/libxml2/libxml2-2.7.8-xpath-freeing.patch b/extra/libxml2/libxml2-2.7.8-xpath-freeing.patch
deleted file mode 100644
index 2844f4a74..000000000
--- a/extra/libxml2/libxml2-2.7.8-xpath-freeing.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit df83c17e5a2646bd923f75e5e507bc80d73c9722
-Author: Daniel Veillard <veillard@redhat.com>
-Date:   Wed Nov 17 14:12:14 2010 +0100
-
-    Fix a potential freeing error in XPath
-
-diff --git a/xpath.c b/xpath.c
-index 81e33f6..1447be5 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -11763,11 +11763,15 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- 
- 	    if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {
- 	        xmlXPathObjectPtr tmp;
--		/* pop the result */
-+		/* pop the result if any */
- 		tmp = valuePop(ctxt);
--		xmlXPathReleaseObject(xpctxt, tmp);
--		/* then pop off contextObj, which will be freed later */
--		valuePop(ctxt);
-+                if (tmp != contextObj)
-+                    /*
-+                     * Free up the result
-+                     * then pop off contextObj, which will be freed later
-+                     */
-+                    xmlXPathReleaseObject(xpctxt, tmp);
-+                    valuePop(ctxt);
- 		goto evaluation_error;
- 	    }
- 
diff --git a/extra/libxml2/libxml2-2.7.8-xpath-freeing2.patch b/extra/libxml2/libxml2-2.7.8-xpath-freeing2.patch
deleted file mode 100644
index 714954dba..000000000
--- a/extra/libxml2/libxml2-2.7.8-xpath-freeing2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit fec31bcd452e77c10579467ca87a785b41115de6
-Author: Daniel Veillard <veillard@redhat.com>
-Date:   Thu Nov 18 11:07:24 2010 +0100
-
-    Small fix for previous commit
-
-diff --git a/xpath.c b/xpath.c
-index 1447be5..8b56189 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -11765,13 +11765,14 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- 	        xmlXPathObjectPtr tmp;
- 		/* pop the result if any */
- 		tmp = valuePop(ctxt);
--                if (tmp != contextObj)
-+                if (tmp != contextObj) {
-                     /*
-                      * Free up the result
-                      * then pop off contextObj, which will be freed later
-                      */
-                     xmlXPathReleaseObject(xpctxt, tmp);
-                     valuePop(ctxt);
-+                }
- 		goto evaluation_error;
- 	    }
- 
diff --git a/extra/libxml2/libxml2-2.7.8-xpath-hardening.patch b/extra/libxml2/libxml2-2.7.8-xpath-hardening.patch
deleted file mode 100644
index 7a4ad8659..000000000
--- a/extra/libxml2/libxml2-2.7.8-xpath-hardening.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-commit 0f136dcd18c287073a4d67b03fdb9696d7010940
-Author: Daniel Veillard <veillard@redhat.com>
-Date:   Thu Aug 18 17:10:13 2011 +0800
-
-    Hardening of XPath evaluation
-    
-    Add a mechanism of frame for XPath evaluation when entering a function
-    or a scoped evaluation, also fix a potential problem in predicate
-    evaluation.
-
-diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h
-index 1a9e30e..ddd9dd8 100644
---- a/include/libxml/xpath.h
-+++ b/include/libxml/xpath.h
-@@ -68,7 +68,8 @@ typedef enum {
-     XPATH_UNDEF_PREFIX_ERROR,
-     XPATH_ENCODING_ERROR,
-     XPATH_INVALID_CHAR_ERROR,
--    XPATH_INVALID_CTXT
-+    XPATH_INVALID_CTXT,
-+    XPATH_STACK_ERROR
- } xmlXPathError;
- 
- /*
-@@ -380,6 +381,8 @@ struct _xmlXPathParserContext {
-     xmlXPathCompExprPtr comp;		/* the precompiled expression */
-     int xptr;				/* it this an XPointer expression */
-     xmlNodePtr         ancestor;	/* used for walking preceding axis */
-+
-+    int              valueFrame;        /* used to limit Pop on the stack */
- };
- 
- /************************************************************************
-diff --git a/xpath.c b/xpath.c
-index b59ac5a..bcee2ea 100644
---- a/xpath.c
-+++ b/xpath.c
-@@ -252,6 +252,7 @@ static const char *xmlXPathErrorMessages[] = {
-     "Encoding error\n",
-     "Char out of XML range\n",
-     "Invalid or incomplete context\n",
-+    "Stack usage errror\n",
-     "?? Unknown error ??\n"	/* Must be last in the list! */
- };
- #define MAXERRNO ((int)(sizeof(xmlXPathErrorMessages) /	\
-@@ -2398,6 +2399,42 @@ xmlXPathCacheConvertNumber(xmlXPathContextPtr ctxt, xmlXPathObjectPtr val) {
-  ************************************************************************/
- 
- /**
-+ * xmlXPathSetFrame:
-+ * @ctxt: an XPath parser context
-+ *
-+ * Set the callee evaluation frame
-+ *
-+ * Returns the previous frame value to be restored once done
-+ */
-+static int
-+xmlXPathSetFrame(xmlXPathParserContextPtr ctxt) {
-+    int ret;
-+
-+    if (ctxt == NULL)
-+        return(0);
-+    ret = ctxt->valueFrame;
-+    ctxt->valueFrame = ctxt->valueNr;
-+    return(ret);
-+}
-+
-+/**
-+ * xmlXPathPopFrame:
-+ * @ctxt: an XPath parser context
-+ * @frame: the previous frame value
-+ *
-+ * Remove the callee evaluation frame
-+ */
-+static void
-+xmlXPathPopFrame(xmlXPathParserContextPtr ctxt, int frame) {
-+    if (ctxt == NULL)
-+        return;
-+    if (ctxt->valueNr < ctxt->valueFrame) {
-+        xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR);
-+    }
-+    ctxt->valueFrame = frame;
-+}
-+
-+/**
-  * valuePop:
-  * @ctxt: an XPath evaluation context
-  *
-@@ -2412,6 +2449,12 @@ valuePop(xmlXPathParserContextPtr ctxt)
- 
-     if ((ctxt == NULL) || (ctxt->valueNr <= 0))
-         return (NULL);
-+
-+    if (ctxt->valueNr <= ctxt->valueFrame) {
-+        xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR);
-+        return (NULL);
-+    }
-+
-     ctxt->valueNr--;
-     if (ctxt->valueNr > 0)
-         ctxt->value = ctxt->valueTab[ctxt->valueNr - 1];
-@@ -6154,6 +6197,7 @@ xmlXPathCompParserContext(xmlXPathCompExprPtr comp, xmlXPathContextPtr ctxt) {
-     ret->valueNr = 0;
-     ret->valueMax = 10;
-     ret->value = NULL;
-+    ret->valueFrame = 0;
- 
-     ret->context = ctxt;
-     ret->comp = comp;
-@@ -11711,6 +11755,7 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- 	xmlXPathObjectPtr contextObj = NULL, exprRes = NULL;
- 	xmlNodePtr oldContextNode, contextNode = NULL;
- 	xmlXPathContextPtr xpctxt = ctxt->context;
-+        int frame;
- 
- #ifdef LIBXML_XPTR_ENABLED
- 	    /*
-@@ -11730,6 +11775,8 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- 	*/
- 	exprOp = &ctxt->comp->steps[op->ch2];
- 	for (i = 0; i < set->nodeNr; i++) {
-+            xmlXPathObjectPtr tmp;
-+
- 	    if (set->nodeTab[i] == NULL)
- 		continue;
- 
-@@ -11757,23 +11804,25 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
- 		xmlXPathNodeSetAddUnique(contextObj->nodesetval,
- 		    contextNode);
- 
-+            frame = xmlXPathSetFrame(ctxt);
- 	    valuePush(ctxt, contextObj);
- 	    res = xmlXPathCompOpEvalToBoolean(ctxt, exprOp, 1);
-+            tmp = valuePop(ctxt);
-+            xmlXPathPopFrame(ctxt, frame);
- 
- 	    if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {
--	        xmlXPathObjectPtr tmp;
--		/* pop the result if any */
--		tmp = valuePop(ctxt);
--                if (tmp != contextObj) {
-+                while (tmp != contextObj) {
-                     /*
-                      * Free up the result
-                      * then pop off contextObj, which will be freed later
-                      */
-                     xmlXPathReleaseObject(xpctxt, tmp);
--                    valuePop(ctxt);
-+                    tmp = valuePop(ctxt);
-                 }
- 		goto evaluation_error;
- 	    }
-+            /* push the result back onto the stack */
-+            valuePush(ctxt, tmp);
- 
- 	    if (res)
- 		pos++;
-@@ -13377,7 +13426,9 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
-                 xmlXPathFunction func;
-                 const xmlChar *oldFunc, *oldFuncURI;
- 		int i;
-+                int frame;
- 
-+                frame = xmlXPathSetFrame(ctxt);
-                 if (op->ch1 != -1)
-                     total +=
-                         xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
-@@ -13385,15 +13436,18 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
- 		    xmlGenericError(xmlGenericErrorContext,
- 			    "xmlXPathCompOpEval: parameter error\n");
- 		    ctxt->error = XPATH_INVALID_OPERAND;
-+                    xmlXPathPopFrame(ctxt, frame);
- 		    return (total);
- 		}
--		for (i = 0; i < op->value; i++)
-+		for (i = 0; i < op->value; i++) {
- 		    if (ctxt->valueTab[(ctxt->valueNr - 1) - i] == NULL) {
- 			xmlGenericError(xmlGenericErrorContext,
- 				"xmlXPathCompOpEval: parameter error\n");
- 			ctxt->error = XPATH_INVALID_OPERAND;
-+                        xmlXPathPopFrame(ctxt, frame);
- 			return (total);
- 		    }
-+                }
-                 if (op->cache != NULL)
-                     XML_CAST_FPTR(func) = op->cache;
-                 else {
-@@ -13409,6 +13463,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
-                             xmlGenericError(xmlGenericErrorContext,
-             "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n",
-                                     (char *)op->value4, (char *)op->value5);
-+                            xmlXPathPopFrame(ctxt, frame);
-                             return (total);
-                         }
-                         func = xmlXPathFunctionLookupNS(ctxt->context,
-@@ -13430,6 +13485,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
-                 func(ctxt, op->value);
-                 ctxt->context->function = oldFunc;
-                 ctxt->context->functionURI = oldFuncURI;
-+                xmlXPathPopFrame(ctxt, frame);
-                 return (total);
-             }
-         case XPATH_OP_ARG:
-@@ -14333,6 +14389,7 @@ xmlXPathRunEval(xmlXPathParserContextPtr ctxt, int toBool)
- 	ctxt->valueNr = 0;
- 	ctxt->valueMax = 10;
- 	ctxt->value = NULL;
-+        ctxt->valueFrame = 0;
-     }
- #ifdef XPATH_STREAMING
-     if (ctxt->comp->stream) {
-diff --git a/xpointer.c b/xpointer.c
-index 7a42d02..37afa3a 100644
---- a/xpointer.c
-+++ b/xpointer.c
-@@ -1269,6 +1269,7 @@ xmlXPtrEvalXPointer(xmlXPathParserContextPtr ctxt) {
- 	ctxt->valueNr = 0;
- 	ctxt->valueMax = 10;
- 	ctxt->value = NULL;
-+	ctxt->valueFrame = 0;
-     }
-     SKIP_BLANKS;
-     if (CUR == '/') {
diff --git a/extra/libxml2/shared_library_versionning.patch b/extra/libxml2/shared_library_versionning.patch
deleted file mode 100644
index a0b62bca9..000000000
--- a/extra/libxml2/shared_library_versionning.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 00819877651b87842ed878898ba17dba489820f0 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Thu, 04 Nov 2010 20:53:14 +0000
-Subject: Reactivate the shared library versionning script
-
----
-diff --git a/configure.in b/configure.in
-index 59d0629..a1d2c89 100644
---- a/configure.in
-+++ b/configure.in
-@@ -84,7 +84,7 @@ else
-   esac
- fi
- AC_SUBST(VERSION_SCRIPT_FLAGS)
--AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"])
-+AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
- 
- dnl
- dnl We process the AC_ARG_WITH first so that later we can modify
---
-cgit v0.8.3.1
diff --git a/extra/libxmu/PKGBUILD b/extra/libxmu/PKGBUILD
index 5f08dbbef..b000167bb 100644
--- a/extra/libxmu/PKGBUILD
+++ b/extra/libxmu/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libxmu
 pkgver=1.1.1
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="X11 miscellaneous micro-utility library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
diff --git a/extra/libxrender/PKGBUILD b/extra/libxrender/PKGBUILD
index 174772c0c..24de8a9f4 100644
--- a/extra/libxrender/PKGBUILD
+++ b/extra/libxrender/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libxrender
 pkgver=0.9.7
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="X Rendering Extension client library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
diff --git a/extra/libzapojit/PKGBUILD b/extra/libzapojit/PKGBUILD
index 2846994c5..30faef378 100644
--- a/extra/libzapojit/PKGBUILD
+++ b/extra/libzapojit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169961 2012-10-30 22:47:17Z heftig $
+# $Id: PKGBUILD 183440 2013-04-21 22:11:37Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libzapojit
-pkgver=0.0.2
+pkgver=0.0.3
 pkgrel=1
 pkgdesc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ makedepends=('intltool' 'gobject-introspection')
 url="http://www.gnome.org"
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7b5a2fcf8e94fa8c869098b8461104633f4b046c471a03e3fea2b1a358574b24')
+sha256sums=('3d25f99329105abb99d1e9651b0aa1842065456ea54c22970a7330e9f3d1c37e')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libzip/PKGBUILD b/extra/libzip/PKGBUILD
index c970e31d4..8aa3edff2 100644
--- a/extra/libzip/PKGBUILD
+++ b/extra/libzip/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154546 2012-03-30 00:01:03Z eric $
+# $Id: PKGBUILD 183834 2013-04-28 07:37:57Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libzip
-pkgver=0.10.1
+pkgver=0.11.1
 pkgrel=1
 pkgdesc="A C library for reading, creating, and modifying zip archives"
 url="http://www.nih.at/libzip/index.html"
@@ -11,22 +11,25 @@ license=('BSD')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('zlib')
 options=('!libtool')
-source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.xz"
         'fix-headers.patch')
-md5sums=('d3e933ae049204badccf605f20aaecde'
+md5sums=('87d5ec3629f6ad2a4b01ad961e7f0c19'
          '249395bd3a426c4c4e993e9d4753e1dd')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
+prepare() {
+  cd ${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}/fix-headers.patch"
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   autoreconf -i
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/libzrtpcpp/PKGBUILD b/extra/libzrtpcpp/PKGBUILD
index 1a5aacc34..d2050134e 100644
--- a/extra/libzrtpcpp/PKGBUILD
+++ b/extra/libzrtpcpp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 159301 2012-05-21 09:44:12Z andrea $
+# $Id: PKGBUILD 184149 2013-05-02 19:39:50Z eric $
 # Maintainer:
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Michel Brabants <michel.brabants@euphonynet.be>
 
 pkgname=libzrtpcpp
-pkgver=2.1.2
+pkgver=2.3.2
 pkgrel=1
 pkgdesc="A C++ implementation of Phil Zimmermann's ZRTP specification"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,13 +13,15 @@ url='http://www.gnutelephony.org/index.php/GNU_ZRTP'
 license=('GPL3')
 depends=('ccrtp')
 makedepends=('cmake')
-source=("https://github.com/downloads/wernerd/ZRTPCPP/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('2f78cffbdb0f3e0ee92609fc01a1b6c5')
+source=(http://ftp.gnu.org/gnu/ccrtp/${pkgname}-${pkgver}.tar.gz{,.sig})
+md5sums=('b5f0a72252785862133e9cbc9cbbd3f8'
+         'SKIP')
 
-build() {
-  sed 's/lib64/lib/g' -i "${srcdir}"/${pkgname}-${pkgver}/CMakeLists.txt
+prepare() {
+  sed 's/lib64/lib/g' -i ${pkgname}-${pkgver}/CMakeLists.txt
+}
 
-  cd "${srcdir}"
+build() {
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -29,6 +31,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD
index df923eee9..1e87777ff 100644
--- a/extra/licq/PKGBUILD
+++ b/extra/licq/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 176292 2013-01-28 16:48:25Z stephane $
+# $Id: PKGBUILD 181125 2013-03-31 19:16:53Z stephane $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=licq
 pkgver=1.7.1
-pkgrel=1
+pkgrel=3
 pkgdesc="Advanced graphical ICQ clone and more for Unix" 
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.licq.org"
 license=('GPL')
-depends=('boost-libs' 'gpgme' 'libxss' 'qt')
+depends=('boost-libs' 'gpgme' 'libxss' 'qt4')
 makedepends=('cmake' 'boost')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2)
diff --git a/extra/liferea/PKGBUILD b/extra/liferea/PKGBUILD
deleted file mode 100644
index cf58f55a4..000000000
--- a/extra/liferea/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 170014 2012-10-31 00:54:53Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=liferea
-pkgver=1.8.10
-pkgrel=1
-pkgdesc="A desktop news aggregator for online news feeds and weblogs"
-arch=('i686' 'x86_64')
-url="http://liferea.sourceforge.net/"
-license=('GPL')
-depends=('gconf' 'libwebkit' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-theme')
-makedepends=('intltool')
-options=('!libtool' '!emptydirs')
-install=liferea.install
-source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2)
-sha1sums=('1e71c56f4eb8ea7941fce53ced433491d0dd7c4d')
-
-build() {
-  cd "${srcdir}/liferea-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install
-  make
-}
-
-package() {
-  cd "${srcdir}/liferea-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  
-  install -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/extra/liferea/liferea.install b/extra/liferea/liferea.install
deleted file mode 100644
index 7d812ccdb..000000000
--- a/extra/liferea/liferea.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=liferea
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/extra/lightsoff/PKGBUILD b/extra/lightsoff/PKGBUILD
new file mode 100644
index 000000000..8099b7997
--- /dev/null
+++ b/extra/lightsoff/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=lightsoff
+pkgver=3.8.0
+pkgrel=1
+pkgdesc="Turn off all the lights"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=lightsoff.install
+url="https://live.gnome.org/Lightsoff"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('767f7876c6f360b0e3c18243c7e2201ea0a31523df890853a572d0325d91c24b')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/lightsoff/lightsoff.install b/extra/lightsoff/lightsoff.install
new file mode 100644
index 000000000..0730c1a47
--- /dev/null
+++ b/extra/lightsoff/lightsoff.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index 42e92bded..acfdcb4cb 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 173176 2012-12-12 00:31:57Z eric $
+# $Id: PKGBUILD 180683 2013-03-25 19:15:34Z bpiotrowski $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
 pkgver=1.4.32
-pkgrel=2
+pkgrel=4
 pkgdesc='A secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lighttpd.net/"
-depends=('pcre' 'bzip2' 'libldap' 'util-linux')
-makedepends=('fcgi' 'libmysqlclient' 'lua51' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig')
+depends=('pcre' 'bzip2' 'libldap' 'util-linux' 'systemd')
+makedepends=('fcgi' 'libmariadbclient' 'lua51' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig')
 optdepends=('libxml2: mod_webdav'
             'lua51: mod_cml/mod_magnet'
-            'libmysqlclient: mod_mysql_vhost'
+            'libmariadbclient: mod_mysql_vhost'
             'sqlite: mod_webdav')
 backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
 options=('!libtool' 'emptydirs')
 install='lighttpd.install'
 source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"
         "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
-        'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
+        'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
 sha256sums=('1368f80069ce71f5928cad59c8e60c0b95876942ca9e02c53853e54ae24aedc1'
             '5456a90967df6774386010baa3fa67dba1c80c3b7058c70c80931d8dea5093e7'
-            '186f4bb2364f82d4076a2ba7d3e088ffb356550493d92dd9d5eb57cac2839c17'
-            '6df18675691384c48b9137c8f18ca238055001f1077baf05cb8322247b475a77'
+            '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe'
             'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa'
             'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871'
             '708cefe97541edba73f572ed3836bd056462b1467e45e1912c9d960139929696')
@@ -57,7 +56,6 @@ package() {
 	cd $srcdir/$pkgname-$pkgver
 	make DESTDIR=$pkgdir install
 
-	install -D -m755 $srcdir/lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd
 	install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd
 	install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf
 	install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/
diff --git a/extra/lighttpd/lighttpd.install b/extra/lighttpd/lighttpd.install
index 6b471f633..817bd5746 100644
--- a/extra/lighttpd/lighttpd.install
+++ b/extra/lighttpd/lighttpd.install
@@ -1,6 +1,6 @@
 post_install() {
 	if [[ ! -d run/lighttpd ]]; then
-		usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/lighttpd.conf
+		usr/bin/systemd-tmpfiles --create lighttpd.conf
 	fi
 }
 
diff --git a/extra/lighttpd/lighttpd.logrotate.d b/extra/lighttpd/lighttpd.logrotate.d
index 76f98785c..b424c692d 100644
--- a/extra/lighttpd/lighttpd.logrotate.d
+++ b/extra/lighttpd/lighttpd.logrotate.d
@@ -4,6 +4,6 @@
 	notifempty
 	sharedscripts
 	postrotate
-		/usr/bin/killall -HUP lighttpd-angel &>/dev/null || true
+		systemctl reload lighttpd.service || true
 	endscript
 }
diff --git a/extra/lighttpd/lighttpd.rc.d b/extra/lighttpd/lighttpd.rc.d
deleted file mode 100644
index c2c41b818..000000000
--- a/extra/lighttpd/lighttpd.rc.d
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-pid_file='/run/lighttpd/lighttpd-angel.pid'
-
-get_pid() {
-	if [ -r "${pid_file}" ]; then
-		cat "${pid_file}"
-	else
-		pgrep -f /usr/sbin/lighttpd-angel
-	fi
-}
-
-test_config() {
-	stat_busy 'Checking configuration'
-	if [ $(id -u) -ne 0 ]; then
-		stat_append '(This script must be run as root)'
-		stat_die
-	fi
-
-	if [ ! -r /etc/lighttpd/lighttpd.conf ]; then
-		stat_append '(/etc/lighttpd/lighttpd.conf not found)'
-		stat_die
-	fi
-
-	/usr/sbin/lighttpd -t -f /etc/lighttpd/lighttpd.conf >/dev/null 2>&1
-	if [ $? -gt 0 ]; then
-		stat_append '(error in /etc/lighttpd/lighttpd.conf)'
-		stat_die
-	fi
-
-	stat_done
-}
-
-start() {
-	stat_busy 'Starting lighttpd'
-
-	local PID=$(get_pid)
-	if [ -z "$PID" ]; then
-		nohup /usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf >>/var/log/lighttpd/lighttpd-angel.log 2>&1 &
-		if [ $? -gt 0 ]; then
-			stat_die
-		else
-			echo $! > "${pid_file}"
-			add_daemon lighttpd
-			stat_done
-		fi
-	else
-		stat_die
-	fi
-}
-
-stop() {
-	stat_busy 'Stopping lighttpd'
-	local PID=$(get_pid)
-	[ -n "$PID" ] && kill $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		[ -f "${pid_file}" ] && rm -f "${pid_file}"
-		rm_daemon lighttpd
-		stat_done
-	fi
-}
-
-gracefull-stop() {
-	stat_busy 'Stopping lighttpd gracefully'
-	local PID=$(get_pid)
-	[ -n "$PID" ] && kill -INT $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		[ -f "${pid_file}" ] && rm -f "${pid_file}"
-		rm_daemon lighttpd
-		stat_done
-	fi
-}
-
-reload() {
-	stat_busy 'Reloading lighttpd'
-	local PID=$(get_pid)
-	[ -n "$PID" ] && kill -HUP $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_die
-	else
-		stat_done
-	fi
-}
-
-
-case "$1" in
-	start)
-		test_config
-		start
-		;;
-	stop)
-		test_config
-		stop
-		;;
-	gracefull-stop)
-		test_config
-		stop
-		;;
-	reload)
-		test_config
-		reload
-		;;
-	restart)
-		test_config
-		stop
-		while [ -n "$(get_pid)" ]; do
-			sleep 1
-		done
-		start
-		;;
-	status)
-		stat_busy 'Checking lighttpd status'
-		ck_status lighttpd
-		;;
-	*)
-	echo "usage: $0 {start|stop|gracefull-stop|reload|restart|status}"
-esac
-
-exit 0
diff --git a/extra/lilv/PKGBUILD b/extra/lilv/PKGBUILD
index 6036ddd5a..9b58dff47 100644
--- a/extra/lilv/PKGBUILD
+++ b/extra/lilv/PKGBUILD
@@ -3,37 +3,46 @@
 # Contributor: speps <speps at aur dot archlinux dot org>
 
 pkgname=lilv
-pkgver=0.14.4
+pkgver=0.16.0
 pkgrel=1
-pkgdesc="A library to make the use of LV2 plugins as simple as possible for applications."
-arch=(i686 x86_64 mips64el)
-url="http://drobilla.net/software/$pkgname/"
+pkgdesc="A library to make the use of LV2 plugins as simple as possible for applications"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://drobilla.net/software/lilv/"
 license=('custom:ISC')
-depends=('python2' 'sratom' 'jack')
+depends=('python2' 'sratom>=0.4.2' 'jack')
 makedepends=('swig')
 optdepends=('bash-completion: auto-complete words')
-source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('891595410eeb68322cf875286f96fccf')
+source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2"
+        'lilvmm.patch')
+md5sums=('12eb71f2b5b8a68e15c1c816896bcb9f'
+         'd34207f8ca3586650ad7c50284ffb3e0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # fix UI API error
+  # backport of http://dev.drobilla.net/changeset/5092
+  patch -Np2 -i "$srcdir/lilvmm.patch"
+
+  # pick up python2 even when python3 exists
+  # (the build system has flaky support for python3)
   export PYTHON="/usr/bin/python2"
 
-  # remove ldconfig
+  # remove ldconfig --speps
   sed -i "/ldconfig/d" wscript
 
-  python2 ./waf configure --prefix=/usr \
-                          --mandir=/usr/share/man \
-                          --configdir=/etc \
-                          --dyn-manifest \
-                          --bindings
-  python2 ./waf
+  python2 waf configure --prefix=/usr \
+                        --configdir=/etc \
+                        --dyn-manifest \
+                        --bindings
+
+  python2 waf build $MAKEFLAGS
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  DESTDIR="$pkgdir" python2 ./waf install
+
+  python2 waf install --destdir="$pkgdir"
 
   # license
   install -Dm644 COPYING \
diff --git a/extra/lilv/lilvmm.patch b/extra/lilv/lilvmm.patch
new file mode 100644
index 000000000..410aac5e3
--- /dev/null
+++ b/extra/lilv/lilvmm.patch
@@ -0,0 +1,40 @@
+Index: trunk/lilv/lilv/lilvmm.hpp

+===================================================================

+--- trunk/lilv/lilv/lilvmm.hpp	(revision 4975)

++++ trunk/lilv/lilv/lilvmm.hpp	(revision 5092)

+@@ -48,4 +48,9 @@

+ 	inline RT name(T1 a1, T2 a2) { \

+ 		return lilv_ ## prefix ## _ ## name(me, a1, a2); \

++	}

++

++#define LILV_WRAP3(RT, prefix, name, T1, a1, T2, a2, T3, a3) \

++	inline RT name(T1 a1, T2 a2, T3 a3) { \

++		return lilv_ ## prefix ## _ ## name(me, a1, a2, a3); \

+ 	}

+ 

+@@ -138,4 +143,25 @@

+ 	LILV_WRAP1(bool, nodes, contains, const Node, node);

+ 	LILV_WRAP0(Node, nodes, get_first);

++};

++

++struct UI {

++	inline UI(const LilvUI* c_obj) : me(c_obj) {}

++	LILV_WRAP_CONVERSION(const LilvUI);

++

++	LILV_WRAP0(const LilvNode*, ui, get_uri);

++	LILV_WRAP0(const LilvNode*, ui, get_bundle_uri);

++	LILV_WRAP0(const LilvNode*, ui, get_binary_uri);

++	LILV_WRAP0(const LilvNodes*, ui, get_classes);

++	/*LILV_WRAP3(bool, ui, is_supported,

++	           LilvUISupportedFunc, supported_func,

++	           const LilvNode*,     container_type,

++	           const LilvNode**,    ui_type);*/

++	LILV_WRAP1(bool, ui, is_a, const LilvNode*, class_uri);

++

++	const LilvUI* me;

++};

++

++struct UIs {

++	LILV_WRAP_COLL(UIs, UI, uis);

+ };

+ 

diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD
index f349b5b02..eabfb6a73 100644
--- a/extra/link-grammar/PKGBUILD
+++ b/extra/link-grammar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170367 2012-11-06 17:34:52Z giovanni $
+# $Id: PKGBUILD 183248 2013-04-19 14:20:16Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=link-grammar
-pkgver=4.7.9
+pkgver=4.7.11
 pkgrel=1
 pkgdesc="A Grammar Checking library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('aspell')
 options=('!libtool' '!makeflags')
 source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('c115f2b46d577e038e52128ece034144')
+md5sums=('1a990ecf0b517813a4c7b3b6f9c01f00')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/linux_logo/PKGBUILD b/extra/linux_logo/PKGBUILD
deleted file mode 100644
index 3152b3c30..000000000
--- a/extra/linux_logo/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 171454 2012-11-17 15:59:08Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=linux_logo
-pkgver=5.11
-pkgrel=2
-pkgdesc="Text-based logo and system information program"
-arch=('i686' 'x86_64') 
-url="http://www.deater.net/weave/vmwprod/linux_logo"
-license=('GPL')
-depends=('glibc')
-source=(http://www.deater.net/weave/vmwprod/linux_logo/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('bd22808f165574cb3bc98c579aa48c0acab65f39')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  find ./logos -type f | sort > logo_config
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make PREFIX="${pkgdir}/usr" install
-}
diff --git a/extra/liquidwar/PKGBUILD b/extra/liquidwar/PKGBUILD
index 1b7022396..6a6a9a640 100644
--- a/extra/liquidwar/PKGBUILD
+++ b/extra/liquidwar/PKGBUILD
@@ -21,6 +21,7 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
   patch -p0 -i "$srcdir/liquidwar-5.6.4-ovflfix.patch"
   sed -i 's/python/python2/' doc/Makefile.in
+  sed -ri 's/(EXTERN_LIBS .+)$/\1 -lm/' src/Makefile.in
   [ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm"
   LIBS='-lm' PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS
   make GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 6f203458d..b2de0df03 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 176080 2013-01-27 10:59:18Z giovanni $
+# $Id: PKGBUILD 184020 2013-05-01 05:23:57Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2013.01.25
+pkgver=2013.04.30
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('da78b67d200dcffc47c1e869daf0395c')
+md5sums=('95533d91bd196e42fd748076dc244b09')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index d2a332c8e..ac62f6ed0 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176908 2013-02-02 12:44:44Z foutrelis $
+# $Id: PKGBUILD 183300 2013-04-20 23:37:12Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -11,7 +11,7 @@
 
 pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
 pkgver=3.2
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64' 'mips64el')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
@@ -24,8 +24,9 @@ source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz
         cindexer-clang-path.patch
         enable-lto.patch
         llvm-3.1-fix-debug-line-info.patch
+        clang-3.2-fix-std-thread-with-libstdc++.patch
         clang-3.1-fix-libprofile_rt.a-location.patch)
-sha256sums=('378f9ed7126409785aa399bf367762753dbda563b60612dae1a92d5263ab8130'
+sha256sums=('125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343'
             '2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658'
             'a9a6b73a1bd5fc763f3b3826a6ce796cb150042d37d319e06e72d3d9778aaac1'
             '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
@@ -33,18 +34,17 @@ sha256sums=('378f9ed7126409785aa399bf367762753dbda563b60612dae1a92d5263ab8130'
             '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92'
             'fe3969d9ec93263814d9892a15b6a1eb60ad756fe7c3985a45d8cd82bc9b7a7b'
             'db1f1aadebbc4c4232bdad49fb9b7dc61eac727085c63154b870fa9ce64fd18d'
+            '02b2c0fd29bc165140eb4524700254bfdd88369706719acb3f3be3134f1e67e8'
             '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver.src"
 
   # At the present, clang must reside inside the LLVM source code tree to build
   # See http://llvm.org/bugs/show_bug.cgi?id=4840
-  rm -rf tools/clang
-  cp -r "$srcdir/clang-$pkgver.src" tools/clang
+  mv "$srcdir/clang-$pkgver.src" tools/clang
 
-  rm -rf projects/compiler-rt
-  cp -r "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt
+  mv "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt
 
   # Fix symbolic links from OCaml bindings to LLVM libraries
   sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml
@@ -70,6 +70,11 @@ build() {
   # Use gold instead of default linker, and always use the plugin
   patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch"
 
+  # Fix FS#34861: crash on apps built using C++11's std::thread
+  # http://llvm.org/bugs/show_bug.cgi?id=12730
+  patch -d tools/clang -Np2 -i \
+    "$srcdir/clang-3.2-fix-std-thread-with-libstdc++.patch"
+
   # Fix FS#29984: [clang] -coverage is broken
   patch -d tools/clang -Np1 -i \
     "$srcdir/clang-3.1-fix-libprofile_rt.a-location.patch"
@@ -81,16 +86,22 @@ build() {
   # Drop "svn" suffix from version string
   sed -i 's/3\.2svn/3.2/g' configure
 
+  # Prepare Python 2 override
+  mkdir "$srcdir/python2-path"
+  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver.src"
+
   # Apply strip option to configure
   _optimized_switch="enable"
   [[ $(check_option strip) == n ]] && _optimized_switch="disable"
 
   # Include location of libffi headers in CPPFLAGS
-  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)"
+  CPPFLAGS+=" $(pkg-config --cflags libffi)"
 
   # Use Python 2
-  mkdir "$srcdir/python2-path"
-  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
   export PATH="$srcdir/python2-path:$PATH"
 
   # Force the use of GCC instead of clang
diff --git a/extra/llvm/clang-3.1-fix-lwg-2141.patch b/extra/llvm/clang-3.1-fix-lwg-2141.patch
deleted file mode 100644
index af10a5c33..000000000
--- a/extra/llvm/clang-3.1-fix-lwg-2141.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: test/SemaCXX/libstdcxx_common_type_hack.cpp
-===================================================================
---- test/SemaCXX/libstdcxx_common_type_hack.cpp	(revision 0)
-+++ test/SemaCXX/libstdcxx_common_type_hack.cpp	(revision 166455)
-@@ -0,0 +1,33 @@
-+// RUN: %clang_cc1 -fsyntax-only %s -std=c++11 -verify
-+
-+// This is a test for an egregious hack in Clang that works around
-+// an issue with GCC's <type_traits> implementation. std::common_type
-+// relies on pre-standard rules for decltype(), in which it doesn't
-+// produce reference types so frequently.
-+
-+#ifdef BE_THE_HEADER
-+
-+#pragma GCC system_header
-+namespace std {
-+  template<typename T> T &&declval();
-+
-+  template<typename...Ts> struct common_type {};
-+  template<typename A, typename B> struct common_type<A, B> {
-+    // Under the rules in the standard, this always produces a
-+    // reference type.
-+    typedef decltype(true ? declval<A>() : declval<B>()) type;
-+  };
-+}
-+
-+#else
-+
-+#define BE_THE_HEADER
-+#include "libstdcxx_common_type_hack.cpp"
-+
-+using T = int;
-+using T = std::common_type<int, int>::type;
-+
-+using U = int; // expected-note {{here}}
-+using U = decltype(true ? std::declval<int>() : std::declval<int>()); // expected-error {{different types}}
-+
-+#endif
-Index: lib/Sema/SemaTemplateInstantiateDecl.cpp
-===================================================================
---- lib/Sema/SemaTemplateInstantiateDecl.cpp	(revision 166454)
-+++ lib/Sema/SemaTemplateInstantiateDecl.cpp	(revision 166455)
-@@ -158,6 +158,22 @@
-     SemaRef.MarkDeclarationsReferencedInType(D->getLocation(), DI->getType());
-   }
- 
-+  // HACK: g++ has a bug where it gets the value kind of ?: wrong.
-+  // libstdc++ relies upon this bug in its implementation of common_type.
-+  // If we happen to be processing that implementation, fake up the g++ ?:
-+  // semantics. See LWG issue 2141 for more information on the bug.
-+  const DecltypeType *DT = DI->getType()->getAs<DecltypeType>();
-+  CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(D->getDeclContext());
-+  if (DT && RD && isa<ConditionalOperator>(DT->getUnderlyingExpr()) &&
-+      DT->isReferenceType() &&
-+      RD->getEnclosingNamespaceContext() == SemaRef.getStdNamespace() &&
-+      RD->getIdentifier() && RD->getIdentifier()->isStr("common_type") &&
-+      D->getIdentifier() && D->getIdentifier()->isStr("type") &&
-+      SemaRef.getSourceManager().isInSystemHeader(D->getLocStart()))
-+    // Fold it to the (non-reference) type which g++ would have produced.
-+    DI = SemaRef.Context.getTrivialTypeSourceInfo(
-+      DI->getType().getNonReferenceType());
-+
-   // Create the new typedef
-   TypedefNameDecl *Typedef;
-   if (IsTypeAlias)
diff --git a/extra/llvm/clang-3.2-fix-std-thread-with-libstdc++.patch b/extra/llvm/clang-3.2-fix-std-thread-with-libstdc++.patch
new file mode 100644
index 000000000..6963603b1
--- /dev/null
+++ b/extra/llvm/clang-3.2-fix-std-thread-with-libstdc++.patch
@@ -0,0 +1,17 @@
+--- cfe/trunk/lib/Basic/Targets.cpp	2013/04/04 23:51:36	178815
++++ cfe/trunk/lib/Basic/Targets.cpp	2013/04/04 23:53:43	178816
+@@ -2730,6 +2730,14 @@
+   case NoMMX3DNow:
+     break;
+   }
++
++  if (CPU >= CK_i486) {
++    Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1");
++    Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2");
++    Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4");
++  }
++  if (CPU >= CK_i586)
++    Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8");
+ }
+ 
+ bool X86TargetInfo::hasFeature(StringRef Feature) const {
diff --git a/extra/llvm/clang-pure64.patch b/extra/llvm/clang-pure64.patch
deleted file mode 100644
index 9bbbfaa8b..000000000
--- a/extra/llvm/clang-pure64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp	(revision 123373)
-+++ lib/Driver/Tools.cpp	(working copy)
-@@ -3306,7 +3306,7 @@
-     else if (ToolChain.getArch() == llvm::Triple::ppc64)
-       CmdArgs.push_back("/lib64/ld64.so.1");
-     else
--      CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
-+      CmdArgs.push_back("/lib/ld-linux-x86-64.so.2");
-   }
- 
-   CmdArgs.push_back("-o");
diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD
index 40dd3065d..23ba10d9f 100644
--- a/extra/lm_sensors/PKGBUILD
+++ b/extra/lm_sensors/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170399 2012-11-07 01:42:13Z eric $
+# $Id: PKGBUILD 181375 2013-04-04 00:53:02Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=lm_sensors
 pkgver=3.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lm-sensors.org/"
@@ -11,35 +11,28 @@ license=('GPL' 'LGPL')
 depends=('perl' 'sysfsutils')
 makedepends=('rrdtool')
 optdepends=('rrdtool: for logging with sensord')
-backup=('etc/sensors3.conf' 'etc/healthd.conf' 'etc/conf.d/sensord')
+backup=('etc/sensors3.conf' 'etc/healthd.conf')
 options=('!emptydirs')
 source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \
-	sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \
-        sensord.rc fancontrol.service sensord.service healthd.service \
-        daemonarg.patch linux_3.0.patch)
+	healthd healthd.conf fancontrol.service sensord.service healthd.service \
+        linux_3.0.patch lm_sensors-fancontrol.patch)
 sha1sums=('b55c06f425993e42f13553f204066c446da36fd3'
           '035a721f20e4ad568f4fdde2d7c25d906c192458'
-          'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'
-          'a068ac0a3115a6191a487e11422506baa922b40a'
           'afaad558d2ad4732aa53b69afa23ccf37bc67ab1'
           '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'
-          'de5a46afc39a77ae8721246a0223baf21a2d4c9c'
-          'de8d4d65406815c389f8a04e2a8508a1ae6749c8'
-          '72a60251d1d55a67307dab4105d9f3f01a080af4'
           '7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c'
           'eff43b4882d25dae7dd0b33eb2e33b0836a5cc51'
           'a7a20eb3c799d70287e6c7968a7ab42165925293'
-          '34241388c4001bfb6e49b7e10da1217e29a258d6'
-          '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c')
+          '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c'
+          'd3e419b4019451fb039ae3d3b8e0ec55121b9f17')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \
-         -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/{detect/sensors-detect,init/lm_sensors.service}
+  sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/lm_sensors.service}
   sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect
   sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service
-  patch -p1 < ../daemonarg.patch
-  patch -p0 < ../linux_3.0.patch
+  patch -p0 -i "${srcdir}/linux_3.0.patch"
+  patch -p0 -i "${srcdir}/lm_sensors-fancontrol.patch"
   make PREFIX=/usr
 }
 
@@ -48,13 +41,8 @@ package() {
   make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
     PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
   install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service"
-  install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors"
-  install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol"
   install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd"
-  install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd"
   install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf"
-  install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord"
-  install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord"
   install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service"
   install -D -m644 "${srcdir}/sensord.service" "${pkgdir}/usr/lib/systemd/system/sensord.service"
   install -D -m644 "${srcdir}/healthd.service" "${pkgdir}/usr/lib/systemd/system/healthd.service"
diff --git a/extra/lm_sensors/daemonarg.patch b/extra/lm_sensors/daemonarg.patch
deleted file mode 100644
index 4b80cef19..000000000
--- a/extra/lm_sensors/daemonarg.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ru lm_sensors-3.1.2-1/prog/pwm/fancontrol lm_sensors-3.1.2-1_pyropeter/usr/sbin/fancontrol
---- lm_sensors-3.1.2-1/prog/pwm/fancontrol	2010-02-03 03:45:15.000000000 +0100
-+++ lm_sensors-3.1.2-1_pyropeter/prog/pwm/fancontrol	2010-03-07 01:37:09.000000000 +0100
-@@ -5,7 +5,9 @@
- #
- # Version 0.70
- #
--# Usage: fancontrol [CONFIGFILE]
-+# Usage: fancontrol [-D] [CONFIGFILE]
-+#
-+# (-D causes fancontrol to 'fork' to the background after some tests)
- #
- # Dependencies:
- #   bash, egrep, sed, cut, sleep, readlink, lm_sensors :)
-@@ -43,6 +45,12 @@
- #DEBUG=1
- MAX=255
- 
-+DAEMON=0
-+if [ "$1" = "-D" ]; then
-+	DAEMON=1
-+	shift
-+fi
-+
- declare -i pwmval
- 
- function LoadConfig {
-@@ -303,7 +311,6 @@
- 	echo "File $PIDFILE exists, is fancontrol already running?"
- 	exit 1
- fi
--echo $$ > "$PIDFILE"
- 
- # $1 = pwm file name
- function pwmdisable()
-@@ -475,6 +482,14 @@
- 	let fcvcount=$fcvcount+1
- done
- 
-+if [ "$DAEMON" -gt 0 ]; then
-+	echo "Forking..."
-+	$0 $* &> /dev/null &
-+	exit 0
-+fi
-+
-+echo $$ > "$PIDFILE"
-+
- echo 'Starting automatic fan control...'
- 
- # main loop calling the main function at specified intervals
diff --git a/extra/lm_sensors/fancontrol.rc b/extra/lm_sensors/fancontrol.rc
deleted file mode 100644
index 8e98d06f2..000000000
--- a/extra/lm_sensors/fancontrol.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID -x /usr/sbin/fancontrol)
-case "$1" in
-  start)
-    stat_busy "Starting fancontrol"
-    [ -z "$PID" ] && /usr/sbin/fancontrol -D &>/dev/null
-    if [ $? -gt 0 -o -n "$PID" ]; then
-      stat_fail
-    else
-      add_daemon fancontrol
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping fancontrol"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon fancontrol
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/lm_sensors/healthd.rc b/extra/lm_sensors/healthd.rc
deleted file mode 100644
index f50f4a6f8..000000000
--- a/extra/lm_sensors/healthd.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -x -o %PPID /usr/sbin/healthd)
-case "${1}" in
-  start)
-    stat_busy "Starting Health Daemon"
-    [ -z "${PID}" ] && /usr/sbin/healthd &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo "${PID}" > /var/run/healthd.pid
-      add_daemon healthd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Health Daemon"
-    [ ! -z "${PID}" ] && kill ${PID} &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon healthd
-      stat_done
-    fi
-    ;;
-  restart) 
-    $0 stop 
-    sleep 2
-    $0 start 
-    ;;
-  *) echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/lm_sensors/lm_sensors-fancontrol.patch b/extra/lm_sensors/lm_sensors-fancontrol.patch
new file mode 100644
index 000000000..e58891695
--- /dev/null
+++ b/extra/lm_sensors/lm_sensors-fancontrol.patch
@@ -0,0 +1,29 @@
+--- prog/pwm/fancontrol	2012-11-07 03:26:37.000000000 +0200
++++ prog/pwm/fancontrol	2013-03-22 18:15:00.566696011 +0200
+@@ -297,7 +297,7 @@
+ cd $DIR
+ 
+ # Check for configuration change
+-if [ -z "$DEVPATH" -o -z "$DEVNAME" ]
++if [ -z "$DEVPATH" ] || [ -z "$DEVNAME" ]
+ then
+ 	echo "Configuration is too old, please run pwmconfig again" >&2
+ 	exit 1
+@@ -337,7 +337,7 @@
+ 	# It didn't work, try pwmN_enable=1 pwmN=255
+ 	echo 1 > $ENABLE 2> /dev/null
+ 	echo $MAX > $1
+-	if [ `cat $ENABLE` -eq 1 -a `cat $1` -ge 190 ]
++	if [ `cat $ENABLE` -eq 1 ] && [ `cat $1` -ge 190 ]
+ 	then
+ 		# Success
+ 		return 0
+@@ -469,7 +469,7 @@
+ 		else
+ 		  # calculate the new value from temperature and settings
+ 		  pwmval="(${tval}-${mint})*(${maxpwm}-${minso})/(${maxt}-${mint})+${minso}"
+-		  if [ $pwmpval -eq 0 -o $min_fanval -eq 0 ]
++		  if [ $pwmpval -eq 0 ] || [ $min_fanval -eq 0 ]
+ 		  then # if fan was stopped start it using a safe value
+ 		  	echo $minsa > $pwmo
+ 			# Sleep while still handling signals
diff --git a/extra/lm_sensors/sensord.conf b/extra/lm_sensors/sensord.conf
deleted file mode 100644
index a1cf091c1..000000000
--- a/extra/lm_sensors/sensord.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sensord
-#
-SENSORD_ARGS=""
diff --git a/extra/lm_sensors/sensord.rc b/extra/lm_sensors/sensord.rc
deleted file mode 100644
index e3ef4d26d..000000000
--- a/extra/lm_sensors/sensord.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sensord
-
-PID=$(pidof -o %PPID /usr/sbin/sensord)
-case "$1" in
-  start)
-    stat_busy "Starting sensord"
-    [ -z "$PID" ] && /usr/sbin/sensord ${SENSORD_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon sensord
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping sensord"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon sensord
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/lm_sensors/sensors.rc b/extra/lm_sensors/sensors.rc
deleted file mode 100644
index 4acde2202..000000000
--- a/extra/lm_sensors/sensors.rc
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-
-# description: sensors is used for monitoring motherboard sensor values.
-# config: /etc/conf.d/lm_sensors
-
-# See also the lm_sensors homepage at:
-#     http://www2.lm-sensors.nu/~lm78/index.html
-
-# It uses a config file /etc/conf.d/lm_sensors that contains the modules to
-# be loaded/unloaded. That file is sourced into this one.
-
-# The format of that file a shell script that simply defines the modules
-# in order as normal shell variables with the special names:
-#    MODULE_1, MODULE_2, MODULE_3, etc.
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PSENSORS=/usr/bin/sensors
-
-if $(grep -q sysfs /proc/mounts); then
-  WITHSYS=1
-else
-  WITHSYS=0
-fi
-
-if [ $WITHSYS == "0" ]; then
-  # If sensors isn't supported by the kernel, try loading the module...
-  [ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc &>/dev/null
-
-  # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have support for sensors.
-  if ! [ -e /proc/sys/dev/sensors ]; then
-    echo  "lm_sensors: kernel does not have sensors support"
-    stat_fail
-  fi
-
-  # If sensors was not already running, unload the module...
-  [ -e /var/run/daemons/sensors ] || /sbin/modprobe -r i2c-proc &>/dev/null
-fi
-
-if [ -e /etc/conf.d/lm_sensors ]; then
-  CONFIG=/etc/conf.d/lm_sensors
-elif [ -e /etc/sysconfig/lm_sensors ]; then
-  # Moving config to new Arch-specific location
-  mv /etc/sysconfig/lm_sensors /etc/conf.d/lm_sensors
-  CONFIG=/etc/conf.d/lm_sensors
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting Up Sensors"
-
-    if [ -r "$CONFIG" ]; then
-      . "$CONFIG"
-      modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ')
-      i=0
-      while [ $i -lt $modules ] ; do
-        module=$(eval echo '$'MODULE_$i)
-       # echo starting module __${module}__ #debug
-        /sbin/modprobe $module &>/dev/null
-        i=$(expr $i + 1)
-      done
-    fi
-
-    $PSENSORS -s
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon sensors
-      stat_done
-    fi	  
-    ;;
-
-  stop)
-    stat_busy "Shutting Down Sensors"
-
-    if [ -r "$CONFIG" ]; then
-      . "$CONFIG"
-      modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ')
-      i=$(expr $modules - 1)
-      while [ $i -ge 0 ] ; do
-        module=$(eval echo '$'MODULE_$i)
-      #  echo stoping module __${module}__ #debug
-        /sbin/modprobe -r $module &>/dev/null
-        i=$(expr $i - 1)
-      done
-    fi
-
-    if [ $WITHSYS == "0" ]; then
-      /sbin/modprobe -r i2c-proc &>/dev/null
-    fi
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon sensors
-      stat_done
-    fi
-    ;;
-    
-  status)
-    $PSENSORS
-    ;;
-    
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  condrestart)
-    [ -e /var/run/daemons/sensors ] && $0 restart || :
-    ;;
-
-  *)
-    echo "Usage: $0 {start|stop|restart|status|condrestart}"
-esac
-exit 0
diff --git a/extra/lsof/PKGBUILD b/extra/lsof/PKGBUILD
index feb53b9bf..e11622b06 100644
--- a/extra/lsof/PKGBUILD
+++ b/extra/lsof/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 157359 2012-04-27 22:32:41Z tomegun $
+# $Id: PKGBUILD 179524 2013-03-06 00:34:51Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,7 +6,7 @@
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=lsof
-pkgver=4.86
+pkgver=4.87
 pkgrel=1
 pkgdesc="Lists open files for running Unix processes"
 arch=('i686' 'x86_64' 'mips64el')
@@ -40,5 +40,5 @@ package() {
 	install -D -m0644 -o root -g root ${srcdir}/license.txt \
 	     ${pkgdir}/usr/share/licenses/lsof/LICENSE 
 }
-md5sums=('9f1cda41f35add068c7b81f873fa56b5'
+md5sums=('80e2a76d0e05826db910ec88e631296c'
          '1b63c76bd10437cabf890508c8e58d36')
diff --git a/extra/ltrace/fix-crash-on-int3-after-symcall.patch b/extra/ltrace/fix-crash-on-int3-after-symcall.patch
deleted file mode 100644
index 5e0a7911c..000000000
--- a/extra/ltrace/fix-crash-on-int3-after-symcall.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -upr ltrace-0.6.0.orig/handle_event.c ltrace-0.6.0/handle_event.c
---- ltrace-0.6.0.orig/handle_event.c	2011-01-07 21:29:30.000000000 +0200
-+++ ltrace-0.6.0/handle_event.c	2012-01-06 05:14:04.000000000 +0200
-@@ -617,6 +617,10 @@ handle_breakpoint(Event *event) {
- 	}
- 
- 	if ((sbp = address2bpstruct(event->proc, event->e_un.brk_addr))) {
-+		if (sbp->libsym == NULL) {
-+			continue_after_breakpoint(event->proc, sbp);
-+			return;
-+		}
- 		if (strcmp(sbp->libsym->name, "") == 0) {
- 			debug(2, "Hit _dl_debug_state breakpoint!\n");
- 			arch_check_dbg(event->proc);
diff --git a/extra/lua/PKGBUILD b/extra/lua/PKGBUILD
index 5cc472505..58ad58b9f 100644
--- a/extra/lua/PKGBUILD
+++ b/extra/lua/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 173169 2012-12-12 00:31:37Z eric $
+# $Id: PKGBUILD 181843 2013-04-04 12:42:25Z bpiotrowski $
 # Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=lua
-pkgver=5.2.1
-pkgrel=3
-pkgdesc='A powerful light-weight programming language designed for extending applications'
+pkgver=5.2.2
+pkgrel=1
+pkgdesc='Powerful light-weight programming language designed for extending applications'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.lua.org/'
 depends=('readline')
@@ -14,7 +14,7 @@ license=('MIT')
 options=('!makeflags' '!emptydirs')
 source=("http://www.lua.org/ftp/$pkgname-$pkgver.tar.gz"
         'liblua.so.patch' 'lua.pc' 'LICENSE')
-md5sums=('ae08f641b45d737d12d30291a5e5f6e3'
+md5sums=('efbb645e897eae37cad4344ce8b0a614'
          'bdc663c7b82ffc0b5df67611621fb625'
          'e7ba6c2b695b0b84a5ea0cbff5fc9067'
          '0e2bd67b909b9ff673da844ca3480df2')
@@ -22,7 +22,7 @@ md5sums=('ae08f641b45d737d12d30291a5e5f6e3'
 build() {
   cd $pkgname-$pkgver
   patch -p1 -i "$srcdir/liblua.so.patch"
-  [[ $CARCH != i686 ]] && export CFLAGS="$CFLAGS -fPIC"
+  export CFLAGS="$CFLAGS -fPIC"
   make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux
   sed "s/%VER%/${pkgver%.*}/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc
 }
@@ -30,7 +30,7 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make \
-    TO_LIB="liblua.a liblua.so liblua.so.5.2 liblua.so.$pkgver" \
+    TO_LIB="liblua.a liblua.so liblua.so.5.2 liblua.so.5.2.1" \
     INSTALL_DATA="cp -d" \
     INSTALL_TOP="$pkgdir/usr" \
     INSTALL_MAN="$pkgdir/usr/share/man/man1" \
diff --git a/extra/lua/lua-5.1-cflags.diff b/extra/lua/lua-5.1-cflags.diff
deleted file mode 100644
index db658aeca..000000000
--- a/extra/lua/lua-5.1-cflags.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile
---- lua-5.1.orig/src/Makefile	2006-02-16 16:45:09.000000000 +0100
-+++ lua-5.1/src/Makefile	2006-03-01 14:55:29.000000000 +0100
-@@ -8,7 +8,8 @@
- PLAT= none
- 
- CC= gcc
--CFLAGS= -O2 -Wall $(MYCFLAGS)
-+CFLAGS ?= -O2 -Wall
-+CFLAGS += $(MYCFLAGS)
- AR= ar rcu
- RANLIB= ranlib
- RM= rm -f
diff --git a/extra/lua/lua-arch.patch b/extra/lua/lua-arch.patch
deleted file mode 100644
index d8650c3a2..000000000
--- a/extra/lua/lua-arch.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ur lua-5.1.4/etc/lua.pc lua-5.1.4-new/etc/lua.pc
---- lua-5.1.4/etc/lua.pc	2008-08-08 14:46:11.000000000 +0200
-+++ lua-5.1.4-new/etc/lua.pc	2012-02-23 18:25:34.000000000 +0100
-@@ -8,6 +8,6 @@
- 
- # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
--prefix= /usr/local
-+prefix= /usr
- INSTALL_BIN= ${prefix}/bin
- INSTALL_INC= ${prefix}/include
- INSTALL_LIB= ${prefix}/lib
-diff -ur lua-5.1.4/src/luaconf.h lua-5.1.4-new/src/luaconf.h
---- lua-5.1.4/src/luaconf.h	2008-02-11 17:25:08.000000000 +0100
-+++ lua-5.1.4-new/src/luaconf.h	2012-02-23 18:25:34.000000000 +0100
-@@ -94,7 +94,7 @@
- 	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
- 
- #else
--#define LUA_ROOT	"/usr/local/"
-+#define LUA_ROOT	"/usr/"
- #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
- #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
- #define LUA_PATH_DEFAULT  \
-diff -ur lua-5.1.4/src/Makefile lua-5.1.4-new/src/Makefile
---- lua-5.1.4/src/Makefile	2008-01-19 20:37:58.000000000 +0100
-+++ lua-5.1.4-new/src/Makefile	2012-02-23 18:26:43.000000000 +0100
-@@ -23,6 +23,7 @@
- PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
- 
- LUA_A=	liblua.a
-+LUA_SO=	liblua.so
- CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
- 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
- 	lundump.o lvm.o lzio.o
-@@ -36,7 +37,7 @@
- LUAC_O=	luac.o print.o
- 
- ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
--ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
- ALL_A= $(LUA_A)
- 
- default: $(PLAT)
-@@ -51,6 +52,11 @@
- 	$(AR) $@ $?
- 	$(RANLIB) $@
- 
-+$(LUA_SO): $(CORE_O) $(LIB_O)
-+	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
-+	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
-+	ln -sf $(LUA_SO).$(R) $(LUA_SO)
-+
- $(LUA_T): $(LUA_O) $(LUA_A)
- 	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
- 
---- lua-5.1.4/Makefile	2008-08-12 02:40:48.000000000 +0200
-+++ lua-5.1.4-new/Makefile	2012-02-23 19:06:32.000000000 +0100
-@@ -53,7 +53,7 @@
- all:	$(PLAT)
- 
- $(PLATS) clean:
--	cd src && $(MAKE) $@
-+	cd src && $(MAKE) $@ V=$(V) R=$(R)
- 
- test:	dummy
- 	src/lua test/hello.lua
diff --git a/extra/lua51/PKGBUILD b/extra/lua51/PKGBUILD
index 11589a7f1..435788e88 100644
--- a/extra/lua51/PKGBUILD
+++ b/extra/lua51/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=lua51
 pkgver=5.1.5
-pkgrel=3
+pkgrel=3.1
 pkgdesc='A powerful light-weight programming language designed for extending applications'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.lua.org/'
diff --git a/extra/lv2/PKGBUILD b/extra/lv2/PKGBUILD
index 82ca0cb21..8cf34018a 100644
--- a/extra/lv2/PKGBUILD
+++ b/extra/lv2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 171678 2012-11-21 07:36:28Z schiv $
+# $Id: PKGBUILD 180306 2013-03-19 21:48:21Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 
 pkgname=lv2
-pkgver=1.2.0
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="Successor to the LADSPA audio plug-in standard"
 url="http://lv2plug.in/"
@@ -15,7 +15,7 @@ provides=('lv2core')
 conflicts=('lv2core')
 replaces=('lv2core')
 source=("http://lv2plug.in/spec/$pkgname-$pkgver.tar.bz2")
-md5sums=('323b851563b4da1ad2c0faf5c76f0e3a')
+md5sums=('b7fb567fbfadae14ecd4f422fa24d41e')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/lynx/PKGBUILD b/extra/lynx/PKGBUILD
index b342e6b46..d015394b0 100644
--- a/extra/lynx/PKGBUILD
+++ b/extra/lynx/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=lynx
 pkgver=2.8.7
 _pkgver=2-8-7
-pkgrel=6
+pkgrel=6.1
 pkgdesc="A text browser for the World Wide Web"
 url="http://lynx.isc.org/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -23,7 +23,8 @@ build() {
     --with-ssl \
     --enable-nls \
     --enable-ipv6 \
-    --mandir=/usr/share/man
+    --mandir=/usr/share/man \
+    CFLAGS="$CFLAGS -DUSE_OPENSSL_INCL"
   make
 }
 
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index 36dba8905..a1be32613 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 176293 2013-01-28 16:48:26Z stephane $
+# $Id: PKGBUILD 181126 2013-03-31 19:16:54Z stephane $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=lyx
 pkgver=2.0.5.1
-pkgrel=1
+pkgrel=3
 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lyx.org"
-depends=('qt' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes')
+depends=('qt4' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes')
 makedepends=('boost')
 optdepends=('rcs: built-in version control system'
             'texlive-latexextra: float wrap support')
diff --git a/extra/m17n-lib/PKGBUILD b/extra/m17n-lib/PKGBUILD
index afa11f8f3..0a6d13cf2 100644
--- a/extra/m17n-lib/PKGBUILD
+++ b/extra/m17n-lib/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=m17n-lib
 pkgver=1.6.4
-pkgrel=1
+pkgrel=1.1
 pkgdesc='Multilingual text processing library (runtimes)'
 url='http://www.nongnu.org/m17n/'
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/mahjong/PKGBUILD b/extra/mahjong/PKGBUILD
deleted file mode 100644
index 1e87da8b1..000000000
--- a/extra/mahjong/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 160020 2012-05-28 05:16:18Z eric $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Jason Chu <jchu@xentac.net>
-
-pkgname=mahjong
-pkgver=1.12.1
-pkgrel=1
-pkgdesc="The classical game of Mah Jong (not the solitare version) with network support"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.stevens-bradfield.com/MahJong/"
-license=('GPL' 'custom')
-depends=('gtk2')
-source=(http://mahjong.julianbradfield.org/Source/mj-$pkgver-src.tar.gz)
-md5sums=('a74acae39d6a49bad9c34b84088f72f3')
-
-build() {
-  cd "$srcdir/mj-$pkgver-src"
-  sed -i 's/& Calling/Calling/' gui-dial.c
-  make LDLIBS="-lm"
-}
-
-package() {
-  cd "$srcdir/mj-$pkgver-src"
-  make DESTDIR="$pkgdir/usr/" MANDIR=share/man/man1 install install.man
-  install -D -m644 tiles-v1/README "$pkgdir/usr/share/licenses/$pkgname/tiles-license.txt"
-}
diff --git a/extra/manedit/PKGBUILD b/extra/manedit/PKGBUILD
index 519e8e402..d620506a4 100644
--- a/extra/manedit/PKGBUILD
+++ b/extra/manedit/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=manedit
 pkgver=1.2.1
-pkgrel=4.1
+pkgrel=4.2
 pkgdesc="An editor specifically tailored for UNIX manual pages"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
new file mode 100644
index 000000000..2a10ef5b1
--- /dev/null
+++ b/extra/mariadb/PKGBUILD
@@ -0,0 +1,137 @@
+# $Id: PKGBUILD 180833 2013-03-26 15:59:12Z bpiotrowski $
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+
+pkgbase=mariadb
+pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
+pkgver=5.5.30
+pkgrel=2
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+url='http://mariadb.org/'
+makedepends=('cmake' 'openssl' 'zlib')
+options=('!libtool')
+source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz
+        mariadb.service
+        mariadb-post.sh
+        mariadb-tmpfile.conf)
+sha256sums=('64dba5f1819f1d4ebf7ed31d74e4106c981a24b88259995deba3734fb7c4635f'
+            'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334'
+            '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
+            '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
+
+build() {
+  cd $srcdir
+  mkdir build
+  cd build
+
+  cmake ../$pkgbase-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSYSCONFDIR=/etc/mysql \
+    -DMYSQL_DATADIR=/var/lib/mysql \
+    -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
+    -DDEFAULT_CHARSET=utf8 \
+    -DDEFAULT_COLLATION=utf8_general_ci \
+    -DENABLED_LOCAL_INFILE=ON \
+    -DINSTALL_INFODIR=share/mysql/docs \
+    -DINSTALL_MANDIR=share/man \
+    -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
+    -DINSTALL_SCRIPTDIR=bin \
+    -DINSTALL_INCLUDEDIR=include/mysql \
+    -DINSTALL_DOCREADMEDIR=share/mysql \
+    -DINSTALL_SUPPORTFILESDIR=share/mysql \
+    -DINSTALL_MYSQLSHAREDIR=share/mysql \
+    -DINSTALL_DOCDIR=share/mysql/docs \
+    -DINSTALL_SHAREDIR=share/mysql \
+    -DWITH_READLINE=ON \
+    -DWITH_ZLIB=system \
+    -DWITH_SSL=system \
+    -DWITH_LIBWRAP=OFF \
+    -DWITH_EXTRA_CHARSETS=complex \
+    -DWITH_EMBEDDED_SERVER=ON \
+    -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
+    -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
+    -DWITH_INNOBASE_STORAGE_ENGINE=1 \
+    -DWITH_PARTITION_STORAGE_ENGINE=1 \
+    -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
+    -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
+    -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
+    -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
+    -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}"
+
+
+  make
+}
+
+package_libmariadbclient() {
+  pkgdesc='MariaDB client libraries'
+  depends=('openssl')
+  conflicts=('libmysqlclient')
+  provides=("libmysqlclient=$pkgver")
+  
+  cd "$srcdir"/build
+  for dir in include libmysql libmysqld libservices; do
+    make -C $dir DESTDIR="$pkgdir" install
+  done
+
+  install -d "$pkgdir"/usr/bin
+  install -m755 scripts/mysql_config "$pkgdir"/usr/bin/
+  install -d "$pkgdir"/usr/share/man/man1
+  for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
+    install -m644 "$srcdir"/$pkgbase-$pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
+  done
+}
+
+package_mariadb-clients() {
+  pkgdesc='MariaDB client tools'
+  depends=('libmariadbclient')
+  conflicts=('mysql-clients')
+  provides=("mysql-clients=$pkgver")
+  
+  cd "$srcdir"/build
+  make -C client DESTDIR="$pkgdir" install
+
+  # install man pages
+  install -d "$pkgdir"/usr/share/man/man1
+  for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
+    install -m644 "$srcdir"/$pkgbase-$pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
+  done
+
+  # provided by mariadb
+  rm "$pkgdir"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
+}
+
+package_mariadb() {
+  pkgdesc='Fast SQL database server, drop-in replacement for MySQL'
+  backup=('etc/mysql/my.cnf')
+  install=mariadb.install
+  depends=('mariadb-clients')
+  conflicts=('mysql' 'mytop')
+  provides=("mysql=$pkgver" 'mytop')
+  optdepends=('perl-dbd-mysql: mytop dependency'
+              'perl-term-readkey: mytop dependency')
+  options=('emptydirs')
+
+  cd "$srcdir"/build
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf
+  install -Dm755 "$srcdir"/mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post
+  install -Dm644 "$srcdir"/mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
+  install -Dm644 "$srcdir"/mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
+
+  # provided by libmariadbclient
+  rm "$pkgdir"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+  rm "$pkgdir"/usr/lib/libmysql*
+  rm -r "$pkgdir"/usr/include/
+  rm "$pkgdir"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+  
+  # provided by mariadb-clients
+  rm "$pkgdir"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+  rm "$pkgdir"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+
+  # not needed
+  rm -r "$pkgdir"/usr/{data,mysql-test,sql-bench}
+  rm "$pkgdir"/usr/share/man/man1/mysql-test-run.pl.1
+}
diff --git a/extra/mariadb/mariadb-post.sh b/extra/mariadb/mariadb-post.sh
new file mode 100755
index 000000000..c4ac18171
--- /dev/null
+++ b/extra/mariadb/mariadb-post.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+while true; do
+    response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break
+    echo "$response" | grep -q "mysqld is alive" && break
+    echo "$response" | grep -q "Access denied for user" && break 
+    sleep 1
+done
diff --git a/extra/mysql/mysqld-tmpfile.conf b/extra/mariadb/mariadb-tmpfile.conf
index 6883dc798..6883dc798 100644
--- a/extra/mysql/mysqld-tmpfile.conf
+++ b/extra/mariadb/mariadb-tmpfile.conf
diff --git a/extra/mariadb/mariadb.install b/extra/mariadb/mariadb.install
new file mode 100644
index 000000000..7d3c2ce5c
--- /dev/null
+++ b/extra/mariadb/mariadb.install
@@ -0,0 +1,47 @@
+if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then
+  datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p")
+fi
+[[ -z $datadir ]] && datadir=/var/lib/mysql
+
+post_install(){
+  groupadd -g 89 mysql &>/dev/null
+  useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
+
+  if [[ ! -e $datadir ]]; then
+    install -dm700 $datadir
+    usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir
+    chown -R mysql:mysql var/lib/mysql &>/dev/null
+  fi
+
+  usr/bin/systemd-tmpfiles --create mysql.conf
+
+  echo ">> If you are migrating from MySQL, don't forget to run 'mysql_upgrade'"
+  echo "     after mysqld.service restart." 
+}
+
+post_upgrade(){
+  getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
+  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
+
+  if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then
+    for x in data/*; do
+      cp -r $x $datadir/
+    done
+    rm -rf data
+  fi
+
+  if [[ "$(vercmp $2 5.5.25-5)" -lt 0 ]]; then
+    echo ">> mysql.service has been renamed to mysqld.service to keep"
+    echo "    consistency with MySQL package." 
+  fi
+}
+
+post_remove(){
+  if getent passwd mysql >/dev/null 2>&1; then
+    userdel mysql
+
+  fi
+  if getent group mysql >/dev/null 2>&1; then
+    groupdel mysql
+  fi
+}
diff --git a/extra/mariadb/mariadb.service b/extra/mariadb/mariadb.service
new file mode 100644
index 000000000..dd65511d7
--- /dev/null
+++ b/extra/mariadb/mariadb.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=MariaDB database server
+After=syslog.target
+
+[Service]
+User=mysql
+Group=mysql
+
+ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid 
+ExecStartPost=/usr/bin/mysqld-post
+
+Restart=always
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/mash/PKGBUILD b/extra/mash/PKGBUILD
index 496e7250e..92e2a085e 100644
--- a/extra/mash/PKGBUILD
+++ b/extra/mash/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157037 2012-04-23 09:53:25Z ibiru $
+# $Id: PKGBUILD 183442 2013-04-21 22:11:40Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=mash
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A small library for using 3D models within a Clutter scene"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://clutter-project.org/"
@@ -11,7 +11,7 @@ options=('!libtool')
 license=('LGPL')
 depends=('clutter')
 makedepends=('gtk-doc' 'gobject-introspection')
-source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+source=(https://github.com/downloads/clutter-project/mash/mash-${pkgver}.tar.xz)
 sha256sums=('fd4089e2974a1a57f9ba209a0a47924ed157da9fc9a3d65f68a6b9fdca353ccc')
 
 build() {
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index dd81a957d..cbbdfa233 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 174263 2013-01-03 12:45:07Z juergen $
+# $Id: PKGBUILD 178301 2013-02-19 19:05:06Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
-pkgver=5.28.0
-pkgrel=5
+pkgver=5.29.1
+pkgrel=1
 pkgdesc="Maxima - a sophisticated computer algebra system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net"
 if [ "${CARCH}" == "mips64el" ] ; then
     depends=('clisp' 'texinfo' 'sh')
 else
-    depends=('sbcl=1.1.3-1' 'texinfo' 'sh')
+    depends=('sbcl=1.1.4' 'texinfo' 'sh')
 fi
 makedepends=('python2')
 optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
@@ -21,7 +21,7 @@ optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/
 options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima
 install=maxima.install
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop")
-sha1sums=('52d7dad4681711a6ead73b72835b177107363b9c'
+sha1sums=('9be04303d6a5472bc95576b7de7286fa4b8ff604'
           '4398ebb1ec85ccfa12f37516a56d60c26f74b18b')
 
 build() {
diff --git a/extra/mcrypt/PKGBUILD b/extra/mcrypt/PKGBUILD
deleted file mode 100644
index bcbc3a275..000000000
--- a/extra/mcrypt/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 136972 2011-09-04 11:41:22Z pierre $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=mcrypt
-pkgver=2.6.8
-pkgrel=2.1
-pkgdesc="A program for encrypting files or streams"
-url="http://mcrypt.sourceforge.net/"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('mhash' 'libmcrypt' 'zlib')
-source=("http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.gz")
-md5sums=('97639f8821b10f80943fa17da302607e')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD
index 6c27b82c7..cd31148ff 100644
--- a/extra/mediastreamer/PKGBUILD
+++ b/extra/mediastreamer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163154 2012-07-08 09:31:45Z ibiru $
+# $Id: PKGBUILD 183011 2013-04-16 22:29:29Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=mediastreamer
 pkgver=2.8.2
-pkgrel=2
+pkgrel=5
 pkgdesc="A library written in C that allows you to create and run audio and video streams"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linphone.org/"
@@ -18,16 +18,20 @@ source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${
         mediastreamer-ffmpeg.patch)
 md5sums=('e51ea9d5fce1396b374d10473dfbadec'
          '805da7def98f367e621363fa0c951fe8'
-         'f147546489a973f148ce3dd2dba36834')
+         '553d5d47ea4a8c8dfeabdc0281849d5f')
 
-build() {
-  cd "${srcdir}"/$pkgname-$pkgver
+prepare() {
+  cd $pkgname-$pkgver
   patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}"/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/mediastreamer/mediastreamer-ffmpeg.patch b/extra/mediastreamer/mediastreamer-ffmpeg.patch
index 944d4b833..3304e9f56 100644
--- a/extra/mediastreamer/mediastreamer-ffmpeg.patch
+++ b/extra/mediastreamer/mediastreamer-ffmpeg.patch
@@ -1,205 +1,57 @@
-diff --git a/include/mediastreamer2/msvideo.h b/include/mediastreamer2/msvideo.h
-index 5ae8a63..86edf86 100644
---- mediastreamer2/include/mediastreamer2/msvideo.h
-+++ mediastreamer2/include/mediastreamer2/msvideo.h
-@@ -21,6 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #define msvideo_h
- 
- #include <mediastreamer2/msfilter.h>
-+#ifndef INT64_C
-+#define INT64_C(c) (c ## LL)
-+#define UINT64_C(c) (c ## ULL)
-+#endif
-+#include <libavutil/avutil.h>
-+#include <libavcodec/version.h>
- 
- /* some global constants for video MSFilter(s) */
- #define MS_VIDEO_SIZE_SQCIF_W 128
-@@ -206,7 +212,9 @@ extern "C"{
- MS2_PUBLIC int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt);
- MS2_PUBLIC MSPixFmt ffmpeg_pix_fmt_to_ms(int fmt);
- MS2_PUBLIC MSPixFmt ms_fourcc_to_pix_fmt(uint32_t fourcc);
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- MS2_PUBLIC void ms_ffmpeg_check_init(void);
-+#endif
- MS2_PUBLIC int ms_yuv_buf_init_from_mblk(MSPicture *buf, mblk_t *m);
- MS2_PUBLIC int ms_yuv_buf_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, int w, int h);
- MS2_PUBLIC int ms_picture_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, MSPixFmt fmt, int w, int h);
+commit f586917ea4d66f9ba8910f0967a8830e54d50784
+Author: Yann Diorcet <yann.diorcet@belledonne-communications.com>
+Date:   Tue Jun 5 11:07:48 2012 +0200
+
+    Fixes for new versions of ffmpeg
+
 diff --git a/src/h264dec.c b/src/h264dec.c
-index 223de3d..8c40a7c 100644
---- mediastreamer2/src/h264dec.c
-+++ mediastreamer2/src/h264dec.c
-@@ -44,7 +44,9 @@ typedef struct _DecData{
+index c4a84ee..5229b5e 100644
+--- a/src/h264dec.c
++++ b/src/h264dec.c
+@@ -45,7 +45,9 @@ typedef struct _DecData{
  static void ffmpeg_init(){
  	static bool_t done=FALSE;
  	if (!done){
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
++#ifdef FF_API_AVCODEC_INIT
  		avcodec_init();
 +#endif
  		avcodec_register_all();
  		done=TRUE;
  	}
-diff --git a/src/mscommon.c b/src/mscommon.c
-index 2cab005..bebb946 100644
---- mediastreamer2/src/mscommon.c
-+++ mediastreamer2/src/mscommon.c
-@@ -33,9 +33,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #include "mediastreamer2/mscodecutils.h"
- #include "mediastreamer2/msfilter.h"
- #include <ortp/ortp_srtp.h>
-+#ifndef INT64_C
-+#define INT64_C(c) (c ## LL)
-+#define UINT64_C(c) (c ## ULL)
-+#endif
-+#include <libavutil/avutil.h>
-+#include <libavcodec/version.h>
- 
- extern void __register_ffmpeg_encoders_if_possible(void);
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- extern void ms_ffmpeg_check_init();
-+#endif
- extern bool_t libmsandroiddisplay_init(void);
- extern void libmsandroiddisplaybad_init(void);
- extern void libmsandroidopengldisplay_init(void);
-@@ -645,7 +653,9 @@ void ms_init(){
- 		}
- 	}
- #if !defined(NO_FFMPEG)
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	ms_ffmpeg_check_init();
-+#endif
- 	__register_ffmpeg_encoders_if_possible();
- #endif
- #endif
-diff --git a/src/videodec.c b/src/videodec.c
-index c04e1e9..a455075 100644
---- mediastreamer2/src/videodec.c
-+++ mediastreamer2/src/videodec.c
-@@ -27,9 +27,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #include "mediastreamer2/msvideo.h"
- #include "mediastreamer2/msticker.h"
- #include "rfc2429.h"
-+#ifndef INT64_C
-+#define INT64_C(c) (c ## LL)
-+#define UINT64_C(c) (c ## ULL)
-+#endif
-+#include <libavutil/avutil.h>
-+#include <libavcodec/version.h>
- 
--
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- extern void ms_ffmpeg_check_init();
-+#endif
- 
- 
- typedef struct DecState{
-@@ -50,7 +57,9 @@ typedef struct DecState{
- 
- static void dec_init(MSFilter *f, enum CodecID cid){
- 	DecState *s=(DecState *)ms_new0(DecState,1);
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	ms_ffmpeg_check_init();
-+#endif
- 	
- 	avcodec_get_context_defaults(&s->av_context);
- 	s->av_codec=NULL;
 diff --git a/src/videoenc.c b/src/videoenc.c
-index 21d016f..520f06a 100644
---- mediastreamer2/src/videoenc.c
-+++ mediastreamer2/src/videoenc.c
-@@ -37,7 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
- #define RATE_CONTROL_MARGIN 15000 /*bits/second*/
+index 21d016f..fb35760 100644
+--- a/src/videoenc.c
++++ b/src/videoenc.c
+@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
  static bool_t avcodec_initialized=FALSE;
-+#endif
  
++#ifndef FF_I_TYPE
++#define FF_I_TYPE AV_PICTURE_TYPE_I
++#endif
++
  #ifdef ENABLE_LOG_FFMPEG
  
-@@ -51,6 +53,7 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
- 
- #endif
+ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
+@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
  
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
  void ms_ffmpeg_check_init(){
  	if(!avcodec_initialized){
++#ifdef FF_API_AVCODEC_INIT
  		avcodec_init();
-@@ -62,6 +65,7 @@ void ms_ffmpeg_check_init(){
- #endif
- 	}
- }
 +#endif
- 
- /* the goal of this small object is to tell when to send I frames at startup:
- at 2 and 4 seconds*/
-@@ -201,7 +205,9 @@ static void enc_init(MSFilter *f, enum CodecID codec)
- {
- 	EncState *s=(EncState *)ms_new(EncState,1);
- 	f->data=s;
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	ms_ffmpeg_check_init();
-+#endif
- 	s->profile=0;/*always default to profile 0*/
- 	s->comp_buf=NULL;
- 	s->fps=15;
-@@ -300,9 +306,13 @@ static void prepare_h263(EncState *s){
+ 		avcodec_register_all();
+ 		avcodec_initialized=TRUE;
+ #ifdef ENABLE_LOG_FFMPEG
+@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){
  	if (s->profile==0){
  		s->codec=CODEC_ID_H263;
  	}else{
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
++		/*
  		c->flags|=CODEC_FLAG_H263P_UMV;
-+#endif
  		c->flags|=CODEC_FLAG_AC_PRED;
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
  		c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
-+#endif
- 		/*
+-		/*
  		c->flags|=CODEC_FLAG_OBMC;
  		c->flags|=CODEC_FLAG_AC_PRED;
-@@ -372,7 +382,11 @@ static void add_rfc2190_header(mblk_t **packet, AVCodecContext *context){
- 	// assume video size is CIF or QCIF
- 	if (context->width == 352 && context->height == 288) header->b_wptr[1] = 0x60;
- 	else header->b_wptr[1] = 0x40;
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	if (context->coded_frame->pict_type != FF_I_TYPE) header->b_wptr[1] |= 0x10;
-+#else
-+	if (context->coded_frame->pict_type != AV_PICTURE_TYPE_I) header->b_wptr[1] |= 0x10;
-+#endif
- 	header->b_wptr += 4;
- 	header->b_cont = *packet;
- 	*packet = header;
-@@ -779,7 +793,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){
- 		s->req_vfu=TRUE;
- 	}
- 	if (s->req_vfu){
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 		pict.pict_type=FF_I_TYPE;
-+#else
-+		pict.pict_type=AV_PICTURE_TYPE_I;
-+#endif
- 		s->req_vfu=FALSE;
- 	}
- 	comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base;
-@@ -799,7 +817,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){
- 		if (s->framenum==1){
- 			video_starter_first_frame (&s->starter,f->ticker->time);
- 		}
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 		if (c->coded_frame->pict_type==FF_I_TYPE){
-+#else
-+		if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){
-+#endif
- 			ms_message("Emitting I-frame");
- 		}
- 		comp_buf->b_wptr+=error;
-@@ -1067,7 +1089,9 @@ MSFilterDesc ms_mjpeg_enc_desc={
- #endif
- 
- void __register_ffmpeg_encoders_if_possible(void){
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	ms_ffmpeg_check_init();
-+#endif
- 	if (avcodec_find_encoder(CODEC_ID_MPEG4))
- 		ms_filter_register(&ms_mpeg4_enc_desc);
- 	if (avcodec_find_encoder(CODEC_ID_H263)){
+ 		*/
diff --git a/extra/memcached/ChangeLog b/extra/memcached/ChangeLog
deleted file mode 100644
index d1f1e44d0..000000000
--- a/extra/memcached/ChangeLog
+++ /dev/null
@@ -1,24 +0,0 @@
-2011-02-07 Ionut Biru <ibiru@archlinux.org>
-	* Rebuild 1.4.5 against libevent 2.0.10
-
-2011-01-31 Dan McGee <dan@archlinux.org>
-	* Rebuild 1.4.5 with gcc 4.5.X patch accepted upstream
-
-2009-11-14 Dan McGee <dan@archlinux.org>
-	* Bump to 1.4.3
-	* Added memcached-tool to package
-
-2009-09-13 Dan McGee <dan@archlinux.org>
-	* Bump to 1.4.1
-	* Add new required conf.d option MEMCACHED_USER
-	* Rework the way we store the PID for init script usage
-
-2009-04-12 Dan McGee <dan@archlinux.org>
-	* Bump to 1.2.8
-
-2009-04-05 Dan McGee <dan@archlinux.org>
-	* Bump to 1.2.7
-
-2008-12-13 Dan McGee <dan@archlinux.org>
-	* Added conf file to backup array
-	* Fixed the not quite right default config
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index ec2850e85..7341c2243 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 174611 2013-01-05 08:40:08Z giovanni $
+# $Id: PKGBUILD 184144 2013-05-02 17:00:09Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.4.2
+pkgver=2.6
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
         'mercurial.profile')
-md5sums=('ffae81c0366c13ae852e9fdc26fc3690'
+md5sums=('d012d8bb5f85369d3b6a630a80667170'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/mesa-demos/LICENSE b/extra/mesa-demos/LICENSE
deleted file mode 100644
index ae33d2709..000000000
--- a/extra/mesa-demos/LICENSE
+++ /dev/null
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components.  Different copyrights
-and licenses apply to different components.  For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors.  See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component         Location               Primary Author      License
-----------------------------------------------------------------------------
-Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
-
-Device drivers    src/mesa/drivers/*     See drivers         See drivers
-
-Ext headers       include/GL/glext.h     SGI                 SGI Free B
-                  include/GL/glxext.h
-
-GLUT              src/glut/              Mark Kilgard        Mark's copyright
-
-Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
-
-SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
-
-demo programs     progs/demos/           various             see source files
-
-X demos           progs/xdemos/          Brian Paul          see source files
-
-SGI demos         progs/samples/         SGI                 SGI copyright
-
-RedBook demos     progs/redbook/         SGI                 SGI copyright
diff --git a/extra/mesa-demos/PKGBUILD b/extra/mesa-demos/PKGBUILD
deleted file mode 100644
index 79f57c0e6..000000000
--- a/extra/mesa-demos/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 151280 2012-02-25 12:34:36Z pierre $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname='mesa-demos'
-pkgver=8.0.1
-pkgrel=2
-arch=('i686' 'x86_64')
-pkgdesc="Mesa demos and tools"
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-depends=('glew')
-source=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2"
-        'LICENSE')
-md5sums=('320c2a4b6edc6faba35d9cb1e2a30bf4'
-         '5c65a0fe315dd347e09b1f2826a1df5a')
-
-build() {
-  cd "${srcdir}/mesa-demos-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/mesa-demos-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-demos"
-  install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-demos/"
-}
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 94e4336a6..83648b26f 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,44 +1,29 @@
-# $Id: PKGBUILD 175899 2013-01-23 16:58:37Z andyrtr $
+# $Id: PKGBUILD 184295 2013-05-05 17:57:33Z bpiotrowski $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
-pkgname=('libglapi' 'libgl' 'mesa' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
-[[ "$CARCH" != "mips64el" ]] && pkgname+=('ati-dri' 'intel-dri' 'svga-dri' 'nouveau-dri')
-
-#_git=true
-#_gitdate=20121006
-_git=false
-
-if [ "${_git}" = "true" ]; then
-    pkgver=8.99.git_$_gitdate
-  else
-    pkgver=9.0.2
-fi
+pkgname=('mesa' 'mesa-libgl')
+pkgver=9.1.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
-makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libx11>=1.5.0' 'libxt>=1.1.3' 
-             'gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' 'imake' 'systemd')
-[[ "$CARCH" != "mips64el" ]] && makedepends+=('llvm-amdgpu-snapshot' 'libvdpau>=0.5')
+makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
+             'wayland' 'systemd')
+if [ "$CARCH" != "mips64el" ]; then
+  pkgname+=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
+  makedepends+=('libvdpau' 'llvm-amdgpu-snapshot')
+fi
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 options=('!libtool')
-source=(LICENSE llvm32.patch)
-if [ "${_git}" = "true" ]; then
-	# mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
-	#source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
-	source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-7851d398def2df3f6836a500d67123eed50f3943.tar.gz")
-  else
-	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
-	#source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2"
-)
-fi
-source+=(mesa-loongson.patch)
+source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
+	#ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1-rc2.tar.bz2 # for RC testing
+        LICENSE)
+md5sums=('df2aab86ff4a510ce5b0d074caa0a59f'
+         '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
     cd ${srcdir}/?esa-*
-    
-    patch -Np1 -i ${srcdir}/llvm32.patch
 
    if [ "$CARCH" = "mips64el" ]; then
      extraconf="--with-gallium-drivers=swrast --with-dri-drivers=swrast --disable-gallium-llvm --disable-vdpau"
@@ -46,10 +31,14 @@ build() {
      extraconf=""
    fi
 
-    patch -Np1 -i $srcdir/mesa-loongson.patch
-#    patch -Np1 -i ${srcdir}/git_fixes.diff
+    # pick 2 commits from master to
+    # fix a nouveau crash: http://cgit.freedesktop.org/mesa/mesa/commit/?id=17f1cb1d99e66227d1e05925ef937643f5c1089a
+    # and intel kwin slowness http://cgit.freedesktop.org/mesa/mesa/commit/?id=e062a4187d8ea518a39c913ae7562cf1d8ac3205
+    #patch -Np1 -i ${srcdir}/git-fixes.patch
+
+    autoreconf -vfi # our automake is far too new for their build system :)
 
-    COMMONOPTS="--prefix=/usr \
+    ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
     --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
@@ -57,7 +46,7 @@ build() {
     --enable-gallium-llvm \
     --enable-egl \
     --enable-gallium-egl \
-    --with-egl-platforms=x11,drm \
+    --with-egl-platforms=x11,drm,wayland \
     --enable-shared-glapi \
     --enable-gbm \
     --enable-glx-tls \
@@ -69,244 +58,108 @@ build() {
     --enable-texture-float \
     --enable-xa \
     --enable-vdpau \
-    $extraconf "
-
-# not default:
-#    --enable-gallium-egl enable optional EGL state tracker (not required for
-#                          EGL support in Gallium with OpenGL and OpenGL ES)
-#                          [default=disable]
-#    --enable-xa             enable build of the XA X Acceleration API                          [default=no]
-
-
-if [ "${_git}" = "true" ]; then
-    ./autogen.sh \
-      $COMMONOPTS
-  else
-    autoreconf -vfi
-    ./configure \
-      $COMMONOPTS
-fi
-
-    # fix a build break with new llvm
-    sed -i "s:-Werror=implicit-function-declaration::" src/gallium/drivers/r600/Makefile
+    $extraconf
+    # --help
+    # --with-llvm-shared-libs \ # enabling this would force us to move llvm-amdgpu-snapshot from community to extra, delay it until llvm 3.3 / Mesa 9.2/10.0
 
     make
-}
-
-package_libglapi() {
-  depends=('glibc')
-  pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions"
-
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/"
-}
-
-package_libgl() {
-  depends=('libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libglapi' 'gcc-libs')
-  pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  # libGL & libdricore
-  make -C ${srcdir}/?esa-*/src/glx DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-
-  # See FS#26284
-  install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
-  ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
-}
-
-package_mesa() {
-  # check also gl.pc
-  depends=('libgl' 'libx11>=1.5.0' 'libxext>=1.3.1' 'libxdamage' 'libxfixes' 'libxcb' 'libxxf86vm')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3-D graphics libraries and include files"
-
-  make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-glHEADERS
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-driincludeHEADERS  
-  make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-pkgconfigDATA
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA  
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/common DESTDIR="${pkgdir}" install-sysconfDATA
-
-  [ "$CARCH" != "mips64el" ] && make -C ${srcdir}/?esa-*/src/gallium/targets/xa-vmwgfx DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
-}
-
-package_osmesa() {
-  depends=('libglapi' 'gcc-libs')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3D off-screen rendering library"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/osmesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/osmesa/"
-}
-
-package_libgbm() {
-  depends=('systemd' 'libglapi' 'libdrm')
-  pkgdesc="Mesa gbm library"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgbm"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgbm/"
-}
-
-package_libgles() {
-  depends=('libglapi' 'libdrm' 'khrplatform-devel')
-  pkgdesc="Mesa GLES libraries and headers"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  make -C ${srcdir}/?esa-*/src/mapi/es1api DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mapi/es2api DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/"
-}
-
-package_libegl() {
-  # check also egl.pc
-  depends=('libx11' 'libxext' 'libxdamage' 'libxfixes' 'libxxf86vm' 'libxcb' 'libgbm' 'khrplatform-devel')
-  pkgdesc="Mesa EGL libraries and headers"
-
-  make -C ${srcdir}/?esa-*/src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/doc/libegl"
-  install -m644 ${srcdir}/?esa-*/docs/egl.html "${pkgdir}/usr/share/doc/libegl/"
-  
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install
-  
-  make -C ${srcdir}/?esa-*/src/egl DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" uninstall
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
-  
-  # fix file conflicts
-  rm -rf ${pkgdir}/usr/include/KHR
-}
-
-package_khrplatform-devel() {
-  pkgdesc="Khronos platform development package"
-
-  install -m755 -d "${pkgdir}/usr/include/KHR"
-  install -m644 ${srcdir}/?esa-*/include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" 
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/"
+    # fake installation
+	mkdir $srcdir/fakeinstall
+	make DESTDIR=${srcdir}/fakeinstall install
 }
 
 package_ati-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon"
+  pkgdesc="Mesa drivers for AMD/ATI Radeon"
+  depends=("mesa-libgl=${pkgver}")
   conflicts=('xf86-video-ati<6.9.0-6')
 
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
-  
-  # classic mesa drivers for radeon,r200
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install
-  # gallium3D driver for r300,r600,radeonsi
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-radeonsi DESTDIR="${pkgdir}" install
-  # vdpau driver
-  make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-r300 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-r600 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-radeonsi DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
+  install -m755 -d ${pkgdir}/usr/lib/vdpau/
+  mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_{r300,r600,radeonsi}.* ${pkgdir}/usr/lib/vdpau/
 
+  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{r200,r300,r600,radeon,radeonsi}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/
+  
+  install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
+  mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{r300,r600,radeonsi}* ${pkgdir}/usr/lib/gallium-pipe/
+  
   install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/ati-dri/"
 }
 
 package_intel-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for Intel"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
+  pkgdesc="Mesa drivers for Intel"
+  depends=("mesa-libgl=${pkgver}")
 
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
+  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/
 
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-  
   install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/intel-dri/"
 }
 
 package_nouveau-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
+  pkgdesc="Mesa drivers for Nouveau"
+  depends=("mesa-libgl=${pkgver}")
 
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
+  install -m755 -d ${pkgdir}/usr/lib/vdpau/
+  mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/
 
-  # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
-  # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-  # vdpau driver
-  make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-nouveau DESTDIR="${pkgdir}" install
+  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/nouveau_{dri,vieux_dri}.so ${pkgdir}/usr/lib/xorg/modules/dri/
   
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
+  install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
+  mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib/gallium-pipe/
   
   install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/"
 }
 
 package_svga-dri() {
-  depends=('gcc-libs' 'libdrm' 'expat')
   pkgdesc="Gallium3D VMware guest GL driver"
+  depends=('gcc-libs' 'libdrm' 'expat' 'libffi')
 
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install
+  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/
+
+  install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
+  mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_vmwgfx* ${pkgdir}/usr/lib/gallium-pipe/
   
   install -m755 -d "${pkgdir}/usr/share/licenses/svga-dri"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/svga-dri/"
 }
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         '5fe9ad0c5beed19bc98d8c34aaad4ade'
-         'dc45d1192203e418163e0017640e1cfc'
-         '598c24dccfcdcc99c07d883f7c09f36a')
+
+package_mesa() {
+  pkgdesc="an open-source implementation of the OpenGL specification"
+  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'systemd')
+  optdepends=('opengl-man-pages: for the OpenGL API man pages')
+  provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+  conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+  replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+  [ "$CARCH" != "mips64el" ] && depends+=('libvdpau')
+
+  mv -v ${srcdir}/fakeinstall/* ${pkgdir}
+  # rename libgl.so to not conflict with blobs - may break gl.pc ?
+  mv ${pkgdir}/usr/lib/libGL.so.1.2.0 	${pkgdir}/usr/lib/mesa-libGL.so.1.2.0
+  rm ${pkgdir}/usr/lib/libGL.so{,.1}
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
+}
+
+package_mesa-libgl() {
+  pkgdesc="Mesa 3-D graphics library"
+  depends=("mesa=${pkgver}")
+  provides=("libgl=${pkgver}")
+  replaces=('libgl')
+ 
+  # See FS#26284
+  install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
+  ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
+
+  ln -s mesa-libGL.so.1.2.0      ${pkgdir}/usr/lib/libGL.so
+  ln -s mesa-libGL.so.1.2.0      ${pkgdir}/usr/lib/libGL.so.1
+  ln -s mesa-libGL.so.1.2.0      ${pkgdir}/usr/lib/libGL.so.1.2.0
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"
+}
diff --git a/extra/mesa/git_fixes.diff b/extra/mesa/git_fixes.diff
deleted file mode 100644
index 8132d1d10..000000000
--- a/extra/mesa/git_fixes.diff
+++ /dev/null
@@ -1,93 +0,0 @@
-From 161aababc659e23c4a8523366a31f63b3d14e280 Mon Sep 17 00:00:00 2001
-From: Ian Romanick <ian.d.romanick@intel.com>
-Date: Mon, 08 Oct 2012 22:07:10 +0000
-Subject: docs: Add 9.0 release md5sums
-
-Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
----
-diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html
-index d72c5bb..02b7324 100644
---- a/docs/relnotes-9.0.html
-+++ b/docs/relnotes-9.0.html
-@@ -26,7 +26,9 @@ because GL_ARB_compatibility is not supported.
- 
- <h2>MD5 checksums</h2>
- <pre>
--tbd
-+be4cd34c6599a7cb9d254b05c48bdb1f  MesaLib-9.0.tar.gz
-+60e557ce407be3732711da484ab3db6c  MesaLib-9.0.tar.bz2
-+16b128544cd3f7e237927bb9f8aab7ce  MesaLib-9.0.zip
- </pre>
- 
- 
---
-cgit v0.9.0.2-2-gbebe
-From 32faf7ab0de8b88bb15a2cb262a73c411dce9d0d Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Fri, 05 Oct 2012 22:47:40 +0000
-Subject: mesa: don't call TexImage driver hooks for zero-sized images
-
-This simply avoids some failed assertions but there's no reason to
-call the driver hooks for storing a tex image if its size is zero.
-
-Note: This is a candidate for the stable branches.
-(cherry picked from commit 91d84096497ff538f55591f7e6bb0b563726db8d)
----
-diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
-index 21646cc..8004876 100644
---- a/src/mesa/main/teximage.c
-+++ b/src/mesa/main/teximage.c
-@@ -3034,13 +3034,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
-                                           border, internalFormat, texFormat);
- 
-                /* Give the texture to the driver.  <pixels> may be null. */
--               if (compressed) {
--                  ctx->Driver.CompressedTexImage(ctx, dims, texImage,
--                                                 imageSize, pixels);
--               }
--               else {
--                  ctx->Driver.TexImage(ctx, dims, texImage, format,
--                                       type, pixels, unpack);
-+               if (width > 0 && height > 0 && depth > 0) {
-+                  if (compressed) {
-+                     ctx->Driver.CompressedTexImage(ctx, dims, texImage,
-+                                                    imageSize, pixels);
-+                  }
-+                  else {
-+                     ctx->Driver.TexImage(ctx, dims, texImage, format,
-+                                          type, pixels, unpack);
-+                  }
-                }
- 
-                check_gen_mipmap(ctx, target, texObj, level);
---
-cgit v0.9.0.2-2-gbebe
-From e75051d1967350ceff0209dde24ae42696b13b5c Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Fri, 05 Oct 2012 22:59:27 +0000
-Subject: mesa: fix error check for zero-sized compressed subtexture
-
-For glCompressedTexSubImage, width or height = 0 is legal.
-Fixes a failure in piglit's s3tc-errors test.
-
-This is for the 9.0 and 8.0 branches.  Already fixed on master.
----
-diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
-index 8004876..38fa9fa 100644
---- a/src/mesa/main/teximage.c
-+++ b/src/mesa/main/teximage.c
-@@ -3598,10 +3598,10 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions,
-    if (!_mesa_is_compressed_format(ctx, format))
-       return GL_INVALID_ENUM;
- 
--   if (width < 1 || width > maxTextureSize)
-+   if (width < 0 || width > maxTextureSize)
-       return GL_INVALID_VALUE;
- 
--   if ((height < 1 || height > maxTextureSize)
-+   if ((height < 0 || height > maxTextureSize)
-        && dimensions > 1)
-       return GL_INVALID_VALUE;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/mesa/llvm32.patch b/extra/mesa/llvm32.patch
deleted file mode 100644
index 946c07849..000000000
--- a/extra/mesa/llvm32.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-From 8d9778589f4b3a174e884338adb0fe1bdeca5eb7 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Thu, 10 May 2012 14:21:54 +0000
-Subject: radeon: Support LLVM 3.2
-
-LLVM 3.2 and newer requires that the R600/SI backend be part of the
-LLVM tree.
----
-diff --git a/configure.ac b/configure.ac
-index 896f98a..32f412b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1661,6 +1661,7 @@ if test "x$enable_gallium_llvm" = xyes; then
-             if $LLVM_CONFIG --components | grep -q '\<mcjit\>'; then
-                 LLVM_COMPONENTS="${LLVM_COMPONENTS} mcjit"
-             fi
-+            LLVM_COMPONENTS="${LLVM_COMPONENTS} all-targets"
-             if test "x$enable_opencl" = xyes; then
-                 LLVM_COMPONENTS="${LLVM_COMPONENTS} ipo linker instrumentation"
-             fi
-@@ -1782,6 +1783,23 @@ gallium_require_drm_loader() {
-     fi
- }
- 
-+radeon_llvm_check() {
-+    LLVM_VERSION_MAJOR=`echo $LLVM_VERSION | cut -d. -f1`
-+    if test "$LLVM_VERSION_MAJOR" -lt "3" -o "x$LLVM_VERSION" = "x3.0"; then
-+        AC_MSG_ERROR([LLVM 3.1 or newer is required for the r600/radeonsi llvm compiler.])
-+    fi
-+    if test "$LLVM_VERSION_MAJOR" -ge "3" -a "x$LLVM_VERSION" != "x3.1" && $LLVM_CONFIG --targets-built | grep -qv '\<AMDGPU\>' ; then
-+        AC_MSG_ERROR([To use the r600/radeonsi LLVM backend with LLVM 3.2 and newer, you need to fetch the LLVM source from:
-+                      git://people.freedesktop.org/~tstellar/llvm master
-+                      and build with --enable-experimental-targets==AMDGPU])
-+    fi
-+    if test "$LLVM_VERSION" = "3.2"; then
-+        dnl LLVM 3.2 does not add experimental libraries to llvm-config's
-+        dnl library list.
-+        LLVM_LIBS="$LLVM_LIBS -lLLVMAMDGPUCodeGen -lLLVMAMDGPUDesc -lLLVMAMDGPUAsmPrinter -lLLVMAMDGPUInfo `$LLVM_CONFIG --libs mc`"
-+    fi
-+}
-+
- dnl Gallium drivers
- dnl Duplicates in GALLIUM_DRIVERS_DIRS are removed by sorting it after this block
- if test "x$with_gallium_drivers" != x; then
-@@ -1812,9 +1830,7 @@ if test "x$with_gallium_drivers" != x; then
-             gallium_require_drm_loader
-             GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"
-             if test "x$enable_r600_llvm" = xyes -o "x$enable_opencl" = xyes; then
--                if test "x$LLVM_VERSION" != "x3.1"; then
--                    AC_MSG_ERROR([LLVM 3.1 is required for the r600 llvm compiler.])
--                fi
-+                radeon_llvm_check
-                 NEED_RADEON_GALLIUM=yes;
-             fi
-             if test "x$enable_r600_llvm" = xyes; then
-@@ -1829,9 +1845,7 @@ if test "x$with_gallium_drivers" != x; then
-             PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
-             gallium_require_drm_loader
-             GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS radeonsi"
--            if test "x$LLVM_VERSION" != "x3.1"; then
--                AC_MSG_ERROR([LLVM 3.1 is required to build the radeonsi driver.])
--            fi
-+            radeon_llvm_check
- 	    NEED_RADEON_GALLIUM=yes;
-             gallium_check_st "radeon/drm" "dri-radeonsi" "xorg-radeonsi" "" "" "vdpau-radeonsi" ""
-             ;;
-diff --git a/src/gallium/drivers/radeon/Makefile b/src/gallium/drivers/radeon/Makefile
-index 7f1c613..bcc2646 100644
---- a/src/gallium/drivers/radeon/Makefile
-+++ b/src/gallium/drivers/radeon/Makefile
-@@ -12,6 +12,12 @@ TBLGEN = $(LLVM_BINDIR)/llvm-tblgen
- 
- CXXFLAGS+= $(LLVM_CXXFLAGS)
- 
-+ifeq ($(LLVM_VERSION),3.1)
-+	CPP_SOURCES += $(LLVM_CPP_SOURCES)
-+else
-+	CXXFLAGS+= -DEXTERNAL_LLVM
-+endif
-+
- include ../../Makefile.template
- 
- CXXFLAGS := $(filter-out -DDEBUG, $(CXXFLAGS))
-diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources
-index c5d1207..5e79342 100644
---- a/src/gallium/drivers/radeon/Makefile.sources
-+++ b/src/gallium/drivers/radeon/Makefile.sources
-@@ -23,8 +23,7 @@ TD_FILES := \
- 	SIRegisterInfo.td	\
- 	SISchedule.td
- 
--
--GENERATED_SOURCES := \
-+LLVM_GENERATED_SOURCES := \
- 	R600Intrinsics.td		\
- 	R600RegisterInfo.td		\
- 	SIRegisterInfo.td		\
-@@ -41,7 +40,7 @@ GENERATED_SOURCES := \
- 	AMDGPUGenMCCodeEmitter.inc	\
- 	AMDGPUGenDFAPacketizer.inc
- 
--CPP_SOURCES := \
-+LLVM_CPP_SOURCES := \
- 	AMDIL7XXDevice.cpp		\
- 	AMDILCFGStructurizer.cpp	\
- 	AMDILDevice.cpp			\
-@@ -81,6 +80,8 @@ CPP_SOURCES := \
- 	MCTargetDesc/SIMCCodeEmitter.cpp \
- 	MCTargetDesc/R600MCCodeEmitter.cpp \
- 	TargetInfo/AMDGPUTargetInfo.cpp	\
-+
-+CPP_SOURCES := \
- 	radeon_llvm_emit.cpp
- 
- C_SOURCES := \
-diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-index 1b67bfe..625b0b4 100644
---- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-@@ -90,6 +90,7 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes,
-    /* XXX: Can we just initialize the AMDGPU target here? */
-    InitializeAllTargets();
-    InitializeAllTargetMCs();
-+   InitializeAllAsmPrinters();
- #else
-    LLVMInitializeAMDGPUTargetInfo();
-    LLVMInitializeAMDGPUTarget();
---
-cgit v0.9.0.2-2-gbebe
-From 67fcb3c2b4ecbd87e465b6c6b316be44811ea116 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Mon, 01 Oct 2012 21:00:00 +0000
-Subject: configure.ac: Use amdgpu component for LLVM 3.2
-
-The amdgpu component actually does exist.  I must have been using an
-older version of llvm-config by accident when I first made this change.
----
-diff --git a/configure.ac b/configure.ac
-index 32f412b..0de506d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1793,10 +1793,8 @@ radeon_llvm_check() {
-                       git://people.freedesktop.org/~tstellar/llvm master
-                       and build with --enable-experimental-targets==AMDGPU])
-     fi
--    if test "$LLVM_VERSION" = "3.2"; then
--        dnl LLVM 3.2 does not add experimental libraries to llvm-config's
--        dnl library list.
--        LLVM_LIBS="$LLVM_LIBS -lLLVMAMDGPUCodeGen -lLLVMAMDGPUDesc -lLLVMAMDGPUAsmPrinter -lLLVMAMDGPUInfo `$LLVM_CONFIG --libs mc`"
-+    if test "x$LLVM_VERSION" = "x3.2"; then
-+        LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --libs amdgpu`"
-     fi
- }
- 
---
-cgit v0.9.0.2-2-gbebe
-From 4cc530f452436a5304a628d1428ed7f07247a175 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Wed, 10 Oct 2012 21:00:13 +0000
-Subject: radeon/llvm: Fix build with LLVM 3.2
-
----
-diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-index 2f2eb4c..21661a0 100644
---- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-@@ -36,13 +36,16 @@
- #include <llvm/Support/TargetRegistry.h>
- #include <llvm/Support/TargetSelect.h>
- #include <llvm/Support/Threading.h>
--#include <llvm/Target/TargetData.h>
- #include <llvm/Target/TargetMachine.h>
--
- #include <llvm/Transforms/Scalar.h>
--
- #include <llvm-c/Target.h>
- 
-+#if HAVE_LLVM < 0x0302
-+#include <llvm/Target/TargetData.h>
-+#else
-+#include <llvm/DataLayout.h>
-+#endif
-+
- #include <iostream>
- #include <stdlib.h>
- #include <stdio.h>
-@@ -120,7 +123,11 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes,
-                      ));
-    TargetMachine &AMDGPUTargetMachine = *tm.get();
-    PassManager PM;
-+#if HAVE_LLVM < 0x0302
-    PM.add(new TargetData(*AMDGPUTargetMachine.getTargetData()));
-+#else
-+   PM.add(new DataLayout(*AMDGPUTargetMachine.getDataLayout()));
-+#endif
-    PM.add(createPromoteMemoryToRegisterPass());
-    AMDGPUTargetMachine.setAsmVerbosityDefault(true);
- 
---
-cgit v0.9.0.2-2-gbebe
-From b21455f27db6e55e708f8e264f4a15412ee8fa52 Mon Sep 17 00:00:00 2001
-From: Dmitry Cherkasov <dcherkassov@gmail.com>
-Date: Wed, 17 Oct 2012 18:03:13 +0000
-Subject: configure.ac: Fix LLVM 3.2 r600/radeonsi error message
-
-Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
-Signed-off-by: Dmitry Cherkasov <Dmitrii.Cherkasov@amd.com>
----
-diff --git a/configure.ac b/configure.ac
-index aefa142..ca24856 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1757,7 +1757,7 @@ radeon_llvm_check() {
-     if test "$LLVM_VERSION_MAJOR" -ge "3" -a "x$LLVM_VERSION" != "x3.1" && $LLVM_CONFIG --targets-built | grep -qv '\<AMDGPU\>' ; then
-         AC_MSG_ERROR([To use the r600/radeonsi LLVM backend with LLVM 3.2 and newer, you need to fetch the LLVM source from:
-                       git://people.freedesktop.org/~tstellar/llvm master
--                      and build with --enable-experimental-targets==AMDGPU])
-+                      and build with --enable-experimental-targets=AMDGPU])
-     fi
-     if test "x$LLVM_VERSION" = "x3.2"; then
-         LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --libs amdgpu`"
---
-cgit v0.9.0.2-2-gbebe
-From d2b0338e3354fadc90a3751520f4aa44ba01954f Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Wed, 17 Oct 2012 19:21:48 +0000
-Subject: r600g: Remove special handling of PRED_SET* insructions for LLVM 3.2
-
-The 3.2 version of the backend now sets all the correct fields for
-PRED_SET* instructions.
----
-diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
-index 053a988..58b7fb2 100644
---- a/src/gallium/drivers/r600/r600_shader.c
-+++ b/src/gallium/drivers/r600/r600_shader.c
-@@ -330,6 +330,7 @@ static unsigned r600_alu_from_byte_stream(struct r600_shader_ctx *ctx,
- 			alu.src[src_idx].sel += 512;
- 	}
- 
-+#if HAVE_LLVM < 0x0302
- 	if (alu.inst == CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETNE) ||
- 	    alu.inst == CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETE) ||
- 	    alu.inst == CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETE_INT) ||
-@@ -340,6 +341,7 @@ static unsigned r600_alu_from_byte_stream(struct r600_shader_ctx *ctx,
- 		alu.src[1].chan = 0;
- 		alu.last = 1;
- 	}
-+#endif
- 
- 	if (alu.execute_mask) {
- 		alu.pred_sel = 0;
---
-cgit v0.9.0.2-2-gbebe
-From f2f17fc348c847bbf5c54bb75b76e1661e8ced60 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Mon, 01 Oct 2012 21:01:06 +0000
-Subject: radeon/llvm: Only initialize the AMDGPU target
-
----
-diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-index 625b0b4..2f2eb4c 100644
---- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-@@ -86,17 +86,11 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes,
- 
-    Triple AMDGPUTriple(sys::getDefaultTargetTriple());
- 
--#ifdef EXTERNAL_LLVM
--   /* XXX: Can we just initialize the AMDGPU target here? */
--   InitializeAllTargets();
--   InitializeAllTargetMCs();
--   InitializeAllAsmPrinters();
--#else
-    LLVMInitializeAMDGPUTargetInfo();
-    LLVMInitializeAMDGPUTarget();
-    LLVMInitializeAMDGPUTargetMC();
-    LLVMInitializeAMDGPUAsmPrinter();
--#endif
-+
-    std::string err;
-    const Target * AMDGPUTarget = TargetRegistry::lookupTarget("r600", err);
-    if(!AMDGPUTarget) {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch
deleted file mode 100644
index a567b5926..000000000
--- a/extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
-    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
- 
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+   if (!MRI) {
-+      debug_printf("error: no register info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+
-+   OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+   if (!MII) {
-+      debug_printf("error: no instruction info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<MCInstPrinter> Printer(
-+         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
-+#elif HAVE_LLVM == 0x0300
-    OwningPtr<MCInstPrinter> Printer(
-          T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index fe7616b..68f8808 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
-+#if HAVE_LLVM >= 0x0301
-+   llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+#else
-    llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+#endif
- }
- 
- 
diff --git a/extra/metacity/PKGBUILD b/extra/metacity/PKGBUILD
deleted file mode 100644
index 0e96942c6..000000000
--- a/extra/metacity/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 170056 2012-10-31 10:19:33Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=metacity
-pkgver=2.34.13
-pkgrel=1
-pkgdesc="A window manager for GNOME"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-depends=('dconf' 'gtk2' 'gsettings-desktop-schemas' 'libcanberra'  'libgtop' 'libsm' 'startup-notification' 'zenity')
-makedepends=('intltool' 'yelp-tools')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=metacity.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        fix_compositing_startup.patch)
-sha256sums=('8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075'
-            '5094a0ffe3eb8289ed752829877c2e1b743eddf938ad3fc92fb4574b42765ae2')
-
-build() {
-  cd "$pkgname-$pkgver"
-  patch -Np1 -i "${srcdir}/fix_compositing_startup.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/metacity \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/extra/metacity/fix_compositing_startup.patch b/extra/metacity/fix_compositing_startup.patch
deleted file mode 100644
index 56b218ae7..000000000
--- a/extra/metacity/fix_compositing_startup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur metacity-2.34.5.orig/src/compositor/compositor-xrender.c metacity-2.34.5/src/compositor/compositor-xrender.c
---- metacity-2.34.5.orig/src/compositor/compositor-xrender.c	2011-11-10 15:14:34.000000000 +0100
-+++ metacity-2.34.5/src/compositor/compositor-xrender.c	2012-08-28 14:23:04.093750568 +0200
-@@ -3066,6 +3057,8 @@
- #endif
- 
-   xrc->enabled = TRUE;
-+  xrc->show_redraw = FALSE;
-+  xrc->debug = FALSE;
-   g_timeout_add (2000, (GSourceFunc) timeout_debug, xrc);
- 
-   return compositor;
diff --git a/extra/metacity/metacity.install b/extra/metacity/metacity.install
deleted file mode 100644
index ba0feffc1..000000000
--- a/extra/metacity/metacity.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=metacity
-
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
-        /usr/sbin/gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/minicom/PKGBUILD b/extra/minicom/PKGBUILD
index fc069045a..425852d48 100644
--- a/extra/minicom/PKGBUILD
+++ b/extra/minicom/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 154279 2012-03-25 09:59:29Z giovanni $
+# $Id: PKGBUILD 179491 2013-03-05 16:42:11Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Denis Tikhomirov <dvtikhomirov@gmail.com>
 
 pkgname=minicom
-pkgver=2.6.1
+pkgver=2.6.2
 pkgrel=1
 pkgdesc="A serial communication program"
 arch=('i686'  'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ license=('GPL')
 depends=('bash')
 optdepends=('lrzsz: for xmodem, ymodem and zmodem file transfer protocols')
 backup=('etc/minirc.dfl')
-source=("http://alioth.debian.org/frs/download.php/3700/${pkgname}-${pkgver}.tar.gz")
-md5sums=('435fb410a5bfa9bb20d4248b3ca53529')
+source=("http://alioth.debian.org/frs/download.php/3869/${pkgname}-${pkgver}.tar.gz")
+md5sums=('203c56c4b447f45e2301b0cc4e83da3c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD
index 94defebce..81bd3704a 100644
--- a/extra/miro/PKGBUILD
+++ b/extra/miro/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168998 2012-10-17 10:19:32Z allan $
+# $Id: PKGBUILD 180405 2013-03-21 02:05:09Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=miro
 pkgver=5.0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.getmiro.com"
@@ -14,14 +14,14 @@ depends=('python2-dbus' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
          'gstreamer0.10-python' 'python2-notify' 'libtorrent-rasterbar'
          'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python2-pycurl' 
          'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils')
-makedepends=('pkg-config' 'boost')
+makedepends=('boost')
 install=miro.install
 source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz"
         'ffmpeg.patch')
 sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f'
           'ce0f42be2a0a3ac99f07b5abfabf0975928c841c')
 
-build() {
+package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   cd linux
diff --git a/extra/misdnuser/PKGBUILD b/extra/misdnuser/PKGBUILD
deleted file mode 100644
index 2536b39fe..000000000
--- a/extra/misdnuser/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 166730 2012-09-17 05:26:17Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=misdnuser
-pkgver=2.0.17_20120917
-pkgrel=1
-pkgdesc="Tools and library for mISDN"
-arch=('i686' 'x86_64')
-url="http://www.misdn.org"
-license=('GPL')
-depends=('isdn4k-utils' 'spandsp')
-backup=('etc/capi20.conf') 
-options=('!makeflags' '!libtool' '!strip')
-source=(ftp://ftp.archlinux.org/other/misdnuser/${pkgname}-${pkgver}.tar.gz
-        misdncapid.rc
-        mISDNcapid.service
-        c2faxrecv-mISDNcapid.service
-        mISDNcapid.conf)
-
-build() {
-  # only enable for debugging!
-  #export CFLAGS+=" -g -O0"
-  #export CXXFLAGS+=" -g -O0"
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-capi --enable-softdsp --with-mISDN_group=uucp
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -D -m 755 ${srcdir}/misdncapid.rc ${pkgdir}/etc/rc.d/misdncapid
-  # fix udev rule
-  mkdir -p ${pkgdir}/usr/lib/udev/rules.d
-  mv ${pkgdir}/etc/udev/rules.d/45-misdn.rules ${pkgdir}/usr/lib/udev/rules.d
-  rm -r ${pkgdir}/etc/udev/
-  # add systemd files
-  install -D -m644 ${srcdir}/mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/mISDNcapid.service
-  # mISDNcapid:
-  # tends to crash on avmfritz card, add an extra systemd file for
-  # restarting the services until segfaults are fixed!
-  install -D -m644 ${srcdir}/c2faxrecv-mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/c2faxrecv-mISDNcapid.service
-  install -D -m644 ${srcdir}/mISDNcapid.conf ${pkgdir}/usr/lib/tmpfiles.d/mISDNcapid.conf
-}
-md5sums=('4cdb52f2c0ff1a1426573ac5ef09e9f8'
-         '2009563b144de037ecb20f8d727a772e'
-         '8f305ee6e35fa12a8bec0632bfe7a076'
-         '32ead7f063e007c784aa883d441f33c2'
-         '42c3b46880a68c3883ee1ed00af34b45')
diff --git a/extra/misdnuser/c2faxrecv-mISDNcapid.service b/extra/misdnuser/c2faxrecv-mISDNcapid.service
deleted file mode 100644
index 7a98ca435..000000000
--- a/extra/misdnuser/c2faxrecv-mISDNcapid.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=mISDN CAPI to fax receive
-Requires=faxq.service mISDNcapid.service
-After=faxq.service mISDNcapid.service
-
-[Service]
-ExecStart=/usr/bin/c2faxrecv
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/misdnuser/mISDNcapid.conf b/extra/misdnuser/mISDNcapid.conf
deleted file mode 100644
index 7607e262d..000000000
--- a/extra/misdnuser/mISDNcapid.conf
+++ /dev/null
@@ -1 +0,0 @@
-D /var/run/mISDNcapid 0755 root root -
diff --git a/extra/misdnuser/mISDNcapid.service b/extra/misdnuser/mISDNcapid.service
deleted file mode 100644
index 94f38478a..000000000
--- a/extra/misdnuser/mISDNcapid.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=mISDN CAPI daemon
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/mISDNcapid
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/misdnuser/misdncapid.rc b/extra/misdnuser/misdncapid.rc
deleted file mode 100755
index 5c47ca0a9..000000000
--- a/extra/misdnuser/misdncapid.rc
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID="$(pidof -o %PPID /usr/sbin/mISDNcapid)"
-case "$1" in
-    start)
-        stat_busy "Starting misdncapid"
-	if [ ! -x /var/run/mISDNcapid ] ; then
-	    install -m755 -d /var/run/mISDNcapid
-	fi
-
-	[ -z "$PID" ] && /usr/sbin/mISDNcapid >/dev/null 2>&1
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            PID=$(pidof -o %PPID /usr/sbin/mISDNcapid)
-            echo $PID > /var/run/misdncapid.pid
-            add_daemon misdncapid
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping misdncapid"
-	[ -f /var/run/misdncapid.pid ] && kill `cat /var/run/misdncapid.pid` >/dev/null 2>&1
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-	    rm -f /var/run/misdncapid.pid
-            rm_daemon misdncapid
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/extra/mjpegtools/PKGBUILD b/extra/mjpegtools/PKGBUILD
index ef16d63ac..2aa2477d9 100644
--- a/extra/mjpegtools/PKGBUILD
+++ b/extra/mjpegtools/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=mjpegtools
 pkgver=2.0.0
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 5ae29fe01..b34f0297a 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 176294 2013-01-28 16:48:27Z stephane $
+# $Id: PKGBUILD 184009 2013-04-30 20:08:12Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=6.0.0
-pkgrel=2
+pkgver=6.2.0
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
 makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
              'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
 source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz")
-md5sums=('869dac2061f4ef91dd96ce6bb0fafecb')
+md5sums=('a09b69f7e17677f1b5bfd15720dd004c')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/mkvtoolnix/mm_io.patch b/extra/mkvtoolnix/mm_io.patch
deleted file mode 100644
index 9ee9e018f..000000000
--- a/extra/mkvtoolnix/mm_io.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/common/mm_io.cpp	2012-07-08 20:06:02.000000000 +0200
-+++ b/src/common/mm_io.cpp	2012-07-21 11:59:59.000000000 +0200
-@@ -147,7 +147,7 @@
- void
- mm_file_io_c::prepare_path(const std::string &path) {
-   boost::filesystem::path directory = boost::filesystem::path(path).parent_path();
--  if (boost::filesystem::exists(directory))
-+  if (directory.empty() || boost::filesystem::exists(directory))
-     return;
- 
-   boost::system::error_code error_code;
diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD
index 5f61522e8..c08be7683 100644
--- a/extra/moc/PKGBUILD
+++ b/extra/moc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169339 2012-10-19 21:57:39Z eric $
+# $Id: PKGBUILD 178318 2013-02-20 05:19:12Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=moc
 pkgver=2.5beta1
-pkgrel=1
+pkgrel=3
 epoch=1
 pkgdesc="An ncurses console audio player designed to be powerful and easy to use"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,9 +19,11 @@ optdepends=('speex: for using the speex plugin'
             'faad2: for using the aac plugin' 
 	    'libmodplug: for using the modplug plugin')
 options=('!libtool')
-source=(ftp://ftp.daper.net/pub/soft/moc/unstable/moc-2.5.0-beta1.tar.bz2{,.sig})
+source=(ftp://ftp.daper.net/pub/soft/moc/unstable/moc-2.5.0-beta1.tar.bz2{,.sig} \
+        moc-ffmpeg.patch)
 sha1sums=('4030a1fa5c7cfef06909c54d8c7a1fbb93f23caa'
-          '29c232c37e1f3737c3b670372732446e9c0786a8')
+          '29c232c37e1f3737c3b670372732446e9c0786a8'
+          'f3b8b327dd27d50422b1ad8c9ef89a7366529307')
 
 # source PKGBUILD && mksource
 mksource() {
@@ -41,6 +43,7 @@ mksource() {
 
 build() {
   cd "${srcdir}/${pkgname}-2.5.0-beta1"
+  patch -p0 -i "${srcdir}/moc-ffmpeg.patch"
   ./configure --prefix=/usr --without-rcc \
     --with-oss --with-alsa --with-jack --with-aac --with-mp3 \
     --with-musepack --with-vorbis --with-flac --with-wavpack \
diff --git a/extra/moc/moc-ffmpeg.patch b/extra/moc/moc-ffmpeg.patch
new file mode 100644
index 000000000..e268e5427
--- /dev/null
+++ b/extra/moc/moc-ffmpeg.patch
@@ -0,0 +1,557 @@
+Index: menu.c
+===================================================================
+--- menu.c	(revision 2516)
++++ menu.c	(working copy)
+@@ -90,9 +90,14 @@
+ 	getyx (menu->win, y, x);
+ 	if (title_width <= title_space || mi->align == MENU_ALIGN_LEFT)
+ 		xwaddnstr (menu->win, mi->title, title_space);
+-	else
+-		xwaddstr (menu->win, mi->title + title_width - title_space);
++	else {
++		char *ptr;
+ 
++		ptr = xstrtail (mi->title, title_space);
++		xwaddstr (menu->win, ptr);
++		free (ptr);
++	}
++
+ 	/* Fill the remainder of the title field with spaces. */
+ 	if (mi == menu->selected) {
+ 		getyx (menu->win, y, ix);
+Index: utf8.c
+===================================================================
+--- utf8.c	(revision 2516)
++++ utf8.c	(working copy)
+@@ -199,47 +199,50 @@
+ 
+ int xwaddnstr (WINDOW *win, const char *str, const int n)
+ {
+-	int res;
++	int res, width, inv_char;
++	wchar_t *ucs;
++	char *mstr, *lstr;
++	size_t size, num_chars;
+ 
+ 	assert (n > 0);
+ 	assert (str != NULL);
+ 
+-	if (using_utf8) {
++	mstr = iconv_str (iconv_desc, str);
+ 
+-		/* This nasty hack is because we need to count n in chars, but
+-		 * [w]addnstr() takes arguments in bytes (in UTF-8 a char can be
+-		 * longer than 1 byte).  There are also problems with [w]addnwstr()
+-		 * (screen garbled).  I have no better idea. */
++	size = xmbstowcs (NULL, mstr, -1, NULL) + 1;
++	ucs = (wchar_t *)xmalloc (sizeof(wchar_t) * size);
++	xmbstowcs (ucs, mstr, size, &inv_char);
++	width = wcswidth (ucs, WIDTH_MAX);
+ 
+-		wchar_t *ucs;
+-		size_t size;
+-		size_t utf_num_chars;
+-		int inv_char;
+-
+-		size = xmbstowcs (NULL, str, -1, NULL) + 1;
+-		ucs = (wchar_t *)xmalloc (sizeof(wchar_t) * size);
+-		xmbstowcs (ucs, str, size, &inv_char);
+-		if ((size_t)n < size - 1)
+-			ucs[n] = L'\0';
+-		utf_num_chars = wcstombs (NULL, ucs, 0);
+-		if (inv_char) {
+-			char *utf8 = (char *)xmalloc (utf_num_chars + 1);
+-
+-			wcstombs (utf8, ucs, utf_num_chars + 1);
+-			res = waddstr (win, utf8);
+-			free (utf8);
++	if (width == -1) {
++		size_t clidx;
++		for (clidx = 0; clidx < size - 1; clidx++) {
++			if (wcwidth (ucs[clidx]) == -1)
++				ucs[clidx] = L'?';
+ 		}
+-		else
+-			res = waddnstr (win, str, utf_num_chars);
+-		free (ucs);
++		width = wcswidth (ucs, WIDTH_MAX);
++		inv_char = 1;
+ 	}
+-	else {
+-		char *lstr = iconv_str (iconv_desc, str);
+ 
+-		res = waddnstr (win, lstr, n);
+-		free (lstr);
++	if (width > n) {
++		while (width > n)
++			width -= wcwidth (ucs[--size]);
++		ucs[size] = L'\0';
+ 	}
+ 
++	num_chars = wcstombs (NULL, ucs, 0);
++	lstr = (char *)xmalloc (num_chars + 1);
++
++	if (inv_char)
++		wcstombs (lstr, ucs, num_chars + 1);
++	else
++		snprintf (lstr, num_chars + 1, "%s", mstr);
++
++	res = waddstr (win, lstr);
++
++	free (ucs);
++	free (lstr);
++	free (mstr);
+ 	return res;
+ }
+ 
+Index: decoder_plugins/mp3/mp3.c
+===================================================================
+--- decoder_plugins/mp3/mp3.c	(revision 2516)
++++ decoder_plugins/mp3/mp3.c	(working copy)
+@@ -696,17 +696,19 @@
+ {
+ 	char *ext;
+ 
++	strcpy (buf, "MPx");
++
+ 	ext = ext_pos (file);
+-	if (!strcasecmp (ext, "mp3"))
+-		strcpy (buf, "MP3");
+-	else if (!strcasecmp (ext, "mp2"))
+-		strcpy (buf, "MP2");
+-	else if (!strcasecmp (ext, "mp1"))
+-		strcpy (buf, "MP1");
+-	else if (!strcasecmp (ext, "mpga"))
+-		strcpy (buf, "MPG");
+-	else
+-		strcpy (buf, "MPx");
++	if (ext) {
++		if (!strcasecmp (ext, "mp3"))
++			strcpy (buf, "MP3");
++		else if (!strcasecmp (ext, "mp2"))
++			strcpy (buf, "MP2");
++		else if (!strcasecmp (ext, "mp1"))
++			strcpy (buf, "MP1");
++		else if (!strcasecmp (ext, "mpga"))
++			strcpy (buf, "MPG");
++	}
+ }
+ 
+ static int mp3_our_format_ext (const char *ext)
+Index: decoder_plugins/ffmpeg/ffmpeg.m4
+===================================================================
+--- decoder_plugins/ffmpeg/ffmpeg.m4	(revision 2516)
++++ decoder_plugins/ffmpeg/ffmpeg.m4	(working copy)
+@@ -88,6 +88,25 @@
+ 		                 [#include <libavcodec/avcodec.h>])
+ 		AC_CHECK_DECLS([AV_CODEC_ID_OPUS], , ,
+ 		                 [#include <libavcodec/avcodec.h>])
++		AC_SEARCH_LIBS(avcodec_free_frame, avcodec,
++			[AC_DEFINE([HAVE_AVCODEC_FREE_FRAME], 1,
++				[Define to 1 if you have the `avcodec_free_frame' function.])])
++		AC_CHECK_DECLS([CODEC_ID_PCM_S8_PLANAR], , ,
++		                 [#include <libavcodec/avcodec.h>])
++		AC_CHECK_DECLS([AV_SAMPLE_FMT_U8P], , ,
++		                 [#include <libavcodec/avcodec.h>])
++		AC_CHECK_DECLS([AV_SAMPLE_FMT_S16P], , ,
++		                 [#include <libavcodec/avcodec.h>])
++		AC_CHECK_DECLS([AV_SAMPLE_FMT_S32P], , ,
++		                 [#include <libavcodec/avcodec.h>])
++		AC_CHECK_DECLS([AV_SAMPLE_FMT_FLTP], , ,
++		                 [#include <libavcodec/avcodec.h>])
++		AC_SEARCH_LIBS(av_get_sample_fmt_name, avutil,
++			[AC_DEFINE([HAVE_AV_GET_SAMPLE_FMT_NAME], 1,
++				[Define to 1 if you have the `av_get_sample_fmt_name' function.])])
++		AC_SEARCH_LIBS(av_lockmgr_register, avcodec,
++			[AC_DEFINE([HAVE_LOCKMGR_REGISTER], 1,
++				[Define to 1 if you have the `av_lockmgr_register' function.])])
+ 		CPPFLAGS="$save_CPPFLAGS"
+ 		CFLAGS="$save_CFLAGS"
+ 		LIBS="$save_LIBS"
+Index: decoder_plugins/ffmpeg/ffmpeg.c
+===================================================================
+--- decoder_plugins/ffmpeg/ffmpeg.c	(revision 2516)
++++ decoder_plugins/ffmpeg/ffmpeg.c	(working copy)
+@@ -99,6 +99,7 @@
+ 	bool okay; /* was this stream successfully opened? */
+ 	struct decoder_error error;
+ 	long fmt;
++	int sample_width;
+ 	int bitrate;            /* in bits per second */
+ 	int avg_bitrate;        /* in bits per second */
+ #if SEEK_IN_DECODER
+@@ -106,6 +107,7 @@
+ 	int seek_sec;           /* second to which to seek */
+ #endif
+ 	bool seek_broken;       /* FFmpeg seeking is broken */
++	bool timing_broken;     /* FFmpeg trashes duration and bit_rate */
+ #if SEEK_IN_DECODER && defined(DEBUG)
+ 	pthread_t thread_id;
+ #endif
+@@ -277,8 +279,72 @@
+ 	}
+ }
+ 
++/* Handle FFmpeg's locking requirements. */
++#ifdef HAVE_LOCKMGR_REGISTER
++static int locking_cb (void **mutex, enum AVLockOp op)
++{
++	int result;
++
++	switch (op) {
++	case AV_LOCK_CREATE:
++		*mutex = xmalloc (sizeof (pthread_mutex_t));
++		result = pthread_mutex_init (*mutex, NULL);
++		break;
++	case AV_LOCK_OBTAIN:
++		result = pthread_mutex_lock (*mutex);
++		break;
++	case AV_LOCK_RELEASE:
++		result = pthread_mutex_unlock (*mutex);
++		break;
++	case AV_LOCK_DESTROY:
++		result = pthread_mutex_destroy (*mutex);
++		free (*mutex);
++		*mutex = NULL;
++		break;
++	}
++
++	return result;
++}
++#endif
++
++/* Here we attempt to determine if FFmpeg/LibAV has trashed the 'duration'
++ * and 'bit_rate' fields in AVFormatContext for large files.  Determining
++ * whether or not they are likely to be valid is imprecise and will vary
++ * depending (at least) on:
++ *
++ * - The file's size,
++ * - The file's codec,
++ * - The number and size of tags,
++ * - The version of FFmpeg/LibAV, and
++ * - Whether it's FFmpeg or LibAV.
++ *
++ * This function represents a best guess.
++*/
++static bool is_timing_broken (AVFormatContext *ic)
++{
++	int64_t file_size;
++
++	if (ic->duration < 0 || ic->bit_rate < 0)
++		return true;
++
++#ifdef HAVE_AVIO_SIZE
++	file_size = avio_size (ic->pb);
++#else
++	file_size = ic->file_size;
++#endif
++
++	if (file_size < UINT32_MAX)
++		return false;
++
++	return true;
++}
++
+ static void ffmpeg_init ()
+ {
++#ifdef HAVE_LOCKMGR_REGISTER
++	int rc;
++#endif
++
+ #ifdef DEBUG
+ 	av_log_set_level (AV_LOG_INFO);
+ #else
+@@ -291,10 +357,20 @@
+ 	supported_extns = lists_strs_new (16);
+ 	load_audio_extns (supported_extns);
+ 	load_video_extns (supported_extns);
++
++#ifdef HAVE_LOCKMGR_REGISTER
++	rc = av_lockmgr_register (locking_cb);
++	if (rc < 0)
++		fatal ("Lock manager initialisation failed");
++#endif
+ }
+ 
+ static void ffmpeg_destroy ()
+ {
++#ifdef HAVE_LOCKMGR_REGISTER
++	av_lockmgr_register (NULL);
++#endif
++
+ 	av_log_set_level (AV_LOG_QUIET);
+ 	ffmpeg_log_repeats (NULL);
+ 
+@@ -341,9 +417,9 @@
+ 	}
+ #endif
+ 
+-	if (tags_sel & TAGS_TIME) {
++	if (!is_timing_broken (ic) && tags_sel & TAGS_TIME) {
+ 		info->time = -1;
+-		if (ic->duration >= 0)
++		if (ic->duration != (int64_t)AV_NOPTS_VALUE && ic->duration >= 0)
+ 			info->time = ic->duration / AV_TIME_BASE;
+ 	}
+ 
+@@ -426,12 +502,6 @@
+ 
+ #endif
+ 
+-	if (tags_sel & TAGS_TIME) {
+-		info->time = -1;
+-		if (ic->duration != (int64_t)AV_NOPTS_VALUE && ic->duration >= 0)
+-			info->time = ic->duration / AV_TIME_BASE;
+-	}
+-
+ end:
+ #ifdef HAVE_AVFORMAT_CLOSE_INPUT
+ 	avformat_close_input (&ic);
+@@ -450,12 +520,16 @@
+ 		if (!strcmp (data->ic->iformat->name, "wav")) {
+ 			switch (data->enc->codec_id) {
+ 			case CODEC_ID_PCM_S8:
++#if HAVE_DECL_CODEC_ID_PCM_S8_PLANAR
++			case CODEC_ID_PCM_S8_PLANAR:
++#endif
+ 				result = SFMT_S8;
+ 				break;
+ 			case CODEC_ID_PCM_U8:
+ 				result = SFMT_U8;
+ 				break;
+ 			case CODEC_ID_PCM_S16LE:
++			case CODEC_ID_PCM_S16LE_PLANAR:
+ 			case CODEC_ID_PCM_S16BE:
+ 				result = SFMT_S16;
+ 				break;
+@@ -490,15 +564,27 @@
+ 
+ 	switch (data->enc->sample_fmt) {
+ 	case AV_SAMPLE_FMT_U8:
++#if HAVE_DECL_AV_SAMPLE_FMT_U8P
++	case AV_SAMPLE_FMT_U8P:
++#endif
+ 		result = SFMT_U8;
+ 		break;
+ 	case AV_SAMPLE_FMT_S16:
++#if HAVE_DECL_AV_SAMPLE_FMT_S16P
++	case AV_SAMPLE_FMT_S16P:
++#endif
+ 		result = SFMT_S16;
+ 		break;
+ 	case AV_SAMPLE_FMT_S32:
++#if HAVE_DECL_AV_SAMPLE_FMT_S32P
++	case AV_SAMPLE_FMT_S32P:
++#endif
+ 		result = SFMT_S32;
+ 		break;
+ 	case AV_SAMPLE_FMT_FLT:
++#if HAVE_DECL_AV_SAMPLE_FMT_FLTP
++	case AV_SAMPLE_FMT_FLTP:
++#endif
+ 		result = SFMT_FLOAT;
+ 		break;
+ 	default:
+@@ -597,6 +683,7 @@
+ 	data->stream = NULL;
+ 	data->enc = NULL;
+ 	data->codec = NULL;
++	data->sample_width = 0;
+ 	data->bitrate = 0;
+ 	data->avg_bitrate = 0;
+ 
+@@ -624,6 +711,7 @@
+ 	data->seek_sec = 0;
+ #endif
+ 	data->seek_broken = false;
++	data->timing_broken = false;
+ 
+ 	decoder_error_init (&data->error);
+ 
+@@ -702,27 +790,38 @@
+ 	if (data->fmt == 0)
+ 		data->fmt = fmt_from_sample_fmt (data);
+ 	if (data->fmt == 0) {
++#ifdef HAVE_AV_GET_SAMPLE_FMT_NAME
+ 		decoder_error (&data->error, ERROR_FATAL, 0,
++		               "Cannot get sample size from unknown sample format: %s",
++		               av_get_sample_fmt_name (data->enc->sample_fmt));
++#else
++		decoder_error (&data->error, ERROR_FATAL, 0,
+ 		               "Unsupported sample size!");
++#endif
++		avcodec_close (data->enc);
+ 		goto end;
+ 	}
++	data->sample_width = sfmt_Bps (data->fmt);
+ 	if (data->codec->capabilities & CODEC_CAP_DELAY)
+ 		data->delay = true;
+ 	data->seek_broken = is_seek_broken (data);
++	data->timing_broken = is_timing_broken (data->ic);
+ 
+ 	data->okay = true;
+ 
+-	if (data->ic->duration >= AV_TIME_BASE) {
++	if (!data->timing_broken && data->ic->duration >= AV_TIME_BASE) {
+ #ifdef HAVE_AVIO_SIZE
+ 		data->avg_bitrate = (int) (avio_size (data->ic->pb) /
+-		                          (data->ic->duration / AV_TIME_BASE) * 8);
++		                           (data->ic->duration / AV_TIME_BASE) * 8);
+ #else
+ 		data->avg_bitrate = (int) (data->ic->file_size /
+-		                          (data->ic->duration / AV_TIME_BASE) * 8);
++		                           (data->ic->duration / AV_TIME_BASE) * 8);
+ #endif
+ 	}
+-	data->bitrate = data->ic->bit_rate;
+ 
++	if (!data->timing_broken && data->ic->bit_rate > 0)
++		data->bitrate = data->ic->bit_rate;
++
+ 	return data;
+ 
+ end:
+@@ -943,12 +1042,14 @@
+                           char *buf, int buf_len)
+ {
+ 	int filled = 0;
++	AVFrame *frame;
+ 
++	frame = avcodec_alloc_frame ();
++
+ 	do {
+ 		int len, got_frame, is_planar, plane_size, data_size, copied;
+-		AVFrame frame;
+ 
+-		len = avcodec_decode_audio4 (data->enc, &frame, &got_frame, pkt);
++		len = avcodec_decode_audio4 (data->enc, frame, &got_frame, pkt);
+ 
+ 		if (len < 0)  {
+ 			/* skip frame */
+@@ -968,33 +1069,46 @@
+ 
+ 		is_planar = av_sample_fmt_is_planar (data->enc->sample_fmt);
+ 		data_size = av_samples_get_buffer_size (&plane_size,
+-		                                        data->enc->channels,                                                   frame.nb_samples,
++		                                        data->enc->channels,
++		                                        frame->nb_samples,
+ 		                                        data->enc->sample_fmt, 1);
+ 
+ 		if (data_size == 0)
+ 			continue;
+ 
+-		copied = copy_or_buffer (data, (char *)frame.extended_data[0],
+-		                         plane_size, buf, buf_len);
+-		buf += copied;
+-		filled += copied;
+-		buf_len -= copied;
++		if (is_planar && data->enc->channels > 1) {
++			int offset, ch;
+ 
+-        if (is_planar && data->enc->channels > 1) {
+-			int ch;
++			for (offset = 0; offset < plane_size; offset += data->sample_width) {
++				for (ch = 0; ch < data->enc->channels; ch += 1) {
++					copied = copy_or_buffer (data,
++					                         (char *)frame->extended_data[ch]
++					                                               + offset,
++				                             data->sample_width, buf, buf_len);
++					buf += copied;
++					filled += copied;
++					buf_len -= copied;
++				}
++			}
++		}
++		else {
++			copied = copy_or_buffer (data, (char *)frame->extended_data[0],
++		                             plane_size, buf, buf_len);
++			buf += copied;
++			filled += copied;
++			buf_len -= copied;
++		}
+ 
+-            for (ch = 1; ch < data->enc->channels; ch += 1) {
+-				copied = copy_or_buffer (data, (char *)frame.extended_data[ch],
+-				                         plane_size, buf, buf_len);
+-				buf += copied;
+-				filled += copied;
+-				buf_len -= copied;
+-            }
+-        }
+-
+ 		debug ("Copying %dB (%dB filled)", data_size, filled);
+ 	} while (pkt->size > 0);
+ 
++	avcodec_get_frame_defaults (frame);
++#ifdef HAVE_AVCODEC_FREE_FRAME
++	avcodec_free_frame (&frame);
++#else
++	av_freep (&frame);
++#endif
++
+ 	return filled;
+ }
+ #endif
+@@ -1122,9 +1236,10 @@
+ 		free_packet (pkt);
+ 	} while (!bytes_produced && !data->eos);
+ 
+-	data->bitrate = compute_bitrate (sound_params, bytes_used,
+-	                                 bytes_produced + data->remain_buf_len,
+-	                                 data->bitrate);
++	if (!data->timing_broken)
++		data->bitrate = compute_bitrate (sound_params, bytes_used,
++		                                 bytes_produced + data->remain_buf_len,
++		                                 data->bitrate);
+ 
+ 	return bytes_produced;
+ }
+@@ -1185,20 +1300,23 @@
+ {
+ 	struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data;
+ 
+-	return data->bitrate / 1000;
++	return data->timing_broken ? -1 : data->bitrate / 1000;
+ }
+ 
+ static int ffmpeg_get_avg_bitrate (void *prv_data)
+ {
+ 	struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data;
+ 
+-	return data->avg_bitrate / 1000;
++	return data->timing_broken ? -1 : data->avg_bitrate / 1000;
+ }
+ 
+ static int ffmpeg_get_duration (void *prv_data)
+ {
+ 	struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data;
+ 
++	if (data->timing_broken)
++		return -1;
++
+ 	if (!data->stream)
+ 		return -1;
+ 
+
+Index: configure.in
+===================================================================
+--- configure.in	(revision 2518)
++++ configure.in	(working copy)
+@@ -293,7 +293,6 @@
+ 
+ dnl optional functions
+ AC_CHECK_FUNCS([strcasestr strerror_r syslog])
+-AC_CHECK_FUNCS([getrlimit pthread_attr_getstacksize])
+ AX_CHECK_UNAME_SYSCALL
+ 
+ dnl MIME magic
+@@ -322,6 +321,7 @@
+ CC="$PTHREAD_CC"
+ CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
+ EXTRA_LIBS="$EXTRA_LIBS $PTHREAD_LIBS"
++AC_CHECK_FUNCS([getrlimit pthread_attr_getstacksize])
+ 
+ dnl __FUNCTION__
+ AC_TRY_COMPILE(,[printf(__FUNCTION__);], [AC_DEFINE([HAVE__FUNCTION__], 1,
+
+
diff --git a/extra/mod_fastcgi/PKGBUILD b/extra/mod_fastcgi/PKGBUILD
deleted file mode 100644
index 8b637bc32..000000000
--- a/extra/mod_fastcgi/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 150579 2012-02-18 15:20:31Z pierre $
-# Maintainer:
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=mod_fastcgi
-pkgver=2.4.6
-pkgrel=4
-pkgdesc="Apache module to support the FastCGI protocol"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.fastcgi.com/"
-depends=('apache')
-options=('!libtool')
-source=("http://www.fastcgi.com/dist/${pkgname}-${pkgver}.tar.gz"
-        'lp381384.patch')
-md5sums=('a21a613dd5dacf4c8ad88c8550294fed'
-         '7dd09e6579cc9bf2f992bbd82d1d1537')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/lp381384.patch"
-  cp Makefile.AP2 Makefile
-  make top_dir=/usr/lib/httpd
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make top_dir=/usr/lib/httpd DESTDIR="${pkgdir}" install
-  install -Dm644 docs/LICENSE.TERMS \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/mod_fastcgi/lp381384.patch b/extra/mod_fastcgi/lp381384.patch
deleted file mode 100644
index e7c978d10..000000000
--- a/extra/mod_fastcgi/lp381384.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-References:
-http://thread.gmane.org/gmane.comp.web.fastcgi.devel/2613
-http://article.gmane.org/gmane.comp.web.fastcgi.devel/1167
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=509116
-https://bugs.launchpad.net/ubuntu/+source/libapache-mod-fastcgi/+bug/381384
-
-Patch extracted from the SNAP-0811090952 snapshot tarball.
-2009-05-28 Martin von Gagern
-
-diff -ru mod_fastcgi-2.4.6/CHANGES mod_fastcgi-2.4.6-lp381384/CHANGES
---- mod_fastcgi-2.4.6/CHANGES	2007-11-13 13:26:35.000000000 +0100
-+++ mod_fastcgi-2.4.6-lp381384/CHANGES	2009-05-28 21:02:31.000000000 +0200
-@@ -1,3 +1,6 @@
-+ *) Don't let the Content-Length header propagate on errors or across
-+    redirects.  [Artur Zaprzala <arturz ownmail.net>]
-+
- 2.4.6
- 
-  *) Fix a bug I introduced in 2.4.4 that broke dynamic application
-diff -ru mod_fastcgi-2.4.6/mod_fastcgi.c mod_fastcgi-2.4.6-lp381384/mod_fastcgi.c
---- mod_fastcgi-2.4.6/mod_fastcgi.c	2007-11-13 00:00:10.000000000 +0100
-+++ mod_fastcgi-2.4.6-lp381384/mod_fastcgi.c	2009-05-28 21:02:31.000000000 +0200
-@@ -753,6 +753,11 @@
-                 ap_table_set(r->headers_out, "Location", value);
-                 continue;
-             }
-+            
-+            if (strcasecmp(name, "Content-Length") == 0) {
-+                ap_table_set(r->headers_out, name, value);
-+            	continue;
-+            }
- 
-             /* If the script wants them merged, it can do it */
-             ap_table_add(r->err_headers_out, name, value);
diff --git a/extra/mod_mono/mod_mono.install b/extra/mod_mono/mod_mono.install
deleted file mode 100644
index 4945a714b..000000000
--- a/extra/mod_mono/mod_mono.install
+++ /dev/null
@@ -1,20 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  cat << EOM
-
---> As of version 1.1.10 mod_mono let's you use asp pages very easily by some
---> auto integration in apache. Please read:
-          http://www.mono-project.com/AutoConfiguration
---> to get the idea. To use mod_mono, you only have to type into httpd.conf:
-Include /etc/httpd/conf/mod_mono.conf
-
-EOM
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-# vim: ft=sh
diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD
index b1246319f..540845fad 100644
--- a/extra/modemmanager/PKGBUILD
+++ b/extra/modemmanager/PKGBUILD
@@ -1,38 +1,36 @@
-# $Id: PKGBUILD 166517 2012-09-09 15:40:36Z heftig $
+# $Id: PKGBUILD 183639 2013-04-25 18:36:08Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
 pkgname=modemmanager
 _realname=ModemManager
-pkgver=0.6.0.0
-pkgrel=1
+pkgver=0.7.990
+pkgrel=4
 pkgdesc="Mobile broadband modem management service"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cgit.freedesktop.org/ModemManager/ModemManager/"
-license=('GPL2')
-depends=('dbus-glib' 'udev' 'ppp')
-makedepends=('intltool')
+license=(GPL2)
+depends=(udev ppp libqmi polkit hicolor-icon-theme)
+makedepends=(intltool git gtk-doc)
 optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
 options=('!libtool')
-source=(http://download.gnome.org/sources/$_realname/0.6/$_realname-$pkgver.tar.xz
-        modem-manager.service)
-sha256sums=('d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2'
-            '118e36f2f956d719cf4036f3fd5f5bf0fde88ca55bdf7ed95051b5b09066fcbe')
+install=modemmanager.install
+#source=(http://download.gnome.org/sources/$_realname/${pkgver::3}/$_realname-$pkgver.tar.xz)
+source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=135bec6")
+sha256sums=('SKIP')
 
 build() {
-  cd "$_realname-$pkgver"
-   ./configure --prefix=/usr \
-   	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--with-udev-base-dir=/usr/lib/udev \
-	--disable-static
+  cd $_realname
+   ./autogen.sh --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --with-udev-base-dir=/usr/lib/udev \
+        --disable-static \
+        --with-polkit
   make
 }
 
 package() {
-  cd "$_realname-$pkgver"
+  cd $_realname
   make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/modem-manager.service" \
-    "$pkgdir/usr/lib/systemd/system/modem-manager.service"
-  echo "SystemdService=modem-manager.service" \
-    >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.ModemManager.service"
 }
diff --git a/extra/modemmanager/modem-manager.service b/extra/modemmanager/modem-manager.service
deleted file mode 100644
index bad666be8..000000000
--- a/extra/modemmanager/modem-manager.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Modem Manager
-
-[Service]
-Type=dbus
-BusName=org.freedesktop.ModemManager
-ExecStart=/usr/sbin/modem-manager
-# Suppress stderr to eliminate duplicated messages in syslog. MM calls openlog()
-# with LOG_PERROR. But systemd redirects stderr to syslog by default, which
-# results in logging each message twice.
-StandardError=null
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/modemmanager/modemmanager.install b/extra/modemmanager/modemmanager.install
new file mode 100644
index 000000000..be187f2b4
--- /dev/null
+++ b/extra/modemmanager/modemmanager.install
@@ -0,0 +1,12 @@
+post_install() {
+  type -P gtk-update-icon-cache &>/dev/null &&
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/monica/PKGBUILD b/extra/monica/PKGBUILD
deleted file mode 100644
index 0615205f3..000000000
--- a/extra/monica/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 130314 2011-07-04 22:06:55Z eric $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=monica
-pkgver=3.7
-pkgrel=2
-pkgdesc="A monitor calibration tool"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.pcbypaul.com/software/monica.html"
-license=('BSD')
-depends=('fltk' 'xorg-xgamma')
-makedepends=('librsvg')
-#http://www.pcbypaul.com/software/dl/${pkgname}-${pkgver}.tar.bz2
-source=(ftp://ftp.archlinux.org/other/monica/${pkgname}-${pkgver}.tar.bz2 \
-        monica.desktop monica.svg)
-md5sums=('490aabc35b830e4a3dc32a2f893ba805'
-         'a337bfda1fca7228420db0ce92256816'
-         '4569f5df7d7b3eaf20108adf48e8dfe4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -Dm755 monica "${pkgdir}/usr/bin/monica"
-  install -Dm644 "${srcdir}/monica.desktop" "${pkgdir}/usr/share/applications/monica.desktop"
-  install -Dm644 "${srcdir}/monica.svg" "${pkgdir}/usr/share/pixmaps/monica.svg"
-  rsvg-convert -w 64 -h 57 -f png -o "${pkgdir}/usr/share/pixmaps/monica.png" "${srcdir}/monica.svg"
-  install -Dm644 licence "${pkgdir}/usr/share/licenses/monica/license.txt"
-}
diff --git a/extra/monica/monica.desktop b/extra/monica/monica.desktop
deleted file mode 100644
index 6b17659ca..000000000
--- a/extra/monica/monica.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Monica
-Comment=Monitor Calibration for x-server
-Exec=monica
-Icon=monica
-Terminal=false
-Type=Application
-X-MultipleArgs=false
-Categories=Application;Settings;System;
diff --git a/extra/monica/monica.svg b/extra/monica/monica.svg
deleted file mode 100644
index bb9f77d9b..000000000
--- a/extra/monica/monica.svg
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="monica.svg"
-   sodipodi:docbase="/home/pool/graphics/arch_candy/svg-icons"
-   height="67.000000pt"
-   width="70.000000pt"
-   inkscape:version="0.41"
-   sodipodi:version="0.32"
-   id="svg1573">
-  <defs
-     id="defs1575">
-    <linearGradient
-       id="linearGradient1606">
-      <stop
-         id="stop1607"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.62745100;" />
-      <stop
-         id="stop1608"
-         offset="1.0000000"
-         style="stop-color:#000000;stop-opacity:0.0000000;" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="translate(0.000000,3.125000)"
-       gradientUnits="userSpaceOnUse"
-       fy="12.500000"
-       fx="12.500000"
-       r="12.433378"
-       cy="12.500000"
-       cx="12.500000"
-       id="radialGradient1636"
-       xlink:href="#linearGradient1606"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.437333,0.000000,0.000000,0.410284,0.000000,3.125000)"
-       y2="0.0000000"
-       x2="20.514223"
-       y1="30.771334"
-       x1="20.514223"
-       id="linearGradient1638"
-       xlink:href="#linearGradient1606"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientTransform="translate(-12.50000,3.250000)"
-       gradientUnits="userSpaceOnUse"
-       fy="12.500000"
-       fx="100.00000"
-       r="12.500000"
-       cy="12.500000"
-       cx="100.00000"
-       id="radialGradient1643"
-       xlink:href="#linearGradient1606"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.447214,0.000000,0.000000,2.236068,-12.50000,3.250000)"
-       y2="19.565595"
-       x2="251.55765"
-       y1="19.565595"
-       x1="223.60680"
-       id="linearGradient1645"
-       xlink:href="#linearGradient1606"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.508806,0.000000,0.000000,1.965387,0.000000,3.125000)"
-       y2="18.889412"
-       x2="0.0000000"
-       y1="18.889412"
-       x1="25.058681"
-       id="linearGradient1647"
-       xlink:href="#linearGradient1606"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.814390,0.000000,0.000000,0.355317,0.000000,-10.12500)"
-       y2="246.61094"
-       x2="22.207298"
-       y1="211.07926"
-       x1="22.207298"
-       id="linearGradient1649"
-       xlink:href="#linearGradient1606"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientTransform="translate(0.000000,-10.12500)"
-       gradientUnits="userSpaceOnUse"
-       fy="75.000000"
-       fx="12.500000"
-       r="12.500000"
-       cy="75.000000"
-       cx="12.500000"
-       id="radialGradient1651"
-       xlink:href="#linearGradient1606"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientTransform="translate(-12.50000,-10.000000)"
-       gradientUnits="userSpaceOnUse"
-       fy="75.000000"
-       fx="100.00000"
-       r="12.500000"
-       cy="75.000000"
-       cx="100.00000"
-       id="radialGradient1653"
-       xlink:href="#linearGradient1606"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:current-layer="svg1573"
-     inkscape:window-y="3"
-     inkscape:window-x="0"
-     inkscape:grid-points="true"
-     inkscape:grid-bbox="true"
-     gridtolerance="2.0000000px"
-     gridoriginx="0.0000000pt"
-     gridoriginy="0.0000000pt"
-     gridspacingx="10.000000pt"
-     gridspacingy="10.000000pt"
-     snaptogrid="false"
-     showgrid="true"
-     inkscape:window-height="1002"
-     inkscape:window-width="1272"
-     inkscape:cy="50.235475"
-     inkscape:cx="67.194289"
-     inkscape:zoom="7.9999998"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base" />
-  <metadata
-     id="metadata1576">
-    <rdf:RDF
-       id="RDF1577">
-      <cc:Work
-         id="Work1578"
-         rdf:about="">
-        <dc:description
-           id="description1579">Created with Inkscape
-http://www.inkscape.org/</dc:description>
-        <dc:format
-           id="format1581">image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage"
-           id="type1583" />
-        <dc:title
-           id="title1606">ML-Term Icon</dc:title>
-        <dc:date
-           id="date1608">2004-07-14</dc:date>
-        <dc:creator
-           id="creator1610">
-          <cc:Agent
-             id="Agent1611">
-            <dc:title
-               id="title1612">Tobias Kieslich</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:coverage
-           id="coverage1614" />
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/"
-           id="license1616" />
-      </cc:Work>
-      <cc:License
-         id="License1624"
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:permits
-           id="permits1625"
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           id="permits1626"
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           id="requires1627"
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:permits
-           id="permits1628"
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           id="requires1629"
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           id="requires1630"
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <path
-     sodipodi:nodetypes="cc"
-     id="path2775"
-     d="M 5.8437501,76.625001 L 82.343750,76.625001"
-     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:9.1875000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-  <path
-     sodipodi:nodetypes="cc"
-     id="path2007"
-     d="M 10.593750,6.8437510 L 77.343750,6.8437510"
-     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-  <path
-     sodipodi:nodetypes="cccc"
-     id="path2803"
-     d="M 8.2187499,9.3437490 L 8.2187499,59.593751 L 79.718750,59.593751 L 79.718750,9.3437490"
-     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-  <path
-     sodipodi:nodetypes="cc"
-     id="path2807"
-     d="M 29.750001,67.218750 L 58.125000,67.218750"
-     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:14.937500;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-  <path
-     sodipodi:nodetypes="cc"
-     id="path2953"
-     d="M 22.468750,14.718749 L 22.468750,52.468750"
-     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#3f0000;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-  <path
-     sodipodi:nodetypes="cc"
-     id="path2955"
-     d="M 27.468750,14.718749 L 27.468750,52.468750"
-     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#ff1500;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-  <path
-     sodipodi:nodetypes="cc"
-     id="path2957"
-     d="M 41.593750,14.718749 L 41.593750,52.468750"
-     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#0b2f00;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-  <path
-     sodipodi:nodetypes="cc"
-     id="path2959"
-     d="M 46.593750,14.718749 L 46.593750,52.468750"
-     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#08ce00;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-  <path
-     sodipodi:nodetypes="cc"
-     id="path2961"
-     d="M 60.718750,14.718749 L 60.718750,52.468750"
-     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#00004e;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-  <path
-     sodipodi:nodetypes="cc"
-     id="path2963"
-     d="M 65.718750,14.718749 L 65.718750,52.468750"
-     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#0072ff;stroke-width:5.0625000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-</svg>
diff --git a/extra/mono/mono.rc.d b/extra/mono/mono.rc.d
deleted file mode 100644
index 548cc2d7b..000000000
--- a/extra/mono/mono.rc.d
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-. /etc/rc.conf
-. /etc/rc.d/functions
- 
-case "$1" in
-  start)
-    stat_busy "Registering .NET IL binaries with mono"
-    if [ ! -d /proc/sys/fs/binfmt_misc ]; then
-      stat_die "You need support for \"misc binaries\" in your kernel!"
-    fi
-    mount | grep -q binfmt_misc
-    if [ $? != 0 ]; then
-      mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
-      if [ $? != 0 ]; then
-        stat_die
-      fi
-    fi
-    echo ':CLR:M::MZ::/usr/bin/mono:' > /proc/sys/fs/binfmt_misc/register
-    stat_done
-    ;;
-  stop)
-
-    stat_busy "Unregistering .NET IL binaries"
-    if [ -f /proc/sys/fs/binfmt_misc/CLR ]; then
-      echo '-1' > /proc/sys/fs/binfmt_misc/CLR
-    fi
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac 
diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD
index 1dc7e8fae..2c527a93e 100644
--- a/extra/monodevelop-debugger-gdb/PKGBUILD
+++ b/extra/monodevelop-debugger-gdb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 175074 2013-01-12 15:33:07Z daniel $
+# $Id: PKGBUILD 178507 2013-02-24 19:41:09Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=monodevelop-debugger-gdb
-pkgver=3.0.6
+pkgver=4.0
 pkgrel=1
 pkgdesc="Mono Debugger support"
 arch=('i686' 'x86_64') # also "any" pkg?
@@ -12,7 +12,7 @@ depends=('monodevelop>=3.0.6' 'gdb')
 makedepends=('mono')
 options=('!makeflags')
 source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('9f3d08104d01e536342ffe15bdd5727c')
+md5sums=('35424c9cb2218840c015f49821219c5b')
 
 build() {
   export MONO_SHARED_DIR="${srcdir}/.wabi"
diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD
index 85c19338a..7aaeb4c1f 100644
--- a/extra/monodevelop/PKGBUILD
+++ b/extra/monodevelop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175072 2013-01-12 15:31:21Z daniel $
+# $Id: PKGBUILD 178505 2013-02-24 19:40:36Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=monodevelop
-pkgver=3.0.6
+pkgver=4.0
 pkgrel=1
 pkgdesc="An IDE primarily designed for C# and other .NET languages"
 
@@ -19,7 +19,7 @@ options=(!makeflags)
 install=monodevelop.install
 source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         monodevelop-core-addins.pc.in.patch)
-md5sums=('748d0fb89c40c2cb5a9267c8635eb55d'
+md5sums=('811e09cbddc262d138fed1e119a52df7'
          '8466d032735130e37d4091a793a7966c')
 
 build() {
diff --git a/extra/monodevelop/monodevelop_gnome3.patch b/extra/monodevelop/monodevelop_gnome3.patch
deleted file mode 100644
index 4ea101f6a..000000000
--- a/extra/monodevelop/monodevelop_gnome3.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs b/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs
-index 4d8954c..e1a1937 100644
---- a/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs
-+++ b/src/addins/MonoDevelop.GtkCore/libstetic/wrapper/Object.cs
-@@ -1,5 +1,6 @@
- using System;
- using System.Collections;
-+using System.Collections.Generic;
- 
- namespace Stetic.Wrapper {
- 	public abstract class Object : Stetic.ObjectWrapper {
-@@ -11,17 +12,32 @@ namespace Stetic.Wrapper {
- 			((GLib.Object)Wrapped).RemoveNotification (NotifyHandler);
- 			base.Dispose ();
- 		}
--
-+		
-+		IEnumerable<string> GladePropertyNames {
-+			get {
-+				foreach (ItemGroup group in ClassDescriptor.ItemGroups) {
-+					foreach (ItemDescriptor item in group) {
-+						TypedPropertyDescriptor prop = item as TypedPropertyDescriptor;
-+						if (prop != null && !string.IsNullOrEmpty (prop.GladeName)) {
-+							yield return prop.GladeName;
-+						}
-+					}
-+				}
-+			}
-+		}
-+		
- 		internal protected override void OnDesignerAttach (IDesignArea designer)
- 		{
- 			base.OnDesignerAttach (designer);
--			((GLib.Object)Wrapped).AddNotification (NotifyHandler);
-+			foreach (string property in GladePropertyNames)
-+				((GLib.Object)Wrapped).AddNotification (property, NotifyHandler);
- 		}
- 		
- 		internal protected override void OnDesignerDetach (IDesignArea designer)
- 		{
- 			base.OnDesignerDetach (designer);
--			((GLib.Object)Wrapped).RemoveNotification (NotifyHandler);
-+			foreach (string property in GladePropertyNames)
-+				((GLib.Object)Wrapped).RemoveNotification (property, NotifyHandler);
- 		}
- 		
- 		public static Object Lookup (GLib.Object obj)
-
-diff --git a/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs b/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
-index 89f04b5..75d7b17 100644
---- a/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
-+++ b/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
-@@ -1540,22 +1540,39 @@ namespace MonoDevelop.Components.Commands
- 	internal class ToolbarTracker
- 	{
- 		Gtk.IconSize lastSize;
--		
-+		 
- 		public void Track (Gtk.Toolbar toolbar)
- 		{
- 			lastSize = toolbar.IconSize;
--			toolbar.AddNotification (OnToolbarPropChanged);
-+			toolbar.AddNotification ("icon-size", IconSizeChanged);
-+			toolbar.OrientationChanged += HandleToolbarOrientationChanged;
-+			toolbar.StyleChanged += HandleToolbarStyleChanged;
-+			
- 			toolbar.Destroyed += delegate {
--				toolbar.RemoveNotification (OnToolbarPropChanged);
-+				toolbar.StyleChanged -= HandleToolbarStyleChanged;
-+				toolbar.OrientationChanged -= HandleToolbarOrientationChanged;
-+				toolbar.RemoveNotification ("icon-size", IconSizeChanged);
- 			};
- 		}
--		
--		void OnToolbarPropChanged (object ob, GLib.NotifyArgs args)
-+
-+		void HandleToolbarStyleChanged (object o, Gtk.StyleChangedArgs args)
- 		{
--			Gtk.Toolbar t = (Gtk.Toolbar) ob;
--			if (lastSize != t.IconSize || args.Property == "orientation" || args.Property == "toolbar-style")
-+			Gtk.Toolbar t = (Gtk.Toolbar) o;
-+			if (lastSize != t.IconSize)
- 				UpdateCustomItems (t);
--			lastSize = t.IconSize;
-+		}
-+
-+		void HandleToolbarOrientationChanged (object o, Gtk.OrientationChangedArgs args)
-+		{
-+			Gtk.Toolbar t = (Gtk.Toolbar) o;
-+			if (lastSize != t.IconSize)
-+				UpdateCustomItems (t);
-+		}
-+
-+		void IconSizeChanged (object o, GLib.NotifyArgs args)
-+		{
-+			this.lastSize = ((Gtk.Toolbar) o).IconSize;
-+			UpdateCustomItems ((Gtk.Toolbar) o);
- 		}
- 		
- 		void UpdateCustomItems (Gtk.Toolbar t)
-
diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD
index 9907fead6..a845608bd 100644
--- a/extra/mousetweaks/PKGBUILD
+++ b/extra/mousetweaks/PKGBUILD
@@ -3,19 +3,19 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=mousetweaks
-pkgver=3.6.0
-pkgrel=1
+pkgver=3.8.0
+pkgrel=2
 pkgdesc="Mouse accessibility enhancements for the GNOME desktop"
 arch=(i686 x86_64 'mips64el')
 license=('GPL3' 'FDL')
 depends=('libxtst' 'gtk3' 'gsettings-desktop-schemas')
 makedepends=('gnome-doc-utils' 'intltool')
-groups=('gnome-extra')
+groups=('gnome')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=mousetweaks.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2c48f655c5b53615270503fd1631e0cf7baa5872b20f75af8608983f039c5cfc')
+sha256sums=('daa9b16e98675f414d3dcf63a0222a37d6c3e518718d92155bba8781510f2e4f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/mp3splt/PKGBUILD b/extra/mp3splt/PKGBUILD
index 96cf2f48f..ad5376595 100644
--- a/extra/mp3splt/PKGBUILD
+++ b/extra/mp3splt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166726 2012-09-17 05:19:09Z tpowa $
+# $Id: PKGBUILD 182919 2013-04-16 07:09:21Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=mp3splt
-pkgver=2.4.3
+pkgver=2.5.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Commandline tool for splitting mp3 and ogg files without decoding"
@@ -22,4 +22,4 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir/ install
 }
-md5sums=('33559a6f8e6179afd8ca7c9886ffa207')
+md5sums=('cd8eb9f866dddb934357b7cdefb5a370')
diff --git a/extra/mpc/PKGBUILD b/extra/mpc/PKGBUILD
index 0344dec07..a3969cd1f 100644
--- a/extra/mpc/PKGBUILD
+++ b/extra/mpc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 154004 2012-03-21 10:52:38Z bisson $
+# $Id: PKGBUILD 182608 2013-04-10 23:44:08Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,16 +6,17 @@
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgname=mpc
-pkgver=0.22
-pkgrel=2.1
+pkgver=0.23
+pkgrel=1
 pkgdesc='Minimalist command line interface to MPD'
-url='http://mpd.wikia.com/wiki/Client:Mpc'
+url='http://www.musicpd.org/clients/mpc/'
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
-options=('!emptydirs')
 depends=('libmpdclient')
-source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('e35414c1f5b25f4e500ceae125adb5bb9063b029')
+source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('25d217b699fd70fd9b65b8b820addf794a109a9c')
+
+options=('!emptydirs')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/mpck/PKGBUILD b/extra/mpck/PKGBUILD
deleted file mode 100644
index aa701f30c..000000000
--- a/extra/mpck/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 143907 2011-11-30 20:27:25Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=mpck
-pkgver=0.19
-pkgrel=2
-license=('GPL')
-pkgdesc="Reads MP3 files and tries to determine if they are correct"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://checkmate.gissen.nl/"
-depends=('glibc')
-source=("http://checkmate.gissen.nl/checkmate-${pkgver}.tar.gz")
-md5sums=('f72114b0982a101b68ddeb65f99b84f7')
-
-build() {
-  cd "${srcdir}/checkmate-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/checkmate-${pkgver}"
-
-  make prefix="${pkgdir}/usr" install
-}
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index 5b0ec3a82..c356c9e97 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 174779 2013-01-07 14:37:06Z bisson $
+# $Id: PKGBUILD 182602 2013-04-10 23:39:58Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,28 +6,25 @@
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=mpd
-pkgver=0.17.3
+pkgver=0.17.4
 pkgrel=1
 pkgdesc='Flexible, powerful, server-side application for playing music'
-url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki'
+url='http://www.musicpd.org/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
          'sqlite' 'jack' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl')
 makedepends=('doxygen')
-source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
-        'tmpfiles.d'
-        'rc.d') 
-sha1sums=('f684d73a7517371a4461afdb2439f9533b51a49d'
-          'f4d5922abb69abb739542d8e93f4dfd748acdad7'
-          '3470d489565f0ed479f1665dd2876f66acb5a585')
+source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
+        'tmpfiles.d')
+sha1sums=('f60b54e368fe74fde2fd4571227b0428fe0ae3cb'
+          'f4d5922abb69abb739542d8e93f4dfd748acdad7')
 
 backup=('etc/mpd.conf')
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -37,25 +34,20 @@ build() {
 		--enable-pulse \
 		--disable-sidplay \
 		--with-systemdsystemunitdir=/usr/lib/systemd/system
-
 	make
 }
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	make DESTDIR="${pkgdir}" install
-
+	install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists
+	install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf
+	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf
 	sed \
 		-e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \
 		-e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \
 		-e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \
 		-e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \
 		-e '/^#user/c user "mpd"' \
-		-i doc/mpdconf.example
-
-	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/mpd
-	install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists
-	install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf
-	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf
+		-i "${pkgdir}"/etc/mpd.conf
 }
diff --git a/extra/mpd/rc.d b/extra/mpd/rc.d
deleted file mode 100755
index f00e16067..000000000
--- a/extra/mpd/rc.d
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-	start)
-		stat_busy 'Starting Music Player Daemon'
-		/usr/bin/mpd /etc/mpd.conf &> /dev/null &&
-		{ add_daemon mpd; stat_done; } || stat_fail
-		;;
-	stop)
-		stat_busy 'Stopping Music Player Daemon'
-		/usr/bin/mpd --kill /etc/mpd.conf &> /dev/null &&
-		{ rm_daemon mpd; stat_done; } || stat_fail
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD
index 9b914ab5d..0671606be 100644
--- a/extra/mpg123/PKGBUILD
+++ b/extra/mpg123/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 164185 2012-07-27 04:44:49Z eric $
+# $Id: PKGBUILD 181379 2013-04-04 01:34:05Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=mpg123
-pkgver=1.14.4
+pkgver=1.15.3
 pkgrel=1
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,8 +17,8 @@ conflicts=('mpg321')
 provides=('mpg321')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('9f53e27bb40b8df3d3b6df25f5f9a8a83b1fccfe'
-          '28ab232dd9bcec8bbb00026cc60960b719d14fed')
+sha1sums=('915eb8782106a62b103a1171364571d69cb64e25'
+          '90614c85da88f965d9aa3165c111b6eeba711903')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -30,4 +30,5 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
+  install -m755 scripts/conplay "${pkgdir}/usr/bin/conplay"
 }
diff --git a/extra/mplayer/PKGBUILD b/extra/mplayer/PKGBUILD
deleted file mode 100644
index 767521e76..000000000
--- a/extra/mplayer/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Id: PKGBUILD 171266 2012-11-16 23:35:46Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgbase=mplayer
-pkgname=('mplayer' 'mencoder')
-pkgver=35421
-pkgrel=1
-arch=('i686' 'x86_64')
-makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
-'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
-'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio' 'subversion')
-license=('GPL')
-url="http://www.mplayerhq.hu/"
-options=(!buildflags !emptydirs)
-source=(ftp://ftp.archlinux.org/other/$pkgbase/$pkgbase-$pkgver.tar.xz mplayer.desktop)
-md5sums=('b8a82ad1e1d6c3ac847074772daba817'
-         'c0d6ef795cf6de48e3b87ff7c23f0319')
-
-build() {
-    cd "$srcdir/$pkgbase"
-
-    ./configure --prefix=/usr \
-        --enable-runtime-cpudetection \
-        --disable-gui \
-        --disable-arts \
-        --disable-liblzo \
-        --disable-speex \
-        --disable-openal \
-        --disable-libdv \
-        --disable-musepack \
-        --disable-esd \
-        --disable-mga \
-        --disable-ass-internal \
-        --disable-cdparanoia \
-        --enable-xvmc \
-        --enable-radio \
-        --enable-radio-capture \
-        --language=all \
-        --confdir=/etc/mplayer 
-    [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
-
-    make
-}
-
-package_mplayer() {
-    pkgdesc="A movie player for linux"
-    install=mplayer.install
-    backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-    depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl'
-    'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
-    'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio')
-
-    cd "$srcdir/$pkgbase"
-
-    make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
-    install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
-    install -dm755 "$pkgdir/usr/share/mplayer/"
-    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
-    rm -rf "$pkgdir/usr/share/mplayer/font"
-    #desktop file  FS#14770
-    install -Dm644 "$srcdir/mplayer.desktop" "$pkgdir/usr/share/applications/mplayer.desktop"
-    install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
-}
-
-package_mencoder() {
-    pkgdesc="Free command line video decoding, encoding and filtering tool"
-    depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr'
-    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio' 'libvorbis')
-
-    cd "$srcdir/$pkgbase"
-    make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
-    find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
-}
-md5sums=('b5d8c24fc106b4ed58acda3b86c468fa'
-         'c0d6ef795cf6de48e3b87ff7c23f0319')
diff --git a/extra/mplayer/mplayer.desktop b/extra/mplayer/mplayer.desktop
deleted file mode 100644
index 07acea13f..000000000
--- a/extra/mplayer/mplayer.desktop
+++ /dev/null
@@ -1,21 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=MPlayer Media Player
-Name[ca]=Reproductor multimèdia MPlayer
-Name[pl]=MPlayer odtwarzacz multimedialny 
-GenericName=Multimedia player
-Comment=Play movies and songs
-Comment[ca]=Reproduïu vídeos i cançons
-Comment[de]=Filme und Musik abspielen
-Comment[es]=Reproduzca vídeos y canciones
-Comment[fr]=Lecteur multimédia
-Comment[it]=Lettore multimediale
-Comment[zh]=多媒体播放器
-Comment[pl]=Odtwarzaj filmy i muzykę
-Icon=mplayer
-TryExec=mplayer
-Exec=mplayer %F
-Terminal=false
-NoDisplay=true
-Categories=GTK;AudioVideo;Audio;Video;Player;TV;
-MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;
diff --git a/extra/mplayer/mplayer.png b/extra/mplayer/mplayer.png
deleted file mode 100644
index 799769335..000000000
--- a/extra/mplayer/mplayer.png
+++ /dev/null
diff --git a/extra/mrtg/PKGBUILD b/extra/mrtg/PKGBUILD
deleted file mode 100644
index b60143b19..000000000
--- a/extra/mrtg/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 146521 2012-01-12 10:46:44Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-
-pkgname=mrtg
-pkgver=2.17.4
-pkgrel=1
-pkgdesc="Multi Router Traffic Grapher."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://oss.oetiker.ch/mrtg/"
-license=('GPL')
-depends=('gd' 'perl')
-source=("http://oss.oetiker.ch/mrtg/pub/${pkgname}-${pkgver}.tar.gz")
-md5sums=('197565e97f97212eef7b414463c8d40c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed 's|LD_RUN_PATH=$(LD_RUN_PATH) ||g' -i Makefile.in
-  ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix=${pkgdir}/usr install
-}
diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD
index 9a9245a8c..a0390f9d4 100644
--- a/extra/msmtp/PKGBUILD
+++ b/extra/msmtp/PKGBUILD
@@ -1,19 +1,24 @@
-# $Id: PKGBUILD 169483 2012-10-22 00:13:27Z eric $
+# $Id: PKGBUILD 183544 2013-04-22 22:24:46Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=msmtp
 pkgname=('msmtp' 'msmtp-mta')
-pkgver=1.4.30
+pkgver=1.4.31
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://msmtp.sourceforge.net"
 makedepends=('texlive-core' 'gsasl' 'libgnome-keyring')
 source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgbase}-${pkgver}.tar.bz2)
-sha1sums=('fd469bae0c3394b30b771780e62bbd41c4d5d175')
+sha1sums=('c0edce1e1951968853f15209c8509699ff9e9ab5')
+
+prepare() {
+  cd ${pkgbase}-${pkgver}
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' scripts/msmtp-gnome-tool/msmtp-gnome-tool.py
+}
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --with-ssl=gnutls
   make
   make -C doc html pdf
@@ -24,7 +29,7 @@ package_msmtp() {
   depends=('gsasl' 'libgnome-keyring')
   install=msmtp.install
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install 
   make DESTDIR="${pkgdir}" -C doc install-html install-pdf
 
diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD
index 8d546d7a1..c1af1911b 100644
--- a/extra/mtr/PKGBUILD
+++ b/extra/mtr/PKGBUILD
@@ -1,33 +1,33 @@
-# $Id: PKGBUILD 144089 2011-12-03 12:24:56Z ibiru $
+# $Id: PKGBUILD 182370 2013-04-09 18:07:19Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mtr
 pkgname=(mtr mtr-gtk)
-pkgver=0.82
-pkgrel=1.1
+pkgver=0.84
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 makedepends=('ncurses' 'gtk2')
 source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz)
 url="http://www.bitwizard.nl/mtr/"
-md5sums=('10601ea543fda3e51545c4bce195b64c')
+md5sums=('df61096ae1b18b27f915feeb907ae48c')
 
 build() {
-    install -d  "$srcdir/"{mtr-cli,mtr-gtk}
-    cd "$srcdir/mtr-cli"
-    ../$pkgbase-$pkgver/configure --prefix=/usr --disable-gtktest --without-gtk
+    cp -r  $pkgbase-$pkgver $pkgbase-cli
+    cd mtr-cli
+    ./configure --prefix=/usr --without-gtk
     make
 
-    cd "$srcdir/mtr-gtk"
-    ../$pkgbase-$pkgver/configure --prefix=/usr
+    cd "$srcdir/$pkgbase-$pkgver"
+    ./configure --prefix=/usr
     make
 }
 
 package_mtr() {
     pkgdesc="Combines the functionality of traceroute and ping into one tool (CLI version)"
-    depends=('ncurses')
-    cd "$srcdir/mtr-cli"
+    depends=('ncurses' 'glib2')
+    cd mtr-cli
     make DESTDIR="$pkgdir" install
 }
 
@@ -37,6 +37,6 @@ package_mtr-gtk() {
     conflicts=("mtr")
     provides=("mtr=$pkgver")
 
-    cd "$srcdir/mtr-gtk"
+    cd $pkgbase-$pkgver
     make DESTDIR="$pkgdir" install
 }
diff --git a/extra/musicbrainz/PKGBUILD b/extra/musicbrainz/PKGBUILD
index 6894b5498..942ba3024 100644
--- a/extra/musicbrainz/PKGBUILD
+++ b/extra/musicbrainz/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=musicbrainz
 pkgver=2.1.5
-pkgrel=5
+pkgrel=5.1
 pkgdesc="The second generation incarnation of the CD Index"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.musicbrainz.org"
diff --git a/extra/mutt/1a4c43138685.patch b/extra/mutt/1a4c43138685.patch
deleted file mode 100644
index ec1bc198a..000000000
--- a/extra/mutt/1a4c43138685.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: muttlib.c

-===================================================================

---- muttlib.c	(revision 6128:eff500f87889)

-+++ muttlib.c	(revision 6161:1a4c43138685)

-@@ -1961,5 +1961,6 @@

-   char *p = safe_strdup (src);

-   int rc = mutt_convert_string (&p, Charset, "utf-8", 0);

--  strfcpy (dest, rc == 0 ? p : src, dlen);

-+  /* `src' may be NULL, such as when called from the pop3 driver. */

-+  strfcpy (dest, (rc == 0) ? NONULL(p) : NONULL(src), dlen);

-   FREE (&p);

- }

diff --git a/extra/mutt/PKGBUILD b/extra/mutt/PKGBUILD
index 382fedad4..c83d61c7f 100644
--- a/extra/mutt/PKGBUILD
+++ b/extra/mutt/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=mutt
 pkgver=1.5.21
-pkgrel=8
+pkgrel=8.1
 pkgdesc='Small but very powerful text-based mail client'
 url='http://www.mutt.org/'
 license=('GPL')
diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD
index 651604424..1c9518299 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170875 2012-11-12 21:30:35Z heftig $
+# $Id: PKGBUILD 183445 2013-04-21 22:11:45Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64 mips64el)
@@ -16,15 +16,14 @@ groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=mutter.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('924f47681c972c3e8da610608c6aef35e61f52b338b5690e5721ed7ef8c2befc')
+sha256sums=('a41a992620e7e51b6a34709db26a215e86f03927e828b4db03e9111d925ef52f')
 
 build() {
   cd "$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/mutter \
       --localstatedir=/var --disable-static \
-      --disable-schemas-compile \
-      --enable-compile-warnings=no
+      --disable-schemas-compile --enable-compile-warnings=minimum
   make
 }
 
diff --git a/extra/mx/PKGBUILD b/extra/mx/PKGBUILD
deleted file mode 100644
index 4dd67c4b0..000000000
--- a/extra/mx/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 160919 2012-06-07 00:15:28Z heftig $
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Guenther Wutz <admin@wutzara.de>
-
-pkgname=mx
-pkgver=1.4.6
-pkgrel=1
-pkgdesc="A widget toolkit using Clutter"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.clutter-project.org"
-license=('LGPL')
-depends=('clutter' 'libxrandr' 'dbus-glib' 'gtk2' 'startup-notification')
-makedepends=('intltool' 'gobject-introspection' 'gtk-doc')
-options=('!libtool')
-source=("http://source.clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
-sha256sums=('20fd8e1463d84c791c20dd1e021bc18041b05ad095a1acbaace7bf0dd43d09f2')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/mysql-python/PKGBUILD b/extra/mysql-python/PKGBUILD
index 3f5286bea..0824d5c9a 100644
--- a/extra/mysql-python/PKGBUILD
+++ b/extra/mysql-python/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 151041 2012-02-24 14:12:17Z pierre $
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# $Id: PKGBUILD 180685 2013-03-25 19:15:36Z bpiotrowski $
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=mysql-python
-pkgver=1.2.3
-pkgrel=3
+pkgver=1.2.4
+pkgrel=2
 pkgdesc="MySQL support for Python"
 arch=("i686" "x86_64" 'mips64el')
 url="http://mysql-python.sourceforge.net/"
 license=('GPL2')
-depends=('python2' 'libmysqlclient')
-makedepends=('mysql' 'python2-distribute')
-source=("http://downloads.sourceforge.net/${pkgname}/MySQL-python-${pkgver}.tar.gz")
-md5sums=('215eddb6d853f6f4be5b4afc4154292f')
+depends=('python2' 'libmariadbclient')
+makedepends=('mariadb' 'python2-distribute')
+source=("http://pypi.python.org/packages/source/M/MySQL-python/MySQL-python-${pkgver}.zip")
+md5sums=('ddf2386daf10a97af115ffad2ed4a9a0')
 
 package() {
   cd ${srcdir}/MySQL-python-${pkgver}
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
deleted file mode 100644
index 622484fb6..000000000
--- a/extra/mysql/PKGBUILD
+++ /dev/null
@@ -1,131 +0,0 @@
-# $Id: PKGBUILD 176798 2013-01-31 15:46:51Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgbase=mysql
-pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.30
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="https://www.mysql.com/products/community/"
-makedepends=('cmake' 'openssl' 'zlib')
-options=('!libtool')
-source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
-        'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service')
-md5sums=('f0cdd56f89e781e800cf223bd9edd00c'
-         '1351485633baf9894cfdf7c5bbffd7b5'
-         '6ea6ceb360d09a774e87335ee098ddd5'
-         '2fa6e456964d4ff5e6d4f9ff0126aed6'
-         'a0e1460c276a50a9666c331de83271f2')
-
-build() {
-  mkdir build
-  cd build
-
-  # CFLAGS/CXXFLAGS as suggested upstream
-
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSYSCONFDIR=/etc/mysql \
-    -DMYSQL_DATADIR=/var/lib/mysql \
-    -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
-    -DDEFAULT_CHARSET=utf8 \
-    -DDEFAULT_COLLATION=utf8_general_ci \
-    -DENABLED_LOCAL_INFILE=ON \
-    -DINSTALL_INFODIR=share/mysql/docs \
-    -DINSTALL_MANDIR=share/man \
-    -DINSTALL_PLUGINDIR=lib/mysql/plugin \
-    -DINSTALL_SCRIPTDIR=bin \
-    -DINSTALL_INCLUDEDIR=include/mysql \
-    -DINSTALL_DOCREADMEDIR=share/mysql \
-    -DINSTALL_SUPPORTFILESDIR=share/mysql \
-    -DINSTALL_MYSQLSHAREDIR=share/mysql \
-    -DINSTALL_DOCDIR=share/mysql/docs \
-    -DINSTALL_SHAREDIR=share/mysql \
-    -DWITH_READLINE=ON \
-    -DWITH_ZLIB=system \
-    -DWITH_SSL=system \
-    -DWITH_LIBWRAP=OFF \
-    -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
-    -DWITH_EXTRA_CHARSETS=complex \
-    -DWITH_EMBEDDED_SERVER=ON \
-    -DWITH_INNOBASE_STORAGE_ENGINE=1 \
-    -DWITH_PARTITION_STORAGE_ENGINE=1 \
-    -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
-    -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
-    -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
-    -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti"
-
-  make
-}
-
-package_libmysqlclient(){
-  pkgdesc="MySQL client libraries"
-  depends=('openssl')
-  
-  cd build
-  for dir in include libmysql libmysqld libservices; do
-    make -C ${dir} DESTDIR="${pkgdir}" install
-  done
-
-  install -d "${pkgdir}"/usr/bin
-  install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/
-  install -d "${pkgdir}"/usr/share/man/man1
-  for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
-    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
-  done
-}
-
-package_mysql-clients(){
-  pkgdesc="MySQL client tools"
-  depends=('libmysqlclient')
-  
-  cd build
-  make -C client DESTDIR="${pkgdir}" install
-
-  # install man pages
-  install -d "${pkgdir}"/usr/share/man/man1
-  for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
-    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
-  done
-
-  # provided by mysql
-  rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
-}
-
-package_mysql(){
-  pkgdesc="A fast SQL database server"
-  backup=('etc/mysql/my.cnf')
-  install=mysql.install
-  depends=('mysql-clients' 'systemd-tools')
-  options=('emptydirs')
-
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/mysql/my.cnf
-  install -Dm755 "${srcdir}"/mysqld-post.sh "${pkgdir}"/usr/bin/mysqld-post
-  install -Dm644 "${srcdir}"/mysqld-tmpfile.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysqld.conf
-  install -d "${pkgdir}"/usr/lib/systemd/system
-  install -Dm644 "${srcdir}"/mysqld.service "${pkgdir}"/usr/lib/systemd/system/
-
-  # provided by libmysqlclient
-  rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  rm "${pkgdir}"/usr/lib/libmysql*
-  rm -r "${pkgdir}"/usr/include/
-  rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
-  
-  # provided by mysql-clients
-  rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
-  rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
-
-  # not needed
-  rm -r "${pkgdir}"/usr/{data,mysql-test,sql-bench}
-  rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
-
-  install -dm700 "${pkgdir}"/var/lib/mysql
-}
diff --git a/extra/mysql/my.cnf b/extra/mysql/my.cnf
deleted file mode 100644
index 387020858..000000000
--- a/extra/mysql/my.cnf
+++ /dev/null
@@ -1,145 +0,0 @@
-# MySQL config file for medium systems.
-#
-# This is for a system with little memory (32M - 64M) where MySQL plays
-# an important part, or systems up to 128M where MySQL is used together with
-# other programs (such as a web server)
-#
-# MySQL programs look for option files in a set of
-# locations which depend on the deployment platform.
-# You can copy this option file to one of those
-# locations. For information about these locations, see:
-# http://dev.mysql.com/doc/mysql/en/option-files.html
-#
-# In this file, you can use all long options that a program supports.
-# If you want to know which options a program supports, run the program
-# with the "--help" option.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password	= your_password
-port		= 3306
-socket		= /run/mysqld/mysqld.sock
-
-# Here follows entries for some specific programs
-
-# The MySQL server
-[mysqld]
-port		= 3306
-socket		= /run/mysqld/mysqld.sock
-datadir		= /var/lib/mysql
-skip-external-locking
-key_buffer_size = 16M
-max_allowed_packet = 1M
-table_open_cache = 64
-sort_buffer_size = 512K
-net_buffer_length = 8K
-read_buffer_size = 256K
-read_rnd_buffer_size = 512K
-myisam_sort_buffer_size = 8M
-
-# Don't listen on a TCP/IP port at all. This can be a security enhancement,
-# if all processes that need to connect to mysqld run on the same host.
-# All interaction with mysqld must be made via Unix sockets or named pipes.
-# Note that using this option without enabling named pipes on Windows
-# (via the "enable-named-pipe" option) will render mysqld useless!
-# 
-skip-networking
-
-# Replication Master Server (default)
-# binary logging is required for replication
-log-bin=mysql-bin
-
-# binary logging format - mixed recommended
-binlog_format=mixed
-
-# required unique id between 1 and 2^32 - 1
-# defaults to 1 if master-host is not set
-# but will not function as a master if omitted
-server-id	= 1
-
-# Replication Slave (comment out master section to use this)
-#
-# To configure this host as a replication slave, you can choose between
-# two methods :
-#
-# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
-#    the syntax is:
-#
-#    CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
-#    MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
-#
-#    where you replace <host>, <user>, <password> by quoted strings and
-#    <port> by the master's port number (3306 by default).
-#
-#    Example:
-#
-#    CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
-#    MASTER_USER='joe', MASTER_PASSWORD='secret';
-#
-# OR
-#
-# 2) Set the variables below. However, in case you choose this method, then
-#    start replication for the first time (even unsuccessfully, for example
-#    if you mistyped the password in master-password and the slave fails to
-#    connect), the slave will create a master.info file, and any later
-#    change in this file to the variables' values below will be ignored and
-#    overridden by the content of the master.info file, unless you shutdown
-#    the slave server, delete master.info and restart the slaver server.
-#    For that reason, you may want to leave the lines below untouched
-#    (commented) and instead use CHANGE MASTER TO (see above)
-#
-# required unique id between 2 and 2^32 - 1
-# (and different from the master)
-# defaults to 2 if master-host is set
-# but will not function as a slave if omitted
-#server-id       = 2
-#
-# The replication master for this slave - required
-#master-host     =   <hostname>
-#
-# The username the slave will use for authentication when connecting
-# to the master - required
-#master-user     =   <username>
-#
-# The password the slave will authenticate with when connecting to
-# the master - required
-#master-password =   <password>
-#
-# The port the master is listening on.
-# optional - defaults to 3306
-#master-port     =  <port>
-#
-# binary logging - not required for slaves, but recommended
-#log-bin=mysql-bin
-
-# Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = /var/lib/mysql
-#innodb_data_file_path = ibdata1:10M:autoextend
-#innodb_log_group_home_dir = /var/lib/mysql
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-#innodb_buffer_pool_size = 16M
-#innodb_additional_mem_pool_size = 2M
-# Set .._log_file_size to 25 % of buffer pool size
-#innodb_log_file_size = 5M
-#innodb_log_buffer_size = 8M
-#innodb_flush_log_at_trx_commit = 1
-#innodb_lock_wait_timeout = 50
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[myisamchk]
-key_buffer_size = 20M
-sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/extra/mysql/mysql.install b/extra/mysql/mysql.install
deleted file mode 100644
index a98f1a877..000000000
--- a/extra/mysql/mysql.install
+++ /dev/null
@@ -1,28 +0,0 @@
-post_install(){
-  groupadd -g 89 mysql &>/dev/null
-  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-  usr/bin/mysql_install_db --user=mysql --basedir=/usr
-  chown -R mysql:mysql var/lib/mysql &>/dev/null
-
-  usr/bin/systemd-tmpfiles --create mysqld.conf
-}
-
-post_upgrade(){
-  getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
-  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-
-  if [ "$(vercmp $2 5.5)" -lt 0 ]; then
-    echo " >> "
-    echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it."
-    echo " >> "
-  fi
-}
-
-post_remove(){
-  if getent passwd mysql >/dev/null 2>&1; then
-    userdel mysql
-  fi
-  if getent group mysql >/dev/null 2>&1; then
-    groupdel mysql
-  fi
-}
diff --git a/extra/mysql/mysqld b/extra/mysql/mysqld
deleted file mode 100755
index 1ac88a7cc..000000000
--- a/extra/mysql/mysqld
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-getPID() {
-   echo $(pgrep -u mysql mysqld 2>/dev/null);
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting MySQL Server"
-    [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null
-    if [ -z "$(getPID)" ]; then
-       /usr/bin/mysqld_safe --user=mysql &>/dev/null &
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        timeo=30
-        while [ $timeo -gt 0 ]; do
-          response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
-          echo "$response" | grep -q "mysqld is alive" && break
-          sleep 1
-          let timeo=${timeo}-1
-        done
-        if [ $timeo -eq 0 ]; then
-          stat_fail
-          exit 1
-        else
-          echo $(getPID) > /var/run/mysqld/mysqld.pid
-          add_daemon mysqld
-          stat_done
-        fi
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping MySQL Server"
-    if [ ! -z "$(getPID)" ]; then
-      timeo=30
-      kill $(getPID) &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      fi
-      while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do
-        sleep 1
-        let timeo=${timeo}-1
-      done
-      if [ -z "$(getPID)" ]; then
-        rm -f /var/run/mysqld/mysqld.pid &>/dev/null
-        rm_daemon mysqld
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/mysql/mysqld-post.sh b/extra/mysql/mysqld-post.sh
deleted file mode 100755
index 8dc9c4eea..000000000
--- a/extra/mysql/mysqld-post.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-while true; do
-    response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
-    echo "$response" | grep -q "mysqld is alive" && break
-    sleep 1
-done
diff --git a/extra/mysql/mysqld.rc b/extra/mysql/mysqld.rc
deleted file mode 100755
index 4bbddb5a4..000000000
--- a/extra/mysql/mysqld.rc
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-getPID() {
-   echo $(pgrep -u mysql mysqld 2>/dev/null);
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting MySQL Server"
-    [ ! -d /run/mysqld ] && install -d -g mysql -o mysql /run/mysqld &>/dev/null
-    if [ -z "$(getPID)" ]; then
-       /usr/bin/mysqld_safe --user=mysql &>/dev/null &
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        timeo=30
-        while [ $timeo -gt 0 ]; do
-          response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
-          echo "$response" | grep -q "mysqld is alive" && break
-          sleep 1
-          let timeo=${timeo}-1
-        done
-        if [ $timeo -eq 0 ]; then
-          stat_fail
-          exit 1
-        else
-          echo $(getPID) > /run/mysqld/mysqld.pid
-          add_daemon mysqld
-          stat_done
-        fi
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping MySQL Server"
-    if [ ! -z "$(getPID)" ]; then
-      timeo=30
-      kill $(getPID) &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      fi
-      while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do
-        sleep 1
-        let timeo=${timeo}-1
-      done
-      if [ -z "$(getPID)" ]; then
-        rm -f /run/mysqld/mysqld.pid &>/dev/null
-        rm_daemon mysqld
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/mysql/mysqld.service b/extra/mysql/mysqld.service
deleted file mode 100644
index 0175c685b..000000000
--- a/extra/mysql/mysqld.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=MySQL Server
-
-[Service]
-User=mysql
-ExecStart=/usr/bin/mysqld --user=mysql
-ExecStartPost=/usr/bin/mysqld-post
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/nautilus-open-terminal/PKGBUILD b/extra/nautilus-open-terminal/PKGBUILD
index f596fdfc8..06a0bee40 100644
--- a/extra/nautilus-open-terminal/PKGBUILD
+++ b/extra/nautilus-open-terminal/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169998 2012-10-30 23:01:23Z heftig $
+# $Id: PKGBUILD 178922 2013-02-28 19:09:50Z ioni $
 # Maintainer : Biru Ionut <ionut@archlinux.ro>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 pkgname=nautilus-open-terminal
-pkgver=0.19
-pkgrel=3
+pkgver=0.20
+pkgrel=1
 pkgdesc="A nautilus plugin for opening terminals in arbitrary local paths"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ftp.gnome.org/pub/GNOME/sources/nautilus-open-terminal"
@@ -12,9 +12,9 @@ license=('GPL')
 depends=('nautilus' 'gconf')
 makedepends=('pkgconfig' 'gettext' 'intltool')
 install=nautilus-open-terminal.install
-source=(ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+source=(ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz)
 options=('!libtool' '!emptydirs')
-sha256sums=('4760f3a5a862ba9239ea92690a42ecee2c68fad413b023dd06505bdb3ee1f6af')
+sha256sums=('84905e98a13990ef73ce698144bdf0ad9adb1346c22a7d7381a3d65f17a364f0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/nautilus-sendto/PKGBUILD b/extra/nautilus-sendto/PKGBUILD
index 9d3e586e5..3ea4d33c2 100644
--- a/extra/nautilus-sendto/PKGBUILD
+++ b/extra/nautilus-sendto/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 169999 2012-10-30 23:01:26Z heftig $
+# $Id: PKGBUILD 183446 2013-04-21 22:11:47Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Tor Krill <tor@krill.nu>
 
 pkgname=nautilus-sendto
-pkgver=3.6.0
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="Nautilus context menu for sending files."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://download.gnome.org/sources/nautilus-sendto/"
-license=('GPL')
-groups=('gnome-extra')
-depends=('evolution-data-server' 'nautilus' 'dconf')
-makedepends=('pidgin' 'gajim' 'gettext' 'intltool' 'gupnp')
+license=(GPL)
+depends=(glib2)
+makedepends=(gettext intltool gobject-introspection)
 options=('!libtool' '!emptydirs')
 install=nautilus-sendto.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5f90a1a7b054257545dc72fa3a63de8f5564815576f90a21c320ebb177b9268e')
+sha256sums=('d99ea11a484bff8894097696a1afc8d7f44de4f064f78deeb6f598cecf0604bb')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/nautilus-sendto/nautilus-sendto.install b/extra/nautilus-sendto/nautilus-sendto.install
index d33a1b261..38a63052c 100644
--- a/extra/nautilus-sendto/nautilus-sendto.install
+++ b/extra/nautilus-sendto/nautilus-sendto.install
@@ -1,11 +1,5 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
 post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
+  if (( $(vercmp $2 3.7.92) < 0 )); then
+    glib-compile-schemas usr/share/glib-2.0/schemas
+  fi
 }
diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD
index 77b88ec12..e807f3ef0 100644
--- a/extra/nautilus/PKGBUILD
+++ b/extra/nautilus/PKGBUILD
@@ -1,34 +1,52 @@
-# $Id: PKGBUILD 170899 2012-11-12 22:34:25Z heftig $
+# $Id: PKGBUILD 183320 2013-04-21 22:06:39Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgname=nautilus
-pkgver=3.6.3
+pkgbase=nautilus
+pkgname=(nautilus libnautilus-extension)
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="GNOME file manager"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify')
-makedepends=('intltool' 'gobject-introspection')
+arch=(i686 x86_64 mips64el)
+license=(GPL)
+depends=(libexif gnome-desktop exempi gvfs desktop-file-utils gnome-icon-theme dconf 
+         libtracker-sparql libnotify nautilus-sendto)
+makedepends=(intltool gobject-introspection python)
 url="http://www.gnome.org"
-groups=('gnome')
 options=('!libtool' '!emptydirs')
-install=nautilus.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d272027754ce8591959ae854fc6b5f43eee4af31e4eecf06de727acebe0ee46c')
+source=(http://download.gnome.org/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('9827e939aa0621041754379ca0227ceb82877785f013dd5935ecc4b791314892')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgbase-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/nautilus \
-      --disable-nst-extension \
       --disable-update-mimedb \
       --disable-packagekit \
       --disable-schemas-compile
   make
 }
 
-package() {
-  cd "$pkgname-$pkgver"
+package_nautilus() {
+  depends+=(libnautilus-extension)
+  groups=(gnome)
+  install=nautilus.install
+
+  cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
+
+### Split libnautilus-extension
+  cd ..
+  mkdir -p n-e/usr/{lib,share}
+  mv "$pkgdir"/usr/include n-e/usr
+  mv "$pkgdir"/usr/lib/{girepository-1.0,pkgconfig} n-e/usr/lib
+  mv "$pkgdir"/usr/lib/libnautilus-extension.so* n-e/usr/lib
+  mv "$pkgdir"/usr/share/{gir-1.0,gtk-doc} n-e/usr/share
+}
+
+package_libnautilus-extension() {
+  pkgdesc="Library for extending the $pkgdesc"
+  depends=(gtk3)
+
+  mv n-e/* "$pkgdir"
 }
diff --git a/extra/ncmpc/PKGBUILD b/extra/ncmpc/PKGBUILD
index 1db460479..842ca76de 100644
--- a/extra/ncmpc/PKGBUILD
+++ b/extra/ncmpc/PKGBUILD
@@ -1,37 +1,40 @@
-# $Id: PKGBUILD 150715 2012-02-21 01:22:44Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# $Id: PKGBUILD 182640 2013-04-11 22:29:15Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Daniel Bainton <dpb [at] backarrow.org>
 
 pkgname=ncmpc
-pkgver=0.20
-pkgrel=1.1
-pkgdesc="A ncurses (command line) interface for MPD"
-arch=("i686" "x86_64" 'mips64el')
-url="http://mpd.wikia.com/wiki/Client:Ncmpc"
+pkgver=0.21
+pkgrel=1
+pkgdesc='Fully featured MPD client using ncurses'
+url='http://www.musicpd.org/clients/ncmpc/'
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('ncurses' 'glib2' 'libmpdclient')
 optdepends=('python2: to enable lyrics plugin'
-	'ruby: to enable lyrics plugin')
-source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('62b9df0263d9567babf7446c258acc5d')
+            'ruby: to enable lyrics plugin')
+source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('ec828bf17be6ab4c60c39bc91a3bd5cd93fac4a5')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed -e 's#python#python2#' -i lyrics/30-leoslyrics.py
+}
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  sed -i 's#python#python2#' lyrics/30-leoslyrics.py
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --enable-lyrics-screen \
-    --with-lyrics-plugin-dir=/usr/share/ncmpc/lyrics
-  make
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--enable-lyrics-screen \
+		--with-lyrics-plugin-dir=/usr/share/ncmpc/lyrics
+	make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -d ${pkgdir}/usr/share/ncmpc/lyrics
-  install -m755 lyrics/{10-hd.sh,15-leoslyrics.sh,20-lyricwiki.rb,30-leoslyrics.py} \
-    ${pkgdir}/usr/share/ncmpc/lyrics
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	for i in lyrics/*; do install -Dm755 "$i" "${pkgdir}/usr/share/ncmpc/$i"; done
 }
diff --git a/extra/nedit/PKGBUILD b/extra/nedit/PKGBUILD
index ef9e2fe78..0819548b5 100644
--- a/extra/nedit/PKGBUILD
+++ b/extra/nedit/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=nedit
 pkgver=5.5
-pkgrel=6.1
+pkgrel=6.2
 pkgdesc="A Unix text editor for programmers and general users"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nedit.org/"
diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD
index f30a2ac81..e438ddc5f 100644
--- a/extra/nepomuk-core/PKGBUILD
+++ b/extra/nepomuk-core/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177625 2013-02-08 08:55:45Z andrea $
+# $Id: PKGBUILD 181871 2013-04-05 08:54:13Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=nepomuk-core
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries"
 url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core"
@@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg')
 makedepends=('cmake' 'automoc4' 'doxygen')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('affc4d3063db773e5b05ff746a4c64adbec29264')
+sha1sums=('e17ca2b7eb3b1745806be7576d6340777f4ce0d0')
 
 build() {
   mkdir build
@@ -24,7 +24,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 
   # Fix the python shebang
diff --git a/extra/nepomuk-core/regression-crash.patch b/extra/nepomuk-core/regression-crash.patch
deleted file mode 100644
index 2559c99c4..000000000
--- a/extra/nepomuk-core/regression-crash.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From: David Faure <faure@kde.org>
-Date: Tue, 02 Oct 2012 18:27:03 +0000
-Subject: Fix crash when watchUserLimitReached() leads to deleting the KInotify instance
-X-Git-Url: http://quickgit.kde.org/?p=nepomuk-core.git&amp;a=commitdiff&amp;h=804e54f83ade8a377d392d350981ead07f60a9d3
----
-Fix crash when watchUserLimitReached() leads to deleting the KInotify instance
-
-... which emitted the signal. So don't use a direct delete.
-
-BUG: 307388
-FIXED-IN: 4.9.3
----
-
-
---- a/services/filewatch/nepomukfilewatch.cpp
-+++ b/services/filewatch/nepomukfilewatch.cpp
-@@ -323,7 +323,8 @@
- void Nepomuk2::FileWatch::slotInotifyWatchUserLimitReached()
- {
-     // we do it the brutal way for now hoping with new kernels and defaults this will never happen
--    delete m_dirWatch;
-+    // Delete the KInotify and switch to KDirNotify dbus signals
-+    m_dirWatch->deleteLater();
-     m_dirWatch = 0;
-     connectToKDirWatch();
- }
-
-From: Dan Vrátil <dvratil@redhat.com>
-Date: Wed, 03 Oct 2012 11:27:22 +0000
-Subject: Add null-crash guards for m_dirWatch to FileWatch
-X-Git-Url: http://quickgit.kde.org/?p=nepomuk-core.git&amp;a=commitdiff&amp;h=32b44881dda4f243932c59c11bf39c91f30c224b
----
-Add null-crash guards for m_dirWatch to FileWatch
-
-BUG: 307388
----
-
-
---- a/services/filewatch/nepomukfilewatch.cpp
-+++ b/services/filewatch/nepomukfilewatch.cpp
-@@ -114,6 +114,7 @@
- 
- Nepomuk2::FileWatch::FileWatch( QObject* parent, const QList<QVariant>& )
-     : Service( parent )
-+    , m_dirWatch( 0 )
- {
-     // Create the configuration instance singleton (for thread-safety)
-     // ==============================================================
-@@ -324,8 +325,10 @@
- {
-     // we do it the brutal way for now hoping with new kernels and defaults this will never happen
-     // Delete the KInotify and switch to KDirNotify dbus signals
--    m_dirWatch->deleteLater();
--    m_dirWatch = 0;
-+    if( m_dirWatch ) {
-+        m_dirWatch->deleteLater();
-+        m_dirWatch = 0;
-+    }
-     connectToKDirWatch();
- }
- #endif
-@@ -413,7 +416,9 @@
- void Nepomuk2::FileWatch::slotDeviceTeardownRequested(const Nepomuk2::RemovableMediaCache::Entry* entry )
- {
- #ifdef BUILD_KINOTIFY
--    m_dirWatch->removeWatch( entry->mountPath() );
-+    if( m_dirWatch ) {
-+        m_dirWatch->removeWatch( entry->mountPath() );
-+    }
- #endif
- }
- 
-
diff --git a/extra/nepomuk-widgets/PKGBUILD b/extra/nepomuk-widgets/PKGBUILD
index 1efac6954..f87972eed 100644
--- a/extra/nepomuk-widgets/PKGBUILD
+++ b/extra/nepomuk-widgets/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177642 2013-02-08 08:56:00Z andrea $
+# $Id: PKGBUILD 181888 2013-04-05 08:54:32Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=nepomuk-widgets
-pkgver=4.10.0
+pkgver=4.10.2
 pkgrel=1
 pkgdesc="The Library containing the Nepomuk Widgets"
 url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-widgets"
@@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('nepomuk-core')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('8c6029bb56364c28398c516f4034c484e0ea31e0')
+sha1sums=('2aa9eaf4709acc1f9a2acf6c6bb4b42fc0840549')
 
 build() {
   mkdir build
diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD
index 81c93037a..4b376fdc5 100644
--- a/extra/net-snmp/PKGBUILD
+++ b/extra/net-snmp/PKGBUILD
@@ -1,38 +1,36 @@
-# $Id: PKGBUILD 176935 2013-02-02 19:40:08Z eric $
-# Maintainer: 
+# $Id: PKGBUILD 182744 2013-04-14 04:22:21Z eric $
+# Maintainer:
 # Contributor: Dale Blount <dale@archlinux.org>
 
 pkgname=net-snmp
 pkgver=5.7.2
-pkgrel=1
+pkgrel=4
 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.net-snmp.org/"
 license=('BSD')
 depends=('openssl' 'libnl' 'pciutils')
 makedepends=('python2-distribute')
-optdepends=('perl-term-readkey: for snmpcheck application' 
+optdepends=('perl-term-readkey: for snmpcheck application'
             'perl-tk: for snmpcheck and tkmib applications'
             'python2: for the python modules')
-provides=('ucd-snmp')
-backup=('etc/conf.d/snmpd')
-options=('!libtool' '!emptydirs')
+options=('!libtool' '!emptydirs' '!makeflags')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
-        snmpd.confd snmpd.rc snmpd.service libnl32.patch)
+        snmpd.service libnl32.patch)
 sha1sums=('c493027907f32400648244d81117a126aecd27ee'
-          '25ee4b2e7b5a1b91122d06e82d41ef5bb5359d6d'
-          'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b'
-          '90600c0141eed10d6e3ca3ccc97ad8dda15c2112'
-          'f59ddc049c1c689f04e68c3c7cd8b8e301df3158'
+          'SKIP'
+          '2ad00f89ecb8ec97adfbae7adfbfa3499319e5d7'
           '74a9848b95f63378eb1753fc309d2b74de5afb0f')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694
+prepare() {
+  cd ${pkgname}-${pkgver}
+# http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694
   patch -Np1 -i "$srcdir/libnl32.patch"
   autoreconf -f -i
+}
 
+build() {
+  cd ${pkgname}-${pkgver}
   PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --mandir=/usr/share/man \
@@ -50,11 +48,9 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   sed -i -e "s:install --basedir=\$\$dir:install --basedir=\$\$dir --root=${pkgdir}:" Makefile
   make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install
-  install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
-  install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd"
   install -D -m644 "${srcdir}/snmpd.service" "${pkgdir}/usr/lib/systemd/system/snmpd.service"
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/net-snmp/snmpd.confd b/extra/net-snmp/snmpd.confd
deleted file mode 100644
index 926b09bbf..000000000
--- a/extra/net-snmp/snmpd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters to be passed to snmpd
-#
-SNMPD_ARGS=""
-
diff --git a/extra/net-snmp/snmpd.rc b/extra/net-snmp/snmpd.rc
deleted file mode 100644
index b00c09f4f..000000000
--- a/extra/net-snmp/snmpd.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/snmpd
-
-PID=`pidof -o %PPID /usr/sbin/snmpd`
-case "$1" in
-  start)
-    stat_busy "Starting Net-SNMP"
-    [ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/snmpd.pid
-      add_daemon snmpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Net-SNMP"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/snmpd.pid
-      rm_daemon snmpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/net-snmp/snmpd.service b/extra/net-snmp/snmpd.service
index 111a8d6a9..3e5dbc534 100644
--- a/extra/net-snmp/snmpd.service
+++ b/extra/net-snmp/snmpd.service
@@ -4,7 +4,8 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/snmpd
+PIDFile=/run/snmpd.pid
+ExecStart=/usr/sbin/snmpd -p /run/snmpd.pid
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
diff --git a/extra/netcdf/PKGBUILD b/extra/netcdf/PKGBUILD
index 27af416b2..957759dbc 100644
--- a/extra/netcdf/PKGBUILD
+++ b/extra/netcdf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164373 2012-07-31 19:53:39Z ronald $
+# $Id: PKGBUILD 178109 2013-02-16 12:42:26Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=netcdf
-pkgver=4.2.1
+pkgver=4.2.1.1
 pkgrel=1
 pkgdesc="network Common Data Form interface for array-oriented data access and corresponding library"
 arch=("i686" "x86_64" 'mips64el')
@@ -13,7 +13,7 @@ optdepends=('netcdf-fortran: fortran bindings' 'netcdf-cxx: c++ bindings')
 options=('!libtool' '!makeflags')
 license=('custom')
 source=(http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-${pkgver}.tar.gz)
-sha1sums=('dfb6b10ef8dd20e785efa5e29b448383090f144d')
+sha1sums=('76631cb4e6b767c224338415cf6e5f5ff9bd1238')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/netpbm/PKGBUILD b/extra/netpbm/PKGBUILD
index 2bb647009..8eca87d59 100644
--- a/extra/netpbm/PKGBUILD
+++ b/extra/netpbm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 148858 2012-02-05 11:53:06Z ibiru $
+# $Id: PKGBUILD 178515 2013-02-24 21:47:43Z eric $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 
 pkgname=netpbm
-pkgver=10.57.1
-pkgrel=1.1
+pkgver=10.61.02
+pkgrel=1
 pkgdesc="A toolkit for manipulation of graphic images"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom' 'BSD' 'GPL' 'LGPL')
@@ -11,18 +11,27 @@ url="http://netpbm.sourceforge.net/"
 depends=('perl' 'libpng' 'libtiff' 'libxml2')
 makedepends=('python2')
 options=('!makeflags')
-# Releases after 10.34 are available via SVN only.
-# Get Advanced tarball here: http://netpbm.sourceforge.net/release.html#tarball
-# Get version number from version.mk
-# Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/
-source=(ftp://ftp.archlinux.org/other/netpbm/${pkgname}-${pkgver}.tar.gz \
-        ftp://ftp.archlinux.org/other/netpbm/netpbm-doc-22Feb2009.tar.xz \
+source=(ftp://ftp.archlinux.org/other/packages/netpbm/${pkgname}-${pkgver}.tar.gz{,.sig} \
+        ftp://ftp.archlinux.org/other/packages/netpbm/netpbm-doc-22Feb2009.tar.xz{,.sig} \
         netpbm-CAN-2005-2471.patch netpbm-security-code.patch netpbm-security-scripts.patch)
-sha1sums=('cd0b99333faf994a680d77c5d217034df35ebd4e'
+sha1sums=('dc2354716996c8fe4c4836386e6c403ec2f15589'
+          '253df0e79f9344e68ee907a43347d630ff6b1b95'
           'dfeba9f9a5fe987d64db0aadb5ca8c1b20fcead2'
+          'e9513608a661beb05a63270931f6191029e935f8'
           'b79cf9d42488fea065ba16262ed97694c47af08d'
-          '4cd5b94a24886ecae3973c5ae104d8298fe5a1f5'
-          '2ac31f714121e08e47af9337c6bbaab3cbfc5c75')
+          'cde27f75fa5ca8010a3b1f08d8e247d42243d0f5'
+          '300a2386d3207005f4cb4120bbb2f3788a9b7716')
+
+# source PKGBUILD && mksource
+mksource() {
+# Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/
+  curl -o advanced.tar.gz 'http://netpbm.svn.sourceforge.net/viewvc/netpbm/advanced.tar.gz?view=tar'
+  tar -xf advanced.tar.gz advanced/version.mk
+  _pkgver=$(grep MAJOR advanced/version.mk |cut -d ' ' -f 3).$(grep MINOR advanced/version.mk |cut -d ' ' -f 3).0$(grep POINT advanced/version.mk |cut -d ' ' -f 3)
+  mv advanced.tar.gz ${pkgname}-${_pkgver}.tar.gz
+  gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${_pkgver}.tar.gz
+  rm -r advanced
+}
 
 build() {
   cd "${srcdir}/advanced"
diff --git a/extra/netpbm/netpbm-security-code.patch b/extra/netpbm/netpbm-security-code.patch
index da67a8f92..27b49fbae 100644
--- a/extra/netpbm/netpbm-security-code.patch
+++ b/extra/netpbm/netpbm-security-code.patch
@@ -1,39 +1,35 @@
-diff -up netpbm-10.47.04/analyzer/pgmtexture.c.security netpbm-10.47.04/analyzer/pgmtexture.c
---- netpbm-10.47.04/analyzer/pgmtexture.c.security	2009-10-21 13:38:55.000000000 +0200
-+++ netpbm-10.47.04/analyzer/pgmtexture.c	2009-10-21 15:09:33.000000000 +0200
-@@ -79,6 +79,9 @@ vector (int nl, int nh)
- {
-     float *v;
- 
-+    if(nh < nl)
-+	pm_error("assert: h < l");
+diff -up netpbm-10.58.01/analyzer/pgmtexture.c.security-code netpbm-10.58.01/analyzer/pgmtexture.c
+--- netpbm-10.58.01/analyzer/pgmtexture.c.security-code	2012-04-09 15:31:32.000000000 +0200
++++ netpbm-10.58.01/analyzer/pgmtexture.c	2012-04-09 15:40:03.183620040 +0200
+@@ -97,7 +97,7 @@ vector(unsigned int const nl,
+     float * v;
+ 
+     assert(nh >= nl);
+-
 +    overflow_add(nh - nl, 1);
      MALLOCARRAY(v, (unsigned) (nh - nl + 1));
+ 
      if (v == NULL)
-         pm_error("Unable to allocate memory for a vector.");
-@@ -95,6 +98,9 @@ matrix (int nrl, int nrh, int ncl, int n
-     float **m;
+@@ -129,6 +129,7 @@ matrix (unsigned int const nrl,
+     assert(nrh >= nrl);
  
      /* allocate pointers to rows */
-+    if(nrh < nrl)
-+	pm_error("assert: h < l");
 +    overflow_add(nrh - nrl, 1);
      MALLOCARRAY(m, (unsigned) (nrh - nrl + 1));
      if (m == NULL)
          pm_error("Unable to allocate memory for a matrix.");
-@@ -102,6 +108,9 @@ matrix (int nrl, int nrh, int ncl, int n
-     assert (nch >= ncl);
+@@ -136,7 +137,7 @@ matrix (unsigned int const nrl,
+     m -= ncl;
  
-     /* allocate rows and set pointers to them */
-+    if(nch < ncl)
-+        pm_error("assert: h < l");
+     assert (nch >= ncl);
+-
 +    overflow_add(nch - ncl, 1);
+     /* allocate rows and set pointers to them */
      for (i = nrl; i <= nrh; ++i) {
          MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1));
-         if (m[i] == NULL)
-diff -up netpbm-10.47.04/converter/other/gemtopnm.c.security netpbm-10.47.04/converter/other/gemtopnm.c
---- netpbm-10.47.04/converter/other/gemtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/gemtopnm.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/other/gemtopnm.c.security-code netpbm-10.58.01/converter/other/gemtopnm.c
+--- netpbm-10.58.01/converter/other/gemtopnm.c.security-code	2012-04-09 15:31:42.000000000 +0200
++++ netpbm-10.58.01/converter/other/gemtopnm.c	2012-04-09 15:40:03.183620040 +0200
 @@ -106,6 +106,7 @@ main(argc, argv)
  
  	pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 );
@@ -42,10 +38,10 @@ diff -up netpbm-10.47.04/converter/other/gemtopnm.c.security netpbm-10.47.04/con
      { 
          /* allocate input row data structure */
          int plane;
-diff -up netpbm-10.47.04/converter/other/jpegtopnm.c.security netpbm-10.47.04/converter/other/jpegtopnm.c
---- netpbm-10.47.04/converter/other/jpegtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/jpegtopnm.c	2009-10-21 15:54:30.000000000 +0200
-@@ -861,6 +861,8 @@ convertImage(FILE *                     
+diff -up netpbm-10.58.01/converter/other/jpegtopnm.c.security-code netpbm-10.58.01/converter/other/jpegtopnm.c
+--- netpbm-10.58.01/converter/other/jpegtopnm.c.security-code	2012-04-09 15:31:40.000000000 +0200
++++ netpbm-10.58.01/converter/other/jpegtopnm.c	2012-04-09 15:40:03.184620028 +0200
+@@ -861,6 +861,8 @@ convertImage(FILE *
      /* Calculate output image dimensions so we can allocate space */
      jpeg_calc_output_dimensions(cinfoP);
  
@@ -54,9 +50,9 @@ diff -up netpbm-10.47.04/converter/other/jpegtopnm.c.security netpbm-10.47.04/co
      /* Start decompressor */
      jpeg_start_decompress(cinfoP);
  
-diff -up netpbm-10.47.04/converter/other/pbmtopgm.c.security netpbm-10.47.04/converter/other/pbmtopgm.c
---- netpbm-10.47.04/converter/other/pbmtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/pbmtopgm.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/other/pbmtopgm.c.security-code netpbm-10.58.01/converter/other/pbmtopgm.c
+--- netpbm-10.58.01/converter/other/pbmtopgm.c.security-code	2012-04-09 15:31:42.000000000 +0200
++++ netpbm-10.58.01/converter/other/pbmtopgm.c	2012-04-09 15:40:03.184620028 +0200
 @@ -47,6 +47,7 @@ main(int argc, char *argv[]) {
                   "than the image height (%u rows)", height, rows);
  
@@ -65,10 +61,9 @@ diff -up netpbm-10.47.04/converter/other/pbmtopgm.c.security netpbm-10.47.04/con
      maxval = MIN(PGM_OVERALLMAXVAL, width*height);
      pgm_writepgminit(stdout, cols, rows, maxval, 0) ;
  
-diff -up netpbm-10.47.04/converter/other/pngtopnm.c.security netpbm-10.47.04/converter/other/pngtopnm.c
-diff -up netpbm-10.47.04/converter/other/pnmtoddif.c.security netpbm-10.47.04/converter/other/pnmtoddif.c
---- netpbm-10.47.04/converter/other/pnmtoddif.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/pnmtoddif.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/other/pnmtoddif.c.security-code netpbm-10.58.01/converter/other/pnmtoddif.c
+--- netpbm-10.58.01/converter/other/pnmtoddif.c.security-code	2012-04-09 15:31:42.000000000 +0200
++++ netpbm-10.58.01/converter/other/pnmtoddif.c	2012-04-09 15:40:03.185620015 +0200
 @@ -632,6 +632,7 @@ main(int argc, char *argv[]) {
      switch (PNM_FORMAT_TYPE(format)) {
      case PBM_TYPE:
@@ -85,9 +80,9 @@ diff -up netpbm-10.47.04/converter/other/pnmtoddif.c.security netpbm-10.47.04/co
          ip.bytes_per_line = 3 * cols;
          ip.bits_per_pixel = 24;
          ip.spectral = 5;
-diff -up netpbm-10.47.04/converter/other/pnmtojpeg.c.security netpbm-10.47.04/converter/other/pnmtojpeg.c
---- netpbm-10.47.04/converter/other/pnmtojpeg.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/pnmtojpeg.c	2009-10-21 15:56:32.000000000 +0200
+diff -up netpbm-10.58.01/converter/other/pnmtojpeg.c.security-code netpbm-10.58.01/converter/other/pnmtojpeg.c
+--- netpbm-10.58.01/converter/other/pnmtojpeg.c.security-code	2012-04-09 15:31:39.000000000 +0200
++++ netpbm-10.58.01/converter/other/pnmtojpeg.c	2012-04-09 15:40:03.186620002 +0200
 @@ -605,7 +605,11 @@ read_scan_script(j_compress_ptr const ci
             want JPOOL_PERMANENT.  
          */
@@ -101,7 +96,7 @@ diff -up netpbm-10.47.04/converter/other/pnmtojpeg.c.security netpbm-10.47.04/co
              (jpeg_scan_info *)
              (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
                                          scan_info_size);
-@@ -936,6 +940,8 @@ compute_rescaling_array(JSAMPLE ** const
+@@ -937,6 +941,8 @@ compute_rescaling_array(JSAMPLE ** const
    const long half_maxval = maxval / 2;
    long val;
  
@@ -110,7 +105,7 @@ diff -up netpbm-10.47.04/converter/other/pnmtojpeg.c.security netpbm-10.47.04/co
    *rescale_p = (JSAMPLE *)
      (cinfo.mem->alloc_small) ((j_common_ptr) &cinfo, JPOOL_IMAGE,
                                (size_t) (((long) maxval + 1L) * 
-@@ -1014,6 +1020,7 @@ convert_scanlines(struct jpeg_compress_s
+@@ -1015,6 +1021,7 @@ convert_scanlines(struct jpeg_compress_s
      */
  
    /* Allocate the libpnm output and compressor input buffers */
@@ -118,33 +113,48 @@ diff -up netpbm-10.47.04/converter/other/pnmtojpeg.c.security netpbm-10.47.04/co
    buffer = (*cinfo_p->mem->alloc_sarray)
      ((j_common_ptr) cinfo_p, JPOOL_IMAGE,
       (unsigned int) cinfo_p->image_width * cinfo_p->input_components, 
-diff -up netpbm-10.47.04/converter/other/pnmtosgi.c.security netpbm-10.47.04/converter/other/pnmtosgi.c
---- netpbm-10.47.04/converter/other/pnmtosgi.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/pnmtosgi.c	2009-10-21 15:09:33.000000000 +0200
-@@ -213,6 +213,22 @@ write_channels(cols, rows, channels, put
+diff -up netpbm-10.58.01/converter/other/pnmtops.c.security-code netpbm-10.58.01/converter/other/pnmtops.c
+--- netpbm-10.58.01/converter/other/pnmtops.c.security-code	2012-04-09 15:31:40.000000000 +0200
++++ netpbm-10.58.01/converter/other/pnmtops.c	2012-04-09 15:40:03.187619989 +0200
+@@ -256,17 +256,21 @@ parseCommandLine(int argc, const char **
+     validateCompDimension(width, 72, "-width value");
+     validateCompDimension(height, 72, "-height value");
+     
++    overflow2(width, 72);
+     cmdlineP->width  = width * 72;
++    overflow2(height, 72);
+     cmdlineP->height = height * 72;
+ 
+     if (imagewidthSpec) {
+         validateCompDimension(imagewidth, 72, "-imagewidth value");
++        overflow2(imagewidth, 72);
+         cmdlineP->imagewidth = imagewidth * 72;
      }
- }
- 
-+static void *
-+xmalloc2(int x, int y)
-+{
-+    void *mem;
-+
-+    overflow2(x,y);
-+    if( x * y == 0 )
-+        return NULL;
-+
-+    mem = malloc2(x, y);
-+    if( mem == NULL )
-+        pm_error("out of memory allocating %d bytes", x * y);
-+    return mem;
-+}
-+
-+
- static void
- put_big_short(short s)
- {
-@@ -250,6 +266,7 @@ build_channels(FILE *ifp, int cols, int 
+     else
+         cmdlineP->imagewidth = 0;
+     if (imageheightSpec) {
+-        validateCompDimension(imagewidth, 72, "-imageheight value");
++        validateCompDimension(imageheight, 72, "-imageheight value");
++        overflow2(imageheight, 72);
+         cmdlineP->imageheight = imageheight * 72;
+     }
+     else
+diff -up netpbm-10.58.01/converter/other/pnmtorle.c.security-code netpbm-10.58.01/converter/other/pnmtorle.c
+--- netpbm-10.58.01/converter/other/pnmtorle.c.security-code	2012-04-09 15:31:42.000000000 +0200
++++ netpbm-10.58.01/converter/other/pnmtorle.c	2012-04-09 15:40:03.188619976 +0200
+@@ -19,6 +19,8 @@
+  * If you modify this software, you should include a notice giving the
+  * name of the person performing the modification, the date of modification,
+  * and the reason for such modification.
++ *
++ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
+  */
+ /*
+  * pnmtorle - A program which will convert pbmplus (ppm or pgm) images
+diff -up netpbm-10.58.01/converter/other/pnmtosgi.c.security-code netpbm-10.58.01/converter/other/pnmtosgi.c
+--- netpbm-10.58.01/converter/other/pnmtosgi.c.security-code	2012-04-09 15:31:42.000000000 +0200
++++ netpbm-10.58.01/converter/other/pnmtosgi.c	2012-04-09 15:40:03.188619976 +0200
+@@ -254,6 +254,7 @@ build_channels(FILE * const ifp, int con
  #endif
  
      if( storage != STORAGE_VERBATIM ) {
@@ -152,7 +162,7 @@ diff -up netpbm-10.47.04/converter/other/pnmtosgi.c.security netpbm-10.47.04/con
          MALLOCARRAY_NOFAIL(table, channels * rows);
          MALLOCARRAY_NOFAIL(rletemp, WORSTCOMPR(cols));
      }
-@@ -303,6 +320,8 @@ compress(temp, row, rows, cols, chan_no,
+@@ -306,6 +307,8 @@ compress(ScanElem * temp,
              break;
          case STORAGE_RLE:
              tabrow = chan_no * rows + row;
@@ -161,9 +171,9 @@ diff -up netpbm-10.47.04/converter/other/pnmtosgi.c.security netpbm-10.47.04/con
              len = rle_compress(temp, cols);    /* writes result into rletemp */
              channel[chan_no][row].length = len;
              MALLOCARRAY(p, len);
-diff -up netpbm-10.47.04/converter/other/rletopnm.c.security netpbm-10.47.04/converter/other/rletopnm.c
---- netpbm-10.47.04/converter/other/rletopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/rletopnm.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/other/rletopnm.c.security-code netpbm-10.58.01/converter/other/rletopnm.c
+--- netpbm-10.58.01/converter/other/rletopnm.c.security-code	2012-04-09 15:31:42.000000000 +0200
++++ netpbm-10.58.01/converter/other/rletopnm.c	2012-04-09 15:40:03.189619963 +0200
 @@ -19,6 +19,8 @@
   * If you modify this software, you should include a notice giving the
   * name of the person performing the modification, the date of modification,
@@ -173,10 +183,10 @@ diff -up netpbm-10.47.04/converter/other/rletopnm.c.security netpbm-10.47.04/con
   */
  /*
   * rletopnm - A conversion program to convert from Utah's "rle" image format
-diff -up netpbm-10.47.04/converter/other/sgitopnm.c.security netpbm-10.47.04/converter/other/sgitopnm.c
---- netpbm-10.47.04/converter/other/sgitopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/sgitopnm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -252,10 +252,14 @@ read_channels(ifp, head, table, func, oc
+diff -up netpbm-10.58.01/converter/other/sgitopnm.c.security-code netpbm-10.58.01/converter/other/sgitopnm.c
+--- netpbm-10.58.01/converter/other/sgitopnm.c.security-code	2012-04-09 15:31:42.000000000 +0200
++++ netpbm-10.58.01/converter/other/sgitopnm.c	2012-04-09 15:40:03.189619963 +0200
+@@ -359,10 +359,14 @@ readChannels(FILE *       const ifP,
          MALLOCARRAY_NOFAIL(image, head->ysize);
      } else {
          maxchannel = MIN(3, head->zsize);
@@ -190,11 +200,11 @@ diff -up netpbm-10.47.04/converter/other/sgitopnm.c.security netpbm-10.47.04/con
          MALLOCARRAY_NOFAIL(temp, WORSTCOMPR(head->xsize));
 +    }
  
-     for(channel = 0; channel < maxchannel; ++channel) {
+     for (channel = 0; channel < maxchannel; ++channel) {
          unsigned int row;
-diff -up netpbm-10.47.04/converter/other/sirtopnm.c.security netpbm-10.47.04/converter/other/sirtopnm.c
---- netpbm-10.47.04/converter/other/sirtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/sirtopnm.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/other/sirtopnm.c.security-code netpbm-10.58.01/converter/other/sirtopnm.c
+--- netpbm-10.58.01/converter/other/sirtopnm.c.security-code	2012-04-09 15:31:42.000000000 +0200
++++ netpbm-10.58.01/converter/other/sirtopnm.c	2012-04-09 15:40:03.190619951 +0200
 @@ -69,6 +69,7 @@ char* argv[];
  	    }
  	    break;
@@ -203,10 +213,10 @@ diff -up netpbm-10.47.04/converter/other/sirtopnm.c.security netpbm-10.47.04/con
  	    picsize = cols * rows * 3;
  	    planesize = cols * rows;
              if ( !( sirarray = (unsigned char*) malloc( picsize ) ) ) 
-diff -up netpbm-10.47.04/converter/other/tifftopnm.c.security netpbm-10.47.04/converter/other/tifftopnm.c
---- netpbm-10.47.04/converter/other/tifftopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/tifftopnm.c	2009-10-21 15:49:29.000000000 +0200
-@@ -1291,7 +1291,9 @@ convertRasterByRows(pnmOut *       const
+diff -up netpbm-10.58.01/converter/other/tifftopnm.c.security-code netpbm-10.58.01/converter/other/tifftopnm.c
+--- netpbm-10.58.01/converter/other/tifftopnm.c.security-code	2012-04-09 15:31:42.000000000 +0200
++++ netpbm-10.58.01/converter/other/tifftopnm.c	2012-04-09 15:40:03.191619939 +0200
+@@ -1279,7 +1279,9 @@ convertRasterByRows(pnmOut *       const
      if (scanbuf == NULL)
          pm_error("can't allocate memory for scanline buffer");
  
@@ -217,9 +227,9 @@ diff -up netpbm-10.47.04/converter/other/tifftopnm.c.security netpbm-10.47.04/co
      if (samplebuf == NULL)
          pm_error("can't allocate memory for row buffer");
  
-diff -up netpbm-10.47.04/converter/other/xwdtopnm.c.security netpbm-10.47.04/converter/other/xwdtopnm.c
---- netpbm-10.47.04/converter/other/xwdtopnm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/other/xwdtopnm.c	2009-10-21 15:53:27.000000000 +0200
+diff -up netpbm-10.58.01/converter/other/xwdtopnm.c.security-code netpbm-10.58.01/converter/other/xwdtopnm.c
+--- netpbm-10.58.01/converter/other/xwdtopnm.c.security-code	2012-04-09 15:31:40.000000000 +0200
++++ netpbm-10.58.01/converter/other/xwdtopnm.c	2012-04-09 15:40:03.192619927 +0200
 @@ -209,6 +209,10 @@ processX10Header(X10WDFileHeader *  cons
          *colorsP = pnm_allocrow(2);
          PNM_ASSIGN1((*colorsP)[0], 0);
@@ -239,32 +249,9 @@ diff -up netpbm-10.47.04/converter/other/xwdtopnm.c.security netpbm-10.47.04/con
      *padrightP =
          h11FixedP->bytes_per_line * 8 -
          h11FixedP->pixmap_width * h11FixedP->bits_per_pixel;
-diff -up netpbm-10.47.04/converter/other/sunicontopnm.c.security netpbm-10.47.04/converter/other/sunicontopnm.c
---- netpbm-10.47.04/converter/other/sunicontopnm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/other/sunicontopnm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -11,6 +11,7 @@
- */
- 
- #include <string.h>
-+#include <limits.h>
- 
- #include "nstring.h"
- #include "pbm.h"
-@@ -87,6 +88,11 @@ ReadIconFile(FILE *                const
-     if (*heightP <= 0)
-         pm_error("invalid height (must be positive): %d", *heightP);
- 
-+    if ( *widthP > INT_MAX - 16 || *widthP < 0)
-+        pm_error( "invalid width: %d", *widthP);
-+    
-+    overflow2(*widthP + 16, *heightP);
-+    
- }
- 
-  
-diff -up netpbm-10.47.04/converter/pbm/mdatopbm.c.security netpbm-10.47.04/converter/pbm/mdatopbm.c
---- netpbm-10.47.04/converter/pbm/mdatopbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/mdatopbm.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/pbm/mdatopbm.c.security-code netpbm-10.58.01/converter/pbm/mdatopbm.c
+--- netpbm-10.58.01/converter/pbm/mdatopbm.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/converter/pbm/mdatopbm.c	2012-04-09 15:40:03.192619927 +0200
 @@ -245,10 +245,13 @@ main(int argc, char **argv) {
          pm_readlittleshort(infile, &yy); nInCols = yy;
      }
@@ -280,9 +267,9 @@ diff -up netpbm-10.47.04/converter/pbm/mdatopbm.c.security netpbm-10.47.04/conve
  
      data = pbm_allocarray(nOutCols, nOutRows);
      
-diff -up netpbm-10.47.04/converter/pbm/mgrtopbm.c.security netpbm-10.47.04/converter/pbm/mgrtopbm.c
---- netpbm-10.47.04/converter/pbm/mgrtopbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/mgrtopbm.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/pbm/mgrtopbm.c.security-code netpbm-10.58.01/converter/pbm/mgrtopbm.c
+--- netpbm-10.58.01/converter/pbm/mgrtopbm.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/converter/pbm/mgrtopbm.c	2012-04-09 15:40:03.193619915 +0200
 @@ -65,6 +65,8 @@ readMgrHeader(FILE *          const ifP,
      if (head.h_high < ' ' || head.l_high < ' ')
          pm_error("Invalid width field in MGR header");
@@ -292,42 +279,10 @@ diff -up netpbm-10.47.04/converter/pbm/mgrtopbm.c.security netpbm-10.47.04/conve
      *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' ');
      *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' ');
      *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP;
-diff -up netpbm-10.47.04/converter/pbm/pbmto10x.c.security netpbm-10.47.04/converter/pbm/pbmto10x.c
---- netpbm-10.47.04/converter/pbm/pbmto10x.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmto10x.c	2009-10-21 15:09:33.000000000 +0200
-@@ -162,7 +162,7 @@ main(int argc, char * argv[]) {
-         res_60x72();
- 
-     pm_close(ifp);
--    exit(0);
-+    return 0;
- }
- 
- 
-diff -up netpbm-10.47.04/converter/pbm/pbmto4425.c.security netpbm-10.47.04/converter/pbm/pbmto4425.c
---- netpbm-10.47.04/converter/pbm/pbmto4425.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmto4425.c	2009-10-21 15:09:33.000000000 +0200
-@@ -2,6 +2,7 @@
- 
- #include "nstring.h"
- #include "pbm.h"
-+#include <string.h>
- 
- static char bit_table[2][3] = {
- {1, 4, 0x10},
-@@ -160,7 +161,7 @@ main(int argc, char * argv[]) {
-     xres = vmap_width * 2;
-     yres = vmap_height * 3;
- 
--    vmap = malloc(vmap_width * vmap_height * sizeof(char));
-+    vmap = malloc3(vmap_width, vmap_height, sizeof(char));
-     if(vmap == NULL)
- 	{
-         pm_error( "Cannot allocate memory" );
-diff -up netpbm-10.47.04/converter/pbm/pbmtogem.c.security netpbm-10.47.04/converter/pbm/pbmtogem.c
---- netpbm-10.47.04/converter/pbm/pbmtogem.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtogem.c	2009-10-21 15:09:33.000000000 +0200
-@@ -123,6 +123,7 @@ putinit (rows, cols)
+diff -up netpbm-10.58.01/converter/pbm/pbmtogem.c.security-code netpbm-10.58.01/converter/pbm/pbmtogem.c
+--- netpbm-10.58.01/converter/pbm/pbmtogem.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/converter/pbm/pbmtogem.c	2012-04-09 15:40:03.193619915 +0200
+@@ -79,6 +79,7 @@ putinit (int const rows, int const cols)
    bitsperitem = 0;
    bitshift = 7;
    outcol = 0;
@@ -335,9 +290,9 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtogem.c.security netpbm-10.47.04/conve
    outmax = (cols + 7) / 8;
    outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
    lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
-diff -up netpbm-10.47.04/converter/pbm/pbmtogo.c.security netpbm-10.47.04/converter/pbm/pbmtogo.c
---- netpbm-10.47.04/converter/pbm/pbmtogo.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtogo.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/pbm/pbmtogo.c.security-code netpbm-10.58.01/converter/pbm/pbmtogo.c
+--- netpbm-10.58.01/converter/pbm/pbmtogo.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/converter/pbm/pbmtogo.c	2012-04-09 15:40:03.193619915 +0200
 @@ -158,6 +158,7 @@ main(int           argc,
      bitrow = pbm_allocrow(cols);
  
@@ -346,9 +301,9 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtogo.c.security netpbm-10.47.04/conver
      rucols = ( cols + 7 ) / 8;
      bytesperrow = rucols;       /* GraphOn uses bytes */
      rucols = rucols * 8;
-diff -up netpbm-10.47.04/converter/pbm/pbmtolj.c.security netpbm-10.47.04/converter/pbm/pbmtolj.c
---- netpbm-10.47.04/converter/pbm/pbmtolj.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtolj.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/pbm/pbmtolj.c.security-code netpbm-10.58.01/converter/pbm/pbmtolj.c
+--- netpbm-10.58.01/converter/pbm/pbmtolj.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/converter/pbm/pbmtolj.c	2012-04-09 15:40:03.194619902 +0200
 @@ -120,7 +120,11 @@ parseCommandLine(int argc, char ** argv,
  static void
  allocateBuffers(unsigned int const cols) {
@@ -361,9 +316,9 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtolj.c.security netpbm-10.47.04/conver
      packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1;
      deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10;
  
-diff -up netpbm-10.47.04/converter/pbm/pbmtomacp.c.security netpbm-10.47.04/converter/pbm/pbmtomacp.c
---- netpbm-10.47.04/converter/pbm/pbmtomacp.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtomacp.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/pbm/pbmtomacp.c.security-code netpbm-10.58.01/converter/pbm/pbmtomacp.c
+--- netpbm-10.58.01/converter/pbm/pbmtomacp.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/converter/pbm/pbmtomacp.c	2012-04-09 15:40:03.195619889 +0200
 @@ -101,6 +101,7 @@ char *argv[];
    if( !lflg )
      left = 0;
@@ -381,9 +336,9 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtomacp.c.security netpbm-10.47.04/conv
    if( bflg )
    { if( bottom - top >= MAX_LINES )
        bottom = top + MAX_LINES - 1;
-diff -up netpbm-10.47.04/converter/pbm/pbmtomda.c.security netpbm-10.47.04/converter/pbm/pbmtomda.c
---- netpbm-10.47.04/converter/pbm/pbmtomda.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtomda.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/pbm/pbmtomda.c.security-code netpbm-10.58.01/converter/pbm/pbmtomda.c
+--- netpbm-10.58.01/converter/pbm/pbmtomda.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/converter/pbm/pbmtomda.c	2012-04-09 15:40:03.195619889 +0200
 @@ -179,6 +179,7 @@ int main(int argc, char **argv)
      
      nOutRowsUnrounded = bScale ? nInRows/2 : nInRows;
@@ -392,11 +347,10 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtomda.c.security netpbm-10.47.04/conve
      nOutRows = ((nOutRowsUnrounded + 3) / 4) * 4;
          /* MDA wants rows a multiple of 4 */   
      nOutCols = nInCols / 8;
-diff -up netpbm-10.47.04/converter/pbm/pbmtomgr.c.security netpbm-10.47.04/converter/pbm/pbmtomgr.c
-diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c
---- netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -105,6 +105,7 @@ int pbm_readline(pbm_stat* pbm,unsigned 
+diff -up netpbm-10.58.01/converter/pbm/pbmtoppa/pbm.c.security-code netpbm-10.58.01/converter/pbm/pbmtoppa/pbm.c
+--- netpbm-10.58.01/converter/pbm/pbmtoppa/pbm.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/converter/pbm/pbmtoppa/pbm.c	2012-04-09 15:40:03.195619889 +0200
+@@ -105,6 +105,7 @@ int pbm_readline(pbm_stat* pbm,unsigned
      return 0;
  
    case P4:
@@ -414,9 +368,9 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbm.c.security netpbm-10.47.04/c
    memcpy (pbm->revdata, data, (pbm->width+7)/8);
    pbm->current_line--;
  }
-diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c
---- netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/pbm/pbmtoppa/pbmtoppa.c.security-code netpbm-10.58.01/converter/pbm/pbmtoppa/pbmtoppa.c
+--- netpbm-10.58.01/converter/pbm/pbmtoppa/pbmtoppa.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/converter/pbm/pbmtoppa/pbmtoppa.c	2012-04-09 15:40:03.196619876 +0200
 @@ -441,6 +441,7 @@ main(int argc, char *argv[]) {
              pm_error("main(): unrecognized parameter '%s'", argv[argn]);
      }
@@ -425,9 +379,9 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtoppa/pbmtoppa.c.security netpbm-10.47
      Pwidth=(Width+7)/8;
      printer.fptr=out;
  
-diff -up netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security netpbm-10.47.04/converter/pbm/pbmtoxbm.c
---- netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtoxbm.c	2009-10-21 15:36:54.000000000 +0200
+diff -up netpbm-10.58.01/converter/pbm/pbmtoxbm.c.security-code netpbm-10.58.01/converter/pbm/pbmtoxbm.c
+--- netpbm-10.58.01/converter/pbm/pbmtoxbm.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/converter/pbm/pbmtoxbm.c	2012-04-09 15:40:03.196619876 +0200
 @@ -335,6 +335,8 @@ convertRaster(FILE *          const ifP,
  
      unsigned char * bitrow;
@@ -437,10 +391,10 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtoxbm.c.security netpbm-10.47.04/conve
  
      putinit(xbmVersion);
  
-diff -up netpbm-10.47.04/converter/pbm/pbmtoybm.c.security netpbm-10.47.04/converter/pbm/pbmtoybm.c
---- netpbm-10.47.04/converter/pbm/pbmtoybm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtoybm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -45,6 +45,7 @@ main( argc, argv )
+diff -up netpbm-10.58.01/converter/pbm/pbmtoybm.c.security-code netpbm-10.58.01/converter/pbm/pbmtoybm.c
+--- netpbm-10.58.01/converter/pbm/pbmtoybm.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/converter/pbm/pbmtoybm.c	2012-04-09 15:40:03.197619863 +0200
+@@ -113,6 +113,7 @@ main(int argc, const char *argv[]) {
      bitrow = pbm_allocrow(cols);
      
      /* Compute padding to round cols up to the nearest multiple of 16. */
@@ -448,9 +402,9 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtoybm.c.security netpbm-10.47.04/conve
      padright = ((cols + 15) / 16) * 16 - cols;
  
      putinit(cols, rows);
-diff -up netpbm-10.47.04/converter/pbm/pbmtozinc.c.security netpbm-10.47.04/converter/pbm/pbmtozinc.c
---- netpbm-10.47.04/converter/pbm/pbmtozinc.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pbmtozinc.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/pbm/pbmtozinc.c.security-code netpbm-10.58.01/converter/pbm/pbmtozinc.c
+--- netpbm-10.58.01/converter/pbm/pbmtozinc.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/converter/pbm/pbmtozinc.c	2012-04-09 15:40:03.197619863 +0200
 @@ -65,6 +65,7 @@ main(int argc, char * argv[]) {
      bitrow = pbm_allocrow( cols );
  
@@ -459,9 +413,41 @@ diff -up netpbm-10.47.04/converter/pbm/pbmtozinc.c.security netpbm-10.47.04/conv
      padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
  
      printf( "USHORT %s[] = {\n",name);
-diff -up netpbm-10.47.04/converter/pbm/pktopbm.c.security netpbm-10.47.04/converter/pbm/pktopbm.c
---- netpbm-10.47.04/converter/pbm/pktopbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/pktopbm.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/pbm/pbmto10x.c.security-code netpbm-10.58.01/converter/pbm/pbmto10x.c
+--- netpbm-10.58.01/converter/pbm/pbmto10x.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/converter/pbm/pbmto10x.c	2012-04-09 15:40:03.197619863 +0200
+@@ -162,7 +162,7 @@ main(int argc, char * argv[]) {
+         res_60x72();
+ 
+     pm_close(ifp);
+-    exit(0);
++    return 0;
+ }
+ 
+ 
+diff -up netpbm-10.58.01/converter/pbm/pbmto4425.c.security-code netpbm-10.58.01/converter/pbm/pbmto4425.c
+--- netpbm-10.58.01/converter/pbm/pbmto4425.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/converter/pbm/pbmto4425.c	2012-04-09 15:40:03.198619851 +0200
+@@ -2,6 +2,7 @@
+ 
+ #include "nstring.h"
+ #include "pbm.h"
++#include <string.h>
+ 
+ static char bit_table[2][3] = {
+ {1, 4, 0x10},
+@@ -160,7 +161,7 @@ main(int argc, char * argv[]) {
+     xres = vmap_width * 2;
+     yres = vmap_height * 3;
+ 
+-    vmap = malloc(vmap_width * vmap_height * sizeof(char));
++    vmap = malloc3(vmap_width, vmap_height, sizeof(char));
+     if(vmap == NULL)
+ 	{
+         pm_error( "Cannot allocate memory" );
+diff -up netpbm-10.58.01/converter/pbm/pktopbm.c.security-code netpbm-10.58.01/converter/pbm/pktopbm.c
+--- netpbm-10.58.01/converter/pbm/pktopbm.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/converter/pbm/pktopbm.c	2012-04-09 15:40:03.198619851 +0200
 @@ -277,6 +277,7 @@ main(int argc, char *argv[]) {
          if (flagbyte == 7) {            /* long form preamble */
              integer packetlength = get32() ;    /* character packet length */
@@ -470,10 +456,10 @@ diff -up netpbm-10.47.04/converter/pbm/pktopbm.c.security netpbm-10.47.04/conver
              endofpacket = packetlength + pktopbm_pkloc;
                  /* calculate end of packet */
              if ((car >= MAXPKCHAR) || !filename[car]) {
-diff -up netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security netpbm-10.47.04/converter/pbm/thinkjettopbm.l
---- netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/thinkjettopbm.l	2009-10-21 15:09:33.000000000 +0200
-@@ -107,7 +107,9 @@ DIG             [0-9]
+diff -up netpbm-10.58.01/converter/pbm/thinkjettopbm.l.security-code netpbm-10.58.01/converter/pbm/thinkjettopbm.l
+--- netpbm-10.58.01/converter/pbm/thinkjettopbm.l.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/converter/pbm/thinkjettopbm.l	2012-04-09 15:40:03.199619839 +0200
+@@ -114,7 +114,9 @@ DIG             [0-9]
  <RASTERMODE>\033\*b{DIG}+W  {
                              int l;
                              if (rowCount >= rowCapacity) {
@@ -483,7 +469,7 @@ diff -up netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security netpbm-10.47.04/
                                  rows = realloc (rows, rowCapacity * sizeof *rows);
                                  if (rows == NULL)
                                      pm_error ("Out of memory.");
-@@ -217,6 +219,8 @@ yywrap (void)
+@@ -226,6 +228,8 @@ yywrap (void)
      /*
       * Quite simple since ThinkJet bit arrangement matches PBM
       */
@@ -492,20 +478,20 @@ diff -up netpbm-10.47.04/converter/pbm/thinkjettopbm.l.security netpbm-10.47.04/
      pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0);
  
      packed_bitrow = malloc(maxRowLength);
-diff -up netpbm-10.47.04/converter/pbm/ybmtopbm.c.security netpbm-10.47.04/converter/pbm/ybmtopbm.c
---- netpbm-10.47.04/converter/pbm/ybmtopbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/pbm/ybmtopbm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -88,4 +88,5 @@ getinit( file, colsP, rowsP, depthP, pad
- 	pm_error("EOF / read error");
+diff -up netpbm-10.58.01/converter/pbm/ybmtopbm.c.security-code netpbm-10.58.01/converter/pbm/ybmtopbm.c
+--- netpbm-10.58.01/converter/pbm/ybmtopbm.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/converter/pbm/ybmtopbm.c	2012-04-09 15:40:03.199619839 +0200
+@@ -49,6 +49,7 @@ getinit(FILE *  const ifP,
+         pm_error("EOF / read error");
  
      *depthP = 1;
 +    overflow_add(*colsP, 15);
      *padrightP = ((*colsP + 15) / 16) * 16 - *colsP;
-}
-
-diff -up netpbm-10.47.04/converter/pgm/lispmtopgm.c.security netpbm-10.47.04/converter/pgm/lispmtopgm.c
---- netpbm-10.47.04/converter/pgm/lispmtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/pgm/lispmtopgm.c	2009-10-21 15:09:33.000000000 +0200
+ }
+ 
+diff -up netpbm-10.58.01/converter/pgm/lispmtopgm.c.security-code netpbm-10.58.01/converter/pgm/lispmtopgm.c
+--- netpbm-10.58.01/converter/pgm/lispmtopgm.c.security-code	2012-04-09 15:31:42.000000000 +0200
++++ netpbm-10.58.01/converter/pgm/lispmtopgm.c	2012-04-09 15:40:03.199619839 +0200
 @@ -58,6 +58,7 @@ main( argc, argv )
          pm_error( "depth (%d bits) is too large", depth);
  
@@ -525,9 +511,9 @@ diff -up netpbm-10.47.04/converter/pgm/lispmtopgm.c.security netpbm-10.47.04/con
      *padrightP = ( ( *colsP + 31 ) / 32 ) * 32 - *colsP;
      
      if ( *colsP != (cols_32 - *padrightP) ) {
-diff -up netpbm-10.47.04/converter/pgm/psidtopgm.c.security netpbm-10.47.04/converter/pgm/psidtopgm.c
---- netpbm-10.47.04/converter/pgm/psidtopgm.c.security	2009-10-21 13:39:06.000000000 +0200
-+++ netpbm-10.47.04/converter/pgm/psidtopgm.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/pgm/psidtopgm.c.security-code netpbm-10.58.01/converter/pgm/psidtopgm.c
+--- netpbm-10.58.01/converter/pgm/psidtopgm.c.security-code	2012-04-09 15:31:42.000000000 +0200
++++ netpbm-10.58.01/converter/pgm/psidtopgm.c	2012-04-09 15:40:03.200619827 +0200
 @@ -78,6 +78,7 @@ main(int     argc,
          pm_error("bits/sample (%d) is too large.", bitspersample);
  
@@ -536,10 +522,10 @@ diff -up netpbm-10.47.04/converter/pgm/psidtopgm.c.security netpbm-10.47.04/conv
      grayrow = pgm_allocrow((cols + 7) / 8 * 8);
      for (row = 0; row < rows; ++row) {
          unsigned int col;
-diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/converter/ppm/ilbmtoppm.c
---- netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ilbmtoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -594,6 +594,7 @@ decode_row(FILE *          const ifP,
+diff -up netpbm-10.58.01/converter/ppm/ilbmtoppm.c.security-code netpbm-10.58.01/converter/ppm/ilbmtoppm.c
+--- netpbm-10.58.01/converter/ppm/ilbmtoppm.c.security-code	2012-04-09 15:31:44.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/ilbmtoppm.c	2012-04-09 15:40:03.201619815 +0200
+@@ -592,6 +592,7 @@ decode_row(FILE *          const ifP,
      rawtype *chp;
  
      cols = bmhdP->w;
@@ -547,7 +533,7 @@ diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/conv
      bytes = RowBytes(cols);
      for( plane = 0; plane < nPlanes; plane++ ) {
          int mask;
-@@ -681,6 +682,23 @@ decode_mask(FILE *          const ifP,
+@@ -679,6 +680,23 @@ decode_mask(FILE *          const ifP,
   Multipalette handling
   ****************************************************************************/
  
@@ -571,7 +557,7 @@ diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/conv
  
  static void
  multi_adjust(cmap, row, palchange)
-@@ -1300,6 +1318,9 @@ dcol_to_ppm(FILE *         const ifP,
+@@ -1341,6 +1359,9 @@ dcol_to_ppm(FILE *         const ifP,
      if( redmaxval != maxval || greenmaxval != maxval || bluemaxval != maxval )
          pm_message("scaling colors to %d bits", pm_maxvaltobits(maxval));
      
@@ -581,7 +567,7 @@ diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/conv
      MALLOCARRAY_NOFAIL(redtable,   redmaxval   +1);
      MALLOCARRAY_NOFAIL(greentable, greenmaxval +1);
      MALLOCARRAY_NOFAIL(bluetable,  bluemaxval  +1);
-@@ -1729,7 +1750,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, data
+@@ -1763,7 +1784,9 @@ PCHG_ConvertSmall(PCHG, cmap, mask, data
              ChangeCount32 = *data++;
              datasize -= 2;
  
@@ -591,7 +577,7 @@ diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/conv
              for( i = 0; i < changes; i++ ) {
                  if( totalchanges >= PCHG->TotalChanges ) goto fail;
                  if( datasize < 2 ) goto fail;
-@@ -1994,6 +2017,9 @@ read_pchg(FILE *     const ifp,
+@@ -2028,6 +2051,9 @@ read_pchg(FILE *     const ifp,
              cmap->mp_change[i] = NULL;
          if( PCHG.StartLine < 0 ) {
              int nch;
@@ -601,7 +587,7 @@ diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/conv
              nch = PCHG.MaxReg - PCHG.MinReg +1;
              MALLOCARRAY_NOFAIL(cmap->mp_init, nch + 1);
              for( i = 0; i < nch; i++ )
-@@ -2070,6 +2096,7 @@ process_body( FILE *          const ifp,
+@@ -2104,6 +2130,7 @@ process_body( FILE *          const ifp,
      if( typeid == ID_ILBM ) {
          int isdeep;
  
@@ -609,9 +595,9 @@ diff -up netpbm-10.47.04/converter/ppm/ilbmtoppm.c.security netpbm-10.47.04/conv
          MALLOCARRAY_NOFAIL(ilbmrow, RowBytes(bmhdP->w));
          *viewportmodesP |= fakeviewport;      /* -isham/-isehb */
  
-diff -up netpbm-10.47.04/converter/ppm/imgtoppm.c.security netpbm-10.47.04/converter/ppm/imgtoppm.c
---- netpbm-10.47.04/converter/ppm/imgtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/imgtoppm.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/ppm/imgtoppm.c.security-code netpbm-10.58.01/converter/ppm/imgtoppm.c
+--- netpbm-10.58.01/converter/ppm/imgtoppm.c.security-code	2012-04-09 15:31:44.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/imgtoppm.c	2012-04-09 15:40:03.202619802 +0200
 @@ -84,6 +84,7 @@ main(int argc, char ** argv) {
              len = atoi((char*) buf );
              if ( fread( buf, len, 1, ifp ) != 1 )
@@ -628,9 +614,9 @@ diff -up netpbm-10.47.04/converter/ppm/imgtoppm.c.security netpbm-10.47.04/conve
              if ( len != cols * rows )
                  pm_message(
                      "pixel data length (%d) does not match image size (%d)",
-diff -up netpbm-10.47.04/converter/ppm/Makefile.security netpbm-10.47.04/converter/ppm/Makefile
---- netpbm-10.47.04/converter/ppm/Makefile.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/Makefile	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/ppm/Makefile.security-code netpbm-10.58.01/converter/ppm/Makefile
+--- netpbm-10.58.01/converter/ppm/Makefile.security-code	2012-04-09 15:31:44.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/Makefile	2012-04-09 15:40:03.202619802 +0200
 @@ -11,7 +11,7 @@ SUBDIRS = hpcdtoppm ppmtompeg
  
  PORTBINARIES =	411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
@@ -640,10 +626,10 @@ diff -up netpbm-10.47.04/converter/ppm/Makefile.security netpbm-10.47.04/convert
  		ppmtoacad ppmtoapplevol ppmtoarbtxt ppmtoascii \
  		ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \
  		ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \
-diff -up netpbm-10.47.04/converter/ppm/pcxtoppm.c.security netpbm-10.47.04/converter/ppm/pcxtoppm.c
---- netpbm-10.47.04/converter/ppm/pcxtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/pcxtoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -409,6 +409,7 @@ pcx_planes_to_pixels(pixels, bitplanes, 
+diff -up netpbm-10.58.01/converter/ppm/pcxtoppm.c.security-code netpbm-10.58.01/converter/ppm/pcxtoppm.c
+--- netpbm-10.58.01/converter/ppm/pcxtoppm.c.security-code	2012-04-09 15:31:44.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/pcxtoppm.c	2012-04-09 15:40:03.203619789 +0200
+@@ -409,6 +409,7 @@ pcx_planes_to_pixels(pixels, bitplanes,
      /*
       * clear the pixel buffer
       */
@@ -659,18 +645,18 @@ diff -up netpbm-10.47.04/converter/ppm/pcxtoppm.c.security netpbm-10.47.04/conve
      rawcols = BytesPerLine * 8 / BitsPerPixel;
      if (headerCols > rawcols) {
          pm_message("warning - BytesPerLine = %d, "
-diff -up netpbm-10.47.04/converter/ppm/picttoppm.c.security netpbm-10.47.04/converter/ppm/picttoppm.c
---- netpbm-10.47.04/converter/ppm/picttoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/picttoppm.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/ppm/picttoppm.c.security-code netpbm-10.58.01/converter/ppm/picttoppm.c
+--- netpbm-10.58.01/converter/ppm/picttoppm.c.security-code	2012-04-09 15:31:44.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/picttoppm.c	2012-04-09 15:40:03.205619763 +0200
 @@ -1,3 +1,5 @@
 +#error "Unfixable. Don't ship me"
 +
  /*
   * picttoppm.c -- convert a MacIntosh PICT file to PPM format.
   *
-diff -up netpbm-10.47.04/converter/ppm/pjtoppm.c.security netpbm-10.47.04/converter/ppm/pjtoppm.c
---- netpbm-10.47.04/converter/ppm/pjtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/pjtoppm.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/ppm/pjtoppm.c.security-code netpbm-10.58.01/converter/ppm/pjtoppm.c
+--- netpbm-10.58.01/converter/ppm/pjtoppm.c.security-code	2012-04-09 15:31:44.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/pjtoppm.c	2012-04-09 15:40:03.206619751 +0200
 @@ -127,19 +127,21 @@ main(argc, argv)
                  case 'V':   /* send plane */
                  case 'W':   /* send last plane */
@@ -720,9 +706,9 @@ diff -up netpbm-10.47.04/converter/ppm/pjtoppm.c.security netpbm-10.47.04/conver
          cols *= 8;
      }
              
-diff -up netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security netpbm-10.47.04/converter/ppm/ppmtoeyuv.c
---- netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtoeyuv.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/ppm/ppmtoeyuv.c.security-code netpbm-10.58.01/converter/ppm/ppmtoeyuv.c
+--- netpbm-10.58.01/converter/ppm/ppmtoeyuv.c.security-code	2012-04-09 15:31:42.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/ppmtoeyuv.c	2012-04-09 15:40:03.206619751 +0200
 @@ -114,6 +114,7 @@ create_multiplication_tables(const pixva
  
      int index;
@@ -731,9 +717,9 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtoeyuv.c.security netpbm-10.47.04/conv
      MALLOCARRAY_NOFAIL(mult299   , maxval+1);
      MALLOCARRAY_NOFAIL(mult587   , maxval+1);
      MALLOCARRAY_NOFAIL(mult114   , maxval+1);
-diff -up netpbm-10.47.04/converter/ppm/ppmtoicr.c.security netpbm-10.47.04/converter/ppm/ppmtoicr.c
---- netpbm-10.47.04/converter/ppm/ppmtoicr.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtoicr.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/ppm/ppmtoicr.c.security-code netpbm-10.58.01/converter/ppm/ppmtoicr.c
+--- netpbm-10.58.01/converter/ppm/ppmtoicr.c.security-code	2012-04-09 15:31:44.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/ppmtoicr.c	2012-04-09 15:40:03.207619739 +0200
 @@ -169,7 +169,7 @@ char* argv[];
  
  	if (rleflag) {	
@@ -743,10 +729,10 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtoicr.c.security netpbm-10.47.04/conve
  		p = testimage;
  		for (i=0; i<rows; i++)
  			for (j=0; j<cols; j++) 
-diff -up netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security netpbm-10.47.04/converter/ppm/ppmtoilbm.c
---- netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtoilbm.c	2009-10-21 15:47:50.000000000 +0200
-@@ -1214,6 +1214,7 @@ ppm_to_rgb8(ifP, cols, rows, maxval)
+diff -up netpbm-10.58.01/converter/ppm/ppmtoilbm.c.security-code netpbm-10.58.01/converter/ppm/ppmtoilbm.c
+--- netpbm-10.58.01/converter/ppm/ppmtoilbm.c.security-code	2012-04-09 15:31:42.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/ppmtoilbm.c	2012-04-09 15:40:03.208619727 +0200
+@@ -1220,6 +1220,7 @@ ppm_to_rgb8(ifP, cols, rows, maxval)
  
      maskmethod = 0;     /* no masking - RGB8 uses genlock bits */
      compmethod = 4;     /* RGB8 files are always compressed */
@@ -754,7 +740,7 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security netpbm-10.47.04/conv
      MALLOCARRAY_NOFAIL(compr_row, cols * 4);
  
      if( maxval != 255 ) {
-@@ -1302,6 +1303,7 @@ ppm_to_rgbn(ifP, cols, rows, maxval)
+@@ -1308,6 +1309,7 @@ ppm_to_rgbn(ifP, cols, rows, maxval)
  
      maskmethod = 0;     /* no masking - RGBN uses genlock bits */
      compmethod = 4;     /* RGBN files are always compressed */
@@ -762,7 +748,7 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security netpbm-10.47.04/conv
      MALLOCARRAY_NOFAIL(compr_row, cols * 2);
  
      if( maxval != 15 ) {
-@@ -1779,6 +1781,7 @@ make_val_table(oldmaxval, newmaxval)
+@@ -1785,6 +1787,7 @@ make_val_table(oldmaxval, newmaxval)
      unsigned int i;
      int * table;
  
@@ -770,7 +756,7 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security netpbm-10.47.04/conv
      MALLOCARRAY_NOFAIL(table, oldmaxval + 1);
      for (i = 0; i <= oldmaxval; ++i)
          table[i] = ROUNDDIV(i * newmaxval, oldmaxval);
-@@ -2283,8 +2286,11 @@ main(int argc, char ** argv) {
+@@ -2293,8 +2296,11 @@ main(int argc, char ** argv) {
          MALLOCARRAY_NOFAIL(coded_rowbuf, RowBytes(cols));
          for (i = 0; i < RowBytes(cols); ++i)
              coded_rowbuf[i] = 0;
@@ -783,9 +769,9 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtoilbm.c.security netpbm-10.47.04/conv
      }
      
      switch (mode) {
-diff -up netpbm-10.47.04/converter/ppm/ppmtolj.c.security netpbm-10.47.04/converter/ppm/ppmtolj.c
---- netpbm-10.47.04/converter/ppm/ppmtolj.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtolj.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/ppm/ppmtolj.c.security-code netpbm-10.58.01/converter/ppm/ppmtolj.c
+--- netpbm-10.58.01/converter/ppm/ppmtolj.c.security-code	2012-04-09 15:31:42.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/ppmtolj.c	2012-04-09 15:40:03.210619701 +0200
 @@ -181,7 +181,8 @@ int main(int argc, char *argv[]) {
  
      ppm_readppminit( ifp, &cols, &rows, &maxval, &format );
@@ -796,9 +782,9 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtolj.c.security netpbm-10.47.04/conver
      obuf = (unsigned char *) pm_allocrow(cols * 3, sizeof(unsigned char));
      cbuf = (unsigned char *) pm_allocrow(cols * 6, sizeof(unsigned char));
      if (mode == C_TRANS_MODE_DELTA)
-diff -up netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security netpbm-10.47.04/converter/ppm/ppmtomitsu.c
---- netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtomitsu.c	2009-10-21 15:48:30.000000000 +0200
+diff -up netpbm-10.58.01/converter/ppm/ppmtomitsu.c.security-code netpbm-10.58.01/converter/ppm/ppmtomitsu.c
+--- netpbm-10.58.01/converter/ppm/ppmtomitsu.c.security-code	2012-04-09 15:31:44.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/ppmtomitsu.c	2012-04-09 15:40:03.210619702 +0200
 @@ -685,6 +685,8 @@ main(int argc, char * argv[]) {
          medias = MSize_User;
  
@@ -808,9 +794,9 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtomitsu.c.security netpbm-10.47.04/con
          medias.maxcols *= 2;
          medias.maxrows *= 2;
      }
-diff -up netpbm-10.47.04/converter/ppm/ppmtopcx.c.security netpbm-10.47.04/converter/ppm/ppmtopcx.c
---- netpbm-10.47.04/converter/ppm/ppmtopcx.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtopcx.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/ppm/ppmtopcx.c.security-code netpbm-10.58.01/converter/ppm/ppmtopcx.c
+--- netpbm-10.58.01/converter/ppm/ppmtopcx.c.security-code	2012-04-09 15:31:44.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/ppmtopcx.c	2012-04-09 15:40:03.210619702 +0200
 @@ -419,6 +419,8 @@ ppmTo16ColorPcx(pixel **            cons
              else                   Planes = 1;
          }
@@ -820,21 +806,21 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtopcx.c.security netpbm-10.47.04/conve
      BytesPerLine = ((cols * BitsPerPixel) + 7) / 8;
      MALLOCARRAY_NOFAIL(indexRow, cols);
      MALLOCARRAY_NOFAIL(planesrow, BytesPerLine);
-diff -up netpbm-10.47.04/converter/ppm/ppmtopict.c.security netpbm-10.47.04/converter/ppm/ppmtopict.c
---- netpbm-10.47.04/converter/ppm/ppmtopict.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtopict.c	2009-10-21 15:09:33.000000000 +0200
-@@ -245,6 +245,8 @@ char *argv[];
-     putShort(stdout, 0);			/* mode */
+diff -up netpbm-10.58.01/converter/ppm/ppmtopict.c.security-code netpbm-10.58.01/converter/ppm/ppmtopict.c
+--- netpbm-10.58.01/converter/ppm/ppmtopict.c.security-code	2012-04-09 15:31:42.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/ppmtopict.c	2012-04-09 15:40:03.211619690 +0200
+@@ -441,6 +441,8 @@ main(int argc, const char ** argv) {
+     putShort(stdout, 0);            /* mode */
  
      /* Finally, write out the data. */
-+     overflow_add(cols/MAX_COUNT, 1);
-+     overflow_add(cols, cols/MAX_COUNT+1);
++    overflow_add(cols/MAX_COUNT, 1);
++    overflow_add(cols, cols/MAX_COUNT+1);
      packed = malloc((unsigned)(cols+cols/MAX_COUNT+1));
      for (row = 0, oc = 0; row < rows; row++)
          oc += putRow(stdout, row, cols, pixels[row], packed);
-diff -up netpbm-10.47.04/converter/ppm/ppmtopj.c.security netpbm-10.47.04/converter/ppm/ppmtopj.c
---- netpbm-10.47.04/converter/ppm/ppmtopj.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtopj.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/ppm/ppmtopj.c.security-code netpbm-10.58.01/converter/ppm/ppmtopj.c
+--- netpbm-10.58.01/converter/ppm/ppmtopj.c.security-code	2012-04-09 15:31:44.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/ppmtopj.c	2012-04-09 15:40:03.212619677 +0200
 @@ -179,6 +179,7 @@ char *argv[];
  	pixels = ppm_readppm( ifp, &cols, &rows, &maxval );
  
@@ -843,9 +829,9 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtopj.c.security netpbm-10.47.04/conver
  	obuf = (unsigned char *) pm_allocrow(cols, sizeof(unsigned char));
  	cbuf = (unsigned char *) pm_allocrow(cols * 2, sizeof(unsigned char));
  
-diff -up netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security netpbm-10.47.04/converter/ppm/ppmtopjxl.c
---- netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtopjxl.c	2009-10-21 15:43:31.000000000 +0200
+diff -up netpbm-10.58.01/converter/ppm/ppmtopjxl.c.security-code netpbm-10.58.01/converter/ppm/ppmtopjxl.c
+--- netpbm-10.58.01/converter/ppm/ppmtopjxl.c.security-code	2012-04-09 15:31:44.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/ppmtopjxl.c	2012-04-09 15:40:03.212619677 +0200
 @@ -276,6 +276,8 @@ main(int argc, const char * argv[]) {
          pm_error("image too large; reduce with ppmscale");
      if (maxval > PCL_MAXVAL)
@@ -878,9 +864,9 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtopjxl.c.security netpbm-10.47.04/conv
      inrow = (char *)malloc((unsigned)bpp);
      outrow = (char *)malloc((unsigned)bpp*2);
      runcnt = (signed char *)malloc((unsigned)bpp);
-diff -up netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security netpbm-10.47.04/converter/ppm/ppmtowinicon.c
---- netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtowinicon.c	2009-10-21 15:44:54.000000000 +0200
+diff -up netpbm-10.58.01/converter/ppm/ppmtowinicon.c.security-code netpbm-10.58.01/converter/ppm/ppmtowinicon.c
+--- netpbm-10.58.01/converter/ppm/ppmtowinicon.c.security-code	2012-04-09 15:31:44.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/ppmtowinicon.c	2012-04-09 15:40:03.213619664 +0200
 @@ -12,6 +12,7 @@
  
  #include <math.h>
@@ -924,10 +910,10 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtowinicon.c.security netpbm-10.47.04/c
      entry->size_in_bytes = 
          xorBitmap->size + andBitmap->size + 40 + (4 * entry->color_count);
      if (verbose) 
-diff -up netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security netpbm-10.47.04/converter/ppm/ppmtoxpm.c
---- netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ppmtoxpm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -197,6 +197,7 @@ genNumstr(unsigned int const input, int 
+diff -up netpbm-10.58.01/converter/ppm/ppmtoxpm.c.security-code netpbm-10.58.01/converter/ppm/ppmtoxpm.c
+--- netpbm-10.58.01/converter/ppm/ppmtoxpm.c.security-code	2012-04-09 15:31:44.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/ppmtoxpm.c	2012-04-09 15:40:03.214619651 +0200
+@@ -197,6 +197,7 @@ genNumstr(unsigned int const input, int
      unsigned int i;
  
      /* Allocate memory for printed number.  Abort if error. */
@@ -935,7 +921,7 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security netpbm-10.47.04/conve
      if (!(str = (char *) malloc(digits + 1)))
          pm_error("out of memory");
  
-@@ -314,6 +315,7 @@ genCmap(colorhist_vector const chv, 
+@@ -314,6 +315,7 @@ genCmap(colorhist_vector const chv,
      unsigned int charsPerPixel;
      unsigned int xpmMaxval;
      
@@ -943,9 +929,9 @@ diff -up netpbm-10.47.04/converter/ppm/ppmtoxpm.c.security netpbm-10.47.04/conve
      MALLOCARRAY(cmap, cmapSize);
      if (cmapP == NULL)
          pm_error("Out of memory allocating %u bytes for a color map.",
-diff -up netpbm-10.47.04/converter/ppm/qrttoppm.c.security netpbm-10.47.04/converter/ppm/qrttoppm.c
---- netpbm-10.47.04/converter/ppm/qrttoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/qrttoppm.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/ppm/qrttoppm.c.security-code netpbm-10.58.01/converter/ppm/qrttoppm.c
+--- netpbm-10.58.01/converter/ppm/qrttoppm.c.security-code	2012-04-09 15:31:42.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/qrttoppm.c	2012-04-09 15:40:03.215619638 +0200
 @@ -46,7 +46,7 @@ main( argc, argv )
  
      ppm_writeppminit( stdout, cols, rows, maxval, 0 );
@@ -955,9 +941,9 @@ diff -up netpbm-10.47.04/converter/ppm/qrttoppm.c.security netpbm-10.47.04/conve
      if ( buf == (unsigned char *) 0 )
  	pm_error( "out of memory" );
  
-diff -up netpbm-10.47.04/converter/ppm/sldtoppm.c.security netpbm-10.47.04/converter/ppm/sldtoppm.c
---- netpbm-10.47.04/converter/ppm/sldtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/sldtoppm.c	2009-10-21 15:44:11.000000000 +0200
+diff -up netpbm-10.58.01/converter/ppm/sldtoppm.c.security-code netpbm-10.58.01/converter/ppm/sldtoppm.c
+--- netpbm-10.58.01/converter/ppm/sldtoppm.c.security-code	2012-04-09 15:31:44.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/sldtoppm.c	2012-04-09 15:40:03.216619626 +0200
 @@ -455,6 +455,8 @@ slider(slvecfn   slvec,
      
      /* Allocate image buffer and clear it to black. */
@@ -967,9 +953,9 @@ diff -up netpbm-10.47.04/converter/ppm/sldtoppm.c.security netpbm-10.47.04/conve
      pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1);
      PPM_ASSIGN(rgbcolor, 0, 0, 0);
      ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0,
-diff -up netpbm-10.47.04/converter/ppm/ximtoppm.c.security netpbm-10.47.04/converter/ppm/ximtoppm.c
---- netpbm-10.47.04/converter/ppm/ximtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/ximtoppm.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/ppm/ximtoppm.c.security-code netpbm-10.58.01/converter/ppm/ximtoppm.c
+--- netpbm-10.58.01/converter/ppm/ximtoppm.c.security-code	2012-04-09 15:31:44.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/ximtoppm.c	2012-04-09 15:40:03.216619626 +0200
 @@ -117,6 +117,7 @@ ReadXimHeader(FILE *     const in_fp,
      header->bits_channel = atoi(a_head.bits_per_channel);
      header->alpha_flag = atoi(a_head.alpha_channel);
@@ -1002,20 +988,9 @@ diff -up netpbm-10.47.04/converter/ppm/ximtoppm.c.security netpbm-10.47.04/conve
          header->colors = (Color *)calloc((unsigned int)header->ncolors,
                  sizeof(Color));
          if (header->colors == NULL) {
-diff -up netpbm-10.47.04/converter/ppm/xpmtoppm.c.security netpbm-10.47.04/converter/ppm/xpmtoppm.c
---- netpbm-10.47.04/converter/ppm/xpmtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/xpmtoppm.c	2009-10-21 15:09:33.000000000 +0200
-@@ -701,6 +701,7 @@ ReadXPMFile(FILE * const stream, int * c
-                        &ncolors, colorsP, &ptab);
-         *transparentP = -1;  /* No transparency in version 1 */
-     }
-+    overflow2(*widthP, *heightP);
-     totalpixels = *widthP * *heightP;
-     MALLOCARRAY(*dataP, totalpixels);
-     if (*dataP == NULL)
-diff -up netpbm-10.47.04/converter/ppm/yuvtoppm.c.security netpbm-10.47.04/converter/ppm/yuvtoppm.c
---- netpbm-10.47.04/converter/ppm/yuvtoppm.c.security	2009-10-21 13:39:10.000000000 +0200
-+++ netpbm-10.47.04/converter/ppm/yuvtoppm.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/converter/ppm/yuvtoppm.c.security-code netpbm-10.58.01/converter/ppm/yuvtoppm.c
+--- netpbm-10.58.01/converter/ppm/yuvtoppm.c.security-code	2012-04-09 15:31:44.000000000 +0200
++++ netpbm-10.58.01/converter/ppm/yuvtoppm.c	2012-04-09 15:40:03.218619602 +0200
 @@ -72,6 +72,7 @@ main(argc, argv)
  
  	ppm_writeppminit(stdout, cols, rows, (pixval) 255, 0);
@@ -1024,9 +999,9 @@ diff -up netpbm-10.47.04/converter/ppm/yuvtoppm.c.security netpbm-10.47.04/conve
      MALLOCARRAY(yuvbuf, (cols+1)/2);
      if (yuvbuf == NULL)
          pm_error("Unable to allocate YUV buffer for %d columns.", cols);
-diff -up netpbm-10.47.04/editor/pamcut.c.security netpbm-10.47.04/editor/pamcut.c
---- netpbm-10.47.04/editor/pamcut.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pamcut.c	2009-10-21 15:29:36.000000000 +0200
+diff -up netpbm-10.58.01/editor/pamcut.c.security-code netpbm-10.58.01/editor/pamcut.c
+--- netpbm-10.58.01/editor/pamcut.c.security-code	2012-04-09 15:31:33.000000000 +0200
++++ netpbm-10.58.01/editor/pamcut.c	2012-04-09 15:40:03.218619602 +0200
 @@ -655,6 +655,8 @@ cutOneImage(FILE *             const ifP
  
      outpam = inpam;    /* Initial value -- most fields should be same */
@@ -1036,9 +1011,9 @@ diff -up netpbm-10.47.04/editor/pamcut.c.security netpbm-10.47.04/editor/pamcut.
      outpam.width  = rightcol - leftcol + 1;
      outpam.height = bottomrow - toprow + 1;
  
-diff -up netpbm-10.47.04/editor/pbmreduce.c.security netpbm-10.47.04/editor/pbmreduce.c
---- netpbm-10.47.04/editor/pbmreduce.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pbmreduce.c	2009-10-21 15:26:13.000000000 +0200
+diff -up netpbm-10.58.01/editor/pbmreduce.c.security-code netpbm-10.58.01/editor/pbmreduce.c
+--- netpbm-10.58.01/editor/pbmreduce.c.security-code	2012-04-09 15:31:33.000000000 +0200
++++ netpbm-10.58.01/editor/pbmreduce.c	2012-04-09 15:40:03.219619590 +0200
 @@ -94,6 +94,7 @@ main( argc, argv )
      if (halftone == QT_FS) {
          unsigned int col;
@@ -1047,10 +1022,10 @@ diff -up netpbm-10.47.04/editor/pbmreduce.c.security netpbm-10.47.04/editor/pbmr
          MALLOCARRAY(thiserr, newcols + 2);
          MALLOCARRAY(nexterr, newcols + 2);
          if (thiserr == NULL || nexterr == NULL)
-diff -up netpbm-10.47.04/editor/pnmgamma.c.security netpbm-10.47.04/editor/pnmgamma.c
---- netpbm-10.47.04/editor/pnmgamma.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmgamma.c	2009-10-21 15:09:34.000000000 +0200
-@@ -586,6 +586,7 @@ createGammaTables(enum transferFunction 
+diff -up netpbm-10.58.01/editor/pnmgamma.c.security-code netpbm-10.58.01/editor/pnmgamma.c
+--- netpbm-10.58.01/editor/pnmgamma.c.security-code	2012-04-09 15:31:34.000000000 +0200
++++ netpbm-10.58.01/editor/pnmgamma.c	2012-04-09 15:40:03.220619577 +0200
+@@ -586,6 +586,7 @@ createGammaTables(enum transferFunction
                    xelval **             const btableP) {
  
      /* Allocate space for the tables. */
@@ -1058,9 +1033,9 @@ diff -up netpbm-10.47.04/editor/pnmgamma.c.security netpbm-10.47.04/editor/pnmga
      MALLOCARRAY(*rtableP, maxval+1);
      MALLOCARRAY(*gtableP, maxval+1);
      MALLOCARRAY(*btableP, maxval+1);
-diff -up netpbm-10.47.04/editor/pnmhisteq.c.security netpbm-10.47.04/editor/pnmhisteq.c
---- netpbm-10.47.04/editor/pnmhisteq.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmhisteq.c	2009-10-21 15:09:34.000000000 +0200
+diff -up netpbm-10.58.01/editor/pnmhisteq.c.security-code netpbm-10.58.01/editor/pnmhisteq.c
+--- netpbm-10.58.01/editor/pnmhisteq.c.security-code	2012-04-09 15:31:33.000000000 +0200
++++ netpbm-10.58.01/editor/pnmhisteq.c	2012-04-09 15:40:03.220619577 +0200
 @@ -103,6 +103,7 @@ computeLuminosityHistogram(xel * const *
      unsigned int pixelCount;
      unsigned int * lumahist;
@@ -1069,9 +1044,9 @@ diff -up netpbm-10.47.04/editor/pnmhisteq.c.security netpbm-10.47.04/editor/pnmh
      MALLOCARRAY(lumahist, maxval + 1);
      if (lumahist == NULL)
          pm_error("Out of storage allocating array for %u histogram elements",
-diff -up netpbm-10.47.04/editor/pnmindex.csh.security netpbm-10.47.04/editor/pnmindex.csh
---- netpbm-10.47.04/editor/pnmindex.csh.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmindex.csh	2009-10-21 15:09:34.000000000 +0200
+diff -up netpbm-10.58.01/editor/pnmindex.csh.security-code netpbm-10.58.01/editor/pnmindex.csh
+--- netpbm-10.58.01/editor/pnmindex.csh.security-code	2012-04-09 15:31:33.000000000 +0200
++++ netpbm-10.58.01/editor/pnmindex.csh	2012-04-09 15:40:03.221619564 +0200
 @@ -1,5 +1,8 @@
  #!/bin/csh -f
  #
@@ -1081,9 +1056,9 @@ diff -up netpbm-10.47.04/editor/pnmindex.csh.security netpbm-10.47.04/editor/pnm
  # pnmindex - build a visual index of a bunch of anymaps
  #
  # Copyright (C) 1991 by Jef Poskanzer.
-diff -up netpbm-10.47.04/editor/pnmpad.c.security netpbm-10.47.04/editor/pnmpad.c
---- netpbm-10.47.04/editor/pnmpad.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmpad.c	2009-10-21 15:33:51.000000000 +0200
+diff -up netpbm-10.58.01/editor/pnmpad.c.security-code netpbm-10.58.01/editor/pnmpad.c
+--- netpbm-10.58.01/editor/pnmpad.c.security-code	2012-04-09 15:31:34.000000000 +0200
++++ netpbm-10.58.01/editor/pnmpad.c	2012-04-09 15:40:03.221619564 +0200
 @@ -527,6 +527,8 @@ main(int argc, const char ** argv) {
  
      computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad);
@@ -1093,11 +1068,10 @@ diff -up netpbm-10.47.04/editor/pnmpad.c.security netpbm-10.47.04/editor/pnmpad.
      newcols = cols + lpad + rpad;
  
      if (PNM_FORMAT_TYPE(format) == PBM_TYPE)
-diff -up netpbm-10.47.04/editor/pnmpaste.c.security netpbm-10.47.04/editor/pnmpaste.c
-diff -up netpbm-10.47.04/editor/pnmremap.c.security netpbm-10.47.04/editor/pnmremap.c
---- netpbm-10.47.04/editor/pnmremap.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmremap.c	2009-10-21 15:28:20.000000000 +0200
-@@ -408,7 +408,7 @@ initFserr(struct pam *   const pamP,
+diff -up netpbm-10.58.01/editor/pnmremap.c.security-code netpbm-10.58.01/editor/pnmremap.c
+--- netpbm-10.58.01/editor/pnmremap.c.security-code	2012-04-09 15:31:33.000000000 +0200
++++ netpbm-10.58.01/editor/pnmremap.c	2012-04-09 15:40:03.222619551 +0200
+@@ -409,7 +409,7 @@ initFserr(struct pam *   const pamP,
      unsigned int plane;
  
      unsigned int const fserrSize = pamP->width + 2;
@@ -1106,7 +1080,7 @@ diff -up netpbm-10.47.04/editor/pnmremap.c.security netpbm-10.47.04/editor/pnmre
      fserrP->width = pamP->width;
  
      MALLOCARRAY(fserrP->thiserr, pamP->depth);
-@@ -444,6 +444,7 @@ floydInitRow(struct pam * const pamP, st
+@@ -445,6 +445,7 @@ floydInitRow(struct pam * const pamP, st
  
      int col;
      
@@ -1114,10 +1088,10 @@ diff -up netpbm-10.47.04/editor/pnmremap.c.security netpbm-10.47.04/editor/pnmre
      for (col = 0; col < pamP->width + 2; ++col) {
          unsigned int plane;
          for (plane = 0; plane < pamP->depth; ++plane) 
-diff -up netpbm-10.47.04/editor/pnmscalefixed.c.security netpbm-10.47.04/editor/pnmscalefixed.c
---- netpbm-10.47.04/editor/pnmscalefixed.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmscalefixed.c	2009-10-21 15:09:34.000000000 +0200
-@@ -211,6 +211,8 @@ compute_output_dimensions(const struct c
+diff -up netpbm-10.58.01/editor/pnmscalefixed.c.security-code netpbm-10.58.01/editor/pnmscalefixed.c
+--- netpbm-10.58.01/editor/pnmscalefixed.c.security-code	2012-04-09 15:31:34.000000000 +0200
++++ netpbm-10.58.01/editor/pnmscalefixed.c	2012-04-09 15:40:03.223619538 +0200
+@@ -214,6 +214,8 @@ compute_output_dimensions(const struct c
                            const int rows, const int cols,
                            int * newrowsP, int * newcolsP) {
  
@@ -1126,7 +1100,7 @@ diff -up netpbm-10.47.04/editor/pnmscalefixed.c.security netpbm-10.47.04/editor/
      if (cmdline.pixels) {
          if (rows * cols <= cmdline.pixels) {
              *newrowsP = rows;
-@@ -262,6 +264,8 @@ compute_output_dimensions(const struct c
+@@ -265,6 +267,8 @@ compute_output_dimensions(const struct c
  
      if (*newcolsP < 1) *newcolsP = 1;
      if (*newrowsP < 1) *newrowsP = 1;
@@ -1135,7 +1109,7 @@ diff -up netpbm-10.47.04/editor/pnmscalefixed.c.security netpbm-10.47.04/editor/
  }        
  
  
-@@ -443,6 +447,9 @@ main(int argc, char **argv ) {
+@@ -446,6 +450,9 @@ main(int argc, char **argv ) {
         unfilled.  We can address that by stretching, whereas the other
         case would require throwing away some of the input.
      */
@@ -1145,9 +1119,9 @@ diff -up netpbm-10.47.04/editor/pnmscalefixed.c.security netpbm-10.47.04/editor/
      sxscale = SCALE * newcols / cols;
      syscale = SCALE * newrows / rows;
  
-diff -up netpbm-10.47.04/editor/pnmshear.c.security netpbm-10.47.04/editor/pnmshear.c
---- netpbm-10.47.04/editor/pnmshear.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/editor/pnmshear.c	2009-10-21 15:31:26.000000000 +0200
+diff -up netpbm-10.58.01/editor/pnmshear.c.security-code netpbm-10.58.01/editor/pnmshear.c
+--- netpbm-10.58.01/editor/pnmshear.c.security-code	2012-04-09 15:31:33.000000000 +0200
++++ netpbm-10.58.01/editor/pnmshear.c	2012-04-09 15:40:03.224619526 +0200
 @@ -15,6 +15,7 @@
  #include <assert.h>
  #include <math.h>
@@ -1168,9 +1142,25 @@ diff -up netpbm-10.47.04/editor/pnmshear.c.security netpbm-10.47.04/editor/pnmsh
      newcols = rows * shearfac + cols + 0.999999;
  
      pnm_writepnminit(stdout, newcols, rows, newmaxval, newformat, 0);
-diff -up netpbm-10.47.04/editor/specialty/pamoil.c.security netpbm-10.47.04/editor/specialty/pamoil.c
---- netpbm-10.47.04/editor/specialty/pamoil.c.security	2009-10-21 13:38:56.000000000 +0200
-+++ netpbm-10.47.04/editor/specialty/pamoil.c	2009-10-21 15:09:33.000000000 +0200
+diff -up netpbm-10.58.01/editor/ppmdither.c.security-code netpbm-10.58.01/editor/ppmdither.c
+--- netpbm-10.58.01/editor/ppmdither.c.security-code	2012-04-09 15:31:33.000000000 +0200
++++ netpbm-10.58.01/editor/ppmdither.c	2012-04-09 15:40:03.224619526 +0200
+@@ -355,7 +355,11 @@ dithMatrix(unsigned int const dithPower)
+         unsigned int const dithMatSize = 
+             (dithDim * sizeof(*dithMat)) + /* pointers */
+             (dithDim * dithDim * sizeof(**dithMat)); /* data */
+-        
++
++        overflow2(dithDim, sizeof(*dithMat));
++        overflow3(dithDim, dithDim, sizeof(**dithMat));
++        overflow_add(dithDim * sizeof(*dithMat), dithDim * dithDim * sizeof(**dithMat));
++
+         dithMat = malloc(dithMatSize);
+         
+         if (dithMat == NULL) 
+diff -up netpbm-10.58.01/editor/specialty/pamoil.c.security-code netpbm-10.58.01/editor/specialty/pamoil.c
+--- netpbm-10.58.01/editor/specialty/pamoil.c.security-code	2012-04-09 15:31:33.000000000 +0200
++++ netpbm-10.58.01/editor/specialty/pamoil.c	2012-04-09 15:40:03.224619526 +0200
 @@ -112,6 +112,7 @@ main(int argc, char *argv[] ) {
      tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type));
      pm_close(ifp);
@@ -1179,9 +1169,9 @@ diff -up netpbm-10.47.04/editor/specialty/pamoil.c.security netpbm-10.47.04/edit
      MALLOCARRAY(hist, inpam.maxval + 1);
      if (hist == NULL)
          pm_error("Unable to allocate memory for histogram.");
-diff -up netpbm-10.47.04/generator/pbmtext.c.security netpbm-10.47.04/generator/pbmtext.c
---- netpbm-10.47.04/generator/pbmtext.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/generator/pbmtext.c	2009-10-21 15:23:15.000000000 +0200
+diff -up netpbm-10.58.01/generator/pbmtext.c.security-code netpbm-10.58.01/generator/pbmtext.c
+--- netpbm-10.58.01/generator/pbmtext.c.security-code	2012-04-09 15:31:34.000000000 +0200
++++ netpbm-10.58.01/generator/pbmtext.c	2012-04-09 15:40:03.225619514 +0200
 @@ -96,12 +96,14 @@ parseCommandLine(int argc, const char **
          
          for (i = 1; i < argc; ++i) {
@@ -1197,15 +1187,15 @@ diff -up netpbm-10.47.04/generator/pbmtext.c.security netpbm-10.47.04/generator/
              totaltextsize += strlen(argv[i]);
              text = realloc(text, totaltextsize);
              if (text == NULL)
-@@ -711,6 +713,7 @@ getText(const char          cmdline_text
+@@ -712,6 +714,7 @@ getText(const char          cmdline_text
                  pm_error("A line of input text is longer than %u characters."
-                          "Cannot process.", sizeof(buf)-1);
+                          "Cannot process.", (unsigned)sizeof(buf)-1);
              if (lineCount >= maxlines) {
-+                overflow2(maxlines, 2);
++		overflow2(maxlines, 2);
                  maxlines *= 2;
                  REALLOCARRAY(text_array, maxlines);
                  if (text_array == NULL)
-@@ -831,6 +834,7 @@ main(int argc, const char *argv[]) {
+@@ -832,6 +835,7 @@ main(int argc, const char *argv[]) {
              hmargin = fontP->maxwidth;
          } else {
              vmargin = fontP->maxheight;
@@ -1213,9 +1203,9 @@ diff -up netpbm-10.47.04/generator/pbmtext.c.security netpbm-10.47.04/generator/
              hmargin = 2 * fontP->maxwidth;
          }
      }
-diff -up netpbm-10.47.04/generator/pgmcrater.c.security netpbm-10.47.04/generator/pgmcrater.c
---- netpbm-10.47.04/generator/pgmcrater.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/generator/pgmcrater.c	2009-10-21 15:09:34.000000000 +0200
+diff -up netpbm-10.58.01/generator/pgmcrater.c.security-code netpbm-10.58.01/generator/pgmcrater.c
+--- netpbm-10.58.01/generator/pgmcrater.c.security-code	2012-04-09 15:31:34.000000000 +0200
++++ netpbm-10.58.01/generator/pgmcrater.c	2012-04-09 15:40:03.226619502 +0200
 @@ -130,7 +130,7 @@ static void gencraters()
      /* Acquire the elevation array and initialize it to mean
         surface elevation. */
@@ -1225,9 +1215,9 @@ diff -up netpbm-10.47.04/generator/pgmcrater.c.security netpbm-10.47.04/generato
      if (aux == NULL) 
          pm_error("out of memory allocating elevation array");
  
-diff -up netpbm-10.47.04/generator/pgmkernel.c.security netpbm-10.47.04/generator/pgmkernel.c
---- netpbm-10.47.04/generator/pgmkernel.c.security	2009-10-21 13:38:57.000000000 +0200
-+++ netpbm-10.47.04/generator/pgmkernel.c	2009-10-21 15:09:34.000000000 +0200
+diff -up netpbm-10.58.01/generator/pgmkernel.c.security-code netpbm-10.58.01/generator/pgmkernel.c
+--- netpbm-10.58.01/generator/pgmkernel.c.security-code	2012-04-09 15:31:34.000000000 +0200
++++ netpbm-10.58.01/generator/pgmkernel.c	2012-04-09 15:40:03.226619502 +0200
 @@ -68,7 +68,7 @@ main ( argc, argv )
      kycenter = (fysize - 1) / 2.0;
      ixsize = fxsize + 0.999;
@@ -1237,22 +1227,22 @@ diff -up netpbm-10.47.04/generator/pgmkernel.c.security netpbm-10.47.04/generato
      for (i = 0; i < iysize; i++) 
          for (j = 0; j < ixsize; j++) {
              fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double)
-diff -up netpbm-10.47.04/lib/libpam.c.security netpbm-10.47.04/lib/libpam.c
---- netpbm-10.47.04/lib/libpam.c.security	2009-10-21 13:39:00.000000000 +0200
-+++ netpbm-10.47.04/lib/libpam.c	2009-10-21 15:09:34.000000000 +0200
-@@ -235,7 +235,8 @@ allocPamRow(const struct pam * const pam
-     int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample);
+diff -up netpbm-10.58.01/lib/libpam.c.security-code netpbm-10.58.01/lib/libpam.c
+--- netpbm-10.58.01/lib/libpam.c.security-code	2012-04-09 15:31:38.000000000 +0200
++++ netpbm-10.58.01/lib/libpam.c	2012-04-09 15:40:03.227619490 +0200
+@@ -220,7 +220,8 @@ allocPamRow(const struct pam * const pam
+     unsigned int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample);
      tuple * tuplerow;
  
 -    tuplerow = malloc(pamP->width * (sizeof(tuple *) + bytesPerTuple));
 +    overflow_add(sizeof(tuple *), bytesPerTuple);
-+    tuplerow = malloc2(pamP->width, sizeof(tuple *) + bytesPerTuple);
++    tuplerow = malloc2(pamP->width, (sizeof(tuple *) + bytesPerTuple));
                        
      if (tuplerow != NULL) {
          /* Now we initialize the pointers to the individual tuples
-diff -up netpbm-10.47.04/lib/libpammap.c.security netpbm-10.47.04/lib/libpammap.c
---- netpbm-10.47.04/lib/libpammap.c.security	2009-10-21 13:39:00.000000000 +0200
-+++ netpbm-10.47.04/lib/libpammap.c	2009-10-21 15:09:34.000000000 +0200
+diff -up netpbm-10.58.01/lib/libpammap.c.security-code netpbm-10.58.01/lib/libpammap.c
+--- netpbm-10.58.01/lib/libpammap.c.security-code	2012-04-09 15:31:38.000000000 +0200
++++ netpbm-10.58.01/lib/libpammap.c	2012-04-09 15:40:03.228619477 +0200
 @@ -104,6 +104,8 @@ allocTupleIntListItem(struct pam * const
      */
      struct tupleint_list_item * retval;
@@ -1262,9 +1252,9 @@ diff -up netpbm-10.47.04/lib/libpammap.c.security netpbm-10.47.04/lib/libpammap.
      unsigned int const size = 
          sizeof(*retval) - sizeof(retval->tupleint.tuple) 
          + pamP->depth * sizeof(sample);
-diff -up netpbm-10.47.04/lib/libpbm1.c.security netpbm-10.47.04/lib/libpbm1.c
---- netpbm-10.47.04/lib/libpbm1.c.security	2009-10-21 13:39:00.000000000 +0200
-+++ netpbm-10.47.04/lib/libpbm1.c	2009-10-21 15:09:34.000000000 +0200
+diff -up netpbm-10.58.01/lib/libpbm1.c.security-code netpbm-10.58.01/lib/libpbm1.c
+--- netpbm-10.58.01/lib/libpbm1.c.security-code	2012-04-09 15:31:38.000000000 +0200
++++ netpbm-10.58.01/lib/libpbm1.c	2012-04-09 15:40:03.228619477 +0200
 @@ -77,6 +77,7 @@ pbm_check(FILE * file, const enum pm_che
          pm_message("pm_filepos passed to pm_check() is %u bytes",
                     sizeof(pm_filepos));
@@ -1273,9 +1263,10 @@ diff -up netpbm-10.47.04/lib/libpbm1.c.security netpbm-10.47.04/lib/libpbm1.c
          pm_check(file, check_type, need_raster_size, retval_p);
      }
  }
---- netpbm-10.47.04/lib/libpm.c.security	2009-10-21 13:39:00.000000000 +0200
-+++ netpbm-10.47.04/lib/libpm.c	2009-10-21 15:09:34.000000000 +0200
-@@ -827,4 +827,53 @@ pm_parse_height(const char * const arg) 
+diff -up netpbm-10.58.01/lib/libpm.c.security-code netpbm-10.58.01/lib/libpm.c
+--- netpbm-10.58.01/lib/libpm.c.security-code	2012-04-09 15:31:38.000000000 +0200
++++ netpbm-10.58.01/lib/libpm.c	2012-04-09 15:40:03.229619464 +0200
+@@ -808,4 +808,53 @@ pm_parse_height(const char * const arg)
  }
  
  
@@ -1329,10 +1320,10 @@ diff -up netpbm-10.47.04/lib/libpbm1.c.security netpbm-10.47.04/lib/libpbm1.c
 +	return realloc(a, b*c);
 +}
  
-diff -up netpbm-10.47.04/lib/pm.h.security netpbm-10.47.04/lib/pm.h
---- netpbm-10.47.04/lib/pm.h.security	2009-10-21 13:39:00.000000000 +0200
-+++ netpbm-10.47.04/lib/pm.h	2009-10-21 15:09:34.000000000 +0200
-@@ -377,4 +377,11 @@ pm_parse_height(const char * const arg);
+diff -up netpbm-10.58.01/lib/pm.h.security-code netpbm-10.58.01/lib/pm.h
+--- netpbm-10.58.01/lib/pm.h.security-code	2012-04-09 15:31:38.000000000 +0200
++++ netpbm-10.58.01/lib/pm.h	2012-04-09 15:40:03.229619464 +0200
+@@ -432,4 +432,11 @@ pm_parse_height(const char * const arg);
  #endif
  
  
@@ -1344,9 +1335,9 @@ diff -up netpbm-10.47.04/lib/pm.h.security netpbm-10.47.04/lib/pm.h
 +void overflow_add(int, int);
 +
  #endif
-diff -up netpbm-10.47.04/other/pnmcolormap.c.security netpbm-10.47.04/other/pnmcolormap.c
---- netpbm-10.47.04/other/pnmcolormap.c.security	2009-10-21 13:38:54.000000000 +0200
-+++ netpbm-10.47.04/other/pnmcolormap.c	2009-10-21 15:09:34.000000000 +0200
+diff -up netpbm-10.58.01/other/pnmcolormap.c.security-code netpbm-10.58.01/other/pnmcolormap.c
+--- netpbm-10.58.01/other/pnmcolormap.c.security-code	2012-04-09 15:31:32.000000000 +0200
++++ netpbm-10.58.01/other/pnmcolormap.c	2012-04-09 15:40:03.230619451 +0200
 @@ -840,6 +840,7 @@ colormapToSquare(struct pam * const pamP
              pamP->width = intsqrt;
          else 
@@ -1355,9 +1346,21 @@ diff -up netpbm-10.47.04/other/pnmcolormap.c.security netpbm-10.47.04/other/pnmc
      }
      {
          unsigned int const intQuotient = colormap.size / pamP->width;
-diff -up netpbm-10.47.04/urt/rle_addhist.c.security netpbm-10.47.04/urt/rle_addhist.c
---- netpbm-10.47.04/urt/rle_addhist.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/rle_addhist.c	2009-10-21 15:09:34.000000000 +0200
+diff -up netpbm-10.58.01/urt/README.security-code netpbm-10.58.01/urt/README
+--- netpbm-10.58.01/urt/README.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/urt/README	2012-04-09 15:40:03.231619438 +0200
+@@ -18,3 +18,8 @@ in its initializer in the original.  But
+ defines stdout as a variable, so that wouldn't compile.  So I changed
+ it to NULL and added a line to rle_hdr_init to set that field to
+ 'stdout' dynamically.  2000.06.02 BJH.
++
++Redid the code to check for maths overflows and other crawly horrors.
++Removed pipe through and compress support (unsafe)
++
++Alan Cox <alan@redhat.com>
+diff -up netpbm-10.58.01/urt/rle_addhist.c.security-code netpbm-10.58.01/urt/rle_addhist.c
+--- netpbm-10.58.01/urt/rle_addhist.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/urt/rle_addhist.c	2012-04-09 15:40:03.231619438 +0200
 @@ -14,6 +14,8 @@
   * If you modify this software, you should include a notice giving the
   * name of the person performing the modification, the date of modification,
@@ -1367,7 +1370,7 @@ diff -up netpbm-10.47.04/urt/rle_addhist.c.security netpbm-10.47.04/urt/rle_addh
   */
  /* 
   * rle_addhist.c - Add to the HISTORY comment in header
-@@ -76,13 +78,19 @@ rle_addhist(char *          argv[],
+@@ -71,13 +73,19 @@ rle_addhist(char *          argv[],
          return;
      
      length = 0;
@@ -1388,7 +1391,7 @@ diff -up netpbm-10.47.04/urt/rle_addhist.c.security netpbm-10.47.04/urt/rle_addh
      length += strlen(padding) + 3 + strlen(histoire) + 1;
          /* length of padding, "on "  and length of history name plus "="*/
      if (in_hdr) /* if we are interested in the old comments... */
-@@ -90,9 +98,12 @@ rle_addhist(char *          argv[],
+@@ -85,9 +93,12 @@ rle_addhist(char *          argv[],
      else
          old = NULL;
      
@@ -1402,9 +1405,9 @@ diff -up netpbm-10.47.04/urt/rle_addhist.c.security netpbm-10.47.04/urt/rle_addh
      ++length;                               /*Cater for the null. */
  
      MALLOCARRAY(newc, length);
-diff -up netpbm-10.47.04/urt/rle_getrow.c.security netpbm-10.47.04/urt/rle_getrow.c
---- netpbm-10.47.04/urt/rle_getrow.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/rle_getrow.c	2009-10-21 15:09:34.000000000 +0200
+diff -up netpbm-10.58.01/urt/rle_getrow.c.security-code netpbm-10.58.01/urt/rle_getrow.c
+--- netpbm-10.58.01/urt/rle_getrow.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/urt/rle_getrow.c	2012-04-09 15:40:03.232619426 +0200
 @@ -17,6 +17,8 @@
   *
   *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
@@ -1422,9 +1425,9 @@ diff -up netpbm-10.47.04/urt/rle_getrow.c.security netpbm-10.47.04/urt/rle_getro
          evenlen = (comlen + 1) & ~1;    /* make it even */
          if ( evenlen )
          {
-diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c
---- netpbm-10.47.04/urt/rle_hdr.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/rle_hdr.c	2009-10-21 15:09:34.000000000 +0200
+diff -up netpbm-10.58.01/urt/rle_hdr.c.security-code netpbm-10.58.01/urt/rle_hdr.c
+--- netpbm-10.58.01/urt/rle_hdr.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/urt/rle_hdr.c	2012-04-09 15:40:03.233619414 +0200
 @@ -14,6 +14,8 @@
   * If you modify this software, you should include a notice giving the
   * name of the person performing the modification, the date of modification,
@@ -1434,7 +1437,7 @@ diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c
   */
  /* 
   * rle_hdr.c - Functions to manipulate rle_hdr structures.
-@@ -79,7 +81,10 @@ int img_num;
+@@ -80,7 +82,10 @@ int img_num;
      /* Fill in with copies of the strings. */
      if ( the_hdr->cmd != pgmname )
      {
@@ -1446,7 +1449,7 @@ diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c
  	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
  	strcpy( tmp, pgmname );
  	the_hdr->cmd = tmp;
-@@ -87,7 +92,9 @@ int img_num;
+@@ -88,7 +93,9 @@ int img_num;
  
      if ( the_hdr->file_name != fname )
      {
@@ -1457,7 +1460,7 @@ diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c
  	RLE_CHECK_ALLOC( pgmname, tmp, 0 );
  	strcpy( tmp, fname );
  	the_hdr->file_name = tmp;
-@@ -152,6 +159,7 @@ rle_hdr *from_hdr, *to_hdr;
+@@ -153,6 +160,7 @@ rle_hdr *from_hdr, *to_hdr;
      if ( to_hdr->bg_color )
      {
  	int size = to_hdr->ncolors * sizeof(int);
@@ -1465,7 +1468,7 @@ diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c
  	to_hdr->bg_color = (int *)malloc( size );
  	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->bg_color, "background color" );
  	memcpy( to_hdr->bg_color, from_hdr->bg_color, size );
-@@ -160,7 +168,7 @@ rle_hdr *from_hdr, *to_hdr;
+@@ -161,7 +169,7 @@ rle_hdr *from_hdr, *to_hdr;
      if ( to_hdr->cmap )
      {
  	int size = to_hdr->ncmap * (1 << to_hdr->cmaplen) * sizeof(rle_map);
@@ -1474,7 +1477,7 @@ diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c
  	RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->cmap, "color map" );
  	memcpy( to_hdr->cmap, from_hdr->cmap, size );
      }
-@@ -173,11 +181,16 @@ rle_hdr *from_hdr, *to_hdr;
+@@ -174,11 +182,16 @@ rle_hdr *from_hdr, *to_hdr;
  	int size = 0;
  	CONST_DECL char **cp;
  	for ( cp=to_hdr->comments; *cp; cp++ )
@@ -1491,13 +1494,45 @@ diff -up netpbm-10.47.04/urt/rle_hdr.c.security netpbm-10.47.04/urt/rle_hdr.c
  	    size *= sizeof(char *);
  	    to_hdr->comments = (CONST_DECL char **)malloc( size );
  	    RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" );
-diff -up netpbm-10.47.04/urt/rle_open_f.c.security netpbm-10.47.04/urt/rle_open_f.c
---- netpbm-10.47.04/urt/rle_open_f.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/rle_open_f.c	2009-10-21 15:15:38.000000000 +0200
-@@ -163,64 +163,7 @@ dealWithSubprocess(const char *  const f
+diff -up netpbm-10.58.01/urt/rle.h.security-code netpbm-10.58.01/urt/rle.h
+--- netpbm-10.58.01/urt/rle.h.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/urt/rle.h	2012-04-09 15:40:03.233619414 +0200
+@@ -14,6 +14,9 @@
+  * If you modify this software, you should include a notice giving the
+  * name of the person performing the modification, the date of modification,
+  * and the reason for such modification.
++ *
++ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
++ *  Header declarations needed
+  */
+ /* 
+  * rle.h - Global declarations for Utah Raster Toolkit RLE programs.
+@@ -160,6 +163,17 @@ rle_hdr             /* End of typedef. *
+  */
+ extern rle_hdr rle_dflt_hdr;
+ 
++/* 
++ * Provided by pm library
++ */
++ 
++extern void overflow_add(int, int);
++#define overflow2(a,b) __overflow2(a,b)
++extern void __overflow2(int, int);
++extern void overflow3(int, int, int);
++extern void *malloc2(int, int);
++extern void *malloc3(int, int, int);
++extern void *realloc2(void *, int, int);
+ 
+ /* Declare RLE library routines. */
+ 
+diff -up netpbm-10.58.01/urt/rle_open_f.c.security-code netpbm-10.58.01/urt/rle_open_f.c
+--- netpbm-10.58.01/urt/rle_open_f.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/urt/rle_open_f.c	2012-04-09 15:40:03.234619402 +0200
+@@ -163,65 +163,7 @@ dealWithSubprocess(const char *  const f
+                    FILE **       const fpP,
                     bool *        const noSubprocessP,
                     const char ** const errorP) {
- 
+-
 -#ifdef NO_OPEN_PIPES
      *noSubprocessP = TRUE;
 -#else
@@ -1559,9 +1594,9 @@ diff -up netpbm-10.47.04/urt/rle_open_f.c.security netpbm-10.47.04/urt/rle_open_
  }
  
  
-diff -up netpbm-10.47.04/urt/rle_putcom.c.security netpbm-10.47.04/urt/rle_putcom.c
---- netpbm-10.47.04/urt/rle_putcom.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/rle_putcom.c	2009-10-21 15:09:34.000000000 +0200
+diff -up netpbm-10.58.01/urt/rle_putcom.c.security-code netpbm-10.58.01/urt/rle_putcom.c
+--- netpbm-10.58.01/urt/rle_putcom.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/urt/rle_putcom.c	2012-04-09 15:40:03.234619402 +0200
 @@ -14,6 +14,8 @@
   * If you modify this software, you should include a notice giving the
   * name of the person performing the modification, the date of modification,
@@ -1587,9 +1622,9 @@ diff -up netpbm-10.47.04/urt/rle_putcom.c.security netpbm-10.47.04/urt/rle_putco
          /* Not found */
          /* Can't realloc because somebody else might be pointing to this
           * comments block.  Of course, if this were true, then the
-diff -up netpbm-10.47.04/urt/Runput.c.security netpbm-10.47.04/urt/Runput.c
---- netpbm-10.47.04/urt/Runput.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/Runput.c	2009-10-21 15:09:34.000000000 +0200
+diff -up netpbm-10.58.01/urt/Runput.c.security-code netpbm-10.58.01/urt/Runput.c
+--- netpbm-10.58.01/urt/Runput.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/urt/Runput.c	2012-04-09 15:40:03.235619390 +0200
 @@ -17,6 +17,8 @@
   *
   *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
@@ -1622,9 +1657,9 @@ diff -up netpbm-10.47.04/urt/Runput.c.security netpbm-10.47.04/urt/Runput.c
  	if ( h_cmap == NULL )
  	{
  	    fprintf( stderr,
-diff -up netpbm-10.47.04/urt/scanargs.c.security netpbm-10.47.04/urt/scanargs.c
---- netpbm-10.47.04/urt/scanargs.c.security	2009-10-21 13:39:11.000000000 +0200
-+++ netpbm-10.47.04/urt/scanargs.c	2009-10-21 15:09:34.000000000 +0200
+diff -up netpbm-10.58.01/urt/scanargs.c.security-code netpbm-10.58.01/urt/scanargs.c
+--- netpbm-10.58.01/urt/scanargs.c.security-code	2012-04-09 15:31:45.000000000 +0200
++++ netpbm-10.58.01/urt/scanargs.c	2012-04-09 15:40:03.235619390 +0200
 @@ -38,6 +38,8 @@
   *
   *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
@@ -1633,8 +1668,8 @@ diff -up netpbm-10.47.04/urt/scanargs.c.security netpbm-10.47.04/urt/scanargs.c
 + *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
   */
  
- #include "rle.h"
-@@ -65,8 +67,8 @@ typedef int *ptr;
+ #include <stdio.h>
+@@ -63,8 +65,8 @@ typedef int *ptr;
  /* 
   * Storage allocation macros
   */
@@ -1643,26 +1678,5 @@ diff -up netpbm-10.47.04/urt/scanargs.c.security netpbm-10.47.04/urt/scanargs.c
 +#define NEW( type, cnt )	(type *) malloc2( (cnt) , sizeof( type ) )
 +#define RENEW( type, ptr, cnt )	(type *) realloc2( ptr, (cnt), sizeof( type ) )
  
- #if defined(c_plusplus) && !defined(USE_PROTOTYPES)
- #define USE_PROTOTYPES
---- advanced/urt/rle_hdr.c.old	2012-01-21 05:57:25.000000000 -0500
-+++ advanced/urt/rle_hdr.c	2012-01-21 05:57:50.000000000 -0500
-@@ -29,6 +29,18 @@
- 
- #include <string.h>
- 
-+/* 
-+ * Provided by pm library
-+ */
-+ 
-+extern void overflow_add(int, int);
-+#define overflow2(a,b) __overflow2(a,b)
-+extern void __overflow2(int, int);
-+extern void overflow3(int, int, int);
-+extern void *malloc2(int, int);
-+/*extern void *malloc3(int, int, int);*/
-+extern void *realloc2(void *, int, int);
-+
- /*****************************************************************
-  * TAG( rle_names )
-  *
+ static CONST_DECL char * prformat( CONST_DECL char *, int );
+ static int isnum( CONST_DECL char *, int, int );
diff --git a/extra/netpbm/netpbm-security-scripts.patch b/extra/netpbm/netpbm-security-scripts.patch
index 557914b66..831be8295 100644
--- a/extra/netpbm/netpbm-security-scripts.patch
+++ b/extra/netpbm/netpbm-security-scripts.patch
@@ -356,24 +356,6 @@ diff -up netpbm-10.47.05/editor/ppmfade.security-scripts netpbm-10.47.05/editor/
 +system("rm $tmpdir/junk*$$.ppm");
  
  exit(0);
-diff -up netpbm-10.47.05/editor/ppmquantall.security-scripts netpbm-10.47.05/editor/ppmquantall
---- netpbm-10.47.05/editor/ppmquantall.security-scripts	2009-12-10 08:34:32.000000000 +0100
-+++ netpbm-10.47.05/editor/ppmquantall	2010-03-16 21:28:09.000000000 +0100
-@@ -70,12 +70,8 @@ for i in ${files[@]}; do
-     heights=(${heights[*]} `grep -v '^#' $i | sed '1d; s/.* //; 2q'`)
- done
- 
--tempdir="${TMPDIR-/tmp}/ppmquantall.$$"
--mkdir -m 0700 $tempdir || \
--  { echo "Could not create temporary file. Exiting."; exit 1;}
--trap 'rm -rf $tempdir' 0 1 3 15
--
--all=$tempdir/pqa.all.$$
-+all=$(mktemp -t pqa.all.XXXXXXXXXX) || exit 1
-+rm -f $all
- 
- pnmcat -topbottom -jleft -white ${files[@]} | pnmquant $newcolors > $all
- if [ $? != 0 ]; then
 diff -up netpbm-10.47.05/editor/ppmshadow.security-scripts netpbm-10.47.05/editor/ppmshadow
 --- netpbm-10.47.05/editor/ppmshadow.security-scripts	2009-12-10 08:34:32.000000000 +0100
 +++ netpbm-10.47.05/editor/ppmshadow	2010-03-16 21:28:09.000000000 +0100
diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD
index df2d09d9f..4ee5fc2bf 100644
--- a/extra/nettle/PKGBUILD
+++ b/extra/nettle/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175512 2013-01-17 18:26:40Z andyrtr $
+# $Id: PKGBUILD 183668 2013-04-26 12:45:09Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: bender02 at gmx dot com
 
 pkgname=nettle
-pkgver=2.6
+pkgver=2.7
 pkgrel=1
 pkgdesc="A low-level cryptographic library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,8 +11,8 @@ url="http://www.lysator.liu.se/~nisse/nettle/"
 license=('GPL2')
 install=$pkgname.install
 depends=('gmp')
-source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz)
-md5sums=('02f76b668855c4da67186c04cd3a222f')
+source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('2caa1bd667c35db71becb93c5d89737f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD
index f9560b02c..18c8e0007 100644
--- a/extra/network-manager-applet/PKGBUILD
+++ b/extra/network-manager-applet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169995 2012-10-30 23:01:10Z heftig $
+# $Id: PKGBUILD 184181 2013-05-03 08:14:17Z foutrelis $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@archlinux.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -6,20 +6,31 @@
 # Contributor: Will Rea <sillywilly@gmail.com>
 
 pkgname=network-manager-applet
-pkgver=0.9.6.4
-pkgrel=1
+pkgver=0.9.8.0
+pkgrel=3
 pkgdesc="GNOME frontends to NetWorkmanager"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
+license=(GPL)
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver::5}" 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify'
-         'gnome-icon-theme' 'mobile-broadband-provider-info' 'iso-codes')
-makedepends=('intltool' 'gnome-bluetooth')
+depends=("networkmanager>=${pkgver::5}" libgnome-keyring gtk3 libnotify
+         gnome-icon-theme mobile-broadband-provider-info iso-codes)
+makedepends=(intltool gnome-bluetooth gobject-introspection)
 optdepends=('gnome-bluetooth: for PAN/DUN support')
 options=('!libtool' '!emptydirs')
 install=network-manager-applet.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz)
-sha256sums=('ae5667b165f0f83244ec76c42f17553ec2169f5250e144904994497137374141')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz
+        fixed-signal-icons.tar.xz)
+noextract=(fixed-signal-icons.tar.xz)
+sha256sums=('1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590'
+            '08ffd9d045c98119eb1991c036f41e51950e72eea5638549075239256c000e91')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  # Fix signal icons to work with libpng 1.6
+  # https://bugzilla.gnome.org/show_bug.cgi?id=697286
+  tar xf ${srcdir}/fixed-signal-icons.tar.xz
+}
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/network-manager-applet/fixed-signal-icons.tar.xz b/extra/network-manager-applet/fixed-signal-icons.tar.xz
new file mode 100644
index 000000000..1f85541dc
--- /dev/null
+++ b/extra/network-manager-applet/fixed-signal-icons.tar.xz
diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD
index 3ecac5e28..b406ae5d5 100644
--- a/extra/networkmanager-openconnect/PKGBUILD
+++ b/extra/networkmanager-openconnect/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166519 2012-09-09 15:40:55Z heftig $
+# $Id: PKGBUILD 179569 2013-03-07 11:54:27Z foutrelis $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openconnect
-pkgver=0.9.6.2
+pkgver=0.9.8.0
 pkgrel=1
 pkgdesc="NetworkManager VPN integration for openconnect"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz)
-sha256sums=('3f53d87dbeb00fc841ef5981e6f1a1a192c65d273386246d48245cca84fa41b0')
+sha256sums=('c12487f57ad2f2386db4b103397e3cb66bf34ba589c5f48c3c5ec0b5547e4d9b')
 
 build() {
   cd NetworkManager-openconnect-${pkgver}
diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD
index 09a4db99c..5a963c814 100644
--- a/extra/networkmanager-openvpn/PKGBUILD
+++ b/extra/networkmanager-openvpn/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166520 2012-09-09 15:41:00Z heftig $
+# $Id: PKGBUILD 179570 2013-03-07 11:54:28Z foutrelis $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openvpn
-pkgver=0.9.6.0
+pkgver=0.9.8.0
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for OpenVPN"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 install=networkmanager-openvpn.install
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz)
-sha256sums=('8fb88705793399574b3de2af93f87b63c0eae342d549a1c79bc59f6a1fad87a3')
+sha256sums=('4196f4c124426884657c8d0e2578f4d35205b8981a46bf645fd599fb238395ce')
 
 build() {
   cd NetworkManager-openvpn-${pkgver}
diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD
index 475d9920a..ed14fbc72 100644
--- a/extra/networkmanager-pptp/PKGBUILD
+++ b/extra/networkmanager-pptp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 171364 2012-11-17 11:09:07Z ibiru $
+# $Id: PKGBUILD 179571 2013-03-07 11:54:28Z foutrelis $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-pptp
-pkgver=0.9.6.0
-pkgrel=2
+pkgver=0.9.8.0
+pkgrel=1
 pkgdesc="NetworkManager VPN plugin for pptp "
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -14,20 +14,17 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=networkmanager-pptp.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz
-        fix-path-to-auth-dialog.patch
         gtk_table_to_gtk_grid.patch)
-sha256sums=('a84cbbf24827229e3dd3611bbde191398275c3b7ecd03913047197644f27a2b4'
-            '35f9c2cb4d046c8f215617e1a0bfd8551965bd0655af0cd25f89c17ea5e9081a'
+sha256sums=('34d0981462d8948ace0dd4f49478c86017b53516afbbf62e2a4c6c0adc679cc8'
             '17c194c605bca780bf657711e9cff910c63ab27eae70c11cb6c53e9c75ad3215')
 
 build() {
   cd NetworkManager-pptp-${pkgver}
-  patch -Np1 -i ../fix-path-to-auth-dialog.patch
   patch -Np1 -i ../gtk_table_to_gtk_grid.patch
   ./configure --prefix=/usr \
-  	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
+        --sysconfdir=/etc \
+        --libexecdir=/usr/lib/networkmanager \
+        --disable-static
   make
 }
 
diff --git a/extra/networkmanager-pptp/fix-path-to-auth-dialog.patch b/extra/networkmanager-pptp/fix-path-to-auth-dialog.patch
deleted file mode 100644
index 28a4a5a44..000000000
--- a/extra/networkmanager-pptp/fix-path-to-auth-dialog.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a2f52d4455bd81732b6b3c16bdab206c56818c07 Mon Sep 17 00:00:00 2001
-From: Clemens Buchacher <drizzd@aon.at>
-Date: Sun, 1 Jul 2012 18:35:50 +0200
-Subject: [PATCH] fix path to auth-dialog
-
-
-Signed-off-by: Clemens Buchacher <drizzd@aon.at>
----
- nm-pptp-service.name.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/nm-pptp-service.name.in b/nm-pptp-service.name.in
-index 9ee79b8..ea5f0e5 100644
---- a/nm-pptp-service.name.in
-+++ b/nm-pptp-service.name.in
-@@ -4,6 +4,6 @@ service=org.freedesktop.NetworkManager.pptp
- program=@LIBEXECDIR@/nm-pptp-service
- 
- [GNOME]
--auth-dialog=nm-pptp-auth-dialog
-+auth-dialog=@LIBEXECDIR@/nm-pptp-auth-dialog
- properties=libnm-pptp-properties
- supports-external-ui-mode=true
--- 
-1.7.11.1
-
diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD
index de1ce6fee..e6745b3d3 100644
--- a/extra/networkmanager-vpnc/PKGBUILD
+++ b/extra/networkmanager-vpnc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166522 2012-09-09 15:41:10Z heftig $
+# $Id: PKGBUILD 179572 2013-03-07 11:54:29Z foutrelis $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-vpnc
-pkgver=0.9.6.0
+pkgver=0.9.8.0
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for vpnc"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=networkmanager-vpnc.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz)
-sha256sums=('6c8e35862330e17ee8f4dc44b1ac47470da703e436d339c7b3e2dac7d1b148a2')
+sha256sums=('e4504c569315c20f2468995f073123a787cdb66695d321f20f994abd1d7eb1c1')
 
 build() {
   cd NetworkManager-vpnc-${pkgver}
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index 570f544c0..fb381f16c 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169996 2012-10-30 23:01:16Z heftig $
+# $Id: PKGBUILD 183447 2013-04-21 22:11:49Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -8,44 +8,37 @@
 
 pkgname=networkmanager
 _pkgname=NetworkManager
-pkgver=0.9.6.4
-pkgrel=1
+pkgver=0.9.8.0
+pkgrel=3
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/$_pkgname/"
-depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant ppp dhclient
-         libsoup systemd)
-makedepends=(intltool dhcpcd iptables gobject-introspection)
-optdepends=('modemmanager: for modem management service'
-            'dhcpcd: alternative DHCP client; does not support DHCPv6'
+depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client
+         libsoup systemd modemmanager)
+makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc)
+optdepends=('dhclient: DHCPv6 support'
             'iptables: Connection sharing'
             'dnsmasq: Connection sharing'
             'bluez: Bluetooth support'
-            'openresolv: resolvconf support')
+            'openresolv: resolvconf support'
+            'ppp: Dialup connection support')
 options=('!libtool')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch
-        nm-polkit-permissive.patch repair-signals.patch systemd-sleep.patch)
-sha256sums=('511b411e055d187bc8f26c519fdb3e55e07fc40d4adecbbec623c0249380a7eb'
+        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch)
+sha256sums=('c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
-            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb'
-            'e23b651a90ef62d515921953b4c6779538d35a737fb74c266b7fce94d62fdb06'
-            'a1c65a09e5e8ecb1004ab7922517aa7fbc9700dc61e3b2fd348d3d7c23808ce6'
-            '24c181ab69e769e703e45f64a552add5df5de22fbcd8899d588add053674420a')
+            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb')
 
 build() {
   cd $_pkgname-$pkgver
 
   patch -Np1 -i ../disable_set_hostname.patch
   patch -Np1 -i ../dnsmasq-path.patch
-  patch -Np1 -i ../nm-polkit-permissive.patch
-  patch -Np1 -i ../repair-signals.patch # FS#31115
-  patch -Np1 -i ../systemd-sleep.patch
-  AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi
+  #AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi
 
   ./configure \
     --prefix=/usr \
@@ -53,7 +46,6 @@ build() {
     --localstatedir=/var \
     --libexecdir=/usr/lib/networkmanager \
     --with-crypto=nss \
-    --with-distro=arch \
     --with-dhclient=/usr/sbin/dhclient \
     --with-dhcpcd=/usr/sbin/dhcpcd \
     --with-iptables=/usr/sbin/iptables \
@@ -61,9 +53,12 @@ build() {
     --with-udev-dir=/usr/lib/udev \
     --with-resolvconf=/usr/sbin/resolvconf \
     --with-session-tracking=systemd \
+    --with-modem-manager-1 \
     --disable-static \
     --enable-more-warnings=no \
-    --disable-wimax
+    --disable-wimax \
+    --enable-modify-system \
+    --enable-doc
 
   make
 }
@@ -73,6 +68,7 @@ package() {
   make DESTDIR="$pkgdir" install
 
   install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
+  install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d"
 
   rm -r "$pkgdir/var/run"
 }
diff --git a/extra/networkmanager/dont-fight-over-ipv6.patch b/extra/networkmanager/dont-fight-over-ipv6.patch
deleted file mode 100644
index f7945335f..000000000
--- a/extra/networkmanager/dont-fight-over-ipv6.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 77de91e5a8b1c1993ae65c54b37e0411e78e6fe6 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Thu, 19 Apr 2012 18:27:12 +0000
-Subject: core: don't fight with the kernel over the default IPv6 route
-
-The kernel wants there to be a default route over every RA-ed IPv6
-interface, and it gets confused and annoyed if we remove that default
-route and replace it with our own (causing it to effectively drop all
-further RAs on the floor, which is particularly bad if some of the
-information in the earlier RA had an expiration time).
-
-So, rather than replacing the kernel's default route(s), just add an
-additional one of our own, with a lower (ie, higher priority) metric.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=785772
----
-diff --git a/src/nm-system.c b/src/nm-system.c
-index 91153ec..4cebb13 100644
---- a/src/nm-system.c
-+++ b/src/nm-system.c
-@@ -1023,7 +1023,7 @@ add_ip6_route_to_gateway (int ifindex, const struct in6_addr *gw)
- }
- 
- static int
--replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
-+add_default_ip6_route (int ifindex, const struct in6_addr *gw)
- {
- 	struct rtnl_route *route = NULL;
- 	struct nl_sock *nlh;
-@@ -1037,22 +1037,36 @@ replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
- 	route = nm_netlink_route_new (ifindex, AF_INET6, 0,
- 	                              NMNL_PROP_SCOPE, RT_SCOPE_UNIVERSE,
- 	                              NMNL_PROP_TABLE, RT_TABLE_MAIN,
-+	                              NMNL_PROP_PRIO, 1,
- 	                              NULL);
- 	g_return_val_if_fail (route != NULL, -ENOMEM);
- 
- 	/* Add the new default route */
--	err = nm_netlink_route6_add (route, &in6addr_any, 0, gw, NLM_F_REPLACE);
--	if (err == -NLE_EXIST) {
--		/* FIXME: even though we use NLM_F_REPLACE the kernel won't replace
--		 * the route if it's the same.  Suppress the pointless error.
--		 */
-+	err = nm_netlink_route6_add (route, &in6addr_any, 0, gw, NLM_F_CREATE);
-+	if (err == -NLE_EXIST)
- 		err = 0;
--	}
- 
- 	rtnl_route_put (route);
- 	return err;
- }
- 
-+static struct rtnl_route *
-+find_static_default_routes (struct rtnl_route *route,
-+                            struct nl_addr *dst,
-+                            const char *iface,
-+                            gpointer user_data)
-+{
-+	GList **def_routes = user_data;
-+
-+	if (   nl_addr_get_prefixlen (dst) == 0
-+	    && rtnl_route_get_protocol (route) == RTPROT_STATIC) {
-+		rtnl_route_get (route);
-+		*def_routes = g_list_prepend (*def_routes, route);
-+	}
-+
-+	return NULL;
-+}
-+
- /*
-  * nm_system_replace_default_ip6_route
-  *
-@@ -1062,12 +1076,35 @@ replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
- gboolean
- nm_system_replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
- {
--	struct rtnl_route *gw_route = NULL;
-+	GList *def_routes, *iter;
-+	struct rtnl_route *route, *gw_route = NULL;
- 	gboolean success = FALSE;
- 	char *iface;
- 	int err;
- 
--	err = replace_default_ip6_route (ifindex, gw);
-+	/* We can't just use NLM_F_REPLACE here like in the IPv4 case, because
-+	 * the kernel doesn't like it if we replace the default routes it
-+	 * creates. (See rh#785772.) So we delete any non-kernel default routes,
-+	 * and then add a new default route of our own with a lower metric than
-+	 * the kernel ones.
-+	 */
-+	def_routes = NULL;
-+	nm_netlink_foreach_route (ifindex, AF_INET6, RT_SCOPE_UNIVERSE, TRUE,
-+	                          find_static_default_routes, &def_routes);
-+	for (iter = def_routes; iter; iter = iter->next) {
-+		route = iter->data;
-+		if (!nm_netlink_route_delete (route)) {
-+			iface = nm_netlink_index_to_iface (ifindex);
-+			nm_log_err (LOGD_DEVICE | LOGD_IP6,
-+			            "(%s): failed to delete existing IPv6 default route",
-+			            iface);
-+			g_free (iface);
-+		}
-+		rtnl_route_put (route);
-+	}
-+	g_list_free (def_routes);
-+
-+	err = add_default_ip6_route (ifindex, gw);
- 	if (err == 0)
- 		return TRUE;
- 
-@@ -1091,7 +1128,7 @@ nm_system_replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
- 		goto out;
- 
- 	/* Try adding the original route again */
--	err = replace_default_ip6_route (ifindex, gw);
-+	err = add_default_ip6_route (ifindex, gw);
- 	if (err != 0) {
- 		nm_netlink_route_delete (gw_route);
- 		nm_log_err (LOGD_DEVICE | LOGD_IP6,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/networkmanager/initialize-GError.patch b/extra/networkmanager/initialize-GError.patch
deleted file mode 100644
index 58f0b9cb3..000000000
--- a/extra/networkmanager/initialize-GError.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8bb278944496102a4afad46b53e1e8279425aaac Mon Sep 17 00:00:00 2001
-From: Jiří Klimeš <jklimes@redhat.com>
-Date: Mon, 02 Apr 2012 14:37:55 +0000
-Subject: libnm-glib: initialize GError, else invalid free() crash can occur (rh #809123)
-
----
-(limited to 'libnm-glib/nm-remote-settings.c')
-
-diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c
-index 9a81a8d..68aaeb4 100644
---- a/libnm-glib/nm-remote-settings.c
-+++ b/libnm-glib/nm-remote-settings.c
-@@ -109,7 +109,7 @@ static void
- _nm_remote_settings_ensure_inited (NMRemoteSettings *self)
- {
- 	NMRemoteSettingsPrivate *priv = NM_REMOTE_SETTINGS_GET_PRIVATE (self);
--	GError *error;
-+	GError *error = NULL;
- 
- 	if (!priv->inited) {
- 		if (!g_initable_init (G_INITABLE (self), NULL, &error)) {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/networkmanager/nm-polkit-permissive.patch b/extra/networkmanager/nm-polkit-permissive.patch
deleted file mode 100644
index 1ac406224..000000000
--- a/extra/networkmanager/nm-polkit-permissive.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in
---- NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive	2011-03-24 14:21:35.100912222 -0500
-+++ NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in	2011-03-24 14:21:49.916726997 -0500
-@@ -95,7 +95,7 @@
-     <_message>System policy prevents modification of network settings for all users</_message>
-     <defaults>
-       <allow_inactive>no</allow_inactive>
--      <allow_active>auth_admin_keep</allow_active>
-+      <allow_active>yes</allow_active>
-     </defaults>
-   </action>
- 
diff --git a/extra/networkmanager/repair-signals.patch b/extra/networkmanager/repair-signals.patch
deleted file mode 100644
index cf1319dc5..000000000
--- a/extra/networkmanager/repair-signals.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 64342a313ef497fca8a4fb7567900d4a1460065f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 13 Sep 2012 09:32:53 +0000
-Subject: core: wait until we daemonized before setting up signals (bgo #683932)
-
-If we mask signals before daemonizing, the daemon process will not be
-able to handle them, and thus would be unkillable with anything other
-than SIGKILL.
----
-diff --git a/src/main.c b/src/main.c
-index 8bc6d3f..5b82cfa 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -401,10 +401,6 @@ main (int argc, char *argv[])
- 		exit (1);
- 	}
- 
--	/* Set up unix signal handling */
--	if (!setup_signals ())
--		exit (1);
--
- 	/* Set locale to be able to use environment variables */
- 	setlocale (LC_ALL, "");
- 
-@@ -501,6 +497,10 @@ main (int argc, char *argv[])
- 			wrote_pidfile = TRUE;
- 	}
- 
-+	/* Set up unix signal handling - before creating threads, but after daemonizing! */
-+	if (!setup_signals ())
-+		exit (1);
-+
- 	if (g_fatal_warnings) {
- 		GLogLevelFlags fatal_mask;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/networkmanager/systemd-fallback.patch b/extra/networkmanager/systemd-fallback.patch
deleted file mode 100644
index f5acc9dc6..000000000
--- a/extra/networkmanager/systemd-fallback.patch
+++ /dev/null
@@ -1,470 +0,0 @@
-diff -u -Nr NetworkManager-0.9.3.995/configure.ac NetworkManager-0.9.3.995-systemd-fallback/configure.ac
---- NetworkManager-0.9.3.995/configure.ac	2012-03-02 01:05:21.000000000 +0100
-+++ NetworkManager-0.9.3.995-systemd-fallback/configure.ac	2012-03-06 16:55:58.294793902 +0100
-@@ -344,7 +344,7 @@
- case $with_session_tracking in
-     ck|none) ;;
-     systemd)
--        PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
-+        PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login])
-         ;;
-     *)
- 	AC_MSG_ERROR(--with-session-tracking must be one of [none, ck, systemd])
-diff -u -Nr NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c
---- NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c	2012-02-27 16:57:16.000000000 +0100
-+++ NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c	2012-03-06 16:55:01.285264295 +0100
-@@ -28,6 +28,10 @@
- #include <glib/gstdio.h>
- #include <systemd/sd-login.h>
- #include <stdlib.h>
-+#include <systemd/sd-daemon.h>
-+#include <sys/stat.h>
-+#include <gio/gio.h>
-+#include "nm-logging.h"
- 
- #include "nm-session-utils.h"
- #include "nm-session-monitor.h"
-@@ -107,10 +111,20 @@
- 	return source;
- }
- 
-+/********************************************************************/
-+
-+#define CKDB_PATH "/var/run/ConsoleKit/database"
-+
- struct _NMSessionMonitor {
- 	GObject parent_instance;
- 
- 	GSource *sd_source;
-+
-+	GKeyFile *database;
-+	GFileMonitor *database_monitor;
-+	time_t database_mtime;
-+	GHashTable *sessions_by_uid;
-+	GHashTable *sessions_by_user;
- };
- 
- struct _NMSessionMonitorClass {
-@@ -130,6 +144,215 @@
- 
- /* ---------------------------------------------------------------------------------------------------- */
- 
-+typedef struct {
-+	char *user;
-+	uid_t uid;
-+	gboolean local;
-+	gboolean active;
-+} Session;
-+
-+static void
-+session_free (Session *s)
-+{
-+	g_free (s->user);
-+	memset (s, 0, sizeof (Session));
-+	g_free (s);
-+}
-+
-+static gboolean
-+check_key (GKeyFile *keyfile, const char *group, const char *key, GError **error)
-+{
-+	if (g_key_file_has_key (keyfile, group, key, error))
-+		return TRUE;
-+
-+	if (!error) {
-+		g_set_error (error,
-+			         NM_SESSION_MONITOR_ERROR,
-+			         NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE,
-+			         "ConsoleKit database " CKDB_PATH " group '%s' had no '%s' key",
-+			         group, key);
-+	}
-+	return FALSE;
-+}
-+
-+static Session *
-+session_new (GKeyFile *keyfile, const char *group, GError **error)
-+{
-+	GError *local = NULL;
-+	Session *s;
-+	const char *uname = NULL;
-+
-+	s = g_new0 (Session, 1);
-+	g_assert (s);
-+
-+	s->uid = G_MAXUINT; /* paranoia */
-+	if (!check_key (keyfile, group, "uid", &local))
-+		goto error;
-+	s->uid = (uid_t) g_key_file_get_integer (keyfile, group, "uid", &local);
-+	if (local)
-+		goto error;
-+
-+	if (!check_key (keyfile, group, "is_active", &local))
-+		goto error;
-+	s->active = g_key_file_get_boolean (keyfile, group, "is_active", &local);
-+	if (local)
-+		goto error;
-+
-+	if (!check_key (keyfile, group, "is_local", &local))
-+		goto error;
-+	s->local = g_key_file_get_boolean (keyfile, group, "is_local", &local);
-+	if (local)
-+		goto error;
-+
-+	if (!nm_session_uid_to_user (s->uid, &uname, error))
-+		return FALSE;
-+	s->user = g_strdup (uname);
-+
-+	return s;
-+
-+error:
-+	session_free (s);
-+	g_propagate_error (error, local);
-+	return NULL;
-+}
-+
-+static void
-+session_merge (Session *src, Session *dest)
-+{
-+	g_return_if_fail (src != NULL);
-+	g_return_if_fail (dest != NULL);
-+
-+	g_warn_if_fail (g_strcmp0 (src->user, dest->user) == 0);
-+	g_warn_if_fail (src->uid == dest->uid);
-+
-+	dest->local = (dest->local || src->local);
-+	dest->active = (dest->active || src->active);
-+}
-+
-+/********************************************************************/
-+
-+static void
-+free_database (NMSessionMonitor *self)
-+{
-+	if (self->database != NULL) {
-+		g_key_file_free (self->database);
-+		self->database = NULL;
-+	}
-+
-+	g_hash_table_remove_all (self->sessions_by_uid);
-+	g_hash_table_remove_all (self->sessions_by_user);
-+}
-+
-+static gboolean
-+reload_database (NMSessionMonitor *self, GError **error)
-+{
-+	struct stat statbuf;
-+	char **groups = NULL;
-+	gsize len = 0, i;
-+	Session *s;
-+
-+	free_database (self);
-+
-+	errno = 0;
-+	if (stat (CKDB_PATH, &statbuf) != 0) {
-+		g_set_error (error,
-+		             NM_SESSION_MONITOR_ERROR,
-+		             errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR,
-+		             "Error statting file " CKDB_PATH ": %s",
-+		             strerror (errno));
-+		goto error;
-+	}
-+	self->database_mtime = statbuf.st_mtime;
-+
-+	self->database = g_key_file_new ();
-+	if (!g_key_file_load_from_file (self->database, CKDB_PATH, G_KEY_FILE_NONE, error))
-+		goto error;
-+
-+	groups = g_key_file_get_groups (self->database, &len);
-+	if (!groups) {
-+		g_set_error_literal (error,
-+		                     NM_SESSION_MONITOR_ERROR,
-+		                     NM_SESSION_MONITOR_ERROR_IO_ERROR,
-+		                     "Could not load groups from " CKDB_PATH "");
-+		goto error;
-+	}
-+
-+	for (i = 0; i < len; i++) {
-+		Session *found;
-+
-+		if (!g_str_has_prefix (groups[i], "Session "))
-+			continue;
-+
-+		s = session_new (self->database, groups[i], error);
-+		if (!s)
-+			goto error;
-+
-+		found = g_hash_table_lookup (self->sessions_by_user, (gpointer) s->user);
-+		if (found) {
-+			session_merge (s, found);
-+			session_free (s);
-+		} else {
-+			/* Entirely new user */
-+			g_hash_table_insert (self->sessions_by_user, (gpointer) s->user, s);
-+			g_hash_table_insert (self->sessions_by_uid, GUINT_TO_POINTER (s->uid), s);
-+		}
-+	}
-+
-+	g_strfreev (groups);
-+	return TRUE;
-+
-+error:
-+	if (groups)
-+		g_strfreev (groups);
-+	free_database (self);
-+	return FALSE;
-+}
-+
-+static gboolean
-+ensure_database (NMSessionMonitor *self, GError **error)
-+{
-+	gboolean ret = FALSE;
-+
-+	if (self->database != NULL) {
-+		struct stat statbuf;
-+
-+		errno = 0;
-+		if (stat (CKDB_PATH, &statbuf) != 0) {
-+			g_set_error (error,
-+			             NM_SESSION_MONITOR_ERROR,
-+			             errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR,
-+			             "Error statting file " CKDB_PATH " to check timestamp: %s",
-+			             strerror (errno));
-+			goto out;
-+		}
-+
-+		if (statbuf.st_mtime == self->database_mtime) {
-+			ret = TRUE;
-+			goto out;
-+		}
-+	}
-+
-+	ret = reload_database (self, error);
-+
-+out:
-+	return ret;
-+}
-+
-+static void
-+on_file_monitor_changed (GFileMonitor *    file_monitor,
-+                         GFile *           file,
-+                         GFile *           other_file,
-+                         GFileMonitorEvent event_type,
-+                         gpointer          user_data)
-+{
-+	NMSessionMonitor *self = NM_SESSION_MONITOR (user_data);
-+
-+	/* throw away cache */
-+	free_database (self);
-+
-+	g_signal_emit (self, signals[CHANGED_SIGNAL], 0);
-+}
-+
- static gboolean
- sessions_changed (gpointer user_data)
- {
-@@ -143,9 +366,50 @@
- static void
- nm_session_monitor_init (NMSessionMonitor *monitor)
- {
--	monitor->sd_source = sd_source_new ();
--	g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
--	g_source_attach (monitor->sd_source, NULL);
-+	if (sd_booted () > 0) {
-+		monitor->sd_source = sd_source_new ();
-+		g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
-+		g_source_attach (monitor->sd_source, NULL);
-+
-+		monitor->database_monitor = NULL;
-+		monitor->database = NULL;
-+	} else {
-+		monitor->sd_source = NULL;
-+
-+		GError *error = NULL;
-+		GFile *file;
-+
-+		/* Sessions-by-user is responsible for destroying the Session objects */
-+		monitor->sessions_by_user = g_hash_table_new_full (g_str_hash, g_str_equal,
-+								NULL, (GDestroyNotify) session_free);
-+		monitor->sessions_by_uid = g_hash_table_new (g_direct_hash, g_direct_equal);
-+
-+
-+		error = NULL;
-+		if (!ensure_database (monitor, &error)) {
-+			/* Ignore the first error if the CK database isn't found yet */
-+			if (g_error_matches (error,
-+					     NM_SESSION_MONITOR_ERROR,
-+					     NM_SESSION_MONITOR_ERROR_NO_DATABASE) == FALSE) {
-+				nm_log_err (LOGD_CORE, "Error loading " CKDB_PATH ": %s", error->message);
-+			}
-+			g_error_free (error);
-+		}
-+
-+		error = NULL;
-+		file = g_file_new_for_path (CKDB_PATH);
-+		monitor->database_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error);
-+		g_object_unref (file);
-+		if (monitor->database_monitor == NULL) {
-+			nm_log_err (LOGD_CORE, "Error monitoring " CKDB_PATH ": %s", error->message);
-+			g_error_free (error);
-+		} else {
-+			g_signal_connect (monitor->database_monitor,
-+					  "changed",
-+					  G_CALLBACK (on_file_monitor_changed),
-+					  monitor);
-+		}
-+	}
- }
- 
- static void
-@@ -158,6 +422,12 @@
- 		g_source_unref (monitor->sd_source);
- 	}
- 
-+	if (monitor->database_monitor != NULL)
-+		g_object_unref (monitor->database_monitor);
-+
-+	if (monitor->database != NULL)
-+		free_database (monitor);
-+
- 	if (G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize != NULL)
- 		G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize (object);
- }
-@@ -206,15 +476,36 @@
-                                      uid_t *out_uid,
-                                      GError **error)
- {
--	uid_t uid;
-+	if (monitor->sd_source != NULL) {
-+		uid_t uid;
- 
--	if (!nm_session_user_to_uid (username, &uid, error))
--		return FALSE;
-+		if (!nm_session_user_to_uid (username, &uid, error))
-+			return FALSE;
- 
--	if (out_uid)
--		*out_uid = uid;
-+		if (out_uid)
-+			*out_uid = uid;
- 
--	return nm_session_monitor_uid_has_session (monitor, uid, NULL, error);
-+		return nm_session_monitor_uid_has_session (monitor, uid, NULL, error);
-+	} else {
-+		Session *s;
-+
-+		if (!ensure_database (monitor, error))
-+			return FALSE;
-+
-+		s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username);
-+		if (!s) {
-+			g_set_error (error,
-+				     NM_SESSION_MONITOR_ERROR,
-+				     NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
-+				     "No session found for user '%s'",
-+				     username);
-+			return FALSE;
-+		}
-+
-+		if (out_uid)
-+			*out_uid = s->uid;
-+		return TRUE;
-+	}
- }
- 
- gboolean
-@@ -222,12 +513,31 @@
-                                 const char *username,
-                                 GError **error)
- {
--	uid_t uid;
-+	if (monitor->sd_source != NULL) {
-+		uid_t uid;
- 
--	if (!nm_session_user_to_uid (username, &uid, error))
--		return FALSE;
-+		if (!nm_session_user_to_uid (username, &uid, error))
-+			return FALSE;
-+
-+		return nm_session_monitor_uid_active (monitor, uid, error);
-+	} else {
-+		Session *s;
-+
-+		if (!ensure_database (monitor, error))
-+			return FALSE;
-+
-+		s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username);
-+		if (!s) {
-+			g_set_error (error,
-+				     NM_SESSION_MONITOR_ERROR,
-+				     NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
-+				     "No session found for user '%s'",
-+				     username);
-+			return FALSE;
-+		}
- 
--	return nm_session_monitor_uid_active (monitor, uid, error);
-+		return s->active;
-+	}
- }
- 
- gboolean
-@@ -236,10 +546,31 @@
-                                     const char **out_user,
-                                     GError **error)
- {
--	if (!nm_session_uid_to_user (uid, out_user, error))
--		return FALSE;
-+	if (monitor->sd_source != NULL) {
-+		if (!nm_session_uid_to_user (uid, out_user, error))
-+			return FALSE;
- 
--	return sd_uid_get_sessions (uid, FALSE, NULL) > 0;
-+		return sd_uid_get_sessions (uid, FALSE, NULL) > 0;
-+	} else {
-+		Session *s;
-+
-+		if (!ensure_database (monitor, error))
-+			return FALSE;
-+
-+		s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid));
-+		if (!s) {
-+			g_set_error (error,
-+				     NM_SESSION_MONITOR_ERROR,
-+				     NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
-+				     "No session found for uid %d",
-+				     uid);
-+			return FALSE;
-+		}
-+
-+		if (out_user)
-+			*out_user = s->user;
-+		return TRUE;
-+	}
- }
- 
- gboolean
-@@ -247,5 +578,24 @@
-                                uid_t uid,
-                                GError **error)
- {
--	return sd_uid_get_sessions (uid, TRUE, NULL) > 0;
-+	if (monitor->sd_source != NULL)
-+		return sd_uid_get_sessions (uid, TRUE, NULL) > 0;
-+	else {
-+		Session *s;
-+
-+		if (!ensure_database (monitor, error))
-+			return FALSE;
-+
-+		s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid));
-+		if (!s) {
-+			g_set_error (error,
-+				     NM_SESSION_MONITOR_ERROR,
-+				     NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
-+				     "No session found for uid '%d'",
-+				     uid);
-+			return FALSE;
-+		}
-+
-+		return s->active;
-+	}
- }
diff --git a/extra/networkmanager/systemd-sleep.patch b/extra/networkmanager/systemd-sleep.patch
deleted file mode 100644
index 3470d4654..000000000
--- a/extra/networkmanager/systemd-sleep.patch
+++ /dev/null
@@ -1,616 +0,0 @@
-From b444d31cba5b8ac0c9771cc5a246dfd3af9dfd00 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Tue, 9 Oct 2012 00:36:35 -0400
-Subject: [PATCH] core: factor out the upower suspend/resume code (bgo
- #677694)
-
-Factor the code that listens for upower sleeping and resuming
-signals out into a class code NMSleepMonitor.
-
-core: add a systemd suspend/resume monitor (bgo #677694)
-
-This implementation uses a delay inhibitor to get systemd to
-emit PrepareForSleep, and then emits ::Sleeping and ::Resuming
-when receiving the before/after PrepareForSleep emissions.
-
-core: DBusGConnections are not GObjects
-
-Introduced in 64fd8eea7706038e5d38c8463a1c765ed9331db2.
-
-core: fix suspend/resume signal names which the manager listens for
-
-Introduced in 64fd8eea7706038e5d38c8463a1c765ed9331db2; but honestly
-I also thought GObject lower-cased signal names since it munges them
-for - and _ too.  Apparently not.
----
- configure.ac                   |   2 +-
- src/Makefile.am                |   9 +-
- src/nm-manager.c               |  40 +++-----
- src/nm-sleep-monitor-systemd.c | 217 +++++++++++++++++++++++++++++++++++++++++
- src/nm-sleep-monitor-upower.c  | 151 ++++++++++++++++++++++++++++
- src/nm-sleep-monitor.h         |  46 +++++++++
- 6 files changed, 437 insertions(+), 28 deletions(-)
- create mode 100644 src/nm-sleep-monitor-systemd.c
- create mode 100644 src/nm-sleep-monitor-upower.c
- create mode 100644 src/nm-sleep-monitor.h
-
-diff --git a/configure.ac b/configure.ac
-index e76e193..9152c23 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -327,7 +327,7 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147)
- AC_SUBST(GUDEV_CFLAGS)
- AC_SUBST(GUDEV_LIBS)
- 
--PKG_CHECK_MODULES(GIO, gio-2.0)
-+PKG_CHECK_MODULES(GIO, gio-unix-2.0)
- AC_SUBST(GIO_CFLAGS)
- AC_SUBST(GIO_LIBS)
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index b155209..ba7d2d6 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -191,6 +191,7 @@ NetworkManager_SOURCES = \
- 		nm-session-monitor.h \
- 		nm-session-utils.c \
- 		nm-session-utils.h \
-+		nm-sleep-monitor.h \
- 		nm-connection-provider.h \
- 		nm-connection-provider.c \
- 		nm-dispatcher.c \
-@@ -201,13 +202,18 @@ NetworkManager_SOURCES += nm-connectivity.c nm-connectivity.h
- endif
- 
- if SESSION_TRACKING_SYSTEMD
--NetworkManager_SOURCES += nm-session-monitor-systemd.c
-+NetworkManager_SOURCES += \
-+		nm-session-monitor-systemd.c \
-+		nm-sleep-monitor-systemd.c
- else
- if SESSION_TRACKING_CK
- NetworkManager_SOURCES += nm-session-monitor-ck.c
- else
- NetworkManager_SOURCES += nm-session-monitor-null.c
- endif
-+
-+# UPower suspend/resume used whenever systemd is not enabled
-+NetworkManager_SOURCES += nm-sleep-monitor-upower.c
- endif
- 
- nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml
-@@ -283,6 +289,7 @@ BUILT_SOURCES = \
- NetworkManager_CPPFLAGS = \
- 	$(DBUS_CFLAGS) \
- 	$(GLIB_CFLAGS) \
-+	$(GIO_CFLAGS) \
- 	$(GUDEV_CFLAGS) \
- 	$(LIBNL_CFLAGS) \
- 	$(GMODULE_CFLAGS) \
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 618c4ed..c8ce115 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -69,6 +69,7 @@
- #include "nm-device-factory.h"
- #include "wifi-utils.h"
- #include "nm-enum-types.h"
-+#include "nm-sleep-monitor.h"
- 
- #if WITH_CONCHECK
- #include "nm-connectivity.h"
-@@ -78,8 +79,6 @@
- #define NM_AUTOIP_DBUS_SERVICE "org.freedesktop.nm_avahi_autoipd"
- #define NM_AUTOIP_DBUS_IFACE   "org.freedesktop.nm_avahi_autoipd"
- 
--#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
--
- static gboolean impl_manager_get_devices (NMManager *manager,
-                                           GPtrArray **devices,
-                                           GError **err);
-@@ -228,7 +227,7 @@ typedef struct {
- 	guint modem_removed_id;
- 
- 	DBusGProxy *aipd_proxy;
--	DBusGProxy *upower_proxy;
-+	NMSleepMonitor *sleep_monitor;
- 
- 	GSList *auth_chains;
- 
-@@ -3288,16 +3287,16 @@ impl_manager_sleep (NMManager *self,
- }
- 
- static void
--upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data)
-+sleeping_cb (DBusGProxy *proxy, gpointer user_data)
- {
--	nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal");
-+	nm_log_dbg (LOGD_SUSPEND, "Received sleeping signal");
- 	_internal_sleep (NM_MANAGER (user_data), TRUE);
- }
- 
- static void
--upower_resuming_cb (DBusGProxy *proxy, gpointer user_data)
-+resuming_cb (DBusGProxy *proxy, gpointer user_data)
- {
--	nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal");
-+	nm_log_dbg (LOGD_SUSPEND, "Received resuming signal");
- 	_internal_sleep (NM_MANAGER (user_data), FALSE);
- }
- 
-@@ -4049,8 +4048,8 @@ dispose (GObject *object)
- 	if (priv->aipd_proxy)
- 		g_object_unref (priv->aipd_proxy);
- 
--	if (priv->upower_proxy)
--		g_object_unref (priv->upower_proxy);
-+	if (priv->sleep_monitor)
-+		g_object_unref (priv->sleep_monitor);
- 
- 	if (priv->fw_monitor) {
- 		if (priv->fw_monitor_id)
-@@ -4372,23 +4371,12 @@ nm_manager_init (NMManager *manager)
- 	} else
- 		nm_log_warn (LOGD_AUTOIP4, "could not initialize avahi-autoipd D-Bus proxy");
- 
--	/* upower sleep/wake handling */
--	priv->upower_proxy = dbus_g_proxy_new_for_name (g_connection,
--	                                                UPOWER_DBUS_SERVICE,
--	                                                "/org/freedesktop/UPower",
--	                                                "org.freedesktop.UPower");
--	if (priv->upower_proxy) {
--		dbus_g_proxy_add_signal (priv->upower_proxy, "Sleeping", G_TYPE_INVALID);
--		dbus_g_proxy_connect_signal (priv->upower_proxy, "Sleeping",
--		                             G_CALLBACK (upower_sleeping_cb),
--		                             manager, NULL);
--
--		dbus_g_proxy_add_signal (priv->upower_proxy, "Resuming", G_TYPE_INVALID);
--		dbus_g_proxy_connect_signal (priv->upower_proxy, "Resuming",
--		                             G_CALLBACK (upower_resuming_cb),
--		                             manager, NULL);
--	} else
--		nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy");
-+	/* sleep/wake handling */
-+	priv->sleep_monitor = nm_sleep_monitor_get ();
-+	g_signal_connect (priv->sleep_monitor, "sleeping",
-+	                  G_CALLBACK (sleeping_cb), manager);
-+	g_signal_connect (priv->sleep_monitor, "resuming",
-+	                  G_CALLBACK (resuming_cb), manager);
- 
- 	/* Listen for authorization changes */
- 	nm_auth_changed_func_register (authority_changed_cb, manager);
-diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c
-new file mode 100644
-index 0000000..70adc89
---- /dev/null
-+++ b/src/nm-sleep-monitor-systemd.c
-@@ -0,0 +1,217 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * (C) Copyright 2012 Red Hat, Inc.
-+ * Author: Matthias Clasen <mclasen@redhat.com>
-+ */
-+
-+#include "config.h"
-+#include <errno.h>
-+#include <string.h>
-+#include <sys/stat.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+#include <dbus/dbus-glib.h>
-+#include <gio/gio.h>
-+#include <gio/gunixfdlist.h>
-+
-+#include "nm-logging.h"
-+#include "nm-dbus-manager.h"
-+
-+#include "nm-sleep-monitor.h"
-+
-+#define SD_NAME              "org.freedesktop.login1"
-+#define SD_PATH              "/org/freedesktop/login1"
-+#define SD_INTERFACE         "org.freedesktop.login1.Manager"
-+
-+
-+struct _NMSleepMonitor {
-+	GObject parent_instance;
-+
-+	GDBusProxy *sd_proxy;
-+	gint inhibit_fd;
-+};
-+
-+struct _NMSleepMonitorClass {
-+	GObjectClass parent_class;
-+
-+	void (*sleeping) (NMSleepMonitor *monitor);
-+	void (*resuming) (NMSleepMonitor *monitor);
-+};
-+
-+
-+enum {
-+	SLEEPING,
-+	RESUMING,
-+	LAST_SIGNAL,
-+};
-+static guint signals[LAST_SIGNAL] = {0};
-+
-+G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT);
-+
-+/********************************************************************/
-+
-+static void
-+inhibit_done (GObject      *source,
-+              GAsyncResult *result,
-+              gpointer      user_data)
-+{
-+	GDBusProxy *sd_proxy = G_DBUS_PROXY (source);
-+	NMSleepMonitor *self = user_data;
-+	GError *error = NULL;
-+	GVariant *res;
-+	GUnixFDList *fd_list;
-+
-+	res = g_dbus_proxy_call_with_unix_fd_list_finish (sd_proxy, &fd_list, result, &error);
-+	if (!res) {
-+		nm_log_warn (LOGD_SUSPEND, "Inhibit failed: %s", error->message);
-+		g_error_free (error);
-+	} else {
-+		if (!fd_list || g_unix_fd_list_get_length (fd_list) != 1)
-+			nm_log_warn (LOGD_SUSPEND, "Didn't get a single fd back");
-+
-+		self->inhibit_fd = g_unix_fd_list_get (fd_list, 0, NULL);
-+
-+		nm_log_dbg (LOGD_SUSPEND, "Inhibitor fd is %d", self->inhibit_fd);
-+		g_object_unref (fd_list);
-+		g_variant_unref (res);
-+	}
-+}
-+
-+static void
-+take_inhibitor (NMSleepMonitor *self)
-+{
-+	g_assert (self->inhibit_fd == -1);
-+
-+	nm_log_dbg (LOGD_SUSPEND, "Taking systemd sleep inhibitor");
-+	g_dbus_proxy_call_with_unix_fd_list (self->sd_proxy,
-+	                                     "Inhibit",
-+	                                     g_variant_new ("(ssss)",
-+	                                                    "sleep",
-+	                                                    g_get_user_name (),
-+	                                                    "inhibited",
-+	                                                    "delay"),
-+	                                     0,
-+	                                     G_MAXINT,
-+	                                     NULL,
-+	                                     NULL,
-+	                                     inhibit_done,
-+	                                     self);
-+}
-+
-+static gboolean
-+drop_inhibitor (NMSleepMonitor *self)
-+{
-+	if (self->inhibit_fd >= 0) {
-+		nm_log_dbg (LOGD_SUSPEND, "Dropping systemd sleep inhibitor");
-+		close (self->inhibit_fd);
-+		self->inhibit_fd = -1;
-+		return TRUE;
-+	}
-+	return FALSE;
-+}
-+
-+static void
-+signal_cb (GDBusProxy  *proxy,
-+           const gchar *sendername,
-+           const gchar *signalname,
-+           GVariant    *args,
-+           gpointer     data)
-+{
-+	NMSleepMonitor *self = data;
-+	gboolean is_about_to_suspend;
-+
-+	if (strcmp (signalname, "PrepareForSleep") != 0)
-+		return;
-+
-+	g_variant_get (args, "(b)", &is_about_to_suspend);
-+	nm_log_dbg (LOGD_SUSPEND, "Received PrepareForSleep signal: %d", is_about_to_suspend);
-+
-+	if (is_about_to_suspend) {
-+		g_signal_emit (self, signals[SLEEPING], 0);
-+		drop_inhibitor (self);
-+	} else {
-+		take_inhibitor (self);
-+		g_signal_emit (self, signals[RESUMING], 0);
-+	}
-+}
-+
-+static void
-+nm_sleep_monitor_init (NMSleepMonitor *self)
-+{
-+	GDBusConnection *bus;
-+
-+	self->inhibit_fd = -1;
-+	bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
-+	self->sd_proxy = g_dbus_proxy_new_sync (bus, 0, NULL,
-+	                                        SD_NAME, SD_PATH, SD_INTERFACE,
-+	                                        NULL, NULL);
-+	g_object_unref (bus);
-+	g_signal_connect (self->sd_proxy, "g-signal", G_CALLBACK (signal_cb), self);
-+	take_inhibitor (self);
-+}
-+
-+static void
-+finalize (GObject *object)
-+{
-+	NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
-+
-+	drop_inhibitor (self);
-+	if (self->sd_proxy)
-+		g_object_unref (self->sd_proxy);
-+
-+	if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL)
-+		G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);
-+}
-+
-+static void
-+nm_sleep_monitor_class_init (NMSleepMonitorClass *klass)
-+{
-+	GObjectClass *gobject_class;
-+
-+	gobject_class = G_OBJECT_CLASS (klass);
-+
-+	gobject_class->finalize = finalize;
-+
-+	signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING,
-+	                                  NM_TYPE_SLEEP_MONITOR,
-+	                                  G_SIGNAL_RUN_LAST,
-+	                                  G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping),
-+	                                  NULL,                   /* accumulator      */
-+	                                  NULL,                   /* accumulator data */
-+	                                  g_cclosure_marshal_VOID__VOID,
-+	                                  G_TYPE_NONE, 0);
-+	signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING,
-+	                                  NM_TYPE_SLEEP_MONITOR,
-+	                                  G_SIGNAL_RUN_LAST,
-+	                                  G_STRUCT_OFFSET (NMSleepMonitorClass, resuming),
-+	                                  NULL,                   /* accumulator      */
-+	                                  NULL,                   /* accumulator data */
-+	                                  g_cclosure_marshal_VOID__VOID,
-+	                                  G_TYPE_NONE, 0);
-+}
-+
-+NMSleepMonitor *
-+nm_sleep_monitor_get (void)
-+{
-+	static NMSleepMonitor *singleton = NULL;
-+
-+	if (singleton)
-+		return g_object_ref (singleton);
-+
-+	singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL));
-+	return singleton;
-+}
-+
-+/* ---------------------------------------------------------------------------------------------------- */
-diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
-new file mode 100644
-index 0000000..3c93f66
---- /dev/null
-+++ b/src/nm-sleep-monitor-upower.c
-@@ -0,0 +1,151 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * (C) Copyright 2012 Red Hat, Inc.
-+ * Author: Matthias Clasen <mclasen@redhat.com>
-+ */
-+
-+#include "config.h"
-+#include <errno.h>
-+#include <string.h>
-+#include <sys/stat.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+#include <dbus/dbus-glib.h>
-+#include <gio/gio.h>
-+#include "nm-logging.h"
-+#include "nm-dbus-manager.h"
-+
-+#include "nm-sleep-monitor.h"
-+
-+#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
-+
-+struct _NMSleepMonitor {
-+        GObject parent_instance;
-+
-+        DBusGProxy *upower_proxy;
-+};
-+
-+struct _NMSleepMonitorClass {
-+        GObjectClass parent_class;
-+
-+        void (*sleeping) (NMSleepMonitor *monitor);
-+        void (*resuming) (NMSleepMonitor *monitor);
-+};
-+
-+
-+enum {
-+        SLEEPING,
-+        RESUMING,
-+        LAST_SIGNAL,
-+};
-+static guint signals[LAST_SIGNAL] = {0};
-+
-+G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT);
-+
-+/********************************************************************/
-+
-+static void
-+upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data)
-+{
-+        nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal");
-+        g_signal_emit (user_data, signals[SLEEPING], 0);
-+}
-+
-+static void
-+upower_resuming_cb (DBusGProxy *proxy, gpointer user_data)
-+{
-+        nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal");
-+        g_signal_emit (user_data, signals[RESUMING], 0);
-+}
-+
-+static void
-+nm_sleep_monitor_init (NMSleepMonitor *self)
-+{
-+        NMDBusManager *dbus_mgr;
-+        DBusGConnection *bus;
-+
-+        dbus_mgr = nm_dbus_manager_get ();
-+        bus = nm_dbus_manager_get_connection (dbus_mgr);
-+        self->upower_proxy = dbus_g_proxy_new_for_name (bus,
-+                                                        UPOWER_DBUS_SERVICE,
-+                                                        "/org/freedesktop/UPower",
-+                                                        "org.freedesktop.UPower");
-+        if (self->upower_proxy) {
-+                dbus_g_proxy_add_signal (self->upower_proxy, "Sleeping", G_TYPE_INVALID);
-+                dbus_g_proxy_connect_signal (self->upower_proxy, "Sleeping",
-+                                             G_CALLBACK (upower_sleeping_cb),
-+                                             self, NULL);
-+
-+                dbus_g_proxy_add_signal (self->upower_proxy, "Resuming", G_TYPE_INVALID);
-+                dbus_g_proxy_connect_signal (self->upower_proxy, "Resuming",
-+                                             G_CALLBACK (upower_resuming_cb),
-+                                             self, NULL);
-+        } else
-+                nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy");
-+        g_object_unref (dbus_mgr);
-+}
-+
-+static void
-+finalize (GObject *object)
-+{
-+        NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
-+
-+        if (self->upower_proxy)
-+                g_object_unref (self->upower_proxy);
-+
-+        if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL)
-+                G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);
-+}
-+
-+static void
-+nm_sleep_monitor_class_init (NMSleepMonitorClass *klass)
-+{
-+        GObjectClass *gobject_class;
-+
-+        gobject_class = G_OBJECT_CLASS (klass);
-+
-+        gobject_class->finalize = finalize;
-+
-+        signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING,
-+                                          NM_TYPE_SLEEP_MONITOR,
-+                                          G_SIGNAL_RUN_LAST,
-+                                          G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping),
-+                                          NULL,                   /* accumulator      */
-+                                          NULL,                   /* accumulator data */
-+                                          g_cclosure_marshal_VOID__VOID,
-+                                          G_TYPE_NONE, 0);
-+        signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING,
-+                                          NM_TYPE_SLEEP_MONITOR,
-+                                          G_SIGNAL_RUN_LAST,
-+                                          G_STRUCT_OFFSET (NMSleepMonitorClass, resuming),
-+                                          NULL,                   /* accumulator      */
-+                                          NULL,                   /* accumulator data */
-+                                          g_cclosure_marshal_VOID__VOID,
-+                                          G_TYPE_NONE, 0);
-+}
-+
-+NMSleepMonitor *
-+nm_sleep_monitor_get (void)
-+{
-+        static NMSleepMonitor *singleton = NULL;
-+
-+        if (singleton)
-+                return g_object_ref (singleton);
-+
-+        singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL));
-+        return singleton;
-+}
-+
-+/* ---------------------------------------------------------------------------------------------------- */
-diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h
-new file mode 100644
-index 0000000..173e6a1
---- /dev/null
-+++ b/src/nm-sleep-monitor.h
-@@ -0,0 +1,46 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * (C) Copyright 2012 Red Hat, Inc.
-+ * Author: Matthias Clasen <mclasen@redhat.com>
-+ */
-+
-+#ifndef NM_SLEEP_MONITOR_H
-+#define NM_SLEEP_MONITOR_H
-+
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+
-+#define NM_TYPE_SLEEP_MONITOR         (nm_sleep_monitor_get_type ())
-+#define NM_SLEEP_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitor))
-+#define NM_SLEEP_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass))
-+#define NM_SLEEP_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass))
-+#define NM_IS_SLEEP_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_SLEEP_MONITOR))
-+#define NM_IS_SLEEP_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_SLEEP_MONITOR))
-+
-+#define NM_SLEEP_MONITOR_SLEEPING "sleeping"
-+#define NM_SLEEP_MONITOR_RESUMING "resuming"
-+
-+typedef struct _NMSleepMonitor         NMSleepMonitor;
-+typedef struct _NMSleepMonitorClass    NMSleepMonitorClass;
-+
-+GType           nm_sleep_monitor_get_type     (void) G_GNUC_CONST;
-+NMSleepMonitor *nm_sleep_monitor_get          (void);
-+
-+G_END_DECLS
-+
-+#endif /* NM_SLEEP_MONITOR_H */
-+
--- 
-1.7.12.2
-
diff --git a/extra/neverball/PKGBUILD b/extra/neverball/PKGBUILD
index 1c3adfd90..a2c8d0df7 100644
--- a/extra/neverball/PKGBUILD
+++ b/extra/neverball/PKGBUILD
@@ -1,35 +1,36 @@
-# $Id: PKGBUILD 148860 2012-02-05 11:53:11Z ibiru $
+# $Id: PKGBUILD 183160 2013-04-18 02:16:47Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=neverball
 pkgver=1.5.4
-pkgrel=4
+pkgrel=5
 pkgdesc="3D game similar to Super Monkey Ball or Marble Madness"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://neverball.org/"
 license=('GPL')
-depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs')
+depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs' \
+         'hicolor-icon-theme' 'xdg-utils')
 makedepends=('mesa')
+install=neverball.install
 source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz neverball-1.5.4-underlink.patch)
 sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7'
           'f71982b7187d569c57b30c4c40fedd6c0e72baca')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h
+prepare() {
+  cd ${pkgname}-${pkgver}
   patch -p0 -i ../neverball-1.5.4-underlink.patch
+}
 
-  if [ "${CARCH}" = "i686" ] ;then
-    make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS=""
-  else
-    make ENABLE_NLS=1 DATADIR=/usr/share/neverball
-  fi
+build() {
+  cd ${pkgname}-${pkgver}
+  make DATADIR=/usr/share/neverball LOCALEDIR=/usr/share/locale \
+    CPPFLAGS="$CPPFLAGS -DNDEBUG" CFLAGS="$CFLAGS"
 }
 
 package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}"/usr/share/{neverball,locale,applications,pixmaps,doc/neverball}
+  install -d "${pkgdir}"/usr/share/{neverball,locale,applications,doc/neverball}
   install -d "${pkgdir}"/usr/share/man/man{1,6}
 
   install -m755 neverball neverputt mapc "${pkgdir}/usr/bin"
@@ -37,11 +38,13 @@ package(){
   cp -r data/* "${pkgdir}/usr/share/neverball/"
   install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/"
   install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/"
-  install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/"
   install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1"
   install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6"
 
-  ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png"
-  ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png"
-  find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \;
+  for i in 16 24 32 48 64 128 256; do
+    install -D -m644 dist/neverball_$i.png "${pkgdir}/usr/share/icons/hicolor/${i}x$i/apps/neverball.png"
+    install -D -m644 dist/neverputt_$i.png "${pkgdir}/usr/share/icons/hicolor/${i}x$i/apps/neverputt.png"
+  done
+
+  chmod -R u=rwX,go=rX "${pkgdir}/usr/share/neverball"
 }
diff --git a/extra/kshutdown/kshutdown.install b/extra/neverball/neverball.install
index 1c0de2e4f..1c0de2e4f 100644
--- a/extra/kshutdown/kshutdown.install
+++ b/extra/neverball/neverball.install
diff --git a/extra/nicotine/PKGBUILD b/extra/nicotine/PKGBUILD
deleted file mode 100644
index eafd29181..000000000
--- a/extra/nicotine/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168342 2012-10-09 00:13:39Z eric $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-# Contributor: Andrew Wright <andreww@photism.org>
-
-pkgname=nicotine
-pkgver=1.2.16
-pkgrel=4
-pkgdesc="Soulseek music-sharing client, written in python"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://sourceforge.net/projects/nicotine-plus/"
-license=('GPL')
-depends=('pygtk' 'mutagen')
-optdepends=('python2-geoip: to enable Geographical blocker')
-source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2)
-md5sums=('ac7433c21ef619a37e079a7ae68da94a')
-
-build() {
-  cd "${srcdir}/${pkgname}+-${pkgver}"
-  sed -i -e "s/Icon=nicotine-plus/Icon=nicotine-plus-32px/" files/nicotine.desktop # Fixing FS#22476
-  sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \
-    -e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py
-
-  python2 setup.py install --root="${pkgdir}"
-  cd trayicon
-  python2 autogen.py
-  make 
-}
-
-package() {
-  cd "${srcdir}/${pkgname}+-${pkgver}/trayicon"
-  make DESTDIR="${pkgdir}" install 
-  ln -s nicotine.py "${pkgdir}/usr/bin/nicotine"
-}
diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD
index 05bcf81d0..f9c429c43 100644
--- a/extra/nmap/PKGBUILD
+++ b/extra/nmap/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=nmap
 pkgver=6.25
-pkgrel=2
+pkgrel=2.1
 pkgdesc='Utility for network discovery and security auditing'
 url='http://nmap.org/'
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/nmap/kdesu.patch b/extra/nmap/kdesu.patch
deleted file mode 100644
index daed631d6..000000000
--- a/extra/nmap/kdesu.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur old/zenmap/install_scripts/unix/su-to-zenmap.sh new/zenmap/install_scripts/unix/su-to-zenmap.sh
---- old/zenmap/install_scripts/unix/su-to-zenmap.sh	2012-08-17 18:34:05.863827354 +1000
-+++ new/zenmap/install_scripts/unix/su-to-zenmap.sh	2012-08-17 18:35:53.872952226 +1000
-@@ -40,8 +40,8 @@
-     fi
-     case $SU_TO_ROOT_X in
-       gksu) gksu -u "$PRIV" "$COMMAND";;
--      kdesu) kdesu -u "$PRIV" "$COMMAND";;
--      kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" "$COMMAND";;
-+      kdesu) kdesu -u "$PRIV" -c "$COMMAND";;
-+      kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" -c "$COMMAND";;
-       ktsuss) ktsuss -u "$PRIV" "$COMMAND";;
-   # As a last resort, open a new xterm use sudo/su
-       sdterm) xterm -e "sudo -u $PRIV $COMMAND";;
diff --git a/extra/normalize/PKGBUILD b/extra/normalize/PKGBUILD
deleted file mode 100644
index 9733d387a..000000000
--- a/extra/normalize/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 149021 2012-02-05 14:18:12Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=normalize
-pkgver=0.7.7
-pkgrel=6
-pkgdesc="A tool for adjusting the volume of WAV files to a standard level"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://normalize.nongnu.org"
-license=('GPL')
-depends=('audiofile' 'libmad' 'vorbis-tools' 'lame' 'flac' 'mpg123')
-makedepends=('pkg-config' 'intltool')
-source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'normalize-0.7.7-audiofile-pkgconfig.patch'
-        'normalize-0.7.7-m4.patch')
-md5sums=('1749b16fc7a08aa5d0cf9f76eeaa8436'
-         '77d565e29bef11837e80347adfd42b58'
-         '0b4bca7bf183275b9f939576ebad4233')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/normalize-0.7.7-audiofile-pkgconfig.patch"
-  patch -Np0 -i "${srcdir}/normalize-0.7.7-m4.patch"
-
-  touch AUTHORS NEWS ChangeLog
-  libtoolize --force --copy
-  aclocal -I m4
-  autoreconf
-  automake --add-missing
-
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man \
-              --with-audiofile \
-              --with-mad
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/normalize/normalize-0.7.7-audiofile-pkgconfig.patch b/extra/normalize/normalize-0.7.7-audiofile-pkgconfig.patch
deleted file mode 100644
index 09f211cdf..000000000
--- a/extra/normalize/normalize-0.7.7-audiofile-pkgconfig.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Use pkgconfig to check for audiofile since the audiofile-config script was
-removed from >=audiofile-0.3.0.
-
---- normalize-0.7.7/configure.ac.orig
-+++ normalize-0.7.7/configure.ac
-@@ -248,33 +248,16 @@
- 
- 
- dnl *** Stuff for audiofile library ***
--dnl v0.2.1 and before have bugs with 24-bit LE files
--AM_PATH_AUDIOFILE([ 0.2.2 ], [ have_audiofile=true ])
--dnl AC_CHECK_LIB(audiofile, afSetVirtualSampleFormat, have_audiofile=true)
-+AC_ARG_WITH(audiofile, AC_HELP_STRING([--with-audiofile],
-+		   [use the audiofile library (default yes)]))
- AH_TEMPLATE([USE_AUDIOFILE],
- 	    [Define if you want to use the audiofile library.])
--AC_ARG_WITH(audiofile,
--    AC_HELP_STRING([--with-audiofile],
--		   [use the audiofile library (default yes)]),
--    [ case "$withval" in
--	  no) with_audiofile=false ;;
--	  *) with_audiofile=true ;;
--      esac ])
- 
--use_audiofile=false
--if test x$with_audiofile != xfalse; then
--    if test x$have_audiofile = xtrue; then
--	AC_DEFINE(USE_AUDIOFILE)
--	use_audiofile=true
--dnl	AUDIOFILELIBS="-laudiofile"
--    elif test x$with_audiofile = xtrue; then
--	AC_MSG_ERROR([--with-audiofile specified, but audiofile library not found])
--    fi
--fi
--dnl AC_SUBST(AUDIOFILELIBS)
--test x$use_audiofile = xfalse && AUDIOFILE_LIBS=
--test x$use_audiofile = xfalse && AUDIOFILE_CFLAGS=
--AM_CONDITIONAL(AUDIOFILE, test x$use_audiofile = xtrue)
-+AS_IF([test "x$with_audiofile" = "xyes"], [
-+    PKG_CHECK_MODULES([AUDIOFILE], [audiofile])
-+    AC_DEFINE(USE_AUDIOFILE)
-+])
-+AM_CONDITIONAL(AUDIOFILE, test x$with_audiofile = xyes)
- 
- 
- dnl *** Stuff for mad mpeg audio decoder library ***
-@@ -330,7 +313,7 @@
- 
- echo
- echo "Configuration:"
--echo "    audiofile library:         $use_audiofile"
-+echo "    audiofile library:         $with_audiofile"
- echo "    mpeg audio support:        $use_mad"
- echo "    xmms volume adjust plugin: $use_xmms"
- echo
diff --git a/extra/normalize/normalize-0.7.7-m4.patch b/extra/normalize/normalize-0.7.7-m4.patch
deleted file mode 100644
index 2aeb3e451..000000000
--- a/extra/normalize/normalize-0.7.7-m4.patch
+++ /dev/null
@@ -1,553 +0,0 @@
---- m4/extra.m4
-+++ m4/extra.m4
-@@ -0,0 +1,550 @@
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005  Free Software Foundation, Inc.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+# Configure paths for GLIB
-+# Owen Taylor     97-11-3
-+
-+dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
-+dnl gthread is specified in MODULES, pass to glib-config
-+dnl
-+AC_DEFUN(AM_PATH_GLIB,
-+[dnl 
-+dnl Get the cflags and libraries from the glib-config script
-+dnl
-+AC_ARG_WITH(glib-prefix,[  --with-glib-prefix=PFX   Prefix where GLIB is installed (optional)],
-+            glib_config_prefix="$withval", glib_config_prefix="")
-+AC_ARG_WITH(glib-exec-prefix,[  --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
-+            glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
-+AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile and run a test GLIB program],
-+		    , enable_glibtest=yes)
-+
-+  if test x$glib_config_exec_prefix != x ; then
-+     glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
-+     if test x${GLIB_CONFIG+set} != xset ; then
-+        GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
-+     fi
-+  fi
-+  if test x$glib_config_prefix != x ; then
-+     glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
-+     if test x${GLIB_CONFIG+set} != xset ; then
-+        GLIB_CONFIG=$glib_config_prefix/bin/glib-config
-+     fi
-+  fi
-+
-+  for module in . $4
-+  do
-+      case "$module" in
-+         gmodule) 
-+             glib_config_args="$glib_config_args gmodule"
-+         ;;
-+         gthread) 
-+             glib_config_args="$glib_config_args gthread"
-+         ;;
-+      esac
-+  done
-+
-+  AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
-+  min_glib_version=ifelse([$1], ,0.99.7,$1)
-+  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-+  no_glib=""
-+  if test "$GLIB_CONFIG" = "no" ; then
-+    no_glib=yes
-+  else
-+    GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
-+    GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
-+    glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+    glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+    glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+    if test "x$enable_glibtest" = "xyes" ; then
-+      ac_save_CFLAGS="$CFLAGS"
-+      ac_save_LIBS="$LIBS"
-+      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-+      LIBS="$GLIB_LIBS $LIBS"
-+dnl
-+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-+dnl checks the results of glib-config to some extent
-+dnl
-+      rm -f conf.glibtest
-+      AC_TRY_RUN([
-+#include <glib.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+int 
-+main ()
-+{
-+  int major, minor, micro;
-+  char *tmp_version;
-+
-+  system ("touch conf.glibtest");
-+
-+  /* HP/UX 9 (%@#!) writes to sscanf strings */
-+  tmp_version = g_strdup("$min_glib_version");
-+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+     printf("%s, bad version string\n", "$min_glib_version");
-+     exit(1);
-+   }
-+
-+  if ((glib_major_version != $glib_config_major_version) ||
-+      (glib_minor_version != $glib_config_minor_version) ||
-+      (glib_micro_version != $glib_config_micro_version))
-+    {
-+      printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-+             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-+             glib_major_version, glib_minor_version, glib_micro_version);
-+      printf ("*** was found! If glib-config was correct, then it is best\n");
-+      printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
-+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+      printf("*** required on your system.\n");
-+      printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
-+      printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
-+      printf("*** before re-running configure\n");
-+    } 
-+  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-+	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-+           (glib_micro_version != GLIB_MICRO_VERSION))
-+    {
-+      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-+	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-+      printf("*** library (version %d.%d.%d)\n",
-+	     glib_major_version, glib_minor_version, glib_micro_version);
-+    }
-+  else
-+    {
-+      if ((glib_major_version > major) ||
-+        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-+        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-+      {
-+        return 0;
-+       }
-+     else
-+      {
-+        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-+               glib_major_version, glib_minor_version, glib_micro_version);
-+        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-+	       major, minor, micro);
-+        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-+        printf("***\n");
-+        printf("*** If you have already installed a sufficiently new version, this error\n");
-+        printf("*** probably means that the wrong copy of the glib-config shell script is\n");
-+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+        printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
-+        printf("*** correct copy of glib-config. (In this case, you will have to\n");
-+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+        printf("*** so that the correct libraries are found at run-time))\n");
-+      }
-+    }
-+  return 1;
-+}
-+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+       CFLAGS="$ac_save_CFLAGS"
-+       LIBS="$ac_save_LIBS"
-+     fi
-+  fi
-+  if test "x$no_glib" = x ; then
-+     AC_MSG_RESULT(yes)
-+     ifelse([$2], , :, [$2])     
-+  else
-+     AC_MSG_RESULT(no)
-+     if test "$GLIB_CONFIG" = "no" ; then
-+       echo "*** The glib-config script installed by GLIB could not be found"
-+       echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
-+       echo "*** your path, or set the GLIB_CONFIG environment variable to the"
-+       echo "*** full path to glib-config."
-+     else
-+       if test -f conf.glibtest ; then
-+        :
-+       else
-+          echo "*** Could not run GLIB test program, checking why..."
-+          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-+          LIBS="$LIBS $GLIB_LIBS"
-+          AC_TRY_LINK([
-+#include <glib.h>
-+#include <stdio.h>
-+],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-+        [ echo "*** The test program compiled, but did not run. This usually means"
-+          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-+          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-+          echo "*** is required on your system"
-+	  echo "***"
-+          echo "*** If you have an old version installed, it is best to remove it, although"
-+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-+          echo "***"
-+          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-+          echo "*** came with the system with the command"
-+          echo "***"
-+          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
-+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+          echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
-+          echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
-+          echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
-+          CFLAGS="$ac_save_CFLAGS"
-+          LIBS="$ac_save_LIBS"
-+       fi
-+     fi
-+     GLIB_CFLAGS=""
-+     GLIB_LIBS=""
-+     ifelse([$3], , :, [$3])
-+  fi
-+  AC_SUBST(GLIB_CFLAGS)
-+  AC_SUBST(GLIB_LIBS)
-+  rm -f conf.glibtest
-+])
-+
-+# Configure paths for GTK+
-+# Owen Taylor     97-11-3
-+
-+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
-+dnl
-+AC_DEFUN(AM_PATH_GTK,
-+[dnl 
-+dnl Get the cflags and libraries from the gtk-config script
-+dnl
-+AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
-+            gtk_config_prefix="$withval", gtk_config_prefix="")
-+AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
-+            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
-+AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
-+		    , enable_gtktest=yes)
-+
-+  for module in . $4
-+  do
-+      case "$module" in
-+         gthread) 
-+             gtk_config_args="$gtk_config_args gthread"
-+         ;;
-+      esac
-+  done
-+
-+  if test x$gtk_config_exec_prefix != x ; then
-+     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-+     if test x${GTK_CONFIG+set} != xset ; then
-+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+     fi
-+  fi
-+  if test x$gtk_config_prefix != x ; then
-+     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-+     if test x${GTK_CONFIG+set} != xset ; then
-+        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+     fi
-+  fi
-+
-+  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-+  min_gtk_version=ifelse([$1], ,0.99.7,$1)
-+  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
-+  no_gtk=""
-+  if test "$GTK_CONFIG" = "no" ; then
-+    no_gtk=yes
-+  else
-+    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
-+    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
-+    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+    if test "x$enable_gtktest" = "xyes" ; then
-+      ac_save_CFLAGS="$CFLAGS"
-+      ac_save_LIBS="$LIBS"
-+      CFLAGS="$CFLAGS $GTK_CFLAGS"
-+      LIBS="$GTK_LIBS $LIBS"
-+dnl
-+dnl Now check if the installed GTK is sufficiently new. (Also sanity
-+dnl checks the results of gtk-config to some extent
-+dnl
-+      rm -f conf.gtktest
-+      AC_TRY_RUN([
-+#include <gtk/gtk.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+int 
-+main ()
-+{
-+  int major, minor, micro;
-+  char *tmp_version;
-+
-+  system ("touch conf.gtktest");
-+
-+  /* HP/UX 9 (%@#!) writes to sscanf strings */
-+  tmp_version = g_strdup("$min_gtk_version");
-+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+     printf("%s, bad version string\n", "$min_gtk_version");
-+     exit(1);
-+   }
-+
-+  if ((gtk_major_version != $gtk_config_major_version) ||
-+      (gtk_minor_version != $gtk_config_minor_version) ||
-+      (gtk_micro_version != $gtk_config_micro_version))
-+    {
-+      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-+             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-+             gtk_major_version, gtk_minor_version, gtk_micro_version);
-+      printf ("*** was found! If gtk-config was correct, then it is best\n");
-+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+      printf("*** required on your system.\n");
-+      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
-+      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-+      printf("*** before re-running configure\n");
-+    } 
-+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
-+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-+	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-+           (gtk_micro_version != GTK_MICRO_VERSION))
-+    {
-+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-+	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-+      printf("*** library (version %d.%d.%d)\n",
-+	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-+    }
-+#endif /* defined (GTK_MAJOR_VERSION) ... */
-+  else
-+    {
-+      if ((gtk_major_version > major) ||
-+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-+      {
-+        return 0;
-+       }
-+     else
-+      {
-+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-+               gtk_major_version, gtk_minor_version, gtk_micro_version);
-+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-+	       major, minor, micro);
-+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-+        printf("***\n");
-+        printf("*** If you have already installed a sufficiently new version, this error\n");
-+        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
-+        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+        printf("*** so that the correct libraries are found at run-time))\n");
-+      }
-+    }
-+  return 1;
-+}
-+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+       CFLAGS="$ac_save_CFLAGS"
-+       LIBS="$ac_save_LIBS"
-+     fi
-+  fi
-+  if test "x$no_gtk" = x ; then
-+     AC_MSG_RESULT(yes)
-+     ifelse([$2], , :, [$2])     
-+  else
-+     AC_MSG_RESULT(no)
-+     if test "$GTK_CONFIG" = "no" ; then
-+       echo "*** The gtk-config script installed by GTK could not be found"
-+       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-+       echo "*** your path, or set the GTK_CONFIG environment variable to the"
-+       echo "*** full path to gtk-config."
-+     else
-+       if test -f conf.gtktest ; then
-+        :
-+       else
-+          echo "*** Could not run GTK test program, checking why..."
-+          CFLAGS="$CFLAGS $GTK_CFLAGS"
-+          LIBS="$LIBS $GTK_LIBS"
-+          AC_TRY_LINK([
-+#include <gtk/gtk.h>
-+#include <stdio.h>
-+],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-+        [ echo "*** The test program compiled, but did not run. This usually means"
-+          echo "*** that the run-time linker is not finding GTK or finding the wrong"
-+          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
-+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-+          echo "*** is required on your system"
-+	  echo "***"
-+          echo "*** If you have an old version installed, it is best to remove it, although"
-+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-+          echo "***"
-+          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-+          echo "*** came with the system with the command"
-+          echo "***"
-+          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
-+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
-+          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
-+          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
-+          CFLAGS="$ac_save_CFLAGS"
-+          LIBS="$ac_save_LIBS"
-+       fi
-+     fi
-+     GTK_CFLAGS=""
-+     GTK_LIBS=""
-+     ifelse([$3], , :, [$3])
-+  fi
-+  AC_SUBST(GTK_CFLAGS)
-+  AC_SUBST(GTK_LIBS)
-+  rm -f conf.gtktest
-+])
-+
-+# CFLAGS and library paths for XMMS
-+# written 15 December 1999 by Ben Gertzfield <che@debian.org>
-+
-+dnl Usage:
-+dnl AM_PATH_XMMS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-+dnl
-+dnl Example:
-+dnl AM_PATH_XMMS(0.9.5.1, , AC_MSG_ERROR([*** XMMS >= 0.9.5.1 not installed - please install first ***]))
-+dnl
-+dnl Defines XMMS_CFLAGS, XMMS_LIBS, XMMS_DATA_DIR, XMMS_PLUGIN_DIR, 
-+dnl XMMS_VISUALIZATION_PLUGIN_DIR, XMMS_INPUT_PLUGIN_DIR, 
-+dnl XMMS_OUTPUT_PLUGIN_DIR, XMMS_GENERAL_PLUGIN_DIR, XMMS_EFFECT_PLUGIN_DIR,
-+dnl and XMMS_VERSION for your plugin pleasure.
-+dnl
-+
-+dnl XMMS_TEST_VERSION(AVAILABLE-VERSION, NEEDED-VERSION [, ACTION-IF-OKAY [, ACTION-IF-NOT-OKAY]])
-+AC_DEFUN(XMMS_TEST_VERSION, [
-+
-+# Determine which version number is greater. Prints 2 to stdout if	
-+# the second number is greater, 1 if the first number is greater,	
-+# 0 if the numbers are equal.						
-+									
-+# Written 15 December 1999 by Ben Gertzfield <che@debian.org>		
-+# Revised 15 December 1999 by Jim Monty <monty@primenet.com>		
-+									
-+    AC_PROG_AWK
-+    xmms_got_version=[` $AWK '						\
-+BEGIN {									\
-+    print vercmp(ARGV[1], ARGV[2]);					\
-+}									\
-+									\
-+function vercmp(ver1, ver2,    ver1arr, ver2arr,			\
-+                               ver1len, ver2len,			\
-+                               ver1int, ver2int, len, i, p) {		\
-+									\
-+    ver1len = split(ver1, ver1arr, /\./);				\
-+    ver2len = split(ver2, ver2arr, /\./);				\
-+									\
-+    len = ver1len > ver2len ? ver1len : ver2len;			\
-+									\
-+    for (i = 1; i <= len; i++) {					\
-+        p = 1000 ^ (len - i);						\
-+        ver1int += ver1arr[i] * p;					\
-+        ver2int += ver2arr[i] * p;					\
-+    }									\
-+									\
-+    if (ver1int < ver2int)						\
-+        return 2;							\
-+    else if (ver1int > ver2int)						\
-+        return 1;							\
-+    else								\
-+        return 0;							\
-+}' $1 $2`]								
-+
-+    if test $xmms_got_version -eq 2; then 	# failure
-+	ifelse([$4], , :, $4)			
-+    else  					# success!
-+	ifelse([$3], , :, $3)
-+    fi
-+])
-+
-+AC_DEFUN(AM_PATH_XMMS,
-+[
-+AC_ARG_WITH(xmms-prefix,[  --with-xmms-prefix=PFX  Prefix where XMMS is installed (optional)],
-+	xmms_config_prefix="$withval", xmms_config_prefix="")
-+AC_ARG_WITH(xmms-exec-prefix,[  --with-xmms-exec-prefix=PFX Exec prefix where XMMS is installed (optional)],
-+	xmms_config_exec_prefix="$withval", xmms_config_exec_prefix="")
-+
-+if test x$xmms_config_exec_prefix != x; then
-+    xmms_config_args="$xmms_config_args --exec-prefix=$xmms_config_exec_prefix"
-+    if test x${XMMS_CONFIG+set} != xset; then
-+	XMMS_CONFIG=$xmms_config_exec_prefix/bin/xmms-config
-+    fi
-+fi
-+
-+if test x$xmms_config_prefix != x; then
-+    xmms_config_args="$xmms_config_args --prefix=$xmms_config_prefix"
-+    if test x${XMMS_CONFIG+set} != xset; then
-+  	XMMS_CONFIG=$xmms_config_prefix/bin/xmms-config
-+    fi
-+fi
-+
-+AC_PATH_PROG(XMMS_CONFIG, xmms-config, no)
-+min_xmms_version=ifelse([$1], ,0.9.5.1, $1)
-+
-+if test "$XMMS_CONFIG" = "no"; then
-+    no_xmms=yes
-+else
-+    XMMS_CFLAGS=`$XMMS_CONFIG $xmms_config_args --cflags`
-+    XMMS_LIBS=`$XMMS_CONFIG $xmms_config_args --libs`
-+    XMMS_VERSION=`$XMMS_CONFIG $xmms_config_args --version`
-+    XMMS_DATA_DIR=`$XMMS_CONFIG $xmms_config_args --data-dir`
-+    XMMS_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --plugin-dir`
-+    XMMS_VISUALIZATION_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args \
-+					--visualization-plugin-dir`
-+    XMMS_INPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --input-plugin-dir`
-+    XMMS_OUTPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --output-plugin-dir`
-+    XMMS_EFFECT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --effect-plugin-dir`
-+    XMMS_GENERAL_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --general-plugin-dir`
-+
-+    XMMS_TEST_VERSION($XMMS_VERSION, $min_xmms_version, ,no_xmms=version)
-+fi
-+
-+AC_MSG_CHECKING(for XMMS - version >= $min_xmms_version)
-+
-+if test "x$no_xmms" = x; then
-+    AC_MSG_RESULT(yes)
-+    ifelse([$2], , :, [$2])
-+else
-+    AC_MSG_RESULT(no)
-+
-+    if test "$XMMS_CONFIG" = "no" ; then
-+	echo "*** The xmms-config script installed by XMMS could not be found."
-+      	echo "*** If XMMS was installed in PREFIX, make sure PREFIX/bin is in"
-+	echo "*** your path, or set the XMMS_CONFIG environment variable to the"
-+	echo "*** full path to xmms-config."
-+    else
-+	if test "$no_xmms" = "version"; then
-+	    echo "*** An old version of XMMS, $XMMS_VERSION, was found."
-+	    echo "*** You need a version of XMMS newer than $min_xmms_version."
-+	    echo "*** The latest version of XMMS is always available from"
-+	    echo "*** http://www.xmms.org/"
-+	    echo "***"
-+
-+            echo "*** If you have already installed a sufficiently new version, this error"
-+            echo "*** probably means that the wrong copy of the xmms-config shell script is"
-+            echo "*** being found. The easiest way to fix this is to remove the old version"
-+            echo "*** of XMMS, but you can also set the XMMS_CONFIG environment to point to the"
-+            echo "*** correct copy of xmms-config. (In this case, you will have to"
-+            echo "*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf"
-+            echo "*** so that the correct libraries are found at run-time)"
-+	fi
-+    fi
-+    XMMS_CFLAGS=""
-+    XMMS_LIBS=""
-+    ifelse([$3], , :, [$3])
-+fi
-+AC_SUBST(XMMS_CFLAGS)
-+AC_SUBST(XMMS_LIBS)
-+AC_SUBST(XMMS_VERSION)
-+AC_SUBST(XMMS_DATA_DIR)
-+AC_SUBST(XMMS_PLUGIN_DIR)
-+AC_SUBST(XMMS_VISUALIZATION_PLUGIN_DIR)
-+AC_SUBST(XMMS_INPUT_PLUGIN_DIR)
-+AC_SUBST(XMMS_OUTPUT_PLUGIN_DIR)
-+AC_SUBST(XMMS_GENERAL_PLUGIN_DIR)
-+AC_SUBST(XMMS_EFFECT_PLUGIN_DIR)
-+])
diff --git a/extra/notification-daemon/PKGBUILD b/extra/notification-daemon/PKGBUILD
index f71a73e7d..8bba639c3 100644
--- a/extra/notification-daemon/PKGBUILD
+++ b/extra/notification-daemon/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 166585 2012-09-12 17:37:48Z jgc $
+# $Id: PKGBUILD 183449 2013-04-21 22:11:53Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Mark Rosenstand <mark@borkware.net>
 
 pkgname=notification-daemon
 pkgver=0.7.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Notification daemon for the desktop notifications framework"
 arch=(i686 x86_64 'mips64el')
-license=('GPL')
+license=(GPL)
 url="http://www.galago-project.org/specs/notification/"
-depends=('gtk3' 'libcanberra')
-groups=('gnome')
-makedepends=('pkgconfig' 'intltool')
+depends=(gtk3 libcanberra)
+makedepends=(pkgconfig intltool)
 options=('!libtool' '!emptydirs')
 source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('64d0ce6fb12c94c3b73b701502c804c408cb5a94580bcae5ac37607639f7a0b3')
@@ -24,6 +23,11 @@ build() {
     make
 }
 
+check() {
+    cd ${pkgname}-${pkgver}
+    make check
+}
+
 package() {
     cd ${pkgname}-${pkgver}
     make DESTDIR=${pkgdir} install
diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD
index 00f6cf667..e4a3d09eb 100644
--- a/extra/nspr/PKGBUILD
+++ b/extra/nspr/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 173931 2012-12-28 07:40:52Z andyrtr $
+# $Id: PKGBUILD 182378 2013-04-09 18:38:44Z ioni $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=nspr
-pkgver=4.9.4
+pkgver=4.9.6
 pkgrel=1
 pkgdesc="Netscape Portable Runtime"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('zip')
 options=(!emptydirs)
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
         nspr.pc.in)
-md5sums=('cf58772702b3abbdcff14e22014eeeaf'
+md5sums=('62b1e9d376d503d972f90c3c0031d879'
          'bce1611f3117b53fc904cab549c09967')
 
 build() {
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index a2f9c41e6..0dd9b420b 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,32 +1,30 @@
-# $Id: PKGBUILD 174760 2013-01-06 20:10:23Z jgc $
+# $Id: PKGBUILD 178844 2013-02-27 16:21:24Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nss
-pkgver=3.14.1.1.93
-_pkgver=3.14.1
-pkgrel=1
+pkgver=3.14.3
+pkgrel=2
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64 'mips64el')
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
-_nsprver=4.9.4
+_nsprver=4.9.5
 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
 makedepends=('perl')
 options=('!strip')
-#source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_3_14_1_WITH_CKBI_1_93_RTM/src/${pkgname}-3.14.1.with.ckbi.1.93.tar.gz
+source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
         nss.pc.in
         nss-config.in
         ssl-renegotiate-transitional.patch
         add_spi+cacert_ca_certs.patch)
-sha1sums=('28b4a2316dc5e5d4605ac375449691c05b6f1c29'
+sha1sums=('94d8781d1fa29cfbd37453dda3e9488709b82c4c'
           'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
           'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
           '8a964a744ba098711b80c0d279a2993524e8eb92'
           'be6ef0f124f188ebb76f4d83e13466bdcfb27dd3')
 
 build() {
-  cd "${srcdir}/${pkgname}-${_pkgver}/mozilla"
+  cd "${srcdir}/${pkgname}-${pkgver}/mozilla"
   # Add CAcert and spi-inc.org CA certificates.
   # See http://wiki.cacert.org/NSSLib for how to generate
   patch -Np0 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
@@ -47,7 +45,7 @@ build() {
   #  cd security/nss/lib/ckfw/builtins
   #  make generate
 
-  cd "${srcdir}/${pkgname}-${_pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   export BUILD_OPT=1
   export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
   export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
@@ -65,7 +63,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
   install -m755 -d "${pkgdir}/usr/bin"
   install -m755 -d "${pkgdir}/usr/include/nss"
@@ -78,8 +76,8 @@ package() {
   				-e "s,%prefix%,/usr,g" \
 				-e "s,%exec_prefix%,/usr/bin,g" \
 				-e "s,%includedir%,/usr/include/nss,g" \
-				-e "s,%NSPR_VERSION%,${_pkgver},g" \
-				-e "s,%NSS_VERSION%,${_pkgver},g" > \
+				-e "s,%NSPR_VERSION%,${_nsprver},g" \
+				-e "s,%NSS_VERSION%,${pkgver},g" > \
 			"${pkgdir}/usr/lib/pkgconfig/nss.pc"
   ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc"
   chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc
diff --git a/extra/nss/nss-no-rpath.patch b/extra/nss/nss-no-rpath.patch
deleted file mode 100644
index 35ea57315..000000000
--- a/extra/nss/nss-no-rpath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./mozilla/security/nss/cmd/platlibs.mk.withrpath	2007-02-19 07:17:06.000000000 +0100
-+++ ./mozilla/security/nss/cmd/platlibs.mk	2007-02-19 07:18:07.000000000 +0100
-@@ -52,9 +52,9 @@
- 
- ifeq ($(OS_ARCH), Linux)
- ifeq ($(USE_64), 1)
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
-+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
- else
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
-+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
- endif
- endif
- 
diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD
index f31eea6af..e78410587 100644
--- a/extra/ntfs-3g_ntfsprogs/PKGBUILD
+++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 176861 2013-02-01 21:35:19Z eric $
+# $Id: PKGBUILD 179546 2013-03-06 15:52:21Z eric $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Thomas B�chler <thomas.archlinux.org>
 
 pkgbase=ntfs-3g_ntfsprogs
-pkgname=('ntfs-3g' 'ntfsprogs')
+pkgname=ntfs-3g
 pkgver=2013.1.13
-pkgrel=1
-url="http://www.tuxera.com/community/ntfs-3g-download/"
+pkgrel=2
+pkgdesc="NTFS filesystem utilities"
 arch=('i686' 'x86_64' 'mips64el')
+url="http://www.tuxera.com/community/ntfs-3g-download/"
 license=('GPL2')
-depends=('glibc' 'fuse')
+depends=('util-linux' 'fuse')
+conflicts=('ntfsprogs')
+provides=('ntfsprogs')
+replaces=('ntfsprogs')
 options=('!libtool')
 source=(http://tuxera.com/opensource/$pkgbase-$pkgver.tgz)
 sha1sums=('8c12b7644d90ae9fb8d0aca0d7ebd5f8fac2c818')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
+  sed -i 's|$(DESTDIR)/sbin|$(DESTDIR)/usr/bin|' {ntfsprogs,src}/Makefile.in
   ./configure --prefix=/usr \
     --with-fuse=external --disable-static \
     --enable-posix-acls --disable-ldconfig \
@@ -25,30 +30,7 @@ build() {
 }
 
 package_ntfs-3g() {
-  pkgdesc="Stable read and write NTFS driver"
-
-  for DIR in src libntfs-3g include; do
-    cd "$srcdir/$pkgbase-$pkgver/$DIR"
-    make DESTDIR="$pkgdir" install
-  done
-
-  mv "$pkgdir"/bin/* "$pkgdir"/usr/bin/
-  rm -rf "$pkgdir"/{s,}bin
-  rmdir "$pkgdir/lib"
-
-  cd "$pkgdir"/usr/bin
-  ln -s ntfs-3g mount.ntfs
-  ln -s ntfs-3g mount.ntfs-3g
-  ln -s lowntfs-3g mount.lowntfs-3g
-}
-
-package_ntfsprogs() {
-  pkgdesc="NTFS filesystem utilities"
-  depends=('util-linux' 'ntfs-3g')
-
-  cd "$srcdir/$pkgbase-$pkgver/ntfsprogs"
-  make DESTDIR="$pkgdir" install
-
-  mv "$pkgdir"/sbin/* "$pkgdir"/usr/bin/
-  rm -rf "$pkgdir"/sbin
+  cd "$srcdir/$pkgbase-$pkgver"
+  make DESTDIR="$pkgdir" rootbindir=/usr/bin rootsbindir=/usr/bin rootlibdir=/usr/lib install
+  ln -s /usr/bin/ntfs-3g "$pkgdir/usr/bin/mount.ntfs"
 }
diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD
index 757d3ef3b..cfd784f4f 100644
--- a/extra/ntp/PKGBUILD
+++ b/extra/ntp/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=ntp
 pkgver=4.2.6.p5
 _realver=4.2.6p5
-pkgrel=13
+pkgrel=13.1
 pkgdesc='Network Time Protocol reference implementation'
 url='http://www.ntp.org/'
 license=('custom')
diff --git a/extra/ntp/logrotate.d b/extra/ntp/logrotate.d
deleted file mode 100644
index 8a9f066c3..000000000
--- a/extra/ntp/logrotate.d
+++ /dev/null
@@ -1,4 +0,0 @@
-/var/log/ntp.log {
-	missingok
-	copytruncate
-}
diff --git a/extra/nvidia-304xx-lts/PKGBUILD b/extra/nvidia-304xx-lts/PKGBUILD
deleted file mode 100644
index 9794500d9..000000000
--- a/extra/nvidia-304xx-lts/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 172304 2012-12-02 11:03:10Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=nvidia-304xx-lts
-pkgver=304.64
-_extramodules=extramodules-3.0-lts
-pkgrel=1
-pkgdesc="NVIDIA drivers for linux-lts, 304xx legacy branch"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux-lts>=3.0.0' "nvidia-304xx-utils=${pkgver}")
-makedepends=('linux-lts-headers>=3.0.0')
-conflicts=('nvidia-lts' 'nvidia-96xx-lts' 'nvidia-173xx-lts')
-provides=('nvidia-304xx')
-license=('custom')
-install=nvidia-304xx-lts.install
-options=(!strip)
-if [ "$CARCH" = "i686" ]; then
-    _arch='x86'
-    _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('6964415cf648a5f4f38117b168369de2')
-elif [ "$CARCH" = "x86_64" ]; then
-    _arch='x86_64'
-   _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
-    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('76007ed4b72afd334e26377b646f5f7e')
-fi
-
-build() {
-    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-    cd "${srcdir}"
-    sh "${_pkg}.run" --extract-only
-    cd "${_pkg}/kernel"
-    make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-}
-
-package() {
-    install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
-        "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
-    install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
-    echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-304xx-lts.conf"
-    echo "blacklist nvidiafb" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-304xx-lts.conf"
-    gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
-}
diff --git a/extra/nvidia-304xx-lts/nvidia-304xx-lts.install b/extra/nvidia-304xx-lts/nvidia-304xx-lts.install
deleted file mode 100644
index d1f5eccaa..000000000
--- a/extra/nvidia-304xx-lts/nvidia-304xx-lts.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-3.0-lts'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.0-lts'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.0-lts'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
diff --git a/extra/nvidia-lts/PKGBUILD b/extra/nvidia-lts/PKGBUILD
deleted file mode 100644
index 606cabfa8..000000000
--- a/extra/nvidia-lts/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 171130 2012-11-16 19:30:17Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=nvidia-lts
-pkgver=310.19
-_extramodules=extramodules-3.0-lts
-pkgrel=1
-pkgdesc="NVIDIA drivers for linux-lts"
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux-lts>=3.0.0' "nvidia-utils=$pkgver")
-makedepends=('linux-lts-headers>=3.0.0')
-provides=('nvidia')
-license=('custom')
-install=nvidia-lts.install
-options=(!strip)
-if [ "$CARCH" = "i686" ]; then
-  _arch='x86'
-  _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-  source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-  md5sums=('2adbdd38540b3a8955714760e05f575d')
-elif [ "$CARCH" = "x86_64" ]; then
-  _arch='x86_64'
-  _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
-  source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-  md5sums=('0ba08d32852e442ebba5ba22c7abed36')
-fi
-
-build() {
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-  cd "${srcdir}"
-  sh ${_pkg}.run --extract-only
-  cd "${_pkg}/kernel"
-  make SYSSRC=/usr/lib/modules/${_kernver}/build module
-}
-
-package() {
-  install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
-    "${pkgdir}/usr/lib/modules/${_extramodules}/kernel/drivers/video/nvidia.ko"
-  gzip "${pkgdir}/usr/lib/modules/${_extramodules}/kernel/drivers/video/nvidia.ko"
-  install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
-  echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-lts.conf"
-  echo "blacklist nvidiafb" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-lts.conf"
-  install -D -m644 "${srcdir}/${_pkg}/LICENSE" "${pkgdir}/usr/share/licenses/nvidia-lts/LICENSE"
-}
diff --git a/extra/nvidia-lts/nvidia-lts.install b/extra/nvidia-lts/nvidia-lts.install
deleted file mode 100644
index d1f5eccaa..000000000
--- a/extra/nvidia-lts/nvidia-lts.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-3.0-lts'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.0-lts'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.0-lts'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
diff --git a/extra/nvidia-utils/PKGBUILD b/extra/nvidia-utils/PKGBUILD
deleted file mode 100644
index 073fb8a9b..000000000
--- a/extra/nvidia-utils/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# $Id: PKGBUILD 171131 2012-11-16 19:33:17Z ibiru $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Contributor: James Rayner <iphitus@gmail.com>
-pkgbase=nvidia-utils
-pkgname=('nvidia-utils' 'opencl-nvidia')
-pkgver=310.19
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-license=('custom')
-options=('!strip')
-
-if [ "$CARCH" = "i686" ]; then
-    _arch='x86'
-    _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('2adbdd38540b3a8955714760e05f575d')
-elif [ "$CARCH" = "x86_64" ]; then
-    _arch='x86_64'
-    _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
-    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('0ba08d32852e442ebba5ba22c7abed36')
-fi
-
-create_links() {
-    # create soname links
-    while read -d '' _lib; do
-        _soname="$(dirname "${_lib}")/$(LC_ALL=C readelf -d "${_lib}" | sed -nr 's/.*Library soname: \[(.*)\].*/\1/p')"
-        [[ -e "${_soname}" ]] || ln -s "$(basename "${_lib}")" "${_soname}"
-        [[ -e "${_soname/.[0-9]*/}" ]] || ln -s "$(basename "${_soname}")" "${_soname/.[0-9]*/}"
-    done < <(find "${pkgdir}" -type f -name '*.so*' -print0)
-}
-
-build() {
-    cd "${srcdir}"
-    sh "${_pkg}.run" --extract-only
-}
-
-package_opencl-nvidia() {
-    pkgdesc="OpenCL implemention for NVIDIA"
-    depends=('libcl' 'zlib')
-    optdepends=('opencl-headers: headers necessary for OpenCL development')
-    cd "${srcdir}/${_pkg}"
-
-    # OpenCL
-    install -D -m644 nvidia.icd "${pkgdir}/etc/OpenCL/vendors/nvidia.icd"
-    install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-compiler.so.${pkgver}"
-    install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-opencl.so.${pkgver}" 
-
-    create_links
-}
-
-package_nvidia-utils() {
-    pkgdesc="NVIDIA drivers utilities and libraries."
-    depends=('xorg-server' 'libxvmc')
-    optdepends=('gtk2: nvidia-settings' 'pangox-compat: nvidia-settings' 'pkg-config: nvidia-xconfig'
-                'opencl-nvidia: OpenCL support')
-    conflicts=('libgl')
-    provides=('libgl')
-    cd "${srcdir}/${_pkg}"
-
-    # X driver
-    install -D -m755 nvidia_drv.so "${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so"
-    # GLX extension module for X
-    install -D -m755 "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.${pkgver}"
-    ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"	# X doesn't find glx otherwise
-    # OpenGL library
-    install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.${pkgver}"
-    # OpenGL core library
-    install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}"
-    # VDPAU
-    install -D -m755 "libvdpau_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/vdpau/libvdpau_nvidia.so.${pkgver}"
-    # nvidia-tls library
-    install -D -m755 "tls/libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-tls.so.${pkgver}"
-    install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-cfg.so.${pkgver}"
-
-    install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-ml.so.${pkgver}"
-    # CUDA
-    install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/libcuda.so.${pkgver}"
-    install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/libnvcuvid.so.${pkgver}"
-
-    # nvidia-xconfig
-    install -D -m755 nvidia-xconfig "${pkgdir}/usr/bin/nvidia-xconfig"
-    install -D -m644 nvidia-xconfig.1.gz "${pkgdir}/usr/share/man/man1/nvidia-xconfig.1.gz"
-    # nvidia-settings
-    install -D -m755 nvidia-settings "${pkgdir}/usr/bin/nvidia-settings"
-    install -D -m644 nvidia-settings.1.gz "${pkgdir}/usr/share/man/man1/nvidia-settings.1.gz"
-    install -D -m644 nvidia-settings.desktop "${pkgdir}/usr/share/applications/nvidia-settings.desktop"
-    install -D -m644 nvidia-settings.png "${pkgdir}/usr/share/pixmaps/nvidia-settings.png"
-    sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i "${pkgdir}/usr/share/applications/nvidia-settings.desktop"
-    # nvidia-bug-report
-    install -D -m755 nvidia-bug-report.sh "${pkgdir}/usr/bin/nvidia-bug-report.sh"
-    # nvidia-smi
-    install -D -m755 nvidia-smi "${pkgdir}/usr/bin/nvidia-smi"
-    install -D -m644 nvidia-smi.1.gz "${pkgdir}/usr/share/man/man1/nvidia-smi.1.gz"
-
-
-    install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nvidia/LICENSE"
-    ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-utils"
-    install -D -m644 README.txt "${pkgdir}/usr/share/doc/nvidia/README"
-    install -D -m644 NVIDIA_Changelog "${pkgdir}/usr/share/doc/nvidia/NVIDIA_Changelog"
-    ln -s nvidia "${pkgdir}/usr/share/doc/nvidia-utils"
-
-    create_links
-}
diff --git a/extra/nvidia/PKGBUILD b/extra/nvidia/PKGBUILD
deleted file mode 100644
index 574df67df..000000000
--- a/extra/nvidia/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 171241 2012-11-16 21:41:41Z ibiru $
-# Maintainer : Thomas Baechler <thomas@archlinux.org>
-
-pkgname=nvidia
-pkgver=310.19
-_extramodules=extramodules-3.6-ARCH
-pkgrel=2
-pkgdesc="NVIDIA drivers for linux."
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-depends=('linux>=3.6' 'linux<3.7' "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.6' 'linux-headers<3.7')
-conflicts=('nvidia-96xx' 'nvidia-173xx')
-license=('custom')
-install=nvidia.install
-options=(!strip)
-
-if [ "$CARCH" = "i686" ]; then
-    _arch='x86'
-    _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('2adbdd38540b3a8955714760e05f575d')
-elif [ "$CARCH" = "x86_64" ]; then
-    _arch='x86_64'
-   _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
-    source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=('0ba08d32852e442ebba5ba22c7abed36')
-fi
-
-build() {
-    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-    cd "${srcdir}"
-    sh "${_pkg}.run" --extract-only
-    cd "${_pkg}/kernel"
-    make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
-}
-
-package() {
-    install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
-        "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
-    install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
-    echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
-    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
-    gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
-}
diff --git a/extra/nvidia/nvidia.install b/extra/nvidia/nvidia.install
deleted file mode 100644
index c2c292ae9..000000000
--- a/extra/nvidia/nvidia.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-3.6-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use nvidia module, reboot the system.'
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.6-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    if  [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
-        echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
-    fi
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.6-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD
index 4893e36fd..b618238ab 100644
--- a/extra/nx/PKGBUILD
+++ b/extra/nx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175081 2013-01-13 09:33:31Z andyrtr $
+# $Id: PKGBUILD 180978 2013-03-29 10:06:34Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers')
-pkgver=3.5.0.17
-pkgrel=3
+pkgver=3.5.0.20
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wiki.x2go.org/"
 license=('GPL')
@@ -12,12 +12,18 @@ license=('GPL')
 makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' # runtime dependencies from subpackages
              'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
              )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz)
-md5sums=('aac9a999d4b38dedd476409e5fc2c4aa')
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
+        keyboard_rule.diff)
+md5sums=('9dd4b22579cf048c14c9c75302553f18'
+         'f681bc66827cd7ddff4b81b983c20401')
 
 build() {
   cd "${srcdir}/nx-libs-$pkgver"
   
+  # fix keyboard layout with xkeyboard-config >= 2.6 - doesn't solve proper layout detection
+  # upstream needs to do much more work in that area
+  patch -Np1 -i ${srcdir}/keyboard_rule.diff
+  
   # debug flags
 #  export CFLAGS="-march=x86-64 -O1 -g -pipe"
 #  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
@@ -126,7 +132,8 @@ package_x2go-agent() {
 	
   install -dm755 ${pkgdir}/usr/{bin,lib/x2go/bin,share/{pixmaps,x2go/versions}}
   # this is a nxagent symlink
-  cp -a ${srcdir}/fakeinstall/usr/lib/x2go/bin/x2goagent ${pkgdir}/usr/lib/x2go/bin
+  ln -sv /usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/x2go/bin/x2goagent 
+
   # the wrapper
   cp -a ${srcdir}/fakeinstall/usr/bin/x2goagent ${pkgdir}/usr/bin
   
diff --git a/extra/nx/keyboard_rule.diff b/extra/nx/keyboard_rule.diff
new file mode 100644
index 000000000..dccab160b
--- /dev/null
+++ b/extra/nx/keyboard_rule.diff
@@ -0,0 +1,11 @@
+--- nx-libs-3.5.0.17/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c	2013-01-04 13:25:49.000000000 +0100
++++ nx-libs-3.5.0.17/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c.new	2013-03-15 18:24:54.084216888 +0100
+@@ -140,7 +140,7 @@
+ #define XKB_CONFIG_FILE      "/etc/nxagent/nxagent.keyboard"
+ #endif
+ #ifndef XKB_DFLT_RULES_FILE
+-#define XKB_DFLT_RULES_FILE  "xfree86"
++#define XKB_DFLT_RULES_FILE  "base"
+ #endif
+ #ifndef XKB_ALTS_RULES_FILE
+ #define XKB_ALTS_RULES_FILE  "xorg"
diff --git a/extra/nx/nx-cflags.patch b/extra/nx/nx-cflags.patch
deleted file mode 100644
index 35562939c..000000000
--- a/extra/nx/nx-cflags.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- nxcomp/configure.in.orig	2008-12-18 15:48:09.000000000 +0100
-+++ nxcomp/configure.in	2008-12-18 15:54:14.000000000 +0100
-@@ -7,8 +7,7 @@
- 
- dnl Set our default compilation flags.
- 
--CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
--CFLAGS="-O3"
-+CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
- 
- dnl Reset default linking directives.
- 
---- nxcompext/configure.in.orig	2008-12-18 15:55:29.000000000 +0100
-+++ nxcompext/configure.in	2008-12-18 15:55:51.000000000 +0100
-@@ -5,11 +5,6 @@
- AC_INIT(NXlib.h)
- AC_PREREQ(2.13)
- 
--dnl Reset default compilation flags.
--
--CXXFLAGS="-O3"
--CFLAGS="-O3"
--
- dnl Reset default linking directives.
- 
- LIBSTATIC=""
---- nxcompshad/configure.in.orig	2008-12-18 15:56:13.000000000 +0100
-+++ nxcompshad/configure.in	2008-12-18 15:56:22.000000000 +0100
-@@ -5,11 +5,6 @@
- AC_INIT(Shadow.h)
- AC_PREREQ(2.13)
- 
--dnl Reset default compilation flags.
--
--CXXFLAGS="-O3"
--CPPFLAGS="-O3"
--
- dnl Reset default linking directives.
- 
- LIBSTATIC=""
---- nxproxy/configure.in.orig	2008-12-18 15:57:48.000000000 +0100
-+++ nxproxy/configure.in	2008-12-18 15:57:55.000000000 +0100
-@@ -5,11 +5,6 @@
- AC_INIT(Main.c)
- AC_PREREQ(2.13)
- 
--dnl Reset default compilation flags.
--
--CXXFLAGS="-O3"
--CPPFLAGS="-O3"
--
- dnl Prefer headers and libraries from nx-X11 if present.
- 
- if test -d "../nx-X11/exports/include" ; then
diff --git a/extra/nx/nx-x11.ld.so.conf.d b/extra/nx/nx-x11.ld.so.conf.d
deleted file mode 100644
index 5d15cb6e2..000000000
--- a/extra/nx/nx-x11.ld.so.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/nx/
diff --git a/extra/nxclient/PKGBUILD b/extra/nxclient/PKGBUILD
deleted file mode 100644
index e11b0d8a8..000000000
--- a/extra/nxclient/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 162204 2012-06-23 13:26:36Z andyrtr $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-#Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> 
-
-pkgname=nxclient
-pkgver=3.5.0.7
-pkgrel=3
-pkgdesc="Nomachine's closed source client for NX servers"
-arch=('i686' 'x86_64')
-url="http://nomachine.com"
-license=('custom:nomachine')
-depends=('libxext' 'libxft' 'xorg-xauth' 'libxcomp' 'nx-common>=3.5.0-4.1' 'desktop-file-utils')
-makedepends=('rpmextract' 'chrpath')
-optdepends=('cups: for printing support')
-[ "$CARCH" = "x86_64" ] && source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.x86_64.rpm nomachine.key nxclient.wrapper)
-[ "$CARCH" = "x86_64" ] && md5sums=('0648c2e36a14d5810e26d7d640d8382f' 'cb5df74aff5160eab9cd4313019ae228' '13c9841df2ff943c8c35ce8fdb04ac44')
-[ "$CARCH" = "i686" ] && source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.i386.rpm nomachine.key nxclient.wrapper)
-[ "$CARCH" = "i686" ] &&  md5sums=('53e5b9b4a1096324e7d3dbd8ffb192a1' 'cb5df74aff5160eab9cd4313019ae228' '13c9841df2ff943c8c35ce8fdb04ac44')
-install=nxclient.install
-
-build() {
-  cd ${srcdir}
-  rpmextract.sh *.rpm
-  sed -i -e 's:/usr/NX:/usr/lib/nx:g' etc/profile.d/nx.*
-  sed -i -e 's:/usr/NX:/usr/lib/nx:g' ${srcdir}/usr/NX/share/applnk/network/*.desktop
-}
-
-package() {
-  # profile files
-  install -D -m 755 ${srcdir}/etc/profile.d/nx.sh ${pkgdir}/etc/profile.d/nx.sh 
-  install -D -m 755 ${srcdir}/etc/profile.d/nx.csh ${pkgdir}/etc/profile.d/nx.csh 
-  # menu entries
-  install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient-wizard.desktop ${pkgdir}/usr/share/applications/nxclient-wizard.desktop
-  install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient.desktop ${pkgdir}/usr/share/applications/nxclient.desktop
-  install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient-admin.desktop ${pkgdir}/usr/share/applications/nxclient-admin.desktop
-  rm -r ${srcdir}/usr/NX/share/applnk
-
-  # remove libs that come in system and are provided by libxcomp/nx-x11
-  rm ${srcdir}/usr/NX/lib/{libXcomp.*,libXcompsh.*,libcrypto.*,libjpeg.*,libz.*}
-
-  # provided by nx-common
-  rm ${srcdir}/usr/NX/bin/nxssh 
-  rm ${srcdir}/usr/NX/bin/nxesd # esd support has been fully dropped
-
-  # provide default key file later
-  rm ${srcdir}/usr/NX/share/keys/server.id_dsa.key
-
-  # move files
-  install -dm755 ${pkgdir}/usr/{bin,lib/nx}
-  cp -aR ${srcdir}/usr/NX/* ${pkgdir}/usr/lib/nx
-  # add symlinks
-  cd ${pkgdir}/usr/bin
-  ln -sv /usr/lib/nx/bin/{nxclient,nxkill,nxprint,nxservice} .
-  # install wrapper including Linker fix
-  mv ${pkgdir}/usr/lib/nx/bin/nxclient ${pkgdir}/usr/lib/nx/bin/nxclient_orig
-  install -m 755 ${srcdir}/nxclient.wrapper ${pkgdir}/usr/lib/nx/bin/nxclient
-
-  # add default key file
-  install -D -m 644 ${srcdir}/nomachine.key ${pkgdir}/usr/lib/nx/share/keys/server.id_dsa.key
-
-  # add license file
-  mkdir -p ${pkgdir}/usr/share/licenses/nxclient
-  mv ${pkgdir}/usr/lib/nx/share/documents/client/license-info ${pkgdir}/usr/share/licenses/nxclient/LICENSE
-
-  # some cleanup
-  rm -rf ${pkgdir}/usr/lib/nx/share/{documents,cups}
-
-  # fix insecure rpath
-  chrpath -d "$pkgdir/usr/lib/nx/bin/nxclient_orig"
-}
diff --git a/extra/nxclient/nomachine.key b/extra/nxclient/nomachine.key
deleted file mode 100644
index e6eadbc15..000000000
--- a/extra/nxclient/nomachine.key
+++ /dev/null
@@ -1,12 +0,0 @@
------BEGIN DSA PRIVATE KEY-----
-MIIBuwIBAAKBgQCXv9AzQXjxvXWC1qu3CdEqskX9YomTfyG865gb4D02ZwWuRU/9
-C3I9/bEWLdaWgJYXIcFJsMCIkmWjjeSZyTmeoypI1iLifTHUxn3b7WNWi8AzKcVF
-aBsBGiljsop9NiD1mEpA0G+nHHrhvTXz7pUvYrsrXcdMyM6rxqn77nbbnwIVALCi
-xFdHZADw5KAVZI7r6QatEkqLAoGBAI4L1TQGFkq5xQ/nIIciW8setAAIyrcWdK/z
-5/ZPeELdq70KDJxoLf81NL/8uIc4PoNyTRJjtT3R4f8Az1TsZWeh2+ReCEJxDWgG
-fbk2YhRqoQTtXPFsI4qvzBWct42WonWqyyb1bPBHk+JmXFscJu5yFQ+JUVNsENpY
-+Gkz3HqTAoGANlgcCuA4wrC+3Cic9CFkqiwO/Rn1vk8dvGuEQqFJ6f6LVfPfRTfa
-QU7TGVLk2CzY4dasrwxJ1f6FsT8DHTNGnxELPKRuLstGrFY/PR7KeafeFZDf+fJ3
-mbX5nxrld3wi5titTnX+8s4IKv29HJguPvOK/SI7cjzA+SqNfD7qEo8CFDIm1xRf
-8xAPsSKs6yZ6j1FNklfu
------END DSA PRIVATE KEY----- 
diff --git a/extra/nxclient/nxclient.install b/extra/nxclient/nxclient.install
deleted file mode 100644
index 9edb5939b..000000000
--- a/extra/nxclient/nxclient.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  
-  echo "For correct setup please take a look at the wiki:"
-  echo "http://wiki.archlinux.org/index.php/FreeNX"
-  
-  
-}
-
-post_upgrade() {
-  update-desktop-database -q
-  
-  if [ "`vercmp $2 3.5.0.7-1.1`" -lt 0 ]; then
-    # important upgrade notice
-    echo "because file location of the default key has been moved"
-    echo "you may need to reconfigure your connection and settings"
-  fi
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/extra/nxclient/nxclient.wrapper b/extra/nxclient/nxclient.wrapper
deleted file mode 100644
index ab9cc2532..000000000
--- a/extra/nxclient/nxclient.wrapper
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-LD_LIBRARY_PATH=/usr/lib/nx/lib:$LD_LIBRARY_PATH /usr/lib/nx/bin/nxclient_orig $@
diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD
index 5e90c9eff..500501846 100644
--- a/extra/obex-data-server/PKGBUILD
+++ b/extra/obex-data-server/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175864 2013-01-23 00:12:55Z eric $
+# $Id: PKGBUILD 180312 2013-03-20 02:35:33Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=obex-data-server
 pkgver=0.4.6
-pkgrel=4
+pkgrel=5
 pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wiki.muiline.com/obex-data-server"
diff --git a/extra/ocaml/fix-ocaml-binutils-2.21.patch b/extra/ocaml/fix-ocaml-binutils-2.21.patch
deleted file mode 100644
index fa7664cec..000000000
--- a/extra/ocaml/fix-ocaml-binutils-2.21.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Stephane Glondu <steph@glondu.net>
-Date: Tue, 8 Mar 2011 21:17:40 +0100
-Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Bug: http://caml.inria.fr/mantis/view.php?id=5237
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404
-Authors: Eric Cooper, spiralvoice
-Reviewed-by: Stéphane Glondu <steph@glondu.net>
----
- asmcomp/amd64/emit.mlp |   13 +++++++------
- asmcomp/i386/emit.mlp  |    6 +++---
- 2 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp
-index 4a3f844..525c6e6 100644
---- a/asmcomp/amd64/emit.mlp
-+++ b/asmcomp/amd64/emit.mlp
-@@ -679,17 +679,18 @@ let fundecl fundecl =
-   emit_all true fundecl.fun_body;
-   List.iter emit_call_gc !call_gc_sites;
-   emit_call_bound_errors ();
-+  begin match Config.system with
-+    "linux" | "gnu" ->
-+      `	.type	{emit_symbol fundecl.fun_name},@function\n`;
-+      `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
-+    | _ -> ()
-+  end;
-   if !float_constants <> [] then begin
-     if macosx
-     then `	.literal8\n`
-     else `	.section	.rodata.cst8,\"a\",@progbits\n`;
-     List.iter emit_float_constant !float_constants
--  end;
--  match Config.system with
--    "linux" | "gnu" ->
--      `	.type	{emit_symbol fundecl.fun_name},@function\n`;
--      `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
--  | _ -> ()
-+  end
- 
- (* Emission of data *)
- 
-diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp
-index 2992f29..0b1252c 100644
---- a/asmcomp/i386/emit.mlp
-+++ b/asmcomp/i386/emit.mlp
-@@ -905,12 +905,12 @@ let fundecl fundecl =
-   emit_all true fundecl.fun_body;
-   List.iter emit_call_gc !call_gc_sites;
-   emit_call_bound_errors ();
--  List.iter emit_float_constant !float_constants;
--  match Config.system with
-+  begin match Config.system with
-     "linux_elf" | "bsd_elf" | "gnu" ->
-       `	.type	{emit_symbol fundecl.fun_name},@function\n`;
-       `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
--  | _ -> ()
-+  | _ -> () end;
-+  List.iter emit_float_constant !float_constants
- 
- 
- (* Emission of data *)
--- 
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index 8192a800f..e21601d8d 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 171914 2012-11-23 13:37:21Z ronald $
+# $Id: PKGBUILD 178113 2013-02-16 16:08:30Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : shining <shiningxc.at.gmail.com>
 # Contributor : cyberdune <cyberdune@gmail.com>
 
 pkgname=octave
 pkgver=3.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.octave.org"
diff --git a/extra/octave/buildfix.diff b/extra/octave/buildfix.diff
deleted file mode 100644
index 8288b7bec..000000000
--- a/extra/octave/buildfix.diff
+++ /dev/null
@@ -1,85 +0,0 @@
---- libgnu/stdio.in.h.origs	2012-05-24 12:46:13.000000000 -0600
-+++ libgnu/stdio.in.h	2012-05-24 16:29:54.813734894 -0600
-@@ -1,12 +1,10 @@
--/* -*- buffer-read-only: t -*- vi: set ro: */
--/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
- /* A GNU-like <stdio.h>.
- 
-    Copyright (C) 2004, 2007-2012 Free Software Foundation, Inc.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
--   the Free Software Foundation; either version 3, or (at your option)
-+   the Free Software Foundation; either version 2, or (at your option)
-    any later version.
- 
-    This program is distributed in the hope that it will be useful,
-@@ -15,8 +13,7 @@
-    GNU General Public License for more details.
- 
-    You should have received a copy of the GNU General Public License
--   along with this program; if not, write to the Free Software Foundation,
--   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
- 
- #if __GNUC__ >= 3
- @PRAGMA_SYSTEM_HEADER@
-@@ -55,7 +52,8 @@
- #include <stddef.h>
- 
- /* Get off_t and ssize_t.  Needed on many systems, including glibc 2.8
--   and eglibc 2.11.2.  */
-+   and eglibc 2.11.2.
-+   May also define off_t to a 64-bit type on native Windows.  */
- #include <sys/types.h>
- 
- /* The __attribute__ feature is available in gcc versions 2.5 and later.
-@@ -701,22 +699,11 @@ _GL_WARN_ON_USE (getline, "getline is un
- # endif
- #endif
- 
--#if @GNULIB_GETS@
--# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
--#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--#   undef gets
--#   define gets rpl_gets
--#  endif
--_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
--_GL_CXXALIAS_RPL (gets, char *, (char *s));
--# else
--_GL_CXXALIAS_SYS (gets, char *, (char *s));
--#  undef gets
--# endif
--_GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
-+   so any use of gets warrants an unconditional warning; besides, C11
-+   removed it.  */
-+#undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
- 
-@@ -781,7 +768,7 @@ _GL_CXXALIASWARN (pclose);
- #elif defined GNULIB_POSIXCHECK
- # undef pclose
- # if HAVE_RAW_DECL_PCLOSE
--_GL_WARN_ON_USE (pclose, "popen is unportable - "
-+_GL_WARN_ON_USE (pclose, "pclose is unportable - "
-                  "use gnulib module pclose for more portability");
- # endif
- #endif
-@@ -1056,9 +1043,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is
- # endif
- #endif
- 
--/* Some people would argue that sprintf should be handled like gets
--   (for example, OpenBSD issues a link warning for both functions),
--   since both can cause security holes due to buffer overruns.
-+/* Some people would argue that all sprintf uses should be warned about
-+   (for example, OpenBSD issues a link warning for it),
-+   since it can cause security holes due to buffer overruns.
-    However, we believe that sprintf can be used safely, and is more
-    efficient than snprintf in those safe cases; and as proof of our
-    belief, we use sprintf in several gnulib modules.  So this header
diff --git a/extra/octave/curlfix.patch b/extra/octave/curlfix.patch
deleted file mode 100644
index 26f3d92f9..000000000
--- a/extra/octave/curlfix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/DLD-FUNCTIONS/urlwrite.cc.old	2011-07-02 16:39:22.466603778 +0200
-+++ src/DLD-FUNCTIONS/urlwrite.cc	2011-07-02 16:39:54.543269859 +0200
-@@ -52,7 +52,6 @@
- 
- #include <curl/curl.h>
- #include <curl/curlver.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- static int
diff --git a/extra/octave/imread.patch b/extra/octave/imread.patch
deleted file mode 100644
index 4a7b73ea0..000000000
--- a/extra/octave/imread.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/DLD-FUNCTIONS/__magick_read__.cc.orig	2010-03-06 08:05:25.000000000 +0000
-+++ src/DLD-FUNCTIONS/__magick_read__.cc	2009-08-25 09:26:01.000000000 +0100
-@@ -30,6 +30,7 @@
- #include "defun-dld.h"
- #include "error.h"
- #include "ov-struct.h"
-+#include "oct-env.h"
- 
- #ifdef HAVE_MAGICK
- 
-@@ -359,6 +358,18 @@
- 
- #ifdef HAVE_MAGICK
- 
-+  static bool initialized = false;
-+
-+  if (! initialized)
-+    {
-+      std::string program_name = octave_env::get_program_invocation_name ();
-+
-+      Magick::InitializeMagick (program_name.c_str ());
-+
-+      initialized = true;
-+    }
-+
-+
-   if (args.length () > 2 || args.length () < 1 || ! args(0).is_string ()
-       || nargout > 3)
-     {
diff --git a/extra/octave/octave-3.4.0-gcc46.patch b/extra/octave/octave-3.4.0-gcc46.patch
deleted file mode 100644
index c174204ac..000000000
--- a/extra/octave/octave-3.4.0-gcc46.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up octave-3.4.0/liboctave/oct-alloc.h.gcc46 octave-3.4.0/liboctave/oct-alloc.h
---- octave-3.4.0/liboctave/oct-alloc.h.gcc46	2011-02-08 03:00:51.000000000 -0700
-+++ octave-3.4.0/liboctave/oct-alloc.h	2011-02-08 09:41:23.984081687 -0700
-@@ -23,6 +23,8 @@ along with Octave; see the file COPYING.
- #if !defined (octave_oct_alloc_h)
- #define octave_oct_alloc_h 1
- 
-+#include <cstddef>
-+
- class
- OCTAVE_API
- octave_allocator
-diff -up octave-3.4.0/src/pr-output.cc.gcc46 octave-3.4.0/src/pr-output.cc
---- octave-3.4.0/src/pr-output.cc.gcc46	2011-02-08 03:00:52.000000000 -0700
-+++ octave-3.4.0/src/pr-output.cc	2011-02-08 09:55:16.149662744 -0700
-@@ -3024,7 +3024,7 @@ abs (T x)
- }
- 
- #define INSTANTIATE_ABS(T) \
--  template /* static */ inline T abs (T)
-+  template /* static */ T abs (T)
- 
- INSTANTIATE_ABS(signed char);
- INSTANTIATE_ABS(short);
diff --git a/extra/ode/PKGBUILD b/extra/ode/PKGBUILD
index 499c75b7c..52c3e697e 100644
--- a/extra/ode/PKGBUILD
+++ b/extra/ode/PKGBUILD
@@ -12,7 +12,7 @@ license=('LGPL' 'BSD')
 depends=('gcc-libs' 'bash')
 source=("http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2")
 options=('!libtool')
-md5sums=('83766cae59692c2843d9afccc1768988')
+md5sums=('48fdd41fae1a7e7831feeded09826599')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD
index b308fb888..732fc7890 100644
--- a/extra/opal/PKGBUILD
+++ b/extra/opal/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 172102 2012-11-28 10:32:11Z jgc $
+# $Id: PKGBUILD 178390 2013-02-21 05:35:59Z heftig $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 pkgname=opal
-pkgver=3.10.9
+pkgver=3.10.10
 pkgrel=1
 pkgdesc="Open Phone Abstraction Library"
 arch=(i686 x86_64 'mips64el')
 url="http://www.opalvoip.org"
-license=('GPL')
-depends=('ptlib' 'libtheora' 'x264' 'speex' 'gsm')
-makedepends=('ffmpeg')
+license=(GPL)
+depends=(ptlib libtheora x264 speex gsm celt)
+makedepends=(ffmpeg)
 options=(!makeflags)
 source=(http://ftp.gnome.org/pub/GNOME/sources/opal/${pkgver%.*}/opal-$pkgver.tar.xz
         opal-ffmpeg.patch)
-sha256sums=('86c717a881f5283cfb58a5d52573c337b904115b90fa3e53c77fc543605e7950'
+sha256sums=('f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864'
             'd81542907ace54015b7c69c275b0c67f449eeb252ba971ba6ca728a5e20db231')
 
 build() {
diff --git a/extra/openal/PKGBUILD b/extra/openal/PKGBUILD
index 182781919..b80436e78 100644
--- a/extra/openal/PKGBUILD
+++ b/extra/openal/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=openal
 pkgver=1.15.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A cross-platform 3D audio library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openal.org/"
diff --git a/extra/openbabel/PKGBUILD b/extra/openbabel/PKGBUILD
index bcea79b31..fee73786c 100644
--- a/extra/openbabel/PKGBUILD
+++ b/extra/openbabel/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=openbabel
 pkgver=2.3.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A library designed to interconvert between many file formats used in molecular modeling and computational chemistry"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openbabel.org/wiki/Main_Page"
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index 9344dd309..65bf06372 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,32 +1,31 @@
-# $Id: PKGBUILD 174304 2013-01-04 05:15:04Z schiv $
+# $Id: PKGBUILD 183293 2013-04-20 16:41:29Z heftig $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=opencv
-pkgname=('opencv' 'opencv-docs' 'opencv-samples')
+pkgname=('opencv' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.4.3
-pkgrel=4
+pkgver=2.4.5
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 url="http://opencv.org/"
 depends=('jasper' 'gstreamer0.10-base'
          'xine-lib' 'libdc1394' 'openexr' 'gtkglext')
-makedepends=('cmake' 'python2-numpy' 'eigen2'
-             'mesa')
-optdepends=('opencv-docs'
-            'opencv-samples'
+makedepends=('cmake' 'python2-numpy' 'mesa'
+             'eigen2')
+optdepends=('opencv-samples'
             'eigen2'
             'python2-numpy: Python 2.x interface')
 if [ "$CARCH" != "mips64el" ]; then
   depends+=('intel-tbb' 'libcl')
   makedepends+=('opencl-headers')
 fi
-source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2"
+source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz"
         'pkgconfig.patch'
         'fsh.patch')
-md5sums=('c0a5af4ff9d0d540684c0bf00ef35dbe'
+md5sums=('8eac87462c7bec8b89021b723207c623'
          'cb916260b5ec594fe7a0cc2e54fc569f'
          '35256e3ccace373feba8131d1540a0de')
 
@@ -39,9 +38,6 @@ fi
 _cmakeopts+=(
             '-D WITH_OPENGL=ON'
             '-D WITH_XINE=ON'
-            '-D ENABLE_SSE=OFF'
-            '-D ENABLE_SSE2=OFF'
-            '-D ENABLE_SSE3=OFF'
             '-D BUILD_PACKAGE=OFF'
             '-D BUILD_WITH_DEBUG_INFO=OFF'
             '-D BUILD_TESTS=OFF'
@@ -53,55 +49,53 @@ _cmakeopts+=(
             '-D CMAKE_INSTALL_PREFIX=/usr'
             '-D CMAKE_SKIP_RPATH=ON')
 
-build() {
-  cd "$srcdir/$_realname-$pkgver"
+# SSE only available from Pentium 3 onwards (i686 is way older)
+[[ "$CARCH" = 'i686' ]] && \
+  _cmakeopts+=('-D ENABLE_SSE=OFF'
+               '-D ENABLE_SSE2=OFF'
+               '-D ENABLE_SSE3=OFF')
+
+# all x64 CPUs support SSE2 but not SSE3
+[[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D ENABLE_SSE3=OFF')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
 
   # fix pkg-config mess
   # see https://bugs.archlinux.org/task/32430
+  # and http://code.opencv.org/issues/1925
   patch -Np1 -i "$srcdir/pkgconfig.patch"
 
-  # fix another upstream mess
+  # fix another upstream mess that they won't fix
   # see http://code.opencv.org/issues/2512
   patch -Np1 -i "$srcdir/fsh.patch"
 
+  # no longer including docs, see https://bugs.archlinux.org/task/34185
+  # python2 compatibility for generating (html) docs
+  #sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
   cmake ${_cmakeopts[@]} .
 
   make
 }
 
 package_opencv() {
-  cd "$srcdir/$_realname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
 
   # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
+  install -Dm644 "$srcdir/$pkgname-$pkgver/doc/license.txt" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   cd "$pkgdir/usr/share"
 
-  # separate docs package; also be -R friendly
-  [ -d doc/$pkgname ] && mv doc/$pkgname "$srcdir/opencv-doc" \
-    && rm -r doc
-
-  # separate samples package
-  [ -d $pkgname/samples ] && mv $pkgname/samples "$srcdir/opencv-samples"
-}
-
-package_opencv-docs() {
-  pkgdesc+=" (documentation)"
-  unset depends
-  unset optdepends
-  options=('docs')
-
-  cd "$srcdir"
-
-  mkdir -p "$pkgdir/usr/share/doc"
-  cp -r opencv-doc "$pkgdir/usr/share/doc/opencv"
-
-  # install license file
-  #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-  #  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  # separate samples package; also be -R friendly
+  [[ -d $pkgname/samples ]] && mv $pkgname/samples "$srcdir/opencv-samples"
 }
 
 package_opencv-samples() {
@@ -110,15 +104,12 @@ package_opencv-samples() {
   unset optdepends
   unset options
 
-  cd "$srcdir"
-
   mkdir -p "$pkgdir/usr/share/opencv"
-  cp -r opencv-samples "$pkgdir/usr/share/opencv/samples"
+  cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples"
 
-  # Do we really need licenses for these minor splits?
   # install license file
-  #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-  #  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 "$srcdir/opencv-$pkgver/doc/license.txt" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/openexr/PKGBUILD b/extra/openexr/PKGBUILD
index 6a72be6f9..cf262e1c6 100644
--- a/extra/openexr/PKGBUILD
+++ b/extra/openexr/PKGBUILD
@@ -1,21 +1,19 @@
-# $Id: PKGBUILD 169756 2012-10-27 23:42:17Z eric $
+# $Id: PKGBUILD 183294 2013-04-20 16:41:30Z heftig $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=openexr
-pkgver=1.7.1
-pkgrel=2
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="An high dynamic-range image file format library"
 url="http://www.openexr.com/"
 arch=(i686 x86_64 'mips64el')
 license=('BSD')
 depends=('zlib' 'ilmbase')
 options=('!libtool')
-source=("https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'gcc43.patch')
+source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/gcc43.patch"
   ./configure --prefix=/usr
   make
 }
@@ -25,6 +23,4 @@ package() {
   make DESTDIR="${pkgdir}" install
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-
-md5sums=('a9e0369dfd68941c50cdaa93e9d7a8d1'
-         'd91fae759053a70bcedcf02eb33ca4a2')
+md5sums=('0820e1a8665236cb9e728534ebf8df18')
diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD
index c9124c508..f42151c26 100644
--- a/extra/opengtl/PKGBUILD
+++ b/extra/opengtl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 173974 2012-12-30 15:30:38Z foutrelis $
+# $Id: PKGBUILD 183549 2013-04-23 00:30:16Z eric $
 # Maintainer:
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Andries Radu <admiral0@live.it>
 
 pkgname=opengtl
-pkgver=0.9.17
-pkgrel=2
+pkgver=0.9.18
+pkgrel=1
 pkgdesc="A set of libraries for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications"
 url="http://www.opengtl.org"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,18 +13,11 @@ license=('GPL')
 depends=('gcc-libs' 'llvm')
 makedepends=('cmake' 'libpng')
 optdepends=('libpng: for using the png extension')
-source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2
-        opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch)
-sha256sums=('89a37394fe71f2e771d7230333c86b93706f0083f86a58a86a670bca7e4f905e'
-            'd3e12d964c927e6f659df00e6210815c803c9126b34e9e92d4ccfebd6d30c8d7')
+source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2)
+sha256sums=('f094b3d2a1a60519975bb3badc05e704f2b93c7a3d2cb753041f2ff27cfcd9f8')
 
 build() {
   cd "$srcdir"
-
-  #  Fix build with LLVM 3.2
-  patch -d OpenGTL-$pkgver -Np1 -i \
-    "$srcdir/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch"
-
   mkdir build
   cd build
   cmake ../OpenGTL-$pkgver \
diff --git a/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch b/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch
deleted file mode 100644
index c148c88bb..000000000
--- a/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -upr OpenGTL-0.9.17.orig/CMakeLists.txt OpenGTL-0.9.17/CMakeLists.txt
---- OpenGTL-0.9.17.orig/CMakeLists.txt	2012-06-04 17:51:43.000000000 +0300
-+++ OpenGTL-0.9.17/CMakeLists.txt	2012-12-25 03:00:30.000000000 +0200
-@@ -47,8 +47,8 @@ configure_file(config-endian.h.cmake ${C
- 
- find_package(LLVM REQUIRED)
- 
--if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.1" OR LLVM_VERSION STREQUAL "3.0" ) ) # There is no way with MSVC to know the llvm version
--  message(FATAL_ERROR "LLVM 3.0 or 3.1 is required.")
-+if( NOT MSVC AND NOT LLVM_VERSION STREQUAL "3.2" ) # There is no way with MSVC to know the llvm version
-+  message(FATAL_ERROR "LLVM 3.2 is required.")
- endif()
- 
- if(MSVC)
-diff -upr OpenGTL-0.9.17.orig/OpenCTL/OpenCTL/Program.cpp OpenGTL-0.9.17/OpenCTL/OpenCTL/Program.cpp
---- OpenGTL-0.9.17.orig/OpenCTL/OpenCTL/Program.cpp	2012-06-04 17:51:43.000000000 +0300
-+++ OpenGTL-0.9.17/OpenCTL/OpenCTL/Program.cpp	2012-12-25 02:59:17.000000000 +0200
-@@ -29,7 +29,7 @@
- #include <llvm/PassManager.h>
- #include <llvm/Analysis/LoopPass.h>
- #include <llvm/Analysis/Verifier.h>
--#include <llvm/Target/TargetData.h>
-+#include <llvm/DataLayout.h>
- #include <llvm/GlobalVariable.h>
- 
- // GTLCore
-diff -upr OpenGTL-0.9.17.orig/OpenGTL/GTLCore/ModuleData_p.cpp OpenGTL-0.9.17/OpenGTL/GTLCore/ModuleData_p.cpp
---- OpenGTL-0.9.17.orig/OpenGTL/GTLCore/ModuleData_p.cpp	2012-06-04 17:51:43.000000000 +0300
-+++ OpenGTL-0.9.17/OpenGTL/GTLCore/ModuleData_p.cpp	2012-12-25 02:59:34.000000000 +0200
-@@ -23,7 +23,7 @@
- 
- #include <llvm/Module.h>
- #include <llvm/PassManager.h>
--#include <llvm/Target/TargetData.h>
-+#include <llvm/DataLayout.h>
- #include <llvm/Target/TargetMachine.h>
- #include <llvm/Analysis/Verifier.h>
- #include <llvm/Transforms/Utils/Cloning.h>
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD
deleted file mode 100644
index 49d078cc0..000000000
--- a/extra/openjdk6/PKGBUILD
+++ /dev/null
@@ -1,184 +0,0 @@
-# $Id: PKGBUILD 177074 2013-02-05 19:26:45Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=('openjdk6' 'openjdk6-src')
-pkgbase="openjdk6"
-_javaver=6
-_icedteaver=1.12.1
-_openjdk_version=b27
-_openjdk_date=26_oct_2012
-pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=1
-url='http://icedtea.classpath.org'
-arch=('i686' 'x86_64' 'mips64el')
-license=('custom')
-makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2'
-	     'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxt' 'nss' 'libxslt'
-	     'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6' 'inetutils' 'wget')
-options=('!emptydirs')
-source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz{,.sig}
-	http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	http://icedtea.classpath.org/download/drops/jaxp144_04.zip
-	http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip
-	http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip
-	fix_jdk_cmds_path.diff
-	fix_corba_cmds_path.diff
-	fontconfig-paths.diff
-	nonreparenting-wm.diff
-	disable_Werror.diff
-	openjdk6.profile
-	openjdk6.profile.csh)
-noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	jaxp144_04.zip
-	jdk6-jaxws2_1_6-2011_06_13.zip
-	jdk6-jaf-b20.zip)
-sha256sums=('8e73a3939ba8c2cca888defc6c90811c959273a9bc7bd1352338a72cefcf1157'
-            'a4d9d3e427943efc8715688d58eca6e8e111907f962524af78dd9a71e6892d60'
-            '044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0'
-            '490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c'
-            '229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3'
-            '78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012'
-            'f5f59e121f7645ebc449bb13569fd924cbab3194e41db901f4fbe9dbd45720c5'
-            '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
-            '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
-            '9c3c55c30729ec44fab14c3f3f841c273730c7467d8908a72f018bc9e9f65bd9'
-            'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97'
-            '26e2cd5a6034f08a685129c9412f487b9931fb0d556f1ccceab17bdb75a372cd'
-            '0c2d9116d6e550021994d6713a93621a9df685d2182996be3249ad812712b007')
-
-build() {
-
-  unset JAVA_HOME
-  unset CLASSPATH
-  
-    [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd ${srcdir}/icedtea6-${_icedteaver}
-
-  ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
-
-  cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
-
-  autoreconf -i
-
-  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff patches/disable_Werror.diff"
-
-  export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
-  export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
-  unset MAKEFLAGS
-
-  ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
-	--with-ant-home=/usr/share/java/apache-ant \
-	--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \
-	--with-jaxp-drop-zip=${srcdir}/jaxp144_04.zip \
-  	--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \
-	--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
-	--disable-bootstrap \
-	--with-abs-install-dir=${_jvmdir}
-  LD_PRELOAD="" make 
-}
-
-package_openjdk6() {
- pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
- backup=(etc/profile.d/openjdk6.sh)
- depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7')
- optdepends=('icedtea-web: web browser plugin + Java Web Start'
-            'alsa-lib: for sound'
-            'giflib: for gif format support')
- conflicts=('java-environment' 'java-runtime')
- provides=('java-environment=6' 'java-runtime=6' 'java-runtime-headless=6')
- install=openjdk6.install
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    _arch=amd64
-  else
-    _arch=i586
-  fi
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd ${srcdir}/icedtea6-${_icedteaver}
-  install -m755 -d ${pkgdir}/${_jvmdir}/jre
-
-  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
-
-   # Install main files.
-  cp -a bin include lib ${pkgdir}/${_jvmdir}/ 
-  cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ 
-
-  mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \
-     ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src 
-  mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \
-     ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc 
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src
-
-   # Install man pages.
-  install -m755 -d ${pkgdir}/usr/share/man/man1
-  install -m644 man/man1/*.1 ${pkgdir}/usr/share/man/man1/ 
-  
-   # Install demos and samples.
-  cp -a demo ${pkgdir}/${_jvmdir}/ 
-  install -m755 -d sample/rmi
-  mv bin/java-rmi.cgi sample/rmi 
-  cp -a sample ${pkgdir}/${_jvmdir}/ 
-  popd
-
-  # Install icons and menu entries.
-  for s in 16 24 32 48 ; do
-    install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps
-    install -m644 openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
-      ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png 
-  done
-
-  # Install desktop files.
-  install -m755 -d ${pkgdir}/usr/share/applications
-  install -m644 {jconsole,policytool}.desktop ${pkgdir}/usr/share/applications
-
-  # link binaries into /usr/bin
-  install -m755 -d ${pkgdir}/usr/bin
-  pushd ${pkgdir}/${_jvmdir}/bin
-  for file in *; do
-    ln -sf ${_jvmdir}/bin/${file} \
-      ${pkgdir}/usr/bin 
-  done
-  popd
-
-  # link JKS keystore from ca-certificates-java
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts
-  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts"
- 
-  # set some variables
-  install -m755 -d ${pkgdir}/etc/profile.d
-  install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh 
-  install -m755 ${srcdir}/openjdk6.profile.csh ${pkgdir}/etc/profile.d/openjdk6.csh 
-  
-  # install license
-  install -Dm644 ${srcdir}//icedtea6-${_icedteaver}/openjdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_openjdk6-src() {
- pkgdesc='Free Java environment based on OpenJDK 6.0 Source Bundle'
- depends=('openjdk6')
- 
-  if [ "${CARCH}" = "x86_64" ]; then
-    _arch=amd64
-  else
-    _arch=i586
-  fi
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd ${srcdir}/icedtea6-${_icedteaver}
-  install -m755 -d ${pkgdir}/${_jvmdir}/jre
-  
-  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
-   # Install src.zip file
-  cp -a src.zip ${pkgdir}/${_jvmdir}/ 
-}
diff --git a/extra/openjdk6/disable_Werror.diff b/extra/openjdk6/disable_Werror.diff
deleted file mode 100644
index fa8887a10..000000000
--- a/extra/openjdk6/disable_Werror.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- openjdk/hotspot/make/linux/makefiles/gcc.make	2012-06-07 16:30:51.000000000 +0200
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make.new	2012-06-14 15:32:44.967695139 +0200
-@@ -150,7 +150,7 @@
- endif
- 
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
-+#WARNINGS_ARE_ERRORS = -Werror
- 
- # Except for a few acceptable ones
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
diff --git a/extra/openjdk6/fix_corba_cmds_path.diff b/extra/openjdk6/fix_corba_cmds_path.diff
deleted file mode 100644
index 7a3db9567..000000000
--- a/extra/openjdk6/fix_corba_cmds_path.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- openjdk/corba/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:26:12.000000000 +0300
-+++ openjdk/corba/make/common/shared/Defs-utils.gmk	2008-04-14 15:35:13.000000000 +0300
-@@ -76,7 +76,7 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
- CUT            = $(UTILS_USR_BIN_PATH)cut
-@@ -125,7 +125,7 @@
- TAIL           = $(UTILS_USR_BIN_PATH)tail
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
--TOUCH          = $(UTILS_COMMAND_PATH)touch
-+TOUCH          = $(UTILS_USR_BIN_PATH)touch
- TR             = $(UTILS_USR_BIN_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
-@@ -176,7 +176,7 @@
-   # others have it in /usr/bin.
-   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
- 		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
--  NAWK           = $(USRBIN_PATH)gawk
-+  NAWK           = $(UTILS_COMMAND_PATH)gawk
-   # Intrinsic unix command, with backslash-escaped character interpretation
-   ECHO           = /bin/echo -e
-   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/extra/openjdk6/fix_jdk_cmds_path.diff b/extra/openjdk6/fix_jdk_cmds_path.diff
deleted file mode 100644
index bd37dd4ba..000000000
--- a/extra/openjdk6/fix_jdk_cmds_path.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:33:23.000000000 +0300
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2008-04-14 15:37:34.000000000 +0300
-@@ -89,7 +89,7 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
- CUT            = $(UTILS_USR_BIN_PATH)cut
-@@ -137,7 +137,7 @@
- TAIL           = $(UTILS_USR_BIN_PATH)tail
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
--TOUCH          = $(UTILS_COMMAND_PATH)touch
-+TOUCH          = $(UTILS_USR_BIN_PATH)touch
- TR             = $(UTILS_USR_BIN_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
-@@ -178,7 +178,7 @@
-   BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
-                        $(wildcard $(UTILS_USR_BIN_PATH)basename))
- 
--  NAWK           = $(USRBIN_PATH)gawk
-+  NAWK           = $(UTILS_COMMAND_PATH)gawk
-   # Intrinsic unix command, with backslash-escaped character interpretation
-   ECHO           = /bin/echo -e
-   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/extra/openjdk6/fontconfig-paths.diff b/extra/openjdk6/fontconfig-paths.diff
deleted file mode 100644
index fa08db629..000000000
--- a/extra/openjdk6/fontconfig-paths.diff
+++ /dev/null
@@ -1,134 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties	2009-05-29 22:45:23.024341869 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new	2009-05-29 22:55:13.681366890 +0000
-@@ -275,73 +275,61 @@
- 
- # Font File Names
- 
--filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
--filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
--filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
--filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
--
--filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
--filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf
--filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf
--filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf
--
--filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
--filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf
--filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf
--filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf
--
--filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf
--
--filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf
--filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
--filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf
--filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf
--filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf
--filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf
--filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf
--filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf
--filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
--filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf
--filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf
--filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf
--filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf
--
--filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf
--filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf
--filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf
--filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf
--#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
--filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf
--filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf
--filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf
--filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf
--filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf
--
--filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf
--filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf
--filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf
--filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf
--filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf
--filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf
--filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf
--filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf
--filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf
--filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf
--filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf
--filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf
--
--# AWT X11 font paths
--awtfontpath.latin-1=/usr/share/fonts/X11/Type1
--awtfontpath.umingcn=/usr/share/fonts/truetype/arphic
--awtfontpath.uminghk=/usr/share/fonts/truetype/arphic
--awtfontpath.umingtw=/usr/share/fonts/truetype/arphic
--awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic
--awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy
--awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi
--awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami
--awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
--awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
--awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
-+filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf
-+filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
-+filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf
-+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf
-+
-+filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf
-+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf
-+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf
-+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
-+
-+filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf
-+filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf
-+filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf
-+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf
-+
-+filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf
-+
-+filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf
-+filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf
-+filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf
-+filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf
-+filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf
-+filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf
-+filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf
-+filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf
-+filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf
-+filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf
-+filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf
-+filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf
-+filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf
-+
-+filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf
-+filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf
-+filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf
-+filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf
-+#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf
-+filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf
-+filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf
-+filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf
-+filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf
-+filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf
-+
-+filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf
-+filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf
-+filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf
-+filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf
-+filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf
-+filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf
-+filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf
-+filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf
-+filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf
-+filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf
-+filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf
-+filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf
-+
diff --git a/extra/openjdk6/nonreparenting-wm.diff b/extra/openjdk6/nonreparenting-wm.diff
deleted file mode 100644
index 65fa66e89..000000000
--- a/extra/openjdk6/nonreparenting-wm.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWM.java b/jdk/src/solaris/classes/sun/awt/X11/XWM.java
-index 68d1ff7..878327e 100644
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java
-@@ -99,7 +99,8 @@
-         METACITY_WM = 11,
-         COMPIZ_WM = 12,
-         LG3D_WM = 13,
--        MUTTER_WM = 14;
-+        MUTTER_WM = 14,
-+        OTHER_NONREPARENTING_WM = 15;
-     public String toString() {
-         switch  (WMID) {
-           case NO_WM:
-@@ -564,7 +567,7 @@ class XWM implements MWMConstants, XUtilConstants {
-     }
- 
-     static boolean isNonReparentingWM() {
--        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM);
-+        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
-     }
- 
-     /*
-@@ -764,9 +767,17 @@ class XWM implements MWMConstants, XUtilConstants {
-              * supports WIN or _NET wm spec.
-              */
-             else if (l_net_protocol.active()) {
--                awt_wmgr = XWM.OTHER_WM;
-+                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+                } else {
-+                    awt_wmgr = XWM.OTHER_WM;
-+		}
-             } else if (win.active()) {
--                awt_wmgr = XWM.OTHER_WM;
-+                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+                } else {
-+                    awt_wmgr = XWM.OTHER_WM;
-+		}
-             }
-             /*
-              * Check for legacy WMs.
-@@ -777,6 +788,8 @@ class XWM implements MWMConstants, XUtilConstants {
-                 awt_wmgr = XWM.MOTIF_WM;
-             } else if (isOpenLook()) {
-                 awt_wmgr = XWM.OPENLOOK_WM;
-+            } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-             } else {
-                 awt_wmgr = XWM.OTHER_WM;
-             }
-@@ -1298,6 +1311,7 @@ class XWM implements MWMConstants, XUtilConstants {
-                   res = new Insets(28, 6, 6, 6);
-                   break;
-               case NO_WM:
-+              case OTHER_NONREPARENTING_WM:
-               case LG3D_WM:
-                   res = zeroInsets;
-                   break;
diff --git a/extra/openjdk6/openjdk6.install b/extra/openjdk6/openjdk6.install
deleted file mode 100644
index 653c8fe2f..000000000
--- a/extra/openjdk6/openjdk6.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/sbin/init-jks-keystore
-  fi
-  echo "when you use a non-reparenting window manager"
-  echo "set _JAVA_AWT_WM_NONREPARENTING=1 in"
-  echo "/etc/profile.d/openjdk6.sh"
-#  update-desktop-database -q
-}
-
-post_upgrade() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/sbin/init-jks-keystore
-  fi
-#  update-desktop-database -q
-}
-
-
-post_remove() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-#  update-desktop-database -q
-}
diff --git a/extra/openjdk6/openjdk6.profile b/extra/openjdk6/openjdk6.profile
deleted file mode 100644
index 9da4421ef..000000000
--- a/extra/openjdk6/openjdk6.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-export J2SDKDIR=/usr/lib/jvm/java-6-openjdk
-export J2REDIR=$J2SDKDIR/jre
-export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
-
-# enable this for non-reparenting window managers
-#export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/extra/openjdk6/openjdk6.profile.csh b/extra/openjdk6/openjdk6.profile.csh
deleted file mode 100644
index 3cb15fd49..000000000
--- a/extra/openjdk6/openjdk6.profile.csh
+++ /dev/null
@@ -1,6 +0,0 @@
-setenv J2SDKDIR "/usr/lib/jvm/java-6-openjdk"
-setenv J2REDIR "$J2SDKDIR/jre"
-setenv JAVA_HOME "/usr/lib/jvm/java-6-openjdk"
-
-# enable this for non-reparenting window managers
-#setenv _JAVA_AWT_WM_NONREPARENTING 1
diff --git a/extra/openjpeg/PKGBUILD b/extra/openjpeg/PKGBUILD
index 8e6838aff..d32fc971e 100644
--- a/extra/openjpeg/PKGBUILD
+++ b/extra/openjpeg/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=openjpeg
 pkgver=1.5.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="An open source JPEG 2000 codec"
 arch=(i686 x86_64 'mips64el')
 license=('BSD')
diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD
index 86e346cba..330cb5a14 100644
--- a/extra/openmpi/PKGBUILD
+++ b/extra/openmpi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170075 2012-10-31 21:09:28Z stephane $
+# $Id: PKGBUILD 181255 2013-04-02 18:31:27Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 pkgname=openmpi
-pkgver=1.6.3
-pkgrel=1
+pkgver=1.6.4
+pkgrel=2
 pkgdesc="High performance message passing library (MPI)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.open-mpi.org"
@@ -12,7 +12,7 @@ depends=('gcc-fortran' 'openssh' 'libltdl' 'hwloc')
 makedepends=('inetutils')
 options=(!libtool)
 source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('a61aa2dee4c47d93d88e49ebed36de25df4f6492')
+sha1sums=('38095d3453519177272f488d5058a98f7ebdbf10')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
@@ -57,9 +57,6 @@ package() {
    # Openmpi's otfinfo conflicts with the one from texlive
    mv "${pkgdir}"/usr/bin/otfinfo{,mpi}
 
-   # Openmpi's otfdump conflicts with the one from libotf
-   mv "${pkgdir}"/usr/bin/otfdump{,ompi}
-
    # Remove dangling symlink
    rm "${pkgdir}"/usr/share/man/man1/orteCC.1
 
diff --git a/extra/openmpi/openmpi-hostfile.patch b/extra/openmpi/openmpi-hostfile.patch
deleted file mode 100644
index f6377674b..000000000
--- a/extra/openmpi/openmpi-hostfile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile openmpi-1.6/orte/runtime/orte_mca_params.c
---- openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile	2012-04-24 13:18:21.000000000 -0600
-+++ openmpi-1.6/orte/runtime/orte_mca_params.c	2012-05-15 16:35:24.769565442 -0600
-@@ -225,7 +225,7 @@ int orte_register_params(void)
-                                 false, false, 1000, &orte_timeout_usec_per_proc);
-     
-     /* default hostfile */
--    asprintf(&orte_default_hostfile, "%s/etc/openmpi-default-hostfile", opal_install_dirs.prefix);
-+    asprintf(&orte_default_hostfile, "%s/openmpi-default-hostfile", opal_install_dirs.sysconfdir);
-     mca_base_param_reg_string_name("orte", "default_hostfile",
-                                    "Name of the default hostfile (relative or absolute path, \"none\" to ignore environmental or default MCA param setting)",
-                                    false, false, orte_default_hostfile, &orte_default_hostfile);
diff --git a/extra/oprofile/PKGBUILD b/extra/oprofile/PKGBUILD
deleted file mode 100644
index 41b02b3be..000000000
--- a/extra/oprofile/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 169713 2012-10-27 01:52:54Z stephane $
-# Maintainer : Aaron Griffin <aaron@archlinux.org>
-
-pkgname=oprofile
-pkgver=0.9.8
-pkgrel=1
-pkgdesc="A system-wide profiler for Linux systems, capable of profiling all running code at low overhead"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://oprofile.sourceforge.net"
-license=('GPL')
-depends=('popt' 'gcc-libs' 'zlib' 'sh')
-makedepends=('qt')
-optdepends=('qt: for oprof_start gui')
-options=('!libtool')
-install=oprofile.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-sha1sums=('28416b853641f913e5f90954f2e3837efd96f6cd')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --with-kernel-support --with-x --enable-gui=qt4
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -d "$pkgdir/var/lib/oprofile"
-
-# installing development libraries and headers - FS#20089
-  install -d  "$pkgdir/usr/include/oprofile"
-  install -m644 config.h libop/op_*.h libregex/op_*.h libdb/odb.h \
-    libpp/{locate_images.h,image_errors.h} libutil/op_*.h \
-    libutil++/{op_*.h,bfd_support.h,utility.h,cached_value.h} "$pkgdir/usr/include/oprofile"
-  install -m644 libop/libop.a libdb/libodb.a "$pkgdir/usr/lib/"
-  install -m644 libabi/libabi.a "$pkgdir/usr/lib/libopabi.a"
-  install -m644 libutil/libutil.a "$pkgdir/usr/lib/liboputil.a"
-  install -m644 libutil++/libutil++.a "$pkgdir/usr/lib/liboputil++.a"
-}
diff --git a/extra/oprofile/oprofile.install b/extra/oprofile/oprofile.install
deleted file mode 100644
index 5cd3e7e22..000000000
--- a/extra/oprofile/oprofile.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install(){
-  groupadd -g 492 oprofile &>/dev/null
-  useradd -u 492 -g oprofile -d /var/lib/oprofile -s /bin/false oprofile &>/dev/null
-}
-
-post_upgrade(){
-  getent group oprofile >/dev/null 2>&1 || groupadd -g 492 oprofile &>/dev/null
-  getent passwd oprofile >/dev/null 2>&1 || useradd -u 492 -g oprofile -d /var/lib/oprofile -s /bin/false oprofile &>/dev/null
-  if [ "$(vercmp $2 0.9.7-2)" -lt 0 ] ; then
-    usermod -d /var/lib/oprofile oprofile
-  fi
-}
-
-post_remove(){
-  if getent passwd oprofile >/dev/null 2>&1; then
-    userdel oprofile
-  fi
-  if getent group oprofile >/dev/null 2>&1; then
-    groupdel oprofile
-  fi
-}
diff --git a/extra/opus/PKGBUILD b/extra/opus/PKGBUILD
index 31598bfdd..96d8d09df 100644
--- a/extra/opus/PKGBUILD
+++ b/extra/opus/PKGBUILD
@@ -1,34 +1,34 @@
-# $Id: PKGBUILD 172981 2012-12-08 01:33:56Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 184222 2013-05-04 08:38:14Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com>
 # Contributor: pumbur
 
 pkgname=opus
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Codec designed for interactive speech and audio transmission over the Internet"
-arch=('i686' 'x86_64' 'mips64el')
+arch=(i686 x86_64 mips64el)
 url="http://www.opus-codec.org/"
-license=('custom')
-depends=('glibc')
+license=(BSD)
+depends=(glibc)
 options=('!libtool')
-source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('c503ad05a59ddb44deab96204401be03')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --enable-custom-modes
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/opus"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/opus/"
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/extra/orage/PKGBUILD b/extra/orage/PKGBUILD
index 98baf99e3..5b2adb494 100644
--- a/extra/orage/PKGBUILD
+++ b/extra/orage/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157825 2012-04-30 04:19:42Z foutrelis $
+# $Id: PKGBUILD 178517 2013-02-24 22:19:59Z eric $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=orage
-pkgver=4.8.3
-pkgrel=2
+pkgver=4.8.4
+pkgrel=1
 pkgdesc="A simple calendar application with reminders for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -16,7 +16,7 @@ options=('!libtool')
 replaces=('xfcalendar')
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('f4f89ea1f301514c419e7643661b510132ebb012')
+sha1sums=('8b9facb0393385e4d639dd6a886c216729672958')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/orc/PKGBUILD b/extra/orc/PKGBUILD
index 03f9a9eb9..6305e6ed3 100644
--- a/extra/orc/PKGBUILD
+++ b/extra/orc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 149305 2012-02-06 18:30:33Z ibiru $
+# $Id: PKGBUILD 182380 2013-04-09 18:42:44Z ioni $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=orc
-pkgver=0.4.16
-pkgrel=1.1
+pkgver=0.4.17
+pkgrel=1
 pkgdesc="The Oild Runtime Compiler"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -10,7 +10,7 @@ url="http://code.entropywave.com/projects/orc/"
 depends=('glibc')
 options=('!libtool')
 source=(http://code.entropywave.com/download/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('e482932e544c847761449b106ecbc483')
+md5sums=('af1bf3dab9e69f3c36f389285e2a12a1')
 
 build () {
     cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/ortp/PKGBUILD b/extra/ortp/PKGBUILD
index 805501f9b..b1747f65e 100644
--- a/extra/ortp/PKGBUILD
+++ b/extra/ortp/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=ortp
 pkgver=0.20.0.20120701
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A Real-time Transport Protocol (RTP) library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linphone.org/index.php/eng/code_review/ortp"
diff --git a/extra/ortp/libzrtpcpp2.patch b/extra/ortp/libzrtpcpp2.patch
deleted file mode 100644
index c433c314d..000000000
--- a/extra/ortp/libzrtpcpp2.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Only in ortp-0.20.0.my/build: Makefile
-Only in ortp-0.20.0.my/build/win32native: Makefile
-Only in ortp-0.20.0.my/build/wince: Makefile
-Only in ortp-0.20.0.my/build/winmob: Makefile
-Only in ortp-0.20.0.my: config.log
-Only in ortp-0.20.0.my: config.status
-Only in ortp-0.20.0.my: doc
-Only in ortp-0.20.0.my/include: Makefile
-Only in ortp-0.20.0.my/include/ortp: Makefile
-Only in ortp-0.20.0.my: libtool
-Only in ortp-0.20.0.my: Makefile
-Only in ortp-0.20.0.my: ortp-config.h
-Only in ortp-0.20.0.my: ortp.defs
-Only in ortp-0.20.0.my: ortp.pc
-Only in ortp-0.20.0.my/src: avprofile.lo
-Only in ortp-0.20.0.my/src: b64.lo
-Only in ortp-0.20.0.my/src: .deps
-Only in ortp-0.20.0.my/src: event.lo
-Only in ortp-0.20.0.my/src: jitterctl.lo
-Only in ortp-0.20.0.my/src: libortp.la
-Only in ortp-0.20.0.my/src: .libs
-Only in ortp-0.20.0.my/src: Makefile
-Only in ortp-0.20.0.my/src: netsim.lo
-Only in ortp-0.20.0.my/src: ortp.lo
-Only in ortp-0.20.0.my/src: ortp_srtp.lo
-Only in ortp-0.20.0.my/src: payloadtype.lo
-Only in ortp-0.20.0.my/src: port.lo
-Only in ortp-0.20.0.my/src: posixtimer.lo
-Only in ortp-0.20.0.my/src: rtcp.lo
-Only in ortp-0.20.0.my/src: rtcpparse.lo
-Only in ortp-0.20.0.my/src: rtpparse.lo
-Only in ortp-0.20.0.my/src: rtpsession_inet.lo
-Only in ortp-0.20.0.my/src: rtpsession.lo
-Only in ortp-0.20.0.my/src: rtpsignaltable.lo
-Only in ortp-0.20.0.my/src: rtptimer.lo
-Only in ortp-0.20.0.my/src: scheduler.lo
-Only in ortp-0.20.0.my/src: sessionset.lo
-Only in ortp-0.20.0.my/src: str_utils.lo
-Only in ortp-0.20.0.my/src: stun.lo
-Only in ortp-0.20.0.my/src: stun_udp.lo
-Only in ortp-0.20.0.my/src: telephonyevents.lo
-Only in ortp-0.20.0.my/src/tests: .deps
-Only in ortp-0.20.0.my/src/tests: Makefile
-Only in ortp-0.20.0.my/src/tests/win_receiver: Makefile
-Only in ortp-0.20.0.my/src/tests/win_sender: Makefile
-Only in ortp-0.20.0.my/src: utils.lo
-diff -wbBur ortp-0.20.0/src/zrtp.c ortp-0.20.0.my/src/zrtp.c
---- ortp-0.20.0/src/zrtp.c	2012-02-22 20:19:51.000000000 +0400
-+++ ortp-0.20.0.my/src/zrtp.c	2012-05-16 19:11:25.000000000 +0400
-@@ -837,7 +837,7 @@
- 	userData->session=s;
- 	ortp_zrtp_configure(context);
- 	ortp_message("Initialized ZRTP context");
--	zrtp_initializeZrtpEngine(context, &userData->zrtp_cb, userAgentStr, params->zid_file, userData, 0);
-+	zrtp_initializeZrtpEngine(context, &userData->zrtp_cb, userAgentStr, params->zid_file, userData);
- 	return ortp_zrtp_configure_context(userData,s,params);
- }
- 
-@@ -867,7 +867,7 @@
- 	userData->session=s;
- 	ortp_zrtp_configure(context);
- 	
--	zrtp_initializeZrtpEngine(context, &userData->zrtp_cb, userAgentStr, params->zid_file, userData, 0);
-+	zrtp_initializeZrtpEngine(context, &userData->zrtp_cb, userAgentStr, params->zid_file, userData);
- 
- 	ortp_message("setting zrtp_setMultiStrParams");
- 	zrtp_setMultiStrParams(context,multiparams,length);
-Only in ortp-0.20.0.my/src: zrtp.lo
-Only in ortp-0.20.0.my: stamp-h1
diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD
index ffbb1bb86..322688170 100644
--- a/extra/oxygen-gtk2/PKGBUILD
+++ b/extra/oxygen-gtk2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 177572 2013-02-07 13:44:31Z andrea $
+# $Id: PKGBUILD 183540 2013-04-22 20:14:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: birdflesh <antkoul at gmail dot com>
 
 pkgname=oxygen-gtk2
-pkgver=1.3.2
-pkgrel=2
+pkgver=1.3.3
+pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/playground/artwork/oxygen-gtk/'
@@ -13,16 +13,10 @@ depends=('gtk2')
 conflicts=('oxygen-gtk')
 replaces=('oxygen-gtk')
 makedepends=('cmake')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'fix-regression.patch')
-md5sums=('7c4ecfca330102b7ff50e472a62dfc60'
-         'bced3ab820c3eafbb4e40a279d05bff6')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('37b24d69d386eca5b4382424002ed762')
 
 build() {
-  cd ${pkgname}-${pkgver}/
-  patch -p1 -i "${srcdir}"/fix-regression.patch
-  cd ../
-
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
diff --git a/extra/oxygen-gtk2/fix-regression.patch b/extra/oxygen-gtk2/fix-regression.patch
deleted file mode 100644
index 466b53c17..000000000
--- a/extra/oxygen-gtk2/fix-regression.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/src/oxygenqtsettings.cpp b/src/oxygenqtsettings.cpp
-index f2ad1af..9965086 100644
---- a/src/oxygenqtsettings.cpp
-+++ b/src/oxygenqtsettings.cpp
-@@ -102,6 +102,9 @@ namespace Oxygen
- 
-         const bool forced( flags&Forced );
- 
-+        // no attempt at initializing if gtk settings is not yet set
-+        if( !gtk_settings_get_default() ) return false;
-+
-         if( _initialized && !forced ) return false;
-         else if( !forced ) _initialized = true;
- 
-diff --git a/src/oxygenstylewrapper.cpp b/src/oxygenstylewrapper.cpp
-index ff0666b..a2572b0 100644
---- a/src/oxygenstylewrapper.cpp
-+++ b/src/oxygenstylewrapper.cpp
-@@ -3741,6 +3741,10 @@ namespace Oxygen
-         #endif
- 
-         // style initialization
-+        /*
-+        this is normally achieved in theme_init, but is somehow not working with gnome shell
-+        so that it is redone here, since duplication is avoided when initialization is called twice without modifications
-+        */
-         Style::instance().initialize();
- 
-         // hooks
-diff --git a/src/oxygentheme.cpp b/src/oxygentheme.cpp
-index 50b04e2..9bc49e1 100644
---- a/src/oxygentheme.cpp
-+++ b/src/oxygentheme.cpp
-@@ -52,12 +52,8 @@ void theme_init( GTypeModule* module )
-     Oxygen::RCStyle::registerType( module );
-     Oxygen::StyleWrapper::registerType( module );
- 
--    // initialize oxygen here, for XUL applications
--    // special care is taken to not initialize everything
--    Oxygen::ApplicationName applicationName;
--    applicationName.initialize();
--    if( applicationName.isXul() )
--    { Oxygen::Style::instance().initialize( Oxygen::QtSettings::Forced | Oxygen::QtSettings::Colors ); }
-+    // style initialization
-+    Oxygen::Style::instance().initialize();
- 
- }
- 
diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD
index 1b96f42dd..6fe117199 100644
--- a/extra/oxygen-gtk3/PKGBUILD
+++ b/extra/oxygen-gtk3/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 176332 2013-01-30 13:12:57Z andrea $
+# $Id: PKGBUILD 183542 2013-04-22 20:16:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=oxygen-gtk3
-pkgver=1.1.2
+pkgver=1.1.3
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 depends=('gtk3')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('2a251c52a7799e67a4af70adc4ed3c60')
+md5sums=('63ae9752dd39a3310d20d973dd6ea247')
 
 build() {
   mkdir build
diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD
index 1a4bf6730..ff27d987f 100644
--- a/extra/p11-kit/PKGBUILD
+++ b/extra/p11-kit/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 165246 2012-08-14 15:06:21Z ibiru $
+# $Id: PKGBUILD 183529 2013-04-22 13:10:36Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=p11-kit
-pkgver=0.13
-pkgrel=1.1
+pkgver=0.18.1
+pkgrel=1
 pkgdesc="Library to work with PKCS#11 modules"
 arch=(i686 x86_64 mips64el)
 url="http://p11-glue.freedesktop.org"
 license=('BSD')
-depends=(glibc)
+depends=('glibc' 'libtasn1')
 options=(!libtool)
-source=($url/releases/$pkgname-$pkgver.tar.gz)
-md5sums=('3892bc07ff54b1b391aad4628911801d')
+source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig})
+md5sums=('e4ef21592dbd126b62e1a6d4ad65ce5c'
+         'SKIP')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/p7zip/7zFM.desktop b/extra/p7zip/7zFM.desktop
deleted file mode 100644
index 62b8e8562..000000000
--- a/extra/p7zip/7zFM.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=7-Zip FM
-GenericName=7-Zip File Manager
-Type=Application
-Categories=GTK;Utility;Archiving;Compression;
-Terminal=false
-Icon=p7zip
-Exec=7zFM
diff --git a/extra/p7zip/PKGBUILD b/extra/p7zip/PKGBUILD
deleted file mode 100644
index 4bb2bb474..000000000
--- a/extra/p7zip/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 143961 2011-11-30 22:27:42Z andrea $
-# Contributor: Thayer Williams <thayer@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-# Contributor: TuxSpirit<tuxspirit@archlinux.fr>  2007/11/17 21:22:36 UTC
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=p7zip
-pkgver=9.20.1
-pkgrel=6
-pkgdesc='Command-line version of the 7zip compressed file archiver'
-url='http://p7zip.sourceforge.net/'
-license=('GPL' 'custom')
-arch=('i686' 'x86_64')
-depends=('gcc-libs' 'bash')
-optdepends=('wxgtk: GUI'
-            'desktop-file-utils: desktop entries')
-makedepends=('yasm' 'nasm' 'wxgtk')
-options=('!makeflags')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2"
-        '7zFM.desktop')
-sha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7'
-          'f2c370d6f1b286b7ce9a2804e22541b755616a40')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}_${pkgver}"
-
-	[[ $CARCH = x86_64 ]] \
-	&& cp makefile.linux_amd64_asm makefile.machine \
-	|| cp makefile.linux_x86_asm_gcc_4.X makefile.machine
-
-	make all4 OPTFLAGS="${CXXFLAGS}"
-}
-
-package() {
-	cd "${srcdir}/${pkgname}_${pkgver}"
-
-	make install \
-		DEST_DIR="${pkgdir}" \
-		DEST_HOME="/usr" \
-		DEST_MAN="/usr/share/man"
-
-	# Licenses
-	install -d "${pkgdir}"/usr/share/licenses/p7zip
-	ln -s -t "${pkgdir}"/usr/share/licenses/p7zip \
-		/usr/share/doc/p7zip/DOCS/License.txt \
-		/usr/share/doc/p7zip/DOCS/unRarLicense.txt
-
-	# Integration with stuff...
-	install -D GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png
-	install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus}
-	cp GUI/kde4/* "${pkgdir}"/usr/share/kde4/services/ServiceMenus/
-	cp ../7zFM.desktop "${pkgdir}"/usr/share/applications/
-	ln -s 7zCon.sfx "${pkgdir}"/usr/lib/p7zip/7z.sfx
-
-	find GUI/help -type d -exec chmod 755 {} \;
-	cp -r GUI/help "${pkgdir}"/usr/lib/p7zip/
-
-	chmod -R u+w "${pkgdir}/usr"
-}
diff --git a/extra/p7zip/install b/extra/p7zip/install
deleted file mode 100644
index 7f3cc4358..000000000
--- a/extra/p7zip/install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	[[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
-	[[ -x usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor || true
-}
-
-post_upgrade() {
-	post_install
-}
-
-
-post_remove() {
-	post_install
-}
diff --git a/extra/pango-perl/PKGBUILD b/extra/pango-perl/PKGBUILD
index 2c1da6bf5..d8e794ad3 100644
--- a/extra/pango-perl/PKGBUILD
+++ b/extra/pango-perl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160501 2012-06-02 10:26:50Z bluewind $
+# $Id: PKGBUILD 183483 2013-04-21 22:21:03Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pango-perl
-pkgver=1.223
-pkgrel=2
+pkgver=1.224
+pkgrel=1
 pkgdesc="Perl bindings for Pango"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
@@ -12,7 +12,7 @@ makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
 depends=('pango' 'glib-perl' 'cairo-perl')
 options=('!emptydirs')
 source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Pango-${pkgver}.tar.gz)
-md5sums=('628a6de54f47b6791c6b45edfb835215')
+md5sums=('8c411f367cffb0aa16d0e3963294d32e')
 
 build() {
   cd "${srcdir}/Pango-${pkgver}"
diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD
index 847bb4527..ed37014b7 100644
--- a/extra/pango/PKGBUILD
+++ b/extra/pango/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 174865 2013-01-08 09:21:35Z jgc $ 
+# $Id: PKGBUILD 183451 2013-04-21 22:11:56Z heftig $ 
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pango
-pkgver=1.32.5
+pkgver=1.34.0
 pkgrel=1
 pkgdesc="A library for layout and rendering of text"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ options=('!libtool')
 install=pango.install
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
 url="http://www.pango.org/"
-sha256sums=('7d7bc99c3d9b580cb4fe787fe47824e56e39534b9040e1c8a2a159248d8e5821')
+sha256sums=('105da1efe019018a9de81681d88c9ace83d2111509ab625c4be9d124a1fdce27')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/pangomm/PKGBUILD b/extra/pangomm/PKGBUILD
index 639cf1f20..9568bde1c 100644
--- a/extra/pangomm/PKGBUILD
+++ b/extra/pangomm/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 141215 2011-10-26 14:54:11Z ibiru $
+# $Id: PKGBUILD 183600 2013-04-24 15:18:44Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=pangomm
 pkgname=('pangomm' 'pangomm-docs')
-pkgver=2.28.4
-pkgrel=1.1
-arch=(i686 x86_64 'mips64el')
+pkgver=2.34.0
+pkgrel=1
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('pango' 'glibmm' 'glibmm-docs' 'cairomm' 'pkgconfig')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.xz)
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::4}/${pkgname}-${pkgver}.tar.xz)
 options=('!libtool')
 url="http://gtkmm.sourceforge.net/"
-sha256sums=('778dcb66a793cbfd52a9f92ee5a71b888c3603a913fc1ddc48a30204de6d6c82')
+sha256sums=('0e82bbff62f626692a00f3772d8b17169a1842b8cc54d5f2ddb1fec2cede9e41')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/pangox-compat/PKGBUILD b/extra/pangox-compat/PKGBUILD
index 08734edd0..133b81400 100644
--- a/extra/pangox-compat/PKGBUILD
+++ b/extra/pangox-compat/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=pangox-compat
 pkgver=0.0.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="X Window System font support for Pango"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD
index ed1779343..71c85b1dc 100644
--- a/extra/parted/PKGBUILD
+++ b/extra/parted/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=parted
 pkgver=3.1
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
diff --git a/extra/pavucontrol/PKGBUILD b/extra/pavucontrol/PKGBUILD
index 3e388d479..efc85291e 100644
--- a/extra/pavucontrol/PKGBUILD
+++ b/extra/pavucontrol/PKGBUILD
@@ -1,31 +1,30 @@
-# $Id: PKGBUILD 139414 2011-10-01 19:00:51Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 179630 2013-03-08 23:03:46Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=pavucontrol
-pkgver=1.0
-pkgrel=1.1
+pkgver=2.0
+pkgrel=1
 pkgdesc="A GTK volume control tool for PulseAudio"
-arch=(i686 x86_64 'mips64el')
-url="http://0pointer.de/lennart/projects/pavucontrol"
+arch=(i686 x86_64 mips64el)
+url="http://freedesktop.org/software/pulseaudio/pavucontrol/"
 license=(GPL)
 depends=(gnome-icon-theme libcanberra-pulse gtkmm3 libsigc++)
 makedepends=(intltool lynx)
-source=(http://freedesktop.org/software/pulseaudio/$pkgname/$pkgname-$pkgver.tar.xz
-        pavucontrol.desktop)
-sha256sums=('3dbe2865b6e3a195a8951967d9234f62cd254c30b08bdea1ecf8997b58f68cde'
+source=($url/$pkgname-$pkgver.tar.xz pavucontrol.desktop)
+sha256sums=('22f29dd81b4a1a34ec7bffe9b027aff2a37fc76ccded4539d43a8c126a39470b'
             '5eab8c78e92c39a71ac1ca4c4464a8915d3a29d91e1703fd51c24652b747eebe')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --enable-gtk3
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
   install -Dm644 "$srcdir/pavucontrol.desktop" \
diff --git a/extra/perl-alien-sdl/PKGBUILD b/extra/perl-alien-sdl/PKGBUILD
index d86c3b1d7..c7ebe8309 100644
--- a/extra/perl-alien-sdl/PKGBUILD
+++ b/extra/perl-alien-sdl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165868 2012-09-01 20:47:49Z heftig $
+# $Id: PKGBUILD 184164 2013-05-03 01:57:18Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
@@ -8,7 +8,7 @@
 
 pkgname=perl-alien-sdl
 _realname=Alien-SDL
-pkgver=1.438
+pkgver=1.440
 pkgrel=1
 pkgdesc="Building, finding and using SDL binaries"
 arch=(i686 x86_64 'mips64el')
@@ -17,9 +17,9 @@ url="http://search.cpan.org/dist/Alien-SDL/"
 depends=(sdl=1.2.15 perl-file-sharedir perl-capture-tiny)
 makedepends=(perl-file-which perl-text-patch)
 options=(!emptydirs)
-_author=JTPALMER
+_author=FROGGS
 source=(http://search.cpan.org/CPAN/authors/id/${_author::1}/${_author::2}/$_author/$_realname-$pkgver.tar.gz)
-md5sums=('1936ba9e300677151124b62883cedf20')
+md5sums=('ad665d058d186e673114024ba10dfa09')
 
 package() {
   cd "$srcdir/$_realname-$pkgver"
diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD
index fe3af375d..825ab0b59 100644
--- a/extra/perl-dbd-mysql/PKGBUILD
+++ b/extra/perl-dbd-mysql/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 175923 2013-01-25 03:51:01Z eric $
+# $Id: PKGBUILD 180686 2013-03-25 19:15:37Z bpiotrowski $
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: Eric Johnson <eric@coding-zone.com>
 
 pkgname=perl-dbd-mysql
 _realname=DBD-mysql
 pkgver=4.022
-pkgrel=1
+pkgrel=3
 pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'PerlArtistic')
 url="http://search.cpan.org/dist/${_realname}/"
-depends=('libmysqlclient' 'perl-dbi')
-makedepends=('mysql')
+depends=('libmariadbclient' 'perl-dbi')
+makedepends=('mariadb')
 options=('!emptydirs')
 source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz)
 md5sums=('20fb571245e3b9ac275b8329025c4bf6')
diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD
index 262b737d6..a93b49575 100644
--- a/extra/perl-dbi/PKGBUILD
+++ b/extra/perl-dbi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175925 2013-01-25 04:01:07Z eric $
+# $Id: PKGBUILD 182702 2013-04-12 23:53:53Z eric $
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor:  Matt Thompson <mattt@defunct.ca>
 
 pkgname=perl-dbi
 _realname=DBI
-pkgver=1.623
+pkgver=1.625
 pkgrel=1
 pkgdesc="Database independent interface for Perl"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz)
-md5sums=('b45654dca3b495f3d496c359f0029d96')
+md5sums=('b0521be412faff4ec8d511cd5f3f6a31')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
diff --git a/extra/perl-ev/PKGBUILD b/extra/perl-ev/PKGBUILD
index 183dbf253..920638e82 100644
--- a/extra/perl-ev/PKGBUILD
+++ b/extra/perl-ev/PKGBUILD
@@ -1,9 +1,8 @@
-# Packager: Justin Davis (juster) <jrcd83@gmail.com>
-# $Id: PKGBUILD 160527 2012-06-02 10:27:33Z bluewind $
+# $Id: PKGBUILD 182901 2013-04-16 04:01:09Z eric $
 
 pkgname=perl-ev
-pkgver=4.11
-pkgrel=2
+pkgver=4.15
+pkgrel=1
 pkgdesc='perl interface to libev, a high performance full-featured event loop'
 arch=(i686 x86_64 'mips64el')
 license=(PerlArtistic GPL)
@@ -11,36 +10,24 @@ options=(!emptydirs)
 depends=(perl-common-sense)
 url=https://metacpan.org/release/EV
 source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/EV-$pkgver.tar.gz")
-md5sums=(405c6d74f9dff12918b12560c1a57877)
-sha512sums=(6aca3eeb617a313de7947b760558c12ed85af4fa8efd5bb4fd8bc2f271b4556312989aebf77cda4e212fd3b1351c268624aeaf2b1cf700507ff46c0c9dcc9db8)
-_dir="$srcdir/EV-$pkgver"
+md5sums=('546d10fb5901f2af937e53b41a92b2bb')
 
-build()
-(
-  cd "$_dir"
+build() {
+  cd EV-$pkgver
   export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps
   unset PERL5LIB PERL_MM_OPT
-  /usr/bin/perl Makefile.PL
+  perl Makefile.PL
   make
-)
+}
 
-check()
-(
-  cd "$_dir"
+check() {
+  cd EV-$pkgver
   export PERL_MM_USE_DEFAULT=1
   unset PERL5LIB
   make test
-)
+}
 
-package()
-(
-  cd "$_dir"
+package() {
+  cd EV-$pkgver
   make install INSTALLDIRS=vendor DESTDIR="$pkgdir"
-  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
-)
-
-# Local Variables:
-# mode: shell-script
-# sh-basic-offset: 2
-# End:
-# vim:set ts=2 sw=2 et:
+}
diff --git a/extra/perl-event/PKGBUILD b/extra/perl-event/PKGBUILD
deleted file mode 100644
index 24c4d81d9..000000000
--- a/extra/perl-event/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 160529 2012-06-02 10:27:35Z bluewind $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Contributor: François Charette <francois.archlinux.org>
-
-pkgname=perl-event
-_srcname=Event
-pkgver=1.20
-pkgrel=2
-pkgdesc="Framework for GUI events"
-arch=('i686' 'x86_64' 'mips64el')
-license=('PerlArtistic' 'GPL')
-url="http://search.cpan.org/dist/${_srcname}/"
-depends=('perl')
-options=('!emptydirs')
-source=(http://search.cpan.org/CPAN/authors/id/J/JP/JPRIT/${_srcname}-${pkgver}.tar.gz)
-md5sums=('bdbdf6c1b235c3e13c25f3b0491c5134')
-
-build() {
-  cd "${srcdir}/${_srcname}-${pkgver}"
-
-  # install module in vendor directories.
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/${_srcname}-${pkgver}"
-  make test
-}
-
-package() {
-  cd "${srcdir}/${_srcname}-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-}
diff --git a/extra/perl-guard/PKGBUILD b/extra/perl-guard/PKGBUILD
index b0aa28c8d..65a819282 100644
--- a/extra/perl-guard/PKGBUILD
+++ b/extra/perl-guard/PKGBUILD
@@ -1,5 +1,5 @@
 # Packager: Justin Davis <jrcd83@gmail.com>
-# $Id: PKGBUILD 160533 2012-06-02 10:27:42Z bluewind $
+# $Id: PKGBUILD 180339 2013-03-20 16:34:29Z eric $
 
 pkgname=perl-guard
 pkgver=1.022
@@ -18,8 +18,8 @@ _distdir="${srcdir}/Guard-${pkgver}"
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
       PERL_AUTOINSTALL=--skipdeps                            \
-      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
-      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
+      PERL_MM_OPT="INSTALLDIRS=vendor"     \
+      PERL_MB_OPT="--installdirs vendor" \
       MODULEBUILDRC=/dev/null
 
     cd "$_distdir"
@@ -38,7 +38,6 @@ check() {
 package() {
     cd "$_distdir"
     make DESTDIR="$pkgdir" install
-    find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
 
 # Local Variables:
diff --git a/extra/perl-html-parser/PKGBUILD b/extra/perl-html-parser/PKGBUILD
index 1ed93e03f..4abb00e0e 100644
--- a/extra/perl-html-parser/PKGBUILD
+++ b/extra/perl-html-parser/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 160535 2012-06-02 10:27:46Z bluewind $
+# $Id: PKGBUILD 182897 2013-04-16 03:24:08Z eric $
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: Manolis Tzanidakis
 # Contributor: Firmicus <francois.archlinux.org> 
 
 pkgname=perl-html-parser
 _realname=HTML-Parser
-pkgver=3.69
-pkgrel=2
+pkgver=3.70
+pkgrel=1
 pkgdesc="Perl HTML parser class"
 arch=('i686' 'x86_64' 'mips64el')
 license=('PerlArtistic')
 url="http://search.cpan.org/dist/${_realname}/"
-depends=('perl-html-tagset' 'perl>=5.12.1')
-options=(!emptydirs)
+depends=('perl-html-tagset' 'perl')
+checkdepends=('perl-test-pod')
+options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz)
-md5sums=('d22cc6468ce670a56034be907e4e7c54')
+md5sums=('efe7699f5ece3a230d730a3682359c08')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
@@ -32,4 +33,3 @@ package() {
   cd "${srcdir}/${_realname}-${pkgver}"
   make install DESTDIR="${pkgdir}"
 }
-# vim: ts=2 sw=2 et ft=sh
diff --git a/extra/perl-libintl-perl/PKGBUILD b/extra/perl-libintl-perl/PKGBUILD
index 10f344716..ac9570fc9 100644
--- a/extra/perl-libintl-perl/PKGBUILD
+++ b/extra/perl-libintl-perl/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 160537 2012-06-02 10:27:49Z bluewind $
+# $Id: PKGBUILD 182899 2013-04-16 03:42:32Z eric $
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=perl-libintl-perl
 _realname=libintl-perl
-pkgver=1.20
-pkgrel=4
+pkgver=1.23
+pkgrel=1
 pkgdesc="Perl Module: Localization support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://search.cpan.org/dist/${_realname}/"
 depends=('gettext' 'perl')
-options=(!emptydirs)
+options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/G/GU/GUIDO/${_realname}-$pkgver.tar.gz)
-md5sums=('cb36f58a7d2e15974f25b35381548b1b')
+md5sums=('2e79dc842af1c9efc14fbe6664dc89bf')
 
 build() {
   cd "${srcdir}/${_realname}-$pkgver"
diff --git a/extra/perl-list-moreutils/PKGBUILD b/extra/perl-list-moreutils/PKGBUILD
index 2aad86c9c..6e0eefa61 100644
--- a/extra/perl-list-moreutils/PKGBUILD
+++ b/extra/perl-list-moreutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160539 2012-06-02 10:27:53Z bluewind $
+# $Id: PKGBUILD 180362 2013-03-20 17:38:22Z eric $
 # Maintainer : Justin "juster" Davis <jrcd83@gmail.com>
 # Generator  : pbjam 0.01
 
@@ -19,8 +19,8 @@ _distdir="${srcdir}/List-MoreUtils-${pkgver}"
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
       PERL_AUTOINSTALL=--skipdeps                            \
-      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
-      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
+      PERL_MM_OPT="INSTALLDIRS=vendor"     \
+      PERL_MB_OPT="--installdirs vendor" \
       MODULEBUILDRC=/dev/null
 
     cd "$_distdir"
@@ -39,7 +39,6 @@ check() {
 package() {
     cd "$_distdir"
     make DESTDIR="$pkgdir" install
-    find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
 
 # Local Variables:
diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD
index 1879935bf..f12fdac29 100644
--- a/extra/perl-net-ssleay/PKGBUILD
+++ b/extra/perl-net-ssleay/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176029 2013-01-26 16:18:55Z giovanni $
+# $Id: PKGBUILD 182685 2013-04-12 16:53:38Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Manolis Tzanidakis
 
 pkgname=perl-net-ssleay
 _cpanname=Net-SSLeay
-pkgver=1.52
+pkgver=1.54
 pkgrel=1
 pkgdesc="Perl extension for using OpenSSL"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ options=(!emptydirs)
 replaces=('net-ssleay')
 provides=('net-ssleay')
 source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz")
-md5sums=('b885d173d5733b103355658aa4b3c60d')
+md5sums=('26e758fff1c90cb00e9358fea7e1e22f')
 
 build() {
   cd ${srcdir}/${_cpanname}-${pkgver}
diff --git a/extra/perl-socket6/PKGBUILD b/extra/perl-socket6/PKGBUILD
index ce7feaf42..d43eba51f 100644
--- a/extra/perl-socket6/PKGBUILD
+++ b/extra/perl-socket6/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 180365 2013-03-20 17:57:40Z eric $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Generator  : CPANPLUS::Dist::Arch 1.18
 
@@ -19,8 +20,8 @@ _distdir="${srcdir}/Socket6-0.23"
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
       PERL_AUTOINSTALL=--skipdeps                            \
-      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
-      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
+      PERL_MM_OPT="INSTALLDIRS=vendor"     \
+      PERL_MB_OPT="--installdirs vendor" \
       MODULEBUILDRC=/dev/null
 
     cd "$_distdir"
@@ -38,8 +39,7 @@ check() {
 
 package() {
   cd "$_distdir"
-  make install
-  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
+  make DESTDIR="$pkgdir" install
 }
 
 # Local Variables:
diff --git a/extra/perl-unicode-string/PKGBUILD b/extra/perl-unicode-string/PKGBUILD
deleted file mode 100644
index 0090d429c..000000000
--- a/extra/perl-unicode-string/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 160563 2012-06-02 10:28:34Z bluewind $
-# Maintainer: James Rayner <iphitus@gmail.com>
-# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
-
-pkgname=perl-unicode-string
-_realname=Unicode-String
-pkgver=2.09
-pkgrel=7
-pkgdesc="String of Unicode characters for perl (UCS2/UTF16)"
-arch=('i686' 'x86_64' 'mips64el')
-license=('PerlArtistic')
-url="http://search.cpan.org/dist/${_realname}/"
-depends=('perl')
-options=(!emptydirs)
-source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz)
-md5sums=('553e68e603723bf7c631f8701ab0d678')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  # in stall module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make test
-}
-
-package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-}
diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD
index 3ba2bccbb..0b4acc826 100644
--- a/extra/perl-yaml-syck/PKGBUILD
+++ b/extra/perl-yaml-syck/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175939 2013-01-25 05:33:39Z eric $
+# $Id: PKGBUILD 182872 2013-04-15 21:25:04Z eric $
 # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman
 # Maintainer: kevin <kevin@archlinux.org>
 
 pkgname=perl-yaml-syck
 _realname=YAML-Syck
-pkgver=1.22
+pkgver=1.25
 pkgrel=1
 pkgdesc="Fast, lightweight YAML loader and dumper"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz)
-md5sums=('361db9a4dcaf8fa279ca813e146ce7d7')
+md5sums=('847f315cbd074b42c44f360383ac13e9')
 
 build() {
   cd "${srcdir}/${_realname}-$pkgver"
diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD
index fc12aa997..8c5389681 100644
--- a/extra/phonon-vlc/PKGBUILD
+++ b/extra/phonon-vlc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170852 2012-11-12 18:34:07Z andrea $
+# $Id: PKGBUILD 177946 2013-02-12 07:43:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon-vlc
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://phonon.kde.org/'
@@ -11,11 +11,10 @@ license=('LGPL')
 depends=('vlc')
 makedepends=('cmake' 'automoc4' 'phonon')
 provides=('phonon-backend')
-source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/src/phonon-backend-vlc-${pkgver}.tar.xz")
-md5sums=('d227b92619124a2b85e2d2e5f0fff90e')
+source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/phonon-backend-vlc-${pkgver}.tar.xz")
+md5sums=('1ae8b15594714841d2bcf8c72813a176')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../phonon-backend-vlc-${pkgver} \
@@ -26,6 +25,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
index 0535acd73..f2c70a45a 100644
--- a/extra/phonon/PKGBUILD
+++ b/extra/phonon/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 169725 2012-10-27 10:50:17Z andrea $
+# $Id: PKGBUILD 179762 2013-03-09 17:47:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon
 pkgver=4.6.0
-pkgrel=3
+pkgrel=8
 epoch=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://phonon.kde.org/'
 license=('LGPL')
 pkgdesc="The multimedia framework for KDE"
-depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist')
+depends=('phonon-backend' 'libpulse' 'libqzeitgeist')
 optdepends=('pulseaudio: PulseAudio support')
-makedepends=('cmake' 'automoc4' 'pulseaudio' 'qtwebkit')
+makedepends=('cmake' 'automoc4' 'pulseaudio')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
         'fix-plugindir-for-qt-app.patch'
         'fix-qmake.patch')
@@ -21,6 +21,7 @@ md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173'
 
 build() {
   cd ${pkgname}-${pkgver}
+  # Upstream fixes
   patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch
   patch -p1 -i "${srcdir}"/fix-qmake.patch
   cd ../
@@ -31,12 +32,19 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \
-    -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer
+    -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
+    -DPHONON_BUILD_DESIGNER_PLUGIN=OFF
   make
 }
 
 package(){
   cd build
   make DESTDIR="${pkgdir}" install
+
+  # Install headers into the Qt4 dir
+  install -d "${pkgdir}"/usr/include/qt4
+  mv "${pkgdir}"/usr/include/{phonon,KDE} "${pkgdir}"/usr/include/qt4/
+
+  sed -i 's#includedir=/usr/include#includedir=/usr/include/qt4#' \
+    "${pkgdir}"/usr/lib/pkgconfig/phonon.pc
 }
diff --git a/extra/php-apc/svn.patch b/extra/php-apc/svn.patch
deleted file mode 100644
index 6a846a752..000000000
--- a/extra/php-apc/svn.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-Index: apc_string.c
-===================================================================
---- apc_string.c	(Revision 325040)
-+++ apc_string.c	(Revision 326091)
-@@ -91,17 +91,18 @@
-         p = p->pNext;
-     }
-    
--    if (APCSG(interned_strings_top) + ZEND_MM_ALIGNED_SIZE(sizeof(Bucket) + nKeyLength) >=
-+    if (APCSG(interned_strings_top) + ZEND_MM_ALIGNED_SIZE(sizeof(Bucket) + nKeyLength + 1) >=
-         APCSG(interned_strings_end)) {
-         /* no memory */
-         return NULL;
-     }
- 
-     p = (Bucket *) APCSG(interned_strings_top);
--    APCSG(interned_strings_top) += ZEND_MM_ALIGNED_SIZE(sizeof(Bucket) + nKeyLength);
-+    APCSG(interned_strings_top) += ZEND_MM_ALIGNED_SIZE(sizeof(Bucket) + nKeyLength + 1);
- 
-     p->arKey = (char*)(p+1);
-     memcpy(p->arKey, arKey, nKeyLength);
-+    ((char *)p->arKey)[nKeyLength] = '\0';
-     p->nKeyLength = nKeyLength;
-     p->h = h;
-     p->pData = &p->pDataPtr;
-@@ -154,7 +155,7 @@
-         }
- 
- 		if (ce->name) {
--            ce->name = apc_new_interned_string(ce->name, ce->name_length TSRMLS_CC);
-+            ce->name = apc_new_interned_string(ce->name, ce->name_length+1 TSRMLS_CC);
- 		}
- 
-         q = ce->properties_info.pListHead;
-@@ -166,7 +167,7 @@
-             }
- 
-             if (info->name) {
--                info->name = apc_new_interned_string(info->name, info->name_length TSRMLS_CC);
-+                info->name = apc_new_interned_string(info->name, info->name_length+1 TSRMLS_CC);
-             }
- 
-             q = q->pListNext;
-Index: apc.php
-===================================================================
---- apc.php	(Revision 325040)
-+++ apc.php	(Revision 326091)
-@@ -91,7 +91,7 @@
- 	'SORT1'	=> '/^[AHSMCDTZ]$/',	// first sort key
- 	'SORT2'	=> '/^[DA]$/',			// second sort key
- 	'AGGR'	=> '/^\d+$/',			// aggregation by dir level
--	'SEARCH'	=> '~^[a-zA-Z0-1/_.-]*$~'			// aggregation by dir level
-+	'SEARCH'	=> '~^[a-zA-Z0-9/_.-]*$~'			// aggregation by dir level
- );
- 
- // default cache mode
-Index: php_apc.c
-===================================================================
---- php_apc.c	(Revision 325040)
-+++ php_apc.c	(Revision 326091)
-@@ -724,6 +724,10 @@
-     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz", &strkey, &strkey_len, &(args.step), &success) == FAILURE) {
-         return;
-     }
-+    
-+	if (success) {
-+		zval_dtor(success);
-+	}
- 
-     if(_apc_update(strkey, strkey_len, inc_updater, &args TSRMLS_CC)) {
-         if(success) ZVAL_TRUE(success);
-@@ -747,6 +751,10 @@
-     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lz", &strkey, &strkey_len, &(args.step), &success) == FAILURE) {
-         return;
-     }
-+    
-+	if (success) {
-+		zval_dtor(success);
-+	}
- 
-     args.step = args.step * -1;
- 
-Index: php_apc.h
-===================================================================
---- php_apc.h	(Revision 325040)
-+++ php_apc.h	(Revision 326091)
-@@ -35,7 +35,7 @@
- #include "apc_php.h"
- #include "apc_globals.h"
- 
--#define PHP_APC_VERSION "3.1.9"
-+#define PHP_APC_VERSION "3.1.10"
- 
- extern zend_module_entry apc_module_entry;
- #define apc_module_ptr &apc_module_entry
-Index: apc_cache.c
-===================================================================
---- apc_cache.c	(Revision 325040)
-+++ apc_cache.c	(Revision 326091)
-@@ -944,7 +944,7 @@
- 
-     len = strlen(filename);
-     if(APCG(fpstat)==0) {
--        if(IS_ABSOLUTE_PATH(filename,len)) {
-+        if(IS_ABSOLUTE_PATH(filename,len) || strstr(filename, "://")) {
-             key->data.fpfile.fullpath = filename;
-             key->data.fpfile.fullpath_len = len;
-             key->h = string_nhash_8(key->data.fpfile.fullpath, key->data.fpfile.fullpath_len);
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 64ac59d08..990b706f0 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175873 2013-01-23 00:13:10Z eric $
+# $Id: PKGBUILD 182657 2013-04-12 07:45:16Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,8 +21,8 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.4.11
-pkgrel=2
+pkgver=5.4.14
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('PHP')
 url='http://www.php.net'
@@ -33,16 +33,27 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('9975e68c22b86b013b934743ad2d2276'
-         '0b0bc7a917fc592bdf11dcd3c5c255e9'
+md5sums=('cfdc044be2c582991a1fe0967898fa38'
+         '44c1bb1df346b3b9d3e092c7df9a37d0'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          '5c1f4c967b66ce3eaf819b46951dcbf5'
          'e036c721e5ad927cd1613c7475a58b3a'
          'f8b206cb8fecb05cb1ded8bee45633ff'
          'c60343df74f8e1afb13b084d5c0e47ed')
 
+prepare() {
+	cd ${srcdir}/${pkgbase}-${pkgver}
+
+	# adjust paths
+	patch -p0 -i ${srcdir}/php.ini.patch
+	patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
+
+	# workaround for pkg-config 0.28
+	sed 's/ && test -n "$OPENSSL_INCS"//g' -i configure
+}
+
 build() {
-	phpconfig="--srcdir=../${pkgbase}-${pkgver} \
+	local _phpconfig="--srcdir=../${pkgbase}-${pkgver} \
 		--config-cache \
 		--prefix=/usr \
 		--sysconfdir=/etc/php \
@@ -55,7 +66,7 @@ build() {
 		--without-pear \
 		"
 
-	phpextensions="--enable-bcmath=shared \
+	local _phpextensions="--enable-bcmath=shared \
 		--enable-calendar=shared \
 		--enable-dba=shared \
 		--enable-exif=shared \
@@ -120,69 +131,65 @@ build() {
 
 	cd ${srcdir}/${pkgbase}-${pkgver}
 
-	# adjust paths
-	patch -p0 -i ${srcdir}/php.ini.patch
-	patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
-
 	# php
 	mkdir ${srcdir}/build-php
 	cd ${srcdir}/build-php
 	ln -s ../${pkgbase}-${pkgver}/configure
-	./configure ${phpconfig} \
+	./configure ${_phpconfig} \
 		--disable-cgi \
 		--with-readline \
 		--enable-pcntl \
-		${phpextensions}
+		${_phpextensions}
 	make
 
 	# cgi and fcgi
 	# reuse the previous run; this will save us a lot of time
 	cp -a ${srcdir}/build-php ${srcdir}/build-cgi
 	cd ${srcdir}/build-cgi
-	./configure ${phpconfig} \
+	./configure ${_phpconfig} \
 		--disable-cli \
 		--enable-cgi \
-		${phpextensions}
+		${_phpextensions}
 	make
 
 	# apache
 	cp -a ${srcdir}/build-php ${srcdir}/build-apache
 	cd ${srcdir}/build-apache
-	./configure ${phpconfig} \
+	./configure ${_phpconfig} \
 		--disable-cli \
 		--with-apxs2 \
-		${phpextensions}
+		${_phpextensions}
 	make
 
 	# fpm
 	cp -a ${srcdir}/build-php ${srcdir}/build-fpm
 	cd ${srcdir}/build-fpm
-	./configure ${phpconfig} \
+	./configure ${_phpconfig} \
 		--disable-cli \
 		--enable-fpm \
 		--with-fpm-user=http \
 		--with-fpm-group=http \
-		${phpextensions}
+		${_phpextensions}
 	make
 
 	# embed
 	cp -a ${srcdir}/build-php ${srcdir}/build-embed
 	cd ${srcdir}/build-embed
-	./configure ${phpconfig} \
+	./configure ${_phpconfig} \
 		--disable-cli \
 		--enable-embed=shared \
-		${phpextensions}
+		${_phpextensions}
 	make
 
 	# pear
 	cp -a ${srcdir}/build-php ${srcdir}/build-pear
 	cd ${srcdir}/build-pear
-	./configure ${phpconfig} \
+	./configure ${_phpconfig} \
 		--disable-cgi \
 		--with-readline \
 		--enable-pcntl \
 		--with-pear \
-		${phpextensions}
+		${_phpextensions}
 	make
 }
 
@@ -232,7 +239,7 @@ package_php-apache() {
 
 package_php-fpm() {
 	pkgdesc='FastCGI Process Manager for PHP'
-	depends=('php')
+	depends=('php' 'systemd')
 	backup=('etc/php/php-fpm.conf')
 	install='php-fpm.install'
 
diff --git a/extra/php/php-fpm.install b/extra/php/php-fpm.install
index 41fc37c22..3572a7653 100644
--- a/extra/php/php-fpm.install
+++ b/extra/php/php-fpm.install
@@ -1,6 +1,6 @@
 post_install() {
 	if [[ ! -d run/php-fpm ]]; then
-		usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/php-fpm.conf
+		usr/bin/systemd-tmpfiles --create php-fpm.conf
 	fi
 }
 
diff --git a/extra/php/php.ini.patch b/extra/php/php.ini.patch
index bbaae2152..62555d66a 100644
--- a/extra/php/php.ini.patch
+++ b/extra/php/php.ini.patch
@@ -5,7 +5,7 @@
  ; *NOT* affected by whether Safe Mode is turned On or Off.
  ; http://php.net/open-basedir
 -;open_basedir =
-+open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/
++open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/:/usr/share/webapps/
  
  ; This directive allows you to disable certain functions for security reasons.
  ; It receives a comma-delimited list of function names. This directive is
diff --git a/extra/php/rc.d.php-fpm b/extra/php/rc.d.php-fpm
deleted file mode 100644
index a8cb9eca9..000000000
--- a/extra/php/rc.d.php-fpm
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-wait_for_pid () {
-	try=0
-	while test $try -lt 35 ; do
-		case "$1" in
-			'created')
-			if [ -f "$2" ] ; then
-				try=''
-				break
-			fi
-			;;
-			'removed')
-			if [ ! -f "$2" ] ; then
-				try=''
-				break
-			fi
-			;;
-		esac
-
-		stat_append '.'
-		try=`expr $try + 1`
-		sleep 1
-	done
-}
-
-test_config() {
-	stat_busy 'Checking configuration'
-	if [ $(id -u) -ne 0 ]; then
-		stat_append '(This script must be run as root)'
-		stat_die
-	fi
-
-	if [ ! -r /etc/php/php-fpm.conf ]; then
-		stat_append '(/etc/php/php-fpm.conf not found)'
-		stat_die
-	fi
-
-	local test=$(/usr/sbin/php-fpm -t 2>&1)
-	if [ $? -gt 0 ]; then
-		stat_append '(error in /etc/php/php-fpm.conf)'
-		stat_die
-	elif echo $test | grep -qi 'error'; then
-		stat_append '(error in /etc/php/php.ini)'
-		stat_die
-	fi
-
-	stat_done
-}
-
-case "$1" in
-	start)
-		test_config
-		stat_busy 'Starting php-fpm'
-
-		/usr/sbin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid
-
-		if [ "$?" != 0 ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		wait_for_pid created /run/php-fpm/php-fpm.pid
-
-		if [ -n "$try" ] ; then
-			stat_fail
-			exit 1
-		else
-			add_daemon php-fpm
-			stat_done
-		fi
-	;;
-
-	stop)
-		test_config
-		stat_busy 'Gracefully shutting down php-fpm'
-
-		if [ ! -r /run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -QUIT `cat /run/php-fpm/php-fpm.pid`
-
-		wait_for_pid removed /run/php-fpm/php-fpm.pid
-
-		if [ -n "$try" ] ; then
-			stat_fail
-			exit 1
-		else
-			rm_daemon php-fpm
-			stat_done
-		fi
-	;;
-
-	force-quit)
-		stat_busy 'Terminating php-fpm'
-
-		if [ ! -r /run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -TERM `cat /run/php-fpm/php-fpm.pid`
-
-		wait_for_pid removed /run/php-fpm/php-fpm.pid
-
-		if [ -n "$try" ] ; then
-			stat_fail
-			exit 1
-		else
-			rm_daemon php-fpm
-			stat_done
-		fi
-	;;
-
-	restart)
-		$0 stop
-		$0 start
-	;;
-
-	reload)
-		test_config
-		stat_busy 'Reload service php-fpm'
-
-		if [ ! -r /run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -USR2 `cat /run/php-fpm/php-fpm.pid`
-		stat_done
-	;;
-
-	*)
-		echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}"
-		exit 1
-	;;
-
-esac
diff --git a/extra/pidgin-encryption/PKGBUILD b/extra/pidgin-encryption/PKGBUILD
deleted file mode 100644
index 3f843ccc3..000000000
--- a/extra/pidgin-encryption/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 150421 2012-02-17 13:03:41Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Dan McGee <dan@archlinux.org>
-# Contributor: Dale Blount <dale@archlinux.org>
-
-pkgname=pidgin-encryption
-pkgver=3.1
-pkgrel=2.1
-pkgdesc="A Pidgin plugin providing transparent RSA encryption using NSS"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://pidgin-encrypt.sourceforge.net/"
-depends=('pidgin' 'nss')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/pidgin-encrypt/$pkgname-$pkgver.tar.gz
-        glib.patch)
-md5sums=('d839eec602c21f913b32b742dc512f4b'
-         '6183c2e70e11c9ef874b21a996c93d2f')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 -i "$srcdir/glib.patch"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/extra/pidgin-encryption/fix_header_escaping.patch b/extra/pidgin-encryption/fix_header_escaping.patch
deleted file mode 100644
index 84df67b19..000000000
--- a/extra/pidgin-encryption/fix_header_escaping.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- pidgin-encryption-3.0.orig/encrypt.c	2007-05-06 23:37:55.000000000 -0400
-+++ pidgin-encryption-3.0.new/encrypt.c	2009-11-22 22:28:34.052010351 -0500
-@@ -1114,21 +1114,21 @@ static void PE_headers_init() {
-    notify_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
- 
-    g_hash_table_insert(header_table, g_strdup("prpl-toc"),
--                       g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\""));
-+                       g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\""));
-    g_hash_table_insert(footer_table, g_strdup("prpl-toc"),
-                        g_strdup("\"></A>"));
-    g_hash_table_insert(notify_table, g_strdup("prpl-toc"),
-                        g_strdup("<A HREF=\"Gaim-Encryption Capable\"></A>"));
- 
-    g_hash_table_insert(header_table, g_strdup("prpl-oscar"),
--                       g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\""));
-+                       g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\""));
-    g_hash_table_insert(footer_table, g_strdup("prpl-oscar"),
-                        g_strdup("\"></A>"));
-    g_hash_table_insert(notify_table, g_strdup("prpl-oscar"),
-                        g_strdup("<A HREF=\"Gaim-Encryption Capable\"></A>"));
- 
-    g_hash_table_insert(header_table, g_strdup("prpl-aim"),
--                       g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF=\""));
-+                       g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF=\""));
-    g_hash_table_insert(footer_table, g_strdup("prpl-aim"),
-                        g_strdup("\"></A>"));
-    g_hash_table_insert(notify_table, g_strdup("prpl-aim"),
-@@ -1136,7 +1136,7 @@ static void PE_headers_init() {
- 
- /* If jabber stops stripping HTML, we can go back to these headers */
- /*    g_hash_table_insert(header_table, g_strdup("prpl-jabber"), */
--/*                        g_strdup("*** Encrypted with the Gaim-Encryption plugin <A HREF='")); */
-+/*                        g_strdup("--- Encrypted with the Gaim-Encryption plugin <A HREF='")); */
- /*    g_hash_table_insert(footer_table, g_strdup("prpl-jabber"), */
- /*                        g_strdup("'></A>")); */
- /*    g_hash_table_insert(notify_table, g_strdup("prpl-jabber"), */
-@@ -1144,22 +1144,22 @@ static void PE_headers_init() {
- 
- 
-    g_hash_table_insert(header_table, g_strdup("prpl-jabber"),
--                       g_strdup("*** Encrypted with the Gaim-Encryption plugin "));
-+                       g_strdup("--- Encrypted with the Gaim-Encryption plugin "));
-    g_hash_table_insert(footer_table, g_strdup("prpl-jabber"),
-                        g_strdup(" "));
-    g_hash_table_insert(notify_table, g_strdup("prpl-jabber"),
-                        g_strdup("<A HREF='Gaim-Encryption Capable'> </A>"));
- 
--   header_default = g_strdup("*** Encrypted :");
-+   header_default = g_strdup("--- Encrypted :");
- }
- 
--/* #define CRYPT_HEADER "*** Encrypted with the Gaim-Encryption plugin <A HREF=\"" */
-+/* #define CRYPT_HEADER "--- Encrypted with the Gaim-Encryption plugin <A HREF=\"" */
- /* #define CRYPT_FOOTER "\"></A>" */
- /* #define CRYPT_NOTIFY_HEADER "<A HREF=\"Gaim-Encryption Capable\"></A>" */
- 
- // Jabber seems to turn our double quotes into single quotes at times, so define
- // the same headers, only with single quotes.  Lengths MUST be the same as above
--/* #define CRYPT_HEADER_MANGLED "*** Encrypted with the Gaim-Encryption plugin <A HREF='" */
-+/* #define CRYPT_HEADER_MANGLED "--- Encrypted with the Gaim-Encryption plugin <A HREF='" */
- /* #define CRYPT_NOTIFY_HEADER_MANGLED "<A HREF='Gaim-Encryption Capable'></A>" */
- 
- 
-
diff --git a/extra/pidgin-encryption/glib.patch b/extra/pidgin-encryption/glib.patch
deleted file mode 100644
index 9d156c32c..000000000
--- a/extra/pidgin-encryption/glib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru pidgin-encryption-3.1.orig/rsa_nss.c pidgin-encryption-3.1/rsa_nss.c
---- pidgin-encryption-3.1.orig/rsa_nss.c	2012-12-26 13:57:18.637297343 +0100
-+++ pidgin-encryption-3.1/rsa_nss.c	2012-12-26 14:00:37.782680833 +0100
-@@ -24,7 +24,7 @@
- #include <debug.h>
- #include <gtkdialogs.h>
- 
--#include "glib/gmain.h"
-+#include <glib.h>
- 
- #include <string.h>
- #include <assert.h>
diff --git a/extra/pidgin-encryption/log_crash.patch b/extra/pidgin-encryption/log_crash.patch
deleted file mode 100644
index a18416144..000000000
--- a/extra/pidgin-encryption/log_crash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pidgin-encryption-3.0.orig/state_ui.c	2007-05-07 02:15:27.000000000 +0200
-+++ pidgin-encryption-3.0.new/state_ui.c	2009-04-26 17:08:02.000000000 +0200
-@@ -268,6 +268,8 @@
- static GtkIMHtmlSmiley * create_smiley_if_absent(GtkIMHtml *imhtml) {
-    GtkIMHtmlSmiley * smiley;
-    const char* category = gtk_imhtml_get_protocol_name(imhtml);
-+   
-+   if (!category) return NULL;
- 
-    /* make sure that the category we're about to use to add (based on the protocol name) */
-    /* already exists.  If it doesn't, just use the default category so it isn't created. */
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index 2add5a8ab..2e6cea0c8 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 174743 2013-01-05 21:41:56Z foutrelis $
+# $Id: PKGBUILD 178040 2013-02-14 01:37:10Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,8 +6,8 @@
 # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
 
 pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.6
-pkgrel=4
+pkgver=2.10.7
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pidgin.im/"
 license=('GPL')
@@ -15,12 +15,18 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
              'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi'
              'tk' 'ca-certificates' 'intltool' 'networkmanager')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('3e25a633b97cbfa8326999a30282e7a662a9b9bbf2853be84af0b8fb60392c96')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+        pidgin-2.10.7-link-libirc-to-libsasl2.patch)
+sha256sums=('eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192'
+            '063723d5dc5726c43137b4b383c9d07c2c008391f6a626faaf6cedd31a2f1e8f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # https://developer.pidgin.im/ticket/15517
+  patch -Np1 -i "$srcdir/pidgin-2.10.7-link-libirc-to-libsasl2.patch"
+  autoreconf -vi
+
   # Use Python 2
   sed -i 's/env python$/&2/' */plugins/*.py \
     libpurple/purple-{remote,notifications-example,url-handler}
diff --git a/extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch b/extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch
new file mode 100644
index 000000000..abffa20b8
--- /dev/null
+++ b/extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch
@@ -0,0 +1,12 @@
+diff -upr pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am pidgin-2.10.7/libpurple/protocols/irc/Makefile.am
+--- pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am	2013-02-14 02:44:47.000000000 +0200
++++ pidgin-2.10.7/libpurple/protocols/irc/Makefile.am	2013-02-14 02:49:58.000000000 +0200
+@@ -27,7 +27,7 @@ else
+ st =
+ pkg_LTLIBRARIES   = libirc.la
+ libirc_la_SOURCES = $(IRCSOURCES)
+-libirc_la_LIBADD  = $(GLIB_LIBS)
++libirc_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS)
+ 
+ endif
+ 
diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD
index 8f731703a..6f2722cf7 100644
--- a/extra/pigeonhole/PKGBUILD
+++ b/extra/pigeonhole/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176805 2013-01-31 17:39:46Z andyrtr $
+# $Id: PKGBUILD 182109 2013-04-07 09:14:17Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 # Contributorr: Peter Lewis <plewis@aur.archlinux.org>
@@ -7,12 +7,12 @@
 # This must be built against the version of dovecot being used,
 # else mail delivery will fail.
 # Specify the version of dovecot to be used here:
-_dcpkgver=2.1.14
+_dcpkgver=2.1.16
 # Make sure to bump pkgrel if changing this.
 
 pkgname=pigeonhole
-pkgver=0.3.3
-pkgrel=5
+pkgver=0.3.4
+pkgrel=1
 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pigeonhole.dovecot.org/"
@@ -22,8 +22,8 @@ conflicts=('dovecot-sieve' 'pigeonhole-hg')
 source=("http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-$pkgname-$pkgver.tar.gz"{,.sig}
         "dovecot.conf")
 options=('!libtool')
-sha256sums=('1d581f6292c6e760b26a06193a0af266ba3b6f3a0431e6617fcf6e1c84f7dd0e'
-            '8604f9c52cff28506873cf4d0026c57ef73def5f05877126ea561774f1b8ffec'
+sha256sums=('34da8801c7695c397a53a13574fe8674b92aa9d936f91a1b6e6df787488a6d05'
+            'SKIP'
             'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858')
 
 build() {
diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD
index 3ff369e9a..51e2f79fc 100644
--- a/extra/pixman/PKGBUILD
+++ b/extra/pixman/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=pixman
-pkgver=0.28.2
+pkgver=0.29.2
 pkgrel=1
 pkgdesc="The pixel-manipulation library for X and cairo"
 arch=(i686 x86_64 'mips64el')
@@ -13,14 +13,10 @@ license=('custom')
 depends=('glibc')
 options=('!libtool')
 source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('9e9ede6e13061030f9c827219cb87f47e32ecdb4')
+sha1sums=('c1367c28cfb6a1c79c39b5df2d1a05351f57c702')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-#  [ "$CARCH" = "mips64el" ] && {
-#    patch -Np1 -i $srcdir/pixman-loongson2f.patch
-#    autoreconf -i
-#  }
   ./configure --prefix=/usr --disable-static
   make
 }
diff --git a/extra/pixman/pixman-loongson2f.patch b/extra/pixman/pixman-loongson2f.patch
deleted file mode 100644
index 15e01cb6b..000000000
--- a/extra/pixman/pixman-loongson2f.patch
+++ /dev/null
@@ -1,2745 +0,0 @@
-diff -urN pixman//configure.ac Pixman.Loongson//configure.ac
---- pixman//configure.ac	2010-12-25 18:46:00.018699000 +0800
-+++ Pixman.Loongson//configure.ac	2010-12-25 18:39:15.298778000 +0800
-@@ -264,6 +264,43 @@
- ])
- 
- dnl ===========================================================================
-+dnl Check for Loongson SIMD
-+
-+have_loongson_intrinsics=no
-+AC_MSG_CHECKING(whether to use Loongson SIMD intrinsics)
-+
-+AC_COMPILE_IFELSE([
-+#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4))
-+error "Need GCC >= 4.4 for Loongson SIMD compilation"
-+#endif
-+int main () {
-+    /* Test with a loongson SIMD instruction. */
-+	asm volatile ( ".set arch = loongson2f \n\t" "and \$f0, \$f0, \$f0 \n\t"  : : : "cc", "memory" );
-+    return 0;
-+}], have_loongson_intrinsics=yes)
-+
-+
-+AC_ARG_ENABLE(loongson,
-+   [AC_HELP_STRING([--disable-loongson],
-+                   [disable Loongson fast paths])],
-+   [enable_loongson=$enableval], [enable_loongson=auto])
-+
-+if test $enable_loongson = no ; then
-+   have_loongson_intrinsics=disabled
-+fi
-+
-+if test $have_loongson_intrinsics = yes ; then
-+   AC_DEFINE(USE_LS, 1, [use Loongson compiler intrinsics])
-+fi
-+
-+AC_MSG_RESULT($have_loongson_intrinsics)
-+if test $enable_loongson = yes && test $have_loongson_intrinsics = no ; then
-+   AC_MSG_ERROR([Loongson intrinsics not detected])
-+fi
-+
-+AM_CONDITIONAL(USE_LS, test $have_loongson_intrinsics = yes)
-+
-+dnl ===========================================================================
- dnl Check for MMX
- 
- if test "x$MMX_CFLAGS" = "x" ; then
-diff -urN pixman//pixman/Makefile.am Pixman.Loongson//pixman/Makefile.am
---- pixman//pixman/Makefile.am	2010-12-25 18:46:00.025027000 +0800
-+++ Pixman.Loongson//pixman/Makefile.am	2010-12-25 18:39:15.303599000 +0800
-@@ -55,6 +55,19 @@
- 	pixman-combine.h.template solaris-hwcap.mapfile pixman-x64-mmx-emulation.h
- CLEANFILES = pixman-combine32.c pixman-combine64.c pixman-combine32.h pixman-combine64.h
- 
-+# loongson code
-+if USE_LS
-+noinst_LTLIBRARIES += libpixman-ls.la
-+libpixman_ls_la_SOURCES = \
-+	pixman-ls.c
-+libpixman_ls_la_CFLAGS = $(DEP_CFLAGS) $(LS_CFLAGS)
-+libpixman_ls_la_LIBADD = $(DEP_LIBS)
-+libpixman_1_la_LDFLAGS += $(LS_LDFLAGS)
-+libpixman_1_la_LIBADD += libpixman-ls.la
-+
-+ASM_CFLAGS_ls=$(LS_CFLAGS)
-+endif
-+
- # mmx code
- if USE_MMX
- noinst_LTLIBRARIES += libpixman-mmx.la
-diff -urN pixman//pixman/pixman-combine-ls.c Pixman.Loongson//pixman/pixman-combine-ls.c
---- pixman//pixman/pixman-combine-ls.c	1970-01-01 08:00:00.000000000 +0800
-+++ Pixman.Loongson//pixman/pixman-combine-ls.c	2010-12-25 18:39:15.344171000 +0800
-@@ -0,0 +1,911 @@
-+static force_inline uint32_t
-+combine (const uint32_t *src, const uint32_t *mask)
-+{
-+    uint32_t ssrc = *src;
-+
-+    if (mask)
-+    {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%1,$f22) 
-+		load8888r(%0,$f20) 
-+		expand_alpha($f22,$f22)

-+		pix_multiply($f20,$f22)

-+		store8888r($f8,%0)
-+		:"+r"(ssrc):"r"(*mask):clobber
-+		);
-+    }
-+    return ssrc;
-+}
-+
-+static void
-+ls_combine_saturate_u (pixman_implementation_t *imp,
-+                        pixman_op_t              op,
-+                        uint32_t *               dest,
-+                        const uint32_t *         src,
-+                        const uint32_t *         mask,
-+                        int                      width)
-+{
-+    const uint32_t *end = dest + width;
-+
-+    while (dest < end)
-+    {
-+	uint32_t s = combine (src, mask);
-+	uint32_t d = *dest;
-+
-+	__asm__ volatile (
-+	".set arch=loongson2f \n\t"	
-+	load8888r(%1,$f22) 
-+	load8888r(%0,$f20) 
-+	:"+r"(d):"r"(s):clobber
-+	);
-+
-+	uint32_t sa = s >> 24;
-+	uint32_t da = ~d >> 24;
-+
-+	if (sa > da)
-+	{
-+		uint32_t dds =  DIV_UN8 (da, sa) << 24;
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%0,$f24) 
-+		expand_alpha($f24,$f24)
-+		pix_multiply($f22,$f24)
-+		save_to($f22)
-+		::"r"(dds):clobber
-+		);
-+	}
-+	__asm__ volatile (
-+	".set arch=loongson2f \n\t"	
-+	pix_add($f20,$f22) 
-+	store8888r($f8,%0)
-+	:"=r"(*dest)::clobber
-+	);
-+
-+	++src;
-+	++dest;
-+	if (mask)
-+	    mask++;
-+    }
-+}
-+static void
-+ls_combine_out_u (pixman_implementation_t *imp,
-+                   pixman_op_t              op,
-+                   uint32_t *               dest,
-+                   const uint32_t *         src,
-+                   const uint32_t *         mask,
-+                   int                      width)
-+{
-+    const uint32_t *end = dest + width;
-+
-+    while (dest < end)
-+    {
-+	if (mask) 
-+	{
-+
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+
-+		load8888r(%2,$f22)  
-+		load8888r(%1,$f20) 
-+		expand_alpha($f22,$f22)
-+		pix_multiply($f20,$f22)
-+		save_to ($f20)
-+
-+		load8888r(%0,$f24) 
-+		expand_alpha($f24,$f24)
-+		negate($f24,$f24)
-+		pix_multiply($f20,$f24)		
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+
-+		mask++;
-+	}else {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+
-+
-+		load8888r(%1,$f20) 
-+
-+		load8888r(%0,$f24) 
-+		expand_alpha($f24,$f24)
-+		negate($f24,$f24)
-+		pix_multiply($f20,$f24)		
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src):clobber
-+		);		
-+		
-+	}
-+	++dest;
-+	++src;
-+    }
-+}
-+
-+static void
-+ls_combine_out_reverse_u (pixman_implementation_t *imp,
-+                           pixman_op_t              op,
-+                           uint32_t *               dest,
-+                           const uint32_t *         src,
-+                           const uint32_t *         mask,
-+                           int                      width)
-+{
-+    const uint32_t *end = dest + width;
-+
-+    while (dest < end)
-+    {
-+	if (mask)
-+	{
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+
-+		load8888r(%2,$f22)  
-+		load8888r(%1,$f20) 
-+		expand_alpha($f22,$f22)
-+		pix_multiply($f20,$f22)
-+		save_to ($f20)
-+
-+		load8888r(%0,$f24) 
-+		expand_alpha($f20,$f20)
-+		negate($f20,$f20)
-+		pix_multiply($f20,$f24)		
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+
-+		mask++;
-+	}else{
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+
-+		load8888r(%1,$f20) 
-+
-+		load8888r(%0,$f24) 
-+		expand_alpha($f20,$f20)
-+		negate($f20,$f20)
-+		pix_multiply($f20,$f24)		
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src):clobber
-+		);	
-+	}
-+	++dest;
-+	++src;
-+
-+    }
-+}
-+
-+static void
-+ls_combine_out_ca (pixman_implementation_t *imp,
-+                    pixman_op_t              op,
-+                    uint32_t *               dest,
-+                    const uint32_t *         src,
-+                    const uint32_t *         mask,
-+                    int                      width)
-+{
-+    const uint32_t *end = src + width;
-+
-+    while (src < end)
-+    {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%2,$f22) 
-+		load8888r(%1,$f20) 
-+		load8888r(%0,$f24) 
-+		expand_alpha($f24,$f26)
-+		negate($f26,$f26)
-+		pix_multiply($f20,$f22)
-+		save_to($f20) 
-+		pix_multiply($f20,$f26)
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+	++src;
-+	++dest;
-+	++mask;
-+    }
-+}
-+
-+static void
-+ls_combine_out_reverse_ca (pixman_implementation_t *imp,
-+                            pixman_op_t              op,
-+                            uint32_t *               dest,
-+                            const uint32_t *         src,
-+                            const uint32_t *         mask,
-+                            int                      width)
-+{
-+    const uint32_t *end = src + width;
-+
-+    while (src < end)
-+    {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%2,$f22) 
-+		load8888r(%1,$f20) 
-+		load8888r(%0,$f24) 
-+		expand_alpha($f20,$f28)
-+		pix_multiply($f22,$f28)
-+		save_to($f22) 
-+		negate($f22,$f22)
-+		pix_multiply($f24,$f22)
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+	++src;
-+	++dest;
-+	++mask;
-+    }
-+}
-+
-+
-+static void
-+ls_combine_atop_u (pixman_implementation_t *imp,
-+                    pixman_op_t              op,
-+                    uint32_t *               dest,
-+                    const uint32_t *         src,
-+                    const uint32_t *         mask,
-+                    int                      width)
-+{
-+    const uint32_t *end = dest + width;
-+
-+    while (dest < end)
-+    {
-+	if (mask)
-+	{
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+
-+		load8888r(%2,$f22)  
-+		load8888r(%1,$f20) 
-+		expand_alpha($f22,$f22)
-+		pix_multiply($f20,$f22)
-+		save_to ($f20)
-+
-+		load8888r(%0,$f24) 
-+		expand_alpha($f20,$f26)
-+		expand_alpha($f24,$f28)
-+		negate($f26,$f26)
-+		pix_add_mul($f20,$f28,$f24,$f26)		
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+
-+		mask++;
-+	}else {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%1,$f20) 
-+
-+		load8888r(%0,$f24) 
-+		expand_alpha($f20,$f26)
-+		expand_alpha($f24,$f28)
-+		negate($f26,$f26)
-+		pix_add_mul($f20,$f28,$f24,$f26)		
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src):clobber
-+		);
-+	}
-+	++dest;
-+	++src;
-+
-+    }
-+}
-+
-+static void
-+ls_combine_atop_reverse_u (pixman_implementation_t *imp,
-+                            pixman_op_t              op,
-+                            uint32_t *               dest,
-+                            const uint32_t *         src,
-+                            const uint32_t *         mask,
-+                            int                      width)
-+{
-+    const uint32_t *end;
-+
-+    end = dest + width;
-+
-+    while (dest < end)
-+    {
-+	if (mask){
-+
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+
-+		load8888r(%2,$f22)  
-+		load8888r(%1,$f20) 
-+		expand_alpha($f22,$f22)
-+		pix_multiply($f20,$f22)
-+		save_to ($f20)
-+
-+		load8888r(%0,$f24) 
-+		expand_alpha($f20,$f26)
-+		expand_alpha($f24,$f28)
-+		negate($f28,$f28)
-+		pix_add_mul($f20,$f28,$f24,$f26)		
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+		mask++;
-+	}else{
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+
-+		load8888r(%1,$f20) 
-+
-+		load8888r(%0,$f24) 
-+		expand_alpha($f20,$f26)
-+		expand_alpha($f24,$f28)
-+		negate($f28,$f28)
-+		pix_add_mul($f20,$f28,$f24,$f26)		
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src):clobber
-+		);	
-+	}
-+	++dest;
-+	++src;
-+    }
-+}
-+
-+
-+static void
-+ls_combine_atop_ca (pixman_implementation_t *imp,
-+                     pixman_op_t              op,
-+                     uint32_t *               dest,
-+                     const uint32_t *         src,
-+                     const uint32_t *         mask,
-+                     int                      width)
-+{
-+    const uint32_t *end = src + width;
-+
-+    while (src < end)
-+    {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%2,$f22) 
-+		load8888r(%1,$f20) 
-+		load8888r(%0,$f24) 
-+		expand_alpha($f24,$f26) 
-+		expand_alpha($f20,$f28) 
-+		pix_multiply($f20,$f22)
-+		save_to($f20)
-+		pix_multiply($f22,$f28)
-+		save_to($f22)
-+		negate($f22,$f22)
-+		pix_add_mul($f24,$f22,$f20,$f26)		
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+	++src;
-+	++dest;
-+	++mask;
-+    }
-+}
-+
-+static void
-+ls_combine_atop_reverse_ca (pixman_implementation_t *imp,
-+                             pixman_op_t              op,
-+                             uint32_t *               dest,
-+                             const uint32_t *         src,
-+                             const uint32_t *         mask,
-+                             int                      width)
-+{
-+    const uint32_t *end = src + width;
-+
-+    while (src < end)
-+    {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%2,$f22) 
-+		load8888r(%1,$f20) 
-+		load8888r(%0,$f24) 
-+		expand_alpha($f24,$f26)
-+		expand_alpha($f20,$f28)
-+		pix_multiply($f20,$f22)
-+		save_to($f20) 
-+		pix_multiply($f22,$f28)
-+		save_to($f22) 
-+		negate($f26,$f26)
-+		pix_add_mul($f24,$f22,$f20,$f26)		
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+	++src;
-+	++dest;
-+	++mask;
-+    }
-+}
-+
-+static void
-+ls_combine_xor_u (pixman_implementation_t *imp,
-+                   pixman_op_t              op,
-+                   uint32_t *               dest,
-+                   const uint32_t *         src,
-+                   const uint32_t *         mask,
-+                   int                      width)
-+{
-+    const uint32_t *end = dest + width;
-+
-+    while (dest < end)
-+    {
-+	if (mask) 
-+	{
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%2,$f22)  
-+		load8888r(%1,$f20) 
-+		expand_alpha($f22,$f22)
-+		pix_multiply($f20,$f22)
-+		save_to ($f20)
-+
-+
-+		load8888r(%0,$f24) 
-+		expand_alpha($f20,$f26) 
-+		expand_alpha($f24,$f28) 
-+		negate($f26,$f26)
-+		negate($f28,$f28)
-+		pix_add_mul($f20,$f28,$f24,$f26)		
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+		mask++;
-+	}else{
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%1,$f20) 
-+
-+		load8888r(%0,$f24) 
-+		expand_alpha($f20,$f26) 
-+		expand_alpha($f24,$f28) 
-+		negate($f26,$f26)
-+		negate($f28,$f28)
-+		pix_add_mul($f20,$f28,$f24,$f26)		
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src):clobber
-+		);
-+	}
-+	++dest;
-+	++src;
-+
-+    }
-+}
-+
-+static void
-+ls_combine_xor_ca (pixman_implementation_t *imp,
-+                    pixman_op_t              op,
-+                    uint32_t *               dest,
-+                    const uint32_t *         src,
-+                    const uint32_t *         mask,
-+                    int                      width)
-+{
-+    const uint32_t *end = src + width;
-+
-+    while (src < end)
-+    {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%2,$f22) 
-+		load8888r(%1,$f20) 
-+		load8888r(%0,$f24) 
-+		expand_alpha($f24,$f26) 
-+		expand_alpha($f20,$f28) 
-+		pix_multiply($f20,$f22)
-+		save_to($f20) 
-+		pix_multiply($f22,$f28)
-+		save_to($f22) 
-+		negate($f26,$f26)
-+		negate($f22,$f22)
-+		pix_add_mul($f24,$f22,$f20,$f26)		
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+	++src;
-+	++dest;
-+	++mask;
-+    }
-+}
-+
-+
-+static void
-+ls_combine_in_reverse_u (pixman_implementation_t *imp,
-+                          pixman_op_t              op,
-+                          uint32_t *               dest,
-+                          const uint32_t *         src,
-+                          const uint32_t *         mask,
-+                          int                      width)
-+{
-+    const uint32_t *end = dest + width;
-+
-+    while (dest < end)
-+    {
-+ 
-+	if (mask) 
-+	{
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%2,$f22)  
-+		load8888r(%1,$f20) 
-+		expand_alpha($f22,$f22)
-+		pix_multiply($f20,$f22)
-+		save_to ($f20)
-+
-+		load8888r(%0,$f24) 
-+		expand_alpha($f20,$f26)
-+		pix_multiply($f24,$f26)
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+		mask++;
-+	} else {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%1,$f20) 
-+
-+		load8888r(%0,$f24) 
-+		expand_alpha($f20,$f26)
-+		pix_multiply($f24,$f26)
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src):clobber		
-+		);
-+	}
-+	++dest;
-+	++src;
-+    }
-+}
-+
-+static void
-+ls_combine_in_reverse_ca (pixman_implementation_t *imp,
-+                           pixman_op_t              op,
-+                           uint32_t *               dest,
-+                           const uint32_t *         src,
-+                           const uint32_t *         mask,
-+                           int                      width)
-+{
-+    const uint32_t *end = src + width;
-+
-+    while (src < end)
-+    {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%2,$f22) 
-+		load8888r(%1,$f20) 
-+		load8888r(%0,$f24) 
-+		expand_alpha($f20,$f20) 
-+		pix_multiply($f22,$f20)
-+		save_to($f26)
-+		pix_multiply($f24,$f26)
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+	++src;
-+	++dest;
-+	++mask;
-+    }
-+}
-+
-+static void
-+ls_combine_in_u (pixman_implementation_t *imp,
-+                  pixman_op_t              op,
-+                  uint32_t *               dest,
-+                  const uint32_t *         src,
-+                  const uint32_t *         mask,
-+                  int                      width)
-+{
-+    const uint32_t *end = dest + width;
-+
-+    while (dest < end)
-+    {
-+	if (mask) 
-+	{
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%2,$f22)  
-+		load8888r(%1,$f20) 
-+		expand_alpha($f22,$f22)
-+		pix_multiply($f20,$f22)
-+		save_to ($f20)
-+
-+		load8888r(%0,$f24) 
-+		expand_alpha($f24,$f24)
-+		pix_multiply($f20,$f24)
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+		mask++;
-+	} else {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%1,$f20) 
-+
-+		load8888r(%0,$f24) 
-+		expand_alpha($f24,$f24)
-+		pix_multiply($f20,$f24)
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src):clobber
-+		);	
-+	
-+	}
-+	++dest;
-+	++src;
-+    }
-+}
-+
-+static void
-+ls_combine_in_ca (pixman_implementation_t *imp,
-+                   pixman_op_t              op,
-+                   uint32_t *               dest,
-+                   const uint32_t *         src,
-+                   const uint32_t *         mask,
-+                   int                      width)
-+{
-+    const uint32_t *end = src + width;
-+
-+    while (src < end)
-+    {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%2,$f22) 
-+		load8888r(%1,$f20) 
-+		load8888r(%0,$f24) 
-+		expand_alpha($f24,$f24) 
-+		pix_multiply($f20,$f22)
-+		save_to($f26)
-+		pix_multiply($f26,$f24)
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+	++src;
-+	++dest;
-+	++mask;
-+    }
-+ }
-+static void
-+ls_combine_src_ca (pixman_implementation_t *imp,
-+                    pixman_op_t              op,
-+                    uint32_t *               dest,
-+                    const uint32_t *         src,
-+                    const uint32_t *         mask,
-+                    int                      width)
-+{
-+    const uint32_t *end = src + width;
-+
-+    while (src < end)
-+    {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%2,$f22) 
-+		load8888r(%1,$f20) 
-+		pix_multiply($f20,$f22)
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+	++src;
-+	++mask;
-+	++dest;
-+    }
-+
-+}
-+
-+
-+static void 
-+ls_combine_over_u (pixman_implementation_t *imp,
-+                    pixman_op_t              op,
-+                    uint32_t *               dest,
-+                    const uint32_t *         src,
-+                    const uint32_t *         mask,
-+                    int                      width)
-+{
-+    const uint32_t *end = dest + width;
-+
-+    while (dest < end)
-+    {
-+
-+	uint32_t ssrc = combine (src, mask);
-+	uint32_t a = ssrc >> 24;
-+
-+	if (a == 0xff)
-+	{
-+	    *dest = ssrc;
-+	}
-+	else if (ssrc)
-+	{
-+
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%1,$f20)
-+
-+		expand_alpha($f20,$f24) 
-+		load8888r(%0,$f26) 
-+		over($f20,$f24,$f26)
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(ssrc):clobber
-+		);
-+	}
-+
-+	++dest;
-+	++src;
-+	if (mask)
-+	    ++mask;
-+    }
-+}
-+
-+static void
-+ls_combine_over_reverse_u (pixman_implementation_t *imp,
-+                            pixman_op_t              op,
-+                            uint32_t *               dest,
-+                            const uint32_t *         src,
-+                            const uint32_t *         mask,
-+                            int                      width)
-+{
-+    const uint32_t *end = dest + width;
-+
-+    while (dest < end)
-+    {
-+	if (mask)
-+	{
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+
-+		load8888r(%2,$f22)  
-+		load8888r(%1,$f20) 
-+		expand_alpha($f22,$f22)
-+		pix_multiply($f20,$f22)
-+		save_to ($f20)
-+
-+		load8888r(%0,$f26) 
-+		expand_alpha($f26,$f28)
-+		over($f26,$f28,$f20)
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+		mask++;
-+	}else{
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%1,$f20) 
-+
-+		load8888r(%0,$f26) 
-+		expand_alpha($f26,$f28)
-+		over($f26,$f28,$f20)
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src):clobber
-+		);	
-+	
-+	}
-+	++dest;
-+	++src;
-+    }
-+}
-+
-+
-+static void
-+ls_combine_over_ca (pixman_implementation_t *imp,
-+                     pixman_op_t              op,
-+                     uint32_t *               dest,
-+                     const uint32_t *         src,
-+                     const uint32_t *         mask,
-+                     int                      width)
-+{
-+    const uint32_t *end = src + width;
-+
-+    while (src < end)
-+    {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%0,$f20) 
-+		load8888r(%1,$f22) 
-+		load8888r(%2,$f24) 
-+		expand_alpha($f22,$f26) 
-+		in_over($f22,$f26,$f24,$f20)
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+	++src;
-+	++dest;
-+	++mask;
-+    }
-+
-+}
-+
-+static void
-+ls_combine_over_reverse_ca (pixman_implementation_t *imp,
-+                             pixman_op_t              op,
-+                             uint32_t *               dest,
-+                             const uint32_t *         src,
-+                             const uint32_t *         mask,
-+                             int                      width)
-+{
-+    const uint32_t *end = src + width;
-+
-+    while (src < end)
-+    {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%0,$f20) 
-+		load8888r(%1,$f22) 
-+		load8888r(%2,$f24) 
-+		in($f22,$f24)
-+		save_to($f22)
-+		expand_alpha($f20,$f28) 
-+		over($f20,$f28,$f22)
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+	++src;
-+	++dest;
-+	++mask;
-+    }
-+
-+}
-+
-+static void
-+ls_combine_add_u (pixman_implementation_t *imp,
-+                   pixman_op_t              op,
-+                   uint32_t *               dest,
-+                   const uint32_t *         src,
-+                   const uint32_t *         mask,
-+                   int                      width)
-+{
-+    const uint32_t *end = dest + width;
-+
-+    while (dest < end)
-+    {
-+
-+	if (mask)
-+	{
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%2,$f22)  
-+		load8888r(%1,$f20) 
-+		expand_alpha($f22,$f22)
-+		pix_multiply($f20,$f22)
-+		save_to ($f20)
-+
-+		load8888r(%0,$f22) 
-+		pix_add($f20,$f22)
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+		mask++;
-+	}else{
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%1,$f20) 
-+
-+		load8888r(%0,$f22) 
-+		pix_add($f20,$f22)
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src):clobber
-+		);	
-+	
-+	}
-+	++dest;
-+	++src;
-+    }
-+}
-+
-+static void
-+ls_combine_add_ca (pixman_implementation_t *imp,
-+                    pixman_op_t              op,
-+                    uint32_t *               dest,
-+                    const uint32_t *         src,
-+                    const uint32_t *         mask,
-+                    int                      width)
-+{
-+    const uint32_t *end = src + width;
-+
-+    while (src < end)
-+    {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%0,$f20) 
-+		load8888r(%1,$f22) 
-+		load8888r(%2,$f24) 
-+		pix_multiply($f22,$f24)
-+		save_to($f22)
-+		pix_add($f22,$f20)
-+		store8888r($f8,%0)
-+		:"+r"(*dest):"r"(*src),"r"(*mask):clobber
-+		);
-+	++src;
-+	++dest;
-+	++mask;
-+    }
-+}
-diff -urN pixman//pixman/pixman-composite-ls.c Pixman.Loongson//pixman/pixman-composite-ls.c
---- pixman//pixman/pixman-composite-ls.c	1970-01-01 08:00:00.000000000 +0800
-+++ Pixman.Loongson//pixman/pixman-composite-ls.c	2010-12-25 18:39:15.356667000 +0800
-@@ -0,0 +1,967 @@
-+static void
-+ls_composite_over_x888_8_8888 (pixman_implementation_t *imp,
-+                                 pixman_op_t              op,
-+                                 pixman_image_t *         src_image,
-+                                 pixman_image_t *         mask_image,
-+                                 pixman_image_t *         dst_image,
-+                                 int32_t                  src_x,
-+                                 int32_t                  src_y,
-+                                 int32_t                  mask_x,
-+                                 int32_t                  mask_y,
-+                                 int32_t                  dest_x,
-+                                 int32_t                  dest_y,
-+                                 int32_t                  width,
-+                                 int32_t                  height)
-+{
-+
-+    uint32_t    *src, *src_line;
-+    uint32_t    *dst, *dst_line;
-+    uint8_t     *mask, *mask_line;
-+    int src_stride, mask_stride, dst_stride;
-+    uint32_t m;
-+    uint32_t s, d;
-+    int32_t w;
-+
-+    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
-+    PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
-+    PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
-+
-+    while (height--)
-+    {
-+	src = src_line;
-+	src_line += src_stride;
-+	dst = dst_line;
-+	dst_line += dst_stride;
-+	mask = mask_line;
-+	mask_line += mask_stride;
-+
-+	w = width;
-+	while (w--)
-+	{
-+	    m = *mask++;
-+	    if (m)
-+	    {
-+		s = *src | 0xff000000;
-+
-+		if (m == 0xff)
-+		{
-+		    *dst = s;
-+		}
-+		else
-+		{
-+          __asm__ volatile (
-+          ".set arch=loongson2f \n\t"     
-+          load8888r(%0,$f20) 
-+          load8888r(%1,$f22) 
-+          load8888r(%2,$f24) 
-+          expand_alpha($f22,$f26)
-+          expand_alpha_rev($f24,$f28)
-+          in_over($f22,$f26,$f28,$f20)
-+          store8888r($f8,%0)
-+          :"+r"(*dst):"r"(s),"r"(m):clobber
-+          );
-+
-+//		    __m64 sa = expand_alpha (s);
-+//		    __m64 vm = expand_alpha_rev (to_m64 (m));
-+//		    __m64 vdest = in_over (s, sa, vm, load8888 (*dst));
-+//		    *dst = store8888 (vdest);
-+
-+		}
-+	    }
-+	    src++;
-+	    dst++;
-+	}
-+    }
-+}
-+
-+
-+
-+
-+
-+static void
-+ls_composite_over_8888_8888 (pixman_implementation_t *imp,
-+                              pixman_op_t              op,
-+                              pixman_image_t *         src_image,
-+                              pixman_image_t *         mask_image,
-+                              pixman_image_t *         dst_image,
-+                              int32_t                  src_x,
-+                              int32_t                  src_y,
-+                              int32_t                  mask_x,
-+                              int32_t                  mask_y,
-+                              int32_t                  dest_x,
-+                              int32_t                  dest_y,
-+                              int32_t                  width,
-+                              int32_t                  height)
-+{
-+    uint32_t *dst_line, *dst;
-+    uint32_t *src_line, *src;
-+    uint32_t s;
-+    int dst_stride, src_stride;
-+    uint8_t a;
-+    int32_t w;
-+
-+    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
-+    PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
-+
-+    while (height--)
-+    {
-+	dst = dst_line;
-+	dst_line += dst_stride;
-+	src = src_line;
-+	src_line += src_stride;
-+	w = width;
-+
-+	while (w--)
-+	{
-+	    s = *src;
-+	    a = s >> 24;
-+
-+	    if (a == 0xff)
-+	    {
-+		*dst = s;
-+	    }
-+	    else if (s)
-+	    {
-+			
-+				__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%1,$f24) 
-+		load8888r(%0,$f20)
-+		expand_alpha($f24,$f26)
-+		over($f24,$f26,$f20)
-+		store8888r($f8,%0)
-+		:"+r"(*dst):"r"(*src):clobber
-+		);
-+	    }
-+		dst++;
-+		src++;	
-+
-+	}
-+    }
-+}
-+
-+
-+static void
-+ls_composite_over_8888_n_8888 (pixman_implementation_t *imp,
-+                                pixman_op_t              op,
-+                                pixman_image_t *         src_image,
-+                                pixman_image_t *         mask_image,
-+                                pixman_image_t *         dst_image,
-+                                int32_t                  src_x,
-+                                int32_t                  src_y,
-+                                int32_t                  mask_x,
-+                                int32_t                  mask_y,
-+                                int32_t                  dest_x,
-+                                int32_t                  dest_y,
-+                                int32_t                  width,
-+                                int32_t                  height)
-+{
-+    uint32_t    *dst_line, *dst;
-+    uint32_t    *src_line, *src;
-+    uint32_t mask;
-+    __m64 vmask;
-+    int dst_stride, src_stride;
-+    int32_t w;
-+    __m64 srca;
-+
-+    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
-+    PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
-+
-+    mask = _pixman_image_get_solid (mask_image, dst_image->bits.format);
-+    mask = mask | mask >> 8 | mask >> 16 | mask >> 24;
-+
-+	__asm__ volatile (
-+	".set arch=loongson2f \n\t"	
-+	load8888(%1,$f24)
-+	store64a($f24,%0)
-+	:"=m"(vmask):"m"(mask):clobber
-+	);
-+
-+    srca = ls_4x00ff;
-+
-+    while (height--)
-+    {
-+	dst = dst_line;
-+	dst_line += dst_stride;
-+	src = src_line;
-+	src_line += src_stride;
-+	w = width;
-+
-+	while (w)
-+	{
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%1,$f20) 
-+		load8888r(%0,$f22) 
-+		expand_alpha($f20,$f28)
-+		in_over($f20,$f28,$f24,$f22)
-+		store8888r($f8,%0)
-+		:"+r"(*dst):"r"(*src):clobber
-+		);
-+
-+	    w--;
-+	    dst++;
-+	    src++;
-+	}
-+    }
-+}
-+
-+static void
-+ls_composite_over_n_8888 (pixman_implementation_t *imp,
-+                           pixman_op_t              op,
-+                           pixman_image_t *         src_image,
-+                           pixman_image_t *         mask_image,
-+                           pixman_image_t *         dst_image,
-+                           int32_t                  src_x,
-+                           int32_t                  src_y,
-+                           int32_t                  mask_x,
-+                           int32_t                  mask_y,
-+                           int32_t                  dest_x,
-+                           int32_t                  dest_y,
-+                           int32_t                  width,
-+                           int32_t                  height)
-+{
-+    uint32_t src;
-+    uint32_t    *dst_line, *dst;
-+    int32_t w;
-+    int dst_stride;
-+    __m64 vsrc, vsrca; 
-+
-+    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
-+
-+    if (src == 0)
-+	return;
-+
-+    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
-+
-+	__asm__ volatile (
-+	".set arch=loongson2f \n\t"	
-+	load8888r(%2,$f24)
-+	store64($f24,%0)
-+	expand_alpha($f24,$f26)
-+	store64($f26,%1)
-+	:"=m"(vsrc), "=m"(vsrca):"r"(src):clobber
-+	);
-+
-+    while (height--)
-+    {
-+	dst = dst_line;
-+	dst_line += dst_stride;
-+	w = width;
-+
-+	while (w)
-+	{
-+	__asm__ volatile (
-+	".set arch=loongson2f \n\t"	
-+	load8888r(%0,$f28)
-+	over($f24,$f26,$f28)
-+	store8888r($f8,%0)
-+	:"+r"(*dst)::clobber
-+	);
-+
-+	    w--;
-+	    dst++;
-+	}
-+    }
-+}
-+
-+static void
-+ls_composite_over_n_8888_8888_ca (pixman_implementation_t *imp,
-+                                   pixman_op_t              op,
-+                                   pixman_image_t *         src_image,
-+                                   pixman_image_t *         mask_image,
-+                                   pixman_image_t *         dst_image,
-+                                   int32_t                  src_x,
-+                                   int32_t                  src_y,
-+                                   int32_t                  mask_x,
-+                                   int32_t                  mask_y,
-+                                   int32_t                  dest_x,
-+                                   int32_t                  dest_y,
-+                                   int32_t                  width,
-+                                   int32_t                  height)
-+{
-+    uint32_t src, srca;
-+    uint32_t    *dst_line;
-+    uint32_t    *mask_line;
-+    int dst_stride, mask_stride;
-+    __m64 vsrc, vsrca;
-+
-+    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
-+
-+    srca = src >> 24;
-+    if (src == 0)
-+	return;
-+
-+    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
-+    PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint32_t, mask_stride, mask_line, 1);
-+
-+	__asm__ volatile (
-+	".set arch=loongson2f \n\t"	
-+	load8888r(%2,$f24)
-+	store64($f24,%0)
-+	expand_alpha($f24,$f26)
-+	store64($f26,%1)
-+	:"=m"(vsrc), "=m"(vsrca):"r"(src):clobber
-+	);
-+
-+    while (height--)
-+    {
-+	int twidth = width;
-+	uint32_t *p = (uint32_t *)mask_line;
-+	uint32_t *q = (uint32_t *)dst_line;
-+
-+	while (twidth)
-+	{
-+
-+	    if (*p)
-+	    {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%0,$f28)
-+		load8888r(%1,$f20)
-+		in_over($f24,$f26,$f20,$f28)
-+		store8888r($f8,%0)
-+		:"+r"(*q):"r"(*p):clobber
-+		);
-+	    }
-+	    twidth--;
-+	    p++;
-+	    q++;
-+	}
-+
-+	dst_line += dst_stride;
-+	mask_line += mask_stride;
-+    }
-+}
-+
-+
-+static void
-+ls_composite_over_n_8_8888 (pixman_implementation_t *imp,
-+                             pixman_op_t              op,
-+                             pixman_image_t *         src_image,
-+                             pixman_image_t *         mask_image,
-+                             pixman_image_t *         dst_image,
-+                             int32_t                  src_x,
-+                             int32_t                  src_y,
-+                             int32_t                  mask_x,
-+                             int32_t                  mask_y,
-+                             int32_t                  dest_x,
-+                             int32_t                  dest_y,
-+                             int32_t                  width,
-+                             int32_t                  height)
-+{
-+    uint32_t src, srca;
-+    uint32_t *dst_line, *dst;
-+    uint8_t *mask_line, *mask;
-+    int dst_stride, mask_stride;
-+    int32_t w;
-+    __m64 vsrc, vsrca;
-+    uint64_t srcsrc;
-+
-+    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
-+
-+    srca = src >> 24;
-+    if (src == 0)
-+	return;
-+
-+    srcsrc = (uint64_t)src << 32 | src;
-+
-+    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
-+    PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
-+
-+	__asm__ volatile (
-+	".set arch=loongson2f \n\t"	
-+	load8888r(%2,$f24)
-+	store64a($f24,%0)
-+	expand_alpha($f24,$f26)
-+	store64a($f26,%1)
-+	:"=m"(vsrc), "=m"(vsrca):"r"(src):clobber
-+	);
-+
-+    while (height--)
-+    {
-+	dst = dst_line;
-+	dst_line += dst_stride;
-+	mask = mask_line;
-+	mask_line += mask_stride;
-+	w = width;
-+
-+	while (w)
-+	{
-+	    uint32_t m = *mask;
-+
-+	    if (m)
-+	    {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%0,$f20)
-+		load32r(%1,$f22)
-+		expand_alpha_rev($f22,$f28)
-+		in_over($f24,$f26,$f28,$f20)
-+		store8888r($f8,%0)
-+		:"+r"(*dst):"r"(m):clobber
-+		);
-+	    }
-+
-+	    w--;
-+	    mask++;
-+	    dst++;
-+	}
-+    }
-+
-+}
-+
-+static void
-+ls_composite_over_x888_n_8888 (pixman_implementation_t *imp,
-+                                pixman_op_t              op,
-+                                pixman_image_t *         src_image,
-+                                pixman_image_t *         mask_image,
-+                                pixman_image_t *         dst_image,
-+                                int32_t                  src_x,
-+                                int32_t                  src_y,
-+                                int32_t                  mask_x,
-+                                int32_t                  mask_y,
-+                                int32_t                  dest_x,
-+                                int32_t                  dest_y,
-+                                int32_t                  width,
-+                                int32_t                  height)
-+{
-+    uint32_t *dst_line, *dst;
-+    uint32_t *src_line, *src;
-+    uint32_t mask;
-+    __m64 vmask;
-+    int dst_stride, src_stride;
-+    int32_t w;
-+    __m64 srca;
-+
-+    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
-+    PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
-+    mask = _pixman_image_get_solid (mask_image, dst_image->bits.format);
-+
-+    mask &= 0xff000000;
-+    mask = mask | mask >> 8 | mask >> 16 | mask >> 24;
-+	__asm__ volatile (
-+	".set arch=loongson2f \n\t"	
-+	load8888r(%1,$f24)
-+	store64a($f24,%0)
-+	:"=m"(vmask):"r"(mask):clobber
-+	);
-+
-+	__asm__ volatile (
-+	".set arch=loongson2f \n\t"	
-+	load64a(%1,$f26)
-+	store64a($f26,%0)
-+	:"=m"(srca):"m"(ls_4x00ff):clobber
-+	);
-+
-+    while (height--)
-+    {
-+	dst = dst_line;
-+	dst_line += dst_stride;
-+	src = src_line;
-+	src_line += src_stride;
-+	w = width;
-+
-+	while (w)
-+	{
-+		uint32_t src_tmp = *src | 0xff000000;
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%1,$f20)
-+		load8888r(%0,$f22)		
-+		in_over($f20,$f26,$f24,$f22)
-+		store8888r($f8,%0)
-+		:"+r"(*dst):"r"(src_tmp):clobber
-+		);
-+
-+	    w--;
-+	    dst++;
-+	    src++;
-+	}
-+    }
-+}
-+
-+
-+static void
-+ls_composite_over_8888_0565 (pixman_implementation_t *imp,
-+                               pixman_op_t              op,
-+                               pixman_image_t *         src_image,
-+                               pixman_image_t *         mask_image,
-+                               pixman_image_t *         dst_image,
-+                               int32_t                  src_x,
-+                               int32_t                  src_y,
-+                               int32_t                  mask_x,
-+                               int32_t                  mask_y,
-+                               int32_t                  dest_x,
-+                               int32_t                  dest_y,
-+                               int32_t                  width,
-+                               int32_t                  height)
-+{
-+    uint16_t    *dst_line, *dst;
-+    uint32_t d;
-+    uint32_t    *src_line, *src, s;
-+    uint8_t a;
-+    int dst_stride, src_stride;
-+    int32_t w;
-+
-+    PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
-+    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
-+
-+    while (height--)
-+    {
-+	dst = dst_line;
-+	dst_line += dst_stride;
-+	src = src_line;
-+	src_line += src_stride;
-+	w = width;
-+
-+	while (w--)
-+	{
-+	    s = *src++;
-+	    a = s >> 24;
-+	    if (s)
-+	    {
-+		if (a == 0xff)
-+		{
-+		    d = s;
-+		}
-+		else
-+		{
-+		    d = *dst;
-+		    d = CONVERT_0565_TO_0888 (d);
-+
-+		    __asm__ volatile (
-+		    ".set arch=loongson2f \n\t"     
-+		    load8888r(%1,$f24) 
-+		    load8888r(%0,$f20)
-+		    expand_alpha($f24,$f26) 
-+		    over($f24,$f26,$f20)
-+		    store8888r($f8,%0)
-+		    :"+r"(d):"r"(s):clobber
-+		    );
-+
-+
-+		}
-+		*dst = CONVERT_8888_TO_0565 (d);
-+	    }
-+	    dst++;
-+	}
-+    }
-+}
-+
-+static void
-+ls_composite_over_n_0565 (pixman_implementation_t *imp,
-+                           pixman_op_t              op,
-+                           pixman_image_t *         src_image,
-+                           pixman_image_t *         mask_image,
-+                           pixman_image_t *         dst_image,
-+                           int32_t                  src_x,
-+                           int32_t                  src_y,
-+                           int32_t                  mask_x,
-+                           int32_t                  mask_y,
-+                           int32_t                  dest_x,
-+                           int32_t                  dest_y,
-+                           int32_t                  width,
-+                           int32_t                  height)
-+{
-+    uint32_t src;
-+    uint32_t d;
-+    uint16_t    *dst_line, *dst;
-+    int32_t w;
-+    int dst_stride;
-+    __m64 vsrc, vsrca;
-+
-+    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
-+
-+    if (src == 0)
-+	return;
-+
-+    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
-+	__asm__ volatile (
-+	".set arch=loongson2f \n\t"	
-+	load8888r(%2,$f24)
-+	store64a($f24,%0)
-+	expand_alpha($f24,$f26)
-+	store64a($f26,%1)
-+	:"=m"(vsrc), "=m"(vsrca):"r"(src):clobber
-+	);
-+
-+    while (height--)
-+    {
-+	dst = dst_line;
-+	dst_line += dst_stride;
-+	w = width;
-+
-+	while (w)
-+	{
-+
-+		d = *dst;
-+		d = CONVERT_0565_TO_0888 (d);
-+
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%0,$f20)
-+
-+		over($f24,$f26,$f20)
-+		store8888r($f8,%0)
-+		:"+r"(d)::clobber
-+		);
-+
-+		*dst = CONVERT_8888_TO_0565 (d);
-+
-+	    w--;
-+	    dst++;
-+	}
-+    }
-+}
-+
-+static void
-+ls_composite_over_n_8_0565 (pixman_implementation_t *imp,
-+                             pixman_op_t              op,
-+                             pixman_image_t *         src_image,
-+                             pixman_image_t *         mask_image,
-+                             pixman_image_t *         dst_image,
-+                             int32_t                  src_x,
-+                             int32_t                  src_y,
-+                             int32_t                  mask_x,
-+                             int32_t                  mask_y,
-+                             int32_t                  dest_x,
-+                             int32_t                  dest_y,
-+                             int32_t                  width,
-+                             int32_t                  height)
-+{
-+    uint32_t src, srca, m, d;
-+    uint16_t *dst_line, *dst;
-+    uint8_t *mask_line, *mask;
-+    int dst_stride, mask_stride;
-+    int32_t w;
-+    __m64 vsrc, vsrca;
-+
-+    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
-+
-+    srca = src >> 24;
-+    if (src == 0)
-+	return;
-+
-+    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
-+    PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
-+	__asm__ volatile (
-+	".set arch=loongson2f \n\t"	
-+	load8888r(%2,$f24)
-+	store64a($f24,%0)
-+	expand_alpha($f24,$f26)
-+	store64a($f26,%1)
-+	:"=m"(vsrc), "=m"(vsrca):"r"(src):clobber
-+	);
-+
-+    while (height--)
-+    {
-+	dst = dst_line;
-+	dst_line += dst_stride;
-+	mask = mask_line;
-+	mask_line += mask_stride;
-+	w = width;
-+
-+	while (w)
-+	{
-+	    m = *mask;
-+	    d = *dst;
-+
-+	    if (m)
-+	    {
-+
-+		d = CONVERT_0565_TO_0888 (d);
-+
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%0,$f20)
-+		load32r(%1,$f22)
-+		expand_alpha_rev($f22,$f28)
-+		in_over($f24,$f26,$f28,$f20)
-+		store8888r($f8,%0)
-+		:"+r"(d):"r"(m):clobber
-+		);
-+
-+		*dst = CONVERT_8888_TO_0565 (d);
-+
-+	    }
-+
-+	    w--;
-+	    mask++;
-+	    dst++;
-+	}
-+    }
-+}
-+
-+static void
-+ls_composite_over_n_8888_0565_ca (pixman_implementation_t *imp,
-+                                   pixman_op_t              op,
-+                                   pixman_image_t *         src_image,
-+                                   pixman_image_t *         mask_image,
-+                                   pixman_image_t *         dst_image,
-+                                   int32_t                  src_x,
-+                                   int32_t                  src_y,
-+                                   int32_t                  mask_x,
-+                                   int32_t                  mask_y,
-+                                   int32_t                  dest_x,
-+                                   int32_t                  dest_y,
-+                                   int32_t                  width,
-+                                   int32_t                  height)
-+{
-+    uint32_t src, srca, m, d;
-+    uint16_t    *dst_line;
-+    uint32_t    *mask_line;
-+    int dst_stride, mask_stride;
-+    __m64 vsrc, vsrca;
-+
-+    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
-+
-+    srca = src >> 24;
-+    if (src == 0)
-+	return;
-+
-+    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
-+    PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint32_t, mask_stride, mask_line, 1);
-+	__asm__ volatile (
-+	".set arch=loongson2f \n\t"	
-+	load8888r(%2,$f24)
-+	store64a($f24,%0)
-+	expand_alpha($f24,$f26)
-+	store64a($f26,%1)
-+	:"=m"(vsrc), "=m"(vsrca):"r"(src):clobber
-+	);
-+
-+    while (height--)
-+    {
-+	int twidth = width;
-+	uint32_t *p = (uint32_t *)mask_line;
-+	uint16_t *q = (uint16_t *)dst_line;
-+
-+	while (twidth)
-+	{
-+
-+	    m = *(uint32_t *)p;
-+	    d = *q;
-+
-+	    if (m)
-+	    {
-+
-+		d = CONVERT_0565_TO_0888 (d);
-+
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%0,$f20)
-+		load8888r(%1,$f22)
-+		in_over($f24,$f26,$f22,$f20)
-+		store8888r($f8,%0)
-+		:"+r"(d):"r"(m):clobber
-+		);
-+
-+		*q = CONVERT_8888_TO_0565 (d);
-+
-+	    }
-+
-+	    twidth--;
-+	    p++;
-+	    q++;
-+	}
-+
-+	mask_line += mask_stride;
-+	dst_line += dst_stride;
-+    }
-+}
-+static void
-+ls_composite_over_pixbuf_8888 (pixman_implementation_t *imp,
-+                                pixman_op_t              op,
-+                                pixman_image_t *         src_image,
-+                                pixman_image_t *         mask_image,
-+                                pixman_image_t *         dst_image,
-+                                int32_t                  src_x,
-+                                int32_t                  src_y,
-+                                int32_t                  mask_x,
-+                                int32_t                  mask_y,
-+                                int32_t                  dest_x,
-+                                int32_t                  dest_y,
-+                                int32_t                  width,
-+                                int32_t                  height)
-+{
-+    uint32_t    *dst_line, *dst;
-+    uint32_t    *src_line, *src;
-+    int dst_stride, src_stride;
-+    int32_t w;
-+
-+    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
-+    PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
-+
-+#if 0
-+    /* FIXME */
-+    assert (src_image->drawable == mask_image->drawable);
-+#endif
-+
-+    while (height--)
-+    {
-+	dst = dst_line;
-+	dst_line += dst_stride;
-+	src = src_line;
-+	src_line += src_stride;
-+	w = width;
-+
-+	while (w)
-+	{
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%1,$f22) 
-+		load8888r(%0,$f20) 
-+		over_rev_non_pre($f22,$f20)
-+		store8888r($f8,%0)
-+		:"+r"(*dst):"r"(*src):clobber
-+		);
-+
-+	    w--;
-+	    dst++;
-+	    src++;
-+	}
-+    }
-+}
-+static void
-+ls_composite_over_pixbuf_0565 (pixman_implementation_t *imp,
-+                                pixman_op_t              op,
-+                                pixman_image_t *         src_image,
-+                                pixman_image_t *         mask_image,
-+                                pixman_image_t *         dst_image,
-+                                int32_t                  src_x,
-+                                int32_t                  src_y,
-+                                int32_t                  mask_x,
-+                                int32_t                  mask_y,
-+                                int32_t                  dest_x,
-+                                int32_t                  dest_y,
-+                                int32_t                  width,
-+                                int32_t                  height)
-+{
-+    uint16_t    *dst_line, *dst;
-+    uint32_t    *src_line, *src, d;
-+    int dst_stride, src_stride;
-+    int32_t w;
-+
-+    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dst_stride, dst_line, 1);
-+    PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, src_stride, src_line, 1);
-+
-+#if 0
-+    /* FIXME */
-+    assert (src_image->drawable == mask_image->drawable);
-+#endif
-+
-+    while (height--)
-+    {
-+	dst = dst_line;
-+	dst_line += dst_stride;
-+	src = src_line;
-+	src_line += src_stride;
-+	w = width;
-+
-+	while (w)
-+	{
-+
-+		d = *dst;
-+		d = CONVERT_0565_TO_0888 (d);
-+
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load8888r(%1,$f20) 
-+		load8888r(%0,$f24) 
-+		over_rev_non_pre($f20,$f24)
-+		store8888r($f8,%0)
-+		:"+r"(d):"r"(*src):clobber
-+		);
-+
-+		*dst = CONVERT_8888_TO_0565 (d);
-+
-+	    w--;
-+	    dst++;
-+	    src++;
-+	}
-+    }
-+}
-+
-+static void
-+ls_composite_src_n_8_8888 (pixman_implementation_t *imp,
-+                            pixman_op_t              op,
-+                            pixman_image_t *         src_image,
-+                            pixman_image_t *         mask_image,
-+                            pixman_image_t *         dst_image,
-+                            int32_t                  src_x,
-+                            int32_t                  src_y,
-+                            int32_t                  mask_x,
-+                            int32_t                  mask_y,
-+                            int32_t                  dest_x,
-+                            int32_t                  dest_y,
-+                            int32_t                  width,
-+                            int32_t                  height)
-+{
-+    uint32_t src, srca;
-+    uint32_t    *dst_line, *dst, m;
-+    uint8_t     *mask_line, *mask;
-+    int dst_stride, mask_stride;
-+    int32_t w;
-+    __m64 vsrc, vsrca;
-+    uint64_t srcsrc;
-+
-+    src = _pixman_image_get_solid (src_image, dst_image->bits.format);
-+
-+    srca = src >> 24;
-+    if (src == 0)
-+    {
-+	pixman_fill_ls (dst_image->bits.bits, dst_image->bits.rowstride,
-+			 PIXMAN_FORMAT_BPP (dst_image->bits.format),
-+	                 dest_x, dest_y, width, height, 0);
-+	return;
-+    }
-+
-+    srcsrc = (uint64_t)src << 32 | src;
-+
-+    PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dst_stride, dst_line, 1);
-+    PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, mask_stride, mask_line, 1);
-+
-+	__asm__ volatile (
-+	".set arch=loongson2f \n\t"	
-+	load8888r(%2,$f24)
-+	store64a($f24,%0)
-+	expand_alpha($f24,$f26)
-+	store64a($f26,%1)
-+	:"=m"(vsrc), "=m"(vsrca):"r"(src):clobber
-+	);
-+    while (height--)
-+    {
-+	dst = dst_line;
-+	dst_line += dst_stride;
-+	mask = mask_line;
-+	mask_line += mask_stride;
-+	w = width;
-+
-+	while (w)
-+	{
-+	    m = *mask;
-+
-+	    if (m)
-+	    {
-+		__asm__ volatile (
-+		".set arch=loongson2f \n\t"	
-+		load32r(%1,$f20)
-+		expand_alpha_rev($f20,$f28)
-+		in($f24,$f28)
-+		store8888r($f8,%0)
-+		:"=r"(*dst):"r"(m):clobber
-+		);
-+
-+	    }
-+	    else
-+	    {
-+		*dst = 0;
-+	    }
-+
-+	    w--;
-+	    mask++;
-+	    dst++;
-+	}
-+    }
-+}
-diff -urN pixman//pixman/pixman-cpu.c Pixman.Loongson//pixman/pixman-cpu.c
---- pixman//pixman/pixman-cpu.c	2010-12-25 18:46:00.073234000 +0800
-+++ Pixman.Loongson//pixman/pixman-cpu.c	2010-12-25 18:39:15.360337000 +0800
-@@ -579,7 +579,9 @@
-     if (pixman_have_mmx ())
- 	return _pixman_implementation_create_mmx ();
- #endif
--
-+#ifdef USE_LS
-+	return _pixman_implementation_create_ls ();
-+#endif
- #ifdef USE_ARM_NEON
-     if (pixman_have_arm_neon ())
- 	return _pixman_implementation_create_arm_neon ();
-diff -urN pixman//pixman/pixman-ls.c Pixman.Loongson//pixman/pixman-ls.c
---- pixman//pixman/pixman-ls.c	1970-01-01 08:00:00.000000000 +0800
-+++ Pixman.Loongson//pixman/pixman-ls.c	2010-12-25 18:39:15.386759000 +0800
-@@ -0,0 +1,538 @@
-+/*
-+* Based on pixman-mmx.c
-+* Implemented for loongson 2F only.
-+* Free software based on GPL licence.
-+* Copyright 2010 WG Ge.
-+*/
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+#include <stdlib.h>
-+#include <string.h>
-+#include <math.h>
-+#include <limits.h>
-+#include <stdio.h>
-+#include "pixman-private.h"
-+#include "pixman-combine32.h"
-+#include "primitive.h"
-+
-+#define __m64  __attribute__ ((aligned (8))) uint64_t
-+#define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-+#define DECLARE_ALIGNED_8(t, v, ...)  DECLARE_ALIGNED(8, t, v)
-+
-+DECLARE_ALIGNED_8 (const uint64_t, ls_4x00ff                  ) = 0x00ff00ff00ff00ffULL;
-+DECLARE_ALIGNED_8 (const uint64_t, ls_4x0080                  ) = 0x0080008000800080ULL;
-+DECLARE_ALIGNED_8 (const uint64_t, ls_565_rgb                 ) = 0x000001f0003f001fULL;
-+DECLARE_ALIGNED_8 (const uint64_t, ls_565_unpack_multiplier   ) = 0x0000008404100840ULL;
-+DECLARE_ALIGNED_8 (const uint64_t, ls_565_r                   ) = 0x000000f800000000ULL;
-+DECLARE_ALIGNED_8 (const uint64_t, ls_565_g                   ) = 0x0000000000fc0000ULL;
-+DECLARE_ALIGNED_8 (const uint64_t, ls_565_b                   ) = 0x00000000000000f8ULL;
-+DECLARE_ALIGNED_8 (const uint64_t, ls_mask_0                  ) = 0xffffffffffff0000ULL;
-+DECLARE_ALIGNED_8 (const uint64_t, ls_mask_1                  ) = 0xffffffff0000ffffULL;
-+DECLARE_ALIGNED_8 (const uint64_t, ls_mask_2                  ) = 0xffff0000ffffffffULL;
-+DECLARE_ALIGNED_8 (const uint64_t, ls_mask_3                  ) = 0x0000ffffffffffffULL;
-+DECLARE_ALIGNED_8 (const uint64_t, ls_full_alpha              ) = 0x00ff000000000000ULL;
-+DECLARE_ALIGNED_8 (const uint64_t, ls_ffff0000ffff0000        ) = 0xffff0000ffff0000ULL;
-+DECLARE_ALIGNED_8 (const uint64_t, ls_0000ffff00000000        ) = 0x0000ffff00000000ULL;
-+DECLARE_ALIGNED_8 (const uint64_t, ls_000000000000ffff        ) = 0x000000000000ffffULL;
-+
-+
-+pixman_bool_t
-+pixman_fill_ls (uint32_t *bits,
-+                 int       stride,
-+                 int       bpp,
-+                 int       x,
-+                 int       y,
-+                 int       width,
-+                 int       height,
-+                 uint32_t xor)
-+{
-+    uint64_t fill;
-+    uint32_t byte_width;
-+    uint8_t     *byte_line;
-+
-+
-+
-+    if (bpp != 16 && bpp != 32 && bpp != 8)
-+	return FALSE;
-+
-+    if (bpp == 8)
-+    {
-+	stride = stride * (int) sizeof (uint32_t) / 1;
-+	byte_line = (uint8_t *)(((uint8_t *)bits) + stride * y + x);
-+	byte_width = width;
-+	stride *= 1;
-+        xor = (xor & 0xff) * 0x01010101;
-+    }
-+    else if (bpp == 16)
-+    {
-+	stride = stride * (int) sizeof (uint32_t) / 2;
-+	byte_line = (uint8_t *)(((uint16_t *)bits) + stride * y + x);
-+	byte_width = 2 * width;
-+	stride *= 2;
-+        xor = (xor & 0xffff) * 0x00010001;
-+    }
-+    else
-+    {
-+	stride = stride * (int) sizeof (uint32_t) / 4;
-+	byte_line = (uint8_t *)(((uint32_t *)bits) + stride * y + x);
-+	byte_width = 4 * width;
-+	stride *= 4;
-+    }
-+
-+    fill = ((uint64_t)xor << 32) | xor;
-+
-+	__asm__ volatile (
-+	".set arch=loongson2f \n\t"
-+	"ldc1 $f24, %0 \n\t"
-+	::"m"(fill):"$f24"
-+	);
-+    while (height--)
-+    {
-+	int w;
-+	uint8_t *d = byte_line;
-+
-+	byte_line += stride;
-+	w = byte_width;
-+
-+	while (w >= 1 && ((unsigned long)d & 1))
-+	{
-+	    *(uint8_t *)d = (xor & 0xff);
-+	    w--;
-+	    d++;
-+	}
-+
-+	while (w >= 2 && ((unsigned long)d & 3))
-+	{
-+	    *(uint16_t *)d = xor;
-+	    w -= 2;
-+	    d += 2;
-+	}
-+
-+	while (w >= 4 && ((unsigned long)d & 7))
-+	{
-+	    *(uint32_t *)d = xor;
-+
-+	    w -= 4;
-+	    d += 4;
-+	}
-+
-+	while (w >= 64)
-+	{
-+
-+	__asm__ volatile (
-+	".set arch=loongson2f \n\t"
-+	"dmfc1 $8, $f24 \n\t"
-+	"sd $8 ,   (%0) \n\t"
-+	"sd $8 ,   8(%0) \n\t"	
-+	"sd $8 ,   16(%0) \n\t"
-+	"sd $8 ,   24(%0) \n\t"
-+	"sd $8 ,   32(%0) \n\t"          
-+	"sd $8 ,   40(%0) \n\t"	       
-+	"sd $8 ,   48(%0) \n\t"        
-+	"sd $8 ,   56(%0) \n\t"        
-+	::"r"(d):"$8","memory","$f24"
-+	);
-+	    w -= 64;
-+	    d += 64;
-+	}
-+
-+	while (w >= 4)
-+	{
-+	    *(uint32_t *)d = xor;
-+
-+	    w -= 4;
-+	    d += 4;
-+	}
-+	while (w >= 2)
-+	{
-+	    *(uint16_t *)d = xor;
-+	    w -= 2;
-+	    d += 2;
-+	}
-+	while (w >= 1)
-+	{
-+	    *(uint8_t *)d = (xor & 0xff);
-+	    w--;
-+	    d++;
-+	}
-+
-+    }
-+    return TRUE;
-+}
-+
-+static pixman_bool_t
-+pixman_blt_ls (uint32_t *src_bits,
-+                uint32_t *dst_bits,
-+                int       src_stride,
-+                int       dst_stride,
-+                int       src_bpp,
-+                int       dst_bpp,
-+                int       src_x,
-+                int       src_y,
-+                int       dst_x,
-+                int       dst_y,
-+                int       width,
-+                int       height)
-+{
-+    uint8_t *   src_bytes;
-+    uint8_t *   dst_bytes;
-+    int byte_width;
-+
-+    if (src_bpp != dst_bpp)
-+	return FALSE;
-+
-+    if (src_bpp == 16)
-+    {
-+	src_stride = src_stride * (int) sizeof (uint32_t) / 2;
-+	dst_stride = dst_stride * (int) sizeof (uint32_t) / 2;
-+	src_bytes = (uint8_t *)(((uint16_t *)src_bits) + src_stride * (src_y) + (src_x));
-+	dst_bytes = (uint8_t *)(((uint16_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-+	byte_width = 2 * width;
-+	src_stride *= 2;
-+	dst_stride *= 2;
-+    }
-+    else if (src_bpp == 32)
-+    {
-+	src_stride = src_stride * (int) sizeof (uint32_t) / 4;
-+	dst_stride = dst_stride * (int) sizeof (uint32_t) / 4;
-+	src_bytes = (uint8_t *)(((uint32_t *)src_bits) + src_stride * (src_y) + (src_x));
-+	dst_bytes = (uint8_t *)(((uint32_t *)dst_bits) + dst_stride * (dst_y) + (dst_x));
-+	byte_width = 4 * width;
-+	src_stride *= 4;
-+	dst_stride *= 4;
-+    }
-+    else
-+    {
-+	return FALSE;
-+    }
-+
-+    while (height--)
-+    {
-+	int w;
-+	uint8_t *s = src_bytes;
-+	uint8_t *d = dst_bytes;
-+	src_bytes += src_stride;
-+	dst_bytes += dst_stride;
-+	w = byte_width;
-+
-+	while (w >= 2 && ((unsigned long)d & 3))
-+	{
-+	    *(uint16_t *)d = *(uint16_t *)s;
-+	    w -= 2;
-+	    s += 2;
-+	    d += 2;
-+	}
-+
-+	while (w >= 4 && ((unsigned long)d & 7))
-+	{
-+	    *(uint32_t *)d = *(uint32_t *)s;
-+
-+	    w -= 4;
-+	    s += 4;
-+	    d += 4;
-+	}
-+ if ((unsigned long)s & 7)
-+{
-+	while (w >= 64)
-+	{
-+
-+	__asm__ volatile (
-+	".set arch=loongson2f \n\t"
-+	"uld $8 ,   (%1) \n\t"
-+	"uld $9 ,  8(%1) \n\t"
-+	"uld $10, 16(%1) \n\t"
-+	"uld $11, 24(%1) \n\t"
-+	"sd $8 ,   (%0) \n\t"
-+	"sd $9 ,   8(%0) \n\t"	
-+	"sd $10,   16(%0) \n\t"
-+	"sd $11,   24(%0) \n\t"
-+
-+	"uld $8 ,   32(%1) \n\t"
-+	"uld $9 ,   40(%1) \n\t"
-+	"uld $10,   48(%1) \n\t"
-+	"uld $11,   56(%1) \n\t"
-+	"sd $8 ,   32(%0) \n\t"          
-+	"sd $9 ,   40(%0) \n\t"	       
-+	"sd $10,   48(%0) \n\t"        
-+	"sd $11,   56(%0) \n\t"        
-+	::"r"(d),"r"(s):"$8","$9","$10","$11","memory"
-+	);
-+	    w -= 64;
-+	    s += 64;
-+	    d += 64;
-+	}
-+}
-+else
-+{
-+	while (w >= 64)
-+	{
-+
-+	__asm__ volatile (
-+	".set arch=loongson2f \n\t"
-+	"ld $8 ,   (%1) \n\t"
-+	"ld $9 ,  8(%1) \n\t"
-+	"ld $10, 16(%1) \n\t"
-+	"ld $11, 24(%1) \n\t"
-+	"sd $8 ,   (%0) \n\t"
-+	"sd $9 ,   8(%0) \n\t"	
-+	"sd $10,   16(%0) \n\t"
-+	"sd $11,   24(%0) \n\t"
-+
-+	"ld $8 ,   32(%1) \n\t"
-+	"ld $9 ,   40(%1) \n\t"
-+	"ld $10,   48(%1) \n\t"
-+	"ld $11,   56(%1) \n\t"
-+	"sd $8 ,   32(%0) \n\t"          
-+	"sd $9 ,   40(%0) \n\t"	       
-+	"sd $10,   48(%0) \n\t"        
-+	"sd $11,   56(%0) \n\t"        
-+	::"r"(d),"r"(s):"$8","$9","$10","$11","memory"
-+	);
-+	    w -= 64;
-+	    s += 64;
-+	    d += 64;
-+	}
-+}	
-+
-+	while (w >= 4)
-+	{
-+	    *(uint32_t *)d = *(uint32_t *)s;
-+
-+	    w -= 4;
-+	    s += 4;
-+	    d += 4;
-+	}
-+	if (w >= 2)
-+	{
-+	    *(uint16_t *)d = *(uint16_t *)s;
-+	    w -= 2;
-+	    s += 2;
-+	    d += 2;
-+	}
-+    }
-+    return TRUE;
-+}
-+
-+
-+#include "pixman-composite-ls.c"
-+#include "pixman-combine-ls.c"
-+
-+static pixman_bool_t
-+ls_blt (pixman_implementation_t *imp,
-+         uint32_t *               src_bits,
-+         uint32_t *               dst_bits,
-+         int                      src_stride,
-+         int                      dst_stride,
-+         int                      src_bpp,
-+         int                      dst_bpp,
-+         int                      src_x,
-+         int                      src_y,
-+         int                      dst_x,
-+         int                      dst_y,
-+         int                      width,
-+         int                      height)
-+{
-+    if (!pixman_blt_ls (
-+            src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp,
-+            src_x, src_y, dst_x, dst_y, width, height))
-+    {
-+	return _pixman_implementation_blt (
-+	    imp->delegate,
-+	    src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp,
-+	    src_x, src_y, dst_x, dst_y, width, height);
-+    }
-+
-+    return TRUE;
-+}
-+
-+static pixman_bool_t
-+ls_fill (pixman_implementation_t *imp,
-+          uint32_t *               bits,
-+          int                      stride,
-+          int                      bpp,
-+          int                      x,
-+          int                      y,
-+          int                      width,
-+          int                      height,
-+          uint32_t xor)
-+{
-+    if (!pixman_fill_ls (bits, stride, bpp, x, y, width, height, xor))
-+    {
-+	return _pixman_implementation_fill (
-+	    imp->delegate, bits, stride, bpp, x, y, width, height, xor);
-+    }
-+
-+    return TRUE;
-+}
-+

-+static void
-+ls_composite_copy_area (pixman_implementation_t *imp,
-+                         pixman_op_t              op,
-+                         pixman_image_t *         src_image,
-+                         pixman_image_t *         mask_image,
-+                         pixman_image_t *         dst_image,
-+                         int32_t                  src_x,
-+                         int32_t                  src_y,
-+                         int32_t                  mask_x,
-+                         int32_t                  mask_y,
-+                         int32_t                  dest_x,
-+                         int32_t                  dest_y,
-+                         int32_t                  width,
-+                         int32_t                  height)
-+{
-+    pixman_blt_ls (src_image->bits.bits,
-+                    dst_image->bits.bits,
-+                    src_image->bits.rowstride,
-+                    dst_image->bits.rowstride,
-+                    PIXMAN_FORMAT_BPP (src_image->bits.format),
-+                    PIXMAN_FORMAT_BPP (dst_image->bits.format),
-+                    src_x, src_y, dest_x, dest_y, width, height);
-+}
-+
-+
-+static const pixman_fast_path_t ls_fast_paths[] =
-+{
-+
-+//these are implemented so far
-+#if 1
-+    PIXMAN_STD_FAST_PATH    (OVER, x8r8g8b8, a8,       x8r8g8b8, ls_composite_over_x888_8_8888    ),
-+    PIXMAN_STD_FAST_PATH    (OVER, x8r8g8b8, a8,       a8r8g8b8, ls_composite_over_x888_8_8888    ),
-+    PIXMAN_STD_FAST_PATH    (OVER, x8b8g8r8, a8,       x8b8g8r8, ls_composite_over_x888_8_8888    ),
-+    PIXMAN_STD_FAST_PATH    (OVER, x8b8g8r8, a8,       a8b8g8r8, ls_composite_over_x888_8_8888    ),
-+#endif
-+
-+#if 1
-+//over_8888_0565 significant perf improvement, slight better L1, L2, 30% better RT
-+    PIXMAN_STD_FAST_PATH    (OVER, a8r8g8b8, null,     r5g6b5,   ls_composite_over_8888_0565      ),
-+    PIXMAN_STD_FAST_PATH    (OVER, a8b8g8r8, null,     b5g6r5,   ls_composite_over_8888_0565      ),
-+    PIXMAN_STD_FAST_PATH    (OVER, pixbuf,   pixbuf,   r5g6b5,   ls_composite_over_pixbuf_0565    ),
-+    PIXMAN_STD_FAST_PATH    (OVER, rpixbuf,  rpixbuf,  b5g6r5,   ls_composite_over_pixbuf_0565    ),
-+
-+//big improvement some closing 100%
-+    PIXMAN_STD_FAST_PATH_CA (OVER, solid,    a8b8g8r8, b5g6r5,   ls_composite_over_n_8888_0565_ca ),
-+    PIXMAN_STD_FAST_PATH_CA (OVER, solid,    a8r8g8b8, r5g6b5,   ls_composite_over_n_8888_0565_ca ),
-+    PIXMAN_STD_FAST_PATH    (OVER, solid,    a8,       r5g6b5,   ls_composite_over_n_8_0565       ),
-+    PIXMAN_STD_FAST_PATH    (OVER, solid,    a8,       b5g6r5,   ls_composite_over_n_8_0565       ),
-+    PIXMAN_STD_FAST_PATH    (OVER, solid,    null,     r5g6b5,   ls_composite_over_n_0565         ),
-+
-+//ubalbe to bench with lowlevel bench, believe it is a gain in perf
-+    PIXMAN_STD_FAST_PATH    (OVER, x8r8g8b8, solid,    a8r8g8b8, ls_composite_over_x888_n_8888    ),
-+    PIXMAN_STD_FAST_PATH    (OVER, x8r8g8b8, solid,    x8r8g8b8, ls_composite_over_x888_n_8888    ),
-+    PIXMAN_STD_FAST_PATH    (OVER, x8b8g8r8, solid,    a8b8g8r8, ls_composite_over_x888_n_8888    ),
-+    PIXMAN_STD_FAST_PATH    (OVER, x8b8g8r8, solid,    x8b8g8r8, ls_composite_over_x888_n_8888    ),
-+
-+//performance regress 30% in L1,L2, but significant improvement in RT
-+    PIXMAN_STD_FAST_PATH    (OVER, a8b8g8r8, null,     a8b8g8r8, ls_composite_over_8888_8888      ),
-+    PIXMAN_STD_FAST_PATH    (OVER, a8b8g8r8, null,     x8b8g8r8, ls_composite_over_8888_8888      ),
-+    PIXMAN_STD_FAST_PATH    (OVER, a8r8g8b8, null,     a8r8g8b8, ls_composite_over_8888_8888      ),
-+    PIXMAN_STD_FAST_PATH    (OVER, a8r8g8b8, null,     x8r8g8b8, ls_composite_over_8888_8888      ),
-+    PIXMAN_STD_FAST_PATH    (OVER, pixbuf,   pixbuf,   a8r8g8b8, ls_composite_over_pixbuf_8888    ),
-+    PIXMAN_STD_FAST_PATH    (OVER, pixbuf,   pixbuf,   x8r8g8b8, ls_composite_over_pixbuf_8888    ),
-+    PIXMAN_STD_FAST_PATH    (OVER, rpixbuf,  rpixbuf,  a8b8g8r8, ls_composite_over_pixbuf_8888    ),
-+    PIXMAN_STD_FAST_PATH    (OVER, rpixbuf,  rpixbuf,  x8b8g8r8, ls_composite_over_pixbuf_8888    ),
-+
-+//same performance in L1,L2, but significant improvement in RT 30-40%
-+    PIXMAN_STD_FAST_PATH    (OVER, a8r8g8b8, solid,    a8r8g8b8, ls_composite_over_8888_n_8888    ),
-+    PIXMAN_STD_FAST_PATH    (OVER, a8r8g8b8, solid,    x8r8g8b8, ls_composite_over_8888_n_8888    ),
-+    PIXMAN_STD_FAST_PATH    (OVER, a8b8g8r8, solid,    a8b8g8r8, ls_composite_over_8888_n_8888    ),
-+    PIXMAN_STD_FAST_PATH    (OVER, a8b8g8r8, solid,    x8b8g8r8, ls_composite_over_8888_n_8888    ),
-+
-+//significant perf improvement 20%
-+    PIXMAN_STD_FAST_PATH    (OVER, solid,    a8,       a8r8g8b8, ls_composite_over_n_8_8888       ),
-+    PIXMAN_STD_FAST_PATH    (OVER, solid,    a8,       x8r8g8b8, ls_composite_over_n_8_8888       ),
-+    PIXMAN_STD_FAST_PATH    (OVER, solid,    a8,       a8b8g8r8, ls_composite_over_n_8_8888       ),
-+    PIXMAN_STD_FAST_PATH    (OVER, solid,    a8,       x8b8g8r8, ls_composite_over_n_8_8888       ),
-+
-+//3 times perf improvements
-+    PIXMAN_STD_FAST_PATH_CA (OVER, solid,    a8r8g8b8, a8r8g8b8, ls_composite_over_n_8888_8888_ca ),
-+    PIXMAN_STD_FAST_PATH_CA (OVER, solid,    a8r8g8b8, x8r8g8b8, ls_composite_over_n_8888_8888_ca ),
-+    PIXMAN_STD_FAST_PATH_CA (OVER, solid,    a8b8g8r8, a8b8g8r8, ls_composite_over_n_8888_8888_ca ),
-+    PIXMAN_STD_FAST_PATH_CA (OVER, solid,    a8b8g8r8, x8b8g8r8, ls_composite_over_n_8888_8888_ca ),
-+
-+//significant performance boost
-+    PIXMAN_STD_FAST_PATH    (OVER, solid,    null,     a8r8g8b8, ls_composite_over_n_8888         ),
-+    PIXMAN_STD_FAST_PATH    (OVER, solid,    null,     x8r8g8b8, ls_composite_over_n_8888         ),
-+//simple add, expect better perf in generic code
-+//    PIXMAN_STD_FAST_PATH    (ADD,  a8r8g8b8, null,     a8r8g8b8, ls_composite_add_8888_8888       ),
-+//    PIXMAN_STD_FAST_PATH    (ADD,  a8b8g8r8, null,     a8b8g8r8, ls_composite_add_8888_8888       ),
-+
-+// FIXME: Copy memory are not better than geneic code
-+#if 0
-+    PIXMAN_STD_FAST_PATH    (SRC,  a8r8g8b8, null,     a8r8g8b8, ls_composite_copy_area           ),
-+    PIXMAN_STD_FAST_PATH    (SRC,  a8b8g8r8, null,     a8b8g8r8, ls_composite_copy_area           ),
-+    PIXMAN_STD_FAST_PATH    (SRC,  a8r8g8b8, null,     x8r8g8b8, ls_composite_copy_area           ),
-+    PIXMAN_STD_FAST_PATH    (SRC,  a8b8g8r8, null,     x8b8g8r8, ls_composite_copy_area           ),
-+    PIXMAN_STD_FAST_PATH    (SRC,  x8r8g8b8, null,     x8r8g8b8, ls_composite_copy_area           ),
-+    PIXMAN_STD_FAST_PATH    (SRC,  x8b8g8r8, null,     x8b8g8r8, ls_composite_copy_area           ),
-+    PIXMAN_STD_FAST_PATH    (SRC,  r5g6b5,   null,     r5g6b5,   ls_composite_copy_area           ),
-+    PIXMAN_STD_FAST_PATH    (SRC,  b5g6r5,   null,     b5g6r5,   ls_composite_copy_area           ),
-+    PIXMAN_STD_FAST_PATH    (OVER, x8r8g8b8, null,     x8r8g8b8, ls_composite_copy_area           ),
-+    PIXMAN_STD_FAST_PATH    (OVER, x8b8g8r8, null,     x8b8g8r8, ls_composite_copy_area           ),
-+#endif
-+
-+//significant improvement
-+    PIXMAN_STD_FAST_PATH    (SRC,  solid,    a8,       a8r8g8b8, ls_composite_src_n_8_8888        ),
-+    PIXMAN_STD_FAST_PATH    (SRC,  solid,    a8,       x8r8g8b8, ls_composite_src_n_8_8888        ),
-+    PIXMAN_STD_FAST_PATH    (SRC,  solid,    a8,       a8b8g8r8, ls_composite_src_n_8_8888        ),
-+    PIXMAN_STD_FAST_PATH    (SRC,  solid,    a8,       x8b8g8r8, ls_composite_src_n_8_8888        ),
-+
-+#endif
-+
-+//these are not yet implemented
-+
-+#if 0
-+
-+    PIXMAN_STD_FAST_PATH    (ADD,  a8,       null,     a8,       ls_composite_add_8000_8000       ),
-+    PIXMAN_STD_FAST_PATH    (ADD,  solid,    a8,       a8,       ls_composite_add_n_8_8           ),
-+    PIXMAN_STD_FAST_PATH    (IN,   a8,       null,     a8,       ls_composite_in_8_8              ),
-+    PIXMAN_STD_FAST_PATH    (IN,   solid,    a8,       a8,       ls_composite_in_n_8_8            ),
-+#endif
-+
-+
-+    { PIXMAN_OP_NONE },
-+};
-+
-+pixman_implementation_t *
-+_pixman_implementation_create_ls (void)
-+{
-+    pixman_implementation_t *general = _pixman_implementation_create_fast_path ();
-+    pixman_implementation_t *imp = _pixman_implementation_create (general, ls_fast_paths);
-+
-+//Turned on but unable to benchmark.
-+#if 1
-+    imp->combine_32[PIXMAN_OP_OVER] = ls_combine_over_u;
-+    imp->combine_32[PIXMAN_OP_OVER_REVERSE] = ls_combine_over_reverse_u;
-+    imp->combine_32[PIXMAN_OP_IN] = ls_combine_in_u;
-+    imp->combine_32[PIXMAN_OP_IN_REVERSE] = ls_combine_in_reverse_u;
-+    imp->combine_32[PIXMAN_OP_OUT] = ls_combine_out_u;
-+    imp->combine_32[PIXMAN_OP_OUT_REVERSE] = ls_combine_out_reverse_u;
-+    imp->combine_32[PIXMAN_OP_ATOP] = ls_combine_atop_u;
-+    imp->combine_32[PIXMAN_OP_ATOP_REVERSE] = ls_combine_atop_reverse_u;
-+    imp->combine_32[PIXMAN_OP_XOR] = ls_combine_xor_u;
-+    imp->combine_32[PIXMAN_OP_ADD] = ls_combine_add_u;
-+    imp->combine_32[PIXMAN_OP_SATURATE] = ls_combine_saturate_u;
-+
-+    imp->combine_32_ca[PIXMAN_OP_SRC] = ls_combine_src_ca;
-+    imp->combine_32_ca[PIXMAN_OP_OVER] = ls_combine_over_ca;
-+    imp->combine_32_ca[PIXMAN_OP_OVER_REVERSE] = ls_combine_over_reverse_ca;
-+    imp->combine_32_ca[PIXMAN_OP_IN] = ls_combine_in_ca;
-+    imp->combine_32_ca[PIXMAN_OP_IN_REVERSE] = ls_combine_in_reverse_ca;
-+    imp->combine_32_ca[PIXMAN_OP_OUT] = ls_combine_out_ca;
-+    imp->combine_32_ca[PIXMAN_OP_OUT_REVERSE] = ls_combine_out_reverse_ca;
-+    imp->combine_32_ca[PIXMAN_OP_ATOP] = ls_combine_atop_ca;
-+    imp->combine_32_ca[PIXMAN_OP_ATOP_REVERSE] = ls_combine_atop_reverse_ca;
-+    imp->combine_32_ca[PIXMAN_OP_XOR] = ls_combine_xor_ca;
-+    imp->combine_32_ca[PIXMAN_OP_ADD] = ls_combine_add_ca;
-+#endif
-+
-+//FIXME blt and fill not shown better perf than geneic code
-+#if 0
-+    imp->blt = ls_blt;
-+    imp->fill = ls_fill;
-+#endif
-+
-+    return imp;
-+}
-+
-diff -urN pixman//pixman/pixman-private.h Pixman.Loongson//pixman/pixman-private.h
---- pixman//pixman/pixman-private.h	2010-12-25 18:46:00.102841000 +0800
-+++ Pixman.Loongson//pixman/pixman-private.h	2010-12-25 18:39:15.401808000 +0800
-@@ -493,6 +493,11 @@
- pixman_implementation_t *
- _pixman_implementation_create_fast_path (void);
- 
-+#ifdef USE_LS
-+pixman_implementation_t *
-+_pixman_implementation_create_ls (void);
-+#endif
-+
- #ifdef USE_MMX
- pixman_implementation_t *
- _pixman_implementation_create_mmx (void);
-diff -urN pixman//pixman/primitive.h Pixman.Loongson//pixman/primitive.h
---- pixman//pixman/primitive.h	1970-01-01 08:00:00.000000000 +0800
-+++ Pixman.Loongson//pixman/primitive.h	2010-12-25 18:39:15.457084000 +0800
-@@ -0,0 +1,214 @@
-+/*

-+* MMX register usage protocal

-+*	return result: f8 

-+*	tmp immediate f12

-+*	tmp register in primtive f14 f16 f18

-+*	tmp register in pixman f0,f4,f6,f10,f20,f22,  

-+*	globals in function f24, f26, f28,f30 

-+* Exceptions for load and store: 

-+*	load will specify dest FPR register

-+*	store will specify src FPR register

-+*       expand_alpha(_rev) implemented with GPR,  dest FPR as the 2nd parameter

-+*

-+* Special alert: don't use return result $f8 as input, it might be overwritten

-+*/

-+

-+

-+/*primitive macros */

-+

-+#define clobber "$8","$9","$f0","$f2","$f8",\

-+	"$f12","$f14","$f16","$f18","$f20",\

-+	"$f22","$f24","$f26","$f28","$f30"

-+

-+#define  DMTC1_IMM(regc1,imm) \

-+	"dli $8, "#imm" \n\t" \

-+	"dmtc1 $8, "#regc1" \n\t"

-+

-+#define  MTC1_IMM(regc1,imm) \

-+	"li $8, "#imm" \n\t" \

-+	"dmtc1 $8, "#regc1" \n\t"

-+

-+

-+#define save_to(reg1)  "mov.d "#reg1", $f8 \n\t"

-+#define zero(reg1)  "xor "#reg1","#reg1","#reg1" \n\t"

-+

-+#define load32(sp,reg1) \

-+		"ulw $8, "#sp" \n\t" \

-+		"dmtc1 $8, "#reg1" \n\t"

-+

-+#define load32a(sp,reg1) \

-+		"lw $8, "#sp" \n\t" \

-+		"dmtc1 $8, "#reg1" \n\t"

-+

-+#define load32r(sp,reg1)  \

-+	"dmtc1 "#sp", "#reg1" \n\t"

-+

-+#define load64(sp,reg1) \

-+		"uld $8, "#sp" \n\t" \

-+		"dmtc1 $8, "#reg1" \n\t"

-+

-+#define load64a(sp,reg1) \

-+		"ld $8, "#sp" \n\t" \

-+		"dmtc1 $8, "#reg1" \n\t"

-+

-+

-+#define store32(reg1,sp) \

-+		"dmfc1 $8, "#reg1" \n\t" \

-+		"usw $8, "#sp" \n\t"

-+

-+#define store32r(reg1,sp) \

-+		"dmfc1 "#sp", "#reg1" \n\t"

-+

-+#define store32a(reg1,sp) \

-+		"swc1 "#reg1", "#sp" \n\t" 

-+

-+#define store64(reg1,sp) \

-+		"dmfc1 $8, "#reg1" \n\t" \

-+		"usd $8, "#sp" \n\t"

-+

-+#define store64a(reg1,sp) \

-+		"sdc1 "#reg1", "#sp" \n\t" 

-+

-+#define load8888(sp,reg1) \

-+	load64(sp,reg1) \

-+	"xor $f12, $f12, $f12 \n\t" \

-+	"punpcklbh "#reg1", "#reg1", $f12 \n\t" 

-+

-+#define load8888r(sp,reg1) \

-+	load32r(sp,reg1) \

-+	"xor $f12, $f12, $f12 \n\t" \

-+	"punpcklbh "#reg1", "#reg1", $f12 \n\t" 

-+

-+#define load8888a(sp,reg1) \

-+	load64a(sp,reg1) \

-+	"xor $f12, $f12, $f12 \n\t" \

-+	"punpcklbh "#reg1", "#reg1", $f12 \n\t" 

-+

-+#define load8888ah(sp,reg1) \

-+	load64a(sp,reg1) \

-+	"xor $f12, $f12, $f12 \n\t" \

-+	"punpckhbh "#reg1", "#reg1", $f12 \n\t" 

-+	

-+#define store8888(reg1,sp) \

-+	"xor $f12, $f12, $f12 \n\t" \

-+	"packushb "#reg1", "#reg1", $f12 \n\t" \

-+	store64(reg1,sp)

-+

-+#define store8888r(reg1,sp) \

-+	"xor $f12, $f12, $f12 \n\t" \

-+	"packushb "#reg1", "#reg1", $f12 \n\t" \

-+	store32r(reg1,sp)

-+

-+#define store8888a(reg1,sp) \

-+	"xor $f12, $f12, $f12 \n\t" \

-+	"packushb "#reg1", "#reg1", $f12 \n\t" \

-+	store64a(reg1,sp)

-+

-+#define pack8888(reg1,reg2) 	\

-+	"packushb $f8, "#reg1","#reg2" \n\t"

-+

-+#define unpack8888(reg1,reg2) 	\

-+	"punpcklbh $f8, "#reg1","#reg2" \n\t"

-+

-+

-+#define negate(sreg,dreg) \

-+	DMTC1_IMM($f12, 0x00ff00ff00ff00ff)\

-+	"xor "#dreg", "#sreg", $f12 \n\t"

-+

-+#define pix_add(reg1,reg2) \

-+	"paddusb $f8, "#reg1", "#reg2" \n\t"

-+

-+#define pix_multiply(reg1,reg2) \

-+	"pmullh $f14, "#reg1", "#reg2" \n\t " \

-+	DMTC1_IMM($f12, 0x0080008000800080) \

-+	"paddush $f14, $f14, $f12 \n\t "\

-+ 	MTC1_IMM($f12, 8) \

-+	"psrlh $f16, $f14, $f12 \n\t" \

-+	"paddush $f14, $f14, $f16 \n\t" \

-+	"psrlh $f8, $f14, $f12 \n\t" 

-+

-+#define pix_add_mul(reg1,reg2,reg3,reg4) \
-+	pix_multiply(reg1,reg2) \

-+	"mov.d $f18, $f8 \n\t" \

-+	pix_multiply(reg3,reg4) \

-+	pix_add($f18,$f8)	

-+

-+#define expand_alpha(sreg,dreg) \

-+                "dmfc1 $8, "#sreg" \n\t" \

-+                "dsrl32 $8, $8, 16 \n\t" \

-+                "dsll $9, $8, 16 \n\t" \

-+                "or $8, $8, $9 \n\t" \

-+                "dsll32 $9, $8, 0 \n\t" \

-+                "or $8, $8, $9 \n\t" \

-+                "dmtc1 $8, "#dreg" \n\t"

-+

-+#define expand_alpha_rev(sreg,dreg)\

-+                "dmfc1 $8, "#sreg" \n\t" \

-+                "dsll32 $8, $8, 16 \n\t" \

-+                "dsrl32 $8, $8, 16 \n\t" \

-+                "dsll $9, $8, 16 \n\t" \

-+                "or $8, $8, $9 \n\t" \

-+                "dsll32 $9, $8, 0 \n\t" \

-+                "or $8, $8, $9 \n\t" \

-+                "dmtc1 $8, "#dreg" \n\t"

-+

-+#define expand8888(reg1,pos) expand8888_##pos(reg1)

-+

-+#define expand8888_0(reg1) \

-+	"xor $f12, $f12, $f12 \n\t" \

-+	"punpcklbh $f8, "#reg1", $f12 \n\t" 

-+

-+#define expand8888_1(reg1) \

-+	"xor $f12, $f12, $f12 \n\t" \

-+	"punpckhbh $f8, "#reg1", $f12 \n\t" 

-+

-+#define expandx888(reg1,pos) \

-+	expand8888(reg1,pos) \

-+	DMTC1_IMM($f12, 0x00ff000000000000) \

-+	"or $f8, $f8, $f12 \n\t"

-+

-+#define invert_colors(reg1)  \

-+	DMTC1_IMM($f12, 0xffff0000ffff0000) \

-+	"and $f14, "#reg1", $f12 \n\t" \

-+	DMTC1_IMM($f12, 0x000000000000ffff) \

-+	"and $f16, "#reg1", $f12 \n\t" \

-+	DMTC1_IMM($f12, 0x0000ffff00000000) \

-+	"and $f18, "#reg1", $f12 \n\t" \

-+	MTC1_IMM($f12, 32) \

-+	"dsll $f16, $f16, $f12 \n\t" \

-+	"dsrl $f18, $f18, $f12 \n\t" \

-+	"or $f14, $f14, $f16 \n\t" \

-+	"or $f8, $f14, $f18 \n\t" 

-+

-+#define over(reg1,reg2,reg3) \

-+	negate(reg2,$f8) \

-+	pix_multiply(reg3, $f8)\

-+	pix_add(reg1, $f8) 

-+

-+

-+#define over_rev_non_pre(reg1,reg2) \

-+	expand_alpha(reg1,$f0) \

-+	DMTC1_IMM($f12,0x00ff000000000000) \

-+	"or $f2, $f0, $f12 \n\t" \

-+	invert_colors(reg1) \

-+	pix_multiply($f8,$f2) \

-+	save_to($f2) \

-+	over($f2, $f0, reg2)

-+

-+#define in(reg1,reg2) pix_multiply(reg1,reg2) 

-+

-+#define in_over_full_src_alpha(reg1,reg2,reg3) \

-+	DMTC1_IMM($f12,0x00ff000000000000) \

-+	"or $f0, "#reg1", $f12 \n\t" \

-+	in($f0,reg2) \

-+	save_to($f0) \

-+	over($f0,reg2,reg3)

-+

-+#define in_over(reg1,reg2,reg3,reg4) \

-+	in(reg1,reg3) \

-+	"mov.d $f0, $f8 \n\t" \

-+	pix_multiply(reg2,reg3) \

-+	"mov.d $f2, $f8 \n\t" \

-+	over($f0,$f2,reg4)

-+

-+

diff --git a/extra/pixman/test_failures_on_x86-32.diff b/extra/pixman/test_failures_on_x86-32.diff
deleted file mode 100644
index 6e333c03a..000000000
--- a/extra/pixman/test_failures_on_x86-32.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-From da6193b1fcc1dfab27f4c36917864f2f2c41cf3e Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sun, 27 May 2012 17:01:57 +0000
-Subject: mmx: add missing _mm_empty calls
-
-Fixes spurious test failures on x86-32.
----
-diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
-index bb125bf..6e292c6 100644
---- a/pixman/pixman-mmx.c
-+++ b/pixman/pixman-mmx.c
-@@ -2232,6 +2232,8 @@ mmx_composite_src_x888_0565 (pixman_implementation_t *imp,
- 	    w--;
- 	}
-     }
-+
-+    _mm_empty ();
- }
- 
- static void
-@@ -3542,6 +3544,7 @@ mmx_fetch_x8r8g8b8 (pixman_iter_t *iter, const uint32_t *mask)
- 	w--;
-     }
- 
-+    _mm_empty ();
-     return iter->buffer;
- }
- 
-@@ -3585,6 +3588,7 @@ mmx_fetch_r5g6b5 (pixman_iter_t *iter, const uint32_t *mask)
- 	w--;
-     }
- 
-+    _mm_empty ();
-     return iter->buffer;
- }
- 
-@@ -3630,6 +3634,7 @@ mmx_fetch_a8 (pixman_iter_t *iter, const uint32_t *mask)
- 	w--;
-     }
- 
-+    _mm_empty ();
-     return iter->buffer;
- }
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/pkgfile/PKGBUILD b/extra/pkgfile/PKGBUILD
index 38030771b..1e8d62fab 100644
--- a/extra/pkgfile/PKGBUILD
+++ b/extra/pkgfile/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 176818 2013-02-01 01:25:21Z dreisner $
+# $Id: PKGBUILD 179110 2013-03-03 17:28:37Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=pkgfile
 pkgver=8
-pkgrel=1
+pkgrel=2
 pkgdesc="a pacman .files metadata explorer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://github.com/falconindy/pkgfile"
diff --git a/extra/plotutils/PKGBUILD b/extra/plotutils/PKGBUILD
index b2947f933..d70ad52e3 100644
--- a/extra/plotutils/PKGBUILD
+++ b/extra/plotutils/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=plotutils
 pkgver=2.6
-pkgrel=3
+pkgrel=3.1
 arch=('x86_64' 'i686' 'mips64el')
 pkgdesc="Set of utilities and libraries for plotting."
 url="http://directory.fsf.org/graphics/plotutils.html"
diff --git a/extra/polkit-qt/PKGBUILD b/extra/polkit-qt/PKGBUILD
index 327764938..938c360ee 100644
--- a/extra/polkit-qt/PKGBUILD
+++ b/extra/polkit-qt/PKGBUILD
@@ -4,18 +4,19 @@
 
 pkgname=polkit-qt
 pkgver=0.103.0
-pkgrel=1.1
+pkgrel=2
 pkgdesc='A library that allows developers to access PolicyKit API with a nice Qt-style API'
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kdesupport/polkit-qt-1'
 license=('LGPL')
-depends=('polkit' 'qt')
+depends=('polkit' 'qt4')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/apps/KDE4.x/admin/${pkgname}-1-${pkgver}.tar.bz2")
 md5sums=('a105e233e6733fb072c9080cd7ae1af2')
 
 build() {
-  cd "${srcdir}"
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-1-${pkgver} \
@@ -25,6 +26,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build"
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD
index feefcadbf..d0b97eadc 100644
--- a/extra/polkit/PKGBUILD
+++ b/extra/polkit/PKGBUILD
@@ -1,30 +1,25 @@
-# $Id: PKGBUILD 174766 2013-01-07 11:39:56Z jgc $
+# $Id: PKGBUILD 183452 2013-04-21 22:11:58Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=polkit
-pkgver=0.109
-pkgrel=1
+pkgver=0.110
+pkgrel=2
 pkgdesc="Application development toolkit for controlling system-wide privileges"
 arch=(i686 x86_64 'mips64el')
-license=('LGPL')
+license=(LGPL)
 url="http://www.freedesktop.org/wiki/Software/polkit"
-depends=('glib2' 'pam' 'expat' 'libsystemd' 'js')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
-replaces=('policykit')
+depends=(glib2 pam expat libsystemd js185)
+makedepends=(intltool gtk-doc gobject-introspection)
 options=('!libtool')
 install=polkit.install
 source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz
-        polkit.pam
-        fix-xauthority.patch)
-md5sums=('8c3f08287dd3e1e546e3c2ae00090908'
-         '6564f95878297b954f0572bc1610dd15'
-         '78db344a30d7aa089b4705009ec95b58')
+        polkit.pam)
+md5sums=('06e0d3b72e566ac277fc35c8206d2a28'
+         '6564f95878297b954f0572bc1610dd15')
 
 build() {
   cd $pkgname-$pkgver
 
-  patch -Np1 -i ../fix-xauthority.patch
-
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
       --with-systemdsystemunitdir=/usr/lib/systemd/system \
diff --git a/extra/polkit/autogen.sh b/extra/polkit/autogen.sh
deleted file mode 100755
index d08b00a49..000000000
--- a/extra/polkit/autogen.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-DIE=0
-
-(test -f $srcdir/configure.ac) || {
-    echo -n "**Error**: Directory $srcdir does not look like the"
-    echo " top-level package directory"
-    exit 1
-}
-
-olddir=`pwd`
-cd "$srcdir"
-
-touch ChangeLog
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have autoconf installed."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && {
-  (libtoolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have libtool installed."
-    echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-    DIE=1
-  }
-}
-
-(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have gtk-doc installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-	DIE=1
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have automake installed."
-  echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-  NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: Missing aclocal.  The version of automake"
-  echo "installed doesn't appear recent enough."
-  echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-
-# if no automake, don't bother testing for autoreconf
-test -n "$NO_AUTOMAKE" || (autoreconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have autoreconf installed."
-  echo "You can get autoreconf from ..."
-  DIE=1
-}
-
-
-if test "$DIE" -eq 1; then
-  exit 1
-fi
-
-if test -z "$*"; then
-  echo "**Warning**: I am going to run configure with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo $0 " command line."
-  echo
-fi
-
-case $CC in
-xlc )
-  am_opt=--include-deps;;
-esac
-
-      aclocalinclude="$ACLOCAL_FLAGS"
-
-      echo "Running autoreconf on test/mocklibc ..."
-      (cd "test/mocklibc"; autoreconf --install)
-
-      if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
-	if test -z "$NO_LIBTOOLIZE" ; then 
-	  echo "Running libtoolize..."
-	  libtoolize --force --copy
-	fi
-      fi
-      echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
-	echo "Running autoheader..."
-	autoheader
-      fi
-      echo "Running automake --gnu -Wno-portability $am_opt ..."
-      automake --add-missing --gnu -Wno-portability $am_opt
-      echo "Running autoconf ..."
-      autoconf
-
-intltoolize --copy --force --automake                  || exit 1
-
-cd "$olddir"
-
-conf_flags="--enable-maintainer-mode --enable-gtk-doc"
-
-if test x$NOCONFIGURE = x; then
-  echo "Running $srcdir/configure $conf_flags $@ ..."
-  $srcdir/configure $conf_flags "$@" \
-  && echo "Now type make to compile." || exit 1
-else
-  echo "Skipping configure process."
-fi
diff --git a/extra/polkit/fix-empty-wheel.patch b/extra/polkit/fix-empty-wheel.patch
deleted file mode 100644
index d6f99c43d..000000000
--- a/extra/polkit/fix-empty-wheel.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From fa04223240d46641b0773dbf9f7d72f529046bea Mon Sep 17 00:00:00 2001
-From: David Zeuthen <zeuthen@gmail.com>
-Date: Tue, 18 Sep 2012 18:47:06 +0000
-Subject: Fall back to authenticating as uid 0 if the list of admin identities is empty
-
-For example, this can happen if the wheel group has no members. This
-was reported in Red Hat bug 834494, see
-
- https://bugzilla.redhat.com/show_bug.cgi?id=834494
-
-Signed-off-by: David Zeuthen <zeuthen@gmail.com>
----
-diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c
-index 1d4a555..3bd2f0b 100644
---- a/src/polkitbackend/polkitbackendinteractiveauthority.c
-+++ b/src/polkitbackend/polkitbackendinteractiveauthority.c
-@@ -1293,15 +1293,11 @@ polkit_backend_interactive_authority_get_admin_identities (PolkitBackendInteract
-                                                            PolkitDetails                     *details)
- {
-   PolkitBackendInteractiveAuthorityClass *klass;
--  GList *ret;
-+  GList *ret = NULL;
- 
-   klass = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_GET_CLASS (authority);
- 
--  if (klass->get_admin_identities == NULL)
--    {
--      ret = g_list_prepend (NULL, polkit_unix_user_new (0));
--    }
--  else
-+  if (klass->get_admin_identities != NULL)
-     {
-       ret = klass->get_admin_identities (authority,
-                                          caller,
-@@ -2257,6 +2253,10 @@ authentication_agent_initiate_challenge (AuthenticationAgent         *agent,
-         }
-     }
- 
-+  /* Fall back to uid 0 if no users are available (rhbz #834494) */
-+  if (user_identities == NULL)
-+    user_identities = g_list_prepend (NULL, polkit_unix_user_new (0));
-+
-   session = authentication_session_new (agent,
-                                         cookie,
-                                         subject,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/polkit/fix-xauthority.patch b/extra/polkit/fix-xauthority.patch
deleted file mode 100644
index cf00b929c..000000000
--- a/extra/polkit/fix-xauthority.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d6acecdd0ebb42e28ff28e04e0207cb01fa20910 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <zeuthen@gmail.com>
-Date: Wed, 19 Dec 2012 19:28:29 +0000
-Subject: Set XAUTHORITY environment variable if is unset
-
-The way it works is that if XAUTHORITY is unset, then its default
-value is $HOME/.Xauthority. But since we're changing user identity
-this will not work since $HOME will now change. Therefore, if
-XAUTHORITY is unset, just set its default value before changing
-identity. This bug only affected login managers using X Window
-Authorization but not explicitly setting the XAUTHORITY variable.
-
-You can argue that XAUTHORITY is broken since it forces uid-changing
-apps like pkexec(1) to do more work - and get involved in intimate
-details of how X works and so on - but that doesn't change how things
-work.
-
-Based on a patch from Peter Wu <lekensteyn@gmail.com>.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=51623
-
-Signed-off-by: David Zeuthen <zeuthen@gmail.com>
----
-diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c
-index 840eb3c..da9784a 100644
---- a/src/programs/pkexec.c
-+++ b/src/programs/pkexec.c
-@@ -608,6 +608,28 @@ main (int argc, char *argv[])
-       g_ptr_array_add (saved_env, g_strdup (value));
-     }
- 
-+  /* $XAUTHORITY is "special" - if unset, we need to set it to ~/.Xauthority. Yes,
-+   * this is broken but it's unfortunately how things work (see fdo #51623 for
-+   * details)
-+   */
-+  if (g_getenv ("XAUTHORITY") == NULL)
-+    {
-+      const gchar *home;
-+
-+      /* pre-2.36 GLib does not examine $HOME (it always looks in /etc/passwd) and
-+       * this is not what we want
-+       */
-+      home = g_getenv ("HOME");
-+      if (home == NULL)
-+        home = g_get_home_dir ();
-+
-+      if (home != NULL)
-+        {
-+          g_ptr_array_add (saved_env, g_strdup ("XAUTHORITY"));
-+          g_ptr_array_add (saved_env, g_build_filename (home, ".Xauthority", NULL));
-+        }
-+    }
-+
-   /* Nuke the environment to get a well-known and sanitized environment to avoid attacks
-    * via e.g. the DBUS_SYSTEM_BUS_ADDRESS environment variable and similar.
-    */
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/polkit/systemd-fallback.patch b/extra/polkit/systemd-fallback.patch
deleted file mode 100644
index f89ce10ae..000000000
--- a/extra/polkit/systemd-fallback.patch
+++ /dev/null
@@ -1,1571 +0,0 @@
-diff -u -rN polkit-0.104/configure.ac polkit-0.104-systemd-fallback/configure.ac
---- polkit-0.104/configure.ac	2012-01-03 17:25:49.000000000 +0100
-+++ polkit-0.104-systemd-fallback/configure.ac	2012-03-06 15:45:55.275860194 +0100
-@@ -160,14 +160,14 @@
-               [enable_systemd=auto])
- if test "$enable_systemd" != "no"; then
-   PKG_CHECK_MODULES(SYSTEMD,
--                    [libsystemd-login],
-+                    [libsystemd-login libsystemd-daemon],
-                     have_systemd=yes,
-                     have_systemd=no)
-   if test "$have_systemd" = "yes"; then
-     SESSION_TRACKING=systemd
-   else
-     if test "$enable_systemd" = "yes"; then
--      AC_MSG_ERROR([systemd support requested but libsystemd-login1 library not found])
-+      AC_MSG_ERROR([systemd support requested but systemd libraries not found])
-     fi
-   fi
- fi
-diff -u -rN polkit-0.104/src/polkit/Makefile.am polkit-0.104-systemd-fallback/src/polkit/Makefile.am
---- polkit-0.104/src/polkit/Makefile.am	2012-01-03 16:03:47.000000000 +0100
-+++ polkit-0.104-systemd-fallback/src/polkit/Makefile.am	2012-03-06 15:19:25.108853325 +0100
-@@ -79,15 +79,8 @@
- 	polkitimplicitauthorization.c		polkitimplicitauthorization.h		\
- 	polkittemporaryauthorization.c		polkittemporaryauthorization.h		\
- 	polkitpermission.c			polkitpermission.h			\
--        $(NULL)
--
--if HAVE_SYSTEMD
--libpolkit_gobject_1_la_SOURCES += \
--	polkitunixsession-systemd.c		polkitunixsession.h
--else
--libpolkit_gobject_1_la_SOURCES += \
- 	polkitunixsession.c			polkitunixsession.h
--endif
-+        $(NULL)
- 
- libpolkit_gobject_1_la_CFLAGS =                                        	\
-         -D_POLKIT_COMPILATION                                  		\
-diff -u -rN polkit-0.104/src/polkit/polkitunixsession.c polkit-0.104-systemd-fallback/src/polkit/polkitunixsession.c
---- polkit-0.104/src/polkit/polkitunixsession.c	2011-10-18 19:02:27.000000000 +0200
-+++ polkit-0.104-systemd-fallback/src/polkit/polkitunixsession.c	2012-03-06 15:17:29.829788021 +0100
-@@ -23,12 +23,18 @@
- #  include "config.h"
- #endif
- 
-+#include <stdlib.h>
- #include <string.h>
- #include "polkitunixsession.h"
- #include "polkitsubject.h"
- #include "polkiterror.h"
- #include "polkitprivate.h"
- 
-+#ifdef HAVE_SYSTEMD
-+#  include <systemd/sd-daemon.h>
-+#  include <systemd/sd-login.h>
-+#endif
-+
- /**
-  * SECTION:polkitunixsession
-  * @title: PolkitUnixSession
-@@ -364,34 +370,44 @@
-   PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject);
-   GDBusConnection *connection;
-   GVariant *result;
--  gboolean ret;
--
--  ret = FALSE;
-+  gboolean ret = FALSE;
- 
--  connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
--  if (connection == NULL)
--    goto out;
--
--  result = g_dbus_connection_call_sync (connection,
--                                        "org.freedesktop.ConsoleKit",           /* name */
--                                        session->session_id,                    /* object path */
--                                        "org.freedesktop.ConsoleKit.Session",   /* interface name */
--                                        "GetUser",                              /* method */
--                                        NULL, /* parameters */
--                                        G_VARIANT_TYPE ("(u)"),
--                                        G_DBUS_CALL_FLAGS_NONE,
--                                        -1,
--                                        cancellable,
--                                        error);
--  if (result == NULL)
--    goto out;
-+#ifdef HAVE_SYSTEMD
-+  uid_t uid;
-+  
-+  if (sd_booted () > 0)
-+    {
-+      if (sd_session_get_uid (session->session_id, &uid) == 0)
-+        ret = TRUE;
-+    }
-+  else
-+#endif
-+    {
-+      connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
-+      if (connection == NULL)
-+        goto out;
-+
-+      result = g_dbus_connection_call_sync (connection,
-+                                            "org.freedesktop.ConsoleKit",           /* name */
-+                                            session->session_id,                    /* object path */
-+                                            "org.freedesktop.ConsoleKit.Session",   /* interface name */
-+                                            "GetUser",                              /* method */
-+                                            NULL, /* parameters */
-+                                            G_VARIANT_TYPE ("(u)"),
-+                                            G_DBUS_CALL_FLAGS_NONE,
-+                                            -1,
-+                                            cancellable,
-+                                            error);
-+      if (result == NULL)
-+        goto out;
- 
--  ret = TRUE;
--  g_variant_unref (result);
-+      ret = TRUE;
-+      g_variant_unref (result);
- 
-- out:
--  if (connection != NULL)
--    g_object_unref (connection);
-+     out:
-+      if (connection != NULL)
-+        g_object_unref (connection);
-+    }
-   return ret;
- }
- 
-@@ -470,12 +486,9 @@
-                                    GError       **error)
- {
-   PolkitUnixSession *session = POLKIT_UNIX_SESSION (initable);
--  GDBusConnection *connection;
-+  GDBusConnection *connection = NULL;
-   GVariant *result;
--  gboolean ret;
--
--  connection = NULL;
--  ret = FALSE;
-+  gboolean ret = FALSE;
- 
-   if (session->session_id != NULL)
-     {
-@@ -484,33 +497,56 @@
-       goto out;
-     }
- 
--  connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
--  if (connection == NULL)
--    goto out;
-+#ifdef HAVE_SYSTEMD
-+  char *s;
-+  
-+  if (sd_booted () > 0)
-+    {
-+      if (sd_pid_get_session (session->pid, &s) == 0)
-+        {
-+          session->session_id = g_strdup (s);
-+          free (s);
-+          ret = TRUE;
-+          goto out;
-+        }
-+      
-+      g_set_error (error,
-+                   POLKIT_ERROR,
-+                   POLKIT_ERROR_FAILED,
-+                   "No session for pid %d",
-+                   (gint) session->pid);
-+    }
-+  else
-+#endif
-+    { 
-+      connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
-+      if (connection == NULL)
-+        goto out;
-+
-+      result = g_dbus_connection_call_sync (connection,
-+                                            "org.freedesktop.ConsoleKit",           /* name */
-+                                            "/org/freedesktop/ConsoleKit/Manager",  /* object path */
-+                                            "org.freedesktop.ConsoleKit.Manager",   /* interface name */
-+                                            "GetSessionForUnixProcess",             /* method */
-+                                            g_variant_new ("(u)", session->pid),    /* parameters */
-+                                            G_VARIANT_TYPE ("(o)"),
-+                                            G_DBUS_CALL_FLAGS_NONE,
-+                                            -1,
-+                                            cancellable,
-+                                            error);
-+      if (result == NULL)
-+        goto out;
- 
--  result = g_dbus_connection_call_sync (connection,
--                                        "org.freedesktop.ConsoleKit",           /* name */
--                                        "/org/freedesktop/ConsoleKit/Manager",  /* object path */
--                                        "org.freedesktop.ConsoleKit.Manager",   /* interface name */
--                                        "GetSessionForUnixProcess",             /* method */
--                                        g_variant_new ("(u)", session->pid),    /* parameters */
--                                        G_VARIANT_TYPE ("(o)"),
--                                        G_DBUS_CALL_FLAGS_NONE,
--                                        -1,
--                                        cancellable,
--                                        error);
--  if (result == NULL)
--    goto out;
-+      g_variant_get (result, "(o)", &session->session_id);
-+      g_variant_unref (result);
- 
--  g_variant_get (result, "(o)", &session->session_id);
--  g_variant_unref (result);
-+      ret = TRUE;
-+    }
- 
--  ret = TRUE;
- 
-  out:
-   if (connection != NULL)
-     g_object_unref (connection);
--
-   return ret;
- }
- 
-diff -u -rN polkit-0.104/src/polkit/polkitunixsession-systemd.c polkit-0.104-systemd-fallback/src/polkit/polkitunixsession-systemd.c
---- polkit-0.104/src/polkit/polkitunixsession-systemd.c	2012-01-03 16:03:47.000000000 +0100
-+++ polkit-0.104-systemd-fallback/src/polkit/polkitunixsession-systemd.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,481 +0,0 @@
--/*
-- * Copyright (C) 2011 Red Hat, Inc.
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General
-- * Public License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-- * Boston, MA 02111-1307, USA.
-- *
-- * Author: Matthias Clasen
-- */
--
--#ifdef HAVE_CONFIG_H
--#  include "config.h"
--#endif
--
--#include <string.h>
--#include "polkitunixsession.h"
--#include "polkitsubject.h"
--#include "polkiterror.h"
--#include "polkitprivate.h"
--
--#include <systemd/sd-login.h>
--
--/**
-- * SECTION:polkitunixsession
-- * @title: PolkitUnixSession
-- * @short_description: Unix sessions
-- *
-- * An object that represents an user session.
-- *
-- * The session id is an opaque string obtained from ConsoleKit.
-- */
--
--/**
-- * PolkitUnixSession:
-- *
-- * The #PolkitUnixSession struct should not be accessed directly.
-- */
--struct _PolkitUnixSession
--{
--  GObject parent_instance;
--
--  gchar *session_id;
--
--  gint pid;
--};
--
--struct _PolkitUnixSessionClass
--{
--  GObjectClass parent_class;
--};
--
--enum
--{
--  PROP_0,
--  PROP_SESSION_ID,
--  PROP_PID,
--};
--
--static void subject_iface_init        (PolkitSubjectIface *subject_iface);
--static void initable_iface_init       (GInitableIface *initable_iface);
--static void async_initable_iface_init (GAsyncInitableIface *async_initable_iface);
--
--G_DEFINE_TYPE_WITH_CODE (PolkitUnixSession, polkit_unix_session, G_TYPE_OBJECT,
--                         G_IMPLEMENT_INTERFACE (POLKIT_TYPE_SUBJECT, subject_iface_init)
--                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init)
--                         G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init)
--                         );
--
--static void
--polkit_unix_session_init (PolkitUnixSession *session)
--{
--}
--
--static void
--polkit_unix_session_finalize (GObject *object)
--{
--  PolkitUnixSession *session = POLKIT_UNIX_SESSION (object);
--
--  g_free (session->session_id);
--
--  if (G_OBJECT_CLASS (polkit_unix_session_parent_class)->finalize != NULL)
--    G_OBJECT_CLASS (polkit_unix_session_parent_class)->finalize (object);
--}
--
--static void
--polkit_unix_session_get_property (GObject    *object,
--                                  guint       prop_id,
--                                  GValue     *value,
--                                  GParamSpec *pspec)
--{
--  PolkitUnixSession *session = POLKIT_UNIX_SESSION (object);
--
--  switch (prop_id)
--    {
--    case PROP_SESSION_ID:
--      g_value_set_string (value, session->session_id);
--      break;
--
--    default:
--      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
--      break;
--    }
--}
--
--static void
--polkit_unix_session_set_property (GObject      *object,
--                                  guint         prop_id,
--                                  const GValue *value,
--                                  GParamSpec   *pspec)
--{
--  PolkitUnixSession *session = POLKIT_UNIX_SESSION (object);
--
--  switch (prop_id)
--    {
--    case PROP_SESSION_ID:
--      polkit_unix_session_set_session_id (session, g_value_get_string (value));
--      break;
--
--    case PROP_PID:
--      session->pid = g_value_get_int (value);
--      break;
--
--    default:
--      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
--      break;
--    }
--}
--
--static void
--polkit_unix_session_class_init (PolkitUnixSessionClass *klass)
--{
--  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
--
--  gobject_class->finalize     = polkit_unix_session_finalize;
--  gobject_class->get_property = polkit_unix_session_get_property;
--  gobject_class->set_property = polkit_unix_session_set_property;
--
--  /**
--   * PolkitUnixSession:session-id:
--   *
--   * The UNIX session id.
--   */
--  g_object_class_install_property (gobject_class,
--                                   PROP_SESSION_ID,
--                                   g_param_spec_string ("session-id",
--                                                        "Session ID",
--                                                        "The UNIX session ID",
--                                                        NULL,
--                                                        G_PARAM_CONSTRUCT |
--                                                        G_PARAM_READWRITE |
--                                                        G_PARAM_STATIC_NAME |
--                                                        G_PARAM_STATIC_BLURB |
--                                                        G_PARAM_STATIC_NICK));
--
--
--  /**
--   * PolkitUnixSession:pid:
--   *
--   * The UNIX process id to look up the session.
--   */
--  g_object_class_install_property (gobject_class,
--                                   PROP_PID,
--                                   g_param_spec_int ("pid",
--                                                     "Process ID",
--                                                     "Process ID to use for looking up the session",
--                                                     0,
--                                                     G_MAXINT,
--                                                     0,
--                                                     G_PARAM_CONSTRUCT_ONLY |
--                                                     G_PARAM_WRITABLE |
--                                                     G_PARAM_STATIC_NAME |
--                                                     G_PARAM_STATIC_BLURB |
--                                                     G_PARAM_STATIC_NICK));
--
--}
--
--/**
-- * polkit_unix_session_get_session_id:
-- * @session: A #PolkitUnixSession.
-- *
-- * Gets the session id for @session.
-- *
-- * Returns: The session id for @session. Do not free this string, it
-- * is owned by @session.
-- **/
--const gchar *
--polkit_unix_session_get_session_id (PolkitUnixSession *session)
--{
--  g_return_val_if_fail (POLKIT_IS_UNIX_SESSION (session), NULL);
--  return session->session_id;
--}
--
--/**
-- * polkit_unix_session_set_session_id:
-- * @session: A #PolkitUnixSession.
-- * @session_id: The session id.
-- *
-- * Sets the session id for @session to @session_id.
-- **/
--void
--polkit_unix_session_set_session_id (PolkitUnixSession *session,
--                                    const gchar       *session_id)
--{
--  g_return_if_fail (POLKIT_IS_UNIX_SESSION (session));
--  /*g_return_if_fail (session_id != NULL);*/
--  g_free (session->session_id);
--  session->session_id = g_strdup (session_id);
--}
--
--/**
-- * polkit_unix_session_new:
-- * @session_id: The session id.
-- *
-- * Creates a new #PolkitUnixSession for @session_id.
-- *
-- * Returns: (transfer full): A #PolkitUnixSession. Free with g_object_unref().
-- **/
--PolkitSubject *
--polkit_unix_session_new (const gchar *session_id)
--{
--  return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_SESSION,
--                                       "session-id", session_id,
--                                       NULL));
--}
--
--/**
-- * polkit_unix_session_new_for_process:
-- * @pid: The process id of the process to get the session for.
-- * @cancellable: (allow-none): A #GCancellable or %NULL.
-- * @callback: A #GAsyncReadyCallback to call when the request is satisfied
-- * @user_data: The data to pass to @callback.
-- *
-- * Asynchronously creates a new #PolkitUnixSession object for the
-- * process with process id @pid.
-- *
-- * When the operation is finished, @callback will be invoked in the
-- * <link linkend="g-main-context-push-thread-default">thread-default
-- * main loop</link> of the thread you are calling this method
-- * from. You can then call
-- * polkit_unix_session_new_for_process_finish() to get the result of
-- * the operation.
-- *
-- * This method constructs the object asynchronously, for the synchronous and blocking version
-- * use polkit_unix_session_new_for_process_sync().
-- **/
--void
--polkit_unix_session_new_for_process (gint                pid,
--                                     GCancellable       *cancellable,
--                                     GAsyncReadyCallback callback,
--                                     gpointer            user_data)
--{
--  g_async_initable_new_async (POLKIT_TYPE_UNIX_SESSION,
--                              G_PRIORITY_DEFAULT,
--                              cancellable,
--                              callback,
--                              user_data,
--                              "pid", pid,
--                              NULL);
--}
--
--/**
-- * polkit_unix_session_new_for_process_finish:
-- * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to polkit_unix_session_new_for_process().
-- * @error: (allow-none): Return location for error.
-- *
-- * Finishes constructing a #PolkitSubject for a process id.
-- *
-- * Returns: (transfer full) (allow-none): A #PolkitUnixSession for the @pid passed to
-- *     polkit_unix_session_new_for_process() or %NULL if @error is
-- *     set. Free with g_object_unref().
-- **/
--PolkitSubject *
--polkit_unix_session_new_for_process_finish (GAsyncResult   *res,
--                                            GError        **error)
--{
--  GObject *object;
--  GObject *source_object;
--
--  source_object = g_async_result_get_source_object (res);
--  g_assert (source_object != NULL);
--
--  object = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object),
--                                        res,
--                                        error);
--  g_object_unref (source_object);
--
--  if (object != NULL)
--    return POLKIT_SUBJECT (object);
--  else
--    return NULL;
--}
--
--
--/**
-- * polkit_unix_session_new_for_process_sync:
-- * @pid: The process id of the process to get the session for.
-- * @cancellable: (allow-none): A #GCancellable or %NULL.
-- * @error: (allow-none): Return location for error.
-- *
-- * Creates a new #PolkitUnixSession for the process with process id @pid.
-- *
-- * This is a synchronous call - the calling thread is blocked until a
-- * reply is received. For the asynchronous version, see
-- * polkit_unix_session_new_for_process().
-- *
-- * Returns: (allow-none) (transfer full): A #PolkitUnixSession for
-- * @pid or %NULL if @error is set. Free with g_object_unref().
-- **/
--PolkitSubject *
--polkit_unix_session_new_for_process_sync (gint           pid,
--                                          GCancellable  *cancellable,
--                                          GError       **error)
--{
--  return POLKIT_SUBJECT (g_initable_new (POLKIT_TYPE_UNIX_SESSION,
--                                         cancellable,
--                                         error,
--                                         "pid", pid,
--                                         NULL));
--}
--
--static guint
--polkit_unix_session_hash (PolkitSubject *subject)
--{
--  PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject);
--
--  return g_str_hash (session->session_id);
--}
--
--static gboolean
--polkit_unix_session_equal (PolkitSubject *a,
--                           PolkitSubject *b)
--{
--  PolkitUnixSession *session_a;
--  PolkitUnixSession *session_b;
--
--  session_a = POLKIT_UNIX_SESSION (a);
--  session_b = POLKIT_UNIX_SESSION (b);
--
--  return g_strcmp0 (session_a->session_id, session_b->session_id) == 0;
--}
--
--static gchar *
--polkit_unix_session_to_string (PolkitSubject *subject)
--{
--  PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject);
--
--  return g_strdup_printf ("unix-session:%s", session->session_id);
--}
--
--static gboolean
--polkit_unix_session_exists_sync (PolkitSubject   *subject,
--                                    GCancellable    *cancellable,
--                                    GError         **error)
--{
--  PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject);
--  gboolean ret;
--  uid_t uid;
--
--  ret = FALSE;
--
--  if (!sd_session_get_uid (session->session_id, &uid))
--    ret = FALSE;
--
--  return ret;
--}
--
--static void
--exists_in_thread_func (GSimpleAsyncResult *res,
--                       GObject            *object,
--                       GCancellable       *cancellable)
--{
--  GError *error;
--  error = NULL;
--  if (!polkit_unix_session_exists_sync (POLKIT_SUBJECT (object),
--                                        cancellable,
--                                        &error))
--    {
--      g_simple_async_result_set_from_error (res, error);
--      g_error_free (error);
--    }
--}
--
--static void
--polkit_unix_session_exists (PolkitSubject       *subject,
--                            GCancellable        *cancellable,
--                            GAsyncReadyCallback  callback,
--                            gpointer             user_data)
--{
--  GSimpleAsyncResult *simple;
--
--  g_return_if_fail (POLKIT_IS_UNIX_SESSION (subject));
--
--  simple = g_simple_async_result_new (G_OBJECT (subject),
--                                      callback,
--                                      user_data,
--                                      polkit_unix_session_exists);
--  g_simple_async_result_run_in_thread (simple,
--                                       exists_in_thread_func,
--                                       G_PRIORITY_DEFAULT,
--                                       cancellable);
--  g_object_unref (simple);
--}
--
--static gboolean
--polkit_unix_session_exists_finish (PolkitSubject  *subject,
--                                      GAsyncResult   *res,
--                                      GError        **error)
--{
--  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
--  gboolean ret;
--
--  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == polkit_unix_session_exists);
--
--  ret = FALSE;
--
--  if (g_simple_async_result_propagate_error (simple, error))
--    goto out;
--
--  ret = g_simple_async_result_get_op_res_gboolean (simple);
--
-- out:
--  return ret;
--}
--
--static void
--subject_iface_init (PolkitSubjectIface *subject_iface)
--{
--  subject_iface->hash          = polkit_unix_session_hash;
--  subject_iface->equal         = polkit_unix_session_equal;
--  subject_iface->to_string     = polkit_unix_session_to_string;
--  subject_iface->exists        = polkit_unix_session_exists;
--  subject_iface->exists_finish = polkit_unix_session_exists_finish;
--  subject_iface->exists_sync   = polkit_unix_session_exists_sync;
--}
--
--static gboolean
--polkit_unix_session_initable_init (GInitable     *initable,
--                                   GCancellable  *cancellable,
--                                   GError       **error)
--{
--  PolkitUnixSession *session = POLKIT_UNIX_SESSION (initable);
--  gboolean ret;
--
--  ret = FALSE;
--
--  if (session->session_id != NULL)
--    {
--      /* already set, nothing to do */
--      ret = TRUE;
--      goto out;
--    }
--
--  if (!sd_pid_get_session (session->pid, &session->session_id))
--    ret = TRUE;
--
--out:
--  return ret;
--}
--
--static void
--initable_iface_init (GInitableIface *initable_iface)
--{
--  initable_iface->init = polkit_unix_session_initable_init;
--}
--
--static void
--async_initable_iface_init (GAsyncInitableIface *async_initable_iface)
--{
--  /* use default implementation to run GInitable code in a thread */
--}
-diff -u -rN polkit-0.104/src/polkitbackend/Makefile.am polkit-0.104-systemd-fallback/src/polkitbackend/Makefile.am
---- polkit-0.104/src/polkitbackend/Makefile.am	2012-01-03 16:03:47.000000000 +0100
-+++ polkit-0.104-systemd-fallback/src/polkitbackend/Makefile.am	2012-03-06 15:44:15.380014886 +0100
-@@ -41,15 +41,8 @@
- 	polkitbackendconfigsource.h		polkitbackendconfigsource.c		\
- 	polkitbackendactionlookup.h		polkitbackendactionlookup.c		\
- 	polkitbackendlocalauthorizationstore.h	polkitbackendlocalauthorizationstore.c	\
--        $(NULL)
--
--if HAVE_SYSTEMD
--libpolkit_backend_1_la_SOURCES += \
--	polkitbackendsessionmonitor.h		polkitbackendsessionmonitor-systemd.c
--else
--libpolkit_backend_1_la_SOURCES += \
- 	polkitbackendsessionmonitor.h		polkitbackendsessionmonitor.c
--endif
-+        $(NULL)
- 
- libpolkit_backend_1_la_CFLAGS =                                        	\
-         -D_POLKIT_COMPILATION                                  		\
-diff -u -rN polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor.c polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor.c
---- polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor.c	2011-10-18 19:02:27.000000000 +0200
-+++ polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor.c	2012-03-06 15:43:49.353562242 +0100
-@@ -26,6 +26,12 @@
- #include <string.h>
- #include <glib/gstdio.h>
- 
-+#ifdef HAVE_SYSTEMD
-+#  include <systemd/sd-daemon.h>
-+#  include <systemd/sd-login.h>
-+#  include <stdlib.h>
-+#endif
-+
- #include <polkit/polkit.h>
- #include "polkitbackendsessionmonitor.h"
- 
-@@ -39,6 +45,88 @@
-  * The #PolkitBackendSessionMonitor class is a utility class to track and monitor sessions.
-  */
- 
-+#ifdef HAVE_SYSTEMD
-+typedef struct
-+{
-+  GSource source;
-+  GPollFD pollfd;
-+  sd_login_monitor *monitor;
-+} SdSource;
-+
-+static gboolean
-+sd_source_prepare (GSource *source,
-+                   gint    *timeout)
-+{
-+  *timeout = -1;
-+  return FALSE;
-+}
-+
-+static gboolean
-+sd_source_check (GSource *source)
-+{
-+  SdSource *sd_source = (SdSource *)source;
-+
-+  return sd_source->pollfd.revents != 0;
-+}
-+
-+static gboolean
-+sd_source_dispatch (GSource     *source,
-+                    GSourceFunc  callback,
-+                    gpointer     user_data)
-+
-+{
-+  SdSource *sd_source = (SdSource *)source;
-+  gboolean ret;
-+
-+  g_warn_if_fail (callback != NULL);
-+
-+  ret = (*callback) (user_data);
-+
-+  sd_login_monitor_flush (sd_source->monitor);
-+
-+  return ret;
-+}
-+
-+static void
-+sd_source_finalize (GSource *source)
-+{
-+  SdSource *sd_source = (SdSource*)source;
-+
-+  sd_login_monitor_unref (sd_source->monitor);
-+}
-+
-+static GSourceFuncs sd_source_funcs = {
-+  sd_source_prepare,
-+  sd_source_check,
-+  sd_source_dispatch,
-+  sd_source_finalize
-+};
-+
-+static GSource *
-+sd_source_new (void)
-+{
-+  GSource *source;
-+  SdSource *sd_source;
-+  int ret;
-+
-+  source = g_source_new (&sd_source_funcs, sizeof (SdSource));
-+  sd_source = (SdSource *)source;
-+
-+  if ((ret = sd_login_monitor_new (NULL, &sd_source->monitor)) < 0)
-+    {
-+      g_printerr ("Error getting login monitor: %d", ret);
-+    }
-+  else
-+    {
-+      sd_source->pollfd.fd = sd_login_monitor_get_fd (sd_source->monitor);
-+      sd_source->pollfd.events = G_IO_IN;
-+      g_source_add_poll (source, &sd_source->pollfd);
-+    }
-+
-+  return source;
-+}
-+#endif /* HAVE_SYSTEMD */
-+
- struct _PolkitBackendSessionMonitor
- {
-   GObject parent_instance;
-@@ -48,6 +136,10 @@
-   GKeyFile *database;
-   GFileMonitor *database_monitor;
-   time_t database_mtime;
-+  
-+#ifdef HAVE_SYSTEMD
-+  GSource *sd_source;
-+#endif
- };
- 
- struct _PolkitBackendSessionMonitorClass
-@@ -162,6 +254,18 @@
-   g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0);
- }
- 
-+#ifdef HAVE_SYSTEMD
-+static gboolean
-+sessions_changed (gpointer user_data)
-+{
-+  PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (user_data);
-+
-+  g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0);
-+
-+  return TRUE;
-+}
-+#endif
-+
- static void
- polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor)
- {
-@@ -176,31 +280,47 @@
-       g_error_free (error);
-     }
- 
--  error = NULL;
--  if (!ensure_database (monitor, &error))
--    {
--      g_printerr ("Error loading " CKDB_PATH ": %s", error->message);
--      g_error_free (error);
--    }
-+#ifdef HAVE_SYSTEMD
-+  monitor->sd_source = NULL;
-+  
-+  if (sd_booted () > 0)
-+    {
-+      monitor->sd_source = sd_source_new ();
-+      g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
-+      g_source_attach (monitor->sd_source, NULL);
- 
--  error = NULL;
--  file = g_file_new_for_path (CKDB_PATH);
--  monitor->database_monitor = g_file_monitor_file (file,
--                                                   G_FILE_MONITOR_NONE,
--                                                   NULL,
--                                                   &error);
--  g_object_unref (file);
--  if (monitor->database_monitor == NULL)
--    {
--      g_printerr ("Error monitoring " CKDB_PATH ": %s", error->message);
--      g_error_free (error);
-+      monitor->database = NULL;
-+      monitor->database_monitor = NULL;
-     }
-   else
-+#endif
-     {
--      g_signal_connect (monitor->database_monitor,
--                        "changed",
--                        G_CALLBACK (on_file_monitor_changed),
--                        monitor);
-+      error = NULL;
-+      if (!ensure_database (monitor, &error))
-+        {
-+          g_printerr ("Error loading " CKDB_PATH ": %s", error->message);
-+          g_error_free (error);
-+        }
-+
-+      error = NULL;
-+      file = g_file_new_for_path (CKDB_PATH);
-+      monitor->database_monitor = g_file_monitor_file (file,
-+                                                       G_FILE_MONITOR_NONE,
-+                                                       NULL,
-+                                                       &error);
-+      g_object_unref (file);
-+      if (monitor->database_monitor == NULL)
-+        {
-+          g_printerr ("Error monitoring " CKDB_PATH ": %s", error->message);
-+          g_error_free (error);
-+        }
-+      else
-+        {
-+          g_signal_connect (monitor->database_monitor,
-+                            "changed",
-+                            G_CALLBACK (on_file_monitor_changed),
-+                            monitor);
-+        }
-     }
- }
- 
-@@ -212,6 +332,14 @@
-   if (monitor->system_bus != NULL)
-     g_object_unref (monitor->system_bus);
- 
-+#ifdef HAVE_SYSTEMD
-+  if (monitor->sd_source != NULL)
-+    {
-+      g_source_destroy (monitor->sd_source);
-+      g_source_unref (monitor->sd_source);
-+    }
-+#endif
-+
-   if (monitor->database_monitor != NULL)
-     g_object_unref (monitor->database_monitor);
- 
-@@ -328,22 +456,38 @@
-     }
-   else if (POLKIT_IS_UNIX_SESSION (subject))
-     {
--      if (!ensure_database (monitor, error))
-+#ifdef HAVE_SYSTEMD
-+      if (monitor->sd_source != NULL)
-         {
--          g_prefix_error (error, "Error getting user for session: Error ensuring CK database at " CKDB_PATH ": ");
--          goto out;
-+          if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0)
-+            {
-+              g_set_error (error,
-+                           POLKIT_ERROR,
-+                           POLKIT_ERROR_FAILED,
-+                           "Error getting uid for session");
-+              goto out;
-+            }
-         }
--
--      group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)));
--      local_error = NULL;
--      uid = g_key_file_get_integer (monitor->database, group, "uid", &local_error);
--      if (local_error != NULL)
-+      else
-+#endif
-         {
--          g_propagate_prefixed_error (error, local_error, "Error getting uid using " CKDB_PATH ": ");
-+          if (!ensure_database (monitor, error))
-+            {
-+              g_prefix_error (error, "Error getting user for session: Error ensuring CK database at " CKDB_PATH ": ");
-+              goto out;
-+            }
-+
-+          group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)));
-+          local_error = NULL;
-+          uid = g_key_file_get_integer (monitor->database, group, "uid", &local_error);
-+          if (local_error != NULL)
-+            {
-+              g_propagate_prefixed_error (error, local_error, "Error getting uid using " CKDB_PATH ": ");
-+              g_free (group);
-+              goto out;
-+            }
-           g_free (group);
--          goto out;
-         }
--      g_free (group);
- 
-       ret = polkit_unix_user_new (uid);
-     }
-@@ -373,29 +517,46 @@
- 
-   if (POLKIT_IS_UNIX_PROCESS (subject))
-     {
--      const gchar *session_id;
--      GVariant *result;
--      result = g_dbus_connection_call_sync (monitor->system_bus,
--                                            "org.freedesktop.ConsoleKit",
--                                            "/org/freedesktop/ConsoleKit/Manager",
--                                            "org.freedesktop.ConsoleKit.Manager",
--                                            "GetSessionForUnixProcess",
--                                            g_variant_new ("(u)", polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))),
--                                            G_VARIANT_TYPE ("(o)"),
--                                            G_DBUS_CALL_FLAGS_NONE,
--                                            -1, /* timeout_msec */
--                                            NULL, /* GCancellable */
--                                            error);
--      if (result == NULL)
--        goto out;
--      g_variant_get (result, "(&o)", &session_id);
--      session = polkit_unix_session_new (session_id);
--      g_variant_unref (result);
-+#ifdef HAVE_SYSTEMD
-+      if (monitor->sd_source != NULL)
-+        {
-+          gchar *session_id;
-+          pid_t pid;
-+
-+          pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject));
-+          if (sd_pid_get_session (pid, &session_id) < 0)
-+            goto out;
-+
-+          session = polkit_unix_session_new (session_id);
-+          free (session_id);
-+        }
-+      else
-+#endif
-+        {
-+          const gchar *session_id;
-+          GVariant *result;
-+          result = g_dbus_connection_call_sync (monitor->system_bus,
-+                                                "org.freedesktop.ConsoleKit",
-+                                                "/org/freedesktop/ConsoleKit/Manager",
-+                                                "org.freedesktop.ConsoleKit.Manager",
-+                                                "GetSessionForUnixProcess",
-+                                                g_variant_new ("(u)", polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))),
-+                                                G_VARIANT_TYPE ("(o)"),
-+                                                G_DBUS_CALL_FLAGS_NONE,
-+                                                -1, /* timeout_msec */
-+                                                NULL, /* GCancellable */
-+                                                error);
-+          if (result == NULL)
-+            goto out;
-+          g_variant_get (result, "(&o)", &session_id);
-+          session = polkit_unix_session_new (session_id);
-+          g_variant_unref (result);
-+        }
-     }
-   else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
-     {
-       guint32 pid;
--      const gchar *session_id;
-+      gchar *session_id;
-       GVariant *result;
- 
-       result = g_dbus_connection_call_sync (monitor->system_bus,
-@@ -414,22 +575,35 @@
-       g_variant_get (result, "(u)", &pid);
-       g_variant_unref (result);
- 
--      result = g_dbus_connection_call_sync (monitor->system_bus,
--                                            "org.freedesktop.ConsoleKit",
--                                            "/org/freedesktop/ConsoleKit/Manager",
--                                            "org.freedesktop.ConsoleKit.Manager",
--                                            "GetSessionForUnixProcess",
--                                            g_variant_new ("(u)", pid),
--                                            G_VARIANT_TYPE ("(o)"),
--                                            G_DBUS_CALL_FLAGS_NONE,
--                                            -1, /* timeout_msec */
--                                            NULL, /* GCancellable */
--                                            error);
--      if (result == NULL)
--        goto out;
--      g_variant_get (result, "(&o)", &session_id);
--      session = polkit_unix_session_new (session_id);
--      g_variant_unref (result);
-+#ifdef HAVE_SYSTEMD
-+      if (monitor->sd_source != NULL)
-+        {
-+          if (sd_pid_get_session (pid, &session_id) < 0)
-+            goto out;
-+
-+          session = polkit_unix_session_new (session_id);
-+          free (session_id);
-+        }
-+      else
-+#endif
-+        {
-+          result = g_dbus_connection_call_sync (monitor->system_bus,
-+                                                "org.freedesktop.ConsoleKit",
-+                                                "/org/freedesktop/ConsoleKit/Manager",
-+                                                "org.freedesktop.ConsoleKit.Manager",
-+                                                "GetSessionForUnixProcess",
-+                                                g_variant_new ("(u)", pid),
-+                                                G_VARIANT_TYPE ("(o)"),
-+                                                G_DBUS_CALL_FLAGS_NONE,
-+                                                -1, /* timeout_msec */
-+                                                NULL, /* GCancellable */
-+                                                error);
-+          if (result == NULL)
-+            goto out;
-+          g_variant_get (result, "(&o)", &session_id);
-+          session = polkit_unix_session_new (session_id);
-+          g_variant_unref (result);
-+        }
-     }
-   else
-     {
-@@ -490,7 +664,22 @@
- polkit_backend_session_monitor_is_session_local  (PolkitBackendSessionMonitor *monitor,
-                                                   PolkitSubject               *session)
- {
--  return get_boolean (monitor, session, "is_local");
-+#ifdef HAVE_SYSTEMD
-+  if (monitor->sd_source != NULL)
-+    {
-+      char *seat;
-+
-+      if (!sd_session_get_seat (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)), &seat))
-+        {
-+          free (seat);
-+          return TRUE;
-+        }
-+
-+      return FALSE;
-+    }
-+  else
-+#endif
-+    return get_boolean (monitor, session, "is_local");
- }
- 
- 
-@@ -498,6 +687,11 @@
- polkit_backend_session_monitor_is_session_active (PolkitBackendSessionMonitor *monitor,
-                                                   PolkitSubject               *session)
- {
--  return get_boolean (monitor, session, "is_active");
-+#ifdef HAVE_SYSTEMD
-+  if (monitor->sd_source != NULL)
-+    return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)));
-+  else
-+#endif
-+    return get_boolean (monitor, session, "is_active");
- }
- 
-diff -u -rN polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor-systemd.c polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
---- polkit-0.104/src/polkitbackend/polkitbackendsessionmonitor-systemd.c	2012-01-03 16:03:47.000000000 +0100
-+++ polkit-0.104-systemd-fallback/src/polkitbackend/polkitbackendsessionmonitor-systemd.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,414 +0,0 @@
--/*
-- * Copyright (C) 2011 Red Hat, Inc.
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General
-- * Public License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-- * Boston, MA 02111-1307, USA.
-- *
-- * Author: Matthias Clasen
-- */
--
--#include "config.h"
--#include <errno.h>
--#include <pwd.h>
--#include <grp.h>
--#include <string.h>
--#include <glib/gstdio.h>
--#include <systemd/sd-login.h>
--#include <stdlib.h>
--
--#include <polkit/polkit.h>
--#include "polkitbackendsessionmonitor.h"
--
--/* <internal>
-- * SECTION:polkitbackendsessionmonitor
-- * @title: PolkitBackendSessionMonitor
-- * @short_description: Monitor sessions
-- *
-- * The #PolkitBackendSessionMonitor class is a utility class to track and monitor sessions.
-- */
--
--typedef struct
--{
--  GSource source;
--  GPollFD pollfd;
--  sd_login_monitor *monitor;
--} SdSource;
--
--static gboolean
--sd_source_prepare (GSource *source,
--                   gint    *timeout)
--{
--  *timeout = -1;
--  return FALSE;
--}
--
--static gboolean
--sd_source_check (GSource *source)
--{
--  SdSource *sd_source = (SdSource *)source;
--
--  return sd_source->pollfd.revents != 0;
--}
--
--static gboolean
--sd_source_dispatch (GSource     *source,
--                    GSourceFunc  callback,
--                    gpointer     user_data)
--
--{
--  SdSource *sd_source = (SdSource *)source;
--  gboolean ret;
--
--  g_warn_if_fail (callback != NULL);
--
--  ret = (*callback) (user_data);
--
--  sd_login_monitor_flush (sd_source->monitor);
--
--  return ret;
--}
--
--static void
--sd_source_finalize (GSource *source)
--{
--  SdSource *sd_source = (SdSource*)source;
--
--  sd_login_monitor_unref (sd_source->monitor);
--}
--
--static GSourceFuncs sd_source_funcs = {
--  sd_source_prepare,
--  sd_source_check,
--  sd_source_dispatch,
--  sd_source_finalize
--};
--
--static GSource *
--sd_source_new (void)
--{
--  GSource *source;
--  SdSource *sd_source;
--  int ret;
--
--  source = g_source_new (&sd_source_funcs, sizeof (SdSource));
--  sd_source = (SdSource *)source;
--
--  if ((ret = sd_login_monitor_new (NULL, &sd_source->monitor)) < 0)
--    {
--      g_printerr ("Error getting login monitor: %d", ret);
--    }
--  else
--    {
--      sd_source->pollfd.fd = sd_login_monitor_get_fd (sd_source->monitor);
--      sd_source->pollfd.events = G_IO_IN;
--      g_source_add_poll (source, &sd_source->pollfd);
--    }
--
--  return source;
--}
--
--struct _PolkitBackendSessionMonitor
--{
--  GObject parent_instance;
--
--  GDBusConnection *system_bus;
--
--  GSource *sd_source;
--};
--
--struct _PolkitBackendSessionMonitorClass
--{
--  GObjectClass parent_class;
--
--  void (*changed) (PolkitBackendSessionMonitor *monitor);
--};
--
--
--enum
--{
--  CHANGED_SIGNAL,
--  LAST_SIGNAL,
--};
--
--static guint signals[LAST_SIGNAL] = {0};
--
--G_DEFINE_TYPE (PolkitBackendSessionMonitor, polkit_backend_session_monitor, G_TYPE_OBJECT);
--
--/* ---------------------------------------------------------------------------------------------------- */
--
--static gboolean
--sessions_changed (gpointer user_data)
--{
--  PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (user_data);
--
--  g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0);
--
--  return TRUE;
--}
--
--
--static void
--polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor)
--{
--  GError *error;
--
--  error = NULL;
--  monitor->system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
--  if (monitor->system_bus == NULL)
--    {
--      g_printerr ("Error getting system bus: %s", error->message);
--      g_error_free (error);
--    }
--
--  monitor->sd_source = sd_source_new ();
--  g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
--  g_source_attach (monitor->sd_source, NULL);
--}
--
--static void
--polkit_backend_session_monitor_finalize (GObject *object)
--{
--  PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (object);
--
--  if (monitor->system_bus != NULL)
--    g_object_unref (monitor->system_bus);
--
--  if (monitor->sd_source != NULL)
--    {
--      g_source_destroy (monitor->sd_source);
--      g_source_unref (monitor->sd_source);
--    }
--
--  if (G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize != NULL)
--    G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize (object);
--}
--
--static void
--polkit_backend_session_monitor_class_init (PolkitBackendSessionMonitorClass *klass)
--{
--  GObjectClass *gobject_class;
--
--  gobject_class = G_OBJECT_CLASS (klass);
--
--  gobject_class->finalize = polkit_backend_session_monitor_finalize;
--
--  /**
--   * PolkitBackendSessionMonitor::changed:
--   * @monitor: A #PolkitBackendSessionMonitor
--   *
--   * Emitted when something changes.
--   */
--  signals[CHANGED_SIGNAL] = g_signal_new ("changed",
--                                          POLKIT_BACKEND_TYPE_SESSION_MONITOR,
--                                          G_SIGNAL_RUN_LAST,
--                                          G_STRUCT_OFFSET (PolkitBackendSessionMonitorClass, changed),
--                                          NULL,                   /* accumulator      */
--                                          NULL,                   /* accumulator data */
--                                          g_cclosure_marshal_VOID__VOID,
--                                          G_TYPE_NONE,
--                                          0);
--}
--
--PolkitBackendSessionMonitor *
--polkit_backend_session_monitor_new (void)
--{
--  PolkitBackendSessionMonitor *monitor;
--
--  monitor = POLKIT_BACKEND_SESSION_MONITOR (g_object_new (POLKIT_BACKEND_TYPE_SESSION_MONITOR, NULL));
--
--  return monitor;
--}
--
--/* ---------------------------------------------------------------------------------------------------- */
--
--GList *
--polkit_backend_session_monitor_get_sessions (PolkitBackendSessionMonitor *monitor)
--{
--  /* TODO */
--  return NULL;
--}
--
--/* ---------------------------------------------------------------------------------------------------- */
--
--/**
-- * polkit_backend_session_monitor_get_user:
-- * @monitor: A #PolkitBackendSessionMonitor.
-- * @subject: A #PolkitSubject.
-- * @error: Return location for error.
-- *
-- * Gets the user corresponding to @subject or %NULL if no user exists.
-- *
-- * Returns: %NULL if @error is set otherwise a #PolkitUnixUser that should be freed with g_object_unref().
-- */
--PolkitIdentity *
--polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor  *monitor,
--                                                     PolkitSubject                *subject,
--                                                     GError                      **error)
--{
--  PolkitIdentity *ret;
--  guint32 uid;
--
--  ret = NULL;
--
--  if (POLKIT_IS_UNIX_PROCESS (subject))
--    {
--      uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject));
--      if ((gint) uid == -1)
--        {
--          g_set_error (error,
--                       POLKIT_ERROR,
--                       POLKIT_ERROR_FAILED,
--                       "Unix process subject does not have uid set");
--          goto out;
--        }
--      ret = polkit_unix_user_new (uid);
--    }
--  else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
--    {
--      GVariant *result;
--
--      result = g_dbus_connection_call_sync (monitor->system_bus,
--                                            "org.freedesktop.DBus",
--                                            "/org/freedesktop/DBus",
--                                            "org.freedesktop.DBus",
--                                            "GetConnectionUnixUser",
--                                            g_variant_new ("(s)", polkit_system_bus_name_get_name (POLKIT_SYSTEM_BUS_NAME (subject))),
--                                            G_VARIANT_TYPE ("(u)"),
--                                            G_DBUS_CALL_FLAGS_NONE,
--                                            -1, /* timeout_msec */
--                                            NULL, /* GCancellable */
--                                            error);
--      if (result == NULL)
--        goto out;
--      g_variant_get (result, "(u)", &uid);
--      g_variant_unref (result);
--
--      ret = polkit_unix_user_new (uid);
--    }
--  else if (POLKIT_IS_UNIX_SESSION (subject))
--    {
--
--      if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0)
--        {
--          g_set_error (error,
--                       POLKIT_ERROR,
--                       POLKIT_ERROR_FAILED,
--                       "Error getting uid for session");
--          goto out;
--        }
--
--      ret = polkit_unix_user_new (uid);
--    }
--
-- out:
--  return ret;
--}
--
--/**
-- * polkit_backend_session_monitor_get_session_for_subject:
-- * @monitor: A #PolkitBackendSessionMonitor.
-- * @subject: A #PolkitSubject.
-- * @error: Return location for error.
-- *
-- * Gets the session corresponding to @subject or %NULL if no session exists.
-- *
-- * Returns: %NULL if @error is set otherwise a #PolkitUnixSession that should be freed with g_object_unref().
-- */
--PolkitSubject *
--polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMonitor *monitor,
--                                                        PolkitSubject               *subject,
--                                                        GError                     **error)
--{
--  PolkitSubject *session;
--
--  session = NULL;
--
--  if (POLKIT_IS_UNIX_PROCESS (subject))
--    {
--      gchar *session_id;
--      pid_t pid;
--
--      pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject));
--      if (sd_pid_get_session (pid, &session_id) < 0)
--        goto out;
--
--      session = polkit_unix_session_new (session_id);
--      free (session_id);
--    }
--  else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
--    {
--      guint32 pid;
--      gchar *session_id;
--      GVariant *result;
--
--      result = g_dbus_connection_call_sync (monitor->system_bus,
--                                            "org.freedesktop.DBus",
--                                            "/org/freedesktop/DBus",
--                                            "org.freedesktop.DBus",
--                                            "GetConnectionUnixProcessID",
--                                            g_variant_new ("(s)", polkit_system_bus_name_get_name (POLKIT_SYSTEM_BUS_NAME (subject))),
--                                            G_VARIANT_TYPE ("(u)"),
--                                            G_DBUS_CALL_FLAGS_NONE,
--                                            -1, /* timeout_msec */
--                                            NULL, /* GCancellable */
--                                            error);
--      if (result == NULL)
--        goto out;
--      g_variant_get (result, "(u)", &pid);
--      g_variant_unref (result);
--
--      if (sd_pid_get_session (pid, &session_id) < 0)
--        goto out;
--
--      session = polkit_unix_session_new (session_id);
--      free (session_id);
--    }
--  else
--    {
--      g_set_error (error,
--                   POLKIT_ERROR,
--                   POLKIT_ERROR_NOT_SUPPORTED,
--                   "Cannot get user for subject of type %s",
--                   g_type_name (G_TYPE_FROM_INSTANCE (subject)));
--    }
--
-- out:
--
--  return session;
--}
--
--gboolean
--polkit_backend_session_monitor_is_session_local (PolkitBackendSessionMonitor *monitor,
--                                                 PolkitSubject               *session)
--{
--  char *seat;
--
--  if (!sd_session_get_seat (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)), &seat))
--    {
--      free (seat);
--      return TRUE;
--    }
--
--  return FALSE;
--}
--
--
--gboolean
--polkit_backend_session_monitor_is_session_active (PolkitBackendSessionMonitor *monitor,
--                                                  PolkitSubject               *session)
--{
--  return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)));
--}
--
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index e24fd89ce..02121f66d 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,25 +1,30 @@
-# $Id: PKGBUILD 175029 2013-01-12 08:15:09Z andyrtr $
+# $Id: PKGBUILD 183295 2013-04-20 16:41:31Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.22.0
-pkgrel=1
+pkgver=0.22.3
+pkgrel=2
 arch=(i686 x86_64 mips64el)
 license=('GPL')
-makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection' 'icu')
+makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu')
 options=('!libtool' '!emptydirs')
 url="http://poppler.freedesktop.org/"
 _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
 source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
         http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2)
-md5sums=('c7038be37a7d446544e83a7df3c26196'
+md5sums=('be915388eaad6865cee5a156c8119ec1'
          '9dc64c254a31e570507bdd4ad4ba629a')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
+#  . /etc/profile.d/qt4.sh
+
+  cd "${srcdir}"
+  ln -sf test-${_testtag} test
+  cd ${pkgbase}-${pkgver}
 
+  sed -i -e '/AC_PATH_XTRA/d' configure.ac
+  sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac
   autoreconf -fi
 
   ./configure --prefix=/usr --sysconfdir=/etc \
@@ -33,15 +38,14 @@ build() {
 }
 
 check() {
-  cd "${srcdir}"
-  ln -sf test-${_testtag} test
-  cd ${pkgbase}-${pkgver}
+  cd "${srcdir}/${pkgbase}-${pkgver}"
   LANG=en_US.UTF8 make check
 }
 
 package_poppler() {
   pkgdesc="PDF rendering library based on xpdf 3.0"
-  depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data')
+  depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms2')
+  optdepends=('poppler-data: encoding data to display PDF documents containing CJK characters')
   conflicts=("poppler-qt3<${pkgver}")
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -68,7 +72,7 @@ package_poppler-glib() {
 
 package_poppler-qt() {
   pkgdesc="Poppler Qt bindings"
-  depends=("poppler=${pkgver}" 'qt')
+  depends=("poppler=${pkgver}" 'qt4')
 
   cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
   make DESTDIR="${pkgdir}" install-libLTLIBRARIES
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index a8b69f599..e99b5b627 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 177039 2013-02-05 03:00:26Z bisson $
+# $Id: PKGBUILD 180687 2013-03-25 19:15:38Z bpiotrowski $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=postfix
-pkgver=2.9.6
-pkgrel=1
+pkgver=2.10.0
+pkgrel=4
 pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
 license=('custom')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('pcre' 'libsasl' 'libldap' 'db'
-         'libmysqlclient' 'postgresql-libs' 'sqlite' 'tinycdb')
+         'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb')
 backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
 source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"
         'aliases.patch'
         'service'
         'rc.d')
-sha1sums=('9d7af8670fd13fd5e5290ff2e3f00d724178f0fb'
+sha1sums=('dd9bfc7afee416aa9f2368d084a4b202718e42df'
           '5fc3de6c7df1e5851a0a379e825148868808318b'
           '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6'
           '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
@@ -38,6 +38,10 @@ build() {
 		-DHAS_PGSQL -I/usr/include/postgresql \
 		-DHAS_SQLITE \
 		-DHAS_CDB \
+		-DDEF_MANPAGE_DIR=\"/usr/share/man\" \
+		-DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \
+		-DDEF_SAMPLE_DIR=\"/etc/postfix/sample\" \
+		-DDEF_README_DIR=\"/usr/share/doc/postfix\" \
 	' AUXLIBS=' \
 		-lsasl2 \
 		-lldap -llber \
@@ -54,12 +58,7 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	sh postfix-install -non-interactive \
-		install_root="${pkgdir}" \
-		daemon_directory="/usr/lib/${pkgname}" \
-		sample_directory="/etc/${pkgname}/sample" \
-		manpage_directory="/usr/share/man" \
-		readme_directory="/usr/share/doc/${pkgname}" \
+	sh postfix-install -non-interactive install_root="${pkgdir}"
 
 	install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
 	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/extra/postfix/install b/extra/postfix/install
index cb97e2e6c..7230359fc 100644
--- a/extra/postfix/install
+++ b/extra/postfix/install
@@ -1,33 +1,18 @@
+post_upgrade() {
+	/usr/lib/postfix/post-install daemon_directory=/usr/lib/postfix upgrade-package
+	chown postfix var/lib/postfix
+}
+
 post_install() {
 	getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null
 	getent group postfix  &>/dev/null || groupadd -g 73 postfix  >/dev/null
 	getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null
-
-	cd var/spool/postfix
-	chown postfix active bounce corrupt defer deferred flush hold incoming private public maildrop trace saved
-	chgrp postdrop public maildrop
-	cd ../../../usr/sbin
-	chgrp postdrop postqueue postdrop
-	chmod g+s postqueue postdrop
-	cd ../..
-	chown postfix var/lib/postfix
-
-	newaliases
-}
-
-post_upgrade() {
-	post_install
-
-	if [ `vercmp $2 2.9.0` = -1 ]; then cat <<EOF
-
-==> You must now run "postfix reload" due to inter-daemon protocol change.
-
-EOF
-	fi
+	post_upgrade
 }
 
 pre_remove() {
 	getent passwd postfix &>/dev/null && userdel  postfix  >/dev/null
 	getent group postfix  &>/dev/null && groupdel postfix  >/dev/null
 	getent group postdrop &>/dev/null && groupdel postdrop >/dev/null
+	true
 }
diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD
index 6d205f583..0b32a5ba3 100644
--- a/extra/postgresql-old-upgrade/PKGBUILD
+++ b/extra/postgresql-old-upgrade/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 177586 2013-02-07 18:35:35Z dan $
+# $Id: PKGBUILD 181849 2013-04-04 14:34:55Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=postgresql-old-upgrade
-pkgver=9.1.8
+pkgver=9.1.9
 _majorver=${pkgver%.*}
 pkgrel=1
 pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade"
@@ -47,5 +47,5 @@ package() {
   rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/"
 }
 
-md5sums=('54783b516880a586dcd7c07992d8c0b3')
-sha256sums=('1d88f9dda24062dbfcc09aca9a316981f2aa93322613b853cf32d7a431b44c6d')
+md5sums=('6b5ea53dde48fcd79acfc8c196b83535')
+sha256sums=('28a533e181009308722e8b3c51f1ea7224ab910c380ac1a86f07118667602dd8')
diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD
index 88f08a977..3a602a88d 100644
--- a/extra/postgresql/PKGBUILD
+++ b/extra/postgresql/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177590 2013-02-07 18:51:10Z dan $
+# $Id: PKGBUILD 181847 2013-04-04 14:20:11Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=postgresql
 pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
-pkgver=9.2.3
+pkgver=9.2.4
 _majorver=${pkgver%.*}
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,14 +14,14 @@ source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar
         postgresql-run-socket.patch
         postgresql.pam postgresql.logrotate
         postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir)
-md5sums=('59f42a93695b0186ed5eb03c2653a7d4'
+md5sums=('6ee5bb53b97da7c6ad9cb0825d3300dd'
          '75c579eed03ffb2312631f0b649175b4'
          '96f82c38f3f540b53f3e5144900acf17'
          'd28e443f9f65a5712c52018b84e27137'
          '89b48774b0dae7c37fbb0e907c3c1db8'
          '1c5a1f99e8e93776c593c468e2612985'
          '505e0e4abfc746cae9558584d471a03c')
-sha256sums=('c4f5a63290c0c32d8d9899edee8188d0c8ab124a7199b154fac75e62eec35f7f'
+sha256sums=('d97dd918a88a4449225998f46aafa85216a3f89163a3411830d6890507ffae93'
             '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
             '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
diff --git a/extra/postgresql/postgresql.confd b/extra/postgresql/postgresql.confd
deleted file mode 100644
index 6001c16d1..000000000
--- a/extra/postgresql/postgresql.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-##
-## Parameters to be passed to postgresql
-##
-## Default data directory location
-#PGROOT="/var/lib/postgres"
-## Passed to initdb if necessary
-INITOPTS="--locale en_US.UTF-8"
-## Default log file location
-#PGLOG="/var/log/postgresql.log"
-## Additional options to pass via pg_ctl's '-o' option
-#PGOPTS=""
diff --git a/extra/postgresql/postgresql.rcd b/extra/postgresql/postgresql.rcd
deleted file mode 100755
index f3600b30b..000000000
--- a/extra/postgresql/postgresql.rcd
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/postgresql
-
-# Default PGROOT if it wasn't defined in the conf.d file
-PGROOT=${PGROOT:-/var/lib/postgres}
-PGLOG=${PGLOG:-/var/log/postgresql.log}
-PGCTL_BIN=/usr/bin/pg_ctl
-PGCTL_ARGS=(-D "$PGROOT/data" -l "$PGLOG" -s -w)
-[[ $PGOPTS ]] && PGCTL_ARGS+=(-o "$PGOPTS")
-
-postgres_init() {
-  # initialization
-  if [[ ! -d "$PGROOT/data" ]]; then
-    mkdir -p "$PGROOT/data" && chown -R postgres:postgres "$PGROOT"
-    su - postgres -c "/usr/bin/initdb $INITOPTS -D '$PGROOT/data'"
-  fi
-  if [[ ! -e "$PGLOG" ]]; then
-    touch "$PGLOG"
-    chown postgres "$PGLOG"
-  fi
-}
-
-do_postgres() {
-  su - postgres -c "'$PGCTL_BIN' $(printf '%q ' "${PGCTL_ARGS[@]}" "$@")"
-}
-
-case $1 in
-  start)
-    postgres_init
-    stat_busy "Starting PostgreSQL"
-    if do_postgres start; then
-      add_daemon postgresql
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping PostgreSQL"
-    if do_postgres stop -m fast; then
-      rm_daemon postgresql
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  reload)
-    stat_busy "Reloading PostgreSQL"
-    if do_postgres reload; then
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    postgres_init
-    stat_busy "Restarting PostgreSQL"
-    if do_postgres restart -m fast; then
-      add_daemon postgresql
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  status)
-    stat_busy "Checking PostgreSQL status";
-    ck_status postgresql
-    ;;
-  *)
-    echo "usage: $0 {start|stop|reload|restart|status}"
-    exit 1
-esac
diff --git a/extra/potrace/PKGBUILD b/extra/potrace/PKGBUILD
index 48f6111a7..370447a21 100644
--- a/extra/potrace/PKGBUILD
+++ b/extra/potrace/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 135877 2011-08-20 01:28:52Z bisson $
+# $Id: PKGBUILD 178385 2013-02-21 05:07:45Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=potrace
-pkgver=1.10
-pkgrel=1.1
+pkgver=1.11
+pkgrel=1
 pkgdesc='Utility for tracing a bitmap (input: PBM,PGM,PPM,BMP; output: EPS,PS,PDF,SVG,DXF,PGM,Gimppath,XFig)'
 url='http://potrace.sourceforge.net/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('zlib')
 options=('!libtool')
 source=("http://potrace.sourceforge.net/download/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('e6e8b64d85d30b4695d197a79187ac98c2b236f9')
+sha1sums=('7296baf27bf35298263cb3ed3df34a38fed0b441')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --mandir=/usr/share/man --with-libpotrace
+
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--with-libpotrace \
+		--disable-static \
+
 	make
 }
 
diff --git a/extra/ppl/PKGBUILD b/extra/ppl/PKGBUILD
new file mode 100644
index 000000000..db6a759a3
--- /dev/null
+++ b/extra/ppl/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 181214 2013-04-02 13:01:46Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: ezzetabi <ezzetabi at gawab dot com>
+
+pkgname=ppl
+pkgver=1.0
+pkgrel=1.1
+pkgdesc="A modern library for convex polyhedra and other numerical abstractions."
+arch=('i686' 'x86_64')
+url="http://bugseng.com/products/ppl"
+license=('GPL3')
+depends=('gmp>=5.0')
+options=('!docs' '!libtool')
+source=(http://bugseng.com/products/ppl/download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz{,.sign})
+md5sums=('c4566928c6b7bb63e95f96d1a7b5cb4c'
+         '5f490df826c76fed296060ca8fca4eb5')
+
+build() {
+  cd $srcdir/ppl-$pkgver
+  ./configure --prefix=/usr --enable-interfaces="c,cxx"
+  make
+}
+
+check() {
+  cd $srcdir/ppl-$pkgver
+  make check
+}
+
+package() {
+  cd $srcdir/ppl-$pkgver
+  make DESTDIR=$pkgdir install
+}
+
diff --git a/extra/prison/PKGBUILD b/extra/prison/PKGBUILD
index fdd1519d4..b1f1c3d5c 100644
--- a/extra/prison/PKGBUILD
+++ b/extra/prison/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 133482 2011-07-28 15:01:26Z andrea $
+# $Id: PKGBUILD 178975 2013-03-01 10:22:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=prison
 pkgver=1.0
-pkgrel=1.1
+pkgrel=2
 pkgdesc="A barcode API to produce QRCode barcodes and DataMatrix barcodes"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.kde.org"
+url='https://projects.kde.org/projects/kdesupport/prison'
 license=('GPL')
-depends=('qt' 'libdmtx' 'qrencode')
+depends=('qt4' 'libdmtx' 'qrencode')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.gz")
 md5sums=('8baac61506e37a31482a0df4a5d02cd2')
 
 build() {
-  cd "${srcdir}"
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -24,6 +25,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD
deleted file mode 100644
index 801981082..000000000
--- a/extra/proftpd/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 165550 2012-08-23 12:54:55Z andrea $
-# Maintainer:
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=proftpd
-pkgver=1.3.4b
-pkgrel=3
-epoch=1
-pkgdesc="A high-performance, scalable FTP server"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.proftpd.org/"
-license=('GPL')
-depends=('libmysqlclient' 'postgresql-libs')
-backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
-install=${pkgname}.install
-source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc}
-        'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service'
-        'proftpd.tmpfiles')
-md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2'
-         'e5b9bd78029a15f82994efcb7ed2e9fb'
-         'c439a0a1dbc21b604d8382da87aa021b'
-         'ddb09eb13131becdf0e081eef413116b'
-         '71d5932b0461c318ed68c2c0c2660736'
-         '5709f27ebcbe906e52963ea75e4fde64'
-         '907b149a120b046f05647c73502e23c9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-    --libexecdir=/usr/lib \
-    --disable-pam \
-    --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \
-    --sysconfdir=/etc \
-    --localstatedir=/run/proftpd \
-    --enable-ctrls \
-    --enable-ipv6 \
-    --with-includes=/usr/include/mysql:/usr/include/postgresql \
-    --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \
-    --enable-nls \
-    --with-systemd
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf"
-
-  install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd"
-  install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd"
-  install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd"
-  install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats"
-
-  install -d "${pkgdir}/usr/lib/systemd/system/"
-  install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/"
-  install -Dm644 "${srcdir}"/proftpd.tmpfiles \
-    "${pkgdir}"/usr/lib/tmpfiles.d/proftpd.conf
-
-  # /run is tmpfs
-  rmdir "${pkgdir}"/run/{proftpd,}
-}
diff --git a/extra/proftpd/proftpd b/extra/proftpd/proftpd
deleted file mode 100755
index 9ea1d47fc..000000000
--- a/extra/proftpd/proftpd
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-PROFTPD_ARGS=
-[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting ProFTPd Server"
-    /usr/sbin/proftpd ${PROFTPD_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon proftpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ProFTPd Server"
-    [ -f /run/proftpd/proftpd.pid ] && kill $(cat /run/proftpd/proftpd.pid) &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /run/proftpd/proftpd.pid
-      rm_daemon proftpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
diff --git a/extra/proftpd/proftpd.conf.d b/extra/proftpd/proftpd.conf.d
deleted file mode 100644
index 1a5a8a201..000000000
--- a/extra/proftpd/proftpd.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to proftpd
-#
-PROFTPD_ARGS=""
diff --git a/extra/proftpd/proftpd.install b/extra/proftpd/proftpd.install
deleted file mode 100644
index 6d9888496..000000000
--- a/extra/proftpd/proftpd.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_install() {
-  systemd-tmpfiles --create proftpd.conf
-}
diff --git a/extra/proftpd/proftpd.logrotate b/extra/proftpd/proftpd.logrotate
deleted file mode 100644
index 7b6d7a87b..000000000
--- a/extra/proftpd/proftpd.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/xferlog {
-   postrotate
-      /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/extra/proftpd/proftpd.service b/extra/proftpd/proftpd.service
deleted file mode 100644
index a07d17f46..000000000
--- a/extra/proftpd/proftpd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=ProFTPD FTP Server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/proftpd/proftpd.pid
-ExecStart=/usr/sbin/proftpd
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy = multi-user.target
diff --git a/extra/proftpd/proftpd.tmpfiles b/extra/proftpd/proftpd.tmpfiles
deleted file mode 100644
index 241dc7cb1..000000000
--- a/extra/proftpd/proftpd.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/proftpd 0755 root root
diff --git a/extra/psi/PKGBUILD b/extra/psi/PKGBUILD
deleted file mode 100644
index aa256bc97..000000000
--- a/extra/psi/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167954 2012-10-04 05:36:54Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=psi
-pkgver=0.15
-pkgrel=1
-pkgdesc='Instant messaging application designed for the Jabber IM'
-url='http://psi-im.org/'
-license=('GPL')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('qca-ossl' 'qca-gnupg' 'enchant' 'libxss' 'xdg-utils')
-makedepends=('icu')
-install='psi.install'
-source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2"
-        'archlinux.patch')
-md5sums=('aea15f17cf93e7cea52f305523f761be'
-         '2ed44ef84007b5b7f9a3f0a4f5f6a86d')
-
-build() {
-	cd ${srcdir}/psi-${pkgver}
-	patch -p0 -i ${srcdir}/archlinux.patch
-	./configure --prefix=/usr --release --no-separate-debug-info
-	make
-}
-
-package() {
-	cd ${srcdir}/psi-${pkgver}
-	make INSTALL_ROOT=${pkgdir} install
-	rm -rf ${pkgdir}/usr/share/psi/certs/
-}
diff --git a/extra/psi/affiliationlistconfigmuc.patch b/extra/psi/affiliationlistconfigmuc.patch
deleted file mode 100644
index dd9119e78..000000000
--- a/extra/psi/affiliationlistconfigmuc.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-commit ef1df7a42e7aa7b6bfb1dca5b86b303f71739fc4
-Author: Rion <rion4ik@gmail.com>
-Date:   Fri Dec 3 16:39:56 2010 +0500
-
-    Fixed changing affiliations list from muc config dialog
-
-diff --git a/src/mucaffiliationsview.cpp b/src/mucaffiliationsview.cpp
-index 8632c43..94adcec 100644
---- a/src/mucaffiliationsview.cpp
-+++ b/src/mucaffiliationsview.cpp
-@@ -33,30 +33,6 @@ MUCAffiliationsView::MUCAffiliationsView(QWidget* parent) : QTreeView(parent)
- 	setDropIndicatorShown(true);
- }
- 
--bool MUCAffiliationsView::addToCurrent(const QString& j)
--{	
--	QModelIndex index = currentIndex();
--	if (!index.isValid())
--		return false;
--
--	if (index.parent().isValid())
--		index = index.parent();
--		
--	if (!index.parent().isValid()) {
--		XMPP::Jid jid(j);
--		if (!jid.isValid())
--			return false;
--
--		// TODO: Check if the user is already in the list
--		
--		int row = model()->rowCount(index);
--		model()->insertRows(row,1,index);
--		model()->setData(model()->index(row,0,index),QVariant(jid.bare()));
--		return true;
--	}
--	return false;
--}
--
- void MUCAffiliationsView::removeCurrent()
- {
- 	QModelIndex index = currentIndex();
-diff --git a/src/mucaffiliationsview.h b/src/mucaffiliationsview.h
-index 11f1446..54ee0ff 100644
---- a/src/mucaffiliationsview.h
-+++ b/src/mucaffiliationsview.h
-@@ -32,7 +32,6 @@ public:
- 
- public slots:
- 	void removeCurrent();
--	bool addToCurrent(const QString&);
- 
- signals:
- 	void addEnabled(bool);
-diff --git a/src/mucconfigdlg.cpp b/src/mucconfigdlg.cpp
-index a10f14e..dcf4a35 100644
---- a/src/mucconfigdlg.cpp
-+++ b/src/mucconfigdlg.cpp
-@@ -158,9 +158,31 @@ void MUCConfigDlg::add()
- {
- 	bool ok;
- 	QString text = QInputDialog::getText(this, tr("Add affiliation"), tr("Enter the JID of the user:"), QLineEdit::Normal, "", &ok);
--	if (ok) {
--	   if (text.isEmpty() || !ui_.tv_affiliations->addToCurrent(text))
--		   QMessageBox::critical(this, tr("Error"), tr("You have entered an invalid JID."));
-+	if (ok && ui_.tv_affiliations->currentIndex().isValid()) {
-+		if (!text.isEmpty()) {
-+
-+			QModelIndex index = affiliations_proxy_model_->mapToSource(ui_.tv_affiliations->currentIndex());
-+
-+			if (index.parent().isValid())
-+				index = index.parent();
-+
-+			if (!index.parent().isValid()) {
-+				XMPP::Jid jid(text);
-+				if (jid.isValid()) {
-+
-+					// TODO: Check if the user is already in the list
-+
-+					int row = affiliations_model_->rowCount(index);
-+					affiliations_model_->insertRows(row,1,index);
-+					QModelIndex newIndex = affiliations_model_->index(row,0,index);
-+					affiliations_model_->setData(newIndex, QVariant(jid.bare()));
-+					ui_.tv_affiliations->setCurrentIndex(affiliations_proxy_model_->mapFromSource(newIndex));
-+					return;
-+				}
-+			}
-+		}
-+
-+		QMessageBox::critical(this, tr("Error"), tr("You have entered an invalid JID."));
- 	}
- }
- 
diff --git a/extra/psi/archlinux.patch b/extra/psi/archlinux.patch
deleted file mode 100644
index d9cbb454b..000000000
--- a/extra/psi/archlinux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/systeminfo.cpp	2012-10-04 02:53:03.000000000 +0200
-+++ src/systeminfo.cpp	2012-10-04 07:18:45.111088591 +0200
-@@ -114,7 +114,7 @@
- 		{ LinuxSlackware,	OsAppendFile,	"/etc/slackware-version",	"Slackware Linux"	},
- 		{ LinuxPLD,		OsUseFile,	"/etc/pld-release",		"PLD Linux"		},
- 		{ LinuxAurox,		OsUseName,	"/etc/aurox-release",		"Aurox Linux"		},
--		{ LinuxArch,		OsUseFile,	"/etc/arch-release",		"Arch Linux"		},
-+		{ LinuxArch,		OsUseName,	"/etc/arch-release",		"Arch Linux"		},
- 		{ LinuxLFS,		OsAppendFile,	"/etc/lfs-release",		"LFS Linux"		},
- 
- 		// untested
diff --git a/extra/psi/configureroomcrash.patch b/extra/psi/configureroomcrash.patch
deleted file mode 100644
index 99fa30794..000000000
--- a/extra/psi/configureroomcrash.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit ec91add0e6398ad20c7a8f14a1a08c5e3282c5bd
-Author: Michail Pishchagin <mblsha@users.sourceforge.net>
-Date:   Tue Oct 19 11:26:31 2010 +0400
-
-    Fix crash in MUCAffiliationsModel on Qt 4.7 (closes #1087)
-    Based on 1610-psi-fix-crash-in-muc-configurator.diff from Psi+
-
-diff --git a/src/mucaffiliationsmodel.cpp b/src/mucaffiliationsmodel.cpp
-index 722b762..fd0a830 100644
---- a/src/mucaffiliationsmodel.cpp
-+++ b/src/mucaffiliationsmodel.cpp
-@@ -150,15 +150,18 @@ void MUCAffiliationsModel::resetAffiliationLists()
- 
- void MUCAffiliationsModel::resetAffiliationList(MUCItem::Affiliation a)
- {
-+	emit layoutAboutToBeChanged();
- 	enabled_[(AffiliationListIndex) affiliationToIndex(a)] = false;
- 	QModelIndex index = affiliationListIndex(a);
- 	if (hasChildren(index)) {
- 		removeRows(0,rowCount(index),index);
- 	}
-+	emit layoutChanged();
- }
- 
- void MUCAffiliationsModel::setAffiliationListEnabled(MUCItem::Affiliation a, bool b)
- {
-+	emit layoutAboutToBeChanged();
- 	QModelIndex index = affiliationListIndex(a);
- 	enabled_[(AffiliationListIndex) index.row()] = b;
- 	emit layoutChanged();
-@@ -208,6 +211,9 @@ void MUCAffiliationsModel::addItems(const QList<MUCItem>& items)
- 	foreach(MUCItem item, items) {
- 		QModelIndex list = affiliationListIndex(item.affiliation());
- 		if (list.isValid() && !item.jid().isEmpty()) {
-+			if (!dirty) {
-+				emit layoutAboutToBeChanged();
-+			}
- 			int row = rowCount(list);
- 			if (row == 0) {
- 				enabled_[(AffiliationListIndex) list.row()] = true;
diff --git a/extra/psi/gcc-47.patch b/extra/psi/gcc-47.patch
deleted file mode 100644
index 64cb83fba..000000000
--- a/extra/psi/gcc-47.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- iris/src/irisnet/corelib/netinterface_unix.cpp.orig	2012-01-07 19:46:39.493999646 +0100
-+++ iris/src/irisnet/corelib/netinterface_unix.cpp	2012-01-07 19:46:57.251002321 +0100
-@@ -33,6 +33,7 @@
- #include <net/route.h>
- #include <netinet/in.h>
- #include <errno.h>
-+#include <unistd.h>
- 
- // for solaris
- #ifndef SIOCGIFCONF
diff --git a/extra/psi/input-validation.patch b/extra/psi/input-validation.patch
deleted file mode 100644
index 7260c80e1..000000000
--- a/extra/psi/input-validation.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-commit c68fdd9926a38b2820bc5df97fd1905355a2640d
-Author: rion <rion4ik@gmail.com>
-Date:   Fri Oct 7 22:19:05 2011 +0600
-
-    Fixed QLabel CVE
-
---- src/Certificates/CertificateDisplay.ui	2011-10-19 08:30:15 +0000
-+++ src/Certificates/CertificateDisplay.ui	2011-10-19 08:31:23 +0000
-@@ -1,105 +1,118 @@
--<ui version="4.0" >
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-  <class>CertificateDisplay</class>
-- <widget class="QDialog" name="CertificateDisplay" >
--  <property name="geometry" >
-+ <widget class="QDialog" name="CertificateDisplay">
-+  <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
--    <width>518</width>
-+    <width>525</width>
-     <height>369</height>
-    </rect>
-   </property>
--  <property name="windowTitle" >
-+  <property name="windowTitle">
-    <string>Certificate Information</string>
-   </property>
--  <layout class="QVBoxLayout" >
--   <property name="margin" >
-+  <layout class="QVBoxLayout">
-+   <property name="spacing">
-+    <number>6</number>
-+   </property>
-+   <property name="margin">
-     <number>11</number>
-    </property>
--   <property name="spacing" >
--    <number>6</number>
--   </property>
-    <item>
--    <layout class="QHBoxLayout" >
--     <property name="margin" >
-+    <layout class="QHBoxLayout">
-+     <property name="spacing">
-+      <number>6</number>
-+     </property>
-+     <property name="margin">
-       <number>0</number>
-      </property>
--     <property name="spacing" >
--      <number>6</number>
--     </property>
-      <item>
--      <layout class="QVBoxLayout" >
--       <property name="margin" >
-+      <layout class="QVBoxLayout">
-+       <property name="spacing">
-+        <number>6</number>
-+       </property>
-+       <property name="margin">
-         <number>0</number>
-        </property>
--       <property name="spacing" >
--        <number>6</number>
--       </property>
-        <item>
--        <widget class="QLabel" name="textLabel4" >
--         <property name="text" >
-+        <widget class="QLabel" name="textLabel4">
-+         <property name="text">
-           <string>Certificate Validation:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
--        <widget class="QLabel" name="lb_valid" >
--         <property name="text" >
-+        <widget class="QLabel" name="lb_valid">
-+         <property name="text">
-           <string/>
-          </property>
-+         <property name="textFormat">
-+          <enum>Qt::PlainText</enum>
-+         </property>
-         </widget>
-        </item>
-        <item>
--        <widget class="QLabel" name="textLabel2" >
--         <property name="text" >
-+        <widget class="QLabel" name="textLabel2">
-+         <property name="text">
-           <string>Valid From:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
--        <widget class="QLabel" name="lb_notBefore" >
--         <property name="text" >
-+        <widget class="QLabel" name="lb_notBefore">
-+         <property name="text">
-           <string/>
-          </property>
-+         <property name="textFormat">
-+          <enum>Qt::PlainText</enum>
-+         </property>
-         </widget>
-        </item>
-        <item>
--        <widget class="QLabel" name="textLabel3" >
--         <property name="text" >
-+        <widget class="QLabel" name="textLabel3">
-+         <property name="text">
-           <string>Valid Until:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
--        <widget class="QLabel" name="lb_notAfter" >
--         <property name="text" >
-+        <widget class="QLabel" name="lb_notAfter">
-+         <property name="text">
-           <string/>
-          </property>
-+         <property name="textFormat">
-+          <enum>Qt::PlainText</enum>
-+         </property>
-         </widget>
-        </item>
-        <item>
--        <widget class="QLabel" name="textLabel1" >
--         <property name="text" >
-+        <widget class="QLabel" name="textLabel1">
-+         <property name="text">
-           <string>Serial Number:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
--        <widget class="QLabel" name="lb_sn" >
--         <property name="text" >
-+        <widget class="QLabel" name="lb_sn">
-+         <property name="text">
-           <string/>
-          </property>
-+         <property name="textFormat">
-+          <enum>Qt::PlainText</enum>
-+         </property>
-         </widget>
-        </item>
-        <item>
-         <spacer>
--         <property name="orientation" >
-+         <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
--         <property name="sizeType" >
-+         <property name="sizeType">
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
--         <property name="sizeHint" >
-+         <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>106</height>
-@@ -110,14 +123,14 @@
-       </layout>
-      </item>
-      <item>
--      <widget class="QTextBrowser" name="tb_cert" >
--       <property name="minimumSize" >
-+      <widget class="QTextBrowser" name="tb_cert">
-+       <property name="minimumSize">
-         <size>
-          <width>350</width>
-          <height>300</height>
-         </size>
-        </property>
--       <property name="horizontalScrollBarPolicy" >
-+       <property name="horizontalScrollBarPolicy">
-         <enum>Qt::ScrollBarAlwaysOff</enum>
-        </property>
-       </widget>
-@@ -125,35 +138,35 @@
-     </layout>
-    </item>
-    <item>
--    <widget class="Line" name="line1" >
--     <property name="frameShape" >
-+    <widget class="Line" name="line1">
-+     <property name="frameShape">
-       <enum>QFrame::HLine</enum>
-      </property>
--     <property name="frameShadow" >
-+     <property name="frameShadow">
-       <enum>QFrame::Sunken</enum>
-      </property>
--     <property name="orientation" >
-+     <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-     </widget>
-    </item>
-    <item>
--    <layout class="QHBoxLayout" >
--     <property name="margin" >
-+    <layout class="QHBoxLayout">
-+     <property name="spacing">
-+      <number>6</number>
-+     </property>
-+     <property name="margin">
-       <number>0</number>
-      </property>
--     <property name="spacing" >
--      <number>6</number>
--     </property>
-      <item>
-       <spacer>
--       <property name="orientation" >
-+       <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
--       <property name="sizeType" >
-+       <property name="sizeType">
-         <enum>QSizePolicy::Expanding</enum>
-        </property>
--       <property name="sizeHint" >
-+       <property name="sizeHint" stdset="0">
-         <size>
-          <width>421</width>
-          <height>20</height>
-@@ -162,17 +175,17 @@
-       </spacer>
-      </item>
-      <item>
--      <widget class="QPushButton" native="1" name="pb_close">
--	    <property name="text">
--		  <string>Close</string>
--		</property>
--	  </widget>
-+      <widget class="QPushButton" name="pb_close">
-+       <property name="text">
-+        <string>Close</string>
-+       </property>
-+      </widget>
-      </item>
-     </layout>
-    </item>
-   </layout>
-  </widget>
-- <layoutdefault spacing="6" margin="11" />
-+ <layoutdefault spacing="6" margin="11"/>
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
-  <tabstops>
-   <tabstop>tb_cert</tabstop>
-
diff --git a/extra/psi/psi.install b/extra/psi/psi.install
deleted file mode 100644
index 464d2e625..000000000
--- a/extra/psi/psi.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/psiconv/PKGBUILD b/extra/psiconv/PKGBUILD
index 4d47b2ad5..fc389f1c1 100644
--- a/extra/psiconv/PKGBUILD
+++ b/extra/psiconv/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175861 2013-01-23 00:12:52Z eric $
+# $Id: PKGBUILD 180313 2013-03-20 02:35:34Z eric $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=psiconv
 pkgver=0.9.8
-pkgrel=11
+pkgrel=12
 pkgdesc="Converts Psion 5(MX) files to more commonly used file formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://software.frodo.looijaard.name/psiconv/"
diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD
index 93b16da0e..6e4ad04c3 100644
--- a/extra/pstoedit/PKGBUILD
+++ b/extra/pstoedit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 175857 2013-01-23 00:12:48Z eric $
+# $Id: PKGBUILD 180314 2013-03-20 02:35:35Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tobias Powalowski <t.powa@gmx.de>
 
 pkgname=pstoedit
-pkgver=3.60
-pkgrel=4
+pkgver=3.61
+pkgrel=1
 pkgdesc="Translates PostScript and PDF graphics into other vector formats"
 arch=("i686" "x86_64" 'mips64el')
 url="http://www.pstoedit.net/"
@@ -13,11 +13,8 @@ license=('GPL')
 depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick')
 makedepends=('ghostscript')
 options=('!libtool' '!makeflags')
-source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz"
-	'pstoedit-3.50-parallel.patch'	'pstoedit-3.50-plugin-close.patch')
-sha1sums=('649ade3d873429548eb6dd9f3e13cb79a8d6a1a2'
-          '6e278b164d3e59fbb11e7fd5ae8ffb038932d69a'
-          '54bbe019de66eb4cb8525371462595d21fbd074e')
+source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz")
+sha1sums=('426f3746ecb441caa0db401d5880e1ac04a399d5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/pstoedit/pstoedit-3.50-parallel.patch b/extra/pstoedit/pstoedit-3.50-parallel.patch
deleted file mode 100644
index 4f1f73b04..000000000
--- a/extra/pstoedit/pstoedit-3.50-parallel.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d6178df..66f377b 100755
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -86,6 +86,7 @@ libp2edrvstd_la_SOURCES=			\
-         $(sample_drivers_src)                   
- libp2edrvstd_la_LIBADD=-L. libpstoedit.la
- libp2edrvstd_la_LDFLAGS=-no-undefined -module
-+libp2edrvstd_la_DEPENDENCIES = libpstoedit.la
- 
- #libp2edrvplugins_la_SOURCES=drvmif.cpp drvcgm.cpp drvrtf.cpp drvwwmf.cpp
- #libp2edrvplugins_la_LIBADD=
-@@ -95,15 +96,18 @@ libp2edrvstd_la_LDFLAGS=-no-undefined -module
- libp2edrvlplot_la_SOURCES=drvlplot.cpp drvlplot.h initlibrary.cpp
- libp2edrvlplot_la_LIBADD=$(LIBPLOTTER_LDFLAGS) -L. libpstoedit.la
- libp2edrvlplot_la_LDFLAGS=-no-undefined -module
-+libp2edrvlplot_la_DEPENDENCIES = libpstoedit.la
- 
- libp2edrvswf_la_SOURCES=drvswf.cpp drvswf.h initlibrary.cpp
- libp2edrvswf_la_LIBADD=$(LIBMING_LDFLAGS) -L. libpstoedit.la
- libp2edrvswf_la_LDFLAGS=-no-undefined -module
-+libp2edrvswf_la_DEPENDENCIES = libpstoedit.la
- 
- # note the __ stand for ++ - automake treats all no alphanums chars as _
- libp2edrvmagick___la_SOURCES=drvmagick++.cpp drvmagick++.h initlibrary.cpp
- libp2edrvmagick___la_LIBADD=-L. libpstoedit.la
- libp2edrvmagick___la_LDFLAGS=-no-undefined ${LIBMAGICK_LDFLAGS}  -module
-+libp2edrvmagick___la_DEPENDENCIES = libpstoedit.la
- # moved to configure.ac because needed only for g++ libp2edrvmagick___la_CPPFLAGS=$(LIBMAGICK_CFLAGS) $(AM_CPPFLAGS) -Wno-long-long
- 
- if USE_EMFBYSOURCE
-@@ -113,6 +117,7 @@ else
- libp2edrvwmf_la_SOURCES=drvwmf.cpp drvwmf.h initlibrary.cpp
- libp2edrvwmf_la_LDFLAGS=-no-undefined $(LIBEMF_LDFLAGS) -L. libpstoedit.la -module
- endif
-+libp2edrvwmf_la_DEPENDENCIES = libpstoedit.la
- 
- libpstoedit_la_SOURCES =			\
- 	dynload.cpp dynload.h			\
-@@ -135,6 +140,7 @@ libpstoedit_la_LDFLAGS = -no-undefined
- 
- pstoedit_SOURCES = cmdmain.cpp
- pstoedit_LDFLAGS = -no-undefined -L. libpstoedit.la ${LIBLD_LDFLAGS}
-+pstoedit_DEPENDENCIES = libpstoedit.la
- 
- pkginclude_HEADERS =				\
- 	pstoedit.h				\
diff --git a/extra/pstoedit/pstoedit-3.50-plugin-close.patch b/extra/pstoedit/pstoedit-3.50-plugin-close.patch
deleted file mode 100644
index 6787d6aef..000000000
--- a/extra/pstoedit/pstoedit-3.50-plugin-close.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugzilla.redhat.com/507035
-
-diff --git a/src/dynload.cpp b/src/dynload.cpp
-index c0db355..7c073ef 100644
---- a/src/dynload.cpp
-+++ b/src/dynload.cpp
-@@ -147,7 +147,6 @@ void DynLoader::close()
- 
- DynLoader::~DynLoader()
- {
--	close();
- 	libname=0;
- }
- 
diff --git a/extra/psutils/PKGBUILD b/extra/psutils/PKGBUILD
deleted file mode 100644
index e5c9af4ae..000000000
--- a/extra/psutils/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 137768 2011-09-10 17:03:05Z pierre $
-# Maintainer: eric <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
- 
-pkgname=psutils
-pkgver=1.17
-pkgrel=3
-arch=('i686' 'x86_64')
-pkgdesc="A set of postscript utilities"
-url="http://www.tardis.ed.ac.uk/~ajcd/psutils/index.html"
-license=('custom')
-depends=('glibc' 'ghostscript')
-provides=('psutils-lprng')
-replaces=('psutils-lprng')
-options=('!makeflags')
-source=("ftp://ftp.archlinux.org/other/psutils/${pkgname}-${pkgver}.tar.gz"
-        'psutils-1.17.diff')
-md5sums=('b161522f3bd1507655326afa7db4a0ad'
-         '2b49e9e796000b42f42804d4b50a2be1')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  patch -Np1 -i "${srcdir}/psutils-1.17.diff"
-  make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \
-    INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \
-    MANDIR="${pkgdir}/usr/share/man/man1"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  install -d -m755 "${pkgdir}/usr/include"
-  install -d -m755 "${pkgdir}/usr/share/man"
-  make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \
-    INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \
-    MANDIR="${pkgdir}/usr/share/man/man1" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/extra/psutils/psutils-1.17.diff b/extra/psutils/psutils-1.17.diff
deleted file mode 100644
index 4af32bd7f..000000000
--- a/extra/psutils/psutils-1.17.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -u -r --new-file psutils.orig/Makefile.unix psutils/Makefile.unix
---- psutils.orig/Makefile.unix	Tue Mar 11 14:52:59 1997
-+++ psutils/Makefile.unix	Thu Jan 18 20:53:36 2001
-@@ -19,16 +19,16 @@
- # psnup puts multiple logical pages on one physical page
- # psresize scales and moves pages to fit on different paper sizes
- 
--PAPER=a4
-+PAPER=letter
- 
- # Makefile for PSUtils under Unix
- 
- OS = UNIX
- 
--BINDIR = /usr/local/bin
-+BINDIR = /usr/bin
- SCRIPTDIR = $(BINDIR)
--INCLUDEDIR = /usr/local/share/psutils
--PERL = /usr/local/bin/perl
-+INCLUDEDIR = /usr/share/psutils
-+PERL = /usr/bin/perl
- 
- BINMODE = 0755
- MANMODE = 0644
-@@ -36,7 +36,7 @@
- INSTALL = install -c -m $(BINMODE)
- INSTALLMAN = install -c -m $(MANMODE)
- MANEXT = 1
--MANDIR = /usr/local/share/man/man$(MANEXT)
-+MANDIR = /usr/man/man$(MANEXT)
- 
- CC = gcc
- CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
diff --git a/extra/ptlib/PKGBUILD b/extra/ptlib/PKGBUILD
index b2897cf99..896725a0c 100644
--- a/extra/ptlib/PKGBUILD
+++ b/extra/ptlib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 172101 2012-11-28 10:32:09Z jgc $
+# $Id: PKGBUILD 178389 2013-02-21 05:32:58Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=ptlib
-pkgver=2.10.9
+pkgver=2.10.10
 pkgrel=1
 pkgdesc="Portable Windows Library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('sdl' 'libpulse' 'v4l-utils' 'libldap')
 replaces=('pwlib')
 conflicts=('pwlib')
 source=(http://ftp.gnome.org/pub/GNOME/sources/ptlib/${pkgver%.*}/ptlib-$pkgver.tar.xz)
-sha256sums=('d948e326ce238880ce9b52f9f0cd76a4897618e17cc08a347e4a713f36a575fe')
+sha256sums=('7fcaabe194cbd3bc0b370b951dffd19cfe7ea0298bfff6aecee948e97f3207e4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch b/extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch
deleted file mode 100644
index 93167b79b..000000000
--- a/extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 45607b113a052e4bec93a8707dc4db113c5dd100 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Sat, 26 May 2012 02:58:11 +0200
-Subject: [PATCH] Remove usage of deprecated udev_get_*_path
-
-These symbols were removed in libudev.so.1.0.0. Replace them with
-hardcoded strings.
-
-Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
----
- src/modules/module-udev-detect.c |    9 +++------
- src/modules/udev-util.c          |    4 ++--
- 2 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c
-index 1192194..31416bd 100644
---- a/src/modules/module-udev-detect.c
-+++ b/src/modules/module-udev-detect.c
-@@ -123,7 +123,7 @@ static char *card_get_sysattr(const char *card_idx, const char *name) {
-         goto finish;
-     }
- 
--    t = pa_sprintf_malloc("%s/class/sound/card%s", udev_get_sys_path(udev), card_idx);
-+    t = pa_sprintf_malloc("/sys/class/sound/card%s", card_idx);
-     card = udev_device_new_from_syspath(udev, t);
-     pa_xfree(t);
- 
-@@ -282,7 +282,7 @@ static void verify_access(struct userdata *u, struct device *d) {
-     pa_assert(u);
-     pa_assert(d);
- 
--    cd = pa_sprintf_malloc("%s/snd/controlC%s", udev_get_dev_path(u->udev), path_get_card_id(d->path));
-+    cd = pa_sprintf_malloc("/dev/snd/controlC%s", path_get_card_id(d->path));
-     accessible = access(cd, R_OK|W_OK) >= 0;
-     pa_log_debug("%s is accessible: %s", cd, pa_yes_no(accessible));
- 
-@@ -621,7 +621,6 @@ fail:
- }
- 
- static int setup_inotify(struct userdata *u) {
--    char *dev_snd;
-     int r;
- 
-     if (u->inotify_fd >= 0)
-@@ -632,9 +631,7 @@ static int setup_inotify(struct userdata *u) {
-         return -1;
-     }
- 
--    dev_snd = pa_sprintf_malloc("%s/snd", udev_get_dev_path(u->udev));
--    r = inotify_add_watch(u->inotify_fd, dev_snd, IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF);
--    pa_xfree(dev_snd);
-+    r = inotify_add_watch(u->inotify_fd, "/dev/snd", IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF);
- 
-     if (r < 0) {
-         int saved_errno = errno;
-diff --git a/src/modules/udev-util.c b/src/modules/udev-util.c
-index 2f18bc4..b0bb17d 100644
---- a/src/modules/udev-util.c
-+++ b/src/modules/udev-util.c
-@@ -180,7 +180,7 @@ int pa_udev_get_info(int card_idx, pa_proplist *p) {
-         goto finish;
-     }
- 
--    t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx);
-+    t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx);
-     card = udev_device_new_from_syspath(udev, t);
-     pa_xfree(t);
- 
-@@ -277,7 +277,7 @@ char* pa_udev_get_property(int card_idx, const char *name) {
-         goto finish;
-     }
- 
--    t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx);
-+    t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx);
-     card = udev_device_new_from_syspath(udev, t);
-     pa_xfree(t);
- 
--- 
-1.7.10.2
-
diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index 92aff71f9..70575cf3a 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173315 2012-12-18 20:30:41Z heftig $
+# $Id: PKGBUILD 181159 2013-04-01 19:36:12Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -8,7 +8,7 @@ pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse)
 pkgdesc="A featureful, general-purpose sound server"
 pkgver=3.0
-pkgrel=2
+pkgrel=3
 arch=(i686 x86_64 mips64el)
 url="http://www.freedesktop.org/wiki/Software/PulseAudio"
 license=(GPL LGPL)
@@ -58,6 +58,10 @@ package_pulseaudio() {
   cd $pkgbase-$pkgver
   make -j1 DESTDIR="$pkgdir" install
 
+  # Disable autospawn by default
+  sed -e '/autospawn/iautospawn=no' \
+      -i "$pkgdir/etc/pulse/client.conf"
+
   # Speed up pulseaudio shutdown
   # Lower resample quality, saves CPU
   sed -e '/exit-idle-time/iexit-idle-time=0' \
diff --git a/extra/pulseaudio/pulseaudio.install b/extra/pulseaudio/pulseaudio.install
index 0e599b856..9de8b0e8f 100755
--- a/extra/pulseaudio/pulseaudio.install
+++ b/extra/pulseaudio/pulseaudio.install
@@ -20,6 +20,15 @@ post_upgrade() {
     with changes to the packaged files in /etc/pulse/. Otherwise, PulseAudio
     may refuse to start due to configuration errors.
 MES
+  if (( $(vercmp $2 3.0-3) < 0 )); then
+    cat << MES
+
+>>> Autospawn is now disabled by default. If you need to run PulseAudio outside
+    of an X session, either:
+      - Enable autospawn in client.conf, or
+      - Start it manually by executing 'pulseaudio --start'
+MES
+  fi
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/purple-plugin-pack/PKGBUILD b/extra/purple-plugin-pack/PKGBUILD
index 21ac12113..a22e4ef5f 100644
--- a/extra/purple-plugin-pack/PKGBUILD
+++ b/extra/purple-plugin-pack/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=purple-plugin-pack
 pkgver=2.7.0
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="Compilation of plugins for the libpurple family of IM clients"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://www.guifications.org/projects/purple-plugin-pack"
diff --git a/extra/putty/PKGBUILD b/extra/putty/PKGBUILD
index 880aa82b3..d177db829 100644
--- a/extra/putty/PKGBUILD
+++ b/extra/putty/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=putty
 pkgver=0.62
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A terminal integrated SSH/Telnet client"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
diff --git a/extra/pyalpm/PKGBUILD b/extra/pyalpm/PKGBUILD
index c8d64320c..516b4cc6b 100644
--- a/extra/pyalpm/PKGBUILD
+++ b/extra/pyalpm/PKGBUILD
@@ -1,18 +1,22 @@
 # Maintainer : Rémy Oudompheng <remy@archlinux.org>
 
 pkgname=pyalpm
-pkgver=0.5.3
-pkgrel=2
+pkgver=0.6.1
+pkgrel=1
 pkgdesc="Libalpm bindings for Python 3"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.archlinux.org/users/remy/pyalpm.git/"
 license=('GPL')
-depends=('python>=3.2' 'pacman>=4')
+depends=('python>=3.2' 'pacman>=4.1')
 source=("ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz")
-md5sums=('a76019106d17de3a5933c773013a63d1')
+md5sums=('7310508a3b009705b77dd1d93b3012d9')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+
+  # workaround Python packaging issue (FS#34658)
+  export CFLAGS="$CFLAGS -Wno-format"
+
   python setup.py build
 }
 
diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD
index 3a1f1c750..644b3b6ab 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject/PKGBUILD
@@ -1,41 +1,39 @@
-# $Id: PKGBUILD 170844 2012-11-12 15:18:06Z heftig $
+# $Id: PKGBUILD 183322 2013-04-21 22:06:41Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=pygobject
 pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.4.2
+pkgver=3.8.1
 pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
+arch=(i686 x86_64 mips64el)
 url="https://live.gnome.org/PyGObject"
-license=('LGPL')
-makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection')
+license=(LGPL)
+makedepends=(python python2 python-cairo python2-cairo gobject-introspection)
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz)
 options=('!libtool')
-sha256sums=('2b87ef3170be3a20a53fbdb348ae4ecb41a72a17ec6531baa67147c3437d2aad')
+sha256sums=('e85c8ec64238ce88ec1e905497f5a2eaa947a7f4050e338d21ec510d8a50eacb')
+
+prepare() {
+  mkdir build-py2 build-py3 devel
+  cd ${pkgbase}-${pkgver}
+  sed -i '/Werror=format/d' configure # gcc 4.8
+}
 
 build() {
-  cp -a "$pkgbase-$pkgver" python2-build
-  mkdir devel
-
-  (
-    cd python2-build
-    export PYTHON=/usr/bin/python2
-    ./configure --prefix=/usr
-    make
-  )
-
-  (
-    cd "$pkgbase-$pkgver"
-    ./configure --prefix=/usr
-    make
-  )
+  cd build-py2
+  ../${pkgbase}-${pkgver}/configure --prefix=/usr --with-python=/usr/bin/python2
+  make
+
+  cd ../build-py3
+  ../${pkgbase}-${pkgver}/configure --prefix=/usr
+  make
 }
 
 package_python-gobject() {
   pkgdesc="Python 3 bindings for GObject"
   depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver")
 
-  cd "$pkgbase-$pkgver"
+  cd build-py3
   make DESTDIR="$pkgdir" install
   rm -r "$pkgdir"/usr/{include,lib/pkgconfig}
 }
@@ -44,7 +42,7 @@ package_python2-gobject() {
   pkgdesc="Python 2 bindings for GObject"
   depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver")
 
-  cd "python2-build"
+  cd build-py2
   make DESTDIR="$pkgdir" install
   mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel"
 }
diff --git a/extra/pygobject2/PKGBUILD b/extra/pygobject2/PKGBUILD
index 45c687042..030af8e0f 100644
--- a/extra/pygobject2/PKGBUILD
+++ b/extra/pygobject2/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=8
+pkgrel=8.1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pygtk.org/"
 license=('LGPL')
diff --git a/extra/pymad/PKGBUILD b/extra/pymad/PKGBUILD
deleted file mode 100644
index 2c145e71e..000000000
--- a/extra/pymad/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 150562 2012-02-18 14:43:39Z pierre $
-# Maintainer: Mark Rosenstand <mark@archlinux.org
-# Contributor: Corrado Primier <cp663137@stud.polimi.it>
-
-pkgname=pymad
-pkgver=0.6
-pkgrel=4
-pkgdesc="Python interface to libmad."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.spacepants.org/src/pymad/"
-license=('LGPL')
-depends=('libmad' 'python2')
-source=("http://www.spacepants.org/src/pymad/download/$pkgname-$pkgver.tar.gz")
-md5sums=('a1405fb4b610348565c8d0e400c5ff18')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  python2 config_unix.py --prefix=/usr
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/extra/pyopenssl/PKGBUILD b/extra/pyopenssl/PKGBUILD
index 7056b53f7..63ef2624f 100644
--- a/extra/pyopenssl/PKGBUILD
+++ b/extra/pyopenssl/PKGBUILD
@@ -5,7 +5,7 @@
 pkgbase=pyopenssl
 pkgname=('python-pyopenssl' 'python2-pyopenssl')
 pkgver=0.13
-pkgrel=2
+pkgrel=2.1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pypi.python.org/pypi/pyOpenSSL"
 license=('LGPL2.1')
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
index 441bdda15..ff4e2ca59 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 173040 2012-12-09 15:29:07Z andrea $
+# $Id: PKGBUILD 183563 2013-04-23 13:10:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
 
 pkgbase=pyqt
 pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-pkgver=4.9.6
+pkgver=4.10.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
-makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
+makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
              'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
 source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('514e1f9597771dc732ba75ba9fa5c6b6')
+md5sums=('e5973c4ec0b0469f329bc00209d2ad9c')
 
 build() {
   cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
@@ -21,7 +21,8 @@ build() {
   cd PyQt-x11-gpl-${pkgver}
   python configure.py \
     --confirm-license \
-    --qsci-api
+    --qsci-api \
+    -q /usr/bin/qmake-qt4
 
   # Thanks Gerardo for the rpath fix
   find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
@@ -33,22 +34,24 @@ build() {
   python2 configure.py \
     --confirm-license \
     -v /usr/share/sip \
-    --qsci-api
+    --qsci-api \
+    -q /usr/bin/qmake-qt4
 
   # Thanks Gerardo for the rpath fix
   find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
+  
   make
 }
 
 package_pyqt-common(){
   pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
+  depends=('qt4')
   
   cd PyQt-x11-gpl-${pkgver}
   make -C pyrcc DESTDIR="${pkgdir}" install
   make -C pylupdate DESTDIR="${pkgdir}" install
   
-  install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+  install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api
 }
 
 package_pyqt(){
@@ -64,7 +67,7 @@ package_pyqt(){
 
   # Provided by pyqt-common
   rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+  rm "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api
 }
 
 package_python2-pyqt(){
@@ -85,6 +88,6 @@ package_python2-pyqt(){
   
   # Provided by pyqt
   rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+  rm "${pkgdir}"/usr/lib/qt4/plugins/designer/libpythonplugin.so
+  rm "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api
 }
diff --git a/extra/pyqt/fix-pyuic4.patch b/extra/pyqt/fix-pyuic4.patch
deleted file mode 100644
index 2173443d8..000000000
--- a/extra/pyqt/fix-pyuic4.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-# HG changeset patch
-# User Phil Thompson <phil at riverbankcomputing.com>
-# Date 2012-07-13 13:39:28 +0100
-# Node ID 29b668ada14c1428a3bbfe8f0324c6626bd5ac9a
-# Parent  fd0f3da9d79ca9858d10a20c15fb85456cb832d7
-Fixed a regression in pyuic's handling of custom widgets.
-
-diff --git a/pyuic/uic/Compiler/qobjectcreator.py b/pyuic/uic/Compiler/qobjectcreator.py
---- a/pyuic/uic/Compiler/qobjectcreator.py
-+++ b/pyuic/uic/Compiler/qobjectcreator.py
-@@ -1,6 +1,6 @@
- #############################################################################
- ##
--## Copyright (C) 2011 Riverbank Computing Limited.
-+## Copyright (C) 2012 Riverbank Computing Limited.
- ## Copyright (C) 2006 Thorsten Marek.
- ## All right reserved.
- ##
-@@ -100,7 +100,6 @@
-         assert widgetClass not in self._widgets 
-         self._widgets[widgetClass] = (baseClass, module)
- 
--
-     def _resolveBaseclass(self, baseClass):
-         try:
-             for x in range(0, 10):
-@@ -114,19 +113,17 @@
-         except KeyError:
-             raise ValueError("unknown baseclass %s" % baseClass)
-         
--
-     def search(self, cls):
-         try:
--            self._usedWidgets.add(cls)
-             baseClass = self._resolveBaseclass(self._widgets[cls][0])
-             DEBUG("resolved baseclass of %s: %s" % (cls, baseClass))
--            
--            return type(cls, (baseClass,),
--                        {"module" : ""})
--        
-         except KeyError:
-             return None
- 
-+        self._usedWidgets.add(cls)
-+
-+        return type(cls, (baseClass, ), {"module" : ""})
-+
-     def _writeImportCode(self):
-         imports = {}
-         for widget in self._usedWidgets:
-diff --git a/pyuic/uic/objcreator.py b/pyuic/uic/objcreator.py
---- a/pyuic/uic/objcreator.py
-+++ b/pyuic/uic/objcreator.py
-@@ -102,19 +102,26 @@
-         self._modules.append(self._customWidgets)
- 
-     def createQObject(self, classname, *args, **kwargs):
--        # Handle scoped names, typically static factory methods.
--        parts = classname.split('.')
--        factory = self.findQObjectType(parts[0])
-+        # Handle regular and custom widgets.
-+        factory = self.findQObjectType(classname)
- 
--        if factory is not None:
--            for part in parts[1:]:
--                factory = getattr(factory, part, None)
--                if factory is None:
--                    break
--            else:
--                return self._cpolicy.instantiate(factory, *args, **kwargs)
-+        if factory is None:
-+            # Handle scoped names, typically static factory methods.
-+            parts = classname.split('.')
- 
--        raise NoSuchWidgetError(classname)
-+            if len(parts) > 1:
-+                factory = self.findQObjectType(parts[0])
-+
-+                if factory is not None:
-+                    for part in parts[1:]:
-+                        factory = getattr(factory, part, None)
-+                        if factory is None:
-+                            break
-+
-+            if factory is None:
-+                raise NoSuchWidgetError(classname)
-+
-+        return self._cpolicy.instantiate(factory, *args, **kwargs)
- 
-     def invoke(self, rname, method, args=()):
-         return self._cpolicy.invoke(rname, method, args)
diff --git a/extra/pyqt/fix-qthelp-build.patch b/extra/pyqt/fix-qthelp-build.patch
deleted file mode 100644
index 6055f9f35..000000000
--- a/extra/pyqt/fix-qthelp-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- PyQt-x11-gpl-4.9.1/configure.py~	2012-02-13 20:16:11.418786488 +0000
-+++ PyQt-x11-gpl-4.9.1/configure.py	2012-02-13 20:16:50.561809527 +0000
-@@ -1261,7 +1261,7 @@
-     opengl = (mname == "QtOpenGL")
- 
-     qt = [mname]
--    if mname in ("QtOpenGL", "QtWebKit"):
-+    if mname in ("QtHelp", "QtOpenGL", "QtWebKit"):
-         qt.append("QtCore")
- 
-     makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0,
diff --git a/extra/python-cairo/pycairo-1.8.10-pypath.patch b/extra/python-cairo/pycairo-1.8.10-pypath.patch
deleted file mode 100644
index 07d4e1b7a..000000000
--- a/extra/python-cairo/pycairo-1.8.10-pypath.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up wafadmin/Tools/python.py.pypath wafadmin/Tools/python.py
---- wafadmin/Tools/python.py.pypath	2011-02-10 15:30:44.118506004 -0500
-+++ wafadmin/Tools/python.py	2011-02-10 15:32:50.922506002 -0500
-@@ -156,6 +156,9 @@ MACOSX_DEPLOYMENT_TARGET = %r
- 		env.append_value('LINKFLAGS_PYEMBED',python_LDFLAGS.split())
- 	result=False
- 	name='python'+env['PYTHON_VERSION']
-+	python_config=conf.find_program('python%s-config'%('.'.join(env['PYTHON_VERSION'].split('.')[:2])),var='PYTHON_CONFIG')
-+	if not python_config:
-+		python_config=conf.find_program('python-config-%s'%('.'.join(env['PYTHON_VERSION'].split('.')[:2])),var='PYTHON_CONFIG')
- 	if python_LIBDIR is not None:
- 		path=[python_LIBDIR]
- 		conf.log.write("\n\n# Trying LIBDIR: %r\n"%path)
-@@ -169,6 +172,12 @@ MACOSX_DEPLOYMENT_TARGET = %r
- 		path=[os.path.join(python_prefix,"libs")]
- 		name='python'+env['PYTHON_VERSION'].replace('.','')
- 		result=conf.check(lib=name,uselib='PYEMBED',libpath=path)
-+	if not result and python_config:
-+		conf.log.write("\n\n# try again with help of python-config\n")
-+		for libstr in Utils.cmd_output("%s %s --libs"%(python,python_config)).strip().split():
-+			if(libstr.startswith('-lpython')):
-+				name=libstr[2:]
-+		result=conf.check(lib=name,uselib='PYEMBED',libpath=path)
- 	if result:
- 		env['LIBPATH_PYEMBED']=path
- 		env.append_value('LIB_PYEMBED',name)
-@@ -177,9 +186,6 @@ MACOSX_DEPLOYMENT_TARGET = %r
- 	if(sys.platform=='win32'or sys.platform.startswith('os2')or sys.platform=='darwin'or Py_ENABLE_SHARED):
- 		env['LIBPATH_PYEXT']=env['LIBPATH_PYEMBED']
- 		env['LIB_PYEXT']=env['LIB_PYEMBED']
--	python_config=conf.find_program('python%s-config'%('.'.join(env['PYTHON_VERSION'].split('.')[:2])),var='PYTHON_CONFIG')
--	if not python_config:
--		python_config=conf.find_program('python-config-%s'%('.'.join(env['PYTHON_VERSION'].split('.')[:2])),var='PYTHON_CONFIG')
- 	includes=[]
- 	if python_config:
- 		for incstr in Utils.cmd_output("%s %s --includes"%(python,python_config)).strip().split():
diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD
index 99f1a13c2..3985812b8 100644
--- a/extra/python-lxml/PKGBUILD
+++ b/extra/python-lxml/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 173311 2012-12-18 17:24:46Z angvp $
+# $Id: PKGBUILD 183648 2013-04-26 02:48:29Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 
 pkgbase=python-lxml
 pkgname=('python-lxml' 'python2-lxml' 'python-lxml-docs')
-pkgver=3.0.2
+pkgver=3.1.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD' 'custom')
 url="http://lxml.de/"
 makedepends=('python2' 'python' 'libxslt')
 source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
-md5sums=('38b15b0dd5e9292cf98be800e84a3ce4'
-         '85992526166d265681e42dd669d10773')
+md5sums=('6f2173f4fd5b13fbc9f8a5096d23d524'
+         'SKIP')
 
 check() {
   cd lxml-$pkgver
diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD
index 4ba4575da..06dfbcde1 100755
--- a/extra/python-numpy/PKGBUILD
+++ b/extra/python-numpy/PKGBUILD
@@ -1,34 +1,33 @@
-# $Id: PKGBUILD 169025 2012-10-17 10:20:51Z allan $
+# $Id: PKGBUILD 182931 2013-04-16 08:33:21Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
 
 pkgbase=python-numpy
 pkgname=('python2-numpy' 'python-numpy')
-pkgver=1.7.0
-_pkgver=1.7.0b2
+pkgver=1.7.1
 pkgrel=1
 pkgdesc="Scientific tools for Python"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
-url="http://numpy.scipy.org/"
+url="http://www.numpy.org/"
 makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose')
-source=(http://downloads.sourceforge.net/numpy/numpy-${_pkgver}.tar.gz)
-md5sums=('1b62cf0e34e2db58b0241b00d603df24')
+source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz)
+md5sums=('0ab72b3b83528a7ae79c6df9042d61c6')
 
 build() {
   cd "${srcdir}"
-  cp -a numpy-${_pkgver} numpy-py2-${_pkgver}
+  cp -a numpy-${pkgver} numpy-py2-${pkgver}
 
-  export Atlas=None
+  export ATLAS=None
   export LDFLAGS="$LDFLAGS -shared"
 
   echo "Building Python2"
-  cd "${srcdir}/numpy-py2-${_pkgver}"
+  cd "${srcdir}/numpy-py2-${pkgver}"
   python2 setup.py config_fc --fcompiler=gnu95 build
 
   echo "Building Python3"
-  cd "${srcdir}/numpy-${_pkgver}"
+  cd "${srcdir}/numpy-${pkgver}"
   python setup.py config_fc --fcompiler=gnu95 build
 }
 
@@ -36,7 +35,12 @@ package_python2-numpy() {
   depends=('lapack' 'python2')
   optdepends=('python-nose: testsuite')
 
-  cd "${srcdir}/numpy-py2-${_pkgver}"
+  _pyver=2.7
+
+  export ATLAS=None
+  export LDFLAGS="$LDFLAGS -shared"
+
+  cd "${srcdir}/numpy-py2-${pkgver}"
   python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1
 
   install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy"
@@ -46,6 +50,9 @@ package_python2-numpy() {
          -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
          -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
              $(find ${pkgdir} -name '*.py')
+
+  install -m755 -d "${pkgdir}/usr/include/python${_pyver}"
+  ln -sf /usr/lib/python${_pyver}/site-packages/numpy/core/include/numpy "${pkgdir}/usr/include/python${_pyver}/numpy"
 }
 
 package_python-numpy() {
@@ -54,9 +61,18 @@ package_python-numpy() {
   replaces=('python3-numpy')
   conflicts=('python3-numpy')
 
-  cd "${srcdir}/numpy-${_pkgver}"
+  _pyver=3.3
+  _pyinc=3.3m
+
+  export ATLAS=None
+  export LDFLAGS="$LDFLAGS -shared"
+
+  cd "${srcdir}/numpy-${pkgver}"
   python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/python3-numpy"
-  install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python3-numpy/"
+  install -m755 -d "${pkgdir}/usr/share/licenses/python-numpy"
+  install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python-numpy/"
+
+  install -m755 -d "${pkgdir}/usr/include/python${_pyinc}"
+  ln -sf /usr/lib/python${_pyver}/site-packages/numpy/core/include/numpy "${pkgdir}/usr/include/python${_pyinc}/numpy"
 }
diff --git a/extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch b/extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch
deleted file mode 100644
index 072afbc0e..000000000
--- a/extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c
-index 00c71f9..0afdc17 100644
---- a/numpy/core/src/multiarray/scalarapi.c
-+++ b/numpy/core/src/multiarray/scalarapi.c
-@@ -641,6 +641,40 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
-             itemsize = (((itemsize - 1) >> 2) + 1) << 2;
-         }
-     }
-+#if PY_VERSION_HEX >= 0x03030000
-+    if (type_num == NPY_UNICODE) {
-+        PyObject *u, *args;
-+        char *buffer;
-+        if (swap) {
-+            buffer = malloc(itemsize);
-+            if (buffer == NULL) {
-+                PyErr_NoMemory();
-+                return NULL;
-+            }
-+            memcpy(buffer, data, itemsize);
-+            byte_swap_vector(buffer, itemsize >> 2, 4);
-+        } else {
-+            buffer = data;
-+        }
-+        u = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buffer,
-+                itemsize >> 2);
-+        if (swap) {
-+            free(buffer);
-+        }
-+        if (u == NULL) {
-+            return NULL;
-+        }
-+        args = Py_BuildValue("(O)", u);
-+        if (args == NULL) {
-+            Py_DECREF(u);
-+            return NULL;
-+        }
-+        obj = type->tp_new(type, args, NULL);
-+        Py_DECREF(u);
-+        Py_DECREF(args);
-+        return obj;
-+    }
-+#endif
-     if (type->tp_itemsize != 0) {
-         /* String type */
-         obj = type->tp_alloc(type, itemsize);
-@@ -672,6 +706,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
-             memcpy(destptr, data, itemsize);
-             return obj;
-         }
-+#if PY_VERSION_HEX < 0x03030000
-         else if (type_num == PyArray_UNICODE) {
-             /* tp_alloc inherited from Python PyBaseObject_Type */
-             PyUnicodeObject *uni = (PyUnicodeObject*)obj;
-@@ -743,6 +778,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
- #endif
-             return obj;
-         }
-+#endif // PY_VERSION_HEX < 0x03030000
-         else {
-             PyVoidScalarObject *vobj = (PyVoidScalarObject *)obj;
-             vobj->base = NULL;
-diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src
-index e547071..12745d7 100644
---- a/numpy/core/src/multiarray/scalartypes.c.src
-+++ b/numpy/core/src/multiarray/scalartypes.c.src
-@@ -2592,7 +2592,11 @@ finish:
-     *((npy_@name@ *)dest) = *((npy_@name@ *)src);
- #elif @default@ == 1 /* unicode and strings */
-     if (itemsize == 0) { /* unicode */
-+#if PY_VERSION_HEX >= 0x03030000
-+        itemsize = PyUnicode_GetLength(robj) * PyUnicode_KIND(robj);
-+#else
-         itemsize = ((PyUnicodeObject *)robj)->length * sizeof(Py_UNICODE);
-+#endif
-     }
-     memcpy(dest, src, itemsize);
-     /* @default@ == 2 won't get here */
-diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
-index c4147ef..119056c 100644
---- a/numpy/core/src/multiarray/methods.c
-+++ b/numpy/core/src/multiarray/methods.c
-@@ -1587,7 +1587,7 @@ array_setstate(PyArrayObject *self, PyObject *args)
-     if (!PyDataType_FLAGCHK(typecode, NPY_LIST_PICKLE)) {
-         int swap=!PyArray_ISNOTSWAPPED(self);
-         self->data = datastr;
--        if (!_IsAligned(self) || swap) {
-+        if (!_IsAligned(self) || swap || (len <= 1000)) {
-             intp num = PyArray_NBYTES(self);
-             self->data = PyDataMem_NEW(num);
-             if (self->data == NULL) {
--- 
-1.7.12.3
diff --git a/extra/python-pysqlite/ChangeLog b/extra/python-pysqlite/ChangeLog
deleted file mode 100644
index 2f42c5de4..000000000
--- a/extra/python-pysqlite/ChangeLog
+++ /dev/null
@@ -1,16 +0,0 @@
-2011-10-07  Angel Velasquez <angvp@archlinux.org>
-	* Updated to: 2.6.3
-	    * Added check function
-
-2009-08-06  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated to: 2.5.5
-
-2009-07-19  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 2.5.5
-
-2008-07-15  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 2.4.1
-
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index bd363b1d6..5ebc686fd 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 173845 2012-12-25 00:34:33Z foutrelis $
+# $Id: PKGBUILD 182150 2013-04-08 10:27:25Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=python
-pkgver=3.3.0
-pkgrel=3.1
+pkgver=3.3.1
+pkgrel=1
 _pybasever=3.3
 pkgdesc="Next generation of the python high-level scripting language"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ provides=('python3')
 replaces=('python3')
 options=('!makeflags')
 source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
-sha1sums=('833d73565e1b665f1878504081dc985a5a06e46a')
+sha1sums=('393d7302c48bc911cd7faa7fa9b5fbcb9919bddc')
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index 29fddd125..11562e06f 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 173846 2012-12-25 00:34:35Z foutrelis $
+# $Id: PKGBUILD 182151 2013-04-08 10:27:26Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributer: Allan McRae <allan@archlinux.org>
 # Contributer: Jason Chu <jason@archlinux.org>
 
 pkgname=python2
-pkgver=2.7.3
-pkgrel=4.1
+pkgver=2.7.4
+pkgrel=1
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ optdepends=('tk: for IDLE')
 conflicts=('python<3')
 options=('!makeflags')
 source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357')
+sha1sums=('08e78ebeb6d9c799644f6d787ca424291c0fe03e')
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
@@ -32,6 +32,9 @@ build() {
   # FS#23997
   sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
 
+  sed -i "s/python2.3/python2/g" Lib/distutils/tests/test_build_scripts.py \
+     Lib/distutils/tests/test_install_scripts.py Tools/scripts/gprof2html.py
+
   # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
   # rather than copies shipped in the tarball
   rm -r Modules/expat
@@ -50,21 +53,23 @@ package() {
   cd "${srcdir}/Python-${pkgver}"
   make DESTDIR="${pkgdir}" altinstall maninstall
 
-  ln -sf python${_pybasever}        "${pkgdir}/usr/bin/python2"
-  ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config"
-  ln -sf python${_pybasever}.1      "${pkgdir}/usr/share/man/man1/python2.1"
+  rm "${pkgdir}"/usr/share/man/man1/python.1
+
+  ln -sf python${_pybasever}        "${pkgdir}"/usr/bin/python2
+  ln -sf python${_pybasever}-config "${pkgdir}"/usr/bin/python2-config
+  ln -sf python${_pybasever}.1      "${pkgdir}"/usr/share/man/man1/python2.1
+
+  # FS#33954
+  ln -sf python-${_pybasever}.pc    "${pkgdir}"/usr/lib/pkgconfig/python2.pc
 
-  ln -sf ../../libpython${_pybasever}.so \
-    "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so"
+  ln -sf ../../libpython${_pybasever}.so "${pkgdir}"/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
 
-  mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/"
+  mv "${pkgdir}"/usr/bin/smtpd.py "${pkgdir}"/usr/lib/python${_pybasever}/
 
   # some useful "stuff"
   install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
-  install -m755 Tools/i18n/{msgfmt,pygettext}.py \
-    "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/"
-  install -m755 Tools/scripts/{README,*py} \
-    "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/"
+  install -m755 Tools/i18n/{msgfmt,pygettext}.py "${pkgdir}"/usr/lib/python${_pybasever}/Tools/i18n/
+  install -m755 Tools/scripts/{README,*py} "${pkgdir}"/usr/lib/python${_pybasever}/Tools/scripts/
 
   # fix conflicts with python
   mv "${pkgdir}"/usr/bin/idle{,2}
@@ -72,13 +77,12 @@ package() {
   mv "${pkgdir}"/usr/bin/2to3{,-2.7}
 
   # clean up #!s
-  find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \
+  find "${pkgdir}"/usr/lib/python${_pybasever}/ -name '*.py' | \
     xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
 
   # clean-up reference to build directory
-  sed -i "s#${srcdir}/Python-${pkgver}:##" \
-    "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile"
+  sed -i "s#${srcdir}/Python-${pkgver}:##" "${pkgdir}"/usr/lib/python${_pybasever}/config/Makefile
 
   # license
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/extra/qca-gnupg/PKGBUILD b/extra/qca-gnupg/PKGBUILD
index 4980bee89..385f5f934 100644
--- a/extra/qca-gnupg/PKGBUILD
+++ b/extra/qca-gnupg/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149479 2012-02-08 09:59:34Z pierre $
+# $Id: PKGBUILD 178978 2013-03-01 10:23:20Z andrea $
 # Maintainer:
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qca-gnupg
 pkgver=2.0.0
 _pkgver=2.0.0-beta3
-pkgrel=3.1
+pkgrel=5
 pkgdesc="Qt Cryptographic Architecture"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://delta.affinix.com/qca/"
diff --git a/extra/qca-ossl/PKGBUILD b/extra/qca-ossl/PKGBUILD
index ff7389bca..a804ec832 100644
--- a/extra/qca-ossl/PKGBUILD
+++ b/extra/qca-ossl/PKGBUILD
@@ -4,12 +4,13 @@
 pkgname=qca-ossl
 pkgver=2.0.0
 _pkgver=2.0.0-beta3
-pkgrel=4.1
+pkgrel=6
 pkgdesc="Qt Cryptographic Architecture"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://delta.affinix.com/qca/"
 license=('LGPL')
 depends=('qca')
+makedepends=('icu')
 source=("http://delta.affinix.com/download/qca/2.0/plugins/${pkgname}-${_pkgver}.tar.bz2"
         'no-whirlpool.patch')
 md5sums=('bdc62c01321385c7da8d27b3902910ce'
diff --git a/extra/qca/PKGBUILD b/extra/qca/PKGBUILD
index f2e914566..e3682b678 100644
--- a/extra/qca/PKGBUILD
+++ b/extra/qca/PKGBUILD
@@ -1,20 +1,25 @@
-# $Id: PKGBUILD 149477 2012-02-08 09:57:45Z pierre $
+# $Id: PKGBUILD 178977 2013-03-01 10:23:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qca
 pkgver=2.0.3
-pkgrel=2.1
+pkgrel=4
 pkgdesc="Qt Cryptographic Architecture"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://delta.affinix.com/qca/"
 license=('LGPL')
-depends=('qt' 'ca-certificates')
-source=("http://delta.affinix.com/download/qca/2.0/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('fc15bd4da22b8096c51fcfe52d2fa309')
+depends=('qt4' 'ca-certificates')
+source=("http://delta.affinix.com/download/qca/2.0/${pkgname}-${pkgver}.tar.bz2"
+        'gcc47.patch')
+md5sums=('fc15bd4da22b8096c51fcfe52d2fa309'
+         'dffc7367152d8888c1447253a0387a2a')
 
 build() {
+    . /etc/profile.d/qt4.sh
+
 	cd $srcdir/${pkgname}-${pkgver}
+	patch -p0 -i ${srcdir}/gcc47.patch
 	./configure \
 		--prefix=/usr \
 		--disable-tests \
diff --git a/extra/qca/gcc47.patch b/extra/qca/gcc47.patch
new file mode 100644
index 000000000..5297ecb9b
--- /dev/null
+++ b/extra/qca/gcc47.patch
@@ -0,0 +1,17 @@
+--- ./src/botantools/botan/botan/secmem.h.orig	2012-01-07 20:09:35.427999593 +0100
++++ ./src/botantools/botan/botan/secmem.h	2012-01-07 20:09:52.540001422 +0100
+@@ -214,11 +214,11 @@
+ 
+       SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); }
+       SecureVector(const T in[], u32bit n)
+-         { MemoryRegion<T>::init(true); set(in, n); }
++         { MemoryRegion<T>::init(true); this->set(in, n); }
+       SecureVector(const MemoryRegion<T>& in)
+-         { MemoryRegion<T>::init(true); set(in); }
++         { MemoryRegion<T>::init(true); this->set(in); }
+       SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
+-         { MemoryRegion<T>::init(true); set(in1); append(in2); }
++         { MemoryRegion<T>::init(true); this->set(in1); append(in2); }
+    };
+ 
+ /*************************************************
diff --git a/extra/qemu-kvm/65-kvm.rules b/extra/qemu-kvm/65-kvm.rules
deleted file mode 100644
index c2f7317aa..000000000
--- a/extra/qemu-kvm/65-kvm.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD
deleted file mode 100644
index 64f160c4c..000000000
--- a/extra/qemu-kvm/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 166722 2012-09-17 05:16:37Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=qemu-kvm
-pkgver=1.2.0
-pkgrel=1
-pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
-arch=(i686 x86_64 'mips64el')
-license=('GPL2' 'LGPL2.1')
-url="http://www.linux-kvm.org"
-depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'libpulse' 'seabios' 'libcap-ng')
-makedepends=('texi2html' 'perl' 'python2')
-backup=('etc/qemu/target-x86_64.conf')
-install=qemu-kvm.install
-conflicts=('qemu')
-provides=('qemu')
-replaces=('kvm')
-source=(http://downloads.sourceforge.net/kvm/${pkgname}-${pkgver}.tar.gz
-        65-kvm.rules)
-options=(!strip)
-
-build()
-{
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    # fix esound building
-    ./configure --prefix=/usr \
-                --python=/usr/bin/python2 \
-                --sysconfdir=/etc \
-                --audio-drv-list=alsa,sdl,oss,pa \
-                --audio-card-list=ac97,sb16,es1370,hda \
-                --enable-docs
-    make
-}
-
-package()
-{
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" libexecdir=/usr/lib/qemu install
-    rm "${pkgdir}/usr/share/qemu/bios.bin"
-
-    # symbolic link for backwards compatibility
-    ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu-kvm"
-    # symbolic link for to qemu binary for emulator apps
-    ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu"
-    # symbolic link for to qemu binary for emulator apps
-    ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/kvm"
-    # fix man page
-    mv "${pkgdir}/usr/share/man/man1/qemu.1" \
-                     "${pkgdir}/usr/share/man/man1/qemu-kvm.1"
-    # install udev rules
-    install -D -m644 "${srcdir}/65-kvm.rules" \
-                     "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
-    # strip scripts directory
-    find "${pkgdir}/usr/bin"  -type f -perm -u+w 2>/dev/null | while read binary ; do
-      case "$(file -bi "$binary")" in
-        *application/x-executable*) # Binaries
-        /usr/bin/strip $STRIP_BINARIES "$binary";;
-      esac
-    done
-}
-md5sums=('d7b18b673c48abfee65a9c0245df0415'
-         'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/extra/qemu-kvm/qemu-kvm.install b/extra/qemu-kvm/qemu-kvm.install
deleted file mode 100644
index 5161df93a..000000000
--- a/extra/qemu-kvm/qemu-kvm.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  groupadd kvm -f -g 78
-  echo ">>> PLEASE READ FOR KVM USAGE!"
-  echo ">>>  Load the correct KVM module, you will need a KVM capable CPU!"
-  echo ">>>  Add yourself to the group 'kvm'."
-  echo ""
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  groupdel kvm
-}
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index 8cd545d66..f915357f2 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,28 +1,38 @@
-# $Id: PKGBUILD 172024 2012-11-26 16:12:59Z tpowa $
+# $Id: PKGBUILD 182925 2013-04-16 07:40:13Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu
-pkgver=1.2.1
+pkgver=1.4.1
 pkgrel=1
 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'LGPL2.1')
 url="http://wiki.qemu.org/Index.html"
 makedepends=('texi2html' 'perl' 'python2')
-depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng')
+depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng')
 backup=('etc/qemu/target-x86_64.conf')
 install=qemu.install
 source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
+        doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
         65-kvm.rules)
+replaces=('qemu-kvm')
 options=(!strip)
 
-build()
+prepare()
 {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's/lib64/lib/g' x86_64.ld
+  sed -i -e 's/lib64/lib/g' ldscripts/x86_64.ld
+  # fix building with tex version 5.0
+  # https://bugs.launchpad.net/qemu/+bug/1130533
+  patch -Np1 -i ${srcdir}/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
+}
+
+build ()
+{
+  cd "${srcdir}/${pkgname}-${pkgver}"  
   ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \
               --python=/usr/bin/python2 \
               --audio-card-list=ac97,sb16,es1370,hda \
-              --enable-docs 
+              --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu
               make
 }
 
@@ -33,6 +43,11 @@ package() {
 
   install -D -m644 "${srcdir}/65-kvm.rules" \
                    "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
+  # bridge_helper needs suid
+  # https://bugs.archlinux.org/task/32565
+  chmod u+s "${pkgdir}/usr/lib/qemu/qemu-bridge-helper"
+  # add sample config
+  echo "allow br0" > ${pkgdir}/etc/qemu/bridge.conf.sample
   # strip scripts directory
     find "${pkgdir}/usr/src/linux-${_kernver}/scripts"  -type f -perm -u+w 2>/dev/null | while read binary ; do
       case "$(file -bi "$binary")" in
@@ -42,5 +57,6 @@ package() {
     done
 
 }
-md5sums=('189bc5b87281a72f8c72a0f7ebaa6d00'
+md5sums=('eb2d696956324722b5ecfa46e41f9a75'
+         'b431782f310bfc6af4ef21a8068f866b'
          'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch b/extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
new file mode 100644
index 000000000..bacc87e80
--- /dev/null
+++ b/extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
@@ -0,0 +1,30 @@
+diff --git a/qemu-options.hx b/qemu-options.hx
+index 4bc9c85..3af60bf 100644
+--- a/qemu-options.hx
++++ b/qemu-options.hx
+@@ -2095,18 +2095,13 @@ QEMU supports using either local sheepdog devices or remote networked
+ devices.
+ 
+ Syntax for specifying a sheepdog device
+-@table @list
+-``sheepdog:<vdiname>''
+-
+-``sheepdog:<vdiname>:<snapid>''
+-
+-``sheepdog:<vdiname>:<tag>''
+-
+-``sheepdog:<host>:<port>:<vdiname>''
+-
+-``sheepdog:<host>:<port>:<vdiname>:<snapid>''
+-
+-``sheepdog:<host>:<port>:<vdiname>:<tag>''
++@table @code
++@item sheepdog:<vdiname>
++@item sheepdog:<vdiname>:<snapid>
++@item sheepdog:<vdiname>:<tag>
++@item sheepdog:<host>:<port>:<vdiname>
++@item sheepdog:<host>:<port>:<vdiname>:<snapid>
++@item sheepdog:<host>:<port>:<vdiname>:<tag>
+ @end table
+ 
+ Example
diff --git a/extra/qemu/qemu-glibc-2.16-build.patch b/extra/qemu/qemu-glibc-2.16-build.patch
deleted file mode 100644
index 08948fec6..000000000
--- a/extra/qemu/qemu-glibc-2.16-build.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From baf954154e7c0acda038c01a5c28aea4db7eec67 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 5 Jul 2012 14:28:03 +0100
-Subject: [PATCH] Replace 'struct siginfo' with 'siginfo_t'.
-
-glibc 2.16 will remove the undocumented definition of 'struct siginfo'
-from <bits/siginfo.h>.
-
-This change is already present in glibc 2.15.90, so qemu compilation
-of certain targets (eg. cris-user) breaks.
-
-This struct was always typedef'd to be the same as 'siginfo_t' which
-is what POSIX documents, so use that instead.
-
-Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
----
- linux-user/signal.c |    8 ++++----
- user-exec.c         |    2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/linux-user/signal.c b/linux-user/signal.c
-index 43346dc..108dff9 100644
---- a/linux-user/signal.c
-+++ b/linux-user/signal.c
-@@ -2849,7 +2849,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
-     * Arguments to signal handler:
-     *
-     *   a0 = signal number
--    *   a1 = pointer to struct siginfo
-+    *   a1 = pointer to siginfo_t
-     *   a2 = pointer to struct ucontext
-     *
-     * $25 and PC point to the signal handler, $29 points to the
-@@ -3255,7 +3255,7 @@ struct target_signal_frame {
- };
- 
- struct rt_signal_frame {
--    struct siginfo info;
-+    siginfo_t info;
-     struct ucontext uc;
-     uint32_t tramp[2];
- };
-@@ -3474,9 +3474,9 @@ struct target_signal_frame {
- };
- 
- struct rt_signal_frame {
--        struct siginfo *pinfo;
-+        siginfo_t *pinfo;
-         void *puc;
--        struct siginfo info;
-+        siginfo_t info;
-         struct ucontext uc;
-         uint8_t retcode[8];       /* Trampoline code. */
- };
-diff --git a/user-exec.c b/user-exec.c
-index b2a4261..1a9c276 100644
---- a/user-exec.c
-+++ b/user-exec.c
-@@ -588,7 +588,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
- int cpu_signal_handler(int host_signum, void *pinfo,
-                        void *puc)
- {
--    struct siginfo *info = pinfo;
-+    siginfo_t *info = pinfo;
-     struct ucontext *uc = puc;
-     unsigned long pc = uc->uc_mcontext.sc_iaoq[0];
-     uint32_t insn = *(uint32_t *)pc;
--- 
-1.7.10.4
-
diff --git a/extra/qemu/qemu.install b/extra/qemu/qemu.install
index fd92c60eb..f4fabcc54 100644
--- a/extra/qemu/qemu.install
+++ b/extra/qemu/qemu.install
@@ -3,18 +3,20 @@ post_install() {
   #
   groupadd kvm -f -g 78
   echo ">>> PLEASE READ FOR KVM USAGE!"
-  echo ">>>  Load the correct KVM module, you will need a KVM capable CPU!"
   echo ">>>  Add yourself to the group 'kvm'."
-  echo ""
+}
+
+post_upgrade() {
   if [ "$(vercmp $2 0.11)" -lt 0 ]; then
     echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module"
     echo "is no longer supported and will be removed from the repositories. You"
     echo "can safely uninstall it from your system."
   fi
-}
-
-post_upgrade() {
-  post_install $1
+  if [ "$(vercmp $2 1.3.1)" -lt 0 ]; then
+    echo "With the release of qemu 1.3.0, qemu-kvm binary is removed."
+    echo "You need to change the emulator path, if you use libvirt by using:"
+    echo "'virsh edit <vm-name>'"
+  fi
 }
 
 post_remove() {
diff --git a/extra/qimageblitz/PKGBUILD b/extra/qimageblitz/PKGBUILD
index b8defa8ed..6a8e88eef 100644
--- a/extra/qimageblitz/PKGBUILD
+++ b/extra/qimageblitz/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 145862 2012-01-03 12:41:58Z andrea $
+# $Id: PKGBUILD 178980 2013-03-01 10:23:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=qimageblitz
 pkgver=0.0.6
-pkgrel=2.1
+pkgrel=3
 pkgdesc="A graphical effect and filter library for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde.org/"
 license=('GPL2')
-depends=('qt')
+depends=('qt4')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('0ae2f7d4e0876764a97ca73799f61df4')
 
 build() {
-  cd "${srcdir}"
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   CXX="g++" \
@@ -26,6 +27,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build"
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/qiv/PKGBUILD b/extra/qiv/PKGBUILD
deleted file mode 100644
index fabfa0ec2..000000000
--- a/extra/qiv/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 148900 2012-02-05 11:54:52Z ibiru $
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgname=qiv
-pkgver=2.2.4
-pkgrel=2
-pkgdesc="Quick Image Viewer (qiv) is a very small and fast GDK/Imlib image viewer"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://spiegl.de/qiv/"
-license=('GPL2')
-depends=('file' 'gtk2' 'imlib2')
-source=(http://spiegl.de/qiv/download/$pkgname-$pkgver.tgz)
-md5sums=('1425f89c90f9c045858fccf24d894c97')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  install -D -m 0755 qiv "$pkgdir/usr/bin/qiv"
-  install -D -m 0644 qiv.1 "$pkgdir/usr/share/man/man1/qiv.1"
-}
diff --git a/extra/qjackctl/PKGBUILD b/extra/qjackctl/PKGBUILD
index 7692ca6e7..ead710a4e 100644
--- a/extra/qjackctl/PKGBUILD
+++ b/extra/qjackctl/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 164008 2012-07-23 18:45:37Z schiv $
+# $Id: PKGBUILD 181260 2013-04-02 20:48:27Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 
 pkgname=qjackctl
-pkgver=0.3.9
-pkgrel=2
+pkgver=0.3.10
+pkgrel=1
 pkgdesc="A Qt front-end for the JACK low-latency audio server"
 url="http://qjackctl.sourceforge.net/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('jack' 'qt')
-options=('!makeflags')
+depends=('jack' 'qt4') # qjackctl may soon support qt5
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('f932c916f43ba3251d3a9ed62a448e43')
+md5sums=('cc01522902105ca65e327e657e51ca5e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/qjson/PKGBUILD b/extra/qjson/PKGBUILD
index 9c5c987cc..94f52affe 100644
--- a/extra/qjson/PKGBUILD
+++ b/extra/qjson/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 172063 2012-11-27 13:49:24Z andrea $
+# $Id: PKGBUILD 178982 2013-03-01 10:23:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qjson
 pkgver=0.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A qt-based library that maps JSON data to QVariant objects"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://qjson.sourceforge.net"
-depends=('qt')
+depends=('qt4')
 makedepends=('cmake')
 source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/flavio/${pkgname}/archive/${pkgver}.tar.gz")
 md5sums=('4eef13da988edf8f91c260a3e1baeea9')
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
diff --git a/extra/qoauth/PKGBUILD b/extra/qoauth/PKGBUILD
index e0b554e3d..78fb9e2fa 100644
--- a/extra/qoauth/PKGBUILD
+++ b/extra/qoauth/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153702 2012-03-18 08:58:10Z andrea $
+# $Id: PKGBUILD 179067 2013-03-02 22:33:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Peter Richard Lewis <plewis@aur.archlinux.org>
 
 pkgname=qoauth
 pkgver=1.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Support with OAuth-powered network services"
 url='http://github.com/ayoy/qoauth'
 license=('GPL')
@@ -15,16 +15,16 @@ source=("http://files.ayoy.net/qoauth/release/current/src/${pkgname}-${pkgver}-s
 md5sums=('bcb6d01e6c9a6fb22099c9e0f5889578')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-src"
+  cd ${pkgname}-${pkgver}-src
 
   # Install libraries in /usr/lib/
   sed -i 's|lib64|lib|' src/src.pro
 
-  qmake
+  qmake-qt4
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-src"
+  cd ${pkgname}-${pkgver}-src
   make INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/extra/qpdf/PKGBUILD b/extra/qpdf/PKGBUILD
index 47d9f24f2..bd6e705e5 100644
--- a/extra/qpdf/PKGBUILD
+++ b/extra/qpdf/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 175524 2013-01-18 19:34:24Z andyrtr $
+# $Id: PKGBUILD 182840 2013-04-15 16:29:09Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Miguel Revilla <yo at miguelrevilla.com>
 # Contributor: David Sotelo <dvsotelo at gmail.com>
 # Contributor: Nuno Araujo <nuno.araujo@russo79.com>
 
 pkgname=qpdf
-pkgver=4.0.1
+pkgver=4.1.0
 pkgrel=1
 pkgdesc="QPDF: A Content-Preserving PDF Transformation System"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('pcre' 'perl')
 makedepends=('make')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('093baece867a0a7e07774bd4008156b3')
+md5sums=('eedd61acc53744446d181429651a9baf')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD
index 4c73ea48f..1b003445a 100644
--- a/extra/qrencode/PKGBUILD
+++ b/extra/qrencode/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169087 2012-10-17 20:07:22Z bluewind $
+# $Id: PKGBUILD 178990 2013-03-01 10:24:41Z bluewind $
 # Maintainer: Florian Pritz< flo@xinu.at>
 # Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
 
 pkgname=qrencode
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="C library for encoding data in a QR Code symbol."
 arch=(i686 x86_64 mips64el)
@@ -13,13 +13,13 @@ url="http://megaui.net/fukuchi/works/qrencode/index.en.html"
 license=('GPL')
 options=(!libtool)
 source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('219b146d3b365a56a0f4ef58a718f295')
+md5sums=('2c1693a29fe2f26089ccdff9051c0a3f')
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
-#  autoreconf
-  ./autogen.sh
+
   ./configure --prefix=/usr
+
   make
 }
 
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index a6f9da865..6583f720d 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 173042 2012-12-09 15:31:45Z andrea $
+# $Id: PKGBUILD 179562 2013-03-07 08:19:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
          'python-qscintilla-common')
-pkgver=2.7
+pkgver=2.7.1
 pkgrel=1
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,40 +13,40 @@ url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
 makedepends=('python2-pyqt' 'pyqt' 'chrpath')
 source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
         'configure.py-objdir-support.diff')
-md5sums=('a3857d75a2b332e0460131e0aa4cc4b5'
-         '8cf9c06252e2f11ab00e62848e322fd3')
+md5sums=('da8939b5679a075e30c6632e54dc5abf'
+         'eae1bd23117c5f1f7f172a1c1e11f600')
 
 build() {
-    cd "${srcdir}/QScintilla-gpl-${pkgver}" 
+    cd "${srcdir}/QScintilla-gpl-${pkgver}"
     patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
 
     cd Qt4Qt5
     qmake qscintilla.pro
     make
     
-    cd ../designer-Qt4
+    cd ../designer-Qt4Qt5
     qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
     make
 
     cd ../
     cp -rf Python Python2
     cd Python
-    python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+    python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c
     make
 
     cd ../Python2
-    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c
     make    
 }
 
 package_qscintilla() {
     pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
-    depends=('qt')
+    depends=('qt4')
 
     cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4"
+    cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4Qt5"
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 }
 
diff --git a/extra/qscintilla/configure.py-objdir-support.diff b/extra/qscintilla/configure.py-objdir-support.diff
index b595de18c..8d4a7c99d 100644
--- a/extra/qscintilla/configure.py-objdir-support.diff
+++ b/extra/qscintilla/configure.py-objdir-support.diff
@@ -1,39 +1,21 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_configure.dpatch by Torsten Marek <shlomme@debian.org>
-##
-## DP: patch the configure script for the Python bindings to support object dir builds
-
-@DPATCH@
-Index: qscintilla2-2.4.2/Python/configure.py
-===================================================================
---- qscintilla2-2.4.2.orig/Python/configure.py	2010-01-20 20:56:09.000000000 +0100
-+++ qscintilla2-2.4.2/Python/configure.py	2010-01-27 22:54:35.603870417 +0100
-@@ -33,6 +33,7 @@
+--- QScintilla-gpl-2.7.1/Python/configure.py~	2013-03-07 08:09:00.678704222 +0000
++++ QScintilla-gpl-2.7.1/Python/configure.py	2013-03-07 08:11:48.860880852 +0000
+@@ -29,6 +29,8 @@
  import glob
  import optparse
  
 +src_dir = os.path.dirname(os.path.abspath(__file__))
++
+ try:
+     import sysconfig
+ except ImportError:
+@@ -455,6 +457,9 @@
  
- # Import SIP's configuration module so that we have access to the error
- # reporting.  Then try and import the configuration modules for both PyQt3 and
-@@ -162,7 +163,7 @@
-     if os.access(sciglobal, os.F_OK):
-         # Get the QScintilla version string.
-         _, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR")
--
-+        return # Debian: do not check for the installed version, we're good this way.
-         if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")):
-             # Because we include the Python bindings with the C++ code we can
-             # reasonably force the same version to be used and not bother about
-@@ -232,9 +233,9 @@
-     argv.append(buildfile)
- 
-     if pyqt.pyqt_version >= 0x040000:
--        argv.append("sip/qscimod4.sip")
-+        argv.append(os.path.join(src_dir, "sip/qscimod4.sip"))
-     else:
--        argv.append("sip/qscimod3.sip")
-+        argv.append(os.path.join(src_dir, "sip/qscimod3.sip"))
- 
-     os.system(" ".join(argv))
- 
+     # Get the QScintilla version string.
+     sciversstr = read_define(sciglobal, 'QSCINTILLA_VERSION_STR')
++
++    return # Debian: do not check for the installed version, we're good this way.
++
+     if sciversstr is None:
+         error(
+                 "The QScintilla version number could not be determined by "
diff --git a/extra/qsynth/PKGBUILD b/extra/qsynth/PKGBUILD
index ef85f7948..7f3df04c8 100644
--- a/extra/qsynth/PKGBUILD
+++ b/extra/qsynth/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 151340 2012-02-25 14:47:42Z pierre $
+# $Id: PKGBUILD 183182 2013-04-18 15:40:20Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=qsynth
-pkgver=0.3.6
-pkgrel=2
+pkgver=0.3.7
+pkgrel=1
 pkgdesc="Qt GUI for FluidSynth"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://qsynth.sourceforge.net/"
 license=('GPL')
-depends=('fluidsynth' 'qt')
-options=('!makeflags')
+depends=('fluidsynth' 'qt4')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('3cba3c87463be75ac188ebc3c3023d12')
+md5sums=('a101a50a7ecfb7319482a5022df1d58b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -23,7 +22,8 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
+
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/qt-assistant-compat/PKGBUILD b/extra/qt-assistant-compat/PKGBUILD
index e8e3b147e..bddad5c91 100644
--- a/extra/qt-assistant-compat/PKGBUILD
+++ b/extra/qt-assistant-compat/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 149629 2012-02-08 20:53:42Z pierre $
+# $Id: PKGBUILD 179069 2013-03-02 22:41:59Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=qt-assistant-compat
 pkgver=4.6.3
-pkgrel=2.1
+pkgrel=4
 pkgdesc="compat version of Qt Assistant"
-url="http://qt.nokia.com/"
+url="http://qt-project.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3' 'LGPL')
-depends=('qt')
+depends=('qt4')
 source=('ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz'
         'debian_patches_01_build_system.diff')
 md5sums=('a20148e0488d5c12ab35ccc107dcc64d'
@@ -23,11 +23,11 @@ build() {
 	cd lib; if [ -e Makefile ]; then $(MAKE) distclean; fi
 	rm -f translations/assistant_adp_*.qm
 
-	qmake CONFIG+=create_prl
+	qmake-qt4 CONFIG+=create_prl
 	make
 	cd  ../translations; lrelease assistant_adp_*.ts
 	cd ..
-	qmake CONFIG+=create_prl
+	qmake-qt4 CONFIG+=create_prl
 	make
 }
 
@@ -44,11 +44,11 @@ package() {
 		${pkgdir}/usr/lib/libQtAssistantClient.prl
 
 	# Install translations
-	install -d ${pkgdir}/usr/share/qt/translations/
+	install -d ${pkgdir}/usr/share/qt4/translations/
 	install -p -m0644 translations/assistant_adp_*.qm \
-		${pkgdir}/usr/share/qt/translations/
+		${pkgdir}/usr/share/qt4/translations/
 
 	# Install prf file
 	install -D -p -m0644 features/assistant.prf \
-		${pkgdir}/usr/share/qt/mkspecs/features/assistant.prf
+		${pkgdir}/usr/share/qt4/mkspecs/features/assistant.prf
 }
diff --git a/extra/qt-gstreamer/PKGBUILD b/extra/qt-gstreamer/PKGBUILD
index b40cbdd56..213ddc4c7 100644
--- a/extra/qt-gstreamer/PKGBUILD
+++ b/extra/qt-gstreamer/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 163964 2012-07-23 03:00:17Z allan $
+# $Id: PKGBUILD 178986 2013-03-01 10:24:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: laloch <laloch@atlas.cz>
 
 pkgname=qt-gstreamer
 pkgver=0.10.2
-pkgrel=2
-pkgdesc="Qt bindings for GStreamer"
+pkgrel=3
+pkgdesc="Qt4 bindings for GStreamer"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://gstreamer.freedesktop.org/modules/qt-gstreamer.html'
 license=('LGPL2.1')
-depends=('qt' 'gstreamer0.10-base' 'libgles')
+depends=('qt4' 'gstreamer0.10-base' 'libgles')
 makedepends=('cmake' 'automoc4' 'boost' 'mesa' 'doxygen')
 source=("http://gstreamer.freedesktop.org/src/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('0428aedf2874fd0884ad4c41db9da20e')
 
 build() {
-  cd "${srcdir}"
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -26,6 +27,6 @@ build() {
 }
 
 package() {
-  cd "$srcdir/build"
+  cd build
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/qt/Drop-read-write-perms-for-users.patch b/extra/qt/Drop-read-write-perms-for-users.patch
deleted file mode 100644
index c3f56e65e..000000000
--- a/extra/qt/Drop-read-write-perms-for-users.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Sat, 22 Dec 2012 08:32:12 -0800
-Subject: [PATCH] Change all shmget calls to user-only memory
-
-Drop the read and write permissions for group and other users in the
-system.
-
-Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876
-(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5)
-Reviewed-by: Richard J. Moore <rich@kde.org>
----
- src/corelib/kernel/qsharedmemory_unix.cpp          |    6 +++---
- src/corelib/kernel/qsystemsemaphore_unix.cpp       |    4 ++--
- src/gui/image/qnativeimage.cpp                     |    2 +-
- src/gui/image/qpixmap_x11.cpp                      |    2 +-
- src/plugins/platforms/xcb/qxcbwindowsurface.cpp    |    2 +-
- src/plugins/platforms/xlib/qxlibwindowsurface.cpp  |    2 +-
- .../auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp |    2 +-
- tools/qvfb/qvfbshmem.cpp                           |    4 ++--
- 8 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp
-index 20d76e3..4cf3acf 100644
---- a/src/corelib/kernel/qsharedmemory_unix.cpp
-+++ b/src/corelib/kernel/qsharedmemory_unix.cpp
-@@ -238,7 +238,7 @@ bool QSharedMemoryPrivate::create(int size)
-     }
- 
-     // create
--    if (-1 == shmget(unix_key, size, 0666 | IPC_CREAT | IPC_EXCL)) {
-+    if (-1 == shmget(unix_key, size, 0600 | IPC_CREAT | IPC_EXCL)) {
-         QString function = QLatin1String("QSharedMemory::create");
-         switch (errno) {
-         case EINVAL:
-@@ -293,7 +293,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode)
- {
- #ifndef QT_POSIX_IPC
-     // grab the shared memory segment id
--    int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0444 : 0660));
-+    int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0400 : 0600));
-     if (-1 == id) {
-         setErrorString(QLatin1String("QSharedMemory::attach (shmget)"));
-         return false;
-@@ -381,7 +381,7 @@ bool QSharedMemoryPrivate::detach()
-     size = 0;
- 
-     // Get the number of current attachments
--    int id = shmget(unix_key, 0, 0444);
-+    int id = shmget(unix_key, 0, 0400);
-     cleanHandle();
- 
-     struct shmid_ds shmid_ds;
-diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp
-index fad9acc..e77456b 100644
---- a/src/corelib/kernel/qsystemsemaphore_unix.cpp
-+++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp
-@@ -153,10 +153,10 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode)
-     }
- 
-     // Get semaphore
--    semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL);
-+    semaphore = semget(unix_key, 1, 0600 | IPC_CREAT | IPC_EXCL);
-     if (-1 == semaphore) {
-         if (errno == EEXIST)
--            semaphore = semget(unix_key, 1, 0666 | IPC_CREAT);
-+            semaphore = semget(unix_key, 1, 0600 | IPC_CREAT);
-         if (-1 == semaphore) {
-             setErrorString(QLatin1String("QSystemSemaphore::handle"));
-             cleanHandle();
-diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
-index 9654afe..fef38c5 100644
---- a/src/gui/image/qnativeimage.cpp
-+++ b/src/gui/image/qnativeimage.cpp
-@@ -176,7 +176,7 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /*
- 
-     bool ok;
-     xshminfo.shmid = shmget(IPC_PRIVATE, xshmimg->bytes_per_line * xshmimg->height,
--                            IPC_CREAT | 0777);
-+                            IPC_CREAT | 0700);
-     ok = xshminfo.shmid != -1;
-     if (ok) {
-         xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0);
-diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp
-index 280d8bd..88c9b7b 100644
---- a/src/gui/image/qpixmap_x11.cpp
-+++ b/src/gui/image/qpixmap_x11.cpp
-@@ -193,7 +193,7 @@ static bool qt_create_mitshm_buffer(const QPaintDevice* dev, int w, int h)
-     bool ok;
-     xshminfo.shmid = shmget(IPC_PRIVATE,
-                              xshmimg->bytes_per_line * xshmimg->height,
--                             IPC_CREAT | 0777);
-+                             IPC_CREAT | 0700);
-     ok = xshminfo.shmid != -1;
-     if (ok) {
-         xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0);
-diff --git a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp
-index b6a42d8..0d56821 100644
---- a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp
-+++ b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp
-@@ -98,7 +98,7 @@ QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size, uint depth, QI
-                                           0);
- 
-     m_shm_info.shmid = shmget (IPC_PRIVATE,
--          m_xcb_image->stride * m_xcb_image->height, IPC_CREAT|0777);
-+          m_xcb_image->stride * m_xcb_image->height, IPC_CREAT|0600);
- 
-     m_shm_info.shmaddr = m_xcb_image->data = (quint8 *)shmat (m_shm_info.shmid, 0, 0);
-     m_shm_info.shmseg = xcb_generate_id(xcb_connection());
-diff --git a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp
-index bf003eb..46a2f97 100644
---- a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp
-+++ b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp
-@@ -99,7 +99,7 @@ void QXlibWindowSurface::resizeShmImage(int width, int height)
- 
- 
-     image_info->shminfo.shmid = shmget (IPC_PRIVATE,
--          image->bytes_per_line * image->height, IPC_CREAT|0777);
-+          image->bytes_per_line * image->height, IPC_CREAT|0700);
- 
-     image_info->shminfo.shmaddr = image->data = (char*)shmat (image_info->shminfo.shmid, 0, 0);
-     image_info->shminfo.readOnly = False;
-diff --git a/tools/qvfb/qvfbshmem.cpp b/tools/qvfb/qvfbshmem.cpp
-index 7f9671f..84b6ebe 100644
---- a/tools/qvfb/qvfbshmem.cpp
-+++ b/tools/qvfb/qvfbshmem.cpp
-@@ -176,13 +176,13 @@ QShMemViewProtocol::QShMemViewProtocol(int displayid, const QSize &s,
-     uint data_offset_value = sizeof(QVFbHeader);
- 
-     int dataSize = bpl * h + data_offset_value;
--    shmId = shmget(key, dataSize, IPC_CREAT | 0666);
-+    shmId = shmget(key, dataSize, IPC_CREAT | 0600);
-     if (shmId != -1)
- 	data = (unsigned char *)shmat(shmId, 0, 0);
-     else {
- 	struct shmid_ds shm;
- 	shmctl(shmId, IPC_RMID, &shm);
--	shmId = shmget(key, dataSize, IPC_CREAT | 0666);
-+    shmId = shmget(key, dataSize, IPC_CREAT | 0600);
- 	if (shmId == -1) {
-             perror("QShMemViewProtocol::QShMemViewProtocol");
-             qFatal("Cannot get shared memory 0x%08x", key);
--- 
-1.7.1
-
diff --git a/extra/qt/Fix-binary-incompatibility-between-openssl-versions.patch b/extra/qt/Fix-binary-incompatibility-between-openssl-versions.patch
deleted file mode 100644
index 5f56edd8d..000000000
--- a/extra/qt/Fix-binary-incompatibility-between-openssl-versions.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 691e78e5061d4cbc0de212d23b06c5dffddf2098 Mon Sep 17 00:00:00 2001
-From: Shane Kearns <dbgshane@gmail.com>
-Date: Thu, 6 Dec 2012 17:03:18 +0000
-Subject: [PATCH 54/79] Fix binary incompatibility between openssl versions
-
-OpenSSL changed the layout of X509_STORE_CTX between 0.9 and 1.0
-So we have to consider this struct as private implementation, and use
-the access functions instead.
-
-This bug would cause certificate verification problems if a different
-version of openssl is loaded at runtime to the headers Qt was compiled
-against.
-
-Task-number: QTBUG-28343
-Change-Id: I47fc24336f7d9c80f08f9c8ba6debc51a5591258
-Reviewed-by: Richard J. Moore <rich@kde.org>
-(cherry picked from commit eb2688c4c4f257d0a4d978ba4bf57d6347b15252)
----
- src/network/ssl/qsslsocket_openssl.cpp         | 2 +-
- src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++++++
- src/network/ssl/qsslsocket_openssl_symbols_p.h | 4 ++++
- 3 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index b7ca290..e912abac 100644
---- a/src/network/ssl/qsslsocket_openssl.cpp
-+++ b/src/network/ssl/qsslsocket_openssl.cpp
-@@ -236,7 +236,7 @@ static int q_X509Callback(int ok, X509_STORE_CTX *ctx)
- {
-     if (!ok) {
-         // Store the error and at which depth the error was detected.
--        _q_sslErrorList()->errors << qMakePair<int, int>(ctx->error, ctx->error_depth);
-+        _q_sslErrorList()->errors << qMakePair<int, int>(q_X509_STORE_CTX_get_error(ctx), q_X509_STORE_CTX_get_error_depth(ctx));
-     }
-     // Always return OK to allow verification to continue. We're handle the
-     // errors gracefully after collecting all errors, after verification has
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index 2d6a25b..2e6ccd0 100644
---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -267,6 +267,10 @@ DEFINEFUNC2(int, X509_STORE_add_cert, X509_STORE *a, a, X509 *b, b, return 0, re
- DEFINEFUNC(void, X509_STORE_CTX_free, X509_STORE_CTX *a, a, return, DUMMYARG)
- DEFINEFUNC4(int, X509_STORE_CTX_init, X509_STORE_CTX *a, a, X509_STORE *b, b, X509 *c, c, STACK_OF(X509) *d, d, return -1, return)
- DEFINEFUNC2(int, X509_STORE_CTX_set_purpose, X509_STORE_CTX *a, a, int b, b, return -1, return)
-+DEFINEFUNC(int, X509_STORE_CTX_get_error, X509_STORE_CTX *a, a, return -1, return)
-+DEFINEFUNC(int, X509_STORE_CTX_get_error_depth, X509_STORE_CTX *a, a, return -1, return)
-+DEFINEFUNC(X509 *, X509_STORE_CTX_get_current_cert, X509_STORE_CTX *a, a, return 0, return)
-+DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return 0, return)
- DEFINEFUNC(X509_STORE_CTX *, X509_STORE_CTX_new, DUMMYARG, DUMMYARG, return 0, return)
- #ifdef SSLEAY_MACROS
- DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return)
-@@ -832,6 +836,10 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(X509_STORE_CTX_init)
-     RESOLVEFUNC(X509_STORE_CTX_new)
-     RESOLVEFUNC(X509_STORE_CTX_set_purpose)
-+    RESOLVEFUNC(X509_STORE_CTX_get_error)
-+    RESOLVEFUNC(X509_STORE_CTX_get_error_depth)
-+    RESOLVEFUNC(X509_STORE_CTX_get_current_cert)
-+    RESOLVEFUNC(X509_STORE_CTX_get_chain)
-     RESOLVEFUNC(X509_cmp)
- #ifndef SSLEAY_MACROS
-     RESOLVEFUNC(X509_dup)
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index fa9a157..87f3697 100644
---- a/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -374,6 +374,10 @@ int q_X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store,
-                           X509 *x509, STACK_OF(X509) *chain);
- X509_STORE_CTX *q_X509_STORE_CTX_new();
- int q_X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose);
-+int q_X509_STORE_CTX_get_error(X509_STORE_CTX *ctx);
-+int q_X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx);
-+X509 *q_X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx);
-+STACK_OF(X509) *q_X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx);
- 
- #define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp)
- #define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL)
--- 
-1.8.0.2
-
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
deleted file mode 100644
index 80c9f2acc..000000000
--- a/extra/qt/PKGBUILD
+++ /dev/null
@@ -1,159 +0,0 @@
-# $Id: PKGBUILD 177062 2013-02-05 13:17:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=qt
-pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.4
-pkgrel=3
-arch=('i686' 'x86_64' 'mips64el')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL')
-makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus'
-    'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
-    'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs'
-    'mysql' 'unixodbc' 'cups' 'gtk2')
-[ "$CARCH" != "mips64el" ] && makedepends+=('libfbclient')
-options=('!libtool')
-_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
-source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz"
-        'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-        'qtconfig.desktop'
-        'improve-cups-support.patch'
-	'declarative-fix-sigbus.patch'
-        'fix-crash-in-assistant.patch'
-        'Fix-binary-incompatibility-between-openssl-versions.patch'
-        'Drop-read-write-perms-for-users.patch')
-md5sums=('89c5ecba180cae74c66260ac732dc5cb'
-         'f1837a03fd0ebbd2da58975845f278e3'
-         '480fea1ed076992b688373c8db274be0'
-         '5595c24d5bb942c21e3a4d299e6d0bf1'
-         '824a3b77a25e98567f640e0441ccdebc'
-         'c439c7731c25387352d8453ca7574971'
-         'aac963d05a9d5733e2bfce9e26607f51'
-         '57590084078b6379f0501f7728b02ae2'
-         'abd18c8a71e08167270b8ec6de61254a'
-         'db29b7dd44c56f6026b53b57bbfd9ea3')
-
-build() {
-  cd ${_pkgfqn}
-
-  # MIPS N32-specific fix, shouldn't affect correctness on other platforms.
-  patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch"
-
-  # (FS#28381) (KDEBUG#180051)
-  patch -p1 -i "${srcdir}"/improve-cups-support.patch
-
-  # (FS#29469)
-  patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch
-
-  # Security fixes
-  patch -p1 -i "${srcdir}"/Fix-binary-incompatibility-between-openssl-versions.patch
-  patch -p1 -i "${srcdir}"/Drop-read-write-perms-for-users.patch
-
-  export QT4DIR="${srcdir}"/${_pkgfqn}
-  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-
-  [ "${CARCH}" = "mips64el" ] && export CXXFLAGS="${CXXFLAGS} -fpermissive"
-
-  sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
-  sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
-  sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
-
-  [ "$CARCH" != "mips64el" ] && extra="-plugin-sql-ibase"
-
-  ./configure -confirm-license -opensource \
-    -prefix /usr \
-    -docdir /usr/share/doc/qt \
-    -plugindir /usr/lib/qt/plugins \
-    -importdir /usr/lib/qt/imports \
-    -datadir /usr/share/qt \
-    -translationdir /usr/share/qt/translations \
-    -sysconfdir /etc/xdg \
-    -examplesdir /usr/share/doc/qt/examples \
-    -demosdir /usr/share/doc/qt/demos \
-    -plugin-sql-{psql,mysql,sqlite,odbc} \
-    -system-sqlite \
-    -no-phonon \
-    -no-phonon-backend \
-    -no-webkit \
-    -graphicssystem raster \
-    -openssl-linked \
-    -nomake demos \
-    -nomake examples \
-    -nomake docs \
-    -silent \
-    -no-rpath \
-    -optimized-qmake \
-    -reduce-relocations \
-    -dbus-linked \
-    -no-openvg \
-    $extra
-  make -j1  # parallel make fails with too long argument list
-}
-
-package_qt() {
-    pkgdesc='A cross-platform application and UI framework'
-    depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus'
-      'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
-      'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
-    optdepends=('postgresql-libs: PostgreSQL driver'
-                'libmysqlclient: MySQL driver'
-                'unixodbc: ODBC driver')
-    [ "$CARCH" != "mips64el" ] && optdepends+=('libfbclient: Firebird/iBase driver')
-    optdepends+=('libxinerama: Xinerama support'
-                'libxcursor: Xcursor support'
-                'libxfixes: Xfixes support'
-                'icu: Unicode support')
-    install='qt.install'
-
-    cd ${_pkgfqn}
-    make INSTALL_ROOT="${pkgdir}" install
-
-    # install missing icons and desktop files
-    for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
-      size=$(echo $(basename ${icon}) | cut -d- -f2)
-      install -D -m644 ${icon} \
-        "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png"
-    done
-    install -D -m644 src/gui/dialogs/images/qtlogo-64.png \
-      "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png"
-    install -D -m644 tools/assistant/tools/assistant/images/assistant.png \
-      "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png"
-    install -D -m644 tools/assistant/tools/assistant/images/assistant-128.png \
-      "${pkgdir}/usr/share/icons/hicolor/128x128/apps/assistant.png"
-    install -D -m644 tools/designer/src/designer/images/designer.png \
-      "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png"
-    install -d "${pkgdir}/usr/share/applications"
-    install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \
-      "${pkgdir}/usr/share/applications/"
-
-    # install license addition
-    install -D -m644 LGPL_EXCEPTION.txt \
-      ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
-
-    # Fix wrong path in pkgconfig files
-    find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
-      -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
-
-    # Fix wrong path in prl files
-    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-      -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-}
-
-package_qt-private-headers(){
-    pkgdesc="Qt private headers for development"
-    depends=("qt=${pkgver}")
-
-    install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
-    install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script}
-    
-    for i in QtCore QtDeclarative QtGui QtScript; do
-      cp -r ${_pkgfqn}/include/${i}/private/ \
-        "${pkgdir}"/usr/include/${i}/
-    done
-
-    for i in corelib declarative gui script; do
-      cp -r ${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/
-    done
-}
diff --git a/extra/qt/disable-ssl-compression.patch b/extra/qt/disable-ssl-compression.patch
deleted file mode 100644
index 443af57f3..000000000
--- a/extra/qt/disable-ssl-compression.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From d41dc3e101a694dec98d7bbb582d428d209e5401 Mon Sep 17 00:00:00 2001
-From: Richard Moore <rich@kde.org>
-Date: Fri, 14 Sep 2012 00:13:08 +0100
-Subject: [PATCH] Disable SSL compression by default.
-
-Disable SSL compression by default since this appears to be the a likely
-cause of the currently hyped CRIME attack.
-
-This is a backport of 5ea896fbc63593f424a7dfbb11387599c0025c74
-
-Change-Id: I6eeefb23c6b140a9633b28ed85879459c474348a
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-Reviewed-by: Peter Hartmann <phartmann@rim.com>
----
- src/network/ssl/qssl.cpp              |    5 +++--
- src/network/ssl/qsslconfiguration.cpp |    4 +++-
- src/network/ssl/qsslconfiguration_p.h |    4 +++-
- 3 files changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
-index 49e086f..9578178 100644
---- a/src/network/ssl/qssl.cpp
-+++ b/src/network/ssl/qssl.cpp
-@@ -148,8 +148,9 @@ QT_BEGIN_NAMESPACE
- 
-     By default, SslOptionDisableEmptyFragments is turned on since this causes
-     problems with a large number of servers. SslOptionDisableLegacyRenegotiation
--    is also turned on, since it introduces a security risk. The other options
--    are turned off.
-+    is also turned on, since it introduces a security risk.
-+    SslOptionDisableCompression is turned on to prevent the attack publicised by
-+    CRIME. The other options are turned off.
- 
-     Note: Availability of above options depends on the version of the SSL
-     backend in use.
-diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
-index 24c7b77..3a05f54 100644
---- a/src/network/ssl/qsslconfiguration.cpp
-+++ b/src/network/ssl/qsslconfiguration.cpp
-@@ -201,7 +201,9 @@ bool QSslConfiguration::isNull() const
-             d->privateKey.isNull() &&
-             d->peerCertificate.isNull() &&
-             d->peerCertificateChain.count() == 0 &&
--            d->sslOptions == (QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation));
-+            d->sslOptions == ( QSsl::SslOptionDisableEmptyFragments
-+                              |QSsl::SslOptionDisableLegacyRenegotiation
-+                              |QSsl::SslOptionDisableCompression));
- }
- 
- /*!
-diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h
-index 74f17cd..c36b651 100644
---- a/src/network/ssl/qsslconfiguration_p.h
-+++ b/src/network/ssl/qsslconfiguration_p.h
-@@ -83,7 +83,9 @@ public:
-         : protocol(QSsl::SecureProtocols),
-           peerVerifyMode(QSslSocket::AutoVerifyPeer),
-           peerVerifyDepth(0),
--          sslOptions(QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation)
-+          sslOptions(QSsl::SslOptionDisableEmptyFragments
-+                     |QSsl::SslOptionDisableLegacyRenegotiation
-+                     |QSsl::SslOptionDisableCompression)
-     { }
- 
-     QSslCertificate peerCertificate;
--- 
-1.7.10
-
diff --git a/extra/qt/fix-assistant-crash.patch b/extra/qt/fix-assistant-crash.patch
deleted file mode 100644
index 67bbbc48b..000000000
--- a/extra/qt/fix-assistant-crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp	2012-06-26 17:37:47.334536023 +0000
-+++ qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp~	2012-06-26 17:37:08.531487286 +0000
-@@ -944,8 +944,7 @@
-     if (helpEngine.usesAppFont())
-         font = helpEngine.appFont();
- 
--    const QWidgetList &widgets = qApp->allWidgets();
--    foreach (QWidget* widget, widgets)
-+    foreach (QWidget* widget, QApplication::allWidgets())
-         widget->setFont(font);
- }
- 
diff --git a/extra/qt/fix-crash-in-assistant.patch b/extra/qt/fix-crash-in-assistant.patch
deleted file mode 100644
index 4246e0532..000000000
--- a/extra/qt/fix-crash-in-assistant.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp	2012-06-26 17:37:47.334536023 +0000
-+++ qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp~	2012-06-26 17:37:08.531487286 +0000
-@@ -944,8 +944,7 @@
-     if (helpEngine.usesAppFont())
-         font = helpEngine.appFont();
-
--    const QWidgetList &widgets = qApp->allWidgets();
--    foreach (QWidget* widget, widgets)
-+    foreach (QWidget* widget, QApplication::allWidgets())
-         widget->setFont(font);
- }
diff --git a/extra/qt/fix-qtscript-crash.patch b/extra/qt/fix-qtscript-crash.patch
deleted file mode 100644
index 97b1cc62d..000000000
--- a/extra/qt/fix-qtscript-crash.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e6b7178bc2e62a37b4737695bced1b46bced9215 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= <jedrzej.nowacki@digia.com>
-Date: Mon, 22 Oct 2012 15:17:19 +0200
-Subject: [PATCH] Fix mmap usage.
-
-Add missing MAP_NORESERVE and fix error checking.
-
-Special thanks to Olivier JG for debugging the issue.
-
-Task-number: QTBUG-27322
-Change-Id: Ia9f4aa80415f0127318714912b524131a5b0f18a
-Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
----
- .../JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp             | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-index 16d0fb1..e1237e4 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-@@ -305,8 +305,8 @@ public:
-         randomLocation += (1 << 24);
-         randomLocation <<= 21;
- #endif
--        m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
--        if (!m_base)
-+        m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
-+        if (m_base == MAP_FAILED)
-             CRASH();
- 
-         // For simplicity, we keep all memory in m_freeList in a 'released' state.
--- 
-1.8.0
-
diff --git a/extra/qt/qsortfilterproxymodel.patch b/extra/qt/qsortfilterproxymodel.patch
deleted file mode 100644
index 33770e47d..000000000
--- a/extra/qt/qsortfilterproxymodel.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 989e6c5ee6f3e38b24632ec5caf49c5b03d17aed Mon Sep 17 00:00:00 2001
-From: Stephen Kelly <stephen.kelly@kdab.com>
-Date: Fri, 14 Sep 2012 15:42:34 +0200
-Subject: [PATCH] Fix crash when invalidating a QSortFilterProxyModel
-
-Backport of d7a15fbfd93fb566c7793596ea50d8786b9eb654 from qtbase.
-
-Task-number: QTBUG-27122
-Change-Id: I0b1eda292fd9648e6f08629f7a069b66bb8b59e8
-Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
----
- src/gui/itemviews/qsortfilterproxymodel.cpp        | 28 +++++++---
- .../tst_qsortfilterproxymodel.cpp                  | 61 ++++++++++++++++++++++
- 2 files changed, 83 insertions(+), 6 deletions(-)
-
-diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp
-index d937b63..9fe224e 100644
---- a/src/gui/itemviews/qsortfilterproxymodel.cpp
-+++ b/src/gui/itemviews/qsortfilterproxymodel.cpp
-@@ -1036,18 +1036,34 @@ void QSortFilterProxyModelPrivate::filter_changed(const QModelIndex &source_pare
-     Mapping *m = it.value();
-     QSet<int> rows_removed = handle_filter_changed(m->proxy_rows, m->source_rows, source_parent, Qt::Vertical);
-     QSet<int> columns_removed = handle_filter_changed(m->proxy_columns, m->source_columns, source_parent, Qt::Horizontal);
--    QVector<QModelIndex> mappedChildren = m->mapped_children;
--    QVector<QModelIndex>::iterator it2 = mappedChildren.end();
--    while (it2 != mappedChildren.begin()) {
--        --it2;
--        const QModelIndex source_child_index = *it2;
-+
-+    // We need to iterate over a copy of m->mapped_children because otherwise it may be changed by other code, invalidating
-+    // the iterator it2.
-+    // The m->mapped_children vector can be appended to with indexes which are no longer filtered
-+    // out (in create_mapping) when this function recurses for child indexes.
-+    const QVector<QModelIndex> mappedChildren = m->mapped_children;
-+    QVector<int> indexesToRemove;
-+    for (int i = 0; i < mappedChildren.size(); ++i) {
-+        const QModelIndex source_child_index = mappedChildren.at(i);
-         if (rows_removed.contains(source_child_index.row()) || columns_removed.contains(source_child_index.column())) {
--            it2 = mappedChildren.erase(it2);
-+            indexesToRemove.push_back(i);
-             remove_from_mapping(source_child_index);
-         } else {
-             filter_changed(source_child_index);
-         }
-     }
-+    QVector<int>::const_iterator removeIt = indexesToRemove.constEnd();
-+    const QVector<int>::const_iterator removeBegin = indexesToRemove.constBegin();
-+
-+    // We can't just remove these items from mappedChildren while iterating above and then
-+    // do something like m->mapped_children = mappedChildren, because mapped_children might
-+    // be appended to in create_mapping, and we would lose those new items.
-+    // Because they are always appended in create_mapping, we can still remove them by
-+    // position here.
-+    while (removeIt != removeBegin) {
-+        --removeIt;
-+        m->mapped_children.remove(*removeIt);
-+    }
- }
- 
- /*!
--- 
-1.8.0
-
diff --git a/extra/qt/qtconfig.desktop b/extra/qt/qtconfig.desktop
deleted file mode 100644
index 95770ff6a..000000000
--- a/extra/qt/qtconfig.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt Config 
-Comment=Configure Qt behavior, styles, fonts
-Exec=/usr/bin/qtconfig
-Icon=qtlogo
-Terminal=false
-Type=Application
-Categories=Qt;Settings;
-NoDisplay=true
diff --git a/extra/qt/undo-fix-jit-crash-on-x86_64.patch b/extra/qt/undo-fix-jit-crash-on-x86_64.patch
deleted file mode 100644
index ac86a846b..000000000
--- a/extra/qt/undo-fix-jit-crash-on-x86_64.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-Description: Fix JIT crash on x86-64 (avoid 32-bit branch offset overflow)
- .
- Cherry-picked from webkit commit
- a5b3261a8c4386b4e14ce40a34c7fc933a5f7001
-Origin: commit ada98493bbfbd9af0d0b593017e29d39bcd3495e
-Author: Kent Hansen <kent.hansen@nokia.com>
-Forwarded: not-needed
-Applied-Upstream: yes
-Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
-Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
----
- .../javascriptcore/JavaScriptCore/ChangeLog        |   27 +++++++++++++++++
- .../JavaScriptCore/JavaScriptCore.pri              |    1 +
- .../JavaScriptCore/jit/ExecutableAllocator.cpp     |   21 +++++++++++++
- .../jit/ExecutableAllocatorFixedVMPool.cpp         |   31 +++++++++++++-------
- .../jit/ExecutableAllocatorPosix.cpp               |   29 ++----------------
- .../jit/ExecutableAllocatorSymbian.cpp             |    2 +-
- .../JavaScriptCore/jit/ExecutableAllocatorWin.cpp  |    2 +-
- .../javascriptcore/JavaScriptCore/wtf/Platform.h   |   10 +++++++
- 8 files changed, 84 insertions(+), 39 deletions(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
-index 9cbf0c1..5ab23e6 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
-@@ -1,3 +1,30 @@
-+2010-07-08  Gavin Barraclough  <barraclough@apple.com>
-+
-+        Reviewed by Sam Weinig.
-+
-+        https://bugs.webkit.org/show_bug.cgi?id=41641
-+
-+        Update compile flags to allow use of ExecutableAllocatorFixedVMPool on platforms
-+        other than x86-64 (this may be useful on 32-bit platforms, too).
-+
-+        Simplify ifdefs by dividing into thwo broad allocation strategies
-+        (ENABLE_EXECUTABLE_ALLOCATOR_FIXED & ENABLE_EXECUTABLE_ALLOCATOR_DEMAND).
-+
-+        Rename constant used in the code to have names descriptive of their purpose,
-+        rather than their specific value on a given platform.
-+
-+        * jit/ExecutableAllocator.cpp:
-+        (JSC::ExecutableAllocator::reprotectRegion):
-+        (JSC::ExecutableAllocator::cacheFlush):
-+        * jit/ExecutableAllocatorFixedVMPool.cpp:
-+        (JSC::FixedVMPoolAllocator::FixedVMPoolAllocator):
-+        (JSC::FixedVMPoolAllocator::free):
-+        (JSC::ExecutablePool::systemAlloc):
-+        * jit/ExecutableAllocatorPosix.cpp:
-+        * jit/ExecutableAllocatorSymbian.cpp:
-+        * jit/ExecutableAllocatorWin.cpp:
-+        * wtf/Platform.h:
-+
- 2010-08-24  Oliver Hunt  <oliver@apple.com>
- 
-         Reviewed by Geoff Garen.
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
-index b061321..847f69c 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
-@@ -100,6 +100,7 @@ SOURCES += \
-     interpreter/CallFrame.cpp \
-     interpreter/Interpreter.cpp \
-     interpreter/RegisterFile.cpp \
-+    jit/ExecutableAllocatorFixedVMPool.cpp \
-     jit/ExecutableAllocatorPosix.cpp \
-     jit/ExecutableAllocatorSymbian.cpp \
-     jit/ExecutableAllocatorWin.cpp \
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp
-index f6b27ec..f0ebbab 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp
-@@ -33,6 +33,27 @@ namespace JSC {
- 
- size_t ExecutableAllocator::pageSize = 0;
- 
-+#if ENABLE(ASSEMBLER_WX_EXCLUSIVE)
-+void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSeting setting)
-+{
-+    if (!pageSize)
-+        intializePageSize();
-+
-+    // Calculate the start of the page containing this region,
-+    // and account for this extra memory within size.
-+    intptr_t startPtr = reinterpret_cast<intptr_t>(start);
-+    intptr_t pageStartPtr = startPtr & ~(pageSize - 1);
-+    void* pageStart = reinterpret_cast<void*>(pageStartPtr);
-+    size += (startPtr - pageStartPtr);
-+
-+    // Round size up
-+    size += (pageSize - 1);
-+    size &= ~(pageSize - 1);
-+
-+    mprotect(pageStart, size, (setting == Writable) ? PROTECTION_FLAGS_RW : PROTECTION_FLAGS_RX);
-+}
-+#endif
-+
- }
- 
- #endif // HAVE(ASSEMBLER)
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-index dd1db4e..16d0fb1 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-@@ -27,25 +27,33 @@
- 
- #include "ExecutableAllocator.h"
- 
--#include <errno.h>
-+#if ENABLE(EXECUTABLE_ALLOCATOR_FIXED)
- 
--#if ENABLE(ASSEMBLER) && OS(DARWIN) && CPU(X86_64)
-+#include <errno.h>
- 
- #include "TCSpinLock.h"
--#include <mach/mach_init.h>
--#include <mach/vm_map.h>
- #include <sys/mman.h>
- #include <unistd.h>
- #include <wtf/AVLTree.h>
- #include <wtf/VMTags.h>
- 
-+#if CPU(X86_64)
-+    // These limits suitable on 64-bit platforms (particularly x86-64, where we require all jumps to have a 2Gb max range).
-+    #define VM_POOL_SIZE (2u * 1024u * 1024u * 1024u) // 2Gb
-+    #define COALESCE_LIMIT (16u * 1024u * 1024u) // 16Mb
-+#else
-+    // These limits are hopefully sensible on embedded platforms.
-+    #define VM_POOL_SIZE (32u * 1024u * 1024u) // 32Mb
-+    #define COALESCE_LIMIT (4u * 1024u * 1024u) // 4Mb
-+#endif
-+
-+// ASLR currently only works on darwin (due to arc4random) & 64-bit (due to address space size).
-+#define VM_POOL_ASLR (OS(DARWIN) && CPU(X86_64))
-+
- using namespace WTF;
- 
- namespace JSC {
- 
--#define TWO_GB (2u * 1024u * 1024u * 1024u)
--#define SIXTEEN_MB (16u * 1024u * 1024u)
--
- // FreeListEntry describes a free chunk of memory, stored in the freeList.
- struct FreeListEntry {
-     FreeListEntry(void* pointer, size_t size)
-@@ -291,9 +299,12 @@ public:
-         // for now instead of 2^26 bits of ASLR lets stick with 25 bits of randomization plus
-         // 2^24, which should put up somewhere in the middle of usespace (in the address range
-         // 0x200000000000 .. 0x5fffffffffff).
--        intptr_t randomLocation = arc4random() & ((1 << 25) - 1);
-+        intptr_t randomLocation = 0;
-+#if VM_POOL_ASLR
-+        randomLocation = arc4random() & ((1 << 25) - 1);
-         randomLocation += (1 << 24);
-         randomLocation <<= 21;
-+#endif
-         m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
-         if (!m_base)
-             CRASH();
-@@ -387,7 +398,7 @@ public:
-         // 16MB of allocations have been freed, sweep m_freeList
-         // coalescing any neighboring fragments.
-         m_countFreedSinceLastCoalesce += size;
--        if (m_countFreedSinceLastCoalesce >= SIXTEEN_MB) {
-+        if (m_countFreedSinceLastCoalesce >= COALESCE_LIMIT) {
-             m_countFreedSinceLastCoalesce = 0;
-             coalesceFreeSpace();
-         }
-@@ -429,7 +440,7 @@ ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t size)
-   SpinLockHolder lock_holder(&spinlock);
- 
-     if (!allocator)
--        allocator = new FixedVMPoolAllocator(JIT_ALLOCATOR_LARGE_ALLOC_SIZE, TWO_GB);
-+        allocator = new FixedVMPoolAllocator(JIT_ALLOCATOR_LARGE_ALLOC_SIZE, VM_POOL_SIZE);
-     ExecutablePool::Allocation alloc = {reinterpret_cast<char*>(allocator->alloc(size)), size};
-     return alloc;
- }
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp
-index 2eb0c87..b04049c 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp
-@@ -27,7 +27,7 @@
- 
- #include "ExecutableAllocator.h"
- 
--#if ENABLE(ASSEMBLER) && OS(UNIX) && !OS(SYMBIAN)
-+#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && !OS(WINDOWS) && !OS(SYMBIAN)
- 
- #include <sys/mman.h>
- #include <unistd.h>
-@@ -35,8 +35,6 @@
- 
- namespace JSC {
- 
--#if !(OS(DARWIN) && !PLATFORM(QT) && CPU(X86_64))
--
- void ExecutableAllocator::intializePageSize()
- {
-     ExecutableAllocator::pageSize = getpagesize();
-@@ -57,29 +55,6 @@ void ExecutablePool::systemRelease(const ExecutablePool::Allocation& alloc)
-     ASSERT_UNUSED(result, !result);
- }
- 
--#endif // !(OS(DARWIN) && !PLATFORM(QT) && CPU(X86_64))
--
--#if ENABLE(ASSEMBLER_WX_EXCLUSIVE)
--void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSeting setting)
--{
--    if (!pageSize)
--        intializePageSize();
--
--    // Calculate the start of the page containing this region,
--    // and account for this extra memory within size.
--    intptr_t startPtr = reinterpret_cast<intptr_t>(start);
--    intptr_t pageStartPtr = startPtr & ~(pageSize - 1);
--    void* pageStart = reinterpret_cast<void*>(pageStartPtr);
--    size += (startPtr - pageStartPtr);
--
--    // Round size up
--    size += (pageSize - 1);
--    size &= ~(pageSize - 1);
--
--    mprotect(pageStart, size, (setting == Writable) ? PROTECTION_FLAGS_RW : PROTECTION_FLAGS_RX);
--}
--#endif
--
- }
- 
--#endif // HAVE(ASSEMBLER)
-+#endif
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp
-index e82975c..9028f50 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp
-@@ -22,7 +22,7 @@
- 
- #include "ExecutableAllocator.h"
- 
--#if ENABLE(ASSEMBLER) && OS(SYMBIAN)
-+#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && OS(SYMBIAN)
- 
- #include <e32hal.h>
- #include <e32std.h>
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp
-index e38323c..72a1d5f 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp
-@@ -27,7 +27,7 @@
- 
- #include "ExecutableAllocator.h"
- 
--#if ENABLE(ASSEMBLER) && OS(WINDOWS)
-+#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && OS(WINDOWS)
- 
- #include "windows.h"
- 
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-index 700977e..d930ed7 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-@@ -1016,6 +1016,16 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
- #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 0
- #endif
- 
-+/* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in.
-+   On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */
-+#if ENABLE(ASSEMBLER)
-+#if CPU(X86_64)
-+#define ENABLE_EXECUTABLE_ALLOCATOR_FIXED 1
-+#else
-+#define ENABLE_EXECUTABLE_ALLOCATOR_DEMAND 1
-+#endif
-+#endif
-+
- #if !defined(ENABLE_PAN_SCROLLING) && OS(WINDOWS)
- #define ENABLE_PAN_SCROLLING 1
- #endif
--- 
-1.7.10.4
-
diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD
index 220142e06..835e5f3b8 100644
--- a/extra/qt3/PKGBUILD
+++ b/extra/qt3/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 168609 2012-10-13 11:48:48Z andyrtr $
+# $Id: PKGBUILD 182387 2013-04-09 21:20:53Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=qt3
 pkgver=3.3.8b
-pkgrel=2
+pkgrel=4
 epoch=1
-pkgdesc="The QT3 gui toolkit"
+pkgdesc="A cross-platform application and UI framework"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.trolltech.com/products/qt/index.html"
 license=('GPL')
 depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'glu' 'libxft'
          'libxrandr' 'libmng')
-makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite' 'mesa')
-optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
-options=('!libtool')
-install=qt.install
-source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.gz
-        qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2
+makedepends=('mariadb' 'postgresql' 'unixodbc' 'sqlite' 'mesa')
+optdepends=('libmariadbclient: MariaDB driver'
+            'postgresql-libs: PostgreSQL driver'
+            'unixodbc: ODBC driver')
+options=('!libtool' '!docs')
+source=(ftp://ftp.qt-project.org/qt/source/qt-x11-free-${pkgver}.tar.gz
+        qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2
         eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch)
 sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854'
-          'd2e257a9011208b2cb81b9cf47915b9a2f9dab83'
           '3d19510c46016a1a211d97bf8f82b01498b1b33c'
           '33418e5b117458af23c72cdbffc0c339bc34bdc4'
           '116afa0e737bdf27ea27f9b3653aeb56db9ec151'
@@ -31,11 +31,11 @@ sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854'
 # other qt-patches come from fedora and gentoo
 
 build() {
-  unset QMAKESPEC
   export QTDIR="${srcdir}"/qt-x11-free-${pkgver}
   export PATH=${QTDIR}/bin:${PATH}
   export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
   export QMAKESPEC=$QTDIR/mkspecs/linux-g++
+
   cd "${srcdir}"/qt-x11-free-${pkgver}
   # apply qt patches from kde.org
   for i in ../qt-copy-kde-patches/*; do
@@ -51,27 +51,25 @@ build() {
   patch -p1 -i "${srcdir}"/qt-odbc.patch 
   # fix build with gcc 4.6.0
   patch -p1 -i "${srcdir}"/gcc-4.6.patch
-
   patch -p0 -i "${srcdir}"/qt3-png15.patch 
-  # start compiling qt
-  sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
-  rm -rf doc/html examples tutorial
-  sed -i "s|sub-tutorial sub-examples||" Makefile
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf
+ 
+  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++{,-32,-64}/qmake.conf
   sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
   sed -i "s|read acceptance|acceptance=yes|" configure
 
- # remove unwanted mkspecs
-  rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
-
   if [ "$CARCH" = "x86_64" ]; then
       export ARCH="-64"	
     else unset ARCH
   fi
 
-  ./configure -prefix /opt/qt \
+  ./configure \
+    -prefix /usr \
+    -bindir /usr/lib/qt3/bin \
+    -headerdir /usr/include/qt3 \
+    -plugindir /usr/lib/qt3/plugins \
+    -datadir /usr/share/qt3 \
+    -translationdir /usr/share/qt3/translations \
+    -I/usr/include/mysql -I/usr/include/postgresql/server \
     -platform linux-g++$ARCH \
     -system-zlib \
     -qt-gif \
@@ -85,40 +83,26 @@ build() {
     -no-g++-exceptions \
     -plugin-sql-{mysql,psql,sqlite,odbc}
 
-  # fix /opt/qt/lib path
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile
-
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  make -C qmake 
-  cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql
-  "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
-  cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql
-  "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
-
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  # fix the broken makefiles
-  #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
   make
 }
 
 package() {
   cd "${srcdir}"/qt-x11-free-${pkgver}
   make INSTALL_ROOT="${pkgdir}" install
-  rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations}
-  sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl
-  install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake
-  install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh
-  ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config 
-  rm -f "${pkgdir}"/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH
+  sed -i -e "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" -e "s|${srcdir}/||g" "${pkgdir}"/usr/lib/*.prl
+  rm -rf "${pkgdir}"/usr/share/qt3/{phrasebooks,templates,translations}
+  rm -rf "${pkgdir}"/usr/share/qt3/mkspecs/{aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,linux-g++$ARCH/linux-g++$ARCH,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} 
 
-  # install man pages
-  install -d -m755 "${pkgdir}"/opt/qt/man
-  cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/
+# install man pages
+  install -d -m755 "${pkgdir}"/usr/share/man
+  cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/usr/share/man/
+  for i in "${pkgdir}"/usr/share/man/man1/*; do
+    mv $i ${i%.*}-qt3.1
+  done
 
-  install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
-  echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf
+# Useful symlinks for cmake and configure scripts
+  install -d "${pkgdir}"/usr/bin
+  for b in "${pkgdir}"/usr/lib/qt3/bin/*; do
+    ln -s /usr/lib/qt3/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt3
+  done
 }
diff --git a/extra/qt3/qt.install b/extra/qt3/qt.install
deleted file mode 100644
index 6d042daae..000000000
--- a/extra/qt3/qt.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	post_remove
-}
-
-post_upgrade() {
-	post_remove
-}
-
-post_remove() {
-	# this can be removed in future versions
-	sed  -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf
-}
diff --git a/extra/qt3/qt.profile b/extra/qt3/qt.profile
deleted file mode 100644
index ed4d232ae..000000000
--- a/extra/qt3/qt.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export QTDIR=/opt/qt
-export QT_XFT=true
-export PATH=$PATH:$QTDIR/bin
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig
diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD
new file mode 100644
index 000000000..62851cbea
--- /dev/null
+++ b/extra/qt4/PKGBUILD
@@ -0,0 +1,132 @@
+# $Id: PKGBUILD 180689 2013-03-25 19:15:41Z bpiotrowski $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=qt4
+pkgver=4.8.4
+pkgrel=16
+arch=('i686' 'x86_64' 'mips64el')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL')
+pkgdesc='A cross-platform application and UI framework'
+depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus'
+        'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
+        'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2'
+             'mesa-libgl')
+optdepends=('postgresql-libs: PostgreSQL driver'
+            'libmariadbclient: MariaDB driver'
+            'unixodbc: ODBC driver'
+            'libxinerama: Xinerama support'
+            'libxcursor: Xcursor support'
+            'libxfixes: Xfixes support'
+            'icu: Unicode support')
+if [ "$CARCH" != "mips64el" ]; then
+  makedepends+=('libfbclient')
+  optdepends+=('libfbclient: Firebird/iBase driver')
+fi
+install="${pkgname}.install"
+options=('!libtool')
+replaces=('qt<=4.8.4')
+conflicts=('qt')
+_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
+source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz"
+        'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' 'linguist-qt4.desktop'
+        'improve-cups-support.patch'
+	'declarative-fix-sigbus.patch')
+md5sums=('89c5ecba180cae74c66260ac732dc5cb'
+         'a16638f4781e56e7887ff8212a322ecc'
+         '4f0152ba6d645e81218b23ba8beeb42d'
+         '283a00ff7f662dca481b70d6daa826e0'
+         '027683880235708d4bc270a7ef961183'
+         'c439c7731c25387352d8453ca7574971'
+         'aac963d05a9d5733e2bfce9e26607f51')
+
+build() {
+  cd ${_pkgfqn}
+
+  # (FS#28381) (KDEBUG#180051)
+  patch -p1 -i "${srcdir}"/improve-cups-support.patch
+
+  # MIPS N32-specific fix, shouldn't affect correctness on other platforms.
+  patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch"
+
+  export QT4DIR="${srcdir}"/${_pkgfqn}
+  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+
+  [ "${CARCH}" = "mips64el" ] && export CXXFLAGS="${CXXFLAGS} -fpermissive"
+
+  sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
+  sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
+  sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
+
+  [ "$CARCH" != "mips64el" ] && extra="-plugin-sql-ibase"
+
+  ./configure -confirm-license -opensource \
+    -prefix /usr \
+    -bindir /usr/lib/qt4/bin \
+    -headerdir /usr/include/qt4 \
+    -docdir /usr/share/doc/qt4 \
+    -plugindir /usr/lib/qt4/plugins \
+    -importdir /usr/lib/qt4/imports \
+    -datadir /usr/share/qt4 \
+    -translationdir /usr/share/qt4/translations \
+    -sysconfdir /etc/xdg \
+    -examplesdir /usr/share/doc/qt4/examples \
+    -demosdir /usr/share/doc/qt4/demos \
+    -plugin-sql-{psql,mysql,sqlite,odbc} \
+    -system-sqlite \
+    -no-phonon \
+    -no-phonon-backend \
+    -no-webkit \
+    -graphicssystem raster \
+    -openssl-linked \
+    -nomake demos \
+    -nomake examples \
+    -nomake docs \
+    -silent \
+    -no-rpath \
+    -optimized-qmake \
+    -reduce-relocations \
+    -dbus-linked \
+    -no-openvg \
+    $extra
+  make
+}
+
+package() {
+    cd ${_pkgfqn}
+    make INSTALL_ROOT="${pkgdir}" install
+
+    # install missing icons and desktop files
+    install -D -m644 src/gui/dialogs/images/qtlogo-64.png \
+      "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qt4logo.png"
+    install -d "${pkgdir}"/usr/share/applications
+    install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig}-qt4.desktop \
+      "${pkgdir}/usr/share/applications/"
+
+    # Useful symlinks for cmake and configure scripts
+    install -d "${pkgdir}"/usr/bin
+    for b in "${pkgdir}"/usr/lib/qt4/bin/*; do
+      ln -s /usr/lib/qt4/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt4
+    done
+
+    # install license addition
+    install -D -m644 LGPL_EXCEPTION.txt \
+      ${pkgdir}/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+
+    # Fix wrong libs path in pkgconfig files
+    find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
+      -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
+
+    # Fix wrong bins path in pkgconfig files
+    find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
+      -exec sed -i 's|/usr/bin/|/usr/lib/qt4/bin/|g' {} \;
+
+    # Fix wrong path in prl files
+    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+      -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+
+    # The TGA plugin is broken (FS#33568)
+    rm "${pkgdir}"/usr/lib/qt4/plugins/imageformats/libqtga.so
+}
diff --git a/extra/qt4/assistant-qt4.desktop b/extra/qt4/assistant-qt4.desktop
new file mode 100644
index 000000000..d2904beb2
--- /dev/null
+++ b/extra/qt4/assistant-qt4.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt4 Assistant 
+Comment=Shows Qt4 documentation and examples
+Exec=assistant-qt4
+Icon=assistant
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;Documentation;
diff --git a/extra/qt/declarative-fix-sigbus.patch b/extra/qt4/declarative-fix-sigbus.patch
index 0d446fce5..0d446fce5 100644
--- a/extra/qt/declarative-fix-sigbus.patch
+++ b/extra/qt4/declarative-fix-sigbus.patch
diff --git a/extra/qt4/designer-qt4.desktop b/extra/qt4/designer-qt4.desktop
new file mode 100644
index 000000000..514146e78
--- /dev/null
+++ b/extra/qt4/designer-qt4.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Qt4 Designer
+GenericName=Interface Designer
+Comment=Design GUIs for Qt4 applications
+Exec=designer-qt4
+Icon=designer
+MimeType=application/x-designer;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;
diff --git a/extra/qt/improve-cups-support.patch b/extra/qt4/improve-cups-support.patch
index e0305e11b..e0305e11b 100644
--- a/extra/qt/improve-cups-support.patch
+++ b/extra/qt4/improve-cups-support.patch
diff --git a/extra/qt4/linguist-qt4.desktop b/extra/qt4/linguist-qt4.desktop
new file mode 100644
index 000000000..61036b307
--- /dev/null
+++ b/extra/qt4/linguist-qt4.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qt4 Linguist 
+Comment=Add translations to Qt4 applications
+Exec=linguist-qt4
+Icon=linguist
+MimeType=text/vnd.trolltech.linguist;application/x-linguist;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;
diff --git a/extra/qt/qt.install b/extra/qt4/qt4.install
index 5495fb1b5..5495fb1b5 100644
--- a/extra/qt/qt.install
+++ b/extra/qt4/qt4.install
diff --git a/extra/qt4/qtconfig-qt4.desktop b/extra/qt4/qtconfig-qt4.desktop
new file mode 100644
index 000000000..578963124
--- /dev/null
+++ b/extra/qt4/qtconfig-qt4.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt4 Config 
+Comment=Configure Qt4 behavior, styles, fonts
+Exec=qtconfig-qt4
+Icon=qt4logo
+Terminal=false
+Type=Application
+Categories=Qt;Settings;
+NoDisplay=true
diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
new file mode 100644
index 000000000..67e7f8647
--- /dev/null
+++ b/extra/qt5/PKGBUILD
@@ -0,0 +1,347 @@
+# $Id: PKGBUILD 182619 2013-04-11 11:34:49Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgbase=qt5
+pkgname=('qt5-base'
+         'qt5-imageformats'
+         'qt5-script'
+         'qt5-svg'
+         'qt5-xmlpatterns')
+# V8 is not ported yet to mips64el, don't build jsbackend and its reverse dependencies there.
+[ "$CARCH" != "mips64el" ] && pkgname+=(
+         'qt5-declarative'
+         'qt5-doc'
+         'qt5-graphicaleffects'
+         'qt5-jsbackend'
+         'qt5-multimedia'
+         'qt5-quick1'
+         'qt5-tools'
+         'qt5-translations')
+pkgver=5.0.2
+pkgrel=1
+arch=('i686' 'x86_64' 'mips64el')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL')
+makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms'
+            'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins'
+            'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils'
+            'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
+            'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
+            'libmng' 'openal' 'gtk2')
+[ "$CARCH" != "mips64el" ] && makedepends+=('libfbclient')
+groups=('qt' 'qt5')
+options=('!libtool')
+_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
+source=("http://releases.qt-project.org/${pkgbase}/${pkgver}/single/${_pkgfqn}.tar.xz"
+        'assistant.desktop' 'designer.desktop' 'linguist.desktop'
+        'use-python2.patch' 'gcc48.patch'
+	'qatomic-before-mips32.patch')
+md5sums=('2cab3518d86fe8f0638c7faea8b46397'
+         'f1837a03fd0ebbd2da58975845f278e3'
+         '480fea1ed076992b688373c8db274be0'
+         '5595c24d5bb942c21e3a4d299e6d0bf1'
+         'd6ab43fb371be494e3bfd9b210c40bf1'
+         '7927028e2374321c78a76df858e723d6'
+         '84d7fcc2b5f270f482d5522ae01c29e2')
+
+build() {
+  cd ${_pkgfqn}
+
+  export QTDIR="${srcdir}"/${_pkgfqn}
+  export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
+
+  sed -i "s|-O2|${CXXFLAGS}|" qtbase/mkspecs/common/{g++,gcc}-base.conf
+  sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" qtbase/mkspecs/common/gcc-base-unix.conf
+  sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" qtbase/mkspecs/common/gcc-base.conf
+
+  # Use python2 for Python 2.x
+  patch -p1 -i "${srcdir}"/use-python2.patch
+  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+    $(find . -name '*.py')
+
+  [ "$CARCH" != "mips64el" ] && extra="-plugin-sql-ibase"
+
+  # Fix build without -march=mips32, mips64 or its superset.
+  patch -p1 -i "$srcdir/qatomic-before-mips32.patch"
+
+  # GCC 4.8 fixes
+  cd qtbase
+  patch -p1 -i "${srcdir}"/gcc48.patch
+  cd ../
+
+
+  ./configure -confirm-license -opensource \
+    -prefix /usr \
+    -bindir /usr/lib/qt/bin \
+    -docdir /usr/share/doc/qt \
+    -headerdir /usr/include/qt \
+    -archdatadir /usr/lib/qt \
+    -datadir /usr/share/qt \
+    -sysconfdir /etc/xdg \
+    -examplesdir /usr/share/doc/qt/examples \
+    -plugin-sql-{psql,mysql,sqlite,odbc} \
+    -system-sqlite \
+    -openssl-linked \
+    -nomake docs \
+    -nomake examples \
+    -nomake tests \
+    -no-rpath \
+    -optimized-qmake \
+    -dbus-linked \
+    -reduce-relocations \
+    $extra
+
+  [ "$CARCH" = "mips64el" ] && modules="module-qtbase module-qtimageformats module-qtscript module-qtsvg module-qtxmlpatterns"
+
+  make $modules
+
+if [ "$CARCH" != "mips64el" ]; then
+  # build docs
+  make docs
+
+  # build examples
+  for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \
+    qtwebkit-examples-and-demos qtxmlpatterns; do
+    cd ${m}/examples
+    ${QTDIR}/qmake
+    make
+  cd ../../
+  done
+fi
+}
+
+package_qt5-base() {
+  pkgdesc='A cross-platform application and UI framework'
+  depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd'
+           'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng' 'xcb-util-image'
+           'hicolor-icon-theme' 'xdg-utils' 'icu' 'qtchooser')
+  optdepends=('postgresql-libs: PostgreSQL driver'
+              'libmariadbclient: MariaDB driver'
+              'unixodbc: ODBC driver')
+  [ "$CARCH" != "mips64el" ] && optdepends+=('libfbclient: Firebird/iBase driver')
+  install='qt5-base.install'
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtbase
+  make INSTALL_ROOT="${pkgdir}" install
+  
+  cd "${srcdir}"
+  install -D -m644 ${_pkgfqn}/qtbase/LGPL_EXCEPTION.txt \
+    ${pkgdir}/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt
+
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+
+  # Fix wrong qmake path in pri file
+  sed -i "s|${srcdir}/${_pkgfqn}/qtbase|/usr|" \
+    "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap.pri
+
+  # Useful symlinks
+  install -d "${pkgdir}"/usr/bin
+  for b in "${pkgdir}"/usr/lib/qt/bin/*; do
+    ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
+  done
+}
+
+package_qt5-declarative() {
+  pkgdesc='A cross-platform application and UI framework (QtQml, QtQuick)'
+  depends=('qt5-jsbackend' 'qt5-xmlpatterns')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtdeclarative
+  make INSTALL_ROOT="${pkgdir}" install
+  
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+  
+  # Useful symlinks
+  install -d "${pkgdir}"/usr/bin
+  for b in "${pkgdir}"/usr/lib/qt/bin/*; do
+    ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
+  done
+}
+
+package_qt5-doc() {
+  pkgdesc='A cross-platform application and UI framework (Documentation and Examples)'
+  depends=('qt5-base')
+  conflicts=('qt-doc')
+  replaces=('qt-doc')
+  provides=('qt-doc')
+  options=('docs')
+  groups=()
+
+  cd ${_pkgfqn}
+  make INSTALL_ROOT="${pkgdir}" install_docs
+
+  for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \
+    qtwebkit-examples-and-demos qtxmlpatterns; do
+    cd ${m}/examples
+    make INSTALL_ROOT="${pkgdir}" install
+    cd ../../
+  done
+}
+
+package_qt5-jsbackend() {
+  pkgdesc='A cross-platform application and UI framework (QtV8)'
+  depends=('qt5-base')
+
+  cd ${_pkgfqn}/qtjsbackend
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+}
+
+package_qt5-xmlpatterns() {
+  pkgdesc='A cross-platform application and UI framework (QtXmlPatterns)'
+  depends=('qt5-base')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtxmlpatterns
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+  
+  # Useful symlinks
+  install -d "${pkgdir}"/usr/bin
+  for b in "${pkgdir}"/usr/lib/qt/bin/*; do
+    ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
+  done
+}
+
+package_qt5-translations() {
+  pkgdesc='A cross-platform application and UI framework (Translations)'
+  depends=('qt5-base')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qttranslations
+  make INSTALL_ROOT="${pkgdir}" install
+}
+
+package_qt5-multimedia() {
+  pkgdesc='A cross-platform application and UI framework (QtMultimedia)'
+  depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base' 'openal')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtmultimedia
+  make INSTALL_ROOT="${pkgdir}" install
+
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+}
+
+package_qt5-graphicaleffects() {
+  pkgdesc='A cross-platform application and UI framework (QtGraphicalEffects)'
+  depends=('qt5-declarative')
+
+  cd ${_pkgfqn}/qtgraphicaleffects
+  make INSTALL_ROOT="${pkgdir}" install
+}
+
+package_qt5-imageformats() {
+  pkgdesc='A cross-platform application and UI framework (Images plugins)'
+  depends=('qt5-base' 'libtiff' 'libmng')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtimageformats
+  make INSTALL_ROOT="${pkgdir}" install
+}
+
+package_qt5-quick1() {
+  pkgdesc='A cross-platform application and UI framework (QtDeclarative)'
+  depends=('qt5-webkit' 'qt5-script')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtquick1
+  make INSTALL_ROOT="${pkgdir}" install
+  
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+}
+
+package_qt5-script() {
+  pkgdesc='A cross-platform application and UI framework (QtScript)'
+  depends=('qt5-base')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtscript
+  make INSTALL_ROOT="${pkgdir}" install
+  
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+}
+
+package_qt5-svg() {
+  pkgdesc='A cross-platform application and UI framework (QtSvg)'
+  depends=('qt5-base')
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qtsvg
+  make INSTALL_ROOT="${pkgdir}" install
+  
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+}
+  
+package_qt5-tools() {
+  pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp)'
+  depends=('qt5-webkit' 'desktop-file-utils' 'qt5-translations')
+  optdepends=('qt5-doc: documentation')
+  install='qt5-tools.install'
+  conflicts=('qt')
+
+  cd ${_pkgfqn}/qttools
+  make INSTALL_ROOT="${pkgdir}" install
+  
+  # install missing icons and desktop files
+  for icon in src/linguist/linguist/images/icons/linguist-*-32.png ; do
+    size=$(echo $(basename ${icon}) | cut -d- -f2)
+    install -p -D -m644 ${icon} \
+      "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png"
+  done
+
+  install -p -D -m644 src/assistant/assistant/images/assistant.png \
+    "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png"
+  install -p -D -m644 src/assistant/assistant/images/assistant-128.png \
+    "${pkgdir}/usr/share/icons/hicolor/128x128/apps/assistant.png"
+  install -p -D -m644 src/designer/src/designer/images/designer.png \
+    "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png"
+  install -d "${pkgdir}/usr/share/applications"
+  install -m644 "${srcdir}"/{linguist,designer,assistant}.desktop \
+    "${pkgdir}/usr/share/applications/"
+
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+  
+  # Useful symlinks
+  install -d "${pkgdir}"/usr/bin
+  for b in "${pkgdir}"/usr/lib/qt/bin/*; do
+    ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
+  done 
+}
+
+package_qt5-webkit() {
+  pkgdesc='A cross-platform application and UI framework (QtWebKit)'
+  depends=('qt5-declarative' 'gstreamer0.10-base' 'libxslt' 'libxcomposite')
+
+  cd ${_pkgfqn}/qtwebkit
+  make INSTALL_ROOT="${pkgdir}" install
+  
+  # Fix wrong path in prl files
+  find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+
+  # Fix wrong path in pc file
+  perl -pi -e "s, -L${srcdir}/?\S+,,g" "${pkgdir}"/usr/lib/pkgconfig/Qt5WebKit.pc
+}
diff --git a/extra/qt/assistant.desktop b/extra/qt5/assistant.desktop
index 37ff84b44..37ff84b44 100644
--- a/extra/qt/assistant.desktop
+++ b/extra/qt5/assistant.desktop
diff --git a/extra/qt/designer.desktop b/extra/qt5/designer.desktop
index f0b381d02..f0b381d02 100644
--- a/extra/qt/designer.desktop
+++ b/extra/qt5/designer.desktop
diff --git a/extra/qt5/gcc48.patch b/extra/qt5/gcc48.patch
new file mode 100644
index 000000000..03b205b68
--- /dev/null
+++ b/extra/qt5/gcc48.patch
@@ -0,0 +1,63 @@
+# Author:     David E. Narváez <david.narvaez@computer.org>
+# AuthorDate: 2013-02-23 23:14:50 -0500
+# Commit:     David E. Narváez <david.narvaez@computer.org>
+# CommitDate: 2013-02-23 23:14:50 -0500
+#
+# Rename qAbs Function for timeval
+#
+# This decouples it from qAbs which is declared as a constexpr under
+# certain compilation flags and enables for qtbase to be compiled with
+# GCC 4.8
+#
+# Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9
+diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp
+index 0eee425..7a29247 100644
+--- a/src/corelib/kernel/qtimerinfo_unix.cpp
++++ b/src/corelib/kernel/qtimerinfo_unix.cpp
+@@ -87,22 +87,21 @@
+     firstTimerInfo = 0;
+ }
+ 
+ timeval QTimerInfoList::updateCurrentTime()
+ {
+     return (currentTime = qt_gettime());
+ }
+ 
+ #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED)
+ 
+-template <>
+-timeval qAbs(const timeval &t)
++timeval qAbsTimeval(const timeval &t)
+ {
+     timeval tmp = t;
+     if (tmp.tv_sec < 0) {
+         tmp.tv_sec = -tmp.tv_sec - 1;
+         tmp.tv_usec -= 1000000;
+     }
+     if (tmp.tv_sec == 0 && tmp.tv_usec < 0) {
+         tmp.tv_usec = -tmp.tv_usec;
+     }
+     return normalizedTimeval(tmp);
+@@ -137,21 +136,21 @@
+     *delta = elapsedTime - elapsedTimeTicks;
+ 
+     previousTicks = currentTicks;
+     previousTime = currentTime;
+ 
+     // If tick drift is more than 10% off compared to realtime, we assume that the clock has
+     // been set. Of course, we have to allow for the tick granularity as well.
+     timeval tickGranularity;
+     tickGranularity.tv_sec = 0;
+     tickGranularity.tv_usec = msPerTick * 1000;
+-    return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10);
++    return elapsedTimeTicks < ((qAbsTimeval(*delta) - tickGranularity) * 10);
+ }
+ 
+ /*
+   repair broken timer
+ */
+ void QTimerInfoList::timerRepair(const timeval &diff)
+ {
+     // repair all timers
+     for (int i = 0; i < size(); ++i) {
+         register QTimerInfo *t = at(i);
diff --git a/extra/qt/linguist.desktop b/extra/qt5/linguist.desktop
index 3b203e0bd..3b203e0bd 100644
--- a/extra/qt/linguist.desktop
+++ b/extra/qt5/linguist.desktop
diff --git a/extra/qt5/qatomic-before-mips32.patch b/extra/qt5/qatomic-before-mips32.patch
new file mode 100644
index 000000000..47d550f93
--- /dev/null
+++ b/extra/qt5/qatomic-before-mips32.patch
@@ -0,0 +1,34 @@
+ISAs before MIPS32 do not support the argument of sync, so build fails
+with -march=mips3 (or -march=loongson2f).
+
+Since the default argument of 0 does all work of other values, not
+specifying it should keep the code correct on older ISAs.
+
+A proper patch would detect if "sync 0x11" is accepted by the
+assembler and choose the appropriate code.
+
+--- qt-everywhere-opensource-src-5.0.1.orig/qtbase/src/corelib/arch/qatomic_mips.h	2013-03-03 18:52:14.370775913 +0100
++++ qt-everywhere-opensource-src-5.0.1/qtbase/src/corelib/arch/qatomic_mips.h	2013-03-03 19:30:16.209001188 +0100
+@@ -122,19 +122,19 @@
+ template <int size> template <typename T> inline
+ void QBasicAtomicOps<size>::acquireMemoryFence(const T &) Q_DECL_NOTHROW
+ {
+-    asm volatile ("sync 0x11" ::: "memory");
++    asm volatile ("sync" ::: "memory");
+ }
+ 
+ template <int size> template <typename T> inline
+ void QBasicAtomicOps<size>::releaseMemoryFence(const T &) Q_DECL_NOTHROW
+ {
+-    asm volatile ("sync 0x12" ::: "memory");
++    asm volatile ("sync" ::: "memory");
+ }
+ 
+ template <int size> template <typename T> inline
+ void QBasicAtomicOps<size>::orderedMemoryFence(const T &) Q_DECL_NOTHROW
+ {
+-    asm volatile ("sync 0" ::: "memory");
++    asm volatile ("sync" ::: "memory");
+ }
+ 
+ template<> template<typename T> inline
diff --git a/extra/thunderbird/thunderbird.install b/extra/qt5/qt5-base.install
index 4d4a283db..c0797237a 100644
--- a/extra/thunderbird/thunderbird.install
+++ b/extra/qt5/qt5-base.install
@@ -1,6 +1,5 @@
 post_install() {
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
 
 post_upgrade() {
diff --git a/extra/mplayer/mplayer.install b/extra/qt5/qt5-tools.install
index 660593cf5..5495fb1b5 100644
--- a/extra/mplayer/mplayer.install
+++ b/extra/qt5/qt5-tools.install
@@ -1,4 +1,5 @@
 post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
     update-desktop-database -q
 }
 
diff --git a/extra/qt5/use-python2.patch b/extra/qt5/use-python2.patch
new file mode 100644
index 000000000..eb53b10f6
--- /dev/null
+++ b/extra/qt5/use-python2.patch
@@ -0,0 +1,107 @@
+--- qt-everywhere-opensource-src-5.0.0/qtjsbackend/src/v8/v8.pri~	2013-01-11 06:50:55.241495644 +0000
++++ qt-everywhere-opensource-src-5.0.0/qtjsbackend/src/v8/v8.pri	2013-01-11 06:51:29.987894356 +0000
+@@ -303,7 +303,7 @@
+ V8_EXPERIMENTAL_LIBRARY_FILES = \
+     $$V8SRC/proxy.js \
+ 
+-v8_js2c.commands = python $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/libraries.cpp CORE off
++v8_js2c.commands = python2 $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/libraries.cpp CORE off
+ v8_js2c.commands += $$V8SRC/macros.py ${QMAKE_FILE_IN}
+ v8_js2c.output = $$V8_GENERATED_SOURCES_DIR/libraries.cpp
+ v8_js2c.input = V8_LIBRARY_FILES
+@@ -314,7 +314,7 @@
+ v8_js2c.name = generating[v8] ${QMAKE_FILE_IN}
+ silent:v8_js2c.commands = @echo generating[v8] ${QMAKE_FILE_IN} && $$v8_js2c.commands
+ 
+-v8_js2c_experimental.commands = python $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/experimental-libraries.cpp EXPERIMENTAL off
++v8_js2c_experimental.commands = python2 $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/experimental-libraries.cpp EXPERIMENTAL off
+ v8_js2c_experimental.commands += $$V8SRC/macros.py ${QMAKE_FILE_IN}
+ v8_js2c_experimental.output = $$V8_GENERATED_SOURCES_DIR/experimental-libraries.cpp
+ v8_js2c_experimental.input = V8_EXPERIMENTAL_LIBRARY_FILES
+--- qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/JavaScriptCore/DerivedSources.pri~        2013-01-09 11:29:16.452266719 +0000
++++ qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/JavaScriptCore/DerivedSources.pri 2013-01-09 11:30:18.188538725 +0000
+@@ -85,14 +85,14 @@
+ retgen.output = RegExpJitTables.h
+ retgen.script = $$PWD/create_regex_tables
+ retgen.input = retgen.script
+-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
++retgen.commands = python2 $$retgen.script > ${QMAKE_FILE_OUT}
+ GENERATORS += retgen
+ 
+ #GENERATOR: "KeywordLookup.h": decision tree used by the lexer
+ klgen.output = KeywordLookup.h
+ klgen.script = $$PWD/KeywordLookupGenerator.py
+ klgen.input = KEYWORDLUT_FILES
+-klgen.commands = python $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
++klgen.commands = python2 $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
+ GENERATORS += klgen
+ 
+ EXTRACTOR_BINARY = LLIntOffsetsExtractor$$BIN_EXTENSION
+@@ -117,7 +117,7 @@
+     disassembler.input = DISASSEMBLER_FILES
+     disassembler.script = $$PWD/disassembler/udis86/itab.py
+     disassembler.depends = $$DISASSEMBLER_DEPENDENCY
+-    disassembler.commands = python $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH}
++    disassembler.commands = python2 $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH}
+     disassembler.CONFIG += no_link
+     GENERATORS += disassembler
+ }
+--- qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/WebCore/DerivedSources.pri~       2013-01-09 11:46:01.165612894 +0000
++++ qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/WebCore/DerivedSources.pri        2013-01-09 11:46:27.465404725 +0000
+@@ -779,7 +779,7 @@
+ inspectorValidate.output = InspectorProtocolVersion.h
+ inspectorValidate.input = INSPECTOR_JSON
+ inspectorValidate.script = $$PWD/inspector/generate-inspector-protocol-version
+-inspectorValidate.commands = python $$inspectorValidate.script -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
++inspectorValidate.commands = python2 $$inspectorValidate.script -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
+ inspectorValidate.depends = $$PWD/inspector/generate-inspector-protocol-version
+ inspectorValidate.add_output_to_sources = false
+ GENERATORS += inspectorValidate
+@@ -787,7 +787,7 @@
+ inspectorJSON.output = InspectorFrontend.cpp InspectorBackendDispatcher.cpp InspectorTypeBuilder.cpp
+ inspectorJSON.input = INSPECTOR_JSON
+ inspectorJSON.script = $$PWD/inspector/CodeGeneratorInspector.py
+-inspectorJSON.commands = python $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH}
++inspectorJSON.commands = python2 $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH}
+ inspectorJSON.depends = $$inspectorJSON.script
+ GENERATORS += inspectorJSON
+ 
+@@ -908,7 +908,7 @@
+ entities.output = HTMLEntityTable.cpp
+ entities.input = HTML_ENTITIES
+ entities.script = $$PWD/html/parser/create-html-entity-table
+-entities.commands = python $$entities.script -o ${QMAKE_FILE_OUT} $$HTML_ENTITIES
++entities.commands = python2 $$entities.script -o ${QMAKE_FILE_OUT} $$HTML_ENTITIES
+ entities.clean = ${QMAKE_FILE_OUT}
+ entities.depends = $$PWD/html/parser/create-html-entity-table
+ GENERATORS += entities
+--- qt-everywhere-opensource-src-5.0.1/qtwebkit/Source/WebKit2/DerivedSources.pri~	2013-02-10 13:48:49.800319915 +0000
++++ qt-everywhere-opensource-src-5.0.1/qtwebkit/Source/WebKit2/DerivedSources.pri	2013-02-10 13:49:09.966867900 +0000
+@@ -120,14 +120,14 @@
+     $$PWD/Scripts/webkit2/model.py \
+     $$PWD/Scripts/webkit2/parser.py
+ 
+-message_header_generator.commands = $${PYTHON} $${SOURCE_DIR}/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
++message_header_generator.commands = python2 $${SOURCE_DIR}/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+ message_header_generator.input = MESSAGE_RECEIVERS
+ message_header_generator.depends = $$SCRIPTS
+ message_header_generator.output_function = message_header_generator_output
+ message_header_generator.add_output_to_sources = false
+ GENERATORS += message_header_generator
+ 
+-message_receiver_generator.commands = $${PYTHON} $${SOURCE_DIR}/WebKit2/Scripts/generate-message-receiver.py  ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
++message_receiver_generator.commands = python2 $${SOURCE_DIR}/WebKit2/Scripts/generate-message-receiver.py  ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+ message_receiver_generator.input = MESSAGE_RECEIVERS
+ message_receiver_generator.depends = $$SCRIPTS
+ message_receiver_generator.output_function = message_receiver_generator_output
+--- qt-everywhere-opensource-src-5.0.2/qtwebkit/Tools/qmake/mkspecs/features/configure.prf~	2013-04-11 08:05:15.149214600 +0000
++++ qt-everywhere-opensource-src-5.0.2/qtwebkit/Tools/qmake/mkspecs/features/configure.prf	2013-04-11 08:05:28.829105110 +0000
+@@ -116,7 +116,7 @@
+     production_build:blackberry {
+         addReasonForSkippingBuild("Build not supported on BB10 yet.")
+     }
+-    requiredPrograms = gperf python perl bison ruby flex
++    requiredPrograms = gperf python2 perl bison ruby flex
+     for(program, requiredPrograms): \
+         !programExistsInPath($$program): \
+             addReasonForSkippingBuild("Missing $$program from PATH")
diff --git a/extra/qtchooser/3.conf b/extra/qtchooser/3.conf
new file mode 100644
index 000000000..bea263c91
--- /dev/null
+++ b/extra/qtchooser/3.conf
@@ -0,0 +1,2 @@
+/usr/lib/qt3/bin
+/usr/lib
diff --git a/extra/qtchooser/4.conf b/extra/qtchooser/4.conf
new file mode 100644
index 000000000..96e344eba
--- /dev/null
+++ b/extra/qtchooser/4.conf
@@ -0,0 +1,2 @@
+/usr/lib/qt4/bin
+/usr/lib
diff --git a/extra/qtchooser/5.conf b/extra/qtchooser/5.conf
new file mode 100644
index 000000000..bcd76decb
--- /dev/null
+++ b/extra/qtchooser/5.conf
@@ -0,0 +1,2 @@
+/usr/lib/qt/bin
+/usr/lib
diff --git a/extra/qtchooser/PKGBUILD b/extra/qtchooser/PKGBUILD
new file mode 100644
index 000000000..c402efc78
--- /dev/null
+++ b/extra/qtchooser/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 182622 2013-04-11 12:14:29Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=qtchooser
+pkgver=26
+pkgrel=3
+pkgdesc='Wrap the other Qt tools by searching for different instances of Qt on the system'
+arch=('i686' 'x86_64' 'mips64el')
+url='http://qt.gitorious.org/qt/qtchooser'
+license=('GPL')
+depends=('gcc-libs')
+source=("http://macieira.org/${pkgname}/${pkgname}-${pkgver}-g97962d2.tar.gz"
+        {3,4,5}.conf)
+md5sums=('a188a5cb63113130e0d05fe4d5bf4e95'
+         '7c5da2b7911d1c4fabc63d6ef00f0020'
+         'aa4d49b269e1b806f5eea170801f0aa6'
+         'cf83f09a9a5a44d898b93f624d74dd11')
+
+build() {
+  cd ${pkgname}-${pkgver}-g97962d2
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}-g97962d2
+  make INSTALL_ROOT="${pkgdir}" install
+
+  install -d "${pkgdir}"/etc/xdg/qtchooser
+  install -m644 "${srcdir}"/{3,4,5}.conf \
+    "${pkgdir}"/etc/xdg/qtchooser/
+  
+  # Set the default Qt
+  ln -s /etc/xdg/qtchooser/5.conf \
+    "${pkgdir}"/etc/xdg/qtchooser/default.conf
+}
diff --git a/extra/qtscriptgenerator/PKGBUILD b/extra/qtscriptgenerator/PKGBUILD
index fd570d20d..32c57bb16 100644
--- a/extra/qtscriptgenerator/PKGBUILD
+++ b/extra/qtscriptgenerator/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158023 2012-05-01 07:24:53Z andrea $
+# $Id: PKGBUILD 179036 2013-03-01 19:03:29Z andrea $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=qtscriptgenerator
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool that generates Qt bindings for Qt Script"
 arch=("i686" "x86_64" 'mips64el')
 url="https://code.google.com/p/qtscriptgenerator/"
@@ -18,27 +18,27 @@ sha1sums=('4c1078f26b196156e857c17c9d11a66cfea66f00'
           'c50b26e6504f5c981a916860d9c3929e436e1067')
 
 build() {
-  cd "${srcdir}"/$pkgname-src-$pkgver
+  cd $pkgname-src-$pkgver
 
   patch -p1 -i "${srcdir}"/phonon.patch
   patch -p1 -i "${srcdir}"/no-phonon.patch
 
   # prepare plugins
   cd generator
-  qmake
+  qmake-qt4
   make
-  ./generator --include-paths=/usr/include
+  QTDIR=/usr ./generator --include-paths=/usr/include/qt4
 
   # build plugins
-  cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings
-  qmake
+  cd ../qtbindings
+  qmake-qt4
   make
 }
 
 package() {
-  cd "${srcdir}"/$pkgname-src-$pkgver/qtbindings
+  cd $pkgname-src-$pkgver/qtbindings
   # move plugins to correct directory
-  install -d "${pkgdir}"/usr/lib/qt/plugins/script
+  install -d "${pkgdir}"/usr/lib/qt4/plugins/script
   cp -a "${srcdir}"/$pkgname-src-$pkgver/plugins/script/* \
-    "${pkgdir}"/usr/lib/qt/plugins/script/
+    "${pkgdir}"/usr/lib/qt4/plugins/script/
 }
diff --git a/extra/qtwebkit/LLIntCLoop32BigEndian.patch b/extra/qtwebkit/LLIntCLoop32BigEndian.patch
new file mode 100644
index 000000000..4331e0ea8
--- /dev/null
+++ b/extra/qtwebkit/LLIntCLoop32BigEndian.patch
@@ -0,0 +1,72 @@
+Index: Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+===================================================================
+--- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm	(revision 139916)
++++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm	(working copy)
+@@ -1728,7 +1728,7 @@ _llint_op_next_pname:
+     loadi 20[PC], t2
+     loadi PayloadOffset[cfr, t2, 8], t2
+     loadp JSPropertyNameIterator::m_jsStrings[t2], t3
+-    loadi [t3, t0, 8], t3
++    loadi PayloadOffset[t3, t0, 8], t3
+     addi 1, t0
+     storei t0, PayloadOffset[cfr, t1, 8]
+     loadi 4[PC], t1
+Index: Source/JavaScriptCore/llint/LowLevelInterpreter.asm
+===================================================================
+--- Source/JavaScriptCore/llint/LowLevelInterpreter.asm	(revision 139916)
++++ Source/JavaScriptCore/llint/LowLevelInterpreter.asm	(working copy)
+@@ -263,13 +263,13 @@ macro assertNotConstant(index)
+ end
+ 
+ macro functionForCallCodeBlockGetter(targetRegister)
+-    loadp Callee[cfr], targetRegister
++    loadp Callee + PayloadOffset[cfr], targetRegister
+     loadp JSFunction::m_executable[targetRegister], targetRegister
+     loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister
+ end
+ 
+ macro functionForConstructCodeBlockGetter(targetRegister)
+-    loadp Callee[cfr], targetRegister
++    loadp Callee + PayloadOffset[cfr], targetRegister
+     loadp JSFunction::m_executable[targetRegister], targetRegister
+     loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister
+ end
+@@ -841,7 +841,7 @@ macro interpretResolveWithBase(opcodeLen
+     getResolveOperation(4, t0, t1)
+     btpz t0, .slowPath
+ 
+-    loadp ScopeChain[cfr], t3
++    loadp ScopeChain + PayloadOffset[cfr], t3
+     # Get the base
+     loadis ResolveOperation::m_operation[t0], t2
+ 
+Index: Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+===================================================================
+--- Source/JavaScriptCore/llint/LowLevelInterpreter.cpp	(revision 139916)
++++ Source/JavaScriptCore/llint/LowLevelInterpreter.cpp	(working copy)
+@@ -33,6 +33,7 @@
+ 
+ #if ENABLE(LLINT_C_LOOP)
+ #include "CodeBlock.h"
++#include "JSValueInlines.h"
+ #include "LLIntCLoop.h"
+ #include "LLIntSlowPaths.h"
+ #include "VMInspector.h"
+@@ -116,6 +117,17 @@ static double Ints2Double(uint32_t lo, u
+     u.ival64 = (static_cast<uint64_t>(hi) << 32) | lo;
+     return u.dval;
+ }
++
++static void Double2Ints(double input, intptr_t& lo, intptr_t& hi)
++{
++    union {
++        double dval;
++        uint64_t ival64;
++    } u;
++    u.dval = input;
++    hi = static_cast<intptr_t>(u.ival64 >> 32);
++    lo = static_cast<intptr_t>(u.ival64);
++}
+ #endif // USE(JSVALUE32_64)
+ 
+ } // namespace LLint
diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD
index 4a703ddfe..430b2aae0 100644
--- a/extra/qtwebkit/PKGBUILD
+++ b/extra/qtwebkit/PKGBUILD
@@ -1,54 +1,63 @@
-# $Id: PKGBUILD 175761 2013-01-21 13:09:08Z andrea $
+# $Id: PKGBUILD 183523 2013-04-22 10:48:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qtwebkit
-pkgver=2.3.beta1
-_pkgver=2.3-beta1
+pkgver=2.3.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://trac.webkit.org/wiki/QtWebKit'
 pkgdesc='An open source web browser engine (Qt port)'
 license=('LGPL2.1' 'GPL3')
-depends=('qt' 'systemd' 'gstreamer0.10-base')
+depends=('qt4' 'systemd' 'gstreamer0.10-base')
 makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
 conflicts=('qt<4.8')
 _qtver=4.8.4
-source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${_pkgver}"
+source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${pkgver}"
         "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz"
         'use-python2.patch'
-        'qwebview.patch')
-sha1sums=('e5a8ffe62fc57dbbea2110241077bebbcd605fd2'
+        'qwebview.patch'
+	'LLIntCLoop32BigEndian.patch')
+sha1sums=('5b71baa0c92290d00b8cc3739c298098c1ed4bcd'
           'f5880f11c139d7d8d01ecb8d874535f7d9553198'
           '315b6ff603f35e5492a036f7082f6aa075dfb607'
-          'fed0c1a90e3997b5575dbc83d6ea23bc46097a6f')
+          'ef467fcfc9e74aa88356f27acc21792706ed1e4d'
+          'af830ae24e2ae5113754c9ae524d27ec0a28a9d6')
 
 build() {
   cd webkit-qtwebkit-23
 
   if [ "$CARCH" = "mips64el" ]; then
-      # Fix MIPS N32 support.
+     # Fix MIPS N32 support.
       sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
-          Source/JavaScriptCore/wtf/Platform.h
-      # Don't enable JIT even if configure finds that it's not supported.
+          Source/WTF/wtf/Platform.h
+     # Don't enable JIT even if configure finds that it's not supported.
       sed -i 's/#define ENABLE_JIT 1/#define ENABLE_JIT 0/' \
-          Source/JavaScriptCore/wtf/Platform.h
+          Source/WTF/wtf/Platform.h
   fi
 
   patch -p1 -i "${srcdir}"/use-python2.patch
 
+  # Fix https://bugs.webkit.org/show_bug.cgi?id=103128, original patch with ChangeLog stripped.
+  patch -p0 -i "${srcdir}/LLIntCLoop32BigEndian.patch"
+
+  OPTS="--no-webkit2"
+  if [ "${CARCH}" = "i686" ]; then
+      # FS#33418
+      OPTS="${OPTS} --no-force-sse2"
+  fi
+
   export QTDIR=/usr
+  export PATH="/usr/lib/qt4/bin:$PATH"
   Tools/Scripts/build-webkit --qt \
     --makeargs="${MAKEFLAGS}" \
     --prefix=/usr \
-    --no-webkit2
-
-  cd ../
+    ${OPTS}
 
   # Build the QWebView plugin (FS#27914)
-  cd qt-everywhere-opensource-src-${_qtver}
+  cd ../qt-everywhere-opensource-src-${_qtver}
   patch -p1 -i "${srcdir}"/qwebview.patch
   cd tools/designer/src/plugins/qwebview
-  qmake
+  qmake-qt4
   make
 }
 
@@ -56,8 +65,6 @@ package() {
   cd webkit-qtwebkit-23
   make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
 
-  cd ../
-
-  cd qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
+  cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
   make INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/extra/qtwebkit/enable-accelerated-compositing.patch b/extra/qtwebkit/enable-accelerated-compositing.patch
deleted file mode 100644
index 13474cd6a..000000000
--- a/extra/qtwebkit/enable-accelerated-compositing.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: trunk/Source/WebCore/html/HTMLCanvasElement.cpp

-===================================================================

---- trunk/Source/WebCore/html/HTMLCanvasElement.cpp	(revision 139541)

-+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp	(revision 139742)

-@@ -190,5 +190,5 @@

-     Settings* settings = document()->settings();

-     if (settings && settings->webGLEnabled()

--#if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(EFL)

-+#if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(QT)

-         && settings->acceleratedCompositingEnabled()

- #endif

diff --git a/extra/qtwebkit/fix-build.patch b/extra/qtwebkit/fix-build.patch
deleted file mode 100644
index 46313bbe9..000000000
--- a/extra/qtwebkit/fix-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up qtwebkit-2.2.2-source/Source/WebKit.pri.no_Werror qtwebkit-2.2.2-source/Source/WebKit.pri
---- qtwebkit-2.2.2-source/Source/WebKit.pri.no_Werror	2012-05-22 09:30:37.000000000 -0500
-+++ qtwebkit-2.2.2-source/Source/WebKit.pri	2012-05-22 09:51:42.126610618 -0500
-@@ -102,7 +102,7 @@ CONFIG -= warn_on
- 
- # Treat warnings as errors on x86/Linux/GCC
- linux-g++* {
--    !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
-+    #!CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
- 
-     greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
-         if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
-
-diff -up webkit-qtwebkit/Source/common.pri.me webkit-qtwebkit/Source/common.pri
---- webkit-qtwebkit/Source/common.pri.me	2012-01-24 14:51:49.000000000 +0100
-+++ webkit-qtwebkit/Source/common.pri	2012-01-24 14:52:01.000000000 +0100
-@@ -3,12 +3,12 @@
- contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
- contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
- 
--linux-g++ {
--isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
--    message(Using gold linker)
--    QMAKE_LFLAGS+=-fuse-ld=gold
--}
--}
-+#linux-g++ {
-+#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
-+#    message(Using gold linker)
-+#    QMAKE_LFLAGS+=-fuse-ld=gold
-+#}
-+#}
- 
- # We use this flag on production branches
- # See https://bugs.webkit.org/show_bug.cgi?id=60824
-diff -up webkit-qtwebkit/Source/JavaScriptCore/runtime/JSGlobalObject.h.me webkit-qtwebkit/Source/JavaScriptCore/runtime/JSGlobalObject.h
diff --git a/extra/qtwebkit/glibc.patch b/extra/qtwebkit/glibc.patch
deleted file mode 100644
index bd7cb9416..000000000
--- a/extra/qtwebkit/glibc.patch
+++ /dev/null
@@ -1,339 +0,0 @@
-diff -up webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am.glib231 webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am
---- webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am.glib231	2011-11-09 16:32:47.000000000 +0100
-+++ webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am	2011-12-21 12:50:19.000000000 +0100
-@@ -438,7 +438,6 @@ javascriptcore_sources += \
- 	Source/JavaScriptCore/wtf/gobject/GRefPtr.h \
- 	Source/JavaScriptCore/wtf/gobject/GTypedefs.h \
- 	Source/JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \
--	Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \
- 	Source/JavaScriptCore/wtf/HashCountedSet.h \
- 	Source/JavaScriptCore/wtf/HashFunctions.h \
- 	Source/JavaScriptCore/wtf/HashIterators.h \
-diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp
---- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp.glib231	2011-11-09 16:32:47.000000000 +0100
-+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp	2011-12-21 12:50:19.000000000 +0100
-@@ -37,18 +37,6 @@ template <> void freeOwnedGPtr<GList>(GL
-     g_list_free(ptr);
- }
- 
--template <> void freeOwnedGPtr<GCond>(GCond* ptr)
--{
--    if (ptr)
--        g_cond_free(ptr);
--}
--
--template <> void freeOwnedGPtr<GMutex>(GMutex* ptr)
--{
--    if (ptr)
--        g_mutex_free(ptr);
--}
--
- template <> void freeOwnedGPtr<GPatternSpec>(GPatternSpec* ptr)
- {
-     if (ptr)
-diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h
---- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h.glib231	2011-11-09 16:32:47.000000000 +0100
-+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h	2011-12-21 12:50:19.000000000 +0100
-@@ -35,8 +35,6 @@ namespace WTF {
- template <typename T> inline void freeOwnedGPtr(T* ptr);
- template<> void freeOwnedGPtr<GError>(GError*);
- template<> void freeOwnedGPtr<GList>(GList*);
--template<> void freeOwnedGPtr<GCond>(GCond*);
--template<> void freeOwnedGPtr<GMutex>(GMutex*);
- template<> void freeOwnedGPtr<GPatternSpec>(GPatternSpec*);
- template<> void freeOwnedGPtr<GDir>(GDir*);
- 
-diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
---- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.glib231	2011-11-09 16:32:47.000000000 +0100
-+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h	2011-12-21 12:50:19.000000000 +0100
-@@ -39,7 +39,6 @@ typedef void* gpointer;
- typedef struct _GAsyncResult GAsyncResult;
- typedef struct _GCancellable GCancellable;
- typedef struct _GCharsetConverter GCharsetConverter;
--typedef struct _GCond GCond;
- typedef struct _GDir GDir;
- typedef struct _GdkAtom* GdkAtom;
- typedef struct _GdkCursor GdkCursor;
-@@ -52,7 +51,6 @@ typedef struct _GFile GFile;
- typedef struct _GHashTable GHashTable;
- typedef struct _GInputStream GInputStream;
- typedef struct _GList GList;
--typedef struct _GMutex GMutex;
- typedef struct _GPatternSpec GPatternSpec;
- typedef struct _GPollableOutputStream GPollableOutputStream;
- typedef struct _GSocketClient GSocketClient;
-diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp
---- webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp.glib231	2011-12-21 12:52:25.000000000 +0100
-+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp	2011-12-21 12:52:28.000000000 +0100
-@@ -1,248 +0,0 @@
--/*
-- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
-- * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com)
-- *
-- * Redistribution and use in source and binary forms, with or without
-- * modification, are permitted provided that the following conditions
-- * are met:
-- *
-- * 1.  Redistributions of source code must retain the above copyright
-- *     notice, this list of conditions and the following disclaimer.
-- * 2.  Redistributions in binary form must reproduce the above copyright
-- *     notice, this list of conditions and the following disclaimer in the
-- *     documentation and/or other materials provided with the distribution.
-- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
-- *     its contributors may be used to endorse or promote products derived
-- *     from this software without specific prior written permission.
-- *
-- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
-- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-- */
--
--#include "config.h"
--#include "Threading.h"
--
--#if !USE(PTHREADS)
--
--#include "CurrentTime.h"
--#include "HashMap.h"
--#include "MainThread.h"
--#include "RandomNumberSeed.h"
--#include <wtf/StdLibExtras.h>
--
--#include <glib.h>
--#include <limits.h>
--
--namespace WTF {
--
--typedef HashMap<ThreadIdentifier, GThread*> ThreadMap;
--
--static Mutex* atomicallyInitializedStaticMutex;
--
--static Mutex& threadMapMutex()
--{
--    DEFINE_STATIC_LOCAL(Mutex, mutex, ());
--    return mutex;
--}
--
--void initializeThreading()
--{
--    if (!g_thread_supported())
--        g_thread_init(NULL);
--    ASSERT(g_thread_supported());
--
--    if (!atomicallyInitializedStaticMutex) {
--        atomicallyInitializedStaticMutex = new Mutex;
--        threadMapMutex();
--        initializeRandomNumberGenerator();
--    }
--}
--
--void lockAtomicallyInitializedStaticMutex()
--{
--    ASSERT(atomicallyInitializedStaticMutex);
--    atomicallyInitializedStaticMutex->lock();
--}
--
--void unlockAtomicallyInitializedStaticMutex()
--{
--    atomicallyInitializedStaticMutex->unlock();
--}
--
--static ThreadMap& threadMap()
--{
--    DEFINE_STATIC_LOCAL(ThreadMap, map, ());
--    return map;
--}
--
--static ThreadIdentifier identifierByGthreadHandle(GThread*& thread)
--{
--    MutexLocker locker(threadMapMutex());
--
--    ThreadMap::iterator i = threadMap().begin();
--    for (; i != threadMap().end(); ++i) {
--        if (i->second == thread)
--            return i->first;
--    }
--
--    return 0;
--}
--
--static ThreadIdentifier establishIdentifierForThread(GThread*& thread)
--{
--    ASSERT(!identifierByGthreadHandle(thread));
--
--    MutexLocker locker(threadMapMutex());
--
--    static ThreadIdentifier identifierCount = 1;
--
--    threadMap().add(identifierCount, thread);
--
--    return identifierCount++;
--}
--
--static GThread* threadForIdentifier(ThreadIdentifier id)
--{
--    MutexLocker locker(threadMapMutex());
--
--    return threadMap().get(id);
--}
--
--static void clearThreadForIdentifier(ThreadIdentifier id)
--{
--    MutexLocker locker(threadMapMutex());
--
--    ASSERT(threadMap().contains(id));
--
--    threadMap().remove(id);
--}
--
--ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, const char*)
--{
--    GThread* thread;
--    if (!(thread = g_thread_create(entryPoint, data, TRUE, 0))) {
--        LOG_ERROR("Failed to create thread at entry point %p with data %p", entryPoint, data);
--        return 0;
--    }
--
--    ThreadIdentifier threadID = establishIdentifierForThread(thread);
--    return threadID;
--}
--
--void initializeCurrentThreadInternal(const char*)
--{
--}
--
--int waitForThreadCompletion(ThreadIdentifier threadID, void** result)
--{
--    ASSERT(threadID);
--
--    GThread* thread = threadForIdentifier(threadID);
--
--    void* joinResult = g_thread_join(thread);
--    if (result)
--        *result = joinResult;
--
--    clearThreadForIdentifier(threadID);
--    return 0;
--}
--
--void detachThread(ThreadIdentifier)
--{
--}
--
--ThreadIdentifier currentThread()
--{
--    GThread* currentThread = g_thread_self();
--    if (ThreadIdentifier id = identifierByGthreadHandle(currentThread))
--        return id;
--    return establishIdentifierForThread(currentThread);
--}
--
--void yield()
--{
--    g_thread_yield();
--}
--
--Mutex::Mutex()
--    : m_mutex(g_mutex_new())
--{
--}
--
--Mutex::~Mutex()
--{
--}
--
--void Mutex::lock()
--{
--    g_mutex_lock(m_mutex.get());
--}
--
--bool Mutex::tryLock()
--{
--    return g_mutex_trylock(m_mutex.get());
--}
--
--void Mutex::unlock()
--{
--    g_mutex_unlock(m_mutex.get());
--}
--
--ThreadCondition::ThreadCondition()
--    : m_condition(g_cond_new())
--{
--}
--
--ThreadCondition::~ThreadCondition()
--{
--}
--
--void ThreadCondition::wait(Mutex& mutex)
--{
--    g_cond_wait(m_condition.get(), mutex.impl().get());
--}
--
--bool ThreadCondition::timedWait(Mutex& mutex, double absoluteTime)
--{
--    // Time is in the past - return right away.
--    if (absoluteTime < currentTime())
--        return false;
--    
--    // Time is too far in the future for g_cond_timed_wait - wait forever.
--    if (absoluteTime > INT_MAX) {
--        wait(mutex);
--        return true;
--    }
--
--    int timeSeconds = static_cast<int>(absoluteTime);
--    int timeMicroseconds = static_cast<int>((absoluteTime - timeSeconds) * 1000000.0);
--    
--    GTimeVal targetTime;
--    targetTime.tv_sec = timeSeconds;
--    targetTime.tv_usec = timeMicroseconds;
--
--    return g_cond_timed_wait(m_condition.get(), mutex.impl().get(), &targetTime);
--}
--
--void ThreadCondition::signal()
--{
--    g_cond_signal(m_condition.get());
--}
--
--void ThreadCondition::broadcast()
--{
--    g_cond_broadcast(m_condition.get());
--}
--
--
--}
--
--#endif // !USE(PTHREADS)
-diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h
---- webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h.glib231	2011-11-09 16:32:47.000000000 +0100
-+++ webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h	2011-12-21 12:50:19.000000000 +0100
-@@ -44,8 +44,6 @@
- 
- #if USE(PTHREADS)
- #include <pthread.h>
--#elif PLATFORM(GTK)
--#include "GOwnPtr.h"
- #endif
- 
- #if PLATFORM(QT)
-@@ -66,10 +64,6 @@ typedef pthread_rwlock_t PlatformReadWri
- typedef void* PlatformReadWriteLock;
- #endif
- typedef pthread_cond_t PlatformCondition;
--#elif PLATFORM(GTK)
--typedef GOwnPtr<GMutex> PlatformMutex;
--typedef void* PlatformReadWriteLock; // FIXME: Implement.
--typedef GOwnPtr<GCond> PlatformCondition;
- #elif PLATFORM(QT)
- typedef QT_PREPEND_NAMESPACE(QMutex)* PlatformMutex;
- typedef void* PlatformReadWriteLock; // FIXME: Implement.
diff --git a/extra/qtwebkit/qwebview.patch b/extra/qtwebkit/qwebview.patch
index 73d5d5032..98f6f0f03 100644
--- a/extra/qtwebkit/qwebview.patch
+++ b/extra/qtwebkit/qwebview.patch
@@ -11,7 +11,7 @@
 +++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro	2013-01-09 12:55:53.352169136 +0000
 @@ -2,9 +2,4 @@
  CONFIG += ordered
- 
+
  REQUIRES = !CONFIG(static,shared|static)
 -contains(QT_CONFIG, qt3support): SUBDIRS += widgets
 -win32: SUBDIRS += activeqt
diff --git a/extra/quadrapassel/PKGBUILD b/extra/quadrapassel/PKGBUILD
new file mode 100644
index 000000000..1374c9d02
--- /dev/null
+++ b/extra/quadrapassel/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 183453 2013-04-21 22:12:00Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=quadrapassel
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Fit falling blocks together (Tetris-like game for GNOME)"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'libcanberra' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=quadrapassel.install
+url="https://live.gnome.org/Quadrapassel"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('18935ab737c9a690104207758ba92223e8bfe6d5f1feeeadbbca3eb543ce5284')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/quadrapassel/quadrapassel.install b/extra/quadrapassel/quadrapassel.install
new file mode 100644
index 000000000..0730c1a47
--- /dev/null
+++ b/extra/quadrapassel/quadrapassel.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/quodlibet/PKGBUILD b/extra/quodlibet/PKGBUILD
deleted file mode 100644
index 80140f70a..000000000
--- a/extra/quodlibet/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 164824 2012-08-06 21:35:32Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=quodlibet
-pkgver=2.4.1
-pkgrel=1.1
-pkgdesc="An audio player written in pygtk"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
-url="http://code.google.com/p/quodlibet/"
-depends=('gstreamer0.10-python' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 
-         'gstreamer0.10-ugly-plugins' 'mutagen' 'pygtk')
-makedepends=('intltool')
-optdepends=('gstreamer0.10-ffmpeg: for ffmpeg (ASF/WMA) support ' 
-            'gstreamer0.10-bad-plugins: for MPEG-4 (AAC) and Musepack support' 
-            'python2-dbus: for dbus support' 
-            'notification-daemon: for notification support' 
-            'libgpod: for ipod support' 
-            'python2-feedparser: for audio feeds (podcast) support' 
-            'udisks: for media devices support' 
-            'media-player-info: for media devices support')
-options=('!makeflags')
-source=(http://quodlibet.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('4db812f0b447805a27ae8f25517623205712b75e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's#env python#env python2#' *.py quodlibet/util/fmps.py
-  sed -i 's#libudev.so.0#libudev.so.1#' quodlibet/devices/__init__.py
-  ./setup.py build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./setup.py install --prefix="${pkgdir}/usr"
-  install -D -m644 quodlibet/images/hicolor/64x64/apps/exfalso.png "${pkgdir}/usr/share/pixmaps/exfalso.png"
-  install -D -m644 quodlibet/images/hicolor/64x64/apps/quodlibet.png "${pkgdir}/usr/share/pixmaps/quodlibet.png"
-}
diff --git a/extra/quota-tools/LICENSE b/extra/quota-tools/LICENSE
deleted file mode 100644
index 4bae71589..000000000
--- a/extra/quota-tools/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 1980, 1990 Regents of the University of California. All
- * rights reserved.
- *
- * This code is derived from software contributed to Berkeley by Robert Elz at
- * The University of Melbourne.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer. 2.
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution. 3. All advertising
- * materials mentioning features or use of this software must display the
- * following acknowledgement: This product includes software developed by the
- * University of California, Berkeley and its contributors. 4. Neither the
- * name of the University nor the names of its contributors may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
diff --git a/extra/quota-tools/nulls.diff b/extra/quota-tools/nulls.diff
deleted file mode 100644
index 97c5bc482..000000000
--- a/extra/quota-tools/nulls.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-#Description: Avoid memory corruption of NULL address
-#Author: Petr Pisar
-
---- quota/quotasys.c	2010-02-18 09:44:11.000000000 +0100
-+++ quota-tools/quotasys.c	2010-05-05 08:02:53.000000000 +0200
-@@ -746,9 +746,12 @@
- 	kernel_qfmt_num = 0;
- 	if (!stat("/proc/fs/xfs/stat", &st))
- 		kernel_qfmt[kernel_qfmt_num++] = QF_XFS;
--	else
--		if (!quotactl(QCMD(Q_XGETQSTAT, 0), NULL, 0, NULL) || (errno != EINVAL && errno != ENOSYS))
-+	else {
-+		fs_quota_stat_t dummy;
-+
-+		if (!quotactl(QCMD(Q_XGETQSTAT, 0), "/dev/root", 0, (void *)&dummy) || (errno != EINVAL && errno != ENOSYS))
- 			kernel_qfmt[kernel_qfmt_num++] = QF_XFS;
-+	}
- 	/* Detect new kernel interface; Assume generic interface unless we can prove there is not one... */
- 	if (!stat("/proc/sys/fs/quota", &st) || errno != ENOENT) {
- 		kernel_iface = IFACE_GENERIC;
diff --git a/extra/quota-tools/quotaon.diff b/extra/quota-tools/quotaon.diff
deleted file mode 100644
index 6a43cee6c..000000000
--- a/extra/quota-tools/quotaon.diff
+++ /dev/null
@@ -1,216 +0,0 @@
-# Description: Fix quotaon to work with XFS and print all informational messages only in verbose mode
-# Author: Jan Kara
-
-diff -u quota/quotaon.c quota-tools/quotaon.c
---- quota/quotaon.c	2010-07-28 11:14:02.000000000 +0200
-+++ quota-tools/quotaon.c	2010-06-15 10:11:30.000000000 +0200
-@@ -42,6 +42,7 @@
- #include <getopt.h>
- #include <string.h>
- #include <stdlib.h>
-+#include <stdarg.h>
- 
- #include "quotaon.h"
- #include "quota.h"
-@@ -145,6 +146,19 @@
- 	}
- }
- 
-+int pinfo(char *fmt, ...)
-+{
-+	va_list arg;
-+	int ret;
-+
-+	if (!(flags & FL_VERBOSE))
-+		return 0;
-+	va_start(arg, fmt);
-+	ret = vprintf(fmt, arg);
-+	va_end(arg);
-+	return ret;
-+}
-+
- /*
-  *	Enable/disable rsquash on given filesystem
-  */
-@@ -171,10 +185,10 @@
- 		errstr(_("set root_squash on %s: %s\n"), quotadev, strerror(errno));
- 		return 1;
- 	}
--	if ((flags & STATEFLAG_VERBOSE) && (flags & STATEFLAG_OFF))
--		printf(_("%s: %s root_squash turned off\n"), quotadev, type2name(type));
--	else if ((flags & STATEFLAG_VERBOSE) && (flags & STATEFLAG_ON))
--		printf(_("%s: %s root_squash turned on\n"), quotadev, type2name(type));
-+	if (flags & STATEFLAG_OFF)
-+		pinfo(_("%s: %s root_squash turned off\n"), quotadev, type2name(type));
-+	else if (flags & STATEFLAG_ON)
-+		pinfo(_("%s: %s root_squash turned on\n"), quotadev, type2name(type));
- #endif
- 	return 0;
- }
-@@ -195,8 +209,7 @@
- 			errstr(_("quotactl on %s [%s]: %s\n"), quotadev, quotadir, strerror(errno));
- 			return 1;
- 		}
--		if (flags & STATEFLAG_VERBOSE)
--			printf(_("%s [%s]: %s quotas turned off\n"), quotadev, quotadir, type2name(type));
-+		pinfo(_("%s [%s]: %s quotas turned off\n"), quotadev, quotadir, type2name(type));
- 		return 0;
- 	}
- 	if (kernel_iface == IFACE_GENERIC) {
-@@ -218,8 +231,7 @@
- 			errstr(_("Quota format not supported in kernel.\n"));
- 		return 1;
- 	}
--	if (flags & STATEFLAG_VERBOSE)
--		printf(_("%s [%s]: %s quotas turned on\n"), quotadev, quotadir, type2name(type));
-+	pinfo(_("%s [%s]: %s quotas turned on\n"), quotadev, quotadir, type2name(type));
- 	return 0;
- }
- 
-@@ -268,8 +280,6 @@
- 	int sflags, ret = 0;
- 
- 	sflags = flags & FL_OFF ? STATEFLAG_OFF : STATEFLAG_ON;
--	if (flags & FL_VERBOSE)
--		sflags |= STATEFLAG_VERBOSE;
- 	if (flags & FL_ALL)
- 		sflags |= STATEFLAG_ALL;
- 
-@@ -281,10 +291,7 @@
- 			errstr(_("Cannot change state of XFS quota. It's not compiled in kernel.\n"));
- 			return 1;
- 		}
--		if ((flags & FL_OFF && (kern_quota_on(mnt->mnt_fsname, USRQUOTA, QF_XFS) != -1
--		    || kern_quota_on(mnt->mnt_fsname, GRPQUOTA, QF_XFS) != -1))
--		    || (!(flags & FL_OFF) && kern_quota_on(mnt->mnt_fsname, type, QF_XFS) == -1))
--			ret = xfs_newstate(mnt, type, extra, sflags);
-+		ret = xfs_newstate(mnt, type, extra, sflags);
- 	}
- 	else if (meta_qf_fstype(mnt->mnt_type)) {
- 		if (!hasquota(mnt, type, 0))
-@@ -376,7 +383,7 @@
- 	while ((mnt = get_next_mount())) {
- 		if (nfs_fstype(mnt->mnt_type)) {
- 			if (!(flags & FL_ALL))
--				fprintf(stderr, "%s: Quota cannot be turned on on NFS filesystem\n", mnt->mnt_fsname);
-+				errstr(_("%s: Quota cannot be turned on on NFS filesystem\n"), mnt->mnt_fsname);
- 			continue;
- 		}
- 
-diff -u quota/quotaon.h quota-tools/quotaon.h
---- quota/quotaon.h	2010-02-18 09:44:11.000000000 +0100
-+++ quota-tools/quotaon.h	2010-06-12 12:06:08.000000000 +0200
-@@ -13,7 +13,7 @@
- #define STATEFLAG_ON		0x01
- #define STATEFLAG_OFF		0x02
- #define STATEFLAG_ALL		0x04
--#define STATEFLAG_VERBOSE	0x08
- 
- typedef int (newstate_t) (struct mntent * mnt, int type, char *file, int flags);
- extern int xfs_newstate(struct mntent *mnt, int type, char *file, int flags);
-+extern int pinfo(char *fmt, ...);
-diff -u quota/quotaon_xfs.c quota-tools/quotaon_xfs.c
---- quota/quotaon_xfs.c	2010-07-26 18:48:24.000000000 +0200
-+++ quota-tools/quotaon_xfs.c	2010-06-15 10:11:30.000000000 +0200
-@@ -59,8 +59,8 @@
- 			    return 1;
- 		    case Q_XFS_QUOTAON:
- 			    if (roothack) {
--				    printf(_("Enabling %s quota on root filesystem"
--					     " (reboot to take effect)\n"), type2name(type));
-+				    pinfo(_("Enabling %s quota on root filesystem"
-+					    " (reboot to take effect)\n"), type2name(type));
- 				    return 1;
- 			    }
- 			    errstr(_("Enable XFS %s quota accounting during mount\n"),
-@@ -79,12 +79,12 @@
- 			    return -1;
- 		    case Q_XFS_QUOTAON:
- 			    if (roothack) {
--				    printf(_("Enabling %s quota on root filesystem"
--					     " (reboot to take effect)\n"), type2name(type));
-+				    pinfo(_("Enabling %s quota on root filesystem"
-+					    " (reboot to take effect)\n"), type2name(type));
- 				    return 1;
- 			    }
- 			    if (xopts & XFS_QUOTA_UDQ_ENFD || xopts & XFS_QUOTA_GDQ_ENFD) {
--				    printf(_("Enabling %s quota enforcement on %s\n"), type2name(type), dev);
-+				    pinfo(_("Enabling %s quota enforcement on %s\n"), type2name(type), dev);
- 				    return 1;
- 			    }
- 			    errstr(_("Already accounting %s quota on %s\n"),
-@@ -92,7 +92,7 @@
- 			    return -1;
- 		    case Q_XFS_QUOTAOFF:
- 			    if (xopts & XFS_QUOTA_UDQ_ACCT || xopts & XFS_QUOTA_GDQ_ACCT) {
--				    printf(_("Disabling %s quota accounting on %s\n"),
-+				    pinfo(_("Disabling %s quota accounting on %s\n"),
- 					   type2name(type), dev);
- 			    	    return 1;
- 			    }
-@@ -121,9 +121,9 @@
- 				    return -1;
- 			    }
- 			    if (xopts & XFS_QUOTA_UDQ_ACCT || xopts & XFS_QUOTA_GDQ_ACCT)
--			    	    acctstr = _("and accounting ");
--			    printf(_("Disabling %s quota enforcement %son %s\n"),
--				   type2name(type), acctstr, dev);
-+		    		    acctstr = _("and accounting ");
-+			    pinfo(_("Disabling %s quota enforcement %son %s\n"),
-+				  type2name(type), acctstr, dev);
- 			    return 1;
- 		  }
- 		  break;
-@@ -146,10 +146,10 @@
- 		errstr(_("quotactl on %s: %s\n"), dev, strerror(errno));
- 		return 1;
- 	}
--	if ((flags & STATEFLAG_VERBOSE) && qoff)
--		printf(_("%s: %s quotas turned off\n"), dev, type2name(type));
--	else if ((flags & STATEFLAG_VERBOSE) && !qoff)
--		printf(_("%s: %s quotas turned on\n"), dev, type2name(type));
-+	if (qoff)
-+		pinfo(_("%s: %s quotas turned off\n"), dev, type2name(type));
-+	else
-+		pinfo(_("%s: %s quotas turned on\n"), dev, type2name(type));
- 	return 0;
- }
- 
-@@ -168,8 +168,7 @@
- 		return 1;
- 	}
- 
--	if (flags & STATEFLAG_VERBOSE)
--		printf(_("%s: deleted %s quota blocks\n"), dev, type2name(type));
-+	pinfo(_("%s: deleted %s quota blocks\n"), dev, type2name(type));
- 	return 0;
- }
- 
-@@ -208,16 +207,12 @@
- 	}
- #endif /* XFS_ROOTHACK */
- 
--	if (xarg == NULL) {	/* both acct & enfd on/off */
--		xopts |= (type == USRQUOTA) ?
--			(XFS_QUOTA_UDQ_ACCT | XFS_QUOTA_UDQ_ENFD) :
--			(XFS_QUOTA_GDQ_ACCT | XFS_QUOTA_GDQ_ENFD);
-+	if (xarg == NULL) {	/* only enfd on/off */
-+		xopts |= (type == USRQUOTA) ? XFS_QUOTA_UDQ_ENFD :
-+			XFS_QUOTA_GDQ_ENFD;
- 		err = xfs_onoff((char *)dev, type, flags, roothack, xopts);
- 	}
- 	else if (strcmp(xarg, "account") == 0) {
--		/* only useful if we want root accounting only */
--		if (!roothack || !(flags & STATEFLAG_ON))
--			goto done;
- 		xopts |= (type == USRQUOTA) ? XFS_QUOTA_UDQ_ACCT : XFS_QUOTA_GDQ_ACCT;
- 		err = xfs_onoff((char *)dev, type, flags, roothack, xopts);
- 	}
-@@ -231,7 +226,6 @@
- 	}
- 	else
- 		die(1, _("Invalid argument \"%s\"\n"), xarg);
--      done:
- 	free((char *)dev);
- 	return err;
- }
diff --git a/extra/quota-tools/repquota.diff b/extra/quota-tools/repquota.diff
deleted file mode 100644
index 3d79497d9..000000000
--- a/extra/quota-tools/repquota.diff
+++ /dev/null
@@ -1,91 +0,0 @@
-# Description: fix repquota to get latest quota info header
-# Author: Jan Kara
-
-diff -u quota/quotaio.c quota-tools/quotaio.c
---- quota/quotaio.c	2010-07-28 11:14:02.000000000 +0200
-+++ quota-tools/quotaio.c	2010-05-28 09:05:21.000000000 +0200
-@@ -147,6 +147,15 @@
- 		}
- 	}
- 	if (!QIO_ENABLED(h) || flags & IOI_OPENFILE) {	/* Need to open file? */
-+		if (QIO_ENABLED(h)) {	/* Kernel uses same file? */
-+			unsigned int cmd =
-+				(kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC;
-+			if (quotactl(QCMD(cmd, h->qh_type), h->qh_quotadev,
-+				     0, NULL) < 0) {
-+				die(4, _("Cannot sync quotas on device %s: %s\n"),
-+				    h->qh_quotadev, strerror(errno));
-+			}
-+		}
- 		/* We still need to open file for operations like 'repquota' */
- 		if ((fd = open(qfname, QIO_RO(h) ? O_RDONLY : O_RDWR)) < 0) {
- 			errstr(_("Cannot open quotafile %s: %s\n"),
-diff -u quota/quotaio_v1.c quota-tools/quotaio_v1.c
---- quota/quotaio_v1.c	2010-07-26 18:48:24.000000000 +0200
-+++ quota-tools/quotaio_v1.c	2010-05-28 09:05:23.000000000 +0200
-@@ -348,11 +348,6 @@
- 	struct dquot *dquot = get_empty_dquot();
- 	qid_t id = 0;
- 
--	if (QIO_ENABLED(h))	/* Kernel uses same file? */
--		if (quotactl(QCMD((kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC, h->qh_type),
--			     h->qh_quotadev, 0, NULL) < 0)
--			die(4, _("Cannot sync quotas on device %s: %s\n"), h->qh_quotadev,
--			    strerror(errno));
- 	memset(dquot, 0, sizeof(*dquot));
- 	dquot->dq_h = h;
- 	lseek(h->qh_fd, 0, SEEK_SET);
-diff -u quota/quotaio_v2.c quota-tools/quotaio_v2.c
---- quota/quotaio_v2.c	2010-02-18 09:44:11.000000000 +0100
-+++ quota-tools/quotaio_v2.c	2010-05-28 09:05:23.000000000 +0200
-@@ -484,11 +484,6 @@
- 
- static int v2_scan_dquots(struct quota_handle *h, int (*process_dquot) (struct dquot *, char *))
- {
--	if (QIO_ENABLED(h))	/* Kernel uses same file? */
--		if (quotactl(QCMD((kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC, h->qh_type),
--			     h->qh_quotadev, 0, NULL) < 0)
--			die(4, _("Cannot sync quotas on device %s: %s\n"), h->qh_quotadev,
--			    strerror(errno));
- 	return qtree_scan_dquots(h, process_dquot);
- }
- 
-diff -u quota/quotasys.c quota-tools/quotasys.c
---- quota/quotasys.c	2010-07-28 11:14:02.000000000 +0200
-+++ quota-tools/quotasys.c	2010-06-15 10:11:30.000000000 +0200
-@@ -861,22 +861,23 @@
- 	if (kernel_iface == IFACE_GENERIC) {
- 		int actfmt;
- 
--		if (quotactl(QCMD(Q_GETFMT, type), dev, 0, (void *)&actfmt) < 0)
--			return -1;
--		actfmt = kern2utilfmt(actfmt);
--		if (actfmt < 0)
--			return -1;
--		return actfmt;
-+		if (quotactl(QCMD(Q_GETFMT, type), dev, 0,
-+			     (void *)&actfmt) >= 0) {
-+			actfmt = kern2utilfmt(actfmt);
-+			if (actfmt >= 0)
-+				return actfmt;
-+		}
-+	} else {
-+		if ((fmt == -1 || fmt == QF_VFSV0) &&
-+		    v2_kern_quota_on(dev, type))	/* VFSv0 quota format */
-+			return QF_VFSV0;
-+		if ((fmt == -1 || fmt == QF_VFSOLD) &&
-+		    v1_kern_quota_on(dev, type))	/* Old quota format */
-+			return QF_VFSOLD;
- 	}
--	if ((fmt == -1 || fmt == QF_VFSV0) &&
--	    v2_kern_quota_on(dev, type))	/* VFSv0 quota format */
--		return QF_VFSV0;
- 	if ((fmt == -1 || fmt == QF_XFS) &&
- 	    xfs_kern_quota_on(dev, type))	/* XFS quota format */
- 		return QF_XFS;
--	if ((fmt == -1 || fmt == QF_VFSOLD) &&
--	    v1_kern_quota_on(dev, type))	/* Old quota format */
--		return QF_VFSOLD;
- 	return -1;
- }
- 
diff --git a/extra/quota-tools/system_inodes.diff b/extra/quota-tools/system_inodes.diff
deleted file mode 100644
index 94f4d66da..000000000
--- a/extra/quota-tools/system_inodes.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-# Description: Do not count system inodes into quota for ext[234]
-# Author: Jan Kara
-
---- quota/quotacheck.c	2010-02-18 09:44:10.000000000 +0100
-+++ quota-tools//quotacheck.c	2010-05-22 16:47:53.000000000 +0200
-@@ -455,8 +455,10 @@
- 		return -1;
- 	}
- 
--	while ((long)i_num) {
--		if (inode.i_links_count) {
-+	while (i_num) {
-+		if ((i_num == EXT2_ROOT_INO ||
-+		     i_num >= EXT2_FIRST_INO(fs->super)) &&
-+		    inode.i_links_count) {
- 			debug(FL_DEBUG, _("Found i_num %ld, blocks %ld\n"), (long)i_num, (long)inode.i_blocks);
- 			if (flags & FL_VERBOSE)
- 				blit(NULL);
diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD
index f55a910f8..5e5ec46eb 100644
--- a/extra/qwt/PKGBUILD
+++ b/extra/qwt/PKGBUILD
@@ -1,47 +1,49 @@
-# $Id: PKGBUILD 171291 2012-11-17 00:59:56Z allan $
+# $Id: PKGBUILD 179293 2013-03-04 21:34:48Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=qwt
-pkgver=6.0.1
-pkgrel=3
+pkgver=6.0.2
+pkgrel=2
 pkgdesc="Qt Widgets for Technical Applications"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://qwt.sourceforge.net/"
-depends=('qt')
-options=('!makeflags')
+depends=('qt4')
 license=("custom:$pkgname")
-source=("http://downloads.sourceforge.net/sourceforge/qwt/$pkgname-$pkgver.tar.bz2" \
+source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.bz2" \
         "qwtconfig-archlinux.pri")
-sha1sums=('301cca0c49c7efc14363b42e082b09056178973e'
+sha1sums=('cbdd00b29521987c9e7bc6aa51092f0474b9428d'
           'aba0fc75f6d450237028b7b143bdcf05a79cabb3')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   # copy our config file to the right place
-  install -Dm644 ${srcdir}/qwtconfig-archlinux.pri \
-	${srcdir}/${pkgname}-${pkgver}/qwtconfig.pri
+  cp ${srcdir}/qwtconfig-archlinux.pri qwtconfig.pri
 
   # build qwt:
-  qmake qwt.pro
+  qmake-qt4 qwt.pro
   make
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  make INSTALL_ROOT=${pkgdir} QTDIR=/usr install
+  make INSTALL_ROOT=${pkgdir} install
 
   # install web designer plugin
-  install -d ${pkgdir}/usr/lib/qt/plugins/designer/
+  install -d ${pkgdir}/usr/lib/qt4/plugins/designer/
   install -Dm755 designer/plugins/designer/libqwt_designer_plugin.so \
-    ${pkgdir}/usr/lib/qt/plugins/designer/
+    ${pkgdir}/usr/lib/qt4/plugins/designer/
 
-  # Move man files to proper directory.
-#  install -d ${pkgdir}/usr/share/man/man3
-#  mv -f ${pkgdir}/usr/share/doc/qwt/man/man3/* ${pkgdir}/usr/share/man/man3
+  # needed by qmake (FS#30407)
+  install -d "${pkgdir}"/usr/share/qt4/mkspecs/features/
+  install -m644 qwtconfig.pri qwt.prf qwtfunctions.pri \
+    "${pkgdir}"/usr/share/qt4/mkspecs/features/
+
+  # move man pages
+  mv "${pkgdir}"/usr/share/doc/qwt/man/ "${pkgdir}"/usr/share/
 
   # install licence
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/COPYING \
-	${pkgdir}/usr/share/licenses/${pkgname}/license.txt
+	${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/extra/qwtplot3d/PKGBUILD b/extra/qwtplot3d/PKGBUILD
index b51d260b8..2d261f9c0 100644
--- a/extra/qwtplot3d/PKGBUILD
+++ b/extra/qwtplot3d/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 171261 2012-11-16 23:35:36Z allan $
+# $Id: PKGBUILD 178992 2013-03-01 10:24:54Z andrea $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=qwtplot3d
 pkgver=0.2.7
-pkgrel=5
+pkgrel=6
 pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets"
 arch=("i686" "x86_64" 'mips64el')
 license=('custom:zlib')
 url="http://qwtplot3d.sourceforge.net/"
-depends=('qt' 'qwt')
+depends=('qt4' 'qwt')
 makedepends=('mesa' 'glu')
 source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz"
         qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch)
@@ -18,6 +18,8 @@ sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea'
           '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005')
 
 build() {
+    . /etc/profile.d/qt4.sh
+
     cd ${srcdir}/${pkgname}
     patch -p1 < ../qwtplot3d-gcc44.patch
     patch -p1 < ../qwtplot3d-qt-4.8.0.patch
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index 4f8843606..68c6465d0 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 177618 2013-02-08 07:48:31Z ronald $
+# $Id: PKGBUILD 180808 2013-03-26 11:49:39Z foutrelis $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: K. Piche <kpiche@rogers.com>
 
 pkgname=r
-pkgver=2.15.2
-pkgrel=3
+pkgver=2.15.3
+pkgrel=1
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -13,21 +13,19 @@ url=('http://www.r-project.org/')
 depends=('blas' 'lapack' 'bzip2'  'libpng' 'libjpeg' 'libtiff'
          'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs'
          'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils')
-makedepends=('openjdk6' 'gcc-fortran' 'tk>=8.6.0')
+makedepends=('jdk7-openjdk' 'gcc-fortran' 'tk')
 optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files')
 backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories')
 options=('!makeflags' '!emptydirs')
+install=r.install
 source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
 	'r.desktop'
 	'r.png'
-	'R.conf'
-	'x11.patch')
-install=r.install
-sha1sums=('c80da687d66ee88d1e34fc1ae5c1bd525f9513dd'
+	'R.conf')
+sha1sums=('a05b68f31b00d8038d9f0a8562cfc0c8e32d9621'
           '13aa29219bcaa102e575de8c1c8e0833d233e836'
           'a69a07ec363440efc18ce0a7f2af103375dea978'
-          '43668da6cfd1b4455a99f23e79e2059294dddac9'
-          'a11b91d53645bd545fddc382c991096502e8ac67')
+          '43668da6cfd1b4455a99f23e79e2059294dddac9')
 
 build() {
    cd "${srcdir}/R-${pkgver}"
@@ -36,8 +34,8 @@ build() {
   # set texmf dir correctly in makefile
   sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in
 
-  # upstream patch fixing empty plots FS#32597
-  patch -Np0 -i ${srcdir}/x11.patch
+# fix for texinfo 5.X
+  sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure
 
    ./configure  --prefix=/usr \
 		--libdir=/usr/lib \
@@ -53,11 +51,19 @@ build() {
                 F77=gfortran \
 		LIBnn=lib
    make
+
+# make libRmath.so
+   cd src/nmath/standalone
+   make shared
 }
 
 package() {
    cd "${srcdir}/R-${pkgver}"
-   make -j1 DESTDIR="${pkgdir}" install
+   make DESTDIR="${pkgdir}" install
+
+# install libRmath.so
+   cd src/nmath/standalone
+   make DESTDIR="${pkgdir}" install
 
    #  Fixup R wrapper scripts.
    sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R"
@@ -80,5 +86,5 @@ package() {
   done
 
   # Install ld.so.conf.d file to ensure other applications access the shared lib
-  install -Dm644 ${srcdir}/R.conf ${pkgdir}/etc/ld.so.conf.d/R.conf
+  install -Dm644 "${srcdir}/R.conf" "${pkgdir}/etc/ld.so.conf.d/R.conf"
 }
diff --git a/extra/r/x11.patch b/extra/r/x11.patch
deleted file mode 100644
index 3a02b28ea..000000000
--- a/extra/r/x11.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/modules/X11/devX11.c	(révision 61681)
-+++ src/modules/X11/devX11.c	(révision 61682)
-@@ -244,6 +244,7 @@ 
- {
-     if(inclose || !xd || !xd->buffered || xd->holdlevel > 0) return;
-     cairo_paint(xd->xcc);
-+    cairo_surface_flush(xd->xcs);
-     if (xd->type == WINDOW) XDefineCursor(display, xd->window, arrow_cursor);
-     XSync(display, 0);
-     xd->last = currentTime();
-@@ -753,8 +754,10 @@ 
- #ifdef HAVE_WORKING_CAIRO
- 	    pX11Desc xd = (pX11Desc) dd->deviceSpecific;
- 	    /* We can use the buffered copy where we have it */ 
--	    if(xd->buffered == 1) cairo_paint(xd->xcc);
--	    else if (xd->buffered > 1)
-+	    if(xd->buffered == 1) {
-+		cairo_paint(xd->xcc);
-+		cairo_surface_flush(xd->xcs);
-+	    } else if (xd->buffered > 1)
- 		/* rely on timer to repaint eventually */
- 		xd->last_activity = currentTime();
- 	    else
-@@ -2691,7 +2694,11 @@ 
- 		Cairo_update(xd);
- 	    return;
- 	}
--	if(xd->buffered) cairo_paint(xd->xcc);
-+	if(xd->buffered) {
-+	    cairo_paint(xd->xcc);
-+	    cairo_surface_flush(xd->xcs);
-+	}
-+	
- #endif
- 	if(xd->type==WINDOW) XDefineCursor(display, xd->window, arrow_cursor);
- 	XSync(display, 0);
diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD
index 8d4a5f91d..fb728058e 100644
--- a/extra/racket/PKGBUILD
+++ b/extra/racket/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 176859 2013-02-01 18:49:56Z eric $
+# $Id: PKGBUILD 178310 2013-02-19 23:15:41Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=racket
-pkgver=5.3.2
+pkgver=5.3.3
 pkgrel=1
 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ options=('!libtool' '!strip')
 install=racket.install
 source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \
         drracket.desktop)
-sha1sums=('bd6b1a31d3a94bc8253709f7ca1c81bcb2e23495'
+sha1sums=('96995fe20b332c4644dd51668851193b16976071'
           'a20808f6b250225704856f82a544681a962a299d')
 
 build() {
diff --git a/extra/racket/drracket-normal.rkt b/extra/racket/drracket-normal.rkt
deleted file mode 100644
index 5ed11c21c..000000000
--- a/extra/racket/drracket-normal.rkt
+++ /dev/null
@@ -1,199 +0,0 @@
-#lang racket/base
-
-(require mred
-         racket/class
-         racket/cmdline
-         racket/list
-         framework/private/bday
-         framework/splash
-         racket/runtime-path
-         racket/file
-         "frame-icon.rkt"
-         "eb.rkt")
-
-(define-runtime-path doc-icon.rkt "dock-icon.rkt")
-
-(define files-to-open (command-line #:args filenames filenames))
-
-;; updates the command-line-arguments with only the files
-;; to open. See also main.rkt.
-(current-command-line-arguments (apply vector files-to-open))
-
-(define (currently-the-weekend?)
-  (define date (seconds->date (current-seconds)))
-  (define dow (date-week-day date))
-  (or (= dow 6) (= dow 0)))
-
-(define (valentines-day?)
-  (define date (seconds->date (current-seconds)))
-  (and (= 2 (date-month date))
-       (= 14 (date-day date))))
-
-(define (current-icon-state)
-  (cond
-    [(valentines-day?) 'valentines]
-    [(currently-the-weekend?) 'weekend]
-    [else 'normal]))
-
-(define-values (texas-independence-day? prince-kuhio-day? kamehameha-day? halloween?)
-  (let* ([date (seconds->date (current-seconds))]
-         [month (date-month date)]
-         [day (date-day date)]
-         [dow (date-week-day date)])
-    (values (and (= 3 month) (= 2 day))
-            #f
-            (and (= 6 month) (= 11 day))
-            (and (= 10 month) (= 31 day)))))
-
-
-(define special-state #f)
-
-(define (icons-bitmap name)
-  (make-object bitmap% (collection-file-path name "icons")))
-
-(define-struct magic-image (chars filename [bitmap #:mutable]))
-
-(define (magic-img str img)
-  (make-magic-image (reverse (string->list str)) img #f))
-
-;; magic strings and their associated images.  There should not be a string
-;; in this list that is a prefix of another.
-(define magic-images
-  (list #;(magic-img "larval" "PLT-206-larval.png")
-        (magic-img "mars"   "PLT-206-mars.jpg")))
-
-(define (load-magic-images)
-  (set! load-magic-images void) ; run only once
-  (for-each (λ (magic-image)
-              (unless (magic-image-bitmap magic-image)
-                (set-magic-image-bitmap!
-                 magic-image
-                 (icons-bitmap (magic-image-filename magic-image)))))
-            magic-images))
-
-(define longest-magic-string
-  (apply max (map (λ (s) (length (magic-image-chars s))) magic-images)))
-
-(define key-codes null)
-
-(define (find-magic-image)
-  (define (prefix? l1 l2)
-    (or (null? l1)
-        (and (pair? l2)
-             (eq? (car l1) (car l2))
-             (prefix? (cdr l1) (cdr l2)))))
-  (ormap (λ (i) (and (prefix? (magic-image-chars i) key-codes) i))
-         magic-images))
-
-(define (add-key-code new-code)
-  (set! key-codes (cons new-code key-codes))
-  (when ((length key-codes) . > . longest-magic-string)
-    (set! key-codes (take key-codes longest-magic-string))))
-
-(define (drracket-splash-char-observer evt)
-  (let ([ch (send evt get-key-code)])
-    (when (and (eq? ch #\q)
-               (send evt get-control-down))
-      (exit))
-    (when (char? ch)
-      ;; as soon as something is typed, load the bitmaps
-      (load-magic-images)
-      (add-key-code ch)
-      (let ([match (find-magic-image)])
-        (when match
-          (set! key-codes null)
-          (set-splash-bitmap
-           (if (eq? special-state match)
-               (begin (set! special-state #f) the-splash-bitmap)
-               (begin (set! special-state match)
-                      (magic-image-bitmap match))))
-          (refresh-splash))))))
-
-(when (eb-bday?) (install-eb))
-
-(define weekend-bitmap-spec (collection-file-path "plt-logo-red-shiny.png" "icons"))
-(define normal-bitmap-spec (collection-file-path "plt-logo-red-diffuse.png" "icons"))
-(define valentines-days-spec (collection-file-path "heart.png" "icons"))
-
-(define the-bitmap-spec
-  (cond
-    [(valentines-day?)
-     valentines-days-spec]
-    [(or prince-kuhio-day? kamehameha-day?)
-     (set-splash-progress-bar?! #f)
-     (let ([size ((dynamic-require 'drracket/private/palaka 'palaka-pattern-size) 4)])
-       (vector (dynamic-require 'drracket/private/honu-logo 'draw-honu) 
-               size 
-               size))]
-    [texas-independence-day?
-     (collection-file-path "texas-plt-bw.gif" "icons")]
-    [halloween?
-     (collection-file-path "PLT-pumpkin.png" "icons")]
-    [(currently-the-weekend?)
-     weekend-bitmap-spec]
-    [else normal-bitmap-spec]))
-(define the-splash-bitmap (read-bitmap the-bitmap-spec))
-(set-splash-char-observer drracket-splash-char-observer)
-
-(when (eq? (system-type) 'macosx)
-  (define initial-state (current-icon-state))
-  (define weekend-bitmap (if (equal? the-bitmap-spec weekend-bitmap-spec)
-                             the-splash-bitmap
-                             #f))
-  (define weekday-bitmap (if (equal? the-bitmap-spec normal-bitmap-spec)
-                             the-splash-bitmap
-                             #f))
-  (define valentines-bitmap (if (equal? the-bitmap-spec valentines-days-spec)
-                                the-splash-bitmap
-                                #f))
-  (define set-doc-tile-bitmap (dynamic-require doc-icon.rkt 'set-dock-tile-bitmap))
-  (define (set-icon state)
-    (case state
-      [(valentines) 
-       (unless valentines-bitmap (set! valentines-bitmap (read-bitmap valentines-days-spec)))
-       (set-doc-tile-bitmap valentines-bitmap)]
-      [(weekend)
-       (unless weekend-bitmap (set! weekend-bitmap (read-bitmap weekend-bitmap-spec)))
-       (set-doc-tile-bitmap weekend-bitmap)]
-      [(normal) 
-       (unless weekday-bitmap (set! weekday-bitmap (read-bitmap normal-bitmap-spec)))
-       (set-doc-tile-bitmap weekday-bitmap)]))
-  (set-icon initial-state)
-  (void
-   (thread
-    (λ ()
-      (let loop ([last-state initial-state])
-        (sleep 10)
-        (define next-state (current-icon-state))
-        (unless (equal? last-state next-state)
-          (set-icon next-state))
-        (loop next-state))))))
-
-(start-splash the-splash-bitmap
-              "DrRacket"
-              700
-              #:allow-funny? #t
-              #:frame-icon todays-icon)
-
-(when (getenv "PLTDRBREAK")
-  (printf "PLTDRBREAK: creating break frame\n") (flush-output)
-  (let ([to-break (eventspace-handler-thread (current-eventspace))])
-    (parameterize ([current-eventspace (make-eventspace)])
-      (let* ([f (new frame% (label "Break DrRacket"))]
-             [b (new button% 
-                     (label "Break Main Thread")
-                     (callback
-                      (λ (x y)
-                        (break-thread to-break)))
-                     (parent f))]
-             [b (new button% 
-                     (label "Break All Threads")
-                     (callback
-                      (λ (x y)
-                        ((dynamic-require 'drracket/private/key 'break-threads))))
-                     (parent f))])
-        (send f show #t)))))
-
-(dynamic-require 'drracket/tool-lib #f)
-(shutdown-splash)
-(close-splash)
diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD
index b5250c08a..b88c703ae 100644
--- a/extra/raptor/PKGBUILD
+++ b/extra/raptor/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 175875 2013-01-23 00:13:12Z eric $
+# $Id: PKGBUILD 180809 2013-03-26 11:49:40Z foutrelis $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=raptor
-pkgver=2.0.8
-pkgrel=3
+pkgver=2.0.9
+pkgrel=2
 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://librdf.org/raptor"
-depends=('curl' 'libxslt' 'icu>=50.1.2')
+depends=('curl' 'libxslt' 'icu')
 license=('LGPL')
 options=('!libtool')
 source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz")
@@ -33,4 +33,4 @@ package() {
   cd "${srcdir}"/raptor2-${pkgver}
   make prefix="${pkgdir}"/usr install
 }
-md5sums=('ac60858b875aab8fa7917f21a1237aa9')
+md5sums=('4ceb9316488b0ea01acf011023cf7fff')
diff --git a/extra/ratpoison/PKGBUILD b/extra/ratpoison/PKGBUILD
deleted file mode 100644
index ddc2ad4bb..000000000
--- a/extra/ratpoison/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 150948 2012-02-24 09:50:09Z pierre $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: juergen <juergen@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-
-pkgname=ratpoison
-pkgver=1.4.5
-pkgrel=5
-pkgdesc="A simple keystroke-driven window manager"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('libxinerama' 'readline' 'bash' 'perl' 'libxtst' 'libxft' 'texinfo')
-url="http://www.nongnu.org/ratpoison/"
-install="${pkgname}.install"
-source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        "${pkgname}.desktop")
-md5sums=('330a08dbed6be88cab54f6947e9f0b60'
-         '29c3cb9be59758e39d8471391231a74a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make CFLAGS="$CFLAGS -DHAVE_GETLINE"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # fix permissions
-  chmod a+x ${pkgdir}/usr/share/ratpoison/{allwindows.sh,clickframe.pl,rpshowall.sh,rpws,split.sh}
-
-  # Not useful outside the source tree. Kill it
-  rm ${pkgdir}/usr/share/ratpoison/genrpbindings
-
-  cd contrib
-  ./genrpbindings
-  install -dm755 ${pkgdir}/usr/share/ratpoison/bindings
-  install -m644 {Ratpoison.pm,ratpoison-cmd.el,ratpoison.rb,ratpoison.lisp,ratpoison.py} \
-    ${pkgdir}/usr/share/ratpoison/bindings/
-
-  install -Dm644 ${srcdir}/${pkgname}.desktop \
-    ${pkgdir}/etc/X11/sessions/${pkgname}.desktop
-
-  install -Dm644 ${pkgdir}/usr/share/ratpoison/ratpoison.el \
-    ${pkgdir}/usr/share/emacs/site-lisp/ratpoison.el
-}
diff --git a/extra/ratpoison/ratpoison.desktop b/extra/ratpoison/ratpoison.desktop
deleted file mode 100644
index 9e29bd46a..000000000
--- a/extra/ratpoison/ratpoison.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Ratpoison
-Comment=The ratpoison window manager
-Exec=ratpoison
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application
diff --git a/extra/ratpoison/ratpoison.install b/extra/ratpoison/ratpoison.install
deleted file mode 100644
index 1eafd8f69..000000000
--- a/extra/ratpoison/ratpoison.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(ratpoison.info.gz)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
diff --git a/extra/razor/PKGBUILD b/extra/razor/PKGBUILD
index cc8afee2a..f8c9c8f52 100644
--- a/extra/razor/PKGBUILD
+++ b/extra/razor/PKGBUILD
@@ -1,41 +1,39 @@
-# $Id: PKGBUILD 160573 2012-06-02 10:28:53Z bluewind $
+# $Id: PKGBUILD 183164 2013-04-18 06:55:29Z eric $
 # Maintainer:
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Manolis Tzanidakis
 
 pkgname=razor
-pkgver=2.84
-pkgrel=7
+pkgver=2.85
+pkgrel=1
 pkgdesc="A distributed, collaborative, spam detection and filtering network"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://razor.sourceforge.net"
 license=('PerlArtistic')
 depends=('perl-net-dns' 'perl-digest-sha1' 'perl-uri' 'perl-digest-nilsimsa' 'perl')
 options=('!emptydirs')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-agents-${pkgver}.tar.bz2")
-md5sums=('8b9a11a6ce020383c32c45d1530d77c2')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-agents-${pkgver}.tar.bz2"
+         razor-2.85-cosmetic-pv-fix.patch)
+md5sums=('014d08db40187cb1316482191566b012'
+         '850645e088b21845f4b6653623d59515')
 
-build() {
-  cd "${srcdir}"/${pkgname}-agents-${pkgver}
-
-  # skip install_razor_agents (we'll do the linking later)
-  # /bin/sed -i "s|install :: all pure_install doc_install install_razor_agents|install :: all pure_install doc_install|g" Makefile
+prepare() {
+  cd ${pkgname}-agents-${pkgver}
+  patch -p1 -i "$srcdir/razor-2.85-cosmetic-pv-fix.patch"
+}
 
+build() {
+  cd ${pkgname}-agents-${pkgver}
   perl Makefile.PL INSTALLDIRS=vendor
   make
 }
 
 check() {
-  cd "${srcdir}"/${pkgname}-agents-${pkgver}
+  cd ${pkgname}-agents-${pkgver}
   make test
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-agents-${pkgver}
+  cd ${pkgname}-agents-${pkgver}
   make DESTDIR="${pkgdir}" install
-
-  # cd ${pkgdir}/usr/bin
-  # for i in razor-check razor-report razor-revoke razor-admin; do 
-  #  /bin/ln -sf razor-client $i; 
-  # done
 }
diff --git a/extra/razor/razor-2.85-cosmetic-pv-fix.patch b/extra/razor/razor-2.85-cosmetic-pv-fix.patch
new file mode 100644
index 000000000..c391d48fb
--- /dev/null
+++ b/extra/razor/razor-2.85-cosmetic-pv-fix.patch
@@ -0,0 +1,22 @@
+--- a/lib/Razor2/Client/Version.pm	2007-05-10 22:32:10.000000000 +0200
++++ b/lib/Razor2/Client/Version.pm	2010-03-25 11:11:36.911409707 +0100
+@@ -14,7 +14,7 @@
+ 
+ $PROTOCOL = 3;
+ 
+-$VERSION = '2.84';
++$VERSION = '2.85';
+ 
+ 1;
+ 
+--- a/META.yml	2007-05-23 20:29:34.000000000 +0200
++++ b/META.yml	2010-03-25 11:11:43.691408628 +0100
+@@ -1,7 +1,7 @@
+ # http://module-build.sourceforge.net/META-spec.html
+ #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
+ name:         razor-agents
+-version:      2.84
++version:      2.85
+ version_from: lib/Razor2/Client/Version.pm
+ installdirs:  site
+ requires:
diff --git a/extra/rcs/PKGBUILD b/extra/rcs/PKGBUILD
index 89cb246c3..b3331b406 100644
--- a/extra/rcs/PKGBUILD
+++ b/extra/rcs/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 161362 2012-06-10 09:11:36Z bisson $
+# $Id: PKGBUILD 181864 2013-04-05 00:36:01Z bisson $
 # Contributor: dorphell <dorphell@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=rcs
-pkgver=5.8.1
+pkgver=5.8.2
 pkgrel=1
 pkgdesc='Revision Control System: manages multiple revisions of files'
 url='http://www.gnu.org/software/rcs/'
 license=('GPL3')
 arch=('i686' 'x86_64' 'mips64el')
-source=("http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('3317a9e0f324a094e48584831e1b23852f907af9')
+source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('5972a7f97ab307e775083144cdf6b425c4aba7fe')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/redland/PKGBUILD b/extra/redland/PKGBUILD
index d6748d580..b903c8a97 100644
--- a/extra/redland/PKGBUILD
+++ b/extra/redland/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 174023 2013-01-01 18:37:13Z andyrtr $
+# $Id: PKGBUILD 180113 2013-03-17 11:48:21Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Francois Charette <francois.archlinux.org> 
@@ -7,11 +7,11 @@ pkgbase=redland
 epoch=1
 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite')
 pkgver=1.0.16
-pkgrel=1
+pkgrel=2
 url="http://librdf.org/"
 license=("GPL")
 arch=('i686' 'x86_64' 'mips64el')
-makedepends=('rasqal' 'raptor' 'db' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite')
+makedepends=('rasqal' 'raptor' 'db' 'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite')
 options=('!libtool')
 source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc}
         rpath.diff)
@@ -45,7 +45,7 @@ package_redland() {
 
 package_redland-storage-mysql() {
  pkgdesc="MySQL storage support for Redland"
- depends=('redland' 'libmysqlclient')
+ depends=('redland' 'libmariadbclient')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   install -dm755 "${pkgdir}/usr/lib/redland"
diff --git a/extra/rest/PKGBUILD b/extra/rest/PKGBUILD
index 0667874d2..ed44bdfef 100644
--- a/extra/rest/PKGBUILD
+++ b/extra/rest/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 169985 2012-10-30 23:00:29Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 183454 2013-04-21 22:12:01Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=rest
 pkgver=0.7.90
-pkgrel=1
+pkgrel=2
 pkgdesc="A helper library for RESTful services."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libxml2' 'libsoup-gnome')
-makedepends=('gobject-introspection')
+license=(GPL2)
+depends=(glib2 libxml2 'libsoup>=2.42.0')
+makedepends=(gobject-introspection)
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
 sha256sums=('1d682acaac4d946cc7c98a2dd9d65a8c83a6fdb8ca6759e70b8b5042fe66c022')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc
@@ -23,8 +23,8 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/rhythmbox/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch b/extra/rhythmbox/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch
deleted file mode 100644
index dc3f3429a..000000000
--- a/extra/rhythmbox/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a8f5d8cec87ef1586897e94e49bdf54db64bf97b Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember@gmail.com>
-Date: Thu, 11 Oct 2012 10:59:16 +0200
-Subject: [PATCH] Disable the context pane plugin when webkit isn't available
-
----
- plugins/Makefile.am | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index e4f6e69..3a9ea03 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -14,7 +14,6 @@ SUBDIRS =						\
- if ENABLE_PYTHON
- SUBDIRS +=						\
- 	artsearch					\
--	context						\
- 	im-status					\
- 	lyrics						\
- 	magnatune					\
-@@ -24,8 +23,12 @@ SUBDIRS +=						\
- 	sendto						\
- 	rb
- 
-+if WITH_WEBKIT
-+SUBDIRS += context
- endif
- 
-+endif # ENABLE_PYTHON
-+
- if WITH_LIRC
- SUBDIRS += lirc
- endif
--- 
-1.7.12.1
-
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index 4a7101d97..da3dbc420 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -1,24 +1,19 @@
-# $Id: PKGBUILD 171480 2012-11-18 00:28:26Z eric $
+# $Id: PKGBUILD 183455 2013-04-21 22:12:04Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rhythmbox
-pkgver=2.98
-pkgrel=4
+pkgver=2.99.1
+pkgrel=1
 pkgdesc="An iTunes-like music playback and management application"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
+license=(GPL)
 url="http://www.rhythmbox.org"
-depends=('dconf' 'desktop-file-utils' 'gstreamer0.10-base-plugins' 
-         'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib'
-         'libnotify' 'libpeas' 'media-player-info' 'python2-gobject' 
-         'totem-plparser' 'tdb')
-makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection' 
-             'vala' 'gnome-common' 'gtk-doc' 'grilo' 'libdmapsharing' 'lirc-utils' 
-             'libgpod' 'libmtp')
-optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
-            'gstreamer0.10-bad-plugins: Extra media codecs'
-            'gstreamer0.10-ffmpeg: Extra media codecs'
+depends=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas media-player-info python2-gobject totem-plparser tdb webkitgtk3)
+makedepends=(itstool intltool brasero gobject-introspection vala grilo libdmapsharing lirc-utils libgpod libmtp)
+optdepends=('gst-plugins-ugly: Extra media codecs'
+            'gst-plugins-bad: Extra media codecs'
+            'gst-libav: Extra media codecs'
             'brasero: Audio CD Recorder plugin'
             'libdmapsharing: DAAP Music Sharing plugin'
             'grilo-plugins: Grilo media browser plugin'
@@ -28,23 +23,15 @@ optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
             'zeitgeist: Zeitgeist plugin')
 options=('!libtool' '!emptydirs')
 install=rhythmbox.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz
-	Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch
-	rhythmbox-2.98-xinitthreads.patch)
-sha256sums=('a5c0a18a7c76133d36c7dcbdc37e304eae8272703985b17b540d68603b0c76d5'
-            '6510214e7fe0a18d17d8c599ae065bd48c2e1f82931fe82e3d1cc684a0801cd6'
-            'cd9af451a411e5a621c385d43f5ddd3664b3d085fc12dc7d5e5cd1f5db9e73b0')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('ed30bb534a789e2b50f953e33eee0bb09f389fe813d433a87d504d07be5f7777')
 
 build() {
   cd "$pkgname-$pkgver"
-  patch -Np1 -i "${srcdir}/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch"
-  patch -Np1 -i "${srcdir}/rhythmbox-2.98-xinitthreads.patch"
-  autoreconf -fi
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/rhythmbox \
       --localstatedir=/var --disable-static \
-      --enable-daap --enable-python --enable-vala \
-      --with-mdns=avahi --disable-scrollkeeper --without-webkit
+      --enable-daap --enable-python --enable-vala
   make
 }
 
diff --git a/extra/rhythmbox/rhythmbox-2.98-xinitthreads.patch b/extra/rhythmbox/rhythmbox-2.98-xinitthreads.patch
deleted file mode 100644
index 6a6426038..000000000
--- a/extra/rhythmbox/rhythmbox-2.98-xinitthreads.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 1780aab638aa39704be34fc214de39b4847a87b2 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 17 Oct 2012 19:02:50 +0200
-Subject: [PATCH] shell: Call XInitThreads() on X11 systems
-
-Otherwise bad things can happen with some plugins that expect
-mutexes to work, like the visualiser plugin and Clutter.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686320
----
- configure.ac | 15 +++++++++++++++
- shell/main.c | 12 ++++++++++++
- 2 files changed, 27 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 009c838..8a88d72 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -86,10 +86,25 @@ PKG_PROG_PKG_CONFIG
- 
- PKG_CHECK_MODULES(RB_CLIENT, glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS gio-unix-2.0 >= $GLIB_REQS)
- 
-+dnl Always require libX11 for XInitThreads() on X11 systems
-+X11_PKG=""
-+gdk_targets=`$PKG_CONFIG --variable targets gdk-3.0`
-+for target in $gdk_targets; do
-+	case "$target" in
-+		x11)
-+			X11_PKG=x11
-+			break
-+			;;
-+		*)
-+			;;
-+	esac
-+done
-+
- dnl  note: gio-unix-2.0 is here for libmediaplayerid
- PKG_CHECK_MODULES(RHYTHMBOX,				\
- 		  gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQS \
- 		  gtk+-3.0 >= $GTK_REQS			\
-+		  $X11_PKG				\
- 		  gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQS	\
- 		  glib-2.0 >= $GLIB_REQS		\
- 		  gio-2.0 >= $GLIB_REQS			\
-diff --git a/shell/main.c b/shell/main.c
-index 3c0346d..696f3e9 100644
---- a/shell/main.c
-+++ b/shell/main.c
-@@ -34,6 +34,11 @@
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
- 
-+#ifdef GDK_WINDOWING_X11
-+/* X11 headers */
-+#include <X11/Xlib.h>
-+#endif
-+
- #include <girepository.h>
- 
- #include "rb-shell.h"
-@@ -51,6 +56,13 @@ main (int argc, char **argv)
- 	int new_argc;
- 	char **new_argv;
- 
-+#ifdef GDK_WINDOWING_X11
-+	if (XInitThreads () == 0) {
-+		g_critical ("Initialising threading support failed.");
-+		return 1;
-+	}
-+#endif
-+
- 	/* disable multidevice so clutter-gtk events work.
- 	 * this needs to be done before gtk_open, so the visualizer
- 	 * plugin can't do it.
--- 
-1.7.12.1
\ No newline at end of file
diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD
index ebc4007af..223544f00 100644
--- a/extra/rosegarden/PKGBUILD
+++ b/extra/rosegarden/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 173870 2012-12-26 20:57:07Z schiv $
+# $Id: PKGBUILD 182809 2013-04-15 13:34:39Z 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.12.25
+pkgver=13.04
 pkgrel=1
 pkgdesc="MIDI/audio sequencer and notation editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rosegardenmusic.com/"
 license=('GPL')
 depends=('liblrdf' 'dssi' 'fftw' 'lirc-utils'
-         'perl' 'qt' 'shared-mime-info')
+         'perl' 'qt4' 'shared-mime-info')
 makedepends=('imake')
 optdepends=('lilypond: notation display'
             'cups: printing support'
@@ -23,14 +23,22 @@ 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=('8c98e7d3d448b07d9dc079b28bd37eba')
+md5sums=('bcc9be7bf8c3945e0eefdb95dc037f0b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # lrdf + raptor2 compatibility
-  export lrdf_CFLAGS="$(pkg-config --cflags raptor2)"
+  lrdf_CFLAGS="$(pkg-config --cflags raptor2)"
+
+  # qt4 compatibility (qt->qt5)
+  LRELEASE=/usr/lib/qt4/bin/lrelease
+  LUPDATE=/usr/lib/qt4/bin/lupdate
+
+  export lrdf_CFLAGS LRELEASE LUPDATE
+
   ./configure --prefix=/usr
+
   make
 }
 
diff --git a/extra/rosegarden/rosegarden.install b/extra/rosegarden/rosegarden.install
index 5119faec2..3f22aadfb 100644
--- a/extra/rosegarden/rosegarden.install
+++ b/extra/rosegarden/rosegarden.install
@@ -1,6 +1,7 @@
 post_install() {
   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
   update-mime-database usr/share/mime &> /dev/null
+  update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/extra/rox/PKGBUILD b/extra/rox/PKGBUILD
deleted file mode 100644
index e852a9f96..000000000
--- a/extra/rox/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 153733 2012-03-19 00:48:00Z eric $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Jochem Kossen <j.kossen@home.nl>
-
-pkgname=rox
-pkgver=2.11
-pkgrel=1
-pkgdesc="A small and fast file manager which can optionally manage the desktop background and panels"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://roscidus.com/desktop/"
-depends=('sh' 'libsm' 'gtk2')
-makedepends=('librsvg' 'python2')
-source=("http://downloads.sourceforge.net/${pkgname}/rox-filer-${pkgver}.tar.bz2"
-        'rox.desktop' 'rox.svg' 'rox.sh')
-md5sums=('0eebf05a67f7932367750ebf9faf215d'
-         'de05c906395abd4402b0470c1bc2ae6e'
-         '658c8648b51e215558e13e6afb2b5c76'
-         '31578a90b241f0a8d09c9f8587608d00')
-
-build() {
-  cd "${srcdir}/rox-filer-${pkgver}"
-  ./ROX-Filer/AppRun --compile LIBS="-ldl -lm"
-# finally we render a png as fallback for svg unaware menu applications
-# Attention: always make sure you check the dimensions of the source-svg,
-# you can read the dimensions via inkscape's export function
-  rsvg-convert -w 48 -h 38 -f png -o "${srcdir}/rox.png" "${srcdir}/rox.svg"
-}
-
-package() {
-  cd "${srcdir}/rox-filer-${pkgver}"
-  install -d "${pkgdir}/usr/share/Choices/MIME-types"
-  install -m755 Choices/MIME-types/* "${pkgdir}/usr/share/Choices/MIME-types/"
-  cp -rp ROX-Filer "${pkgdir}/usr/share/"
-  rm -fr "${pkgdir}"/usr/share/ROX-Filer/{src,build}
- 
-  install -D -m755 "${srcdir}/rox.sh" "${pkgdir}/usr/bin/rox"
-  install -D -m644 rox.1 "${pkgdir}/usr/share/man/man1/rox.1"
-  ln -sf rox.1 "${pkgdir}/usr/share/man/man1/ROX-Filer.1"
-
-  install -D -m644 "${srcdir}/rox.desktop" "${pkgdir}/usr/share/applications/rox.desktop"
-  install -D -m644 "${srcdir}/rox.svg" "${pkgdir}/usr/share/pixmaps/rox.svg"
-  install -D -m644 "${srcdir}/rox.png" "${pkgdir}/usr/share/pixmaps/rox.png"
-}
diff --git a/extra/rox/rox.desktop b/extra/rox/rox.desktop
deleted file mode 100644
index 93edfabcf..000000000
--- a/extra/rox/rox.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=ROX Filer
-Exec=rox
-Icon=rox
-Terminal=false
-Type=Application
-Categories=System;Utility;Core;FileManager;
diff --git a/extra/rox/rox.sh b/extra/rox/rox.sh
deleted file mode 100644
index f2dc449d0..000000000
--- a/extra/rox/rox.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/share/ROX-Filer/AppRun "$@"
diff --git a/extra/rox/rox.svg b/extra/rox/rox.svg
deleted file mode 100644
index 4cbd7cc28..000000000
--- a/extra/rox/rox.svg
+++ /dev/null
@@ -1,493 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
-"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   id="svg1573"
-   sodipodi:version="0.32"
-   inkscape:version="0.39"
-   width="100.00000pt"
-   height="80.000000pt"
-   sodipodi:docbase="/home/keep/graphics/arch_candy/svg-icons"
-   sodipodi:docname="rox_filer.svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:xlink="http://www.w3.org/1999/xlink">
-  <defs
-     id="defs1575">
-    <linearGradient
-       id="linearGradient2267">
-      <stop
-         style="stop-color:#fdffc6;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2268" />
-      <stop
-         style="stop-color:#ffbc00;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2269" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2267"
-       id="linearGradient2270"
-       x1="0.17269076"
-       y1="0.14173229"
-       x2="0.97590363"
-       y2="0.72834647" />
-    <linearGradient
-       id="linearGradient2263">
-      <stop
-         style="stop-color:#b4b4b4;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2264" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2265" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1589">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop1590" />
-      <stop
-         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop1593" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2196">
-      <stop
-         style="stop-color:#bee3ff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop2197" />
-      <stop
-         style="stop-color:#7dd3ff;stop-opacity:1.0000000;"
-         offset="0.073038995"
-         id="stop2200" />
-      <stop
-         style="stop-color:#2494d0;stop-opacity:1.0000000;"
-         offset="0.81849396"
-         id="stop2199" />
-      <stop
-         style="stop-color:#465b72;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop2198" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1606">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.62745100;"
-         offset="0.0000000"
-         id="stop1607" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop1608" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1606"
-       id="radialGradient1636"
-       cx="1.0000000"
-       cy="1.0000000"
-       r="0.99467027"
-       fx="1.0000000"
-       fy="1.0000000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1606"
-       id="linearGradient1638"
-       x1="0.50000000"
-       y1="1.0000000"
-       x2="0.50000000"
-       y2="0.0000000" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1606"
-       id="radialGradient1643"
-       cx="0.0000000"
-       cy="1.0000000"
-       r="1.0000000"
-       fx="0.0000000"
-       fy="1.0000000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1606"
-       id="linearGradient1645"
-       x1="0.0000000"
-       y1="0.50000000"
-       x2="1.0000000"
-       y2="0.50000000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1606"
-       id="linearGradient1647"
-       x1="1.0000000"
-       y1="0.50000000"
-       x2="0.0000000"
-       y2="0.50000000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1606"
-       id="linearGradient1649"
-       x1="0.50000000"
-       y1="1.8735014e-14"
-       x2="0.50000000"
-       y2="1.0000000" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1606"
-       id="radialGradient1651"
-       cx="1.0000000"
-       cy="0.0000000"
-       r="1.0000000"
-       fx="1.0000000"
-       fy="0.0000000" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1606"
-       id="radialGradient1653"
-       cx="0.0000000"
-       cy="0.0000000"
-       r="1.0000000"
-       fx="0.0000000"
-       fy="0.0000000" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2196"
-       id="linearGradient2195"
-       x1="0.28313252"
-       y1="0.17968750"
-       x2="0.32777777"
-       y2="0.82031250" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2196"
-       id="linearGradient2202"
-       x1="0.67934781"
-       y1="0.96875000"
-       x2="0.63000000"
-       y2="-0.054687500" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2196"
-       id="linearGradient2207"
-       x1="0.34701493"
-       y1="0.58801496"
-       x2="0.71766168"
-       y2="1.0074906" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1589"
-       id="linearGradient1588"
-       x1="0.34029850"
-       y1="0.052631579"
-       x2="0.88955224"
-       y2="0.85964912" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2263"
-       id="radialGradient2272"
-       cx="0.65671641"
-       cy="0.34579438"
-       r="0.36985061"
-       fx="0.65671641"
-       fy="0.35046729" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.4980189"
-     inkscape:cx="45.259790"
-     inkscape:cy="38.198748"
-     inkscape:window-width="1018"
-     inkscape:window-height="744"
-     showgrid="true"
-     snaptogrid="false"
-     gridspacingy="10.000000pt"
-     gridspacingx="10.000000pt"
-     gridoriginy="0.0000000pt"
-     gridoriginx="0.0000000pt"
-     gridtolerance="2.0000000px"
-     inkscape:grid-bbox="false"
-     inkscape:grid-points="false"
-     inkscape:window-x="0"
-     inkscape:window-y="3"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:guide-points="true"
-     guidetolerance="3.0000000pt" />
-  <metadata
-     id="metadata1576">
-    <rdf:RDF
-       id="RDF1577">
-      <cc:Work
-         rdf:about=""
-         id="Work1578">
-        <dc:description
-           id="description1579">Created with Inkscape
-http://www.inkscape.org/</dc:description>
-        <dc:format
-           id="format1581">image/svg+xml</dc:format>
-        <dc:type
-           id="type1583"
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title
-           id="title1606">Rox-Filer Icon for Archlinux
-based on work found on the internet trying to match the original xpm</dc:title>
-        <dc:date
-           id="date1608">2004-07-14</dc:date>
-        <dc:creator
-           id="creator1610">
-          <cc:Agent
-             id="Agent1611">
-            <dc:title
-               id="title1612">Tobias Kieslich, Archlinux package maintainer</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:coverage
-           id="coverage1614" />
-        <cc:license
-           id="license1616"
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/"
-         id="License1624">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction"
-           id="permits1625" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution"
-           id="permits1626" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice"
-           id="requires1627" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks"
-           id="permits1628" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike"
-           id="requires1629" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode"
-           id="requires1630" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <rect
-     style="fill:url(#radialGradient1636);fill-opacity:0.56000000;fill-rule:evenodd;stroke:none;"
-     id="sh_up_left"
-     width="18.750000"
-     height="18.750000"
-     x="0.15625000"
-     y="0.15624750" />
-  <rect
-     style="fill:url(#linearGradient1638);fill-opacity:0.56000000;fill-rule:evenodd;stroke:none;"
-     id="sh_up_top"
-     width="87.500000"
-     height="18.750000"
-     x="18.906250"
-     y="-2.4999999e-06" />
-  <rect
-     style="fill:url(#radialGradient1643);fill-opacity:0.56000000;fill-rule:evenodd;stroke:none;"
-     id="sh_up_right"
-     width="18.750000"
-     height="18.750000"
-     x="106.40625"
-     y="0.15624750" />
-  <rect
-     style="fill:url(#linearGradient1645);fill-opacity:0.56000000;fill-rule:evenodd;stroke:none;"
-     id="sh_side_right"
-     width="18.750000"
-     height="62.500000"
-     x="106.40625"
-     y="18.906250"
-     ry="0.0000000" />
-  <rect
-     style="fill:url(#radialGradient1653);fill-opacity:0.56000000;fill-rule:evenodd;stroke:none;"
-     id="sh_lo_right"
-     width="18.750000"
-     height="18.750000"
-     x="106.40625"
-     y="81.406250" />
-  <rect
-     style="fill:url(#linearGradient1649);fill-opacity:0.56000000;fill-rule:evenodd;stroke:none;"
-     id="sh_lo_button"
-     width="87.500000"
-     height="18.750000"
-     x="18.906250"
-     y="81.406250"
-     ry="0.0000000" />
-  <rect
-     style="fill:url(#radialGradient1651);fill-opacity:0.56000000;fill-rule:evenodd;stroke:none;"
-     id="sh_lo_left"
-     width="18.750000"
-     height="18.750000"
-     x="0.15625000"
-     y="81.406250"
-     ry="0.0000000" />
-  <rect
-     style="fill:url(#linearGradient1647);fill-opacity:0.56000000;fill-rule:evenodd;stroke:none;"
-     id="sh_side_left"
-     width="18.750000"
-     height="62.500000"
-     x="0.15625000"
-     y="18.906250" />
-  <path
-     style="fill:url(#linearGradient2195);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#005ec6;stroke-width:0.37500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.76973683;"
-     d="M 10.000000,17.031250 C 15.781250,16.406250 12.187501,7.1874998 23.593751,7.4999998 C 45.937500,7.6562498 50.000000,5.4687498 55.937501,12.031250 C 73.437502,11.875000 95.781252,12.187500 106.25000,13.437500 C 111.09375,21.718750 109.03244,76.848192 111.25000,85.000000 C 105.93750,85.781250 31.718750,84.843750 17.187500,85.000000 C 19.687500,74.062500 13.593750,31.093750 10.000000,17.031250 z "
-     id="path2194"
-     sodipodi:nodetypes="ccccccc" />
-  <path
-     style="fill:url(#linearGradient2202);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#003465;stroke-width:0.50000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.51315790;"
-     d="M 22.656253,20.937500 C 27.656253,18.125000 102.18751,22.656260 118.12500,20.781250 C 113.28125,46.875000 107.43528,64.689405 111.09375,85.156250 C 92.656250,89.531250 42.031253,85.000000 17.187502,85.000000 C 8.7500029,53.281250 17.656253,23.750000 22.656253,20.937500 z "
-     id="path2201"
-     sodipodi:nodetypes="ccccc" />
-  <path
-     id="outline"
-     stroke="black"
-     stroke-width="1"
-     d="M 55.515353,11.233098 C 87.695353,13.593098 87.040232,46.022391 105.94188,47.608732 C 113.45000,47.428732 86.513146,58.158732 68.693146,56.338732 C 60.333146,56.338732 57.423146,56.698732 47.423146,57.608732 C 41.423146,58.518732 35.435573,58.989217 27.975573,57.179217 C 20.902855,58.670188 21.171750,57.406693 19.875646,46.904982 C 21.358146,46.737482 21.292460,46.313412 22.819854,48.554647 C 23.991544,50.273937 24.425353,46.595305 25.854085,48.756854 C 33.124085,44.026854 26.153146,23.978732 33.423146,21.428732 C 29.603146,15.978732 33.973146,9.4287317 36.693146,9.7887317 C 37.783146,7.2487317 37.221926,4.5924878 39.401926,5.5024878 C 43.194694,7.1884025 46.004695,3.4125365 48.214085,3.2643658 C 50.330329,3.9390609 49.603146,4.8787317 51.243146,5.4287317 C 57.063146,2.8787317 55.923427,9.3281222 55.515353,11.233098 z "
-     style="fill:url(#radialGradient2272);stroke:#000000;stroke-width:1.8000009;stroke-miterlimit:4.0000000;opacity:1.0000000;"
-     sodipodi:nodetypes="ccccccsccccccc"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:#8c8c8c;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;"
-     d="M 84.890446,38.997755 C 84.890446,38.997755 88.581336,37.807146 90.724434,37.092780 C 91.795983,40.069305 97.868097,47.689207 107.15485,48.046390 C 110.72668,47.808268 93.343775,48.522634 90.248190,49.475122 C 87.152604,50.427610 84.652324,41.140853 84.890446,38.997755 z "
-     id="path2244"
-     sodipodi:nodetypes="ccccc"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:#aaaaaa;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.95000046;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 78.173843,39.831182 C 78.650087,44.117377 78.411965,55.904415 86.269989,56.142537 C 98.176087,55.904415 112.93964,49.237000 102.46229,48.284512 C 94.842380,47.689208 93.175526,50.427610 85.555623,38.759633 C 85.079379,32.330340 85.317501,38.759634 85.555623,38.759634 L 78.173843,39.831182 z "
-     id="path2243"
-     sodipodi:nodetypes="cccccc"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:#aaaaaa;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.95000046;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 72.173840,40.069304 C 72.650084,44.355499 75.388487,56.142537 80.508108,55.904415 C 92.414206,55.666293 110.27335,48.046390 99.795987,48.284512 C 92.890450,48.998878 81.936840,51.261037 79.793742,39.593060 C 79.317498,33.163767 79.793742,39.593061 79.793742,39.593061 L 72.173840,40.069304 z "
-     id="path2242"
-     sodipodi:nodetypes="cccccc"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:#aaaaaa;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.95000046;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 65.744547,40.188365 C 66.220791,44.474560 67.054218,56.142537 74.912242,56.380659 C 86.818339,56.142537 101.34378,49.594183 90.866413,49.832305 C 82.889327,49.832305 75.626608,51.261037 73.364449,39.950243 C 72.888205,33.520950 73.364449,39.950244 73.364449,39.950244 L 65.744547,40.188365 z "
-     id="path1620"
-     sodipodi:nodetypes="cccccc"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:#aaaaaa;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.95000046;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 61.554493,41.021792 C 62.030737,45.307987 62.745103,55.309110 70.603127,55.547232 C 77.389603,57.095025 90.605372,50.903854 80.128005,51.141976 C 72.627163,50.308549 70.841249,47.689208 68.698151,40.783670 C 67.983785,30.782548 68.221907,39.593061 68.221907,39.593061 L 61.554493,41.021792 z "
-     id="path1619"
-     sodipodi:nodetypes="cccccc"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:#0e5ca4;fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2207);stroke-width:2.8750000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 18.125000,83.750000 C 15.781250,74.687500 55.937499,78.593750 65.156250,78.593750 C 78.125000,78.906250 82.031249,57.656250 89.843750,57.500000 C 94.531250,57.656250 104.59597,56.966529 109.75222,56.966529 C 108.17076,66.501032 108.33487,74.284818 109.68750,84.218750 C 92.500002,87.968750 42.343750,83.593750 18.125000,83.750000 z "
-     id="path2206"
-     sodipodi:nodetypes="cccccc" />
-  <path
-     style="fill:#aaaaaa;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.95000046;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 30.241456,38.045267 C 29.288968,47.927329 28.336481,47.927329 26.431505,49.951366 C 25.479017,48.403573 24.407468,48.403573 23.097797,49.951366 C 21.669066,48.284512 21.779994,46.597620 20.172530,47.349456 C 21.072561,50.995102 20.280329,54.730317 22.014628,58.317134 C 28.786566,56.578346 35.306033,59.977218 53.934591,56.542597 C 58.339847,54.756683 47.386237,41.855219 46.314688,42.212402 C 45.243139,42.569585 33.337041,44.355500 30.241456,38.045267 z "
-     id="path2245"
-     sodipodi:nodetypes="cccccccc"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:#ffc800;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 32.136364,51.487233 C 28.207348,51.844415 27.753870,54.946654 28.230114,57.565995 C 30.023765,56.968112 32.078234,57.581448 34.761364,57.362233 L 34.761364,51.987233 C 34.066700,51.633088 33.237515,51.349589 32.136364,51.487233 z "
-     id="path2261"
-     sodipodi:nodetypes="ccccc"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:#ffc800;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 35.470071,51.606294 C 31.541055,51.963476 31.087577,55.065715 31.563821,57.685056 C 33.357472,57.087173 35.411941,57.700509 38.095071,57.481294 L 38.095071,52.106294 C 37.400407,51.752149 36.571222,51.468650 35.470071,51.606294 z "
-     id="path2260"
-     sodipodi:nodetypes="ccccc"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:#ffc800;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 38.208474,51.606294 C 34.279458,51.963476 33.825980,56.018203 34.302224,58.637544 C 36.095875,58.039661 38.150344,57.700509 40.833474,57.481294 L 40.833474,52.106294 C 40.138810,51.752149 39.309625,51.468650 38.208474,51.606294 z "
-     id="path2259"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:#ffc800;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 41.184999,51.606294 C 37.255983,51.963476 36.802505,56.018203 37.278749,58.637544 C 39.072400,58.039661 41.126869,57.700509 43.809999,57.481294 L 43.809999,52.106294 C 43.115335,51.752149 42.286150,51.468650 41.184999,51.606294 z "
-     id="path2258"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:#ffc800;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 44.280584,51.487233 C 40.351568,51.844415 39.898090,55.899142 40.374334,58.518483 C 42.167985,57.920600 44.222454,57.581448 46.905584,57.362233 L 46.905584,51.987233 C 46.210920,51.633088 45.381735,51.349589 44.280584,51.487233 z "
-     id="path2249"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:#ffc800;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 61.911677,45.307988 C 61.375902,44.415030 61.765709,44.034840 61.733085,42.658881 C 58.268663,42.540664 58.280316,48.344042 58.697030,52.570707 C 56.077688,52.808829 55.363323,52.570707 54.291774,52.689768 C 53.220225,52.808829 52.029615,50.546671 49.172152,50.903854 C 45.243139,51.261036 44.766896,55.309110 45.243140,57.928451 C 49.172151,56.618781 53.577408,56.380658 65.721628,56.499719 C 56.672994,50.070426 60.721067,44.593622 61.911677,45.307988 z "
-     id="path2248"
-     sodipodi:nodetypes="cccccccc"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.75000042;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 38.862811,5.8564233 C 40.714965,6.4457451 43.778156,8.4025157 47.566654,3.8563191 C 48.661109,3.2669973 49.839752,5.5400956 51.186773,5.7926621 C 48.745297,8.2341380 48.324354,12.527769 45.461933,12.527768 C 42.431136,13.032901 41.841814,10.423048 37.295617,10.423047 C 36.958861,9.9179145 36.673901,6.3615563 38.862811,5.8564233 z "
-     id="path2273"
-     sodipodi:nodetypes="cccccc"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.45000023;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 37.884939,9.1602151 C 38.726827,8.5708933 41.168303,9.1602151 42.094380,9.9179146 C 43.020458,10.675614 47.314087,4.3614521 49.166242,4.8665850 C 50.850018,6.0452286 51.439340,5.5400956 50.765829,6.4661727 C 50.092319,7.3922498 47.903409,12.696146 45.798689,12.611957 C 43.693968,12.527768 38.474261,9.9179146 37.463995,10.338859 C 36.453729,10.759803 37.884939,9.1602151 37.884939,9.1602151 z "
-     id="path2274"
-     sodipodi:nodetypes="ccccccc"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:url(#linearGradient2270);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.90000045;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 40.480700,28.282268 C 35.837322,26.139170 26.550566,13.399645 37.146993,10.304059 C 42.504737,10.423120 41.314127,13.042462 44.409712,12.447157 C 47.505298,11.851852 49.886518,4.3510105 53.339286,4.9463154 C 55.601444,7.0894130 55.958628,15.423681 53.101164,18.757389 C 50.005579,19.709877 46.195627,19.471755 40.480700,28.282268 z "
-     id="path2262"
-     sodipodi:nodetypes="cccccc"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:#000000;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.2500006;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 42.346947,9.9179146 C 41.926003,10.338859 41.505058,10.759803 41.589247,11.180747 C 42.431136,11.601691 43.273024,12.443579 44.788422,12.527769 C 45.967067,11.517503 46.135443,8.4867045 45.377745,8.3183268 C 44.367479,7.8973828 43.020457,9.0760263 42.346947,9.9179146 z "
-     id="path2275"
-     sodipodi:nodetypes="ccccc"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 41.195066,29.115694 C 40.123518,29.472877 34.765774,29.591938 35.242017,36.140292 C 35.718261,42.688646 40.718822,50.427609 48.100603,50.903853 C 49.291213,51.022914 58.339847,48.165450 55.958627,36.973718 C 52.267738,26.734474 46.314688,28.520389 41.195066,29.115694 z "
-     id="path2276"
-     sodipodi:nodetypes="ccccc"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 20.025215,48.192533 C 20.739581,49.025960 19.406907,55.190048 26.193383,50.189487"
-     id="path2278"
-     sodipodi:nodetypes="cc"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 24.185500,48.718875 C 24.304561,49.552301 24.764651,51.141975 26.431505,49.832305"
-     id="path2279"
-     sodipodi:nodetypes="cc"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 53.815530,22.448279 C 57.625482,22.686401 60.482945,27.925084 61.554494,41.736158"
-     id="path2280"
-     sodipodi:nodetypes="cc"
-     transform="translate(-4.687500,23.28125)" />
-  <path
-     style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;"
-     d="M 36.908871,25.662926 C 35.480139,28.401329 33.932347,29.710999 35.122956,36.140292"
-     id="path2281"
-     sodipodi:nodetypes="cc"
-     transform="translate(-4.687500,23.28125)" />
-</svg>
diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD
index b5554eca3..3a6655758 100644
--- a/extra/rrdtool/PKGBUILD
+++ b/extra/rrdtool/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 174294 2013-01-04 03:15:34Z eric $
+# $Id: PKGBUILD 180584 2013-03-23 23:09:38Z td123 $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=rrdtool
 pkgver=1.4.7
-pkgrel=4
+pkgrel=5
 pkgdesc="Data logging and graphing application"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rrdtool.org"
@@ -35,6 +35,6 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" includedir=/usr/include install
   install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 12700fbfe..870f3733d 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Jeramy Rutley <jrutley@gmail.com>
 
 pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.3_p385
+pkgver=2.0.0_p0
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ruby-lang.org/en/'
@@ -13,7 +13,7 @@ makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
 options=('!emptydirs' '!makeflags')
 source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
         'gemrc')
-md5sums=('5ec9aff670f4912b0f6f0e11e855ef6c'
+md5sums=('895c1c581f8d28e8b3bb02472b2ccf6a'
          '6fb8e7a09955e0f64be3158fb4a27e7a')
 
 build() {
diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD
new file mode 100644
index 000000000..cfcdf94b6
--- /dev/null
+++ b/extra/rygel/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 183456 2013-04-21 22:12:05Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=rygel
+pkgver=0.18.1
+pkgrel=1
+pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://live.gnome.org/Rygel"
+license=(LGPL)
+depends=(gupnp-av gupnp-dlna libgee gtk3 libunistring libtracker-sparql hicolor-icon-theme xdg-utils)
+makedepends=(vala intltool)
+optdepends=('gst-plugins-base: Extra media codecs'
+            'gst-plugins-good: Extra media codecs'
+            'gst-plugins-bad: Extra media codecs'            
+            'gst-plugins-ugly: Extra media codecs'
+            'gst-libav: Extra media codecs'
+            'tracker: Share indexed media files')
+backup=(etc/rygel.conf)
+options=('!libtool')
+install=rygel.install
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('3f71bec31be373707dd0edd88aeea49c74429f258fc5a7e01bb979563349c64d')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static --enable-mediathek-plugin --enable-gst-launch-plugin
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/abiword/abiword.install b/extra/rygel/rygel.install
index 2eaa60550..2c455e952 100644
--- a/extra/abiword/abiword.install
+++ b/extra/rygel/rygel.install
@@ -1,5 +1,5 @@
 post_install() {
-  update-desktop-database -q
+  xdg-icon-resource forceupdate
 }
 
 post_upgrade() {
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index e8c50d100..447980d9b 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,26 +1,35 @@
-# $Id: PKGBUILD 176366 2013-01-31 08:04:09Z tpowa $
+
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
+# Contributor: Michael Hansen <zrax0111 gmail com>
+# Contributor: Marco A Rojas <marquicus at gmail.com>
+# Contributor: Netanel Shine <netanel at archlinux.org.il >
+# Contributor: ngoonee <ngoonee.talk@gmail.com>
+# Contributor: Adam Russell <adamlr6+arch@gmail.com>
+# Contributor: Dhananjay Sathe <dhananjaysathe@gmail.com>
+
 pkgbase=samba
 pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=3.6.12
+pkgver=4.0.5
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.6.12
+_realver=4.0.5
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 url="http://www.samba.org"
 license=('GPL3')
-makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb')
+makedepends=('python2' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups' 
+             'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb>=1.1.15' 'krb5' 'pam' 
+             'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb')
 source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
         samba.logrotate
         swat.xinetd
         samba.pam
         smbd.service
         smbd.socket
-        smbd@.service
         nmbd.service
+        smbd@.service
         swat.socket
         swat@.service
         winbindd.service
@@ -28,131 +37,175 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
 ### UNINSTALL dmapi package before building!!!
 
 build() {
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  ./configure --prefix=/usr \
-              --libdir=/usr/lib/ \
+  # Use samba-pkg as a staging directory for the split packages
+  # (This is so RPATHS and symlinks are generated correctly via
+  # make install, but the otherwise unsplit pieces can be split)
+  _pkgsrc=${srcdir}/samba-pkg
+  rm -rf ${_pkgsrc}
+  cd ${srcdir}/samba-${_realver}
+  # change to use python2
+  SAVEIFS=${IFS}
+  IFS=$(echo -en "\n\b")
+  PYTHON_CALLERS="$(find ${srcdir}/samba-${_realver} -name '*.py')
+$(find ${srcdir}/samba-${_realver} -name 'wscript*')
+$(find ${srcdir}/samba-${_realver} -name 'configure.ac')
+$(find ${srcdir}/samba-${_realver} -name 'upgrade_from_s3')
+$(find ${srcdir}/samba-${_realver}/buildtools -type f)
+$(find ${srcdir}/samba-${_realver}/source4/scripting -type f)"
+  sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" \
+         -e "s|python-config|python2-config|" \
+         -e "s|bin/python|bin/python2|" \
+      ${PYTHON_CALLERS}
+  IFS=${SAVEIFS}
+
+  export PYTHON=/usr/bin/python2
+_samba4_idmap_modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2
+_samba4_pdb_modules=pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4
+_samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4
+ cd ${srcdir}/samba-${_realver}
+  ./configure --enable-fhs \
+              --prefix=/usr \
+              --libdir=/usr/lib \
               --localstatedir=/var \
               --with-configdir=/etc/samba \
               --with-lockdir=/var/cache/samba \
-              --with-piddir=/var/run/samba \
-              --with-fhs \
-              --with-pam \
-              --with-pam_smbpass \
-              --with-pammodulesdir=/usr/lib/security \
-              --with-dnsupdate \
-              --with-automount \
-              --with-quotas \
+              --with-sockets-dir=/var/run/samba \
+              --with-piddir=/var/run \
               --with-ads \
+              --with-ldap \
+              --with-swat \
+              --with-winbind \
               --with-acl-support \
-              --with-libsmbclient \
-              --with-syslog \
-              --enable-external-libtalloc \
-              --disable-dnssd \
-              --disable-avahi \
-              --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \
-              --enable-external-libtdb
+              --enable-gnutls \
+              --with-pam \
+              --with-pammodulesdir=/usr/lib/security \
+              --with-shared-modules=${_samba4_idmap_modules},${_samba4_pdb_modules},${_samba4_auth_modules} \
+              --disable-rpath-install
+
+              # Add this to the options once it's working...
+               #--with-system-mitkrb5 /opt/heimdal
   make
+  make DESTDIR="${_pkgsrc}/" install
+
+  # This gets skipped somehow
+  if [ ! -e ${_pkgsrc}/usr/bin/smbtar ]; then
+      install -m755 ${srcdir}/samba-${_realver}/source3/script/smbtar ${_pkgsrc}/usr/bin/
+  fi
 }
 
-package_libwbclient () {
+package_libwbclient() {
 pkgdesc="Samba winbind client library"
-depends=('glibc')
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  mkdir -p ${pkgdir}/usr/lib  
-  for i in libwbclient*; do
-      cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
-  done
-  install -D -m644 pkgconfig/wbclient.pc ${pkgdir}/usr/lib/pkgconfig/wbclient.pc
-  install -D -m644 ../nsswitch/libwbclient/wbclient.h ${pkgdir}/usr/include/wbclient.h
+depends=('glibc' 'libbsd')
+  # Use samba-pkg as a staging directory for the split packages
+  # (This is so RPATHS and symlinks are generated correctly via
+  # make install, but the otherwise unsplit pieces can be split)
+  _pkgsrc=${srcdir}/samba-pkg
+  install -d -m755 ${pkgdir}/usr/lib
+  mv ${_pkgsrc}/usr/lib/libwbclient*.so* ${pkgdir}/usr/lib/
+
+  install -d -m755 ${pkgdir}/usr/lib/samba
+  mv ${_pkgsrc}/usr/lib/samba/libwinbind-client*.so* ${pkgdir}/usr/lib/samba/
+  mv ${_pkgsrc}/usr/lib/samba/libreplace.so* ${pkgdir}/usr/lib/samba/
+
+  install -d -m755 ${pkgdir}/usr/lib/pkgconfig
+  mv ${_pkgsrc}/usr/lib/pkgconfig/wbclient.pc ${pkgdir}/usr/lib/pkgconfig/
+
+  install -d -m755 ${pkgdir}/usr/include/samba-4.0
+  mv ${_pkgsrc}/usr/include/samba-4.0/wbclient.h ${pkgdir}/usr/include/samba-4.0/
 }
 
-package_smbclient () {
+package_smbclient() {
 pkgdesc="Tools to access a server's filespace and printers via SMB"
-depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc' 'libwbclient')
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib
-  install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/
-  for i in libnetapi* libsmbclient*;do
-      cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
-  done
-  install -m755 script/smbtar ${pkgdir}/usr/bin/
-  mkdir -p ${pkgdir}/usr/lib/cups/backend
-  ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb
-  mkdir -p ${pkgdir}/usr/include
-  install -m644 include/libsmbclient.h ${pkgdir}/usr/include/
-  install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/
-  mkdir -p ${pkgdir}/usr/share/man/man{1,7}
-  for man in rpcclient smbcacls smbclient smbcquotas smbget \
-      smbtree smbtar nmblookup; do
-      install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/
-  done
-  install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/
+depends=('popt' 'cifs-utils' 'tdb' "libwbclient>=$pkgver" 'ldb'
+         'tevent' 'libgcrypt' 'python2' 'talloc' 'readline' 'gnutls' 
+         'libbsd' 'libldap' 'libcups')
+
+    _smbclient_bins=('smbclient' 'smbclient4' 'rpcclient' 'smbspool'
+                     'smbtree' 'smbcacls' 'smbcquotas' 'smbget' 'net'
+                     'nmblookup' 'nmblookup4' 'smbtar')
+    # Use samba-pkg as a staging directory for the split packages
+    # (This is so RPATHS and symlinks are generated correctly via
+    # make install, but the otherwise unsplit pieces can be split)
+    _pkgsrc=${srcdir}/samba-pkg
+    install -d -m755 ${pkgdir}/usr/bin
+    for bin in ${_smbclient_bins[@]}; do
+        mv ${_pkgsrc}/usr/bin/${bin} ${pkgdir}/usr/bin/
+    done
+
+    # smbclient binaries link to the majority of the samba
+    # libs, so this is a shortcut instead of resolving the
+    # whole dependency tree by hand
+    install -d -m755 ${pkgdir}/usr/lib
+    for lib in ${_pkgsrc}/usr/lib/lib*.so*; do
+        mv ${lib} ${pkgdir}/usr/lib/
+    done
+
+    install -d -m755 ${pkgdir}/usr/lib/samba
+    for lib in ${_pkgsrc}/usr/lib/samba/lib*.so*; do
+        mv ${lib} ${pkgdir}/usr/lib/samba/
+    done
+
+    install -d -m755 ${pkgdir}/usr/lib/pkgconfig
+    mv ${_pkgsrc}/usr/lib/pkgconfig/smbclient.pc ${pkgdir}/usr/lib/pkgconfig/
+    mv ${_pkgsrc}/usr/lib/pkgconfig/smbclient-raw.pc ${pkgdir}/usr/lib/pkgconfig/
+    mv ${_pkgsrc}/usr/lib/pkgconfig/netapi.pc ${pkgdir}/usr/lib/pkgconfig/
+
+    install -d -m755 ${pkgdir}/usr/share/man/man1
+    install -d -m755 ${pkgdir}/usr/share/man/man7
+    install -d -m755 ${pkgdir}/usr/share/man/man8
+    for bin in ${_smbclient_bins[@]}; do
+        if [ -e ${_pkgsrc}/usr/share/man/man1/${bin}.1 ]; then
+            mv ${_pkgsrc}/usr/share/man/man1/${bin}.1 ${pkgdir}/usr/share/man/man1/
+        fi
+        if [ -e ${_pkgsrc}/usr/share/man/man8/${bin}.8 ]; then
+            mv ${_pkgsrc}/usr/share/man/man8/${bin}.8 ${pkgdir}/usr/share/man/man8/
+        fi
+    done
+    mv ${_pkgsrc}/usr/share/man/man7/libsmbclient.7 ${pkgdir}/usr/share/man/man7/
+
+    install -d -m755 ${pkgdir}/usr/include/samba-4.0
+    mv ${_pkgsrc}/usr/include/samba-4.0/libsmbclient.h ${pkgdir}/usr/include/samba-4.0/
+    mv ${_pkgsrc}/usr/include/samba-4.0/netapi.h ${pkgdir}/usr/include/samba-4.0/
+
+    mkdir -p ${pkgdir}/usr/lib/cups/backend
+    ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb
 }
 
-package_samba () {
-pkgdesc="Tools to access a server's filespace and printers via SMB"
+package_samba() {
+pkgdesc="SMB Fileserver and AD Domain server"
+depends=('db>=4.7' 'popt' 'libcups' 'libcap>=2.16' 'gamin' 'gnutls>=2.4.1'
+         'talloc' 'ldb' 'libbsd' 'python2' 'tdb' "smbclient>=$pkgver")
 backup=(etc/logrotate.d/samba
         etc/pam.d/samba
         etc/samba/smb.conf
         etc/xinetd.d/swat
         etc/conf.d/samba)
-depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
-install='samba.install'
-  cd ${srcdir}/samba-${_realver}/source3
-  mkdir -p ${pkgdir}/etc/samba/private
-  chmod 700 ${pkgdir}/etc/samba/private
-  make DESTDIR=${pkgdir} install
-  chmod 644 ${pkgdir}/usr/include/*.h
-  rm -rf ${pkgdir}/usr/var
-  rm -rf ${pkgdir}/var/run/samba
-  (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh)
-  mkdir -p ${pkgdir}/etc/samba
-  cat ../examples/smb.conf.default | \
-    sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default
-  install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba
-  install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat
-  install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba
-  # spool directory
-  install -d -m1777 ${pkgdir}/var/spool/samba
-  sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default
-  # fix logrotate
-  sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default
-  # nsswitch libraries
-  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/usr/lib/libnss_wins.so
-  ln -s libnss_wins.so ${pkgdir}/usr/lib/libnss_wins.so.2
-  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/usr/lib/libnss_winbind.so
-  ln -s libnss_winbind.so ${pkgdir}/usr/lib/libnss_winbind.so.2
-  # winbind krb5 locator
-  mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5
-  install -d -m 0755 ${pkgdir}/usr/lib/krb5/plugins/libkrb5
-  install -m 755 bin/winbind_krb5_locator.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/winbind_krb5_locator.so
-  # remove conflict files of smbclient
-  for man in libsmbclient smbspool \
-      mount.cifs net cifs.upcall; do
-      rm -f ${pkgdir}/usr/share/man/man8/${man}.8
-  done
-  for i in libnetapi* libwbclient* libsmbclient* winbind_krb5*;do
-      rm -f ${pkgdir}/usr/lib/$i
-  done
-  for bin in net \
-      nmblookup rpcclient smbcacls smbclient \
-      smbcquotas smbget smbspool smbtar smbtree; do
-      rm -f ${pkgdir}/usr/bin/$bin
-  done
-  rm -f ${pkgdir}/usr/sbin/cifs.upcall
-  rm -f ${pkgdir}/usr/include/netapi.h
-  rm -f ${pkgdir}/usr/include/wbclient.h
-  for man in rpcclient smbcacls smbclient smbcquotas \
-      smbtree smbtar nmblookup smbget; do
-      rm -f ${pkgdir}/usr/share/man/man1/${man}.1
-  done
-  for man in tdbbackup tdbdump tdbtool; do
-      rm -f ${pkgdir}/usr/share/man/man8/${man}.8
-  done
-  rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7
-  rm -f ${pkgdir}/usr/include/libsmbclient.h
-  # copy ldap example
-  install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
+install=samba.install
+    # Use samba-pkg as a staging directory for the split packages
+    # (This is so RPATHS and symlinks are generated correctly via
+    # make install, but the otherwise unsplit pieces can be split)
+    _pkgsrc=${srcdir}/samba-pkg
+    # Everything that libwbclient and smbclient didn't install goes
+    # into the samba package...
+    mv ${_pkgsrc}/* ${pkgdir}/
+    rmdir ${_pkgsrc}
+
+    _pyver=`python2 -c 'import sys; print(sys.version[:3])'`
+
+    find ${pkgdir}/usr/lib/python${_pyver}/site-packages/ -name '*.py' | \
+         xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
+    find ${pkgdir}/usr/bin ${pkgdir}/usr/sbin -type f -executable | \
+         xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
+
+    # Make admin scripts look in the right place for the samba python module
+    for script in sbin/samba_dnsupdate sbin/samba_kcc sbin/samba_spnupdate \
+                  sbin/samba_upgradedns bin/samba-tool
+    do
+        sed -i "/^sys\.path\.insert/ a\
+sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \
+               ${pkgdir}/usr/${script}
+    done
+
   # install systemd files
   install -d -m755 ${pkgdir}/usr/lib/systemd/system
   for i in smbd nmbd swat winbindd; do
@@ -161,17 +214,41 @@ install='samba.install'
   done
   # create ephemeral dirs via tmpfiles rather than shipping them in package
   install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf
+  # install sample smb.conf
+  install -d -m755 ${pkgdir}/etc/samba
+  install -m644 ${srcdir}/samba-${_realver}/packaging/LSB/smb.conf ${pkgdir}/etc/samba/smb.conf.default
+  
+  mkdir -p ${pkgdir}/etc/samba/private
+  chmod 700 ${pkgdir}/etc/samba/private
+
+  install -D -m644 ${srcdir}/samba.logrotate ${pkgdir}/etc/logrotate.d/samba
+  install -D -m644 ${srcdir}/swat.xinetd ${pkgdir}/etc/xinetd.d/swat
+  install -D -m644 ${srcdir}/samba.pam ${pkgdir}/etc/pam.d/samba 
+
+  # winbind krb5 locator
+  mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5
+  mv  ${pkgdir}/usr/lib/*.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/
+
+  # fix logrotate
+  sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default
+  
+  # spool directory
+  install -d -m1777 ${pkgdir}/var/spool/samba
+  
   rm -rf ${pkgdir}/var/run
+  
+  # copy ldap example
+  install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-md5sums=('430fd21a1acd26964d3ccf366df8709a'
+md5sums=('58ec2fec08872b72f8fd526f2da20a9e'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'
          '96f82c38f3f540b53f3e5144900acf17'
-         '4d86a4e3b2ac4b35e12ac667d1d261a7'
+         'd0b18dd7f5fafc8d25cb3a7c37c6d920'
          'a78b9aa93eb14b0ac445897395693225'
-         '4f2a5266f88d016a78014bb02e118c7f'
-         '46bac3375dcf25baea4699226410987a'
+         '90845b89f2321cb19c0b13f385f1782a'
+         '70186fa43510bf99e3afd5951e814fbf'
          '6db11f3dd2112a4b7a73007b189bef3f'
          'b0de262f9c62acd162e873658f33d063'
-         '03257dd11fc041d59e612c02a54ef4c0'
+         '64a52bc798033aeabfae3410bd559aa4'
          '49abd7b719e3713a3f75a8a50958e381')
diff --git a/extra/samba/nmbd.service b/extra/samba/nmbd.service
index 44b4ffba1..4f86c4db9 100644
--- a/extra/samba/nmbd.service
+++ b/extra/samba/nmbd.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/samba/nmbd.pid
+PIDFile=/var/run/nmbd.pid
 ExecStart=/usr/sbin/nmbd -D 
 ExecReload=/bin/kill -HUP $MAINPID
 
diff --git a/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch b/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch
new file mode 100644
index 000000000..cb2378a78
--- /dev/null
+++ b/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch
@@ -0,0 +1,60 @@
+From 1ac743a7d0d20e16fc325749d593edaaed89d706 Mon Sep 17 00:00:00 2001
+From: Alexander Bokovoy <ab@samba.org>
+Date: Wed, 6 Feb 2013 10:17:57 +0200
+Subject: [PATCH] PIDL: fix parsing linemarkers in preprocessor output
+
+When PIDL calls out to C preprocessor to expand IDL files
+and parse the output, it filters out linemarkers and line control
+information as described in http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html
+and http://gcc.gnu.org/onlinedocs/cpp/Line-Control.html#Line-Control
+
+With gcc 4.8 stdc-predef.h is included automatically and linemarker for the
+file has extended flags that PIDL couldn't parse ('system header that needs to
+be extern "C" protected for C++')
+
+Thanks to Jakub Jelinek <jakub@redhat.com> for explanation of the linemarker format.
+
+Fixes https://bugzilla.redhat.com/show_bug.cgi?id=906517
+
+Reviewed-by: Andreas Schneider <asn@samba.org>
+(cherry picked from commit 6ba7ab5c14801aecae96373d5a9db7ab82957526)
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+---
+ pidl/idl.yp                | 4 +++-
+ pidl/lib/Parse/Pidl/IDL.pm | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/pidl/idl.yp b/pidl/idl.yp
+index b5c5185..c8a65f6 100644
+--- a/pidl/idl.yp
++++ b/pidl/idl.yp
+@@ -610,7 +610,9 @@ again:
+ 
+ 	for ($parser->YYData->{INPUT}) {
+ 		if (/^\#/) {
+-			if (s/^\# (\d+) \"(.*?)\"( \d+|)//) {
++			# Linemarker format is described at
++			# http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html
++			if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) {
+ 				$parser->YYData->{LINE} = $1-1;
+ 				$parser->YYData->{FILE} = $2;
+ 				goto again;
+diff --git a/pidl/lib/Parse/Pidl/IDL.pm b/pidl/lib/Parse/Pidl/IDL.pm
+index d4820ff..6927c89 100644
+--- a/pidl/lib/Parse/Pidl/IDL.pm
++++ b/pidl/lib/Parse/Pidl/IDL.pm
+@@ -2576,7 +2576,9 @@ again:
+ 
+ 	for ($parser->YYData->{INPUT}) {
+ 		if (/^\#/) {
+-			if (s/^\# (\d+) \"(.*?)\"( \d+|)//) {
++			# Linemarker format is described at
++			# http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html
++			if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) {
+ 				$parser->YYData->{LINE} = $1-1;
+ 				$parser->YYData->{FILE} = $2;
+ 				goto again;
+-- 
+1.8.1.1
+
diff --git a/extra/samba/samba.install b/extra/samba/samba.install
index d9baeac90..420643f0e 100644
--- a/extra/samba/samba.install
+++ b/extra/samba/samba.install
@@ -1,7 +1,14 @@
 #!/bin/sh
 
 post_install() {
-  systemd-tmpfiles --create /usr/lib/tmpfiles.d/samba.conf
+  systemd-tmpfiles --create samba.conf
 }
 
+post_upgrade() {
+  if [ "$(vercmp $2 4.0.4)" -lt 0 ]; then
+    echo "Major upgrade from samba 3.x to 4.x,"
+    echo "please read the Samba4 migration guide:"
+    echo "http://wiki.samba.org/index.php/Samba4/samba3upgrade/HOWTO"
+  fi
+}
 # vim:set ts=2 sw=2 et:
diff --git a/extra/samba/smbd.conf b/extra/samba/smbd.conf
deleted file mode 100644
index b745bb85b..000000000
--- a/extra/samba/smbd.conf
+++ /dev/null
@@ -1 +0,0 @@
-D /var/run/samba 0755 root root -
diff --git a/extra/samba/smbd.service b/extra/samba/smbd.service
index 5c006a44e..12c08474a 100644
--- a/extra/samba/smbd.service
+++ b/extra/samba/smbd.service
@@ -4,7 +4,7 @@ After=network.target nmbd.service winbindd.service
 
 [Service]
 Type=forking
-PIDFile=/var/run/samba/smbd.pid
+PIDFile=/var/run/smbd.pid
 ExecStart=/usr/sbin/smbd -D 
 ExecReload=/bin/kill -HUP $MAINPID
 
diff --git a/extra/samba/smbd@.service b/extra/samba/smbd@.service
index 58ccd6a9f..e1f71be3f 100644
--- a/extra/samba/smbd@.service
+++ b/extra/samba/smbd@.service
@@ -2,8 +2,6 @@
 Description=Samba SMB/CIFS server instance
 
 [Service]
-Type=forking
-PIDFile=/var/run/samba/smbd.pid
-ExecStart=/usr/sbin/smbd -D 
+ExecStart=/usr/sbin/smbd -F
 ExecReload=/bin/kill -HUP $MAINPID
 StandardInput=socket
diff --git a/extra/samba/winbindd.service b/extra/samba/winbindd.service
index 67a778fc7..02e3014b1 100644
--- a/extra/samba/winbindd.service
+++ b/extra/samba/winbindd.service
@@ -4,7 +4,7 @@ After=network.target nmbd.service
 
 [Service]
 Type=forking
-PIDFile=/var/run/samba/winbindd.pid
+PIDFile=/var/run/winbindd.pid
 ExecStart=/usr/sbin/winbindd -D 
 ExecReload=/bin/kill -HUP $MAINPID
 
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index f91ca3d6c..a8fc7e654 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173127 2012-12-11 14:42:10Z jgc $
+# $Id: PKGBUILD 182410 2013-04-10 07:43:35Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Simo L. <neotuli@yahoo.com>
@@ -6,21 +6,31 @@
 
 pkgname=sane
 pkgver=1.0.23
-pkgrel=2
+pkgrel=4
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusb-compat' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
 makedepends=('texlive-latexextra')
-install=$pkgname.install
 backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,kodakaio.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane)
 source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
         'sane.xinetd'
         'saned.socket'
-        'saned.service')
+        'saned.service'
+        'kodakaio.c.patch'
+        'network.patch')
 options=(!libtool)
 
+prepare() {
+  cd "${srcdir}/${pkgname}-backends-${pkgver}"
+
+   # fix FS#33657
+   patch -Np0 -i ${srcdir}/kodakaio.c.patch
+   # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186
+   patch -Np1 -i ${srcdir}/network.patch
+}
+
 build() {
   cd "${srcdir}/${pkgname}-backends-${pkgver}"
 
@@ -59,6 +69,8 @@ package () {
       "${pkgdir}/usr/lib/systemd/system/saned@.service"
 }
 md5sums=('e226a89c54173efea80e91e9a5eb6573'
-         'da946cc36fb83612162cf9505986d4b2'
+         '5f519030392d599e2ad348159ec4c96f'
          'e57e9e15528f47f5f1b3f1411135ed5d'
-         'e44bd4c994a52d6f472463d1eb0a03be')
+         'e44bd4c994a52d6f472463d1eb0a03be'
+         'e65dbefb7c3d69955fb6eb3ace14aa12'
+         '44e77692c52db15b0f530a1d9a8e1296')
diff --git a/extra/sane/kodakaio.c.patch b/extra/sane/kodakaio.c.patch
new file mode 100644
index 000000000..95cb1ee9a
--- /dev/null
+++ b/extra/sane/kodakaio.c.patch
@@ -0,0 +1,11 @@
+--- backend/kodakaio.c.bad	2013-01-31 20:42:10.627296894 +0100
++++ backend/kodakaio.c	2013-01-31 20:42:46.040397213 +0100
+@@ -2197,7 +2197,7 @@
+ 
+ 	reply = cupsGetDevices(CUPS_HTTP_DEFAULT, CUPS_TIMEOUT_DEFAULT, 
+ 		"dnssd", CUPS_EXCLUDE_NONE, ProcessDevice, Dummy);
+-	if(reply != IPP_OK) printf("Failed cupsGetDevices\n");
++	if(reply != IPP_OK) DBG(1, "Failed cupsGetDevices\n");
+ 
+ 	return 0;
+ }
diff --git a/extra/sane/libv4l-0.8.3.patch b/extra/sane/libv4l-0.8.3.patch
deleted file mode 100644
index 4e240e0cf..000000000
--- a/extra/sane/libv4l-0.8.3.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Mon, 14 Mar 2011 13:35:05 +0100
-Subject: [PATCH] patch: v4l
-
-Squashed commit of the following:
-
-commit 23381932c76846191b42a48e505b37cd74711265
-Author: Julien BLACHE <jb@jblache.org>
-Date:   Wed Feb 16 19:37:43 2011 +0100
-
-    Fix v4l build with libv4l 0.8.3+
-
-    (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953)
-
-    Conflicts:
-
-    	ChangeLog
-
-    Signed-off-by: Nils Philippsen <nils@redhat.com>
----
- backend/v4l.c |    3 +--
- backend/v4l.h |    3 ++-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/backend/v4l.c b/backend/v4l.c
-index 6510ef0..38595ed 100644
---- a/backend/v4l.c
-+++ b/backend/v4l.c
-@@ -84,9 +84,8 @@
- #include "../include/sane/sanei_config.h"
- #define V4L_CONFIG_FILE "v4l.conf"
- 
--#include "v4l.h"
--
- #include <libv4l1.h>
-+#include "v4l.h"
- 
- static const SANE_Device **devlist = NULL;
- static int num_devices;
-diff --git a/backend/v4l.h b/backend/v4l.h
-index 588b96e..6aee586 100644
---- a/backend/v4l.h
-+++ b/backend/v4l.h
-@@ -29,6 +29,7 @@
- #ifndef v4l_h
- #define v4l_h
- 
-+#ifndef __LINUX_VIDEODEV_H
- /* Kernel interface */
- /* Only the stuff we need. For more features, more defines are needed */
- 
-@@ -165,7 +166,7 @@ struct video_channel
- 
- 
- /* end of kernel interface */
--
-+#endif /* !__LINUX_VIDEODEV_H */
- 
- #include <../include/sane/sane.h>
- 
--- 
-1.7.4
-
diff --git a/extra/sane/network.patch b/extra/sane/network.patch
new file mode 100644
index 000000000..2605ea835
--- /dev/null
+++ b/extra/sane/network.patch
@@ -0,0 +1,42 @@
+diff --git a/sanei/sanei_tcp.c b/sanei/sanei_tcp.c
+index a57d7c7..d0a1e92 100644
+--- a/sanei/sanei_tcp.c
++++ b/sanei/sanei_tcp.c
+@@ -45,6 +45,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ 
+ #ifdef HAVE_WINSOCK2_H
+ #include <winsock2.h>
+@@ -123,14 +124,27 @@ sanei_tcp_write(int fd, const u_char * buf, int count)
+ ssize_t
+ sanei_tcp_read(int fd, u_char * buf, int count)
+ {
+-        ssize_t bytes_recv = 0, rc = 1;
++    ssize_t bytes_recv = 0, rc = 1;
++	int retry = 5;
+ 
+ 	while (bytes_recv < count && rc > 0)
+ 	{
+ 		rc = recv(fd, buf+bytes_recv, count-bytes_recv, 0);
++		DBG(1, "%s: bytes received %d\n", __FUNCTION__, rc);
+ 		if (rc > 0)
+ 		  bytes_recv += rc;
+-
++		else {
++			if ( errno == EAGAIN && retry-- ) {
++				DBG(1, "%s: waiting  %d\n", __FUNCTION__, retry);
++				/* wait for max 1s */
++				struct timespec req;
++				struct timespec rem;
++				req.tv_sec = 0;
++				req.tv_nsec= 100000000;
++				nanosleep(&req, &rem);	
++				rc = 1;
++			}
++		}
+ 	}
+ 	return bytes_recv;
+ }
diff --git a/extra/sane/sane.install b/extra/sane/sane.install
deleted file mode 100644
index 5ec361eea..000000000
--- a/extra/sane/sane.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-	/bin/cat <<THEEND
-NOTE
-----
-Add your user to group 'scanner' to use scanner devices.
-THEEND
-}
diff --git a/extra/sane/sane.xinetd b/extra/sane/sane.xinetd
index b035664b4..67f08a656 100644
--- a/extra/sane/sane.xinetd
+++ b/extra/sane/sane.xinetd
@@ -3,7 +3,7 @@ service sane-port
 	port        = 6566
 	socket_type = stream
 	wait        = no
-	user        = root
+	user        = nobody 
 	group       = scanner
 	server      = /usr/sbin/saned
 	# disabled by default!
diff --git a/extra/sane/xerox_mfp_fix_usb_devices.patch b/extra/sane/xerox_mfp_fix_usb_devices.patch
deleted file mode 100644
index 5ed29b974..000000000
--- a/extra/sane/xerox_mfp_fix_usb_devices.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7
-Author: Alex Belkin <abc@telekom.ru>
-Date:   Tue Mar 8 17:57:19 2011 +0300
-
-    keep usb device by default (correct for bug introduced by tcp sub-backend
-
-diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
-index e08b50f..d4672a7 100644
---- a/backend/xerox_mfp.c
-+++ b/backend/xerox_mfp.c
-@@ -37,10 +37,10 @@
- static const SANE_Device **devlist = NULL;	/* sane_get_devices array */
- static struct device *devices_head = NULL;	/* sane_get_devices list */
- 
--transport available_transports[] = {
-+enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX };
-+transport available_transports[TRANSPORTS_MAX] = {
-     { "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device },
-     { "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device },
--    { 0 }
- };
- 
- static int resolv_state(int state)
-@@ -824,7 +824,13 @@ free_devices (void)
-   devices_head = NULL;
- }
- 
--/* SANE API ignores return code of this callback */
-+static transport *tr_from_devname(SANE_String_Const devname)
-+{
-+  if (strncmp("tcp", devname, 3) == 0)
-+    return &available_transports[TRANSPORT_TCP];
-+  return &available_transports[TRANSPORT_USB];
-+}
-+
- static SANE_Status
- list_one_device (SANE_String_Const devname)
- {
-@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname)
-       return SANE_STATUS_GOOD;
-   }
- 
--  for (tr = available_transports; tr->ttype; tr++) {
--    if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
--      break;
--  }
--  if (!tr->ttype)
--    return SANE_STATUS_INVAL;
-+  tr = tr_from_devname(devname);
- 
-   dev = calloc (1, sizeof (struct device));
-   if (dev == NULL)
-@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname)
- static SANE_Status
- list_conf_devices (UNUSED (SANEI_Config * config), const char *devname)
- {
--    transport *tr;
--
--    for (tr = available_transports; tr->ttype; tr++) {
--	if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
--	    return tr->configure_device(devname, list_one_device);
--    }
--    return	SANE_STATUS_INVAL;
-+  return tr_from_devname(devname)->configure_device(devname, list_one_device);
- }
- 
- SANE_Status
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 6303aa1fe..d032d9d56 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 177550 2013-02-07 05:42:47Z eric $
+# $Id: PKGBUILD 178213 2013-02-18 09:01:22Z juergen $
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Daniel White <daniel@whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Leslie Polzer (skypher)
 
 pkgname=sbcl
-pkgver=1.1.3
+pkgver=1.1.4
 pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 url="http://www.sbcl.org/"
@@ -19,7 +19,7 @@ makedepends=('clisp' 'texinfo')
 install=sbcl.install
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
         "arch-fixes.lisp")
-md5sums=('a0f12d01697373499597018a1aad431a'
+md5sums=('9d82ec89abbaf265fbfc71a24445dd66'
          '7ac0c1936547f4278198b8bf7725204d')
 
 build() {
diff --git a/extra/schroedinger/PKGBUILD b/extra/schroedinger/PKGBUILD
index d11443041..857c57cca 100644
--- a/extra/schroedinger/PKGBUILD
+++ b/extra/schroedinger/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: rabyte <rabyte__gmail>
 pkgname=schroedinger
 pkgver=1.0.11
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="An implemenation of the Dirac video codec in ANSI C code"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.diracvideo.org/"
diff --git a/extra/scim-hangul/gcc43.patch b/extra/scim-hangul/gcc43.patch
deleted file mode 100644
index 4d33471d9..000000000
--- a/extra/scim-hangul/gcc43.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur scim-hangul-0.3.2-orig/src/scim_hangul_imengine.cpp scim-hangul-0.3.2/src/scim_hangul_imengine.cpp
---- scim-hangul-0.3.2-orig/src/scim_hangul_imengine.cpp	2008-03-26 09:33:43.000000000 +0100
-+++ scim-hangul-0.3.2/src/scim_hangul_imengine.cpp	2008-03-26 09:34:41.000000000 +0100
-@@ -33,6 +33,7 @@
-   #include <config.h>
- #endif
- 
-+#include <cstring>
- #include <scim.h>
- #include "scim_hangul_imengine.h"
- 
-diff -Naur scim-hangul-0.3.2-orig/src/scim_hangul_imengine_setup.cpp scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp
---- scim-hangul-0.3.2-orig/src/scim_hangul_imengine_setup.cpp	2008-03-26 09:33:43.000000000 +0100
-+++ scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp	2008-03-26 09:34:53.000000000 +0100
-@@ -34,6 +34,7 @@
-   #include <config.h>
- #endif
- 
-+#include <cstring>
- #include <scim.h>
- #include <gtk/scimkeyselection.h>
- 
diff --git a/extra/scim-pinyin/gcc43.patch b/extra/scim-pinyin/gcc43.patch
deleted file mode 100644
index 91a948d5d..000000000
--- a/extra/scim-pinyin/gcc43.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -up scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_phrase.cpp
---- scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43	2008-02-25 16:27:05.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_phrase.cpp	2008-02-25 16:26:41.000000000 +0800
-@@ -28,6 +28,7 @@
- #define SCIM_PHRASE_MAX_RELATION 1000
- 
- #include <scim.h>
-+#include <cstring>
- #include "scim_pinyin_private.h"
- #include "scim_phrase.h"
- 
-diff -up scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43 scim-pinyin-0.5.91/src/scim_special_table.cpp
---- scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43	2008-02-25 16:27:55.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_special_table.cpp	2008-02-25 16:28:08.000000000 +0800
-@@ -22,6 +22,7 @@
- 
- #include <time.h>
- #include <scim.h>
-+#include <cstring>
- #include "scim_pinyin_private.h"
- #include "scim_special_table.h"
- 
-diff -up scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin.cpp
---- scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43	2008-02-25 16:26:10.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_pinyin.cpp	2008-02-25 16:26:26.000000000 +0800
-@@ -29,6 +29,7 @@
- #define Uses_SCIM_LOOKUP_TABLE
- 
- #include <scim.h>
-+#include <cstring>
- #include "scim_pinyin.h"
- 
- // Internal functions
-diff -up scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp
---- scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43	2008-02-25 16:27:15.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp	2008-02-25 16:27:28.000000000 +0800
-@@ -27,6 +27,7 @@
- #define Uses_SCIM_LOOKUP_TABLE
- 
- #include <scim.h>
-+#include <cstring>
- #include "scim_pinyin_private.h"
- #include "scim_phrase.h"
- #include "scim_pinyin.h"
diff --git a/extra/scim-tables/PKGBUILD b/extra/scim-tables/PKGBUILD
index 91591a9c5..8af63073b 100644
--- a/extra/scim-tables/PKGBUILD
+++ b/extra/scim-tables/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 165324 2012-08-15 15:29:35Z bisson $
+# $Id: PKGBUILD 183256 2013-04-19 15:20:34Z bisson $
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Gan Lu <rhythm.gan@gmail.com>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=scim-tables
-pkgver=0.5.11
+pkgver=0.5.12
 pkgrel=1
 pkgdesc='Generic table input method module for SCIM'
 url='http://www.scim-im.org/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('scim')
-options=('!libtool')
+makedepends=('intltool')
 source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('25dd1fcc809f57671e7df369f4011c14ba225b6b')
+sha1sums=('c83515c1c3ce0c40fb7cf30f576d8837a06a626f')
+
+options=('!libtool')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --enable-static=no
+	./configure --prefix=/usr --disable-static
 	make
 }
 
diff --git a/extra/scim-uim/scim-uim-0.2.0-fix-gcc43-build.patch b/extra/scim-uim/scim-uim-0.2.0-fix-gcc43-build.patch
deleted file mode 100644
index d142fd7b7..000000000
--- a/extra/scim-uim/scim-uim-0.2.0-fix-gcc43-build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- scim-uim-0.2.0/src/scim_uim_imengine.cpp	2007-04-10 07:43:59.000000000 +0200
-+++ scim-uim-0.2.0/src/scim_uim_imengine.cpp.gcc43buildfixed	2008-03-23 10:53:23.000000000 +0100
-@@ -32,6 +32,7 @@
-   #include <config.h>
- #endif
- 
-+#include <string.h>
- #include <scim.h>
- #include "scim_uim_imengine.h"
- #include <uim/uim-compat-scm.h>
diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD
index 571f37fdc..d232dfb91 100644
--- a/extra/scim/PKGBUILD
+++ b/extra/scim/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 162185 2012-06-23 07:47:16Z bisson $
+# $Id: PKGBUILD 184249 2013-05-05 00:06:28Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Gan Lu <rhythm.gan@gmail.com>
 
 pkgname=scim
 pkgver=1.4.14
-pkgrel=1
+pkgrel=2
 pkgdesc='Input method user interface and development platform'
 url='http://www.scim-im.org/projects/scim'
 license=('LGPL')
 options=('!libtool')
 arch=('i686' 'x86_64' 'mips64el')
-makedepends=('intltool')
 depends=('libltdl' 'gtk2')
+makedepends=('intltool' 'optipng')
 backup=('etc/scim/config' 'etc/scim/global')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('73391be371dd7ef9f9af8b3a211e2bedec0cf71b')
@@ -21,7 +21,6 @@ install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -32,6 +31,6 @@ build() {
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	make DESTDIR="${pkgdir}" install
+	find "${pkgdir}" -name *.png -exec optipng {} \; # libpng-1.6 has higher standards
 }
diff --git a/extra/screen/PKGBUILD b/extra/screen/PKGBUILD
index a152626c5..b84d7c8a2 100644
--- a/extra/screen/PKGBUILD
+++ b/extra/screen/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=screen
 pkgver=4.0.3
-pkgrel=15
+pkgrel=15.1
 _ptygroup=5 #the UID of our PTY/TTY group
 pkgdesc="Full-screen window manager that multiplexes a physical terminal"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/scribus/PKGBUILD b/extra/scribus/PKGBUILD
index 195391d4f..51f2f93a6 100644
--- a/extra/scribus/PKGBUILD
+++ b/extra/scribus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175912 2013-01-24 08:14:06Z remy $
+# $Id: PKGBUILD 178994 2013-03-01 10:25:10Z andrea $
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
@@ -6,20 +6,19 @@
 
 pkgname=scribus
 pkgver=1.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A desktop publishing program"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.scribus.net"
 license=('GPL')
 install=scribus.install
-depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \
+depends=('libcups>=1.3.11' 'lcms2' 'qt4' 'ghostscript>=8.70' \
          'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \
          'desktop-file-utils' 'shared-mime-info' \
          'hyphen' 'aspell' 'boost-libs')
-makedepends=('cmake' 'boost')
+makedepends=('cmake' 'boost' 'mesa')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('5c2a6bb7107e67a0083e32275bdb1a13')
 sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb')
 
 build() {
diff --git a/extra/scribus/scribus.install b/extra/scribus/scribus.install
index 0598e46ed..52a6286ac 100644
--- a/extra/scribus/scribus.install
+++ b/extra/scribus/scribus.install
@@ -1,8 +1,6 @@
-
 post_install() {
-  echo "update desktop mime database..."
-  update-mime-database usr/share/mime > /dev/null 2>&1
-  update-desktop-database -q > /dev/null 2>&1
+  update-mime-database usr/share/mime &> /dev/null
+  update-desktop-database -q
 }
 post_upgrade() {
   post_install $1
diff --git a/extra/scrot/PKGBUILD b/extra/scrot/PKGBUILD
deleted file mode 100644
index e65b2eec2..000000000
--- a/extra/scrot/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 143963 2011-11-30 22:40:01Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=scrot
-pkgver=0.8
-pkgrel=5.1
-pkgdesc="A simple command-line screenshot utility for X"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://scrot.sourcearchive.com/"
-license=('MIT')
-depends=('giblib')
-source=("ftp://ftp.archlinux.org/other/scrot/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('6a02df0e3bb26ec578dfeb8f56a7b30d')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir docsdir=/usr/share/doc/scrot install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/sdl/PKGBUILD b/extra/sdl/PKGBUILD
deleted file mode 100644
index cfa5262bb..000000000
--- a/extra/sdl/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 166673 2012-09-15 09:41:06Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=sdl
-pkgver=1.2.15
-pkgrel=3
-pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
-arch=('i686' 'x86_64')
-url="http://www.libsdl.org"
-license=('LGPL')
-depends=('glibc' 'libxext' 'libxrender' 'libx11')
-makedepends=('alsa-lib' 'mesa' 'libpulse')
-optdepends=('alsa-lib: ALSA audio driver'
-            'libpulse: PulseAudio audio driver')
-options=('!libtool')
-source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
-        sdl-1.2.14-fix-mouse-clicking.patch
-        sdl-1.2.14-disable-mmx.patch
-        fix_joystick_misc_axes.diff
-        libsdl-1.2.15-resizing.patch)
-md5sums=('9d96df8417572a2afb781a7c4c811a85'
-         '04d8c179f125e04bcd4c9d60e013c2d7'
-         'e5c16b7611f62c7cb25f0534eff68852'
-         '687586a108b597a2a6b73070c1d37e51'
-         '3dd50347d8856160a9cbd7f80383a1f8')
-
-build() {
-  cd SDL-$pkgver
-  patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch
-  patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch
-  patch -Np1 -i ../fix_joystick_misc_axes.diff
-  patch -Np1 -i ../libsdl-1.2.15-resizing.patch
-  ./configure --prefix=/usr --disable-nasm --enable-alsa \
-              --with-x --disable-rpath --disable-static
-  make
-}
-
-package() {
-  cd SDL-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/extra/sdl/fix_joystick_misc_axes.diff b/extra/sdl/fix_joystick_misc_axes.diff
deleted file mode 100644
index 75e3755c9..000000000
--- a/extra/sdl/fix_joystick_misc_axes.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
-index ee43974..80e46e4 100644
---- a/src/joystick/linux/SDL_sysjoystick.c
-+++ b/src/joystick/linux/SDL_sysjoystick.c
-@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd)
- 				++joystick->nbuttons;
- 			}
- 		}
--		for ( i=0; i<ABS_MISC; ++i ) {
-+		for ( i=0; i<ABS_MAX; ++i ) {
- 			/* Skip hats */
- 			if ( i == ABS_HAT0X ) {
- 				i = ABS_HAT3Y;
diff --git a/extra/sdl/libsdl-1.2.15-resizing.patch b/extra/sdl/libsdl-1.2.15-resizing.patch
deleted file mode 100644
index 0655a13e1..000000000
--- a/extra/sdl/libsdl-1.2.15-resizing.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Revert change that breaks window corner resizing
- http://bugzilla.libsdl.org/show_bug.cgi?id=1430
-Author: Andrew Caudwell <acaudwell@gmail.com>
-Last-Update: 2012-04-10
-Bug-Debian: http://bugs.debian.org/665779
-
-diff -r c787fb1b5699 src/video/x11/SDL_x11events.c
---- a/src/video/x11/SDL_x11events.c	Mon Feb 20 23:51:08 2012 -0500
-+++ b/src/video/x11/SDL_x11events.c	Mon Mar 26 12:26:52 2012 +1300
-@@ -57,12 +57,6 @@
- static SDLKey MISC_keymap[256];
- SDLKey X11_TranslateKeycode(Display *display, KeyCode kc);
- 
--/*
-- Pending resize target for ConfigureNotify (so outdated events don't
-- cause inappropriate resize events)
--*/
--int X11_PendingConfigureNotifyWidth = -1;
--int X11_PendingConfigureNotifyHeight = -1;
- 
- #ifdef X_HAVE_UTF8_STRING
- Uint32 Utf8ToUcs4(const Uint8 *utf8)
-@@ -825,16 +819,6 @@
- #ifdef DEBUG_XEVENTS
- printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height);
- #endif
--		if ((X11_PendingConfigureNotifyWidth != -1) &&
--		    (X11_PendingConfigureNotifyHeight != -1)) {
--		    if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) &&
--			(xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) {
--			    /* Event is from before the resize, so ignore. */
--			    break;
--		    }
--		    X11_PendingConfigureNotifyWidth = -1;
--		    X11_PendingConfigureNotifyHeight = -1;
--		}
- 		if ( SDL_VideoSurface ) {
- 		    if ((xevent.xconfigure.width != SDL_VideoSurface->w) ||
- 		        (xevent.xconfigure.height != SDL_VideoSurface->h)) {
-diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h
---- a/src/video/x11/SDL_x11events_c.h	Mon Feb 20 23:51:08 2012 -0500
-+++ b/src/video/x11/SDL_x11events_c.h	Mon Mar 26 12:26:52 2012 +1300
-@@ -27,8 +27,3 @@
- extern void X11_InitOSKeymap(_THIS);
- extern void X11_PumpEvents(_THIS);
- extern void X11_SetKeyboardState(Display *display, const char *key_vec);
--
--/* Variables to be exported */
--extern int X11_PendingConfigureNotifyWidth;
--extern int X11_PendingConfigureNotifyHeight;
--
-diff -r c787fb1b5699 src/video/x11/SDL_x11video.c
---- a/src/video/x11/SDL_x11video.c	Mon Feb 20 23:51:08 2012 -0500
-+++ b/src/video/x11/SDL_x11video.c	Mon Mar 26 12:26:52 2012 +1300
-@@ -1182,8 +1182,6 @@
- 			current = NULL;
- 			goto done;
- 		}
--		X11_PendingConfigureNotifyWidth = width;
--		X11_PendingConfigureNotifyHeight = height;
- 	} else {
- 		if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) {
- 			current = NULL;
diff --git a/extra/sdl/sdl-1.2.14-disable-mmx.patch b/extra/sdl/sdl-1.2.14-disable-mmx.patch
deleted file mode 100644
index 1bb6e0e47..000000000
--- a/extra/sdl/sdl-1.2.14-disable-mmx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# and another one from FS#26020
-
---- a/src/video/SDL_yuv_sw.c    2009-10-13 06:07:15.000000000 +0700
-+++ b/src/video/SDL_yuv_sw.c    2011-09-20 19:26:30.247742620 +0700
-@@ -89,6 +89,8 @@
- #include "SDL_yuvfuncs.h"
- #include "SDL_yuv_sw_c.h"
- 
-+#undef __OPTIMIZE__
-+
- /* The functions used to manipulate software video overlays */
- static struct private_yuvhwfuncs sw_yuvfuncs = {
- 	SDL_LockYUV_SW,
diff --git a/extra/sdl/sdl-1.2.14-fix-mouse-clicking.patch b/extra/sdl/sdl-1.2.14-fix-mouse-clicking.patch
deleted file mode 100644
index 7d3e5acfc..000000000
--- a/extra/sdl/sdl-1.2.14-fix-mouse-clicking.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig	2010-04-08 11:57:05.003169834 -0700
-+++ SDL-1.2.14/src/video/x11/SDL_x11events.c	2010-04-08 12:33:51.690926340 -0700
-@@ -423,12 +423,15 @@
- if ( xevent.xcrossing.mode == NotifyUngrab )
- printf("Mode: NotifyUngrab\n");
- #endif
--		if ( this->input_grab == SDL_GRAB_OFF ) {
--			posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-+		if ( (xevent.xcrossing.mode != NotifyGrab) &&
-+		     (xevent.xcrossing.mode != NotifyUngrab) ) {
-+			if ( this->input_grab == SDL_GRAB_OFF ) {
-+				posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-+			}
-+			posted = SDL_PrivateMouseMotion(0, 0,
-+					xevent.xcrossing.x,
-+					xevent.xcrossing.y);
- 		}
--		posted = SDL_PrivateMouseMotion(0, 0,
--				xevent.xcrossing.x,
--				xevent.xcrossing.y);
- 	    }
- 	    break;
- 
diff --git a/extra/sdl_gfx/PKGBUILD b/extra/sdl_gfx/PKGBUILD
index 1fd94b0fe..c6256479c 100644
--- a/extra/sdl_gfx/PKGBUILD
+++ b/extra/sdl_gfx/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=sdl_gfx
 pkgver=2.0.24
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="SDL Graphic Primitives"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
diff --git a/extra/sdl_mixer/PKGBUILD b/extra/sdl_mixer/PKGBUILD
index 56fb59859..e1bad6295 100644
--- a/extra/sdl_mixer/PKGBUILD
+++ b/extra/sdl_mixer/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=sdl_mixer
 pkgver=1.2.12
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A simple multi-channel audio mixer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libsdl.org/projects/SDL_mixer/"
diff --git a/extra/sdl_sound/PKGBUILD b/extra/sdl_sound/PKGBUILD
index ad57a55b4..7eef84341 100644
--- a/extra/sdl_sound/PKGBUILD
+++ b/extra/sdl_sound/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=sdl_sound
 pkgver=1.0.3
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A library to decode several popular sound file formats, such as .WAV and .MP3"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://icculus.org/SDL_sound/"
diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD
index 4d959c5fb..79e2e11ef 100644
--- a/extra/seahorse/PKGBUILD
+++ b/extra/seahorse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170821 2012-11-12 08:38:53Z heftig $
+# $Id: PKGBUILD 183457 2013-04-21 22:12:07Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Michel Brabants <michel.linux@tiscali.be>
 
 pkgname=seahorse
-pkgver=3.6.3
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64 'mips64el')
@@ -19,7 +19,7 @@ groups=(gnome-extra)
 install=seahorse.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
         seahorse-ssh-askpass.sh)
-sha256sums=('9b712da1989725547a8093e638725ee6de74d7870661545a15374c7ebf335cc1'
+sha256sums=('c1a1d97618a37a79e19902e00f3a0de7cfb947b52eb9282ea09e5f9f73151e7a'
             '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c')
 
 build() {
diff --git a/extra/seed/GLib.js b/extra/seed/GLib.js
new file mode 100644
index 000000000..5aec39a73
--- /dev/null
+++ b/extra/seed/GLib.js
@@ -0,0 +1,282 @@
+GLib = imports.gi.GLib;
+
+(function() {
+
+/* Variant Sugar 
+ * Provide commodities methods to convert Variant from/to javascript object.
+ * variant.toJS() : returns a javascript object representing the Variant 
+ # @variant
+ * Variant.new(signature, value): returns a GVariant structure representing
+ * the javascript object @value
+ *
+ * This implementation uses json-glib's json <-> variant conversion facilities
+ * if presents and fallback to a javascript implementation otherwise.
+ * This javascript implementation is imported from gjs with modification for
+ * JSCore compatibility (Copyright 2011 Giovanni Campagna,
+ * see gjs/override/GLib.js for licence)
+ */
+
+    // Use json-glib's json <-> variant conversion if present.
+    // Defaults to javascript code imported from gjs otherwise.
+    GLib.Variant.prototype.to_js = function(signature) {
+	return _toJS(signature, this);
+    }
+    var toVariant = _toVariant;
+    
+    try {
+	JSONGLib = imports.gi.Json;
+    }
+    catch (e) {}
+
+    if (JSONGLib && JSONGLib.gvariant_serialize_data)
+    {
+	GLib.Variant.prototype.to_js = function(signature) {
+	    return _toJSNative(signature, this);
+	}
+	toVariant = _toVariantNative;
+    }
+
+    GLib.Variant.new = function (value, sig) {
+	var signature = Array.prototype.slice.call(sig);
+
+	if (signature.length != 0)
+	    throw new TypeError('Invalid GVariant signature (more than one single complete type)');
+	var variant = toVariant(signature, value);
+	return variant;
+    }
+
+    GLib.Variant.prototype.toString = function() {
+	return '[object variant of type "' + this.get_type_string() + '"]';
+    };
+
+/// End Variant Sugar ///
+}).apply();
+
+function _toVariantNative(signature, object)
+{
+    if (!object || object == '')
+	return null;
+    if (!signature || signature == '')
+	signature = null;
+
+    return JSONGLib.gvariant_deserialize_data (JSON.stringify (object),
+						       -1, signature);
+};
+
+function _toJSNative(signature, variant)
+{
+    if (!variant)
+	return;
+
+    var jsonStr = JSONGLib.gvariant_serialize_data (variant, signature);
+    if (!jsonStr)
+	return;
+
+    return JSON.parse (jsonStr);
+};
+
+// Code imported from gjs, modified for JSCore idoms.
+// Copyright 2011 Giovanni Campagna (see gjs/override/GLib.js for licence)
+
+const SIMPLE_TYPES = ['b', 'y', 'n', 'q', 'i', 'u', 'x', 't', 'h', 'd', 's', 'o', 'g'];
+
+function _read_single_type(signature, forceSimple) {
+    var char = signature.shift();
+    var isSimple = false;
+
+    if (SIMPLE_TYPES.indexOf(char) == -1) {
+	if (forceSimple)
+	    throw new TypeError('Invalid GVariant signature (a simple type was expected)');
+    } else
+	isSimple = true;
+
+    if (char == 'm' || char == 'a')
+	return [char].concat(_read_single_type(signature, false));
+    if (char == '{') {
+	var key = _read_single_type(signature, true);
+	var val = _read_single_type(signature, false);
+	var close = signature.shift();
+	if (close != '}')
+	    throw new TypeError('Invalid GVariant signature for type DICT_ENTRY (expected "}"');
+	return [char].concat(key, val, close);
+    }
+    if (char == '(') {
+	var res = [char];
+	while (true) {
+	    if (signature.length == 0)
+		throw new TypeError('Invalid GVariant signature for type TUPLE (expected ")")');
+	    var next = signature[0];
+	    if (next == ')') {
+		signature.shift();
+		return res.concat(next);
+	    }
+	    var el = _read_single_type(signature);
+	    res = res.concat(el);
+	}
+    }
+
+    // Valid types are simple types, arrays, maybes, tuples, dictionary entries and variants
+    if (!isSimple && char != 'v')
+	throw new TypeError('Invalid GVariant signature (' + char + ' is not a valid type)');
+
+    return [char];
+}
+
+
+function _toVariant(signature, value) {
+    if (signature.length == 0)
+	    throw new TypeError('GVariant signature cannot be empty');
+
+    var char = signature.shift();
+    switch (char) {
+    case 'b':
+	return GLib.Variant.new_boolean(value);
+    case 'y':
+	return GLib.Variant.new_byte(value);
+    case 'n':
+	return GLib.Variant.new_int16(value);
+    case 'q':
+	return GLib.Variant.new_uint16(value);
+    case 'i':
+	return GLib.Variant.new_int32(value);
+    case 'u':
+	return GLib.Variant.new_uint32(value);
+    case 'x':
+	return GLib.Variant.new_int64(value);
+    case 't':
+	return GLib.Variant.new_uint64(value);
+    case 'h':
+	return GLib.Variant.new_handle(value);
+    case 'd':
+	return GLib.Variant.new_double(value);
+    case 's':
+	return GLib.Variant.new_string(value);
+    case 'o':
+	return GLib.Variant.new_object_path(value);
+    case 'g':
+	return GLib.Variant.new_signature(value);
+    case 'v':
+	return GLib.Variant.new_variant(value);
+    case 'm':
+	if (value != null)
+	    return GLib.Variant.new_maybe(null, _pack_variant(signature, value))
+	else
+	    return GLib.Variant.new_maybe(GLib.VariantType.new(_read_single_type(signature, false).join('')), null);
+    case 'a':
+	var arrayType = _read_single_type(signature, false);
+	if (arrayType[0] == 's') {
+	    // special case for array of strings
+	    return GLib.Variant.new_strv(value, value.length);
+	}
+	if (arrayType[0] == 'y') {
+	    // special case for array of bytes
+	    return GLib.Variant.new_bytestring(value);
+	}
+	if (arrayType[0] == 'a' && arrayType[1] == 'y') {
+	    // special case for array of array of bytes
+	    return GLib.Variant.new_bytestring_array(value, value.length);
+	}
+
+	var arrayValue = [];
+	if (arrayType[0] == '{') {
+	    // special case for dictionaries
+	    for (var key in value) {
+		var copy = [].concat(arrayType);
+		var child = _pack_variant(copy, [key, value[key]]);
+		arrayValue.push(child);
+	    }
+	} else {
+	    for (var i = 0; i < value.length; i++) {
+		var copy = [].concat(arrayType);
+		var child = _pack_variant(copy, value[i]);
+		arrayValue.push(child);
+	    }
+	}
+	return GLib.Variant.new_array(GLib.VariantType.new(arrayType.join('')), arrayValue, arrayValue.length);
+    case '(':
+	var children = [ ];
+	for (var i = 0; i < value.length; i++) {
+	    var next = signature[0];
+	    if (next == ')')
+		break;
+	    children.push(_pack_variant(signature, value[i]));
+	}
+
+	if (signature[0] != ')')
+	    throw new TypeError('Invalid GVariant signature for type TUPLE (expected ")")');
+	signature.shift();
+	return GLib.Variant.new_tuple(children, children.length);
+    case '{':
+	var key = _pack_variant(signature, value[0]);
+	var child = _pack_variant(signature, value[1]);
+
+	if (signature[0] != '}')
+	    throw new TypeError('Invalid GVariant signature for type DICT_ENTRY (expected "}")');
+	signature.shift();
+
+	return GLib.Variant.new_dict_entry(key, child);
+    default:
+	throw new TypeError('Invalid GVariant signature (unexpected character ' + char + ')');
+    }
+}
+
+function _toJS(signature, variant) {
+    switch (String.fromCharCode(variant.classify())) {
+    case 'b':
+	return variant.get_boolean();
+    case 'y':
+	return variant.get_byte();
+    case 'n':
+	return variant.get_int16();
+    case 'q':
+	return variant.get_uint16();
+    case 'i':
+	return variant.get_int32();
+    case 'u':
+	return variant.get_uint32();
+    case 'x':
+	return variant.get_int64();
+    case 't':
+	return variant.get_uint64();
+    case 'h':
+	return variant.get_handle();
+    case 'd':
+	return variant.get_double();
+    case 'o':
+    case 'g':
+    case 's':
+	// g_variant_get_string has length as out argument
+	return variant.get_string();
+    case 'v':
+	return variant.get_variant();
+    case 'm':
+	var val = variant.get_maybe();
+	return _toJS(val);
+    case 'a':
+	if (variant.is_container()) {
+	    // special case containers
+	    var ret = { };
+	    var nElements = variant.n_children();
+	    for (var i = 0; i < nElements; i++) {
+		// always unpack the dictionary entry, and always unpack
+		// the key (or it cannot be added as a key)
+		var val = _toJS(variant.get_child_value(i));
+		var key = val[0].classify ? _toJS(val[0]) : val[0];
+		ret[key] = val[1] && val[1].classify ? _toJS(val[1]) : val[1]
+	    }
+	    return ret;
+	}
+	// fall through
+    case '(':
+    case '{':
+	var ret = [ ];
+	var nElements = variant.n_children();
+	for (var i = 0; i < nElements; i++) {
+	    var val = variant.get_child_value(i);
+	    ret.push(_toJS(val));
+	}
+	return ret;
+    }
+
+    throw new Error('Assertion failure: this code should not be reached');
+}
diff --git a/extra/seed/PKGBUILD b/extra/seed/PKGBUILD
index 9dabdad34..447022f1e 100644
--- a/extra/seed/PKGBUILD
+++ b/extra/seed/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 157423 2012-04-28 09:27:33Z allan $
+# $Id: PKGBUILD 183482 2013-04-21 22:21:02Z heftig $
 #Maintainer : Ionut Biru <ibiru@archlinux.org>
 #Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=seed
-pkgver=3.2.0
-pkgrel=2
+pkgver=3.8.1
+pkgrel=1
 pkgdesc="Library and interpreter for JavaScript with GObject type system bindings."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Seed/"
 license=('LGPL')
 options=('!libtool')
-depends=('libwebkit3' 'gobject-introspection' 'gnome-js-common')
+depends=('webkitgtk3' 'gobject-introspection' 'gnome-js-common' 'mpfr')
 makedepends=('intltool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('3d1eca40834b72a5730ddaf8a5f46b8df20ddb2b3b39687d1a84ef966d3d37c0')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.8/${pkgname}-${pkgver}.tar.xz
+        GLib.js)
+sha256sums=('80cb4db7fa6f6cf8d3e255fc45a81657388d458bc8bf23e4089e35f69eeaac32'
+            '2a8185df661056e12830d0a29155dc539016fc349a823f5aec09dd15bbb9239b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  install -m644 ../GLib.js extensions/
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/serd/PKGBUILD b/extra/serd/PKGBUILD
index 910609df9..c80194539 100644
--- a/extra/serd/PKGBUILD
+++ b/extra/serd/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=serd
 pkgver=0.18.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples."
 arch=(i686 x86_64 mips64el)
 url="http://drobilla.net/software/$pkgname/"
diff --git a/extra/serf/PKGBUILD b/extra/serf/PKGBUILD
index 011594504..38d4ea6e4 100644
--- a/extra/serf/PKGBUILD
+++ b/extra/serf/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 173790 2012-12-23 03:50:15Z stephane $
+# $Id: PKGBUILD 179622 2013-03-08 20:38:44Z eric $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 pkgname=serf
-pkgver=1.1.1
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="High-performance asynchronous HTTP client library"
 url="http://code.google.com/p/serf/"
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('Apache')
 depends=('apr' 'apr-util' 'openssl' 'zlib')
 source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('1ec4689ef57e7c28e7371df00d0ccc3e32ef6457')
+sha1sums=('30b29bd9214d50887abcc20cf82096aaaf5d1d61')
 options=('!libtool')
 
 build() {
@@ -19,6 +19,12 @@ build() {
   make
 }
 
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make check
+}
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
diff --git a/extra/sg3_utils/PKGBUILD b/extra/sg3_utils/PKGBUILD
index 3d7f85749..88611c74a 100644
--- a/extra/sg3_utils/PKGBUILD
+++ b/extra/sg3_utils/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 147121 2012-01-22 10:55:51Z andyrtr $
+#$Id: PKGBUILD 180167 2013-03-18 13:36:39Z jgc $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=sg3_utils
-pkgver=1.33
-pkgrel=1.1
+pkgver=1.35
+pkgrel=1
 pkgdesc="Generic SCSI utilities"
 arch=(i686 x86_64 'mips64el')
 url="http://sg.danny.cz/sg/sg3_utils.html"
@@ -11,7 +11,7 @@ license=('GPL' 'custom:BSD')
 depends=('glibc')
 options=('!libtool')
 source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tgz)
-md5sums=('261e39f7161337330ba6bd57999be801')
+md5sums=('55c32fb95a5b3907687b023f392fbd3c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/sg3_utils/stdint.patch b/extra/sg3_utils/stdint.patch
deleted file mode 100644
index 8f8c5f581..000000000
--- a/extra/sg3_utils/stdint.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- include/sg_cmds_basic.h	2008/06/26 23:27:40	1.1
-+++ include/sg_cmds_basic.h	2008/06/26 23:28:06
-@@ -30,6 +30,8 @@
-  *
-  */
- 
-+#include <stdint.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
---- include/sg_cmds_extra.h	2008/06/26 23:27:40	1.1
-+++ include/sg_cmds_extra.h	2008/06/26 23:29:02
-@@ -30,6 +30,8 @@
-  *
-  */
- 
-+#include <stdint.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
diff --git a/extra/shared-mime-info/PKGBUILD b/extra/shared-mime-info/PKGBUILD
index 492573484..c007889e8 100644
--- a/extra/shared-mime-info/PKGBUILD
+++ b/extra/shared-mime-info/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 148606 2012-02-04 11:19:59Z andyrtr $
+# $Id: PKGBUILD 178164 2013-02-17 17:13:54Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=shared-mime-info
-pkgver=1.0
-pkgrel=1.1
+pkgver=1.1
+pkgrel=1
 pkgdesc="Freedesktop.org Shared MIME Info"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -12,7 +12,7 @@ makedepends=('intltool' 'pkgconfig')
 install=shared-mime-info.install
 url="http://freedesktop.org/Software/shared-mime-info"
 source=(http://freedesktop.org/~hadess/${pkgname}-${pkgver}.tar.xz)
-md5sums=('901b7977dbb2b71d12d30d4d8fb97028')
+md5sums=('12ba00bf1cb2e69bfba73127e708e833')
 options=(!makeflags)
 
 build() {
@@ -21,6 +21,11 @@ build() {
   make
 }
 
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -k check
+}
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/extra/sharutils/PKGBUILD b/extra/sharutils/PKGBUILD
index f24e51a2e..64e4aeb46 100644
--- a/extra/sharutils/PKGBUILD
+++ b/extra/sharutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175104 2013-01-13 20:19:27Z bisson $
+# $Id: PKGBUILD 182986 2013-04-16 16:21:08Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sharutils
-pkgver=4.13.3
+pkgver=4.13.5
 pkgrel=1
 pkgdesc='Makes so-called shell archives out of many files'
 url='http://www.gnu.org/software/sharutils/'
@@ -12,13 +12,12 @@ license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('perl' 'gettext' 'texinfo')
 source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('50582fcededd1891c47ec1caa98491e280950cbd')
+sha1sums=('8c2e352860994332fa03f2a6c92d789097fb2e52')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i "$srcdir/gets.patch"
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
diff --git a/extra/sharutils/gets.patch b/extra/sharutils/gets.patch
deleted file mode 100644
index b1b0f16ca..000000000
--- a/extra/sharutils/gets.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru sharutils-4.11.1.orig/lib/stdio.in.h sharutils-4.11.1/lib/stdio.in.h
---- sharutils-4.11.1.orig/lib/stdio.in.h	2012-12-26 14:49:54.935220358 +0100
-+++ sharutils-4.11.1/lib/stdio.in.h	2012-12-26 14:50:29.151983394 +0100
-@@ -175,12 +175,6 @@
-                  "use gnulib module fflush for portable POSIX compliance");
- #endif
- 
--/* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
--#undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
--
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 498956596..6465992f3 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 173037 2012-12-09 15:06:30Z andrea $
+# $Id: PKGBUILD 183493 2013-04-22 09:21:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
 
 pkgbase=sip
 pkgname=('sip' 'python-sip' 'python2-sip')
-pkgver=4.14.2
+pkgver=4.14.6
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.com/software/sip/"
 license=('custom:"sip"')
 makedepends=('python' 'python2')
 source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('b93442e745b3be2fad89de0686a76ce9')
+md5sums=('d6493b9f0a7911566545f694327314c4')
 
 build() {
   cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
diff --git a/extra/slang/PKGBUILD b/extra/slang/PKGBUILD
index 802f419fd..9dc80cda9 100644
--- a/extra/slang/PKGBUILD
+++ b/extra/slang/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=slang
 pkgver=2.2.4
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc="S-Lang is a powerful interpreted language"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.jedsoft.org/slang/"
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD
index 5305fb47d..48b0963aa 100644
--- a/extra/slim/PKGBUILD
+++ b/extra/slim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175827 2013-01-22 09:52:02Z foutrelis $
+# $Id: PKGBUILD 179969 2013-03-13 15:12:30Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
@@ -7,12 +7,12 @@
 
 pkgname=slim
 pkgver=1.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop-independent graphical login manager for X11"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://slim.berlios.de/"
 license=('GPL2')
-depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
+depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'xorg-xauth')
 makedepends=('cmake' 'freeglut')
 backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim')
 source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz
@@ -34,7 +34,7 @@ build() {
     -DCMAKE_SKIP_RPATH=ON \
     -DUSE_PAM=yes \
     -DUSE_CONSOLEKIT=no
-	make
+  make
 }
 
 package() {
diff --git a/extra/slim/fix-array-overflow.patch b/extra/slim/fix-array-overflow.patch
deleted file mode 100644
index b035f8a78..000000000
--- a/extra/slim/fix-array-overflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: app.cpp
-===================================================================
---- app.cpp	(revision 223)
-+++ app.cpp	(working copy)
-@@ -593,7 +593,7 @@
- 
-         n++;
- 
--        child_env = static_cast<char**>(malloc(sizeof(char*)*n));
-+        child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1)));
-         memcpy(child_env, old_env, sizeof(char*)*n);
-         child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
-         child_env[n] = NULL;
diff --git a/extra/slim/fix-glibc-segfault-1.3.4.patch b/extra/slim/fix-glibc-segfault-1.3.4.patch
deleted file mode 100644
index b035f8a78..000000000
--- a/extra/slim/fix-glibc-segfault-1.3.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: app.cpp
-===================================================================
---- app.cpp	(revision 223)
-+++ app.cpp	(working copy)
-@@ -593,7 +593,7 @@
- 
-         n++;
- 
--        child_env = static_cast<char**>(malloc(sizeof(char*)*n));
-+        child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1)));
-         memcpy(child_env, old_env, sizeof(char*)*n);
-         child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
-         child_env[n] = NULL;
diff --git a/extra/slim/fix-numlock-1.3.3.patch b/extra/slim/fix-numlock-1.3.3.patch
deleted file mode 100644
index 179fffcbf..000000000
--- a/extra/slim/fix-numlock-1.3.3.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- trunk/app.cpp	2012/02/21 23:57:28	211
-+++ trunk/app.cpp	2012/04/16 23:28:34	212
-@@ -332,6 +332,15 @@
-             Login();
-         }
-     }
-+
-+    // Set NumLock
-+    string numlock = cfg->getOption("numlock");
-+    if (numlock == "on") {
-+        NumLock::setOn(Dpy);
-+    } else if (numlock == "off") {
-+        NumLock::setOff(Dpy);
-+    }
-+    
-     // Start looping
-     int panelclosed = 1;
-     Panel::ActionType Action;
-@@ -971,13 +980,6 @@
-         break;
-     }
- 
--    string numlock = cfg->getOption("numlock");
--    if (numlock == "on") {
--        NumLock::setOn(Dpy);
--    } else if (numlock == "off") {
--        NumLock::setOff(Dpy);
--    }
--    
-     delete args;
- 
-     serverStarted = true;
---- trunk/numlock.cpp	2012/02/21 23:57:28	211
-+++ trunk/numlock.cpp	2012/04/16 23:28:34	212
-@@ -68,9 +68,9 @@
-         return;
- 
-     if( flag == true )
--        XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
--    else
-         XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, mask);
-+    else
-+        XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
- }
- 
- void NumLock::setOn(Display *dpy) {
diff --git a/extra/slim/install b/extra/slim/install
deleted file mode 100644
index 65aa77d72..000000000
--- a/extra/slim/install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  cat <<EOF
-
-==> Add slim to the DAEMONS array in /etc/rc.conf or update /etc/inittab.
-
-EOF
-}
diff --git a/extra/slim/libpng-1.4+-support.patch b/extra/slim/libpng-1.4+-support.patch
deleted file mode 100644
index 57b39272b..000000000
--- a/extra/slim/libpng-1.4+-support.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/image.cpp	2012-06-26 04:20:14.000000000 -0400
-+++ b/image.cpp	2012-06-27 11:41:34.000000000 -0400
-@@ -781,7 +781,11 @@
-                                 (png_infopp) NULL);
-     }
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+    if (setjmp(png_jmpbuf((png_ptr)))) {
-+#else
-     if (setjmp(png_ptr->jmpbuf)) {
-+#endif
-         goto png_destroy;
-     }
- 
diff --git a/extra/slim/logrotate b/extra/slim/logrotate
deleted file mode 100644
index 26ec3b0f4..000000000
--- a/extra/slim/logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/slim.log {
-    compress
-    rotate 1
-    size 1024k
-    notifempty
-    missingok
-    copytruncate
-    noolddir
-}
diff --git a/extra/slim/pam.d b/extra/slim/pam.d
deleted file mode 100644
index 59db5a8c5..000000000
--- a/extra/slim/pam.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-password        required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_loginuid.so
--session	optional	pam_systemd.so
diff --git a/extra/slim/ptr_pam.patch b/extra/slim/ptr_pam.patch
deleted file mode 100644
index 3a3fbcdb7..000000000
--- a/extra/slim/ptr_pam.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -aur old/app.cpp new/app.cpp
---- old/app.cpp	2010-07-08 07:04:10.000000000 +0200
-+++ new/app.cpp	2011-05-01 18:30:52.933844872 +0200
-@@ -43,8 +43,8 @@
-     Panel* panel = *static_cast<Panel**>(appdata_ptr);
-     int result = PAM_SUCCESS;
-     for (int i=0; i<num_msg; i++){
--        resp[i]->resp=0;
--        resp[i]->resp_retcode=0;
-+        (*resp)[i].resp=0;
-+        (*resp)[i].resp_retcode=0;
-         switch(msg[i]->msg_style){
-             case PAM_PROMPT_ECHO_ON:
-                 // We assume PAM is asking for the username
-@@ -53,13 +53,13 @@
-                     case Panel::Suspend:
-                     case Panel::Halt:
-                     case Panel::Reboot:
--                        resp[i]->resp=strdup("root");
-+                        (*resp)[i].resp=strdup("root");
-                         break;
- 
-                     case Panel::Console:
-                     case Panel::Exit:
-                     case Panel::Login:
--                        resp[i]->resp=strdup(panel->GetName().c_str());
-+                        (*resp)[i].resp=strdup(panel->GetName().c_str());
-                         break;
-                 }
-                 break;
-@@ -75,7 +75,7 @@
- 
-                     default:
-                         panel->EventHandler(Panel::Get_Passwd);
--                        resp[i]->resp=strdup(panel->GetPasswd().c_str());
-+                        (*resp)[i].resp=strdup(panel->GetPasswd().c_str());
-                         break;
-                 }
-                 break;
-@@ -91,9 +91,9 @@
-     }
-     if (result!=PAM_SUCCESS){
-         for (int i=0; i<num_msg; i++){
--            if (resp[i]->resp==0) continue;
--            free(resp[i]->resp);
--            resp[i]->resp=0;
-+            if ((*resp)[i].resp==0) continue;
-+            free((*resp)[i].resp);
-+            (*resp)[i].resp=0;
-         };
-         free(*resp);
-         *resp=0;
diff --git a/extra/slim/rc.d b/extra/slim/rc.d
deleted file mode 100755
index b0be7ffc5..000000000
--- a/extra/slim/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/slim`
-case "$1" in
-  start)
-    stat_busy "Starting Simple Login Manager"
-    [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon slim
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Simple Login Manager"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon slim
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/slim/session-name.patch b/extra/slim/session-name.patch
deleted file mode 100644
index 8211c4f72..000000000
--- a/extra/slim/session-name.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp
---- slim-1.3.2.old/panel.cpp	2010-10-24 06:01:15.117000019 +0000
-+++ slim-1.3.2.new/panel.cpp	2010-10-24 17:26:30.987999967 +0000
-@@ -23,7 +23,7 @@
-     Root = root;
-     cfg = config;
- 
--    session = "";
-+    session = cfg->nextSession(session);
- 
-     // Init GC
-     XGCValues gcv;
-@@ -188,7 +188,7 @@
- }
- 
- void Panel::ClearPanel() {
--    session = "";
-+    session = cfg->nextSession(session);
-     Reset();
-     XClearWindow(Dpy, Root);
-     XClearWindow(Dpy, Win);
diff --git a/extra/slim/slim.service b/extra/slim/slim.service
deleted file mode 100644
index b894085a0..000000000
--- a/extra/slim/slim.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=SLiM Simple Login Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/slim -nodaemon
-
-[Install]
-Alias=display-manager.service
diff --git a/extra/slim/tty-slowness.patch b/extra/slim/tty-slowness.patch
deleted file mode 100644
index c590fbed8..000000000
--- a/extra/slim/tty-slowness.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -aur slim-1.3.2.a/app.cpp slim-1.3.2.b/app.cpp
---- slim-1.3.2.a/app.cpp	2010-08-21 15:10:13.702755711 +0200
-+++ slim-1.3.2.b/app.cpp	2010-08-21 15:10:48.579631179 +0200
-@@ -280,21 +280,22 @@
-         signal(SIGALRM, AlarmSignal);
- 
- #ifndef XNEST_DEBUG
--        OpenLog();
--        
-         if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
-             daemonmode = true;
-         }
- 
-         // Daemonize
-         if (daemonmode) {
--            if (daemon(0, 1) == -1) {
-+            if (daemon(0, 0) == -1) {
-                 cerr << APPNAME << ": " << strerror(errno) << endl;
-                 exit(ERR_EXIT);
-             }
--            UpdatePid();
-         }
- 
-+        OpenLog();
-+
-+        if (daemonmode) UpdatePid();
-+
-         CreateServerAuth();
-         StartServer();
-         alarm(2);
diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD
index 1a0648f78..261ca4b05 100644
--- a/extra/smartmontools/PKGBUILD
+++ b/extra/smartmontools/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 177000 2013-02-03 16:40:55Z giovanni $
+# $Id: PKGBUILD 183306 2013-04-21 10:49:31Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Jani Talikka <jani.talikka@gmail.com>
 # Contributor: Ralf Barth <archlinux.org@haggy.org>
 
 pkgname=smartmontools
-pkgver=6.0
+pkgver=6.1
 pkgrel=2
 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives"
 url="http://smartmontools.sourceforge.net"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gcc-libs' 'libcap-ng' 'bash')
+optdepends=('heirloom-mailx: to get mail alerts to work')
 backup=('etc/smartd.conf'
         'etc/conf.d/smartd')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'smartd.conf')
-md5sums=('5646a07f5f4bee8e2e649de8c6b7ae87'
+md5sums=('83a3a681f8183ed858392d550ae1cca6'
          '28c1b80c41dac52d433961dcfb4f70e0')
 
 build() {
diff --git a/extra/smartmontools/smartd.rc b/extra/smartmontools/smartd.rc
deleted file mode 100755
index 16920db12..000000000
--- a/extra/smartmontools/smartd.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-SMARTD_ARGS=
-[ -f /etc/conf.d/smartd ] && . /etc/conf.d/smartd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-
-   start)
-     stat_busy "Starting smartd"
-     /usr/sbin/smartd ${SMARTD_ARGS} &>/dev/null
-     if [ $? -ne 0 ]; then
-       stat_fail
-     else
-       add_daemon smartd
-       stat_done
-     fi
-   ;;
-
-   stop)
-     stat_busy "Stopping smartd"
-     kill -9 `pidof /usr/sbin/smartd` &>/dev/null
-     rm_daemon smartd
-     stat_done
-   ;;
-
-   restart)
-     stat_busy "Restarting smartd ..."
-     $0 stop
-     $0 start
-     stat_done
-   ;;
-
-   *)
-     echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD
index 4594c85c6..32516b6d8 100644
--- a/extra/smb4k/PKGBUILD
+++ b/extra/smb4k/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173880 2012-12-27 00:40:48Z giovanni $
+# $Id: PKGBUILD 179497 2013-03-05 17:07:36Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com>
 
 pkgname=smb4k
-pkgver=1.0.5
+pkgver=1.0.6
 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=('b8472b5baad3616858706a7b4bf0427a')
+md5sums=('438ea64ed1296de6618677758257445b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/smpeg/PKGBUILD b/extra/smpeg/PKGBUILD
index 9d3e4158a..7d93b22e1 100644
--- a/extra/smpeg/PKGBUILD
+++ b/extra/smpeg/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=smpeg
 pkgver=0.4.4
-pkgrel=7
+pkgrel=7.1
 pkgdesc="SDL MPEG Player Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://icculus.org/smpeg/"
diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD
index 5eee90c6b..395b5e20f 100644
--- a/extra/smplayer/PKGBUILD
+++ b/extra/smplayer/PKGBUILD
@@ -1,25 +1,34 @@
-# $Id: PKGBUILD 173913 2012-12-28 02:38:34Z foutrelis $
+# $Id: PKGBUILD 184186 2013-05-03 10:19:10Z foutrelis $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 # Contributor: shamrok <szamrok@gmail.com>
 
 pkgname=smplayer
-pkgver=0.8.3
-pkgrel=1
+pkgver=0.8.4
+pkgrel=2
 pkgdesc="A complete front-end for MPlayer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://smplayer.sourceforge.net/"
 license=('GPL')
-depends=('qt' 'mplayer')
+depends=('qt4' 'mplayer')
+makedepends=('optipng')
 install=smplayer.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('48755bffdff3878df32d8c047d7a3d52')
+md5sums=('4691b569c4209d7e5a2c1386d9319881')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  # Fix invalid PNG icons to work with libpng 1.6
+  # http://sourceforge.net/p/smplayer/bugs/571/
+  find -name '*.png' -exec optipng -quiet -force -fix {} +
+}
 
 build() {
   cd "$pkgname-$pkgver"
   sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro
-  make PREFIX=/usr
+  make PREFIX=/usr QMAKE=qmake-qt4 LRELEASE=lrelease-qt4
 }
 
 package() {
diff --git a/extra/snappy/PKGBUILD b/extra/snappy/PKGBUILD
index 772e17688..3e7d7a387 100644
--- a/extra/snappy/PKGBUILD
+++ b/extra/snappy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166939 2012-09-22 20:17:43Z dreisner $
+# $Id: PKGBUILD 178016 2013-02-13 16:35:15Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Antony Male <antony dot male at geemail dot com>>
 
 pkgname=snappy
-pkgver=1.0.5
-pkgrel=2
+pkgver=1.1.0
+pkgrel=1
 pkgdesc='A fast compressor/decompressor library'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/snappy/"
@@ -13,7 +13,7 @@ depends=('glibc' 'gcc-libs')
 checkdepends=('zlib')
 options=('!libtool')
 source=("http://snappy.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-md5sums=('4c0af044e654f5983f4acbf00d1ac236')
+md5sums=('c8f3ef29b5281e78f4946b2d739cea4f')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD
index c6da2530d..53c93d271 100644
--- a/extra/snd/PKGBUILD
+++ b/extra/snd/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 171550 2012-11-19 03:46:19Z schiv $
+# $Id: PKGBUILD 180122 2013-03-17 18:38:44Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: see .contrib
 
 pkgname=snd
-pkgver=13.2
+pkgver=13.5
 pkgrel=1
 pkgdesc="An advanced sound editor"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://ccrma.stanford.edu/software/snd/"
 license=('custom')
 depends=('jack' 'gamin' 'gsl' 'fftw' 'gtk2' 'libmpc')
@@ -17,13 +17,12 @@ optdepends=('wavpack' 'flac' 'speex' 'mpg123'
             'timidity++' 'vorbis-tools')
 install=$pkgname.install
 source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz")
-md5sums=('303df8ac9e6d777e480e24b65a3bfaad')
+md5sums=('bc8915f28110744237330e8b93638bd3')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # execstack is probably due to gmp; this is here just for a reminder
-  #LDFLAGS+=" -Wl,-z,noexecstack"
+  LDFLAGS+=" -Wl,-z,noexecstack"
 
   ./configure --prefix=/usr \
               --with-alsa \
diff --git a/extra/sofia-sip/PKGBUILD b/extra/sofia-sip/PKGBUILD
index a7db7e757..b2974f1f4 100644
--- a/extra/sofia-sip/PKGBUILD
+++ b/extra/sofia-sip/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 pkgname=sofia-sip
 pkgver=1.12.11
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="An open-source SIP User-Agent library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sofia-sip.sourceforge.net"
diff --git a/extra/sonata/ChangeLog b/extra/sonata/ChangeLog
deleted file mode 100644
index 8311a287c..000000000
--- a/extra/sonata/ChangeLog
+++ /dev/null
@@ -1,16 +0,0 @@
-2011-07-26  Angel Velasquez <angvp@archlinux.org>
-  * sonata 1.6.2.1-7:
-  Applied patch to pull lyrics FS#25036
-
-2009-03-30  Alexander Fehr  <pizzapunk gmail com>
-
-  * sonata-1.6-1:
-  New upstream release.
-
-2008-09-15  Alexander Fehr  <pizzapunk gmail com>
-
-  * sonata-1.5.3-1:
-  New upstream release.
-  New maintainer.
-  Replaced install file with optdepends.
-  Added ChangeLog.
diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD
index d3ca43c94..aee8750a3 100644
--- a/extra/soprano/PKGBUILD
+++ b/extra/soprano/PKGBUILD
@@ -1,26 +1,23 @@
-# $Id: PKGBUILD 177766 2013-02-08 09:03:19Z andrea $
+# $Id: PKGBUILD 184138 2013-05-02 15:21:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=soprano
-pkgver=2.9.0
+pkgver=2.9.1
 pkgrel=1
 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://soprano.sourceforge.net/'
 license=('GPL' 'LGPL')
-depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base')
-makedepends=('cmake' 'openjdk6' 'doxygen')
-[ "$CARCH" = "mips64el" ] && makedepends=('cmake' 'doxygen')
+depends=('qt4' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base')
+makedepends=('cmake' 'doxygen')
+[ "$CARCH" != "mips64el" ] && makedepends+=('java-environment')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('90134eaaf40b6663dd01cfaefdaba7fb')
+md5sums=('c7beb1bda475f363fa0afb58edc541fe')
 
 build() {
   mkdir build
   cd build
-
-  [ "$CARCH" = "mips64el" ] || \
-  . /etc/profile.d/openjdk6.sh
   # we need the rpath
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/sord/PKGBUILD b/extra/sord/PKGBUILD
index 8d0a71024..0f47e40d5 100644
--- a/extra/sord/PKGBUILD
+++ b/extra/sord/PKGBUILD
@@ -3,31 +3,31 @@
 # Contributor: speps <speps at aur dot archlinux dot org>
 
 pkgname=sord
-pkgver=0.10.4
+pkgver=0.12.0
 pkgrel=1
-pkgdesc="A lightweight C library for storing RDF data in memory."
-arch=(i686 x86_64 mips64el)
-url="http://drobilla.net/software/$pkgname/"
+pkgdesc="A lightweight C library for storing RDF data in memory"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://drobilla.net/software/sord/"
 license=('custom:ISC')
-depends=('serd>=0.18.0' 'pcre')
+depends=('serd' 'pcre')
 makedepends=('python2')
 source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('9353e5b5e26c926c1a8c0e43fa577f31')
+md5sums=('0c045bd0a7a2d70974ed7287bb61f891')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # remove ldconfig
+  # remove ldconfig --speps
   sed -i "/ldconfig/d" wscript
 
-  python2 ./waf configure --prefix=/usr \
-                          --mandir=/usr/share/man
-  python2 ./waf
+  python2 waf configure --prefix=/usr
+  python2 waf build $MAKEFLAGS
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  DESTDIR="$pkgdir" python2 ./waf install
+
+  python2 waf install --destdir="$pkgdir"
 
   # license
   install -Dm644 COPYING \
diff --git a/extra/sound-juicer/PKGBUILD b/extra/sound-juicer/PKGBUILD
index 8bb2aadec..4b7584362 100644
--- a/extra/sound-juicer/PKGBUILD
+++ b/extra/sound-juicer/PKGBUILD
@@ -1,29 +1,39 @@
-# $Id: PKGBUILD 171308 2012-11-17 04:45:56Z heftig $
+# $Id: PKGBUILD 183458 2013-04-21 22:12:09Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Ben <contrasutra@myrealbox.com>
 
 pkgname=sound-juicer
 pkgver=3.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A cd ripper application"
 arch=(i686 x86_64 mips64el)
 license=(GPL)
-depends=(libmusicbrainz5 libdiscid gtk3 gst-plugins-base gst-plugins-good brasero
-         hicolor-icon-theme gconf)
-makedepends=(intltool gnome-doc-utils)
+depends=(libmusicbrainz5 libdiscid gtk3 gst-plugins-base gst-plugins-good brasero hicolor-icon-theme gconf)
+makedepends=(intltool gnome-doc-utils gnome-common)
 options=(!emptydirs)
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-groups=(gnome-extra)
 install=sound-juicer.install
 sha256sums=('ea76703e08e67590af7b8ce5206c343eb01d77cd5023c0bc958a0c2f5a98d2e9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -e "s/AM_GST_ELEMENT_CHECK/GST_ELEMENT_CHECK/" \
+      -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in
+  autoreconf -f
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-scrollkeeper
-  make
+
+  # drop unneeded direct library deps with --as-needed
+  # libtool doesn't make this easy, so we do it the hard way
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+  # Remove RPATH
+  sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+  sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+  export tagname=CC
+  make AM_CFLAGS=-export-dynamic
 }
 
 package() {
diff --git a/extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch b/extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch
deleted file mode 100644
index 562e38e97..000000000
--- a/extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up soundtouch/source/SoundTouch/Makefile.am~ soundtouch/source/SoundTouch/Makefile.am
---- soundtouch/source/SoundTouch/Makefile.am~	2009-02-15 11:21:36.000000000 +0100
-+++ soundtouch/source/SoundTouch/Makefile.am	2009-02-15 11:23:30.000000000 +0100
-@@ -36,7 +36,9 @@
- # Note by authore: '-msse2' might not work in non-X86 compilations. If someone can

- # fix this script to automatically check for CPU architecture, please submit a patch 

- # to me.

--AM_CXXFLAGS=-O3 -msse2 -fcheck-new -I../../include

-+AM_CXXFLAGS = -fcheck-new -I../../include

-+mmx_optimized.lo : AM_CXXFLAGS = -mmmx -fcheck-new -I../../include

-+sse_optimized.lo : AM_CXXFLAGS = -msse -fcheck-new -I../../include

- 

- 

- # other linking flags to add

diff --git a/extra/soundtouch/soundtouch-1.4.0-x86_64-asm-broken.patch b/extra/soundtouch/soundtouch-1.4.0-x86_64-asm-broken.patch
deleted file mode 100644
index 4c777d60e..000000000
--- a/extra/soundtouch/soundtouch-1.4.0-x86_64-asm-broken.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up soundtouch/include/STTypes.h~ soundtouch/include/STTypes.h
---- soundtouch/include/STTypes.h~	2009-01-25 17:32:53.000000000 +0100
-+++ soundtouch/include/STTypes.h	2009-02-14 22:22:37.000000000 +0100
-@@ -87,7 +87,7 @@ namespace soundtouch

-  

-  #endif

- 

--    #if (WIN32 || __i386__ || __x86_64__)

-+    #if (WIN32 || __i386__)

-         /// Define this to allow X86-specific assembler/intrinsic optimizations. 

-         /// Notice that library contains also usual C++ versions of each of these

-         /// these routines, so if you're having difficulties getting the optimized 

diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index 498bbeaf6..5328e64ea 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176932 2013-02-02 19:24:03Z giovanni $
+# $Id: PKGBUILD 181128 2013-03-31 19:16:57Z stephane $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=source-highlight
 pkgver=3.1.7
-pkgrel=4
+pkgrel=5
 pkgdesc="Convert source code to syntax highlighted document"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/src-highlite/"
diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD
index 550f7a666..cfb0ab785 100644
--- a/extra/sox/PKGBUILD
+++ b/extra/sox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163160 2012-07-08 09:32:27Z ibiru $
+# $Id: PKGBUILD 178141 2013-02-16 22:48:58Z ioni $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=sox
-pkgver=14.4.0
-pkgrel=3
+pkgver=14.4.1
+pkgrel=1
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sox.sourceforge.net/"
@@ -19,18 +19,16 @@ optdepends=('libao: for ao plugin'
             'libpulse: for pulse plugin')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        sox_default_audio_driver_fallback.patch sox-ffmpeg0.11.patch)
-sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978'
-          'ab304f1fc17269262dbc4977aa9b7e97ec805ae4'
+        sox-ffmpeg0.11.patch)
+sha1sums=('4775f9e9eebb5a2fe79df548908a7a24088118d9'
           '2f92bcaebcaf300782396f106cdd27c72048a851')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/sox_default_audio_driver_fallback.patch"
   patch -p1 -i "${srcdir}/sox-ffmpeg0.11.patch"
   sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in
   ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-dyn-default --with-distro="Arch Linux"
+    --with-dyn-default --with-distro="Parabola"
   make
 }
 
diff --git a/extra/sox/sox_default_audio_driver_fallback.patch b/extra/sox/sox_default_audio_driver_fallback.patch
deleted file mode 100644
index 9f9060e17..000000000
--- a/extra/sox/sox_default_audio_driver_fallback.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- src/sox.c.old	2012-05-06 22:45:45.380564154 -0400
-+++ src/sox.c	2012-05-06 22:47:11.948248987 -0400
-@@ -2538,20 +2538,38 @@
-   return name? from_env? from_env : name : NULL;
- }
- 
-+static char const * try_device(char const * name)
-+{
-+  sox_format_handler_t const * handler = sox_find_format(name, sox_false);
-+  if (handler) {
-+    sox_format_t format, * ft = &format;
-+    memset(ft, 0, sizeof(*ft));
-+    ft->filename = (char *)device_name(name);
-+    ft->priv = lsx_calloc(1, handler->priv_size);
-+    if (handler->startwrite(ft) == SOX_SUCCESS) {
-+      handler->stopwrite(ft);
-+      free(ft->priv);
-+      return name;
-+    }
-+    free(ft->priv);
-+  }
-+  return NULL;
-+}
-+
- static char const * set_default_device(file_t * f)
- {
-   /* Default audio driver type in order of preference: */
-   if (!f->filetype) f->filetype = getenv("AUDIODRIVER");
--  if (!f->filetype && sox_find_format("coreaudio", sox_false)) f->filetype = "coreaudio";
--  if (!f->filetype && sox_find_format("pulseaudio" , sox_false)) f->filetype = "pulseaudio";
--  if (!f->filetype && sox_find_format("alsa", sox_false)) f->filetype = "alsa";
--  if (!f->filetype && sox_find_format("waveaudio" , sox_false)) f->filetype = "waveaudio";
--  if (!f->filetype && sox_find_format("sndio", sox_false)) f->filetype = "sndio";
--  if (!f->filetype && sox_find_format("oss" , sox_false)) f->filetype = "oss";
--  if (!f->filetype && sox_find_format("sunau",sox_false)) f->filetype = "sunau";
--  if (!f->filetype && sox_find_format("ao"  , sox_false) && file_count) /*!rec*/
--    f->filetype = "ao";
--
-+  if (!f->filetype) f->filetype = try_device("coreaudio");
-+  if (!f->filetype) f->filetype = try_device("pulseaudio");
-+  if (!f->filetype) f->filetype = try_device("alsa");
-+  if (!f->filetype) f->filetype = try_device("waveaudio");
-+  if (!f->filetype) f->filetype = try_device("sndio");
-+  if (!f->filetype) f->filetype = try_device("oss");
-+  if (!f->filetype) f->filetype = try_device("sunau");
-+  if (!f->filetype && file_count) /*!rec*/
-+    f->filetype = try_device("ao");
-+ 
-   if (!f->filetype) {
-     lsx_fail("Sorry, there is no default audio device configured");
-     exit(1);
diff --git a/extra/spandsp/PKGBUILD b/extra/spandsp/PKGBUILD
index bd61876a2..0a9c83273 100644
--- a/extra/spandsp/PKGBUILD
+++ b/extra/spandsp/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=spandsp
 pkgver=0.0.6pre21
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A DSP library for telephony"
 arch=(i686 x86_64 mips64el)
 license=('GPL')
diff --git a/extra/speech-dispatcher/PKGBUILD b/extra/speech-dispatcher/PKGBUILD
index 053b65878..9eec7b513 100644
--- a/extra/speech-dispatcher/PKGBUILD
+++ b/extra/speech-dispatcher/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165252 2012-08-14 16:20:06Z andrea $
+# $Id: PKGBUILD 179645 2013-03-09 01:49:56Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Steve Holmes <steve.holmes88@gmail.com>
@@ -7,14 +7,14 @@
 # Contributor: Andreas Messer <andi@bupfen.de>
 
 pkgname=speech-dispatcher
-pkgver=0.7.1
-pkgrel=7
+pkgver=0.8
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="High-level device independent layer for speech synthesis interface"
 url="http://www.freebsoft.org/speechd"
 license=('GPL2' 'FDL')
-depends=('glib2' 'python2' 'dotconf' 'texinfo' 'libpulse')
-makedepends=('pkgconfig' 'espeak')
+depends=('glib2' 'libltdl' 'python-xdg' 'dotconf' 'libpulse')
+makedepends=('intltool' 'espeak')
 optdepends=('festival: Speech output using Festival'
         'espeak: Speech output using ESpeak'
         'pulseaudio: PulseAudio support')
@@ -37,10 +37,9 @@ backup=(etc/speech-dispatcher/clients/gnome-speech.conf
 	etc/speech-dispatcher/speechd.conf)
 install="${pkgname}.install"
 source=("http://www.freebsoft.org/pub/projects/speechd/$pkgname-$pkgver.tar.gz"
-        'speechd.sh' 'speech-dispatcherd.service')
-md5sums=('ccfc30ac006673d36b4223eb760ed696'
-        '858293f464b83f03f3b6bb796291c71d'
-        'd26f52e2e95a30eaa83560f0e63faca5')
+        'speech-dispatcherd.service')
+md5sums=('d88691a64c676122f996230c107c392f'
+         'd26f52e2e95a30eaa83560f0e63faca5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -53,20 +52,8 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 
-  install -Dm755 ${srcdir}/speechd.sh ${pkgdir}/etc/rc.d/speechd
-  install -d "${pkgdir}/usr/lib/systemd/system/"
-  install -m644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/"
-  install -d ${pkgdir}/var/log/speech-dispatcher
-
-  # Fix spd-conf to use python 2.7
-  sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' ${pkgdir}/usr/bin/spd-conf
-  sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' ${pkgdir}/usr/lib/python2.7/site-packages/speechd/_test.py
-  
-  rm -f ${pkgdir}/usr/share/info/dir
-  gzip -9nf ${pkgdir}/usr/share/info/*
-
-  # Remove conflicts with erlang (FS#21674)
-  rm -r ${pkgdir}/usr/bin/run_test
+  install -Dm644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/speech-dispatcherd.service"
+  install -d "${pkgdir}/var/log/speech-dispatcher"
 }
diff --git a/extra/speech-dispatcher/speech-dispatcher.install b/extra/speech-dispatcher/speech-dispatcher.install
index 93f4f9363..1565d3a31 100644
--- a/extra/speech-dispatcher/speech-dispatcher.install
+++ b/extra/speech-dispatcher/speech-dispatcher.install
@@ -1,10 +1,10 @@
 info_dir=usr/share/info
 info_files=('speech-dispatcher.info'
-    'speech-dispatcher-cs.info'
     'ssip.info'
     'spd-say.info')
 
 post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
   for f in ${info_files[@]}; do
     install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
   done
@@ -15,6 +15,7 @@ post_upgrade() {
 }
 
 pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
   for f in ${info_files[@]}; do
     install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
   done
diff --git a/extra/speech-dispatcher/speechd.sh b/extra/speech-dispatcher/speechd.sh
deleted file mode 100644
index eb44198cb..000000000
--- a/extra/speech-dispatcher/speechd.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/speech-dispatcher)
-case "$1" in
-  start)
-    stat_busy "Starting speech dispatcher Daemon"
-    [ -z "$PID" ] && /usr/bin/speech-dispatcher -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon speechd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping speech dispatcher Daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon speechd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-
-exit 0
diff --git a/extra/speedtouch/PKGBUILD b/extra/speedtouch/PKGBUILD
deleted file mode 100644
index 658d0f7e7..000000000
--- a/extra/speedtouch/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 143969 2011-11-30 23:13:25Z giovanni $
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Contributor: Aurelien Foret <orelien@chez.com>
-
-pkgname=speedtouch
-pkgver=1.3.1
-pkgrel=4
-pkgdesc="Driver for the ADSL Speed Touch USB modem"
-arch=('i686' 'x86_64')
-url="http://speedtouch.sourceforge.net/"
-license=('GPL')
-depends=('bash')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 
-	'speedtouch-1.3.1-gcc4.patch')
-md5sums=('0848a120ae0eeab6c8ab378e11dc4fa2' 
-	 '4191035925db745944c75e26937c42a3')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  patch -Np1 -i ${srcdir}/speedtouch-1.3.1-gcc4.patch
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make prefix=${pkgdir}/usr sysconfdir=${pkgdir}/etc mandir=${pkgdir}/usr/share/man install
-}
diff --git a/extra/speedtouch/speedtouch-1.3.1-gcc4.patch b/extra/speedtouch/speedtouch-1.3.1-gcc4.patch
deleted file mode 100644
index bdd323c50..000000000
--- a/extra/speedtouch/speedtouch-1.3.1-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- speedtouch-1.3.1/src/modem.h        2004-09-29 21:56:31.000000000 +0100
-+++ speedtouch-1.3.1-gcc4/src/modem.h   2005-07-21 07:15:03.000000000 +0100
-@@ -38,7 +38,4 @@
- #define EP_CODE_IN  0x85
- #define EP_CODE_OUT 0x05
-
--/* Global Variables */
--extern int verbose;
--
- #endif
- 
\ No newline at end of file
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index 5a31c4b93..ca5e880db 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 175005 2013-01-10 17:58:12Z andyrtr $
+# $Id: PKGBUILD 182667 2013-04-12 14:07:12Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite"
-pkgname=('sqlite' 'sqlite-tcl')
-_amalgamationver=3071502
-#_docver=${_amalgamationver}
-_docver=3071502
-pkgver=3.7.15.2
+pkgname=('sqlite' 'sqlite-tcl') 
+_amalgamationver=3071602
+_docver=${_amalgamationver}
+#_docver=3071601
+pkgver=3.7.16.2
 pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,11 +15,11 @@ license=('custom')
 url="http://www.sqlite.org/"
 makedepends=('tcl' 'readline')
 source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
-	http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
+	http://www.sqlite.org/2013/sqlite-autoconf-$_amalgamationver.tar.gz
 	license.txt)
 options=('!libtool' '!emptydirs')
-md5sums=('bcb0ab0b5b30116b2531cfeef3c861b4'
-         'c1cdbc5544034d9012e421e75a5e4890')
+sha1sums=('85bf857cf86f34831d55d7ba97606dba581b8d62'
+          'f34f6daa4ab3073d74e774aad21d66878cf26853')
 
 build() {
   export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
diff --git a/extra/sratom/PKGBUILD b/extra/sratom/PKGBUILD
index 372c1a723..09ae20b22 100644
--- a/extra/sratom/PKGBUILD
+++ b/extra/sratom/PKGBUILD
@@ -3,32 +3,35 @@
 # Contributor: speps <speps at aur dot archlinux dot org>
 
 pkgname=sratom
-pkgver=0.4.0
+pkgver=0.4.2
 pkgrel=1
 pkgdesc="An LV2 Atom RDF serialisation library"
-arch=(i686 x86_64 mips64el)
-url="http://drobilla.net/software/$pkgname/"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://drobilla.net/software/sratom/"
 license=('custom:ISC')
-depends=('lv2' 'sord')
+depends=('lv2' 'sord>=0.12.0')
 makedepends=('python2')
 source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('7279faa5879949de6593945c7f924595')
+md5sums=('5bb7e4bc4198e19f388ac51239007f25')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # remove ldconfig
+  # remove ldconfig --speps
   sed -i '/ldconfig/d' wscript
 
   python2 waf configure --prefix=/usr
-  python2 waf
+  python2 waf build $MAKEFLAGS
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  DESTDIR="$pkgdir/" python2 waf install
+
+  python2 waf install --destdir="$pkgdir"
 
   # license
   install -Dm644 COPYING \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/stardict/NetDictRequests.patch b/extra/stardict/NetDictRequests.patch
deleted file mode 100644
index 4d6fe145a..000000000
--- a/extra/stardict/NetDictRequests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur old/dict/src/lib/compositelookup.cpp new/dict/src/lib/compositelookup.cpp
---- old/dict/src/lib/compositelookup.cpp	2011-07-02 23:58:40.000000000 -0700
-+++ new/dict/src/lib/compositelookup.cpp	2011-07-18 07:40:01.795710505 -0700
-@@ -50,7 +50,7 @@
- void CompositeLookup::send_net_dict_request(const std::string& dict_id, const std::string& key)
- {
- 	NetDictRequest request(dict_id, key);
--	g_assert(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request));
-+	std::find(NetDictRequests.begin(), NetDictRequests.end(), request);
- 	NetDictRequests.push_back(request);
- }
- 
diff --git a/extra/stardict/PKGBUILD b/extra/stardict/PKGBUILD
deleted file mode 100644
index e17f9eb91..000000000
--- a/extra/stardict/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 163464 2012-07-12 12:42:33Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Neil Lin <neil@vip.url.com.tw>
-
-pkgname=stardict
-pkgver=3.0.3
-pkgrel=2
-pkgdesc='International dictionary software'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.stardict.org/'
-license=('GPL')
-depends=('enchant' 'gtk2' 'libsigc++' 'libsm')
-makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common' 'libmysqlclient')
-options=('!libtool' '!emptydirs')
-source=("http://stardict-3.googlecode.com/files/stardict-${pkgver}.tar.bz2"
-        'crash-empty-dict.patch'
-        'gcc46.patch'
-        'glib2.patch'
-        'zlib.patch')
-sha1sums=('5043c0918963cd4d40e6d6289353f295766ec74f'
-          '97af8fdb73c8f04674234b629c6867254e9bd043'
-          '6605a9cdfc4abc2a0ab4462d1228233d34806f0a'
-          '467880bca5e89aa25cb4a57a9e1caba9a8841822'
-          '024ac5eb75a11c96569e31021a4bd65463b3cf5b')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -p1 -i ../crash-empty-dict.patch
-	patch -p1 -i ../gcc46.patch
-	patch -p1 -i ../glib2.patch
-	patch -p1 -i ../zlib.patch
-	./autogen.sh # gnome-autogen.sh requires gnome-common
-
-	./configure \
-		PKG_CONFIG=/usr/bin/pkg-config \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--disable-gnome-support \
-		--disable-schemas-install \
-		--disable-espeak \
-		--disable-gucharmap \
-		--disable-festival \
-		--disable-updateinfo \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/stardict/crash-empty-dict.patch b/extra/stardict/crash-empty-dict.patch
deleted file mode 100644
index 4d6fe145a..000000000
--- a/extra/stardict/crash-empty-dict.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur old/dict/src/lib/compositelookup.cpp new/dict/src/lib/compositelookup.cpp
---- old/dict/src/lib/compositelookup.cpp	2011-07-02 23:58:40.000000000 -0700
-+++ new/dict/src/lib/compositelookup.cpp	2011-07-18 07:40:01.795710505 -0700
-@@ -50,7 +50,7 @@
- void CompositeLookup::send_net_dict_request(const std::string& dict_id, const std::string& key)
- {
- 	NetDictRequest request(dict_id, key);
--	g_assert(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request));
-+	std::find(NetDictRequests.begin(), NetDictRequests.end(), request);
- 	NetDictRequests.push_back(request);
- }
- 
diff --git a/extra/stardict/gcc46.patch b/extra/stardict/gcc46.patch
deleted file mode 100644
index 944b9635c..000000000
--- a/extra/stardict/gcc46.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -aur old/dict/stardict-plugins/stardict-wordnet-plugin/utils.h new/dict/stardict-plugins/stardict-wordnet-plugin/utils.h
---- old/dict/stardict-plugins/stardict-wordnet-plugin/utils.h	2011-07-18 06:58:58.519404744 -0700
-+++ new/dict/stardict-plugins/stardict-wordnet-plugin/utils.h	2011-07-18 07:01:10.739734313 -0700
-@@ -26,6 +26,7 @@
- #ifndef __TYPES_H__
- #define __TYPES_H__
- 
-+#include <cstddef>
- #include <math.h>
- 
- typedef float single;
diff --git a/extra/stardict/glib2.patch b/extra/stardict/glib2.patch
deleted file mode 100644
index 6296dab0d..000000000
--- a/extra/stardict/glib2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur old/dict/configure.ac new/dict/configure.ac
---- old/dict/configure.ac	2011-07-03 16:58:40.000000000 +1000
-+++ new/dict/configure.ac	2012-07-12 22:31:52.875176842 +1000
-@@ -266,6 +266,9 @@
- fi
- AC_SUBST(WIKI_PARSEDATA_PLUGIN_DIR)
- 
-+GMODULE2_LIBS=`pkg-config --libs gmodule-2.0`
-+AC_SUBST([GMODULE2_LIBS])
-+
- dnl ================================================================
- dnl main program checks.
- dnl ================================================================
-diff -Naur old/dict/src/Makefile.am new/dict/src/Makefile.am
---- old/dict/src/Makefile.am	2011-07-03 16:58:40.000000000 +1000
-+++ new/dict/src/Makefile.am	2012-07-12 22:29:53.714870692 +1000
-@@ -33,7 +33,7 @@
- stardict_DEPENDENCIES = lib/libstardict.la $(LOCAL_SIGCPP_LIBFILE)
- stardict_LDFLAGS = 
- ## place libstardict.la before any system library, otherwise build with --as-needed linker option may fail
--stardict_LDADD = lib/libstardict.la $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE)
-+stardict_LDADD = lib/libstardict.la $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE) $(GMODULE2_LIBS)
- 
- if !GNOME_SUPPORT
- if MAEMO_SUPPORT
-diff -Naur old/dict/src/tomboykeybinder.h new/dict/src/tomboykeybinder.h
---- old/dict/src/tomboykeybinder.h	2011-07-03 16:58:40.000000000 +1000
-+++ new/dict/src/tomboykeybinder.h	2012-07-12 22:28:04.337920391 +1000
-@@ -21,7 +21,6 @@
- #ifndef __TOMBOY_KEY_BINDER_H__
- #define __TOMBOY_KEY_BINDER_H__
- 
--#include <glib/gtypes.h>
- 
- G_BEGIN_DECLS
- 
diff --git a/extra/stardict/zlib.patch b/extra/stardict/zlib.patch
deleted file mode 100644
index eb5a9a12a..000000000
--- a/extra/stardict/zlib.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur old/lib/src/libcommon.cpp new/lib/src/libcommon.cpp
---- old/lib/src/libcommon.cpp	2012-07-12 11:33:30.343333334 +0000
-+++ new/lib/src/libcommon.cpp	2012-07-12 11:34:05.006568754 +0000
-@@ -614,7 +614,7 @@
- 		return EXIT_FAILURE;
- 	}
- 	while(true) {
--		len = gzread(get_impl(in), buf, buffer_size);
-+		len = gzread((gzFile)get_impl(in), buf, buffer_size);
- 		if(len < 0) {
- 			g_critical(read_file_err, arch_file_name, "");
- 			return EXIT_FAILURE;
-@@ -871,3 +871,8 @@
- 		return res;
- 	}
- }
-+
-+int gzclose_compat(void * file)
-+{
-+    return gzclose ((gzFile)file);
-+}
-diff -Naur old/lib/src/libcommon.h new/lib/src/libcommon.h
---- old/lib/src/libcommon.h	2012-07-12 11:33:30.343333334 +0000
-+++ new/lib/src/libcommon.h	2012-07-12 11:34:05.006568754 +0000
-@@ -187,8 +187,9 @@
- 	typedef ResourceWrapper<FILE, FILE*, int, fclose> File;
- }
- 
-+extern int gzclose_compat(void * file);
- namespace zip {
--typedef ResourceWrapper<void, void*, int, gzclose> gzFile;
-+typedef ResourceWrapper<void, void*, int, gzclose_compat> gzFile;
- }
- 
- /* Create a new temporary file. Return file name in file name encoding.
diff --git a/extra/stellarium/PKGBUILD b/extra/stellarium/PKGBUILD
index a004e46e3..3cd2faeb2 100644
--- a/extra/stellarium/PKGBUILD
+++ b/extra/stellarium/PKGBUILD
@@ -1,20 +1,22 @@
-# $Id: PKGBUILD 168612 2012-10-13 11:49:36Z andyrtr $
+# $Id: PKGBUILD 178997 2013-03-01 10:25:43Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=stellarium
-pkgver=0.11.4
+pkgver=0.12.0
 pkgrel=2
 pkgdesc="A stellarium with great graphics and a nice database of sky-objects"
 arch=("i686" "x86_64" 'mips64el')
 url="http://stellarium.free.fr/"
 license=('GPL2')
-depends=('libpng' 'glu' 'libgl' 'freetype2' 'qt' 'openssl')
-makedepends=('cmake' 'boost' 'mesa')
+depends=('libpng' 'glu' 'libgl' 'freetype2' 'qt4' 'openssl' 'desktop-file-utils' 
+'xdg-utils')
+install=stellarium.install
+makedepends=('cmake' 'boost' 'mesa' 'mesa-libgl')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	stellarium.desktop
         stellarium.png)
-sha1sums=('5b8bfd71b4c3eabbc1db64b71221eeebe6785dbf'
+sha1sums=('c6cc8f0954d976584e8ab9bc061f3b35e3b84251'
           'c9cc79212542238227b5bd6af99f60fe056f4ab2'
           'b890d3b6c4dcfcfcc696514202af11b2a50c0fea')
 	
diff --git a/extra/gcalctool/gcalctool.install b/extra/stellarium/stellarium.install
index 2ef26aaa9..46544f062 100644
--- a/extra/gcalctool/gcalctool.install
+++ b/extra/stellarium/stellarium.install
@@ -1,5 +1,8 @@
+pkgname=stellarium
+
 post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  xdg-icon-resource forceupdate
 }
 
 post_upgrade() {
diff --git a/extra/streamripper/PKGBUILD b/extra/streamripper/PKGBUILD
index 52144364a..53427efbf 100644
--- a/extra/streamripper/PKGBUILD
+++ b/extra/streamripper/PKGBUILD
@@ -16,7 +16,7 @@ sha1sums=('bc8a8d3ad045e0772ca691d2063c39efcc0dca45')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --build=$CHOST
   make
 }
 
diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD
index db9d618e5..6bf0c5f97 100644
--- a/extra/strigi/PKGBUILD
+++ b/extra/strigi/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 177081 2013-02-05 23:18:31Z andrea $
+# $Id: PKGBUILD 178998 2013-03-01 10:25:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=strigi
 pkgver=0.7.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast crawling desktop search engine with Qt GUI"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://strigi.sourceforge.net/'
 license=('GPL2')
-depends=('exiv2' 'libxml2' 'boost-libs' 'qt')
+depends=('exiv2' 'libxml2' 'boost-libs' 'qt4')
 makedepends=('cmake' 'pkg-config' 'boost')
 optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file'
             'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK')
@@ -17,6 +17,8 @@ source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.ta
 md5sums=('d69443234f4286d71997db9de543331a')
 
 build() {
+  . /etc/profile.d/qt4.sh
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
diff --git a/extra/strigi/gcc47.patch b/extra/strigi/gcc47.patch
deleted file mode 100644
index d99582563..000000000
--- a/extra/strigi/gcc47.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Rex Dieter <rdieter@fedoraproject.org>
-Date: Mon, 09 Jan 2012 17:13:25 +0000
-Subject: gcc47 fix, unistd.h header required unconditionally for 'sleep'
-X-Git-Url: http://quickgit.kde.org/?p=strigidaemon.git&amp;a=commitdiff&amp;h=a8e97f672325557b3fbc84b987299350ec5ac10b
----
-gcc47 fix, unistd.h header required unconditionally for 'sleep'
----
-
-
---- a/bin/daemon/eventlistener/eventlistenerqueue.cpp
-+++ b/bin/daemon/eventlistener/eventlistenerqueue.cpp
-@@ -27,9 +27,7 @@
- #include <iostream>
- #include <stdio.h>
- 
--#if defined(__SUNPRO_CC)
- #include <unistd.h>
--#endif
- 
- using namespace std;
- 
-
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 5ce8be215..c7eb2b598 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173791 2012-12-23 03:50:49Z stephane $
+# $Id: PKGBUILD 182098 2013-04-06 21:41:54Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
-pkgver=1.7.8
+pkgver=1.7.9
 pkgrel=1
 pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64' 'mips64el')
@@ -28,16 +28,14 @@ source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
         svnserve.conf
         svnserve.tmpfiles
         svnserve.service
-        subversion-kwallet.patch
         subversion.rpath.fix.patch)
-sha1sums=('12c7d8d5414bba74c9777c4d1dae74f152df63c2'
-          '24f8e82fa131c1a1b924d71046f8d38cb00645a7'
+sha1sums=('453757bae78a800997559f2232483ab99238ec1e'
+          '5ce5adc5f5cae5a2d569a89b5e4498623feae84a'
           '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
           '73b36c046c09cec2093354911c89e3ba8056af6c'
           'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
           '00cc36e69077a8c45674ead6dd62a7647b3a3b6d'
           '9f6790d842cf3e0228b007483a43e39a42724068'
-          'f2aed28a2e34b8631ee9b69175bac1bac59327ce'
           '3d1e28408a9abb42af2e531adc0d01ce21acfad6')
 
 build() {
@@ -47,9 +45,6 @@ build() {
    patch -Np0 -i ../subversion.rpath.fix.patch
    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py
 
-   # FS#33081
-   patch -Np0 -i ../subversion-kwallet.patch
-
    if [ "$CARCH" = "mips64el" ]; then
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
                --with-zlib=/usr --with-neon=/usr --with-serf=/usr --with-apxs \
diff --git a/extra/subversion/subversion-1.7.5-kwallet-gcc47.patch b/extra/subversion/subversion-1.7.5-kwallet-gcc47.patch
deleted file mode 100644
index a571c3c3c..000000000
--- a/extra/subversion/subversion-1.7.5-kwallet-gcc47.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Naur subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp
---- subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp	2010-12-30 15:46:50.000000000 -0500
-+++ subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp	2012-08-14 19:43:16.694275908 -0400
-@@ -60,6 +60,9 @@
- /* KWallet simple provider, puts passwords in KWallet                    */
- /*-----------------------------------------------------------------------*/
- 
-+static int q_argc = 1;
-+static char q_argv0[] = "svn"; // Build non-const char * from string constant
-+static char *q_argv[] = { q_argv0 };
- 
- static const char *
- get_application_name(apr_hash_t *parameters,
-@@ -175,6 +178,10 @@
-                    "kwallet-initialized",
-                    APR_HASH_KEY_STRING,
-                    NULL);
-+      apr_hash_set(parameters,
-+                   "kwallet-wallet",
-+                   APR_HASH_KEY_STRING,
-+                   NULL);
-     }
-   return APR_SUCCESS;
- }
-@@ -203,12 +210,11 @@
-   QCoreApplication *app;
-   if (! qApp)
-     {
--      int argc = 1;
--      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
-+      int argc = q_argc;
-+      app = new QCoreApplication(argc, q_argv);
-     }
- 
--  KCmdLineArgs::init(1,
--                     (char *[1]) {(char *) "svn"},
-+  KCmdLineArgs::init(q_argc, q_argv,
-                      get_application_name(parameters, pool),
-                      "subversion",
-                      ki18n(get_application_name(parameters, pool)),
-@@ -273,12 +279,11 @@
-   QCoreApplication *app;
-   if (! qApp)
-     {
--      int argc = 1;
--      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
-+      int argc = q_argc;
-+      app = new QCoreApplication(argc, q_argv);
-     }
- 
--  KCmdLineArgs::init(1,
--                     (char *[1]) {(char *) "svn"},
-+  KCmdLineArgs::init(q_argc, q_argv,
-                      get_application_name(parameters, pool),
-                      "subversion",
-                      ki18n(get_application_name(parameters, pool)),
diff --git a/extra/subversion/subversion-1.7.6-kwallet-gcc47.patch b/extra/subversion/subversion-1.7.6-kwallet-gcc47.patch
deleted file mode 100644
index a571c3c3c..000000000
--- a/extra/subversion/subversion-1.7.6-kwallet-gcc47.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Naur subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp
---- subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp	2010-12-30 15:46:50.000000000 -0500
-+++ subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp	2012-08-14 19:43:16.694275908 -0400
-@@ -60,6 +60,9 @@
- /* KWallet simple provider, puts passwords in KWallet                    */
- /*-----------------------------------------------------------------------*/
- 
-+static int q_argc = 1;
-+static char q_argv0[] = "svn"; // Build non-const char * from string constant
-+static char *q_argv[] = { q_argv0 };
- 
- static const char *
- get_application_name(apr_hash_t *parameters,
-@@ -175,6 +178,10 @@
-                    "kwallet-initialized",
-                    APR_HASH_KEY_STRING,
-                    NULL);
-+      apr_hash_set(parameters,
-+                   "kwallet-wallet",
-+                   APR_HASH_KEY_STRING,
-+                   NULL);
-     }
-   return APR_SUCCESS;
- }
-@@ -203,12 +210,11 @@
-   QCoreApplication *app;
-   if (! qApp)
-     {
--      int argc = 1;
--      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
-+      int argc = q_argc;
-+      app = new QCoreApplication(argc, q_argv);
-     }
- 
--  KCmdLineArgs::init(1,
--                     (char *[1]) {(char *) "svn"},
-+  KCmdLineArgs::init(q_argc, q_argv,
-                      get_application_name(parameters, pool),
-                      "subversion",
-                      ki18n(get_application_name(parameters, pool)),
-@@ -273,12 +279,11 @@
-   QCoreApplication *app;
-   if (! qApp)
-     {
--      int argc = 1;
--      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
-+      int argc = q_argc;
-+      app = new QCoreApplication(argc, q_argv);
-     }
- 
--  KCmdLineArgs::init(1,
--                     (char *[1]) {(char *) "svn"},
-+  KCmdLineArgs::init(q_argc, q_argv,
-                      get_application_name(parameters, pool),
-                      "subversion",
-                      ki18n(get_application_name(parameters, pool)),
diff --git a/extra/subversion/subversion-kwallet.patch b/extra/subversion/subversion-kwallet.patch
deleted file mode 100644
index d2bf17101..000000000
--- a/extra/subversion/subversion-kwallet.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: subversion/libsvn_auth_kwallet/kwallet.cpp
-===================================================================
---- subversion/libsvn_auth_kwallet/kwallet.cpp	(revision 1421011)
-+++ subversion/libsvn_auth_kwallet/kwallet.cpp	(working copy)
-@@ -253,7 +253,7 @@ kwallet_password_get(svn_boolean_t *done,
-         }
-     }
- 
--  apr_pool_cleanup_register(pool, parameters, kwallet_terminate, NULL);
-+  apr_pool_cleanup_register(pool, parameters, kwallet_terminate, apr_pool_cleanup_null);
- 
-   return SVN_NO_ERROR;
- }
-@@ -327,7 +327,7 @@ kwallet_password_set(svn_boolean_t *done,
-         }
-     }
- 
--  apr_pool_cleanup_register(pool, parameters, kwallet_terminate, NULL);
-+  apr_pool_cleanup_register(pool, parameters, kwallet_terminate, apr_pool_cleanup_null);
- 
-   return SVN_NO_ERROR;
- }
\ No newline at end of file
diff --git a/extra/suil/PKGBUILD b/extra/suil/PKGBUILD
index f03085cba..6e56f882b 100644
--- a/extra/suil/PKGBUILD
+++ b/extra/suil/PKGBUILD
@@ -3,33 +3,33 @@
 # Contributor: speps <speps at aur dot archlinux dot org>
 
 pkgname=suil
-pkgver=0.6.10
+pkgver=0.6.12
 pkgrel=1
 pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs"
-arch=(i686 x86_64 mips64el)
-url="http://drobilla.net/software/$pkgname/"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://drobilla.net/software/suil/"
 license=('custom:ISC')
 depends=('lv2')
-makedepends=('python2' 'qt' 'gtk2')
-optdepends=('qt: Qt UIs wrapping support'
-            'gtk2: Gtk2 UIs wrapping support')
+makedepends=('python2' 'qt4' 'gtk2')
+optdepends=('qt4: Qt 4.x UI wrapping support'
+            'gtk2: GTK+ 2.x UI wrapping support')
 source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('735e3cc4d539059cf3948d3dba75807e')
+md5sums=('528d4a0a37e6c9d5a4547ac36f7bd9e6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # remove ldconfig
+  # remove ldconfig --speps
   sed -i "/ldconfig/d" wscript
 
-  python2 ./waf configure --prefix=/usr \
-                          --mandir=/usr/share/man
-  python2 ./waf
+  python2 waf configure --prefix=/usr
+  python2 waf
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  DESTDIR="$pkgdir" python2 ./waf install
+
+  python2 waf install --destdir="$pkgdir"
 
   # license
   install -Dm644 COPYING \
diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD
index 28ea033b8..1d9a0f205 100644
--- a/extra/sushi/PKGBUILD
+++ b/extra/sushi/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 170902 2012-11-12 22:36:42Z heftig $
+# $Id: PKGBUILD 183459 2013-04-21 22:12:10Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=sushi
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="A quick previewer for Nautilus"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL2')
-groups=(gnome-extra)
+groups=(gnome)
 depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz5' 'webkitgtk3' 'gtksourceview3' 'evince')
 install=sushi.install
 makedepends=('intltool' 'gobject-introspection')
 options=(!libtool)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ddcfa4fd8ad6a8a7ff2da10a5190a031df9e9debf217cb1fcdeec2a181222af8')
+sha256sums=('c4f24d0961ce8fc5ef3a4fe9af178e368c7117459df2c0be12c8f953646c82dd')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/swell-foop/PKGBUILD b/extra/swell-foop/PKGBUILD
new file mode 100644
index 000000000..4b20245b8
--- /dev/null
+++ b/extra/swell-foop/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 183460 2013-04-21 22:12:12Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+pkgname=swell-foop
+pkgver=3.8.1
+pkgrel=1
+pkgdesc="Clear the screen by removing groups of colored and shaped tiles"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=swell-foop.install
+url="https://live.gnome.org/Swell%20Foop"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('50d6b53d7507c1176ade9227f04d1c260143a5ebf8cf812c359c89eaeec9ee99')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/swell-foop/swell-foop.install b/extra/swell-foop/swell-foop.install
new file mode 100644
index 000000000..0730c1a47
--- /dev/null
+++ b/extra/swell-foop/swell-foop.install
@@ -0,0 +1,13 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/extra/swh-plugins/PKGBUILD b/extra/swh-plugins/PKGBUILD
index 40538e7a2..5e3314f4d 100644
--- a/extra/swh-plugins/PKGBUILD
+++ b/extra/swh-plugins/PKGBUILD
@@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://plugin.org.uk/"
 license=('GPL')
 depends=('fftw' 'ladspa')
-makedepends=('libxml2')
+makedepends=('libxml2' 'perl-xml-parser')
 groups=('ladspa-plugins')
 source=("http://plugin.org.uk/releases/$pkgver/$pkgname-$pkgver.tar.gz"
         'mbeq_crash_fix.patch')
@@ -23,9 +23,9 @@ build() {
 
   # Arch64 fix;
   # -fPIC seems to be the only option
-  if [ "$CARCH" = 'x86_64' ]; then
+  if [ "$CARCH" != 'i686' ]; then
     export CFLAGS="$CFLAGS -fPIC"
-    export CXXFLAGS="$CFLAGS"
+    export CXXFLAGS="$CXXFLAGS -fPIC"
   fi
 
   # fix Firefox crash on x64 when
diff --git a/extra/swig/pyint_fromsize_t.diff b/extra/swig/pyint_fromsize_t.diff
deleted file mode 100644
index 1c7727ae2..000000000
--- a/extra/swig/pyint_fromsize_t.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Py3k: Map PyInt_FromSize_t to PyLong_FromSize_t
- The latest SWIG version introduced a usage of PyInt_FromSize_t, but
- does not define a compatibility macro for Python 3k as for the other
- PyInt_... functions. This patch adds that macro.
-
-Author: Torsten Landschoff <torsten@debian.org>
-
-
---- swig2.0-2.0.7.orig/Lib/python/pyhead.swg
-+++ swig2.0-2.0.7/Lib/python/pyhead.swg
-@@ -5,6 +5,7 @@
- #define PyInt_Check(x) PyLong_Check(x)
- #define PyInt_AsLong(x) PyLong_AsLong(x)
- #define PyInt_FromLong(x) PyLong_FromLong(x)
-+#define PyInt_FromSize_t(x) PyLong_FromSize_t(x)
- #define PyString_Check(name) PyBytes_Check(name)
- #define PyString_FromString(x) PyUnicode_FromString(x)
- #define PyString_Format(fmt, args)  PyUnicode_Format(fmt, args)
diff --git a/extra/swig/upstream_r13128.diff b/extra/swig/upstream_r13128.diff
deleted file mode 100644
index d7d74d7e5..000000000
--- a/extra/swig/upstream_r13128.diff
+++ /dev/null
@@ -1,73 +0,0 @@
-From: Klaus Kämpf <kkaempf@suse.de>
-Subject: Fix call to Swig_name_decl (upstream ID 3530078)
-
-Origin: upstream, http://swig.svn.sourceforge.net/viewvc/swig?view=revision&revision=13128
-Bug: http://sourceforge.net/tracker/?func=detail&aid=3530078&group_id=1645&atid=101645
-Bug-Debian: http://bugs.debian.org/675196
----
- Examples/test-suite/errors/expected.log |   26 +++++++++++++-------------
- Source/Modules/lang.cxx                 |    4 ++--
- 2 files changed, 15 insertions(+), 15 deletions(-)
-
---- a/Source/Modules/lang.cxx
-+++ b/Source/Modules/lang.cxx
-@@ -2623,7 +2623,7 @@ int Language::constructorDeclaration(Nod
- 	  Delete(expected_name_resolved);
- 	}
- 	if (illegal_name) {
--	  Swig_warning(WARN_LANG_RETURN_TYPE, input_file, line_number, "Function %s must have a return type. Ignored.\n", Swig_name_decl(name));
-+	  Swig_warning(WARN_LANG_RETURN_TYPE, input_file, line_number, "Function %s must have a return type. Ignored.\n", Swig_name_decl(n));
- 	  Swig_restore(n);
- 	  return SWIG_NOWRAP;
- 	}
-@@ -2760,7 +2760,7 @@ int Language::destructorDeclaration(Node
-     }
- 
-     if (illegal_name) {
--      Swig_warning(WARN_LANG_ILLEGAL_DESTRUCTOR, input_file, line_number, "Illegal destructor name %s. Ignored.\n", Swig_name_decl(name));
-+      Swig_warning(WARN_LANG_ILLEGAL_DESTRUCTOR, input_file, line_number, "Illegal destructor name %s. Ignored.\n", Swig_name_decl(n));
-       Swig_restore(n);
-       Delete(expected_name);
-       return SWIG_NOWRAP;
---- a/Examples/test-suite/errors/expected.log
-+++ b/Examples/test-suite/errors/expected.log
-@@ -227,17 +227,17 @@ cpp_extend_destructors.i:87: Warning 302
- cpp_extend_destructors.i:85: Warning 302: previous definition of '~JStruct'.
- cpp_extend_destructors.i:100: Warning 302: Identifier '~LStruct' redefined (ignored),
- cpp_extend_destructors.i:98: Warning 302: previous definition of '~LStruct'.
--cpp_extend_destructors.i:24: Warning 521: Illegal destructor name ~NOT_CStruct. Ignored.
--cpp_extend_destructors.i:30: Warning 521: Illegal destructor name ~NOT_DStruct. Ignored.
--cpp_extend_destructors.i:44: Warning 521: Illegal destructor name ~NOT_EStruct. Ignored.
--cpp_extend_destructors.i:50: Warning 521: Illegal destructor name ~NOT_FStruct. Ignored.
--cpp_extend_destructors.i:65: Warning 521: Illegal destructor name ~NOT_GStruct. Ignored.
--cpp_extend_destructors.i:72: Warning 521: Illegal destructor name ~NOT_HStruct. Ignored.
--cpp_extend_destructors.i:81: Warning 521: Illegal destructor name ~NOT_IStruct. Ignored.
--cpp_extend_destructors.i:86: Warning 521: Illegal destructor name ~NOT_JStruct. Ignored.
--cpp_extend_destructors.i:92: Warning 521: Illegal destructor name ~NOT_KStruct. Ignored.
--cpp_extend_destructors.i:99: Warning 521: Illegal destructor name ~NOT_LStruct< int >. Ignored.
--cpp_extend_destructors.i:99: Warning 521: Illegal destructor name ~NOT_LStruct< short >. Ignored.
-+cpp_extend_destructors.i:24: Warning 521: Illegal destructor name CStruct::~NOT_CStruct(). Ignored.
-+cpp_extend_destructors.i:30: Warning 521: Illegal destructor name DStruct::~NOT_DStruct(). Ignored.
-+cpp_extend_destructors.i:44: Warning 521: Illegal destructor name EStruct::~NOT_EStruct(). Ignored.
-+cpp_extend_destructors.i:50: Warning 521: Illegal destructor name FStruct::~NOT_FStruct(). Ignored.
-+cpp_extend_destructors.i:65: Warning 521: Illegal destructor name GStruct::~NOT_GStruct(). Ignored.
-+cpp_extend_destructors.i:72: Warning 521: Illegal destructor name HStruct::~NOT_HStruct(). Ignored.
-+cpp_extend_destructors.i:81: Warning 521: Illegal destructor name IStruct::~NOT_IStruct(). Ignored.
-+cpp_extend_destructors.i:86: Warning 521: Illegal destructor name JStruct::~NOT_JStruct(). Ignored.
-+cpp_extend_destructors.i:92: Warning 521: Illegal destructor name KStruct::~NOT_KStruct(). Ignored.
-+cpp_extend_destructors.i:99: Warning 521: Illegal destructor name LStruct< int >::~NOT_LStruct(). Ignored.
-+cpp_extend_destructors.i:99: Warning 521: Illegal destructor name LStruct< short >::~NOT_LStruct(). Ignored.
- 
- :::::::::::::::::::::::::::::::: cpp_extend_redefine.i :::::::::::::::::::::::::::::::::::
- cpp_extend_redefine.i:9: Warning 302: Identifier 'bar' redefined by %extend (ignored),
-@@ -312,8 +312,8 @@ cpp_nested.i:12: Warning 325: Nested cla
- cpp_no_access.i:3: Warning 319: No access specifier given for base class 'foo' (ignored).
- 
- :::::::::::::::::::::::::::::::: cpp_no_return_type.i :::::::::::::::::::::::::::::::::::
--cpp_no_return_type.i:6: Warning 504: Function R must have a return type. Ignored.
--cpp_no_return_type.i:10: Warning 504: Function UU must have a return type. Ignored.
-+cpp_no_return_type.i:6: Warning 504: Function S::R() must have a return type. Ignored.
-+cpp_no_return_type.i:10: Warning 504: Function U::UU() must have a return type. Ignored.
- 
- :::::::::::::::::::::::::::::::: cpp_nobase.i :::::::::::::::::::::::::::::::::::
- cpp_nobase.i:3: Warning 401: Nothing known about base class 'Bar'. Ignored.
diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD
index 94c7bc9ec..117266eec 100644
--- a/extra/swt/PKGBUILD
+++ b/extra/swt/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 173193 2012-12-12 16:57:29Z guillaume $
+# $Id: PKGBUILD 178694 2013-02-26 10:20:09Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 pkgname=swt
 pkgver=4.2.1
-pkgrel=1
+pkgrel=2
 _date=201209141800
-pkgdesc="An open source widget toolkit for Java"
+pkgdesc='An open source widget toolkit for Java'
 arch=('i686' 'x86_64')
-url="http://www.eclipse.org/swt/"
+url='http://www.eclipse.org/swt/'
 license=('EPL')
 depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst')
 optdepends=('libgnomeui' 'mesa' 'glu' 'libwebkit')
@@ -25,6 +25,7 @@ source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date
         build-swt.xml)
 # To test this pkg:
 # http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse
+# http://download.eclipse.org/eclipse/downloads/
 
 build() {
   cd ${srcdir}
diff --git a/extra/syslog-ng/PKGBUILD b/extra/syslog-ng/PKGBUILD
index 336177d71..2a4cc6fce 100644
--- a/extra/syslog-ng/PKGBUILD
+++ b/extra/syslog-ng/PKGBUILD
@@ -1,35 +1,30 @@
-# $Id: PKGBUILD 173195 2012-12-12 17:17:00Z dreisner $
+# $Id: PKGBUILD 179615 2013-03-08 18:57:03Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=syslog-ng
-pkgver=3.3.7
-pkgrel=1
+pkgver=3.4.1
+pkgrel=2
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.balabit.com/network-security/syslog-ng/"
 depends=('awk' 'eventlog' 'glib2' 'libcap' 'openssl' 'systemd')
-makedepends=('flex' 'pkg-config')
+makedepends=('flex' 'pkg-config' 'python2')
 optdepends=('logrotate: for rotating log files')
 options=('!libtool')
 backup=('etc/syslog-ng/modules.conf'
         'etc/syslog-ng/scl.conf'
         'etc/syslog-ng/syslog-ng.conf'
-        'etc/conf.d/syslog-ng'
         'etc/logrotate.d/syslog-ng')
 install=$pkgname.install
 source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz"
         syslog-ng.conf
-        syslog-ng.conf.d
-        syslog-ng.logrotate
-        syslog-ng.rc)
-sha1sums=('06f09057c3dfb84eba381e0141f92565673ec0c8'
-          'db14f4937a821e449b769c938faf2275a7ef188e'
-          '9b2eb6ea9e27c9f1b6c1c855be211ec3da51d3c8'
-          '949128fe3d7f77a7aab99048061f885bc758000c'
-          '94af81a84e3add6653755122cdd5080694de059d')
+        syslog-ng.logrotate)
+sha1sums=('e75892262863b77f74a401d19661164154f716e7'
+          '0aaf695ea6756b59198ff2e4af237b4a6186525d'
+          '949128fe3d7f77a7aab99048061f885bc758000c')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -42,6 +37,7 @@ build() {
     --datadir=/usr/share/syslog-ng \
     --with-pidfile-dir=/run \
     --disable-spoof-source \
+    --enable-ipv6 \
     --enable-systemd \
     --with-systemdsystemunitdir=/usr/lib/systemd/system
 
@@ -54,6 +50,4 @@ package() {
   install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d"
   install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf"
   install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng"
-  install -Dm755 "$srcdir/syslog-ng.rc" "$pkgdir/etc/rc.d/syslog-ng"
-  install -Dm644 "$srcdir/syslog-ng.conf.d" "$pkgdir/etc/conf.d/syslog-ng"
 }
diff --git a/extra/syslog-ng/syslog-ng.conf b/extra/syslog-ng/syslog-ng.conf
index c79e531de..969798e6d 100644
--- a/extra/syslog-ng/syslog-ng.conf
+++ b/extra/syslog-ng/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.3
+@version: 3.4
 #
 # /etc/syslog-ng/syslog-ng.conf
 #
diff --git a/extra/syslog-ng/syslog-ng.conf.d b/extra/syslog-ng/syslog-ng.conf.d
deleted file mode 100644
index 6bf1cd038..000000000
--- a/extra/syslog-ng/syslog-ng.conf.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# /etc/conf.d/syslog-ng
-#
-
-# passed to syslog-ng on config check
-SYSLOG_NG_CHECKOPTS=()
-
-# passed to syslog-ng at startup
-SYSLOG_NG_OPTS=()
-
diff --git a/extra/syslog-ng/syslog-ng.rc b/extra/syslog-ng/syslog-ng.rc
deleted file mode 100755
index d48b71ed1..000000000
--- a/extra/syslog-ng/syslog-ng.rc
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/syslog-ng
-
-checkconfig() {
-  if ! syslog-ng -s "${SYSLOG_NG_CHECKOPTS[@]}"; then
-    stat_fail
-    exit 1
-  fi
-}
-
-pidfile=/run/syslog-ng.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-  if [[ $PID && ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting Syslog-NG"
-    checkconfig
-    if [[ -z $PID ]] && /usr/sbin/syslog-ng "${SYSLOG_NG_OPTS[@]}"; then
-      add_daemon syslog-ng
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Syslog-NG"
-    if [[ $PID ]] && kill $PID &>/dev/null; then
-      rm_daemon syslog-ng
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  reload)
-    stat_busy "Reloading Syslog-NG configuration and re-opening log files"
-    if [[ -z $PID ]]; then
-      stat_fail
-    else
-      checkconfig
-      if kill -HUP $PID &>/dev/null; then
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload}"
-esac
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index 55a6e753b..47da491d8 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 177777 2013-02-08 12:50:50Z andrea $
+# $Id: PKGBUILD 178008 2013-02-13 13:30:36Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=system-config-printer
 pkgver=1.3.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A CUPS printer configuration tool and status applet"
 url="http://cyberelk.net/tim/software/system-config-printer/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,13 +15,18 @@ makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils')
 optdepends=('gnome-keyring: password management')
 replaces=('system-config-printer-common' 'system-config-printer-gnome')
 conflicts=('system-config-printer-common' 'system-config-printer-gnome')
-source=(http://cyberelk.net/tim/data/${pkgname}/1.3/${pkgname}-${pkgver}.tar.xz{,.sig})
+source=(http://cyberelk.net/tim/data/${pkgname}/1.3/${pkgname}-${pkgver}.tar.xz{,.sig}
+        'fix-typo-in-service.patch')
 md5sums=('0775647e1c34ef25364de3c178a4ed36'
-         '1aa2246047b424e2d23473749368b8c6')
+         '1aa2246047b424e2d23473749368b8c6'
+         'd30d14aeb6d2bfeac0679d28704473ec')
 
 build() {
   cd ${pkgname}-${pkgver}
 
+  # Fixed upstream
+  patch -p1 -i "${srcdir}"/fix-typo-in-service.patch
+
   sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
     -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
     $(find . -name '*.py')
diff --git a/extra/system-config-printer/fix-typo-in-service.patch b/extra/system-config-printer/fix-typo-in-service.patch
new file mode 100644
index 000000000..56f17dcec
--- /dev/null
+++ b/extra/system-config-printer/fix-typo-in-service.patch
@@ -0,0 +1,18 @@
+From 1e48d0a6404c6660bbf3f456e5ec48bed8fe7b80 Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh@redhat.com>
+Date: Tue, 23 Oct 2012 13:55:12 +0000
+Subject: Fixed typo in systemd config file.
+
+---
+diff --git a/udev/configure-printer@.service.in b/udev/configure-printer@.service.in
+index 8a20967..5898c79 100644
+--- a/udev/configure-printer@.service.in
++++ b/udev/configure-printer@.service.in
+@@ -4,4 +4,4 @@ Requires=cups.socket
+ After=cups.socket
+ 
+ [Service]
+-ExecStart=@udevhelperdir@/configure-printer add "%i"
++ExecStart=@udevhelperdir@/udev-configure-printer add "%i"
+--
+cgit v0.9.1
diff --git a/extra/t1lib/PKGBUILD b/extra/t1lib/PKGBUILD
index 9d882a493..1b75bcc67 100644
--- a/extra/t1lib/PKGBUILD
+++ b/extra/t1lib/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=t1lib
 pkgver=5.1.2
-pkgrel=3.1
+pkgrel=3.2
 pkgdesc="Library for generating character- and string-glyphs from Adobe Type 1 fonts"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html"
diff --git a/extra/taglib/PKGBUILD b/extra/taglib/PKGBUILD
index f5a71aae8..5eaaaed56 100644
--- a/extra/taglib/PKGBUILD
+++ b/extra/taglib/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=taglib
 pkgver=1.8
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A Library for reading and editing the meta-data of several popular audio formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://developer.kde.org/~wheeler/taglib.html"
diff --git a/extra/taglib/ape-idev2.patch b/extra/taglib/ape-idev2.patch
deleted file mode 100644
index 9c58da420..000000000
--- a/extra/taglib/ape-idev2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur taglib-1.7.orig/taglib/ape/apeproperties.cpp taglib-1.7/taglib/ape/apeproperties.cpp
---- taglib-1.7.orig/taglib/ape/apeproperties.cpp	2011-03-12 00:15:38.000000000 +1100
-+++ taglib-1.7/taglib/ape/apeproperties.cpp	2011-07-29 21:19:45.984345060 +1000
-@@ -137,7 +137,7 @@
-   long ID3v2OriginalSize = 0;
-   bool hasID3v2 = false;
-   if(ID3v2Location >= 0) {
--    ID3v2::Tag tag(d->file, ID3v2Location, 0);
-+    ID3v2::Tag tag(d->file, ID3v2Location);
-     ID3v2OriginalSize = tag.header()->completeTagSize();
-     if(tag.header()->tagSize() > 0)
-       hasID3v2 = true;
diff --git a/extra/tali/PKGBUILD b/extra/tali/PKGBUILD
new file mode 100644
index 000000000..c33e2cb6c
--- /dev/null
+++ b/extra/tali/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=tali
+pkgver=3.8.0
+pkgrel=1
+pkgdesc="Beat the odds in a poker-style dice game"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
+conflicts=('gnome-games')
+replaces=('gnome-games')
+options=('!emptydirs' '!libtool')
+install=tali.install
+url="https://live.gnome.org/Tali"
+groups=('gnome-extra')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('77fa3a3804f51e40629799d441b34e9b01a665097be229bd94adb28d3dbc17d5')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --disable-schemas-compile \
+      --with-scores-user=root --with-scores-group=games
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Remove all scores, we generate them from postinstall
+  rm -rf "$pkgdir/var"
+}
diff --git a/extra/tali/tali.install b/extra/tali/tali.install
new file mode 100644
index 000000000..8e65298ad
--- /dev/null
+++ b/extra/tali/tali.install
@@ -0,0 +1,34 @@
+_scores=(
+	gtali.Colors.scores
+	gtali.Regular.scores
+)
+
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    if [ -e "var/games/$score" ]; then
+      continue
+    fi
+
+    touch "var/games/$score"
+    chown root:games "var/games/$score"
+    chmod 664 "var/games/$score"
+  done
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f usr/share/icons/hicolor
+
+  for score in "${_scores[@]}" ; do
+    rm -f "var/games/$score"
+  done
+}
diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD
index 26090b7e3..f74ed7032 100644
--- a/extra/tcl/PKGBUILD
+++ b/extra/tcl/PKGBUILD
@@ -1,44 +1,47 @@
-# $Id: PKGBUILD 173926 2012-12-28 05:57:13Z andyrtr $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
+# $Id: PKGBUILD 183693 2013-04-27 04:42:47Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=tcl
 pkgver=8.6.0
-pkgrel=3
+pkgrel=4
 pkgdesc="The Tcl scripting language"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tcl.sourceforge.net/"
 license=('custom')
+depends=('zlib')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
 md5sums=('573aa5fe678e9185ef2b3c56b24658d3')
 
-build() {
-  cd ${srcdir}/tcl${pkgver}/unix
-
+prepare() {
+  cd tcl${pkgver}
   # we build the tcl sqlite interface in sqlite-tcl package
-  rm -rf ${srcdir}/tcl${pkgver}/pkgs/sqlite3*
-  
+  rm -rf pkgs/sqlite3*
+
+  sed -i 's/#define DUPTRAVERSE_MAX_DEPTH 500/#define DUPTRAVERSE_MAX_DEPTH 5000/' \
+    generic/regc_nfa.c
+}
+
+build() {
+  cd tcl${pkgver}/unix
   [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit"
   ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT
-  
   make
 }
 
 check() {
-  cd ${srcdir}/tcl${pkgver}/unix
+  cd tcl${pkgver}/unix
   make test
 }
 
-package()
-{
-  cd ${srcdir}/tcl${pkgver}/unix
-  
-  make INSTALL_ROOT=${pkgdir} install install-private-headers
-  ln -sf tclsh8.6 ${pkgdir}/usr/bin/tclsh
-  
+package() {
+  cd tcl${pkgver}/unix
+  make INSTALL_ROOT="${pkgdir}" install install-private-headers
+  find "${pkgdir}" -name '*.a' -type f -exec chmod 644 {} \;
+  ln -sf tclsh8.6 "${pkgdir}/usr/bin/tclsh"
+
   # install license
-  install -Dm644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 ../license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
   # remove buildroot traces
-  sed -i "s#${srcdir}#/usr/src#" ${pkgdir}/usr/lib/{tcl,tdbc1.0.0/tdbc,itcl4.0.0/itcl}Config.sh
+  sed -i "s#${srcdir}#/usr/src#" "${pkgdir}"/usr/lib/{tcl,tdbc1.0.0/tdbc,itcl4.0.0/itcl}Config.sh
 }
diff --git a/extra/tcpdump/PKGBUILD b/extra/tcpdump/PKGBUILD
index d9ceeda41..171c06763 100644
--- a/extra/tcpdump/PKGBUILD
+++ b/extra/tcpdump/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161647 2012-06-13 06:49:09Z giovanni $
+# $Id: PKGBUILD 184005 2013-04-30 18:42:55Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=tcpdump
-pkgver=4.3.0
+pkgver=4.4.0
 pkgrel=1
 pkgdesc="A tool for network monitoring and data acquisition"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('libpcap' 'openssl')
 source=("http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz"
         'tcpdump_duplicate_executable.patch')
-md5sums=('a3fe4d30ac85ff5467c889ff46b7e1e8'
+md5sums=('6f75aabcffd012f73bd7c331bb5d8232'
          '96c116e5ed51759a029bb6c236d63178')
 
 build() {
diff --git a/extra/tdb/PKGBUILD b/extra/tdb/PKGBUILD
index 6ea655dee..b376562bb 100644
--- a/extra/tdb/PKGBUILD
+++ b/extra/tdb/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=tdb
 pkgver=1.2.11
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A Trivial Database similar to GDBM but allows simultaneous commits"
 arch=(i686 x86_64 'mips64el')
 license=('GPL3')
diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD
index 3857efdc6..4fab1ec3a 100644
--- a/extra/telepathy-gabble/PKGBUILD
+++ b/extra/telepathy-gabble/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175988 2013-01-25 15:56:11Z ioni $
+# $Id: PKGBUILD 179516 2013-03-05 19:16:44Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Daniel Balieiro <daniel@balieiro.com>
 # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
 pkgname=telepathy-gabble
-pkgver=0.17.2
+pkgver=0.17.3
 pkgrel=1
 pkgdesc="A Jabber/XMPP connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('libxslt' 'python2')
 options=('!libtool' '!emptydirs')
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
 install=telepathy-gabble.install
-md5sums=('18329694ca5dcd35a97a70b9109c0f9a')
+md5sums=('f190ac6244440601f616dd61846689ba')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD
index 8dbc3192f..11b9b0305 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170731 2012-11-10 15:25:09Z ibiru $
+# $Id: PKGBUILD 183617 2013-04-25 16:40:37Z ioni $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 
 pkgname=telepathy-glib
-pkgver=0.20.1
+pkgver=0.20.2
 pkgrel=1
 pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 depends=('dbus-glib')
 makedepends=('libxslt' 'vala' 'gobject-introspection')
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('780034ff7433f33e6577b02fd7a2cb0a')
+md5sums=('bfc8a1b94c7a268f15d4d92b83460987')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/extra/telepathy-haze/PKGBUILD b/extra/telepathy-haze/PKGBUILD
index 9eb64e501..32d35ccb4 100644
--- a/extra/telepathy-haze/PKGBUILD
+++ b/extra/telepathy-haze/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157068 2012-04-23 12:17:39Z ibiru $
+# $Id: PKGBUILD 183633 2013-04-25 18:08:02Z ioni $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 pkgname=telepathy-haze
-pkgver=0.6.0
-pkgrel=2
+pkgver=0.7.0
+pkgrel=1
 pkgdesc="A telepathy-backend to use libpurple (Pidgin) protocols."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
@@ -14,7 +14,7 @@ replaces=('telepathy-butterfly')
 install=telepathy-haze.install
 groups=('telepathy')
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('622e0b2f7ff4050a29f907f2ef0f039c')
+md5sums=('85ae58b06a3a94ccfab7080a834bc684')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD
index 973bc8c69..93507bbfc 100644
--- a/extra/telepathy-idle/PKGBUILD
+++ b/extra/telepathy-idle/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 171097 2012-11-16 17:07:10Z ibiru $
+# $Id: PKGBUILD 183634 2013-04-25 18:08:44Z ioni $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 # Contributor: Samuel Mendes <heka.lok@gmail.com>
 
 pkgname=telepathy-idle
-pkgver=0.1.14
+pkgver=0.1.15
 pkgrel=1
 pkgdesc="An IRC connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
 groups=('telepathy')
 license=('LGPL')
-depends=('telepathy-glib' 'openssl')
+depends=('telepathy-glib')
 makedepends=('libxslt' 'python2')
 install=telepathy-idle.install
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('c292c54aa08f61544ab53fda880d861c')
+md5sums=('56f960ed1d9ed0c01e0b9f7eb68dbebe')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD
index fcf68f7b9..fd9e78d72 100644
--- a/extra/telepathy-kde-accounts-kcm/PKGBUILD
+++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 173278 2012-12-18 09:13:01Z andrea $
+# $Id: PKGBUILD 183062 2013-04-17 06:09:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-accounts-kcm
 _pkgname=ktp-accounts-kcm
-pkgver=0.5.2
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
 depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list')
-makedepends=('cmake' 'automoc4')
+makedepends=('cmake' 'automoc4' 'boost')
 optdepends=('telepathy-gabble: XMPP/Jabber/GTalk support'
             'telepathy-haze: all protocols supported by libpurple')
 groups=('kde-telepathy')
 conflicts=('telepathy-kde-accounts-kcm-plugins')
 replaces=('telepathy-kde-accounts-kcm-plugins')
-source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('5335e33715488c246fd1436f44de2864ab32e257')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('a6ba149da9a52423a41fe99704e57344d384b1cc')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD
index f747ad7a7..dc8ab8ad2 100644
--- a/extra/telepathy-kde-approver/PKGBUILD
+++ b/extra/telepathy-kde-approver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173280 2012-12-18 09:13:39Z andrea $
+# $Id: PKGBUILD 183131 2013-04-17 17:57:15Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-approver
 _pkgname=ktp-approver
-pkgver=0.5.2
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="KDE Channel Approver for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ license=('GPL')
 depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a55967c0852dfa421af8e246d29484bc181e2d26')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('1ccb773a14fa480e7e4c14611bc6d8a95e970e8e')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD
index 3783bcd67..6acf90197 100644
--- a/extra/telepathy-kde-auth-handler/PKGBUILD
+++ b/extra/telepathy-kde-auth-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173282 2012-12-18 09:14:18Z andrea $
+# $Id: PKGBUILD 183133 2013-04-17 18:23:20Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-auth-handler
 _pkgname=ktp-auth-handler
-pkgver=0.5.2
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('GPL')
 depends=('telepathy-kde-common-internals' 'qjson')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('be96d7a67edf5896bcc5604a984e354cb0c031d2')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('c3cc980dced0a7d63b287c382cec05fb9ef0348a')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD
index e7ff1c42b..540a69f78 100644
--- a/extra/telepathy-kde-common-internals/PKGBUILD
+++ b/extra/telepathy-kde-common-internals/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 173302 2012-12-18 09:20:12Z andrea $
+# $Id: PKGBUILD 183068 2013-04-17 06:14:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-common-internals
 _pkgname=ktp-common-internals
-pkgver=0.5.2
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="Common components for KDE-Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
-depends=('kdelibs' 'telepathy-qt' 'telepathy-mission-control')
-makedepends=('cmake' 'automoc4')
+depends=('kdelibs' 'telepathy-logger-qt' 'telepathy-mission-control')
+makedepends=('cmake' 'automoc4' 'boost' 'doxygen')
 install=${pkgname}.install
-source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('58a198b1d9c3e90b5be069361f53f272a9db6ca1')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('47f99b56e2faa6ef7c760f2112a7b10445f9c709')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD
index ead9c99ec..a47e7f087 100644
--- a/extra/telepathy-kde-contact-list/PKGBUILD
+++ b/extra/telepathy-kde-contact-list/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 173288 2012-12-18 09:15:39Z andrea $
+# $Id: PKGBUILD 183065 2013-04-17 06:12:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-contact-list
 _pkgname=ktp-contact-list
-pkgver=0.5.2
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="Telepathy contact list application"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
 depends=('telepathy-kde-common-internals' 'kdebase-runtime')
-makedepends=('cmake' 'automoc4')
+makedepends=('cmake' 'automoc4' 'boost')
 groups=('kde-telepathy')
 install=${pkgname}.install
-source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('0bae4ded1384f35f9a809145b8192f819ea708ec')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('0fb7888effd4e9a8f584dfbdcce31e088fbe71de')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD
index 7a1e2896c..391ed90b7 100644
--- a/extra/telepathy-kde-contact-runner/PKGBUILD
+++ b/extra/telepathy-kde-contact-runner/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173290 2012-12-18 09:16:16Z andrea $
+# $Id: PKGBUILD 183135 2013-04-17 18:25:34Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-contact-runner
 _pkgname=ktp-contact-runner
-pkgver=0.5.2
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="KRunner plugin for KDE Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('GPL')
 depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('4423513dcb44ad7773e5e57050d170b72d6e8492')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('1acb3f1371008040abf3a75d39a61fbe9f580821')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-contact-applet/PKGBUILD b/extra/telepathy-kde-desktop-applets/PKGBUILD
index 158c608c2..1d228d835 100644
--- a/extra/telepathy-kde-contact-applet/PKGBUILD
+++ b/extra/telepathy-kde-desktop-applets/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 173286 2012-12-18 09:15:02Z andrea $
+# $Id: PKGBUILD 183137 2013-04-17 18:33:27Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
-pkgname=telepathy-kde-contact-applet
-_pkgname=ktp-contact-applet
-pkgver=0.5.2
+pkgname=telepathy-kde-desktop-applets
+_pkgname=ktp-desktop-applets
+pkgver=0.6.1
 pkgrel=1
-pkgdesc="The KDE-Telepathy contact plasmoid"
+pkgdesc="The KDE-Telepathy Plasma desktop applets"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
 depends=('telepathy-kde-common-internals' 'kdebase-workspace')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('1d0f479c227698cdd79ebe040aee6fc9a8ad17c0')
+conflicts=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet')
+replaces=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('78cf1e37fbaf2af2b3c14df81dde7417a5bd7c07')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
index b8b6b3d42..431f0701d 100644
--- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD
+++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173292 2012-12-18 09:16:52Z andrea $
+# $Id: PKGBUILD 183140 2013-04-17 18:34:04Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-filetransfer-handler
 _pkgname=ktp-filetransfer-handler
-pkgver=0.5.2
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="Telepathy file transfer handler"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('GPL')
 depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('ba9bc3b1b711c9e96765c9feaeced0b24ca89756')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('66e365cf5ec60233d04869570cc89ad70eacb214')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD
index 244cda673..02605f9dc 100644
--- a/extra/telepathy-kde-integration-module/PKGBUILD
+++ b/extra/telepathy-kde-integration-module/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173301 2012-12-18 09:19:20Z andrea $
+# $Id: PKGBUILD 183141 2013-04-17 18:34:18Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-integration-module
 _pkgname=ktp-kded-integration-module
-pkgver=0.5.2.1
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,13 +12,13 @@ license=('GPL')
 depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/unstable/kde-telepathy/0.5.2/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('96d8a52a85517ab95afe71f6828e18d26fb9c8d3')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('c5121ed5ba4f7ea0e7885b0aa7a42008c3ec6930')
 
 build() {
   mkdir build
   cd build
-  cmake ../${_pkgname}-0.5.2 \
+  cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release
   make
diff --git a/extra/telepathy-kde-presence-applet/PKGBUILD b/extra/telepathy-kde-presence-applet/PKGBUILD
deleted file mode 100644
index d58a5b165..000000000
--- a/extra/telepathy-kde-presence-applet/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 173295 2012-12-18 09:17:32Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Laurent Carlier <lordheavym@gmail.com>
-
-pkgname=telepathy-kde-presence-applet
-_pkgname=ktp-presence-applet
-pkgver=0.5.2
-pkgrel=1
-pkgdesc="Plasma applet for managing your Telepathy account presence"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
-license=('GPL')
-depends=('telepathy-kde-contact-list')
-makedepends=('cmake' 'automoc4')
-groups=('kde-telepathy')
-source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('6aea77d2d0eaf5b95ba8188a3acdec6c4d32b863')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../${_pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD
index 6d668a44e..888539576 100644
--- a/extra/telepathy-kde-send-file/PKGBUILD
+++ b/extra/telepathy-kde-send-file/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173297 2012-12-18 09:18:06Z andrea $
+# $Id: PKGBUILD 183143 2013-04-17 18:35:12Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-send-file
 _pkgname=ktp-send-file
-pkgver=0.5.2
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ depends=('telepathy-kde-filetransfer-handler' 'telepathy-kde-contact-list')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 install=${pkgname}.install
-source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('023f1b8e9ceb76018e597fb7e787995cc2888e0c')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('48ece90d7f2614aa133b8304d4891e0151d26f00')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD
index 7a2664f47..bce31e164 100644
--- a/extra/telepathy-kde-text-ui/PKGBUILD
+++ b/extra/telepathy-kde-text-ui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173299 2012-12-18 09:18:41Z andrea $
+# $Id: PKGBUILD 183145 2013-04-17 18:35:36Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-text-ui
 _pkgname=ktp-text-ui
-pkgver=0.5.2
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="Telepathy handler for Text Chats"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ license=('GPL')
 depends=('telepathy-kde-contact-list' 'telepathy-logger-qt')
 makedepends=('cmake' 'automoc4' 'boost')
 groups=('kde-telepathy')
-source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('5dd8d66b9011d96c0637f4b15e6c3912edef6c17')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('6dd32df14da326bcaeed8b68a25634b2731f0b6b')
 
 build() {
   mkdir build
diff --git a/extra/telepathy-logger-qt/PKGBUILD b/extra/telepathy-logger-qt/PKGBUILD
index e72da53e3..85c4cc481 100644
--- a/extra/telepathy-logger-qt/PKGBUILD
+++ b/extra/telepathy-logger-qt/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 173276 2012-12-18 08:24:14Z andrea $
+# $Id: PKGBUILD 182024 2013-04-05 09:11:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: George Brooke <george+arch.aur@george-brooke.co.uk>
 
 pkgname=telepathy-logger-qt
-pkgver=0.5.2
+pkgver=0.6.0
 pkgrel=1
 pkgdesc="Qt bindings for telepathy logger"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/extragear/network/telepathy/telepathy-logger-qt'
 license=('GPL')
-depends=('telepathy-qt' 'telepathy-logger' 'qt-gstreamer' 'boost-libs')
-makedepends=('automoc4' 'cmake' 'python2' 'boost' 'doxygen')
-source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('1af03910c91ca461a7ab3e6a95c712e61f494ffa')
+depends=('telepathy-qt' 'telepathy-logger' 'qt-gstreamer')
+makedepends=('automoc4' 'cmake' 'python2' 'doxygen' 'boost')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('3e58f7a25ad192d9a62b52784492b317b77a5ffa')
 
 build() {
-  cd "$srcdir"
   mkdir build 
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -26,6 +25,6 @@ build() {
 }
 
 package() {
-  cd "$srcdir/build"
+  cd build
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/telepathy-logger/PKGBUILD b/extra/telepathy-logger/PKGBUILD
index bd4516383..138ef6e97 100644
--- a/extra/telepathy-logger/PKGBUILD
+++ b/extra/telepathy-logger/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 170064 2012-10-31 13:30:17Z ibiru $
+# $Id: PKGBUILD 179904 2013-03-11 17:10:13Z ioni $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=telepathy-logger
-pkgver=0.6.0
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="Telepathy framework logging daemon"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ makedepends=('intltool' 'gnome-doc-utils' 'gobject-introspection')
 options=('!libtool')
 install=telepathy-logger.install
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('f453c49e53898c64bc423f0fdf117290')
+md5sums=('e513eaa767344821073a0b7bb8b45217')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD
index 345b7d049..cefff521c 100644
--- a/extra/telepathy-qt/PKGBUILD
+++ b/extra/telepathy-qt/PKGBUILD
@@ -1,26 +1,31 @@
-# $Id: PKGBUILD 175068 2013-01-12 13:26:14Z andrea $
+# $Id: PKGBUILD 179901 2013-03-11 14:05:45Z andrea $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-qt
 pkgver=0.9.3
-pkgrel=3
+pkgrel=7
 pkgdesc="A library for Qt-based Telepathy clients"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org/wiki/"
 license=('LGPL')
 options=('!libtool')
-depends=('qt' 'telepathy-farstream' 'farstream-0.1')
+depends=('qt4' 'telepathy-farstream' 'gstreamer0.10-base')
 makedepends=('libxslt' 'python2' 'cmake' 'doxygen')
 conflicts=('telepathy-qt4')
 replaces=('telepathy-qt4')
 provides=('telepathy-qt4')
-source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc})
+source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc}
+        'farstream-0.2.patch')
 md5sums=('94ac93aedf5f6fff49837bc8368e5a37'
-         'e1b851b08b159fca39596ff8395ca53a')
+         'e1b851b08b159fca39596ff8395ca53a'
+         '6b2421c59d20d29fece8d5e6445354c7')
 
 build() {
-    cd "$srcdir"
+    cd ${pkgname}-${pkgver}
+    patch -p1 -i "${srcdir}"/farstream-0.2.patch
+    cd ../
+
     mkdir build
     cd build
     cmake ../${pkgname}-${pkgver} \
@@ -32,6 +37,6 @@ build() {
 }
 
 package() {
-    cd "$srcdir"/build
+    cd build
     make DESTDIR="$pkgdir" install
 }
diff --git a/extra/telepathy-qt/farstream-0.2.patch b/extra/telepathy-qt/farstream-0.2.patch
new file mode 100644
index 000000000..7b87b8201
--- /dev/null
+++ b/extra/telepathy-qt/farstream-0.2.patch
@@ -0,0 +1,28 @@
+diff -urB telepathy-qt/cmake/modules/FindFarstream.cmake new/cmake/modules/FindFarstream.cmake
+--- telepathy-qt/cmake/modules/FindFarstream.cmake	2012-04-25 22:14:22.275967164 +0200
++++ new/cmake/modules/FindFarstream.cmake	2012-10-07 12:19:46.543103512 +0200
+@@ -23,9 +23,9 @@
+     # in the find_path() and find_library() calls
+     find_package(PkgConfig)
+     if (FARSTREAM_MIN_VERSION)
+-        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1>=${FARSTREAM_MIN_VERSION})
++        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2>=${FARSTREAM_MIN_VERSION})
+     else (FARSTREAM_MIN_VERSION)
+-        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1)
++        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2)
+     endif (FARSTREAM_MIN_VERSION)
+     set(FARSTREAM_DEFINITIONS ${PC_FARSTREAM_CFLAGS_OTHER})
+ endif (NOT WIN32)
+@@ -34,10 +34,10 @@
+    PATHS
+    ${PC_FARSTREAM_INCLUDEDIR}
+    ${PC_FARSTREAM_INCLUDE_DIRS}
+-   PATH_SUFFIXES farstream-0.1
++   PATH_SUFFIXES farstream-0.2
+    )
+ 
+-find_library(FARSTREAM_LIBRARIES NAMES farstream-0.1
++find_library(FARSTREAM_LIBRARIES NAMES farstream-0.2
+    PATHS
+    ${PC_FARSTREAM_LIBDIR}
+    ${PC_FARSTREAM_LIBRARY_DIRS}
diff --git a/extra/telepathy-qt/gcc47.patch b/extra/telepathy-qt/gcc47.patch
deleted file mode 100644
index ac6ae67fb..000000000
--- a/extra/telepathy-qt/gcc47.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nur telepathy-qt-0.9.1.orig/TelepathyQt/client-registrar.cpp telepathy-qt-0.9.1/TelepathyQt/client-registrar.cpp
---- telepathy-qt-0.9.1.orig/TelepathyQt/client-registrar.cpp	2012-04-01 17:44:00.013466055 +0000
-+++ telepathy-qt-0.9.1/TelepathyQt/client-registrar.cpp	2012-04-01 17:51:00.233486476 +0000
-@@ -39,6 +39,8 @@
- #include <TelepathyQt/MethodInvocationContext>
- #include <TelepathyQt/PendingComposite>
- #include <TelepathyQt/PendingReady>
-+ 
-+#include <stdint.h>
- 
- namespace Tp
- {
-diff -Nur telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-client.cpp telepathy-qt-0.9.1/TelepathyQt/stream-tube-client.cpp
---- telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-client.cpp	2012-04-01 17:44:00.006799442 +0000
-+++ telepathy-qt-0.9.1/TelepathyQt/stream-tube-client.cpp	2012-04-01 17:51:00.233486476 +0000
-@@ -38,6 +38,8 @@
- #include <QAbstractSocket>
- #include <QHash>
- 
-+#include <stdint.h>
-+
- namespace Tp
- {
- 
-diff -Nur telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-server.cpp telepathy-qt-0.9.1/TelepathyQt/stream-tube-server.cpp
---- telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-server.cpp	2012-04-01 17:44:00.003466134 +0000
-+++ telepathy-qt-0.9.1/TelepathyQt/stream-tube-server.cpp	2012-04-01 17:51:00.233486476 +0000
-@@ -38,6 +38,8 @@
- #include <TelepathyQt/OutgoingStreamTubeChannel>
- #include <TelepathyQt/StreamTubeChannel>
- 
-+#include <stdint.h>
-+
- namespace Tp
- {
- 
diff --git a/extra/terminal/PKGBUILD b/extra/terminal/PKGBUILD
deleted file mode 100644
index edef8f505..000000000
--- a/extra/terminal/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 157827 2012-04-30 04:19:45Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-# Contributor: Aurelien Foret <orelien@chez.com>
-
-pkgname=terminal
-pkgver=0.4.8
-pkgrel=2
-pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.xfce.org/projects/terminal/"
-license=('GPL2')
-groups=('xfce4')
-depends=('exo' 'vte' 'dbus-glib' 'startup-notification' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool')
-options=('!libtool')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/apps/$pkgname/0.4/Terminal-$pkgver.tar.bz2)
-sha256sums=('fe5db0b7127ce87efa1e10f44d8915be88005b6ce4f0bfea6b64533e25cc788d')
-
-build() {
-  cd "$srcdir/Terminal-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/xfce4 \
-    --localstatedir=/var \
-    --disable-static \
-    --disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/Terminal-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/terminal/terminal.install b/extra/terminal/terminal.install
deleted file mode 100644
index e4f8fd06c..000000000
--- a/extra/terminal/terminal.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/tevent/PKGBUILD b/extra/tevent/PKGBUILD
new file mode 100644
index 000000000..82c199ad0
--- /dev/null
+++ b/extra/tevent/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 182652 2013-04-12 07:10:43Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Christian Hesse <mail@eworm.de>
+# Contributor: Marco A Rojas <marquicus at gmail dot com>
+# Contributor: Ng Oon-Ee <ngoonee.talk@gmail.com>
+# Contributor: Thomas Burdick <thomas.burdick@gmail.com>
+
+pkgname=tevent
+pkgver=0.9.18
+pkgrel=1
+pkgdesc="An event system based on the talloc memory management library"
+arch=('i686' 'x86_64' 'mips64el')
+url="https://tevent.samba.org/"
+source=("http://samba.org/ftp/tevent/${pkgname}-${pkgver}.tar.gz")
+license=('GPL3')
+depends=('talloc')
+makedepends=('python2')
+optdepends=('python2: for python bindings')
+
+build() {
+	cd ${srcdir}/${pkgname}-${pkgver}
+
+	# change to use python2
+	sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" buildtools/bin/waf
+	export PYTHON=/usr/bin/python2
+
+	./configure --prefix=/usr
+}
+
+package() {
+	cd ${srcdir}/${pkgname}-${pkgver}
+	
+	make
+	make DESTDIR=${pkgdir}/ install
+}
+md5sums=('952535f0bcf002eee5a8db68deb6374b')
diff --git a/extra/texlive-bin/09-texlive-fonts.conf b/extra/texlive-bin/09-texlive-fonts.conf
deleted file mode 100644
index f870fbd7a..000000000
--- a/extra/texlive-bin/09-texlive-fonts.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <dir>/usr/share/texmf-dist/fonts/opentype</dir>
-  <dir>/usr/share/texmf-dist/fonts/truetype</dir>
-  <dir>/usr/local/share/texmf/fonts/opentype</dir>
-  <dir>/usr/local/share/texmf/fonts/truetype</dir>
-</fontconfig>
-
diff --git a/extra/texlive-bin/PKGBUILD b/extra/texlive-bin/PKGBUILD
deleted file mode 100644
index a3278aa7f..000000000
--- a/extra/texlive-bin/PKGBUILD
+++ /dev/null
@@ -1,311 +0,0 @@
-# $Id: PKGBUILD 169389 2012-10-20 09:31:50Z andyrtr $
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# Contributor: francois <francois.archlinux.org>
-
-pkgname=texlive-bin
-pkgver=2012.0
-pkgrel=5
-pkgdesc="TeX Live binaries"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('t1lib' 'gd' 'poppler' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2')
-makedepends=('perl' 'clisp' 'ffcall')
-optdepends=('ed: for texconfig')
-provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam')
-conflicts=('pdfjam')
-options=('!libtool' '!strip')
-url='http://tug.org/texlive/'
-install="texlive.install"
-source=('texmf.cnf'
-        'fix-fontforge-encoding.patch'
-        '09-texlive-fonts.conf'
-        'poppler-0.20.patch'
-        'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20120623.tar.xz'
-        'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20120623.tar.xz'
-        'luatex-r4449-radical-rule-thickness.patch'
-)
-backup=(etc/texmf/web2c/texmf.cnf \
-    etc/texmf/chktex/chktexrc \
-	etc/texmf/dvipdfm/config/config \
-	etc/texmf/dvipdfmx/dvipdfmx.cfg \
-	etc/texmf/dvips/config/config.ps \
-	etc/texmf/tex/generic/config/language.dat \
-	etc/texmf/tex/generic/config/language.def \
-	etc/texmf/tex/generic/config/pdftexconfig.tex \
-	etc/texmf/ttf2pk/ttf2pk.cfg \
-	etc/texmf/web2c/fmtutil.cnf \
-	etc/texmf/web2c/mktex.cnf \
-	etc/texmf/xdvi/XDvi)
-
-md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae'
-         'bfb9716aa00c86c08cd31e5b32edeb98'
-         '393a4bf67adc7ca5df2b386759d1a637'
-         'e3a664d5a7f0923f35060fe9d25d2573'
-         'ac2c3c3aa765581f8504e21a5edbfb9f'
-         'f315a860158cfc952c82a6d759961024'
-         '5190f3295eb9a604c5f17f5bd607299b')
-
-build() {
-   if [ "${CARCH}" = "x86_64" ]; then
-     export CFLAGS="${CFLAGS} -fPIC"
-     export CXXFLAGS="${CXXFLAGS} -fPIC"
-   fi
-
-    cd "$srcdir"
-   # this patch removes spurious error message with locale "xx_YY.utf8"
-   patch -Np0 -i fix-fontforge-encoding.patch
-   # fix build with poppler >= 0.20
-   patch -Np0 -i poppler-0.20.patch
-   # fix radical rule thickness regression in Luatex
-   # http://tex.stackexchange.com/q/61952/729
-   patch -Np0 -i luatex-r4449-radical-rule-thickness.patch
-   # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251)
-   sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c
-   #############################################################
-   ### configure
-   cd source
-   ## prevent compiling Xdvi with libXp
-   sed -i~ 's|-lXp ||' texk/xdvik/configure
-   test ! -d Work && mkdir Work
-   cd Work
-   echo "--> Initial configuration..."
-   # we use temporary prefix to avoid messing the existing
-   # $pkgdir/usr/share/texmf tree
-   # system zlib is disabled due to issues with zlib 1.2.6 (FS#28221)
-   ../configure --prefix=/usr -C \
-     --sysconfdir=/etc \
-     --datarootdir=/usr/share \
-     --datadir=/usr/share \
-     --mandir=/usr/share/man \
-     --disable-native-texlive-build \
-     --with-banner-add="/Arch Linux" \
-     --disable-multiplatform \
-     --disable-dialog \
-     --disable-psutils \
-     --disable-t1utils \
-     --disable-bibtexu \
-     --disable-xz \
-     --with-system-zlib \
-     --with-system-zziplib \
-     --with-system-pnglib \
-     --with-system-ncurses \
-     --with-system-t1lib \
-     --with-system-gd \
-     --with-system-poppler \
-     --with-system-xpdf \
-     --with-system-freetype2 \
-     --without-system-graphite \
-     --with-freetype2-libdir=/usr/lib \
-     --with-freetype2-include=/usr/include/freetype2 \
-     --with-xdvi-x-toolkit=xaw \
-     --disable-dump-share \
-     --disable-aleph \
-     --enable-luatex \
-     --with-clisp-runtime=default \
-     --enable-xindy --disable-xindy-rules --disable-xindy-docs
-   #############################################################
-   ### make
-   echo "-------------------------------------------------------"
-   echo "--> Building the whole beast ..."
-   echo "-------------------------------------------------------"
-   make
-}
-
-package() {
-   cd "$srcdir"
-   #############################################################
-   ### install texmf tree
-   echo "-------------------------------------------------------"
-   echo "--> installing the texmf tree"
-   echo "-------------------------------------------------------"
-   install -m755 -d "$pkgdir"/usr/share
-   cp -r texmf "$pkgdir"/usr/share/
-   install -d -m755 "$pkgdir"/etc/texmf/web2c
-   install -d -m755 "$pkgdir"/etc/texmf/chktex
-   install -d -m755 "$pkgdir"/etc/texmf/dvips/config
-   install -d -m755 "$pkgdir"/etc/texmf/dvipdfm/config
-   install -d -m755 "$pkgdir"/etc/texmf/dvipdfmx
-   install -d -m755 "$pkgdir"/etc/texmf/tex/generic/config
-   install -d -m755 "$pkgdir"/etc/texmf/ttf2pk
-   install -d -m755 "$pkgdir"/etc/texmf/xdvi
-   install -d -m755 "$pkgdir"/etc/fonts/conf.avail
-   install -m644 "$srcdir"/09-texlive-fonts.conf "$pkgdir"/etc/fonts/conf.avail/
-   # move man files to /usr/share/man
-   for i in 1 5; do
-     install -d -m755 "$pkgdir"/usr/share/man/man$i
-     mv "$pkgdir"/usr/share/texmf/doc/man/man$i/*.$i "$pkgdir"/usr/share/man/man$i/
-   done
-   # move info files to /usr/share/info
-   install -d -m755 "$pkgdir"/usr/share/info
-   mv "$pkgdir"/usr/share/texmf/doc/info/*.info "$pkgdir"/usr/share/info/
-   rm -rf "$pkgdir"/usr/share/texmf/doc/{man,info}
-   # copy config files to $TEXMFCONFIG tree
-   cp -a "$pkgdir"/usr/share/texmf/chktex/chktexrc \
-     	"$pkgdir"/etc/texmf/chktex/
-   cp -a "$pkgdir"/usr/share/texmf/web2c/mktex.cnf \
-   	  "$pkgdir"/etc/texmf/web2c/
-   cp -a "$pkgdir"/usr/share/texmf/web2c/updmap.cfg \
-   	  "$pkgdir"/etc/texmf/web2c/
-   cp -a "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf \
-   	  "$pkgdir"/etc/texmf/web2c/
-   cp -a "$pkgdir"/usr/share/texmf/dvips/config/config.ps \
-   	  "$pkgdir"/etc/texmf/dvips/config/
-   cp -a "$pkgdir"/usr/share/texmf/dvipdfm/config/config \
-   	  "$pkgdir"/etc/texmf/dvipdfm/config/
-   cp -a "$pkgdir"/usr/share/texmf/dvipdfmx/dvipdfmx.cfg \
-   	  "$pkgdir"/etc/texmf/dvipdfmx/
-   cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/pdftexconfig.tex \
-   	  "$pkgdir"/etc/texmf/tex/generic/config/
-   cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/language.dat \
-   	  "$pkgdir"/etc/texmf/tex/generic/config/
-   cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/language.def \
-   	  "$pkgdir"/etc/texmf/tex/generic/config/
-   cp -a "$pkgdir"/usr/share/texmf/ttf2pk/ttf2pk.cfg \
-   	  "$pkgdir"/etc/texmf/ttf2pk/
-   cp -a "$pkgdir"/usr/share/texmf/xdvi/XDvi \
-   	  "$pkgdir"/etc/texmf/xdvi/
-   # remove TL specific warnings in the language.{dat,def} files:
-   sed -i -e '/DO NOT EDIT/,+3 d' "$pkgdir"/etc/texmf/tex/generic/config/language.*
-   # clean updmap.cfg
-   sed -i '/^\(Map\|MixedMap\)/d' "$pkgdir"/etc/texmf/web2c/updmap.cfg
-   sed -i '/^#! \(Map\|MixedMap\)/d' "$pkgdir"/etc/texmf/web2c/updmap.cfg
-
-   #############################################################
-   ### install
-   cd source
-   # fixes for xindy
-   find utils/xindy -name Makefile -exec sed -i -e "s|^prefix =.\+$|prefix = $pkgdir/usr|" -e "s|^mandir =.\+$|mandir = \${prefix}/share/man|" -e "s|^datadir =.\+$|datadir = \${datarootdir}/texmf|" -e "s|^docdir =.\+$|docdir = \${datadir}/doc/xindy|" '{}' \;
-
-   echo "-------------------------------------------------------"
-   echo "--> Proceeding with make install ..."
-   echo "-------------------------------------------------------"
-   cd Work
-   make DESTDIR="${pkgdir}" texmf="$pkgdir"/usr/share/texmf install
-   rm -rf "${pkgdir}"/usr/{texmf,share/texmf-dist}
-
-   # replace upstream texmf.cnf with ours
-   rm -f "$pkgdir"/usr/share/texmf/web2c/texmf.cnf
-   install -m644 "$srcdir"/texmf.cnf "$pkgdir"/etc/texmf/web2c/texmf.cnf
-   # since the location of texmf.cnf is hard-wired to be under /usr/share/texmf/web2c
-   # we make a symlink from /etc/texmf/web2c/texmf.cnf to the latter
-   ln -sf /etc/texmf/web2c/texmf.cnf "$pkgdir"/usr/share/texmf/web2c/texmf.cnf
-   # fix location of TEXMFCACHE for luatools
-   sed -i 's#texlive2010#texlive#' "$pkgdir"/usr/share/texmf/web2c/texmfcnf.lua
-   ## remove aleph from fmtutil.cnf
-   sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf
-
-   ## install Perl libraries
-   mkdir -p "$pkgdir"/usr/share/tlpkg/TeXLive
-   install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "$pkgdir"/usr/share/tlpkg/TeXLive
-
-   # create symlinks for formats 
-   echo "--> Create symlinks for TeX formats ..."
-   PATH="$PATH:${pkgdir}/usr/bin" texlinks -f "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf "$pkgdir"/usr/bin/
-   #############################################################
-   # remove dangling symlinks
-   _bibtexextra_scripts="
-bibexport
-listbib
-urlbst
-"
-   _core_scripts="
-afm2afm
-arlatex
-autoinst
-bundledoc
-checkcites
-cmap2enc
-ctanify
-ctanupload
-de-macro
-dosepsbin
-dviasm
-epstopdf
-findhyph
-font2afm
-fragmaster
-installfont-tl
-latex2man
-latexdiff
-latexdiff-vc
-latexfileversion
-latexmk
-latexrevise
-listings-ext.sh
-match_parens
-mf2pt1
-mkjobtexmf
-mkluatexfontdb
-mkt1font
-mptopdf
-ot2kpx
-pdf180
-pdf270
-pdf90
-pdfatfi
-pdfbook
-pdfcrop
-pdfflip
-pdfjam
-pdfjam-pocketmod
-pdfjam-slides3up
-pdfjam-slides6up
-pdfjoin
-pdfnup
-pdfpun
-pfm2kpx
-pkfix
-pkfix-helper
-purifyeps
-repstopdf
-rpdfcrop
-showglyphs
-sty2dtx
-texcount
-texdef
-texdiff
-texdirflatten
-texliveonfly
-texloganalyser
-typeoutfileinfo
-thumbpdf
-vpl2ovp
-vpl2vpl
-"
-   _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht"
-   _langcjk_scripts="convbkmk updmap-setup-kanji"
-   _langextra_scripts="ebong"
-   _langgreek_scripts="mkgrkindex"
-   _latexextra_scripts="
-authorindex
-exceltex
-makeglossaries
-pdfannotextractor
-perltex
-ppower4
-ps4pdf
-splitindex
-svn-multi
-vpe"
-   _music_scripts="m-tx musixtex musixflx pmx2pdf"
-   _pictures_scripts="cachepic epspdf epspdftk fig4latex mathspic"
-   _pstricks_scripts="pedigree pst2pdf"
-   _science_scripts="ulqda"
-   for s in \
-        ${_bibtexextra_scripts} \
-        ${_core_scripts}       \
-        ${_htmlxml_scripts}    \
-        ${_langcjk_scripts}    \
-        ${_langextra_scripts}  \
-        ${_langgreek_scripts}  \
-        ${_latexextra_scripts} \
-        ${_music_scripts}      \
-        ${_pictures_scripts}   \
-        ${_pstricks_scripts}   \
-        ${_science_scripts}    \
-        tlmgr; do
-     rm -f "$pkgdir"/usr/bin/$s
-   done
-   ###################################################################
-}
-
diff --git a/extra/texlive-bin/fix-fontforge-encoding.patch b/extra/texlive-bin/fix-fontforge-encoding.patch
deleted file mode 100644
index 8104b3289..000000000
--- a/extra/texlive-bin/fix-fontforge-encoding.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/noprefs.c.orig	2009-09-30 19:27:00.935039526 +0200
-+++ source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/noprefs.c	2009-09-30 19:28:04.908364646 +0200
-@@ -495,6 +495,9 @@
- 	{ "Big5HKSCS", e_big5hkscs },
- 	{ "Big5-HKSCS", e_big5hkscs },
- 	{ "UTF-8", e_utf8 },
-+	{ "utf-8", e_utf8 },
-+	{ "UTF8", e_utf8 },
-+	{ "utf8", e_utf8 },
- 	{ "ISO-10646/UTF-8", e_utf8 },
- 	{ "ISO_10646/UTF-8", e_utf8 },
- 	{ "UCS2", e_unicode },
diff --git a/extra/texlive-bin/luatex-r4449-radical-rule-thickness.patch b/extra/texlive-bin/luatex-r4449-radical-rule-thickness.patch
deleted file mode 100644
index f925a1a93..000000000
--- a/extra/texlive-bin/luatex-r4449-radical-rule-thickness.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: source/texk/web2c/luatexdir/tex/mlist.w
-===================================================================
---- source/texk/web2c/luatexdir/tex/mlist.w	(revision 4448)
-+++ source/texk/web2c/luatexdir/tex/mlist.w	(revision 4449)
-@@ -1798,7 +1798,17 @@
-         theta = fraction_rule(cur_style);
-         y = var_delimiter(left_delimiter(q), cur_size,
-                           height(x) + depth(x) + clr + theta, NULL, cur_style);
--        theta = height(y);
-+	/* If |y| is a composite then set |theta| to the height of its top
-+           character, else set it to the height of |y|. */
-+        if (list_ptr(y) != null
-+            && type(list_ptr(y)) == hlist_node
-+            && list_ptr(list_ptr(y)) != null
-+            && type(list_ptr(list_ptr(y))) == glyph_node) {     /* and it should be */
-+            theta = char_height(font(list_ptr(list_ptr(y))),
-+                           character(list_ptr(list_ptr(y))));
-+        } else {
-+            theta = height(y);
-+        }
-     } else {
-         y = var_delimiter(left_delimiter(q), cur_size,
-                           height(x) + depth(x) + clr + theta, NULL, cur_style);
diff --git a/extra/texlive-bin/poppler-0.20.patch b/extra/texlive-bin/poppler-0.20.patch
deleted file mode 100644
index 3bd8183ab..000000000
--- a/extra/texlive-bin/poppler-0.20.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- source/texk/web2c/luatexdir/lua/lepdflib.cc.orig	2011-10-06 06:14:20.000000000 +0000
-+++ source/texk/web2c/luatexdir/lua/lepdflib.cc	2012-05-17 11:30:26.327236883 +0000
-@@ -1433,7 +1433,7 @@
- 
- static int m_Object_getTypeName(lua_State * L)
- {
--    char *s;
-+    const char *s;
-     udstruct *uin;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
---- source/texk/web2c/pdftexdir/pdftosrc.cc.orig	2012-06-24 17:12:34.376329435 +0200
-+++ source/texk/web2c/pdftexdir/pdftosrc.cc	2012-06-24 17:12:25.490003152 +0200
-@@ -134,7 +134,7 @@
-         exit(1);
-     }
-     if (extract_xref_table) {
--        int size = xref->getSize();
-+        int size = xref->getNumObjects();
-         int i;
-         for (i = 0; i < size; i++) {
-             if (xref->getEntry(i)->offset == 0xffffffff)
diff --git a/extra/texlive-bin/texlive.install b/extra/texlive-bin/texlive.install
deleted file mode 100644
index 06a40a3b3..000000000
--- a/extra/texlive-bin/texlive.install
+++ /dev/null
@@ -1,43 +0,0 @@
-infodir=usr/share/info
-filelist=(dvipng.info dvips.info eplain.info epspdf.info fontname.info kpathsea.info latex2e-es.info latex2e.info latex2man.info mf2pt1.info tds.info texdraw.info web2c.info)
-
-post_install() {
-  echo    ">>> texlive: updating the filename database..."
-  usr/bin/mktexlsr
-  echo -n   "creating all formats..."
-  usr/bin/fmtutil-sys --all 1>/dev/null
-  echo      " done." 
-  echo      " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
-
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  local corename corever _pacout
-  echo    ">>> texlive: updating the filename database..."
-  usr/bin/mktexlsr
-  _pacout=$(pacman -Q texlive-core 2>/dev/null)
-  read corename corever <<< ${_pacout}
-  if [[ ${corever} == 2012* ]]; then
-      echo -n   "recreating all formats..."
-      usr/bin/fmtutil-sys --all 1>/dev/null
-      echo      " done." 
-      echo      " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
-  else
-      echo "WARNING: not recreating formats since texlive-core has version '$corever'"
-  fi
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
diff --git a/extra/texlive-bin/texmf.cnf b/extra/texlive-bin/texmf.cnf
deleted file mode 100644
index 76975ee5c..000000000
--- a/extra/texlive-bin/texmf.cnf
+++ /dev/null
@@ -1,724 +0,0 @@
-% texmf.cnf for TeXLive/Arch Linux -- runtime path configuration file for kpathsea.
-% Public domain.
-% 
-% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
-% updated.  Instead, put your changes -- and only your changes, not an
-% entire copy of the full texmf.cnf! -- in ../../texmf.cnf.  That is, if
-% this file is installed in /some/path/to/texlive/2011/texmf/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2011/texmf.cnf.
-% 
-% What follows is a super-summary of what this .cnf file can
-% contain. Please read the Kpathsea manual for more information.
-%
-% Any identifier (sticking to A-Za-z_ for names is safest) can be assigned.
-% The `=' (and surrounding spaces) is optional.
-% $foo (or ${foo}) in a value expands to the envvar or cnf value of foo.
-% Long lines can be continued with a \.
-%
-% Earlier entries (in the same or another file) override later ones, and
-% an environment variable foo overrides any texmf.cnf definition of foo.
-%
-% All definitions are read before anything is expanded, so you can use
-% variables before they are defined.
-%
-% If a variable assignment is qualified with `.PROGRAM', it is ignored
-% unless the current executable (last filename component of argv[0]) is
-% named PROGRAM.  This foo.PROGRAM construct is not recognized on the
-% right-hand side. For environment variables, use FOO_PROGRAM.
-%
-% Which file formats use which paths for searches is described in the
-% various programs' and the Kpathsea documentation (http://tug.org/kpathsea).
-%
-% // means to search subdirectories (recursively).
-% A leading !! means to look only in the ls-R db, never on the disk.
-% In this file, either ; or : can be used to separate path components.
-% A leading/trailing/doubled path separator in the paths will be
-%   expanded into the compile-time default. Probably not what you want.
-%
-% Brace notation is supported, for example: /usr/local/{mytex,othertex}
-% expands to /usr/local/mytex:/usr/local/othertex.  We make extensive
-% use of this.
-
-
-%  Part 1: Search paths and directories.
-
-% This is the parent directory of our several trees, i.e.,
-% /usr/local/texlive/YYYY in the original TeX Live distribution.
-%
-% All trees must be organized according to the TeX Directory Structure
-% (http://tug.org/tds), or files may not be found.
-%
-% Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
-TEXMFROOT = $SELFAUTODIR/share
-
-% The tree containing runtime files related to the specific
-% distribution and version.
-TEXMFMAIN = $TEXMFROOT/texmf
-
-% The main tree of packages, distribution-agnostic:
-TEXMFDIST = $TEXMFROOT/texmf-dist
-
-% Local additions to the distribution trees.
-TEXMFLOCAL = /usr/local/share/texmf
-
-% TEXMFSYSVAR, where *-sys store cached runtime data.
-TEXMFSYSVAR = /var/lib/texmf
-
-% TEXMFSYSCONFIG, where *-sys store configuration data.
-TEXMFSYSCONFIG = /etc/texmf
-
-% Per-user texmf tree(s) -- organized per the TDS, as usual.  To define
-% more than one per-user tree, set this to a list of directories in
-% braces, as described above.  (This used to be HOMETEXMF.)  ~ expands
-% to %USERPROFILE% on Windows, $HOME otherwise.
-TEXMFHOME = ~/texmf
-
-% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive/texmf-var
-
-% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive/texmf-config
-
-% List all the texmf trees.
-%
-% For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named
-% explicitly and before all other trees.
-% 
-% TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the
-% files in TEXMFMAIN are tightly coupled with the particular version of
-% the distribution, such as configuration files.  Overriding them would
-% be more likely to cause trouble than help.  On the other hand, the
-% bulk of packages and fonts are in TEXMFDIST, and locally-installed
-% versions should take precedence over those -- although it is generally
-% a source of confusion to have different versions of a package
-% installed, whatever the trees, so try to avoid it.
-TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
-
-% Where to look for ls-R files.  There need not be an ls-R in the
-% directories in this path, but if there is one, Kpathsea will use it.
-% By default, this is only the !! elements of TEXMF, so that mktexlsr
-% does not create ls-R files in the non-!! elements -- because if an
-% ls-R is present, it will be used, and the disk will not be searched.
-% This is arguably a bug in kpathsea.
-TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
-
-% The system trees.  These are the trees that are shared by all users.
-% If a tree appears in this list, the mktex* scripts will use
-% VARTEXFONTS for generated files, if the original tree isn't writable;
-% otherwise the current working directory is used.
-SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST
-
-% Where generated fonts may be written.  This tree is used when the sources
-% were found in a system tree and either that tree wasn't writable, or the
-% varfonts feature was enabled in MT_FEATURES in mktex.cnf.
-VARTEXFONTS = $TEXMFVAR/fonts
-
-% On some systems, there will be a system tree which contains all the font
-% files that may be created as well as the formats.  For example
-%   TEXMFVAR = /var/lib/texmf
-% is used in many distros.  In this case, set VARTEXFONTS like this
-%VARTEXFONTS = $TEXMFVAR/fonts
-% and do not mention it in TEXMFDBS (but _do_ mention TEXMFVAR).
-%
-% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below
-% one of the TEXMF directories (avoids overlapping ls-R files).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Usually you will not need to edit any of the following variables.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% WEB2C is for Web2C specific files.  The current directory may not be
-% a good place to look for them.
-WEB2C = $TEXMF/web2c
-
-% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input
-% or \openin, including .sty, .eps, etc.  We specify paths for all known
-% formats, past or present.  Not all of them are built these days.
-
-% Plain TeX.  Have the command tex check all directories as a last
-% resort, we may have plain-compatible stuff anywhere.
-TEXINPUTS.tex           = .;$TEXMF/tex/{plain,generic,}//
-
-% Fontinst needs to read afm files.
-TEXINPUTS.fontinst      = .;$TEXMF/{tex,fonts/afm}//
-
-% Other plain-based formats.
-TEXINPUTS.amstex        = .;$TEXMF/tex/{amstex,plain,generic,}//
-TEXINPUTS.csplain       = .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.eplain        = .;$TEXMF/tex/{eplain,plain,generic,}//
-TEXINPUTS.ftex          = .;$TEXMF/tex/{formate,plain,generic,}//
-TEXINPUTS.mex           = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.texinfo       = .;$TEXMF/tex/{texinfo,plain,generic,}//
-
-% LaTeX 2e specific macros are stored in latex/, macros that can only be
-% used with 2.09 in latex209/.  In addition, we look in the directory
-% latex209, useful for macros that were written for 2.09 and do not
-% mention 2e at all, but can be used with 2e.
-TEXINPUTS.cslatex       = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.latex         = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.latex209      = .;$TEXMF/tex/{latex209,generic,latex,}//
-TEXINPUTS.olatex        = .;$TEXMF/tex/{latex,generic,}//
-
-% MLTeX.
-TEXINPUTS.frlatex       = .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frtex         = .;$TEXMF/tex/{french,plain,generic,}//
-TEXINPUTS.mllatex       = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.mltex         = .;$TEXMF/tex/{plain,generic,}//
-
-% e-TeX.
-TEXINPUTS.elatex        = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.etex          = .;$TEXMF/tex/{plain,generic,}//
-
-% pdfTeX.
-TEXINPUTS.pdfcslatex    = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.pdfcsplain    = .;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.pdflatex      = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfmex        = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.utf8mex       = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdftex        = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.pdftexinfo    = .;$TEXMF/tex/{texinfo,plain,generic,}//
-TEXINPUTS.pdfamstex     = .;$TEXMF/tex/{amstex,plain,generic,}//
-
-% pdfeTeX.
-TEXINPUTS.pdfelatex     = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfetex       = .;$TEXMF/tex/{plain,generic,}//
-
-% pdfxTeX.
-TEXINPUTS.pdfxlatex     = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfxmex       = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdfxtex       = .;$TEXMF/tex/{plain,generic,}//
-
-% LuaTeX.
-TEXINPUTS.lualatex      = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.luatex        = .;$TEXMF/tex/{luatex,plain,generic,}//
-TEXINPUTS.dvilualatex   = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.dviluatex     = .;$TEXMF/tex/{luatex,plain,generic,}//
-
-% XeTeX.
-TEXINPUTS.xelatex       = .;$TEXMF/tex/{xelatex,latex,xetex,generic,}//
-TEXINPUTS.xeplain       = .;$TEXMF/tex/{xeplain,eplain,plain,xetex,generic,}//
-TEXINPUTS.xetex         = .;$TEXMF/tex/{xetex,plain,generic,}//
-
-% Omega / Aleph.
-TEXINPUTS.aleph         = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.elambda       = .;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.eomega        = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.lambda        = .;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.lamed         = .;$TEXMF/tex/{lamed,lambda,latex,generic,}//
-TEXINPUTS.omega         = .;$TEXMF/tex/{plain,generic,}//
-
-% p(La)TeX.
-TEXINPUTS.ptex          = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}//
-TEXINPUTS.platex        = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}//
-
-% epTeX.
-TEXINPUTS.eptex         = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}//
-
-% pBibTeX bibliographies and style files.
-BIBINPUTS.pbibtex       = .;$TEXMF/{pbibtex,bibtex}/bib//
-BSTINPUTS.pbibtex       = .;$TEXMF/{pbibtex,bibtex}/bst//
-
-% ConTeXt.
-TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic,}//
-
-% jadetex.
-TEXINPUTS.jadetex       = .;$TEXMF/tex/{jadetex,latex,generic,}//
-TEXINPUTS.pdfjadetex    = .;$TEXMF/tex/{jadetex,latex,generic,}//
-
-% XMLTeX.
-TEXINPUTS.xmltex        = .;$TEXMF/tex/{xmltex,latex,generic,}//
-TEXINPUTS.pdfxmltex     = .;$TEXMF/tex/{xmltex,latex,generic,}//
-
-% Miscellany, no longer built.
-TEXINPUTS.lamstex       = .;$TEXMF/tex/{lamstex,plain,generic,}//
-TEXINPUTS.lollipop      = .;$TEXMF/tex/{lollipop,plain,generic,}//
-TEXINPUTS.frpdflatex    = .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frpdftex      = .;$TEXMF/tex/{french,plain,generic,}//
-
-% Earlier entries override later ones, so put this generic one last.
-TEXINPUTS               = .;$TEXMF/tex/{$progname,generic,}//
-
-% ttf2tfm.
-TTF2TFMINPUTS =                 .;$TEXMF/ttf2pk//
-
-% Metafont, MetaPost inputs.
-MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
-MPINPUTS = .;$TEXMF/metapost//
-
-% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read.
-% We want to find the engine-specific file, e.g., cont-en.fmt can
-% exist under both pdftex/ and xetex/.  But just in case some formats
-% end up without an engine directory, look directly in web2c/ too.
-% We repeat the same definition three times because of the way fmtutil
-% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats
-% will not be found.
-TEXFORMATS = .;$TEXMF/web2c{/$engine,}
-MFBASES = .;$TEXMF/web2c{/$engine,}
-MPMEMS = .;$TEXMF/web2c{/$engine,}
-%
-% As of 2008, pool files don't exist any more (the strings are compiled
-% into the binaries), but just in case something expects to find these:
-TEXPOOL = .;$TEXMF/web2c
-MFPOOL = ${TEXPOOL}
-MPPOOL = ${TEXPOOL}
-
-% support the original xdvi.  Must come before the generic settings.
-PKFONTS.XDvi   = .;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}//
-VFFONTS.XDvi   = .;$TEXMF/%s
-PSHEADERS.XDvi = .;$TEXMF/%q{dvips,fonts/type1}//
-TEXPICTS.XDvi  = .;$TEXMF/%q{dvips,tex}//
-
-% Device-independent font metric files.
-VFFONTS = .;$TEXMF/fonts/vf//
-TFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm//
-
-% The $MAKETEX_MODE below means the drivers will not use a cx font when
-% the mode is ricoh.  If no mode is explicitly specified, kpse_prog_init
-% sets MAKETEX_MODE to /, so all subdirectories are searched.  See the manual.
-% The modeless part guarantees that bitmaps for PostScript fonts are found.
-PKFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}//
-
-% Similarly for the GF format, which only remains in existence because
-% Metafont outputs it (and MF isn't going to change).
-GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MODE//
-
-% A backup for PKFONTS and GFFONTS. Not used for anything.
-GLYPHFONTS = .;$TEXMF/fonts
-
-% A place to puth everything that doesn't fit the other font categories.
-MISCFONTS = .;$TEXMF/fonts/misc//
-
-% font name map files.  This isn't just fonts/map// because ConTeXt
-% wants support for having files with the same name in the different
-% subdirs.  Maybe if the programs ever get unified to accepting the same
-% map file syntax the definition can be simplified again.
-TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,pdftex,dvips,}//
-
-% BibTeX bibliographies and style files.  bibtex8 also uses these.
-BIBINPUTS = .;$TEXMF/bibtex/bib//
-BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}//
-
-% MlBibTeX.
-MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}//
-MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}//
-
-% .ris and .bltxml bibliography formats.
-RISINPUTS = .;$TEXMF/bibtex/ris//
-BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml//
-
-% MFT style files.
-MFTINPUTS = .;$TEXMF/mft//
-
-% PostScript headers and prologues (.pro); unfortunately, some programs
-% also use this for acessing font files (enc, type1, truetype)
-TEXPSHEADERS = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3}}//
-TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3,truetype}}//
-
-% OSFONTDIR is to provide a convenient hook for allowing TeX to find
-% fonts installed on the system (outside of TeX).  An empty default
-% value would add "//" to the search paths, so we give it a dummy value.
-% OSFONTDIR = /usr/share/fonts
-
-% PostScript Type 1 outline fonts.
-T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR//
-
-% PostScript AFM metric files.
-AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR//
-
-% TrueType outline fonts.
-TTFONTS = .;$TEXMF/fonts/{truetype,opentype}//;$OSFONTDIR//
-
-% OpenType outline fonts.
-OPENTYPEFONTS = .;$TEXMF/fonts/{opentype,truetype}//;$OSFONTDIR//
-
-% Type 42 outline fonts.
-T42FONTS = .;$TEXMF/fonts/type42//
-
-% Ligature definition files.
-LIGFONTS =  .;$TEXMF/fonts/lig//
-
-% Dvips' config.* files (this name should not start with `TEX'!).
-TEXCONFIG = $TEXMF/dvips//
-
-% Makeindex style (.ist) files.
-INDEXSTYLE = .;$TEXMF/makeindex//
-
-% Font encoding files (.enc).
-ENCFONTS = .;$TEXMF/fonts/enc//
-
-% CMap files.
-CMAPFONTS = .;$TEXMF/fonts/cmap//
-
-% Subfont definition files.
-SFDFONTS = .;$TEXMF/fonts/sfd//
-
-% OpenType feature files (.fea).
-FONTFEATURES=.;$TEXMF/fonts/fea//
-
-% .cid and .cidmap
-FONTCIDMAPS=.;$TEXMF/fonts/cid//
-
-% pdftex config files:
-PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}//
-
-% Used by DMP (ditroff-to-mpx), called by makempx -troff.
-TRFONTS = /usr{/local,}/share/groff/{current/font,site-font}/devps
-MPSUPPORT = .;$TEXMF/metapost/support
-
-% For xdvi to find mime.types and .mailcap, if they do not exist in
-% ~.  These are single directories, not paths.
-% (But the default mime.types, at least, may well suffice.)
-MIMELIBDIR = /etc
-MAILCAPLIBDIR = /etc
-
-% Default settings for the fontconfig library as used by the Windows
-% versions of xetex/xdvipdfmx.  On Unixish systems, fontconfig ignores
-% this.  ConTeXT MkIV (all platforms) also use these values.
-% 
-FONTCONFIG_FILE = fonts.conf
-FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf
-FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache
-
-% TeX documentation and source files, for use with texdoc and kpsewhich.
-TEXDOCS = $TEXMF/doc//
-TEXSOURCES = .;$TEXMF/source//
-
-% Web and CWeb input paths.
-WEBINPUTS = .;$TEXMF/web//
-CWEBINPUTS = .;$TEXMF/cweb//
-
-% Omega-related fonts and other files.
-OFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}//
-OPLFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/opl//
-OVFFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ovf,vf}//
-OVPFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp//
-OTPINPUTS = .;$TEXMF/omega/otp//
-OCPINPUTS = .;$TEXMF/omega/ocp//
-
-% Some additional input variables for several programs.  If you add
-% a program that uses the `other text files' or `other binary files'
-% search formats, you'll want to add their variables here as well.
-T4HTINPUTS   = .;$TEXMF/tex4ht//
-
-%% t4ht utility, sharing files with TeX4ht
-TEX4HTFONTSET=alias,iso8859,unicode
-TEX4HTINPUTS = .;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts/{$TEX4HTFONTSET}//
-
-% TeXworks editor configuration and settings
-TW_LIBPATH = $TEXMFCONFIG/texworks
-TW_INIPATH = $TW_LIBPATH
-
-% For security, do not look in . for dvipdfmx.cfg, since the D option
-% would allow command execution.
-DVIPDFMXINPUTS = $TEXMF/dvipdfmx
-
-% Lua needs to look in TEXINPUTS for lua scripts distributed with packages.
-% 
-% But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in
-% the environment with a colon, say, TEXINPUTS=/some/dir:, the intended
-% default expansion of TEXINPUTS will not happen and .lua files under
-% the /tex/ will not be found.
-% 
-% So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex.
-% The default LUAINPUTS sufficess for luatex and dviluatex.
-%
-LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,}//
-
-% Lua needs to look for binary lua libraries distributed with packages.
-CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua//
-
-% Architecture independent executables.
-TEXMFSCRIPTS = $TEXMF/scripts/{$progname,$engine,}//
-
-% Other languages.
-JAVAINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/java//
-PERLINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/perl//
-PYTHONINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/python//
-RUBYINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
-
-
-%% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment.
-% KPSE_DOT = .
-
-% This definition isn't used from this .cnf file itself (that would be
-% paradoxical), but the compile-time default in paths.h is built from it.
-% The SELFAUTO* variables are set automatically from the location of
-% argv[0], in kpse_set_program_name.
-% 
-% This main texmf.cnf file is installed, for a release YYYY, in a
-% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf.
-% Since this file is subject to future updates, the TeX Live installer
-% or human administrator may also create a file
-% /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file
-% will take precedence over the distributed one under texmf/web2c.
-% 
-% For security reasons, it is better not to include . in this path.
-%
-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
-
-% kpathsea 3.5.3 and later sets these at runtime. To avoid empty
-% expansions from binaries linked against an earlier version of the
-% library, we set $progname and $engine to something non-empty:
-progname = unsetprogname
-engine = unsetengine
-
-
-%  Part 2: Options.
-
-% If this option is set to true, `tex a.b' will look first for a.b.tex
-% (within each path element), and then for a.b, i.e., we try standard
-% extensions first.  If this is false, we first look for a.b and then
-% a.b.tex, i.e., we try the name as-is first.
-%
-% Both names are always tried; the difference is the order in which they
-% are tried.  The setting applies to all searches, not just .tex.
-%
-% This setting only affects names being looked up which *already* have
-% an extension.  A name without an extension (e.g., `tex story') will
-% always have an extension added first.
-%
-% The default is true, because we already avoid adding the standard
-% extension(s) in the usual cases.  E.g., babel.sty will only look for
-% babel.sty, not babel.sty.tex, regardless of this setting.
-try_std_extension_first = t
-
-% Enable system commands via \write18{...}.  When enabled fully (set to
-% t), obviously insecure.  When enabled partially (set to p), only the
-% commands listed in shell_escape_commands are allowed.  Although this
-% is not fully secure either, it is much better, and so useful that we
-% enable it for everything but bare tex.
-shell_escape = p
-
-% No spaces in this command list.
-% 
-% The programs listed here are as safe as any we know: they either do
-% not write any output files, respect openout_any, or have hard-coded
-% restrictions similar or higher to openout_any=p.  They also have no
-% features to invoke arbitrary other programs, and no known exploitable
-% bugs.  All to the best of our knowledge.  They also have practical use
-% for being called from TeX.
-% 
-shell_escape_commands = \
-bibtex,bibtex8,\
-kpsewhich,\
-makeindex,\
-repstopdf,\
-
-% we'd like to allow:
-% dvips - but external commands can be executed, need at least -R1.
-% epspdf, ps2pdf, pstopdf - need to respect openout_any,
-%   and gs -dSAFER must be used and check for shell injection with filenames.
-% (img)convert (ImageMagick) - delegates.mgk possible misconfig, besides,
-%   without Unix convert it hardly seems worth it, and Windows convert
-%   is something completely different that destroys filesystems, so skip.
-% pygmentize - but is the filter feature insecure?
-% ps4pdf - but it calls an unrestricted latex.
-% rpdfcrop - maybe ok, but let's get experience with repstopdf first.
-% texindy,xindy - but is the module feature insecure?
-% ulqda - but requires optional SHA1.pm, so why bother.
-% tex, latex, etc. - need to forbid --shell-escape, and inherit openout_any.
-
-% plain TeX should remain unenhanced.
-shell_escape.tex = f
-shell_escape.initex = f
-
-% This is used by the Windows script wrapper for restricting searching
-% for the purportedly safe shell_escape_commands above to system
-% directories.
-TEXMF_RESTRICTED_SCRIPTS = \
-  {!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}//
-
-% Allow TeX \openin, \openout, or \input on filenames starting with `.'
-% (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)?
-% a (any)        : any file can be opened.
-% r (restricted) : disallow opening "dotfiles".
-% p (paranoid)   : as `r' and disallow going to parent directories, and
-%                  restrict absolute paths to be under $TEXMFOUTPUT.
-openout_any = p
-openin_any = a
-
-% Write .log/.dvi/etc. files here, if the current directory is unwritable.
-%TEXMFOUTPUT = /tmp
-
-% If a dynamic file creation fails, log the command to this file, in
-% either the current directory or TEXMFOUTPUT.  Set to the
-% empty string or  0  to avoid logging.
-MISSFONT_LOG = missfont.log
-
-% Set to a colon-separated list of words specifying warnings to suppress.
-% To suppress everything, use TEX_HUSH = all; this is currently equivalent to
-% TEX_HUSH = checksum:lostchar:readable:special
-% To suppress nothing, use TEX_HUSH = none or do not set the variable at all.
-TEX_HUSH = none
-
-% Allow TeX, and MF to parse the first line of an input file for
-% the %&format construct.
-parse_first_line = t
-
-% But don't parse the first line if invoked as "tex", since we want that
-% to remain Knuth-compatible.  The src_specials and
-% file_line_error_style settings, as well as the options -enctex,
-% -mltex, -8bit, etc., also affect this, but they are all off by default.
-parse_first_line.tex = f
-parse_first_line.initex = f
-
-% Control file:line:error style messages.
-file_line_error_style = f
-
-% Enable the mktex... scripts by default?  These must be set to 0 or 1.
-% Particular programs can and do override these settings, for example
-% dvips's -M option.  Your first chance to specify whether the scripts
-% are invoked by default is at configure time.
-%
-% These values are ignored if the script names are changed; e.g., if you
-% set DVIPSMAKEPK to `foo', what counts is the value of the environment
-% variable/config value `FOO', not the `MKTEXPK' value.
-%
-%MKTEXTEX = 0
-%MKTEXPK = 0
-%MKTEXMF = 0
-%MKTEXTFM = 0
-%MKTEXFMT = 0
-%MKOCP = 0
-%MKOFM = 0
-
-% Used by makempx to run TeX.  We use "etex" because MetaPost is
-% expecting DVI, and not "tex" because we want first line parsing.
-TEX = etex
-
-% These variables specify the external program called for the
-% interactive `e' option.  %d is replaced by the line number and %s by
-% the current filename.  The default is specified at compile-time, and
-% we let that stay in place since different platforms like different values.
-%TEXEDIT = vi +%d '%s'                    % default for Unix
-%TEXEDIT = texworks --position=+%d "%s"   % default for Windows
-%MFEDIT = ${TEXEDIT}
-%MPEDIT = ${TEXEDIT}
-
-% The default `codepage and sort order' file for BibTeX8, when none is
-% given as command line option or environment variable.
-BIBTEX_CSFILE = 88591lat.csf
-
-% This variable is specific to Windows.  It must be set to 0 or 1.  The
-% default is 0.  Setting it to 1 tells the Windows script wrappers to
-% use an already installed Perl interpreter if one is found on the
-% search path, in preference to the Perl shipped with TeX Live.  Thus,
-% it may be useful if you both (a) installed a full Perl distribution
-% for general use, and (b) need to run Perl programs from TL that use
-% additional modules we don't provide.  The TL Perl does provide all the
-% standard Perl modules.
-%
-%TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0
-
-
-%  Part 3: Array and other sizes for TeX (and Metafont).
-%
-% If you want to change some of these sizes only for a certain TeX
-% variant, the usual dot notation works, e.g.,
-% main_memory.hugetex = 20000000
-%
-% If a change here appears to be ignored, try redumping the format file.
-
-% Memory. Must be less than 8,000,000 total.
-%
-% main_memory is relevant only to initex, extra_mem_* only to non-ini.
-% Thus, have to redump the .fmt file after changing main_memory; to add
-% to existing fmt files, increase extra_mem_*.  (To get an idea of how
-% much, try \tracingstats=2 in your TeX source file;
-% web2c/tests/memtest.tex might also be interesting.)
-%
-% To increase space for boxes (as might be needed by, e.g., PiCTeX),
-% increase extra_mem_bot.
-%
-% For some xy-pic samples, you may need as much as 700000 words of memory.
-% For the vast majority of documents, 60000 or less will do.
-%
-main_memory = 3000000 % words of inimemory available; also applies to inimf&mp
-extra_mem_top = 0     % extra high memory for chars, tokens, etc.
-extra_mem_bot = 0     % extra low memory for boxes, glue, breakpoints, etc.
-
-% ConTeXt needs lots of memory.
-extra_mem_top.context = 2000000
-extra_mem_bot.context = 4000000
-
-% Words of font info for TeX (total size of all TFM files, approximately).
-% Must be >= 20000 and <= 147483647 (without tex.ch changes).
-font_mem_size = 3000000
-
-% Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes).
-font_max = 9000
-
-% Extra space for the hash table of control sequences.
-hash_extra = 200000
-
-% Max number of characters in all strings, including all error messages,
-% help texts, font names, control sequences.  These values apply to TeX.
-pool_size = 3250000
-% Minimum pool space after TeX's own strings; must be at least
-% 25000 less than pool_size, but doesn't need to be nearly that large.
-string_vacancies = 90000
-% Maximum number of strings.
-max_strings = 500000
-% min pool space left after loading .fmt
-pool_free = 47500
-
-% Buffer size.  TeX uses the buffer to contain input lines, but macro
-% expansion works by writing material into the buffer and reparsing the
-% line.  As a consequence, certain constructs require the buffer to be
-% very large, even though most documents can be handled with a small value.
-buf_size = 200000
-
-% Hyphenation trie.  The maximum possible is 4194303 (ssup_trie_size in
-% the sources), but we don't need that much.  The value here suffices
-% for all known free hyphenation patterns to be loaded simultaneously
-% (as TeX Live does).
-%
-trie_size = 1000000
-
-hyph_size = 8191        % prime number of hyphenation exceptions, >610, <32767.
-                        % http://primes.utm.edu/curios/page.php/8191.html
-nest_size = 500         % simultaneous semantic levels (e.g., groups)
-max_in_open = 15        % simultaneous input files and error insertions, 
-                        % also applies to MetaPost
-param_size = 10000      % simultaneous macro parameters, also applies to MP
-save_size = 50000       % for saving values outside current group
-stack_size = 5000       % simultaneous input sources
-
-% These are Omega-specific.
-ocp_buf_size = 500000   % character buffers for ocp filters.
-ocp_stack_size = 10000  % stacks for ocp computations.
-ocp_list_size = 1000    % control for multiple ocps.
-
-% These work best if they are the same as the I/O buffer size, but it
-% doesn't matter much.  Must be a multiple of 8.
-dvi_buf_size = 16384 % TeX
-gf_buf_size = 16384  % MF
-
-% It's probably inadvisable to change these. At any rate, we must have:
-% 45 < error_line      < 255;
-% 30 < half_error_line < error_line - 15;
-% 60 <= max_print_line;
-% These apply to TeX, Metafont, and MetaPost.
-error_line = 79
-half_error_line = 50
-max_print_line = 79
-
-% Metafont only.
-screen_width.mf = 1664
-screen_depth.mf = 1200
-
-% BibTeX only (max_strings also determines hash_size and hash_prime).
-ent_str_size =  250
-glob_str_size = 5000
-max_strings.bibtex = 35307
-max_strings.bibtex8 = 35307
-max_strings.bibtexu = 35307
-max_strings.pbibtex = 35307
-
-% GFtype only.
-line_length.gftype = 500
-max_rows.gftype = 8191
-max_cols.gftype = 8191
diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD
index 1d196fe0b..c81afb68e 100644
--- a/extra/texmacs/PKGBUILD
+++ b/extra/texmacs/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 171430 2012-11-17 14:28:35Z ronald $
+# $Id: PKGBUILD 179001 2013-03-01 10:26:20Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: Christopher Reimer <c.reimer1993@gmail.com>
 
 pkgname=texmacs
 pkgver=1.0.7.16
-pkgrel=1
+pkgrel=2
 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.texmacs.org/"
 license=('GPL')
 depends=('perl' 'guile' 'texlive-core' 'python2' 'libxext' 'freetype2' 'shared-mime-info'
-         'desktop-file-utils' 'qt')
+         'desktop-file-utils' 'qt4')
 # do not remove texlive-core dependency, as it is needed!
 optdepends=('transfig: convert images using fig2ps'
             'gawk: conversion of some files')
diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD
index de4a198f9..0a67af680 100644
--- a/extra/thunar/PKGBUILD
+++ b/extra/thunar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173900 2012-12-27 13:11:31Z foutrelis $
+# $Id: PKGBUILD 184280 2013-05-05 17:42:44Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 pkgname=thunar
-pkgver=1.6.2
+pkgver=1.6.3
 pkgrel=1
 pkgdesc="Modern file manager for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
@@ -23,7 +23,7 @@ optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2)
-sha256sums=('7dbd172ae396e7a2533f47dc1ff703a9ea1a61af3edfdc6f4877b9b9331abd85')
+sha256sums=('9a2706f6881ac29cda9f0b0325d179153bc09e37bcbafcab9823c1c1ec89579d')
 
 build() {
   cd "$srcdir/Thunar-$pkgver"
diff --git a/extra/thunar/thunar-1.4.0-dont-add-duplicates-of-devices.patch b/extra/thunar/thunar-1.4.0-dont-add-duplicates-of-devices.patch
deleted file mode 100644
index ee8636392..000000000
--- a/extra/thunar/thunar-1.4.0-dont-add-duplicates-of-devices.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -uprb Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c Thunar-1.4.0/thunar/thunar-shortcuts-model.c
---- Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c	2012-11-03 07:42:39.000000000 +0200
-+++ Thunar-1.4.0/thunar/thunar-shortcuts-model.c	2012-11-03 08:13:25.000000000 +0200
-@@ -1221,11 +1221,25 @@ thunar_shortcuts_model_volume_added (GVo
-                                      GVolume              *volume,
-                                      ThunarShortcutsModel *model)
- {
-+  GList *lp;
-+  gint  idx;
-+
-   _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor));
-   _thunar_return_if_fail (model->volume_monitor == volume_monitor);
-   _thunar_return_if_fail (G_IS_VOLUME (volume));
-   _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
- 
-+  /* check that the volume is not in the internal list already */
-+  if (g_list_find (model->hidden_volumes, volume) != NULL)
-+    return;
-+
-+  /* nor in the list of visible volumes */
-+  for (idx = 0, lp = model->shortcuts; lp != NULL; ++idx, lp = lp->next)
-+    {
-+      if (THUNAR_SHORTCUT (lp->data)->volume == volume)
-+        return;
-+    }
-+
-   /* place the volume on the hidden list */
-   model->hidden_volumes = g_list_prepend (model->hidden_volumes, g_object_ref (volume));
- 
-diff -uprb Thunar-1.4.0.orig/thunar/thunar-tree-model.c Thunar-1.4.0/thunar/thunar-tree-model.c
---- Thunar-1.4.0.orig/thunar/thunar-tree-model.c	2012-11-03 07:42:39.000000000 +0200
-+++ Thunar-1.4.0/thunar/thunar-tree-model.c	2012-11-03 08:09:36.000000000 +0200
-@@ -1127,11 +1127,26 @@ thunar_tree_model_volume_added (GVolumeM
-                                 GVolume                *volume,
-                                 ThunarTreeModel        *model)
- {
-+  ThunarTreeModelItem *item = NULL;
-+  GNode               *node;
-+
-   _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor));
-   _thunar_return_if_fail (model->volume_monitor == volume_monitor);
-   _thunar_return_if_fail (G_IS_VOLUME (volume));
-   _thunar_return_if_fail (THUNAR_IS_TREE_MODEL (model));
- 
-+  /* check that the volume is not in the internal list already */
-+  if (g_list_find (model->hidden_volumes, volume) != NULL)
-+    return;
-+
-+  /* nor in the list of visible volumes */
-+  for (node = model->root->children; node != NULL; node = node->next)
-+    {
-+      item = THUNAR_TREE_MODEL_ITEM (node->data);
-+      if (item->volume == volume)
-+        return;
-+    }
-+
-   /* place the volume on the hidden list */
-   model->hidden_volumes = g_list_prepend (model->hidden_volumes, g_object_ref (volume));
- 
diff --git a/extra/thunar/thunar-1.4.0-show-loop-devices-hack.patch b/extra/thunar/thunar-1.4.0-show-loop-devices-hack.patch
deleted file mode 100644
index 95bbc6665..000000000
--- a/extra/thunar/thunar-1.4.0-show-loop-devices-hack.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -upr Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c Thunar-1.4.0/thunar/thunar-gio-extensions.c
---- Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c	2012-05-26 07:03:39.000000000 +0300
-+++ Thunar-1.4.0/thunar/thunar-gio-extensions.c	2012-05-26 07:05:06.000000000 +0300
-@@ -550,6 +550,11 @@ thunar_g_volume_is_present (GVolume *vol
-       has_media = g_drive_has_media (drive);
-       g_object_unref (drive);
-     }
-+  else
-+    {
-+      /* XXX: hack to show loop devices with gvfs 1.12 / udisks2 */
-+      has_media = g_volume_can_mount (volume);
-+    }
- 
-   mount = g_volume_get_mount (volume);
-   if (mount != NULL)
diff --git a/extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch b/extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch
deleted file mode 100644
index d054180b5..000000000
--- a/extra/thunar/thunar-1.6.0-show-nodisplay-true-applications.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 6b5c1c908b60965825407fb4557d024514a4f89a Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick@xfce.org>
-Date: Wed, 05 Dec 2012 17:34:38 +0000
-Subject: Show NoDisplay=true applications (bug #9595).
-
-See http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html
----
-diff --git a/thunar/thunar-chooser-button.c b/thunar/thunar-chooser-button.c
-index f7ae355..f2993b8 100644
---- a/thunar/thunar-chooser-button.c
-+++ b/thunar/thunar-chooser-button.c
-@@ -453,7 +453,6 @@ thunar_chooser_button_file_changed (ThunarChooserButton *chooser_button,
-           /* add all possible applications */
-           for (lp = app_infos, i = 0; lp != NULL; lp = lp->next, ++i)
-             {
--              /* skip infos that have NoDisplay or OnlyShowIn set */
-               if (thunar_g_app_info_should_show (lp->data))
-                 {
-                   /* insert the item into the store */
-diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c
-index d77f72a..1b9026a 100644
---- a/thunar/thunar-gio-extensions.c
-+++ b/thunar/thunar-gio-extensions.c
-@@ -569,26 +569,17 @@ gboolean
- thunar_g_app_info_should_show (GAppInfo *info)
- {
- #ifdef HAVE_GIO_UNIX
--  const gchar *filename;
--
-   _thunar_return_val_if_fail (G_IS_APP_INFO (info), FALSE);
- 
--  /* check if NoDesktop is set or OnlyShowIn is set but
--   * does not contain XFCE */
--  if (g_app_info_should_show (info))
--    return TRUE;
--
-   if (G_IS_DESKTOP_APP_INFO (info))
-     {
--      /* show custom command from the user directory, this to not
--       * exclude custom commands */
--      filename = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info));
--      if (filename != NULL
--          && g_str_has_prefix (filename, g_get_user_data_dir ()))
--        return TRUE;
-+      /* NoDisplay=true files should be visible in the interface,
-+       * because this key is intent to hide mime-helpers from the
-+       * application menu. Hidden=true is never returned by GIO. */
-+      return g_desktop_app_info_get_show_in (G_DESKTOP_APP_INFO (info), NULL);
-     }
- 
--  return FALSE;
-+  return TRUE;
- #else
-   /* we cannot exclude custom actions, so show everything */
-   return TRUE;
---
-cgit v0.9.0.3
diff --git a/extra/thunderbird/PKGBUILD b/extra/thunderbird/PKGBUILD
deleted file mode 100644
index 6d3c71623..000000000
--- a/extra/thunderbird/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 171672 2012-11-21 02:02:06Z foutrelis $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Dale Blount <dale@archlinux.org>
-# Contributor: Anders Bostrom <anders.bostrom@home.se>
-
-pkgname=thunderbird
-pkgver=17.0
-pkgrel=1
-pkgdesc="Standalone Mail/News reader"
-arch=('i686' 'x86_64')
-license=('MPL' 'GPL')
-url="http://www.mozilla.org/thunderbird/"
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13')
-optdepends=('libcanberra: for sound support')
-install=thunderbird.install
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2
-        mozconfig
-        thunderbird.desktop
-        thunderbird-install-dir.patch
-        vendor.js)
-options=(!emptydirs)
-md5sums=('f3690660044337273efb52f79cb15b0e'
-         '41511a6bcdd04cf56706218e4670e631'
-         'af3e5b344d2edf1c7d61bb0a5a96de9a'
-         '1c6f47b315a5d7830f8e901b1f723cfc'
-         '5a53179d14ae9631b7afe5e4d0fc0b25')
-
-build() {
-  cd comm-release
-  patch -Np1 -i "$srcdir/thunderbird-install-dir.patch"
-
-  cp "$srcdir/mozconfig" .mozconfig
-
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird"
-  export PYTHON="/usr/bin/python2"
-
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-}
-
-package() {
-  cd comm-release
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/thunderbird/defaults/preferences/vendor.js"
-
-  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
-      install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \
-          "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png"
-  done
-
-  install -Dm644 "$srcdir/thunderbird.desktop" \
-      "$pkgdir/usr/share/applications/thunderbird.desktop"
-
-  rm -rf "$pkgdir"/usr/lib/thunderbird/{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries"
-  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation"
-
-  # We don't want the development stuff
-  rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel,share/idl}
-}
diff --git a/extra/thunderbird/mozconfig b/extra/thunderbird/mozconfig
deleted file mode 100644
index 8950db703..000000000
--- a/extra/thunderbird/mozconfig
+++ /dev/null
@@ -1,40 +0,0 @@
-mk_add_options MOZ_CO_PROJECT=mail
-ac_add_options --enable-application=mail
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-#ac_add_options --enable-system-cairo
-ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-official-branding
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
diff --git a/extra/thunderbird/thunderbird-install-dir.patch b/extra/thunderbird/thunderbird-install-dir.patch
deleted file mode 100644
index 871b7bc47..000000000
--- a/extra/thunderbird/thunderbird-install-dir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -upr comm-release.orig/config/baseconfig.mk comm-release/config/baseconfig.mk
---- comm-release.orig/config/baseconfig.mk	2012-11-21 03:19:15.000000000 +0200
-+++ comm-release/config/baseconfig.mk	2012-11-21 03:20:35.000000000 +0200
-@@ -1,9 +1,9 @@
- INCLUDED_AUTOCONF_MK = 1
- 
--includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+includedir := $(includedir)/$(MOZ_APP_NAME)
-+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- MOZILLA_SRCDIR = $(topsrcdir)/mozilla
- MOZDEPTH = $(DEPTH)/mozilla
- DIST = $(MOZDEPTH)/dist
-diff -upr comm-release.orig/mozilla/config/baseconfig.mk comm-release/mozilla/config/baseconfig.mk
---- comm-release.orig/mozilla/config/baseconfig.mk	2012-11-21 03:19:16.000000000 +0200
-+++ comm-release/mozilla/config/baseconfig.mk	2012-11-21 03:19:20.000000000 +0200
-@@ -1,9 +1,9 @@
- INCLUDED_AUTOCONF_MK = 1
- 
--includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+includedir := $(includedir)/$(MOZ_APP_NAME)
-+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- DIST = $(DEPTH)/dist
- 
- # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff -upr comm-release.orig/mozilla/js/src/config/baseconfig.mk comm-release/mozilla/js/src/config/baseconfig.mk
---- comm-release.orig/mozilla/js/src/config/baseconfig.mk	2012-11-21 03:19:15.000000000 +0200
-+++ comm-release/mozilla/js/src/config/baseconfig.mk	2012-11-21 03:19:20.000000000 +0200
-@@ -1,7 +1,7 @@
- INCLUDED_AUTOCONF_MK = 1
- 
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- 
- ifneq (,$(filter /%,$(TOP_DIST)))
- DIST = $(TOP_DIST)
diff --git a/extra/thunderbird/thunderbird.desktop b/extra/thunderbird/thunderbird.desktop
deleted file mode 100644
index a626e52ba..000000000
--- a/extra/thunderbird/thunderbird.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Thunderbird
-Comment=Mail & News Reader
-GenericName=Mail Client & News Reader
-Exec=thunderbird %u
-TryExec=thunderbird
-Icon=thunderbird
-Terminal=false
-Type=Application
-Categories=Network;Email;
-MimeType=message/rfc822;x-scheme-handler/mailto;
-StartupNotify=true
diff --git a/extra/thunderbird/vendor.js b/extra/thunderbird/vendor.js
deleted file mode 100644
index 170b505a8..000000000
--- a/extra/thunderbird/vendor.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default mailer checking.
-pref("mail.shell.checkDefaultMail", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);
diff --git a/extra/timidity++/2.13.2-gcc4.patch b/extra/timidity++/2.13.2-gcc4.patch
deleted file mode 100644
index af0b5f8f7..000000000
--- a/extra/timidity++/2.13.2-gcc4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur TiMidity++-2.13.2-orig/interface/xaw_i.c TiMidity++-2.13.2/interface/xaw_i.c
---- TiMidity++-2.13.2-orig/interface/xaw_i.c	2005-06-25 21:55:19.000000000 -0400
-+++ TiMidity++-2.13.2/interface/xaw_i.c	2005-06-25 21:56:01.000000000 -0400
-@@ -261,7 +261,7 @@
- String bitmapdir = XAW_BITMAP_DIR;
- Boolean arrangetitle,savelist;
- static char **current_flist = NULL;
--static int voices = 0, last_voice = 0, voices_num_width;
-+static int xaw_i_voices = 0, last_voice = 0, voices_num_width;
- static int maxentry_on_a_menu = 0,submenu_n = 0;
- #define OPTIONS_WINDOW 1
- #define FLIST_WINDOW 2
-@@ -1329,7 +1329,7 @@
-     c= *(local_buf+1);
-     n= atoi(local_buf+2);
-     if(c == 'L')
--      voices = n;
-+      xaw_i_voices = n;
-     else
-       last_voice = n;
-     if(IsTracePlaying()) drawVoices();
-@@ -2070,7 +2070,7 @@
-   XSetForeground(disp, gct, tracecolor);
-   XFillRectangle(disp,XtWindow(trace),gct,voices_num_width +4,
-                  MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+1,VOICENUM_WIDTH,TRACE_FOOT);  
--  sprintf(local_buf, "%3d/%d", last_voice, voices);
-+  sprintf(local_buf, "%3d/%d", last_voice, xaw_i_voices);
-   XSetForeground(disp, gct, capcolor);  
-   XDrawString(disp, XtWindow(trace),gct,voices_num_width+6,
-               MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+16,local_buf,strlen(local_buf));
diff --git a/extra/timidity++/PKGBUILD b/extra/timidity++/PKGBUILD
index 439939459..151d036f4 100644
--- a/extra/timidity++/PKGBUILD
+++ b/extra/timidity++/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173850 2012-12-25 00:34:49Z foutrelis $
+# $Id: PKGBUILD 182711 2013-04-13 07:33:18Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=timidity++
 pkgver=2.14.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A MIDI to WAVE converter and player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://timidity.sourceforge.net"
@@ -14,10 +14,9 @@ optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface
             'xaw3d: for using the Xaw interface')
 backup=('etc/timidity++/timidity.cfg')
 source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.xz \
-        timidity.cfg timidity++.sh timidity.service)
+        timidity.cfg timidity.service)
 sha1sums=('15ec27f1ea3e718a8d61603521fc16df5c0dd24b'
           '660b3afbb720d26e8f008034cee66dd8da082d6e'
-          '9f3e732a7ca1e97119a76df62ecf154df04d4f77'
           'f0351b9eb8928d3d82c380107654a7dbe7cd2d54')
 
 build() {
@@ -35,6 +34,5 @@ package() {
   cd "${srcdir}/TiMidity++-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -D -m644 ../timidity.cfg "${pkgdir}/etc/timidity++/timidity.cfg"
-  install -D -m755 ../timidity++.sh "${pkgdir}/etc/rc.d/timidity++"
   install -D -m644 ../timidity.service "${pkgdir}/usr/lib/systemd/system/timidity.service"
 }
diff --git a/extra/timidity++/TiMidity++-2.13.2+flac-1.1.3.patch b/extra/timidity++/TiMidity++-2.13.2+flac-1.1.3.patch
deleted file mode 100644
index 200d011a3..000000000
--- a/extra/timidity++/TiMidity++-2.13.2+flac-1.1.3.patch
+++ /dev/null
@@ -1,349 +0,0 @@
-diff -urN TiMidity++-2.13.2.orig/configure.in TiMidity++-2.13.2/configure.in
---- TiMidity++-2.13.2.orig/configure.in	2004-10-03 15:39:52 +0300
-+++ TiMidity++-2.13.2/configure.in	2007-02-19 13:06:42 +0200
-@@ -1216,11 +1216,39 @@
-       EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBFLAC_CFLAGS)
-       LIBS="$LIBS $LIBFLAC_LIBS"
-     ])
--    AM_PATH_LIBOGGFLAC([
--      EXTRADEFS="$EXTRADEFS -DAU_OGGFLAC"
--      EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBOGGFLAC_CFLAGS)
--      LIBS="$LIBS $LIBOGGFLAC_LIBS"
--    ])
-+    # in FLAC-1.1.3, libOggFLAC was merged into libFLAC
-+    # FLAC_API_VERSION_CURRENT first appears in FLAC-1.1.3
-+    AC_MSG_CHECKING(for legacy libFLAC (<1.1.13))
-+    ac_save_LIBS="$LIBS"
-+    LIBS=
-+    AC_TRY_RUN([
-+    #include <FLAC/export.h>
-+    int main () { return FLAC_API_VERSION_CURRENT<8; }
-+    ],legacy_flac=no,legacy_flac=yes,legacy_flac=no)
-+    AC_MSG_RESULT($legacy_flac)
-+    LIBS="$ac_save_LIBS"
-+    if test "x$legacy_flac" = xyes; then
-+      AM_PATH_LIBOGGFLAC([
-+        EXTRADEFS="$EXTRADEFS -DAU_OGGFLAC"
-+        EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$LIBOGGFLAC_CFLAGS)
-+        LIBS="$LIBS $LIBOGGFLAC_LIBS"
-+      ])
-+    else
-+      
-+      AC_MSG_CHECKING(for Ogg support in libFLAC )
-+      ac_save_LIBS="$LIBS"
-+      LIBS="-lFLAC -lm -logg"
-+      AC_TRY_RUN([
-+      #include <FLAC/export.h>
-+      int main () { return !FLAC_API_SUPPORTS_OGG_FLAC; }
-+      ],ogg_flac=yes,ogg_flac=yes,ogg_flac=no)
-+      AC_MSG_RESULT($ogg_flac)
-+      LIBS="$ac_save_LIBS"
-+      if test "x$ogg_flac" = xyes; then    
-+        LIBS="$LIBS -logg"
-+        CFLAGS="$CFLAGS -DAU_OGGFLAC"
-+      fi
-+    fi
-   else
-     AC_MSG_RESULT(no)
-   fi
-diff -urN TiMidity++-2.13.2.orig/timidity/flac_a.c TiMidity++-2.13.2/timidity/flac_a.c
---- TiMidity++-2.13.2.orig/timidity/flac_a.c	2004-05-23 07:35:44 +0300
-+++ TiMidity++-2.13.2/timidity/flac_a.c	2007-02-19 13:06:55 +0200
-@@ -38,14 +38,22 @@
- 
- #if defined(AU_FLAC_DLL) || defined(AU_OGGFLAC_DLL)
- #include <windows.h>
--#define FLAC__EXPORT_H  /* don't include "OggFLAC/export.h" */
--#define FLAC_API
--#define OggFLAC__EXPORT_H  /* don't include "FLAC/export.h" */
--#define OggFLAC_API
-+#include <FLAC/export.h> /* need export.h to figure out API version from FLAC_API_VERSION_CURRENT */
-+#undef FLAC_API
-+#undef OggFLAC_API
- #endif
- 
- #include <FLAC/all.h>
--#ifdef AU_OGGFLAC
-+
-+/* by LEGACY_FLAC we mean before FLAC 1.1.3 */
-+/* in FLAC 1.1.3, libOggFLAC is merged into libFLAC and all encoding layers are merged into the stream encoder */
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
-+#if defined(LEGACY_FLAC) && defined(AU_OGGFLAC)
- #include <OggFLAC/stream_encoder.h>
- #endif
- 
-@@ -100,17 +108,21 @@
-   unsigned long out_bytes;
-   union {
-     FLAC__StreamEncoderState flac;
-+#ifdef LEGACY_FLAC
-     FLAC__SeekableStreamEncoderState s_flac;
- #ifdef AU_OGGFLAC
-     OggFLAC__StreamEncoderState ogg;
- #endif
-+#endif
-   } state;
-   union {
-     union {
-       FLAC__StreamEncoder *stream;
-+#ifdef LEGACY_FLAC
-       FLAC__SeekableStreamEncoder *s_stream;
-+#endif
-     } flac;
--#ifdef AU_OGGFLAC
-+#if defined(LEGACY_FLAC) && defined(AU_OGGFLAC)
-     union {
-       OggFLAC__StreamEncoder *stream;
-     } ogg;
-@@ -158,7 +170,7 @@
- static long serial_number = 0;
- FLAC_ctx *flac_ctx = NULL;
- 
--#ifdef AU_OGGFLAC
-+#if defined(LEGACY_FLAC) && defined(AU_OGGFLAC)
- static FLAC__StreamEncoderWriteStatus
- ogg_stream_encoder_write_callback(const OggFLAC__StreamEncoder *encoder,
- 				  const FLAC__byte buffer[],
-@@ -168,8 +180,13 @@
- static FLAC__StreamEncoderWriteStatus
- flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder,
- 				   const FLAC__byte buffer[],
-+#ifdef LEGACY_FLAC
- 				   unsigned bytes, unsigned samples,
-+#else
-+				   size_t bytes, unsigned samples,
-+#endif
- 				   unsigned current_frame, void *client_data);
-+#ifdef LEGACY_FLAC
- static void flac_stream_encoder_metadata_callback(const FLAC__StreamEncoder *encoder,
- 						  const FLAC__StreamMetadata *metadata,
- 						  void *client_data);
-@@ -181,6 +198,7 @@
- static void flac_seekable_stream_encoder_metadata_callback(const FLAC__SeekableStreamEncoder *encoder,
- 						  const FLAC__StreamMetadata *metadata,
- 						  void *client_data);
-+#endif
- 
- /* preset */
- void flac_set_compression_level(int compression_level)
-@@ -281,7 +299,11 @@
- #ifdef AU_OGGFLAC
- void flac_set_option_oggflac(int isogg)
- {
-+#ifdef LEGACY_FLAC
-   flac_options.isogg = isogg;
-+#else
-+  flac_options.isogg = (FLAC_API_SUPPORTS_OGG_FLAC && isogg);
-+#endif
- }
- #endif
- 
-@@ -295,6 +317,7 @@
-   dpm.fd = -1;
- 
-   if (ctx != NULL) {
-+#ifdef LEGACY_FLAC
- #ifdef AU_OGGFLAC
-     if (flac_options.isogg) {
-       if (ctx->encoder.ogg.stream) {
-@@ -317,6 +340,12 @@
- 	FLAC__stream_encoder_delete(ctx->encoder.flac.stream);
-       }
-     }
-+#else
-+    if (ctx->encoder.flac.stream) {
-+      FLAC__stream_encoder_finish(ctx->encoder.flac.stream);
-+      FLAC__stream_encoder_delete(ctx->encoder.flac.stream);
-+    }
-+#endif
-     free(ctx);
-     flac_ctx = NULL;
-   }
-@@ -329,6 +358,9 @@
-   FLAC__StreamMetadata padding;
-   FLAC__StreamMetadata *metadata[4];
-   int num_metadata = 0;
-+#ifndef LEGACY_FLAC
-+  FLAC__StreamEncoderInitStatus init_status;
-+#endif
- 
-   FLAC_ctx *ctx;
- 
-@@ -371,6 +403,7 @@
-     metadata[num_metadata++] = &padding;
-   }
- 
-+#ifdef LEGACY_FLAC
- #ifdef AU_OGGFLAC
-   if (flac_options.isogg) {
-     if ((ctx->encoder.ogg.stream = OggFLAC__stream_encoder_new()) == NULL) {
-@@ -542,6 +575,67 @@
-       return -1;
-     }
-   }
-+#else /* !LEGACY_FLAC */
-+	if ((ctx->encoder.flac.stream = FLAC__stream_encoder_new()) == NULL) {
-+		ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC stream");
-+		flac_session_close();
-+		return -1;
-+	}
-+
-+#ifdef AU_OGGFLAC
-+  if (flac_options.isogg) {
-+    /* set sequential number for serial */
-+    serial_number++;
-+    if (serial_number == 1) {
-+      srand(time(NULL));
-+      serial_number = rand();
-+    }
-+    FLAC__stream_encoder_set_ogg_serial_number(ctx->encoder.flac.stream, serial_number);
-+  }
-+#endif /* AU_OGGFLAC */
-+	FLAC__stream_encoder_set_channels(ctx->encoder.flac.stream, nch);
-+	/* 16bps only */
-+	FLAC__stream_encoder_set_bits_per_sample(ctx->encoder.flac.stream, 16);
-+
-+	FLAC__stream_encoder_set_verify(ctx->encoder.flac.stream, flac_options.verify);
-+
-+	if (!FLAC__format_sample_rate_is_valid(dpm.rate)) {
-+		ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "invalid sampling rate %d", dpm.rate);
-+		flac_session_close();
-+		return -1;
-+	}
-+	FLAC__stream_encoder_set_sample_rate(ctx->encoder.flac.stream, dpm.rate);
-+
-+	FLAC__stream_encoder_set_qlp_coeff_precision(ctx->encoder.flac.stream, flac_options.qlp_coeff_precision);
-+	/* expensive! */
-+	FLAC__stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.flac.stream, flac_options.qlp_coeff_precision_search);
-+
-+	if (nch == 2) {
-+		FLAC__stream_encoder_set_do_mid_side_stereo(ctx->encoder.flac.stream, flac_options.mid_side);
-+		FLAC__stream_encoder_set_loose_mid_side_stereo(ctx->encoder.flac.stream, flac_options.adaptive_mid_side);
-+	}
-+
-+	FLAC__stream_encoder_set_max_lpc_order(ctx->encoder.flac.stream, flac_options.max_lpc_order);
-+	FLAC__stream_encoder_set_min_residual_partition_order(ctx->encoder.flac.stream, flac_options.min_residual_partition_order);
-+	FLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.flac.stream, flac_options.max_residual_partition_order);
-+
-+	FLAC__stream_encoder_set_blocksize(ctx->encoder.flac.stream, flac_options.blocksize);
-+
-+	if (0 < num_metadata)
-+		FLAC__stream_encoder_set_metadata(ctx->encoder.flac.stream, metadata, num_metadata);
-+
-+#ifdef AU_OGGFLAC
-+  if (flac_options.isogg)
-+		init_status = FLAC__stream_encoder_init_ogg_stream(ctx->encoder.flac.stream, NULL, flac_stream_encoder_write_callback, NULL, NULL, NULL, ctx);
-+  else
-+#endif
-+	init_status = FLAC__stream_encoder_init_stream(ctx->encoder.flac.stream, flac_stream_encoder_write_callback, NULL, NULL, NULL, ctx);
-+	if (init_status != FLAC__STREAM_ENCODER_INIT_STATUS_OK) {
-+		ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC encoder (init status: %s)", FLAC__StreamEncoderInitStatusString[init_status]);
-+		flac_session_close();
-+		return -1;
-+	}
-+#endif
- 
-   return 0;
- }
-@@ -638,7 +732,7 @@
-   return 0;
- }
- 
--#ifdef AU_OGGFLAC
-+#if defined(LEGACY_FLAC) && defined(AU_OGGFLAC)
- static FLAC__StreamEncoderWriteStatus
- ogg_stream_encoder_write_callback(const OggFLAC__StreamEncoder *encoder,
- 				  const FLAC__byte buffer[],
-@@ -658,7 +752,11 @@
- static FLAC__StreamEncoderWriteStatus
- flac_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder,
- 				   const FLAC__byte buffer[],
-+#ifdef LEGACY_FLAC
- 				   unsigned bytes, unsigned samples,
-+#else
-+				   size_t bytes, unsigned samples,
-+#endif
- 				   unsigned current_frame, void *client_data)
- {
-   FLAC_ctx *ctx = (FLAC_ctx *)client_data;
-@@ -670,6 +768,7 @@
-   else
-     return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
- }
-+#ifdef LEGACY_FLAC
- static void flac_stream_encoder_metadata_callback(const FLAC__StreamEncoder *encoder,
- 						  const FLAC__StreamMetadata *metadata,
- 						  void *client_data)
-@@ -695,6 +794,7 @@
- 						  void *client_data)
- {
- }
-+#endif
- 
- static int output_data(char *buf, int32 nbytes)
- {
-@@ -723,6 +823,7 @@
-     oggbuf[i] = *s++;
-   }
- 
-+#ifdef LEGACY_FLAC
- #ifdef AU_OGGFLAC
-   if (flac_options.isogg) {
-     ctx->state.ogg = OggFLAC__stream_encoder_get_state(ctx->encoder.ogg.stream);
-@@ -793,6 +894,29 @@
-       return -1;
-     }
-   }
-+#else /* !LEGACY_FLAC */
-+  ctx->state.flac = FLAC__stream_encoder_get_state(ctx->encoder.flac.stream);
-+  if (ctx->state.flac != FLAC__STREAM_ENCODER_OK) {
-+    if (ctx->state.flac == FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR |
-+	FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA) {
-+      ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream verify error (%s)",
-+		FLAC__StreamDecoderStateString[FLAC__stream_encoder_get_verify_decoder_state(ctx->encoder.flac.stream)]);
-+    }
-+    else {
-+      ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode FLAC stream (%s)",
-+		FLAC__StreamEncoderStateString[ctx->state.flac]);
-+    }
-+    flac_session_close();
-+    return -1;
-+  }
-+
-+  if (!FLAC__stream_encoder_process_interleaved(ctx->encoder.flac.stream, oggbuf,
-+						nbytes / nch / 2 )) {
-+    ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode FLAC stream");
-+    flac_session_close();
-+    return -1;
-+  }
-+#endif
-   ctx->in_bytes += nbytes;
- 
-   free(oggbuf);
-@@ -813,6 +937,7 @@
-     return;
-   }
- 
-+#ifdef LEGACY_FLAC
-   if (flac_options.isogg) {
- #ifdef AU_OGGFLAC
-     if ((ctx->state.ogg = OggFLAC__stream_encoder_get_state(ctx->encoder.ogg.stream)) != OggFLAC__STREAM_ENCODER_OK) {
-@@ -838,6 +963,13 @@
-       /* fall through */
-     }
-   }
-+#else /* !LEGACY_FLAC */
-+  if ((ctx->state.flac = FLAC__stream_encoder_get_state(ctx->encoder.flac.stream)) != FLAC__STREAM_ENCODER_OK) {
-+    ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream encoder is invalid (%s)",
-+	      FLAC__StreamEncoderStateString[ctx->state.flac]);
-+    /* fall through */
-+  }
-+#endif
- 
-   ctl->cmsg(CMSG_INFO, VERB_NORMAL, "Wrote %lu/%lu bytes(%g%% compressed)",
-             ctx->out_bytes, ctx->in_bytes, ((double)ctx->out_bytes / (double)ctx->in_bytes) * 100.);
diff --git a/extra/timidity++/timidity++-2.13.2-exiterror.patch b/extra/timidity++/timidity++-2.13.2-exiterror.patch
deleted file mode 100644
index 01a83fead..000000000
--- a/extra/timidity++/timidity++-2.13.2-exiterror.patch
+++ /dev/null
@@ -1,695 +0,0 @@
-diff -ur TiMidity++-2.13.2/interface/alsaseq_c.c TiMidity++-2.13.2-new/interface/alsaseq_c.c
---- TiMidity++-2.13.2/interface/alsaseq_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/alsaseq_c.c	2005-01-02 03:39:15.968158520 +0100
-@@ -177,7 +177,7 @@
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
- static void ctl_event(CtlEvent *e);
--static void ctl_pass_playing_list(int n, char *args[]);
-+static int ctl_pass_playing_list(int n, char *args[]);
- 
- /**********************************/
- /* export the interface functions */
-@@ -308,7 +308,7 @@
-         return 0;
- }
- 
--static void ctl_pass_playing_list(int n, char *args[])
-+static int ctl_pass_playing_list(int n, char *args[])
- {
- 	double btime;
- 	int i, j;
-@@ -323,7 +323,7 @@
- 
- 	if (alsa_seq_open(&alsactx.handle) < 0) {
- 		fprintf(stderr, "error in snd_seq_open\n");
--		return;
-+		return 1;
- 	}
- 	alsactx.queue = -1;
- 	alsactx.client = snd_seq_client_id(alsactx.handle);
-@@ -342,7 +342,7 @@
- 		int port;
- 		port = alsa_create_port(alsactx.handle, i);
- 		if (port < 0)
--			return;
-+			return 1;
- 		alsactx.port[i] = port;
- 		alsa_set_timestamping(&alsactx, port);
- 		printf(" %d:%d", alsactx.client, alsactx.port[i]);
-@@ -411,6 +411,7 @@
- 		server_reset();
- 		doit(&alsactx);
- 	}
-+	return 0;
- }
- 
- /*
-diff -ur TiMidity++-2.13.2/interface/emacs_c.c TiMidity++-2.13.2-new/interface/emacs_c.c
---- TiMidity++-2.13.2/interface/emacs_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/emacs_c.c	2005-01-02 03:02:02.000000000 +0100
-@@ -78,7 +78,7 @@
- static void ctl_close(void);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static void ctl_event(CtlEvent *e);
- static int read_ready(void);
- static int emacs_type = 0; /* 0:emacs, 1:mule, 2:??
-@@ -249,7 +249,7 @@
-     return s;
- }
- 
--static void ctl_pass_playing_list(int argc, char *argv[])
-+static int ctl_pass_playing_list(int argc, char *argv[])
- {
-     int i;
-     char cmd[BUFSIZ];
-@@ -274,7 +274,7 @@
-     {
- 	for(i = 1; i < argc; i++)
- 	    play_midi_file(argv[i]);
--	return;
-+	return 0;
-     }
- 
-     /* Main Loop */
-@@ -296,11 +296,11 @@
- 		ctl_refresh();
- 		break;
- 	      case RC_QUIT:
--		return;
-+		return 0;
- 	    } /* skipping others command */
- 	}
- 	else if(!strncmp(cmd, "QUIT", 4))
--	    return;
-+	    return 0;
- 	else
- 	    continue; /* skipping unknown command */
-     }
-diff -ur TiMidity++-2.13.2/interface/gtk_c.c TiMidity++-2.13.2-new/interface/gtk_c.c
---- TiMidity++-2.13.2/interface/gtk_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/gtk_c.c	2005-01-02 03:35:53.447946272 +0100
-@@ -57,7 +57,7 @@
- 
- static int ctl_open(int using_stdin, int using_stdout);
- static void ctl_close(void);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
- static void ctl_event(CtlEvent *e);
-@@ -528,7 +528,7 @@
- #endif
- }
- 
--static void
-+static int 
- ctl_pass_playing_list(int number_of_files, char *list_of_files[])
- {
-     int i=0;
-@@ -558,7 +558,7 @@
- 	}
- 	else {
- 	    if (command==RC_QUIT)
--		return;
-+		return 0;
- 	    if (command==RC_ERROR)
- 		command=RC_TUNE_END; /* Launch next file */
- 	    
-@@ -580,6 +580,7 @@
- 	    command = ctl_blocking_read(&val);
- 	}
-     }
-+    return 0;
- }
- 
- /*
-diff -ur TiMidity++-2.13.2/interface/mac_c.c TiMidity++-2.13.2-new/interface/mac_c.c
---- TiMidity++-2.13.2/interface/mac_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/mac_c.c	2005-01-02 03:04:13.000000000 +0100
-@@ -71,7 +71,7 @@
- static void ctl_pitch_bend(int channel, int val);
- static void ctl_reset(void);
- static int ctl_open(int using_stdin, int using_stdout);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static void ctl_close(void);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
-@@ -955,7 +955,7 @@
- }
- 
- 
--static void ctl_pass_playing_list(int init_number_of_files,
-+static int ctl_pass_playing_list(int init_number_of_files,
- 				  char * /*init_list_of_files*/ [])
- {
- 	EventRecord	event;
-@@ -983,6 +983,7 @@
- 		mac_HandleEvent(&event);
- 	}	
- 	Do_Quit();
-+	return 0;
- }
- 
- static Boolean UserWantsControl()
-diff -ur TiMidity++-2.13.2/interface/motif_c.c TiMidity++-2.13.2-new/interface/motif_c.c
---- TiMidity++-2.13.2/interface/motif_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/motif_c.c	2005-01-02 03:05:04.000000000 +0100
-@@ -60,7 +60,7 @@
- static void ctl_close(void);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static void ctl_event(CtlEvent *e);
- 
- static int motif_ready = 0;
-@@ -346,12 +346,13 @@
-   return(ctl_blocking_read(valp));
- }
- 
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[])
- {
-     int i=0;
-     char file_to_play[1000];
-     int command;
-     int32 val;
-+    int retval;
- 
-     motif_ready = 1;
- 
-@@ -381,12 +382,13 @@
- 	    else
- 		{
- 		    if (command==RC_QUIT)
--			return;
-+			return 0;
- 
- 		    switch(command)
- 			{
- 			case RC_ERROR:
- 			    m_pipe_int_write(ERROR_MESSAGE);
-+			    retval=1;
- 			    break;
- 			case RC_NONE:
- 			    break;
-@@ -411,6 +413,7 @@
- 		    command = ctl_blocking_read(&val);
- 		}
- 	}
-+    return retval;
- }
- 
- /*
-diff -ur TiMidity++-2.13.2/interface/ncurs_c.c TiMidity++-2.13.2-new/interface/ncurs_c.c
---- TiMidity++-2.13.2/interface/ncurs_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/ncurs_c.c	2005-01-02 03:05:48.000000000 +0100
-@@ -174,7 +174,7 @@
- 
- static int ctl_open(int using_stdin, int using_stdout);
- static void ctl_close(void);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
- static void ctl_event(CtlEvent *e);
-@@ -3100,7 +3100,7 @@
-     reuse_mblock(&tmpbuffer);
- }
- 
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[])
- {
-     int i;
-     int act_number_of_files;
-@@ -3128,7 +3128,7 @@
- 
-     if (file_list.number<0) {
-       cmsg(CMSG_FATAL, VERB_NORMAL, "No MIDI file to play!");
--      return;
-+      return 1;
-     }
- 
-     ctl_listmode_max=1;
-@@ -3169,7 +3169,7 @@
- 		    if(!(ctl.flags & CTLF_LIST_LOOP) || stdin_check)
- 		    {
- 			aq_flush(0);
--			return;
-+			return 0;
- 		    }
- 		    i = 0;
- 		    if(rc == RC_TUNE_END)
-@@ -3187,7 +3187,7 @@
- 
- 		/* else fall through */
- 	    case RC_QUIT:
--		return;
-+		return 0;
- 	    }
- 	  ctl_reset();
- 	}
-diff -ur TiMidity++-2.13.2/interface/portmidisyn_c.c TiMidity++-2.13.2-new/interface/portmidisyn_c.c
---- TiMidity++-2.13.2/interface/portmidisyn_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/portmidisyn_c.c	2005-01-02 03:13:05.000000000 +0100
-@@ -96,7 +96,7 @@
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
- static void ctl_event(CtlEvent *e);
--static void ctl_pass_playing_list(int n, char *args[]);
-+static int ctl_pass_playing_list(int n, char *args[]);
- 
- #ifndef __W32__
- static void init_keybord(void);
-@@ -215,17 +215,17 @@
- 
- #ifdef IA_W32G_SYN
- extern void w32g_syn_doit(void);
--extern void w32g_syn_ctl_pass_playing_list(int n_, char *args_[]);
-+extern int w32g_syn_ctl_pass_playing_list(int n_, char *args_[]);
- 
- 
--static void ctl_pass_playing_list(int n, char *args[])
-+static int ctl_pass_playing_list(int n, char *args[])
- {
--	w32g_syn_ctl_pass_playing_list ( n, args );
-+	return w32g_syn_ctl_pass_playing_list ( n, args );
- }
- #endif
- 
- #ifndef IA_W32G_SYN
--static void ctl_pass_playing_list(int n, char *args[])
-+static int ctl_pass_playing_list(int n, char *args[])
- #else
- // 0: OK, 2: Require to reset.
- int ctl_pass_playing_list2(int n, char *args[])
-@@ -241,7 +241,7 @@
- #ifndef IA_W32G_SYN
- 	if(n > MAX_PORT ){
- 		printf( "Usage: timidity -iW [Midi interface No s]\n");
--		return;
-+		return 1;
- 	}
- #endif
- 
-@@ -347,11 +347,7 @@
- #endif /* USE_GTK_GUI */
- 	rtsyn_close();
- 
--#ifdef IA_W32G_SYN
- 	return 0;
--#else
--	return;
--#endif
- }
- 
- 
-diff -ur TiMidity++-2.13.2/interface/server_c.c TiMidity++-2.13.2-new/interface/server_c.c
---- TiMidity++-2.13.2/interface/server_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/server_c.c	2005-01-02 03:07:38.000000000 +0100
-@@ -176,7 +176,7 @@
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
- static void ctl_event(CtlEvent *e);
--static void ctl_pass_playing_list(int n, char *args[]);
-+static int ctl_pass_playing_list(int n, char *args[]);
- 
- /**********************************/
- /* export the interface functions */
-@@ -356,14 +356,14 @@
- static void compute_sample_increment(void);
- static void server_reset(void);
- 
--static void ctl_pass_playing_list(int n, char *args[])
-+static int ctl_pass_playing_list(int n, char *args[])
- {
-     int sock;
- 
-     if(n != 2 && n != 1)
-     {
- 	fprintf(stderr, "Usage: timidity -ir control-port [data-port]\n");
--	return;
-+	return 1;
-     }
- 
- #ifdef SIGPIPE
-@@ -379,7 +379,7 @@
-     if (control_port) {
- 	sock = pasv_open(&control_port);
- 	if(sock == -1)
--	    return;
-+	    return 1;
-     }
-     opt_realtime_playing = 1; /* Enable loading patch while playing */
-     allocate_cache_size = 0; /* Don't use pre-calclated samples */
-@@ -404,7 +404,7 @@
- 		    continue;
- 		perror("accept");
- 		close(sock);
--		return;
-+		return 1;
- 	    }
- 	}
- 	else control_fd = 0;
-@@ -446,6 +446,7 @@
- 	if (!control_port)
- 	    break;
-     }
-+    return 0;
- }
- 
- #define MAX_GETCMD_PARAMS 8
-diff -ur TiMidity++-2.13.2/interface/tk_c.c TiMidity++-2.13.2-new/interface/tk_c.c
---- TiMidity++-2.13.2/interface/tk_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/tk_c.c	2005-01-02 03:08:48.000000000 +0100
-@@ -86,7 +86,7 @@
- static void ctl_close(void);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static int ctl_blocking_read(int32 *valp);
- static void ctl_note(int status, int ch, int note, int vel);
- static void ctl_event(CtlEvent *e);
-@@ -587,7 +587,7 @@
- 	return(ctl_blocking_read(valp));
- }
- 
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[])
- {
- 	int i=0;
- 	char local[1000];
-@@ -618,7 +618,7 @@
- 				/* if really QUIT */
- 				k_pipe_gets(local, sizeof(local)-1);
- 				if (*local == 'Z')
--					return;
-+					return 0;
- 				/* only stop playing..*/
- 			}
- 			if (command==RC_CHANGE_VOLUME) /* init volume */
-@@ -646,6 +646,7 @@
- 			command = ctl_blocking_read(&val);
- 		}
- 	}
-+	return 0;
- }
- 
- 
-diff -ur TiMidity++-2.13.2/interface/w32g_c.c TiMidity++-2.13.2-new/interface/w32g_c.c
---- TiMidity++-2.13.2/interface/w32g_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/w32g_c.c	2005-01-02 03:10:03.000000000 +0100
-@@ -86,7 +86,7 @@
- 
- static int ctl_open(int using_stdin, int using_stdout);
- static void ctl_close(void);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static void ctl_event(CtlEvent *e);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
-@@ -662,7 +662,7 @@
- }
- 
- extern BOOL SetWrdWndActive(void);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[])
- {
- 	static int init_flag = 1;
-     int rc;
-@@ -779,7 +779,7 @@
- 		if(ctl.flags & CTLF_AUTOEXIT) {
- 		    if(play_mode->fd != -1)
- 			aq_flush(0);
--		    return;
-+		    return 0;
- 		}
- 		break;
- 	    }
-@@ -803,7 +803,7 @@
- 		if(ctl.flags & CTLF_AUTOEXIT){
- 		    if(play_mode->fd != -1)
- 			aq_flush(0);
--		    return;
-+		    return 0;
- 		}
- 		if((ctl.flags & CTLF_LIST_LOOP) && w32g_nvalid_playlist())
- 		{
-@@ -839,7 +839,7 @@
- 	  case RC_QUIT:
- 	    if(play_mode->fd != -1)
- 		aq_flush(1);
--	    return;
-+	    return 0;
- 
- 	  case RC_CHANGE_VOLUME:
- 	    amplification += value;
-@@ -868,6 +868,7 @@
- 	    PrefSettingApplyReally();
- 	rc = RC_NONE;
-     }
-+	return 0;
- }
- 
- static void ctl_lcd_mark(int flag, int x, int y)
-diff -ur TiMidity++-2.13.2/interface/w32g_syn.c TiMidity++-2.13.2-new/interface/w32g_syn.c
---- TiMidity++-2.13.2/interface/w32g_syn.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/w32g_syn.c	2005-01-02 03:10:49.000000000 +0100
-@@ -281,7 +281,7 @@
- static int wait_for_termination_of_syn_thread ( void );
- int w32g_message_set ( int cmd );
- int w32g_message_get ( w32g_syn_message_t *msg );
--void w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] );
-+int w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] );
- int w32g_syn_do_before_pref_apply ( void );
- int w32g_syn_do_after_pref_apply ( void );
- 
-@@ -1403,7 +1403,7 @@
- 	}
- }
- 
--void w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] )
-+int w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] )
- {
- 	int i;
- #ifndef TWSYNSRV
-@@ -1471,6 +1471,7 @@
- 	}
- #endif
- 	if ( w32g_syn.quit_state < 2 ) w32g_syn.quit_state = 2;
-+	return 0;
- }
- 
- int w32g_syn_do_before_pref_apply ( void )
-diff -ur TiMidity++-2.13.2/interface/winsyn_c.c TiMidity++-2.13.2-new/interface/winsyn_c.c
---- TiMidity++-2.13.2/interface/winsyn_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/winsyn_c.c	2005-01-02 03:11:36.000000000 +0100
-@@ -88,7 +88,7 @@
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
- static void ctl_event(CtlEvent *e);
--static void ctl_pass_playing_list(int n, char *args[]);
-+static int ctl_pass_playing_list(int n, char *args[]);
- 
- #ifndef __W32__
- static void init_keybord(void);
-@@ -207,17 +207,17 @@
- 
- #ifdef IA_W32G_SYN
- extern void w32g_syn_doit(void);
--extern void w32g_syn_ctl_pass_playing_list(int n_, char *args_[]);
-+extern int w32g_syn_ctl_pass_playing_list(int n_, char *args_[]);
- 
- 
--static void ctl_pass_playing_list(int n, char *args[])
-+static int ctl_pass_playing_list(int n, char *args[])
- {
--	w32g_syn_ctl_pass_playing_list ( n, args );
-+	return w32g_syn_ctl_pass_playing_list ( n, args );
- }
- #endif
- 
- #ifndef IA_W32G_SYN
--static void ctl_pass_playing_list(int n, char *args[])
-+static int ctl_pass_playing_list(int n, char *args[])
- #else
- // 0: OK, 2: Require to reset.
- int ctl_pass_playing_list2(int n, char *args[])
-@@ -233,7 +233,7 @@
- #ifndef IA_W32G_SYN
- 	if(n > MAX_PORT ){
- 		printf( "Usage: timidity -iW [Midi interface No s]\n");
--		return;
-+		return 1;
- 	}
- #endif
- 
-@@ -339,11 +339,7 @@
- #endif /* USE_GTK_GUI */
- 	rtsyn_close();
- 
--#ifdef IA_W32G_SYN
- 	return 0;
--#else
--	return;
--#endif
- }
- 
- 
-diff -ur TiMidity++-2.13.2/interface/xaw_c.c TiMidity++-2.13.2-new/interface/xaw_c.c
---- TiMidity++-2.13.2/interface/xaw_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/xaw_c.c	2005-01-02 03:11:57.000000000 +0100
-@@ -55,7 +55,7 @@
- static void ctl_close(void);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static void ctl_event(CtlEvent *e);
- 
- static void a_pipe_open(void);
-@@ -463,7 +463,7 @@
-   }
- }
- 
--static void ctl_pass_playing_list(int init_number_of_files,
-+static int ctl_pass_playing_list(int init_number_of_files,
-                   char *init_list_of_files[]) {
-   int current_no,command=RC_NONE,i,j;
-   int32 val;
-diff -ur TiMidity++-2.13.2/interface/xskin_c.c TiMidity++-2.13.2-new/interface/xskin_c.c
---- TiMidity++-2.13.2/interface/xskin_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/xskin_c.c	2005-01-02 03:12:31.000000000 +0100
-@@ -55,7 +55,7 @@
- static void ctl_close(void);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static void ctl_event(CtlEvent *e);
- static void ctl_speana_data(double *val, int size);
- static void initialize_exp_hz_table( void );
-@@ -342,7 +342,7 @@
-   }
- }
- 
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]) {
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]) {
- 
-   int current_no,command,i;
-   int32 val;
-@@ -403,7 +403,7 @@
-       command=play_midi_file(list_of_files[file_table[current_no]]);
-     } else {
-       /* Quit timidity*/
--      if (exitflag) return;
-+      if (exitflag) return 0;
-       /* Stop playing */
-       if (command==RC_QUIT) {
- 	sprintf(local_buf,"T 00:00");
-@@ -461,6 +461,7 @@
-       command=ctl_blocking_read(&val);
-     }
-   }
-+  return 0;
- }
- 
- /* ------ Pipe handlers ----- */
-diff -ur TiMidity++-2.13.2/timidity/controls.h TiMidity++-2.13.2-new/timidity/controls.h
---- TiMidity++-2.13.2/timidity/controls.h	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/timidity/controls.h	2005-01-02 02:59:37.000000000 +0100
-@@ -147,7 +147,7 @@
- 
-   int  (*open)(int using_stdin, int using_stdout);
-   void (*close)(void);
--  void (*pass_playing_list)(int number_of_files, char *list_of_files[]);
-+  int (*pass_playing_list)(int number_of_files, char *list_of_files[]);
-   int  (*read)(int32 *valp);
-   int  (*cmsg)(int type, int verbosity_level, char *fmt, ...);
-   void (*event)(CtlEvent *ev);	/* Control events */
-diff -ur TiMidity++-2.13.2/timidity/playmidi.c TiMidity++-2.13.2-new/timidity/playmidi.c
---- TiMidity++-2.13.2/timidity/playmidi.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/timidity/playmidi.c	2005-01-02 03:15:55.000000000 +0100
-@@ -8562,7 +8562,7 @@
-     return rc;
- }
- 
--void dumb_pass_playing_list(int number_of_files, char *list_of_files[])
-+int dumb_pass_playing_list(int number_of_files, char *list_of_files[])
- {
-     #ifndef CFG_FOR_SF
-     int i = 0;
-@@ -8586,12 +8586,12 @@
- 	    aq_flush(0);
- 
- 	    if(!(ctl->flags & CTLF_LIST_LOOP))
--		return;
-+		return 0;
- 	    i = 0;
- 	    break;
- 
- 	    case RC_QUIT:
--		return;
-+		return 0;
- 	}
-     }
-     #endif
-diff -ur TiMidity++-2.13.2/timidity/playmidi.h TiMidity++-2.13.2-new/timidity/playmidi.h
---- TiMidity++-2.13.2/timidity/playmidi.h	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/timidity/playmidi.h	2005-01-02 03:16:07.000000000 +0100
-@@ -577,7 +577,7 @@
- extern int opt_pan_delay;
- 
- extern int play_midi_file(char *fn);
--extern void dumb_pass_playing_list(int number_of_files, char *list_of_files[]);
-+extern int dumb_pass_playing_list(int number_of_files, char *list_of_files[]);
- extern void default_ctl_lyric(int lyricid);
- extern int check_apply_control(void);
- extern void recompute_freq(int v);
-diff -ur TiMidity++-2.13.2/timidity/sndfont.c TiMidity++-2.13.2-new/timidity/sndfont.c
---- TiMidity++-2.13.2/timidity/sndfont.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/timidity/sndfont.c	2005-01-02 03:15:27.000000000 +0100
-@@ -1893,7 +1893,7 @@
- 
- #if CFG_FOR_SF_SUPPORT_FFT
- int check_apply_control(void) { return 0; } // not pass
--void dumb_pass_playing_list(int number_of_files, char *list_of_files[]) {}
-+int dumb_pass_playing_list(int number_of_files, char *list_of_files[]) {return 0;}
- void recompute_freq(int v) {} // not pass
- int32 control_ratio = 0;
- int reduce_quality_flag = 0;
-diff -ur TiMidity++-2.13.2/timidity/timidity.c TiMidity++-2.13.2-new/timidity/timidity.c
---- TiMidity++-2.13.2/timidity/timidity.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/timidity/timidity.c	2005-01-02 02:59:29.000000000 +0100
-@@ -5291,6 +5291,7 @@
-     int need_stdin = 0, need_stdout = 0;
-     int i;
-     int output_fail = 0;
-+    int retval;
- 
-     if(nfiles == 0 && !strchr(INTERACTIVE_INTERFACE_IDS, ctl->id_character))
- 	return 0;
-@@ -5410,7 +5411,7 @@
- 	ctl->cmsg(CMSG_INFO, VERB_DEBUG_SILLY,
- 		  "pass_playing_list() nfiles=%d", nfiles);
- 
--	ctl->pass_playing_list(nfiles, files);
-+	retval=ctl->pass_playing_list(nfiles, files);
- 
- 	if(intr)
- 	    aq_flush(1);
-@@ -5451,7 +5452,7 @@
-     url_news_connection_cache(URL_NEWS_CLOSE_CACHE);
- #endif /* SUPPORT_SOCKET */
- 
--    return 0;
-+    return retval;
- }
- 
- #ifdef IA_W32GUI
diff --git a/extra/timidity++/timidity++-2.13.2-gtk26.patch b/extra/timidity++/timidity++-2.13.2-gtk26.patch
deleted file mode 100644
index 73dc8de6c..000000000
--- a/extra/timidity++/timidity++-2.13.2-gtk26.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- interface/gtk_i.c	2004/12/21 16:59:33	1.1
-+++ interface/gtk_i.c	2004/12/21 16:59:41
-@@ -365,6 +365,7 @@ void
- Launch_Gtk_Process(int pipe_number)
- {
-     int	argc = 0;
-+    gchar **argv = NULL;
-     GtkWidget *button, *mbar, *swin;
-     GtkWidget *table, *align, *handlebox;
-     GtkWidget *vbox, *hbox, *vbox2, *scrolled_win;
-@@ -373,7 +374,7 @@ Launch_Gtk_Process(int pipe_number)
-     /* enable locale */
-     gtk_set_locale ();
- 
--    gtk_init (&argc, NULL);
-+    gtk_init (&argc, &argv);
- 
-     ttip = create_yellow_tooltips();
-     window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
diff --git a/extra/timidity++/timidity++-2.13.2-polling.patch b/extra/timidity++/timidity++-2.13.2-polling.patch
deleted file mode 100644
index a9638dba1..000000000
--- a/extra/timidity++/timidity++-2.13.2-polling.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- interface/alsaseq_c.c	2006/12/13 23:22:53	1.28
-+++ interface/alsaseq_c.c	2008/04/16 00:14:45	1.29
-@@ -501,6 +501,8 @@
- 
- static void doit(struct seq_context *ctxp)
- {
-+	fd_set rfds;
-+	struct timeval timeout;
- 	for (;;) {
- 		while (snd_seq_event_input_pending(ctxp->handle, 1)) {
- 			if (do_sequencer(ctxp))
-@@ -528,15 +530,17 @@
- 			play_event(&ev);
- 			aq_fill_nonblocking();
- 		}
--		if (! ctxp->active || ! IS_STREAM_TRACE) {
--			fd_set rfds;
--			struct timeval timeout;
--			FD_ZERO(&rfds);
--			FD_SET(ctxp->fd, &rfds);
-+
-+		FD_ZERO(&rfds);
-+		FD_SET(ctxp->fd, &rfds);
-+		if (ctxp->active) {
- 			timeout.tv_sec = 0;
- 			timeout.tv_usec = 10000; /* 10ms */
- 			if (select(ctxp->fd + 1, &rfds, NULL, NULL, &timeout) < 0)
- 				goto __done;
-+		} else {
-+			if (select(ctxp->fd + 1, &rfds, NULL, NULL, NULL) < 0)
-+				goto __done;
- 		}
- 	}
- 
diff --git a/extra/timidity++/timidity++.sh b/extra/timidity++/timidity++.sh
deleted file mode 100644
index 3fa13cea9..000000000
--- a/extra/timidity++/timidity++.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/timidity`
-case "$1" in
-   start)
-     stat_busy "Starting Timidity++ ALSA Daemon"
-     [ -z "$PID" ] && /usr/bin/timidity -iAD > /dev/null
-     if [ $? -gt 0 ]; then
-       stat_fail
-     else
-       echo $PID > /var/run/timidity.pid
-       add_daemon timidity++
-       stat_done
-     fi
-     ;;
-   stop)
-     stat_busy "Stopping Timidity++ ALSA Daemon"
-     [ ! -z "$PID" ]  && kill $PID &> /dev/null
-     if [ $? -gt 0 ]; then
-       stat_fail
-     else
-       rm /var/run/timidity.pid
-       rm_daemon timidity++
-       stat_done
-     fi
-     ;;
-   restart)
-     $0 stop
-     sleep 1
-     $0 start
-     ;;
-   *)
-     echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD
index 807a94be2..9dde63604 100644
--- a/extra/tk/PKGBUILD
+++ b/extra/tk/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=tk
 pkgver=8.6.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A windowing toolkit for use with tcl"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tcl.sourceforge.net/"
diff --git a/extra/tomboy/PKGBUILD b/extra/tomboy/PKGBUILD
index ffda1b338..29f155d28 100644
--- a/extra/tomboy/PKGBUILD
+++ b/extra/tomboy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170922 2012-11-13 02:13:42Z heftig $
+# $Id: PKGBUILD 183462 2013-04-21 22:12:14Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=tomboy
-pkgver=1.12.2
+pkgver=1.14.0
 pkgrel=1
 pkgdesc="Desktop note-taking application for Linux and Unix"
 arch=('i686' 'x86_64')
@@ -11,10 +11,9 @@ url="http://www.gnome.org/projects/tomboy/"
 depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp' 'dbus-sharp-glib' 'mono-addins' 'hicolor-icon-theme')
 makedepends=('intltool' 'pkgconfig'  'gnome-doc-utils')
 options=('!libtool' '!emptydirs' '!makeflags')
-groups=('gnome-extra')
 install=tomboy.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ebcb23efb8eedc949eb84d4b5c9919ddaacc97198384f79ed08e97092c46e55e')
+sha256sums=('14c1e7f2c7d67d8603a7de95830c3b159779909e8a74c5a6ca9e08a2508fea18')
 
 build() {
   export MONO_SHARED_DIR="$srcdir/.wabi"
diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD
index 1eb9ed819..22e7cd0bc 100644
--- a/extra/tomcat-native/PKGBUILD
+++ b/extra/tomcat-native/PKGBUILD
@@ -2,16 +2,17 @@
 # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
 
 pkgname=tomcat-native
-pkgver=1.1.24
+pkgver=1.1.27
 pkgrel=1
-pkgdesc="The Apache Tomcat Native Library"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://tomcat.apache.org/"
-license=("Apache")
+pkgdesc='The Apache Tomcat Native Library'
+arch=('i686' 'x86_64')
+url='http://tomcat.apache.org/'
+license=('APACHE')
 depends=('apr' 'openssl')
 makedepends=('java-environment')
+options=(!emptydirs)
 source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
-md5sums=('cfd4762f2da19ba79d1b6a2a948c9d21')
+sha256sums=('7f78e71060dc029f9005490080babc45a2b702ea54263c440c52a9a7c02609e4')
 
 build() {
   cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native"
@@ -28,5 +29,4 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}-src/jni/native"
 
   make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/{bin,include}
 }
diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD
index d4fe27edd..1a687c454 100644
--- a/extra/totem-plparser/PKGBUILD
+++ b/extra/totem-plparser/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 169976 2012-10-30 22:59:47Z heftig $
+# $Id: PKGBUILD 183463 2013-04-21 22:12:16Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=totem-plparser
-pkgver=3.4.3
+pkgver=3.4.4
 pkgrel=1
 url="http://www.gnome.org"
 pkgdesc="Totem playlist parser library"
 license=('LGPL')
 arch=(i686 x86_64 'mips64el')
-depends=('gmime' 'libsoup-gnome' 'libarchive' 'libquvi')
+depends=('gmime' 'libsoup' 'libarchive' 'libquvi')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz)
-sha256sums=('ab8beed4dd5d3a5d7ed5dc8b357e94dc03a8553fef6e33c2e7fb63a76e44c42b')
+sha256sums=('b821e812da3f3e42d2f831296b4031c60a615d29857781971578ce2c0c807457')
 
 build() {
   cd totem-pl-parser-$pkgver
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index 7bd46d5b9..e68efbb37 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 173078 2012-12-10 11:38:58Z jgc $
+# $Id: PKGBUILD 183323 2013-04-21 22:06:42Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
-pkgver=3.6.3
-pkgrel=2
+pkgver=3.8.0
+pkgrel=1
 pkgdesc="GNOME3 movie player based on GStreamer"
 url="http://www.gnome.org"
 arch=('i686' 'x86_64' 'mips64el')
 license=(GPL2 custom)
 depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas
-         hicolor-icon-theme gnome-icon-theme-symbolic gsettings-desktop-schemas dconf clutter-gst
+         hicolor-icon-theme gnome-icon-theme gsettings-desktop-schemas dconf clutter-gst
          clutter-gtk python2-gobject gst-plugins-bad)
-makedepends=(intltool gnome-doc-utils nautilus vala grilo pylint dbus-glib libzeitgeist)
+makedepends=(intltool libnautilus-extension vala grilo pylint dbus-glib libzeitgeist itstool docbook-xsl)
 [ "$CARCH" != "mips64el" ] && makedepends+=('lirc-utils')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
         browser-plugins.ini)
-sha256sums=('ad9f2ff207c8a965975670e262394953b37b2dc25cff7ee59f138f961f88ce60'
+sha256sums=('74c73a5decb69572cb182005b144493c2f6e7f48d4c57851e6da33e8e76fb039'
             'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e')
 
 build() {
@@ -34,10 +34,11 @@ build() {
 }
 
 package_totem() {
-  groups=(gnome-extra)
+  groups=(gnome)
   install=totem.install
   optdepends=('gst-plugins-ugly: Extra media codecs'
-              'gst-ffmpeg: Extra media codecs'
+              'gst-libav: Extra media codecs'
+              'lirc-utils: Infrared Remote Control plugin'
               'grilo-plugins: Browse sidebar (remote media)'
               'pyxdg: opensubtitles plugin'
               'libzeitgeist: Zeitgeist plugin')
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 7d71e1bd1..358071391 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,26 +1,25 @@
-# $Id: PKGBUILD 175872 2013-01-23 00:13:08Z eric $
+# $Id: PKGBUILD 183324 2013-04-21 22:06:43Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
-pkgver=0.14.4
+pkgver=0.16.0
 _tver=${pkgver%.*}
-pkgrel=3
+pkgrel=4
 pkgdesc="All-in-one indexer, search tool and metadata database"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
-             'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3'
-             'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection'
-             'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser'
-             'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala'
-             'libgxps')
+arch=(i686 x86_64 mips64el)
+license=(GPL)
+makedepends=(libgee libsecret upower libexif exempi
+             poppler-glib libgsf icu enca networkmanager gtk3
+             desktop-file-utils hicolor-icon-theme gobject-introspection
+             intltool giflib gst-plugins-base-libs totem-plparser
+             taglib libvorbis flac vala libgxps libnautilus-extension)
 url="http://www.gnome.org"
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('b818ee42b9007a94b2f8046edc4706bb2036187d5fd304e7ae23e5d2fcf85918')
+sha256sums=('299c6a180370522d1d794c184aaef8d8222d3f737d564b8e5ca25b8751470c4f')
 
 build() {
   cd $pkgbase-$pkgver
@@ -40,19 +39,18 @@ build() {
 }
 
 package_tracker() {
-  depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring'
-           'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca'
-           'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
+  depends=("libtracker-sparql=$pkgver-$pkgrel" libgee libsecret
+           upower libexif exempi poppler-glib libgsf enca
+           networkmanager gtk3 desktop-file-utils hicolor-icon-theme)
   optdepends=('giflib: extractor for GIF data'
-              'gstreamer0.10-base: video extractor'
+              'gst-plugins-base-libs: video extractor'
               'totem-plparser: playlist support'
-              'nautilus: nautilus-extension'
               'libvorbis: Vorbis metadata extractor'
               'flac: FLAC metadata extractor'
               'taglib: writeback for audio files'
-              'gnome-panel: tracker-search-bar'
+              "nautilus: edit files' tracker tags"
               'libgxps: XPS extractor')
-  groups=('gnome-extra')
+  groups=('gnome')
   install=tracker.install
 
   cd $pkgbase-$pkgver
@@ -80,7 +78,7 @@ package_tracker() {
 
 package_libtracker-sparql() {
   pkgdesc="$pkgdesc (SPARQL library)"
-  depends=('sqlite' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux')
+  depends=(sqlite icu glib2 libffi pcre util-linux)
 
   mv "$srcdir"/sparql/* "$pkgdir"
 }
diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD
index 6ccf48d1d..171ed5edf 100644
--- a/extra/transcode/PKGBUILD
+++ b/extra/transcode/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175862 2013-01-23 00:12:53Z eric $
+# $Id: PKGBUILD 180315 2013-03-20 02:35:36Z eric $
 # Maintainer:
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: roberto <roberto@archlinux.org>
@@ -6,7 +6,7 @@
 pkgname=transcode
 _sripver=0.3-4
 pkgver=1.1.7
-pkgrel=7
+pkgrel=8
 pkgdesc="A video/DVD ripper and encoder for the terminal/console"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tcforge.berlios.de/"
diff --git a/extra/transcode/ffmpeg-0.10.patch b/extra/transcode/ffmpeg-0.10.patch
deleted file mode 100644
index 5965c180c..000000000
--- a/extra/transcode/ffmpeg-0.10.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur transcode-1.1.7.orig/filter/filter_pp.c transcode-1.1.7/filter/filter_pp.c
---- transcode-1.1.7.orig/filter/filter_pp.c	2012-01-27 19:55:13.706613234 +0000
-+++ transcode-1.1.7/filter/filter_pp.c	2012-01-27 19:56:04.719541629 +0000
-@@ -38,8 +38,8 @@
- 
- /* FIXME: these use the filter ID as an index--the ID can grow
-  * arbitrarily large, so this needs to be fixed */
--static pp_mode_t *mode[100];
--static pp_context_t *context[100];
-+static pp_mode *mode[100];
-+static pp_context *context[100];
- static int width[100], height[100];
- static int pre[100];
- 
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index e0b64408c..a95b9c42d 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,34 +1,30 @@
-# $Id: PKGBUILD 176031 2013-01-26 16:24:37Z foutrelis $
+# $Id: PKGBUILD 179032 2013-03-01 18:56:31Z andrea $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.76
+pkgver=2.77
 pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.transmissionbt.com/"
 license=('MIT')
-makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
+makedepends=('gtk3' 'intltool' 'curl' 'qt4' 'libevent')
 source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
         transmissiond transmissiond.conf transmission.systemd
-        transmission.tmpfiles
-        transmission-2.76-fix-regression.patch)
-md5sums=('9abbffe29ce9b5ee68a116d293c51111'
+        transmission.tmpfiles)
+md5sums=('60c0e77a1852656215f7102a437b2a3d'
          '7d6186ee2a852ae3d44980f05063e194'
          'db72b02fee139e8ab416324e6c044d76'
          '5c289c8901221a94be74665368ab5c2c'
-         '23f2320361ad54373c3a4551ef634fe8'
-         '894b1332cf651c15d593aed0b51dbdd6')
+         '23f2320361ad54373c3a4551ef634fe8')
+
 build() {
   cd $pkgbase-$pkgver
 
-  # https://trac.transmissionbt.com/ticket/5215
-  patch -Np2 -i "$srcdir/transmission-2.76-fix-regression.patch"
-
   ./configure --prefix=/usr
   make
   pushd qt
-  qmake qtr.pro
+  qmake-qt4 qtr.pro
   make
 }
 package_transmission-cli() {
@@ -67,7 +63,7 @@ package_transmission-gtk() {
 
 package_transmission-qt() {
   pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)"
-  depends=('curl' 'qt' 'libevent')
+  depends=('curl' 'qt4' 'libevent')
   optdepends=('transmission-cli: daemon and web support')
   install=transmission-qt.install
 
diff --git a/extra/transmission/transmission-2.76-fix-regression.patch b/extra/transmission/transmission-2.76-fix-regression.patch
deleted file mode 100644
index b3fb734ba..000000000
--- a/extra/transmission/transmission-2.76-fix-regression.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: branches/2.7x/cli/cli.c
-===================================================================
---- branches/2.7x/cli/cli.c	(revision 13784)
-+++ branches/2.7x/cli/cli.c	(revision 13794)
-@@ -268,14 +268,12 @@
-     {
-       if (!tr_fileExists (str, NULL))
--        tr_mkdirp (str, 0700);
--
--      if (tr_fileExists (str, NULL))
-         {
--          tr_bencDictAddStr (&settings, TR_PREFS_KEY_DOWNLOAD_DIR, str);
--        }
--      else
--        {
--          fprintf (stderr, "Unable to create download directory \"%s\"!\n", str);
--          return EXIT_FAILURE;
-+          tr_mkdirp (str, 0700);
-+
-+          if (!tr_fileExists (str, NULL))
-+            {
-+              fprintf (stderr, "Unable to create download directory \"%s\"!\n", str);
-+              return EXIT_FAILURE;
-+            }
-         }
-     }
diff --git a/extra/tsocks/PKGBUILD b/extra/tsocks/PKGBUILD
index 086f5fc42..19bfbfbfd 100644
--- a/extra/tsocks/PKGBUILD
+++ b/extra/tsocks/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149054 2012-02-05 15:38:18Z bisson $
+# $Id: PKGBUILD 180127 2013-03-17 23:33:27Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=tsocks
 pkgver=1.8beta5
-pkgrel=5
+pkgrel=6
 pkgdesc='Transparent SOCKS proxying library'
 url='http://tsocks.sourceforge.net/'
 license=('GPL')
@@ -21,6 +21,6 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-1.8"
 	make DESTDIR="${pkgdir}" install
-	install -d "${pkgdir}"/etc
-	install -m644 tsocks.conf.{simple,complex}.example "${pkgdir}"/etc
+	install -d "${pkgdir}/usr/share/${pkgname}"
+	install -m644 tsocks.conf.{simple,complex}.example "${pkgdir}/usr/share/${pkgname}"
 }
diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD
index 8a743571a..cef6f3c74 100644
--- a/extra/twisted/PKGBUILD
+++ b/extra/twisted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 174290 2013-01-03 23:54:14Z eric $
+# $Id: PKGBUILD 182404 2013-04-10 06:49:54Z eric $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor:  Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=twisted
-pkgver=12.3.0
+pkgver=13.0.0
 pkgrel=1
 pkgdesc="Asynchronous networking framework written in Python"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,20 +18,23 @@ optdepends=('python2-pyopenssl'
 	    'tk: for using tkconch')
 install=twisted.install
 source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2)
-sha1sums=('921bef9a560edd14ea2b559ac0d674f4dac4fd65')
+sha1sums=('5c66a4f231a5f3e17860a41498ac80e76a156dca')
+
+prepare() {
+    cd "Twisted-$pkgver"
+    sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \
+      twisted/python/test/pullpipe.py \
+      twisted/mail/test/pop3testserver.py \
+      twisted/trial/test/scripttest.py
+}
 
 build() {
-    cd "$srcdir/Twisted-$pkgver"
+    cd "Twisted-$pkgver"
     python2 setup.py build
 }
 
 package() {
-    cd "$srcdir/Twisted-$pkgver"
+    cd "Twisted-$pkgver"
     python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
     install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-    sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \
-      "$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py \
-      "$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py \
-      "$pkgdir"/usr/lib/python2.7/site-packages/twisted/python/test/pullpipe.py
 }
diff --git a/extra/ucommon/PKGBUILD b/extra/ucommon/PKGBUILD
index a476b2701..d4f257971 100644
--- a/extra/ucommon/PKGBUILD
+++ b/extra/ucommon/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166607 2012-09-13 00:51:08Z eric $
+# $Id: PKGBUILD 184150 2013-05-02 19:39:51Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=ucommon
-pkgver=5.5.0
+pkgver=6.0.3
 pkgrel=1
 pkgdesc="A light-weight C++ library to facilitate using C++ design patterns"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,23 +10,23 @@ url="http://www.gnutelephony.org/index.php/GNU_uCommon_C++"
 license=('GPL3' 'LGPL3')
 depends=('openssl')
 options=('!libtool')
-source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig})
-#source=("http://www.gnutelephony.org/dist/tarballs/$pkgname-$pkgver.tar.gz"{,.sig})
-md5sums=('657555f23a0e79952e811cf738fc4526'
-         'd2cfc22eac90730992de976c4d7530c1')
+#source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig})
+source=("http://www.gnutelephony.org/dist/tarballs/$pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('c6025b339417e817b6d5ac21b5334823'
+         'SKIP')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   make check
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD
index a8a55a34b..fd8ac016a 100644
--- a/extra/udisks2/PKGBUILD
+++ b/extra/udisks2/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 174775 2013-01-07 12:39:21Z jgc $
+# $Id: PKGBUILD 183464 2013-04-21 22:12:17Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=udisks2
-pkgver=2.0.1
+pkgver=2.1.0
 pkgrel=1
 pkgdesc="Disk Management Service, version 2"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/udisks"
 license=('GPL2')
 depends=('glib2' 'udev' 'polkit' 'libatasmart' 'eject')
-makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
+makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python')
 optdepends=('parted: partition management'
             'gptfdisk: GUID partition table support')
 options=(!libtool)
 source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2)
-sha256sums=('7a6728942d3cd1adc8cd5ee770e8865b293694e9663487861b7b8bf7b495bbbf')
+sha256sums=('310208e5a10335dae4b52a0125c24d31cf292cce3d15cf65da4cd308e38d15a8')
 
 build() {
   cd "udisks-$pkgver"
diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD
index a08102520..eb16cf181 100644
--- a/extra/uim/PKGBUILD
+++ b/extra/uim/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 176237 2013-01-27 23:33:03Z bisson $
+# $Id: PKGBUILD 181132 2013-03-31 23:20:08Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=uim
-pkgver=1.8.4
-pkgrel=2
+pkgver=1.8.5
+pkgrel=1
 pkgdesc='Multilingual input method library'
 url='http://code.google.com/p/uim/'
 license=('custom:BSD')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libxft' 'libedit' 'anthy' 'm17n-lib')
-makedepends=('intltool' 'gettext' 'qt' 'gtk2' 'gtk3' 'gnome-panel')
-optdepends=('qt: immodule and helper applications'
+makedepends=('intltool' 'gettext' 'qt4' 'gtk2' 'gtk3' 'gnome-panel')
+optdepends=('qt4: immodule and helper applications'
             'gtk2: immodule and helper applications'
             'gtk3: immodules and helper applications'
             'gnome-panel: gnome applet indicator')
 options=('!libtool')
 source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('4f40912e4d4a85d9967044caef9e1ef349f3d6f2')
+sha1sums=('13178e0ad9e9196e3fdb0bb9806e4add8fe3a8e5')
 
 install=install
 
@@ -36,7 +36,7 @@ build() {
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
+	make -j1 DESTDIR="${pkgdir}" install
 	rm "${pkgdir}"/usr/lib/libgcroots.a
 	install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/extra/uim/install b/extra/uim/install
index 83a9cf391..1dffeec76 100644
--- a/extra/uim/install
+++ b/extra/uim/install
@@ -1,6 +1,7 @@
 post_install() {
 	[[ -x usr/bin/gtk-query-immodules-2.0 ]] && usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
 	[[ -x usr/bin/gtk-query-immodules-3.0 ]] && usr/bin/gtk-query-immodules-3.0 > usr/lib/gtk-3.0/3.0.0/immodules.cache
+	true
 }
 
 post_upgrade() {
diff --git a/extra/unrar/PKGBUILD b/extra/unrar/PKGBUILD
deleted file mode 100644
index f4ef1a125..000000000
--- a/extra/unrar/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 161802 2012-06-14 17:00:58Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: dorphell <dorphell@gmx.net>
-
-pkgbase=unrar
-pkgname=('unrar' 'libunrar')
-pkgver=4.2.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.rarlab.com/rar_add.htm"
-license=('custom')
-makedepends=('gcc-libs')
-source=("http://www.rarlab.com/rar/unrarsrc-${pkgver}.tar.gz"
-        'unrar-4.2.1-soname.patch')
-md5sums=('8ea9d1b4139474b282d76e627a2de3e4'
-         'b9ec767da9a36f5ac38034c974e77758')
-
-build() {
-  cd "${srcdir}/${pkgbase}"
-
-  patch -Np0 -i "${srcdir}/unrar-4.2.1-soname.patch"
-
-  cp -a ${srcdir}/unrar ${srcdir}/libunrar
-  make -C "${srcdir}"/libunrar -f makefile.unix lib libversion=${pkgver} CXXFLAGS="-fPIC ${CXXFLAGS}"
-  make -f makefile.unix CXXFLAGS="-fPIC ${CXXFLAGS}" STRIP="true"
-}
-
-package_unrar() {
-  pkgdesc="The RAR uncompression program"
-  depends=('gcc-libs')
-  cd "${srcdir}/${pkgbase}"
-
-  install -Dm755 unrar "${pkgdir}/usr/bin/unrar"
-  # install license
-  install -Dm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_libunrar() {
-  pkgdesc="Library and header file for applications that use libunrar"
-  depends=('gcc-libs')
-  cd "${srcdir}/libunrar"
-
-  install -Dm755 libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so.${pkgver}"
-  install -Dm644 dll.hpp "${pkgdir}/usr/include/unrar/dll.hpp"
-  ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so.4"
-  ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so"
-  # install license
-  install -Dm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/unrar/unrar-4.2.1-soname.patch b/extra/unrar/unrar-4.2.1-soname.patch
deleted file mode 100644
index 83ebe9611..000000000
--- a/extra/unrar/unrar-4.2.1-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makefile.unix	2012-02-23 10:23:14.000000000 +0100
-+++ makefile.unix	2012-05-05 12:58:13.000000000 +0200
-@@ -131,7 +131,7 @@
- lib:	CXXFLAGS+=$(LIBFLAGS)
- lib:	clean $(OBJECTS) $(LIB_OBJ)
- 	@rm -f libunrar.so
--	$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
-+	$(LINK) -shared -Wl,-soname,libunrar.so.$(libversion) -o libunrar.so.$(libversion) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
- 
- install-unrar:
- 			install -D unrar $(DESTDIR)/bin/unrar
diff --git a/extra/unzip/PKGBUILD b/extra/unzip/PKGBUILD
deleted file mode 100644
index 7c2d71367..000000000
--- a/extra/unzip/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 150453 2012-02-17 23:22:29Z allan $
-# Maintainer:
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: Robson Peixoto
-
-pkgname=unzip
-pkgver=6.0
-pkgrel=6
-pkgdesc="Unpacks .zip archives such as those made by PKZIP"
-arch=('i686' 'x86_64')
-url="http://www.info-zip.org/"
-license=('custom')
-depends=('bzip2' 'bash')
-source=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz')
-md5sums=('62b490407489521db863b523a7f86375')
-
-build() {
-  cd ${srcdir}/${pkgname}${pkgver/./}
-
-  # set CFLAGS -- from Debian
-  export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DACORN_FTYPE_NFS \
-  -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT \
-  -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DDATE_FORMAT=DF_YMD \
-  -DUSE_BZIP2 -DNATIVE"
-
-  sed -i "/MANDIR =/s#)/#)/share/#" unix/Makefile
-
-  # make -- from Debian
-  make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr LF2="" \
-  D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips
-}
-
-package() {
-  cd ${srcdir}/${pkgname}${pkgver/./}
-
-  # install -- from Debian
-  make -f unix/Makefile prefix=${pkgdir}/usr INSTALL_PROGRAM="install" install
-
-  # install the license file
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/unzip/LICENSE
-}
-
diff --git a/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch b/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch
deleted file mode 100644
index 2694334c8..000000000
--- a/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a5b3dd887dcd60e981626ae2e15c874311fc4fef Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Sun, 2 Sep 2012 04:36:13 +0200
-Subject: [PATCH] Send resume signal when built with systemd and using
- pm-utils suspend
-
-This case was apparently overlooked when adding systemd support.
-
-Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
----
- src/linux/up-backend.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c
-index ddd4472..52b430e 100644
---- a/src/linux/up-backend.c
-+++ b/src/linux/up-backend.c
-@@ -603,10 +603,11 @@ gboolean
- up_backend_emits_resuming (UpBackend *backend)
- {
- #ifdef HAVE_SYSTEMD
--	return TRUE;
--#else
--	return FALSE;
-+	if (sd_booted ())
-+		return TRUE;
-+	else
- #endif
-+	return FALSE;
- }
- 
- /**
--- 
-1.7.12
-
diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD
index 737738445..b127cfcf3 100644
--- a/extra/upower/PKGBUILD
+++ b/extra/upower/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 174773 2013-01-07 12:34:08Z jgc $
+# $Id: PKGBUILD 180239 2013-03-18 19:28:47Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=upower
-pkgver=0.9.19
+pkgver=0.9.20
 pkgrel=1
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,10 +11,8 @@ license=('GPL')
 depends=('systemd-tools' 'libsystemd' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
 makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd')
 options=('!libtool')
-source=($url/releases/$pkgname-$pkgver.tar.xz
-        lg-unifying-fix-K750-features-name-use-1-second-interval.patch)
-md5sums=('f96955ff1a2e4f006937d6b5ea95afb8'
-         '04b2a6141e80e422a9fe2820b5b3a613')
+source=($url/releases/$pkgname-$pkgver.tar.xz)
+md5sums=('f175984d142dc8d2353a7da609836b69')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -22,12 +20,11 @@ build() {
   # put udev files in /usr/lib
   sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
 
-  patch -Np1 -i ../lg-unifying-fix-K750-features-name-use-1-second-interval.patch
-
   ./configure --prefix=/usr --sysconfdir=/etc \
     --localstatedir=/var \
     --libexecdir=/usr/lib/$pkgname \
-    --disable-static
+    --disable-static \
+    --enable-deprecated
   make
 }
 
diff --git a/extra/upower/lg-unifying-fix-K750-features-name-use-1-second-interval.patch b/extra/upower/lg-unifying-fix-K750-features-name-use-1-second-interval.patch
deleted file mode 100644
index 27c4dc51e..000000000
--- a/extra/upower/lg-unifying-fix-K750-features-name-use-1-second-interval.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 35b0d25b49d04cf7d33699c34f42a196c8e92a2e Mon Sep 17 00:00:00 2001
-From: Julien Danjou <julien@danjou.info>
-Date: Sat, 01 Dec 2012 12:30:03 +0000
-Subject: lg-unifying: fix K750 features name, use 1 second interval
-
-I've recently got access to some spec on this, so I'm now able to document
-his a bit better. Also, change the 0x78 value for the function sending
-BattLightMeasureBroadcastEvent to 0x1 since this is the number of event we
-want, and one is enough.
-
-Signed-off-by: Julien Danjou <julien@danjou.info>
-Signed-off-by: Richard Hughes <richard@hughsie.com>
----
-diff --git a/src/linux/up-device-lg-unifying.c b/src/linux/up-device-lg-unifying.c
-index e8997c0..eddd1ec 100644
---- a/src/linux/up-device-lg-unifying.c
-+++ b/src/linux/up-device-lg-unifying.c
-@@ -84,10 +84,9 @@
- #define HIDPP_FEATURE_GETDEVICENAMETYPE_FUNCTION_GETCOUNT      (0x00 << 4)
- #define HIDPP_FEATURE_GETDEVICENAMETYPE_FUNCTION_GETDEVICENAME (0x01 << 4)
- 
--/* I wish i has the spec for this, but I don't so I invented the name */
--#define HIDPP_FEATURE_K750_BATTERY                                   0x4301
--#define HIDPP_FEATURE_K750_BATTERY_FUNCTION_STARTLUXANDBATTERY   (0x00 << 4)
--#define HIDPP_FEATURE_K750_BATTERY_FUNCTION_LUXANDBATTERYEVENT   (0x01 << 4)
-+#define HIDPP_FEATURE_SOLAR_DASHBOARD                                     0x4301
-+#define HIDPP_FEATURE_SOLAR_DASHBOARD_FUNCTION_SetLightMeasure       (0x00 << 4)
-+#define HIDPP_FEATURE_SOLAR_DASHBOARD_BattLightMeasureBroadcastEvent (0x01 << 4)
- 
- #define HIDPP_FEATURE_FUNCTION_AS_ARG(feature)	\
- 	feature >> 8, feature, 0x00
-@@ -105,7 +104,7 @@ struct UpDeviceUnifyingPrivate
- 	int			 fd;
- 	/* Device index on the Unifying "bus" */
- 	gint			 device_index;
--	gint			 feature_k750_battery_index;
-+	gint			 feature_solar_dashboard_index;
- 	GIOChannel		*channel;
- 	guint			 channel_source_id;
- };
-@@ -130,8 +129,8 @@ up_device_unifying_event_io (GIOChannel *channel, GIOCondition condition, gpoint
- 	while (read (unifying->priv->fd, buf, sizeof(buf)) > 0)
- 		if (buf[0] == HIDPP_HEADER_RESPONSE &&
- 		    buf[1] == unifying->priv->device_index &&
--		    buf[2] == unifying->priv->feature_k750_battery_index &&
--		    buf[3] == HIDPP_FEATURE_K750_BATTERY_FUNCTION_LUXANDBATTERYEVENT) {
-+		    buf[2] == unifying->priv->feature_solar_dashboard_index &&
-+		    buf[3] == HIDPP_FEATURE_SOLAR_DASHBOARD_BattLightMeasureBroadcastEvent) {
- 			lux = (buf[5] << 8) | buf[6];
- 			if (lux > 200) {
- 				g_object_set (device,
-@@ -283,25 +282,24 @@ up_device_unifying_hidpp2_set_battery (UpDeviceUnifying *unifying)
- 		0x00, 0x00, 0x00, 0x00, 0x00,
- 	};
- 
--	if (unifying->priv->feature_k750_battery_index == -1)
--		unifying->priv->feature_k750_battery_index =
--			up_device_unifying_hidpp2_get_feature_index (unifying, HIDPP_FEATURE_K750_BATTERY);
-+	if (unifying->priv->feature_solar_dashboard_index == -1)
-+		unifying->priv->feature_solar_dashboard_index =
-+			up_device_unifying_hidpp2_get_feature_index (unifying, HIDPP_FEATURE_SOLAR_DASHBOARD);
- 
--	if (unifying->priv->feature_k750_battery_index == 0) {
--		/* Probably not a K750 */
-+	if (unifying->priv->feature_solar_dashboard_index == 0) {
-+		/* Probably not a solar keyboard */
- 		/* TODO: add support for BatteryLevelStatus */
- 	} else {
- 		/* This request will make the keyboard send a bunch of packets
- 		 * (events) with lux-meter and battery information */
--		request[2] = unifying->priv->feature_k750_battery_index;
--		request[3] = HIDPP_FEATURE_K750_BATTERY_FUNCTION_STARTLUXANDBATTERY;
--		/* Don't know what this means */
--		request[4] = 0x78;
--		request[5] = 0x01;
-+		request[2] = unifying->priv->feature_solar_dashboard_index;
-+		request[3] = HIDPP_FEATURE_SOLAR_DASHBOARD_FUNCTION_SetLightMeasure;
-+		request[4] = 0x01; /* Max number of reports: number of report sent after function call */
-+		request[5] = 0x01; /* Report period: time between reports, in seconds */
- 
- 
- 		if (write (unifying->priv->fd, request, sizeof(request)) != sizeof(request)) {
--			g_debug ("Unable to send K750 battery/lux events start request to device");
-+			g_debug ("Unable to send solar battery/lux events start request to device");
- 			return FALSE;
- 		}
- 
-@@ -719,7 +717,7 @@ up_device_unifying_init (UpDeviceUnifying *unifying)
- 	unifying->priv = UP_DEVICE_UNIFYING_GET_PRIVATE (unifying);
- 	unifying->priv->poll_timer_id = 0;
- 	unifying->priv->fd = -1;
--	unifying->priv->feature_k750_battery_index = -1;
-+	unifying->priv->feature_solar_dashboard_index = -1;
- }
- 
- /**
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/usbmuxd/usbmuxd-udevuser.patch b/extra/usbmuxd/usbmuxd-udevuser.patch
deleted file mode 100644
index 51c8f3d3a..000000000
--- a/extra/usbmuxd/usbmuxd-udevuser.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur usbmuxd-1.0.7.orig/udev/85-usbmuxd.rules.in usbmuxd-1.0.7/udev/85-usbmuxd.rules.in
---- usbmuxd-1.0.7.orig/udev/85-usbmuxd.rules.in	2011-08-04 15:28:32.751579507 +0000
-+++ usbmuxd-1.0.7/udev/85-usbmuxd.rules.in	2011-08-04 15:36:20.139265124 +0000
-@@ -1,7 +1,7 @@
- # usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd)
- 
- # Forces iDevices to the last USB configuration and runs usbmuxd
--ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux"
-+ACTION=="add", SUBSYSTEM=="usb", OWNER="usbmux", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux"
- 
- # Exit usbmuxd when the last device is removed
- ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x"
diff --git a/extra/usbview/PKGBUILD b/extra/usbview/PKGBUILD
deleted file mode 100644
index dcbe9e51f..000000000
--- a/extra/usbview/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 169543 2012-10-23 11:13:44Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=usbview
-pkgver=2.0
-pkgrel=2
-pkgdesc="Display the topology of devices on the USB bus"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.kroah.com/linux/usb/"
-license=('GPL')
-depends=('gtk3' 'desktop-file-utils')
-makedepends=('pkg-config' 'gendesk')
-install=${pkgname}.install
-source=("http://www.kroah.com/linux/usb/${pkgname}-${pkgver}.tar.gz")
-md5sums=('565f2e79f3924d14ab5b4d8aced557e5')
-
-build() {
-  cd "${srcdir}"
-  gendesk -n
-  sed -i "s:Application;:Application;System:g" "${srcdir}"/${pkgname}.desktop
-
-  cd "${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix="${pkgdir}/usr" \
-       sysconfdir="${pkgdir}/etc" \
-       localstatedir="${pkgdir}/var" install
-
-  install -Dm0644 "${srcdir}"/${pkgname}.desktop \
-    "${pkgdir}"/usr/share/applications/${pkgname}.desktop
-
-  install -Dm0644 "${srcdir}"/${pkgname}-${pkgver}/usb_icon.xpm \
-    "${pkgdir}"/usr/share/pixmaps/${pkgname}.xpm
-}
diff --git a/extra/usbview/usbview-1.1-gtk3-port.patch b/extra/usbview/usbview-1.1-gtk3-port.patch
deleted file mode 100644
index 9462dcf43..000000000
--- a/extra/usbview/usbview-1.1-gtk3-port.patch
+++ /dev/null
@@ -1,802 +0,0 @@
---- a/Makefile.am	2009-03-11 03:25:46.000000000 +0100
-+++ b/Makefile.am	2012-06-14 20:33:10.641639573 +0200
-@@ -16,10 +16,8 @@
- 	interface.c		\
- 	callbacks.c		\
- 	usbtree.c usbtree.h	\
--	showmessage.c		\
- 	usbparse.c usbparse.h	\
- 	configure-dialog.c      \
--	about-dialog.c		\
- 	usbview_logo.xpm	\
- 	usbview_logo.xcf	\
- 	usb_icon.xpm		\
---- a/callbacks.c	2008-06-25 23:03:13.000000000 +0200
-+++ b/callbacks.c	2012-06-14 21:06:05.000523489 +0200
-@@ -23,13 +23,13 @@
- #endif
- 
- #include <gtk/gtk.h>
--
- #include "usbtree.h"
-+#include "usbview_logo.xpm"	/* logo */
- 
- 
- void on_buttonClose_clicked (GtkButton *button, gpointer user_data)
- {
--	gtk_exit(0);
-+	gtk_main_quit();
- }
- 
- 
-@@ -55,7 +55,21 @@
- 
- void on_buttonAbout_clicked (GtkButton *button, gpointer user_data)
- {
--	about_dialog ();
-+	GdkPixbuf *logo;
-+	gchar *authors[] = { "Greg Kroah-Hartman <greg@kroah.com>", NULL };
-+
-+	logo = gdk_pixbuf_new_from_xpm_data ((const char **)usbview_logo_xpm);
-+	gtk_show_about_dialog (GTK_WINDOW (windowMain),
-+		"logo", logo,
-+		"program-name", "usbview",
-+		"version", VERSION,
-+		"comments", "Display information on USB devices",
-+		"website-label", "http://www.kroah.com/linux-usb/",
-+		"website", "http://www.kroah.com/linux-usb/",
-+		"copyright", "Copyright © 1999-2012",
-+		"authors", authors,
-+		NULL);
-+	g_object_unref (logo);
- }
- 
- 
---- a/configure-dialog.c	2009-03-11 02:40:28.000000000 +0100
-+++ b/configure-dialog.c	2012-06-14 21:06:05.000523489 +0200
-@@ -24,264 +24,78 @@
- #endif
- 
- #include <gtk/gtk.h>
--#include <stdio.h>
--#include <stdlib.h>
- #include <string.h>
--#include <ctype.h>
--
- #include "usbtree.h"
- #include "usbparse.h"
- 
--
--
--
- static	GtkWidget	*fileEntry;
--static	GtkWidget	*filew;
--static	char		*sFilename;
--
--/* 
-- * Get the selected filename and print it to the console 
-- */
--static void file_ok_sel (GtkWidget *w, GtkFileSelection *fs)
--{
--	const char *sTempFile;
--
--	/* --- Get the name --- */
--	sTempFile = gtk_file_selection_get_filename (GTK_FILE_SELECTION (fs));
--
--	/* --- Allocate space and save it. --- */
--	sFilename = malloc (sizeof (char) * (strlen (sTempFile) + 1));
--	strcpy (sFilename, sTempFile);
--
--	/* --- Destroy the file selection --- */
--	gtk_widget_destroy (filew);
--}
--
--
--static void file_cancel_sel (GtkWidget *w, GtkFileSelection *fs)
--{
--	/* --- Destroy the file selection --- */
--	gtk_widget_destroy (filew);
--}
--
--
--/*
-- * DestroyDialog
-- *
-- * Destroy the dialog (obvious, eh?) but also remove the
-- * grab and close the modal. 
-- */
--static int DestroyDialog (GtkWidget *widget, gpointer *data)
--{
--	gtk_grab_remove (widget);
--	gtk_main_quit ();
--	return(FALSE);
--}
--
--
--/*
-- * GetFilename 
-- */
--static char *GetFilename (char *sTitle, char *initialFilename)
--{
--	sFilename = NULL;
--
--	/* --- Create a new file selection widget --- */
--	filew = gtk_file_selection_new (sTitle);
--
--	/* --- If it's destroyed --- */
--	gtk_signal_connect (GTK_OBJECT (filew), "destroy", (GtkSignalFunc) DestroyDialog, &filew);
--
--	/* --- Connect the ok_button to file_ok_sel function  --- */
--	gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filew)->ok_button), "clicked", (GtkSignalFunc) file_ok_sel, filew );
--
--	/* --- Connect the cancel_button to destroy the widget  --- */
--	gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filew)->cancel_button), "clicked", (GtkSignalFunc) file_cancel_sel, filew);
--
--	/* --- Lets set the filename --- */
--	gtk_file_selection_set_filename (GTK_FILE_SELECTION(filew), initialFilename);
--
--	/* --- Turn off the file operation buttons --- */
--	gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION(filew));
--
--	/* --- Of course, we show it --- */
--	gtk_widget_show (filew);
--
--	/* --- Make sure we keep the focus --- */
--	gtk_grab_add (filew);
--
--	gtk_main ();
--
--	return(sFilename);
--}
--
--
--static void ClearShowMessage (GtkWidget *widget, gpointer data)
--{
--	gtk_grab_remove (widget);
--}
--
--static void CancelConfigureDialog (GtkWidget *widget, gpointer data)
--{
--	GtkWidget *dialogWidget = (GtkWidget *) data;
--
--	gtk_grab_remove (dialogWidget);
--
--	/* --- Close the widget --- */
--	gtk_widget_destroy (dialogWidget);
--}
--
--static void OkConfigureDialog (GtkWidget *widget, gpointer data)
--{
--	GtkWidget       *dialogWidget = (GtkWidget *) data;
--	gchar           *editString;
--
--	editString = gtk_editable_get_chars (GTK_EDITABLE (fileEntry), 0, -1);
--
--	gtk_grab_remove (dialogWidget);
--
--	/* --- Close the widget --- */
--	gtk_widget_destroy (dialogWidget);
--
--	strcpy (devicesFile, editString);
--	g_free (editString);
--	LoadUSBTree(0);
--}
--
- 
- static void fileSelectButtonClick (GtkWidget *widget, gpointer data)
- {
--	gchar   *newFilename;
-+	GtkWidget *dialog;
-+	gchar *filename;
- 
--	newFilename = GetFilename ("locate usbdevfs devices file", devicesFile);
--
--	if (newFilename != NULL) {
--		gtk_entry_set_text (GTK_ENTRY (fileEntry), newFilename);
--		gtk_widget_show (fileEntry);
--		g_free (newFilename);
-+	dialog = gtk_file_chooser_dialog_new (
-+				"locate usbdevfs devices file",
-+				GTK_WINDOW (windowMain),
-+				GTK_FILE_CHOOSER_ACTION_OPEN,
-+				GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-+				GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
-+				NULL);
-+
-+	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
-+	{
-+		filename = gtk_file_chooser_get_filename(
-+						GTK_FILE_CHOOSER (dialog));
-+		gtk_entry_set_text (GTK_ENTRY (fileEntry), filename);
-+		g_free (filename);
- 	}
-+			  
-+	gtk_widget_destroy (dialog);
- }
- 
--
- void configure_dialog (void)
- {
--	GtkWidget *configDialog;
--	GtkWidget *dialog_vbox2;
-+	GtkWidget *dialog, *content_area;
- 	GtkWidget *hbox1;
- 	GtkWidget *label1;
--	GtkWidget *label41;
--	GtkWidget *label42;
--	GtkWidget *label43;
--	GtkWidget *vbox1;
--	GtkWidget *dialog_action_area2;
--	GtkWidget *hbuttonbox2;
--	GtkWidget *okButton;
--	GtkWidget *cancelButton;
- 	GtkWidget *fileSelectButton;
-+	gchar *editString;
-+	gint result;
- 
--	configDialog = gtk_dialog_new ();
--	gtk_object_set_data (GTK_OBJECT (configDialog), "configDialog", configDialog);
--	gtk_window_set_title (GTK_WINDOW (configDialog), "USB View Configuration");
--	gtk_window_set_policy (GTK_WINDOW (configDialog), TRUE, TRUE, FALSE);
--
--	dialog_vbox2 = GTK_DIALOG (configDialog)->vbox;
--	gtk_object_set_data (GTK_OBJECT (configDialog), "dialog_vbox2", dialog_vbox2);
--	gtk_widget_show (dialog_vbox2);
--
--	vbox1 = gtk_vbox_new (FALSE, 0);
--	gtk_widget_ref (vbox1);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "vbox1", vbox1, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (vbox1);
--	gtk_box_pack_start (GTK_BOX (dialog_vbox2), vbox1, TRUE, TRUE, 0);
--
--	label41 = gtk_label_new ("");
--	gtk_widget_ref (label41);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "label41", label41, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (label41);
--	gtk_box_pack_start (GTK_BOX (vbox1), label41, FALSE, FALSE, 0);
--
--	hbox1 = gtk_hbox_new (FALSE, 0);
--	gtk_widget_ref (hbox1);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "hbox1", hbox1, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (hbox1);
--//	gtk_box_pack_start (GTK_BOX (dialog_vbox2), hbox1, TRUE, TRUE, 0);
--	gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 0);
--
--	label42 = gtk_label_new ("");
--	gtk_widget_ref (label42);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "label42", label42, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (label42);
--	gtk_box_pack_start (GTK_BOX (vbox1), label42, FALSE, FALSE, 0);
--
--
--	label1 = gtk_label_new ("  Location of usbdevfs devices file");
--	gtk_widget_ref (label1);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "label1", label1, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (label1);
-+	dialog = gtk_dialog_new_with_buttons (
-+				"USB View Configuration",
-+				GTK_WINDOW (windowMain),
-+				GTK_DIALOG_DESTROY_WITH_PARENT,
-+				GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-+				GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
-+				NULL);
-+
-+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-+
-+	hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-+	gtk_container_add (GTK_CONTAINER (content_area), hbox1);
-+
-+	label1 = gtk_label_new ("Location of usbdevfs devices file");
- 	gtk_box_pack_start (GTK_BOX (hbox1), label1, FALSE, FALSE, 5);
- 
- 	fileEntry = gtk_entry_new ();
--	gtk_widget_ref (fileEntry);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "fileEntry", fileEntry, (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_entry_set_text (GTK_ENTRY (fileEntry), devicesFile);
--	gtk_widget_show (fileEntry);
- 	gtk_box_pack_start (GTK_BOX (hbox1), fileEntry, TRUE, TRUE, 0);
- 
--	dialog_action_area2 = GTK_DIALOG (configDialog)->action_area;
--	gtk_object_set_data (GTK_OBJECT (configDialog), "dialog_action_area2", dialog_action_area2);
--	gtk_widget_show (dialog_action_area2);
--	gtk_container_set_border_width (GTK_CONTAINER (dialog_action_area2), 1);
--
--	hbuttonbox2 = gtk_hbutton_box_new ();
--	gtk_widget_ref (hbuttonbox2);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "hbuttonbox2", hbuttonbox2, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (hbuttonbox2);
--	gtk_box_pack_start (GTK_BOX (dialog_action_area2), hbuttonbox2, TRUE, TRUE, 11);
--
--	okButton = gtk_button_new_with_label ("  OK  ");
--	gtk_widget_ref (okButton);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "okButton", okButton, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (okButton);
--	gtk_container_add (GTK_CONTAINER (hbuttonbox2), okButton);
--	GTK_WIDGET_SET_FLAGS (okButton, GTK_CAN_DEFAULT);
--
--	cancelButton = gtk_button_new_with_label ("  Cancel  ");
--	gtk_widget_ref (cancelButton);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "cancelButton", cancelButton, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (cancelButton);
--	gtk_container_add (GTK_CONTAINER (hbuttonbox2), cancelButton);
--	GTK_WIDGET_SET_FLAGS (cancelButton, GTK_CAN_DEFAULT);
--
- 	fileSelectButton = gtk_button_new_with_label ("...");
--	gtk_widget_ref (fileSelectButton);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "fileSelectButton", fileSelectButton, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (fileSelectButton);
--
-+	g_signal_connect (G_OBJECT (fileSelectButton), "clicked",
-+			  G_CALLBACK (fileSelectButtonClick), NULL);
- 	gtk_box_pack_start (GTK_BOX (hbox1), fileSelectButton, TRUE, FALSE, 1);
- 
--	label43 = gtk_label_new ("    ");
--	gtk_widget_ref (label43);
--	gtk_object_set_data_full (GTK_OBJECT (configDialog), "label43", label43, (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (label43);
--	gtk_box_pack_start (GTK_BOX (hbox1), label43, FALSE, FALSE, 0);
--	
--	gtk_signal_connect (GTK_OBJECT (okButton), "clicked", GTK_SIGNAL_FUNC (OkConfigureDialog), configDialog);
--	gtk_signal_connect (GTK_OBJECT (cancelButton), "clicked", GTK_SIGNAL_FUNC (CancelConfigureDialog), configDialog);
--	gtk_signal_connect (GTK_OBJECT (fileSelectButton), "clicked", GTK_SIGNAL_FUNC (fileSelectButtonClick), configDialog);
--
--	/* --- Default the "Ok" button --- */
--	GTK_WIDGET_SET_FLAGS (okButton, GTK_CAN_DEFAULT);
--	gtk_widget_grab_default (okButton);
--
--	gtk_signal_connect (GTK_OBJECT (configDialog), "destroy", GTK_SIGNAL_FUNC (ClearShowMessage), NULL);
--
--	/* --- Show the dialog --- */
--	gtk_widget_show (configDialog);
--
--	/* --- Only this window can have actions done. --- */
--	gtk_grab_add (configDialog);
--
--	return;
-+	gtk_widget_show_all (dialog);
-+	result = gtk_dialog_run(GTK_DIALOG (dialog));
-+	if (result == GTK_RESPONSE_ACCEPT) {
-+		editString = gtk_editable_get_chars (
-+					GTK_EDITABLE (fileEntry), 0, -1);
-+		strcpy (devicesFile, editString);
-+		g_free (editString);
-+		LoadUSBTree (0);
-+	}
-+	gtk_widget_destroy (dialog);
- }
--
--
---- a/configure.in	2007-10-23 02:03:36.000000000 +0200
-+++ b/configure.in	2012-06-14 20:25:16.629667442 +0200
-@@ -1,7 +1,7 @@
- dnl Process this file with autoconf to produce a configure script.
- 
- AC_INIT(configure.in)
--AM_INIT_AUTOMAKE(usbview, 1.0)
-+AM_INIT_AUTOMAKE(usbview, 1.1)
- AM_CONFIG_HEADER(config.h)
- 
- # required versions of other packages
-@@ -12,33 +12,10 @@
- AM_PROG_CC_STDC
- AC_HEADER_STDC
- 
--PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0.5)
-+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)
- AC_SUBST(GTK_FLAGS)
- AC_SUBST(GTK_LIBS)
- 
--
--dnl Set PACKAGE_LOCALE_DIR in config.h.
--if test "x${prefix}" = "xNONE"; then
--  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale")
--else
--  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale")
--fi
--
--dnl Set PACKAGE_DATA_DIR in config.h.
--if test "x${datadir}" = 'x${prefix}/share'; then
--  if test "x${prefix}" = "xNONE"; then
--    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}")
--  else
--    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}")
--  fi
--else
--  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
--fi
--
--dnl Set PACKAGE_SOURCE_DIR in config.h.
--packagesrcdir=`cd $srcdir && pwd`
--AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
--
- dnl Use -Wall if we have gcc.
- changequote(,)dnl
- if test "x$GCC" = "xyes"; then
---- a/interface.c	2009-03-11 03:11:47.000000000 +0100
-+++ b/interface.c	2012-06-14 21:06:05.000523489 +0200
-@@ -32,15 +32,16 @@
- #include "usb_icon.xpm"
- 
- GtkWidget *treeUSB;
-+GtkTreeStore *treeStore;
- GtkTextBuffer *textDescriptionBuffer;
- GtkWidget *textDescriptionView;
-+GtkWidget *windowMain;
- 
- int timer;
- 
- GtkWidget*
- create_windowMain ()
- {
--	GtkWidget *windowMain;
- 	GtkWidget *vbox1;
- 	GtkWidget *hpaned1;
- 	GtkWidget *scrolledwindow1;
-@@ -50,68 +51,61 @@
- 	GtkWidget *buttonClose;
- 	GtkWidget *buttonAbout;
- 	GdkPixbuf *icon;
-+	GtkCellRenderer *treeRenderer;
-+	GtkTreeViewColumn *treeColumn;
- 
- 	windowMain = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- 	gtk_widget_set_name (windowMain, "windowMain");
--	gtk_object_set_data (GTK_OBJECT (windowMain), "windowMain", windowMain);
- 	gtk_window_set_title (GTK_WINDOW (windowMain), "USB Viewer");
--	gtk_window_set_default_size (GTK_WINDOW (windowMain), 500, 300);
-+	gtk_window_set_default_size (GTK_WINDOW (windowMain), 600, 300);
- 
- 	icon = gdk_pixbuf_new_from_xpm_data((const char **)usb_icon_xpm);
- 	gtk_window_set_icon(GTK_WINDOW(windowMain), icon);
- 
--	vbox1 = gtk_vbox_new (FALSE, 0);
-+	vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- 	gtk_widget_set_name (vbox1, "vbox1");
--	gtk_widget_ref (vbox1);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "vbox1", vbox1,
--				  (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_widget_show (vbox1);
- 	gtk_container_add (GTK_CONTAINER (windowMain), vbox1);
- 
--	hpaned1 = gtk_hpaned_new ();
-+	hpaned1 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
- 	gtk_widget_set_name (hpaned1, "hpaned1");
--	gtk_widget_ref (hpaned1);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "hpaned1", hpaned1,
--				  (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_widget_show (hpaned1);
- 	gtk_box_pack_start (GTK_BOX (vbox1), hpaned1, TRUE, TRUE, 0);
--	gtk_paned_set_position (GTK_PANED (hpaned1), 200);
- 
--	treeUSB = gtk_ctree_new_with_titles (1, 0, NULL);
-+	treeStore = gtk_tree_store_new (N_COLUMNS,
-+				G_TYPE_STRING,	/* NAME_COLUMN */
-+				G_TYPE_INT,	/* DEVICE_ADDR_COLUMN */
-+				G_TYPE_STRING	/* COLOR_COLUMN */);
-+	treeUSB = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treeStore));
-+	treeRenderer = gtk_cell_renderer_text_new ();
-+	treeColumn = gtk_tree_view_column_new_with_attributes (
-+					"USB devices",
-+					treeRenderer,
-+					"text", NAME_COLUMN,
-+					"foreground", COLOR_COLUMN,
-+					NULL);
-+	gtk_tree_view_append_column (GTK_TREE_VIEW (treeUSB), treeColumn);
- 	gtk_widget_set_name (treeUSB, "treeUSB");
--	gtk_widget_ref (treeUSB);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "treeUSB", treeUSB,
--				  (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_widget_show (treeUSB);
--	gtk_container_add (GTK_CONTAINER (hpaned1), treeUSB);
--	gtk_widget_set_usize (treeUSB, 200, -2);
-+	gtk_paned_pack1 (GTK_PANED (hpaned1), treeUSB, FALSE, FALSE);
- 
- 	scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
- 	gtk_widget_set_name (scrolledwindow1, "scrolledwindow1");
--	gtk_widget_ref (scrolledwindow1);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "scrolledwindow1", scrolledwindow1,
--				  (GtkDestroyNotify) gtk_widget_unref);
--	gtk_widget_show (scrolledwindow1);
--	gtk_container_add (GTK_CONTAINER (hpaned1), scrolledwindow1);
- 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
-+	gtk_widget_show (scrolledwindow1);
-+	gtk_paned_pack2 (GTK_PANED (hpaned1), scrolledwindow1, TRUE, FALSE);
- 
- 	textDescriptionBuffer = gtk_text_buffer_new(NULL);
- 	//textDescription = gtk_text_new (NULL, NULL);
- 	textDescriptionView = gtk_text_view_new_with_buffer(textDescriptionBuffer);
- 	gtk_widget_set_name (textDescriptionView, "textDescription");
--	gtk_widget_ref (textDescriptionView);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "textDescription", textDescriptionView,
--				  (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_text_view_set_editable(GTK_TEXT_VIEW(textDescriptionView), FALSE);
- 	gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textDescriptionView), FALSE);
- 	gtk_widget_show (textDescriptionView);
- 	gtk_container_add (GTK_CONTAINER (scrolledwindow1), textDescriptionView);
- 
--	hbuttonbox1 = gtk_hbutton_box_new ();
-+	hbuttonbox1 = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- 	gtk_widget_set_name (hbuttonbox1, "hbuttonbox1");
--	gtk_widget_ref (hbuttonbox1);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "hbuttonbox1", hbuttonbox1,
--				  (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_widget_show (hbuttonbox1);
- 	gtk_box_pack_start (GTK_BOX (vbox1), hbuttonbox1, FALSE, FALSE, 5);
- 	//gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox1), 10);
-@@ -120,58 +115,46 @@
- 
- 	buttonRefresh = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
- 	gtk_widget_set_name (buttonRefresh, "buttonRefresh");
--	gtk_widget_ref (buttonRefresh);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonRefresh", buttonRefresh,
--				  (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_widget_show (buttonRefresh);
- 	gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonRefresh);
- 	gtk_container_set_border_width (GTK_CONTAINER (buttonRefresh), 4);
--	GTK_WIDGET_SET_FLAGS (buttonRefresh, GTK_CAN_DEFAULT);
-+	gtk_widget_set_can_default (buttonRefresh, TRUE);
- 
- 	buttonConfigure = gtk_button_new_with_label ("Configure...");
- 	gtk_widget_set_name (buttonConfigure, "buttonConfigure");
--	gtk_widget_ref (buttonConfigure);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonConfigure", buttonConfigure,
--				  (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_widget_show (buttonConfigure);
- 	gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonConfigure);
- 	gtk_container_set_border_width (GTK_CONTAINER (buttonConfigure), 4);
--	GTK_WIDGET_SET_FLAGS (buttonConfigure, GTK_CAN_DEFAULT);
-+	gtk_widget_set_can_default (buttonConfigure, TRUE);
- 
- 	buttonAbout = gtk_button_new_from_stock(GTK_STOCK_ABOUT);
- 	gtk_widget_set_name (buttonAbout, "buttonAbout");
--	gtk_widget_ref (buttonAbout);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonAbout", buttonAbout,
--				  (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_widget_show (buttonAbout);
- 	gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonAbout);
- 	gtk_container_set_border_width (GTK_CONTAINER (buttonAbout), 4);
--	GTK_WIDGET_SET_FLAGS (buttonAbout, GTK_CAN_DEFAULT);
-+	gtk_widget_set_can_default (buttonAbout, TRUE);
- 
- 	buttonClose = gtk_button_new_from_stock(GTK_STOCK_QUIT);
- 	gtk_widget_set_name (buttonClose, "buttonClose");
--	gtk_widget_ref (buttonClose);
--	gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonClose", buttonClose,
--				  (GtkDestroyNotify) gtk_widget_unref);
- 	gtk_widget_show (buttonClose);
- 	gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonClose);
- 	gtk_container_set_border_width (GTK_CONTAINER (buttonClose), 4);
--	GTK_WIDGET_SET_FLAGS (buttonClose, GTK_CAN_DEFAULT);
-+	gtk_widget_set_can_default (buttonClose, TRUE);
- 
--	gtk_signal_connect (GTK_OBJECT (windowMain), "delete_event",
--			    GTK_SIGNAL_FUNC (on_window1_delete_event),
-+	g_signal_connect (G_OBJECT (windowMain), "delete_event",
-+			    G_CALLBACK (on_window1_delete_event),
- 			    NULL);
--	gtk_signal_connect (GTK_OBJECT (buttonRefresh), "clicked",
--			    GTK_SIGNAL_FUNC (on_buttonRefresh_clicked),
-+	g_signal_connect (G_OBJECT (buttonRefresh), "clicked",
-+			    G_CALLBACK (on_buttonRefresh_clicked),
- 			    NULL);
--	gtk_signal_connect (GTK_OBJECT (buttonConfigure), "clicked",
--			    GTK_SIGNAL_FUNC (on_buttonConfigure_clicked),
-+	g_signal_connect (G_OBJECT (buttonConfigure), "clicked",
-+			    G_CALLBACK (on_buttonConfigure_clicked),
- 			    NULL);
--	gtk_signal_connect (GTK_OBJECT (buttonAbout), "clicked",
--			    GTK_SIGNAL_FUNC (on_buttonAbout_clicked),
-+	g_signal_connect (G_OBJECT (buttonAbout), "clicked",
-+			    G_CALLBACK (on_buttonAbout_clicked),
- 			    NULL);
--	gtk_signal_connect (GTK_OBJECT (buttonClose), "clicked",
--			    GTK_SIGNAL_FUNC (on_buttonClose_clicked),
-+	g_signal_connect (G_OBJECT (buttonClose), "clicked",
-+			    G_CALLBACK (on_buttonClose_clicked),
- 			    NULL);
- 
- 	/* create our timer */
---- a/main.c	2008-06-25 23:03:27.000000000 +0200
-+++ b/main.c	2012-06-14 21:06:05.000523489 +0200
-@@ -30,7 +30,6 @@
- {
- 	GtkWidget *window1;
- 
--	gtk_set_locale ();
- 	gtk_init (&argc, &argv);
- 
- 	initialize_stuff();
---- a/usbparse.h	2008-06-25 23:03:47.000000000 +0200
-+++ b/usbparse.h	2012-06-14 21:06:05.000523489 +0200
-@@ -166,7 +166,7 @@
- 	struct Device	*child[MAX_CHILDREN];
- 	DeviceBandwidth	*bandwidth;
- 	GtkWidget	*tree;
--	GtkCTreeNode	*leaf;
-+	GtkTreeIter	leaf;
- } Device;
- 
- 
---- a/usbtree.c	2012-06-14 21:08:11.672516042 +0200
-+++ b/usbtree.c	2012-06-14 21:06:05.000523489 +0200
-@@ -45,7 +45,7 @@
- 
- 	/* blow away the tree if there is one */
- 	if (rootDevice != NULL) {
--		gtk_ctree_remove_node (GTK_CTREE(treeUSB), GTK_CTREE_NODE(rootDevice->leaf));
-+		gtk_tree_store_clear (treeStore);
- 	}
- 
- 	/* clean out the text box */
-@@ -208,32 +208,37 @@
- }
- 
- 
--void SelectItem (GtkWidget *widget, GtkCTreeNode *node, gint column, gpointer userData)
-+void SelectItem (GtkTreeSelection *selection, gpointer userData)
- {
--	int     data;
--	data = (int) gtk_ctree_node_get_row_data (GTK_CTREE (widget), node);
--
--	PopulateListBox ((int)data);
--
--	return;
-+	GtkTreeIter iter;
-+	GtkTreeModel *model;
-+	gint deviceAddr;
-+
-+	if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
-+		gtk_tree_model_get (model, &iter,
-+				DEVICE_ADDR_COLUMN, &deviceAddr,
-+				-1);
-+		PopulateListBox (deviceAddr);
-+	}
- }
- 
- 
- static void DisplayDevice (Device *parent, Device *device)
- {
- 	int		i;
--	gchar		*text[1];
- 	int		configNum;
- 	int		interfaceNum;
- 	gboolean	driverAttached = TRUE;
-+	gint		deviceAddr;
-+	const gchar	*color = "black";
- 
- 	if (device == NULL)
- 		return;
- 
- 	/* build this node */
--	text[0] = device->name;
--	device->leaf = gtk_ctree_insert_node (GTK_CTREE(treeUSB), parent->leaf, NULL, text, 1, NULL, NULL, NULL, NULL, FALSE, FALSE);
--	gtk_ctree_node_set_row_data (GTK_CTREE(treeUSB), device->leaf, (gpointer)((device->deviceNumber<<8) | (device->busNumber)));
-+	deviceAddr = (device->deviceNumber << 8) | device->busNumber;
-+	gtk_tree_store_append (treeStore, &device->leaf,
-+			       (device->level != 0) ? &parent->leaf : NULL);
- 
- 	/* determine if this device has drivers attached to all interfaces */
- 	for (configNum = 0; configNum < MAX_CONFIGS; ++configNum) {
-@@ -252,15 +257,14 @@
- 	}
- 
- 	/* change the color of this leaf if there are no drivers attached to it */
--	if (driverAttached == FALSE) {
--		GdkColor        red;
--		 
--		red.red = 56000;
--		red.green = 0;
--		red.blue = 0;
--		red.pixel = 0;
--		gtk_ctree_node_set_foreground (GTK_CTREE(treeUSB), device->leaf, &red);
--	}
-+	if (driverAttached == FALSE)
-+		color = "red";
-+
-+	gtk_tree_store_set (treeStore, &device->leaf,
-+			    NAME_COLUMN, device->name,
-+			    DEVICE_ADDR_COLUMN, deviceAddr,
-+			    COLOR_COLUMN, color,
-+			    -1);
- 
- 	/* create all of the children's leafs */
- 	for (i = 0; i < MAX_CHILDREN; ++i) {
-@@ -283,11 +287,16 @@
- 
- static void FileError (void)
- {
--	gchar *tempString = g_malloc0(strlen (verifyMessage) + strlen (devicesFile) + 50);
--	sprintf (tempString, " Can not open the file %s \n\n%s", devicesFile, verifyMessage);
--	ShowMessage ("USBView Error", tempString, FALSE);
--	g_free (tempString);
--	return;
-+	GtkWidget *dialog;
-+
-+	dialog = gtk_message_dialog_new (
-+				    GTK_WINDOW (windowMain),
-+				    GTK_DIALOG_DESTROY_WITH_PARENT,
-+				    GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-+				    "Can not open the file %s\n\n%s",
-+				    devicesFile, verifyMessage);
-+	gtk_dialog_run (GTK_DIALOG (dialog));
-+	gtk_widget_destroy (dialog);
- }
- 
- 
-@@ -328,10 +337,6 @@
- 	int             finished;
- 	int             i;
- 
--	if (MessageShown() == TRUE) {
--		return;
--	}
--
- 	/* if refresh is selected, then always do a refresh, otherwise look at the file first */
- 	if (!refresh) {
- 		if (!FileHasChanged()) {
-@@ -368,11 +373,5 @@
- 	usb_name_devices ();
- 
--	/* set up our tree */
--	gtk_ctree_set_line_style (GTK_CTREE(treeUSB), GTK_CTREE_LINES_DOTTED);
--	gtk_ctree_set_expander_style (GTK_CTREE(treeUSB), GTK_CTREE_EXPANDER_SQUARE);
--	gtk_ctree_set_indent (GTK_CTREE(treeUSB),10);
--	gtk_clist_column_titles_passive (GTK_CLIST(treeUSB));
--
- 	/* build our tree */
- 	for (i = 0; i < rootDevice->maxChildren; ++i) {
- 		DisplayDevice (rootDevice, rootDevice->child[i]);
-@@ -380,11 +386,14 @@
- 
- 	gtk_widget_show (treeUSB);
- 
--	gtk_ctree_expand_recursive (GTK_CTREE(treeUSB), NULL);
-+	gtk_tree_view_expand_all (GTK_TREE_VIEW (treeUSB));
- 
- 	/* hook up our callback function to this tree if we haven't yet */
- 	if (!signal_connected) {
--		gtk_signal_connect (GTK_OBJECT (treeUSB), "tree-select-row", GTK_SIGNAL_FUNC (SelectItem), NULL);
-+		GtkTreeSelection *select;
-+		select = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeUSB));
-+		g_signal_connect (G_OBJECT (select), "changed",
-+				  G_CALLBACK (SelectItem), NULL);
- 		signal_connected = TRUE;
- 	}
- 
---- a/usbtree.h	2008-06-25 23:03:52.000000000 +0200
-+++ b/usbtree.h	2012-06-14 21:06:05.000523489 +0200
-@@ -21,16 +21,24 @@
- #ifndef __USB_TREE_H
- #define __USB_TREE_H
- 
-+enum {
-+	NAME_COLUMN,
-+	DEVICE_ADDR_COLUMN,
-+	COLOR_COLUMN,
-+	N_COLUMNS
-+};
-+
- extern gchar		devicesFile[1000];
-+extern GtkTreeStore	*treeStore;
- extern GtkWidget	*treeUSB;
- extern GtkWidget	*textDescriptionView;
- extern GtkTextBuffer	*textDescriptionBuffer;
-+extern GtkWidget	*windowMain;
- 
- extern void	LoadUSBTree		(int refresh);
- extern void	initialize_stuff	(void);
- extern GtkWidget * create_windowMain	(void);
- extern void	configure_dialog	(void);
--extern void	about_dialog		(void);
- 
- extern void	on_buttonClose_clicked		(GtkButton *button, gpointer user_data);
- extern gboolean	on_window1_delete_event		(GtkWidget *widget, GdkEvent *event, gpointer user_data);
-@@ -39,8 +47,4 @@
- extern void	on_buttonAbout_clicked		(GtkButton *button, gpointer user_data);
- extern gint	on_timer_timeout		(gpointer user_data);
- 
--extern void	ShowMessage	(gchar *title, gchar *message, gboolean centered);
--extern gboolean	MessageShown	(void);
--
--
- #endif	/* __USB_TREE_H */
diff --git a/extra/usbview/usbview-1.1-missing-usbfs.patch b/extra/usbview/usbview-1.1-missing-usbfs.patch
deleted file mode 100644
index 7da2f0ca0..000000000
--- a/extra/usbview/usbview-1.1-missing-usbfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/usbtree.c	2012-10-21 08:21:35.000000000 +0200
-+++ b/usbtree.c	2012-10-21 08:21:12.000000000 +0200
-@@ -397,7 +397,7 @@
- 
- void initialize_stuff (void)
- {
--	strcpy (devicesFile, "/proc/bus/usb/devices");
-+	strcpy (devicesFile, "/sys/kernel/debug/usb/devices");
- 	memset (&previousDevicesFile[0], 0x00, sizeof(previousDevicesFile));
- 	previousChange = 0;
- 
diff --git a/extra/usbview/usbview.install b/extra/usbview/usbview.install
deleted file mode 100644
index b7f7e849b..000000000
--- a/extra/usbview/usbview.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  echo ">>> Debugfs must be mounted in order to use usbview."
-  echo ">>> As root execute:"
-  echo ">>> \"mount -t debugfs none /sys/kernel/debug\" or add"
-  echo ">>> \"none /sys/kernel/debug debugfs defaults 0 0\""
-  echo ">>> to /etc/fstab"
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/extra/usermin/PKGBUILD b/extra/usermin/PKGBUILD
deleted file mode 100644
index 9bbc7ed69..000000000
--- a/extra/usermin/PKGBUILD
+++ /dev/null
@@ -1,134 +0,0 @@
-# $Id: PKGBUILD 177553 2013-02-07 05:50:05Z eric $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=usermin
-pkgver=1.530
-pkgrel=1
-pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding"
-arch=(i686 x86_64 'mips64el')
-license=('custom:usermin')
-url="http://www.webmin.com/"
-depends=('perl' 'webmin')
-makedepends=('perl-net-ssleay')
-backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' 'etc/usermin/config' 'etc/usermin/usermin.cats' \
-'etc/usermin/at/config' \
-'etc/usermin/man/config' \
-'etc/usermin/ssh/config' \
-'etc/usermin/chfn/config' \
-'etc/usermin/cron/config' \
-'etc/usermin/file/config' \
-'etc/usermin/plan/config' \
-'etc/usermin/proc/config' \
-'etc/usermin/spam/config' \
-'etc/usermin/htaccess/config' \
-'etc/usermin/cshrc/config' \
-'etc/usermin/gnupg/config' \
-'etc/usermin/mysql/config' \
-'etc/usermin/quota/config' \
-'etc/usermin/shell/config' \
-'etc/usermin/theme/config' \
-'etc/usermin/mailbox/config' \
-'etc/usermin/schedule/config' \
-'etc/usermin/config' \
-'etc/usermin/commands/config' \
-'etc/usermin/htaccess-htpasswd/config' \
-'etc/usermin/forward/config' \
-'etc/usermin/telnet/config' \
-'etc/usermin/tunnel/config' \
-'etc/usermin/updown/config' \
-'etc/usermin/procmail/config' \
-'etc/usermin/fetchmail/config' \
-'etc/usermin/changepass/config' \
-'etc/usermin/language/config' \
-'etc/usermin/postgresql/config' \
-'etc/usermin/usermount/config' \
-)
-install=usermin.install
-source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
-	usermin.rc 
-	usermin.service
-	ftp://ftp.archlinux.org/other/usermin/usermin-config.tar.bz2) 
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-    
-  # remove modules we do not support
-
-  #remove config files from other distros
-  rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*')
-  
-  # remove caldera theme
-  rm -rf caldera
-
-  # remove init-scripts from other distros
-  rm usermin-init
-  rm usermin-daemon
-
-  # setting perl path
-  (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-  
-  # create dirs
-  mkdir -p "$pkgdir"/opt/usermin
-  mkdir -p "$pkgdir"/var/log/usermin
-  mkdir -p "$pkgdir"/etc/usermin
-  
-  # install pam stuff
-  install -D -m 644 usermin-pam "$pkgdir"/etc/pam.d/usermin
-  
-  # remove other distros and add only Archlinux don't change next line else it will not work!
-  rm os_list.txt
-  echo 'Archlinux			Any version	generic-linux	*	-d "/etc/pacman.d"' >> os_list.txt
-  
-  # copy stuff to right dirs
-  cd "$srcdir"/$pkgname-$pkgver
-  cp -rp * "$pkgdir"/opt/usermin
-  cd "$srcdir"/usermin-config
-  cp -rfp * "$pkgdir"/opt/usermin
-
-  # define parameters for setup.sh
-  config_dir="$pkgdir"/etc/usermin
-  var_dir="$pkgdir"/var/log/usermin
-  perl=/usr/bin/perl
-  autoos=1
-  port=20000
-  login=root
-  crypt="XXX"
-  ssl=1
-  atboot=0
-  nostart=1
-  nochown=1
-  autothird=1
-  nouninstall=1
-  noperlpath=1
-  atbootyn=n
-  tempdir="$pkgdir"/tmp
-  export config_dir var_dir perl autoos port tempdir ssl nochown autothird nouninstall nostart noperlpath atbootyn login crypt
-  
-  # Fix setup.sh
-  sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/usermin/setup.sh
-  "$pkgdir"/opt/usermin/setup.sh
-  
-  # Fixup the config files to use their real locations
-  sed -i 's:^pidfile=.*$:pidfile=/var/run/usermin.pid:' "$pkgdir"/etc/usermin/miniserv.conf
-  find "$pkgdir"/etc/usermin -type f -exec sed -i "s:$pkgdir::g" {} \; 
-  
-  # make it only accessible by localhost
-  echo 'allow=127.0.0.1' >> "$pkgdir"/etc/usermin/miniserv.conf
-  
-  # enable user and password login
-  sed -i -e '/localauth/d' "$pkgdir"/etc/usermin/miniserv.conf
-
-  #install systemd service file
-  install -D -m 644 "$srcdir"/usermin.service "$pkgdir"/usr/lib/systemd/system/usermin.service
- 
- #install rc file
-  install -D -m 755 "$srcdir"/usermin.rc "$pkgdir"/etc/rc.d/usermin
-
-  # delete temp dir
-  rm -r "$pkgdir"/tmp
-  #install license
-  install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE
-}
-md5sums=('5a00ec2d294935676efc12f607446fb4'
-         'cfef4490cd1ef9517c0b39a7bd75c968'
-         'a5bd5e5ee779f8a3cf3d776ca77ee36e'
-         'ec37a79f948f778224550930d2a7ca07')
diff --git a/extra/usermin/usermin-config.tar.bz2 b/extra/usermin/usermin-config.tar.bz2
deleted file mode 100644
index 056bb6298..000000000
--- a/extra/usermin/usermin-config.tar.bz2
+++ /dev/null
diff --git a/extra/usermin/usermin.install b/extra/usermin/usermin.install
deleted file mode 100644
index 3ace10ea2..000000000
--- a/extra/usermin/usermin.install
+++ /dev/null
@@ -1,34 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
-  crypt=${crypt//\\/\\\\}
-  crypt=${crypt//\//\\\/}
-  sed -i "s/root:XXX/root:${crypt}/" /etc/usermin/miniserv.users
-cat << EOF
-Note:
-==> It is not allowed to install 3rd party modules, or delete existing modules.
-==> Please write your own PKGBUILDS for 3rd party modules and additional themes.
-Setup:
-==> To make usermin start at boot time, add usermin to rc.conf daemons
-==> Point your web browser to http://localhost:20000 to use usermin.
-==> To change the modules setup please use webmin.
-
-==> The access is restricted to localhost, if you want to connect from other locations
-==> change /etc/usermin/miniserv.conf to something like that: allow=127.0.0.1 <your-ip>
-==> If you want to have ssl encryption please install 'perl-net-ssleay' additional.
-EOF
-# fix man module
-  cd /opt/usermin/man
-  gzip -df $(find . -name '*.gz')
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  # uninstall unzipped files
-  rm -r /opt/usermin/man
-}
diff --git a/extra/usermin/usermin.rc b/extra/usermin/usermin.rc
deleted file mode 100644
index af365780a..000000000
--- a/extra/usermin/usermin.rc
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-start=/etc/usermin/start
-stop=/etc/usermin/stop
-lockfile=/var/lock/usermin
-
-case "$1" in
-'start')
-     stat_busy "Starting Usermin daemon"
-     $start >/dev/null 2>&1 </dev/null
-     RETVAL=$?
-     if [ "$RETVAL" = "0" ]; then
-     touch $lockfile >/dev/null 2>&1
-     stat_done
-     else
-     stat_fail
-fi
-;;
-
-'stop')
-     stat_busy "Stopping Usermin daemon"
-     $stop >/dev/null 2>&1 </dev/null
-     RETVAL=$?
-     if [ "$RETVAL" = "0" ]; then
-     rm -f $lockfile
-     stat_done
-     else
-     stat_fail
-fi
-;;
-
-'restart')
-     $stop && $start
-     RETVAL=$?
-;;
-*)
-echo "Usage: $0 { start | stop | restart }"
-RETVAL=1
-;;
-esac
-exit $RETVAL
\ No newline at end of file
diff --git a/extra/usermin/usermin.service b/extra/usermin/usermin.service
deleted file mode 100644
index e91164c63..000000000
--- a/extra/usermin/usermin.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Usermin
-
-[Service]
-Type=forking
-ExecStart=/opt/usermin/miniserv.pl /etc/usermin/miniserv.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD
index efb043b62..7de2cf5c4 100644
--- a/extra/v4l-utils/PKGBUILD
+++ b/extra/v4l-utils/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 172061 2012-11-27 13:18:13Z tomegun $
+# $Id: PKGBUILD 184233 2013-05-04 14:56:27Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=v4l-utils
-pkgver=0.8.9
+pkgver=0.9.5
 pkgrel=1
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 arch=('i686' 'x86_64' 'mips64el')
@@ -9,27 +9,26 @@ url="http://freshmeat.net/projects/libv4l"
 provides=("libv4l=$pkgver")
 replaces=('libv4l')
 conflicts=('libv4l')
+backup=(etc/rc_maps.cfg)
 license=('LGPL')
-makedepends=('qt')
-optdepends=('qt')
+makedepends=('qt4')
+optdepends=('qt4')
 depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo')
 source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2
         http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc)
+sha256sums=('6c9f1be981d5763069e0969ebe426c39da5a7d738865367e390e3b486f1b502c'
+            'SKIP')
+options=(!libtool)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  sed -i 's|CFLAGS :=|CFLAGS ?=|' Make.rules
-
-  make PREFIX="/usr"
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make install PREFIX="/usr" DESTDIR="${pkgdir}/"
-  rm -f "${pkgdir}/usr/bin/ivtv-ctl"
-  mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
-  rm -rf "${pkgdir}/lib"
+  MAKEFLAGS="-j1" make install DESTDIR="${pkgdir}/"
+  rm "${pkgdir}/usr/bin/ivtv-ctl"
 }
-md5sums=('cc4f34a1494275ed70f76f2a806dca6a'
-         'ae8f4ed2ca0c1e006cb8c69b5a2982f7')
diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD
index 13e8e9ba8..5335e1902 100644
--- a/extra/vala/PKGBUILD
+++ b/extra/vala/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170948 2012-11-14 00:15:27Z heftig $
+# $Id: PKGBUILD 183465 2013-04-21 22:12:18Z heftig $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 
 pkgname=vala
-pkgver=0.18.1
-pkgrel=1.1
+pkgver=0.20.1
+pkgrel=1
 pkgdesc="Compiler for the GObject type system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Vala"
@@ -13,7 +13,7 @@ depends=('glib2')
 makedepends=('libxslt')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7f5e2e8ca03f9fa2cf13acaf93bfdc3a7ad0a10b000a337ba9c6bdc021bdca32')
+sha256sums=('9cb7ecd18a23525e401c204d4d08341c7d911cd5d78078eee10b747ecb45e481')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch b/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch
deleted file mode 100644
index fa400b953..000000000
--- a/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
---- valgrind-3.7.0-orig/configure	2011-11-05 21:24:39.000000000 +1000
-+++ valgrind-3.7.0/configure	2011-12-27 15:43:54.832120449 +1000
-@@ -6402,6 +6402,17 @@
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.15)
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5
-+$as_echo "2.15 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_15 1" >>confdefs.h
-+
-+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+	;;
-+
-      darwin)
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
- $as_echo "Darwin" >&6; }
-@@ -6422,7 +6433,7 @@
-      *)
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
- $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
--	as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
-+	as_fn_error "Valgrind requires glibc version 2.2 - 2.15" "$LINENO" 5
- 	as_fn_error "or Darwin libc" "$LINENO" 5
- 	;;
- esac
diff --git a/extra/valgrind/valgrind-3.7.0-glibc-2.16.patch b/extra/valgrind/valgrind-3.7.0-glibc-2.16.patch
deleted file mode 100644
index 4d28ff11a..000000000
--- a/extra/valgrind/valgrind-3.7.0-glibc-2.16.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
---- valgrind-3.7.0-orig/configure	2011-11-05 21:24:39.000000000 +1000
-+++ valgrind-3.7.0/configure	2011-12-27 15:43:54.832120449 +1000
-@@ -6402,6 +6402,28 @@
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.15)
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5
-+$as_echo "2.15 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_15 1" >>confdefs.h
-+
-+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+	;;
-+
-+     2.16)
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.16 family" >&5
-+$as_echo "2.16 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_16 1" >>confdefs.h
-+
-+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+	;;
-+
-      darwin)
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
- $as_echo "Darwin" >&6; }
-@@ -6422,7 +6433,7 @@
-      *)
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
- $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
--	as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
-+	as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5
- 	as_fn_error "or Darwin libc" "$LINENO" 5
- 	;;
- esac
diff --git a/extra/valgrind/valgrind-3.7.0-supp.patch b/extra/valgrind/valgrind-3.7.0-supp.patch
deleted file mode 100644
index 63a71de0e..000000000
--- a/extra/valgrind/valgrind-3.7.0-supp.patch
+++ /dev/null
@@ -1,253 +0,0 @@
---- valgrind-orig/exp-sgcheck.supp	2011-10-27 07:24:45.000000000 +1000
-+++ valgrind-new/exp-sgcheck.supp	2012-07-12 21:49:58.290123661 +1000
-@@ -1,8 +1,8 @@
- {
-    ld-2.X possibly applying relocations
-    exp-sgcheck:SorG
--   obj:/*lib*/ld-2.*so*
--   obj:/*lib*/ld-2.*so*
-+   obj:*/*lib*/ld-2.*so*
-+   obj:*/*lib*/ld-2.*so*
- }
- 
- # I'm pretty sure this is a false positive caused by the sg_ stuff
---- valgrind-orig/glibc-2.34567-NPTL-helgrind.supp	2011-10-27 07:24:45.000000000 +1000
-+++ valgrind-new/glibc-2.34567-NPTL-helgrind.supp	2012-07-12 21:50:03.663270525 +1000
-@@ -27,7 +27,7 @@
- #{
- #   helgrind-glibc2X-001
- #   Helgrind:Race
--#   obj:/lib*/ld-2.*so*
-+#   obj:*/lib*/ld-2.*so*
- #}
- 
- # helgrind-glibc2X-002 was merged into helgrind-glibc2X-001
-@@ -37,13 +37,13 @@
- {
-    helgrind-glibc2X-004
-    Helgrind:Race
--   obj:/lib*/libc-2.*so*
-+   obj:*/lib*/libc-2.*so*
- }
- 
- {
-    helgrind-glibc2X-005
-    Helgrind:Race
--   obj:/lib*/libpthread-2.*so*
-+   obj:*/lib*/libpthread-2.*so*
- }
- 
- # helgrind-glibc2X-006 was merged into helgrind-glibc2X-005
-@@ -78,14 +78,14 @@
- {
-    helgrind-glibc2X-101
-    Helgrind:Race
--   obj:/lib*/libpthread-2.*so*
-+   obj:*/lib*/libpthread-2.*so*
-    fun:pthread_*
- }
- {
-    helgrind-glibc2X-102
-    Helgrind:Race
-    fun:mythread_wrapper
--   obj:/lib*/libpthread-2.*so*
-+   obj:*/lib*/libpthread-2.*so*
- }
- {
-    helgrind-glibc2X-103
-@@ -110,7 +110,7 @@
- {
-    helgrind-glibc2X-107
-    Helgrind:Race
--   obj:/lib*/libpthread-2.*so*
-+   obj:*/lib*/libpthread-2.*so*
-    fun:sem_*
- }
- {
-@@ -126,7 +126,7 @@
- {
-    helgrind-glibc2X-110
-    Helgrind:Race
--   obj:/lib*/libc-2.*so*
-+   obj:*/lib*/libc-2.*so*
-    fun:pthread_*
- }
- {
---- valgrind-orig/glibc-2.X.supp.in	2011-10-27 07:24:45.000000000 +1000
-+++ valgrind-new/glibc-2.X.supp.in	2012-07-12 21:49:57.323490407 +1000
-@@ -39,74 +39,74 @@
- {
-    dl-hack3-cond-1
-    Memcheck:Cond
--   obj:/lib*/ld-@GLIBC_VERSION@*.so*
--   obj:/lib*/ld-@GLIBC_VERSION@*.so*
--   obj:/lib*/ld-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
- }
- {
-    dl-hack3-cond-2
-    Memcheck:Cond
--   obj:/lib*/ld-@GLIBC_VERSION@*.so*
--   obj:/lib*/ld-@GLIBC_VERSION@*.so*
--   obj:/lib*/libc-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
- }
- {
-    dl-hack3-cond-3
-    Memcheck:Cond
--   obj:/lib*/ld-@GLIBC_VERSION@*.so*
--   obj:/lib*/libc-@GLIBC_VERSION@*.so*
--   obj:/lib*/libc-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
- }
- {
-    dl-hack3-cond-4
-    Memcheck:Cond
--   obj:/lib*/ld-@GLIBC_VERSION@*.so*
--   obj:/lib*/ld-@GLIBC_VERSION@*.so*
--   obj:/lib*/libdl-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
- }
- 
- {
-    dl-hack4-64bit-addr-1
-    Memcheck:Addr8
--   obj:/lib*/ld-@GLIBC_VERSION@*.so*
--   obj:/lib*/ld-@GLIBC_VERSION@*.so*
--   obj:/lib*/ld-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
- }
- {
-    dl-hack4-64bit-addr-2
-    Memcheck:Addr8
--   obj:/lib*/ld-@GLIBC_VERSION@*.so*
--   obj:/lib*/ld-@GLIBC_VERSION@*.so*
--   obj:/lib*/libc-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
- }
- {
-    dl-hack4-64bit-addr-3
-    Memcheck:Addr8
--   obj:/lib*/ld-@GLIBC_VERSION@*.so*
--   obj:/lib*/ld-@GLIBC_VERSION@*.so*
--   obj:/lib*/libdl-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
- }
- 
- {
-    dl-hack5-32bit-addr-1
-    Memcheck:Addr4
--   obj:/lib*/ld-@GLIBC_VERSION@*.so
--   obj:/lib*/ld-@GLIBC_VERSION@*.so
--   obj:/lib*/ld-@GLIBC_VERSION@*.so
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so
- }
- {
-    dl-hack5-32bit-addr-3
-    Memcheck:Addr4
--   obj:/lib*/ld-@GLIBC_VERSION@*.so
--   obj:/lib*/ld-@GLIBC_VERSION@*.so
--   obj:/lib*/libdl-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so
-+   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
- }
- {
-    dl-hack5-32bit-addr-4
-    Memcheck:Addr4
--   obj:/lib*/ld-@GLIBC_VERSION@*.so
--   obj:/lib*/libdl-@GLIBC_VERSION@*.so*
--   obj:/lib*/ld-@GLIBC_VERSION@*.so
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so
-+   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
-+   obj:*/lib*/ld-@GLIBC_VERSION@*.so
- }
- 
- 
-@@ -149,9 +149,9 @@
- {
-    glibc-@GLIBC_VERSION@-on-SUSE-10.3-(x86)
-    Memcheck:Addr4
--   obj:/lib/ld-@GLIBC_VERSION@*.so
--   obj:/lib/ld-@GLIBC_VERSION@*.so
--   obj:/lib/ld-@GLIBC_VERSION@*.so
-+   obj:*/lib/ld-@GLIBC_VERSION@*.so
-+   obj:*/lib/ld-@GLIBC_VERSION@*.so
-+   obj:*/lib/ld-@GLIBC_VERSION@*.so
- }
- 
- {
-@@ -225,7 +225,7 @@
-    MVL-401-linuxthreads-pthread_create
-    Memcheck:Param
-    write(buf)
--   obj:/lib/libpthread-0.10.so
-+   obj:*/lib/libpthread-0.10.so
-    fun:pthread_create
- }
- 
---- valgrind-orig/glibc-2.X-drd.supp	2011-10-27 07:24:45.000000000 +1000
-+++ valgrind-new/glibc-2.X-drd.supp	2012-07-12 21:49:57.323490407 +1000
-@@ -6,7 +6,7 @@
- {
-    drd-ld
-    drd:ConflictingAccess
--   obj:/lib*/ld-*.so
-+   obj:*/lib*/ld-*.so
- }
- 
- #
-@@ -22,13 +22,19 @@
- {
-    drd-libc-stdio
-    drd:ConflictingAccess
--   obj:/lib*/libc-*
-+   obj:*/lib*/libc-*
- }
- {
-    drd-libc-thread-cancellation-test
-    drd:ConflictingAccess
-    fun:write
- }
-+{
-+   drd-libc-random
-+   drd:ConflictingAccess
-+   fun:random_r
-+   fun:random
-+}
- 
- #
- # Suppression patterns for libstdc++, the implementation of the standard C++
-@@ -128,7 +134,7 @@
- {
-    drd-libpthread-?
-    drd:ConflictingAccess
--   obj:/lib/libgcc_s.so.1
-+   obj:*/lib/libgcc_s.so.1
- }
- {
-    drd-libpthread-nanosleep
-@@ -171,6 +177,7 @@
- {
-    drd-libxcb-xcb_wait_for_reply
-    drd:CondErr
-+   ...
-    fun:pthread_cond_destroy*
-    fun:xcb_wait_for_reply
- }
diff --git a/extra/vamp-plugin-sdk/PKGBUILD b/extra/vamp-plugin-sdk/PKGBUILD
index a819e9c7c..096446ee9 100644
--- a/extra/vamp-plugin-sdk/PKGBUILD
+++ b/extra/vamp-plugin-sdk/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=vamp-plugin-sdk
 pkgver=2.4
-pkgrel=1
+pkgrel=1.1
 pkgdesc="The Vamp audio analysis plug-in system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.vamp-plugins.org/"
diff --git a/extra/vamp-plugin-sdk/gcc44.patch b/extra/vamp-plugin-sdk/gcc44.patch
deleted file mode 100644
index f559a7da9..000000000
--- a/extra/vamp-plugin-sdk/gcc44.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur vamp-plugin-sdk-2.0.orig/examples/FixedTempoEstimator.cpp vamp-plugin-sdk-2.0/examples/FixedTempoEstimator.cpp
---- vamp-plugin-sdk-2.0.orig/examples/FixedTempoEstimator.cpp	2008-12-01 13:48:41.000000000 +0200
-+++ vamp-plugin-sdk-2.0/examples/FixedTempoEstimator.cpp	2009-06-06 00:57:58.000000000 +0300
-@@ -43,9 +43,9 @@
- 
- using Vamp::RealTime;
- 
-+#include <cstdio>
- #include <cmath>
- 
--
- class FixedTempoEstimator::D
- // this class just avoids us having to declare any data members in the header
- {
diff --git a/extra/vc/PKGBUILD b/extra/vc/PKGBUILD
index 8e7d1ee1d..19e6366d9 100644
--- a/extra/vc/PKGBUILD
+++ b/extra/vc/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 177033 2013-02-04 15:56:42Z andrea $
+# $Id: PKGBUILD 183664 2013-04-26 12:12:30Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: PedsXing <pedsxing at gmx dot net>
 
 pkgname=vc
-pkgver=0.6.1
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="A library to ease explicit vectorization of C++ code"
 url='http://code.compeng.uni-frankfurt.de/projects/vc/'
-arch=('x86_64' 'i686' 'mips64el')
+arch=('x86_64' 'i686')
 license=('LGPL3')
 makedepends=('cmake')
-source=("http://code.compeng.uni-frankfurt.de/attachments/download/147/Vc-${pkgver}.tar.gz")
-md5sums=('8b9885b58872a11131d2818ec54f838a')
+source=("http://code.compeng.uni-frankfurt.de/attachments/download/161/Vc-${pkgver}.tar.gz")
+md5sums=('a7bc94838e55b5e0cdf5a02e1b52f8dc')
  
 build() {
   mkdir build 
@@ -22,10 +22,10 @@ build() {
   make
 }
 
-check() {
-  cd build
-  make test
-}
+# check() {
+#  cd build
+#  make test
+#}
 
 package() {
   cd build
diff --git a/extra/vde2/PKGBUILD b/extra/vde2/PKGBUILD
index 05785b36e..929e8686c 100644
--- a/extra/vde2/PKGBUILD
+++ b/extra/vde2/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=vde2
 pkgver=2.3.2
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Virtual Distributed Ethernet for emulators like qemu"
 url="http://sourceforge.net/projects/vde/"
 license=("GPL" "LGPL" "CUSTOM")
diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD
index 909423b60..2789c8cfa 100644
--- a/extra/vice/PKGBUILD
+++ b/extra/vice/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=vice
 pkgver=2.4
-pkgrel=2
+pkgrel=2.1
 pkgdesc="The Versatile Commodore 8-bit Emulator"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -32,6 +32,8 @@ build() {
   patch -Np1 -i "${srcdir}/vice-2.4-notexi-notxt.patch"
   patch -Np1 -i "${srcdir}/vice-2.4-zlib-1.2.7.patch"
 
+  sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
+
   autoreconf
   ./configure --prefix=/usr \
               --enable-ethernet \
diff --git a/extra/vice/vice-2.3-no-fc-cache.patch b/extra/vice/vice-2.3-no-fc-cache.patch
deleted file mode 100644
index 7efdc87c7..000000000
--- a/extra/vice/vice-2.3-no-fc-cache.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure.in	2011-02-19 23:07:05.000000000 +0100
-+++ b/configure.in	2012-08-06 13:18:46.000000000 +0200
-@@ -1990,12 +1990,7 @@
- 
- fi
- 
--AC_PATH_PROGS(FCCACHE, fc-cache, false)
--if test x"$FCCACHE" = "xfalse"; then
-   AM_CONDITIONAL(HAVE_FC_CACHE, false)
--else
--  AM_CONDITIONAL(HAVE_FC_CACHE, true)
--fi
- 
- if test x"$is_amigaos4" = "xyes"; then
-   if test x"$enable_sdlui" != "xyes"; then
diff --git a/extra/vice/vice-2.3-notexi-notxt.patch b/extra/vice/vice-2.3-notexi-notxt.patch
deleted file mode 100644
index f26ac0beb..000000000
--- a/extra/vice/vice-2.3-notexi-notxt.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/doc/Makefile.am	2011-02-05 17:52:48.000000000 +0100
-+++ b/doc/Makefile.am	2012-08-06 14:33:37.000000000 +0200
-@@ -48,14 +48,7 @@
- $(srcdir)/vice.txt:	vice.texi
- 	$(MAKEINFO) -o $(srcdir)/vice.txt --no-headers $(srcdir)/vice.texi
- 
--if BUILD_PDF
--$(srcdir)/vice.pdf:	vice.texi
--	$(TEXI2DVI) -q --clean --pdf -o $(srcdir)/vice.pdf $(srcdir)/vice.texi
--
--PDF_DEPS=$(srcdir)/vice.pdf
--else
- PDF_DEPS=
--endif
- 
- if BUILD_AMIGAGUIDE
- $(srcdir)/vice.guide:	vice.texi
-@@ -99,4 +92,4 @@
- IPF_DEPS=
- endif
- 
--INFO_DEPS = $(srcdir)/vice.txt $(srcdir)/vice.info $(PDF_DEPS) $(GUIDE_DEPS) $(HLP_DEPS) $(CHM_DEPS) $(IPF_DEPS)
-+INFO_DEPS = $(srcdir)/vice.info $(PDF_DEPS) $(GUIDE_DEPS) $(HLP_DEPS) $(CHM_DEPS) $(IPF_DEPS)
diff --git a/extra/vice/vice-2.3-x11video.patch b/extra/vice/vice-2.3-x11video.patch
deleted file mode 100644
index d698638c6..000000000
--- a/extra/vice/vice-2.3-x11video.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/arch/unix/x11/xaw/x11video.c	2011-01-18 23:59:00.000000000 +0100
-+++ b/src/arch/unix/x11/xaw/x11video.c	2011-02-27 18:40:52.000000000 +0100
-@@ -60,6 +60,8 @@
- #include <X11/Xutil.h>
- #include <X11/Intrinsic.h>
- #include <X11/cursorfont.h>
-+#include <X11/Xmd.h>
-+#include <X11/extensions/shmproto.h>
- 
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/extra/vice/vice-2.3-zlib-1.2.7.patch b/extra/vice/vice-2.3-zlib-1.2.7.patch
deleted file mode 100644
index 079a8d6bd..000000000
--- a/extra/vice/vice-2.3-zlib-1.2.7.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/zfile.c	2010-07-16 20:20:01.000000000 +0200
-+++ b/src/zfile.c	2012-08-06 15:29:10.000000000 +0200
-@@ -197,10 +197,10 @@
-     do {
-         char buf[256];
- 
--        len = gzread(fdsrc, (void *)buf, 256);
-+        len = gzread((gzFile)fdsrc, (void *)buf, 256);
-         if (len > 0) {
-             if (fwrite((void *)buf, 1, (size_t)len, fddest) < len) {
--                gzclose(fdsrc);
-+                gzclose((gzFile)fdsrc);
-                 fclose(fddest);
-                 ioutil_remove(tmp_name);
-                 lib_free(tmp_name);
-@@ -209,7 +209,7 @@
-         }
-     } while (len > 0);
- 
--    gzclose(fdsrc);
-+    gzclose((gzFile)fdsrc);
-     fclose(fddest);
- 
-     return tmp_name;
-@@ -792,10 +792,10 @@
-         char buf[256];
-         len = fread((void *)buf, 256, 1, fdsrc);
-         if (len > 0)
--            gzwrite(fddest, (void *)buf, (unsigned int)len);
-+            gzwrite((gzFile)fddest, (void *)buf, (unsigned int)len);
-     } while (len > 0);
- 
--    gzclose(fddest);
-+    gzclose((gzFile)fddest);
-     fclose(fdsrc);
- 
-     archdep_file_set_gzip(dest);
diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD
index 13462ab85..f4ebc938b 100644
--- a/extra/vigra/PKGBUILD
+++ b/extra/vigra/PKGBUILD
@@ -1,29 +1,24 @@
-# $Id: PKGBUILD 148954 2012-02-05 11:57:34Z ibiru $
+# $Id: PKGBUILD 181129 2013-03-31 19:16:58Z stephane $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
-pkgver=1.8.0
-pkgrel=3.1
+pkgver=1.9.0
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hci.iwr.uni-heidelberg.de/vigra/"
 license=('custom:MIT')
 makedepends=(# runtime deps
              'libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw'
 	     # additional makedeps
-             'cmake' 'python2-nose' 'doxygen' 'python-sphinx' 'boost' 'python2-numpy')
+             'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost' 'python2-numpy')
 options=('!libtool')
-source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz
-	vigra-1.7.1.gcc460.patch)
-md5sums=('15c5544448e529ee60020758ab6be264'
-         '25ef8bc26bc38ee67e5b512d2acd0166')
-sha1sums=('09f1d506c2748ebeb7d9f1c77ce387f9e7b837d2'
-          '1de6381a74dd136ea25df5a27f249187b0dbd17e')
+source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz)
+md5sums=('b6155afe1ea967917d2be16d98a85404')
 
 build() {
   cd "${srcdir}"/${pkgbase}-${pkgver}
-  patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -DPYTHON_EXECUTABLE=/usr/bin/python2 \
       -DWITH_VIGRANUMPY=1 \
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index b313b46ff..43b3b8dce 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -6,8 +6,8 @@
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
 _topver=7.3
-_patchlevel=798
-__hgrev=30b3b1da0350
+_patchlevel=918
+__hgrev=c61da758a9a2
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
 pkgrel=1
@@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
         'vimrc'
         'archlinux.vim'
         'gvim.desktop')
-md5sums=('e4a759fdb7cf91d91fd4f8e4f44d5d9c'
-         'ff8221082bdd0f9b63f57e5cc7773ee7'
+md5sums=('b1a619f017851646a8567deda17bdb36'
+         'SKIP'
          '6e7adfbd5d26c1d161030ec203a7f243'
          '20fceda56badf201695c57999b0bc609'
          '10353a61aadc3f276692d0e17db1478e'
diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD
index 995f8de14..01c484075 100644
--- a/extra/vinagre/PKGBUILD
+++ b/extra/vinagre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 170889 2012-11-12 22:10:03Z heftig $
+# $Id: PKGBUILD 183466 2013-04-21 22:12:20Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: lp76 <l.peduto@gmail.com>
 
 pkgname=vinagre
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="A VNC Client for the GNOME Desktop"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ makedepends=('docbook-xsl' 'intltool' 'rdesktop' 'openssh' 'itstool')
 groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('dec4b24de9c372cef3efc0d3e80514c85250e01ce01325d07a4e4e956b4a8f3c')
+sha256sums=('64f9bcd08f33e5e767565909792094ad78d7b400f16dc24e0a5699c7e87da000')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD
index a028a4a22..604f7c10a 100644
--- a/extra/vino/PKGBUILD
+++ b/extra/vino/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 170890 2012-11-12 22:11:14Z heftig $
+# $Id: PKGBUILD 183467 2013-04-21 22:12:21Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=vino
-pkgver=3.6.2
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="a VNC server for the GNOME desktop"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libsecret' 'avahi' 'desktop-file-utils')
 makedepends=('intltool' 'networkmanager' 'gnome-common')
-groups=('gnome-extra')
+groups=('gnome')
 url="http://www.gnome.org"
 options=(!emptydirs)
 install=vino.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c24907542c5ea086293dc852edfeb6b6d02d63e210a3ff715c18d04e130857e4')
+sha256sums=('3a82392aa479d5a4be38020ac64b3c4f0227917af6175938919dbe741995929c')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD
index 60299ddd2..3636f2cc4 100644
--- a/extra/virtuoso/PKGBUILD
+++ b/extra/virtuoso/PKGBUILD
@@ -1,23 +1,32 @@
-# $Id: PKGBUILD 164689 2012-08-02 16:10:25Z andrea $
+# $Id: PKGBUILD 184267 2013-05-05 08:27:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
 pkgbase=virtuoso
 pkgname=('virtuoso' 'virtuoso-base')
 pkgver=6.1.6
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://virtuoso.openlinksw.com/wiki/main/Main/'
 license=('GPL')
-makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2')
+makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2' 'optipng')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz")
-md5sums=('3991149c570f3738c3e819ce603e487f')
+source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz"
+        'automake113.patch')
+md5sums=('3991149c570f3738c3e819ce603e487f'
+         '570043e1b5f4acd9826732f002941c12')
+
+prepare() {
+  cd ${pkgbase}-opensource-${pkgver}
+
+  optipng -quiet -force -fix appsrc/ODS-Wiki/http/images/opts_16.png
+
+  patch -p1 -i "${srcdir}"/automake113.patch
+}
 
 build() {
-  cd ${srcdir}/${pkgbase}-opensource-${pkgver}
+  cd ${pkgbase}-opensource-${pkgver}
 
-  ./autogen.sh
   ./configure --with-layout=debian \
     --program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/' \
     --with-readline
@@ -29,7 +38,7 @@ package_virtuoso-base() {
   depends=('libldap')
 
   # install server
-  cd ${srcdir}/${pkgbase}-opensource-${pkgver}/binsrc/virtuoso
+  cd ${pkgbase}-opensource-${pkgver}/binsrc/virtuoso
   make DESTDIR=${pkgdir} install
 
   # install driver
@@ -47,7 +56,7 @@ package_virtuoso() {
   pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality'
   depends=('virtuoso-base' 'libxml2')
 
-  cd ${srcdir}/${pkgbase}-opensource-${pkgver}
+  cd ${pkgbase}-opensource-${pkgver}
   make DESTDIR=${pkgdir} install
 
   # remove conflicts with virtuoso-base
diff --git a/extra/virtuoso/automake113.patch b/extra/virtuoso/automake113.patch
new file mode 100644
index 000000000..5f84b49bc
--- /dev/null
+++ b/extra/virtuoso/automake113.patch
@@ -0,0 +1,12 @@
++++ a/configure.in
+--- b/configure.in
+@@ -36,7 +36,7 @@ 
+ AC_INIT([Virtuoso Open Source Edition],
+ AC_CONFIG_SRCDIR([libsrc/Dk.h])
+ AC_CONFIG_AUX_DIR([binsrc/config])
+ AC_CONFIG_MACRO_DIR([binsrc/config])
+-AM_CONFIG_HEADER([libsrc/Dk/config.h])
++AC_CONFIG_HEADER([libsrc/Dk/config.h])
+ 
+ dnl
+ dnl You may need to change the next macro for older versions of automake: 
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 61b1b7eb6..a8ab46e88 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 175149 2013-01-15 11:34:26Z jgc $
+# $Id: PKGBUILD 182353 2013-04-08 21:34:41Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
-pkgver=2.0.5
-pkgrel=2
+pkgver=2.0.6
+pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/vlc/"
 license=('LGPL2.1' 'GPL2')
-depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' 
+depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 
          'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' 
          'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 
          'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' 
@@ -61,7 +61,7 @@ backup=('usr/share/vlc/lua/http/.hosts'
 options=('!libtool' '!emptydirs')
 install=vlc.install
 source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('4f959c0766ada8cea5a72c65fce94ebe')
+md5sums=('b45be633c71dca04ca7d6c3d64dd728b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -87,7 +87,9 @@ build() {
               --enable-opus \
               --enable-sftp \
               $extraconf \
-              LUAC=luac5.1
+              LUAC=luac5.1 \
+              RCC=/usr/bin/rcc-qt4
+
   make
 }
 
diff --git a/extra/vorbis-tools/PKGBUILD b/extra/vorbis-tools/PKGBUILD
index 2cf4f7627..7c9b87fcb 100644
--- a/extra/vorbis-tools/PKGBUILD
+++ b/extra/vorbis-tools/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=vorbis-tools
 pkgver=1.4.0
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Extra tools for Ogg-Vorbis"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.xiph.org/vorbis/'
diff --git a/extra/vte/PKGBUILD b/extra/vte/PKGBUILD
index 757049e4c..5357adaec 100644
--- a/extra/vte/PKGBUILD
+++ b/extra/vte/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=vte
 pkgver=0.28.2
-pkgrel=3.1
+pkgrel=3.2
 pkgdesc="Virtual Terminal Emulator widget for use with GTK2"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD
index 2c680778b..b9073b50d 100644
--- a/extra/vte3/PKGBUILD
+++ b/extra/vte3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170907 2012-11-12 22:41:40Z heftig $
+# $Id: PKGBUILD 183325 2013-04-21 22:06:44Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=vte3
 pkgname=(vte3 vte-common)
-pkgver=0.34.2
+pkgver=0.34.4
 pkgrel=1
 pkgdesc="Virtual Terminal Emulator widget for use with GTK3"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ options=('!libtool' '!emptydirs')
 makedepends=('intltool' 'gobject-introspection' 'gtk3')
 url="http://www.gnome.org"
 source=(http://download.gnome.org/sources/vte/${pkgver::4}/vte-$pkgver.tar.xz)
-sha256sums=('f40f9fe0bcc6d65bc44b2fab5469b56a9f0631132c6b90e06053e421711159cf')
+sha256sums=('477de8f0b8473e1cb27c9488e278df44d16fc384d1753c5c3961e3f0417860bd')
 
 build() {
   cd "vte-$pkgver"
diff --git a/extra/w3m/https-segfault.patch b/extra/w3m/https-segfault.patch
deleted file mode 100644
index 31286a70d..000000000
--- a/extra/w3m/https-segfault.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994
-
---- old/url.c	2011-01-04 14:52:24.000000000 +0530
-+++ new/url.c	2011-09-02 18:25:43.305652690 +0530
-@@ -82,11 +82,11 @@
-     {"ftp", SCM_FTP},
-     {"local", SCM_LOCAL},
-     {"file", SCM_LOCAL},
--    /*  {"exec", SCM_EXEC}, */
-+    {"exec", SCM_EXEC}, 
-     {"nntp", SCM_NNTP},
--    /*  {"nntp", SCM_NNTP_GROUP}, */
-+    {"nntp", SCM_NNTP_GROUP}, 
-     {"news", SCM_NEWS},
--    /*  {"news", SCM_NEWS_GROUP}, */
-+    {"news", SCM_NEWS_GROUP}, 
-     {"data", SCM_DATA},
- #ifndef USE_W3MMAILER
-     {"mailto", SCM_MAILTO},
diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD
index c48bbde13..cd262f582 100644
--- a/extra/watchdog/PKGBUILD
+++ b/extra/watchdog/PKGBUILD
@@ -1,25 +1,19 @@
-# $Id: PKGBUILD 165803 2012-08-30 17:35:28Z thomas $
+# $Id: PKGBUILD 178840 2013-02-27 15:05:46Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=watchdog
-pkgver=5.12
-pkgrel=2
+pkgver=5.13
+pkgrel=1
 pkgdesc="Watchdog daemon"
 arch=(i686 x86_64 'mips64el')
 url="http://sourceforge.net/projects/watchdog"
 license=('GPL')
 depends=('glibc')
-backup=(etc/watchdog.conf
-        etc/conf.d/watchdog
-        etc/conf.d/wd_keepalive)
+backup=(etc/watchdog.conf)
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        watchdog.sh
-        watchdog.cf
         watchdog-5.12-fix-oom-in-wd_keepalive.patch
         watchdog.systemd)
-md5sums=('cea28bea70e54f3625062bc808aef9af'
-         'f57d33967eb9404dd52e3c4e73795a20'
-         '01c1e2e13f515131180b4ebe9b8b7cc3'
+md5sums=('153455f008f1cf8f65f6ad9586a21ff1'
          'c90c2686975b5254f82b3de683f1f442'
          'a835ae5cbdbb21c19a468dedb5d734e4')
 
@@ -41,13 +35,5 @@ build() {
 package() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   make install DESTDIR="${pkgdir}"
-  for fil in watchdog wd_keepalive ; do
-	install -D -m755 "${srcdir}"/watchdog.sh "${pkgdir}"/etc/rc.d/${fil}
-	install -D -m644 "${srcdir}"/watchdog.cf "${pkgdir}"/etc/conf.d/${fil}
-  done
   install -D -m644 "${srcdir}"/watchdog.systemd "${pkgdir}"/usr/lib/systemd/system/watchdog.service
-
-  sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/rc.d/wd_keepalive
-  sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/conf.d/wd_keepalive
-  sed -i 's/Watchdog/Simple Watchdog/' "${pkgdir}"/etc/rc.d/wd_keepalive
 }
diff --git a/extra/watchdog/watchdog.cf b/extra/watchdog/watchdog.cf
deleted file mode 100644
index a33e1ea91..000000000
--- a/extra/watchdog/watchdog.cf
+++ /dev/null
@@ -1,2 +0,0 @@
-# watchdog configuration
-WATCHDOG_OPTIONS=""
diff --git a/extra/watchdog/watchdog.sh b/extra/watchdog/watchdog.sh
deleted file mode 100644
index 54f78454f..000000000
--- a/extra/watchdog/watchdog.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID="$( cat /run/watchdog.pid 2>/dev/null )"
-[ -r /etc/conf.d/watchdog ] && source /etc/conf.d/watchdog
-
-case "$1" in
-  start)
-    stat_busy "Starting Watchdog Daemon"
-
-    [ -z "$PID" ] && /usr/sbin/watchdog ${WATCHDOG_OPTIONS}
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon watchdog
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Watchdog Daemon"
-
-    [ -n "$PID" ] && kill $PID &> /dev/null
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon watchdog
-      stat_done
-    fi
-
-    rm -f /run/watchdog.pid
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/wavpack/PKGBUILD b/extra/wavpack/PKGBUILD
index a5b2a112f..0e2974f09 100644
--- a/extra/wavpack/PKGBUILD
+++ b/extra/wavpack/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=wavpack
 pkgver=4.60.1
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc="Audio compression format with lossless, lossy, and hybrid compression modes"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.wavpack.com/"
diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD
new file mode 100644
index 000000000..dbe4ca569
--- /dev/null
+++ b/extra/wayland/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 182997 2013-04-16 18:42:01Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Sébastien Luttringer
+# Contributor: Joel Teichroeb <joel@teichroeb.net>
+
+pkgname=wayland
+pkgver=1.1.0
+pkgrel=1
+pkgdesc='A computer display server protocol'
+arch=('i686' 'x86_64' 'mips64el')
+url='http://wayland.freedesktop.org'
+license=('MIT')
+depends=('libffi' 'expat')
+makedepends=('doxygen')
+options=(!libtool)
+source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz")
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr \
+    --disable-static
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+md5sums=('d2dc9398a83692cafc16eba6e45f85d8')
diff --git a/extra/wcslib/PKGBUILD b/extra/wcslib/PKGBUILD
index bf9c85b74..4f939fa74 100644
--- a/extra/wcslib/PKGBUILD
+++ b/extra/wcslib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 171525 2012-11-18 11:23:12Z andrea $
+# $Id: PKGBUILD 183302 2013-04-21 06:02:20Z andrea $
 # Maintainer: Your Name <youremail@domain.com>
 
 pkgname=wcslib
-pkgver=4.16
+pkgver=4.17
 pkgrel=1
 pkgdesc="A C library that implements the 'World Coordinate System' (WCS) standard in FITS"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL3')
 depends=('cfitsio')
 makedepends=('gcc-fortran')
 source=("ftp://ftp.atnf.csiro.au/pub/software/${pkgname}/${pkgname}.tar.bz2")
-md5sums=('30439a0bb730ef936646d646c9f07518')
+md5sums=('81f739c84789b84626db9fe4cd866081')
 
 build() {
   cd $pkgname-$pkgver
@@ -27,11 +27,13 @@ build() {
 #}
 
 package() {
+  # Fix install on i686
+  install -d "${pkgdir}"/usr/include/${pkgname}-${pkgver}
+
   cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir/" install
+  make -j1 DESTDIR="$pkgdir/" install
   
   # Fix wrong permissions
-
   chmod g=rx,-s "${pkgdir}"/usr/{bin/,/lib/{,pkgconfig},share/man/man1/}
   chmod -s "${pkgdir}"/usr/{include/wcslib-${pkgver}/,share/doc/wcslib-${pkgver}/{,html/}}
 }
diff --git a/extra/webkitgtk/0001-https-bugs.webkit.org-show_bug.cgi-id-112141.patch b/extra/webkitgtk/0001-https-bugs.webkit.org-show_bug.cgi-id-112141.patch
new file mode 100644
index 000000000..49eb83223
--- /dev/null
+++ b/extra/webkitgtk/0001-https-bugs.webkit.org-show_bug.cgi-id-112141.patch
@@ -0,0 +1,64 @@
+Without ChangeLog change.
+
+From 7ba6eb5405cb66c97398f8cdb6d5f9e919ba6131 Mon Sep 17 00:00:00 2001
+From: "rgabor@webkit.org"
+ <rgabor@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Tue, 12 Mar 2013 15:28:10 +0000
+Subject: [PATCH] https://bugs.webkit.org/show_bug.cgi?id=112141 LLInt CLoop
+ backend misses Double2Ints() on 32bit architectures
+
+Reviewed by Filip Pizlo.
+
+Implement Double2Ints() in CLoop backend of LLInt on 32bit architectures.
+
+* llint/LowLevelInterpreter.cpp:
+(LLInt):
+(JSC::LLInt::Double2Ints):
+* offlineasm/cloop.rb:
+
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@145551 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/JavaScriptCore/ChangeLog                     | 14 ++++++++++++++
+ Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 11 +++++++++++
+ Source/JavaScriptCore/offlineasm/cloop.rb           |  2 +-
+ 3 files changed, 26 insertions(+), 1 deletion(-)
+
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+index d3c73b0..186c659 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+@@ -117,6 +117,17 @@ static double Ints2Double(uint32_t lo, uint32_t hi)
+     u.ival64 = (static_cast<uint64_t>(hi) << 32) | lo;
+     return u.dval;
+ }
++
++static void Double2Ints(double val, uint32_t& lo, uint32_t& hi)
++{
++    union {
++        double dval;
++        uint64_t ival64;
++    } u;
++    u.dval = val;
++    hi = static_cast<uint32_t>(u.ival64 >> 32);
++    lo = static_cast<uint32_t>(u.ival64);
++}
+ #endif // USE(JSVALUE32_64)
+ 
+ } // namespace LLint
+diff --git a/Source/JavaScriptCore/offlineasm/cloop.rb b/Source/JavaScriptCore/offlineasm/cloop.rb
+index 14cacb9..f6bd552 100644
+--- a/Source/JavaScriptCore/offlineasm/cloop.rb
++++ b/Source/JavaScriptCore/offlineasm/cloop.rb
+@@ -1025,7 +1025,7 @@ class Instruction
+         # 32-bit instruction: f2dii dblOp int32LoOp int32HiOp (based on ARMv7)
+         # Encode a 64-bit double into 2 32-bit ints (low and high).
+         when "fd2ii"
+-            $asm.putc "Double2Ints(#{operands[0].clValue(:double)}, #{operands[1].clValue}, #{operands[2].clValue});"
++            $asm.putc "Double2Ints(#{operands[0].clValue(:double)}, #{operands[1].clValue(:uint32)}, #{operands[2].clValue(:uint32)});"
+ 
+         # 64-bit instruction: fq2d int64Op dblOp (based on X64)
+         # Copy a bit-encoded double in a 64-bit int register to a double register.
+-- 
+1.8.2.1
+
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
index ea93ba2b0..6e907c355 100644
--- a/extra/webkitgtk/PKGBUILD
+++ b/extra/webkitgtk/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 175876 2013-01-23 00:13:13Z eric $
+# $Id: PKGBUILD 183326 2013-04-21 22:06:45Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=webkitgtk
-pkgname=('webkitgtk2' 'webkitgtk3')
-pkgver=1.10.2
-pkgrel=2
+pkgname=('webkitgtk3')
+pkgver=2.0.1
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://webkitgtk.org/"
 license=('custom')
-makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gstreamer0.10-base' 'gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc')
+makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gperf' 'gobject-introspection' 'python' 'mesa' 'ruby' 'gtk-doc' 'libsecret' 'libwebp')
 options=('!libtool' '!emptydirs')
-source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz)
-sha256sums=('19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c')
-
-build() {
-  cd "$srcdir/webkitgtk-$pkgver"
-  mkdir -p build-gtk2 build-gtk3
+source=(http://webkitgtk.org/releases/$pkgbase-$pkgver.tar.xz
+        0001-https-bugs.webkit.org-show_bug.cgi-id-112141.patch)
+sha256sums=('6303552a39d7912725d75bc55f530cdb99171fb873e299798d0bb932d6ea76cb'
+            '7b4c1419342bafcca642d7a41abe92713810401591906b081fe476169cb9a3aa')
 
+prepare() {
+  cd $pkgbase-$pkgver
+  mkdir build-gtk3
   if [ "$CARCH" = "mips64el" ]; then
      # Fix MIPS N32 support.
       sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
@@ -24,52 +25,45 @@ build() {
      # Don't enable JIT even if configure finds that it's not supported.
       sed -i 's/#define ENABLE_JIT 1/#define ENABLE_JIT 0/' \
           Source/WTF/wtf/Platform.h
+  fi
+
+  # Fix build on 32-bit platforms.
+  patch -p1 -i "$srcdir/0001-https-bugs.webkit.org-show_bug.cgi-id-112141.patch"
 
-# --disable-optimizations will add -O0
-      export CFLAGS="${CFLAGS/-O[0-9]}"
+  # Won't be made before files there.
+  mkdir -p build-gtk3/Programs/resources
+}
+
+build() {
+  cd $pkgbase-$pkgver/build-gtk3
 
+  if [ "$CARCH" = "mips64el" ]; then
+      # Optimizations make it segfault when running; without
+      # -mlong-calls R_MIPS_26 relocations will be used and truncated.
+      # Disable unneeded arch-specific warnings.
+      export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=[0-9]} -Wno-cast-align"
+      export CFLAGS="${CFLAGS/-O[0-9]} -mlong-calls"
+      export CXXFLAGS="${CXXFLAGS/-O[0-9]} -mlong-calls"
       extra="--disable-fast-malloc --disable-optimizations"
   fi
 
-  cd build-gtk2
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --disable-silent-rules \
-    --libexecdir=/usr/lib/webkitgtk2 \
-    --with-gstreamer=0.10 \
-    --with-gtk=2.0 \
-    --disable-webkit2 $extra
-  make all stamp-po
-  
-  cd ../build-gtk3
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --disable-silent-rules \
-    --libexecdir=/usr/lib/webkitgtk3 \
-    --with-gstreamer=1.0 $extra
+  # Suppress a *lot* of gcc 4.8 warnings
+  export CPPFLAGS="$CPPFLAGS -Wno-unused-local-typedefs"
+
+  ../configure --prefix=/usr --libexecdir=/usr/lib/webkitgtk3 \
+    --enable-introspection $extra
   make all stamp-po
 }
 
 package_webkitgtk3() {
   pkgdesc="GTK+ Web content engine library for GTK+ 3.0"
-  depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs')
+  depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk3' 'gst-plugins-base-libs' 'libsecret' 'libwebp')
   conflicts=('libwebkit3')
   provides=("libwebkit3=${pkgver}")
   replaces=('libwebkit3')
+  optdepends=('gtk2: Webkit2 plugin support')
   
-  cd "$srcdir/webkitgtk-$pkgver/build-gtk3"
-  make -j1 DESTDIR="$pkgdir" install
-  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_webkitgtk2() {
-  pkgdesc="GTK+ Web content engine library for GTK+ 2.0"
-  depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gstreamer0.10-base')
-  conflicts=('libwebkit')
-  provides=("libwebkit=${pkgver}")
-  replaces=('libwebkit')
-  
-  cd "$srcdir/webkitgtk-$pkgver/build-gtk2"
+  cd $pkgbase-$pkgver/build-gtk3
   make -j1 DESTDIR="$pkgdir" install
   install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/webkitgtk2/PKGBUILD b/extra/webkitgtk2/PKGBUILD
new file mode 100644
index 000000000..c62f1250c
--- /dev/null
+++ b/extra/webkitgtk2/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 183468 2013-04-21 22:12:24Z heftig $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgname=webkitgtk2
+pkgver=1.10.2
+pkgrel=4
+arch=('i686' 'x86_64' 'mips64el')
+url="http://webkitgtk.org/"
+license=('custom')
+makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gstreamer0.10-base' 'gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc')
+options=('!libtool' '!emptydirs')
+source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz)
+sha256sums=('19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c')
+
+build() {
+  cd "$srcdir/webkitgtk-$pkgver"
+  mkdir build-gtk2
+
+  if [ "$CARCH" = "mips64el" ]; then
+     # Fix MIPS N32 support.
+      sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
+          Source/WTF/wtf/Platform.h
+     # Don't enable JIT even if configure finds that it's not supported.
+      sed -i 's/#define ENABLE_JIT 1/#define ENABLE_JIT 0/' \
+          Source/WTF/wtf/Platform.h
+
+# --disable-optimizations will add -O0
+      export CFLAGS="${CFLAGS/-O[0-9]}"
+
+      extra="--disable-fast-malloc --disable-optimizations"
+  fi
+
+  cd build-gtk2
+  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
+    --enable-introspection \
+    --disable-silent-rules \
+    --libexecdir=/usr/lib/webkitgtk2 \
+    --with-gstreamer=0.10 \
+    --with-gtk=2.0 \
+    --disable-webkit2 $extra
+  make all stamp-po
+}
+
+package() {
+  pkgdesc="GTK+ Web content engine library for GTK+ 2.0"
+  depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gstreamer0.10-base')
+  conflicts=('libwebkit')
+  provides=("libwebkit=${pkgver}")
+  replaces=('libwebkit')
+  
+  cd "$srcdir/webkitgtk-$pkgver/build-gtk2"
+  make -j1 DESTDIR="$pkgdir" install
+  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD
deleted file mode 100644
index e2648fd49..000000000
--- a/extra/webmin/PKGBUILD
+++ /dev/null
@@ -1,221 +0,0 @@
-# $Id: PKGBUILD 177556 2013-02-07 05:57:24Z eric $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=webmin
-pkgver=1.610
-pkgrel=1
-pkgdesc="a web-based interface for system administration"
-arch=(i686 x86_64 'mips64el')
-license=('custom:webmin')
-url="http://www.webmin.com/"
-depends=('perl' 'perl-perl4-corelibs')
-makedepends=('perl-net-ssleay')
-backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/config' 'etc/webmin/webmin.cats' \
-'etc/webmin/pacman/config' \
-'etc/webmin/at/config' \
-'etc/webmin/acl/config' \
-'etc/webmin/lvm/config' \
-'etc/webmin/net/config' \
-'etc/webmin/nis/config' \
-'etc/webmin/pam/config' \
-'etc/webmin/cron/config' \
-'etc/webmin/file/config' \
-'etc/webmin/grub/config' \
-'etc/webmin/init/config' \
-'etc/webmin/ipfw/config' \
-'etc/webmin/lilo/config' \
-'etc/webmin/proc/config' \
-'etc/webmin/raid/config' \
-'etc/webmin/spam/config' \
-'etc/webmin/sshd/config' \
-'etc/webmin/time/config' \
-'etc/webmin/cluster-passwd/config' \
-'etc/webmin/software/config' \
-'etc/webmin/webminlog/config' \
-'etc/webmin/cluster-webmin/config' \
-'etc/webmin/bind8/config' \
-'etc/webmin/dhcpd/config' \
-'etc/webmin/fdisk/config' \
-'etc/webmin/mount/config' \
-'etc/webmin/mysql/config' \
-'etc/webmin/quota/config' \
-'etc/webmin/samba/config' \
-'etc/webmin/shell/config' \
-'etc/webmin/squid/config' \
-'etc/webmin/adsl-client/config' \
-'etc/webmin/servers/config' \
-'etc/webmin/cluster-shell/config' \
-'etc/webmin/bandwidth/config' \
-'etc/webmin/ppp-client/config' \
-'etc/webmin/lpadmin/config' \
-'etc/webmin/apache/config' \
-'etc/webmin/firewall/config' \
-'etc/webmin/stunnel/config' \
-'etc/webmin/burner/config' \
-'etc/webmin/exports/config' \
-'etc/webmin/backup-config/config' \
-'etc/webmin/custom/config' \
-'etc/webmin/htaccess-htpasswd/config' \
-'etc/webmin/logrotate/config' \
-'etc/webmin/format/config' \
-'etc/webmin/fsdump/config' \
-'etc/webmin/passwd/config' \
-'etc/webmin/cluster-useradmin/config' \
-'etc/webmin/cluster-software/config' \
-'etc/webmin/cluster-copy/config' \
-'etc/webmin/cluster-cron/config' \
-'etc/webmin/telnet/config' \
-'etc/webmin/status/config' \
-'etc/webmin/syslog/config' \
-'etc/webmin/updown/config' \
-'etc/webmin/usermin/config' \
-'etc/webmin/webmin/config' \
-'etc/webmin/xinetd/config' \
-'etc/webmin/openslp/config' \
-'etc/webmin/procmail/config' \
-'etc/webmin/fetchmail/config' \
-'etc/webmin/postgresql/config' \
-'etc/webmin/useradmin/config' \
-'etc/webmin/mailboxes/config' \
-'etc/webmin/inittab/config' \
-'etc/webmin/change-user/config' \
-'etc/webmin/postfix/config' \
-'etc/webmin/proftpd/config' \
-'etc/webmin/pserver/config' \
-'etc/webmin/dnsadmin/config' )
-install=webmin.install
-source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
-	ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 
-	ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2
-	webmin.rc
-	webmin.service) 
-options=(!strip)
-
-package() {
-  # NOTE: USE --asroot build option to avoid fakeroot error!
-  cd "$srcdir"/$pkgname-$pkgver
-  # add patches from webmin.com
-  #for i in ../*.wbm 
-  #do tar xvf $i
-  #done
-  #for i in ../*.wbt
-  #do tar xvf $i
-  #done
-  # delete stuff that's not needed
-  rm -f mount/freebsd-mounts*
-  rm -f mount/openbsd-mounts*
-  rm -f mount/macos-mounts*
-  
-  # remove modules we do not support
-  rm -rf {bacula-backup,ldap-useradmin,mon,sentry,frox,jabber,majordomo,qmail,sendmail,sarg,wuftpd,webalizer,inetd,ipsec,pap,pptp-client,pptp-server,shorewall,smart-status,vgetty,heartbeat,cfengine,cpan,sgiexports,hpuxexports,qmailadmin,bsdexports,dfsadmin}
-  
-  #remove config files from other distros
-  rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*')
-  
-  # remove caldera theme
-  rm -rf caldera
-
-  # remove init-scripts from other distros
-  rm webmin-gentoo-init
-  rm webmin-init
-  rm webmin-caldera-init
-  rm webmin-daemon
-
-  # remove update stuff to avoid problems with updating webmin,modules and themes without pacman
-  rm -f webmin/{update.cgi,update.pl,update_sched.cgi,upgrade.cgi,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi}
-  rm -f usermin/{upgrade.cgi,update.cgi,update.pl,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi}
-
-  # remove modules add because we don't want files installed without pacman control
-  rm -f webmin/{install_mod.cgi,delete_mod.cgi}  
-
-  # setting perl path
-  (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-  
-  # create dirs
-  mkdir -p "$pkgdir"/opt/webmin
-  mkdir -p "$pkgdir"/var/log/webmin
-  mkdir -p "$pkgdir"/etc/webmin
-  
-  # install pam stuff
-  install -D -m 644 webmin-pam "$pkgdir"/etc/pam.d/webmin
-  
-  # remove other distros and add only Archlinux don't change next line else it will not work!
-  rm os_list.txt
-  echo 'Archlinux			Any version	generic-linux	*	-d "/etc/pacman.d"' >> os_list.txt
-  
-  # Add rc.conf support to boot and shutdown menu and lock editing of this module
-  cd init/
-  sed -i -e 's:^local_down=.*:local_down=Archlinux RC.CONF,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*')
-  sed -i -e 's:^local_script=.*:local_script=Archlinux RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') 
-  sed -i -e 's:^index_downscript=.*:index_downscript=Archlinux RC.CONF:g' lang/*
-  sed -i -e 's:^index_script=.*:index_script=Archlinux RC.LOCAL:g' lang/*
-  sed -i -e 's:^noconfig=0:noconfig=1:g'  defaultacl
-
-  # Add pacman menu
-  cd "$srcdir"/$pkgname-$pkgver
-  cp -rf custom/ pacman
-  cp -rf mscstyle3/custom mscstyle3/pacman
-  sed -i -e 's:^noconfig=0:noconfig=1:g' -e 's:^edit=1:edit=0:g' pacman/defaultacl
-  sed -i -e '/desc/d' -e '/longdesc/d' pacman/module.info
-  sed -i -e 's:^name=Custom:name=Pacman:g' pacman/module.info
-  echo 'category=system' >> pacman/module.info
-  echo 'desc=Pacman' >> pacman/module.info
-  sed -i -e 's:^index_title=.*:index_title=Pacman:g' pacman/lang/*
-
-  # copy stuff to right dirs
-  cd "$srcdir"/$pkgname-$pkgver
-  cp -rp * "$pkgdir"/opt/webmin
-  cd "$srcdir"/webmin-config
-  cp -rfp * "$pkgdir"/opt/webmin
-
-  # define parameters for setup.sh
-  config_dir="$pkgdir"/etc/webmin
-  var_dir="$pkgdir"/var/log/webmin
-  perl=/usr/bin/perl
-  autoos=1
-  port=10000
-  login=root
-  crypt="XXX"
-  ssl=1
-  atboot=0
-  nostart=1
-  nochown=1
-  autothird=1
-  nouninstall=1
-  noperlpath=1
-  atbootyn=n
-  tempdir="$pkgdir"/tmp
-  export config_dir var_dir perl autoos port tempdir login crypt ssl nochown autothird nouninstall nostart noperlpath atbootyn
-  
-  # Fix setup.sh
-  sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/webmin/setup.sh
-  "$pkgdir"/opt/webmin/setup.sh
-  
-  # Fixup the config files to use their real locations
-  sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf
-  find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \; 
-  
-  # make it only accessible by localhost
-  echo 'allow=127.0.0.1' >> "$pkgdir"/etc/webmin/miniserv.conf
-  
-  # install pacman menu
-  cd "$srcdir"/webmin-pacman/config
-  cp -rfp * "$pkgdir"/etc/webmin/pacman
-
-  #install rc file
-  install -D -m 755 "$srcdir"/webmin.rc "$pkgdir"/etc/rc.d/webmin
-
-  # install systemd files
-  install -D -m 644 $srcdir/webmin.service $pkgdir/usr/lib/systemd/system/webmin.service
-
-  # delete temp dir
-  rm -r "$pkgdir"/tmp
-  # change sticky bit
-  chmod 0644 $pkgdir/opt/webmin/man/config-generic-linux
-  # install license
-  install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
-}
-md5sums=('e5f51402c09558ee688efea3d03a3d83'
-         'b0b3e3fb231a12e60165b6b4d604dcfa'
-         'bfebb75bb94029b48c46b7f1ba1aa811'
-         'c77dfcd621b417a7826d25f56a1e60ae'
-         'fc29ecb6a5cd8c278abe054e60381095')
diff --git a/extra/webmin/webmin-config.tar.bz2 b/extra/webmin/webmin-config.tar.bz2
deleted file mode 100644
index c7869eebf..000000000
--- a/extra/webmin/webmin-config.tar.bz2
+++ /dev/null
diff --git a/extra/webmin/webmin-pacman.tar.bz2 b/extra/webmin/webmin-pacman.tar.bz2
deleted file mode 100644
index e8ad9fd7b..000000000
--- a/extra/webmin/webmin-pacman.tar.bz2
+++ /dev/null
diff --git a/extra/webmin/webmin.install b/extra/webmin/webmin.install
deleted file mode 100644
index efdd9291d..000000000
--- a/extra/webmin/webmin.install
+++ /dev/null
@@ -1,35 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
-  crypt=${crypt//\\/\\\\}
-  crypt=${crypt//\//\\\/}
-  sed -i "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users
-
-cat << EOF
-Note:
-==> It is not allowed to install 3rd party modules, or delete existing modules.
-==> Please write your own PKGBUILDS for 3rd party modules and additional themes.
-Setup:
-==> To make webmin start at boot time, add webmin to rc.conf daemons
-==> Point your web browser to http://localhost:10000 to use webmin.
-==> The access is restricted to localhost, if you want to connect from other locations
-==> change /etc/webmin/miniserv.conf to something like that: allow=127.0.0.1 <your-ip>
-==> If you want to have ssl encryption please install 'perl-net-ssleay' additional.
-EOF
-# fix man module
-  cd /opt/webmin/man
-  for i in $(find . -name '*.gz'); do
-  gzip -df $i
-  done
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  # uninstall unzipped files
-  rm -r /opt/webmin/man
-}
diff --git a/extra/webmin/webmin.rc b/extra/webmin/webmin.rc
deleted file mode 100644
index 6aac8941d..000000000
--- a/extra/webmin/webmin.rc
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-start=/etc/webmin/start
-stop=/etc/webmin/stop
-lockfile=/var/lock/webmin
-
-case "$1" in
-'start')
-     stat_busy "Starting Webmin daemon"
-     $start >/dev/null 2>&1 </dev/null
-     RETVAL=$?
-     if [ "$RETVAL" = "0" ]; then
-     touch $lockfile >/dev/null 2>&1
-     add_daemon webmin
-     stat_done
-     else
-     stat_fail
-fi
-;;
-
-'stop')
-     stat_busy "Stopping Webmin daemon"
-     $stop >/dev/null 2>&1 </dev/null
-     RETVAL=$?
-     if [ "$RETVAL" = "0" ]; then
-     rm -f $lockfile
-     rm_daemon webmin
-     stat_done
-     else
-     stat_fail
-fi
-;;
-
-'restart')
-     $0 stop
-     $0 start
-;;
-*)
-echo "Usage: $0 { start | stop | restart }"
-RETVAL=1
-;;
-esac
-exit $RETVAL
\ No newline at end of file
diff --git a/extra/webmin/webmin.service b/extra/webmin/webmin.service
deleted file mode 100644
index a8a384a8c..000000000
--- a/extra/webmin/webmin.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Webmin
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/etc/webmin/start
-ExecStop=/etc/webmin/stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/webrtc-audio-processing/PKGBUILD b/extra/webrtc-audio-processing/PKGBUILD
index 3b78626e8..1dfa2d2bb 100644
--- a/extra/webrtc-audio-processing/PKGBUILD
+++ b/extra/webrtc-audio-processing/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=webrtc-audio-processing
 pkgver=0.1
-pkgrel=1
+pkgrel=1.1
 _gitrev=9413986
 pkgdesc="AudioProcessing library based on Google's implementation of WebRTC"
 arch=(i686 x86_64 mips64el)
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index e82872dc6..d67f26041 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175728 2013-01-20 12:37:22Z giovanni $
+# $Id: PKGBUILD 180587 2013-03-23 23:09:44Z td123 $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: lucke <lucke at o2 dot pl>
 
 pkgname=weechat
 pkgver=0.4.0
-pkgrel=1
+pkgrel=3
 pkgdesc="Fast, light and extensible IRC client (curses UI)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.weechat.org/"
@@ -13,12 +13,18 @@ depends=('gnutls' 'curl' 'libgcrypt')
 makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl>=8.6.0' 'ruby' 'aspell' 'guile')
 optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile')
 options=('!libtool')
-source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('b2e10ca1e3a72142fcc8d58c7c774b1b')
+source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2"
+        'ruby-2.0.0-crash-fix.diff')
+md5sums=('b2e10ca1e3a72142fcc8d58c7c774b1b'
+         '8bafb0ec603af018e2d66155640685b4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # fix: https://bugs.archlinux.org/task/34342
+  # original commit: http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=commit;h=4fdbb83a079f24a742633fd4d02084911580c19c
+  patch -Np1 -i ${srcdir}/ruby-2.0.0-crash-fix.diff
+
   mkdir build
   cd build
   cmake .. -DPREFIX=/usr \
diff --git a/extra/weechat/ruby-2.0.0-crash-fix.diff b/extra/weechat/ruby-2.0.0-crash-fix.diff
new file mode 100644
index 000000000..bfc816ade
--- /dev/null
+++ b/extra/weechat/ruby-2.0.0-crash-fix.diff
@@ -0,0 +1,76 @@
+X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=blobdiff_plain;f=src%2Fplugins%2Fruby%2Fweechat-ruby-api.c;h=101caec961829de03f8097edc63f497eab99aaa3;hp=bbc2fbcbe3c5290a8a975c4676a85a8c7e0998b7;hb=4fdbb83a079f24a742633fd4d02084911580c19c;hpb=55e58811b3df451db4f95b1035a39f5659788989
+
+diff --git a/src/plugins/ruby/weechat-ruby-api.c b/src/plugins/ruby/weechat-ruby-api.c
+index bbc2fbc..101caec 100644
+--- a/src/plugins/ruby/weechat-ruby-api.c
++++ b/src/plugins/ruby/weechat-ruby-api.c
+@@ -1333,28 +1333,21 @@ weechat_ruby_api_config_new_option (VALUE class, VALUE config_file,
+                                     VALUE description, VALUE string_values,
+                                     VALUE min, VALUE max, VALUE default_value,
+                                     VALUE value, VALUE null_value_allowed,
+-                                    VALUE function_check_value,
+-                                    VALUE data_check_value,
+-                                    VALUE function_change,
+-                                    VALUE data_change,
+-                                    VALUE function_delete,
+-                                    VALUE data_delete)
++                                    VALUE callbacks)
+ {
+     char *c_config_file, *c_section, *c_name, *c_type, *c_description;
+     char *c_string_values, *c_default_value, *c_value;
+     char *c_function_check_value, *c_data_check_value, *c_function_change;
+     char *c_data_change, *c_function_delete, *c_data_delete, *result;
+     int c_min, c_max, c_null_value_allowed;
+-    VALUE return_value;
++    VALUE function_check_value, data_check_value, function_change, data_change;
++    VALUE function_delete, data_delete, return_value;
+ 
+     API_FUNC(1, "config_new_option", API_RETURN_EMPTY);
+     if (NIL_P (config_file) || NIL_P (section) || NIL_P (name) || NIL_P (type)
+         || NIL_P (description) || NIL_P (string_values) || NIL_P (min)
+         || NIL_P (max) || NIL_P (default_value) || NIL_P (value)
+-        || NIL_P (null_value_allowed) || NIL_P (function_check_value)
+-        || NIL_P (data_check_value) || NIL_P (function_change)
+-        || NIL_P (data_change) || NIL_P (function_delete)
+-        || NIL_P (data_delete))
++        || NIL_P (null_value_allowed) || NIL_P (callbacks))
+         API_WRONG_ARGS(API_RETURN_EMPTY);
+ 
+     Check_Type (config_file, T_STRING);
+@@ -1368,12 +1361,21 @@ weechat_ruby_api_config_new_option (VALUE class, VALUE config_file,
+     Check_Type (default_value, T_STRING);
+     Check_Type (value, T_STRING);
+     Check_Type (null_value_allowed, T_FIXNUM);
+-    Check_Type (function_check_value, T_STRING);
+-    Check_Type (data_check_value, T_STRING);
+-    Check_Type (function_change, T_STRING);
+-    Check_Type (data_change, T_STRING);
+-    Check_Type (function_delete, T_STRING);
+-    Check_Type (data_delete, T_STRING);
++    Check_Type (callbacks, T_ARRAY);
++
++    /*
++     * due to a Ruby limitation (15 arguments max by function), we receive the
++     * the callbacks in an array of 6 strings (3 callbacks + 3 data)
++     */
++    if (RARRAY_LEN(callbacks) != 6)
++        API_WRONG_ARGS(API_RETURN_EMPTY);
++
++    function_check_value = rb_ary_entry (callbacks, 0);
++    data_check_value = rb_ary_entry (callbacks, 1);
++    function_change = rb_ary_entry (callbacks, 2);
++    data_change = rb_ary_entry (callbacks, 3);
++    function_delete = rb_ary_entry (callbacks, 4);
++    data_delete = rb_ary_entry (callbacks, 5);
+ 
+     c_config_file = StringValuePtr (config_file);
+     c_section = StringValuePtr (section);
+@@ -5915,7 +5917,7 @@ weechat_ruby_api_init (VALUE ruby_mWeechat)
+     API_DEF_FUNC(config_new, 3);
+     API_DEF_FUNC(config_new_section, 14);
+     API_DEF_FUNC(config_search_section, 2);
+-    API_DEF_FUNC(config_new_option, 17);
++    API_DEF_FUNC(config_new_option, 12);
+     API_DEF_FUNC(config_search_option, 3);
+     API_DEF_FUNC(config_string_to_boolean, 1);
+     API_DEF_FUNC(config_option_reset, 2);
diff --git a/extra/wget/PKGBUILD b/extra/wget/PKGBUILD
index 1f57247ec..e0134a52d 100644
--- a/extra/wget/PKGBUILD
+++ b/extra/wget/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=wget
 pkgver=1.14
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A network utility to retrieve files from the Web"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/wget/wget.html"
diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD
index 57eaa9ba9..a10335240 100644
--- a/extra/whois/PKGBUILD
+++ b/extra/whois/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168908 2012-10-16 14:12:00Z giovanni $
+# $Id: PKGBUILD 183246 2013-04-19 14:14:54Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=whois
-pkgver=5.0.20
+pkgver=5.0.24
 pkgrel=1
 pkgdesc="The whois client by Marco d'Itri"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('libidn')
 makedepends=('perl')
 source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz")
-md5sums=('2e33c03536082ae8156b2cbe78c0299d')
+md5sums=('34c45f9beaafa5ae58d7d8b366c7c262')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/wildmidi/PKGBUILD b/extra/wildmidi/PKGBUILD
index 9e6e8fba5..5ff568a57 100644
--- a/extra/wildmidi/PKGBUILD
+++ b/extra/wildmidi/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=wildmidi
 pkgver=0.2.3.5
-pkgrel=2
+pkgrel=2.1
 pkgdesc='Open Source MIDI Synthesizer'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://wildmidi.sourceforge.net/'
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index eb009e1ab..94d554263 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,26 +1,27 @@
-# $Id: PKGBUILD 176946 2013-02-02 21:34:52Z guillaume $
+# $Id: PKGBUILD 182116 2013-04-07 20:47:05Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
-pkgver=1.8.5
-pkgrel=1
+pkgver=1.8.6
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
-             'libgcrypt' 'lua51' 'python' 'portaudio')
+             'libgcrypt' 'lua51' 'python')
 url='http://www.wireshark.org/'
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
         01_patch-automake-1.13.diff
         02_enable-version.diff)
-sha256sums=('d4e4798216974a3c45e74b03644ee33b64481d2fe5c788c002266e5f141ee372'
+sha256sums=('2722ed3e926c26648faec31a81b7881d829df85762c21794b9dd9e4f227331ea'
             '388a9cf4c924c32a0f7ee8ffeaae060cdbf0c712bcc0032d5dfaa5717b217b80'
             'dd71a9fc3443b5e586d9e50c31208d031f20d7b96cf72d9e4e0f02f2f175d00b')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
+# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8202
   patch -p0 < ${srcdir}/01_patch-automake-1.13.diff
   patch -p0 < ${srcdir}/02_enable-version.diff
 
@@ -29,14 +30,13 @@ build() {
       --prefix=/usr \
       --with-ssl \
       --with-zlib=yes \
-      --with-lua \
-      --with-portaudio
+      --with-lua
   make all
 }
 
 package_wireshark-cli() {
   pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
-  depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'portaudio' 'lua51')
+  depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua51')
   install=wireshark.install
   conflicts=(wireshark)
 
diff --git a/extra/wireshark/enable_version.patch b/extra/wireshark/enable_version.patch
deleted file mode 100644
index 18ad14b1f..000000000
--- a/extra/wireshark/enable_version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.in.init	2012-05-24 20:08:15.040038922 +0000
-+++ configure.in	2012-05-24 20:08:27.869944008 +0000
-@@ -185,7 +185,7 @@
- 		  [use gnutls library @<:@default=yes@:>@]),
-   with_gnutls="$withval", with_gnutls="yes")
- if test "x$with_gnutls" = "xyes"; then
--  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0 gnutls < 3],
-+  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0],
-         [
-                 echo "gnuTLS found, enabling ssl decryption"
-                 AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use gnutls library])
-
diff --git a/extra/wpa_supplicant_gui/PKGBUILD b/extra/wpa_supplicant_gui/PKGBUILD
index 9f679c671..a14ed2300 100644
--- a/extra/wpa_supplicant_gui/PKGBUILD
+++ b/extra/wpa_supplicant_gui/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 177075 2013-02-05 19:47:31Z eric $
+# $Id: PKGBUILD 179006 2013-03-01 10:27:04Z andrea $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=wpa_supplicant_gui
 pkgver=2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A Qt frontend to wpa_supplicant"
 url="http://hostap.epitest.fi/wpa_supplicant"
 arch=('i686' 'x86_64' 'mips64el')
-depends=('qt' "wpa_supplicant")
+depends=('qt4' "wpa_supplicant")
 license=('GPL')
 source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz")
 sha256sums=('2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09')
 
 build() {
+  . /etc/profile.d/qt4.sh
   cd wpa_supplicant-${pkgver}
   cd wpa_supplicant/wpa_gui-qt4
   qmake QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" 
diff --git a/extra/wxgtk/PKGBUILD b/extra/wxgtk/PKGBUILD
index 611111a0b..322e9315f 100644
--- a/extra/wxgtk/PKGBUILD
+++ b/extra/wxgtk/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=wxgtk
 pkgver=2.8.12.1
-pkgrel=4
+pkgrel=4.1
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wxwidgets.org"
diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD
index ca63edef8..499536e98 100644
--- a/extra/wxmaxima/PKGBUILD
+++ b/extra/wxmaxima/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=wxmaxima
 pkgver=12.09.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wxmaxima.sourceforge.net/"
diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD
index 654516144..49cbfa7dc 100644
--- a/extra/wxpython/PKGBUILD
+++ b/extra/wxpython/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=wxpython
 pkgver=2.8.12.1
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A wxWidgets GUI toolkit for Python"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:wxWindows')
diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD
index a7188e716..0effd2cac 100644
--- a/extra/x264/PKGBUILD
+++ b/extra/x264/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 171269 2012-11-16 23:35:55Z ibiru $
+# $Id: PKGBUILD 178144 2013-02-16 22:49:02Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=x264
-pkgver=20121113
+pkgver=20130206
 pkgrel=1
 pkgdesc="free library for encoding H264/AVC video streams"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/developers/x264.html"
 license=('GPL')
 depends=('glibc')
-makedepends=('yasm')
-source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2)
-md5sums=('c37851c8534ef5d7b1935145f8f5a725')
+makedepends=('yasm' 'git')
+source=(ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.xz)
+md5sums=('f952248492745a077ad6a77465276166')
 
 build() {
-    cd "$pkgname-snapshot-$pkgver-2245-stable"
+    cd $pkgname
 
     [ "$CARCH" = "mips64el" ] && extra="--enable-pic"
 
@@ -25,7 +25,7 @@ build() {
     make
 }
 package() {
-    cd "$pkgname-snapshot-$pkgver-2245-stable"
+    cd $pkgname
 
     make DESTDIR="$pkgdir" \
       bindir=/usr/bin \
diff --git a/extra/x2goclient/PKGBUILD b/extra/x2goclient/PKGBUILD
index ecce71ee0..7da864f8c 100644
--- a/extra/x2goclient/PKGBUILD
+++ b/extra/x2goclient/PKGBUILD
@@ -1,24 +1,23 @@
-# $Id: PKGBUILD 175060 2013-01-12 11:27:38Z andyrtr $
+# $Id: PKGBUILD 180595 2013-03-24 09:37:30Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
 # Contributor: Richard Murri <admin@richardmurri.com>
 
 pkgname=x2goclient
-pkgver=4.0.0.1
+pkgver=4.0.1.0
 pkgrel=1
 pkgdesc="x2go qt4 client"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.x2go.org"
-depends=('qt' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme' 'xdg-utils')
+depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme' 'xdg-utils')
 makedepends=('man2html')
 install=x2goclient.install
 source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e8786329cfe97652d337f71caa71f432')
+md5sums=('ff223344915b9def9e9e5a01ae919532')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i "s:qmake-qt4:qmake:g" Makefile
   sed -i "s:-o root -g root ::" Makefile
   make PREFIX=/usr
 }
diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD
index 206fc78a5..44e9d531f 100644
--- a/extra/x2goserver/PKGBUILD
+++ b/extra/x2goserver/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175694 2013-01-19 17:56:40Z andyrtr $
+# $Id: PKGBUILD 180593 2013-03-24 09:34:13Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
@@ -7,20 +7,20 @@
 # Contributor: Milan Knížek <knizek@volny.cz>
 
 pkgname=x2goserver
-pkgver=4.0.0.0
-pkgrel=4
+pkgver=4.0.0.1
+pkgrel=1
 pkgdesc="Open source terminal server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.x2go.org/"
 license=('GPL')
-depends=('openssh' 'perl-config-simple' 'perl-dbd-sqlite' 'python' 'x2go-agent' 'xorg-xauth')
+depends=('openssh' 'perl-config-simple' 'perl-dbd-sqlite' 'perl-file-basedir' 'python' 'x2go-agent' 'xorg-xauth')
 makedepends=('man2html')
 #optdepends=('cups-x2go: printing support')
 options=('emptydirs')
 install=x2goserver.install
 backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql')
 source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service)
-md5sums=('1fc38566832c30897c6583e7ffa1fda3'
+md5sums=('85dc2a2d52e82eead744a51007155ff9'
          'b09799f9203150dc1277a56058be48a8')
 
 build() {
@@ -43,7 +43,7 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make PREFIX=/usr DESTDIR="$pkgdir" install
+  make -j1 PREFIX=/usr DESTDIR="$pkgdir" install
 
   # systemd service file - only runs x2gocleansessions
   install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
diff --git a/extra/xaos/PKGBUILD b/extra/xaos/PKGBUILD
index c54c9ee29..057088ba5 100644
--- a/extra/xaos/PKGBUILD
+++ b/extra/xaos/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=xaos
 pkgver=3.5
-pkgrel=5.1
+pkgrel=5.2
 pkgdesc="A fast portable real-time interactive fractal zoomer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/xaos/"
diff --git a/extra/xchat/PKGBUILD b/extra/xchat/PKGBUILD
deleted file mode 100644
index 6fee3c70f..000000000
--- a/extra/xchat/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 173853 2012-12-25 00:35:03Z foutrelis $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xchat
-pkgver=2.8.8
-pkgrel=11
-pkgdesc="A GTK+ based IRC client"
-arch=('i686' 'x86_64')
-url="http://www.xchat.org/"
-license=('GPL')
-depends=('gtk2' 'openssl' 'dbus-glib' 'libnotify' 'hicolor-icon-theme')
-makedepends=('tcl' 'perl' 'python2' 'librsvg')
-optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin'
-            'python2: for python plugin')
-options=('!libtool')
-install=xchat.install
-source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
-        http://xchat.org/files/icons/xchat-svg.tar.bz2
-        xchat-2.8.8-libnotify07.patch
-        xchat-2.8.8-link-against-libnotify.patch
-        xchat-2.8.8-glib-2.31.patch)
-sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
-          '0d366346cc11e0efb57fc2648fe423c94a3469bd'
-          'a053fba4e1911d1ee6a8248fe19e344797920fe3'
-          '70c3cc29fc55ff35f701ef8ac23078b6e3761ce1'
-          'aecaf6176a7cfd62555207b02f2793b360aa39da')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/xchat-2.8.8-libnotify07.patch"
-  patch -p1 -i "${srcdir}/xchat-2.8.8-link-against-libnotify.patch"
-  patch -p1 -i "${srcdir}/xchat-2.8.8-glib-2.31.patch"
-  autoconf
-  autoheader
-
-  LIBS+="-lgmodule-2.0" ./configure --prefix=/usr --sysconfdir=/etc --datadir=/usr/share \
-    --enable-openssl --enable-dbus --disable-textfe --enable-ipv6 --enable-shm --enable-spell=static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  for i in 24 32 48 64 128 256 ; do
-    install -d "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps"
-    rsvg-convert -w $i -h $i -o "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/xchat.png" ../xchat-cloned.svg
-  done
-  install -D -m644 ../xchat-cloned.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/xchat.svg"
-  install -D -m644 ../xchat-used.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/xchat2.svg"
-}
diff --git a/extra/xchat/xchat-2.8.8-glib-2.31.patch b/extra/xchat/xchat-2.8.8-glib-2.31.patch
deleted file mode 100644
index 63f562ff8..000000000
--- a/extra/xchat/xchat-2.8.8-glib-2.31.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Author: Dominique Leuenberger <dimstar@opensuse.org>
-
-http://sourceforge.net/tracker/?func=detail&aid=3446968&group_id=239&atid=100239
-
-glib got stricter in checking includes. Only glib.h (and a few exceptions)
-are to be included directly.
-
-Index: xchat-2.8.8/src/common/servlist.c
-===================================================================
---- xchat-2.8.8.orig/src/common/servlist.c
-+++ xchat-2.8.8/src/common/servlist.c
-@@ -24,7 +24,7 @@
- #include <unistd.h>
- 
- #include "xchat.h"
--#include <glib/ghash.h>
-+#include <glib.h>
- 
- #include "cfgfiles.h"
- #include "fe.h"
-Index: xchat-2.8.8/src/common/text.c
-===================================================================
---- xchat-2.8.8.orig/src/common/text.c
-+++ xchat-2.8.8/src/common/text.c
-@@ -28,7 +28,7 @@
- #include <sys/mman.h>
- 
- #include "xchat.h"
--#include <glib/ghash.h>
-+#include <glib.h>
- #include "cfgfiles.h"
- #include "chanopt.h"
- #include "plugin.h"
-Index: xchat-2.8.8/src/common/util.c
-===================================================================
---- xchat-2.8.8.orig/src/common/util.c
-+++ xchat-2.8.8/src/common/util.c
-@@ -39,7 +39,7 @@
- #include <errno.h>
- #include "xchat.h"
- #include "xchatc.h"
--#include <glib/gmarkup.h>
-+#include <glib.h>
- #include <ctype.h>
- #include "util.h"
- #include "../../config.h"
-Index: xchat-2.8.8/src/common/xchat.h
-===================================================================
---- xchat-2.8.8.orig/src/common/xchat.h
-+++ xchat-2.8.8/src/common/xchat.h
-@@ -1,10 +1,6 @@
- #include "../../config.h"
- 
--#include <glib/gslist.h>
--#include <glib/glist.h>
--#include <glib/gutils.h>
--#include <glib/giochannel.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <time.h>			/* need time_t */
- 
- #ifndef XCHAT_H
diff --git a/extra/xchat/xchat-2.8.8-libnotify07.patch b/extra/xchat/xchat-2.8.8-libnotify07.patch
deleted file mode 100644
index 2a6dce9a2..000000000
--- a/extra/xchat/xchat-2.8.8-libnotify07.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 xchat-2.8.8/src/fe-gtk/plugin-tray.c
---- xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07	2010-11-15 17:32:15.708325783 -0500
-+++ xchat-2.8.8/src/fe-gtk/plugin-tray.c	2010-11-15 18:05:17.322141789 -0500
-@@ -125,8 +125,9 @@ static void *nn_mod = NULL;
- /* prototypes */
- static gboolean (*nn_init) (char *);
- static void (*nn_uninit) (void);
--static void *(*nn_new_with_status_icon) (const gchar *summary, const gchar *message, const gchar *icon, GtkStatusIcon *status_icon);
--static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, GtkWidget *attach);
-+/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an
-+ * extra NULL argument will be fine */
-+static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy);
- static gboolean (*nn_show) (void *noti, GError **error);
- static void (*nn_set_timeout) (void *noti, gint timeout);
- 
-@@ -160,8 +161,6 @@ libnotify_notify_new (const char *title,
- 			goto bad;
- 		if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit))
- 			goto bad;
--		if (!g_module_symbol (nn_mod, "notify_notification_new_with_status_icon", (gpointer)&nn_new_with_status_icon))
--			goto bad;
- 		if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new))
- 			goto bad;
- 		if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show))
diff --git a/extra/xchat/xchat-2.8.8-link-against-libnotify.patch b/extra/xchat/xchat-2.8.8-link-against-libnotify.patch
deleted file mode 100644
index 31e6c0854..000000000
--- a/extra/xchat/xchat-2.8.8-link-against-libnotify.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-From: Christopher Aillon <caillon@redhat.com>
-Date: Thu, 7 Apr 2011 19:34:14 -0700
-Subject: [PATCH] Link directly against libnotify
-
-Dynamically loading the library isn't ideal since the soname
-can change silently on us.  Additionally, notify-send is
-shipped as part of libnotify, so we aren't actually bringing
-in a new dependency.  Since we'd need to patch the source and
-rebuild for new sonames anyway, there's little benefit to
-dynamically loading libnotify.
-
-Plus, this has the benefit of cleaning up the code, as well as
-ensuring we'll catch any future soname changes sooner.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=693362
-https://sourceforge.net/tracker/?func=detail&aid=3280223&group_id=239&atid=100239
----
- configure.in             |   23 +++++++
- src/fe-gtk/plugin-tray.c |  144 ++++++++++-------------------------------------
- 2 files changed, 55 insertions(+), 112 deletions(-)
-
-diff -p -U8 xchat-2.8.8/configure.in.libnotifyso4 xchat-2.8.8/configure.in
---- xchat-2.8.8/configure.in.libnotifyso4	2010-05-29 23:01:16.000000000 -0700
-+++ xchat-2.8.8/configure.in	2011-04-07 19:27:00.448137113 -0700
-@@ -34,16 +34,17 @@ AH_VERBATIM([PREFIX],[#undef PREFIX])
- AH_VERBATIM([XCHATLIBDIR],[#undef XCHATLIBDIR])
- AH_VERBATIM([XCHATSHAREDIR],[#undef XCHATSHAREDIR])
- AH_VERBATIM([SOCKS],[#undef SOCKS])
- AH_VERBATIM([USE_MSPROXY],[#undef USE_MSPROXY])
- dnl AH_VERBATIM([USE_GNOME],[#undef USE_GNOME])
- AH_VERBATIM([USE_SHM],[#undef USE_SHM])
- AH_VERBATIM([USE_GTKSPELL],[#undef USE_GTKSPELL])
- AH_VERBATIM([USE_LIBSEXY],[#undef USE_LIBSEXY])
-+AH_VERBATIM([USE_LIBNOTIFY],[#undef USE_LIBNOTIFY])
- AH_VERBATIM([USE_IPV6],[#undef USE_IPV6])
- AH_VERBATIM([USE_MMX],[#undef USE_MMX])
- AH_VERBATIM([USE_OPENSSL],[#undef USE_OPENSSL])
- AH_VERBATIM([USE_PLUGIN],[#undef USE_PLUGIN])
- AH_VERBATIM([USE_XFT],[#undef USE_XFT])
- AH_VERBATIM([USE_XLIB],[#undef USE_XLIB])
- AH_VERBATIM([USE_SIGACTION],[#undef USE_SIGACTION])
- AH_VERBATIM([USING_FREEBSD],[#undef USING_FREEBSD])
-@@ -126,16 +127,20 @@ AC_ARG_ENABLE(tcl,
- AC_ARG_ENABLE(plugin,
- [  --disable-plugin        disable plugin support],
-         plugin=$enableval, plugin=yes)
- 
- AC_ARG_ENABLE(dbus,
- [  --disable-dbus          disable DBUS support],
-         dbus=$enableval, dbus=yes)
- 
-+AC_ARG_ENABLE(libnotify,
-+[  --disable-libnotify     disable libnotify support],
-+        libnotify=$enableval, libnotify=yes)
-+
- AC_ARG_ENABLE(mmx,
- [  --disable-mmx           disable MMX assembly routines],
-         mmx=$enableval, mmx=yes)
- 
- AC_ARG_ENABLE(shm,
- [  --enable-shm            enable use of XShm for fast tinting (default: no)],
-         shm=$enableval, shm=no)
- 
-@@ -482,16 +487,32 @@ if test "x$dbus" = "xyes" ; then
- 
- 		DBUS_SERVICES_DIR="$DATADIR/dbus-1/services"
- 		AC_SUBST(DBUS_SERVICES_DIR)
- 		AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is])
- 	fi
- fi
- 
- dnl *********************************************************************
-+dnl ** LIBNOTIFY ********************************************************
-+dnl *********************************************************************
-+
-+if test "x$libnotify" = "xyes" ; then
-+	PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= 0.4, [], [
-+		AC_MSG_RESULT(no)
-+		libnotify=no
-+	])
-+	if test "$libnotify" != "no" ; then
-+		GUI_LIBS="$GUI_LIBS $LIBNOTIFY_LIBS"
-+		GUI_CFLAGS="$GUI_CFLAGS $LIBNOTIFY_CFLAGS"
-+		AC_DEFINE(USE_LIBNOTIFY)
-+	fi
-+fi
-+
-+dnl *********************************************************************
- dnl ** SPELL ************************************************************
- dnl *********************************************************************
- 
- if test "$spell" = "gtkspell" ; then
- 	PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, [], [
- 		AC_MSG_RESULT(no)
- 		spell=no
- 	])
-@@ -519,16 +540,17 @@ if test "$spell" = "static" ; then
- fi
- 
- dnl *********************************************************************
- dnl ** CONDITIONALS *****************************************************
- dnl *********************************************************************
- 
- AM_CONDITIONAL(USE_OPENSSL, test "x$openssl" = "xyes")
- AM_CONDITIONAL(USE_LIBSEXY, test "x$spell" = "xstatic")
-+AM_CONDITIONAL(USE_LIBNOTIFY, test "x$libnotify" = "xyes")
- AM_CONDITIONAL(DO_TEXT, test "x$textfe" = "xyes")
- AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes")
- AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes")
- AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes")
- AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes")
- AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes")
- AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes")
- AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno")
-@@ -807,16 +829,17 @@ echo mmx tinting ......... : $mmx\	spell
- echo XShm tinting ........ : $shm\	plugin interface ...... : $plugin
- if test "$xft" = no; then
-   echo text backend ........ : pango\	nls/gettext ........... : $USE_NLS
- else
-   echo text backend ........ : xft\	nls/gettext ........... : $USE_NLS
- fi
- echo openssl support ..... : $openssl\	ipv6 support .......... : $ipv6
- echo dbus support ........ : $dbus\	msproxy ntlm \(ISA\) .... : $have_ntlm
-+echo libnotify support ... : $libnotify
- echo
- echo The binary will be installed in $prefix/bin
- echo
- 
- if test "$gtkfe" = no; then
- 	echo Warning: The GTK \(GUI\) frontend will not be built.
- 	echo
- fi
-diff -p -U8 xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotifyso4 xchat-2.8.8/src/fe-gtk/plugin-tray.c
---- xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotifyso4	2011-04-07 17:57:27.524307905 -0700
-+++ xchat-2.8.8/src/fe-gtk/plugin-tray.c	2011-04-07 19:18:33.429475719 -0700
-@@ -10,17 +10,27 @@
- #include "../common/fe.h"
- #include "../common/util.h"
- #include "fe-gtk.h"
- #include "pixmaps.h"
- #include "maingui.h"
- #include "menu.h"
- #include <gtk/gtk.h>
- 
--#define LIBNOTIFY
-+#ifdef USE_LIBNOTIFY
-+#include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+#if NOTIFY_CHECK_VERSION(0,7,0)
-+#define XC_NOTIFY_NEW(a,b,c,d) notify_notification_new(a,b,c)
-+#else
-+#define XC_NOTIFY_NEW(a,b,c,d) notify_notification_new(a,b,c,d)
-+#endif
-+#endif
- 
- typedef enum	/* current icon status */
- {
- 	TS_NONE,
- 	TS_MESSAGE,
- 	TS_HIGHLIGHT,
- 	TS_FILEOFFER,
- 	TS_CUSTOM /* plugin */
-@@ -112,90 +122,16 @@ tray_count_networks (void)
- 
- void
- fe_tray_set_tooltip (const char *text)
- {
- 	if (sticon)
- 		gtk_status_icon_set_tooltip (sticon, text);
- }
- 
--#ifdef LIBNOTIFY
--
--/* dynamic access to libnotify.so */
--
--static void *nn_mod = NULL;
--/* prototypes */
--static gboolean (*nn_init) (char *);
--static void (*nn_uninit) (void);
--/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an
-- * extra NULL argument will be fine */
--static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy);
--static gboolean (*nn_show) (void *noti, GError **error);
--static void (*nn_set_timeout) (void *noti, gint timeout);
--
--static void
--libnotify_cleanup (void)
--{
--	if (nn_mod)
--	{
--		nn_uninit ();
--		g_module_close (nn_mod);
--		nn_mod = NULL;
--	}
--}
--
--static gboolean
--libnotify_notify_new (const char *title, const char *text, GtkStatusIcon *icon)
--{
--	void *noti;
--
--	if (!nn_mod)
--	{
--		nn_mod = g_module_open ("libnotify", G_MODULE_BIND_LAZY);
--		if (!nn_mod)
--		{
--			nn_mod = g_module_open ("libnotify.so.1", G_MODULE_BIND_LAZY);
--			if (!nn_mod)
--				return FALSE;
--		}
--
--		if (!g_module_symbol (nn_mod, "notify_init", (gpointer)&nn_init))
--			goto bad;
--		if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit))
--			goto bad;
--		if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new))
--			goto bad;
--		if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show))
--			goto bad;
--		if (!g_module_symbol (nn_mod, "notify_notification_set_timeout", (gpointer)&nn_set_timeout))
--			goto bad;
--		if (!nn_init (PACKAGE_NAME))
--			goto bad;
--	}
--
--	text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP);
--	title = strip_color (title, -1, STRIP_ALL);
--	noti = nn_new (title, text, XCHATSHAREDIR"/pixmaps/xchat.png", NULL);
--	g_free ((char *)title);
--	g_free ((char *)text);
--
--	nn_set_timeout (noti, prefs.input_balloon_time*1000);
--	nn_show (noti, NULL);
--	g_object_unref (G_OBJECT (noti));
--
--	return TRUE;
--
--bad:
--	g_module_close (nn_mod);
--	nn_mod = NULL;
--	return FALSE;
--}
--
--#endif
--
- void
- fe_tray_set_balloon (const char *title, const char *text)
- {
- #ifndef WIN32
- 	const char *argv[8];
- 	const char *path;
- 	char time[16];
- 	WinStatus ws;
-@@ -208,52 +144,36 @@ fe_tray_set_balloon (const char *title, 
- 	/* bit 1 of flags means "no balloons unless hidden/iconified" */
- 	if (ws != WS_HIDDEN && (prefs.gui_tray_flags & 2))
- 		return;
- 
- 	/* FIXME: this should close the current balloon */
- 	if (!text)
- 		return;
- 
--#ifdef LIBNOTIFY
--	/* try it via libnotify.so */
--	if (libnotify_notify_new (title, text, sticon))
--		return;	/* success */
--#endif
-+#ifdef USE_LIBNOTIFY
-+	NotifyNotification *notification;
-+	char *notify_text, *notify_title;
- 
--	/* try it the crude way */
--	path = g_find_program_in_path ("notify-send");
--	if (path)
--	{
--		sprintf(time, "%d000",prefs.input_balloon_time);
--		argv[0] = path;
--		argv[1] = "-i";
--		argv[2] = "gtk-dialog-info";
--		if (access (XCHATSHAREDIR"/pixmaps/xchat.png", R_OK) == 0)
--			argv[2] = XCHATSHAREDIR"/pixmaps/xchat.png";
--		argv[3] = "-t";
--		argv[4] = time;
--		argv[5] = title;
--		text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP);
--		argv[6] = text;
--		argv[7] = NULL;
--		xchat_execv (argv);
--		g_free ((char *)path);
--		g_free ((char *)text);
--	}
--	else
--	{
--		/* show this error only once */
--		static unsigned char said_it = FALSE;
--		if (!said_it)
--		{
--			said_it = TRUE;
--			fe_message (_("Cannot find 'notify-send' to open balloon alerts.\nPlease install libnotify."), FE_MSG_ERROR);
--		}
--	}
-+	if (!notify_is_initted())
-+		notify_init(PACKAGE_NAME);
-+
-+	notify_text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP);
-+	notify_title = strip_color (title, -1, STRIP_ALL);
-+
-+	notification = XC_NOTIFY_NEW (notify_title, notify_text, XCHATSHAREDIR"/pixmaps/xchat.png", NULL);
-+
-+	g_free ((char *)notify_title);
-+	g_free ((char *)notify_text);
-+
-+	notify_notification_set_timeout (notification, prefs.input_balloon_time*1000);
-+	notify_notification_show (notification, NULL);
-+
-+	g_object_unref (notification);
-+#endif
- #endif
- }
- 
- static void
- tray_set_balloonf (const char *text, const char *format, ...)
- {
- 	va_list args;
- 	char *buf;
-@@ -840,13 +760,13 @@ tray_plugin_init (xchat_plugin *plugin_h
- 	return 1;       /* return 1 for success */
- }
- 
- int
- tray_plugin_deinit (xchat_plugin *plugin_handle)
- {
- #ifdef WIN32
- 	tray_cleanup ();
--#elif defined(LIBNOTIFY)
--	libnotify_cleanup ();
-+#elif defined(USE_LIBNOTIFY)
-+	notify_uninit ();
- #endif
- 	return 1;
- }
diff --git a/extra/xchat/xchat.install b/extra/xchat/xchat.install
deleted file mode 100644
index eab82d16f..000000000
--- a/extra/xchat/xchat.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor	
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/extra/xchm/PKGBUILD b/extra/xchm/PKGBUILD
index 4896f9951..5e80ecc1f 100644
--- a/extra/xchm/PKGBUILD
+++ b/extra/xchm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166331 2012-09-06 15:41:21Z giovanni $
+# $Id: PKGBUILD 179976 2013-03-13 18:06:41Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=xchm
-pkgver=1.21
+pkgver=1.22
 pkgrel=1
 pkgdesc="A cross-platform GUI front-end to chmlib"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ install=xchm.install
 source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz"
         'xchm.desktop'
         'xchm.xml')
-md5sums=('9bfe439ce94554ebae95d84f7a1db8e7'
+md5sums=('3856ec4e6e54a80d0811707975fc8995'
          '31fb9692b9ee9f2a205f58b9ff4bc4fe'
          '4102b0a393f5c60236143cc034664dd0')
 
diff --git a/extra/xcompmgr/PKGBUILD b/extra/xcompmgr/PKGBUILD
index 1160d1a04..821e36277 100644
--- a/extra/xcompmgr/PKGBUILD
+++ b/extra/xcompmgr/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=xcompmgr
 pkgver=1.1.6
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Composite Window-effects manager for X.org"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
diff --git a/extra/xdelta/PKGBUILD b/extra/xdelta/PKGBUILD
deleted file mode 100644
index 6fecbfc18..000000000
--- a/extra/xdelta/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 145275 2011-12-21 01:19:51Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=xdelta
-pkgver=1.1.4
-pkgrel=4.1
-pkgdesc="binary file delta generator"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://sourceforge.net/projects/xdelta/"
-license=('GPL')
-depends=('glib' 'zlib')
-options=('!libtool')
-source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz
-        xdelta-1.1.4-aclocal.patch)
-md5sums=('1b896c01ebf0e353b7e3c3071b05f496'
-         '1d8ab5909bdf977a2783c164b66906fd')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i $srcdir/xdelta-1.1.4-aclocal.patch
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
diff --git a/extra/xdelta/xdelta-1.1.4-aclocal.patch b/extra/xdelta/xdelta-1.1.4-aclocal.patch
deleted file mode 100644
index ad8c99de5..000000000
--- a/extra/xdelta/xdelta-1.1.4-aclocal.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xdelta-1.1.3/xdelta.m4.aclocal	2004-10-20 00:20:47.875648144 +0200
-+++ xdelta-1.1.3/xdelta.m4	2004-10-20 00:21:47.205628616 +0200
-@@ -4,7 +4,7 @@
- dnl AM_PATH_XDELTA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
- dnl Test for XDELTA, and define XDELTA_CFLAGS and XDELTA_LIBS, if "gmodule" or
- dnl
--AC_DEFUN(AM_PATH_XDELTA,
-+AC_DEFUN([AM_PATH_XDELTA],
- [dnl
- dnl Get the cflags and libraries from the xdelta-config script
- dnl
diff --git a/extra/xdelta3/PKGBUILD b/extra/xdelta3/PKGBUILD
deleted file mode 100644
index e9c34c169..000000000
--- a/extra/xdelta3/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 176015 2013-01-26 01:45:29Z eric $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Eduard "bekks" Warkentin <eduard.warkentin@gmail.com>
-# Contributor: Henning Garus <henning.garus@gmail.com>
-
-pkgname=xdelta3
-pkgver=3.0.6
-pkgrel=1
-pkgdesc="A diff utility which works with binary files"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://xdelta.org/"
-license=('GPL')
-depends=('xz')
-source=(http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('652048ab4a7e5f927bce045228a17b31')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./xdelta3 test
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/xdelta3/xdelta3-makefile.patch b/extra/xdelta3/xdelta3-makefile.patch
deleted file mode 100644
index d5fa12e70..000000000
--- a/extra/xdelta3/xdelta3-makefile.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur xdelta3.0.0-orig/Makefile xdelta3.0.0/Makefile
---- xdelta3.0.0-orig/Makefile	2011-01-09 18:29:06.000000000 +1000
-+++ xdelta3.0.0/Makefile	2011-12-21 11:53:13.530028738 +1000
-@@ -54,7 +54,7 @@
- WIXDIR = "/cygdrive/c/Program Files/wix2.0.4820"
- 
- # -arch x86_64
--CFLAGS= -Wall -Wshadow -fno-builtin
-+CFLAGS+= -Wall -Wshadow -fno-builtin
- WFLAGS= -Wextra -Wsign-compare -Wconversion -Wextra -Wno-unused-parameter
- 
- # $Format: "REL=$Xdelta3Version$" $
-@@ -126,7 +126,7 @@
- 	$(WIXDIR)/light.exe xdelta3.wixobj -out xdelta3.msi
- 
- xdelta3: $(SOURCES)
--	$(CC) $(CFLAGS) -O3 xdelta3.c -lm -o xdelta3 \
-+	$(CC) $(CFLAGS) -O3 xdelta3.c -lm $(LDFLAGS) -o xdelta3 \
- 	      -DGENERIC_ENCODE_TABLES=0 \
- 	      -DREGRESSION_TEST=1 \
- 	      -DSECONDARY_DJW=1 \
-@@ -137,7 +137,7 @@
- 	      -DXD3_USE_LARGEFILE64=1
- 
- xdelta3-debug: $(SOURCES)
--	$(CC) -g $(CFLAGS) xdelta3.c -lm -o xdelta3-debug \
-+	$(CC) -g $(CFLAGS) xdelta3.c -lm $(LDFLAGS) -o xdelta3-debug \
- 		-DGENERIC_ENCODE_TABLES=1 \
- 		-DREGRESSION_TEST=1 \
- 		-DSECONDARY_DJW=1 \
-@@ -202,6 +202,9 @@
- xdelta3.o: $(SOURCES)
- 	$(CC) -O3 $(CFLAGS) -c xdelta3.c $(SWIG_FLAGS) -o xdelta3.o
- 
-+xdelta3_PIC.o: $(SOURCES)
-+	$(CC) -O3 $(CFLAGS) -fPIC -c xdelta3.c $(SWIG_FLAGS) -o xdelta3_PIC.o
-+
- xdelta3_wrap.o: xdelta3_wrap.c
- 	$(CC) -O3 $(CFLAGS) $(SWIG_FLAGS) \
- 	      -DHAVE_CONFIG_H \
-@@ -221,8 +224,8 @@
- 	cp $(SWIGTGT) /usr/lib/python$(PYVER)/site-packages
- 
- ifeq ("$(DARWIN)", "")
--xdelta3module.so: xdelta3_wrap.o xdelta3.o
--	ld -shared xdelta3.o xdelta3_wrap.o \
-+xdelta3module.so: xdelta3_wrap.o xdelta3_PIC.o
-+	cc $(CFLAGS) $(LDFLAGS) -shared xdelta3_PIC.o xdelta3_wrap.o \
- 		-o xdelta3module.so \
- 		/usr/lib/libpython$(PYVER).so \
- 		-lc
diff --git a/extra/xdg-user-dirs-gtk/PKGBUILD b/extra/xdg-user-dirs-gtk/PKGBUILD
index df275e4b3..8abfcff63 100644
--- a/extra/xdg-user-dirs-gtk/PKGBUILD
+++ b/extra/xdg-user-dirs-gtk/PKGBUILD
@@ -1,8 +1,8 @@
-#  $Id: PKGBUILD 170124 2012-11-03 07:24:35Z eric $
+#  $Id: PKGBUILD 180620 2013-03-25 01:38:50Z eric $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=xdg-user-dirs-gtk
-pkgver=0.9
+pkgver=0.10
 pkgrel=1
 pkgdesc="Creates user dirs and asks to relocalize them"
 arch=(i686 x86_64 mips64el)
@@ -12,8 +12,8 @@ makedepends=('intltool')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('4b908252515eb95b27427ef7c6b0e096febde716c0c89e8f03a79d23882b79c8')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/xdg-user-dirs-gtk/lxde.patch b/extra/xdg-user-dirs-gtk/lxde.patch
deleted file mode 100644
index c5520475c..000000000
--- a/extra/xdg-user-dirs-gtk/lxde.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in.lxde xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in
---- xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in.lxde	2010-02-13 23:52:49.130115833 -0500
-+++ xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in	2010-02-13 23:54:57.574114211 -0500
-@@ -1,10 +1,9 @@
- [Desktop Entry]
--Encoding=UTF-8
- Exec=xdg-user-dirs-gtk-update
- _Name=User folders update
- _Comment=Update common folders names to match current locale
- Terminal=false
--OnlyShowIn=GNOME;
-+OnlyShowIn=GNOME;LXDE;
- Type=Application
- StartupNotify=false
- X-KDE-autostart-after=panel
diff --git a/extra/xerces-c/PKGBUILD b/extra/xerces-c/PKGBUILD
index 0def61317..85a3e1222 100644
--- a/extra/xerces-c/PKGBUILD
+++ b/extra/xerces-c/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id: PKGBUILD 173034 2012-12-09 09:01:09Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
+# $Id: PKGBUILD 179593 2013-03-07 13:22:22Z andrea $
+# Maintainer:
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: pukyxd
 
 pkgname=xerces-c
 pkgver=3.1.1
 pkgrel=3
-pkgdesc="A validating XML parser written in a portable subset of C++."
+pkgdesc="A validating XML parser written in a portable subset of C++"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://xerces.apache.org/xerces-c"
-license=("APACHE")
+url="http://xerces.apache.org/xerces-c/"
+license=('APACHE')
 depends=('gcc-libs' 'curl')
 options=('!libtool')
-source=("http://apache.osuosl.org/xerces/c/3/sources/xerces-c-${pkgver}.tar.gz")
+source=("http://apache.osuosl.org/xerces/c/3/sources/${pkgname}-${pkgver}.tar.gz")
 md5sums=('6a8ec45d83c8cfb1584c5a5345cb51ae')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc
   make
-  make DESTDIR=${pkgdir}/ install
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}/" install
 }
diff --git a/extra/xf86-input-acecad/PKGBUILD b/extra/xf86-input-acecad/PKGBUILD
index 6a60b4fe0..2d758826f 100644
--- a/extra/xf86-input-acecad/PKGBUILD
+++ b/extra/xf86-input-acecad/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 168553 2012-10-13 11:43:16Z andyrtr $
+# $Id: PKGBUILD 180179 2013-03-18 16:08:51Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-acecad
 pkgver=1.5.0
-pkgrel=5
+pkgrel=6
 pkgdesc="X.Org acecad tablet input driver"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('sysfsutils')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         assign-local-private-after-allocating.patch)
diff --git a/extra/xf86-input-aiptek/PKGBUILD b/extra/xf86-input-aiptek/PKGBUILD
index 462e85a63..c55148943 100644
--- a/extra/xf86-input-aiptek/PKGBUILD
+++ b/extra/xf86-input-aiptek/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 168554 2012-10-13 11:43:19Z andyrtr $
+# $Id: PKGBUILD 180180 2013-03-18 16:08:51Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-aiptek
 pkgver=1.4.1
-pkgrel=5
+pkgrel=6
 pkgdesc="X.Org Aiptek USB Digital Tablet input driver"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('55ea7d12d3e24fd72eacc966a59262864dce7769')
diff --git a/extra/xf86-input-elographics/PKGBUILD b/extra/xf86-input-elographics/PKGBUILD
index ee6ad8451..055524671 100644
--- a/extra/xf86-input-elographics/PKGBUILD
+++ b/extra/xf86-input-elographics/PKGBUILD
@@ -3,14 +3,14 @@
 
 pkgname=xf86-input-elographics
 pkgver=1.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Elographics TouchScreen input driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('a21af744d57f158e6dff9d60a68aaac46b8d726d602911940cb61f4d6bb2c6a4')
diff --git a/extra/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff b/extra/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff
deleted file mode 100644
index 93c54d300..000000000
--- a/extra/xf86-input-evdev/Fix_inverted_horizontal_scroll.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-From 99340147b9092a5aaec997eca407282a51e1f063 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 15 Mar 2012 05:46:32 +0000
-Subject: Fix inverted horizontal scroll (#46205)
-
-REL_HWHEEL has a positive increment, not a negative one like REL_WHEEL.
-
-X.Org Bug 46205 <http://bugs.freedesktop.org/show_bug.cgi?id=46205>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
-diff --git a/src/evdev.c b/src/evdev.c
-index d540b87..8cf630c 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -1600,7 +1600,7 @@ EvdevAddRelValuatorClass(DeviceIntPtr device)
-         else if (axis == REL_DIAL)
-             SetScrollValuator(device, axnum, SCROLL_TYPE_VERTICAL, -1.0, SCROLL_FLAG_NONE);
-         else if (axis == REL_HWHEEL)
--            SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, -1.0, SCROLL_FLAG_NONE);
-+            SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, 1.0, SCROLL_FLAG_NONE);
- #endif
-     }
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD
index 180555c19..8f02364c1 100644
--- a/extra/xf86-input-evdev/PKGBUILD
+++ b/extra/xf86-input-evdev/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 168556 2012-10-13 11:43:27Z andyrtr $
+# $Id: PKGBUILD 180837 2013-03-26 16:14:16Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <Alexander@archlinux.org
 
 pkgname=xf86-input-evdev
-pkgver=2.7.3
-pkgrel=2
+pkgver=2.8.0
+pkgrel=1
 pkgdesc="X.org evdev input driver"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc' 'systemd-tools' 'mtdev')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 options=('!libtool' '!makeflags')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504')
+sha256sums=('2f5b4403955f8e82603acff7f8f21a67e89a7c0230e1506c6924c4b9dd8f0e57')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-input-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD
index 013696d26..cdeabcae3 100644
--- a/extra/xf86-input-joystick/PKGBUILD
+++ b/extra/xf86-input-joystick/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 175202 2013-01-16 16:15:44Z andyrtr $
+# $Id: PKGBUILD 180183 2013-03-18 16:08:54Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-joystick
 pkgver=1.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org Joystick input driver"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 backup=('etc/X11/xorg.conf.d/50-joystick.conf')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
diff --git a/extra/xf86-input-joystick/git-fixes.patch b/extra/xf86-input-joystick/git-fixes.patch
deleted file mode 100644
index b3afa06cc..000000000
--- a/extra/xf86-input-joystick/git-fixes.patch
+++ /dev/null
@@ -1,399 +0,0 @@
-From 204dcb86368b011824fc5006f87b9e394d03a394 Mon Sep 17 00:00:00 2001
-From: Terry Lambert <tlambert@chromium.org>
-Date: Sat, 16 Jul 2011 00:23:22 +0000
-Subject: Return proper default for unknown values in pInfo->device_control.
-
-Signed-off-by: Terry Lambert <tlambert@chromium.org>
-Reviewed-by: Stephane Marchesin <marcheu@chromium.org>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/src/jstk.c b/src/jstk.c
-index ec6b79a..6db0e7c 100644
---- a/src/jstk.c
-+++ b/src/jstk.c
-@@ -419,8 +419,7 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
- 
-     default:
-         ErrorF("unsupported mode=%d\n", what);
--        return !Success;
--        break;
-+        return BadValue;
-     } /* switch (what) */
-     return Success;
- }
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index 3c471ce..d699dcd 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -169,6 +169,8 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr       dev,
-         DBG(2, ErrorF("jstkKeyboardDeviceControlProc what=DEVICE_CLOSE\n"));
-         dev->public.on = FALSE;
-         break;
-+    default:
-+        return BadValue;
-     }
- 
-     return Success;
---
-cgit v0.9.0.2-2-gbebe
-From b3b62328cf3f36c20c54a298f8a921e6eef42c4d Mon Sep 17 00:00:00 2001
-From: Devin J. Pohly <djpohly+xorg@gmail.com>
-Date: Sat, 03 Sep 2011 23:00:07 +0000
-Subject: unify capitalization of joystick properties
-
-the axis keys high/low properties were inconsistently capitalized,
-leading to potential confusion as to why one works but not the other.
-
-Signed-off-by: Devin J. Pohly <djpohly+xorg@gmail.com>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/include/joystick-properties.h b/include/joystick-properties.h
-index 49ef800..36f4082 100644
---- a/include/joystick-properties.h
-+++ b/include/joystick-properties.h
-@@ -99,7 +99,7 @@ typedef enum _JSTK_MAPPING {
- 
- /** Scancodes for axis in high position */
- /* 8 bit, 4 per axis */
--#define JSTK_PROP_AXIS_KEYS_HIGH "Axis keys (high)"
-+#define JSTK_PROP_AXIS_KEYS_HIGH "Axis Keys (high)"
- 
- /** Set the mapping of each button to
-     none, x, y, zx, zy, button, key, speed_multiply,
---
-cgit v0.9.0.2-2-gbebe
-From b607c4ebeea4122694f02ba87f06e4cdb23114f1 Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sat, 15 Oct 2011 22:47:52 +0000
-Subject: label buttons and axes
-
-Buttons are labeled "Button %d", starting with 0 and representing the button in X _after_ mapping.
-Mapping can be changed while running so the labels will be constant.
-
-Axes are labeled "Axis %d", starting with 1, representing the _physical_ axis that reports the valuator
-data. The raw valuators can't be dynamically mapped, the first two valuators always are labeled "Rel X"
-and "Rel Y", representing the aggregated post-calculation data from all axes.
-
-Signed-off-by: Sascha Hlusiak <saschahlusiak@arcor.de>
----
-diff --git a/man/joystick.man b/man/joystick.man
-index da92ceb..b401de5 100644
---- a/man/joystick.man
-+++ b/man/joystick.man
-@@ -140,7 +140,11 @@ Neither
- .B mode
- nor
- .B axis
--needs to be set to generate extra valuator events.
-+needs to be set to generate extra valuator events. The axis will be labelled according to it's physical axis number, beginning with 
-+.I 1
-+, i.e.
-+.I \*qAxis 1\*q
-+for the first axis (being the 3rd valuator).
- Default: not set.
- .TP 7
- .BI "\*qaxis="[<factor>]<axis> \*q
-@@ -318,6 +322,28 @@ and the second and fourth axis to the arrow keys
- The keys for the first two axes will be generated in an interval according to the value of the axis. The autorepeat speed of the first axis will be half the speed of that of the second axis.
- The keys for the third and fourth axis are generated once when the axis moves out of the deadzone and when it moves back into the deadzone. X.Org will autorepeat those keys according to current keyboard settings.
- 
-+.SH "XI2 Events"
-+If you only care about raw events instead of using the joystick as a mouse replacement, don't forget to unmap and add valuators to all axes and map the remaining buttons:
-+
-+.nf
-+.BI "  Option  \*qMapAxis1\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis2\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis3\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis4\*q      \*q" "mode=none valuator" \*q
-+\ \ ...
-+.BI "  Option  \*qMapButton1\*q      \*q" "button=1" \*q
-+.BI "  Option  \*qMapButton2\*q      \*q" "button=2" \*q
-+.BI "  Option  \*qMapButton3\*q      \*q" "button=3" \*q
-+.BI "  Option  \*qMapButton4\*q      \*q" "button=4" \*q
-+.BI "  Option  \*qMapButton5\*q      \*q" "button=5" \*q
-+\ \ ...
-+.fi
-+
-+You might also want to set the device "floating" to stop it from reporting core events:
-+.nf
-+.BI "  Option  \*qFloating\*q      \*q" "true" \*q
-+.fi
-+
- .SH "NOTES"
- Configuration through
- .I InputClass
-diff --git a/src/jstk.c b/src/jstk.c
-index 6db0e7c..772683f 100644
---- a/src/jstk.c
-+++ b/src/jstk.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2007-2009 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>     
-+ * Copyright 2007-2011 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>     
-  * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>       
-  *                                                                            
-  * Permission to use, copy, modify, distribute, and sell this software and its
-@@ -21,7 +21,6 @@
-  * PERFORMANCE OF THIS SOFTWARE.
-  */
- 
--
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
-@@ -300,6 +299,7 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-     switch (what) {
-     case DEVICE_INIT: {
-         int m;
-+        char str[32];
-         CARD8 buttonmap[BUTTONMAP_SIZE+1];
-         DBG(1, ErrorF("jstkDeviceControlProc what=INIT\n"));
-         /* Probe device and return if error */
-@@ -312,11 +312,14 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-         }
- 
-         for (m=0; m<=BUTTONMAP_SIZE; m++) {
-+            sprintf(str, "Button %d", m);
-+
-             buttonmap[m] = m;
--	}
-+            btn_labels[m] = MakeAtom(str, strlen(str), TRUE);
-+        }
-+
-+
- 
--            
--            
-         if (InitButtonClassDeviceStruct(pJstk, BUTTONMAP_SIZE, 
-             btn_labels,
-             buttonmap) == FALSE) {
-@@ -331,7 +334,9 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-             if (priv->axis[i].valuator != -1)
-         {
-             DBG(3, ErrorF("Axis %d will be valuator %d\n", i, m));
-+            sprintf(str, "Axis %d", i + 1);
-             priv->axis[i].valuator = m++;
-+            axes_labels[i] = MakeAtom(str, strlen(str), TRUE);
-         }
- 
-         if (InitValuatorClassDeviceStruct(pJstk, m, axes_labels,
-@@ -719,7 +724,6 @@ static XF86ModuleVersionInfo jstkVersionRec =
-                    /* a tool */
- };
- 
--
- /*
-  ***************************************************************************
-  *
-@@ -732,3 +736,6 @@ _X_EXPORT XF86ModuleData joystickModuleData = {
-     jstkDriverPlug,
-     jstkDriverUnplug
- };
-+
-+/* vim: set filetype=c.doxygen ts=4 et: */
-+
---
-cgit v0.9.0.2-2-gbebe
-From e0193debf8f5a72b0a06977d5dea3365ad9cafbe Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 31 Oct 2011 04:27:22 +0000
-Subject: Fix option type for option duplication
-
-xf86OptionListDuplicate() duplicates an XF86Option list, not an InputOption
-list.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index d699dcd..e842941 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -253,26 +253,26 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
-     int rc;
-     char name[512] = {0};
-     InputAttributes *attrs = NULL;
--    InputOption *options;
-     InputOption *iopts = NULL, *tmp;
-     DeviceIntPtr dev;
-+    XF86OptionPtr opts;
- 
-     /* duplicate option list, append to name */
--    options = xf86OptionListDuplicate(pInfo->options);
-+    opts = xf86OptionListDuplicate(pInfo->options);
-     strcpy(name, pInfo->name);
-     strcat(name, " (keys)");
--    options = xf86ReplaceStrOption(options, "Name", name);
--    options = xf86ReplaceStrOption(options, "_source", "_driver/joystick");
-+    opts = xf86ReplaceStrOption(opts, "Name", name);
-+    opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick");
- 
--    while(options)
-+    while(opts)
-     {
-         tmp = calloc(1, sizeof(InputOption));
- 
--        tmp->key = xf86OptionName(options);
--        tmp->value = xf86OptionValue(options);
-+        tmp->key = xf86OptionName(opts);
-+        tmp->value = xf86OptionValue(opts);
-         tmp->next = iopts;
-         iopts = tmp;
--        options = xf86NextOption(options);
-+        opts = xf86NextOption(opts);
-     }
- 
-     /* duplicate attribute list */
---
-cgit v0.9.0.2-2-gbebe
-From 7ccf3a75292d71104c976bf6afb389cccaac1a7d Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 31 Oct 2011 04:33:08 +0000
-Subject: Deal with opaque input option types.
-
-ABI 14 made the InputOption type opaque, move the existing code to ifdefs
-and use the new function calls otherwise.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index e842941..a71275a 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -247,13 +247,46 @@ int jstkKeyboardPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
-     return Success;
- }
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14
-+static InputOption*
-+input_option_new(InputOption* list, char *key, char *value)
-+{
-+    InputOption *tmp;
-+
-+    tmp = calloc(1, sizeof(*tmp));
-+    tmp->key = key;
-+    tmp->value = value;
-+    tmp->next = list;
-+
-+    return tmp;
-+}
-+
-+static void
-+input_option_free_list(InputOption **list)
-+{
-+    InputOption *iopts = *list;
-+
-+    while(iopts)
-+    {
-+        InputOption *tmp = iopts->next;
-+        free(iopts->key);
-+        free(iopts->value);
-+        free(iopts);
-+        iopts = tmp;
-+    }
-+
-+    *list = NULL;
-+}
-+
-+#endif
-+
- InputInfoPtr
- jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- {
-     int rc;
-     char name[512] = {0};
-     InputAttributes *attrs = NULL;
--    InputOption *iopts = NULL, *tmp;
-+    InputOption *iopts = NULL;
-     DeviceIntPtr dev;
-     XF86OptionPtr opts;
- 
-@@ -266,12 +299,9 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- 
-     while(opts)
-     {
--        tmp = calloc(1, sizeof(InputOption));
--
--        tmp->key = xf86OptionName(opts);
--        tmp->value = xf86OptionValue(opts);
--        tmp->next = iopts;
--        iopts = tmp;
-+        iopts = input_option_new(iopts,
-+                                 xf86OptionName(opts),
-+                                 xf86OptionValue(opts));
-         opts = xf86NextOption(opts);
-     }
- 
-@@ -280,14 +310,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- 
-     rc = NewInputDeviceRequest(iopts, attrs, &dev);
- 
--    while(iopts)
--    {
--        tmp = iopts->next;
--        free(iopts->key);
--        free(iopts->value);
--        free(iopts);
--        iopts = tmp;
--    }
-+    input_option_free_list(&iopts);
- 
-     FreeInputAttributes(attrs);
- 
---
-cgit v0.9.0.2-2-gbebe
-From 411c1838456c055d3f911c54ed58bb11a6bf0da3 Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sun, 13 Nov 2011 17:04:25 +0000
-Subject: man: valuators are not added automatically
-
----
-diff --git a/man/joystick.man b/man/joystick.man
-index b401de5..9f38ceb 100644
---- a/man/joystick.man
-+++ b/man/joystick.man
-@@ -129,9 +129,6 @@ can be one of:
- 
- .B none, relative, accelerated, absolute
- 
--Every axis which's mode is not
--.B none
--will be reported as an additional valuator.
- .TP 7
- .B \*qvaluator\*q
- Send extra valuator events for this axis. The valuators will be numbered ascending, starting with 2 (valuator 0 and 1 are reserved for pointer movement). The range of the valuators is always 
---
-cgit v0.9.0.2-2-gbebe
-From b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sun, 13 Nov 2011 19:36:07 +0000
-Subject: Copy pInfo->driver to option list to fix hotplugging of keyboard device
-
-udev does copy the Driver line to the list of options, but when manually
-specifying the driver in xorg.conf, the option "Driver" is unset. Because we
-do hotplug a sub-device from within the core device, we need the "Driver"
-option to be present in the list.
-
-This should fix archlinux bug #23577:
-  https://bugs.archlinux.org/task/23577
-
-Thanks to Malek for coming up with a fix.
-
-Signed-off-by: Sascha Hlusiak <contact@saschahlusiak.de>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index a71275a..241b15d 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -296,6 +296,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
-     strcat(name, " (keys)");
-     opts = xf86ReplaceStrOption(opts, "Name", name);
-     opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick");
-+    opts = xf86AddNewOption(opts, "Driver", pInfo->driver);
- 
-     while(opts)
-     {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-input-keyboard/PKGBUILD b/extra/xf86-input-keyboard/PKGBUILD
index c8f67c5af..97a5dea9b 100644
--- a/extra/xf86-input-keyboard/PKGBUILD
+++ b/extra/xf86-input-keyboard/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 168558 2012-10-13 11:43:39Z andyrtr $
+# $Id: PKGBUILD 180909 2013-03-27 23:09:53Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-keyboard
-pkgver=1.6.2
-pkgrel=2
+pkgver=1.7.0
+pkgrel=1
 pkgdesc="X.Org keyboard input driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('76651a84f5031f7c6ecf075d55989c04a00689642579df6d1a1bee6d5c2e5f8a')
+sha256sums=('0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-input-mouse/PKGBUILD b/extra/xf86-input-mouse/PKGBUILD
index 15b0f2ce4..585b3a69b 100644
--- a/extra/xf86-input-mouse/PKGBUILD
+++ b/extra/xf86-input-mouse/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 168559 2012-10-13 11:43:43Z andyrtr $
+# $Id: PKGBUILD 180912 2013-03-27 23:12:17Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-mouse
-pkgver=1.8.1
-pkgrel=2
+pkgver=1.9.0
+pkgrel=1
 pkgdesc="X.org mouse input driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f5b97aac9aab8fa8b933e960631441ae23b18681c8bf3d5007c00da838f9c9c8')
+sha256sums=('5d601e4bae53d5e9ead4ecd700f1beb5aeaf78b79e634c4aa381a9ce00276488')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-input-synaptics/10-synaptics.conf b/extra/xf86-input-synaptics/10-synaptics.conf
deleted file mode 100644
index 81a90fb81..000000000
--- a/extra/xf86-input-synaptics/10-synaptics.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-Section "InputClass"
-        Identifier "touchpad catchall"
-        Driver "synaptics"
-        MatchIsTouchpad "on"
-        MatchDevicePath "/dev/input/event*"
-        Option "TapButton1" "1"
-        Option "TapButton2" "2"
-        Option "TapButton3" "3"
-EndSection
diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD
index 499c669a5..a79ae614a 100644
--- a/extra/xf86-input-synaptics/PKGBUILD
+++ b/extra/xf86-input-synaptics/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 176855 2013-02-01 15:31:40Z andyrtr $
+# $Id: PKGBUILD 182039 2013-04-05 19:13:38Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski  <tpowa@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-input-synaptics
-pkgver=1.6.3
+pkgver=1.7.0
 pkgrel=1
 pkgdesc="Synaptics driver for notebook touchpads"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxtst' 'mtdev')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 replaces=('synaptics')
 provides=('synaptics')
 conflicts=('synaptics')
@@ -22,7 +22,7 @@ options=(!libtool)
 backup=('etc/X11/xorg.conf.d/50-synaptics.conf')
 source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         add_tapbuttons.diff)
-sha256sums=('b40c9dbd5f743ff1eb2ac81a23b9676df72e76ed3fa6408de3f8a3a260248604'
+sha256sums=('d6f1ad0b0653dddbe2e2db7e2f06c1860e491045e87a6577b63568d65e5d0f0e'
             '5298d3e871db3768b34cf8516d3f53f9291202e2ea5de3300256e1cd9119a1ec')
 
 build() {
diff --git a/extra/xf86-input-vmmouse/PKGBUILD b/extra/xf86-input-vmmouse/PKGBUILD
index 009a20aba..15fb2db7f 100644
--- a/extra/xf86-input-vmmouse/PKGBUILD
+++ b/extra/xf86-input-vmmouse/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 175179 2013-01-16 09:55:26Z jgc $
+# $Id: PKGBUILD 180187 2013-03-18 16:08:57Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-vmmouse
 pkgver=13.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org VMWare Mouse input driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc' 'sh')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 groups=('xorg-drivers' 'xorg')
 backup=('etc/X11/xorg.conf.d/50-vmmouse.conf')
 options=('!libtool')
diff --git a/extra/xf86-input-void/PKGBUILD b/extra/xf86-input-void/PKGBUILD
index ee56a2076..2bcb3ce0e 100644
--- a/extra/xf86-input-void/PKGBUILD
+++ b/extra/xf86-input-void/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 168562 2012-10-13 11:43:57Z andyrtr $
+# $Id: PKGBUILD 180188 2013-03-18 16:08:57Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-void
 pkgver=1.4.0
-pkgrel=4
+pkgrel=5
 pkgdesc="X.org void input driver"
 arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/xf86-input-wacom/70-wacom.rules b/extra/xf86-input-wacom/70-wacom.rules
index f6aa20835..2b32b1234 100644
--- a/extra/xf86-input-wacom/70-wacom.rules
+++ b/extra/xf86-input-wacom/70-wacom.rules
@@ -8,5 +8,8 @@ ACTION!="add|change", GOTO="wacom_end"
 SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
 SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
 
+# inputattach
+SUBSYSTEM=="tty|pnp", KERNEL=="ttyS[0-9]*", ATTRS{id}=="WACf*", RUN+="/usr/sbin/modprobe wacom_w8001", RUN+="/usr/sbin/inputattach --daemon -w8001 /dev/%k"
+
 LABEL="wacom_end"
 
diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD
index d2ebb0595..5ce40ab10 100644
--- a/extra/xf86-input-wacom/PKGBUILD
+++ b/extra/xf86-input-wacom/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 174296 2013-01-04 03:24:43Z heftig $
+# $Id: PKGBUILD 180189 2013-03-18 16:08:58Z andyrtr $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: M Rawash <mrawash@gmail.com>
 
 pkgname=xf86-input-wacom
-pkgver=0.19.0
-pkgrel=1
+pkgver=0.20.0
+pkgrel=2
 pkgdesc="X.Org Wacom tablet driver"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linuxwacom.sourceforge.net/"
-license=('GPL')
+license=(GPL)
 backup=('etc/X11/xorg.conf.d/50-wacom.conf')
-depends=('libxi' 'libxrandr' 'libxinerama')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+depends=(libxi libxinerama libxrandr)
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
+optdepends=('inputattach: support for serial tablets')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2
         70-wacom.rules)
-md5sums=('bdc66047bb0afb4ac29882cca16cdfaa'
-         '10db4f8272286690255c1bcc18bfdd92')
+md5sums=('a726649cb05c98cb1b18a3b7a4f079ed'
+         'cc46dcb399d5ee62c9feb610c60d1270')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/xf86-video-apm/PKGBUILD b/extra/xf86-video-apm/PKGBUILD
index a6982cb01..b1a17aebf 100644
--- a/extra/xf86-video-apm/PKGBUILD
+++ b/extra/xf86-video-apm/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 168564 2012-10-13 11:44:07Z andyrtr $
+# $Id: PKGBUILD 180190 2013-03-18 16:09:00Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-apm
 pkgver=1.2.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Alliance ProMotion video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f'
+            'be06cce5eb0b8eb070321e293f5cd9b7aa947d920d23cc962f7121191ba4180b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-apm/apm-1.2.3-git.patch b/extra/xf86-video-apm/apm-1.2.3-git.patch
deleted file mode 100644
index 1c6afb29d..000000000
--- a/extra/xf86-video-apm/apm-1.2.3-git.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/apm.h b/src/apm.h
-index bc66714..86c7663 100644
---- a/src/apm.h
-+++ b/src/apm.h
-@@ -109,7 +109,7 @@ typedef struct {
-     char		*MemMap;
-     pointer		BltMap;
-     Bool		UnlockCalled;
--    IOADDRESS		iobase, xport, xbase;
-+    unsigned long	iobase, xport, xbase;
-     unsigned char	savedSR10;
-     CARD8		MiscOut;
-     CARD8		c9, d9, db, Rush;
-diff --git a/src/apm_driver.c b/src/apm_driver.c
-index f172bab..f77bb2b 100644
---- a/src/apm_driver.c
-+++ b/src/apm_driver.c
-@@ -418,8 +418,14 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
- 
-     hwp = VGAHWPTR(pScrn);
-     vgaHWGetIOBase(hwp);
--    pApm->iobase = hwp->PIOOffset;
--    pApm->xport = hwp->PIOOffset + 0x3C4;
-+#if ABI_VIDEODRV_VERSION < 12
-+#define PIOOFFSET hwp->PIOOffset
-+#else
-+/* FIXME reintroduce domain support */
-+#define PIOOFFSET 0
-+#endif
-+    pApm->iobase = PIOOFFSET;
-+    pApm->xport = PIOOFFSET + 0x3C4;
- 
-     /* Set pScrn->monitor */
-     pScrn->monitor = pScrn->confScreen->monitor;
diff --git a/extra/xf86-video-apm/git-fix.diff b/extra/xf86-video-apm/git-fix.diff
new file mode 100644
index 000000000..e48d2c42d
--- /dev/null
+++ b/extra/xf86-video-apm/git-fix.diff
@@ -0,0 +1,23 @@
+From 9f67408e4f078e907fbf4feb45cfdcfd0cdebcca Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 10 Jan 2013 03:03:29 +0000
+Subject: Remove #include "mibstore.h"
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/apm.h b/src/apm.h
+index a3c06f8..365e5e2 100644
+--- a/src/apm.h
++++ b/src/apm.h
+@@ -33,9 +33,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* I2C support */
+ #include "xf86i2c.h"
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-ark/PKGBUILD b/extra/xf86-video-ark/PKGBUILD
index ce16d52cf..ed351f636 100644
--- a/extra/xf86-video-ark/PKGBUILD
+++ b/extra/xf86-video-ark/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 168565 2012-10-13 11:44:11Z andyrtr $
+# $Id: PKGBUILD 180191 2013-03-18 16:09:00Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-ark
 pkgver=0.7.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org ark video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 build-fix.diff)
+sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e'
+            '257c3db46ef85863cc2d1b2ba250ef6b1a08df75171f2f3cef83cabd8b22399b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/build-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-ark/build-fix.diff b/extra/xf86-video-ark/build-fix.diff
new file mode 100644
index 000000000..3473b327e
--- /dev/null
+++ b/extra/xf86-video-ark/build-fix.diff
@@ -0,0 +1,10 @@
+--- xf86-video-ark-0.7.5/src/ark_driver.c	2012-07-17 06:51:36.000000000 +0200
++++ xf86-video-ark-0.7.5/src/ark_driver.c.new	2013-03-09 12:34:04.336299997 +0100
+@@ -39,7 +39,6 @@
+ #include "compiler.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+-#include "mibstore.h"
+ #include "fb.h"
+ #include "ark.h"
+ 
diff --git a/extra/xf86-video-ark/git-fixes.patch b/extra/xf86-video-ark/git-fixes.patch
deleted file mode 100644
index 2de0f64be..000000000
--- a/extra/xf86-video-ark/git-fixes.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 9d3769bed020e9796e51411c63de337da5073bb4 Mon Sep 17 00:00:00 2001
-From: Ondrej Zary <linux@rainbow-software.org>
-Date: Sat, 04 Dec 2010 00:23:51 +0000
-Subject: Don't assume that FB address registers are initialized properly
-
-https://bugs.freedesktop.org/show_bug.cgi?id=28249
-
-ark driver does not work with Hercules Stingray 64 card (ark2000pv).
-X fails to start with:
-
-[...]
-(II) ark(0): vgaHWGetIOBase: hwp->IOBase is 0x03d0, hwp->PIOOffset is
-0x0000
-(II) ark(0): Creating default Display subsection in Screen section
-        "Default Screen Section" for depth/fbbpp 24/32
-(==) ark(0): Depth 24, (--) framebuffer bpp 32
-(==) ark(0): RGB weight 888
-(==) ark(0): Default visual is TrueColor
-(**) ark(0): Chipset: "ark2000pv"
-(--) ark(0): Framebuffer @ 0xe5e50000
-(==) ark(0): Using gamma correction (1.0, 1.0, 1.0)
-(--) ark(0): Detected 2048 bytes video ram
-[...]
-Fatal server error:
-AddScreen/ScreenInit failed for driver 0
-
-Comparing with lspci, the framebuffer address is wrong:
-00:0f.0 VGA compatible controller: ARK Logic Inc 2000PV [Stingray] (prog-if 00 [VGA controller])
-	Flags: medium devsel
-	Memory at e5000000 (32-bit, prefetchable) [size=4M]
-	[virtual] Expansion ROM at 1c000000 [disabled] [size=64K]
-
-Reviewed-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/ark.h b/src/ark.h
-index de301dc..077f93b 100644
---- a/src/ark.h
-+++ b/src/ark.h
-@@ -34,7 +34,6 @@ typedef struct _ARKRec {
- #endif
- 	EntityInfoPtr		pEnt;
- 	CARD32			IOAddress;
--	CARD32			FBAddress;
- 	unsigned char *		FBBase;
- 	unsigned char *		MMIOBase;
- 	unsigned long		videoRam;
-diff --git a/src/ark_driver.c b/src/ark_driver.c
-index 5de3b9a..fec3e1a 100644
---- a/src/ark_driver.c
-+++ b/src/ark_driver.c
-@@ -363,14 +363,14 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
- 	outb(hwp->PIOOffset + hwp->IOBase + 5, tmp & 0x7f);
- 	modinx(hwp->PIOOffset + 0x3c4, 0x1d, 0x01, 0x01);
- 
--	/* use membase's later on ??? */
--	pARK->FBAddress = (rdinx(hwp->PIOOffset + 0x3c4, 0x13) << 16) +
--			  (rdinx(hwp->PIOOffset + 0x3c4, 0x14) << 24);
--
--	pScrn->memPhysBase = pARK->FBAddress;
-+#ifndef XSERVER_LIBPCIACCESS
-+	pScrn->memPhysBase = pARK->PciInfo->memBase[0];
-+#else
-+	pScrn->memPhysBase = pARK->PciInfo->regions[0].base_addr;
-+#endif
- 
- 	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%lx\n",
--		   (unsigned long)pARK->FBAddress);
-+		   (unsigned long)pScrn->memPhysBase);
- 
- 	if (!xf86SetGamma(pScrn, gzeros))
- 		return FALSE;
-@@ -748,8 +748,13 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	new->sr10 = rdinx(isaIOBase + 0x3c4, 0x10) & ~0x1f;
- 	new->sr10 |= 0x1f;
- 
--	new->sr13 = pARK->FBAddress >> 16;
--	new->sr14 = pARK->FBAddress >> 24;
-+#ifndef XSERVER_LIBPCIACCESS
-+	new->sr13 = pARK->PciInfo->memBase[0] >> 16;
-+	new->sr14 = pARK->PciInfo->memBase[0] >> 24;
-+#else
-+	new->sr13 = pARK->PciInfo->regions[0].base_addr >> 16;
-+	new->sr14 = pARK->PciInfo->regions[0].base_addr >> 24;
-+#endif
- 
- 	new->sr12 = rdinx(isaIOBase + 0x3c4, 0x12) & ~0x03;
- 	switch (pScrn->videoRam) {
-@@ -1022,7 +1027,7 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn)
- 					     pARK->PciTag, 0xb8000, 0x8000);
- 
- 	pARK->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
--				     pARK->PciTag, pARK->FBAddress,
-+				     pARK->PciTag, pARK->PciInfo->memBase[0],
- 				     pScrn->videoRam * 1024);
- #else
- 
-@@ -1032,14 +1037,17 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn)
- 	{
- 		void** result = (void**)&pARK->FBBase;
- 		int err = pci_device_map_range(pARK->PciInfo,
--					       pARK->FBAddress,
-+					       pARK->PciInfo->regions[0].base_addr,
- 					       pScrn->videoRam * 1024,
- 					       PCI_DEV_MAP_FLAG_WRITABLE |
- 					       PCI_DEV_MAP_FLAG_WRITE_COMBINE,
- 					       result);
- 		
--		if (err) 
-+		if (err) {
-+			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-+			   "Cound not map framebuffer: %d\n", err);
- 			return FALSE;
-+		}
- 	}
- #endif
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-ast/PKGBUILD b/extra/xf86-video-ast/PKGBUILD
index d6dd021e1..ef642098d 100644
--- a/extra/xf86-video-ast/PKGBUILD
+++ b/extra/xf86-video-ast/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 168566 2012-10-13 11:44:15Z andyrtr $
+# $Id: PKGBUILD 180192 2013-03-18 16:09:01Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-ast
 pkgver=0.97.0
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org ASPEED AST Graphics video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76'
+            '8f032dd9f1441e2af4e443166f0e3d3a6ce4ef7f351af8789158d2dec18a52fa')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-ast/git-fix.diff b/extra/xf86-video-ast/git-fix.diff
new file mode 100644
index 000000000..5b2e4bc12
--- /dev/null
+++ b/extra/xf86-video-ast/git-fix.diff
@@ -0,0 +1,196 @@
+From 358ef4a53e582a2176a163356c7754faf3192270 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 15 Aug 2012 17:22:14 +0000
+Subject: Don't bother to include vbe.h
+
+This driver no longer uses VBE, so this can go.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c
+index bb99f9d..6be9a4f 100644
+--- a/src/ast_2dtool.c
++++ b/src/ast_2dtool.c
+@@ -36,7 +36,6 @@
+ #include "regionstr.h"
+ #include "xf86xv.h"
+ #include <X11/extensions/Xv.h>
+-#include "vbe.h"
+ 
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+diff --git a/src/ast_accel.c b/src/ast_accel.c
+index 34f9c65..a789b21 100644
+--- a/src/ast_accel.c
++++ b/src/ast_accel.c
+@@ -36,7 +36,6 @@
+ #include "regionstr.h"
+ #include "xf86xv.h"
+ #include <X11/extensions/Xv.h>
+-#include "vbe.h"
+ 
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+diff --git a/src/ast_cursor.c b/src/ast_cursor.c
+index f967ce9..47ea09d 100644
+--- a/src/ast_cursor.c
++++ b/src/ast_cursor.c
+@@ -36,7 +36,6 @@
+ #include "regionstr.h"
+ #include "xf86xv.h"
+ #include <X11/extensions/Xv.h>
+-#include "vbe.h"
+ 
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+diff --git a/src/ast_driver.c b/src/ast_driver.c
+index 080b051..5e6a26e 100644
+--- a/src/ast_driver.c
++++ b/src/ast_driver.c
+@@ -40,7 +40,6 @@
+ #include "regionstr.h"
+ #include "xf86xv.h"
+ #include <X11/extensions/Xv.h>
+-#include "vbe.h"
+ 
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+diff --git a/src/ast_mode.c b/src/ast_mode.c
+index 3238f39..50289f1 100644
+--- a/src/ast_mode.c
++++ b/src/ast_mode.c
+@@ -36,7 +36,6 @@
+ #include "regionstr.h"
+ #include "xf86xv.h"
+ #include <X11/extensions/Xv.h>
+-#include "vbe.h"
+ 
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+diff --git a/src/ast_tool.c b/src/ast_tool.c
+index d11f20d..c701c1e 100644
+--- a/src/ast_tool.c
++++ b/src/ast_tool.c
+@@ -36,7 +36,6 @@
+ #include "regionstr.h"
+ #include "xf86xv.h"
+ #include <X11/extensions/Xv.h>
+-#include "vbe.h"
+ 
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c
+index ed8c906..42de52c 100644
+--- a/src/ast_vgatool.c
++++ b/src/ast_vgatool.c
+@@ -36,7 +36,6 @@
+ #include "regionstr.h"
+ #include "xf86xv.h"
+ #include <X11/extensions/Xv.h>
+-#include "vbe.h"
+ 
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+--
+cgit v0.9.0.2-2-gbebe
+From 0833e0086b9712b1c29571919899d5d17fea8382 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:33 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c
+index 6be9a4f..684e400 100644
+--- a/src/ast_2dtool.c
++++ b/src/ast_2dtool.c
+@@ -27,7 +27,6 @@
+ #include "xf86_OSproc.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+-#include "mibstore.h"
+ #include "vgaHW.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+diff --git a/src/ast_accel.c b/src/ast_accel.c
+index a789b21..0e7e5d3 100644
+--- a/src/ast_accel.c
++++ b/src/ast_accel.c
+@@ -27,7 +27,6 @@
+ #include "xf86_OSproc.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+-#include "mibstore.h"
+ #include "vgaHW.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+diff --git a/src/ast_cursor.c b/src/ast_cursor.c
+index 47ea09d..c672564 100644
+--- a/src/ast_cursor.c
++++ b/src/ast_cursor.c
+@@ -27,7 +27,6 @@
+ #include "xf86_OSproc.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+-#include "mibstore.h"
+ #include "vgaHW.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+diff --git a/src/ast_driver.c b/src/ast_driver.c
+index 5e6a26e..43fcdbc 100644
+--- a/src/ast_driver.c
++++ b/src/ast_driver.c
+@@ -31,7 +31,6 @@
+ #endif
+ #include "xf86cmap.h"
+ #include "compiler.h"
+-#include "mibstore.h"
+ #include "vgaHW.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+@@ -888,7 +887,6 @@ ASTScreenInit(SCREEN_INIT_ARGS_DECL)
+    }
+ #endif /* end of Accel_2D */
+      
+-   miInitializeBackingStore(pScreen);
+    xf86SetBackingStore(pScreen);
+    xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/ast_mode.c b/src/ast_mode.c
+index 50289f1..2e06062 100644
+--- a/src/ast_mode.c
++++ b/src/ast_mode.c
+@@ -27,7 +27,6 @@
+ #include "xf86_OSproc.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+-#include "mibstore.h"
+ #include "vgaHW.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+diff --git a/src/ast_tool.c b/src/ast_tool.c
+index c701c1e..c2bfac6 100644
+--- a/src/ast_tool.c
++++ b/src/ast_tool.c
+@@ -27,7 +27,6 @@
+ #include "xf86_OSproc.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+-#include "mibstore.h"
+ #include "vgaHW.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c
+index 42de52c..513cf7b 100644
+--- a/src/ast_vgatool.c
++++ b/src/ast_vgatool.c
+@@ -27,7 +27,6 @@
+ #include "xf86_OSproc.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+-#include "mibstore.h"
+ #include "vgaHW.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-ati/0000-poor-man-s-solid-picture-support-for-r300-r600.patch b/extra/xf86-video-ati/0000-poor-man-s-solid-picture-support-for-r300-r600.patch
deleted file mode 100644
index bcfbf94db..000000000
--- a/extra/xf86-video-ati/0000-poor-man-s-solid-picture-support-for-r300-r600.patch
+++ /dev/null
@@ -1,571 +0,0 @@
-From 837149c63929d7d5a8ef6f8204d396f8e6d5acd7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@daenzer.net>
-Date: Fri, 13 Apr 2012 11:12:51 +0200
-Subject: [PATCH 1/4] Poor man's acceleration of solid pictures for R3xx-R7xx
-
-The patch below implements basic acceleration of solid pictures via
-scratch 1x1 pixmaps. It seems to at least alleviate some of the
-corruption and performance issues exposed by Cairo 1.12, and should also
-improve performance for other toolkits/apps using solid pictures.
-
-If there are no objections to this approach, maybe someone else can beat
-me to extending this for Evergreen+ and R1/2xx.
----
- src/r600_exa.c          |  160 ++++++++++++++++++++++++++--------------------
- src/radeon_exa_render.c |  115 ++++++++++++++++++++--------------
- src/radeon_exa_shared.c |   19 ++++++
- src/radeon_exa_shared.h |    1 +
- 4 files changed, 179 insertions(+), 116 deletions(-)
-
-diff --git a/src/r600_exa.c b/src/r600_exa.c
-index e1eb62f..c3ae553 100644
---- a/src/r600_exa.c
-+++ b/src/r600_exa.c
-@@ -901,17 +901,8 @@ static Bool R600CheckCompositeTexture(PicturePtr pPict,
- 				      int op,
- 				      int unit)
- {
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-     unsigned int i;
--    int max_tex_w, max_tex_h;
--
--    max_tex_w = 8192;
--    max_tex_h = 8192;
--
--    if ((w > max_tex_w) || (h > max_tex_h))
--	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
- 
-     for (i = 0; i < sizeof(R600TexFormats) / sizeof(R600TexFormats[0]); i++) {
- 	if (R600TexFormats[i].fmt == pPict->format)
-@@ -951,9 +942,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
-     ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
-     RADEONInfoPtr info = RADEONPTR(pScrn);
-     struct radeon_accel_state *accel_state = info->accel_state;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
--    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    unsigned int repeatType;
-     unsigned int i;
-     tex_resource_t  tex_res;
-     tex_sampler_t   tex_samp;
-@@ -969,9 +958,16 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
-     }
- 
-     /* Texture */
-+    if (pPict->pDrawable) {
-+	tex_res.w               = pPict->pDrawable->width;
-+	tex_res.h               = pPict->pDrawable->height;
-+	repeatType              = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    } else {
-+	tex_res.w               = 1;
-+	tex_res.h               = 1;
-+	repeatType              = RepeatNormal;
-+    }
-     tex_res.id                  = unit;
--    tex_res.w                   = w;
--    tex_res.h                   = h;
-     tex_res.pitch               = accel_state->src_obj[unit].pitch;
-     tex_res.depth               = 0;
-     tex_res.dim                 = SQ_TEX_DIM_2D;
-@@ -1170,24 +1166,24 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
- 	vs_alu_consts[0] = xFixedToFloat(pPict->transform->matrix[0][0]);
- 	vs_alu_consts[1] = xFixedToFloat(pPict->transform->matrix[0][1]);
- 	vs_alu_consts[2] = xFixedToFloat(pPict->transform->matrix[0][2]);
--	vs_alu_consts[3] = 1.0 / w;
-+	vs_alu_consts[3] = 1.0 / tex_res.w;
- 
- 	vs_alu_consts[4] = xFixedToFloat(pPict->transform->matrix[1][0]);
- 	vs_alu_consts[5] = xFixedToFloat(pPict->transform->matrix[1][1]);
- 	vs_alu_consts[6] = xFixedToFloat(pPict->transform->matrix[1][2]);
--	vs_alu_consts[7] = 1.0 / h;
-+	vs_alu_consts[7] = 1.0 / tex_res.h;
-     } else {
- 	accel_state->is_transform[unit] = FALSE;
- 
- 	vs_alu_consts[0] = 1.0;
- 	vs_alu_consts[1] = 0.0;
- 	vs_alu_consts[2] = 0.0;
--	vs_alu_consts[3] = 1.0 / w;
-+	vs_alu_consts[3] = 1.0 / tex_res.w;
- 
- 	vs_alu_consts[4] = 0.0;
- 	vs_alu_consts[5] = 1.0;
- 	vs_alu_consts[6] = 0.0;
--	vs_alu_consts[7] = 1.0 / h;
-+	vs_alu_consts[7] = 1.0 / tex_res.h;
-     }
- 
-     /* VS alu constants */
-@@ -1202,33 +1198,30 @@ static Bool R600CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
- {
-     uint32_t tmp1;
-     PixmapPtr pSrcPixmap, pDstPixmap;
--    int max_tex_w, max_tex_h, max_dst_w, max_dst_h;
- 
-     /* Check for unsupported compositing operations. */
-     if (op >= (int) (sizeof(R600BlendOp) / sizeof(R600BlendOp[0])))
- 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
- 
--    if (!pSrcPicture->pDrawable)
--	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
-+    if (pSrcPicture->pDrawable) {
-+	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
- 
--    max_tex_w = 8192;
--    max_tex_h = 8192;
--    max_dst_w = 8192;
--    max_dst_h = 8192;
-+	if (pSrcPixmap->drawable.width >= 8192 ||
-+	    pSrcPixmap->drawable.height >= 8192) {
-+	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
-+			     pSrcPixmap->drawable.width,
-+			     pSrcPixmap->drawable.height));
-+	}
- 
--    if (pSrcPixmap->drawable.width >= max_tex_w ||
--	pSrcPixmap->drawable.height >= max_tex_h) {
--	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
--			 pSrcPixmap->drawable.width,
--			 pSrcPixmap->drawable.height));
--    }
-+	if (!R600CheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
-+	    return FALSE;
-+    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
- 
-     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
- 
--    if (pDstPixmap->drawable.width >= max_dst_w ||
--	pDstPixmap->drawable.height >= max_dst_h) {
-+    if (pDstPixmap->drawable.width >= 8192 ||
-+	pDstPixmap->drawable.height >= 8192) {
- 	RADEON_FALLBACK(("Dest w/h too large (%d,%d).\n",
- 			 pDstPixmap->drawable.width,
- 			 pDstPixmap->drawable.height));
-@@ -1237,38 +1230,35 @@ static Bool R600CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
-     if (pMaskPicture) {
- 	PixmapPtr pMaskPixmap;
- 
--	if (!pMaskPicture->pDrawable)
--	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
-+	if (pMaskPicture->pDrawable) {
-+	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
- 
--	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
--
--	if (pMaskPixmap->drawable.width >= max_tex_w ||
--	    pMaskPixmap->drawable.height >= max_tex_h) {
--	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
--			     pMaskPixmap->drawable.width,
--			     pMaskPixmap->drawable.height));
--	}
-+	    if (pMaskPixmap->drawable.width >= 8192 ||
-+		pMaskPixmap->drawable.height >= 8192) {
-+	      RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
-+			       pMaskPixmap->drawable.width,
-+			       pMaskPixmap->drawable.height));
-+	    }
- 
--	if (pMaskPicture->componentAlpha) {
--	    /* Check if it's component alpha that relies on a source alpha and
--	     * on the source value.  We can only get one of those into the
--	     * single source value that we get to blend with.
--	     */
--	    if (R600BlendOp[op].src_alpha &&
--		(R600BlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
--		(BLEND_ZERO << COLOR_SRCBLEND_shift)) {
--		RADEON_FALLBACK(("Component alpha not supported with source "
--				 "alpha and source value blending.\n"));
-+	    if (pMaskPicture->componentAlpha) {
-+		/* Check if it's component alpha that relies on a source alpha and
-+		 * on the source value.  We can only get one of those into the
-+		 * single source value that we get to blend with.
-+		 */
-+		if (R600BlendOp[op].src_alpha &&
-+		    (R600BlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
-+		    (BLEND_ZERO << COLOR_SRCBLEND_shift)) {
-+		    RADEON_FALLBACK(("Component alpha not supported with source "
-+				     "alpha and source value blending.\n"));
-+		}
- 	    }
--	}
- 
--	if (!R600CheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
--	    return FALSE;
-+	    if (!R600CheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
-+		return FALSE;
-+	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
-     }
- 
--    if (!R600CheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
--	return FALSE;
--
-     if (!R600GetDestFormat(pDstPicture, &tmp1))
- 	return FALSE;
- 
-@@ -1280,7 +1270,8 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
- 				 PicturePtr pMaskPicture, PicturePtr pDstPicture,
- 				 PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-     RADEONInfoPtr info = RADEONPTR(pScrn);
-     struct radeon_accel_state *accel_state = info->accel_state;
-     uint32_t dst_format;
-@@ -1288,15 +1279,21 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
-     shader_config_t vs_conf, ps_conf;
-     struct r600_accel_object src_obj, mask_obj, dst_obj;
- 
--    if (pDst->drawable.bitsPerPixel < 8 || pSrc->drawable.bitsPerPixel < 8)
-+    if (pDst->drawable.bitsPerPixel < 8 || (pSrc && pSrc->drawable.bitsPerPixel < 8))
- 	return FALSE;
- 
-+    if (!pSrc) {
-+	pSrc = RADEONSolidPixmap(pScreen, pSrcPicture->pSourcePict->solidFill.color);
-+	if (!pSrc)
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+    }
-+
- #if defined(XF86DRM_MODE)
-     if (info->cs) {
- 	src_obj.offset = 0;
- 	dst_obj.offset = 0;
--	src_obj.bo = radeon_get_pixmap_bo(pSrc);
- 	dst_obj.bo = radeon_get_pixmap_bo(pDst);
-+	src_obj.bo = radeon_get_pixmap_bo(pSrc);
- 	dst_obj.tiling_flags = radeon_get_pixmap_tiling(pDst);
- 	src_obj.tiling_flags = radeon_get_pixmap_tiling(pSrc);
- 	dst_obj.surface = radeon_get_pixmap_surface(pDst);
-@@ -1322,7 +1319,16 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
-     dst_obj.bpp = pDst->drawable.bitsPerPixel;
-     dst_obj.domain = RADEON_GEM_DOMAIN_VRAM;
- 
--    if (pMask) {
-+    if (pMaskPicture) {
-+	if (!pMask) {
-+	    pMask = RADEONSolidPixmap(pScreen, pMaskPicture->pSourcePict->solidFill.color);
-+	    if (!pMask) {
-+		if (!pSrcPicture->pDrawable)
-+		    pScreen->DestroyPixmap(pSrc);
-+		RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+	    }
-+	}
-+
- #if defined(XF86DRM_MODE)
- 	if (info->cs) {
- 	    mask_obj.offset = 0;
-@@ -1509,11 +1515,9 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
-     return TRUE;
- }
- 
--static void R600DoneComposite(PixmapPtr pDst)
-+static void R600FinishComposite(ScrnInfoPtr pScrn, PixmapPtr pDst,
-+				struct radeon_accel_state *accel_state)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
--    RADEONInfoPtr info = RADEONPTR(pScrn);
--    struct radeon_accel_state *accel_state = info->accel_state;
-     int vtx_size;
- 
-     if (accel_state->vsync)
-@@ -1527,6 +1531,22 @@ static void R600DoneComposite(PixmapPtr pDst)
-     r600_finish_op(pScrn, vtx_size);
- }
- 
-+static void R600DoneComposite(PixmapPtr pDst)
-+{
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    RADEONInfoPtr info = RADEONPTR(pScrn);
-+    struct radeon_accel_state *accel_state = info->accel_state;
-+
-+    R600FinishComposite(pScrn, pDst, accel_state);
-+
-+    if (!accel_state->src_pic->pDrawable)
-+	pScreen->DestroyPixmap(accel_state->src_pix);
-+
-+    if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable)
-+	pScreen->DestroyPixmap(accel_state->msk_pix);
-+}
-+
- static void R600Composite(PixmapPtr pDst,
- 			  int srcX, int srcY,
- 			  int maskX, int maskY,
-@@ -1543,7 +1563,7 @@ static void R600Composite(PixmapPtr pDst,
- 
- #ifdef XF86DRM_MODE
-     if (info->cs && CS_FULL(info->cs)) {
--	R600DoneComposite(info->accel_state->dst_pix);
-+	R600FinishComposite(pScrn, pDst, info->accel_state);
- 	radeon_cs_flush_indirect(pScrn);
- 	R600PrepareComposite(info->accel_state->composite_op,
- 			     info->accel_state->src_pic,
-diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
-index e5c231f..b6cc9e4 100644
---- a/src/radeon_exa_render.c
-+++ b/src/radeon_exa_render.c
-@@ -299,8 +299,8 @@ static Bool RADEONSetupSourceTile(PicturePtr pPict,
-     if (repeatType == RepeatNormal || repeatType == RepeatReflect) {
- 	Bool badPitch = needMatchingPitch && !RADEONPitchMatches(pPix);
- 	
--	int w = pPict->pDrawable->width;
--	int h = pPict->pDrawable->height;
-+	int w = pPict->pDrawable ? pPict->pDrawable->width : 1;
-+	int h = pPict->pDrawable ? pPict->pDrawable->height : 1;
- 	
- 	if (pPict->transform) {
- 	    if (badPitch)
-@@ -1112,23 +1112,8 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict,
-     ScreenPtr pScreen = pDstPict->pDrawable->pScreen;
-     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-     RADEONInfoPtr info = RADEONPTR(pScrn);
--
-     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-     int i;
--    int max_tex_w, max_tex_h;
--
--    if (is_r500) {
--	max_tex_w = 4096;
--	max_tex_h = 4096;
--    } else {
--	max_tex_w = 2048;
--	max_tex_h = 2048;
--    }
--
--    if ((w > max_tex_w) || (h > max_tex_h))
--	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
- 
-     for (i = 0; i < sizeof(R300TexFormats) / sizeof(R300TexFormats[0]); i++)
-     {
-@@ -1139,7 +1124,7 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict,
- 	RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
- 			 (int)pPict->format));
- 
--    if (!RADEONCheckTexturePOT(pPict, unit == 0)) {
-+    if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0)) {
- 	if (info->cs) {
-     		struct radeon_exa_pixmap_priv *driver_priv;
- 		PixmapPtr pPix;
-@@ -1181,15 +1166,23 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
- {
-     RINFO_FROM_SCREEN(pPix->drawable.pScreen);
-     uint32_t txfilter, txformat0, txformat1, txoffset, txpitch, us_format = 0;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-+    int w, h;
-     int i, pixel_shift, out_size = 6;
--    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    unsigned int repeatType;
-     struct radeon_exa_pixmap_priv *driver_priv;
-     ACCEL_PREAMBLE();
- 
-     TRACE;
- 
-+    if (pPict->pDrawable) {
-+	w = pPict->pDrawable->width;
-+	h = pPict->pDrawable->height;
-+	repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    } else {
-+	w = h = 1;
-+	repeatType = RepeatNormal;
-+    }
-+
-     txpitch = exaGetPixmapPitch(pPix);
-     txoffset = 0;
- 
-@@ -1394,11 +1387,6 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
-     if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0]))
- 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
- 
--    if (!pSrcPicture->pDrawable)
--	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
--
-     if (IS_R500_3D) {
- 	max_tex_w = 4096;
- 	max_tex_h = 4096;
-@@ -1416,13 +1404,6 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
- 	}
-     }
- 
--    if (pSrcPixmap->drawable.width > max_tex_w ||
--	pSrcPixmap->drawable.height > max_tex_h) {
--	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
--			 pSrcPixmap->drawable.width,
--			 pSrcPixmap->drawable.height));
--    }
--
-     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
- 
-     if (pDstPixmap->drawable.width > max_dst_w ||
-@@ -1432,20 +1413,32 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
- 			 pDstPixmap->drawable.height));
-     }
- 
-+    if (pSrcPicture->pDrawable) {
-+	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
-+
-+	if (pSrcPixmap->drawable.width > max_tex_w ||
-+	    pSrcPixmap->drawable.height > max_tex_h) {
-+	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
-+			     pSrcPixmap->drawable.width,
-+			     pSrcPixmap->drawable.height));
-+	}
-+    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
-+
-     if (pMaskPicture) {
- 	PixmapPtr pMaskPixmap;
- 
--	if (!pMaskPicture->pDrawable)
--	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
-+	if (pMaskPicture->pDrawable) {
-+	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
- 
--	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
--
--	if (pMaskPixmap->drawable.width > max_tex_w ||
--	    pMaskPixmap->drawable.height > max_tex_h) {
--	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
--			     pMaskPixmap->drawable.width,
--			     pMaskPixmap->drawable.height));
--	}
-+	    if (pMaskPixmap->drawable.width > max_tex_w ||
-+		pMaskPixmap->drawable.height > max_tex_h) {
-+	      RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
-+			       pMaskPixmap->drawable.width,
-+			       pMaskPixmap->drawable.height));
-+	    }
-+	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
- 
- 	if (pMaskPicture->componentAlpha) {
- 	    /* Check if it's component alpha that relies on a source alpha and
-@@ -1479,7 +1472,8 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
- 				PicturePtr pMaskPicture, PicturePtr pDstPicture,
- 				PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
- {
--    RINFO_FROM_SCREEN(pDst->drawable.pScreen);
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    RINFO_FROM_SCREEN(pScreen);
-     uint32_t dst_format, dst_pitch;
-     uint32_t txenable, colorpitch;
-     uint32_t blendcntl, output_fmt;
-@@ -1508,9 +1502,24 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
-     if (((dst_pitch >> pixel_shift) & 0x7) != 0)
- 	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));
- 
-+    if (!pSrc) {
-+	pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color));
-+	if (!pSrc)
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+    }
-+
-     if (!RADEONSetupSourceTile(pSrcPicture, pSrc, TRUE, FALSE))
- 	return FALSE;
- 
-+    if (pMaskPicture && !pMask) {
-+	pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
-+	if (!pMask) {
-+	    if (!pSrcPicture->pDrawable)
-+		pScreen->DestroyPixmap(pSrc);
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+	}
-+    }
-+
-     RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture,
- 			     pSrc, pMask, pDst);
- 
-@@ -2132,7 +2141,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
-     return TRUE;
- }
- 
--static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
-+static void FUNC_NAME(RadeonFinishComposite)(PixmapPtr pDst)
- {
-     RINFO_FROM_SCREEN(pDst->drawable.pScreen);
-     ACCEL_PREAMBLE();
-@@ -2179,6 +2188,20 @@ static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
-     LEAVE_DRAW(0);
- }
- 
-+static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
-+{
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    RINFO_FROM_SCREEN(pScreen);
-+    struct radeon_accel_state *accel_state = info->accel_state;
-+
-+    FUNC_NAME(RadeonFinishComposite)(pDst);
-+
-+    if (!accel_state->src_pic->pDrawable)
-+	pScreen->DestroyPixmap(accel_state->src_pix);
-+
-+    if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable)
-+	pScreen->DestroyPixmap(accel_state->msk_pix);
-+}
- 
- #ifdef ACCEL_CP
- 
-@@ -2257,7 +2280,7 @@ static void FUNC_NAME(RadeonCompositeTile)(ScrnInfoPtr pScrn,
-     if ((info->cs && CS_FULL(info->cs)) ||
- 	(!info->cs && (info->cp->indirectBuffer->used + 4 * 32) >
- 	 info->cp->indirectBuffer->total)) {
--	FUNC_NAME(RadeonDoneComposite)(info->accel_state->dst_pix);
-+	FUNC_NAME(RadeonFinishComposite)(info->accel_state->dst_pix);
- 	if (info->cs)
- 	    radeon_cs_flush_indirect(pScrn);
- 	else
-diff --git a/src/radeon_exa_shared.c b/src/radeon_exa_shared.c
-index be1d2fa..28dc335 100644
---- a/src/radeon_exa_shared.c
-+++ b/src/radeon_exa_shared.c
-@@ -126,6 +126,25 @@ Bool RADEONCheckBPP(int bpp)
- 	return FALSE;
- }
- 
-+PixmapPtr RADEONSolidPixmap(ScreenPtr pScreen, uint32_t solid)
-+{
-+    PixmapPtr pPix = pScreen->CreatePixmap(pScreen, 1, 1, 32, 0);
-+    struct radeon_bo *bo;
-+
-+    exaMoveInPixmap(pPix);
-+    bo = radeon_get_pixmap_bo(pPix);
-+
-+    if (radeon_bo_map(bo, 1)) {
-+	pScreen->DestroyPixmap(pPix);
-+	return NULL;
-+    }
-+
-+    memcpy(bo->ptr, &solid, 4);
-+    radeon_bo_unmap(bo);
-+
-+    return pPix;
-+}
-+
- static Bool radeon_vb_get(ScrnInfoPtr pScrn)
- {
-     RADEONInfoPtr info = RADEONPTR(pScrn);
-diff --git a/src/radeon_exa_shared.h b/src/radeon_exa_shared.h
-index 7b8b5ca..60a1045 100644
---- a/src/radeon_exa_shared.h
-+++ b/src/radeon_exa_shared.h
-@@ -40,6 +40,7 @@ extern void RADEONVlineHelperClear(ScrnInfoPtr pScrn);
- extern void RADEONVlineHelperSet(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2);
- extern Bool RADEONValidPM(uint32_t pm, int bpp);
- extern Bool RADEONCheckBPP(int bpp);
-+extern PixmapPtr RADEONSolidPixmap(ScreenPtr pScreen, uint32_t solid);
- 
- #define RADEON_TRACE_FALL 0
- #define RADEON_TRACE_DRAW 0
--- 
-1.7.7.5
-
diff --git a/extra/xf86-video-ati/0001-poor-man-s-solid-picture-support-for-evergreen.patch b/extra/xf86-video-ati/0001-poor-man-s-solid-picture-support-for-evergreen.patch
deleted file mode 100644
index e6b5433e1..000000000
--- a/extra/xf86-video-ati/0001-poor-man-s-solid-picture-support-for-evergreen.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-From 761ef4b340e689490a76ec5ce520c858335e2106 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Sat, 14 Apr 2012 08:53:39 -0400
-Subject: [PATCH] poor man's solid picture support for evergreen
-
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- src/evergreen_exa.c |  163 ++++++++++++++++++++++++++++++---------------------
- 1 files changed, 95 insertions(+), 68 deletions(-)
-
-diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c
-index cee3ec2..61b47a4 100644
---- a/src/evergreen_exa.c
-+++ b/src/evergreen_exa.c
-@@ -748,17 +748,8 @@ static Bool EVERGREENCheckCompositeTexture(PicturePtr pPict,
- 					   int op,
- 					   int unit)
- {
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-     unsigned int i;
--    int max_tex_w, max_tex_h;
--
--    max_tex_w = 16384;
--    max_tex_h = 16384;
--
--    if ((w > max_tex_w) || (h > max_tex_h))
--	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
- 
-     for (i = 0; i < sizeof(EVERGREENTexFormats) / sizeof(EVERGREENTexFormats[0]); i++) {
- 	if (EVERGREENTexFormats[i].fmt == pPict->format)
-@@ -798,9 +789,16 @@ static void EVERGREENXFormSetup(PicturePtr pPict, PixmapPtr pPix,
-     ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
-     RADEONInfoPtr info = RADEONPTR(pScrn);
-     struct radeon_accel_state *accel_state = info->accel_state;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-     int const_offset = unit * 8;
-+    int w, h;
-+
-+    if (pPict->pDrawable) {
-+	w = pPict->pDrawable->width;
-+	h = pPict->pDrawable->height;
-+    } else {
-+	w = 1;
-+	h = 1;
-+    }
- 
-     if (pPict->transform != 0) {
- 	accel_state->is_transform[unit] = TRUE;
-@@ -837,9 +835,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
-     ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
-     RADEONInfoPtr info = RADEONPTR(pScrn);
-     struct radeon_accel_state *accel_state = info->accel_state;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
--    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    unsigned int repeatType;
-     unsigned int i;
-     tex_resource_t  tex_res;
-     tex_sampler_t   tex_samp;
-@@ -854,9 +850,17 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
-     }
- 
-     /* Texture */
-+    if (pPict->pDrawable) {
-+	tex_res.w               = pPict->pDrawable->width;
-+	tex_res.h               = pPict->pDrawable->height;
-+	repeatType              = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    } else {
-+	tex_res.w               = 1;
-+	tex_res.h               = 1;
-+	repeatType              = RepeatNormal;
-+    }
-+
-     tex_res.id                  = unit;
--    tex_res.w                   = w;
--    tex_res.h                   = h;
-     tex_res.pitch               = accel_state->src_obj[unit].pitch;
-     tex_res.depth               = 0;
-     tex_res.dim                 = SQ_TEX_DIM_2D;
-@@ -1054,33 +1058,30 @@ static Bool EVERGREENCheckComposite(int op, PicturePtr pSrcPicture,
- {
-     uint32_t tmp1;
-     PixmapPtr pSrcPixmap, pDstPixmap;
--    int max_tex_w, max_tex_h, max_dst_w, max_dst_h;
- 
-     /* Check for unsupported compositing operations. */
-     if (op >= (int) (sizeof(EVERGREENBlendOp) / sizeof(EVERGREENBlendOp[0])))
- 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
- 
--    if (!pSrcPicture->pDrawable)
--	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
-+    if (pSrcPicture->pDrawable) {
-+	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
- 
--    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
--
--    max_tex_w = 8192;
--    max_tex_h = 8192;
--    max_dst_w = 8192;
--    max_dst_h = 8192;
-+	if (pSrcPixmap->drawable.width >= 16384 ||
-+	    pSrcPixmap->drawable.height >= 16384) {
-+	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
-+			     pSrcPixmap->drawable.width,
-+			     pSrcPixmap->drawable.height));
-+	}
- 
--    if (pSrcPixmap->drawable.width >= max_tex_w ||
--	pSrcPixmap->drawable.height >= max_tex_h) {
--	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
--			 pSrcPixmap->drawable.width,
--			 pSrcPixmap->drawable.height));
--    }
-+	if (!EVERGREENCheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
-+	    return FALSE;
-+    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
- 
-     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
- 
--    if (pDstPixmap->drawable.width >= max_dst_w ||
--	pDstPixmap->drawable.height >= max_dst_h) {
-+    if (pDstPixmap->drawable.width >= 16384 ||
-+	pDstPixmap->drawable.height >= 16384) {
- 	RADEON_FALLBACK(("Dest w/h too large (%d,%d).\n",
- 			 pDstPixmap->drawable.width,
- 			 pDstPixmap->drawable.height));
-@@ -1089,38 +1090,35 @@ static Bool EVERGREENCheckComposite(int op, PicturePtr pSrcPicture,
-     if (pMaskPicture) {
- 	PixmapPtr pMaskPixmap;
- 
--	if (!pMaskPicture->pDrawable)
--	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
-+	if (pMaskPicture->pDrawable) {
-+	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
- 
--	if (pMaskPixmap->drawable.width >= max_tex_w ||
--	    pMaskPixmap->drawable.height >= max_tex_h) {
--	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
--			     pMaskPixmap->drawable.width,
--			     pMaskPixmap->drawable.height));
--	}
-+	    if (pMaskPixmap->drawable.width >= 16384 ||
-+		pMaskPixmap->drawable.height >= 16384) {
-+	      RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
-+			       pMaskPixmap->drawable.width,
-+			       pMaskPixmap->drawable.height));
-+	    }
- 
--	if (pMaskPicture->componentAlpha) {
--	    /* Check if it's component alpha that relies on a source alpha and
--	     * on the source value.  We can only get one of those into the
--	     * single source value that we get to blend with.
--	     */
--	    if (EVERGREENBlendOp[op].src_alpha &&
--		(EVERGREENBlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
--		(BLEND_ZERO << COLOR_SRCBLEND_shift)) {
--		RADEON_FALLBACK(("Component alpha not supported with source "
--				 "alpha and source value blending.\n"));
-+	    if (pMaskPicture->componentAlpha) {
-+		/* Check if it's component alpha that relies on a source alpha and
-+		 * on the source value.  We can only get one of those into the
-+		 * single source value that we get to blend with.
-+		 */
-+		if (EVERGREENBlendOp[op].src_alpha &&
-+		    (EVERGREENBlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
-+		    (BLEND_ZERO << COLOR_SRCBLEND_shift)) {
-+		    RADEON_FALLBACK(("Component alpha not supported with source "
-+				     "alpha and source value blending.\n"));
-+		}
- 	    }
--	}
- 
--	if (!EVERGREENCheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
--	    return FALSE;
-+	    if (!EVERGREENCheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
-+		return FALSE;
-+	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
-     }
- 
--    if (!EVERGREENCheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
--	return FALSE;
--
-     if (!EVERGREENGetDestFormat(pDstPicture, &tmp1))
- 	return FALSE;
- 
-@@ -1132,7 +1130,8 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
- 				      PicturePtr pMaskPicture, PicturePtr pDstPicture,
- 				      PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-     RADEONInfoPtr info = RADEONPTR(pScrn);
-     struct radeon_accel_state *accel_state = info->accel_state;
-     uint32_t dst_format;
-@@ -1142,13 +1141,19 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
-     struct r600_accel_object src_obj, mask_obj, dst_obj;
-     float *cbuf;
- 
--    if (pDst->drawable.bitsPerPixel < 8 || pSrc->drawable.bitsPerPixel < 8)
-+    if (pDst->drawable.bitsPerPixel < 8 || (pSrc && pSrc->drawable.bitsPerPixel < 8))
- 	return FALSE;
- 
-+    if (!pSrc) {
-+	pSrc = RADEONSolidPixmap(pScreen, pSrcPicture->pSourcePict->solidFill.color);
-+	if (!pSrc)
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+    }
-+
-     src_obj.offset = 0;
-     dst_obj.offset = 0;
--    src_obj.bo = radeon_get_pixmap_bo(pSrc);
-     dst_obj.bo = radeon_get_pixmap_bo(pDst);
-+    src_obj.bo = radeon_get_pixmap_bo(pSrc);
-     dst_obj.surface = radeon_get_pixmap_surface(pDst);
-     src_obj.surface = radeon_get_pixmap_surface(pSrc);
-     dst_obj.tiling_flags = radeon_get_pixmap_tiling(pDst);
-@@ -1166,7 +1171,15 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
-     dst_obj.bpp = pDst->drawable.bitsPerPixel;
-     dst_obj.domain = RADEON_GEM_DOMAIN_VRAM;
- 
--    if (pMask) {
-+    if (pMaskPicture) {
-+	if (!pMask) {
-+	    pMask = RADEONSolidPixmap(pScreen, pMaskPicture->pSourcePict->solidFill.color);
-+	    if (!pMask) {
-+		if (!pSrcPicture->pDrawable)
-+		    pScreen->DestroyPixmap(pSrc);
-+		RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+	    }
-+	}
- 	mask_obj.offset = 0;
- 	mask_obj.bo = radeon_get_pixmap_bo(pMask);
- 	mask_obj.tiling_flags = radeon_get_pixmap_tiling(pMask);
-@@ -1363,11 +1376,9 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
-     return TRUE;
- }
- 
--static void EVERGREENDoneComposite(PixmapPtr pDst)
-+static void EVERGREENFinishComposite(ScrnInfoPtr pScrn, PixmapPtr pDst,
-+				     struct radeon_accel_state *accel_state)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
--    RADEONInfoPtr info = RADEONPTR(pScrn);
--    struct radeon_accel_state *accel_state = info->accel_state;
-     int vtx_size;
- 
-     if (accel_state->vsync)
-@@ -1381,6 +1392,22 @@ static void EVERGREENDoneComposite(PixmapPtr pDst)
-     evergreen_finish_op(pScrn, vtx_size);
- }
- 
-+static void EVERGREENDoneComposite(PixmapPtr pDst)
-+{
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    RADEONInfoPtr info = RADEONPTR(pScrn);
-+    struct radeon_accel_state *accel_state = info->accel_state;
-+
-+    EVERGREENFinishComposite(pScrn, pDst, accel_state);
-+
-+    if (!accel_state->src_pic->pDrawable)
-+	pScreen->DestroyPixmap(accel_state->src_pix);
-+
-+    if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable)
-+	pScreen->DestroyPixmap(accel_state->msk_pix);
-+}
-+
- static void EVERGREENComposite(PixmapPtr pDst,
- 			       int srcX, int srcY,
- 			       int maskX, int maskY,
-@@ -1393,7 +1420,7 @@ static void EVERGREENComposite(PixmapPtr pDst,
-     float *vb;
- 
-     if (CS_FULL(info->cs)) {
--	EVERGREENDoneComposite(info->accel_state->dst_pix);
-+	EVERGREENFinishComposite(pScrn, pDst, info->accel_state);
- 	radeon_cs_flush_indirect(pScrn);
- 	EVERGREENPrepareComposite(info->accel_state->composite_op,
- 				  info->accel_state->src_pic,
--- 
-1.7.7.5
-
diff --git a/extra/xf86-video-ati/0002-poor-man-s-solid-picture-support-for-r100.patch b/extra/xf86-video-ati/0002-poor-man-s-solid-picture-support-for-r100.patch
deleted file mode 100644
index 3a2779446..000000000
--- a/extra/xf86-video-ati/0002-poor-man-s-solid-picture-support-for-r100.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From f36b911ecc31f689ddceeeb11d10eb7cb4a3428d Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Fri, 13 Apr 2012 13:24:46 -0400
-Subject: [PATCH 2/3] poor man's solid picture support for r100
-
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- src/radeon_exa_render.c |  101 +++++++++++++++++++++++++++--------------------
- 1 files changed, 58 insertions(+), 43 deletions(-)
-
-diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
-index b6cc9e4..451a625 100644
---- a/src/radeon_exa_render.c
-+++ b/src/radeon_exa_render.c
-@@ -338,17 +338,8 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict,
- 				      int unit)
- {
-     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-     int i;
- 
--    /* r100 limit should be 2048, there are issues with 2048
--     * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
--     */
--
--    if ((w > 2047) || (h > 2047))
--	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
--
-     for (i = 0; i < sizeof(R100TexFormats) / sizeof(R100TexFormats[0]); i++) {
- 	if (R100TexFormats[i].fmt == pPict->format)
- 	    break;
-@@ -357,7 +348,7 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict,
- 	RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
- 			(int)pPict->format));
- 
--    if (!RADEONCheckTexturePOT(pPict, unit == 0))
-+    if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0))
- 	return FALSE;
- 
-     if (pPict->filter != PictFilterNearest &&
-@@ -392,15 +383,24 @@ static Bool FUNC_NAME(R100TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
- {
-     RINFO_FROM_SCREEN(pPix->drawable.pScreen);
-     uint32_t txfilter, txformat, txoffset, txpitch;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
--    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
--    Bool repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
--	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
--    int i;
-+    unsigned int repeatType;
-+    Bool repeat;
-+    int i, w, h;
-     struct radeon_exa_pixmap_priv *driver_priv;
-     ACCEL_PREAMBLE();
- 
-+    if (pPict->pDrawable) {
-+	w = pPict->pDrawable->width;
-+	h = pPict->pDrawable->height;
-+	repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    } else {
-+	w = h = 1;
-+	repeatType = RepeatNormal;
-+    }
-+
-+    repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
-+	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
-+
-     txpitch = exaGetPixmapPitch(pPix);
-     txoffset = 0;
- 
-@@ -510,22 +510,6 @@ static Bool R100CheckComposite(int op, PicturePtr pSrcPicture,
-     if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0]))
- 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
- 
--    if (!pSrcPicture->pDrawable)
--	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--    /* r100 limit should be 2048, there are issues with 2048
--     * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
--     */
--
--    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
--
--    if (pSrcPixmap->drawable.width > 2047 ||
--	pSrcPixmap->drawable.height > 2047) {
--	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
--			 pSrcPixmap->drawable.width,
--			 pSrcPixmap->drawable.height));
--    }
--
-     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
- 
-     if (pDstPixmap->drawable.width > 2047 ||
-@@ -535,20 +519,35 @@ static Bool R100CheckComposite(int op, PicturePtr pSrcPicture,
- 			 pDstPixmap->drawable.height));
-     }
- 
-+    if (pSrcPicture->pDrawable) {
-+	/* r100 limit should be 2048, there are issues with 2048
-+	 * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
-+	 */
-+	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
-+
-+	if (pSrcPixmap->drawable.width > 2047 ||
-+	    pSrcPixmap->drawable.height > 2047) {
-+	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
-+			     pSrcPixmap->drawable.width,
-+			     pSrcPixmap->drawable.height));
-+	}
-+    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
-+
-     if (pMaskPicture) {
- 	PixmapPtr pMaskPixmap;
- 
--	if (!pMaskPicture->pDrawable)
--	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
-+	if (pMaskPicture->pDrawable) {
-+	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
- 
--	if (pMaskPixmap->drawable.width > 2047 ||
--	    pMaskPixmap->drawable.height > 2047) {
--	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
--			     pMaskPixmap->drawable.width,
--			     pMaskPixmap->drawable.height));
--	}
-+	    if (pMaskPixmap->drawable.width > 2047 ||
-+		pMaskPixmap->drawable.height > 2047) {
-+		RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
-+				 pMaskPixmap->drawable.width,
-+				 pMaskPixmap->drawable.height));
-+	    }
-+	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
- 
- 	if (pMaskPicture->componentAlpha) {
- 	    /* Check if it's component alpha that relies on a source alpha and
-@@ -624,7 +623,8 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op,
- 					    PixmapPtr pMask,
- 					    PixmapPtr pDst)
- {
--    RINFO_FROM_SCREEN(pDst->drawable.pScreen);
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    RINFO_FROM_SCREEN(pScreen);
-     uint32_t dst_format, dst_pitch, colorpitch;
-     uint32_t pp_cntl, blendcntl, cblend, ablend;
-     int pixel_shift;
-@@ -648,12 +648,27 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op,
- 
-     CHECK_OFFSET(pDst, 0x0f, "destination");
- 
-+    if (!pSrc) {
-+	pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color));
-+	if (!pSrc)
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+    }
-+
-     if (((dst_pitch >> pixel_shift) & 0x7) != 0)
- 	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));
- 
-     if (!RADEONSetupSourceTile(pSrcPicture, pSrc, FALSE, TRUE))
- 	return FALSE;
- 
-+    if (pMaskPicture && !pMask) {
-+	pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
-+	if (!pMask) {
-+	    if (!pSrcPicture->pDrawable)
-+		pScreen->DestroyPixmap(pSrc);
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+	}
-+    }
-+
-     RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture,
- 			     pSrc, pMask, pDst);
- 
--- 
-1.7.7.5
-
diff --git a/extra/xf86-video-ati/0003-poor-man-s-solid-picture-support-for-r200.patch b/extra/xf86-video-ati/0003-poor-man-s-solid-picture-support-for-r200.patch
deleted file mode 100644
index 0a448fc93..000000000
--- a/extra/xf86-video-ati/0003-poor-man-s-solid-picture-support-for-r200.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From c5c8310858f8018a1754f2457d7b102dc7d62b23 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Fri, 13 Apr 2012 13:28:10 -0400
-Subject: [PATCH 3/3] poor man's solid picture support for r200
-
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- src/radeon_exa_render.c |  101 +++++++++++++++++++++++++++--------------------
- 1 files changed, 58 insertions(+), 43 deletions(-)
-
-diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
-index 451a625..7f1a3ff 100644
---- a/src/radeon_exa_render.c
-+++ b/src/radeon_exa_render.c
-@@ -756,17 +756,8 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict,
- 				      int unit)
- {
-     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-     int i;
- 
--    /* r200 limit should be 2048, there are issues with 2048
--     * see bug 19269
--     */
--
--    if ((w > 2047) || (h > 2047))
--	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
--
-     for (i = 0; i < sizeof(R200TexFormats) / sizeof(R200TexFormats[0]); i++)
-     {
- 	if (R200TexFormats[i].fmt == pPict->format)
-@@ -776,7 +767,7 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict,
- 	RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
- 			 (int)pPict->format));
- 
--    if (!RADEONCheckTexturePOT(pPict, unit == 0))
-+    if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0))
- 	return FALSE;
- 
-     if (pPict->filter != PictFilterNearest &&
-@@ -809,15 +800,24 @@ static Bool FUNC_NAME(R200TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
- {
-     RINFO_FROM_SCREEN(pPix->drawable.pScreen);
-     uint32_t txfilter, txformat, txoffset, txpitch;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
--    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
--    Bool repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
--	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
--    int i;
-+    unsigned int repeatType;
-+    Bool repeat;
-+    int i, w, h;
-     struct radeon_exa_pixmap_priv *driver_priv;
-     ACCEL_PREAMBLE();
- 
-+    if (pPict->pDrawable) {
-+	w = pPict->pDrawable->width;
-+	h = pPict->pDrawable->height;
-+	repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    } else {
-+	w = h = 1;
-+	repeatType = RepeatNormal;
-+    }
-+
-+    repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
-+	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
-+
-     txpitch = exaGetPixmapPitch(pPix);
- 
-     txoffset = 0;
-@@ -926,22 +926,6 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
-     if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0]))
- 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
- 
--    if (!pSrcPicture->pDrawable)
--	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--    /* r200 limit should be 2048, there are issues with 2048
--     * see bug 19269
--     */
--
--    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
--
--    if (pSrcPixmap->drawable.width > 2047 ||
--	pSrcPixmap->drawable.height > 2047) {
--	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
--			 pSrcPixmap->drawable.width,
--			 pSrcPixmap->drawable.height));
--    }
--
-     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
- 
-     if (pDstPixmap->drawable.width > 2047 ||
-@@ -951,20 +935,35 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
- 			 pDstPixmap->drawable.height));
-     }
- 
-+    if (pSrcPicture->pDrawable) {
-+	/* r200 limit should be 2048, there are issues with 2048
-+	 * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
-+	 */
-+	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
-+
-+	if (pSrcPixmap->drawable.width > 2047 ||
-+	    pSrcPixmap->drawable.height > 2047) {
-+	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
-+			     pSrcPixmap->drawable.width,
-+			     pSrcPixmap->drawable.height));
-+	}
-+    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
-+
-     if (pMaskPicture) {
- 	PixmapPtr pMaskPixmap;
- 
--	if (!pMaskPicture->pDrawable)
--	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
-+	if (pMaskPicture->pDrawable) {
-+	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
- 
--	if (pMaskPixmap->drawable.width > 2047 ||
--	    pMaskPixmap->drawable.height > 2047) {
--	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
--			     pMaskPixmap->drawable.width,
--			     pMaskPixmap->drawable.height));
--	}
-+	    if (pMaskPixmap->drawable.width > 2047 ||
-+		pMaskPixmap->drawable.height > 2047) {
-+		RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
-+				 pMaskPixmap->drawable.width,
-+				 pMaskPixmap->drawable.height));
-+	    }
-+	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
- 
- 	if (pMaskPicture->componentAlpha) {
- 	    /* Check if it's component alpha that relies on a source alpha and
-@@ -997,7 +996,8 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture,
- 				PicturePtr pMaskPicture, PicturePtr pDstPicture,
- 				PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
- {
--    RINFO_FROM_SCREEN(pDst->drawable.pScreen);
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    RINFO_FROM_SCREEN(pScreen);
-     uint32_t dst_format, dst_pitch;
-     uint32_t pp_cntl, blendcntl, cblend, ablend, colorpitch;
-     int pixel_shift;
-@@ -1024,9 +1024,24 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture,
-     if (((dst_pitch >> pixel_shift) & 0x7) != 0)
- 	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));
- 
-+    if (!pSrc) {
-+	pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color));
-+	if (!pSrc)
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+    }
-+
-     if (!RADEONSetupSourceTile(pSrcPicture, pSrc, FALSE, TRUE))
- 	return FALSE;
- 
-+    if (pMaskPicture && !pMask) {
-+	pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
-+	if (!pMask) {
-+	    if (!pSrcPicture->pDrawable)
-+		pScreen->DestroyPixmap(pSrc);
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+	}
-+    }
-+
-     RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture,
- 			     pSrc, pMask, pDst);
- 
--- 
-1.7.7.5
-
diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD
index 0376fcc78..e2ec0bdcf 100644
--- a/extra/xf86-video-ati/PKGBUILD
+++ b/extra/xf86-video-ati/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 176906 2013-02-02 07:15:02Z andyrtr $
+# $Id: PKGBUILD 180193 2013-03-18 16:09:02Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-ati
 pkgver=7.1.0
 epoch=1
-pkgrel=1
+pkgrel=3
 pkgdesc="X.org ati video driver"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('libdrm>=2.4.41' 'systemd-tools' 'ati-dri')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+depends=('libdrm>=2.4.41' 'systemd-tools' 'ati-dri' 'glamor-egl')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
@@ -20,7 +20,8 @@ sha256sums=('c8ae44051fcb331625217f98c09a3aa69f493052b69d62c03f41fed0bfe610cd')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr \
+    --enable-glamor
   make
 }
 
diff --git a/extra/xf86-video-ati/git_fixes.diff b/extra/xf86-video-ati/git_fixes.diff
deleted file mode 100644
index 0c4518319..000000000
--- a/extra/xf86-video-ati/git_fixes.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From d282719a9c2fb0ee32830aa75b8dfbb9392954ed Mon Sep 17 00:00:00 2001
-From: Jerome Glisse <jglisse@redhat.com>
-Date: Wed, 04 Apr 2012 21:08:30 +0000
-Subject: r6xx-r9xx: force 1D tiling for buffer with height < 64
-
-Due to some old kernel issue, height is 8 aligned insided the ddx
-For buffer with height btw 57 & 63 this lead ddx to believe it can
-allocate a 2D tiled surface while mesa will not align height and
-will assume 1D tiled leading to disagreement and rendering issue.
-This patch force buffer with height < 64 to be 1D tiled.
-
-Signed-off-by: Jerome Glisse <jglisse@redhat.com>
----
-diff --git a/src/radeon_exa.c b/src/radeon_exa.c
-index 99a5806..270dad4 100644
---- a/src/radeon_exa.c
-+++ b/src/radeon_exa.c
-@@ -511,6 +511,13 @@ void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
- 			surface.last_level = 0;
- 			surface.bpe = cpp;
- 			surface.nsamples = 1;
-+			if (height < 64) {
-+				/* disable 2d tiling for small surface to work around
-+				 * the fact that ddx align height to 8 pixel for old
-+				 * obscure reason i can't remember
-+				 */
-+				tiling &= ~RADEON_TILING_MACRO;
-+			}
- 			surface.flags = RADEON_SURF_SCANOUT;
- 			surface.flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_2D, TYPE);
- 			surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_LINEAR, MODE);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-chips/PKGBUILD b/extra/xf86-video-chips/PKGBUILD
index 28b0a216c..265180ab4 100644
--- a/extra/xf86-video-chips/PKGBUILD
+++ b/extra/xf86-video-chips/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 168568 2012-10-13 11:44:27Z andyrtr $
+# $Id: PKGBUILD 180194 2013-03-18 16:09:03Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-chips
 pkgver=1.2.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Chips and Technologies video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=(glibc)
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h)
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h git-fix.diff)
 sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2'
-            'd04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670')
+            'd04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670'
+            '36165ebc70926ab5a8fe4331c5ce88c7f5f2e6979170b849ac1c2c99b3d1a804')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   cp ${srcdir}/iopl.h util/
+  patch -Np1 -i ${srcdir}/git-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-chips/chips-1.2.4-git.patch b/extra/xf86-video-chips/chips-1.2.4-git.patch
deleted file mode 100644
index 9d8e856a3..000000000
--- a/extra/xf86-video-chips/chips-1.2.4-git.patch
+++ /dev/null
@@ -1,912 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 225e516..c0ed508 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -44,9 +44,6 @@ XORG_DEFAULT_OPTIONS
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
- 
--# Checks for programs.
--AM_PROG_CC_C_O
--
- AH_TOP([#include "xorg-server.h"])
- 
- # Define a configure option for an alternate module directory
-diff --git a/man/chips.man b/man/chips.man
-index 740af38..0c022ee 100644
---- a/man/chips.man
-+++ b/man/chips.man
-@@ -165,9 +165,6 @@ Force the use of memory mapped IO where it can be used. Default: off
- Force driver to leave centering and stretching registers alone. This
- can fix some laptop suspend/resume problems. Default: off
- .TP
--.BI "Option \*qOverlay\*q"
--Enable 8+24 overlay mode.  Only appropriate for depth 24.  Default: off.
--.TP
- .BI "Option \*qColorKey\*q \*q" integer \*q
- Set the colormap index used for the transparency key for the depth 8 plane
- when operating in 8+16 overlay mode.  The value must be in the range
-diff --git a/src/ct_accel.c b/src/ct_accel.c
-index 3920b0a..4b5776a 100644
---- a/src/ct_accel.c
-+++ b/src/ct_accel.c
-@@ -428,19 +428,7 @@ chips_imagewrite:
-         infoPtr->ImageWriteFlags |= NO_PLANEMASK;
- #endif
- 
--
--#ifdef CHIPS_HIQV
--    if (XAAInit(pScreen, infoPtr)) {
--	if (cPtr->Flags & ChipsOverlay8plus16)      
--	    return(XAAInitDualFramebufferOverlay(pScreen,
--						 CTNAME(DepthChange)));
--	else
--	    return TRUE;
--    } else
--	return FALSE;
--#else
-     return(XAAInit(pScreen, infoPtr));
--#endif
- }
- 
- #ifdef CHIPS_HIQV
-@@ -1243,11 +1231,6 @@ CTNAME(SubsequentScreenToScreenColorExpandFill)(ScrnInfoPtr pScrn,
- #endif
-     w *= cAcl->BytesPerPixel;
-     ctBLTWAIT;
--#ifdef CHIPS_HIQV
--    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16) &&
--	    (pScrn->depth == 8))
--	ctSETPITCH(cAcl->PitchInBytes << 1, cAcl->PitchInBytes);
--#endif
-     ctSETSRCADDR(srcaddr);
-     ctSETDSTADDR(destaddr);
- #ifdef CHIPS_HIQV
-@@ -1271,10 +1254,6 @@ CTNAME(SetupForColor8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
-     patternaddr = (paty * pScrn->displayWidth + 
- 		   (patx & ~0x3F)) * cAcl->BytesPerPixel;
-     cAcl->patternyrot = (patx & 0x3F) >> 3;
--#ifdef CHIPS_HIQV
--    if (cPtr->Flags & ChipsOverlay8plus16)
--	patternaddr += cPtr->FbOffset16;
--#endif
- 
-     ctBLTWAIT;
-     ctSETPATSRCADDR(patternaddr);
-@@ -1338,10 +1317,7 @@ CTNAME(SetupForMono8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
- 
- #ifdef CHIPS_HIQV
-     patternaddr = paty * pScrn->displayWidth + patx;
--    if (cPtr->Flags & ChipsOverlay8plus16)
--	patternaddr = patternaddr * 2 + cPtr->FbOffset16;
--    else
--	patternaddr *= cAcl->BytesPerPixel;
-+    patternaddr *= cAcl->BytesPerPixel;
- #else
-     patternaddr = (paty * pScrn->displayWidth + patx) * cAcl->BytesPerPixel;
- #endif
-@@ -1593,10 +1569,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
-     dwords = (((skipleft  + bytesPerLine + 0x7) & ~0x7)) >> 2;
-     destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
-     destpitch = pScrn->displayWidth * (bpp >> 3);
--    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	destaddr += cPtr->FbOffset16;
--    else
--	destaddr += cAcl->FbOffset;
-+    destaddr += cAcl->FbOffset;
- 
-     ctBLTWAIT;
- 
-@@ -1681,10 +1654,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
- 	y++;
- 
- 	destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
--	if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	    destaddr += cPtr->FbOffset16;
--	else
--	    destaddr += cAcl->FbOffset;
-+	destaddr += cAcl->FbOffset;
- 
- 	ctBLTWAIT;
- 	ctSETDSTADDR(destaddr);
-@@ -1717,10 +1687,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
-     dwords = (((bytesPerLine + 0x7) & ~0x7)) >> 2;
-     srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
-     srcpitch = pScrn->displayWidth * (bpp >> 3);
--    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	srcaddr += cPtr->FbOffset16;
--    else
--	srcaddr += cAcl->FbOffset;
-+    srcaddr += cAcl->FbOffset;
- 
-     ctBLTWAIT;
-     ctSETROP( ctDSTSYSTEM | ctLEFT2RIGHT | ctTOP2BOTTOM | 
-@@ -1755,10 +1722,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
- 	dst += dstwidth;
- 	y++;
- 	srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
--	if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	    srcaddr += cPtr->FbOffset16;
--	else
--	    srcaddr += cAcl->FbOffset;
-+	srcaddr += cAcl->FbOffset;
- 	ctBLTWAIT;
- 	ctSETSRCADDR(srcaddr);
- 	ctSETHEIGHTWIDTHGO(h, bytesPerLine);
-diff --git a/src/ct_driver.c b/src/ct_driver.c
-index 6624b79..a2e5c94 100644
---- a/src/ct_driver.c
-+++ b/src/ct_driver.c
-@@ -949,7 +949,7 @@ CHIPSProbe(DriverPtr drv, int flags)
- 		}
- 
- 	    }
--	    xfree(usedChips);
-+	    free(usedChips);
- 	}
-     }
- 
-@@ -981,12 +981,12 @@ CHIPSProbe(DriverPtr drv, int flags)
- 		pScrn->ValidMode     = CHIPSValidMode;
- 		foundScreen = TRUE;
- 	    }
--	    xfree(usedChips);
-+	    free(usedChips);
- 	}
-     }
- #endif
-     
--    xfree(devSections);
-+    free(devSections);
-     return foundScreen;
- }
- #endif
-@@ -1446,7 +1446,12 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
- 
-     hwp = VGAHWPTR(pScrn);
-     vgaHWGetIOBase(hwp);
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     cPtr->PIOBase = hwp->PIOOffset;
-+#else
-+    cPtr->PIOBase = 0;
-+#endif
-+
-     /*
-      * Must allow ensure that storage for the 2nd set of vga registers is
-      * allocated for dual channel cards
-@@ -1639,55 +1644,15 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
- 	}
-     }
-     
--    if ((s = xf86GetOptValString(cPtr->Options, OPTION_OVERLAY))) {
--	if (!*s || !xf86NameCmp(s, "8,16") || !xf86NameCmp(s, "16,8")) {
--	  if (pScrn->bitsPerPixel == 16) {
--	    if (cPtr->Flags & ChipsLinearSupport) {
--		cPtr->Flags |= ChipsOverlay8plus16;
--		if(!xf86GetOptValInteger(
--			cPtr->Options, OPTION_COLOR_KEY, &(pScrn->colorKey)))
--		    pScrn->colorKey = TRANSPARENCY_KEY;
--		pScrn->overlayFlags = OVERLAY_8_16_DUALFB;
--		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, 
--			   "PseudoColor overlay enabled.\n");
--		if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_STRETCH))
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--			   "                             - Forcing option \"Stretch\" \"ON\".\n");
--		if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_CENTER))
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--			   "                             - Forcing option \"LcdCenter\" \"OFF\".\n");
--		if (cPtr->Flags & ChipsShadowFB) {
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
--		           "                             - Disabling \"Shadow Framebuffer\".\n");
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--			   "                               Not support with option \"8Plus16\".\n");
--		    cPtr->Flags &= ~ChipsShadowFB;
--		    cPtr->Rotate = 0;
--		}
--	    } else {
--		xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Option \"Overlay\" ignored. Not supported without linear addressing\n");
--	    }
--	  } else {
--	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--		"Option \"Overlay\" is not supported in this configuration\n");
--	  }
--	} else {
--	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--		"\"%s\" is not a valid value for Option \"Overlay\"\n", s); 
--	}
--    }
--
--    if (!(cPtr->Flags & ChipsOverlay8plus16)) {
--	if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
--		&(cPtr->videoKey))) {
--	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
-+    if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
-+	&(cPtr->videoKey))) {
-+         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
- 		cPtr->videoKey);
--	} else {
--	    cPtr->videoKey =  (1 << pScrn->offset.red) | 
-+    } else {
-+       cPtr->videoKey =  (1 << pScrn->offset.red) | 
- 			(1 << pScrn->offset.green) |
- 			(((pScrn->mask.blue >> pScrn->offset.blue) - 1)
- 			<< pScrn->offset.blue); 
--	}
-     }
- 
-     if (cPtr->Flags & ChipsShadowFB) {
-@@ -2335,28 +2300,16 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
-     /* and 32bits on the others. Thus multiply by a suitable factor      */  
-     if (cPtr->Flags & Chips64BitMemory) {
- 	if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
--	    if (cPtr->Flags & ChipsOverlay8plus16 )
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 4);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock,
- 			     MemClk->Clk * 8 * 0.7 / (bytesPerPixel + 1));
- 	else
--	    if (cPtr->Flags & ChipsOverlay8plus16)
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 3);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock, 
- 			     MemClk->Clk * 8 * 0.7 / bytesPerPixel);
-     } else {
- 	if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
--	    if (cPtr->Flags & ChipsOverlay8plus16 )
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 4);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock,
- 			     MemClk->Clk * 4 * 0.7 / (bytesPerPixel + 1));
- 	else
--	    if (cPtr->Flags & ChipsOverlay8plus16)
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 3);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock, 
- 			     MemClk->Clk * 4 * 0.7 / bytesPerPixel);
-     }
-@@ -3736,8 +3689,7 @@ CHIPSEnterVT(int scrnIndex, int flags)
-     /* Should we re-save the text mode on each VT enter? */
-     if(!chipsModeInit(pScrn, pScrn->currentMode))
-       return FALSE;
--    if ((!(cPtr->Flags & ChipsOverlay8plus16)) 
--	&& (cPtr->Flags & ChipsVideoSupport)
-+    if ((cPtr->Flags & ChipsVideoSupport)
- 	&& (cPtr->Flags & ChipsLinearSupport)) 
-         CHIPSResetVideo(pScrn); 
- 
-@@ -3788,8 +3740,7 @@ chipsLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
-     int i, index, shift ;
-     CHIPSEntPtr cPtrEnt;    
- 
--    shift = ((pScrn->depth == 15) && 
--	     (!(cPtr->Flags & ChipsOverlay8plus16))) ? 3 : 0;
-+    shift = (pScrn->depth == 15) ? 3 : 0;
- 
-     if (cPtr->UseDualChannel) {
-         cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0],
-@@ -3895,18 +3846,6 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices,
-     hwp->disablePalette(hwp);
- }
- 
--static Bool
--cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
--                  int xsize, int ysize, int dpix, int dpiy,
--                  int width16, int width8)
--{
--    return
--        (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize,
--                              dpix, dpiy, width16, width8, 16, 8) &&
--         fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize,
--                                   dpix, dpiy, width16, width8, 16, 8, 16, 8));
--}
--
- /* Mandatory */
- static Bool
- CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-@@ -3947,22 +3886,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     if (!chipsMapMem(pScrn))
- 	return FALSE;
- 
--    /* Setup a pointer to the overlay if needed */
--    if (cPtr->Flags & ChipsOverlay8plus16) {
--	cPtr->FbOffset16 = pScrn->displayWidth * pScrn->virtualY;
--	cPtr->FbSize16 =  (pScrn->displayWidth << 1) * pScrn->virtualY;
--	if (cPtr->FbSize16 > (cPtr->FbMapSize - cPtr->FrameBufferSize)) {
--	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
--		   "Too little memory for overlay. Disabling.\n");
--	    cPtr->Flags &= ~ChipsOverlay8plus16;
--	}
--	if ((pScrn->displayWidth > 1024) || (pScrn->virtualY > 1024)) {
--	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
--		   "Max overlay Width/Height 1024 pixels. Disabling.\n");
--	    cPtr->Flags &= ~ChipsOverlay8plus16;
--	}
--    }
--
-     /* Setup the MMIO register access functions if need */
-     if (cPtr->UseFullMMIO && cPtr->MMIOBaseVGA) {
- 	CHIPSSetMmioExtFuncs(cPtr);
-@@ -4035,18 +3958,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     miClearVisualTypes();
- 
-     /* Setup the visuals we support. */
--    if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)){
--	if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask,
--			      pScrn->rgbBits, PseudoColor))
--		return FALSE;
--	if (!miSetVisualTypes(16, TrueColorMask, pScrn->rgbBits, TrueColor))
--		return FALSE;
--    } else {
--      if (!miSetVisualTypes(pScrn->depth,
-+    if (!miSetVisualTypes(pScrn->depth,
- 			    miGetDefaultVisualMask(pScrn->depth),
- 			    pScrn->rgbBits, pScrn->defaultVisual))
--	return FALSE;
--    }
-+        return FALSE;
-     miSetPixmapDepths ();
- 
-     /*
-@@ -4090,13 +4005,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	break;
- #endif
-     case 16:
--      if (cPtr->Flags & ChipsOverlay8plus16) {
--	  ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart + 
--				  cPtr->FbOffset16, FBStart, width, 
--				  height, pScrn->xDpi, pScrn->yDpi,
--				  displayWidth, displayWidth);
--	  break;
--      }
-     default:
- 	ret = fbScreenInit(pScreen, FBStart,
-  		        width,height,
-@@ -4223,7 +4131,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	}
- 	if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY,
- 				 pScrn->displayWidth, pBankInfo)) {
--	    xfree(pBankInfo);
-+	    free(pBankInfo);
- 	    pBankInfo = NULL;
- 	    return FALSE;
- 	}
-@@ -4244,9 +4152,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	if (pScrn->bitsPerPixel < 8)
- 	    freespace = allocatebase - pScrn->displayWidth * 
- 		    pScrn->virtualY / 2;
--	else if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16))
--	    freespace = allocatebase - pScrn->displayWidth * 
--		    pScrn->virtualY - cPtr->FbSize16;
- 	else	
- 	    freespace = allocatebase - pScrn->displayWidth * 
- 		    pScrn->virtualY * (pScrn->bitsPerPixel >> 3);
-@@ -4369,9 +4274,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	    AvailFBArea.y2 = cAcl->CacheEnd /
- 		(pScrn->displayWidth * (pScrn->bitsPerPixel >> 3));
- 
--	    if (!(cPtr->Flags & ChipsOverlay8plus16)) {     
--		xf86InitFBManager(pScreen, &AvailFBArea); 
--	    }
-+	    xf86InitFBManager(pScreen, &AvailFBArea); 
- 	}
- 	if (cPtr->Flags & ChipsAccelSupport) {
- 	    if (IS_HiQV(cPtr)) {
-@@ -4425,16 +4328,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     if (!miCreateDefColormap(pScreen))
- 	return FALSE;
-     
--    if ((cPtr->Flags & ChipsOverlay8plus16) && (pScrn->bitsPerPixel == 16)) {
--	if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, chipsLoadPalette,
--		NULL, CMAP_RELOAD_ON_MODE_SWITCH))
--	    return FALSE;
--    } else {
--	if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
-+    if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
- 		(pScrn->depth == 16 ? chipsLoadPalette16 : chipsLoadPalette),
- 		NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR))
--	    return FALSE;
--    }
-+	return FALSE;
-     
- #ifndef XSERVER_LIBPCIACCESS
-     racflag = RAC_COLORMAP;
-@@ -4448,8 +4345,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	xf86SetSilkenMouse(pScreen);
- #endif
- 
--	if ((!(cPtr->Flags & ChipsOverlay8plus16)) 
--	    && (cPtr->Flags & ChipsVideoSupport)
-+	if ((cPtr->Flags & ChipsVideoSupport)
- 	    && (cPtr->Flags & ChipsLinearSupport)) {
- 	    CHIPSInitVideo(pScreen);
-     }
-@@ -4522,10 +4418,7 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
- 	Base >>= 3;
- 	break;
-     case 16:
--	if (!(cPtr->Flags & ChipsOverlay8plus16))
--	   Base >>= 1;
--	else
--	   Base >>= 2;
-+	Base >>= 1;
- 	break;
-     case 24:
- 	if (!IS_HiQV(cPtr))
-@@ -4581,14 +4474,6 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
- 	cPtr->writeMSS(cPtr, hwp, MSS);
-     }
- 
--    if (cPtr->Flags & ChipsOverlay8plus16) {
--	Base = (Base << 3) & ~(unsigned long)0xF;
--
--	cPtr->writeMR(cPtr, 0x22, (cPtr->FbOffset16 + Base) & 0xF8);
--	cPtr->writeMR(cPtr, 0x23, ((cPtr->FbOffset16 + Base) >> 8) & 0xFF);
--	cPtr->writeMR(cPtr, 0x24, ((cPtr->FbOffset16 + Base) >> 16) & 0xFF);
--    }
--
- }
- 
- /* Mandatory */
-@@ -4652,13 +4537,6 @@ CHIPSValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-     CHIPSPtr cPtr = CHIPSPTR(pScrn);
- 
--    if (flags & MODECHECK_FINAL) {
--    /* Don't subtract FrambufferSize here as it should be subtracted already */
--    if ((cPtr->Flags & ChipsOverlay8plus16) 
--      && ((pScrn->videoRam<<10) - pScrn->displayWidth * 3 * pScrn->virtualY 
--	  < 0))
--	return MODE_MEM;
--    }
-     /* The tests here need to be expanded */
-     if ((mode->Flags & V_INTERLACE) && (cPtr->PanelType & ChipsLCD))
- 	return MODE_NO_INTERLACE;
-@@ -5544,12 +5422,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     } else {
- 	ChipsStd->Attribute[0x10] = 0x01;   /* mode */
-     }
--    if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) {
--	/* Make sure that the overlay isn't visible in the overscan region */
--	if (ChipsStd->Attribute[0x11] == pScrn->colorKey)
--	    ChipsStd->Attribute[0x11] = pScrn->colorKey - 1;
--    } else
--	ChipsStd->Attribute[0x11] = 0x00;   /* overscan (border) color */
-+    ChipsStd->Attribute[0x11] = 0x00;   /* overscan (border) color */
-     ChipsStd->Attribute[0x12] = 0x0F;   /* enable all color planes */
-     ChipsStd->Attribute[0x13] = 0x00;   /* horiz pixel panning 0 */
- 
-@@ -5558,8 +5431,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     /* set virtual screen width */
-     tmp = pScrn->displayWidth >> 3;
-     if (pScrn->bitsPerPixel == 16) {
--	if (!(cPtr->Flags & ChipsOverlay8plus16))
--	    tmp <<= 1;		       /* double the width of the buffer */
-+	tmp <<= 1;		       /* double the width of the buffer */
-     } else if (pScrn->bitsPerPixel == 24) {
- 	tmp += tmp << 1;
-     } else if (pScrn->bitsPerPixel == 32) {
-@@ -5688,8 +5560,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 
-     /* centering/stretching */
-     if (!xf86ReturnOptValBool(cPtr->Options, OPTION_SUSPEND_HACK, FALSE)) {
--	if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE) ||
--	(cPtr->Flags & ChipsOverlay8plus16)) {
-+	if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE)) {
- 	    ChipsNew->FR[0x40] &= 0xDF;    /* Disable Horizontal stretching */
- 	    ChipsNew->FR[0x48] &= 0xFB;    /* Disable vertical stretching */
- 	    ChipsNew->XR[0xA0] = 0x10;     /* Disable cursor stretching */
-@@ -5709,8 +5580,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	}
-     }
- 
--    if ((xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE))
--		|| (cPtr->Flags & ChipsOverlay8plus16)) {
-+    if (xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) {
- 	ChipsNew->FR[0x40] |= 0x3;    /* Enable Horizontal centering */
- 	ChipsNew->FR[0x48] |= 0x3;    /* Enable Vertical centering */
-     } else {
-@@ -5723,8 +5593,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	ChipsNew->XR[0x82] |=0x02;
- 
-     /* software mode flag */
--    ChipsNew->XR[0xE2] = chipsVideoMode(((cPtr->Flags & ChipsOverlay8plus16) ?
--	8 : pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
-+    ChipsNew->XR[0xE2] = chipsVideoMode((pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
- 	min(mode->CrtcHDisplay, cPtr->PanelSize.HDisplay) :
- 	mode->CrtcHDisplay, mode->CrtcVDisplay);
- #ifdef DEBUG
-@@ -5762,7 +5631,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     	}
-     }	    
-     /* bpp depend */
--    if ((pScrn->bitsPerPixel == 16) && (!(cPtr->Flags & ChipsOverlay8plus16))) {
-+    if (pScrn->bitsPerPixel == 16) {
- 	ChipsNew->XR[0x81] = (ChipsNew->XR[0x81] & 0xF0) | 0x4;
- 	if (cPtr->Flags & ChipsGammaSupport)
- 	    ChipsNew->XR[0x82] |= 0x0C;
-@@ -5915,60 +5784,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     /* Turn off multimedia by default as it degrades performance */
-     ChipsNew->XR[0xD0] &= 0x0f;	 
-     
--    /* Setup the video/overlay */
--    if (cPtr->Flags & ChipsOverlay8plus16) {
--	ChipsNew->XR[0xD0] |= 0x10;	/* Force the Multimedia engine on */
--#ifdef SAR04
--	ChipsNew->XR[0x4F] = 0x2A;	/* SAR04 >352 pixel overlay width */
--#endif
--	ChipsNew->MR[0x1E] &= 0xE0;	/* Set Zoom and Direction */
--	if ((!(cPtr->PanelType & ChipsLCD)) && (mode->Flags & V_INTERLACE))
--	    ChipsNew->MR[0x1E] |= 0x10;	/* Interlace */
--	ChipsNew->MR[0x1F] &= 0x14;	/* Mask reserved bits */
--	ChipsNew->MR[0x1F] |= 0x08;	/* RGB 16bpp */
--	if (pScrn->weight.green == 5)
--	    ChipsNew->MR[0x1F] |= 0x01;	/* RGB 15bpp */
--
--	ChipsNew->MR[0x20] &= 0x03;	/* Mask reserved bits */
--	ChipsNew->MR[0x20] |= 0x80;	/* Auto Centre, Use mem ptr1 */
--	ChipsNew->MR[0x22] = cPtr->FbOffset16 & 0xF8;	/* Setup Pointer 1 */
--	ChipsNew->MR[0x23] = (cPtr->FbOffset16 >> 8) & 0xFF;
--	ChipsNew->MR[0x24] = (cPtr->FbOffset16 >> 16) & 0xFF;
--	ChipsNew->MR[0x25] = cPtr->FbOffset16 & 0xF8;	/* Setup Pointer 2 */
--	ChipsNew->MR[0x26] = (cPtr->FbOffset16 >> 8) & 0xFF;
--	ChipsNew->MR[0x27] = (cPtr->FbOffset16 >> 16) & 0xFF;
--	ChipsNew->MR[0x28] = (pScrn->displayWidth >> 2) - 1; /* Width */ 
--	ChipsNew->MR[0x34] = (pScrn->displayWidth >> 2) - 1;
--
--	/* Left Edge of Overlay */
--	ChipsNew->MR[0x2A] = cPtr->OverlaySkewX;
--	ChipsNew->MR[0x2B] &= 0xF8;	/* Mask reserved bits */
--	ChipsNew->MR[0x2B] |= ((cPtr->OverlaySkewX >> 8) & 0x7);
--	/* Right Edge of Overlay */
--	ChipsNew->MR[0x2C] = (cPtr->OverlaySkewX + pScrn->displayWidth - 
--							1) & 0xFF;
--	ChipsNew->MR[0x2D] &= 0xF8;	/* Mask reserved bits */
--	ChipsNew->MR[0x2D] |= ((cPtr->OverlaySkewX + pScrn->displayWidth -
--							1) >> 8) & 0x07;
--	/* Top Edge of Overlay */
--	ChipsNew->MR[0x2E] = cPtr->OverlaySkewY;
--	ChipsNew->MR[0x2F] &= 0xF8;
--	ChipsNew->MR[0x2F] |= ((cPtr->OverlaySkewY >> 8) & 0x7);
--	/* Bottom Edge of Overlay*/
--	ChipsNew->MR[0x30] = (cPtr->OverlaySkewY + pScrn->virtualY - 1 )& 0xFF;
--	ChipsNew->MR[0x31] &= 0xF8;	/* Mask reserved bits */
--	ChipsNew->MR[0x31] |= ((cPtr->OverlaySkewY + pScrn->virtualY - 
--							1 ) >> 8) & 0x07;
--
--	ChipsNew->MR[0x3C] &= 0x18;	/* Mask reserved bits */
--	ChipsNew->MR[0x3C] |= 0x07;	/* Enable keyed overlay window */
--	ChipsNew->MR[0x3D] = 0x00;
--	ChipsNew->MR[0x3E] = 0x00;
--	ChipsNew->MR[0x3F] = pScrn->colorKey; /* 8bpp transparency key */
--	ChipsNew->MR[0x40] = 0xFF;
--	ChipsNew->MR[0x41] = 0xFF;
--	ChipsNew->MR[0x42] = 0x00;
--    } else if (cPtr->Flags & ChipsVideoSupport) {
-+    if (cPtr->Flags & ChipsVideoSupport) {
- #if 0   /* if we do this even though video isn't playing we kill performance */
- 	ChipsNew->XR[0xD0] |= 0x10;	/* Force the Multimedia engine on */
- #endif
-@@ -6877,8 +6693,7 @@ chipsRestoreExtendedRegs(ScrnInfoPtr pScrn, CHIPSRegPtr Regs)
- 	}
- 
- 	/* Set SAR04 multimedia register correctly */
--	if ((cPtr->Flags & ChipsOverlay8plus16)
--	    || (cPtr->Flags & ChipsVideoSupport)) {
-+	if ((cPtr->Flags & ChipsVideoSupport)) {
- #ifdef SAR04
- 	    cPtr->writeXR(cPtr, 0x4E, 0x04);
- 	    if (cPtr->readXR(cPtr, 0x4F) != Regs->XR[0x4F])
-diff --git a/src/ct_driver.h b/src/ct_driver.h
-index d8ce228..9033867 100644
---- a/src/ct_driver.h
-+++ b/src/ct_driver.h
-@@ -114,7 +114,6 @@ typedef struct {
- /* Options flags for the C&T chipsets */
- #define ChipsHWCursor		0x00001000
- #define ChipsShadowFB		0x00002000
--#define ChipsOverlay8plus16	0x00004000
- #define ChipsUseNewFB		0x00008000
- 
- /* Architecture type flags */
-@@ -272,11 +271,13 @@ typedef struct {
- 
- typedef struct _CHIPSRec {
-     pciVideoPtr		PciInfo;
-+#ifndef XSERVER_LIBPCIACCESS
-     PCITAG		PciTag;
-+#endif
-     int			Chipset;
-     EntityInfoPtr       pEnt;
--    IOADDRESS		PIOBase;
--    CARD32		IOAddress;
-+    unsigned long	PIOBase;
-+    unsigned long	IOAddress;
-     unsigned long	FbAddress;
-     unsigned int	IOBase;
-     unsigned char *	FbBase;
-diff --git a/src/ct_video.c b/src/ct_video.c
-index a68acb9..c9e5bb4 100644
---- a/src/ct_video.c
-+++ b/src/ct_video.c
-@@ -56,8 +56,7 @@ CHIPSInitVideo(ScreenPtr pScreen)
-     CHIPSPtr cPtr = CHIPSPTR(pScrn);
-     int num_adaptors;
- 	
--    if (!(cPtr->Flags & ChipsOverlay8plus16) &&
--       (cPtr->Flags & ChipsVideoSupport)) {
-+    if ((cPtr->Flags & ChipsVideoSupport)) {
- 	newAdaptor = CHIPSSetupImageVideo(pScreen);
- 	CHIPSInitOffscreenImages(pScreen);
-     }
-diff --git a/util/dRegs.c b/util/dRegs.c
-index b7edc8f..0d2f0cb 100644
---- a/util/dRegs.c
-+++ b/util/dRegs.c
-@@ -1,63 +1,8 @@
--
--
--
--
--
--
--#ifdef __NetBSD__
--#  include <sys/types.h>
--#  include <machine/pio.h>
--#  include <machine/sysarch.h>
--#else
--#  if defined(SVR4) && defined(i386)
--#    include <sys/types.h>
--#    ifdef NCR
--       /* broken NCR <sys/sysi86.h> */
--#      define __STDC
--#      include <sys/sysi86.h>
--#      undef __STDC
--#    else
--#      include <sys/sysi86.h>
--#    endif
--#    ifdef SVR4
--#      if !defined(sun)
--#        include <sys/seg.h>
--#      endif
--#    endif
--#    include <sys/v86.h>
--#    if defined(sun)
--#      include <sys/psw.h>
--#    endif
--#  endif
--#  include "AsmMacros.h"
--#endif /* NetBSD */
--
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
- 
--#ifdef __NetBSD__
--#  define SET_IOPL() i386_iopl(3)
--#  define RESET_IOPL() i386_iopl(0)
--#else
--#  if defined(SVR4) && defined(i386)
--#    ifndef SI86IOPL
--#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
--#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
--#    else
--#      define SET_IOPL() sysi86(SI86IOPL,3)
--#      define RESET_IOPL() sysi86(SI86IOPL,0)
--#    endif
--#  else
--#    ifdef linux
--#      define SET_IOPL() iopl(3)
--#      define RESET_IOPL() iopl(0)
--#    else
--#      define SET_IOPL() (void)0
--#      define RESET_IOPL() (void)0
--#    endif
--#  endif
--#endif
-+#include "iopl.h"
- 
- int main(void)
- {
-diff --git a/util/iopl.h b/util/iopl.h
-new file mode 100644
-index 0000000..e08207c
---- /dev/null
-+++ b/util/iopl.h
-@@ -0,0 +1,60 @@
-+#ifdef __NetBSD__
-+#  include <sys/types.h>
-+#  include <machine/pio.h>
-+#  include <machine/sysarch.h>
-+#else
-+#  if defined(__linux__)
-+/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
-+ * #    include <sys/io.h>
-+ */
-+int iopl(int level);
-+#  endif
-+#  if defined(SVR4) && defined(i386)
-+#    include <sys/types.h>
-+#    ifdef NCR
-+       /* broken NCR <sys/sysi86.h> */
-+#      define __STDC
-+#      include <sys/sysi86.h>
-+#      undef __STDC
-+#    else
-+#      include <sys/sysi86.h>
-+#    endif
-+#    ifdef SVR4
-+#      if !defined(sun)
-+#        include <sys/seg.h>
-+#      endif
-+#    endif
-+#    include <sys/v86.h>
-+#    if defined(sun)
-+#      include <sys/psw.h>
-+#    endif
-+#  endif
-+#  include "AsmMacros.h"
-+#endif /* NetBSD */
-+
-+#include <unistd.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#ifdef __NetBSD__
-+#  define SET_IOPL() i386_iopl(3)
-+#  define RESET_IOPL() i386_iopl(0)
-+#else
-+#  if defined(SVR4) && defined(i386)
-+#    ifndef SI86IOPL
-+#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
-+#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
-+#    else
-+#      define SET_IOPL() sysi86(SI86IOPL,3)
-+#      define RESET_IOPL() sysi86(SI86IOPL,0)
-+#    endif
-+#  else
-+#    ifdef linux
-+#      define SET_IOPL() iopl(3)
-+#      define RESET_IOPL() iopl(0)
-+#    else
-+#      define SET_IOPL() (void)0
-+#      define RESET_IOPL() (void)0
-+#    endif
-+#  endif
-+#endif
-diff --git a/util/mRegs.c b/util/mRegs.c
-index f359738..843d01d 100644
---- a/util/mRegs.c
-+++ b/util/mRegs.c
-@@ -1,63 +1,8 @@
--
--
--
--
--
--
--#ifdef __NetBSD__
--#  include <sys/types.h>
--#  include <machine/pio.h>
--#  include <machine/sysarch.h>
--#else
--#  if defined(SVR4) && defined(i386)
--#    include <sys/types.h>
--#    ifdef NCR
--       /* broken NCR <sys/sysi86.h> */
--#      define __STDC
--#      include <sys/sysi86.h>
--#      undef __STDC
--#    else
--#      include <sys/sysi86.h>
--#    endif
--#    ifdef SVR4
--#      if !defined(sun)
--#        include <sys/seg.h>
--#      endif
--#    endif
--#    include <sys/v86.h>
--#    if defined(sun)
--#      include <sys/psw.h>
--#    endif
--#  endif
--#  include "AsmMacros.h"
--#endif /* NetBSD */
--
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
- 
--#ifdef __NetBSD__
--#  define SET_IOPL() i386_iopl(3)
--#  define RESET_IOPL() i386_iopl(0)
--#else
--#  if defined(SVR4) && defined(i386)
--#    ifndef SI86IOPL
--#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
--#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
--#    else
--#      define SET_IOPL() sysi86(SI86IOPL,3)
--#      define RESET_IOPL() sysi86(SI86IOPL,0)
--#    endif
--#  else
--#    ifdef linux
--#      define SET_IOPL() iopl(3)
--#      define RESET_IOPL() iopl(0)
--#    else
--#      define SET_IOPL() (void)0
--#      define RESET_IOPL() (void)0
--#    endif
--#  endif
--#endif
-+#include "iopl.h"
- 
- int hex2int(char* str);
- 
-diff --git a/util/modClock.c b/util/modClock.c
-index 89a291a..45af19b 100644
---- a/util/modClock.c
-+++ b/util/modClock.c
-@@ -1,61 +1,12 @@
--
--#ifdef __NetBSD__
--#  include <sys/types.h>
--#  include <machine/pio.h>
--#  include <machine/sysarch.h>
--#else
--#  if defined(SVR4) && defined(i386)
--#    include <sys/types.h>
--#    ifdef NCR
--       /* broken NCR <sys/sysi86.h> */
--#      define __STDC
--#      include <sys/sysi86.h>
--#      undef __STDC
--#    else
--#      include <sys/sysi86.h>
--#    endif
--#    ifdef SVR4
--#      if !defined(sun)
--#        include <sys/seg.h>
--#      endif
--#    endif
--#    include <sys/v86.h>
--#    if defined(sun)
--#      include <sys/psw.h>
--#    endif
--#  endif
--#  include "AsmMacros.h"
--#endif /* NetBSD */
--
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
-+
- #ifndef Lynx
- #include <fnmatch.h>
- #endif
- 
--#ifdef __NetBSD__
--#  define SET_IOPL() i386_iopl(3)
--#  define RESET_IOPL() i386_iopl(0)
--#else
--#  if defined(SVR4) && defined(i386)
--#    ifndef SI86IOPL
--#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
--#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
--#    else
--#      define SET_IOPL() sysi86(SI86IOPL,3)
--#      define RESET_IOPL() sysi86(SI86IOPL,0)
--#    endif
--#  else
--#    ifdef linux
--#      define SET_IOPL() iopl(3)
--#      define RESET_IOPL() iopl(0)
--#    else
--#      define SET_IOPL() (void)0
--#      define RESET_IOPL() (void)0
--#    endif
--#  endif
--#endif
-+#include "iopl.h"
- 
- #define tolerance 0.01 /* +/- 1% */
- 
diff --git a/extra/xf86-video-chips/git-fix.diff b/extra/xf86-video-chips/git-fix.diff
new file mode 100644
index 000000000..bfd94181e
--- /dev/null
+++ b/extra/xf86-video-chips/git-fix.diff
@@ -0,0 +1,39 @@
+From 151a1ec855a9ada44907cb6bef06a71e9080504b Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:34 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/ct_driver.c b/src/ct_driver.c
+index 6f3a5d4..effbc60 100644
+--- a/src/ct_driver.c
++++ b/src/ct_driver.c
+@@ -96,9 +96,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi banking wrapper need this */
+ #ifdef HAVE_ISA
+ #include "mibank.h"
+@@ -4145,7 +4142,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	    pBankInfo = NULL;
+ 	    return FALSE;
+ 	}
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ 
+ 	/* Initialise cursor functions */
+@@ -4296,7 +4292,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	    }
+ 	}
+ 	
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ #ifdef ENABLE_SILKEN_MOUSE
+ 	xf86SetSilkenMouse(pScreen);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-cirrus/PKGBUILD b/extra/xf86-video-cirrus/PKGBUILD
index 7f838e741..b1b470008 100644
--- a/extra/xf86-video-cirrus/PKGBUILD
+++ b/extra/xf86-video-cirrus/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 174961 2013-01-09 16:02:11Z andyrtr $
+# $Id: PKGBUILD 180195 2013-03-18 16:09:03Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-cirrus
 pkgver=1.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org Cirrus Logic video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/xf86-video-dummy/PKGBUILD b/extra/xf86-video-dummy/PKGBUILD
index b3abef50d..02547ed73 100644
--- a/extra/xf86-video-dummy/PKGBUILD
+++ b/extra/xf86-video-dummy/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 168570 2012-10-13 11:44:35Z andyrtr $
+# $Id: PKGBUILD 180196 2013-03-18 16:09:04Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-dummy
 pkgver=0.3.6
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org dummy video driver"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798'
+            '06fe79ba658712a1abb0612a049c1061618d30e72d4939fc59c8c905d9d4d5bb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-dummy/git-fix.diff b/extra/xf86-video-dummy/git-fix.diff
new file mode 100644
index 000000000..4b0b46ef3
--- /dev/null
+++ b/extra/xf86-video-dummy/git-fix.diff
@@ -0,0 +1,31 @@
+From 44f04fd3046043ed31369025f34353c4e0e5c1cd Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:36 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/dummy_driver.c b/src/dummy_driver.c
+index 62066d6..6062c39 100644
+--- a/src/dummy_driver.c
++++ b/src/dummy_driver.c
+@@ -14,9 +14,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi colormap manipulation need this */
+ #include "micmap.h"
+ 
+@@ -617,7 +614,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
+ 		   , lines - pScrn->virtualY);
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 	
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-fbdev/PKGBUILD b/extra/xf86-video-fbdev/PKGBUILD
index 5ad47a246..03748cbfd 100644
--- a/extra/xf86-video-fbdev/PKGBUILD
+++ b/extra/xf86-video-fbdev/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 168571 2012-10-13 11:44:39Z andyrtr $
+# $Id: PKGBUILD 180197 2013-03-18 16:09:06Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-fbdev
 pkgver=0.4.3
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org framebuffer video driver"
 arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831'
+            '4eb30cc4db5d1789429861d2d8f15238b21204d4311763ab7a1f4f32ff2b0321')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-fbdev/git-fix.diff b/extra/xf86-video-fbdev/git-fix.diff
new file mode 100644
index 000000000..138d5bc2a
--- /dev/null
+++ b/extra/xf86-video-fbdev/git-fix.diff
@@ -0,0 +1,29 @@
+From ac293412a01d87f87eb61f4adb9db7486a75d3fc Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:37 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/fbdev.c b/src/fbdev.c
+index cd7ebc5..f5a7378 100644
+--- a/src/fbdev.c
++++ b/src/fbdev.c
+@@ -14,7 +14,6 @@
+ #include "xf86_OSproc.h"
+ 
+ #include "mipointer.h"
+-#include "mibstore.h"
+ #include "micmap.h"
+ #include "colormapst.h"
+ #include "xf86cmap.h"
+@@ -845,7 +844,6 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	}
+ 
+ 	xf86SetBlackWhitePixels(pScreen);
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ 
+ 	/* software cursor */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-glint/PKGBUILD b/extra/xf86-video-glint/PKGBUILD
index e3105fdc9..df917019d 100644
--- a/extra/xf86-video-glint/PKGBUILD
+++ b/extra/xf86-video-glint/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 168573 2012-10-13 11:44:48Z andyrtr $
+# $Id: PKGBUILD 180198 2013-03-18 16:09:07Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-glint
 pkgver=1.2.8
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org GLINT/Permedia video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221'
+            '8bf833751bea92543835c7f0c55b6a6ed7c4df62034372f5f6ae122b3ba8f231')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  patch -Np1 -i ${srcdir}/git-fix.diff
+ ./configure --prefix=/usr
   make
 }
 
diff --git a/extra/xf86-video-glint/git-fix.diff b/extra/xf86-video-glint/git-fix.diff
new file mode 100644
index 000000000..6bc5738c8
--- /dev/null
+++ b/extra/xf86-video-glint/git-fix.diff
@@ -0,0 +1,30 @@
+From 073d5b0b392781bf4a6aa7f9e2dbe2ae51caed2c Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:38 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/glint_driver.c b/src/glint_driver.c
+index b6d20a9..aa78516 100644
+--- a/src/glint_driver.c
++++ b/src/glint_driver.c
+@@ -52,8 +52,6 @@
+ #include "compiler.h"
+ #include "mipointer.h"
+ 
+-#include "mibstore.h"
+-
+ #include "pm3_regs.h"
+ #include "glint_regs.h"
+ #include "IBM.h"
+@@ -2904,7 +2902,6 @@ GLINTScreenInit(SCREEN_INIT_ARGS_DECL)
+         }
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-i128/PKGBUILD b/extra/xf86-video-i128/PKGBUILD
index f48ca85ab..3b54ba963 100644
--- a/extra/xf86-video-i128/PKGBUILD
+++ b/extra/xf86-video-i128/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 168574 2012-10-13 11:44:52Z andyrtr $
+# $Id: PKGBUILD 180199 2013-03-18 16:09:08Z andyrtr $
 # Maintainer:Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-i128
 pkgver=1.3.6
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Number 9 I128 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c'
+            '3805461dd71ff6675fd08afd5c21a230e7f36d6cda6830adac38ceee36d96f4b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-i128/git-fix.diff b/extra/xf86-video-i128/git-fix.diff
new file mode 100644
index 000000000..de3287d13
--- /dev/null
+++ b/extra/xf86-video-i128/git-fix.diff
@@ -0,0 +1,53 @@
+From 3226d66c951f3621fb940cc5844098d892089eb1 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 15 Aug 2012 17:03:11 +0000
+Subject: Don't bother to include vbe.h
+
+Just copied from xf86 boilerplate afaict.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/i128_driver.c b/src/i128_driver.c
+index 66fdee0..a0f08c0 100644
+--- a/src/i128_driver.c
++++ b/src/i128_driver.c
+@@ -55,7 +55,6 @@
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+-#include "vbe.h"
+ 
+ #include "xf86cmap.h"
+ #include "fb.h"
+--
+cgit v0.9.0.2-2-gbebe
+From c87753733a6e1f85d1d037dced0b47ce0cf41658 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:40 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/i128_driver.c b/src/i128_driver.c
+index a0f08c0..51a4135 100644
+--- a/src/i128_driver.c
++++ b/src/i128_driver.c
+@@ -50,8 +50,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+@@ -1556,7 +1554,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL)
+         return FALSE;
+     }
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-i740/PKGBUILD b/extra/xf86-video-i740/PKGBUILD
index a8ec213ce..2d94138ca 100644
--- a/extra/xf86-video-i740/PKGBUILD
+++ b/extra/xf86-video-i740/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 168575 2012-10-13 11:44:55Z andyrtr $
+# $Id: PKGBUILD 180200 2013-03-18 16:09:08Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-i740
 pkgver=1.3.4
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Intel i740 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78'
+            '2b004773fe8090dea727590a7fc0389c53a16d068537fd1968ae320b0f1e36ca')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-i740/git-fix.diff b/extra/xf86-video-i740/git-fix.diff
new file mode 100644
index 000000000..a33dc7e3d
--- /dev/null
+++ b/extra/xf86-video-i740/git-fix.diff
@@ -0,0 +1,32 @@
+From 084aa23643bf4245c917e3d672576bc9e5717017 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 10 Jan 2013 03:21:52 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/i740_driver.c b/src/i740_driver.c
+index 1c82198..7c1051d 100644
+--- a/src/i740_driver.c
++++ b/src/i740_driver.c
+@@ -63,10 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #include "compiler.h"
+ 
+-/* Drivers using the mi implementation of backing store need: */
+-
+-#include "mibstore.h"
+-
+ /* All drivers using the vgahw module need this */
+ /* This driver needs to be modified to not use vgaHW for multihead operation */
+ #include "vgaHW.h"
+@@ -1558,7 +1554,6 @@ I740ScreenInit(SCREEN_INIT_ARGS_DECL) {
+     }
+   }
+ 
+-  miInitializeBackingStore(pScreen);
+   xf86SetBackingStore(pScreen);
+   xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index 8ce522b90..19c5ed42f 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 176993 2013-02-03 15:42:22Z andyrtr $
+# $Id: PKGBUILD 182343 2013-04-08 15:23:26Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.21.0
+pkgver=2.21.6
 pkgrel=1
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -11,15 +11,15 @@ license=('custom')
 install=$pkgname.install
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
 depends=('intel-dri' 'libxvmc' 'xcb-util>=0.3.9' 'systemd')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto' 'libx11' 'libxrender')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto' 'libx11' 'libxrender')
 replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
 provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14'
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15'
            'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d872adef06cbf1a4434811baad4b8a18feacc6633b59b36557e8d7db7161081c')
+sha256sums=('c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-intel/fix_gen4.diff b/extra/xf86-video-intel/fix_gen4.diff
deleted file mode 100644
index 87a2fa8db..000000000
--- a/extra/xf86-video-intel/fix_gen4.diff
+++ /dev/null
@@ -1,142 +0,0 @@
-From 73ddd8b0decee444a57f10a11f05deebba686649 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Fri, 27 Jul 2012 11:43:00 +0000
-Subject: sna/gen4: Further refinement to the GT allocation
-
-Still hunting for why gen4 fails utterly.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
-index 25229e1..1a860bd 100644
---- a/src/sna/gen4_render.c
-+++ b/src/sna/gen4_render.c
-@@ -79,8 +79,8 @@
- #define URB_CS_ENTRY_SIZE     1
- #define URB_CS_ENTRIES	      0
- 
--#define URB_VS_ENTRY_SIZE     1	// each 512-bit row
--#define URB_VS_ENTRIES	      32	// we needs at least 8 entries
-+#define URB_VS_ENTRY_SIZE     1
-+#define URB_VS_ENTRIES	      32
- 
- #define URB_GS_ENTRY_SIZE     0
- #define URB_GS_ENTRIES	      0
-@@ -89,25 +89,24 @@
- #define URB_CLIP_ENTRIES      0
- 
- #define URB_SF_ENTRY_SIZE     2
--#define URB_SF_ENTRIES	      8
-+#define URB_SF_ENTRIES	      64
- 
- /*
-  * this program computes dA/dx and dA/dy for the texture coordinates along
-  * with the base texture coordinate. It was extracted from the Mesa driver
-  */
- 
--#define SF_KERNEL_NUM_GRF  16
--
--#define PS_KERNEL_NUM_GRF   32
-+#define SF_KERNEL_NUM_GRF 16
-+#define PS_KERNEL_NUM_GRF 32
- 
- static const struct gt_info {
- 	uint32_t max_sf_threads;
- 	uint32_t max_wm_threads;
- 	uint32_t urb_size;
- } gen4_gt_info = {
--	16, 32, 256,
-+	24, 32, 256,
- }, g4x_gt_info = {
--	32, 50, 384,
-+	24, 50, 384,
- };
- 
- static const uint32_t sf_kernel[][4] = {
-@@ -1455,10 +1454,10 @@ gen4_emit_state(struct sna *sna,
- 		const struct sna_composite_op *op,
- 		uint16_t wm_binding_table)
- {
-+	gen4_emit_drawing_rectangle(sna, op);
- 	gen4_emit_binding_table(sna, wm_binding_table);
- 	gen4_emit_pipelined_pointers(sna, op, op->op, op->u.gen4.wm_kernel);
- 	gen4_emit_vertex_elements(sna, op);
--	gen4_emit_drawing_rectangle(sna, op);
- 
- 	if (kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo)) {
- 		DBG(("%s: flushing dirty (%d, %d)\n", __FUNCTION__,
---
-cgit v0.9.0.2-2-gbebe
-From fb385745a2347f8966765567e78229d67ddc8d60 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Fri, 27 Jul 2012 12:24:04 +0000
-Subject: sna/gen4: Move the common vertex_offset==0 check into the flush()
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
-index 1a860bd..58d4422 100644
---- a/src/sna/gen4_render.c
-+++ b/src/sna/gen4_render.c
-@@ -338,7 +338,8 @@ static void gen4_magic_ca_pass(struct sna *sna,
- 
- static void gen4_vertex_flush(struct sna *sna)
- {
--	assert(sna->render_state.gen4.vertex_offset);
-+	if (sna->render_state.gen4.vertex_offset == 0)
-+		return;
- 
- 	DBG(("%s[%x] = %d\n", __FUNCTION__,
- 	     4*sna->render_state.gen4.vertex_offset,
-@@ -359,8 +360,7 @@ static int gen4_vertex_finish(struct sna *sna)
- 
- 	bo = sna->render.vbo;
- 	if (bo) {
--		if (sna->render_state.gen4.vertex_offset)
--			gen4_vertex_flush(sna);
-+		gen4_vertex_flush(sna);
- 
- 		for (i = 0; i < ARRAY_SIZE(sna->render.vertex_reloc); i++) {
- 			if (sna->render.vertex_reloc[i]) {
-@@ -1783,8 +1783,7 @@ gen4_render_video(struct sna *sna,
- 	}
- 	priv->clear = false;
- 
--	if (sna->render_state.gen4.vertex_offset)
--		gen4_vertex_flush(sna);
-+	gen4_vertex_flush(sna);
- 	return true;
- }
- 
-@@ -2693,8 +2692,7 @@ fastcall static void
- gen4_render_composite_spans_done(struct sna *sna,
- 				 const struct sna_composite_spans_op *op)
- {
--	if (sna->render_state.gen4.vertex_offset)
--		gen4_vertex_flush(sna);
-+	gen4_vertex_flush(sna);
- 
- 	DBG(("%s()\n", __FUNCTION__));
- 
-@@ -3072,8 +3070,7 @@ gen4_render_copy_blt(struct sna *sna,
- static void
- gen4_render_copy_done(struct sna *sna, const struct sna_copy_op *op)
- {
--	if (sna->render_state.gen4.vertex_offset)
--		gen4_vertex_flush(sna);
-+	gen4_vertex_flush(sna);
- }
- 
- static bool
-@@ -3366,8 +3363,7 @@ gen4_render_fill_op_boxes(struct sna *sna,
- static void
- gen4_render_fill_op_done(struct sna *sna, const struct sna_fill_op *op)
- {
--	if (sna->render_state.gen4.vertex_offset)
--		gen4_vertex_flush(sna);
-+	gen4_vertex_flush(sna);
- 	kgem_bo_destroy(&sna->kgem, op->base.src.bo);
- }
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-intel/gmux_backlight.diff b/extra/xf86-video-intel/gmux_backlight.diff
deleted file mode 100644
index a5522e82b..000000000
--- a/extra/xf86-video-intel/gmux_backlight.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- xf86-video-intel-2.20.0.orig/src/intel_display.c	2012-07-15 21:02:49.000000000 +1000
-+++ xf86-video-intel-2.20.0/src/intel_display.c	2012-07-24 11:53:42.762165514 +1000
-@@ -127,6 +127,7 @@
-  * List of available kernel interfaces in priority order
-  */
- static const char *backlight_interfaces[] = {
-+	"gmux_backlight",
- 	"asus-laptop",
- 	"asus-nb-wmi",
- 	"eeepc",
diff --git a/extra/xf86-video-intel/sna_backlight_fixes.diff b/extra/xf86-video-intel/sna_backlight_fixes.diff
deleted file mode 100644
index 1511a8d79..000000000
--- a/extra/xf86-video-intel/sna_backlight_fixes.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0ab6d7a50d37cf4454577cb8c333d4b8683aa054 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Wed, 25 Jul 2012 11:20:36 +0000
-Subject: sna: Prefer platform backlight devices over firmware
-
-This is in contrast to libbacklight but closer to our original code as
-we prefer a known custom backlight controller over the ACPI interfaces.
-As only the ACPI interfaces are marked as firmware, and the custom
-backlight controllers as platform, we therefore need to prefer platform
-backlight devices.
-
-Reported-by: Austin Lund <austin.lund@gmail.com>
-References: https://bugs.freedesktop.org/show_bug.cgi?id=52423
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
-index b31f08d..ebecd21 100644
---- a/src/sna/sna_display.c
-+++ b/src/sna/sna_display.c
-@@ -282,8 +282,8 @@ sna_output_backlight_get_max(xf86OutputPtr output)
- }
- 
- enum {
--	FIRMWARE,
- 	PLATFORM,
-+	FIRMWARE,
- 	RAW,
- 	NAMED,
- };
---
-cgit v0.9.0.2-2-gbebe
-From 484b072072c8297a87940c9e32097923f0a77c8f Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Wed, 25 Jul 2012 11:22:47 +0000
-Subject: sna: Add 'gmux_backlight' to list of known devices for backwards compatability
-
-Reported-by: Austin Lund <austin.lund@gmail.com>
-References: https://bugs.freedesktop.org/show_bug.cgi?id=52423
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
-index ebecd21..a908596 100644
---- a/src/sna/sna_display.c
-+++ b/src/sna/sna_display.c
-@@ -292,6 +292,7 @@ static void
- sna_output_backlight_init(xf86OutputPtr output)
- {
- 	static const char *known_interfaces[] = {
-+		"gmux_backlight",
- 		"asus-laptop",
- 		"asus-nb-wmi",
- 		"eeepc",
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-mach64/PKGBUILD b/extra/xf86-video-mach64/PKGBUILD
index 79f3fcaf6..991fe6400 100644
--- a/extra/xf86-video-mach64/PKGBUILD
+++ b/extra/xf86-video-mach64/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 173679 2012-12-20 20:15:31Z andyrtr $
+# $Id: PKGBUILD 180202 2013-03-18 16:09:10Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-mach64
 pkgver=6.9.4
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org mach64 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto' )
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto' )
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('mach64-dri: DRI1 support from community repo')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool' '!emptydirs')
diff --git a/extra/xf86-video-mach64/git_fixes.diff b/extra/xf86-video-mach64/git_fixes.diff
deleted file mode 100644
index aad11772e..000000000
--- a/extra/xf86-video-mach64/git_fixes.diff
+++ /dev/null
@@ -1,107 +0,0 @@
-From 5eb7fec958bc6ba8a1a2b0be4916cac818866e1c Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@gmail.com>
-Date: Wed, 18 Jul 2012 08:46:49 +0000
-Subject: mach64: fix build on 32-bit.
-
-tvout code only builds on 32-bit, fix build.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/atiscreen.c b/src/atiscreen.c
-index 2957877..b1fbd3c 100644
---- a/src/atiscreen.c
-+++ b/src/atiscreen.c
-@@ -580,7 +580,7 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL)
- #ifdef TV_OUT
-     /* Fix-up TV out after ImpacTV probe */
-     if (pATI->OptionTvOut && pATI->Chip < ATI_CHIP_264GTPRO)
--        ATISwitchMode(0, pScreenInfo->currentMode, 0);
-+        ATISwitchMode(SWITCH_MODE_ARGS(pScreenInfo, pScreenInfo->currentMode));
- #endif /* TV_OUT */
- 
- #ifdef XF86DRI_DEVEL
---
-cgit v0.9.0.2-2-gbebe
-From 104e3e067a7dcac143cb672fe42d56396ba6087b Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 26 Sep 2012 20:21:25 +0000
-Subject: Don't gratuitously disable Render when ShadowFBing
-
-There's no reason to do this, and I am at a loss to explain why that was
-ever done.  The first instance of this logic comes from xfree86 (over 11
-years ago!):
-
-http://cvsweb.xfree86.org/cvsweb/xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c.diff?r1=1.15&r2=1.16
-
-Now, cfb never had Render support, so that might make some sense if
-there was an intermediate uncommitted state where the driver used fb for
-direct but cfb for shadowed.  But that's really the only plausible
-explanation I can think of.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/atiscreen.c b/src/atiscreen.c
-index b1fbd3c..62a4dd9 100644
---- a/src/atiscreen.c
-+++ b/src/atiscreen.c
-@@ -476,21 +476,11 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL)
-         }
-     }
- 
--    /* If applicable, initialise RENDER extension */
-+    /* initialise RENDER extension */
-+    if (!fbPictureInit(pScreen, NULL, 0) && (serverGeneration == 1))
-     {
--        if (pATI->OptionShadowFB)
--        {
--            if (serverGeneration == 1)
--                xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
--                    "RENDER extension not supported with a shadowed"
--                    " framebuffer.\n");
--        }
--        else if (!fbPictureInit(pScreen, NULL, 0) &&
--                 (serverGeneration == 1))
--        {
--            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
--                "RENDER extension initialisation failed.\n");
--        }
-+	xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
-+	    "RENDER extension initialisation failed.\n");
-     }
- 
-     xf86SetBlackWhitePixels(pScreen);
---
-cgit v0.9.0.2-2-gbebe
-From 42c4e423eec789606eec9703be23a9fd4483a14a Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 02 Oct 2012 14:19:47 +0000
-Subject: Fix build with neither XAA nor EXA against xserver 1.13.0
-
-Pull in picturestr.h to get GLYPH_HAS_GLYPH_PICTURE_ACCESSOR defined
-before compat-api.h is parsed, otherwise you fail with:
-
-In file included from /usr/include/xorg/picturestr.h:28:0,
-                 from /usr/include/xorg/exa.h:38,
-                 from atimach64accel.h:31,
-                 from atiscreen.c:46:
-/usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '*' token
-/usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '(' token
-/usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '*' token
-/usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '(' token
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/atistruct.h b/src/atistruct.h
-index 702360b..98dc15e 100644
---- a/src/atistruct.h
-+++ b/src/atistruct.h
-@@ -51,6 +51,7 @@
- 
- #endif /* TV_OUT */
- 
-+#include "picturestr.h"
- #ifdef USE_EXA
- #include "exa.h"
- #endif
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-mga/PKGBUILD b/extra/xf86-video-mga/PKGBUILD
index 4d19ea417..a0db87db9 100644
--- a/extra/xf86-video-mga/PKGBUILD
+++ b/extra/xf86-video-mga/PKGBUILD
@@ -1,19 +1,17 @@
-# $Id: PKGBUILD 168578 2012-10-13 11:45:11Z andyrtr $
+# $Id: PKGBUILD 180203 2013-03-18 16:09:11Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-mga
 pkgver=1.6.2
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org mga video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-#makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('mga-dri: DRI1 support from community repo')
-#conflicts=('xorg-server<1.12.0')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/xf86-video-modesetting/PKGBUILD b/extra/xf86-video-modesetting/PKGBUILD
index f0cee485d..7f55ea4f5 100644
--- a/extra/xf86-video-modesetting/PKGBUILD
+++ b/extra/xf86-video-modesetting/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 174965 2013-01-09 16:04:11Z andyrtr $
+# $Id: PKGBUILD 180914 2013-03-27 23:14:30Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 pkgname=xf86-video-modesetting
-pkgver=0.6.0
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="X.org generic modesetting video driver"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libdrm>=2.4.37' 'systemd')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('852f9ddb213913f75e1e65ad7ce9c6b5bc7f43a93d8087b6e59666ea4eb3d0d6')
+sha256sums=('2bc55f776eaee7b4e13df13238d36c4facf1cdca095a11519baf2376f5c996ac')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-neomagic/PKGBUILD b/extra/xf86-video-neomagic/PKGBUILD
index 67abbdac7..1ef669cbd 100644
--- a/extra/xf86-video-neomagic/PKGBUILD
+++ b/extra/xf86-video-neomagic/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 173943 2012-12-28 18:53:54Z andyrtr $
+# $Id: PKGBUILD 180205 2013-03-18 16:09:12Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.7
-pkgrel=4
+pkgrel=5
 pkgdesc="X.org neomagic video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD
index 0d310d6fa..5de63e725 100644
--- a/extra/xf86-video-nouveau/PKGBUILD
+++ b/extra/xf86-video-nouveau/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 174803 2013-01-07 18:10:24Z andyrtr $
+# $Id: PKGBUILD 180916 2013-03-27 23:16:59Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: buddabrod <buddabrod@gmail.com>
 
 pkgname=xf86-video-nouveau
-pkgver=1.0.6
+pkgver=1.0.7
 pkgrel=1
 pkgdesc="Open Source 2D acceleration driver for nVidia cards"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/"
 license=('GPL')
 depends=('libdrm' 'udev' 'nouveau-dri')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 install=$pkgname.install
 source=(http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('e3e1522d08134da74cb1796e8863fd3ad3caad9eb5e9d27f4cee3dfa7c75341f')
+sha256sums=('d187c658e1823ca829c941f3f601f8e7220d427e079c3e52b94ecff45bc2e131')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/xf86-video-nv/PKGBUILD b/extra/xf86-video-nv/PKGBUILD
index 692363280..2a7ab0367 100644
--- a/extra/xf86-video-nv/PKGBUILD
+++ b/extra/xf86-video-nv/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 169436 2012-10-21 08:18:01Z andyrtr $
+# $Id: PKGBUILD 180207 2013-03-18 16:09:14Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer:Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-nv
 pkgver=2.1.20
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org nv video driver"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf'
+            '0ec4234fd9202956d25ca93e9131930e4a3fbba5de2ca870d0cf2302ccb76b46')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-nv/git-fixes.patch b/extra/xf86-video-nv/git-fixes.patch
new file mode 100644
index 000000000..ef5a4f2d9
--- /dev/null
+++ b/extra/xf86-video-nv/git-fixes.patch
@@ -0,0 +1,81 @@
+From fc78fe98222b0204b8a2872a529763d6fe5048da Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:49 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/g80_driver.c b/src/g80_driver.c
+index cc4e197..719b96c 100644
+--- a/src/g80_driver.c
++++ b/src/g80_driver.c
+@@ -34,7 +34,6 @@
+ #include <xf86Resources.h>
+ #endif
+ #include <mipointer.h>
+-#include <mibstore.h>
+ #include <micmap.h>
+ #include <xf86cmap.h>
+ #include <fb.h>
+@@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL)
+         }
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/nv_driver.c b/src/nv_driver.c
+index 6dad6e5..8f35334 100644
+--- a/src/nv_driver.c
++++ b/src/nv_driver.c
+@@ -2550,7 +2550,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
+     if (!pNv->NoAccel)
+ 	NVAccelInit(pScreen);
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/nv_include.h b/src/nv_include.h
+index fb190bf..f174eef 100644
+--- a/src/nv_include.h
++++ b/src/nv_include.h
+@@ -24,9 +24,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+diff --git a/src/riva_driver.c b/src/riva_driver.c
+index e0667ef..759501e 100644
+--- a/src/riva_driver.c
++++ b/src/riva_driver.c
+@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
+     if (!pRiva->NoAccel)
+ 	RivaAccelInit(pScreen);
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/riva_include.h b/src/riva_include.h
+index f2c5302..c7aeef7 100644
+--- a/src/riva_include.h
++++ b/src/riva_include.h
+@@ -22,9 +22,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-nv/git_fixes.patch b/extra/xf86-video-nv/git_fixes.patch
deleted file mode 100644
index 059ccf56e..000000000
--- a/extra/xf86-video-nv/git_fixes.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-From cb93a9b513b5814b18594de7a3b67bb225fb9c34 Mon Sep 17 00:00:00 2001
-From: Jesse Adkins <jesserayadkins@gmail.com>
-Date: Tue, 28 Sep 2010 20:29:51 +0000
-Subject: Purge cvs tags.
-
-Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/man/nv.man b/man/nv.man
-index 228f1da..c679803 100644
---- a/man/nv.man
-+++ b/man/nv.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv.man,v 1.30 2006/06/16 00:19:32 mvojkovi Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH NV __drivermansuffix__ __vendorversion__
---
-cgit v0.9.0.2-2-gbebe
-From d7727e5307c5c3fd0dbc51394893385cb3b01101 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Sat, 30 Oct 2010 16:39:39 +0000
-Subject: Sun's copyrights now belong to Oracle
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/man/Makefile.am b/man/Makefile.am
-index b3688ce..e39d1fc 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,5 +1,5 @@
- #
--# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- #
- # Permission is hereby granted, free of charge, to any person obtaining a
- # copy of this software and associated documentation files (the "Software"),
-@@ -19,7 +19,7 @@
- # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- # DEALINGS IN THE SOFTWARE.
--# 
-+#
- 
- drivermandir = $(DRIVER_MAN_DIR)
- 
---
-cgit v0.9.0.2-2-gbebe
-From 95108089e22d33723488baba22467f2f3c4f1bf6 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Sat, 30 Oct 2010 16:53:33 +0000
-Subject: Correct copyright date in previous commit
-
-Oops, pasted in the new template and forgot to restore the original date
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/man/Makefile.am b/man/Makefile.am
-index e39d1fc..1ea26b3 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
- #
- # Permission is hereby granted, free of charge, to any person obtaining a
- # copy of this software and associated documentation files (the "Software"),
---
-cgit v0.9.0.2-2-gbebe
-From 2b17d1ac579ee426f631f4c62c9f0cf617a06e51 Mon Sep 17 00:00:00 2001
-From: Cyril Brulebois <kibi@debian.org>
-Date: Wed, 02 Mar 2011 01:09:10 +0000
-Subject: Fix compiler warning.
-
-Get rid of this with CFLAGS="-Wall -Werror":
-|   CC     g80_display.lo
-| cc1: warnings being treated as errors
-| g80_display.c: In function ‘G80CrtcSetPClk’:
-| g80_display.c:216: error: unused variable ‘i’
-
-Signed-off-by: Cyril Brulebois <kibi@debian.org>
-Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
-Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
-Tested-by: Aaron Plattner <aplattner@nvidia.com>
----
-diff --git a/src/g80_display.c b/src/g80_display.c
-index ae946a8..84e731c 100644
---- a/src/g80_display.c
-+++ b/src/g80_display.c
-@@ -213,7 +213,7 @@ G80CrtcSetPClk(xf86CrtcPtr crtc)
-     if(pNv->architecture <= 0xa0 ||
-        pNv->architecture == 0xaa ||
-        pNv->architecture == 0xac) {
--        int lo_n, lo_m, hi_n, hi_m, p, i;
-+        int lo_n, lo_m, hi_n, hi_m, p;
-         CARD32 lo = pNv->reg[(0x00614104+headOff)/4];
-         CARD32 hi = pNv->reg[(0x00614108+headOff)/4];
- 
---
-cgit v0.9.0.2-2-gbebe
-From 4b03459a835ee43d940054cbdaefa7c330bff385 Mon Sep 17 00:00:00 2001
-From: Nicolas Kaiser <nikai@nikai.net>
-Date: Mon, 25 Apr 2011 11:26:33 +0000
-Subject: remove duplicated includes
-
-Remove duplicated includes of guarded headers.
-
-Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
-Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
-Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
----
-diff --git a/src/g80_type.h b/src/g80_type.h
-index 9bb07a4..270e383 100644
---- a/src/g80_type.h
-+++ b/src/g80_type.h
-@@ -5,7 +5,6 @@
- #include <xf86Cursor.h>
- #include <xf86DDC.h>
- #include <xf86Crtc.h>
--#include <xf86int10.h>
- 
- #define G80_NUM_I2C_PORTS 10
- 
-diff --git a/src/riva_include.h b/src/riva_include.h
-index 04c35a6..16fd40d 100644
---- a/src/riva_include.h
-+++ b/src/riva_include.h
-@@ -50,7 +50,6 @@
- #include "vgaHW.h"
- 
- #include "xf86Cursor.h"
--#include "xf86DDC.h"
- 
- #include "region.h"
- 
---
-cgit v0.9.0.2-2-gbebe
-From 5b7f07f8171dd5ca4f13d7da25d7d91140b036e1 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 19 Dec 2011 21:55:30 +0000
-Subject: Make failure to XAA non-fatal
-
-Fall back to NoAccel on G80 since there's no shadowfb support there,
-otherwise fall to shadowfb.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/g80_driver.c b/src/g80_driver.c
-index 551abe3..35e5d7e 100644
---- a/src/g80_driver.c
-+++ b/src/g80_driver.c
-@@ -429,10 +429,10 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
-     if(!pNv->NoAccel) {
-         switch(pNv->AccelMethod) {
-         case XAA:
--            if(!xf86LoadSubModule(pScrn, "xaa")) goto fail;
-+            if(!xf86LoadSubModule(pScrn, "xaa")) pNv->NoAccel = 1;
-             break;
-         case EXA:
--            if(!xf86LoadSubModule(pScrn, "exa")) goto fail;
-+            if(!xf86LoadSubModule(pScrn, "exa")) pNv->NoAccel = 1;
-             break;
-         }
-     }
-diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 3031f8b..195299a 100644
---- a/src/nv_driver.c
-+++ b/src/nv_driver.c
-@@ -2048,9 +2048,9 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
-     /* Load XAA if needed */
-     if (!pNv->NoAccel) {
- 	if (!xf86LoadSubModule(pScrn, "xaa")) {
--	    xf86FreeInt10(pNv->pInt);
--	    NVFreeRec(pScrn);
--	    return FALSE;
-+	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadwwfb\n");
-+	    pNv->NoAccel = 1;
-+	    pNv->ShadowFB = 1;
- 	}
-     }
- 
-diff --git a/src/riva_driver.c b/src/riva_driver.c
-index e33a7f3..f0fcab4 100644
---- a/src/riva_driver.c
-+++ b/src/riva_driver.c
-@@ -769,9 +769,9 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags)
-     /* Load XAA if needed */
-     if (!pRiva->NoAccel) {
- 	if (!xf86LoadSubModule(pScrn, "xaa")) {
--	    xf86FreeInt10(pRiva->pInt);
--	    RivaFreeRec(pScrn);
--	    return FALSE;
-+	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n");
-+	    pRiva->NoAccel = 1;
-+	    pRiva->ShadowFB = 1;
- 	}
-     }
- 
---
-cgit v0.9.0.2-2-gbebe
-From b3d61828837661c9b383378a7d6006752659108b Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 19 Dec 2011 21:57:40 +0000
-Subject: Fix for new vgahw ABI
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 195299a..527ae5f 100644
---- a/src/nv_driver.c
-+++ b/src/nv_driver.c
-@@ -1543,6 +1543,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
- 	xf86FreeInt10(pNv->pInt);
- 	return FALSE;
-     }
-+    vgaHWSetStdFuncs(VGAHWPTR(pScrn));
-     
-     /* We use a programmable clock */
-     pScrn->progClock = TRUE;
-diff --git a/src/riva_driver.c b/src/riva_driver.c
-index f0fcab4..b52f476 100644
---- a/src/riva_driver.c
-+++ b/src/riva_driver.c
-@@ -484,6 +484,7 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags)
- 	xf86FreeInt10(pRiva->pInt);
- 	return FALSE;
-     }
-+    vgaHWSetStdFuncs(VGAHWPTR(pScrn));
-     
-     /* We use a programmable clock */
-     pScrn->progClock = TRUE;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD
index 8ffda0a95..4a2d01826 100644
--- a/extra/xf86-video-openchrome/PKGBUILD
+++ b/extra/xf86-video-openchrome/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 168581 2012-10-13 11:45:24Z andyrtr $
+# $Id: PKGBUILD 180937 2013-03-28 18:10:47Z andyrtr $
 # Contributor: Paul Mattal <paul@mattal.com>
 # Maintainer: Juergen Hoetzel <juergen@hoetzel.info>
 
 pkgname=xf86-video-openchrome
-pkgver=0.3.1
-pkgrel=2
+pkgver=0.3.2
+pkgrel=1
 pkgdesc="X.Org Openchrome drivers"
 arch=(i686 x86_64)
 license=('custom')
 url="http://www.openchrome.org"
-depends=('libdrm' 'libxvmc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14' 'xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'unichrome-dri')
+depends=('libdrm' 'libxvmc' 'systemd')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15' 'xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'unichrome-dri')
 replaces=('openchrome' 'xf86-video-via')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool' '!emptydirs' '!makeflags')
 source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('89e56dcfe851345f72c61a95b4fa5ab6ad7e0d83')
+sha1sums=('e5be9a8200410b3e3e66349bab4c8acd1ead4402')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD
index 62273c1b0..2553045d2 100644
--- a/extra/xf86-video-r128/PKGBUILD
+++ b/extra/xf86-video-r128/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 168582 2012-10-13 11:45:27Z andyrtr $
+# $Id: PKGBUILD 180209 2013-03-18 16:09:16Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-r128
 pkgver=6.9.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org ati Rage128 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('r128-dri: DRI1 support from community repo')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
diff --git a/extra/xf86-video-rendition/PKGBUILD b/extra/xf86-video-rendition/PKGBUILD
index a44856620..4caf52ecf 100644
--- a/extra/xf86-video-rendition/PKGBUILD
+++ b/extra/xf86-video-rendition/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 168583 2012-10-13 11:45:31Z andyrtr $
+# $Id: PKGBUILD 180210 2013-03-18 16:09:16Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-rendition
 pkgver=4.2.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Rendition video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool' '!strip')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('930e99e4d44418b1e55f11a2a8525b42b0e2d3b5')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb'
+            '93a59e9deed98af201c8bb231fdf3214fcd02dae8ef2f880b044b4fd100cdb4c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-rendition/git-fixes.patch b/extra/xf86-video-rendition/git-fixes.patch
new file mode 100644
index 000000000..77c4d34de
--- /dev/null
+++ b/extra/xf86-video-rendition/git-fixes.patch
@@ -0,0 +1,35 @@
+From 3a3ee1c45e54a808947cc26ca11f0a5299571053 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:50 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/rendition.c b/src/rendition.c
+index 7c74f76..888bb4a 100644
+--- a/src/rendition.c
++++ b/src/rendition.c
+@@ -1173,7 +1173,6 @@ renditionScreenInit(SCREEN_INIT_ARGS_DECL)
+     fbPictureInit (pScreen, 0, 0);
+ 
+     xf86SetBlackWhitePixels(pScreen);
+-    miInitializeBackingStore(pScreen);
+    
+     /*********************************************************/
+     /* The actual setup of the driver-specific code          */
+diff --git a/src/rendition.h b/src/rendition.h
+index f7f13d4..297117e 100644
+--- a/src/rendition.h
++++ b/src/rendition.h
+@@ -28,9 +28,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi colormap manipulation need this */
+ #include "micmap.h"
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-rendition/rendition-4.2.4-git.patch b/extra/xf86-video-rendition/rendition-4.2.4-git.patch
deleted file mode 100644
index 26cff2fd3..000000000
--- a/extra/xf86-video-rendition/rendition-4.2.4-git.patch
+++ /dev/null
@@ -1,809 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 5091e50..f74b912 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,45 +20,45 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-rendition],
--        4.2.4,
-+        [4.2.4],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-rendition)
--
-+        [xf86-video-rendition])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
--          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
- 
- # Checks for libraries.
-@@ -78,17 +78,16 @@ fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
- # Checks for header files.
--AC_HEADER_STDC
- AC_CHECK_HEADERS([elf.h] [elf_abi.h])
- 
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=rendition
- AC_SUBST([DRIVER_NAME])
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 8f2454b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
--
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
--
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-+
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-+
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/man/rendition.man b/man/rendition.man
-index 3658ab0..afeee91 100644
---- a/man/rendition.man
-+++ b/man/rendition.man
-@@ -1,4 +1,3 @@
--.\" $__xservername__: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.man,v 1.3 2003/06/18 16:17:39 eich Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH RENDITION __drivermansuffix__ __vendorversion__
-diff --git a/src/accelX.c b/src/accelX.c
-index a499c56..ed4964e 100644
---- a/src/accelX.c
-+++ b/src/accelX.c
-@@ -289,7 +289,7 @@ int
- RENDITIONInitUcode(ScrnInfoPtr pScreenInfo)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob = pRendition->board.io_base;
-+    unsigned long iob = pRendition->board.io_base;
- 
-     if (0 == verite_getstride(pScreenInfo, NULL,
- 			 &pRendition->board.mode.stride0, 
-@@ -367,7 +367,7 @@ void
- RENDITIONRestoreUcode(ScrnInfoPtr pScreenInfo)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob = pRendition->board.io_base;
-+    unsigned long iob = pRendition->board.io_base;
- 
-     vu8 memend;
- 
-@@ -410,7 +410,7 @@ void
- RENDITIONSaveUcode(ScrnInfoPtr pScreenInfo)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob = pRendition->board.io_base;
-+    unsigned long iob = pRendition->board.io_base;
-     vu8 memend;
- 
- #ifdef DEBUG
-@@ -445,7 +445,7 @@ void
- RENDITIONSyncV1000(ScrnInfoPtr pScreenInfo)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob = pRendition->board.io_base;
-+    unsigned long iob = pRendition->board.io_base;
- 
-     int c;
- 
-@@ -555,7 +555,7 @@ RENDITIONSubsequentScreenToScreenCopy(ScrnInfoPtr pScreenInfo,
- 					   int w, int h)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob = pRendition->board.io_base;
-+    unsigned long iob = pRendition->board.io_base;
- 
- 
- #ifdef DEBUG
-@@ -607,7 +607,7 @@ RENDITIONSubsequentSolidFillRect(ScrnInfoPtr pScreenInfo,
- 				      int x, int y, int w, int h)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob = pRendition->board.io_base;
-+    unsigned long iob = pRendition->board.io_base;
- 
- 
- #ifdef DEBUG
-@@ -639,7 +639,7 @@ RENDITIONSubsequentTwoPointLine(ScrnInfoPtr pScreenInfo,
- 				     int bias)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob = pRendition->board.io_base;
-+    unsigned long iob = pRendition->board.io_base;
- 
- 
- #ifdef DEBUG
-diff --git a/src/rendition.c b/src/rendition.c
-index 7a9e18b..3202b49 100644
---- a/src/rendition.c
-+++ b/src/rendition.c
-@@ -330,7 +330,7 @@ renditionProbe(DriverPtr drv, int flags)
-                     renditionChipsets, renditionPCIchipsets, 
-                     devSections, numDevSections, drv, &usedChips);
- 
--	xfree(devSections);
-+	free(devSections);
- 	if (numUsed <= 0)
- 	    return FALSE;
- 
-@@ -359,7 +359,7 @@ renditionProbe(DriverPtr drv, int flags)
- 		foundScreen=TRUE;
- 	    }
-         }
--	xfree(usedChips);
-+	free(usedChips);
-     }
-     return foundScreen;
- }
-@@ -400,7 +400,7 @@ renditionGetRec(ScrnInfoPtr pScreenInfo)
-     sleep(1);
- #endif
-     if (!pScreenInfo->driverPrivate)
--        pScreenInfo->driverPrivate=xcalloc(sizeof(renditionRec), 1);
-+        pScreenInfo->driverPrivate=calloc(sizeof(renditionRec), 1);
- 
-     /* perhaps some initialization? <ml> */
- 
-@@ -421,7 +421,7 @@ renditionFreeRec(ScrnInfoPtr pScreenInfo)
- #endif
-     if (xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
- 	vgaHWFreeHWRec(pScreenInfo);
--    xfree(pScreenInfo->driverPrivate);
-+    free(pScreenInfo->driverPrivate);
-     pScreenInfo->driverPrivate=NULL;
- 
- #ifdef DEBUG
-@@ -596,7 +596,7 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
-     /* collect all of the options flags and process them */
- 
-     xf86CollectOptions(pScreenInfo, NULL);
--    if (!(pRendition->Options = xalloc(sizeof(renditionOptions))))
-+    if (!(pRendition->Options = malloc(sizeof(renditionOptions))))
- 	return FALSE;
-     memcpy(pRendition->Options, renditionOptions, sizeof(renditionOptions));
-     xf86ProcessOptions(pScreenInfo->scrnIndex, pScreenInfo->options, 
-@@ -663,7 +663,11 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
-     vgaHWGetIOBase(pvgaHW);             /* Get VGA I/O base */
- 
-     pRendition->board.accel=0;
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     pRendition->board.vgaio_base = pvgaHW->PIOOffset;
-+#else
-+    pRendition->board.vgaio_base = 0;
-+#endif
-     pRendition->board.io_base = pRendition->board.vgaio_base 
- #ifdef XSERVER_LIBPCIACCESS
- 	+ pRendition->PciInfo->regions[1].base_addr;
-@@ -1167,7 +1171,7 @@ renditionScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	pRendition->board.shadowPitch 
- 	    = BitmapBytePad(pScreenInfo->bitsPerPixel * width);
- 	pRendition->board.shadowPtr 
--	    = xalloc(pRendition->board.shadowPitch * height);
-+	    = malloc(pRendition->board.shadowPitch * height);
- 	displayWidth = pRendition->board.shadowPitch 
- 	    / (pScreenInfo->bitsPerPixel >> 3);
- 	FBBase = pRendition->board.shadowPtr;
-@@ -1484,7 +1488,7 @@ static xf86MonPtr
- renditionDDC (ScrnInfoPtr pScreenInfo)
- {
-   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--  IOADDRESS iob=pRendition->board.io_base;
-+  unsigned long iob=pRendition->board.io_base;
-   vu32 temp;
- 
-   xf86MonPtr MonInfo = NULL;
-@@ -1517,7 +1521,7 @@ static unsigned int
- renditionDDC1Read (ScrnInfoPtr pScreenInfo)
- {
-   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--  IOADDRESS iob=pRendition->board.io_base;
-+  unsigned long iob=pRendition->board.io_base;
-   vu32 value = 0;
- 
-   /* wait for Vsync */
-diff --git a/src/v1krisc.c b/src/v1krisc.c
-index 2554263..9b7b4e2 100644
---- a/src/v1krisc.c
-+++ b/src/v1krisc.c
-@@ -83,20 +83,20 @@
-  * local function prototypes
-  */
- 
--static void verite_iopoll(IOADDRESS port, vu32 data, vu32 mask);
--static void verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask);
-+static void verite_iopoll(unsigned long port, vu32 data, vu32 mask);
-+static void verite_iopoll8(unsigned long port, vu8 data, vu8 mask);
- 
--static vu32 readRF(IOADDRESS io_base, vu8 index);
--static void writeRF(IOADDRESS io_base, vu8 index, vu32 data);
-+static vu32 readRF(unsigned long io_base, vu8 index);
-+static void writeRF(unsigned long io_base, vu8 index, vu32 data);
- 
--static vu32 risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type);
--static void risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type);
-+static vu32 risc_readmem(unsigned long io_base, vu32 addr, vu8 read_type);
-+static void risc_writemem(unsigned long io_base, vu32 addr, vu32 data, vu8 write_type);
- 
- #if 0
--static void risc_step(IOADDRESS io_base, vu32 count);
-+static void risc_step(unsigned long io_base, vu32 count);
- #endif
--static void risc_forcestep(IOADDRESS io_base, vu32 instruction);
--static void risc_continue(IOADDRESS io_base);
-+static void risc_forcestep(unsigned long io_base, vu32 instruction);
-+static void risc_continue(unsigned long io_base);
- 
- 
- 
-@@ -113,7 +113,7 @@ void
- v1k_start(ScrnInfoPtr pScreenInfo, vu32 pc)
- {
-   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--  IOADDRESS io_base=pRendition->board.io_base;
-+  unsigned long io_base=pRendition->board.io_base;
- 
-   v1k_stop(pScreenInfo);
-   risc_forcestep(io_base, NOP_INSTR);
-@@ -152,7 +152,7 @@ v1k_stop(ScrnInfoPtr pScreenInfo)
- {
-   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
-   vu8	debugreg, statusreg;
--  IOADDRESS io_base=pRendition->board.io_base;
-+  unsigned long io_base=pRendition->board.io_base;
-   vu16 STATUS = 0x4A;   /* v2x00 io register offset */
-   int c;
- 
-@@ -207,7 +207,7 @@ v1k_flushicache(ScrnInfoPtr pScreenInfo)
- {
-   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
-   vu32 c, p1, p2;
--  IOADDRESS io_base=pRendition->board.io_base;
-+  unsigned long io_base=pRendition->board.io_base;
- 
-   /* first flush store accumulation buffers so data is all in memory */
-   p1=risc_readmem(io_base, 0, READ_WORD);
-@@ -255,7 +255,7 @@ void
- v1k_softreset(ScrnInfoPtr pScreenInfo)
- {
-   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--  IOADDRESS io_base=pRendition->board.io_base;
-+  unsigned long io_base=pRendition->board.io_base;
- 
-   verite_out8(io_base+DEBUGREG, SOFTRESET|HOLDRISC);
-   verite_out8(io_base+STATEINDEX, STATEINDEX_PC);
-@@ -300,12 +300,12 @@ v1k_getriscprocs(verite_board_desc *boardDesc)
-  */
- 
- /* 
-- * static void verite_iopoll(IOADDRESS port, vu32 data, vu32 mask)
-+ * static void verite_iopoll(unsigned long port, vu32 data, vu32 mask)
-  *
-  * Loop on IO read until expected data is read or VERITE_MAX_POLLS is reached.
-  */
- static void
--verite_iopoll(IOADDRESS port, vu32 data, vu32 mask)
-+verite_iopoll(unsigned long port, vu32 data, vu32 mask)
- {
-   vu32 c;
- 
-@@ -320,12 +320,12 @@ verite_iopoll(IOADDRESS port, vu32 data, vu32 mask)
- 
- 
- /* 
-- * static void verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask)
-+ * static void verite_iopoll8(unsigned long port, vu8 data, vu8 mask)
-  *
-  * Loop on IO read until expected data is read or VERITE_MAX_POLLS is reached.
-  */
- static void
--verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask)
-+verite_iopoll8(unsigned long port, vu8 data, vu8 mask)
- {
-   vu32 c;
- 
-@@ -340,12 +340,12 @@ verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask)
- 
- 
- /*
-- * static vu32 readRF(IOADDRESS io_base, vu8 index)
-+ * static vu32 readRF(unsigned long io_base, vu8 index)
-  *
-  * Reads data from register file.
-  */
- static vu32
--readRF(IOADDRESS io_base, vu8 index)
-+readRF(unsigned long io_base, vu8 index)
- {
-   vu32 data, instr;
-   vu8 debug, stateindex;
-@@ -378,12 +378,12 @@ readRF(IOADDRESS io_base, vu8 index)
- 
- 
- /*
-- * static void writeRF(IOADDRESS io_base, vu8 index, vu32 data)
-+ * static void writeRF(unsigned long io_base, vu8 index, vu32 data)
-  *
-  * Set RF register, being careful on how to set regs below 64.
-  */
- static void
--writeRF(IOADDRESS io_base, vu8 index, vu32 data)
-+writeRF(unsigned long io_base, vu8 index, vu32 data)
- {
-   vu8 special=0;
- 
-@@ -417,12 +417,12 @@ writeRF(IOADDRESS io_base, vu8 index, vu32 data)
- 
- 
- /*
-- * static vu32 risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type)
-+ * static vu32 risc_readmem(unsigned long io_base, vu32 addr, vu8 read_type)
-  *
-  * NOTE: Assumes RISC is in hold mode.
-  */
- static vu32
--risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type)
-+risc_readmem(unsigned long io_base, vu32 addr, vu8 read_type)
- {
-   vu32 data;
- 
-@@ -445,12 +445,12 @@ risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type)
- 
- 
- /*
-- * static vu32 risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type)
-+ * static vu32 risc_writemem(unsigned long io_base, vu32 addr, vu32 data, vu8 write_type)
-  *
-  * NOTE: Assumes RISC is in hold mode.
-  */
- static void
--risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type)
-+risc_writemem(unsigned long io_base, vu32 addr, vu32 data, vu8 write_type)
- {
-   writeRF(io_base, RISC_RA, addr);          /* point to memory */
-   writeRF(io_base, RISC_FP, data);          /* set data */
-@@ -466,12 +466,12 @@ risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type)
- 
- #if 0
- /*
-- * static void risc_step(IOADDRESS io_base, vu32 count)
-+ * static void risc_step(unsigned long io_base, vu32 count)
-  *
-  * Single step the RISC. NOTE: Do not force instruction into RISCIR!
-  */
- static void
--risc_step(IOADDRESS io_base, vu32 count)
-+risc_step(unsigned long io_base, vu32 count)
- {
-   vu32 c, d;
-   vu8 debugreg;
-@@ -494,12 +494,12 @@ risc_step(IOADDRESS io_base, vu32 count)
- 
- 
- /*
-- * static void risc_forcestep(IOADDRESS io_base, vu32 instruction)
-+ * static void risc_forcestep(unsigned long io_base, vu32 instruction)
-  *
-  * Single step RISC; force instruction; assumes RISC held.
-  */
- static void
--risc_forcestep(IOADDRESS io_base, vu32 instruction)
-+risc_forcestep(unsigned long io_base, vu32 instruction)
- {
-   vu32 c;
-   vu8 debugreg, stateindex;
-@@ -525,12 +525,12 @@ risc_forcestep(IOADDRESS io_base, vu32 instruction)
- 
- 
- /*
-- * static void risc_continue(IOADDRESS io_base)
-+ * static void risc_continue(unsigned long io_base)
-  *
-  * Turn off hold bit.    
-  */
- static void
--risc_continue(IOADDRESS io_base)
-+risc_continue(unsigned long io_base)
- {
-   vu8 debugreg;
- 
-diff --git a/src/vboard.c b/src/vboard.c
-index 49499e2..622715f 100644
---- a/src/vboard.c
-+++ b/src/vboard.c
-@@ -38,7 +38,7 @@ verite_initboard(ScrnInfoPtr pScreenInfo)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
- 
--    IOADDRESS iob=pRendition->board.io_base;
-+    unsigned long iob=pRendition->board.io_base;
-     vu8 *vmb;
-     vu32 offset;
-     vu8 memendian;
-@@ -207,7 +207,7 @@ void
- verite_check_csucode(ScrnInfoPtr pScreenInfo)
- {
-   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--  IOADDRESS iob=pRendition->board.io_base;
-+  unsigned long iob=pRendition->board.io_base;
-   vu8 *vmb;
-   vu32 offset;
-   int c;
-diff --git a/src/vgafont-std.data b/src/vgafont-std.data
-index db63ea8..c47983f 100644
---- a/src/vgafont-std.data
-+++ b/src/vgafont-std.data
-@@ -1,4 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgafont-std.data,v 1.3 1999/10/13 04:21:22 dawes Exp $ */
- #ifndef __VGAFONT_STD__
- #define __VGAFONT_STD__
- 
-diff --git a/src/vgafont-vrx.data b/src/vgafont-vrx.data
-index ad34582..23b5908 100644
---- a/src/vgafont-vrx.data
-+++ b/src/vgafont-vrx.data
-@@ -1,4 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgafont-vrx.data,v 1.3 1999/10/13 04:21:23 dawes Exp $ */
- #ifndef __VGAFONT_VRX__
- #define __VGAFONT_VRX__
- 
-diff --git a/src/vgapalette.data b/src/vgapalette.data
-index 5267608..106028d 100644
---- a/src/vgapalette.data
-+++ b/src/vgapalette.data
-@@ -1,4 +1,3 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgapalette.data,v 1.3 1999/10/13 04:21:23 dawes Exp $ */
- #ifndef __VGAPALETTE__
- #define __VGAPALETTE__
- 
-diff --git a/src/vloaduc.c b/src/vloaduc.c
-index 67bf901..5c6aab0 100644
---- a/src/vloaduc.c
-+++ b/src/vloaduc.c
-@@ -103,7 +103,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name)
-   sz=SW16(ehdr.e_phentsize);
-   num=SW16(ehdr.e_phnum);
-   if (0!=sz && 0!=num) {
--	orig_pphdr=pphdr=(Elf32_Phdr *)xalloc(sz*num);
-+	orig_pphdr=pphdr=(Elf32_Phdr *)malloc(sz*num);
- 	if (!pphdr) {
- 	  ErrorF("RENDITION: Cannot allocate global memory (1)\n"); 
- 	  close(fd);
-@@ -125,7 +125,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name)
-     sz=SW16(ehdr.e_shentsize);
-     num=SW16(ehdr.e_shnum);
-     if (0!=sz && 0!=num) {
--      orig_pshdr=pshdr=(Elf32_Shdr *)xalloc(sz*num);
-+      orig_pshdr=pshdr=(Elf32_Shdr *)malloc(sz*num);
-       if (!pshdr) {
-         ErrorF("RENDITION: Cannot allocate global memory (2)\n"); 
-         close(fd);
-@@ -148,7 +148,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name)
-         loadSegment2board(pScreenInfo, fd, pphdr);
-         pphdr=(Elf32_Phdr *)(((char *)pphdr)+sz);
-       } while (--num);
--      xfree(orig_pphdr);
-+      free(orig_pphdr);
-   }
-   else {
-     do {
-@@ -158,7 +158,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name)
-         loadSection2board(pScreenInfo, fd, pshdr);
- 	  pshdr=(Elf32_Shdr *)(((char *)pshdr)+sz);
- 	} while (--num) ;
--	xfree(orig_pshdr);
-+	free(orig_pshdr);
-   }
-   close(fd);
- 
-@@ -195,7 +195,7 @@ loadSegment2board(ScrnInfoPtr pScreenInfo, int fd, Elf32_Phdr *phdr)
-     return;
-   }
- 
--  data=(vu8 *)xalloc(size);
-+  data=(vu8 *)malloc(size);
-   if (NULL == data){
- 	ErrorF("RENDITION: GlobalAllocPtr couldn't allocate %lx bytes",
- 		(unsigned long)size);
-@@ -210,7 +210,7 @@ loadSegment2board(ScrnInfoPtr pScreenInfo, int fd, Elf32_Phdr *phdr)
- 
-   mmve(pScreenInfo, size, data, physAddr);
- 
--  xfree(data);
-+  free(data);
- }
- 
- 
-diff --git a/src/vmodes.c b/src/vmodes.c
-index c0bd0df..f2dae0b 100644
---- a/src/vmodes.c
-+++ b/src/vmodes.c
-@@ -20,6 +20,7 @@
- #include "v1kregs.h"
- #include "v2kregs.h"
- 
-+#include <unistd.h>
- 
- #undef DEBUG
- 
-@@ -201,7 +202,7 @@ struct V1000ClocksStr {
-  * local function prototypes
-  */
- 
--static void set_PLL(IOADDRESS iob, vu32 value);
-+static void set_PLL(unsigned long iob, vu32 value);
- static double V1000CalcClock(double target, int *M, int *N, int *P);
- static double V2200CalcClock(double target, int *m, int *n, int *p);
- 
-@@ -509,13 +510,13 @@ verite_getstride(ScrnInfoPtr pScreenInfo, int *width,
-  */
- 
- /*
-- * void set_PLL(IOADDRESS iob, vu32 value)
-+ * void set_PLL(unsigned long iob, vu32 value)
-  *
-  * Set PLL clock to desired frequency for the V1000.
-  */
- 
- void
--set_PLL(IOADDRESS iob, vu32 value)
-+set_PLL(unsigned long iob, vu32 value)
- {
-     vu32 ulD;
-     int b;
-diff --git a/src/vos.h b/src/vos.h
-index 7b55f77..999c870 100644
---- a/src/vos.h
-+++ b/src/vos.h
-@@ -23,18 +23,18 @@
- /*
-  * function prototypes
-  */
--#define /*void*/ verite_out8(/*IOADDRESS*/ port, /*vu8*/ data) \
-+#define /*void*/ verite_out8(/*unsigned long*/ port, /*vu8*/ data) \
-                    outb(port, data)
- 
--#define /*void*/ verite_out16(/*IOADDRESS*/ port, /*vu16*/ data) \
-+#define /*void*/ verite_out16(/*unsigned long*/ port, /*vu16*/ data) \
-                    outw(port, data)
- 
--#define /*void*/ verite_out32(/*IOADDRESS*/ port, /*vu32*/ data) \
-+#define /*void*/ verite_out32(/*unsigned long*/ port, /*vu32*/ data) \
-                    outl(port, data)
- 
--#define /*vu8*/  verite_in8(/*IOADDRESS*/ io_base)  ((vu8)inb(io_base))
--#define /*vu16*/ verite_in16(/*IOADDRESS*/ io_base) ((vu16)inw(io_base))
--#define /*vu32*/ verite_in32(/*IOADDRESS*/ io_base) ((vu32)inl(io_base))
-+#define /*vu8*/  verite_in8(/*unsigned long*/ io_base)  ((vu8)inb(io_base))
-+#define /*vu16*/ verite_in16(/*unsigned long*/ io_base) ((vu16)inw(io_base))
-+#define /*vu32*/ verite_in32(/*unsigned long*/ io_base) ((vu32)inl(io_base))
- 
- /* memory accesses */
- #define verite_read_memory32(base, offset) MMIO_IN32(base, offset)
-diff --git a/src/vramdac.c b/src/vramdac.c
-index 7c8acbd..21c1df7 100644
---- a/src/vramdac.c
-+++ b/src/vramdac.c
-@@ -93,11 +93,11 @@
-  * local function prototypes
-  */
- 
--static void Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data);
--static void Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data);
-+static void Bt485_write_masked(unsigned long port, vu8 reg, vu8 mask, vu8 data);
-+static void Bt485_write_cmd3_masked(unsigned long port, vu8 mask, vu8 data);
- #if 0
--static vu8 Bt485_read_masked(IOADDRESS port, vu8 reg, vu8 mask);
--static vu8 Bt485_read_cmd3_masked(IOADDRESS port, vu8 mask);
-+static vu8 Bt485_read_masked(unsigned long port, vu8 reg, vu8 mask);
-+static vu8 Bt485_read_cmd3_masked(unsigned long port, vu8 mask);
- #endif
- 
- /*
-@@ -159,7 +159,7 @@ int
- verite_initdac(ScrnInfoPtr pScreenInfo, vu8 bpp, vu8 doubleclock)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR;
-+    unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR;
-     vu8 cmd0,cmd1,cmd2;
-     vu8 cmd3_data=0;
- 
-@@ -271,7 +271,7 @@ verite_enablecursor(ScrnInfoPtr pScreenInfo, int type, int size)
-                       BT485_3_COLOR_CURSOR, BT485_X_WINDOW_CURSOR };
-     static vu8 csizes[]={ BT485_32_BY_32_CURSOR, BT485_64_BY_64_CURSOR };
-   
--    IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR;
-+    unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR;
- 
- #ifdef DEBUG
-     ErrorF ("Rendition: Debug verite_enablecursor called type=0x%x\n",type);
-@@ -304,7 +304,7 @@ void
- verite_movecursor(ScrnInfoPtr pScreenInfo, vu16 x, vu16 y, vu8 xo, vu8 yo)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR;
-+    unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR;
- 
-     x+=Cursor_size-xo;
-     y+=Cursor_size-yo;
-@@ -327,7 +327,7 @@ void
- verite_setcursorcolor(ScrnInfoPtr pScreenInfo, vu32 fg, vu32 bg)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR;
-+    unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR;
- 
- #ifdef DEBUG
-     ErrorF ("Rendition: Debug verite_setcursorcolor called FG=0x%x BG=0x%x\n",
-@@ -374,7 +374,7 @@ verite_loadcursor(ScrnInfoPtr pScreenInfo, vu8 size, vu8 *cursorimage)
-     int c, bytes, row;
-     vu8 *src = cursorimage;
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR;
-+    unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR;
-     vu8 tmp;
-     vu8 memend; /* Added for byte-swap fix */
- 
-@@ -454,7 +454,7 @@ verite_setpalette(ScrnInfoPtr pScreenInfo, int numColors, int *indices,
- 		LOCO *colors, VisualPtr pVisual)
- {
-     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
--    IOADDRESS iob=pRendition->board.io_base;
-+    unsigned long iob=pRendition->board.io_base;
-     vu32 crtc_status;
-     int i, index;
- 
-@@ -485,12 +485,12 @@ verite_setpalette(ScrnInfoPtr pScreenInfo, int numColors, int *indices,
-  */
- 
- /*
-- * static void Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data)
-+ * static void Bt485_write_masked(unsigned long port, vu8 reg, vu8 mask, vu8 data)
-  *
-  *
-  */
- static void
--Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data)
-+Bt485_write_masked(unsigned long port, vu8 reg, vu8 mask, vu8 data)
- {
-     vu8 tmp;
- 
-@@ -501,12 +501,12 @@ Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data)
- 
- 
- /*
-- * static void Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data)
-+ * static void Bt485_write_cmd3_masked(unsigned long port, vu8 mask, vu8 data)
-  *
-  *
-  */
- static void
--Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data)
-+Bt485_write_cmd3_masked(unsigned long port, vu8 mask, vu8 data)
- {
- /*
-  *   Bt485_write_masked(port, BT485_COMMAND_REG_0, 0x7f, 0x80);
-@@ -522,24 +522,24 @@ Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data)
- 
- #if 0
- /*
-- * static vu8 Bt485_read_masked(IOADDRESS port, vu8 reg, vu8 mask)
-+ * static vu8 Bt485_read_masked(unsigned long port, vu8 reg, vu8 mask)
-  *
-  *
-  */
- static vu8
--Bt485_read_masked(IOADDRESS port, vu8 reg, vu8 mask)
-+Bt485_read_masked(unsigned long port, vu8 reg, vu8 mask)
- {
-     return verite_in8(port+reg)&mask;
- }
- 
- 
- /*
-- * static vu8 Bt485_read_cmd3_masked(IOADDRESS port, vu8 mask)
-+ * static vu8 Bt485_read_cmd3_masked(unsigned long port, vu8 mask)
-  *
-  *
-  */
- static vu8
--Bt485_read_cmd3_masked(IOADDRESS port, vu8 mask)
-+Bt485_read_cmd3_masked(unsigned long port, vu8 mask)
- {
-     vu8 value;
- 
-diff --git a/src/vtypes.h b/src/vtypes.h
-index 257870b..e4ad468 100644
---- a/src/vtypes.h
-+++ b/src/vtypes.h
-@@ -123,7 +123,7 @@ struct verite_board_t {
-     vu16  chip;
- 
-     /* */
--    IOADDRESS io_base, vgaio_base;
-+    unsigned long io_base, vgaio_base;
-     vu32 mmio_base;
-     vu32 vmmio_base;
-     vu32 mem_size;
diff --git a/extra/xf86-video-s3/LICENSE b/extra/xf86-video-s3/LICENSE
deleted file mode 100644
index a4c8d5dd4..000000000
--- a/extra/xf86-video-s3/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
-
-     Copyright 2001  Ani Joshi <ajoshi@unixbox.com>
-
-     XFree86 4.x driver for S3 chipsets
-
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation and
-that the name of Ani Joshi not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  Ani Joshi makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as-is" without express or implied warranty.
-
-ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
diff --git a/extra/xf86-video-s3/PKGBUILD b/extra/xf86-video-s3/PKGBUILD
index 1cc340295..238c7721a 100644
--- a/extra/xf86-video-s3/PKGBUILD
+++ b/extra/xf86-video-s3/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 168584 2012-10-13 11:45:35Z andyrtr $
+# $Id: PKGBUILD 180211 2013-03-18 16:09:17Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-s3
 pkgver=0.6.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org S3 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 build-fix.diff)
+sha256sums=('4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39'
+            'ad5ce4569c16f28801f4f89d8271fccc5706ef8508a6051ca094854d92a19d1a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/build-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-s3/build-fix.diff b/extra/xf86-video-s3/build-fix.diff
new file mode 100644
index 000000000..457674571
--- /dev/null
+++ b/extra/xf86-video-s3/build-fix.diff
@@ -0,0 +1,10 @@
+--- xf86-video-s3-0.6.5/src/s3_driver.c	2012-07-17 06:50:05.000000000 +0200
++++ xf86-video-s3-0.6.5/src/s3_driver.c.new	2013-03-09 17:01:39.639220318 +0100
+@@ -52,7 +52,6 @@
+ #include "compiler.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+-#include "mibstore.h"
+ #include "fb.h"
+ #include "inputstr.h"
+ #include "shadowfb.h"
diff --git a/extra/xf86-video-s3/git-fixes.patch b/extra/xf86-video-s3/git-fixes.patch
deleted file mode 100644
index d6792f38e..000000000
--- a/extra/xf86-video-s3/git-fixes.patch
+++ /dev/null
@@ -1,502 +0,0 @@
-diff --git a/COPYING b/COPYING
-index 7f33cbf..458ab5f 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,70 @@
--This is a stub file.  This package has not yet had its complete licensing
--information compiled.  Please see the individual source files for details on
--your rights to use and modify this software.
-+     Copyright 2001  Ani Joshi <ajoshi@unixbox.com>
- 
--Please submit updated COPYING files to the Xorg bugzilla:
-+     XFree86 4.x driver for S3 chipsets
- 
--https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
- 
--All licensing questions regarding this software should be directed at the
--Xorg mailing list:
-+Permission to use, copy, modify, distribute, and sell this software and its
-+documentation for any purpose is hereby granted without fee, provided that
-+the above copyright notice appear in all copies and that both that copyright
-+notice and this permission notice appear in supporting documentation and
-+that the name of Ani Joshi not be used in advertising or
-+publicity pertaining to distribution of the software without specific,
-+written prior permission.  Ani Joshi makes no representations
-+about the suitability of this software for any purpose.  It is provided
-+"as-is" without express or implied warranty.
-+
-+ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+PERFORMANCE OF THIS SOFTWARE.
-+Copyright 2007 George Sapountzis
-+
-+Permission is hereby granted, free of charge, to any person obtaining a
-+copy of this software and associated documentation files (the "Software"),
-+to deal in the Software without restriction, including without limitation
-+the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+and/or sell copies of the Software, and to permit persons to whom the
-+Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice (including the next
-+paragraph) shall be included in all copies or substantial portions of the
-+Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+SOFTWARE.
-+
-+Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy of
-+this software and associated documentation files (the "Software"), to deal in
-+the Software without restriction, including without limitation the rights to
-+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+of the Software, and to permit persons to whom the Software is furnished to do
-+so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+Except as contained in this notice, the name of the XFree86 Project shall not
-+be used in advertising or otherwise to promote the sale, use or other dealings
-+in this Software without prior written authorization from the XFree86 Project.
-+
-+
-+Copyright 1995-1997 The XFree86 Project, Inc.
-+Copyright (c) 1999,2000  The XFree86 Project Inc.
- 
--http://lists.freedesktop.org/mailman/listinfo/xorg
-diff --git a/ChangeLog b/ChangeLog
-deleted file mode 100644
-index ad0b227..0000000
---- a/ChangeLog
-+++ /dev/null
-@@ -1,133 +0,0 @@
--2009-06-25  Evgeny M. zubok <evgeny.zubok@tochka.ru>
--
--	* src/s3_driver.c:
--	Revert the old behaviour when the BIOS settings are used for
--	intialization of DRAM/VRAM timings, i. e. we don't touch the
--	timings during initialization phase until any memory option (like
--	slow_edodram) is specified.
--	
--	Add manual page.	
--
--2009-05-25  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
--	
--	* src/s3_driver.c:
--	* src/s3_video.c:
--	
--	Enable Xv extension for Trio64V+ (thanks to Egor Ivanov for 
--	testing on real hardware) and Trio64UV+ (Tested only on Trio64V2 by
--	overriding Chipset with "Trio64UV+" but not on real hardware).
--
--	S3 Trio64V+ now using NewMMIO. Trio64V+ chips have the same ChipId
--	as Trio32/64 but only with chip revision greater or eq 0x40. So if 
--	you have problems with NewMMIO, you may override ChipRev in "Device" 
-- 	section of your xorg.conf: "ChipRev" 0x00. Note: disabling the NewMMIO 
--	also disables overlay video (Xv) because it isn't implemented for
--	Old MMIO yet.
--	
--2009-05-04  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
--
--	* src/s3_driver.c:
--	* src/s3_shadow.c:
--
--	Add shadowFB option. It can be used to speedup drawing when
--	hardware acceleration is undesirable or unavailable (for colour depth
--	24 with 24 bpp framebuffer, for example). shadowFB is disabled by
--	default. Enabling shadowFB option disables HW acceleration. Thanks
--	to Egor Ivanov for initial porting of shadowFB from s3virge.
--
--	Interlace mode support.
--
--	Close bug #14999.
--	
--2008-07-06  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
--
--	* src/s3_video.c: 
--
--	Streams Processor initialization.
--
--	XVideo support for 16, 24 and 32 bpp (only for TRIO64V2).
--
--	* src/s3_driver.c: 
--
--	Add XVideo option (enabled by default).
--
--	Replace "swcursor" by "hwcursor" option (HW cursor 
--	not implemented yet for all chipsets).
--
--	Close bug #5527: 24-bit colour depth support (24bpp and 
--	32bpp framebuffer) for TRIOs. Acceleration doesn't work
--	with packed colour mode (24 bpp FB) but works with 32bpp 
--	framebuffer mode (hardware limitation? -- need data).
--
--	Fix system hang-up when switching between console and X session.
--
--	Some minor changes of driver messages.
--
--2008-02-23  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
--
--	* src/s3_driver.c: Add DPMS support for S3 Trio64V2 and possibly
--	others (need testing): S3 Trio64UV+. S3 Aurora64V+ and S3 Trio32/64
--	* src/s3_Trio64DAC: Change clocks for S3 Trio64V2 to make
--	the 1024x768@16bpp mode work.
--	Thanks to Richard Driscoll for these patches.
--	
--2006-04-07  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	* src/s3.h:
--	Bump to 0.4.1 for Xv changes.
--
--2006-04-07  Aaron Plattner  <aplattner@nvidia.com>
--
--	* src/s3_video.c: (S3PutImage):
--	Add a DrawablePtr argument to the XV functions to pave the way for
--	redirected video.
--
--2006-04-07  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	* src/s3.h:
--	* src/s3_IBMRGB.c:
--	* src/s3_Ti.c:
--	* src/s3_Trio64DAC.c:
--	* src/s3_bios.c:
--	* src/s3_cursor.c:
--	* src/s3_dga.c:
--	* src/s3_driver.c:
--	* src/s3_video.c:
--	Unlibcwrap.  Bump server version requirement.  Bump to 0.4.0.
--
--2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version for X11R7 release.
--
--2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for final X11R7 release candidate.
--
--2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for X11R7 RC3 release.
--
--2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Remove extraneous AC_MSG_RESULT.
--
--2005-11-29  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	Only build dlloader modules by default.
--
--2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for X11R7 RC2 release.
--
--2005-11-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update pkgcheck dependencies to work with separate build roots.
-diff --git a/Makefile.am b/Makefile.am
-index 7052905..4c278ba 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,5 +18,15 @@
- #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--AUTOMAKE_OPTIONS = foreign
- SUBDIRS = src man
-+MAINTAINERCLEANFILES = ChangeLog INSTALL
-+
-+.PHONY: ChangeLog INSTALL
-+
-+INSTALL:
-+	$(INSTALL_CMD)
-+
-+ChangeLog:
-+	$(CHANGELOG_CMD)
-+
-+dist-hook: ChangeLog INSTALL
-diff --git a/configure.ac b/configure.ac
-index 0eecc87..0ac34f9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,42 +20,50 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-s3],
--        0.6.3,
-+        [0.6.3],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-s3)
--
-+        [xf86-video-s3])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
--AM_INIT_AUTOMAKE([dist-bzip2])
--
-+# Initialize Automake
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
- AM_MAINTAINER_MODE
- 
--# Checks for programs.
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-+m4_ifndef([XORG_MACROS_VERSION],
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
-+XORG_DEFAULT_OPTIONS
-+
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
-+
-+# Checks for programs.
-+AM_PROG_CC_C_O
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4 xproto fontsproto $REQUIRED_MODULES])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
- 
- # Checks for libraries.
- SAVE_CPPFLAGS="$CPPFLAGS"
-@@ -65,28 +73,20 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
-               [#include "xorg-server.h"])
- CPPFLAGS="$SAVE_CPPFLAGS"
- 
--# Checks for header files.
--AC_HEADER_STDC
--
- if test "x$XSERVER_LIBPCIACCESS" = xyes; then
-     PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
-     XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=s3
- AC_SUBST([DRIVER_NAME])
- 
--XORG_MANPAGE_SECTIONS
--XORG_RELEASE_VERSION
--
--XORG_CHECK_LINUXDOC
--
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index f0eb29b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,27 +1,24 @@
- #
- # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
--# 
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation.
--# 
--# The above copyright notice and this permission notice shall be included
--# in all copies or substantial portions of the Software.
--# 
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
--# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
--# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
--# OTHER DEALINGS IN THE SOFTWARE.
--# 
--# Except as contained in this notice, the name of the copyright holders shall
--# not be used in advertising or otherwise to promote the sale, use or
--# other dealings in this Software without prior written authorization
--# from the copyright holders.
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the "Software"),
-+# to deal in the Software without restriction, including without limitation
-+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+# and/or sell copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice (including the next
-+# paragraph) shall be included in all copies or substantial portions of the
-+# Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+# DEALINGS IN THE SOFTWARE.
- # 
- 
- drivermandir = $(DRIVER_MAN_DIR)
-@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
- 
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- 
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/src/s3.h b/src/s3.h
-index 49b8a54..0875fc9 100644
---- a/src/s3.h
-+++ b/src/s3.h
-@@ -113,7 +113,6 @@ typedef struct _S3Rec {
-         XAAInfoRecPtr           pXAA;
- 	xf86CursorInfoPtr	pCurs;
- 	xf86Int10InfoPtr	pInt10;
--	vbeInfoPtr		pVBE;
-         XF86VideoAdaptorPtr     adaptor;
-         S3PortPrivPtr           portPrivate;
- 
-diff --git a/src/s3_driver.c b/src/s3_driver.c
-index 29e343d..2011dfc 100644
---- a/src/s3_driver.c
-+++ b/src/s3_driver.c
-@@ -309,6 +309,7 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
- 	S3Ptr pS3;
- 	vgaHWPtr hwp;
- 	ClockRangePtr clockRanges;
-+	vbeInfoPtr pVBE;
- 	rgb zeros = {0, 0, 0};
- 	Gamma gzeros = {0.0, 0.0, 0.0};
- 	int i, vgaCRIndex, vgaCRReg;
-@@ -325,6 +326,7 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
-                 return FALSE;
-         
-         hwp = VGAHWPTR(pScrn);
-+	vgaHWSetStdFuncs(hwp);
-         vgaHWGetIOBase(hwp);
-         
-         pScrn->monitor = pScrn->confScreen->monitor;
-@@ -436,9 +438,19 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
- 	}
- 
- 	if (xf86LoadSubModule(pScrn, "vbe")) {
--		pS3->pVBE = VBEInit(pS3->pInt10, pEnt->index);
-+		pVBE = VBEInit(pS3->pInt10, pEnt->index);
-+		vbeFree(pVBE);
- 	}
- 	
-+	xf86LoadSubModule(pScrn, "fb");
-+
-+	if (!xf86LoadSubModule(pScrn, "xaa")) {
-+		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-+			   "Falling back to shadowfb\n");
-+		pS3->NoAccel = TRUE;
-+		pS3->shadowFB = TRUE;
-+	}
-+
- 	if (pS3->shadowFB) {
- 		if (!xf86LoadSubModule(pScrn, "shadowfb")) {
- 			S3FreeRec(pScrn);
-@@ -726,11 +738,6 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
-         xf86PrintModes(pScrn);
-         xf86SetDpi(pScrn, 0, 0);
-  
--        xf86LoadSubModule(pScrn, "fb");
--
--	if (!xf86LoadSubModule(pScrn, "xaa"))
--		return FALSE;
--
- 	return TRUE;
- }
- 
-diff --git a/src/s3_video.c b/src/s3_video.c
-index 3e88889..9a2d458 100644
---- a/src/s3_video.c
-+++ b/src/s3_video.c
-@@ -244,6 +244,8 @@ static XF86VideoAdaptorPtr S3SetupImageVideoOverlay(ScreenPtr pScreen)
- 	XF86VideoAdaptorPtr adapt;
- 
- 	adapt = S3AllocAdaptor(pScrn);
-+	if (adapt == NULL)
-+		return NULL;
- 
-     	adapt->type = XvWindowMask | XvInputMask | XvImageMask;
-     	adapt->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;
diff --git a/extra/xf86-video-s3virge/PKGBUILD b/extra/xf86-video-s3virge/PKGBUILD
index 9ed62f972..db233becc 100644
--- a/extra/xf86-video-s3virge/PKGBUILD
+++ b/extra/xf86-video-s3virge/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 168585 2012-10-13 11:45:39Z andyrtr $
+# $Id: PKGBUILD 180212 2013-03-18 16:09:18Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-s3virge
 pkgver=1.10.6
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org S3 Virge video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=(!libtool)
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e')
diff --git a/extra/xf86-video-s3virge/git-fixes.patch b/extra/xf86-video-s3virge/git-fixes.patch
deleted file mode 100644
index 4cf0a5637..000000000
--- a/extra/xf86-video-s3virge/git-fixes.patch
+++ /dev/null
@@ -1,1644 +0,0 @@
-diff --git a/COPYING b/COPYING
-index 7f33cbf..727ca51 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,60 @@
--This is a stub file.  This package has not yet had its complete licensing
--information compiled.  Please see the individual source files for details on
--your rights to use and modify this software.
-+Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
- 
--Please submit updated COPYING files to the Xorg bugzilla:
-+Permission is hereby granted, free of charge, to any person obtaining a copy of
-+this software and associated documentation files (the "Software"), to deal in
-+the Software without restriction, including without limitation the rights to
-+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+of the Software, and to permit persons to whom the Software is furnished to do
-+so, subject to the following conditions:
- 
--https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
- 
--All licensing questions regarding this software should be directed at the
--Xorg mailing list:
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+Except as contained in this notice, the name of the XFree86 Project shall not
-+be used in advertising or otherwise to promote the sale, use or other dealings
-+in this Software without prior written authorization from the XFree86 Project.
-+
-+Written by Jake Richter Copyright (c) 1989, 1990 Panacea Inc., Londonderry,
-+NH - All Rights Reserved
-+
-+This code may be freely incorporated in any program without royalty, as long
-+as the copyright notice stays intact.
-+
-+Additions by Kevin E. Martin (martin@cs.unc.edu)
-+
-+KEVIN E. MARTIN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+EVENT SHALL KEVIN E. MARTIN BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+PERFORMANCE OF THIS SOFTWARE.
-+
-+Copyright 2007 George Sapountzis
-+
-+Permission is hereby granted, free of charge, to any person obtaining a
-+copy of this software and associated documentation files (the "Software"),
-+to deal in the Software without restriction, including without limitation
-+the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+and/or sell copies of the Software, and to permit persons to whom the
-+Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice (including the next
-+paragraph) shall be included in all copies or substantial portions of the
-+Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+SOFTWARE.
- 
--http://lists.freedesktop.org/mailman/listinfo/xorg
-diff --git a/ChangeLog b/ChangeLog
-deleted file mode 100644
-index 8ef0a7c..0000000
---- a/ChangeLog
-+++ /dev/null
-@@ -1,69 +0,0 @@
--2006-04-07  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	* src/s3v_driver.c:
--	Bump to 1.9.1 for Xv changes.
--
--2006-04-07  Aaron Plattner  <aplattner@nvidia.com>
--
--	* src/s3v_xv.c:
--	Add a DrawablePtr argument to the XV functions to pave the way for
--	redirected video.
--
--2006-04-07  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	* src/s3v.h:
--	* src/s3v_dga.c:
--	* src/s3v_driver.c:
--	* src/s3v_i2c.c:
--	* src/s3v_shadow.c:
--	Unlibcwrap.  Bump server version requirement.  Bump to 1.9.0.
--
--2006-02-08  Luc Verhaegen <libv@skynet.be>
--
--	* src/s3v.h:
--	* src/s3v_driver.c: (S3VPreInit):
--
--	Remove another insane use of pScrn->clock. Code ended up being ignored
--	anyway.
--
--2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version for X11R7 release.
--
--2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for final X11R7 release candidate.
--
--2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* man/Makefile.am:
--	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
--
--2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for X11R7 RC3 release.
--
--2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Remove extraneous AC_MSG_RESULT.
--
--2005-11-29  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	Only build dlloader modules by default.
--
--2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for X11R7 RC2 release.
--
--2005-11-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update pkgcheck dependencies to work with separate build roots.
-diff --git a/Makefile.am b/Makefile.am
-index 4443535..8467821 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,12 +18,17 @@
- #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--AUTOMAKE_OPTIONS = foreign
- SUBDIRS = src man
-+MAINTAINERCLEANFILES = ChangeLog INSTALL
- 
--if BUILD_LINUXDOC
--README: README.sgml
--	$(MAKE_TEXT) README.sgml && mv README.txt README
--endif
-+EXTRA_DIST = CALLMAP
- 
--EXTRA_DIST = CALLMAP TODO_NOTES README.sgml
-+.PHONY: ChangeLog INSTALL
-+
-+INSTALL:
-+	$(INSTALL_CMD)
-+
-+ChangeLog:
-+	$(CHANGELOG_CMD)
-+
-+dist-hook: ChangeLog INSTALL
-diff --git a/README b/README
-index 72b75b2..036eec8 100644
---- a/README
-+++ b/README
-@@ -1,112 +1,88 @@
--xf86-video-s3virge - S3 ViRGE video driver for the Xorg X server
--
--Please submit bugs & patches to the Xorg bugzilla:
--
--        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
--
--All questions regarding this software should be directed at the
--Xorg mailing list:
--
--        http://lists.freedesktop.org/mailman/listinfo/xorg
--
--The master development code repository can be found at:
--
--        git://anongit.freedesktop.org/git/xorg/driver/xf86-video-s3virge
--
--        http://cgit.freedesktop.org/xorg/driver/xf86-video-s3virge
--
--For more information on the git code manager, see:
--
--        http://wiki.x.org/wiki/GitPage
--
--------------------------------------------------------------------------
--What works: 
--- Supports 8bpp, 15/16bpp, 24bpp and 32bpp. Heavy testing on ViRGE DX.
--- There is some known instability in ViRGE GX2, please report problems.
--- Silken Mouse is enabled by default, use the generic server option of
--  -nosilk to disable it.
--
--XCONFIG options:
--
--The driver supports quite a few different XConfig options, which can
--be used to tune the driver and improve performance. Without any options, 
--the driver will use conservative settings which should work on most
--hardware. Large improvements in performance are possible by selecting
--the proper options, which will probably work on most systems.
--
--Cursor:
--
--- "hwcursor" "off" behaves exactly like "swcursor".  Default: "on"
--- "swcursor" will disable the HW Cursor.  HW Cursor is used by default and
--	no option is needed to enable it.
--
--Display:
--- "ShadowFB"  Use shadow framebuffer.  Disables HW acceleration.  Default: off.
--- "Rotate" " cw "|" ccw "  Rotate the screen CW - clockwise or CCW - counter
--    clockwise.  Disables HW Acceleration and HW Cursor, uses ShadowFB.
--    Default: no rotation.
--- "XVideo"  Disable XVideo support by using the off option.  This changes FIFO
--    settings which prevent screen noise for high-res modes.  Default: on
--
--Video memory:
--
--- "slow_edodram" will switch the standard ViRGE to 2-cycle edo mode. Try this
--	if you encounter pixel corruption on the ViRGE. Using this option will
--	cause a large decrease in performance. 
--- "fpm_vram" will switch the ViRGE/VX to fast page mode vram mode
--- "slow_dram " | " fast_dram"  Change Trio 3D and 3D/2X memory options.
--    Default: Use BIOS defaults.
--- "early_ras_precharge", "late_ras_precharge" adjust memory parameters.  One
--	of these will us the same settings as your video card defaults, and
--	using neither in the config file does the same.
--- "set_mclk" sets the memory clock, format is:
--	Option "set_mclk" "50000" 
--	in the XF86Config file.  Valid values are any 
--	integer <= 100000, where 100000 == 100 MHz.
--- "set_refclk" sets the ref clock for ViRGE MX, format is:
--	Option "set_refclk" "50000" 
--
--Acceleration and graphic engine:
-- 
--- "NoAccel" turns off all acceleration
--- "fifo_aggressive", "fifo_moderate" and "fifo_conservative" alter the settings
--	for the threshold at which the pixel FIFO takes over the internal 
--	memory bus to refill itself. The smaller this threshold, the better
--	the acceleration performance of the card. You may try the fastest 
--	setting ("aggressive") and move down if you encounter pixel corruption.
--	The optimal setting will probably depend on dot-clock and on color 
--	depth. Note that specifying any of these options will also alter other
--	memory settings which should increase performance, so you should at
--        least use "fifo_conservative" (this uses the chip defaults).
--- Common XAA acceleration options to disable primitives for test purposes:
--	"XaaNoScreenToScreenCopy"
--	"XaaNoSolidFillRect"
--	"XaaNoColor8x8PatternFillRect"
--	"XaaNoImageWriteRect"
--	"XaaNoPixmapCache"
--
--PCI bus:
--- "pci_burst" will enable PCI burst mode. This should work on all but a
--	few "broken" PCI chipsets, and will increase performance.  Option may
--	take a parameter "on", "off", "yes", etc...
--- "pci_retry" will allow the driver to rely on PCI Retry to program the 
--	ViRGE registers. "pci_burst" must be enabled for this to work. 
--	This will increase performance, especially for small fills/blits, 
--        because the driver does not have to poll the ViRGE before sending it 
--        commands to make sure it is ready. It should work on most 
--        recent PCI chipsets. 
--
--ViRGE MX LCD options:
--- "lcd_center"
--- "set_lcdclk" allows setting the clock for a ViRGE MX LCD display. Format is:
--	Option "set_lcdclk" "30000"
--	in the config file.  Valid values are ?
--
--Debug:
--- "ShowCache"  Enable or disable viewing offscreen cache memory.  A
--    development debug option.  Default: off.
--- "mx_cr3a_fix"  Enable or disable a cr3a fix added for ViRGE MX.
--    Default: on.
--
--
--$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/README,v 1.9 2000/06/14 21:57:54 dawes Exp $
-+  Information for S3 ViRGE Users
-+  The XFree86 Project Inc.
-+  19 Dec 2001
-+  ____________________________________________________________
-+
-+  Table of Contents
-+
-+
-+  1. Supported hardware
-+  2. Features:
-+  3. Configuration:
-+  4. Documentation:
-+  5. Support:
-+  6. Authors
-+
-+
-+  ______________________________________________________________________
-+
-+  1.  Supported hardware
-+
-+  The s3virge driver in X11R7.5 supports the S3 ViRGE, ViRGE DX, GX,
-+  GX2, MX, MX+, and VX chipsets. It also supports Trio3D and Trio3D/2x
-+  chips. A majority of testing is done on ViRGE DX chips, making them
-+  the most stable to date. This release has added support for doublescan
-+  modes on DX.
-+
-+  This driver is moderately stable, however please use caution with any
-+  new install. Please report any problems to bugzilla.freedesktop.org,
-+  using the xorg component.
-+
-+
-+  2.  Features:
-+
-+
-+
-+  o  Fully accelerated support for S3 ViRGE family video adapters
-+
-+  o  uses linear frame buffer
-+
-+  o  supports resolutions up to 2048x2048
-+
-+  o  supports color depths of 8, 15, 16 and 24
-+
-+  o  full use of video card memory for acceleration caching when visible
-+     framebuffer leaves extra memory
-+
-+  o  XVideo on DX, GX, GX2, MX, MX+ and Trio3D/2X at depth 16 and 24
-+
-+  o  Doublescan modes on DX, possibly others (untested)
-+
-+
-+  3.  Configuration:
-+
-+
-+  The driver auto-detects RAM size, RAMDAC and ClockChip. Do not bother
-+  putting these in your "Device" section.
-+
-+
-+  4.  Documentation:
-+
-+
-+  The driver has several supported options which are documented in the
-+  s3virge man page. Please refer to it for additional details about
-+  configuration options.
-+
-+
-+  5.  Support:
-+
-+  For support with X11R7.5 video drivers please refer to our web site at
-+  wiki.x.org <http://wiki.x.org>.
-+
-+
-+  6.  Authors
-+
-+
-+
-+  o  Mark Vojkovich  <mailto:mvojkovich@nvidia.com>
-+
-+  o  Sebastien Marineau
-+
-+  o  Harald Koenig  <mailto:koenig@tat.physik.uni-tuebingen.de>
-+
-+  o  Matt Grossman  <mailto:mattg@oz.net>
-+
-+  o  Kevin Brosius  <mailto:cobra@compuserve.com>
-+
-+
-+
-diff --git a/README.sgml b/README.sgml
-deleted file mode 100644
-index e47b8c4..0000000
---- a/README.sgml
-+++ /dev/null
-@@ -1,61 +0,0 @@
--<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
--<!ENTITY % defs SYSTEM "defs.ent"> %defs;
--]>
--
--<article>
--<title> Information for S3 ViRGE Users
--<author>The XFree86 Project Inc.
--<date>19 Dec 2001
--
--<ident>
--</ident>
--
--<toc>
--
--<sect> Supported hardware
--<p>
--The s3virge driver in X11R&relvers; supports the S3 ViRGE, ViRGE DX, GX, GX2, MX, MX+, and VX chipsets.  It also supports Trio3D and Trio3D/2x chips.  A majority of testing is done on ViRGE DX chips, making them the most stable to date.  This release has added support for doublescan modes on DX.
--
--This driver is moderately stable, however please use caution with any new install.  Please report any problems to bugzilla.freedesktop.org, using the xorg component.
--
--<sect>Features:
--<p>
--
--<itemize>
--<item>Fully accelerated support for S3 ViRGE family video adapters
--<item>uses linear frame buffer
--<item>supports resolutions up to 2048x2048
--<item>supports color depths of 8, 15, 16 and 24
--<item>full use of video card memory for acceleration caching when visible framebuffer leaves extra memory
--<item>XVideo on DX, GX, GX2, MX, MX+ and Trio3D/2X at depth 16 and 24
--<item>Doublescan modes on DX, possibly others (untested)
--</itemize>
--
--<sect>Configuration:
--<p>
--
--The driver auto-detects RAM size, RAMDAC and ClockChip. Do not bother putting 
--these in your "Device" section. 
--
--<sect>Documentation:
--<p>
--
--The driver has several supported options which are documented in the s3virge man
--page.  Please refer to it for additional details about configuration options.
--
--<sect>Support:
--<p>
--For support with X11R&relvers video drivers please refer to our web site at <url name="wiki.x.org" url="http://wiki.x.org">. 
--
--<sect>Authors
--<p>
--
--<itemize>
--<item>Mark Vojkovich <email>mvojkovich@nvidia.com</email>
--<item>Sebastien Marineau
--<item>Harald Koenig <email>koenig@tat.physik.uni-tuebingen.de</email>
--<item>Matt Grossman <email>mattg@oz.net</email>
--<item>Kevin Brosius <email>cobra@compuserve.com</email>
--</itemize>
--
--</article>
-diff --git a/TODO b/TODO
-new file mode 100644
-index 0000000..de5920b
---- /dev/null
-+++ b/TODO
-@@ -0,0 +1,326 @@
-+S3 ViRGE 4.0 devel notes
-+
-+
-+
-+Status
-+------
-+1/26/2003
-+Ver 1.8.6
-+Pre-4.3.0 release.  320x240 doublescan support w/mouse adjust,
-+power management printouts, DAC error printout fix, log XVideo status based
-+on chipset, preliminary support for disabling XV when a mode doesn't
-+support it.
-+
-+5/18/2002
-+Ver 1.8.5
-+320x240 mode support (doublescan).
-+
-+2/2/02
-+Ver 1.8.4
-+Make 320x240 mode work in depth 15 & 16.
-+Testing, need to switch streams on/off based on dblscan_v flag and mode.
-+Virge MX panel_on test (doesn't work.)
-+
-+1/10/02
-+Ver 1.8.3
-+DGA fix, buffer pointer used wrong value.  Submitted for 4.2.0 (late).
-+
-+Ver 1.8.2
-+DPMS testing (display DPMS status, disable MX LCD panel), DGA testing.
-+
-+11/11/01 KJB
-+Ver 1.8.1
-+ViRGE MX (& GX2) fix to CR63 for problems with modes < 1024x768 from 
-+max <sunmax@libero.it>. Submitted for 4.2.0.
-+
-+11/5/01 KJB
-+Ver 1.8.0
-+ViRGE MX & GX2 XVideo changes.  Fix overlap/color keying on MX, fix
-+and enable GX2 XVideo.
-+Submitted for 4.2.0.
-+
-+11/4/01 KJB
-+Ver 1.7.0
-+Bump version for 4.2.0.  Update man and README.
-+
-+11/3/01 KJB
-+Ver 1.6.16
-+Pre-4.2.0 patch.  cr3a fix, virge mx xvideo support, xvideo disable option
-+(helps with high res modes on dx and screen noise), remove accel solid
-+fill rect for trio3d, bring over some trio3d and mx fixes from 4.0.3 test
-+drivers.  Includes VERBLEV bump to 5 to remove register dumps in log file.
-+
-+Ver 1.6.15
-+Experimental - Scanline color expand - GX2
-+
-+9/21/01 KJB
-+Ver 1.6.14
-+ModeInit - cr3a for MX/GX2, don't clear reserved bit 0x40 (revert change).
-+Back out previous cr3a patch for testing.
-+
-+9/18/01 KJB
-+Ver 1.6.13
-+Option "xvideo" added.  Add patch provided by Sven Menke
-+<Menke@SLAC.Stanford.EDU> for XV support on MX (slight changes to logic).
-+
-+Ver 1.6.12
-+Adam J. Richter's cr3a fix (possibly temporary).
-+
-+5/30/01 KJB
-+Ver 1.6.10
-+Disable MaxHValue & MaxVValue setting.
-+
-+1/03/01 KJB
-+Ver 1.6.0
-+Revert ViRGE to pre-Xv changes.  ViRGE DX still supports Xv, but changes
-+added for Xv and ViRGE caused problems with normal display.
-+
-+11/27/00 KJB
-+Ver 1.5.0
-+Clean up, bump version for 4.0.2 submission.
-+CR3A, bit 0x40 (reserved) cleared for MX/GX2.  Update man page.
-+
-+11/24/00 KJB
-+Disable CPU to screen color expansion on GX2, causes lockups on GX2 with
-+'locate html' in an xterm.  Add WaitCmd code to prevent accelerator and
-+reg command path activity at the same time on GX2.
-+XVideo fixes, left side clipping fixed for video windows extending off left
-+side of screen.  Add horizontal filtering modes for 1-2x and >3x scaling.
-+
-+11/7/00 KJB
-+Ver 1.4.0
-+Enable MX fixes, testing with accel BLT_BUG set is worse on GX2, so left
-+it out.  BLT_BUG wasn't being enabled on ViRGE & VX because of case usage,
-+enabled now.  Re-enable silken mouse for GX2.  Add Render/fbPicture support.
-+Fix a few compiler warnings.
-+
-+11/5/00 KJB
-+Continued work on GX2, much stabler now, but I think there is a lockup case
-+left if you enable pci_burst and pci_retry with accel.  I still see screen
-+flashes with vertical bars once in a while, and the log reports a GEReset.
-+Added fbPicture (render) support, untested.  XV code for GX2 is added,
-+but not working yet.
-+
-+10/29/00 KJB
-+Much work on GX2, now SWCursor locks up but HWCursor is stable, go figure.
-+Loading Netscape a couple times with the mail window was enough to lock it
-+up twice in a row.  Server was locked but not a box (PCI) lock.  Also, 
-+vertical barring still occurred a couple times, so HW cursor wasn't causing
-+that.  Try blt_bug flag again for lock up case.  And attach to debug server
-+and bt...  Sleep now...
-+
-+10/21/00 KJB
-+Ver 1.3.0
-+Depth 16 Xv support added.  Testing on ViRGE DX.  1280x1024x24 is noisy, so
-+needs FIFO tuning.
-+
-+9/27/00 KJB
-+Initial Xv support in depth 24.
-+
-+9/10/00 KJB
-+Convert to FB.  Add option "UseFB", default true.  Added
-+VerticalRetraceWait timeout back as default.  #if0 out the line accel
-+code in s3v_accel.c.  The Subsequent...Bresenham line code causes a lockup
-+when used with fb.  We didn't have any hardware accel in there anyway...
-+
-+7/25/00 KJB
-+Started Xv additions.
-+
-+6/26/00 KJB
-+GX2 seems to have an accel bug.  I see the entire screen go solid color or
-+a wide stripe pattern for about 1 second.  The S3VGEReset gets called twice,
-+and then everything is okay.  Unless SilkenMouse is enabled...  That seems to
-+get you a server lock instead.  Short term is to disable SilkenMouse for GX2
-+only.  SilkenMouse isn't really the problem of course, it just happens that if
-+we move the mouse during the 1 second engine lockup we appear more likely to
-+never recover.
-+
-+6/23/00 KJB
-+Ver 1.2.0 - Fix console corruption on GX2 caused by reserved bit use in CR3A.
-+Fix GX2 noise on screen in hi-res depth 24 by increasing FIFO fill threshold. 
-+
-+6/12/00 KJB
-+Ver 1.1.0 - Add Init for SilkenMouse, add xf86SetBackingStore call, move
-+int10Symbols[] to remove warnings.
-+
-+3/3/00 KJB
-+Ver 1.0.0 - S3VProbeDDC code for X -configure option added, add timeout to
-+WAITIDLE macro in s3v_macros.h, change ImageWriteFlags adding NO_GXCOPY.
-+Start of GX2 fixes, use CR regs for FIFO settings.  Update copyrights.
-+
-+2/11/00 KJB
-+Ver 0.11.0 - Add cfb16/24BresS to module symbols to remove warnings.
-+Fix viewport restore problem after EnterVT in 24 bpp.
-+Clean up log output, removing register dumps from normal console log.
-+
-+6/26/99 KJB
-+Make the memory settings for fifo_conservative the default, 'fifo_conservative'
-+does nothing additional now.  Patch includes DGA2 additions below, non-working.
-+Expected to be included in 3.9Pu.
-+
-+Changes in 3.9Pt by others include additions for newer RAC support.  Some reports
-+say multi-head works now with ViRGE.
-+
-+6/17/99 KJB
-+Ver 0.9.0 - Prelim DGA2 support modeled after MGA.
-+
-+5/28/99 KJB
-+Ver 0.8.0 - Changes to 3.9Po - Cleaned up debug register printing function, minor
-+changes to man page, remove S3V.sgml and add new s3virge.sgml in doc/sgml, also
-+remove README.S3V from doc directory.
-+
-+
-+4/5/99 KJB
-+3.9Ph - Ver 0.7.0 - Virge man page added, HW Cursor fixed, rename chipsets removing
-+slashes in the names.
-+
-+03/27/99 KJB
-+Ver 0.6.0 - hwcursor additions, added s3v_hwcurs.c and Option "swcursor".
-+Default is hwcursor, Option "swcursor" will disable it.
-+
-+Ver 0.5.0 - patch against 3.9Pf (seq 2615), fix depth 24 and Accel flags, sync pci_burst option to previous changes, remove s3v_comp.h and s3v_pio.c and merge as needed.
-+
-+03/21/99 KJB
-+3.9Pf has Matt Grossman's Alpha changes.
-+For next patch - remove s3v_pio.c and s3v_comp.h.  Include the EnableMMIO and
-+DisableMMIO functions from s3v_pio.c in s3v_driver.c.
-+
-+03/02/99 KJB
-+3.9Pc - depth 24 doesn't work on my ViRGE DX.  NoAccel doesn't start, accel does
-+but has blocky noise.
-+
-+03/01/99 KJB
-+Macro change done, VGAIN/VGAOUT for register access, INREG/OUTREG for s3v_accel.c.
-+Added Mark Vojkovich's re-write of the accel code.  It may only be clean for ViRGE DX
-+at the moment.  x11perf showed a couple artifacts in 'move window via parent'.
-+In progress, attempt to call cfbScreenInit() functions after MapMem/EnterVT.  Not
-+working yet.  Version stamped 0.4.0.
-+
-+02/22/99 KJB
-+Macro change coming to add Mark's accel update.  VGAOUT for old stuff and MEMOUT
-+for new stuff?  That way there's no confusion with the old INREG/OUTREG macros.
-+Or maybe just stick with INREG/OUTREG for new stuff.
-+
-+01/30/99 KJB
-+Version stamp 0.3.0.  Changed Chipset flags to use PCI IDs exclusively, also use
-+common/xf86PciInfo.h for PCI IDs rather than coding them in regs3v.h.
-+
-+11/28/98 KJB
-+Bumped version stamp to 0.2, expect code in 3.9No.  Cleaned up s3v.h and
-+s3v_driver.c by removing unused definition & code sections.  Added
-+options set_mclk (from 3.3.2) and set_lcdclk (3.3.3 MX).  Code support
-+from 3.3.3 for ViRGE GX2 and MX+ is included.
-+Disabled call to 32 bpp AccelInit to get -depth 24 -bpp 32 working again.
-+
-+11/27/98 KJB
-+More 3.3.3 import.
-+New registers saved, CR40,CR45,SR8,(for MX) SR29,SR45,SR55,SR56,SR57.
-+Reviewed s3vdriver.h, rehs3v.h, newmmio.h, s3v_accel.c, s3v_driver.c.
-+Added ViRGE MX, MX+ & GX2 support.  Re-synced parts of mode save and init
-+with 3.3.3 versions.  Added timeout ability for WaitIdle() and friends.
-+Added chipnames and numbers to Chipsets struct.
-+
-+11/26/98 KJB
-+Import additions from 3.3.3, newmmio.h, regs3v.h,
-+
-+Trap fills disabled because they don't match cfb, pixmap cache & ImageWrite
-+working, fixed depth 8 color loss on VT switches, INREG & OUTREG modified to
-+use a single offset value instead of adding the base and offset together.
-+
-+11/18/98 KJB
-+3.9Nn
-+Acceleration working for Bitblt, ScreenToScreenCopy, Color 8x8 Rect fills,
-+and Rect/Trap fills.
-+Trap fills do not support transparency, so that needs to be exported to XAA.
-+
-+
-+10/31/98 KJB
-+Working depth 8, discolored dep 16 but runs, dep 24 screen goes black, 
-+C-A-Bkspc restores text console.  At 3.9Nk tree level, module would not
-+load in Loader server.  why?  Static server tested.
-+
-+10/29/98 KJB
-+ModeInit() needs work, options are heavily #if'd to try and get 8bpp
-+working.
-+
-+10/16/98 KJB
-+General 4.0 architecture is setup.  Presently at 3.9Nc level, if moved
-+to a newer tree you will need to add the resource handling functions from
-+Egbert (I haven't tackled that yet).
-+
-+At the moment the ScreenInit() function is coded to return FALSE.  On my
-+ViRGE DX card this version does not lock up, but it does destroy the
-+video mode.  Make sure you have an external terminal or network connection
-+if you run it (or blindly do a restart from your main terminal).  I make
-+no guarantees that it won't hard lock other versions of ViRGE.
-+
-+I've left out the Alpha memory mapping, along with all option processing.
-+Those will need to be done once the driver is minimally working.
-+
-+Note that everything in s3v_driver.c is MMIO only.  There are a pair of
-+PIO functions in s3v_pio.c, but that is the only place.  See notes below
-+about my ViRGE DX BIOS and why I needed to do this on my hardware.
-+
-+Other stuff...
-+Some test stuff is assuming 8bpp, so 16 & 24 are broken.
-+On my hardware, I am presently trying to get the Save/Restore sequence to
-+recover the video mode.  At the moment, when I run this driver, I get:
-+ScreenInit() runs to completion.
-+It returns FALSE, so the Server aborts.
-+LeaveVT() is called, and runs to completion.
-+The Server exits gracefully, but my monitor goes powersaver and the video
-+mode is not recovered.
-+
-+
-+
-+TODO items
-+----------
-+1/30/03 General option "videoram" is ignored by the virge driver.
-+  (Meelis Roos)
-+3/24/02 Xv reported to not work as secondary in Xinerama multihead.
-+  (xav on irc)
-+3/24/02 DPMS doesn't fully disable the screen.  Blue line across the
-+  center in all modes. (xav on irc)
-+3/25/02 Secondary reports primary BIOS during int10 detection. ie:
-+
-+(II) S3VIRGE(1): VESA BIOS detected
-+(II) S3VIRGE(1): VESA VBE Version 2.0
-+(II) S3VIRGE(1): VESA VBE Total Mem: 4194240 kB
-+(II) S3VIRGE(1): VESA VBE OEM: ATI RAGE128
-+(II) S3VIRGE(1): VESA VBE OEM Software Rev: 1.0
-+(II) S3VIRGE(1): VESA VBE OEM Vendor: ATI Technologies Inc.
-+(II) S3VIRGE(1): VESA VBE OEM Product: R128
-+(II) S3VIRGE(1): VESA VBE OEM Product Rev: 01.00
-+
-+(xav on irc)
-+
-+
-+Check CR65 usage, bit 2 set based on S3_EARLY_SC?  In my manual bit 2 is
-+enable MMIO to RAMDAC registers.
-+
-+Notes:
-+----------
-+
-+/config/cf/xfree86.cf
-+
-+have to add s3v to XF86CardDrivers for imake to make the 
-+drivers/s3v Makefile.
-+
-+To remake makefiles, after editing Imakefile, go to dir above drivers/s3v
-+and do a 'make Makefiles'.
-+
-+For debug, make CDEBUGFLAGS='-g -DDEBUG', adding -DMetroLink enables
-+timeout for VerticalRetraceWait().
-+
-+
-+
-+S3 ViRGE DX stuff:
-+
-+Card seems to power up (or BIOS forces) with MMIO disabled.  All flavors are
-+disabled, because CR53 comes up as 0.  This may preclude using this card
-+as the second device in a multi-head situation although David D. says that
-+the new config. management stuff may help here.
-+
-+
-+
-+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES,v 1.23 2003/02/13 03:21:33 dawes Exp $
-diff --git a/TODO_NOTES b/TODO_NOTES
-deleted file mode 100644
-index de5920b..0000000
---- a/TODO_NOTES
-+++ /dev/null
-@@ -1,326 +0,0 @@
--S3 ViRGE 4.0 devel notes
--
--
--
--Status
--------
--1/26/2003
--Ver 1.8.6
--Pre-4.3.0 release.  320x240 doublescan support w/mouse adjust,
--power management printouts, DAC error printout fix, log XVideo status based
--on chipset, preliminary support for disabling XV when a mode doesn't
--support it.
--
--5/18/2002
--Ver 1.8.5
--320x240 mode support (doublescan).
--
--2/2/02
--Ver 1.8.4
--Make 320x240 mode work in depth 15 & 16.
--Testing, need to switch streams on/off based on dblscan_v flag and mode.
--Virge MX panel_on test (doesn't work.)
--
--1/10/02
--Ver 1.8.3
--DGA fix, buffer pointer used wrong value.  Submitted for 4.2.0 (late).
--
--Ver 1.8.2
--DPMS testing (display DPMS status, disable MX LCD panel), DGA testing.
--
--11/11/01 KJB
--Ver 1.8.1
--ViRGE MX (& GX2) fix to CR63 for problems with modes < 1024x768 from 
--max <sunmax@libero.it>. Submitted for 4.2.0.
--
--11/5/01 KJB
--Ver 1.8.0
--ViRGE MX & GX2 XVideo changes.  Fix overlap/color keying on MX, fix
--and enable GX2 XVideo.
--Submitted for 4.2.0.
--
--11/4/01 KJB
--Ver 1.7.0
--Bump version for 4.2.0.  Update man and README.
--
--11/3/01 KJB
--Ver 1.6.16
--Pre-4.2.0 patch.  cr3a fix, virge mx xvideo support, xvideo disable option
--(helps with high res modes on dx and screen noise), remove accel solid
--fill rect for trio3d, bring over some trio3d and mx fixes from 4.0.3 test
--drivers.  Includes VERBLEV bump to 5 to remove register dumps in log file.
--
--Ver 1.6.15
--Experimental - Scanline color expand - GX2
--
--9/21/01 KJB
--Ver 1.6.14
--ModeInit - cr3a for MX/GX2, don't clear reserved bit 0x40 (revert change).
--Back out previous cr3a patch for testing.
--
--9/18/01 KJB
--Ver 1.6.13
--Option "xvideo" added.  Add patch provided by Sven Menke
--<Menke@SLAC.Stanford.EDU> for XV support on MX (slight changes to logic).
--
--Ver 1.6.12
--Adam J. Richter's cr3a fix (possibly temporary).
--
--5/30/01 KJB
--Ver 1.6.10
--Disable MaxHValue & MaxVValue setting.
--
--1/03/01 KJB
--Ver 1.6.0
--Revert ViRGE to pre-Xv changes.  ViRGE DX still supports Xv, but changes
--added for Xv and ViRGE caused problems with normal display.
--
--11/27/00 KJB
--Ver 1.5.0
--Clean up, bump version for 4.0.2 submission.
--CR3A, bit 0x40 (reserved) cleared for MX/GX2.  Update man page.
--
--11/24/00 KJB
--Disable CPU to screen color expansion on GX2, causes lockups on GX2 with
--'locate html' in an xterm.  Add WaitCmd code to prevent accelerator and
--reg command path activity at the same time on GX2.
--XVideo fixes, left side clipping fixed for video windows extending off left
--side of screen.  Add horizontal filtering modes for 1-2x and >3x scaling.
--
--11/7/00 KJB
--Ver 1.4.0
--Enable MX fixes, testing with accel BLT_BUG set is worse on GX2, so left
--it out.  BLT_BUG wasn't being enabled on ViRGE & VX because of case usage,
--enabled now.  Re-enable silken mouse for GX2.  Add Render/fbPicture support.
--Fix a few compiler warnings.
--
--11/5/00 KJB
--Continued work on GX2, much stabler now, but I think there is a lockup case
--left if you enable pci_burst and pci_retry with accel.  I still see screen
--flashes with vertical bars once in a while, and the log reports a GEReset.
--Added fbPicture (render) support, untested.  XV code for GX2 is added,
--but not working yet.
--
--10/29/00 KJB
--Much work on GX2, now SWCursor locks up but HWCursor is stable, go figure.
--Loading Netscape a couple times with the mail window was enough to lock it
--up twice in a row.  Server was locked but not a box (PCI) lock.  Also, 
--vertical barring still occurred a couple times, so HW cursor wasn't causing
--that.  Try blt_bug flag again for lock up case.  And attach to debug server
--and bt...  Sleep now...
--
--10/21/00 KJB
--Ver 1.3.0
--Depth 16 Xv support added.  Testing on ViRGE DX.  1280x1024x24 is noisy, so
--needs FIFO tuning.
--
--9/27/00 KJB
--Initial Xv support in depth 24.
--
--9/10/00 KJB
--Convert to FB.  Add option "UseFB", default true.  Added
--VerticalRetraceWait timeout back as default.  #if0 out the line accel
--code in s3v_accel.c.  The Subsequent...Bresenham line code causes a lockup
--when used with fb.  We didn't have any hardware accel in there anyway...
--
--7/25/00 KJB
--Started Xv additions.
--
--6/26/00 KJB
--GX2 seems to have an accel bug.  I see the entire screen go solid color or
--a wide stripe pattern for about 1 second.  The S3VGEReset gets called twice,
--and then everything is okay.  Unless SilkenMouse is enabled...  That seems to
--get you a server lock instead.  Short term is to disable SilkenMouse for GX2
--only.  SilkenMouse isn't really the problem of course, it just happens that if
--we move the mouse during the 1 second engine lockup we appear more likely to
--never recover.
--
--6/23/00 KJB
--Ver 1.2.0 - Fix console corruption on GX2 caused by reserved bit use in CR3A.
--Fix GX2 noise on screen in hi-res depth 24 by increasing FIFO fill threshold. 
--
--6/12/00 KJB
--Ver 1.1.0 - Add Init for SilkenMouse, add xf86SetBackingStore call, move
--int10Symbols[] to remove warnings.
--
--3/3/00 KJB
--Ver 1.0.0 - S3VProbeDDC code for X -configure option added, add timeout to
--WAITIDLE macro in s3v_macros.h, change ImageWriteFlags adding NO_GXCOPY.
--Start of GX2 fixes, use CR regs for FIFO settings.  Update copyrights.
--
--2/11/00 KJB
--Ver 0.11.0 - Add cfb16/24BresS to module symbols to remove warnings.
--Fix viewport restore problem after EnterVT in 24 bpp.
--Clean up log output, removing register dumps from normal console log.
--
--6/26/99 KJB
--Make the memory settings for fifo_conservative the default, 'fifo_conservative'
--does nothing additional now.  Patch includes DGA2 additions below, non-working.
--Expected to be included in 3.9Pu.
--
--Changes in 3.9Pt by others include additions for newer RAC support.  Some reports
--say multi-head works now with ViRGE.
--
--6/17/99 KJB
--Ver 0.9.0 - Prelim DGA2 support modeled after MGA.
--
--5/28/99 KJB
--Ver 0.8.0 - Changes to 3.9Po - Cleaned up debug register printing function, minor
--changes to man page, remove S3V.sgml and add new s3virge.sgml in doc/sgml, also
--remove README.S3V from doc directory.
--
--
--4/5/99 KJB
--3.9Ph - Ver 0.7.0 - Virge man page added, HW Cursor fixed, rename chipsets removing
--slashes in the names.
--
--03/27/99 KJB
--Ver 0.6.0 - hwcursor additions, added s3v_hwcurs.c and Option "swcursor".
--Default is hwcursor, Option "swcursor" will disable it.
--
--Ver 0.5.0 - patch against 3.9Pf (seq 2615), fix depth 24 and Accel flags, sync pci_burst option to previous changes, remove s3v_comp.h and s3v_pio.c and merge as needed.
--
--03/21/99 KJB
--3.9Pf has Matt Grossman's Alpha changes.
--For next patch - remove s3v_pio.c and s3v_comp.h.  Include the EnableMMIO and
--DisableMMIO functions from s3v_pio.c in s3v_driver.c.
--
--03/02/99 KJB
--3.9Pc - depth 24 doesn't work on my ViRGE DX.  NoAccel doesn't start, accel does
--but has blocky noise.
--
--03/01/99 KJB
--Macro change done, VGAIN/VGAOUT for register access, INREG/OUTREG for s3v_accel.c.
--Added Mark Vojkovich's re-write of the accel code.  It may only be clean for ViRGE DX
--at the moment.  x11perf showed a couple artifacts in 'move window via parent'.
--In progress, attempt to call cfbScreenInit() functions after MapMem/EnterVT.  Not
--working yet.  Version stamped 0.4.0.
--
--02/22/99 KJB
--Macro change coming to add Mark's accel update.  VGAOUT for old stuff and MEMOUT
--for new stuff?  That way there's no confusion with the old INREG/OUTREG macros.
--Or maybe just stick with INREG/OUTREG for new stuff.
--
--01/30/99 KJB
--Version stamp 0.3.0.  Changed Chipset flags to use PCI IDs exclusively, also use
--common/xf86PciInfo.h for PCI IDs rather than coding them in regs3v.h.
--
--11/28/98 KJB
--Bumped version stamp to 0.2, expect code in 3.9No.  Cleaned up s3v.h and
--s3v_driver.c by removing unused definition & code sections.  Added
--options set_mclk (from 3.3.2) and set_lcdclk (3.3.3 MX).  Code support
--from 3.3.3 for ViRGE GX2 and MX+ is included.
--Disabled call to 32 bpp AccelInit to get -depth 24 -bpp 32 working again.
--
--11/27/98 KJB
--More 3.3.3 import.
--New registers saved, CR40,CR45,SR8,(for MX) SR29,SR45,SR55,SR56,SR57.
--Reviewed s3vdriver.h, rehs3v.h, newmmio.h, s3v_accel.c, s3v_driver.c.
--Added ViRGE MX, MX+ & GX2 support.  Re-synced parts of mode save and init
--with 3.3.3 versions.  Added timeout ability for WaitIdle() and friends.
--Added chipnames and numbers to Chipsets struct.
--
--11/26/98 KJB
--Import additions from 3.3.3, newmmio.h, regs3v.h,
--
--Trap fills disabled because they don't match cfb, pixmap cache & ImageWrite
--working, fixed depth 8 color loss on VT switches, INREG & OUTREG modified to
--use a single offset value instead of adding the base and offset together.
--
--11/18/98 KJB
--3.9Nn
--Acceleration working for Bitblt, ScreenToScreenCopy, Color 8x8 Rect fills,
--and Rect/Trap fills.
--Trap fills do not support transparency, so that needs to be exported to XAA.
--
--
--10/31/98 KJB
--Working depth 8, discolored dep 16 but runs, dep 24 screen goes black, 
--C-A-Bkspc restores text console.  At 3.9Nk tree level, module would not
--load in Loader server.  why?  Static server tested.
--
--10/29/98 KJB
--ModeInit() needs work, options are heavily #if'd to try and get 8bpp
--working.
--
--10/16/98 KJB
--General 4.0 architecture is setup.  Presently at 3.9Nc level, if moved
--to a newer tree you will need to add the resource handling functions from
--Egbert (I haven't tackled that yet).
--
--At the moment the ScreenInit() function is coded to return FALSE.  On my
--ViRGE DX card this version does not lock up, but it does destroy the
--video mode.  Make sure you have an external terminal or network connection
--if you run it (or blindly do a restart from your main terminal).  I make
--no guarantees that it won't hard lock other versions of ViRGE.
--
--I've left out the Alpha memory mapping, along with all option processing.
--Those will need to be done once the driver is minimally working.
--
--Note that everything in s3v_driver.c is MMIO only.  There are a pair of
--PIO functions in s3v_pio.c, but that is the only place.  See notes below
--about my ViRGE DX BIOS and why I needed to do this on my hardware.
--
--Other stuff...
--Some test stuff is assuming 8bpp, so 16 & 24 are broken.
--On my hardware, I am presently trying to get the Save/Restore sequence to
--recover the video mode.  At the moment, when I run this driver, I get:
--ScreenInit() runs to completion.
--It returns FALSE, so the Server aborts.
--LeaveVT() is called, and runs to completion.
--The Server exits gracefully, but my monitor goes powersaver and the video
--mode is not recovered.
--
--
--
--TODO items
------------
--1/30/03 General option "videoram" is ignored by the virge driver.
--  (Meelis Roos)
--3/24/02 Xv reported to not work as secondary in Xinerama multihead.
--  (xav on irc)
--3/24/02 DPMS doesn't fully disable the screen.  Blue line across the
--  center in all modes. (xav on irc)
--3/25/02 Secondary reports primary BIOS during int10 detection. ie:
--
--(II) S3VIRGE(1): VESA BIOS detected
--(II) S3VIRGE(1): VESA VBE Version 2.0
--(II) S3VIRGE(1): VESA VBE Total Mem: 4194240 kB
--(II) S3VIRGE(1): VESA VBE OEM: ATI RAGE128
--(II) S3VIRGE(1): VESA VBE OEM Software Rev: 1.0
--(II) S3VIRGE(1): VESA VBE OEM Vendor: ATI Technologies Inc.
--(II) S3VIRGE(1): VESA VBE OEM Product: R128
--(II) S3VIRGE(1): VESA VBE OEM Product Rev: 01.00
--
--(xav on irc)
--
--
--Check CR65 usage, bit 2 set based on S3_EARLY_SC?  In my manual bit 2 is
--enable MMIO to RAMDAC registers.
--
--Notes:
------------
--
--/config/cf/xfree86.cf
--
--have to add s3v to XF86CardDrivers for imake to make the 
--drivers/s3v Makefile.
--
--To remake makefiles, after editing Imakefile, go to dir above drivers/s3v
--and do a 'make Makefiles'.
--
--For debug, make CDEBUGFLAGS='-g -DDEBUG', adding -DMetroLink enables
--timeout for VerticalRetraceWait().
--
--
--
--S3 ViRGE DX stuff:
--
--Card seems to power up (or BIOS forces) with MMIO disabled.  All flavors are
--disabled, because CR53 comes up as 0.  This may preclude using this card
--as the second device in a multi-head situation although David D. says that
--the new config. management stuff may help here.
--
--
--
--$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES,v 1.23 2003/02/13 03:21:33 dawes Exp $
-diff --git a/configure.ac b/configure.ac
-index 317b5bf..1c7e9f7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,46 +20,51 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-s3virge],
--        1.10.4,
-+        [1.10.4],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-s3virge)
--
-+        [xf86-video-s3virge])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
--AM_INIT_AUTOMAKE([dist-bzip2])
--
-+# Initialize Automake
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
- AM_MAINTAINER_MODE
- 
--# Checks for programs.
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-+m4_ifndef([XORG_MACROS_VERSION],
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
-+XORG_DEFAULT_OPTIONS
-+
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
- PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
-                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
-                   HAVE_XEXTPROTO_71="no")
- AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
- 
- # Checks for libraries.
- SAVE_CPPFLAGS="$CPPFLAGS"
-@@ -69,8 +74,6 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
-               [#include "xorg-server.h"])
- CPPFLAGS="$SAVE_CPPFLAGS"
- 
--# Checks for header files.
--AC_HEADER_STDC
- 
- if test "x$XSERVER_LIBPCIACCESS" = xyes; then
-     PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
-@@ -78,20 +81,14 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=s3virge
- AC_SUBST([DRIVER_NAME])
- 
--XORG_MANPAGE_SECTIONS
--XORG_RELEASE_VERSION
--
--XORG_CHECK_LINUXDOC
--
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index f0eb29b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,27 +1,24 @@
- #
- # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
--# 
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation.
--# 
--# The above copyright notice and this permission notice shall be included
--# in all copies or substantial portions of the Software.
--# 
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
--# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
--# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
--# OTHER DEALINGS IN THE SOFTWARE.
--# 
--# Except as contained in this notice, the name of the copyright holders shall
--# not be used in advertising or otherwise to promote the sale, use or
--# other dealings in this Software without prior written authorization
--# from the copyright holders.
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the "Software"),
-+# to deal in the Software without restriction, including without limitation
-+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+# and/or sell copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice (including the next
-+# paragraph) shall be included in all copies or substantial portions of the
-+# Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+# DEALINGS IN THE SOFTWARE.
- # 
- 
- drivermandir = $(DRIVER_MAN_DIR)
-@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
- 
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- 
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/src/s3v.h b/src/s3v.h
-index 42b1f83..f4976ca 100644
---- a/src/s3v.h
-+++ b/src/s3v.h
-@@ -40,9 +40,6 @@ in this Software without prior written authorization from the XFree86 Project.
- /* Everything using inb/outb, etc needs "compiler.h" */
- #include "compiler.h"
- 
--/* Drivers for PCI hardware need this */
--#include "xf86PciInfo.h"
--
- /* Drivers that need to access the PCI config space directly need this */
- #include "xf86Pci.h"
- 
-diff --git a/src/s3v_accel.c b/src/s3v_accel.c
-index 528ab8a..7837e4a 100644
---- a/src/s3v_accel.c
-+++ b/src/s3v_accel.c
-@@ -28,7 +28,9 @@ in this Software without prior written authorization from the XFree86 Project.
- #include "config.h"
- #endif
- 
-+#include <unistd.h>
- #include "s3v.h"
-+#include "s3v_pciids.h"
- 
- #include "miline.h"
- 	/* fb includes are in s3v.h */
-diff --git a/src/s3v_dga.c b/src/s3v_dga.c
-index 7ad42db..ecf8571 100644
---- a/src/s3v_dga.c
-+++ b/src/s3v_dga.c
-@@ -62,7 +62,6 @@ in this Software without prior written authorization from the XFree86 Project.
- #include "xf86.h"
- #include "xf86_OSproc.h"
- #include "xf86Pci.h"
--#include "xf86PciInfo.h"
- #include "xaa.h"
- #include "xaalocal.h"
- #include "s3v.h"
-@@ -116,15 +115,15 @@ S3VDGAInit(ScreenPtr pScreen)
- 	   to be rewritten to accommodate depth changes in DGA mode */
- 
- 	if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
--	    newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec));
- 	    oneMore = TRUE;
- 	} else {
--	    newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
- 	    oneMore = FALSE;
- 	}
- 
- 	if(!newmodes) {
--	   xfree(modes);
-+	   free(modes);
- 	   return FALSE;
- 	}
- 	modes = newmodes;
-diff --git a/src/s3v_driver.c b/src/s3v_driver.c
-index 0928a7f..7064b1e 100644
---- a/src/s3v_driver.c
-+++ b/src/s3v_driver.c
-@@ -57,8 +57,9 @@ in this Software without prior written authorization from the XFree86 Project.
-  */
- 
- 
--	/* Most xf86 commons are already in s3v.h */
--#include	"s3v.h"
-+/* Most xf86 commons are already in s3v.h */
-+#include "s3v.h"
-+#include "s3v_pciids.h"
- 		
- 
- #include "globals.h"
-@@ -383,7 +384,7 @@ S3VFreeRec(ScrnInfoPtr pScrn)
-     PVERB5("	S3VFreeRec\n");
-     if (pScrn->driverPrivate == NULL)
- 	return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -435,7 +436,7 @@ S3VProbe(DriverPtr drv, int flags)
- 				    numDevSections, drv, &usedChips);
-     
-     /* Free it since we don't need that list after this */
--    xfree(devSections);
-+    free(devSections);
-     if (numUsed <= 0)
- 	return FALSE;
- 
-@@ -463,7 +464,7 @@ S3VProbe(DriverPtr drv, int flags)
- 	    foundScreen = TRUE;
- 	}
-     }
--    xfree(usedChips);
-+    free(usedChips);
-     PVERB5("	S3VProbe end\n");
-     return foundScreen;
- }
-@@ -519,7 +520,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
-      */
-     if (!vgaHWGetHWRec(pScrn))
- 	return FALSE;
--    
-+    vgaHWSetStdFuncs(VGAHWPTR(pScrn));
- 
-     /* Set pScrn->monitor */
-     pScrn->monitor = pScrn->confScreen->monitor;
-@@ -601,7 +602,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
-     }
-     
-     /* Process the options */
--    if (!(ps3v->Options = xalloc(sizeof(S3VOptions))))
-+    if (!(ps3v->Options = malloc(sizeof(S3VOptions))))
- 	return FALSE;
-     memcpy(ps3v->Options, S3VOptions, sizeof(S3VOptions));
-     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, ps3v->Options);
-@@ -797,7 +798,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
-     
- #ifndef XSERVER_LIBPCIACCESS
-     if (pEnt->resources) {
--	xfree(pEnt);
-+	free(pEnt);
- 	S3VFreeRec(pScrn);
- 	return FALSE;
-     }
-@@ -851,7 +852,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
-     } else {
-         ps3v->ChipRev = PCI_DEV_REVISION(ps3v->PciInfo);
-     }
--    xfree(pEnt);
-+    free(pEnt);
-     
-     /*
-      * This shouldn't happen because such problems should be caught in
-@@ -1328,8 +1329,11 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
-     /* Load XAA if needed */
-     if (!ps3v->NoAccel || ps3v->hwcursor ) {
- 	if (!xf86LoadSubModule(pScrn, "xaa")) {
--	    S3VFreeRec(pScrn);
--	    return FALSE;
-+	    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, VERBLEV,
-+			   "Falling back to shadowfb\n");
-+	    ps3v->NoAccel = 1;
-+	    ps3v->hwcursor = 0;
-+	    ps3v->shadowFB = 1;
- 	}
-     }
- 
-@@ -2326,8 +2330,6 @@ S3VScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-   pScrn = xf86Screens[pScreen->myNum];
-   					/* Get S3V rec */
-   ps3v = S3VPTR(pScrn);
--  					/* Make sure we have card access */
--/*  xf86EnableAccess(pScrn);*/
-    					/* Map MMIO regs and framebuffer */
-   if( !S3VMapMem(pScrn) )
-     return FALSE;
-@@ -2525,7 +2527,7 @@ S3VInternalScreenInit( int scrnIndex, ScreenPtr pScreen)
-   
-   if(ps3v->shadowFB) {
-       ps3v->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--      ps3v->ShadowPtr = xalloc(ps3v->ShadowPitch * height);
-+      ps3v->ShadowPtr = malloc(ps3v->ShadowPitch * height);
-       displayWidth = ps3v->ShadowPitch / (pScrn->bitsPerPixel >> 3);
-       FBStart = ps3v->ShadowPtr;
-   } else {
-@@ -3309,7 +3311,7 @@ S3VCloseScreen(int scrnIndex, ScreenPtr pScreen)
-   if (ps3v->AccelInfoRec)
-     XAADestroyInfoRec(ps3v->AccelInfoRec);
-   if (ps3v->DGAModes)
--  	xfree(ps3v->DGAModes);
-+  	free(ps3v->DGAModes);
- 
-   pScrn->vtSema = FALSE;
- 
-@@ -3518,11 +3520,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
-   S3VPtr ps3v;
-   IOADDRESS vgaCRIndex, vgaCRReg;
-   unsigned char val;
--  
-+  unsigned int PIOOffset = 0;
-+
-   PVERB5("	S3VEnableMmio\n");
-   
-   hwp = VGAHWPTR(pScrn);
-   ps3v = S3VPTR(pScrn);
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+  PIOOffset = hwp->PIOOffset;
-+#endif
-+  
-   /*
-    * enable chipset (seen on uninitialized secondary cards)
-    * might not be needed once we use the VGA softbooter
-@@ -3535,17 +3543,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
-    * to be set correctly already and MMIO _has_ to be
-    * enabled.
-    */
--  val = inb(hwp->PIOOffset + 0x3C3);               /*@@@EE*/
--  outb(hwp->PIOOffset + 0x3C3, val | 0x01);
-+  val = inb(PIOOffset + 0x3C3);               /*@@@EE*/
-+  outb(PIOOffset + 0x3C3, val | 0x01);
-   /*
-    * set CR registers to color mode
-    * in mono mode extended CR registers
-    * are not accessible. (EE 05/04/99)
-    */
--  val = inb(hwp->PIOOffset + VGA_MISC_OUT_R);      /*@@@EE*/
--  outb(hwp->PIOOffset + VGA_MISC_OUT_W, val | 0x01);
-+  val = inb(PIOOffset + VGA_MISC_OUT_R);      /*@@@EE*/
-+  outb(PIOOffset + VGA_MISC_OUT_W, val | 0x01);
-   vgaHWGetIOBase(hwp);             	/* Get VGA I/O base */
--  vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4;
-+  vgaCRIndex = PIOOffset + hwp->IOBase + 4;
-   vgaCRReg = vgaCRIndex + 1;
- #if 1
-   /*
-@@ -3564,7 +3572,7 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
-   			      	/* Enable new MMIO, if TRIO mmio is already */
- 				/* enabled, then it stays enabled. */
-   outb(vgaCRReg, ps3v->EnableMmioCR53 | 0x08);
--  outb(hwp->PIOOffset + VGA_MISC_OUT_W, val);
-+  outb(PIOOffset + VGA_MISC_OUT_W, val);
-   if (S3_TRIO_3D_SERIES(ps3v->Chipset)) {
-     outb(vgaCRIndex, 0x40);
-     val = inb(vgaCRReg);
-@@ -3586,7 +3594,10 @@ S3VDisableMmio(ScrnInfoPtr pScrn)
-   hwp = VGAHWPTR(pScrn);
-   ps3v = S3VPTR(pScrn);
- 
--  vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4;
-+  vgaCRIndex = hwp->IOBase + 4;
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+  vgaCRIndex += hwp->PIOOffset;
-+#endif
-   vgaCRReg = vgaCRIndex + 1;
-   outb(vgaCRIndex, 0x53);
- 				/* Restore register's original state */
-diff --git a/src/s3v_hwcurs.c b/src/s3v_hwcurs.c
-index 53c539f..58e8fd9 100644
---- a/src/s3v_hwcurs.c
-+++ b/src/s3v_hwcurs.c
-@@ -39,6 +39,7 @@ in this Software without prior written authorization from the XFree86 Project.
- 
- 
- #include "s3v.h"
-+#include "s3v_pciids.h"
- 
- /* protos */
- 
-diff --git a/src/s3v_i2c.c b/src/s3v_i2c.c
-index cbac21f..6bbfd1e 100644
---- a/src/s3v_i2c.c
-+++ b/src/s3v_i2c.c
-@@ -58,7 +58,6 @@ in this Software without prior written authorization from the XFree86 Project.
- #include "compiler.h"
- 
- #include "xf86Pci.h"
--#include "xf86PciInfo.h"
- 
- #include "vgaHW.h"
- 
-diff --git a/src/s3v_pciids.h b/src/s3v_pciids.h
-new file mode 100644
-index 0000000..5d11333
---- /dev/null
-+++ b/src/s3v_pciids.h
-@@ -0,0 +1,18 @@
-+#ifndef S3V_PCIIDS_H
-+#define S3V_PCIIDS_H
-+
-+#define PCI_VENDOR_S3			0x5333
-+#define PCI_CHIP_VIRGE			0x5631
-+#define PCI_CHIP_TRIO			0x8811
-+#define PCI_CHIP_TRIO64UVP		0x8814
-+#define PCI_CHIP_VIRGE_VX		0x883D
-+#define PCI_CHIP_TRIO64V2_DXGX		0x8901
-+#define PCI_CHIP_Trio3D			0x8904
-+#define PCI_CHIP_VIRGE_DXGX		0x8A01
-+#define PCI_CHIP_VIRGE_GX2		0x8A10
-+#define PCI_CHIP_Trio3D_2X		0x8A13
-+#define PCI_CHIP_VIRGE_MX		0x8C01
-+#define PCI_CHIP_VIRGE_MXPLUS		0x8C02
-+#define PCI_CHIP_VIRGE_MXP		0x8C03
-+
-+#endif /* S3V_PCIIDS_H */
-diff --git a/src/s3v_shadow.c b/src/s3v_shadow.c
-index e2e1269..82b763f 100644
---- a/src/s3v_shadow.c
-+++ b/src/s3v_shadow.c
-@@ -60,7 +60,6 @@ in this Software without prior written authorization from the XFree86 Project.
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86PciInfo.h"
- #include "xf86Pci.h"
- #include "shadowfb.h"
- #include "servermd.h"
-diff --git a/src/s3v_xv.c b/src/s3v_xv.c
-index 7e7c243..2466789 100644
---- a/src/s3v_xv.c
-+++ b/src/s3v_xv.c
-@@ -40,8 +40,9 @@ in this Software without prior written authorization from the XFree86 Project.
- #include "config.h"
- #endif
- 
--	/* Most xf86 commons are already in s3v.h */
--#include	"s3v.h"
-+/* Most xf86 commons are already in s3v.h */
-+#include "s3v.h"
-+#include "s3v_pciids.h"
- 
- #if 0
- #define OFF_DELAY 	250  /* milliseconds */
-@@ -137,7 +138,7 @@ void S3VInitVideo(ScreenPtr pScreen)
- 	    adaptors = &newAdaptor;
- 	} else {
- 	    newAdaptors =  /* need to free this someplace */
--		xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
-+		malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
- 	    if(newAdaptors) {
- 		memcpy(newAdaptors, adaptors, num_adaptors * 
- 					sizeof(XF86VideoAdaptorPtr));
-@@ -152,7 +153,7 @@ void S3VInitVideo(ScreenPtr pScreen)
-         xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- 
-     if(newAdaptors)
--	xfree(newAdaptors);
-+	free(newAdaptors);
- }
- 
- /* client libraries expect an encoding */
-@@ -301,10 +302,10 @@ S3VAllocAdaptor(ScrnInfoPtr pScrn)
-     if(!(adapt = xf86XVAllocateVideoAdaptorRec(pScrn)))
- 	return NULL;
- 
--    if(!(pPriv = xcalloc(1, sizeof(S3VPortPrivRec)  + 
-+    if(!(pPriv = calloc(1, sizeof(S3VPortPrivRec)  + 
- 			(sizeof(DevUnion) * S3V_MAX_PORTS)))) 
-     {
--	xfree(adapt);
-+	free(adapt);
- 	return NULL;
-     }
- 
diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD
index 423c0af69..d5f9a2eea 100644
--- a/extra/xf86-video-savage/PKGBUILD
+++ b/extra/xf86-video-savage/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 168586 2012-10-13 11:45:43Z andyrtr $
+# $Id: PKGBUILD 181070 2013-03-31 08:09:15Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-savage
 pkgver=2.3.6
-pkgrel=2
+pkgrel=4
 pkgdesc="X.org savage video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('savage-dri: DRI1 support from community repo')
 options=(!libtool)
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        git_fixes.diff)
+sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6'
+            'b415bab5bbad890365c649fe3daa47db23428e92b4a4d8e5aa685e9d78de668d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git_fixes.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-savage/git_fixes.diff b/extra/xf86-video-savage/git_fixes.diff
new file mode 100644
index 000000000..8d5ef49b0
--- /dev/null
+++ b/extra/xf86-video-savage/git_fixes.diff
@@ -0,0 +1,64 @@
+From 3d181030a6ba2205a57ef4665e53aed0251ccaa6 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@gmail.com>
+Date: Wed, 18 Jul 2012 08:52:38 +0000
+Subject: savage: move compat-api.h down to proper place.
+
+This screws up when DRI isn't enabled.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+---
+diff --git a/src/savage_driver.h b/src/savage_driver.h
+index b604292..ec4b1ea 100644
+--- a/src/savage_driver.h
++++ b/src/savage_driver.h
+@@ -85,8 +85,6 @@
+ #include "GL/glxint.h"
+ #include "xf86drm.h"
+ 
+-#include "compat-api.h"
+-
+ /* Totals 2 Mbytes which equals 2^16 32-byte vertices divided among up
+  * to 32 clients. */
+ #define SAVAGE_NUM_BUFFERS 32
+@@ -153,6 +151,8 @@ typedef struct _server{
+ 
+ #endif
+ 
++#include "compat-api.h"
++
+ typedef enum {
+     MT_NONE,
+     MT_CRT,
+--
+cgit v0.9.0.2-2-gbebe
+From ca9718a887ecbc59b76869af673791ab591b849b Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@gmail.com>
+Date: Sat, 22 Dec 2012 10:00:00 +0000
+Subject: savage: fix default accel arch when built with no XAA
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+---
+diff --git a/src/savage_driver.c b/src/savage_driver.c
+index 026bf5c..5b49e60 100644
+--- a/src/savage_driver.c
++++ b/src/savage_driver.c
+@@ -1267,6 +1267,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
+         from = X_DEFAULT;
+ 	char *strptr;
+         if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) {
++#ifdef HAVE_XAA_H
+ 	    if(!xf86NameCmp(strptr,"XAA")) {
+ 	        from = X_CONFIG;
+ 	        psav->useEXA = FALSE;
+@@ -1274,6 +1275,9 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
+ 	       from = X_CONFIG;
+ 	       psav->useEXA = TRUE;
+ 	    }
++#else
++	    psav->useEXA = TRUE;
++#endif
+        }
+        xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n",
+ 		psav->useEXA ? "EXA" : "XAA");
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-siliconmotion/0001-Remove-miInitializeBackingStore.patch b/extra/xf86-video-siliconmotion/0001-Remove-miInitializeBackingStore.patch
new file mode 100644
index 000000000..8552d40a4
--- /dev/null
+++ b/extra/xf86-video-siliconmotion/0001-Remove-miInitializeBackingStore.patch
@@ -0,0 +1,26 @@
+From f19d7e463c30f1364e82e8c9f87b8a8407d53680 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 9 Jan 2013 22:59:39 -0500
+Subject: [PATCH] Remove miInitializeBackingStore()
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/smi_driver.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/smi_driver.c b/src/smi_driver.c
+index 4794571..134db79 100644
+--- a/src/smi_driver.c
++++ b/src/smi_driver.c
+@@ -1750,8 +1750,6 @@ SMI_ScreenInit(SCREEN_INIT_ARGS_DECL)
+ 		   "Done writing mode.  Register dump:\n");
+     SMI_PrintRegs(pScrn);
+ 
+-    miInitializeBackingStore(pScreen);
+-
+ #ifdef HAVE_XMODES
+     xf86DiDGAInit(pScreen, (unsigned long)(pSmi->FBBase + pScrn->fbOffset));
+ #endif
+-- 
+1.8.2
+
diff --git a/extra/xf86-video-siliconmotion/PKGBUILD b/extra/xf86-video-siliconmotion/PKGBUILD
index 92a31063e..12228ae0f 100644
--- a/extra/xf86-video-siliconmotion/PKGBUILD
+++ b/extra/xf86-video-siliconmotion/PKGBUILD
@@ -1,27 +1,30 @@
-# $Id: PKGBUILD 168587 2012-10-13 11:45:47Z andyrtr $
+# $Id: PKGBUILD 180214 2013-03-18 16:09:20Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-siliconmotion
 pkgver=1.7.7
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org siliconmotion video driver"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	98_sm712_CRT_enable.diff)
+	98_sm712_CRT_enable.diff
+	0001-Remove-miInitializeBackingStore.patch)
 sha256sums=('87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa'
-            'd24016e40ee07a0cc1bedc1b9d3832c692b8a78453ac5a84bafab6ace4ff5da3')
+            'd24016e40ee07a0cc1bedc1b9d3832c692b8a78453ac5a84bafab6ace4ff5da3'
+            'c3d8cec4f301ccd739d9709a962698390f99ce9749388273c22afba739d078c6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i ${srcdir}/98_sm712_CRT_enable.diff
+  patch -Np1 -i "${srcdir}/0001-Remove-miInitializeBackingStore.patch"
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-sis/PKGBUILD b/extra/xf86-video-sis/PKGBUILD
index 2e23ccce8..e123c4a03 100644
--- a/extra/xf86-video-sis/PKGBUILD
+++ b/extra/xf86-video-sis/PKGBUILD
@@ -1,27 +1,33 @@
-# $Id: PKGBUILD 171889 2012-11-22 14:24:06Z jgc $
+# $Id: PKGBUILD 180222 2013-03-18 16:10:35Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sis
 pkgver=0.10.7
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org SiS video driver"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('sis-dri: DRI1 support from community repo')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	0001-Disable-UploadToScreen-and-DownloadFromScreen.patch)
+	0001-Disable-UploadToScreen-and-DownloadFromScreen.patch
+	git-fixes.patch
+	Xi.patch)
 sha256sums=('be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0'
-            '3108c60b3030c894fbdb1426b05d7a8281e5fa4f385e1a80e22c8813a3fb6f5b')
+            '3108c60b3030c894fbdb1426b05d7a8281e5fa4f385e1a80e22c8813a3fb6f5b'
+            '7c56b4becd4334a6bdd600ea073226bdb3e0768e4c6b81aaf98b36f1e02f5217'
+            '7a1a0b784664a0f011bd13395be1854dee407e901d2707ab1a6b8d20caa0a672')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/0001-Disable-UploadToScreen-and-DownloadFromScreen.patch"
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+  patch -Np1 -i ${srcdir}/Xi.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-sis/Xi.patch b/extra/xf86-video-sis/Xi.patch
new file mode 100644
index 000000000..74732f33a
--- /dev/null
+++ b/extra/xf86-video-sis/Xi.patch
@@ -0,0 +1,19 @@
+--- xf86-video-sis-0.10.7/src/sis_driver.c	2013-03-10 13:57:50.000000000 +0100
++++ xf86-video-sis-0.10.7/src/sis_driver.c.new	2013-03-10 13:54:48.645203559 +0100
+@@ -9378,7 +9378,15 @@
+      }
+      if(doit) {
+ 	sigstate = xf86BlockSIGIO();
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 18
++        {
++            double dx = x, dy = y;
++            miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy,
++                NULL, NULL);
++            x = (int)dx;
++            y = (int)dy;
++        }
++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
+         {
+             double dx = x, dy = y;
+             miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy);
diff --git a/extra/xf86-video-sis/git-fixes.patch b/extra/xf86-video-sis/git-fixes.patch
new file mode 100644
index 000000000..1f7fb267a
--- /dev/null
+++ b/extra/xf86-video-sis/git-fixes.patch
@@ -0,0 +1,148 @@
+From 339fb3bc032b9f35b07b90480ae82a0fd352e078 Mon Sep 17 00:00:00 2001
+From: Jan Lindemann <jan@jannet.de>
+Date: Thu, 30 Aug 2012 18:09:10 +0000
+Subject: Replace xf86UnMapVidMem with pci_device_unmap_range
+
+Mixing pci_device_map_range with xf86UnMapVidMem doesn't work too well.
+
+X.Org bug#18028 <https://bugs.freedesktop.org/show_bug.cgi?id=18028>
+
+Bug found by Bryan Henderson <bryanh@giraffe-data.com>
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index 61e8075..4c9b9cb 100644
+--- a/src/sis_driver.c
++++ b/src/sis_driver.c
+@@ -7344,7 +7344,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
+         if(pSiSEnt->MapCountIOBase) {
+ 	    pSiSEnt->MapCountIOBase--;
+ 	    if((pSiSEnt->MapCountIOBase == 0) || (pSiSEnt->forceUnmapIOBase)) {
++#ifndef XSERVER_LIBPCIACCESS
+ 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBase, (pSiS->mmioSize * 1024));
++#else
++	        pci_device_unmap_range(pSiS->PciInfo, pSiSEnt->IOBase, (pSiS->mmioSize * 1024));
++#endif
+ 		pSiSEnt->IOBase = NULL;
+ 		pSiSEnt->MapCountIOBase = 0;
+ 		pSiSEnt->forceUnmapIOBase = FALSE;
+@@ -7355,7 +7359,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
+ 	if(pSiSEnt->MapCountIOBaseDense) {
+ 	    pSiSEnt->MapCountIOBaseDense--;
+ 	    if((pSiSEnt->MapCountIOBaseDense == 0) || (pSiSEnt->forceUnmapIOBaseDense)) {
++#ifndef XSERVER_LIBPCIACCESS
+ 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
++#else
++		pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
++#endif
+ 		pSiSEnt->IOBaseDense = NULL;
+ 		pSiSEnt->MapCountIOBaseDense = 0;
+ 		pSiSEnt->forceUnmapIOBaseDense = FALSE;
+@@ -7366,7 +7374,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
+ 	if(pSiSEnt->MapCountFbBase) {
+ 	    pSiSEnt->MapCountFbBase--;
+ 	    if((pSiSEnt->MapCountFbBase == 0) || (pSiSEnt->forceUnmapFbBase)) {
++#ifndef XSERVER_LIBPCIACCESS
+ 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize);
++#else
++		pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize);
++#endif
+ 		pSiSEnt->FbBase = pSiSEnt->RealFbBase = NULL;
+ 		pSiSEnt->MapCountFbBase = 0;
+ 		pSiSEnt->forceUnmapFbBase = FALSE;
+@@ -7376,13 +7388,25 @@ SISUnmapMem(ScrnInfoPtr pScrn)
+ 	}
+     } else {
+ #endif
++#ifndef XSERVER_LIBPCIACCESS
+ 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024));
++#else
++	pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024));
++#endif
+ 	pSiS->IOBase = NULL;
+ #ifdef __alpha__
++#ifndef XSERVER_LIBPCIACCESS
+ 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024));
++#else
++	pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024));
++#endif
+ 	pSiS->IOBaseDense = NULL;
+ #endif
++#ifndef XSERVER_LIBPCIACCESS
+ 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->RealFbBase, pSiS->FbMapSize);
++#else
++	pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->RealFbBase, pSiS->FbMapSize);
++#endif
+ 	pSiS->FbBase = pSiS->RealFbBase = NULL;
+ #ifdef SISDUALHEAD
+     }
+--
+cgit v0.9.0.2-2-gbebe
+From 926d4f655c8491b68a338f50c810f6729686ec9f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:51 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index 4c9b9cb..46cfefd 100644
+--- a/src/sis_driver.c
++++ b/src/sis_driver.c
+@@ -57,7 +57,6 @@
+ #include "fb.h"
+ #include "micmap.h"
+ #include "mipointer.h"
+-#include "mibstore.h"
+ #include "edid.h"
+ 
+ #define SIS_NEED_inSISREG
+@@ -8883,7 +8882,6 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL)
+     }
+     pSiS->SiSFastVidCopyDone = TRUE;
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe
+From 7d4402786b758de3e6ce2641e15a39d612d5c518 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 15 Oct 2012 23:11:30 +0000
+Subject: Stop including xf86Priv.h
+
+As the name might suggest, it's server-private.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/sis.h b/src/sis.h
+index 46fca2a..20e6134 100644
+--- a/src/sis.h
++++ b/src/sis.h
+@@ -75,7 +75,6 @@
+ 
+ #include "compiler.h"
+ #include "xf86Pci.h"
+-#include "xf86Priv.h"
+ #include "xf86_OSproc.h"
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+ #include "xf86Resources.h"
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index 46cfefd..cefe503 100644
+--- a/src/sis_driver.c
++++ b/src/sis_driver.c
+@@ -93,6 +93,10 @@
+ #include "dri.h"
+ #endif
+ 
++#ifndef DEFAULT_DPI
++#define DEFAULT_DPI 96
++#endif
++
+ /*
+  * LookupWindow was removed with video abi 11.
+  */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-sisimedia/PKGBUILD b/extra/xf86-video-sisimedia/PKGBUILD
index 3c7340046..add01b89b 100644
--- a/extra/xf86-video-sisimedia/PKGBUILD
+++ b/extra/xf86-video-sisimedia/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 177523 2013-02-06 18:40:48Z jgc $
+# $Id: PKGBUILD 180223 2013-03-18 16:10:37Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sisimedia
 pkgver=0.9.1
-pkgrel=6
+pkgrel=7
 pkgdesc="X.org SiS 671 video driver"
 arch=(i686 x86_64)
 url="http://www.linuxconsulting.ro/xorg-drivers/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
 source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-0.9.1_20091203.tar.bz2
         xf86-video-sis-0.9.1-20102701.patch
@@ -39,6 +39,7 @@ source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-
         sisimedia-xorg-1.13.patch
         deprecated-sym2.patch
         disable-UploadToScreen-DownloadFromScreen.patch
+        remove_mibstore.h.patch
         COPYING)
 sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430'
           '61715bb86180decde55a56fad9a12d841c89fbb2'
@@ -67,6 +68,7 @@ sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430'
           '4ea333d659abe2b78f07511467c5356f39bf8695'
           '9bef0b61c0505cc64464073d73684e6933d3f84c'
           'ff95fd41be43560245caa40adc6b481f2dafca7d'
+          'e130b4b4cafa0d54426a9b9c4735ad4bf46686f5'
           'a64e244f274bcb155f892d0488a1a4b1b2f7d70d')
 
 build() {
@@ -95,6 +97,7 @@ build() {
   patch -Np0 -i "${srcdir}/fix-xv-crash.patch"
   patch -Np1 -i "${srcdir}/sisimedia-no-xaa.patch"
   patch -Np1 -i "${srcdir}/sisimedia-xorg-1.13.patch"
+  patch -Np1 -i "${srcdir}/remove_mibstore.h.patch"
 
   patch -Np1 -i "${srcdir}/deprecated-sym2.patch"
   patch -Np1 -i "${srcdir}/disable-UploadToScreen-DownloadFromScreen.patch"
diff --git a/extra/xf86-video-sisimedia/remove_mibstore.h.patch b/extra/xf86-video-sisimedia/remove_mibstore.h.patch
new file mode 100644
index 000000000..ebfa74f5a
--- /dev/null
+++ b/extra/xf86-video-sisimedia/remove_mibstore.h.patch
@@ -0,0 +1,18 @@
+--- xf86-video-sis-0.9.1/src/sis_driver.c	2013-03-10 13:02:25.000000000 +0100
++++ xf86-video-sis-0.9.1/src/sis_driver.c.new	2013-03-10 13:04:24.349309791 +0100
+@@ -86,7 +86,6 @@
+ #include "fb.h"
+ #include "micmap.h"
+ #include "mipointer.h"
+-#include "mibstore.h"
+ #include "edid.h"
+ 
+ #define SIS_NEED_inSISREG
+@@ -9637,7 +9636,6 @@
+     }
+     pSiS->SiSFastVidCopyDone = TRUE;
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
diff --git a/extra/xf86-video-sisusb/PKGBUILD b/extra/xf86-video-sisusb/PKGBUILD
index 7d9a9ee9f..14617168c 100644
--- a/extra/xf86-video-sisusb/PKGBUILD
+++ b/extra/xf86-video-sisusb/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 168589 2012-10-13 11:45:54Z andyrtr $
+# $Id: PKGBUILD 180224 2013-03-18 16:10:38Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sisusb
 pkgver=0.9.6
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org SiS USB video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046'
+            '9b64f4a9160c1055d3e01e1b603840986163a7880dbbb5c12f3a7d4c66739134')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-sisusb/git-fixes.patch b/extra/xf86-video-sisusb/git-fixes.patch
new file mode 100644
index 000000000..dc920dabd
--- /dev/null
+++ b/extra/xf86-video-sisusb/git-fixes.patch
@@ -0,0 +1,29 @@
+From 293d0902705c272b83432a955fb6a3c96dd6cea7 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:52 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
+index 539b9f1..0fdc8e9 100644
+--- a/src/sisusb_driver.c
++++ b/src/sisusb_driver.c
+@@ -39,7 +39,6 @@
+ #include "shadowfb.h"
+ #include "micmap.h"
+ #include "mipointer.h"
+-#include "mibstore.h"
+ 
+ #include "sisusb_regs.h"
+ #include "sisusb_dac.h"
+@@ -1907,7 +1906,6 @@ SISUSBScreenInit(SCREEN_INIT_ARGS_DECL)
+     /* Initialize the accelerators */
+     SiSUSBAccelInit(pScreen);
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+ 
+     /* NO SilkenMouse. Never. Ever. */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-sisusb/sisusb-0.9.4-git.patch b/extra/xf86-video-sisusb/sisusb-0.9.4-git.patch
deleted file mode 100644
index 24474954a..000000000
--- a/extra/xf86-video-sisusb/sisusb-0.9.4-git.patch
+++ /dev/null
@@ -1,794 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 86c6ac5..725d6cb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,49 +20,48 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-sisusb],
--        0.9.4,
-+        [0.9.4],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-sisusb)
--
-+        [xf86-video-sisusb])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
--          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
--XORG_PROG_RAWCPP
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
--PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
-+# Obtain compiler/linker options for the driver dependencies
-+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto pciaccess $REQUIRED_MODULES])
- PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
-                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
-                   HAVE_XEXTPROTO_71="no")
-@@ -70,17 +69,14 @@ AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
- 
- # Checks for libraries.
- 
--# Checks for header files.
--AC_HEADER_STDC
--
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=sisusb
- AC_SUBST([DRIVER_NAME])
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 1b26ac2..9ceb36f 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -31,39 +31,9 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
--
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
--
--MANDEFS =  \
--	-D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
--	-D__appmansuffix__=$(APP_MAN_SUFFIX) \
--	-D__filemansuffix__=$(FILE_MAN_SUFFIX) \
--	-D__libmansuffix__=$(LIB_MAN_SUFFIX) \
--	-D__miscmansuffix__=$(MISC_MAN_SUFFIX) \
--	-D__drivermansuffix__=$(DRIVER_MAN_SUFFIX) \
--	-D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
--	-D__xconfigfile__=xorg.conf \
--	-D__xservername__=Xorg
--
--# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
--# to cpp, because that trick does not work on all ANSI C preprocessors.
--# Delete line numbers from the cpp output (-P is not portable, I guess).
--# Allow XCOMM to be preceded by whitespace and provide a means of generating
--# output lines with trailing backslashes.
--# Allow XHASH to always be substituted, even in cases where XCOMM isn't.
--
--CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
--                       -e '/^\#line  *[0-9][0-9]*  *.*$$/d' \
--                       -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
--                       -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
--                       -e '/^[         ]*XHASH/s/XHASH/\#/' \
--                       -e '/\@\@$$/s/\@\@$$/\\/'
--
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- .man.$(DRIVER_MAN_SUFFIX):
--	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
- 
-diff --git a/man/sisusb.man b/man/sisusb.man
-index 7817cb5..6eafb8e 100644
---- a/man/sisusb.man
-+++ b/man/sisusb.man
-@@ -1,17 +1,5 @@
--.\" $XFree86$
--.\" $XdotOrg$
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
--#ifdef __xservername__
--#define __myservername__ __xservername__
--#else
--#define __myservername__ XFree86
--#endif
--#ifdef __xconfigfile__
--#define __myxconfigfile__ __xconfigfile__
--#else
--#define __myxconfigfile__ XF86Config
--#endif
- .TH SISUSB __drivermansuffix__ __vendorversion__
- .SH NAME
- sisusb \- SiS USB video driver
-@@ -25,7 +13,7 @@ sisusb \- SiS USB video driver
- .fi
- .SH DESCRIPTION
- .B sisusb
--is an __myservername__ driver for SiS (Silicon Integrated Systems) video chips that
-+is an __xservername__ driver for SiS (Silicon Integrated Systems) video chips that
- are connected via a Net2280-based USB dongle. The driver is not accelerated, but
- provides support for colordepths of 8, 16 and 24 bpp as well as Render and other
- extensions.
-@@ -39,7 +27,7 @@ driver supports USB video cards based on the following chipsets:
- The SiS315E/PRO features two CRT controllers. However, in its USB version, only
- the first output, referred to as "CRT1", is being used.
- .SH CONFIGURATION DETAILS
--Please refer to __myxconfigfile__(__filemansuffix__) for general configuration
-+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
- details and to sis(__drivermansuffix__) for more information. This manpage only
- covers a subset of the supported options.
- .PP
-@@ -81,11 +69,7 @@ for device reconnection).
- .SH "KNOWN BUGS"
- none.
- .SH "SEE ALSO"
--#ifdef __xservername__
- __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), sis(__drivermansuffix__)
--#else
--XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__), sis(__drivermansuffix__)
--#endif
- .PP
- .B "http://www.winischhofer.at/linuxsisvga.shtml"
- for more information and updates
-diff --git a/src/sisusb.h b/src/sisusb.h
-index b9992ac..82ed509 100644
---- a/src/sisusb.h
-+++ b/src/sisusb.h
-@@ -113,6 +113,14 @@
- #include <X11/extensions/Xv.h>
- #endif
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+#define _swapl(x, n) swapl(x,n)
-+#define _swaps(x, n) swaps(x,n)
-+#else
-+#define _swapl(x, n) swapl(x)
-+#define _swaps(x, n) swaps(x)
-+#endif
-+
- /* Platform/architecture related definitions: */
- 
- #undef SIS_PC_PLATFORM
-@@ -141,7 +149,6 @@
- #define UNLOCK_ALWAYS		/* Always unlock the registers (should be set!) */
- 
- /* Need that for SiSCtrl */
--#define NEED_REPLIES		/* ? */
- #define EXTENSION_PROC_ARGS void *
- #include "extnsionst.h" 			/* required */
- #include <X11/extensions/panoramiXproto.h>	/* required */
-@@ -732,7 +739,7 @@ typedef struct {
-     Bool		skipswitchcheck;
-     ULong		VBFlagsInit;
-     DisplayModePtr	currentModeLast;
--    IOADDRESS		MyPIOOffset;
-+    unsigned long		MyPIOOffset;
- 
-     char		messagebuffer[64];
-     unsigned int	VGAMapSize;		/* SiSVGA stuff */
-diff --git a/src/sisusb_dac.c b/src/sisusb_dac.c
-index 5e3eb7f..b5c4dce 100644
---- a/src/sisusb_dac.c
-+++ b/src/sisusb_dac.c
-@@ -672,7 +672,7 @@ SiSUSBMemCopyToVideoRam(SISUSBPtr pSiSUSB, UChar *to, UChar *from, int size)
-    int num, retry = 3;
-    if(pSiSUSB->sisusbfatalerror) return;
-    do {
--      lseek(pSiSUSB->sisusbdev, (int)to, SEEK_SET);
-+      lseek(pSiSUSB->sisusbdev, (uintptr_t)to, SEEK_SET);
-       num = write(pSiSUSB->sisusbdev, from, size);
-    } while((num != size) && --retry);
-    if(!retry) SiSLostConnection(pSiSUSB);
-@@ -958,7 +958,7 @@ void sisclearvram(SISUSBPtr pSiSUSB, UChar *where, unsigned int howmuch)
-    if(pSiSUSB->sisusbfatalerror) return;
-    do {
-       x.operation = SUCMD_CLRSCR;
--      x.data3 = (CARD32)where;
-+      x.data3 = (CARD32)(uintptr_t)where;
-       x.data0 = (howmuch >> 16) & 0xff;
-       x.data1 = (howmuch >> 8) & 0xff;
-       x.data2 = howmuch & 0xff;
-@@ -990,7 +990,7 @@ void SIS_MMIO_OUT8(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset, CARD8 va
-     int num, retry = 3;
-     if(pSiSUSB->sisusbfatalerror) return;
-     do {
--       lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET);
-+       lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET);
-        num = write(pSiSUSB->sisusbdev, &val, 1);
-     } while((num != 1) && --retry);
-     if(!retry) SiSLostConnection(pSiSUSB);
-@@ -1002,7 +1002,7 @@ void SIS_MMIO_OUT16(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset, CARD16
-     CARD16 buf = sisusb_cpu_to_le16(val);
-     if(pSiSUSB->sisusbfatalerror) return;
-     do {
--       lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET);
-+       lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET);
-        num = write(pSiSUSB->sisusbdev, &buf, 2);
-     } while((num != 2) && --retry);
-     if(!retry) SiSLostConnection(pSiSUSB);
-@@ -1014,7 +1014,7 @@ void SIS_MMIO_OUT32(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset, CARD32
-     CARD32 buf = sisusb_cpu_to_le32(val);
-     if(pSiSUSB->sisusbfatalerror) return;
-     do {
--       lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET);
-+       lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET);
-        num = write(pSiSUSB->sisusbdev, &buf, 4);
-     } while((num != 4) && --retry);
-     if(!retry) SiSLostConnection(pSiSUSB);
-@@ -1026,7 +1026,7 @@ CARD8 SIS_MMIO_IN8(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset)
-     CARD8 tmp;
-     if(pSiSUSB->sisusbfatalerror) return 0;
-     do {
--       lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET);
-+       lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET);
-        num = read(pSiSUSB->sisusbdev, &tmp, 1);
-     } while((num != 1) && --retry);
-     if(!retry) SiSLostConnection(pSiSUSB);
-@@ -1039,7 +1039,7 @@ CARD16 SIS_MMIO_IN16(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset)
-     CARD16 tmp;
-     if(pSiSUSB->sisusbfatalerror) return 0;
-     do {
--       lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET);
-+       lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET);
-        num = read(pSiSUSB->sisusbdev, &tmp, 2);
-     } while((num != 2) && --retry);
-     if(!retry) SiSLostConnection(pSiSUSB);
-@@ -1052,7 +1052,7 @@ CARD32 SIS_MMIO_IN32(SISUSBPtr pSiSUSB, UChar *base, unsigned int offset)
-     CARD32 tmp;
-     if(pSiSUSB->sisusbfatalerror) return 0;
-     do {
--       lseek(pSiSUSB->sisusbdev, (int)base + offset, SEEK_SET);
-+       lseek(pSiSUSB->sisusbdev, (uintptr_t)base + offset, SEEK_SET);
-        num = read(pSiSUSB->sisusbdev, &tmp, 4);
-     } while((num != 4) && --retry);
-     if(!retry) SiSLostConnection(pSiSUSB);
-diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
-index 8ba2c33..032225c 100644
---- a/src/sisusb_driver.c
-+++ b/src/sisusb_driver.c
-@@ -186,12 +186,12 @@ SISUSBFreeRec(ScrnInfoPtr pScrn)
-     /* Just to make sure... */
-     if(!pSiSUSB) return;
- 
--    if(pSiSUSB->pstate) xfree(pSiSUSB->pstate);
-+    if(pSiSUSB->pstate) free(pSiSUSB->pstate);
-     pSiSUSB->pstate = NULL;
--    if(pSiSUSB->fonts) xfree(pSiSUSB->fonts);
-+    if(pSiSUSB->fonts) free(pSiSUSB->fonts);
-     pSiSUSB->fonts = NULL;
- 
--    if(pSiSUSB->SiS_Pr) xfree(pSiSUSB->SiS_Pr);
-+    if(pSiSUSB->SiS_Pr) free(pSiSUSB->SiS_Pr);
-     pSiSUSB->SiS_Pr = NULL;
- 
-     if(pSiSUSB->sisusbdevopen) {
-@@ -200,12 +200,12 @@ SISUSBFreeRec(ScrnInfoPtr pScrn)
-     }
- 
-     if(pScrn->chipset) {
--       xfree(pScrn->chipset);
-+       free(pScrn->chipset);
-        pScrn->chipset = NULL;
-     }
- 
-     if(pScrn->driverPrivate) {
--       xfree(pScrn->driverPrivate);
-+       free(pScrn->driverPrivate);
-        pScrn->driverPrivate = NULL;
-     }
- }
-@@ -217,14 +217,14 @@ SISUSBErrorLog(ScrnInfoPtr pScrn, const char *format, ...)
-     static const char *str = "**************************************************\n";
- 
-     va_start(ap, format);
--    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
-+    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str);
-     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-     	"                      ERROR:\n");
-     xf86VDrvMsgVerb(pScrn->scrnIndex, X_ERROR, 1, format, ap);
-     va_end(ap);
-     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-     	"                  END OF MESSAGE\n");
--    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
-+    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str);
- }
- 
- static int
-@@ -248,7 +248,7 @@ SiSUSBCheckForUSBDongle(char *filename, SISUSBPtr pSiSUSB, int *filehandle)
- 
-     if((myfile = open(filename, O_RDWR, 0)) != -1) {
-        if(!ioctl(myfile, SISUSB_GET_CONFIG_SIZE, &sisusbinfosize)) {
--	  if((mysisusbinfo = xalloc(sisusbinfosize))) {
-+	  if((mysisusbinfo = malloc(sisusbinfosize))) {
- 	     if(!ioctl(myfile, (SISUSB_GET_CONFIG | (sisusbinfosize << 16)), mysisusbinfo)) {
- 		if(mysisusbinfo->sisusb_id == SISUSB_ID) {
- 		   sisusbversion = (mysisusbinfo->sisusb_version  << 16) |
-@@ -280,7 +280,7 @@ SiSUSBCheckForUSBDongle(char *filename, SISUSBPtr pSiSUSB, int *filehandle)
- 		   retval = mysisusbinfo->sisusb_minor;
- 		}
- 	     }
--	     xfree(mysisusbinfo);
-+	     free(mysisusbinfo);
- 	     mysisusbinfo = NULL;
- 	  }
-        }
-@@ -307,13 +307,13 @@ SiSUSBFindUSBDongle(GDevPtr dev, int *minorArray, int numDevSections, char **nam
-        }
-        if((p) && (*p) && (*p == '/')) {
-           gotdev = 1;
--	  *nameptr = xalloc(strlen(p) + 1);
-+	  *nameptr = malloc(strlen(p) + 1);
-           strcpy(*nameptr, p);
- 	  retval = SiSUSBCheckForUSBDongle(*nameptr, NULL, NULL);
-        } else if((p) && (*p) && (sscanf(p, "%d", &i) == 1)) {
-           if(i >= 0 && i <= 31) {
-              gotdev = 1;
--	     *nameptr = xalloc(32);
-+	     *nameptr = malloc(32);
-              sprintf(*nameptr, "/dev/sisusbvga%d", i);
-              retval = SiSUSBCheckForUSBDongle(*nameptr, NULL, NULL);
- 	     if(retval < 0) {
-@@ -324,7 +324,7 @@ SiSUSBFindUSBDongle(GDevPtr dev, int *minorArray, int numDevSections, char **nam
-        }
-     }
-     if(!gotdev) {
--       *nameptr = xalloc(32);
-+       *nameptr = malloc(32);
-        for(i = 0; i < 64; i++) {
-           if(i < 32) sprintf(*nameptr, "/dev/sisusbvga%d", i);
- 	  else       sprintf(*nameptr, "/dev/usb/sisusbvga%d", i);
-@@ -338,7 +338,7 @@ SiSUSBFindUSBDongle(GDevPtr dev, int *minorArray, int numDevSections, char **nam
-     if(retval >= 0) {
-        xf86Msg(X_INFO, "Found SiSUSB dongle (node %s, minor %d)\n", *nameptr, retval);
-     } else if((*nameptr)) {
--       xfree(*nameptr);
-+       free(*nameptr);
-        *nameptr = NULL;
-     }
- 
-@@ -401,14 +401,14 @@ SISUSBProbe(DriverPtr drv, int flags)
-      */
- 
-     /* Allocate and initialize an array of ints for storing the minors */
--    if(!(minorArray = (int *)xalloc(numDevSections * sizeof(int)))) {
-+    if(!(minorArray = (int *)malloc(numDevSections * sizeof(int)))) {
-        return FALSE;
-     }
-     for(i = 0; i < numDevSections; i++) minorArray[i] = -1;
- 
-     /* Allocate an array of char ptrs for storing the device node names */
--    if(!(devnameArray = (char **)xalloc(numDevSections * sizeof(char *)))) {
--       xfree(minorArray);
-+    if(!(devnameArray = (char **)malloc(numDevSections * sizeof(char *)))) {
-+       free(minorArray);
-        return FALSE;
-     }
- 
-@@ -420,20 +420,20 @@ SISUSBProbe(DriverPtr drv, int flags)
-        if((myminor = SiSUSBFindUSBDongle(devSections[i], minorArray, numDevSections, &nameptr)) >= 0) {
-           if(!SiSUSBFindDuplicate(myminor, minorArray, numDevSections)) {
- 	     minorArray[numUsed] = myminor;
--	     devnameArray[numUsed] = xalloc(strlen(nameptr) + 1);
-+	     devnameArray[numUsed] = malloc(strlen(nameptr) + 1);
- 	     strcpy(devnameArray[numUsed], nameptr);
-              numUsed++;
- 	  }
--	  xfree(nameptr);
-+	  free(nameptr);
-        }
-     }
- 
-     /* Free the minor array, we don't need it anymore */
--    xfree(minorArray);
-+    free(minorArray);
- 
-     if(numUsed <= 0) {
--       xfree(devSections);
--       xfree(devnameArray);
-+       free(devSections);
-+       free(devnameArray);
-        return FALSE;
-     }
- 
-@@ -470,8 +470,8 @@ SISUSBProbe(DriverPtr drv, int flags)
- 
-     }
- 
--    xfree(devSections);
--    xfree(devnameArray);
-+    free(devSections);
-+    free(devnameArray);
-     return foundScreen;
- }
- 
-@@ -622,10 +622,10 @@ SISUSBCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn)
-    if(!(nramp = xf86GetGammaRampSize(pScreen))) return;
- 
-    for(i=0; i<3; i++) {
--      ramp[i] = (UShort *)xalloc(nramp * sizeof(UShort));
-+      ramp[i] = (UShort *)malloc(nramp * sizeof(UShort));
-       if(!ramp[i]) {
--         if(ramp[0]) { xfree(ramp[0]); ramp[0] = NULL; }
--	 if(ramp[1]) { xfree(ramp[1]); ramp[1] = NULL; }
-+         if(ramp[0]) { free(ramp[0]); ramp[0] = NULL; }
-+	 if(ramp[1]) { free(ramp[1]); ramp[1] = NULL; }
-          return;
-       }
-    }
-@@ -685,9 +685,9 @@ SISUSBCalculateGammaRamp(ScreenPtr pScreen, ScrnInfoPtr pScrn)
- 
-    xf86ChangeGammaRamp(pScreen, nramp, ramp[0], ramp[1], ramp[2]);
- 
--   xfree(ramp[0]);
--   xfree(ramp[1]);
--   xfree(ramp[2]);
-+   free(ramp[0]);
-+   free(ramp[1]);
-+   free(ramp[2]);
-    ramp[0] = ramp[1] = ramp[2] = NULL;
- }
- #endif
-@@ -906,11 +906,11 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags)
- 	     Bool gotit = FALSE;
- 
- 	     if(!ioctl(fd, SISUSBFB_GET_INFO_SIZE, &sisfbinfosize)) {
--		if((mysisfbinfo = xalloc(sisfbinfosize))) {
-+		if((mysisfbinfo = malloc(sisfbinfosize))) {
- 		   if(!ioctl(fd, (SISUSBFB_GET_INFO | (sisfbinfosize << 16)), mysisfbinfo)) {
- 		      gotit = TRUE;
- 		   } else {
--		      xfree(mysisfbinfo);
-+		      free(mysisfbinfo);
- 		      mysisfbinfo = NULL;
- 		   }
- 		}
-@@ -944,7 +944,7 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags)
- 
- 		   }
- 	        }
--		xfree(mysisfbinfo);
-+		free(mysisfbinfo);
- 		mysisfbinfo = NULL;
- 	     }
- 	     close (fd);
-@@ -1147,7 +1147,7 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags)
- #endif
- 
-     if(pSiSUSB->HWCursor) {
--       if(!(pSiSUSB->USBCursorBuf = xcalloc(pSiSUSB->CursorSize * 4, 1))) pSiSUSB->HWCursor = FALSE;
-+       if(!(pSiSUSB->USBCursorBuf = calloc(pSiSUSB->CursorSize * 4, 1))) pSiSUSB->HWCursor = FALSE;
- 
-        pSiSUSB->availMem -= (pSiSUSB->CursorSize * 2);
-        if(pSiSUSB->OptUseColorCursor) pSiSUSB->availMem -= (pSiSUSB->CursorSize * 2);
-@@ -1456,8 +1456,8 @@ SISUSBMapMem(ScrnInfoPtr pScrn)
- {
-     SISUSBPtr pSiSUSB = SISUSBPTR(pScrn);
- 
--    pSiSUSB->FbBase = (UChar *)pSiSUSB->FbAddress;
--    pSiSUSB->IOBase = (UChar *)pSiSUSB->IOAddress;
-+    pSiSUSB->FbBase = (UChar *)(uintptr_t)pSiSUSB->FbAddress;
-+    pSiSUSB->IOBase = (UChar *)(uintptr_t)pSiSUSB->IOAddress;
- 
-     return TRUE;
- }
-@@ -1811,7 +1811,7 @@ SISUSBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     if(pSiSUSB->ShadowFB) {
-        pSiSUSB->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * displayWidth);
--       pSiSUSB->ShadowPtr = xalloc(pSiSUSB->ShadowPitch * height);
-+       pSiSUSB->ShadowPtr = malloc(pSiSUSB->ShadowPitch * height);
-        if(!(FBStart = pSiSUSB->ShadowPtr)) {
-           SISUSBSaveScreen(pScreen, SCREEN_SAVER_OFF);
-           SISUSBErrorLog(pScrn, "Failed to allocate shadow framebuffer\n");
-@@ -1820,7 +1820,7 @@ SISUSBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- #if X_BYTE_ORDER == X_BIG_ENDIAN
-        if(pScrn->bitsPerPixel == 16) {
-           /* For 16bpp, we need to swap the bytes in the framebuffer */
--          if(!(pSiSUSB->ShadowPtrSwap = xalloc(pSiSUSB->ShadowPitch * height))) {
-+          if(!(pSiSUSB->ShadowPtrSwap = malloc(pSiSUSB->ShadowPitch * height))) {
- 	     SISUSBSaveScreen(pScreen, SCREEN_SAVER_OFF);
-              SISUSBErrorLog(pScrn, "Failed to allocate swap buffer for shadow framebuffer\n");
-              return FALSE;
-@@ -2238,24 +2238,24 @@ SISUSBCloseScreen(int scrnIndex, ScreenPtr pScreen)
-     }
- 
-     if(pSiSUSB->USBCursorBuf) {
--       xfree(pSiSUSB->USBCursorBuf);
-+       free(pSiSUSB->USBCursorBuf);
-        pSiSUSB->USBCursorBuf = NULL;
-     }
- 
-     if(pSiSUSB->ShadowPtr) {
--       xfree(pSiSUSB->ShadowPtr);
-+       free(pSiSUSB->ShadowPtr);
-        pSiSUSB->ShadowPtr = NULL;
-     }
- 
- #if 0
-     if(pSiSUSB->PreAllocMem) {
--       xfree(pSiSUSB->PreAllocMem);
-+       free(pSiSUSB->PreAllocMem);
-        pSiSUSB->PreAllocMem = NULL;
-     }
- #endif
- 
-     if(pSiSUSB->adaptor) {
--       xfree(pSiSUSB->adaptor);
-+       free(pSiSUSB->adaptor);
-        pSiSUSB->adaptor = NULL;
-        pSiSUSB->ResetXv = pSiSUSB->ResetXvGamma = NULL;
-     }
-diff --git a/src/sisusb_init.c b/src/sisusb_init.c
-index ba44431..99ec519 100644
---- a/src/sisusb_init.c
-+++ b/src/sisusb_init.c
-@@ -1301,10 +1301,10 @@ SiSUSBBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN i
- 	 }
-       }
- 
--      if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
-+      if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
-       memset(new, 0, sizeof(DisplayModeRec));
--      if(!(new->name = xalloc(10))) {
--      	 xfree(new);
-+      if(!(new->name = malloc(10))) {
-+      	 free(new);
- 	 return first;
-       }
-       if(!first) first = new;
-diff --git a/src/sisusb_opt.c b/src/sisusb_opt.c
-index d4612b0..4d5cfa3 100644
---- a/src/sisusb_opt.c
-+++ b/src/sisusb_opt.c
-@@ -228,7 +228,7 @@ SiSUSBOptions(ScrnInfoPtr pScrn)
-     xf86CollectOptions(pScrn, NULL);
- 
-     /* Process the options */
--    if(!(pSiSUSB->Options = xalloc(sizeof(SISUSBOptions)))) return;
-+    if(!(pSiSUSB->Options = malloc(sizeof(SISUSBOptions)))) return;
- 
-     memcpy(pSiSUSB->Options, SISUSBOptions, sizeof(SISUSBOptions));
- 
-diff --git a/src/sisusb_osdef.h b/src/sisusb_osdef.h
-index 2d938ad..500bffb 100644
---- a/src/sisusb_osdef.h
-+++ b/src/sisusb_osdef.h
-@@ -77,11 +77,11 @@
- 
- #define SIS315H
- 
--#define OutPortByte(p,v) outSISREG((IOADDRESS)(p),(CARD8)(v))
--#define OutPortWord(p,v) outSISREGW((IOADDRESS)(p),(CARD16)(v))
--#define OutPortLong(p,v) outSISREGL((IOADDRESS)(p),(CARD32)(v))
--#define InPortByte(p)    inSISREG((IOADDRESS)(p))
--#define InPortWord(p)    inSISREGW((IOADDRESS)(p))
--#define InPortLong(p)    inSISREGL((IOADDRESS)(p))
-+#define OutPortByte(p,v) outSISREG((unsigned long)(p),(CARD8)(v))
-+#define OutPortWord(p,v) outSISREGW((unsigned long)(p),(CARD16)(v))
-+#define OutPortLong(p,v) outSISREGL((unsigned long)(p),(CARD32)(v))
-+#define InPortByte(p)    inSISREG((unsigned long)(p))
-+#define InPortWord(p)    inSISREGW((unsigned long)(p))
-+#define InPortLong(p)    inSISREGL((unsigned long)(p))
- 
- #endif  /* _SISUSB_OSDEF_H_ */
-diff --git a/src/sisusb_types.h b/src/sisusb_types.h
-index 04c7a7a..9fc6b41 100644
---- a/src/sisusb_types.h
-+++ b/src/sisusb_types.h
-@@ -51,6 +51,8 @@
- #ifndef _VGATYPES_
- #define _VGATYPES_
- 
-+#include <xf86Pci.h>
-+
- #ifndef FALSE
- #define FALSE   0
- #endif
-@@ -93,7 +95,7 @@ typedef unsigned char BOOLEAN;
- 
- #define SISIOMEMTYPE
- 
--typedef IOADDRESS SISIOADDRESS;
-+typedef unsigned long SISIOADDRESS;
- 
- typedef enum _SIS_CHIP_TYPE {
-     SIS_VGALegacy = 0,
-diff --git a/src/sisusb_utility.c b/src/sisusb_utility.c
-index 8c03d63..a9c1ee1 100644
---- a/src/sisusb_utility.c
-+++ b/src/sisusb_utility.c
-@@ -34,8 +34,6 @@
- #endif
- 
- #include "sisusb.h"
--#define NEED_REPLIES
--#define NEED_EVENTS
- #include <X11/X.h>
- #include "dixstruct.h"
- 
-@@ -789,10 +787,10 @@ SiSUSBProcSiSCtrlQueryVersion(ClientPtr client)
-     rep.majorVersion = SISCTRL_MAJOR_VERSION;
-     rep.minorVersion = SISCTRL_MINOR_VERSION;
-     if(client->swapped) {
--        swaps(&rep.sequenceNumber, n);
--        swapl(&rep.length, n);
--        swaps(&rep.majorVersion, n);
--        swaps(&rep.minorVersion, n);
-+        _swaps(&rep.sequenceNumber, n);
-+        _swapl(&rep.length, n);
-+        _swaps(&rep.majorVersion, n);
-+        _swaps(&rep.minorVersion, n);
-     }
-     WriteToClient(client, sizeof(xSiSCtrlQueryVersionReply), (char *)&rep);
-     return (client->noClientException);
-@@ -834,15 +832,15 @@ SiSUSBProcSiSCtrlCommand(ClientPtr client)
-     rep.sequenceNumber = client->sequence;
- 
-     if(client->swapped) {
--       swaps(&rep.sequenceNumber, n);
--       swapl(&rep.length, n);
--       swapl(&rep.screen, n);
--       swapl(&rep.sdc_id, n);
--       swapl(&rep.sdc_command, n);
--       swapl(&rep.sdc_result_header, n);
-+       _swaps(&rep.sequenceNumber, n);
-+       _swapl(&rep.length, n);
-+       _swapl(&rep.screen, n);
-+       _swapl(&rep.sdc_id, n);
-+       _swapl(&rep.sdc_command, n);
-+       _swapl(&rep.sdc_result_header, n);
-        for(i = 0; i < SDC_NUM_PARM_RESULT; i++) {
--	  swapl(&rep.sdc_parm[i], n);
--	  swapl(&rep.sdc_result[i], n);
-+	  _swapl(&rep.sdc_parm[i], n);
-+	  _swapl(&rep.sdc_result[i], n);
-        }
-     }
-     WriteToClient(client, sizeof(xSiSCtrlCommandReply), (char *)&rep);
-@@ -869,7 +867,7 @@ SiSUSBSProcSiSCtrlQueryVersion(ClientPtr client)
- {
-     REQUEST(xSiSCtrlQueryVersionReq);
-     register int n;
--    swaps(&stuff->length, n);
-+    _swaps(&stuff->length, n);
-     REQUEST_SIZE_MATCH(xSiSCtrlQueryVersionReq);
-     return SiSUSBProcSiSCtrlQueryVersion(client);
- }
-@@ -880,14 +878,14 @@ SiSUSBSProcSiSCtrlCommand(ClientPtr client)
-     REQUEST(xSiSCtrlCommandReq);
-     register int n;
-     int i;
--    swaps(&stuff->length, n);
--    swapl(&stuff->screen, n);
--    swapl(&stuff->sdc_id, n);
--    swapl(&stuff->sdc_command, n);
--    swapl(&stuff->sdc_result_header, n);
-+    _swaps(&stuff->length, n);
-+    _swapl(&stuff->screen, n);
-+    _swapl(&stuff->sdc_id, n);
-+    _swapl(&stuff->sdc_command, n);
-+    _swapl(&stuff->sdc_result_header, n);
-     for(i = 0; i < SDC_NUM_PARM_RESULT; i++) {
--       swapl(&stuff->sdc_parm[i], n);
--       swapl(&stuff->sdc_result[i], n);
-+       _swapl(&stuff->sdc_parm[i], n);
-+       _swapl(&stuff->sdc_result[i], n);
-     }
-     REQUEST_SIZE_MATCH(xSiSCtrlCommandReq);
-     return SiSUSBProcSiSCtrlCommand(client);
-@@ -911,7 +909,7 @@ SiSUSBCtrlResetProc(ExtensionEntry* extEntry)
- {
-     /* Called by CloseDownExtensions() */
-     if(extEntry->extPrivate) {
--       xfree(extEntry->extPrivate);
-+       free(extEntry->extPrivate);
-        extEntry->extPrivate = NULL;
-     }
- }
-@@ -928,7 +926,7 @@ SiSUSBCtrlExtInit(ScrnInfoPtr pScrn)
- 
-    if(!(myext = CheckExtension(SISCTRL_PROTOCOL_NAME))) {
- 
--      if(!(myctrl = xcalloc(sizeof(xSiSCtrlScreenTable), 1)))
-+      if(!(myctrl = calloc(sizeof(xSiSCtrlScreenTable), 1)))
-          return;
- 
-       if(!(myext = AddExtension(SISCTRL_PROTOCOL_NAME, 0, 0,
-@@ -938,7 +936,7 @@ SiSUSBCtrlExtInit(ScrnInfoPtr pScrn)
- 				StandardMinorOpcode))) {
-          xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- 	 		"Failed to add SISCTRL extension\n");
--	 xfree(myctrl);
-+	 free(myctrl);
- 	 return;
-       }
- 
-diff --git a/src/sisusb_video.c b/src/sisusb_video.c
-index bc469b0..1dbf4f1 100644
---- a/src/sisusb_video.c
-+++ b/src/sisusb_video.c
-@@ -216,7 +216,7 @@ void SISUSBInitVideo(ScreenPtr pScreen)
- 
-        if(newAdaptor) size++;
- 
--       newAdaptors = xalloc(size * sizeof(XF86VideoAdaptorPtr*));
-+       newAdaptors = malloc(size * sizeof(XF86VideoAdaptorPtr*));
-        if(newAdaptors) {
-           if(num_adaptors) {
-              memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
-@@ -234,7 +234,7 @@ void SISUSBInitVideo(ScreenPtr pScreen)
-     }
- 
-     if(newAdaptors) {
--       xfree(newAdaptors);
-+       free(newAdaptors);
-     }
- }
- 
-@@ -377,7 +377,7 @@ SISUSBSetupImageVideo(ScreenPtr pScreen)
-     XF86VideoAdaptorPtr adapt;
-     SISUSBPortPrivPtr pPriv;
- 
--    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
-                             sizeof(SISUSBPortPrivRec) +
-                             sizeof(DevUnion))))
-     	return NULL;
diff --git a/extra/xf86-video-tdfx/PKGBUILD b/extra/xf86-video-tdfx/PKGBUILD
index 0e13090fd..997c74f8c 100644
--- a/extra/xf86-video-tdfx/PKGBUILD
+++ b/extra/xf86-video-tdfx/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 168590 2012-10-13 11:45:58Z andyrtr $
+# $Id: PKGBUILD 180215 2013-03-18 16:09:21Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-tdfx
 pkgver=1.4.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org tdfx video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('tdfx-dri: DRI1 support from community repo')
 options=(!libtool)
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859'
+            'a79d50f619e6976b90a73f1a9842390e1b3fa37e1ce519bfbb178bd3161af9b5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-tdfx/git-fixes.patch b/extra/xf86-video-tdfx/git-fixes.patch
new file mode 100644
index 000000000..30399cf1a
--- /dev/null
+++ b/extra/xf86-video-tdfx/git-fixes.patch
@@ -0,0 +1,32 @@
+From 10498d2730c651eb7a1890eb9e728269732e9dad Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:59 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
+index ddd5431..412da07 100644
+--- a/src/tdfx_driver.c
++++ b/src/tdfx_driver.c
+@@ -62,10 +62,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #include "compiler.h"
+ 
+-/* Drivers using the mi implementation of backing store need: */
+-
+-#include "mibstore.h"
+-
+ /* All drivers using the vgahw module need this */
+ /* This driver needs to be modified to not use vgaHW for multihead operation */
+ #include "vgaHW.h"
+@@ -2373,7 +2369,6 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) {
+     }
+   }
+ 
+-  miInitializeBackingStore(pScreen);
+   xf86SetBackingStore(pScreen);
+   xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-trident/PKGBUILD b/extra/xf86-video-trident/PKGBUILD
index 5dee69638..d33c4d24d 100644
--- a/extra/xf86-video-trident/PKGBUILD
+++ b/extra/xf86-video-trident/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 169416 2012-10-20 17:43:29Z andyrtr $
+# $Id: PKGBUILD 180216 2013-03-18 16:09:22Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-trident
 pkgver=1.3.6
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org Trident video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=(!libtool)
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff)
diff --git a/extra/xf86-video-tseng/PKGBUILD b/extra/xf86-video-tseng/PKGBUILD
index a87980924..701c2dcae 100644
--- a/extra/xf86-video-tseng/PKGBUILD
+++ b/extra/xf86-video-tseng/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 168592 2012-10-13 11:46:06Z andyrtr $
+# $Id: PKGBUILD 180217 2013-03-18 16:09:23Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-tseng
 pkgver=1.2.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org tseng video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819'
+            '8a337e2bab9a5ee7ba15dde6665abcfa9559d769074873cb2a85cc86716bd5da')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-tseng/git-fixes.patch b/extra/xf86-video-tseng/git-fixes.patch
new file mode 100644
index 000000000..88f9cc570
--- /dev/null
+++ b/extra/xf86-video-tseng/git-fixes.patch
@@ -0,0 +1,31 @@
+From d2d5c8437e401181f56804cc68594c4831a0983d Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:55:02 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/tseng_driver.c b/src/tseng_driver.c
+index ffafb19..0db62e5 100644
+--- a/src/tseng_driver.c
++++ b/src/tseng_driver.c
+@@ -39,9 +39,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "fb.h"
+ 
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+@@ -1453,7 +1450,6 @@ TsengScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	}
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+     /* Initialise cursor functions */
+     miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-tseng/tseng-1.2.4-git.patch b/extra/xf86-video-tseng/tseng-1.2.4-git.patch
deleted file mode 100644
index 082b2cb0b..000000000
--- a/extra/xf86-video-tseng/tseng-1.2.4-git.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 62cc318..8458c06 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,46 +20,46 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-tseng],
--        1.2.4,
-+        [1.2.4],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-tseng)
--
-+        [xf86-video-tseng])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
-+# Initialize Automake
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--
- AM_MAINTAINER_MODE
- 
--# Require xorg-macros: XORG_DEFAULT_OPTIONS
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
--          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.3)
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
- XORG_DEFAULT_OPTIONS
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
- 
- # Checks for libraries.
-@@ -78,17 +78,14 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--# Checks for header files.
--AC_HEADER_STDC
--
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=tseng
- AC_SUBST([DRIVER_NAME])
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 8f2454b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
--
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
--
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-+
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-+
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/man/tseng.man b/man/tseng.man
-index 403782f..984c8e7 100644
---- a/man/tseng.man
-+++ b/man/tseng.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.man,v 1.2 2001/01/27 18:20:55 dawes Exp $ 
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH TSENG __drivermansuffix__ __vendorversion__
-diff --git a/src/tseng_cursor.c b/src/tseng_cursor.c
-index d4fb847..2412b31 100644
---- a/src/tseng_cursor.c
-+++ b/src/tseng_cursor.c
-@@ -159,7 +159,7 @@ TsengSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
-     }
- }
- 
--void 
-+static void 
- TsengLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *bits)
- {
-     vgaHWPtr hwp = VGAHWPTR(pScrn);
-diff --git a/src/tseng_dga.c b/src/tseng_dga.c
-index 70ebe23..528ba4c 100644
---- a/src/tseng_dga.c
-+++ b/src/tseng_dga.c
-@@ -74,9 +74,9 @@ TsengDGAInit(ScreenPtr pScreen)
-   if (!pTseng->DGAnumModes) {
-     pMode = firstMode = pScrn->modes;
-     while (pMode) {
--      newmodes = xrealloc(modes, (num + 1) * sizeof (DGAModeRec));
-+      newmodes = realloc(modes, (num + 1) * sizeof (DGAModeRec));
-       if (!newmodes) {
--	xfree(modes);
-+	free(modes);
- 	return FALSE;
-       }
-       modes = newmodes;
-@@ -135,7 +135,7 @@ Tseng_OpenFramebuffer(
-     TsengPtr pTseng = TsengPTR(pScrn);
- 
-     *name = NULL; 		/* no special device */
--    *mem = (unsigned char*)pTseng->FbAddress;
-+    *mem = (unsigned char*)(uintptr_t)pTseng->FbAddress;
-     *size = pTseng->FbMapSize;
-     *offset = 0;                /* Always */
-     *flags = 0;                 /* Root permissions OS-dependent */
-diff --git a/src/tseng_driver.c b/src/tseng_driver.c
-index 445c17e..d36b62c 100644
---- a/src/tseng_driver.c
-+++ b/src/tseng_driver.c
-@@ -269,9 +269,9 @@ TsengFreeRec(ScrnInfoPtr pScrn)
-     pTseng = TsengPTR(pScrn);
-     
-     if (pTseng->SavedReg.RAMDAC)
--        xfree(pTseng->SavedReg.RAMDAC);
-+        free(pTseng->SavedReg.RAMDAC);
- 
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -395,10 +395,10 @@ TsengProbe(DriverPtr drv, int flags)
-                 foundScreen = TRUE;
-             }
-         }
--        xfree(usedChips);
-+        free(usedChips);
-     }
-     
--    xfree(devSections);
-+    free(devSections);
-     return foundScreen;
- }
- 
-@@ -806,7 +806,7 @@ TsengProcessOptions(ScrnInfoPtr pScrn)
-     xf86CollectOptions(pScrn, NULL);
- 
-     /* Process the options */
--    if (!(pTseng->Options = xalloc(sizeof(TsengOptions))))
-+    if (!(pTseng->Options = malloc(sizeof(TsengOptions))))
- 	return FALSE;
-     memcpy(pTseng->Options, TsengOptions, sizeof(TsengOptions));
-     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pTseng->Options);
-@@ -883,7 +883,7 @@ TsengGetFbAddress(ScrnInfoPtr pScrn)
-     PDEBUG("	TsengGetFbAddress\n");
- 
-     /* base0 is the framebuffer and base1 is the PCI IO space. */
--    if (PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM)) {
-+    if (!PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM)) {
-         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                    "No valid Framebuffer address in PCI config space;\n");
-         return FALSE;
-diff --git a/src/tseng_mode.c b/src/tseng_mode.c
-index f075226..a3ff87d 100644
---- a/src/tseng_mode.c
-+++ b/src/tseng_mode.c
-@@ -41,7 +41,11 @@ vgaHWWriteBank(vgaHWPtr hwp, CARD8 value)
-     if (hwp->MMIOBase)
- 	MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_BANK, value);
-     else
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- 	outb(hwp->PIOOffset + VGA_BANK, value);
-+#else
-+	pci_io_write8(hwp->io, VGA_BANK, value);
-+#endif
- }
- 
- CARD8
-@@ -50,7 +54,11 @@ vgaHWReadBank(vgaHWPtr hwp)
-     if (hwp->MMIOBase)
- 	return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + VGA_BANK);
-     else
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- 	return inb(hwp->PIOOffset + VGA_BANK);
-+#else
-+	return pci_io_read8(hwp->io, VGA_BANK);
-+#endif
- }
- 
- #define VGA_SEGMENT 0x3CD
-@@ -61,7 +69,11 @@ vgaHWWriteSegment(vgaHWPtr hwp, CARD8 value)
-     if (hwp->MMIOBase)
- 	MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_SEGMENT, value);
-     else
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- 	outb(hwp->PIOOffset + VGA_SEGMENT, value);
-+#else
-+	pci_io_write8(hwp->io, VGA_SEGMENT, value);
-+#endif
- }
- 
- CARD8
-@@ -70,7 +82,11 @@ vgaHWReadSegment(vgaHWPtr hwp)
-     if (hwp->MMIOBase)
- 	return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + VGA_SEGMENT);
-     else
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- 	return inb(hwp->PIOOffset + VGA_SEGMENT);
-+#else
-+	return pci_io_read8(hwp->io, VGA_SEGMENT);
-+#endif
- }
- 
- /*
-@@ -84,8 +100,12 @@ vgaHWWriteModeControl(vgaHWPtr hwp, CARD8 value)
-     if (hwp->MMIOBase)
-         MMIO_OUT8(hwp->MMIOBase,
-                   hwp->MMIOOffset + hwp->IOBase + VGA_MODE_CONTROL, value);
--    else  
--        outb(hwp->IOBase + hwp->PIOOffset + VGA_MODE_CONTROL, value);
-+    else
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+	outb(hwp->PIOOffset + VGA_MODE_CONTROL, value);
-+#else
-+	pci_io_write8(hwp->io, VGA_MODE_CONTROL, value);
-+#endif
- }
- 
- /*
-@@ -110,14 +130,22 @@ vgaHWHerculesSecondPage(vgaHWPtr hwp, Bool Enable)
- 
-         MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_HERCULES, tmp);
-     } else {
--        tmp = inb(hwp->PIOOffset + VGA_HERCULES);
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+	tmp = inb(hwp->PIOOffset + VGA_HERCULES);
-+#else
-+	tmp = pci_io_read8(hwp->io, VGA_HERCULES);
-+#endif
- 
-         if (Enable)
-             tmp |= 0x02;
-         else
-             tmp &= ~0x02;
- 
--        outb(hwp->PIOOffset + VGA_HERCULES, tmp);
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-+	outb(hwp->PIOOffset + VGA_HERCULES, tmp);
-+#else
-+	pci_io_write8(hwp->io, VGA_HERCULES, tmp);
-+#endif
-     }
- }
- 
-@@ -1502,7 +1530,7 @@ TsengModeInit(ScrnInfoPtr pScrn, DisplayModePtr OrigMode)
- 
-     /* clean up */
-     if (new->RAMDAC)
--        xfree(new->RAMDAC);
-+        free(new->RAMDAC);
- 
-     return TRUE;
- }
diff --git a/extra/xf86-video-v4l/PKGBUILD b/extra/xf86-video-v4l/PKGBUILD
index 680323861..d81537960 100644
--- a/extra/xf86-video-v4l/PKGBUILD
+++ b/extra/xf86-video-v4l/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 168593 2012-10-13 11:46:14Z andyrtr $
+# $Id: PKGBUILD 180218 2013-03-18 16:09:23Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-v4l
 pkgver=0.2.0
-pkgrel=11
+pkgrel=12
 pkgdesc="X.org v4l video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
diff --git a/extra/xf86-video-vesa/PKGBUILD b/extra/xf86-video-vesa/PKGBUILD
index 3f48ff9d6..b05999c60 100644
--- a/extra/xf86-video-vesa/PKGBUILD
+++ b/extra/xf86-video-vesa/PKGBUILD
@@ -1,26 +1,29 @@
-# $Id: PKGBUILD 168594 2012-10-13 11:46:21Z andyrtr $
+# $Id: PKGBUILD 180219 2013-03-18 16:09:24Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-vesa
 pkgver=2.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org vesa video driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        revert-kernelcheck.patch)
+        revert-kernelcheck.patch
+        git-fixes.patch)
 sha256sums=('144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3'
-            'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c')
+            'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c'
+            'beba7e8499b1d0b457762e28e7e413b223cbe87a84a39a3566e96c44da8544a1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch"
+  patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-vesa/git-fixes.patch b/extra/xf86-video-vesa/git-fixes.patch
new file mode 100644
index 000000000..fee498d0c
--- /dev/null
+++ b/extra/xf86-video-vesa/git-fixes.patch
@@ -0,0 +1,55 @@
+From 7aafaf56fbca97f36c775462c1ceea3e03700c42 Mon Sep 17 00:00:00 2001
+From: Alexandr Shadchin <alexandr.shadchin@gmail.com>
+Date: Sat, 18 Aug 2012 14:53:34 +0000
+Subject: Fix check function in VESASaveRestore
+
+Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
+Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+diff --git a/src/vesa.c b/src/vesa.c
+index 8ac77da..11cd26c 100644
+--- a/src/vesa.c
++++ b/src/vesa.c
+@@ -1626,7 +1626,7 @@ VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function)
+ {
+     VESAPtr pVesa;
+ 
+-    if (MODE_QUERY < 0 || function > MODE_RESTORE)
++    if (function < MODE_QUERY || function > MODE_RESTORE)
+ 	return (FALSE);
+ 
+     pVesa = VESAGetRec(pScrn);
+--
+cgit v0.9.0.2-2-gbebe
+From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:55:03 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/vesa.c b/src/vesa.c
+index 11cd26c..b73d104 100644
+--- a/src/vesa.c
++++ b/src/vesa.c
+@@ -49,9 +49,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* Colormap handling */
+ #include "micmap.h"
+ #include "xf86cmap.h"
+@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL)
+     VESADGAInit(pScrn, pScreen);
+ 
+     xf86SetBlackWhitePixels(pScreen);
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+ 
+     /* software cursor */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-vmware/PKGBUILD b/extra/xf86-video-vmware/PKGBUILD
index 47905d4e6..2ce3dc6ab 100644
--- a/extra/xf86-video-vmware/PKGBUILD
+++ b/extra/xf86-video-vmware/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 175177 2013-01-16 09:39:57Z jgc $
+# $Id: PKGBUILD 183093 2013-04-17 14:08:02Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-vmware
-pkgver=13.0.0
+pkgver=13.0.1
 pkgrel=1
 pkgdesc="X.org vmware video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libdrm' 'svga-dri' 'mesa')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool' '!emptydirs')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6')
+sha256sums=('802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-vmware/git_fixes.diff b/extra/xf86-video-vmware/git_fixes.diff
deleted file mode 100644
index 85894169e..000000000
--- a/extra/xf86-video-vmware/git_fixes.diff
+++ /dev/null
@@ -1,894 +0,0 @@
-From 46cdf0ed0ad9df66f36f95e27b209d454f67d526 Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Fri, 20 Apr 2012 20:24:26 +0000
-Subject: vmwgfx: set the XA_FLAG_SHARED flag for composite dest surfaces
-
-This fixes a failed assertion in the gallium/svga driver in the
-svga_texture_get_handle() function.  The texture resource wasn't
-getting created with the PIPE_BIND_SHARED flag so the !cachable
-assertion would fail and the X session would abort.  This didn't
-happen with release builds.
-
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/vmwgfx/vmwgfx_xa_surface.c b/vmwgfx/vmwgfx_xa_surface.c
-index 2a18762..8b30e45 100644
---- a/vmwgfx/vmwgfx_xa_surface.c
-+++ b/vmwgfx/vmwgfx_xa_surface.c
-@@ -148,7 +148,7 @@ vmwgfx_hw_composite_dst_stage(PixmapPtr pixmap,
- 
-     vpix->staging_format = format;
-     vpix->staging_remove_flags = 0;
--    vpix->staging_add_flags = XA_FLAG_RENDER_TARGET;
-+    vpix->staging_add_flags = XA_FLAG_RENDER_TARGET | XA_FLAG_SHARED;
- 
-     return TRUE;
- }
---
-cgit v0.9.0.2-2-gbebe
-From 61df95a86f4997e342d50d7779b00aba2e8849a6 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Wed, 06 Jun 2012 08:58:01 +0000
-Subject: vmware: port vmware driver to new compat API
-
-This is a port of the vmware driver to the new compat API.
-
-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
-Signed-off-by: Dave Airlie <airlied@redhat.com>
-Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/saa/saa.c b/saa/saa.c
-index 173c090..f2d68e9 100644
---- a/saa/saa.c
-+++ b/saa/saa.c
-@@ -594,7 +594,7 @@ saa_set_fallback_debug(ScreenPtr screen, Bool enable)
-  * screen private, before calling down to the next CloseScreen.
-  */
- Bool
--saa_close_screen(int i, ScreenPtr pScreen)
-+saa_close_screen(CLOSE_SCREEN_ARGS_DECL)
- {
-     struct saa_screen_priv *sscreen = saa_screen(pScreen);
-     struct saa_driver *driver = sscreen->driver;
-@@ -624,7 +624,7 @@ saa_close_screen(int i, ScreenPtr pScreen)
- 
-     free(sscreen);
- 
--    return (*pScreen->CloseScreen) (i, pScreen);
-+    return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS);
- }
- 
- struct saa_driver *
-diff --git a/saa/saa.h b/saa/saa.h
-index c7aa3b6..4e5ced5 100644
---- a/saa/saa.h
-+++ b/saa/saa.h
-@@ -44,6 +44,8 @@
- #include <damage.h>
- #include <picturestr.h>
- 
-+#include "../src/compat-api.h"
-+
- #define SAA_VERSION_MAJOR 0
- #define SAA_VERSION_MINOR 1
- 
-@@ -173,7 +175,7 @@ extern _X_EXPORT RegionPtr
- saa_bitmap_to_region(PixmapPtr pPix);
- 
- extern _X_EXPORT Bool
--saa_close_screen(int i, ScreenPtr pScreen);
-+saa_close_screen(CLOSE_SCREEN_ARGS_DECL);
- 
- extern _X_EXPORT Bool
- saa_gc_reads_destination(DrawablePtr pDrawable, GCPtr pGC);
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 04c9e0d..b0dd147 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -37,6 +37,7 @@ endif
- vmware_drv_la_SOURCES = \
- 	bits2pixels.c \
- 	bits2pixels.h \
-+	compat-api.h \
- 	guest_os.h \
- 	includeCheck.h \
- 	svga_escape.h \
-diff --git a/src/compat-api.h b/src/compat-api.h
-new file mode 100644
-index 0000000..6bc946f
---- a/dev/null
-+++ b/src/compat-api.h
-@@ -0,0 +1,99 @@
-+/*
-+ * Copyright 2012 Red Hat, Inc.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ *
-+ * Author: Dave Airlie <airlied@redhat.com>
-+ */
-+
-+/* this file provides API compat between server post 1.13 and pre it,
-+   it should be reused inside as many drivers as possible */
-+#ifndef COMPAT_API_H
-+#define COMPAT_API_H
-+
-+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
-+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
-+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
-+#endif
-+
-+#ifndef XF86_HAS_SCRN_CONV
-+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
-+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
-+#endif
-+
-+#ifndef XF86_SCRN_INTERFACE
-+
-+#define SCRN_ARG_TYPE int
-+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
-+
-+#define SCREEN_ARG_TYPE int
-+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
-+
-+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
-+
-+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
-+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
-+
-+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
-+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
-+
-+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
-+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
-+
-+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
-+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
-+
-+#define FREE_SCREEN_ARGS_DECL int arg, int flags
-+
-+#define VT_FUNC_ARGS_DECL int arg, int flags
-+#define VT_FUNC_ARGS pScrn->scrnIndex, 0
-+
-+#define XF86_SCRN_ARG(x) ((x)->scrnIndex)
-+#else
-+#define SCRN_ARG_TYPE ScrnInfoPtr
-+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
-+
-+#define SCREEN_ARG_TYPE ScreenPtr
-+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
-+
-+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
-+
-+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
-+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
-+
-+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
-+#define CLOSE_SCREEN_ARGS pScreen
-+
-+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
-+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
-+
-+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
-+#define SWITCH_MODE_ARGS(arg, m) arg, m
-+
-+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
-+
-+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
-+#define VT_FUNC_ARGS pScrn
-+
-+#define XF86_SCRN_ARG(x) (x)
-+
-+#endif
-+
-+#endif
-diff --git a/src/vmware.c b/src/vmware.c
-index e3892f1..41201f1 100644
---- a/src/vmware.c
-+++ b/src/vmware.c
-@@ -901,8 +901,8 @@ VMWAREModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool rebuildPixmap)
-                                                          pScrn->pScreen->rootDepth),
-                                            (pointer)(pVMWARE->FbBase + pScrn->fbOffset));
- 
--        (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, FALSE);
--        (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, TRUE);
-+        (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), FALSE);
-+        (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), TRUE);
-     }
- 
-     vgaHWProtect(pScrn, FALSE);
-@@ -1018,7 +1018,7 @@ vmwareNextXineramaState(VMWAREPtr pVMWARE)
- }
- 
- static void
--VMWAREAdjustFrame(int scrnIndex, int x, int y, int flags)
-+VMWAREAdjustFrame(ADJUST_FRAME_ARGS_DECL)
- {
-     /* FIXME */
- }
-@@ -1089,9 +1089,9 @@ VMWAREStopFIFO(ScrnInfoPtr pScrn)
- }
- 
- static Bool
--VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen)
-+VMWARECloseScreen(CLOSE_SCREEN_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
-     ScreenPtr save = &pVMWARE->ScrnFuncs;
- 
-@@ -1119,7 +1119,7 @@ VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen)
-     pScrn->DriverFunc = NULL;
- #endif
- 
--    return (*pScreen->CloseScreen)(scrnIndex, pScreen);
-+    return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
- }
- 
- static Bool
-@@ -1296,16 +1296,14 @@ vmwareIsRegionEqual(const RegionPtr reg1,
- }
- 
- static Bool
--VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-+VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn;
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     vgaHWPtr hwp;
-     VMWAREPtr pVMWARE;
-     OptionInfoPtr options;
-     Bool useXinerama = TRUE;
- 
--    /* Get the ScrnInfoRec */
--    pScrn = xf86Screens[pScreen->myNum];
-     pVMWARE = VMWAREPTR(pScrn);
- 
- 
-@@ -1381,7 +1379,7 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     VMWAREModeInit(pScrn, pScrn->currentMode, FALSE);
- 
-     /* Set the viewport if supported */
--    VMWAREAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
-+    VMWAREAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
- 
-     /*
-      * Setup the screen's visuals, and initialise the framebuffer
-@@ -1582,10 +1580,9 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- }
- 
- static Bool
--VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
--
-+VMWARESwitchMode(SWITCH_MODE_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
-     ScreenPtr pScreen = pScrn->pScreen;
- 
-     pScreen->mmWidth = (pScreen->width * VMWARE_INCHTOMM +
-@@ -1597,9 +1594,9 @@ VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
- }
- 
- static Bool
--VMWAREEnterVT(int scrnIndex, int flags)
-+VMWAREEnterVT(VT_FUNC_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
- 
-     /*
-@@ -1616,9 +1613,9 @@ VMWAREEnterVT(int scrnIndex, int flags)
- }
- 
- static void
--VMWARELeaveVT(int scrnIndex, int flags)
-+VMWARELeaveVT(VT_FUNC_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
- 
-     /*
-@@ -1631,17 +1628,18 @@ VMWARELeaveVT(int scrnIndex, int flags)
- }
- 
- static void
--VMWAREFreeScreen(int scrnIndex, int flags)
-+VMWAREFreeScreen(FREE_SCREEN_ARGS_DECL)
- {
-+    SCRN_INFO_PTR(arg);
-     /*
-      * If the vgahw module is used vgaHWFreeHWRec() would be called
-      * here.
-      */
--   VMWAREFreeRec(xf86Screens[scrnIndex]);
-+   VMWAREFreeRec(pScrn);
- }
- 
- static ModeStatus
--VMWAREValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
-+VMWAREValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
- {
-     return MODE_OK;
- }
-diff --git a/src/vmware.h b/src/vmware.h
-index 458390a..4818e16 100644
---- a/src/vmware.h
-+++ b/src/vmware.h
-@@ -177,7 +177,7 @@ typedef struct {
- #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate))
- 
- static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) {
--    return xf86Screens[s->myNum];
-+    return xf86ScreenToScrn(s);
- }
- 
- #define MIN(a,b) ((a)<(b)?(a):(b))
-diff --git a/src/vmware_common.h b/src/vmware_common.h
-index 9cd7194..5629c10 100644
---- a/src/vmware_common.h
-+++ b/src/vmware_common.h
-@@ -32,6 +32,8 @@
- #include <X11/extensions/panoramiXproto.h>
- #include <xf86.h>
- 
-+#include "compat-api.h"
-+
- xXineramaScreenInfo *
- VMWAREParseTopologyString(ScrnInfoPtr pScrn,
-                           const char *topology,
-diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
-index 1b82ac4..7de0772 100644
---- a/vmwgfx/vmwgfx_dri2.c
-+++ b/vmwgfx/vmwgfx_dri2.c
-@@ -83,7 +83,7 @@ static Bool
- dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int format)
- {
-     ScreenPtr pScreen = pDraw->pScreen;
--    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     modesettingPtr ms = modesettingPTR(pScrn);
-     BufferPrivatePtr private = buffer->driverPrivate;
-     PixmapPtr pPixmap;
-@@ -371,7 +371,7 @@ dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion,
- Bool
- xorg_dri2_init(ScreenPtr pScreen)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     modesettingPtr ms = modesettingPTR(pScrn);
-     DRI2InfoRec dri2info;
-     int major, minor;
-diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
-index ed1eb8c..9959ffb 100644
---- a/vmwgfx/vmwgfx_driver.c
-+++ b/vmwgfx/vmwgfx_driver.c
-@@ -107,14 +107,13 @@ typedef uint8_t uint8;
-  */
- 
- static Bool drv_pre_init(ScrnInfoPtr pScrn, int flags);
--static Bool drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc,
--			    char **argv);
--static Bool drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags);
--static void drv_adjust_frame(int scrnIndex, int x, int y, int flags);
--static Bool drv_enter_vt(int scrnIndex, int flags);
--static void drv_leave_vt(int scrnIndex, int flags);
--static void drv_free_screen(int scrnIndex, int flags);
--static ModeStatus drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose,
-+static Bool drv_screen_init(SCREEN_INIT_ARGS_DECL);
-+static Bool drv_switch_mode(SWITCH_MODE_ARGS_DECL);
-+static void drv_adjust_frame(ADJUST_FRAME_ARGS_DECL);
-+static Bool drv_enter_vt(VT_FUNC_ARGS_DECL);
-+static void drv_leave_vt(VT_FUNC_ARGS_DECL);
-+static void drv_free_screen(FREE_SCREEN_ARGS_DECL);
-+static ModeStatus drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose,
- 			         int flags);
- 
- extern void xorg_tracker_set_functions(ScrnInfoPtr scrn);
-@@ -133,7 +132,7 @@ vmwgfx_hookup(ScrnInfoPtr pScrn)
-  * Internal function definitions
-  */
- 
--static Bool drv_close_screen(int scrnIndex, ScreenPtr pScreen);
-+static Bool drv_close_screen(CLOSE_SCREEN_ARGS_DECL);
- 
- /*
-  * Internal functions
-@@ -633,7 +632,7 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd,
- 
- void xorg_flush(ScreenPtr pScreen)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     modesettingPtr ms = modesettingPTR(pScrn);
-     xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
-     PixmapPtr pixmap = NULL;
-@@ -708,14 +707,13 @@ void xorg_flush(ScreenPtr pScreen)
-     free(pixmaps);
- }
- 
--static void drv_block_handler(int i, pointer blockData, pointer pTimeout,
--                              pointer pReadmask)
-+static void drv_block_handler(BLOCKHANDLER_ARGS_DECL)
- {
--    ScreenPtr pScreen = screenInfo.screens[i];
--    modesettingPtr ms = modesettingPTR(xf86Screens[pScreen->myNum]);
-+    SCREEN_PTR(arg);
-+    modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen));
- 
-     vmwgfx_swap(ms, pScreen, BlockHandler);
--    pScreen->BlockHandler(i, blockData, pTimeout, pReadmask);
-+    pScreen->BlockHandler(BLOCKHANDLER_ARGS);
-     vmwgfx_swap(ms, pScreen, BlockHandler);
- 
-     vmwgfx_flush_dri2(pScreen);
-@@ -725,7 +723,7 @@ static void drv_block_handler(int i, pointer blockData, pointer pTimeout,
- static Bool
- drv_create_screen_resources(ScreenPtr pScreen)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     modesettingPtr ms = modesettingPTR(pScrn);
-     Bool ret;
- 
-@@ -735,9 +733,9 @@ drv_create_screen_resources(ScreenPtr pScreen)
-     if (!ret)
- 	return ret;
- 
--    drv_adjust_frame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
-+    drv_adjust_frame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
- 
--    return drv_enter_vt(pScreen->myNum, 1);
-+    return drv_enter_vt(VT_FUNC_ARGS);
- }
- 
- static Bool
-@@ -773,7 +771,7 @@ drv_set_master(ScrnInfoPtr pScrn)
- static Bool
- vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor)
- {
--    ScrnInfoPtr pScrn = xf86Screens[screen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(screen);
-     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-     xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
-     modesettingPtr ms = modesettingPTR(pScrn);
-@@ -804,7 +802,7 @@ vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor)
- static Bool
- vmwgfx_use_hw_cursor(ScreenPtr screen, CursorPtr cursor)
- {
--    ScrnInfoPtr pScrn = xf86Screens[screen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(screen);
-     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-     xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
-     modesettingPtr ms = modesettingPTR(pScrn);
-@@ -902,9 +900,9 @@ static void drv_load_palette(ScrnInfoPtr pScrn, int numColors,
- 
- 
- static Bool
--drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-+drv_screen_init(SCREEN_INIT_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     modesettingPtr ms = modesettingPTR(pScrn);
-     VisualPtr visual;
- 
-@@ -1088,9 +1086,9 @@ drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- }
- 
- static void
--drv_adjust_frame(int scrnIndex, int x, int y, int flags)
-+drv_adjust_frame(ADJUST_FRAME_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
-     xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
-     xf86OutputPtr output = config->output[config->compat_output];
-     xf86CrtcPtr crtc = output->crtc;
-@@ -1104,15 +1102,16 @@ drv_adjust_frame(int scrnIndex, int x, int y, int flags)
- }
- 
- static void
--drv_free_screen(int scrnIndex, int flags)
-+drv_free_screen(FREE_SCREEN_ARGS_DECL)
- {
--    drv_free_rec(xf86Screens[scrnIndex]);
-+    SCRN_INFO_PTR(arg);
-+    drv_free_rec(pScrn);
- }
- 
- static void
--drv_leave_vt(int scrnIndex, int flags)
-+drv_leave_vt(VT_FUNC_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
-     modesettingPtr ms = modesettingPTR(pScrn);
- 
-     vmwgfx_cursor_bypass(ms->fd, 0, 0);
-@@ -1130,9 +1129,9 @@ drv_leave_vt(int scrnIndex, int flags)
-  * This gets called when gaining control of the VT, and from ScreenInit().
-  */
- static Bool
--drv_enter_vt(int scrnIndex, int flags)
-+drv_enter_vt(VT_FUNC_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
- 
-     if (!drv_set_master(pScrn))
- 	return FALSE;
-@@ -1144,17 +1143,17 @@ drv_enter_vt(int scrnIndex, int flags)
- }
- 
- static Bool
--drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags)
-+drv_switch_mode(SWITCH_MODE_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
- 
-     return xf86SetSingleMode(pScrn, mode, RR_Rotate_0);
- }
- 
- static Bool
--drv_close_screen(int scrnIndex, ScreenPtr pScreen)
-+drv_close_screen(CLOSE_SCREEN_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     modesettingPtr ms = modesettingPTR(pScrn);
- 
-     if (ms->cursor) {
-@@ -1166,7 +1165,7 @@ drv_close_screen(int scrnIndex, ScreenPtr pScreen)
- 	xorg_dri2_close(pScreen);
- 
-     if (pScrn->vtSema)
--	pScrn->LeaveVT(scrnIndex, 0);
-+        pScrn->LeaveVT(VT_FUNC_ARGS);
- 
-     pScrn->vtSema = FALSE;
- 
-@@ -1180,11 +1179,11 @@ drv_close_screen(int scrnIndex, ScreenPtr pScreen)
-     if (ms->xat)
- 	xa_tracker_destroy(ms->xat);
- 
--    return (*pScreen->CloseScreen) (scrnIndex, pScreen);
-+    return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS);
- }
- 
- static ModeStatus
--drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
-+drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
- {
-     return MODE_OK;
- }
-diff --git a/vmwgfx/vmwgfx_driver.h b/vmwgfx/vmwgfx_driver.h
-index 4fcfed6..f78a85f 100644
---- a/vmwgfx/vmwgfx_driver.h
-+++ b/vmwgfx/vmwgfx_driver.h
-@@ -46,6 +46,7 @@
- #include <xa_tracker.h>
- #include <xf86Module.h>
- 
-+#include "../src/compat-api.h"
- #ifdef DRI2
- #include <dri2.h>
- #if (!defined(DRI2INFOREC_VERSION) || (DRI2INFOREC_VERSION < 3))
-@@ -118,9 +119,9 @@ typedef struct _modesettingRec
-     ScreenBlockHandlerProcPtr saved_BlockHandler;
-     CreateScreenResourcesProcPtr saved_CreateScreenResources;
-     CloseScreenProcPtr saved_CloseScreen;
--    Bool (*saved_EnterVT)(int, int);
--    void (*saved_LeaveVT)(int, int);
--    void (*saved_AdjustFrame)(int, int, int, int);
-+    Bool (*saved_EnterVT)(VT_FUNC_ARGS_DECL);
-+    void (*saved_LeaveVT)(VT_FUNC_ARGS_DECL);
-+    void (*saved_AdjustFrame)(ADJUST_FRAME_ARGS_DECL);
-     Bool (*saved_UseHWCursor)(ScreenPtr, CursorPtr);
-     Bool (*saved_UseHWCursorARGB)(ScreenPtr, CursorPtr);
- 
-diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
-index 469598a..63df3a1 100644
---- a/vmwgfx/vmwgfx_saa.c
-+++ b/vmwgfx/vmwgfx_saa.c
-@@ -460,7 +460,7 @@ vmwgfx_flush_dri2(ScreenPtr pScreen)
-     struct vmwgfx_saa *vsaa =
- 	to_vmwgfx_saa(saa_get_driver(pScreen));
-     struct _WsbmListHead *list, *next;
--    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- 
-     if (!pScrn->vtSema)
- 	return;
-@@ -1199,7 +1199,7 @@ vmwgfx_operation_complete(struct saa_driver *driver,
-     struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver);
-     struct saa_pixmap *spix = saa_get_saa_pixmap(pixmap);
-     struct vmwgfx_saa_pixmap *vpix = to_vmwgfx_saa_pixmap(spix);
--    ScrnInfoPtr pScrn = xf86Screens[vsaa->pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(vsaa->pScreen);
- 
-     /*
-      * Make dri2 drawables up to date, or add them to the flush list
-diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
-index af53379..449266b 100644
---- a/vmwgfx/vmwgfx_tex_video.c
-+++ b/vmwgfx/vmwgfx_tex_video.c
-@@ -638,7 +638,7 @@ put_image(ScrnInfoPtr pScrn,
-           DrawablePtr pDraw)
- {
-    struct xorg_xv_port_priv *pPriv = (struct xorg_xv_port_priv *) data;
--   ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
-+   ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
-    PixmapPtr pPixmap;
-    INT32 x1, x2, y1, y2;
-    BoxRec dstBox;
-@@ -732,7 +732,7 @@ vmwgfx_free_textured_adaptor(XF86VideoAdaptorPtr adaptor, Bool free_ports)
- static XF86VideoAdaptorPtr
- xorg_setup_textured_adapter(ScreenPtr pScreen)
- {
--   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+   ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-    modesettingPtr ms = modesettingPTR(pScrn);
-    XF86VideoAdaptorPtr adapt;
-    XF86AttributePtr attrs;
-@@ -799,7 +799,7 @@ xorg_setup_textured_adapter(ScreenPtr pScreen)
- void
- xorg_xv_init(ScreenPtr pScreen)
- {
--   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+   ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-    modesettingPtr ms = modesettingPTR(pScrn);
-    XF86VideoAdaptorPtr *adaptors, *new_adaptors = NULL;
-    XF86VideoAdaptorPtr textured_adapter = NULL, overlay_adaptor = NULL;
---
-cgit v0.9.0.2-2-gbebe
-From 50c01998c7800bc02fd6656cc14efa715bf63e08 Mon Sep 17 00:00:00 2001
-From: Robert Hooker <sarvatt@ubuntu.com>
-Date: Fri, 15 Jun 2012 15:56:59 +0000
-Subject: vmware: Fix up some warnings after new compat API change.
-
-Fixes multiple instances of these warnings on x86_64:
-../../src/vmware.h:180:5: warning: implicit declaration of function 'xf86ScreenToScrn' [-Wimplicit-function-declaration]
-../../src/vmware.h:180:5: warning: nested extern declaration of 'xf86ScreenToScrn' [-Wnested-externs]
-../../src/vmware.h:180:5: warning: return makes pointer from integer without a cast [enabled by default]
-Function `xf86ScreenToScrn' implicitly converted to pointer at ../../src/vmware.h:180
-
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
-Signed-off-by: Robert Hooker <sarvatt@ubuntu.com>
-Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/src/vmware.h b/src/vmware.h
-index 4818e16..be113bb 100644
---- a/src/vmware.h
-+++ b/src/vmware.h
-@@ -18,6 +18,7 @@
- #include "xf86.h"
- #include "xf86_OSproc.h"
- 
-+#include "compat-api.h"
- 
- #include <X11/extensions/panoramiXproto.h>
- 
---
-cgit v0.9.0.2-2-gbebe
-From 46c0862d205eefa985e36a74391ca392640cb898 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Sat, 16 Jun 2012 13:43:52 +0000
-Subject: vmware: drop infoFromScreen inline in favour of new interface
-
-This also should fix the build regression introduced with the fix
-for this macro.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/vmware.h b/src/vmware.h
-index be113bb..028dff3 100644
---- a/src/vmware.h
-+++ b/src/vmware.h
-@@ -18,8 +18,6 @@
- #include "xf86.h"
- #include "xf86_OSproc.h"
- 
--#include "compat-api.h"
--
- #include <X11/extensions/panoramiXproto.h>
- 
- #ifdef XSERVER_LIBPCIACCESS
-@@ -177,10 +175,6 @@ typedef struct {
- 
- #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate))
- 
--static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) {
--    return xf86ScreenToScrn(s);
--}
--
- #define MIN(a,b) ((a)<(b)?(a):(b))
- #define MAX(a,b) ((a)>(b)?(a):(b))
- #define ABS(x) (((x) >= 0) ? (x) : -(x))
-diff --git a/src/vmwarecurs.c b/src/vmwarecurs.c
-index 2e2effb..93dacc0 100644
---- a/src/vmwarecurs.c
-+++ b/src/vmwarecurs.c
-@@ -12,6 +12,7 @@ char rcsId_vmwarecurs[] =
- #endif
- 
- #include "vmware.h"
-+#include "vmware_common.h"
- #include "bits2pixels.h"
- 
- static void VMWAREGetImage(DrawablePtr src, int x, int y, int w, int h,
-@@ -110,7 +111,7 @@ vmwareSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
- static Bool
- vmwareUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
- {
--    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
-     VmwareLog(("UseHWCursor new cursor %p refcnt %i old cursor %p refcnt %i\n",
-               pCurs, pCurs->refcnt, pVMWARE->oldCurs, pVMWARE->oldCurs ? pVMWARE->oldCurs->refcnt : 0));
-@@ -145,7 +146,7 @@ vmwareLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src )
- static Bool
- vmwareUseHWCursorARGB(ScreenPtr pScreen, CursorPtr pCurs)
- {
--    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
-     VmwareLog(("UseHWCursorARGB new cursor %p refcnt %i old cursor %p refcnt %i\n",
-               pCurs, pCurs->refcnt, pVMWARE->oldCurs, pVMWARE->oldCurs ? pVMWARE->oldCurs->refcnt : 0));
-@@ -283,7 +284,7 @@ Bool
- vmwareCursorInit(ScreenPtr pScreen)
- {
-     xf86CursorInfoPtr infoPtr;
--    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen));
-+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen));
-     Bool ret;
- 
-     TRACEPOINT
-@@ -330,7 +331,7 @@ vmwareCursorInit(ScreenPtr pScreen)
- void
- vmwareCursorCloseScreen(ScreenPtr pScreen)
- {
--    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
- #ifdef RENDER
-     PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
-@@ -356,7 +357,7 @@ vmwareCursorCloseScreen(ScreenPtr pScreen)
- void
- vmwareCursorHookWrappers(ScreenPtr pScreen)
- {
--    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen));
-+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen));
- #ifdef RENDER
-     PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
- #endif
-@@ -382,7 +383,7 @@ VMWAREGetImage(DrawablePtr src, int x, int y, int w, int h,
-                unsigned int format, unsigned long planeMask, char *pBinImage)
- {
-     ScreenPtr pScreen = src->pScreen;
--    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(src->pScreen));
-+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(src->pScreen));
-     BoxRec box;
-     Bool hidden = FALSE;
-     
-@@ -412,7 +413,7 @@ static void
- VMWARECopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
- {
-     ScreenPtr pScreen = pWin->drawable.pScreen;
--    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pWin->drawable.pScreen));
-+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pWin->drawable.pScreen));
-     BoxPtr pBB;
-     Bool hidden = FALSE;
-     
-@@ -448,7 +449,7 @@ VMWAREComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
- 		CARD16 width, CARD16 height)
- {
-     ScreenPtr pScreen = pDst->pDrawable->pScreen;
--    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen));
-+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen));
-     PictureScreenPtr ps = GetPictureScreen(pScreen);
-     BoxRec box;
-     Bool hidden = FALSE;
-diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c
-index 71f21fe..745c71f 100644
---- a/src/vmwarevideo.c
-+++ b/src/vmwarevideo.c
-@@ -39,6 +39,7 @@
- #endif
- 
- #include "vmware.h"
-+#include "vmware_common.h"
- #include "xf86xv.h"
- #include "fourcc.h"
- #include "svga_escape.h"
-@@ -435,7 +436,7 @@ vmwareVideoEnabled(VMWAREPtr pVMWARE)
- Bool
- vmwareVideoInit(ScreenPtr pScreen)
- {
--    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     XF86VideoAdaptorPtr *overlayAdaptors, *newAdaptors = NULL;
-     XF86VideoAdaptorPtr newAdaptor = NULL;
-     int numAdaptors;
-@@ -504,7 +505,7 @@ vmwareVideoInit(ScreenPtr pScreen)
- void
- vmwareVideoEnd(ScreenPtr pScreen)
- {
--    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
-     VMWAREVideoPtr pVid;
-     int i;
---
-cgit v0.9.0.2-2-gbebe
-From e5ac80d8f72963313358e31cfb1ab98583e26f23 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Tue, 03 Jul 2012 12:50:30 +0000
-Subject: vmware: avoid warnings about shadowing 'i'
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/compat-api.h b/src/compat-api.h
-index 6bc946f..205ac59 100644
---- a/src/compat-api.h
-+++ b/src/compat-api.h
-@@ -46,7 +46,7 @@
- #define SCREEN_ARG_TYPE int
- #define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
- 
--#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
-+#define SCREEN_INIT_ARGS_DECL int scrnIndex, ScreenPtr pScreen, int argc, char **argv
- 
- #define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
- #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
---
-cgit v0.9.0.2-2-gbebe
-From 007bed30270ca9548dfe6e359972b56cbb8e2f13 Mon Sep 17 00:00:00 2001
-From: Jakob Bornecrantz <jakob@vmware.com>
-Date: Tue, 29 May 2012 21:01:14 +0000
-Subject: vmwgfx: Guard against null rotate pixmap in shadow destroy
-
-Reviewed-by: Thomas Hellström <thellstrom@vmware.com>
-Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/vmwgfx/vmwgfx_crtc.c b/vmwgfx/vmwgfx_crtc.c
-index eaf87b2..fec04c0 100644
---- a/vmwgfx/vmwgfx_crtc.c
-+++ b/vmwgfx/vmwgfx_crtc.c
-@@ -250,8 +250,12 @@ crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
- static void
- crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *data)
- {
--    ScreenPtr pScreen = rotate_pixmap->drawable.pScreen;
-+    ScreenPtr pScreen;
- 
-+    if (rotate_pixmap == NULL)
-+        return;
-+
-+    pScreen = rotate_pixmap->drawable.pScreen;
-     pScreen->DestroyPixmap(rotate_pixmap);
- }
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-voodoo/PKGBUILD b/extra/xf86-video-voodoo/PKGBUILD
index abbcae874..a624a2694 100644
--- a/extra/xf86-video-voodoo/PKGBUILD
+++ b/extra/xf86-video-voodoo/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 168596 2012-10-13 11:46:31Z andyrtr $
+# $Id: PKGBUILD 180221 2013-03-18 16:09:27Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-voodoo
 pkgver=1.2.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/xfburn/PKGBUILD b/extra/xfburn/PKGBUILD
index cd95fa9c7..c093a8991 100755
--- a/extra/xfburn/PKGBUILD
+++ b/extra/xfburn/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=xfburn
 pkgver=0.4.3
-pkgrel=6
+pkgrel=6.1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="A simple CD/DVD burning tool based on libburnia libraries"
 url="http://goodies.xfce.org/projects/applications/xfburn"
diff --git a/extra/xfce4-appfinder/PKGBUILD b/extra/xfce4-appfinder/PKGBUILD
index 428a497b8..997245e6a 100644
--- a/extra/xfce4-appfinder/PKGBUILD
+++ b/extra/xfce4-appfinder/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 157837 2012-04-30 04:20:00Z foutrelis $
+# $Id: PKGBUILD 184286 2013-05-05 17:45:12Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-appfinder
-pkgver=4.10.0
+pkgver=4.10.1
 pkgrel=1
 pkgdesc="An application finder for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.xfce.org/projects/xfce4-appfinder"
+url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
 depends=('libxfce4ui' 'garcon' 'hicolor-icon-theme')
@@ -16,7 +16,7 @@ makedepends=('intltool')
 replaces=('xfce-utils')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('042aae7e366428a6a92b6353b3f2727d64823076a7752b8e0a15f1f8f3645439')
+sha256sums=('65ee74ffa76334d273e4c9ae501ec7f81f7de028813849f7d1441cbf7788eb77')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfce4-datetime-plugin/PKGBUILD b/extra/xfce4-datetime-plugin/PKGBUILD
index e045b8ab9..3e4402f6c 100644
--- a/extra/xfce4-datetime-plugin/PKGBUILD
+++ b/extra/xfce4-datetime-plugin/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 157847 2012-04-30 04:20:13Z foutrelis $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# $Id: PKGBUILD 178154 2013-02-17 09:09:09Z foutrelis $
+# Maintainer:
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-datetime-plugin
-pkgver=0.6.1
-pkgrel=3
+pkgver=0.6.2
+pkgrel=1
 pkgdesc="A date and time display plugin for the Xfce panel"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
-depends=('xfce4-panel>=4.7.4' 'libxfcegui4')
+depends=('xfce4-panel')
 makedepends=('intltool')
 options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e82f51ff0e75a63e5cbd139e43e094f9')
+md5sums=('fe604a251eadbc5b0f2b4737b85d92c8')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/xfce4-eyes-plugin/PKGBUILD b/extra/xfce4-eyes-plugin/PKGBUILD
index 5336fcbcc..21e672c64 100644
--- a/extra/xfce4-eyes-plugin/PKGBUILD
+++ b/extra/xfce4-eyes-plugin/PKGBUILD
@@ -1,32 +1,38 @@
-# $Id: PKGBUILD 157855 2012-04-30 04:20:22Z foutrelis $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# $Id: PKGBUILD 179295 2013-03-04 21:35:04Z foutrelis $
+# Maintainer:
+# Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-eyes-plugin
-pkgver=4.4.1
-pkgrel=3
+pkgver=4.4.2
+pkgrel=1
 pkgdesc="A rolling eyes (following mouse pointer) plugin for the Xfce panel"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin"
 license=('GPL2')
-url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme')
+depends=('xfce4-panel' 'hicolor-icon-theme')
 makedepends=('intltool' 'perlxml')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/4.4/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('dcbf6ea9035d379d168b479be0d09f14')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/4.4/$pkgname-$pkgver.tar.bz2)
+sha256sums=('dad102fedd0d9e6df45338a018387b2aacaf24b05eb798275be0dfc05ffa3021')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib \
-	--localstatedir=/var \
-	--disable-static
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install b/extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install
index 21b79d2d4..e4f8fd06c 100644
--- a/extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install
+++ b/extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install
@@ -3,9 +3,11 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-mixer/PKGBUILD b/extra/xfce4-mixer/PKGBUILD
index 96d40abcd..f0f415c59 100644
--- a/extra/xfce4-mixer/PKGBUILD
+++ b/extra/xfce4-mixer/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=xfce4-mixer
 pkgver=4.10.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="The volume control plugin for the Xfce panel"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
diff --git a/extra/xfce4-netload-plugin/PKGBUILD b/extra/xfce4-netload-plugin/PKGBUILD
index f8687e4f3..dba09e52e 100644
--- a/extra/xfce4-netload-plugin/PKGBUILD
+++ b/extra/xfce4-netload-plugin/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=xfce4-netload-plugin
 pkgver=1.2.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A netload plugin for the Xfce panel"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xfce-goodies.berlios.de/"
diff --git a/extra/xfce4-notifyd/PKGBUILD b/extra/xfce4-notifyd/PKGBUILD
index 15cd689ae..17ca807bb 100644
--- a/extra/xfce4-notifyd/PKGBUILD
+++ b/extra/xfce4-notifyd/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 157873 2012-04-30 04:20:51Z foutrelis $
+# $Id: PKGBUILD 183310 2013-04-21 17:16:07Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-notifyd
-pkgver=0.2.2
-pkgrel=3
+pkgver=0.2.3
+pkgrel=1
 pkgdesc="Notification daemon for the Xfce desktop"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/applications/xfce4-notifyd"
 license=('GPL2')
 groups=('xfce4-goodies')
-depends=('libxfce4ui' 'hicolor-icon-theme')
+depends=('libxfce4ui' 'libnotify' 'hicolor-icon-theme')
 makedepends=('intltool')
 provides=('notification-daemon')
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2)
-sha256sums=('b66e68dfc2164bcf479acd3c7e8b6f83065d23aef988535e2db3506d06a39168')
+sha256sums=('dd40f64c9db22b0b971e81e8e74a4ab6afe6d0bb819ab5d0badee89e13faa63b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfce4-panel/PKGBUILD b/extra/xfce4-panel/PKGBUILD
index a9bb10be3..a4abe0b2a 100644
--- a/extra/xfce4-panel/PKGBUILD
+++ b/extra/xfce4-panel/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 157875 2012-04-30 04:20:56Z foutrelis $
+# $Id: PKGBUILD 184288 2013-05-05 17:46:17Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-panel
-pkgver=4.10.0
+pkgver=4.10.1
 pkgrel=1
 pkgdesc="Panel for the Xfce desktop environment"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
-depends=('exo' 'garcon' 'libxfce4ui' 'libwnck' 'libsm' 'hicolor-icon-theme'
+depends=('exo' 'garcon' 'libxfce4ui' 'libwnck' 'hicolor-icon-theme'
          'desktop-file-utils')
 makedepends=('intltool' 'gtk-doc')
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('3321f998af2bbd14ba68654a8881774f6ea2ec4f1a3544598e7f47d3ed0009b9')
+sha256sums=('573052ed1b65e247415f92df120c8a78f9e4152c2636d38c923f82e32b8475d6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD
index 2a95b22f5..b12f31c7f 100644
--- a/extra/xfce4-session/PKGBUILD
+++ b/extra/xfce4-session/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169968 2012-10-30 22:59:13Z heftig $
+# $Id: PKGBUILD 184294 2013-05-05 17:50:37Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-session
-pkgver=4.10.0
-pkgrel=6
+pkgver=4.10.1
+pkgrel=1
 pkgdesc="A session manager for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
@@ -20,19 +20,12 @@ optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enab
 replaces=('xfce-utils')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
-        xfce4-session-4.10.0-add-systemd-support.patch)
-sha256sums=('bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce'
-            'ffae61c48a4bd0cb51d422cb93f2de9567abaf29085370c455ef349b6a10234b')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # https://bugzilla.xfce.org/show_bug.cgi?id=8729
-  patch -Np1 -i "$srcdir/xfce4-session-4.10.0-add-systemd-support.patch"
-
-  xdt-autogen
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch b/extra/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch
deleted file mode 100644
index 7ab637b26..000000000
--- a/extra/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-diff --git a/xfce4-session/xfsm-systemd.c b/xfce4-session/xfsm-systemd.c
-index 4076586..90e7873 100644
---- /dev/null
-+++ b/xfce4-session/xfsm-systemd.c
-@@ -0,0 +1,123 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2012 Christian Hesse
-+ *
-+ * Licensed under the GNU General Public License Version 2
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#include <config.h>
-+
-+#include <gio/gio.h>
-+#include <polkit/polkit.h>
-+
-+#include "xfsm-systemd.h"
-+
-+#define SYSTEMD_DBUS_NAME       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE  "org.freedesktop.login1.Manager"
-+#define SYSTEMD_REBOOT_ACTION   "org.freedesktop.login1.reboot"
-+#define SYSTEMD_SHUTDOWN_ACTION "org.freedesktop.login1.power-off"
-+
-+struct _SystemdProxy {
-+        PolkitAuthority *authority;
-+        PolkitSubject *subject;
-+};
-+
-+SystemdProxy *
-+systemd_proxy_new (void)
-+{
-+        SystemdProxy *proxy;
-+
-+        proxy = g_new0 (SystemdProxy, 1);
-+
-+        proxy->authority = polkit_authority_get_sync (NULL, NULL);
-+        proxy->subject = polkit_unix_process_new (getpid());
-+
-+        return proxy;
-+}
-+
-+void
-+systemd_proxy_free (SystemdProxy *proxy)
-+{
-+        g_object_unref (proxy->authority);
-+        g_object_unref (proxy->subject);
-+
-+        g_free (proxy);
-+}
-+
-+gboolean systemd_proxy_can_method (SystemdProxy *proxy, gboolean *can_method, const gchar *method, GError **error)
-+{
-+        PolkitAuthorizationResult *res;
-+        GError *local_error = NULL;
-+
-+        *can_method = FALSE;
-+        res = polkit_authority_check_authorization_sync (proxy->authority,
-+                                                         proxy->subject,
-+                                                         method,
-+                                                         NULL,
-+                                                         POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE,
-+                                                         NULL,
-+                                                         &local_error);
-+        if (res == NULL) {
-+                g_propagate_error (error, local_error);
-+                return FALSE;
-+        }
-+
-+        *can_method = polkit_authorization_result_get_is_authorized (res) ||
-+                       polkit_authorization_result_get_is_challenge (res);
-+
-+        g_object_unref (res);
-+
-+        return TRUE;
-+}
-+
-+gboolean systemd_proxy_can_restart (SystemdProxy *proxy, gboolean *can_restart, GError **error)
-+{
-+	return systemd_proxy_can_method(proxy, can_restart, SYSTEMD_REBOOT_ACTION, error);
-+}
-+
-+gboolean systemd_proxy_can_shutdown (SystemdProxy *proxy, gboolean *can_shutdown, GError **error)
-+{
-+	return systemd_proxy_can_method(proxy, can_shutdown, SYSTEMD_SHUTDOWN_ACTION, error);
-+}
-+
-+gboolean systemd_proxy_method (SystemdProxy *proxy, const gchar *method, GError **error)
-+{
-+        GDBusConnection *bus;
-+
-+        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
-+        g_dbus_connection_call_sync (bus,
-+                                     SYSTEMD_DBUS_NAME,
-+                                     SYSTEMD_DBUS_PATH,
-+                                     SYSTEMD_DBUS_INTERFACE,
-+                                     method,
-+                                     g_variant_new ("(b)", TRUE),
-+                                     NULL, 0, G_MAXINT, NULL, NULL);
-+        g_object_unref (bus);
-+
-+        return TRUE;
-+}
-+
-+gboolean systemd_proxy_restart (SystemdProxy *proxy, GError **error)
-+{
-+	return systemd_proxy_method(proxy, "Reboot", error);
-+}
-+
-+gboolean systemd_proxy_shutdown (SystemdProxy *proxy, GError **error)
-+{
-+	return systemd_proxy_method(proxy, "PowerOff", error);
-+}
-diff --git a/xfce4-session/xfsm-systemd.h b/xfce4-session/xfsm-systemd.h
-index 3fa8317..2c4d868 100644
---- /dev/null
-+++ b/xfce4-session/xfsm-systemd.h
-@@ -0,0 +1,42 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2012 Christian Hesse
-+ *
-+ * Licensed under the GNU General Public License Version 2
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#ifndef __SYSTEMD_PROXY_H__
-+#define __SYSTEMD_PROXY_H__
-+
-+#include <glib.h>
-+
-+G_BEGIN_DECLS
-+
-+typedef struct _SystemdProxy SystemdProxy;
-+
-+SystemdProxy *systemd_proxy_new (void);
-+void          systemd_proxy_free (SystemdProxy *proxy);
-+gboolean      systemd_proxy_can_method (SystemdProxy *proxy, gboolean *can_method, const char *method, GError **error);
-+gboolean      systemd_proxy_can_restart (SystemdProxy *proxy, gboolean *can_restart, GError **error);
-+gboolean      systemd_proxy_can_shutdown (SystemdProxy *proxy, gboolean *can_shutdown, GError **error);
-+gboolean      systemd_proxy_method (SystemdProxy *proxy, const char *method, GError **error);
-+gboolean      systemd_proxy_restart (SystemdProxy *proxy, GError **error);
-+gboolean      systemd_proxy_shutdown (SystemdProxy *proxy, GError **error);
-+
-+G_END_DECLS
-+
-+#endif  /* __SYSTEMD_PROXY_H__ */
-
-commit 518a28c23f110617aad36e64c02cdab6a36adf37
-Author: Christian Hesse <eworm@leda.eworm.de>
-Date:   Fri Jul 27 14:21:14 2012 +0200
-
-    ...
-
-diff --git a/configure.in.in b/configure.in.in
-index 9aa4f8f..aa0b8bb 100644
---- a/configure.in
-+++ b/configure.in
-@@ -96,6 +96,33 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0])
- XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84])
- XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0])
- 
-+dnl systemd integration
-+AC_ARG_ENABLE([systemd],
-+              AS_HELP_STRING([--enable-systemd], [Use systemd]),
-+              [with_systemd=$enableval],
-+              [with_systemd=auto])
-+PKG_CHECK_MODULES(SYSTEMD,
-+                  [libsystemd-login polkit-gobject-1],
-+                  [have_systemd=yes], [have_systemd=no])
-+AC_MSG_CHECKING([whether to use systemd])
-+if test x$with_systemd = xauto ; then
-+        if test x$have_systemd = xno ; then
-+                with_systemd=no
-+        else
-+                with_systemd=yes
-+        fi
-+fi
-+AC_MSG_RESULT($with_systemd)
-+if test x$with_systemd = xyes; then
-+        if test x$have_systemd = xno; then
-+                AC_MSG_ERROR([Systemd support explicitly required, but systemd not found])
-+        fi
-+        AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
-+fi
-+AC_SUBST(SYSTEMD_CFLAGS)
-+AC_SUBST(SYSTEMD_LIBS)
-+AM_CONDITIONAL(WITH_SYSTEMD, [test "$with_systemd" = "yes"], [Using systemd])
-+
- dnl Check for debugging support
- XDT_FEATURE_DEBUG([xfsm_debug_default])
- 
-
-commit f1279eba9452f027a2037be77388767437161d51
-Author: Christian Hesse <eworm@leda.eworm.de>
-Date:   Fri Jul 27 14:18:16 2012 +0200
-
-    ...
-
-diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
-index 1429abd..077cdf3 100644
---- a/xfce4-session/xfsm-shutdown.c
-+++ b/xfce4-session/xfsm-shutdown.c
-@@ -96,7 +96,11 @@ struct _XfsmShutdown
- {
-   GObject __parent__;
- 
-+#ifdef HAVE_SYSTEMD
-+  SystemdProxy   *systemd_proxy;
-+#else
-   XfsmConsolekit *consolekit;
-+#endif
-   XfsmUPower     *upower;
- 
-   /* kiosk settings */
-@@ -134,7 +138,11 @@ xfsm_shutdown_init (XfsmShutdown *shutdown)
- {
-   XfceKiosk *kiosk;
- 
-+#ifdef HAVE_SYSTEMD
-+  shutdown->systemd_proxy = systemd_proxy_new ();
-+#else
-   shutdown->consolekit = xfsm_consolekit_get ();
-+#endif
-   shutdown->upower = xfsm_upower_get ();
-   shutdown->helper_state = SUDO_NOT_INITIAZED;
-   shutdown->helper_require_password = FALSE;
-@@ -153,7 +161,11 @@ xfsm_shutdown_finalize (GObject *object)
- {
-   XfsmShutdown *shutdown = XFSM_SHUTDOWN (object);
- 
-+#ifdef HAVE_SYSTEMD
-+  systemd_proxy_free (shutdown->systemd_proxy);
-+#else
-   g_object_unref (G_OBJECT (shutdown->consolekit));
-+#endif
-   g_object_unref (G_OBJECT (shutdown->upower));
- 
-   /* close down helper */
-@@ -644,7 +656,11 @@ xfsm_shutdown_try_restart (XfsmShutdown  *shutdown,
-   if (shutdown->helper_state == SUDO_AVAILABLE)
-     return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_RESTART, error);
-   else
-+#ifdef HAVE_SYSTEMD
-+    return systemd_proxy_restart (shutdown->systemd_proxy, error);
-+#else
-     return xfsm_consolekit_try_restart (shutdown->consolekit, error);
-+#endif
- }
- 
- 
-@@ -661,7 +677,11 @@ xfsm_shutdown_try_shutdown (XfsmShutdown  *shutdown,
-   if (shutdown->helper_state == SUDO_AVAILABLE)
-     return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SHUTDOWN, error);
-   else
-+#ifdef HAVE_SYSTEMD
-+    return systemd_proxy_shutdown (shutdown->systemd_proxy, error);
-+#else
-     return xfsm_consolekit_try_shutdown (shutdown->consolekit, error);
-+#endif
- }
- 
- 
-@@ -701,7 +721,11 @@ xfsm_shutdown_can_restart (XfsmShutdown  *shutdown,
-       return TRUE;
-     }
- 
-+#ifdef HAVE_SYSTEMD
-+  if (systemd_proxy_can_restart (shutdown->systemd_proxy, can_restart, error))
-+#else
-   if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error))
-+#endif
-     return TRUE;
- 
-   if (xfsm_shutdown_sudo_init (shutdown, error))
-@@ -728,7 +752,11 @@ xfsm_shutdown_can_shutdown (XfsmShutdown  *shutdown,
-       return TRUE;
-     }
- 
-+#ifdef HAVE_SYSTEMD
-+  if (systemd_proxy_can_shutdown (shutdown->systemd_proxy, can_shutdown, error))
-+#else
-   if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error))
-+#endif
-     return TRUE;
- 
-   if (xfsm_shutdown_sudo_init (shutdown, error))
-
-commit 5aea3fb853683246a537a67423cf5b32076b8dfb
-Author: Christian Hesse <eworm@leda.eworm.de>
-Date:   Fri Jul 27 14:03:27 2012 +0200
-
-    ...
-
-diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
-index c015154..7e3b311 100644
---- a/xfce4-session/Makefile.am
-+++ b/xfce4-session/Makefile.am
-@@ -38,8 +38,6 @@ xfce4_session_SOURCES =							\
- 	xfsm-compat-gnome.h						\
- 	xfsm-compat-kde.c						\
- 	xfsm-compat-kde.h						\
--	xfsm-consolekit.c						\
--	xfsm-consolekit.h						\
- 	xfsm-dns.c							\
- 	xfsm-dns.h							\
- 	xfsm-error.c							\
-@@ -65,6 +63,16 @@ xfce4_session_SOURCES =							\
- 	xfsm-upower.c							\
- 	xfsm-upower.h
- 
-+if WITH_SYSTEMD
-+xfce4_session_SOURCES +=						\
-+	xfsm-systemd.c							\
-+	xfsm-systemd.h
-+else
-+xfce4_session_SOURCES +=						\
-+	xfsm-consolekit.c						\
-+	xfsm-consolekit.h
-+endif
-+
- xfce4_session_CFLAGS =							\
- 	$(LIBSM_CFLAGS)							\
- 	$(LIBX11_CFLAGS)						\
-@@ -72,6 +80,7 @@ xfce4_session_CFLAGS =							\
- 	$(DBUS_CFLAGS)							\
- 	$(DBUS_GLIB_CFLAGS)						\
- 	$(LIBWNCK_CFLAGS)						\
-+	$(SYSTEMD_CFLAGS)						\
- 	$(XFCONF_CFLAGS)						\
- 	$(GMODULE_CFLAGS)						\
- 	$(PLATFORM_CFLAGS)
-@@ -91,6 +100,7 @@ xfce4_session_LDADD =							\
- 	$(DBUS_LIBS)							\
- 	$(DBUS_GLIB_LIBS)						\
- 	$(LIBWNCK_LIBS)							\
-+	$(SYSTEMD_LIBS)							\
- 	$(XFCONF_LIBS)							\
- 	-lm
- 
-diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
-index d8757a8..1429abd 100644
---- a/xfce4-session/xfsm-shutdown.c
-+++ b/xfce4-session/xfsm-shutdown.c
-@@ -66,10 +66,13 @@
- #include <xfce4-session/xfsm-fadeout.h>
- #include <xfce4-session/xfsm-global.h>
- #include <xfce4-session/xfsm-legacy.h>
--#include <xfce4-session/xfsm-consolekit.h>
- #include <xfce4-session/xfsm-upower.h>
- 
--
-+#ifdef HAVE_SYSTEMD
-+#include <xfce4-session/xfsm-systemd.h>
-+#else
-+#include <xfce4-session/xfsm-consolekit.h>
-+#endif
- 
- static void xfsm_shutdown_finalize  (GObject      *object);
- static void xfsm_shutdown_sudo_free (XfsmShutdown *shutdown);
diff --git a/extra/xfce4-settings/PKGBUILD b/extra/xfce4-settings/PKGBUILD
index 4fce8caab..c83a4a3d6 100644
--- a/extra/xfce4-settings/PKGBUILD
+++ b/extra/xfce4-settings/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169428 2012-10-21 04:01:39Z foutrelis $
+# $Id: PKGBUILD 184292 2013-05-05 17:49:14Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 
 pkgname=xfce4-settings
-pkgver=4.10.0
-pkgrel=3
+pkgver=4.10.1
+pkgrel=1
 pkgdesc="Settings manager for xfce"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
@@ -16,26 +16,19 @@ depends=('exo' 'garcon' 'libxfce4ui' 'libnotify' 'libxklavier'
 makedepends=('intltool')
 optdepends=('libcanberra: for sound control')
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
-        xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch
-        xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
         xfce4-settings-xml-4.10.0.patch)
-sha256sums=('0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e'
-            '28482a3410d587fe051b84080ab5366b4fbe2af8684ee46384ff899b73d3f349'
-            '5be974f8fba6ba9dc14e136762cf752fe46eac99f71511d77d910610b5401244'
+sha256sums=('118a6959ea50e3a533d7aa18ec5a878a47a30608b3ce9ce59a93c3888f4e13d5'
             '78e68ef2cbf19760707ba24f3d57dd59fbf40a540d50d20e7cc62ba02196aaaa')
-
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # enable gnome icon theme, clearlooks theme and font hinting by default
   # (taken from Fedora)
   patch -Np1 -i "$srcdir/xfce4-settings-xml-4.10.0.patch"
+}
 
-  # https://bugzilla.xfce.org/show_bug.cgi?id=9272
-  patch -Np1 -i "$srcdir/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch"
-
-  # https://bugzilla.xfce.org/show_bug.cgi?id=9273
-  patch -Np1 -i "$srcdir/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch"
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
 
   ./configure \
     --prefix=/usr \
diff --git a/extra/xfce4-settings/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch b/extra/xfce4-settings/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
deleted file mode 100644
index 1d271476e..000000000
--- a/extra/xfce4-settings/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 2ec636049b95d0c51286253813b5b1a074472afc Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <lionel@lefolgoc.net>
-Date: Sun, 09 Sep 2012 09:50:19 +0000
-Subject: Xfsettingsd: Check service name of NameOwnerChanged (bug #9273).
-
-In some conditions, the dbus spawn of xfconf leads to the
-shutdown of xfsettingsd because it "thinks" another instance
-is taking over... After some debugging I found that it
-receives a NameOwnerChanged signal describing the launch
-of Xfconf (name=org.xfce.Xfconf, old=, new=:1.11 for example).
-
-(cherry picked from commit c17fe35e6f2ff673bab102e736a327fa7bcc1d73)
----
-diff --git a/xfsettingsd/main.c b/xfsettingsd/main.c
-index 0f3a68d..55c4183 100644
---- a/xfsettingsd/main.c
-+++ b/xfsettingsd/main.c
-@@ -93,15 +93,29 @@ signal_handler (gint signum,
- 
- 
- static DBusHandlerResult
--dbus_connection_filter_func (DBusConnection     *connection,
--                             DBusMessage        *message,
--                             void               *user_data)
-+dbus_connection_filter_func (DBusConnection *connection,
-+                             DBusMessage    *message,
-+                             void           *user_data)
- {
-+    gchar *name, *old, *new;
-+
-     if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
-     {
--        g_printerr (G_LOG_DOMAIN ": %s\n", "Another instance took over. Leaving...");
--        gtk_main_quit ();
--        return DBUS_HANDLER_RESULT_HANDLED;
-+        /* double check if it is really org.xfce.SettingsDaemon
-+         * being replaced, see bug 9273 */
-+        if (dbus_message_get_args (message, NULL,
-+                                   DBUS_TYPE_STRING, &name,
-+                                   DBUS_TYPE_STRING, &old,
-+                                   DBUS_TYPE_STRING, &new,
-+                                   DBUS_TYPE_INVALID))
-+        {
-+            if (g_strcmp0 (name, XFSETTINGS_DBUS_NAME) == 0)
-+            {
-+                g_printerr (G_LOG_DOMAIN ": %s\n", "Another instance took over. Leaving...");
-+                gtk_main_quit ();
-+                return DBUS_HANDLER_RESULT_HANDLED;
-+            }
-+        }
-     }
- 
-     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
---
-cgit v0.9.0.3
diff --git a/extra/xfce4-settings/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch b/extra/xfce4-settings/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch
deleted file mode 100644
index ebd270bd9..000000000
--- a/extra/xfce4-settings/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8032dd77047329a93edd4c4a8b686ffc36d2f7a7 Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <lionel@lefolgoc.net>
-Date: Sun, 09 Sep 2012 09:41:18 +0000
-Subject: Appearance: Fix gtk3 theme detection in install script (bug #9272).
-
-(cherry picked from commit e3c6db6f57e72cdbdf0e293bba7d6ca650d7521b)
----
-diff --git a/dialogs/appearance-settings/appearance-install-theme b/dialogs/appearance-settings/appearance-install-theme
-index 13f61ae..6dc1e17 100755
---- a/dialogs/appearance-settings/appearance-install-theme
-+++ b/dialogs/appearance-settings/appearance-install-theme
-@@ -140,7 +140,7 @@ if test "$retval" -eq 0; then
-     detectthemes "gtk-2.0/gtkrc"
- 
-     # install gtk-3.0 themes
--    detectthemes "gtk-3.0/gtkrc"
-+    detectthemes "gtk-3.0/gtk.css"
- 
-     # install xfwm4 themes
-     detectthemes "xfwm4/themerc"
---
-cgit v0.9.0.3
diff --git a/extra/xfce4-smartbookmark-plugin/fix-config-write.patch b/extra/xfce4-smartbookmark-plugin/fix-config-write.patch
deleted file mode 100644
index 0f5a25f4f..000000000
--- a/extra/xfce4-smartbookmark-plugin/fix-config-write.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -upr xfce4-smartbookmark-plugin-0.4.4.orig/src/smartbookmark.c xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c
---- xfce4-smartbookmark-plugin-0.4.4.orig/src/smartbookmark.c	2012-11-19 22:24:16.000000000 +0200
-+++ xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c	2012-11-19 22:24:42.000000000 +0200
-@@ -365,6 +365,7 @@ static void search_create_options(XfcePa
-     search_apply_options_cb(search);
-     gtk_widget_destroy(search->opt_dialog);
-     xfce_panel_plugin_unblock_menu(plugin);
-+    search_write_config(plugin, search);
- }
- 
- 
diff --git a/extra/xfce4-smartbookmark-plugin/use-exo-open-instead-of-xfbrowser4.patch b/extra/xfce4-smartbookmark-plugin/use-exo-open-instead-of-xfbrowser4.patch
deleted file mode 100644
index 254382182..000000000
--- a/extra/xfce4-smartbookmark-plugin/use-exo-open-instead-of-xfbrowser4.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c	
-+++ xfce4-smartbookmark-plugin-0.4.4/src/smartbookmark.c	
-@@ -75,18 +75,27 @@ XFCE_PANEL_PLUGIN_REGISTER_INTERNAL(smar
- 
- static gboolean do_search(const char *url, const char *keyword)
- {
-+    gchar *argv[] = { "exo-open", "--launch", "WebBrowser", NULL, NULL };
-+    gchar *complete_url;
-+    gboolean retval;
-+    GError *error = NULL;
-+
-     DBG ("Do search");
--    gchar *execute;
--    gboolean success;
--    execute = g_strconcat("xfbrowser4  \"", url, NULL);//works better for me
--    //execute = g_strconcat("x-www-browser \"", url, NULL);
--    execute = g_strconcat(execute, keyword, NULL);
--    execute = g_strconcat(execute, "\"", NULL);
- 
--    success = exec_command(execute);
--    g_free(execute);
-+    complete_url = g_strconcat(url, keyword, NULL);
-+    argv[3] = complete_url;
-+
-+    retval = g_spawn_async(NULL, (gchar **)argv, NULL,
-+        G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, NULL, &error);
-+
-+    g_free(complete_url);
-+
-+    if (!retval) {
-+        xfce_err("%s", error->message);
-+        g_error_free(error);
-+    }
- 
--    return success;
-+    return retval;
- }
diff --git a/extra/xfce4-terminal/PKGBUILD b/extra/xfce4-terminal/PKGBUILD
index f55feba33..9c9f197f2 100644
--- a/extra/xfce4-terminal/PKGBUILD
+++ b/extra/xfce4-terminal/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 174007 2013-01-01 12:50:48Z foutrelis $
+# $Id: PKGBUILD 184303 2013-05-05 19:21:38Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-terminal
-pkgver=0.6.1
+pkgver=0.6.2
 pkgrel=1
 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ replaces=('terminal')
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/apps/$pkgname/0.6/$pkgname-$pkgver.tar.bz2)
-sha256sums=('61346427e55af79e86511572bfabb2e025cb13720879226ea1b98a92f0bcd4c8')
+sha256sums=('3d92422288d26311880af694bb4e02c9235997ca307a5e85001bf6bef65c3b35')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfce4-timer-plugin/PKGBUILD b/extra/xfce4-timer-plugin/PKGBUILD
index e6b09e8bf..5bb0eb654 100644
--- a/extra/xfce4-timer-plugin/PKGBUILD
+++ b/extra/xfce4-timer-plugin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157895 2012-04-30 04:21:31Z foutrelis $
+# $Id: PKGBUILD 178519 2013-02-24 22:42:03Z eric $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-timer-plugin
-pkgver=0.6.4
-pkgrel=2
+pkgver=1.0.0
+pkgrel=1
 pkgdesc="plugin to track time for the Xfce4 panel"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -15,7 +15,7 @@ makedepends=('intltool')
 options=('!libtool')
 install=xfce4-timer-plugin.install
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('c2f9e113dcda742cd1559129b79f609b')
+sha1sums=('5bd0e450b4c9b3f37a289fc1723b1a3d984ffd5d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xfce4-weather-plugin/PKGBUILD b/extra/xfce4-weather-plugin/PKGBUILD
index a6853ace1..f094c4cfd 100644
--- a/extra/xfce4-weather-plugin/PKGBUILD
+++ b/extra/xfce4-weather-plugin/PKGBUILD
@@ -1,32 +1,37 @@
-# $Id: PKGBUILD 166575 2012-09-12 13:41:32Z foutrelis $
+# $Id: PKGBUILD 181854 2013-04-04 14:49:51Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Suzy Williams <suzanne.williams3@verizon.net>
 
 pkgname=xfce4-weather-plugin
-pkgver=0.8.2
-pkgrel=1
+pkgver=0.8.3
+pkgrel=3
 pkgdesc="A weather plugin for the Xfce4 panel"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
 license=('GPL2')
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxml2' 'hicolor-icon-theme')
+depends=('xfce4-panel' 'libxml2' 'libsoup' 'hicolor-icon-theme')
 makedepends=('intltool')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.8/$pkgname-$pkgver.tar.bz2)
-sha256sums=('9506a3b1c04992202790b1deac8bbef8ed4933a0becd5c8e61194118e7eb67fe')
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.8/$pkgname-$pkgver.tar.bz2
+        fix-color-parsing-when-reading-config-file.patch)
+sha256sums=('40a6a22be7653b15a47174a430da89040f178695b48e5e01e77990050f715ce4'
+            'dbf1f938e656293daeac4c3ab55061c5f61d8e29e470453b4e956081ca4722c7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  patch -Np1 -i "$srcdir/fix-color-parsing-when-reading-config-file.patch"
+
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
     --localstatedir=/var \
     --disable-static \
-    --disable-debug
+    --disable-debug \
+    --disable-upower
   make
 }
 
diff --git a/extra/xfce4-weather-plugin/fix-color-parsing-when-reading-config-file.patch b/extra/xfce4-weather-plugin/fix-color-parsing-when-reading-config-file.patch
new file mode 100644
index 000000000..916492f00
--- /dev/null
+++ b/extra/xfce4-weather-plugin/fix-color-parsing-when-reading-config-file.patch
@@ -0,0 +1,22 @@
+From 462e85dfd54e9a3bdf6c330c602a6545bccce585 Mon Sep 17 00:00:00 2001
+From: Harald Judt <h.judt@gmx.at>
+Date: Wed, 20 Feb 2013 14:25:09 +0000
+Subject: Fix color parsing when reading config file.
+
+This turned out to be a stupid copy & paste mistake.
+---
+diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
+index 710c33c..4a2e3c3 100644
+--- a/panel-plugin/weather.c
++++ b/panel-plugin/weather.c
+@@ -884,7 +884,7 @@ xfceweather_read_config(XfcePanelPlugin *plugin,
+ 
+     value = xfce_rc_read_entry(rc, "scrollbox_color", NULL);
+     if (value)
+-        gdk_color_parse("#rrrrggggbbbb", &(data->scrollbox_color));
++        gdk_color_parse(value, &(data->scrollbox_color));
+ 
+     data->scrollbox_use_color =
+         xfce_rc_read_bool_entry(rc, "scrollbox_use_color", FALSE);
+--
+cgit v0.9.1
diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD
index 4558e9281..7b2ec2f80 100644
--- a/extra/xfdesktop/PKGBUILD
+++ b/extra/xfdesktop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170256 2012-11-06 11:49:29Z foutrelis $
+# $Id: PKGBUILD 179856 2013-03-10 16:22:07Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfdesktop
-pkgver=4.10.0
-pkgrel=5
+pkgver=4.10.2
+pkgrel=1
 pkgdesc="A desktop manager for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
@@ -16,18 +16,12 @@ conflicts=('xfce4-menueditor')
 replaces=('xfce4-menueditor')
 options=('!libtool')
 install=xfdesktop.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
-        add-backgrounds-xfce-to-search-path.patch)
-sha256sums=('897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b'
-            'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('49a6e0be513e307e896f7e5929825babec9bbcd4b2e73552f9d27647a4db797d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Add backgrounds/xfce/ to the single image list in the settings app
-  # https://bugzilla.xfce.org/show_bug.cgi?id=8799
-  patch -Np1 -i "$srcdir/add-backgrounds-xfce-to-search-path.patch"
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch b/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch
deleted file mode 100644
index c48aeac33..000000000
--- a/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-@@ -, +, @@ 
- settings app. (Bug #8799)
----
- settings/main.c |   14 ++++++++++++++
- 1 file changed, 14 insertions(+)
---- a/settings/main.c	
-+++ a/settings/main.c	
-@@ -688,6 +688,7 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel)
-         xfconf_channel_set_string(panel->channel, prop_image, image_file);
-         xfconf_channel_set_string(panel->channel, prop_last, image_file);
- 
-+        /* Add all backdrops in xfce4/backdrops/ */
-         backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA,
-                                                  "xfce4/backdrops/");
-         for(i = 0; backdrop_dirs[i]; ++i) {
-@@ -696,6 +697,19 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel)
-             if(tmp)
-                 image_file_iter = tmp;
-         }
-+        g_strfreev(backdrop_dirs);
-+
-+        /* Add all backdrops in backgrounds/xfce/ */
-+        backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA,
-+                                                 "backgrounds/xfce/");
-+        for(i = 0; backdrop_dirs[i]; ++i) {
-+            tmp = xfdesktop_image_list_add_dir(ls, backdrop_dirs[i],
-+                                               image_file);
-+            if(tmp)
-+                image_file_iter = tmp;
-+        }
-+        g_strfreev(backdrop_dirs);
-+
- 
-         if(!image_file_iter)
-             image_file_iter = xfdesktop_settings_image_treeview_add(GTK_TREE_MODEL(ls), image_file);
--- 
diff --git a/extra/xfdesktop/avoid-duplicating-volume-icons.patch b/extra/xfdesktop/avoid-duplicating-volume-icons.patch
deleted file mode 100644
index 45e18ac11..000000000
--- a/extra/xfdesktop/avoid-duplicating-volume-icons.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 7b8b5cb05bd870549dee2d159e246ce58e325b7f Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Tue, 6 Nov 2012 00:10:48 +0200
-Subject: [PATCH] Avoid duplicating volume icons
-
-This is a workaround for GVFS 1.14.0 which emits volume-added signals
-for pre-existing volumes.
----
- src/xfdesktop-file-icon-manager.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
-index 72b6d09..e039cb8 100644
---- a/src/xfdesktop-file-icon-manager.c
-+++ b/src/xfdesktop-file-icon-manager.c
-@@ -2521,6 +2521,10 @@ xfdesktop_file_icon_manager_volume_added(GVolumeMonitor *monitor,
- {
-     XfdesktopFileIconManager *fmanager = XFDESKTOP_FILE_ICON_MANAGER(user_data);
- 
-+    /* avoid duplicating volume icons -- workaround for GVFS 1.14.0 */
-+    if (g_hash_table_lookup(fmanager->priv->removable_icons, volume))
-+        return;
-+
-     xfdesktop_file_icon_manager_add_removable_volume(fmanager, volume);
- }
- 
--- 
-1.8.0
-
diff --git a/extra/xfdesktop/implement-paste-on-desktop.patch b/extra/xfdesktop/implement-paste-on-desktop.patch
deleted file mode 100644
index a84e6cb05..000000000
--- a/extra/xfdesktop/implement-paste-on-desktop.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-From dd57435413a10b288153d1ae0062d37e58bcffd1 Mon Sep 17 00:00:00 2001
-From: Eric Koegel <eric.koegel@gmail.com>
-Date: Sat, 17 Dec 2011 10:37:04 +0300
-Subject: [PATCH] Adds the code required to perform a paste on the on the
- desktop. Fixes bug 3804.
-
----
- src/xfdesktop-clipboard-manager.c |  114 ++++++++++++++++++++++++++++++-------
- src/xfdesktop-file-icon-manager.c |   27 ++++++++-
- 2 files changed, 120 insertions(+), 21 deletions(-)
-
-diff --git a/src/xfdesktop-clipboard-manager.c b/src/xfdesktop-clipboard-manager.c
-index 76b4bef..ed90aa0 100644
---- a/src/xfdesktop-clipboard-manager.c
-+++ b/src/xfdesktop-clipboard-manager.c
-@@ -307,7 +307,6 @@ xfdesktop_clipboard_manager_owner_changed (GtkClipboard           *clipboard,
- }
- 
- 
--#if 0
- static void
- xfdesktop_clipboard_manager_contents_received (GtkClipboard     *clipboard,
-                                             GtkSelectionData *selection_data,
-@@ -318,6 +317,8 @@ xfdesktop_clipboard_manager_contents_received (GtkClipboard     *clipboard,
-   GtkWindow                      *parent = GTK_WINDOW(gtk_widget_get_toplevel(request->widget));
-   gboolean                        path_copy = TRUE;
-   GList                          *path_list = NULL;
-+  GList                          *dest_file_list  = NULL;
-+  GList                          *l               = NULL;
-   gchar                          *data;
- 
-   /* check whether the retrieval worked */
-@@ -340,19 +341,43 @@ xfdesktop_clipboard_manager_contents_received (GtkClipboard     *clipboard,
-         }
- 
-       /* determine the path list stored with the selection */
--      path_list = thunar_vfs_path_list_from_string (data, NULL);
-+      path_list = xfdesktop_file_utils_file_list_from_string (data);
-     }
- 
-   /* perform the action if possible */
-   if (G_LIKELY (path_list != NULL))
-     {
-+      for (l = path_list; l; l = l->next) {
-+        gchar *dest_basename = g_file_get_basename(l->data);
-+
-+        if(dest_basename && *dest_basename != '\0') {
-+          /* If we copy a file, we need to use the new absolute filename
-+           * as the destination. If we move, we need to use the destination
-+           * directory. */
-+           if(path_copy) {
-+             GFile *dest_file = g_file_get_child(request->target_file, dest_basename);
-+             dest_file_list = g_list_prepend(dest_file_list, dest_file);
-+           } else {
-+             dest_file_list = g_list_prepend(dest_file_list, request->target_file);
-+           }
-+         }
-+         g_free(dest_basename);
-+      }
-+
-+      dest_file_list = g_list_reverse(dest_file_list);
-+
-       if (G_LIKELY (path_copy))
--        xfdesktop_file_utils_copy_into(parent, path_list, request->target_path);
--        //thunar_application_copy_into (application, request->widget, path_list, request->target_path, request->new_files_closure);
--      else
--        xfdesktop_file_utils_move_into(parent, path_list, request->target_path);
--        //thunar_application_move_into (application, request->widget, path_list, request->target_path, request->new_files_closure);
--      thunar_vfs_path_list_free (path_list);
-+      {
-+        xfdesktop_file_utils_transfer_files(GDK_ACTION_COPY,
-+                                            path_list,
-+                                            dest_file_list,
-+                                            gtk_widget_get_screen(GTK_WIDGET(parent)));
-+      } else {
-+        xfdesktop_file_utils_transfer_files(GDK_ACTION_MOVE,
-+                                            path_list,
-+                                            dest_file_list,
-+                                            gtk_widget_get_screen(GTK_WIDGET(parent)));
-+      }
- 
-       /* clear the clipboard if it contained "cutted data"
-        * (gtk_clipboard_clear takes care of not clearing
-@@ -365,18 +390,11 @@ xfdesktop_clipboard_manager_contents_received (GtkClipboard     *clipboard,
-        * if either the Xserver or our GTK+ version
-        * doesn't support the XFixes extension.
-        */
--#if GTK_CHECK_VERSION(2,6,0)
-       if (!gdk_display_supports_selection_notification (gtk_clipboard_get_display (manager->clipboard)))
--#endif
-         {
-           xfdesktop_clipboard_manager_owner_changed (manager->clipboard, NULL, manager);
-         }
-     }
--  else
--    {
--      /* tell the user that we cannot paste */
--//      thunar_dialogs_show_error (request->widget, NULL, _("There is nothing on the clipboard to paste"));
--    }
- 
-   /* free the request */
-   if (G_LIKELY (request->widget != NULL))
-@@ -384,10 +402,11 @@ xfdesktop_clipboard_manager_contents_received (GtkClipboard     *clipboard,
-   if (G_LIKELY (request->new_files_closure != NULL))
-     g_closure_unref (request->new_files_closure);
-   g_object_unref (G_OBJECT (request->manager));
--  thunar_vfs_path_unref (request->target_path);
--  g_free (request);
-+
-+  g_list_free(dest_file_list);
-+  g_list_free(path_list);
- }
--#endif
-+
- 
- 
- static void
-@@ -654,6 +673,61 @@ xfdesktop_clipboard_manager_cut_files (XfdesktopClipboardManager *manager,
- gboolean
- xfdesktop_clipboard_manager_get_can_paste (XfdesktopClipboardManager *manager)
- {
--    /* FIXME: implement */
--    return FALSE;
-+    g_return_val_if_fail (XFDESKTOP_IS_CLIPBOARD_MANAGER (manager), FALSE);
-+    return manager->can_paste;
-+}
-+
-+
-+/**
-+ * thunar_clipboard_manager_paste_files:
-+ * @manager           : a #XfdesktopClipboardManager.
-+ * @target_file       : the #GFile of the folder to which the contents on the clipboard
-+ *                      should be pasted.
-+ * @widget            : a #GtkWidget, on which to perform the paste or %NULL if no widget is
-+ *                      known.
-+ * @new_files_closure : a #GClosure to connect to the job's "new-files" signal,
-+ *                      which will be emitted when the job finishes with the
-+ *                      list of #GFile<!---->s created by the job, or
-+ *                      %NULL if you're not interested in the signal.
-+ *
-+ * Pastes the contents from the clipboard associated with @manager to the directory
-+ * referenced by @target_file.
-+ * Code copied and adapted from thunar-clipboard-manager.c
-+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
-+ * Copyright (c) 2009-2011 Jannis Pohlmann <jannis@xfce.org>
-+ **/
-+void
-+xfdesktop_clipboard_manager_paste_files (XfdesktopClipboardManager *manager,
-+                                      GFile                  *target_file,
-+                                      GtkWidget              *widget,
-+                                      GClosure               *new_files_closure)
-+{
-+  XfdesktopClipboardPasteRequest *request;
-+
-+  g_return_if_fail (XFDESKTOP_IS_CLIPBOARD_MANAGER (manager));
-+  g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
-+
-+  /* prepare the paste request */
-+  request = g_slice_new0 (XfdesktopClipboardPasteRequest);
-+  request->manager = g_object_ref (G_OBJECT (manager));
-+  request->target_file = g_object_ref (target_file);
-+  request->widget = widget;
-+
-+  /* take a reference on the closure (if any) */
-+  if (G_LIKELY (new_files_closure != NULL))
-+    {
-+      request->new_files_closure = new_files_closure;
-+      g_closure_ref (new_files_closure);
-+      g_closure_sink (new_files_closure);
-+    }
-+
-+  /* get notified when the widget is destroyed prior to
-+   * completing the clipboard contents retrieval
-+   */
-+  if (G_LIKELY (request->widget != NULL))
-+    g_object_add_weak_pointer (G_OBJECT (request->widget), (gpointer) &request->widget);
-+
-+  /* schedule the request */
-+  gtk_clipboard_request_contents (manager->clipboard, manager->x_special_gnome_copied_files,
-+                                  xfdesktop_clipboard_manager_contents_received, request);
- }
-diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
-index d3ca2eb..b7fada2 100644
---- a/src/xfdesktop-file-icon-manager.c
-+++ b/src/xfdesktop-file-icon-manager.c
-@@ -858,6 +858,15 @@ xfdesktop_file_icon_menu_delete(GtkWidget *widget,
- }
- 
- static void
-+xfdesktop_file_icon_menu_paste(GtkWidget *widget,
-+                               gpointer user_data)
-+{
-+    XfdesktopFileIconManager *fmanager = XFDESKTOP_FILE_ICON_MANAGER(user_data);
-+    if(widget && fmanager)
-+        xfdesktop_clipboard_manager_paste_files(clipboard_manager, fmanager->priv->folder, widget, NULL);
-+}
-+
-+static void
- xfdesktop_file_icon_menu_properties(GtkWidget *widget,
-                                     gpointer user_data)
- {
-@@ -1616,7 +1625,11 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop,
-             mi = gtk_image_menu_item_new_from_stock(GTK_STOCK_PASTE, NULL);
-             gtk_widget_show(mi);
-             gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
--            /* FIXME: implement */
-+            if(xfdesktop_clipboard_manager_get_can_paste(clipboard_manager)) {
-+                g_signal_connect(G_OBJECT(mi), "activate",
-+                                 G_CALLBACK(xfdesktop_file_icon_menu_paste),
-+                                 fmanager);
-+            } else
-             gtk_widget_set_sensitive(mi, FALSE);
-         } else {
-             mi = gtk_image_menu_item_new_from_stock(GTK_STOCK_COPY, NULL);
-@@ -2098,6 +2111,18 @@ xfdesktop_file_icon_manager_key_press(GtkWidget *widget,
-             }
-             return TRUE;
-         
-+        case GDK_v:
-+        case GDK_V:
-+            if(!(evt->state & GDK_CONTROL_MASK)
-+               || (evt->state & (GDK_SHIFT_MASK|GDK_MOD1_MASK|GDK_MOD4_MASK)))
-+            {
-+                return FALSE;
-+            }
-+            if(xfdesktop_clipboard_manager_get_can_paste(clipboard_manager)) {
-+                xfdesktop_clipboard_manager_paste_files(clipboard_manager, fmanager->priv->folder, widget, NULL);
-+            }
-+            return TRUE;
-+
-         case GDK_r:
-         case GDK_R:
-             if(!(evt->state & GDK_CONTROL_MASK)
--- 
-1.7.5.4
-
diff --git a/extra/xfwm4/PKGBUILD b/extra/xfwm4/PKGBUILD
index 873f7311b..6791aed95 100644
--- a/extra/xfwm4/PKGBUILD
+++ b/extra/xfwm4/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163772 2012-07-19 16:30:24Z foutrelis $
+# $Id: PKGBUILD 184290 2013-05-05 17:47:29Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfwm4
-pkgver=4.10.0
-pkgrel=2
+pkgver=4.10.1
+pkgrel=1
 pkgdesc="Xfce window manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
@@ -14,17 +14,12 @@ depends=('libxfce4ui' 'libwnck' 'hicolor-icon-theme')
 makedepends=('intltool')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
-        xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch)
-sha256sums=('492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c'
-            'f088a56cc05d1856af8d68dae9e40bc53b724d9dde4d8c2b78a88922c0ee6d1d')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('380c44fba6eb779e34be0fe94f3726cfa131803014d6073c45aec8a1257fa740')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Fix https://bugzilla.xfce.org/show_bug.cgi?id=8949 (FS#29970)
-  patch -Np1 -i "$srcdir/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch"
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/xfwm4/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch b/extra/xfwm4/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch
deleted file mode 100644
index f01b554ce..000000000
--- a/extra/xfwm4/xfwm4-4.10.0-implement-NET_WM_MOVERESIZE_CANCEL.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 099614e3f045e06db7ab509e174510ea74857adb Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <fourdan@xfce.org>
-Date: Wed, 18 Jul 2012 20:12:07 +0000
-Subject: Implement NET_WM_MOVERESIZE_CANCEL message (bug #8949)
-
-as gtk+-3.4 now uses it.
----
-diff --git a/src/display.h b/src/display.h
-index 1ad2ef8..8797237 100644
---- a/src/display.h
-+++ b/src/display.h
-@@ -163,7 +163,8 @@ enum
-     NET_WM_MOVERESIZE_SIZE_LEFT,
-     NET_WM_MOVERESIZE_MOVE,
-     NET_WM_MOVERESIZE_SIZE_KEYBOARD,
--    NET_WM_MOVERESIZE_MOVE_KEYBOARD
-+    NET_WM_MOVERESIZE_MOVE_KEYBOARD,
-+    NET_WM_MOVERESIZE_CANCEL
- };
- 
- enum
-diff --git a/src/moveresize.c b/src/moveresize.c
-index 9893c30..a98bdf7 100644
---- a/src/moveresize.c
-+++ b/src/moveresize.c
-@@ -827,7 +827,7 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
-     eventFilterStatus status = EVENT_FILTER_STOP;
-     MoveResizeData *passdata = (MoveResizeData *) data;
-     Client *c = NULL;
--    gboolean moving = TRUE;
-+    gboolean moving;
-     XWindowChanges wc;
-     int prev_x, prev_y;
- 
-@@ -840,6 +840,12 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
-     display_info = screen_info->display_info;
-     configure_flags = NO_CFG_FLAG;
- 
-+    /*
-+     * Clients may choose to end the move operation,
-+     * we use XFWM_FLAG_MOVING_RESIZING for that.
-+     */
-+    moving = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
-+
-     /* Update the display time */
-     myDisplayUpdateCurrentTime (display_info, xevent);
- 
-@@ -1294,7 +1300,12 @@ clientResizeEventFilter (XEvent * xevent, gpointer data)
-     screen_info = c->screen_info;
-     display_info = screen_info->display_info;
-     status = EVENT_FILTER_STOP;
--    resizing = TRUE;
-+
-+    /*
-+     * Clients may choose to end the resize operation,
-+     * we use XFWM_FLAG_MOVING_RESIZING for that.
-+     */
-+    resizing = FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
- 
-     frame_x = frameX (c);
-     frame_y = frameY (c);
-diff --git a/src/netwm.c b/src/netwm.c
-index 545e64a..1352f08 100644
---- a/src/netwm.c
-+++ b/src/netwm.c
-@@ -695,10 +695,15 @@ clientNetMoveResize (Client * c, XClientMessageEvent * ev)
-             resize = TRUE; /* Resize */
-             break;
-         case NET_WM_MOVERESIZE_MOVE:
--        default:
-             event->type = ButtonPress;
-             resize = FALSE; /* Move */
-             break;
-+        case NET_WM_MOVERESIZE_CANCEL:
-+            FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING);
-+            /* Walk through */
-+        default: /* Do nothing */
-+            return;
-+            break;
-     }
- 
-     if (!FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
---
-cgit v0.9.0.3
diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 379315f4e..7d0726930 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 175863 2013-01-23 00:12:54Z eric $
+# $Id: PKGBUILD 180316 2013-03-20 02:35:37Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-lib
 pkgver=1.2.2
-pkgrel=5
+pkgrel=8
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xine-project.org"
 license=('LGPL' 'GPL')
 depends=('libxvmc' 'ffmpeg' 'libxinerama')
 makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'libmodplug'
-             'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' 
+             'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad'
              'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs')
-[ "$CARCH" = "mips64el" ] || makedepends+=('glu' 'libvdpau')
+[ "$CARCH" = "mips64el" ] || makedepends+=('mesa' 'glu' 'libvdpau')
 optdepends=('imagemagick: for using the imagemagick plugin' \
             'jack: for using the jack plugin' \
             'vcdimager: for using the vcd plugin')
@@ -32,15 +32,24 @@ optdepends+=('wavpack: for using the wavpack plugin' \
 [ "$CARCH" = "mips64el" ] || optdepends+=('libvdpau: for using the VDPAU plugin')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz
+        xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch
 	0001-fix-non-x86-build.patch)
 sha1sums=('a349cbb0b72256bb262377796a022dcf63829b4c'
+          '45500eca2aa40c133e1a6e8b23dbadc4b921b11f'
 	  '5f1a34c7bafa7ea96c0e4e14fbf6e31e53fe41e0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Fix audio decoding with newest FFmpeg
+  # https://bugs.archlinux.org/task/33818
+  patch -Np1 -i "$srcdir/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch"
+
   patch -Np1 -i ${srcdir}/0001-fix-non-x86-build.patch
+
   [ "$CARCH" = "mips64el" ] || extraconf=--enable-vdpau
-  ./configure --prefix=/usr --with-wavpack --disable-optimizations $extraconf
+
+  ./configure --prefix=/usr --with-wavpack --disable-optimizations $extra
   make
 }
 
diff --git a/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch b/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch
new file mode 100644
index 000000000..255f56d0d
--- /dev/null
+++ b/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch
@@ -0,0 +1,277 @@
+From 679582503c8ba2f91a82e44c4a2938550306fd07 Mon Sep 17 00:00:00 2001
+From: Torsten Jager <t.jager@gmx.de>
+Date: Thu, 21 Feb 2013 22:35:00 +0200
+Subject: [PATCH 3/5] ffmpeg_audio_decoder: support new av_decode_audio4 ()
+
+---
+ src/combined/ffmpeg/ff_audio_decoder.c | 153 +++++++++++++++++++++++++++------
+ src/combined/ffmpeg/ffmpeg_compat.h    |   4 +-
+ 2 files changed, 131 insertions(+), 26 deletions(-)
+
+diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c
+index 4e64378..34a7a9e 100644
+--- a/src/combined/ffmpeg/ff_audio_decoder.c
++++ b/src/combined/ffmpeg/ff_audio_decoder.c
+@@ -71,7 +71,9 @@ typedef struct ff_audio_decoder_s {
+   int               decoder_ok;
+ 
+   AVCodecParserContext *parser_context;
+-
++#if AVAUDIO > 3
++  AVFrame          *av_frame;
++#endif
+ } ff_audio_decoder_t;
+ 
+ 
+@@ -150,6 +152,9 @@ static void ff_audio_init_codec(ff_audio_decoder_t *this, unsigned int codec_typ
+     return;
+   }
+ 
++  /* Try to make the following true */
++  this->context->request_sample_fmt = AV_SAMPLE_FMT_S16;
++
+   /* Current ffmpeg audio decoders usually use 16 bits/sample
+    * buf->decoder_info[2] can't be used as it doesn't refer to the output
+    * bits/sample for some codecs (e.g. MS ADPCM) */
+@@ -358,25 +363,19 @@ static void ff_audio_output_close(ff_audio_decoder_t *this)
+   this->audio_channels = 0;
+ }
+ 
+-static int ff_audio_decode(xine_t *xine,
+-                           AVCodecContext *ctx,
+-                           AVCodecParserContext *parser_ctx,
+-                           int16_t *decode_buffer, int *decode_buffer_size,
+-                           uint8_t *buf, int size)
+-{
++static int ff_audio_decode (ff_audio_decoder_t *this,
++  int16_t *decode_buffer, int *decode_buffer_size, uint8_t *buf, int size) {
+   int consumed;
+   int parser_consumed = 0;
+ 
+ #if AVPARSE > 1
+-  if (parser_ctx) {
++  if (this->parser_context) {
+     uint8_t *outbuf;
+     int      outsize;
+ 
+     do {
+-      int ret = av_parser_parse2(parser_ctx, ctx,
+-                                 &outbuf, &outsize,
+-                                 buf, size,
+-                                 0, 0, 0); 
++      int ret = av_parser_parse2 (this->parser_context, this->context,
++        &outbuf, &outsize, buf, size, 0, 0, 0);
+       parser_consumed += ret;
+       buf             += ret;
+       size            -= ret;
+@@ -385,7 +384,7 @@ static int ff_audio_decode(xine_t *xine,
+     /* nothing to decode ? */
+     if (outsize <= 0) {
+       *decode_buffer_size = 0;
+-      xprintf (xine, XINE_VERBOSITY_DEBUG,
++      xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
+                "ffmpeg_audio_dec: not enough data to decode\n");
+       return parser_consumed;
+     }
+@@ -402,21 +401,115 @@ static int ff_audio_decode(xine_t *xine,
+   avpkt.data = buf;
+   avpkt.size = size;
+   avpkt.flags = AV_PKT_FLAG_KEY;
+-  consumed = avcodec_decode_audio3 (ctx,
+-                                    decode_buffer, decode_buffer_size,
+-                                    &avpkt);
++#  if AVAUDIO > 3
++  int got_frame;
++  if (!this->av_frame)
++    this->av_frame = avcodec_alloc_frame ();
++
++  consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt);
++  if ((consumed >= 0) && got_frame) {
++    int16_t *q = decode_buffer;
++    int samples = this->av_frame->nb_samples;
++    int channels = this->context->channels;
++    int bytes, i, j;
++    /* limit buffer */
++    if (channels > 12)
++      channels = 12;
++    if (*decode_buffer_size < samples * channels * 2)
++      samples = *decode_buffer_size / (channels * 2);
++    bytes = samples * channels * 2;
++    *decode_buffer_size = bytes;
++    /* convert to packed int16_t. I guess there is something
++       in libavfilter but also another dependency... */
++    switch (this->context->sample_fmt) {
++      case AV_SAMPLE_FMT_U8P:
++        if (channels > 1) {
++          uint8_t *p[12];
++          for (i = 0; i < channels; i++)
++            p[i] = (uint8_t *)this->av_frame->extended_data[i];
++          for (i = samples; i; i--) {
++            for (j = 0; j < channels; j++)
++              *q++ = ((uint16_t)(*p[j]++) << 8) ^ 0x8000;
++          }
++          break;
++        }
++      case AV_SAMPLE_FMT_U8:
++        {
++          uint8_t *p = (uint8_t *)this->av_frame->extended_data[0];
++          for (i = samples * channels; i; i--)
++            *q++ = ((uint16_t)(*p++) << 8) ^ 0x8000;
++        }
++      break;
++      case AV_SAMPLE_FMT_S16P:
++        if (channels > 1) {
++          int16_t *p[12];
++          for (i = 0; i < channels; i++)
++            p[i] = (int16_t *)this->av_frame->extended_data[i];
++          for (i = samples; i; i--) {
++            for (j = 0; j < channels; j++)
++              *q++ = *p[j]++;
++          }
++          break;
++        }
++      case AV_SAMPLE_FMT_S16:
++        xine_fast_memcpy (q, this->av_frame->extended_data[0], bytes);
++      break;
++      case AV_SAMPLE_FMT_S32P:
++        if (channels > 1) {
++          int32_t *p[12];
++          for (i = 0; i < channels; i++)
++            p[i] = (int32_t *)this->av_frame->extended_data[i];
++          for (i = samples; i; i--) {
++            for (j = 0; j < channels; j++)
++              *q++ = *p[j]++ >> 16;
++          }
++          break;
++        }
++      case AV_SAMPLE_FMT_S32:
++        {
++          int32_t *p = (int32_t *)this->av_frame->extended_data[0];
++          for (i = samples * channels; i; i--)
++            *q++ = *p++ >> 16;
++        }
++      break;
++      case AV_SAMPLE_FMT_FLTP: /* the most popular one */
++        if (channels > 1) {
++          float *p[12];
++          for (i = 0; i < channels; i++)
++            p[i] = (float *)this->av_frame->extended_data[i];
++          for (i = samples; i; i--) {
++            for (j = 0; j < channels; j++) {
++              int v = *p[j]++ * (float)0x7fff;
++              *q++ = (v + 0x8000) & ~0xffff ? (v >> 31) ^ 0x7fff : v;
++            }
++          }
++          break;
++        }
++      case AV_SAMPLE_FMT_FLT:
++        {
++          float *p = (float *)this->av_frame->extended_data[0];
++          for (i = samples * channels; i; i--) {
++            int v = *p++ * (float)0x7fff;
++            *q++ = (v + 0x8000) & ~0xffff ? (v >> 31) ^ 0x7fff : v;
++          }
++        }
++      break;
++      default: ;
++    }
++  } else *decode_buffer_size = 0;
++#  else
++  consumed = avcodec_decode_audio3 (this->context, decode_buffer, decode_buffer_size, &avpkt);
++#  endif
+ #else
+-  consumed = avcodec_decode_audio2 (ctx,
+-                                    decode_buffer, decode_buffer_size,
+-                                    buf, size);
++  consumed = avcodec_decode_audio2 (this->context, decode_buffer, decode_buffer_size, buf, size);
+ #endif
+ 
+   if (consumed < 0) {
+-    xprintf (xine, XINE_VERBOSITY_DEBUG,
++    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
+              "ffmpeg_audio_dec: error decompressing audio frame (%d)\n", consumed);
+   } else if (parser_consumed && consumed != size) {
+ 
+-    xprintf (xine, XINE_VERBOSITY_DEBUG,
++    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
+              "ffmpeg_audio_dec: decoder didn't consume all data\n");
+   }
+ 
+@@ -469,8 +562,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
+         decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+ 
+ 	bytes_consumed =
+-          ff_audio_decode(this->stream->xine, this->context,
+-                          this->parser_context,
++          ff_audio_decode(this,
+                           (int16_t *)this->decode_buffer, &decode_buffer_size,
+                           &this->buf[offset], this->size);
+ 
+@@ -539,6 +631,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
+           }
+ 
+           /* fill up this buffer */
++#if AVAUDIO < 4
+           if (codec_type == BUF_AUDIO_WMAPRO) {
+             /* the above codecs output float samples, not 16-bit integers */
+             int bytes_per_sample = sizeof(float);
+@@ -558,7 +651,9 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
+             bytes_to_send = bytes_to_send * 2 / bytes_per_sample;
+             xine_fast_memcpy(audio_buffer->mem, int_buffer, bytes_to_send);
+             free(int_buffer);
+-          } else {
++          } else
++#endif
++          {
+             if ((decode_buffer_size - out) > audio_buffer->mem_size)
+               bytes_to_send = audio_buffer->mem_size;
+             else
+@@ -595,6 +690,9 @@ static void ff_audio_reset (audio_decoder_t *this_gen) {
+ 
+   /* try to reset the wma decoder */
+   if( this->decoder_ok ) {
++#if AVAUDIO > 3
++    avcodec_free_frame (&this->av_frame);
++#endif
+     pthread_mutex_lock (&ffmpeg_lock);
+     avcodec_close (this->context);
+     if (avcodec_open (this->context, this->codec) < 0)
+@@ -626,6 +724,9 @@ static void ff_audio_dispose (audio_decoder_t *this_gen) {
+   }
+ 
+   if( this->context && this->decoder_ok ) {
++#if AVAUDIO > 3
++    avcodec_free_frame (&this->av_frame);
++#endif
+     pthread_mutex_lock (&ffmpeg_lock);
+     avcodec_close (this->context);
+     pthread_mutex_unlock (&ffmpeg_lock);
+@@ -668,7 +769,9 @@ static audio_decoder_t *ff_audio_open_plugin (audio_decoder_class_t *class_gen,
+ 
+   this->context = avcodec_alloc_context();
+   this->decode_buffer = malloc16 (AVCODEC_MAX_AUDIO_FRAME_SIZE);
+-
++#if AVAUDIO > 3
++  this->av_frame = NULL;
++#endif
+   return &this->audio_decoder;
+ }
+ 
+diff --git a/src/combined/ffmpeg/ffmpeg_compat.h b/src/combined/ffmpeg/ffmpeg_compat.h
+index 0acead8..b567dc1 100644
+--- a/src/combined/ffmpeg/ffmpeg_compat.h
++++ b/src/combined/ffmpeg/ffmpeg_compat.h
+@@ -94,7 +94,9 @@
+ #endif
+ 
+ /* avcodec_decode_audio() */
+-#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
++#if LIBAVCODEC_VERSION_MAJOR >= 54
++#  define AVAUDIO 4
++#elif LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
+ #  define AVAUDIO 3
+ #else
+ #  define AVAUDIO 2
+-- 
+1.8.1.5
+
diff --git a/extra/xine-ui/fix_lirc.diff b/extra/xine-ui/fix_lirc.diff
deleted file mode 100644
index 93890cb5c..000000000
--- a/extra/xine-ui/fix_lirc.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/m4/_xine.m4 b/m4/_xine.m4
---- a/m4/_xine.m4
-+++ b/m4/_xine.m4
-@@ -46,7 +46,8 @@ AC_DEFUN([AC_CHECK_LIRC],
-         fi
-         for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do
-           AC_CHECK_FILE(["$llirc/liblirc_client.so"],
--             [LIRC_LIBS="$llirc/liblirc_client.so"]
-+             [LIRC_LIBS="$llirc/liblirc_client.so"
-+              found_lirc=yes]
-              AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]),
-              AC_CHECK_FILE(["$llirc/liblirc_client.a"],
-                 [LIRC_LIBS="$llirc/liblirc_client.a"
diff --git a/extra/xine-ui/lirc-check-a89347673097.patch b/extra/xine-ui/lirc-check-a89347673097.patch
deleted file mode 100644
index c1c8d2614..000000000
--- a/extra/xine-ui/lirc-check-a89347673097.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-
-# HG changeset patch
-# User Darren Salt <linux@youmustbejoking.demon.co.uk>
-# Date 1268754560 0
-# Node ID a89347673097053d89675e991ab403cda04d94cd
-# Parent ed3079d668ed5291d1daf7096d6b42c90ee06e11
-Resync LIRC check with gxine; no longer fails if liblircclient0.pc is missing.
-
---- a/m4/_xine.m4	Sun Mar 14 18:04:46 2010 +0000
-+++ b/m4/_xine.m4	Tue Mar 16 15:49:20 2010 +0000
-@@ -25,14 +25,14 @@
- dnl
- AC_DEFUN([AC_CHECK_LIRC],
-   [AC_ARG_ENABLE(lirc,
--     [  --disable-lirc          Turn off LIRC support.],
--     [], enable_lirc=yes)
-+     [AS_HELP_STRING([--disable-lirc], [turn off LIRC support])],
-+     [given=Y], [given=N; enable_lirc=yes])
- 
-   found_lirc=no
-   if test x"$enable_lirc" = xyes; then
-     have_lirc=yes
--    PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], [])
--    if test "$LIRC_CFLAGS" != ''; then
-+    PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], [:])
-+    if test "$found_lirc" = yes; then
-       LIRC_INCLUDE="$LIRC_CFLAGS"
-     else
-      AC_REQUIRE_CPP
-@@ -42,15 +42,20 @@
- 
-         if test x"$LIRC_PREFIX" != "x"; then
-            lirc_libprefix="$LIRC_PREFIX/lib"
--  	   LIRC_INCLUDE="-I$LIRC_PREFIX/include"
-+	   LIRC_INCLUDE="-I$LIRC_PREFIX/include"
-         fi
-         for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do
--          AC_CHECK_FILE(["$llirc/liblirc_client.a"],
--            [LIRC_LIBS="$llirc/liblirc_client.a"
--             found_lirc=yes],,)
-+          AC_CHECK_FILE(["$llirc/liblirc_client.so"],
-+             [LIRC_LIBS="$llirc/liblirc_client.so"]
-+             AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]),
-+             AC_CHECK_FILE(["$llirc/liblirc_client.a"],
-+                [LIRC_LIBS="$llirc/liblirc_client.a"
-+                 found_lirc=yes],,)
-+          )
-         done
-      else
--         AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***]);
-+	test $given = Y && AC_MSG_ERROR([LIRC client support requested but not available])
-+	AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***])
-      fi
-     fi
-   fi
-@@ -59,7 +64,6 @@
-      fi
-      AC_SUBST(LIRC_LIBS)
-      AC_SUBST(LIRC_INCLUDE)
--     AM_CONDITIONAL([HAVE_LIRC], [test "x$have_lirc" = "xyes"])
- ])
- 
- dnl AC_C_ATTRIBUTE_ALIGNED
-
diff --git a/extra/xine-ui/lirc-makefile-a68dd15ff7ae.patch b/extra/xine-ui/lirc-makefile-a68dd15ff7ae.patch
deleted file mode 100644
index daad4f03a..000000000
--- a/extra/xine-ui/lirc-makefile-a68dd15ff7ae.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# HG changeset patch
-# User Darren Salt <linux@youmustbejoking.demon.co.uk>
-# Date 1268758696 0
-# Node ID a68dd15ff7ae4be65c2ace25ef66966d7c272514
-# Parent 882c464d4a650d09da37ade366face74452c1897
-Restore definition of HAVE_LIRC for use in makefiles.
-
---- a/m4/_xine.m4	Mon Mar 15 12:03:01 2010 -0700
-+++ b/m4/_xine.m4	Tue Mar 16 16:58:16 2010 +0000
-@@ -62,6 +62,7 @@
-      if test "$found_lirc" = yes; then
- 	AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed])
-      fi
-+     AM_CONDITIONAL([HAVE_LIRC], [test "$found_lirc" = yes])
-      AC_SUBST(LIRC_LIBS)
-      AC_SUBST(LIRC_INCLUDE)
- ])
-
diff --git a/extra/xine-ui/xine-ui-0.99.6-libpng15.patch b/extra/xine-ui/xine-ui-0.99.6-libpng15.patch
deleted file mode 100644
index 6a5fb5522..000000000
--- a/extra/xine-ui/xine-ui-0.99.6-libpng15.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xine-ui-0.99.6/src/xitk/Imlib-light/load.c
-===================================================================
---- xine-ui-0.99.6.orig/src/xitk/Imlib-light/load.c
-+++ xine-ui-0.99.6/src/xitk/Imlib-light/load.c
-@@ -61,7 +61,7 @@ unsigned char *_LoadPNG(ImlibData * id,
-       png_destroy_read_struct(&png_ptr, NULL, NULL);
-       return NULL;
-     }
--  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
diff --git a/extra/xine-ui/xine-ui-xdg.diff b/extra/xine-ui/xine-ui-xdg.diff
deleted file mode 100644
index 959d674b2..000000000
--- a/extra/xine-ui/xine-ui-xdg.diff
+++ /dev/null
@@ -1,206 +0,0 @@
---- xine-ui-0.99.6.orig/src/xitk/common.h
-+++ xine-ui-0.99.6/src/xitk/common.h
-@@ -331,6 +331,5 @@ typedef struct {
-   int                       use_root_window;
- 
-   int                       ssaver_enabled;
--  int                       ssaver_timeout;
- 
-   int                       skip_by_chapter;
---- xine-ui-0.99.6.orig/src/xitk/main.c
-+++ xine-ui-0.99.6/src/xitk/main.c
-@@ -1383,6 +1383,8 @@ int main(int argc, char *argv[]) {
-   if (sigprocmask (SIG_BLOCK,  &vo_mask, NULL))
-     fprintf (stderr, "sigprocmask() failed.\n");
- 
-+  signal(SIGCHLD, SIG_IGN);
-+
-   gGui = (gGui_t *) calloc(1, sizeof(gGui_t));
-   
-   gGui->stream                 = NULL;
---- xine-ui-0.99.6.orig/src/xitk/panel.c
-+++ xine-ui-0.99.6/src/xitk/panel.c
-@@ -356,7 +356,6 @@ void panel_update_runtime_display(void)
-  * Update slider thread.
-  */
- static void *slider_loop(void *dummy) {
--  int screensaver_timer = 0;
-   int status, speed;
-   int pos, secs;
-   int i = 0;
-@@ -441,20 +440,7 @@ static void *slider_loop(void *dummy) {
- 	else
- 	  video_window_set_mrl((char *)gGui->mmk.mrl);
- 	
--	if(!xitk_is_window_iconified(gGui->video_display, gGui->video_window)) {
--	  
--	  if(gGui->ssaver_timeout) {
--	    
--	    if(!(i % 2))
--	      screensaver_timer++;
--	    
--	    if(screensaver_timer >= gGui->ssaver_timeout) {
--	      screensaver_timer = 0;
--	      video_window_reset_ssaver();
--	      
--	    }
--	  }  
--	}
-+       video_window_suspend_ssaver(!xitk_is_window_iconified(gGui->video_display, gGui->video_window));
- 
- 	if(gGui->logo_mode == 0) {
- 	  
-@@ -494,6 +480,8 @@ static void *slider_loop(void *dummy) {
- 	    stream_infos_update_infos();
- 
- 	}
-+      } else {
-+       video_window_suspend_ssaver(0);
-       }
-     }
-     
---- xine-ui-0.99.6.orig/src/xitk/videowin.c
-+++ xine-ui-0.99.6/src/xitk/videowin.c
-@@ -1087,6 +1087,9 @@ static void video_window_adapt_size (voi
- 
-   /* The old window should be destroyed now */
-   if(old_video_window != None) {
-+    /* Screensaver control is tied to our window id */
-+    video_window_suspend_ssaver(0);
-+
-     XDestroyWindow(gGui->video_display, old_video_window);
-      
-     if(gGui->cursor_grabbed)
-@@ -2261,69 +2264,34 @@ static void video_window_handle_event (X
- 
- }
- 
--void video_window_reset_ssaver(void) {
-+void video_window_suspend_ssaver(int do_suspend) {
-+  static int was_suspended;
- 
--  if(gGui->ssaver_enabled && (xitk_get_last_keypressed_time() >= (long int) gGui->ssaver_timeout)) {
-+  do_suspend = do_suspend && gGui->ssaver_enabled;
- 
--#ifdef HAVE_XTESTEXTENSION
--    if(gVw.have_xtest == True) {
--      
--      gVw.fake_key_cur++;
--      
--      if(gVw.fake_key_cur >= 2)
--	gVw.fake_key_cur = 0;
--
--      XLockDisplay(gGui->video_display);
--      XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], True, CurrentTime);
--      XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], False, CurrentTime);
--      XSync(gGui->video_display, False);
--      XUnlockDisplay(gGui->video_display);
-+  if(was_suspended != do_suspend) {
-+    if(fork() == 0) {
-+      char window_id[30];
-+      char *args[] = { "xdg-screensaver", NULL, window_id, NULL };
-+      int fd;
-+
-+      for(fd = 3; fd < 256; fd++)
-+	close(fd);
-+
-+      args[1] = do_suspend ? "suspend" : "resume";
-+      sprintf(window_id, "%lu", (unsigned long)gGui->video_window);
-+      execvp(args[0], args);
-+      _exit(0);
-     }
--    else 
--#endif
--    {
--      /* Reset the gnome screensaver. Look up the command in PATH only once to save time, */
--      /* assuming its location and permission will not change during run time of xine-ui. */
--      {
--	static char *const gssaver_args[] = { "gnome-screensaver-command", "--poke", NULL };
--	static char *gssaver_path   = NULL;
--
--	if(!gssaver_path) {
--	  char *path = getenv("PATH");
--
--	  if(!path)
--	    path = "/usr/local/bin:/usr/bin";
--	  do {
--	    char *p, *pbuf;
--	    int   plen;
--
--	    for(p = path; *path && *path != ':'; path++)
--	      ;
--	    if(p == path)
--	      plen = 1, p = ".";
--	    else
--	      plen = path - p;
--	    asprintf(&pbuf, "%.*s/%s", plen, p, gssaver_args[0]);
--	    if ( access(pbuf, X_OK) ) {
--	      free(pbuf);
--	      gssaver_path = "";
--	    } else
--	      gssaver_path = pbuf;
--	  } while(!gssaver_path[0] && *path++);
--	}
--	if(gssaver_path[0] && (fork() == 0)) {
--	  execv(gssaver_path, gssaver_args);
--	  exit(0);
--	}
--      }
- 
--      XLockDisplay(gGui->video_display);
--      XResetScreenSaver(gGui->video_display);
--      XUnlockDisplay(gGui->video_display);
--    }
-+    was_suspended = do_suspend;
-   }
- }
- 
-+void video_window_reset_ssaver(void) {
-+  video_window_suspend_ssaver(1);
-+}
-+
- void video_window_get_frame_size(int *w, int *h) {
-   if(w)
-     *w = gVw.frame_width;
---- xine-ui-0.99.6.orig/src/xitk/videowin.h
-+++ xine-ui-0.99.6/src/xitk/videowin.h
-@@ -81,6 +81,7 @@ void video_window_get_mag (float *xmag,
- void video_window_update_logo(void);
- void video_window_change_skins(int);
- 
-+void video_window_suspend_ssaver(int do_suspend);
- void video_window_reset_ssaver(void);
- 
- void video_window_get_frame_size(int *w, int *h);
---- xine-ui-0.99.6.orig/src/xitk/event.c
-+++ xine-ui-0.99.6/src/xitk/event.c
-@@ -135,9 +135,6 @@ static void skip_by_chapter_cb(void *dat
-   gGui->skip_by_chapter = cfg->num_value;
-   panel_update_nextprev_tips();
- }
--static void ssaver_timeout_cb(void *data, xine_cfg_entry_t *cfg) {
--  gGui->ssaver_timeout = cfg->num_value;
--}
- 
- static void visual_anim_cb(void *data, xine_cfg_entry_t *cfg) {
-   
-@@ -1614,14 +1611,6 @@ void gui_init (int nfiles, char *filenam
- 					 snapshot_loc_cb,
- 					 CONFIG_NO_DATA);
-   
--  gGui->ssaver_timeout =
--    xine_config_register_num (__xineui_global_xine_instance, "gui.screensaver_timeout", 10,
--			      _("Screensaver reset interval (s)"),
--			      _("Time, in seconds, between two faked events to keep a screensaver quiet, 0 to disable."),
--			      CONFIG_LEVEL_ADV,
--			      ssaver_timeout_cb,
--			      CONFIG_NO_DATA);
--  
-   gGui->skip_by_chapter = 
-     xine_config_register_bool (__xineui_global_xine_instance, "gui.skip_by_chapter", 1,
- 			       _("Chapter hopping"),
-
-
-
-
- 
diff --git a/extra/xmms/PKGBUILD b/extra/xmms/PKGBUILD
index b1d1a6dd0..5555821d4 100644
--- a/extra/xmms/PKGBUILD
+++ b/extra/xmms/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=xmms
 pkgver=1.2.11
-pkgrel=6
+pkgrel=6.1
 pkgdesc="The X MultiMedia System - a multimedia player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://legacy.xmms2.org/"
@@ -14,7 +14,7 @@ optdepends=('libmikmod: for the MikMod input plugin' \
             'libvorbis: for the Ogg Vorbis input plugin' \
             'alsa-lib: for the alsa output plugin' \
             'libgl: for the OpenGL Spectrum analyser visualization plugin')
-options=('!libtool')
+options=('!libtool' '!makeflags')
 install=xmms.install
 source=(http://legacy.xmms2.org/${pkgname}-${pkgver}.tar.bz2 \
 	xmms-menu.patch xmms-1.2.10-crossfade-0.3.9.patch xmms-fix.diff \
diff --git a/extra/xorg-mkfontscale/PKGBUILD b/extra/xorg-mkfontscale/PKGBUILD
index 1fff874dc..ebe951978 100644
--- a/extra/xorg-mkfontscale/PKGBUILD
+++ b/extra/xorg-mkfontscale/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=xorg-mkfontscale
 pkgver=1.1.0
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="Create an index of scalable font files for X"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
diff --git a/extra/xorg-oclock/PKGBUILD b/extra/xorg-oclock/PKGBUILD
index 90a2ca163..ec79fd84a 100644
--- a/extra/xorg-oclock/PKGBUILD
+++ b/extra/xorg-oclock/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=xorg-oclock
 pkgver=1.0.3
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="Round X clock"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
diff --git a/extra/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch b/extra/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch
deleted file mode 100644
index e3e42d410..000000000
--- a/extra/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 29d84d5a7ca4cc12cce47de9313adeb8554fb894 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 18 Oct 2012 15:11:31 +1000
-Subject: [PATCH] dix: fix zaphod screen scrossing (#54654)
-
-POINTER_SCREEN coordinates are screen-relative. For a Zaphod setup, the
-coordinates after a screen crossing are already relative to the new screen's
-origin. Add that offset to the coordinates before re-setting.
-
-regression introduced by
-commit bafbd99080be49a17be97d2cc758fbe623369945
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Wed Aug 8 11:34:32 2012 +1000
-
-    dix: work around scaling issues during WarpPointer (#53037)
-
-X.Org Bug 54654 <http://bugs.freedesktop.org/show_bug.cgi?id=54654>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- dix/getevents.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/dix/getevents.c b/dix/getevents.c
-index 71d83c4..8b4379d 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -1400,8 +1400,9 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
-        coordinates were.
-      */
-     if (flags & POINTER_SCREEN) {
--        screenx = sx;
--        screeny = sy;
-+        scr = miPointerGetScreen(pDev);
-+        screenx = sx + scr->x;
-+        screeny = sy + scr->y;
-     }
- 
-     scr = positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative,
--- 
-1.7.11.7
-
diff --git a/extra/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff b/extra/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
deleted file mode 100644
index 12c110151..000000000
--- a/extra/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
+++ /dev/null
@@ -1,116 +0,0 @@
---- xorg-server-1.12.1/exa/exa_glyphs.c	2012-03-30 04:57:25.000000000 +0200
-+++ xorg-server-1.12.1/exa_glyphs.c.new	2012-04-15 11:48:51.683214230 +0200
-@@ -686,6 +686,7 @@
-     PixmapPtr pMaskPixmap = 0;
-     PicturePtr pMask = NULL;
-     ScreenPtr pScreen = pDst->pDrawable->pScreen;
-+    ExaScreenPriv(pScreen);
-     int width = 0, height = 0;
-     int x, y;
-     int first_xOff = list->xOff, first_yOff = list->yOff;
-@@ -697,7 +698,6 @@
-     ExaGlyphBuffer buffer;
- 
-     if (maskFormat) {
--        ExaScreenPriv(pScreen);
-         GCPtr pGC;
-         xRectangle rect;
- 
-@@ -719,22 +719,20 @@
-                                                 maskFormat->depth,
-                                                 CREATE_PIXMAP_USAGE_SCRATCH);
-         if (!pMaskPixmap)
--            return;
-+	    goto fallback;
-         component_alpha = NeedsComponent(maskFormat->format);
-         pMask = CreatePicture(0, &pMaskPixmap->drawable,
-                               maskFormat, CPComponentAlpha, &component_alpha,
-                               serverClient, &error);
--        if (!pMask ||
--            (!component_alpha && pExaScr->info->CheckComposite &&
--             !(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask)))
-+        (*pScreen->DestroyPixmap) (pMaskPixmap);
-+	if (!pMask)
-+	    goto fallback;
-+
-+	if (!component_alpha && pExaScr->info->CheckComposite &&
-+	    !(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask))
-         {
-             PictFormatPtr argbFormat;
- 
--            (*pScreen->DestroyPixmap) (pMaskPixmap);
--
--            if (!pMask)
--                return;
--
-             /* The driver can't seem to composite to a8, let's try argb (but
-              * without component-alpha) */
-             FreePicture((pointer) pMask, (XID) 0);
-@@ -748,15 +746,25 @@
-                                                     maskFormat->depth,
-                                                     CREATE_PIXMAP_USAGE_SCRATCH);
-             if (!pMaskPixmap)
--                return;
-+	    goto fallback;
- 
-             pMask = CreatePicture(0, &pMaskPixmap->drawable, maskFormat, 0, 0,
-                                   serverClient, &error);
--            if (!pMask) {
--                (*pScreen->DestroyPixmap) (pMaskPixmap);
--                return;
--            }
-+            (*pScreen->DestroyPixmap) (pMaskPixmap);
-+	    if (!pMask)
-+	    goto fallback;
-         }
-+	  
-+	if (pExaScr->info->CheckComposite &&
-+	    (!(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask) ||
-+	     (!(*pExaScr->info->CheckComposite) (op, pSrc, pMask, pDst) &&
-+	      (op != PictOpOver ||
-+	       !(*pExaScr->info->CheckComposite) (PictOpOutReverse, pSrc, pMask, pDst) ||
-+	       !(*pExaScr->info->CheckComposite) (PictOpOver, pSrc, pMask, pDst))))) {
-+	    FreePicture ((pointer) pMask, (XID) 0);
-+	    goto fallback;
-+	}
-+
-         pGC = GetScratchGC(pMaskPixmap->drawable.depth, pScreen);
-         ValidateGC(&pMaskPixmap->drawable, pGC);
-         rect.x = 0;
-@@ -769,6 +777,13 @@
-         y = -extents.y1;
-     }
-     else {
-+    	if (pExaScr->info->CheckComposite &&
-+	    !(*pExaScr->info->CheckComposite) (op, pSrc, NULL, pDst) &&
-+	    (op != PictOpOver ||
-+	     !(*pExaScr->info->CheckComposite) (PictOpOutReverse, pSrc, NULL, pDst) ||
-+	     !(*pExaScr->info->CheckComposite) (PictOpOver, pSrc, NULL, pDst)))
-+	    goto fallback;
-+
-         x = 0;
-         y = 0;
-     }
-@@ -834,6 +849,10 @@
-                          xSrc + x - first_xOff,
-                          ySrc + y - first_yOff, 0, 0, x, y, width, height);
-         FreePicture((pointer) pMask, (XID) 0);
--        (*pScreen->DestroyPixmap) (pMaskPixmap);
-     }
-+    
-+    return;
-+
-+fallback:
-+    ExaCheckGlyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);
- }
---- xorg-server-1.12.1/exa/exa_render.c	2012-03-30 04:57:25.000000000 +0200
-+++ xorg-server-1.12.1/exa_render.c.new	2012-04-15 11:50:35.272482047 +0200
-@@ -878,7 +878,7 @@
-     Bool saveMaskRepeat = pMask ? pMask->repeat : 0;
-     RegionRec region;
- 
--    if (pExaScr->swappedOut)
-+    if (pExaScr->fallback_counter || pExaScr->swappedOut)
-         goto fallback;
- 
-     /* Remove repeat in source if useless */
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 48bed0ef9..398e39971 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,46 +1,43 @@
-# $Id: PKGBUILD 175947 2013-01-25 08:45:46Z andyrtr $
+# $Id: PKGBUILD 183085 2013-04-17 12:51:32Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.13.2
+pkgver=1.14.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org"
-makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto'
+makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto'
              'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess'
              'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros'
-             'xorg-font-util' 'glproto' 'libgcrypt')
-[ "$CARCH" != "mips64el" ] && makedepends+=('dri2proto')
+             'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt') 
 options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         autoconfig-nvidia.patch
         autoconfig-sis.patch
+        xserver-1.6.0-less-acpi-brokenness.patch
+        bug59825.patch
         xvfb-run
         xvfb-run.1
         10-quirks.conf
         loongson.patch
-        #git-fixes.patch
-        use-pixman-glyph-cache.patch)
-sha256sums=('3850adb89e9170ad85aea39d240279494c07779e50cd3cd60126028681209408'
+        git-fixes.patch)
+sha256sums=('a5adb02571efb7d7459dde83286a3adb77dfd1a52a7348e75d2dc72d6f8d28aa'
             '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
+            'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'
+            '26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
             '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
-            '966b8c509006e3b7e6ac951c93a760ecbb2cb2ad7a5807fb919f0c4ee5e079a5'
-            '7c1dacd30c46b01424c7c75974285cd348dafd0327eb3f211cbe446ad90dd308')
+            'c1081681093cd56003f77e1bf4febc3e6bb84a1bde95292fbe19e8c461a7d207'
+            'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  # Apply upstream fixes from server-1.13 branch
-#  patch -Np1 -i "${srcdir}/git-fixes.patch"
-
-  # Use pixman 0.28.0 glyph cache - backported from git master
-#  patch -Np1 -i "${srcdir}/use-pixman-glyph-cache.patch"
-
   # Use nouveau/nv/nvidia drivers for nvidia devices
   patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch"
 
@@ -50,16 +47,19 @@ build() {
   # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html
   patch -Np1 -i "${srcdir}/loongson.patch"
 
-  autoreconf -fi
+  # https://bugs.freedesktop.org/show_bug.cgi?id=59825 - fixes crash with vboxvideo
+  patch -Np1 -i "${srcdir}/bug59825.patch"
 
-  if [ "$CARCH" = "mips64el" ]; then
-    extra="--disable-dri --disable-dri2 --disable-glx --disable-glx-tls"
-  else
-    extra="--enable-dri --enable-glx-tls"
-  fi
+  # From Fedora. Do not build acpid code, it is buggy and we do not need it
+  patch -Np1 -i "${srcdir}/xserver-1.6.0-less-acpi-brokenness.patch"
 
+  # post release git fixes
+  patch -Np1 -i "${srcdir}/git-fixes.patch"
+
+  autoreconf -fi
   ./configure --prefix=/usr \
       --enable-ipv6 \
+      --enable-dri \
       --enable-dmx \
       --enable-xvfb \
       --enable-xnest \
@@ -67,6 +67,7 @@ build() {
       --enable-xcsecurity \
       --enable-xorg \
       --enable-xephyr \
+      --enable-glx-tls \
       --enable-kdrive \
       --enable-kdrive-evdev \
       --enable-kdrive-kbd \
@@ -82,8 +83,7 @@ build() {
       --localstatedir=/var \
       --with-xkb-path=/usr/share/X11/xkb \
       --with-xkb-output=/var/lib/xkb \
-      --with-fontrootdir=/usr/share/fonts \
-      $extra
+      --with-fontrootdir=/usr/share/fonts
   make
 
   # Disable subdirs for make install rule to make splitting easier
@@ -115,8 +115,8 @@ package_xorg-server() {
   pkgdesc="Xorg X server"
   depends=(libxdmcp libxfont libpciaccess libdrm 'pixman>=0.28.0' libgcrypt libxau xorg-server-common xf86-input-evdev)
   backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf')
-  # see xorg-server-1.13.0/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
-  provides=('X-ABI-VIDEODRV_VERSION=13' 'X-ABI-XINPUT_VERSION=18' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server')
+  # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
+  provides=('X-ABI-VIDEODRV_VERSION=14' 'X-ABI-XINPUT_VERSION=19' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server')
   groups=('xorg')
   conflicts=('nvidia-utils<=290.10')
 
@@ -129,11 +129,9 @@ package_xorg-server() {
 
   rmdir "${pkgdir}/usr/share/X11"
 
-  if [ "$CARCH" != "mips64el" ]; then
   # Needed for non-mesa drivers, libgl will restore it
   mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \
      "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg"
-  fi
 
   rm -rf "${pkgdir}/var"
 
@@ -200,12 +198,11 @@ package_xorg-server-devel() {
   depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc
            xproto randrproto renderproto xextproto inputproto kbproto 
            fontsproto pixman videoproto xf86driproto glproto 
-           mesa xineramaproto libpciaccess
+           mesa dri2proto xineramaproto libpciaccess
            # see FS#32146
            resourceproto scrnsaverproto
            # not technically required but almost every Xorg pkg needs it to build
            xorg-util-macros)
-[ "$CARCH" = "mips64el" ] || depends+=('dri2proto')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/extra/xorg-server/bug59825.patch b/extra/xorg-server/bug59825.patch
new file mode 100644
index 000000000..b405d136d
--- /dev/null
+++ b/extra/xorg-server/bug59825.patch
@@ -0,0 +1,12 @@
+diff -U 3 -b -d -p -r -- a/glx/glxdri.c b/glx/glxdri.c

+--- a/glx/glxdri.c	2013-01-24 22:14:35.216092949 +0100

++++ b/glx/glxdri.c	2013-01-24 22:13:48.499427991 +0100

+@@ -971,6 +971,8 @@ __glXDRIscreenProbe(ScreenPtr pScreen)

+     size_t buffer_size;

+     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);

+ 

++    framebuffer.base = NULL;

++

+     if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||

+         !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) {

+         LogMessage(X_INFO,
\ No newline at end of file
diff --git a/extra/xorg-server/git-fixes.patch b/extra/xorg-server/git-fixes.patch
index d1817c00f..177f908ef 100644
--- a/extra/xorg-server/git-fixes.patch
+++ b/extra/xorg-server/git-fixes.patch
@@ -1,643 +1,27 @@
-diff --git a/Xi/exevents.c b/Xi/exevents.c
-index 494d07e..106da3a 100644
---- a/Xi/exevents.c
-+++ b/Xi/exevents.c
-@@ -949,8 +949,6 @@ UpdateDeviceState(DeviceIntPtr device, DeviceEvent *event)
- 
-         if (!(event->flags & TOUCH_POINTER_EMULATED))
-             return DONT_PROCESS;
--        if (!(event->flags & TOUCH_END))
--            return DONT_PROCESS;
- 
-         DecreaseButtonCount(device, key, &t->buttonsDown, &t->motionMask,
-                             &t->state);
-@@ -1561,6 +1559,7 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev)
-     uint32_t touchid;
-     int type = ev->any.type;
-     int emulate_pointer = ! !(ev->device_event.flags & TOUCH_POINTER_EMULATED);
-+    DeviceIntPtr kbd;
- 
-     if (!t)
-         return;
-@@ -1570,9 +1569,6 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev)
-     else
-         touchid = ev->device_event.touchid;
- 
--    if (emulate_pointer)
--        UpdateDeviceState(dev, &ev->device_event);
--
-     if (type == ET_TouchBegin) {
-         ti = TouchBeginTouch(dev, ev->device_event.sourceid, touchid,
-                              emulate_pointer);
-@@ -1619,9 +1615,14 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev)
-      * events which _only_ emulate motion just work normally */
-     if (emulate_pointer && ev->any.type != ET_TouchUpdate)
-         DeliverEmulatedMotionEvent(dev, ti, ev);
-+
-     if (emulate_pointer && IsMaster(dev))
-         CheckMotion(&ev->device_event, dev);
- 
-+    kbd = GetMaster(dev, KEYBOARD_OR_FLOAT);
-+    event_set_state(NULL, kbd, &ev->device_event);
-+    ev->device_event.corestate = event_get_corestate(NULL, kbd);
-+
-     /* Make sure we have a valid window trace for event delivery; must be
-      * called after event type mutation. Touch end events are always processed
-      * in order to end touch records. */
-@@ -1643,6 +1644,9 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev)
-         if (ev->any.type == ET_TouchEnd)
-             TouchEndTouch(dev, ti);
-     }
-+
-+    if (emulate_pointer)
-+        UpdateDeviceState(dev, &ev->device_event);
- }
- 
- /**
-@@ -1864,6 +1868,11 @@ DeliverTouchEndEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, InternalEvent *ev,
-         goto out;
-     }
- 
-+    if (listener->state == LISTENER_AWAITING_BEGIN) {
-+        listener->state = LISTENER_HAS_END;
-+        goto out;
-+    }
-+
-     /* Event in response to reject */
-     if (ev->device_event.flags & TOUCH_REJECT) {
-         if (listener->state != LISTENER_HAS_END)
-diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c
-index 0e45cb8..ab1b624 100644
---- a/Xi/xiselectev.c
-+++ b/Xi/xiselectev.c
-@@ -180,8 +180,13 @@ ProcXISelectEvents(ClientPtr client)
-                     if (CLIENT_ID(iclient->resource) == client->index)
-                         continue;
- 
--                    dixLookupDevice(&tmp, evmask->deviceid, serverClient,
--                                    DixReadAccess);
-+                    if (evmask->deviceid == XIAllDevices)
-+                        tmp = inputInfo.all_devices;
-+                    else if (evmask->deviceid == XIAllMasterDevices)
-+                        tmp = inputInfo.all_master_devices;
-+                    else
-+                        dixLookupDevice(&tmp, evmask->deviceid, serverClient,
-+                                        DixReadAccess);
-                     if (!tmp)
-                         return BadImplementation;       /* this shouldn't happen */
- 
-diff --git a/config/udev.c b/config/udev.c
-index c2d00bb..454838f 100644
---- a/config/udev.c
-+++ b/config/udev.c
-@@ -300,9 +300,15 @@ wakeup_handler(pointer data, int err, pointer read_mask)
-             return;
-         action = udev_device_get_action(udev_device);
-         if (action) {
--            if (!strcmp(action, "add") || !strcmp(action, "change")) {
-+            if (!strcmp(action, "add")) {
-                 device_removed(udev_device);
-                 device_added(udev_device);
-+            } else if (!strcmp(action, "change")) {
-+                /* ignore change for the drm devices */
-+                if (strcmp(udev_device_get_subsystem(udev_device), "drm")) {
-+                    device_removed(udev_device);
-+                    device_added(udev_device);
-+                }
-             }
-             else if (!strcmp(action, "remove"))
-                 device_removed(udev_device);
-diff --git a/dix/devices.c b/dix/devices.c
-index 9cf04ed..fd4916a 100644
---- a/dix/devices.c
-+++ b/dix/devices.c
-@@ -306,6 +306,9 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
-     /* unity matrix */
-     memset(transform, 0, sizeof(transform));
-     transform[0] = transform[4] = transform[8] = 1.0f;
-+    dev->transform.m[0][0] = 1.0;
-+    dev->transform.m[1][1] = 1.0;
-+    dev->transform.m[2][2] = 1.0;
- 
-     XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_TRANSFORM),
-                            XIGetKnownProperty(XATOM_FLOAT), 32,
-@@ -440,6 +443,7 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
-     if (*prev != dev)
-         return FALSE;
- 
-+    TouchEndPhysicallyActiveTouches(dev);
-     ReleaseButtonsAndKeys(dev);
-     SyncRemoveDeviceIdleTime(dev->idle_counter);
-     dev->idle_counter = NULL;
-diff --git a/dix/events.c b/dix/events.c
-index 3b40446..ddb5b34 100644
---- a/dix/events.c
-+++ b/dix/events.c
-@@ -1555,11 +1555,13 @@ ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time,
-     WindowPtr oldWin;
- 
-     /* slave devices need to float for the duration of the grab. */
--    if (grab->grabtype == XI2 &&
-+    if (grab->grabtype == XI2 && keybd->enabled &&
-         !(passive & ImplicitGrabMask) && !IsMaster(keybd))
-         DetachFromMaster(keybd);
- 
--    if (grabinfo->grab)
-+    if (!keybd->enabled)
-+        oldWin = NULL;
-+    else if (grabinfo->grab)
-         oldWin = grabinfo->grab->window;
-     else if (keybd->focus)
-         oldWin = keybd->focus->win;
-@@ -1569,7 +1571,8 @@ ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time,
-         oldWin = keybd->focus->win;
-     if (keybd->valuator)
-         keybd->valuator->motionHintWindow = NullWindow;
--    DoFocusEvents(keybd, oldWin, grab->window, NotifyGrab);
-+    if (oldWin)
-+        DoFocusEvents(keybd, oldWin, grab->window, NotifyGrab);
-     if (syncEvents.playingEvents)
-         grabinfo->grabTime = syncEvents.time;
-     else
-@@ -1590,13 +1593,10 @@ DeactivateKeyboardGrab(DeviceIntPtr keybd)
- {
-     GrabPtr grab = keybd->deviceGrab.grab;
-     DeviceIntPtr dev;
--    WindowPtr focusWin = keybd->focus ? keybd->focus->win
--        : keybd->spriteInfo->sprite->win;
-+    WindowPtr focusWin;
-     Bool wasImplicit = (keybd->deviceGrab.fromPassiveGrab &&
-                         keybd->deviceGrab.implicitGrab);
- 
--    if (focusWin == FollowKeyboardWin)
--        focusWin = inputInfo.keyboard->focus->win;
-     if (keybd->valuator)
-         keybd->valuator->motionHintWindow = NullWindow;
-     keybd->deviceGrab.grab = NullGrab;
-@@ -1607,6 +1607,17 @@ DeactivateKeyboardGrab(DeviceIntPtr keybd)
-         if (dev->deviceGrab.sync.other == grab)
-             dev->deviceGrab.sync.other = NullGrab;
-     }
-+
-+    if (keybd->focus)
-+        focusWin = keybd->focus->win;
-+    else if (keybd->spriteInfo->sprite)
-+        focusWin = keybd->spriteInfo->sprite->win;
-+    else
-+        focusWin = NullWindow;
-+
-+    if (focusWin == FollowKeyboardWin)
-+        focusWin = inputInfo.keyboard->focus->win;
-+
-     DoFocusEvents(keybd, grab->window, focusWin, NotifyUngrab);
- 
-     if (!wasImplicit && grab->grabtype == XI2)
-diff --git a/dix/getevents.c b/dix/getevents.c
-index 4e62507..8b4379d 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -896,9 +896,9 @@ scale_to_desktop(DeviceIntPtr dev, ValuatorMask *mask,
- 
-     /* scale x&y to desktop coordinates */
-     *screenx = rescaleValuatorAxis(x, dev->valuator->axes + 0, NULL,
--                                   screenInfo.x, screenInfo.width);
-+                                   screenInfo.x, screenInfo.width - 1);
-     *screeny = rescaleValuatorAxis(y, dev->valuator->axes + 1, NULL,
--                                   screenInfo.y, screenInfo.height);
-+                                   screenInfo.y, screenInfo.height - 1);
- 
-     *devx = x;
-     *devy = y;
-@@ -1400,8 +1400,9 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
-        coordinates were.
-      */
-     if (flags & POINTER_SCREEN) {
--        screenx = sx;
--        screeny = sy;
-+        scr = miPointerGetScreen(pDev);
-+        screenx = sx + scr->x;
-+        screeny = sy + scr->y;
-     }
- 
-     scr = positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative,
-diff --git a/dix/touch.c b/dix/touch.c
-index 497ad7d..5f77be5 100644
---- a/dix/touch.c
-+++ b/dix/touch.c
-@@ -572,8 +572,8 @@ TouchBuildSprite(DeviceIntPtr sourcedev, TouchPointInfoPtr ti,
-         return FALSE;
- 
-     /* Mark which grabs/event selections we're delivering to: max one grab per
--     * window plus the bottom-most event selection. */
--    ti->listeners = calloc(sprite->spriteTraceGood + 1, sizeof(*ti->listeners));
-+     * window plus the bottom-most event selection, plus any active grab. */
-+    ti->listeners = calloc(sprite->spriteTraceGood + 2, sizeof(*ti->listeners));
-     if (!ti->listeners) {
-         sprite->spriteTraceGood = 0;
-         return FALSE;
-@@ -1029,3 +1029,31 @@ TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode,
- 
-     return TouchListenerAcceptReject(dev, ti, i, mode);
- }
-+
-+/**
-+ * End physically active touches for a device.
-+ */
-+void
-+TouchEndPhysicallyActiveTouches(DeviceIntPtr dev)
-+{
-+    InternalEvent *eventlist = InitEventList(GetMaximumEventsNum());
-+    int i;
-+
-+    OsBlockSignals();
-+    mieqProcessInputEvents();
-+    for (i = 0; i < dev->last.num_touches; i++) {
-+        DDXTouchPointInfoPtr ddxti = dev->last.touches + i;
-+
-+        if (ddxti->active) {
-+            int j;
-+            int nevents = GetTouchEvents(eventlist, dev, ddxti->ddx_id,
-+                                         XI_TouchEnd, 0, NULL);
-+
-+            for (j = 0; j < nevents; j++)
-+                mieqProcessDeviceEvent(dev, eventlist + j, NULL);
-+        }
-+    }
-+    OsReleaseSignals();
-+
-+    FreeEventList(eventlist, GetMaximumEventsNum());
-+}
-diff --git a/exa/exa_priv.h b/exa/exa_priv.h
-index ea7e7fa..2e4759d 100644
---- a/exa/exa_priv.h
-+++ b/exa/exa_priv.h
-@@ -209,6 +209,7 @@ typedef struct {
-     RegionRec srcReg;
-     RegionRec maskReg;
-     PixmapPtr srcPix;
-+    PixmapPtr maskPix;
- 
-     DevPrivateKeyRec pixmapPrivateKeyRec;
-     DevPrivateKeyRec gcPrivateKeyRec;
-diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
-index 5716138..b0a0011 100644
---- a/exa/exa_unaccel.c
-+++ b/exa/exa_unaccel.c
-@@ -442,6 +442,13 @@ ExaSrcValidate(DrawablePtr pDrawable,
-     RegionPtr dst;
-     int xoff, yoff;
- 
-+    if (pExaScr->srcPix == pPix)
-+        dst = &pExaScr->srcReg;
-+    else if (pExaScr->maskPix == pPix)
-+        dst = &pExaScr->maskReg;
-+    else
-+        return;
-+
-     exaGetDrawableDeltas(pDrawable, pPix, &xoff, &yoff);
- 
-     box.x1 = x + xoff;
-@@ -449,8 +456,6 @@ ExaSrcValidate(DrawablePtr pDrawable,
-     box.x2 = box.x1 + width;
-     box.y2 = box.y1 + height;
- 
--    dst = (pExaScr->srcPix == pPix) ? &pExaScr->srcReg : &pExaScr->maskReg;
--
-     RegionInit(&reg, &box, 1);
-     RegionUnion(dst, dst, &reg);
-     RegionUninit(&reg);
-@@ -495,16 +500,19 @@ ExaPrepareCompositeReg(ScreenPtr pScreen,
-         if (pSrc != pDst)
-             RegionTranslate(pSrc->pCompositeClip,
-                             -pSrc->pDrawable->x, -pSrc->pDrawable->y);
--    }
-+    } else
-+        pExaScr->srcPix = NULL;
- 
-     if (pMask && pMask->pDrawable) {
-         pMaskPix = exaGetDrawablePixmap(pMask->pDrawable);
-         RegionNull(&pExaScr->maskReg);
-         maskReg = &pExaScr->maskReg;
-+        pExaScr->maskPix = pMaskPix;
-         if (pMask != pDst && pMask != pSrc)
-             RegionTranslate(pMask->pCompositeClip,
-                             -pMask->pDrawable->x, -pMask->pDrawable->y);
--    }
-+    } else
-+        pExaScr->maskPix = NULL;
- 
-     RegionTranslate(pDst->pCompositeClip,
-                     -pDst->pDrawable->x, -pDst->pDrawable->y);
-diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
-index f8fcde9..532d87b 100644
---- a/hw/xfree86/common/Makefile.am
-+++ b/hw/xfree86/common/Makefile.am
-@@ -15,6 +15,7 @@ XVSDKINCS = xf86xv.h xf86xvmc.h xf86xvpriv.h
- endif
- 
- if XF86VIDMODE
-+XF86VMODESOURCES = xf86vmode.c
- XF86VMODE_SDK = vidmodeproc.h
- endif
- 
-@@ -47,7 +48,7 @@ libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
-                       xf86VidMode.c xf86fbman.c xf86cmap.c \
-                       xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \
-                       xf86Mode.c xorgHelper.c xf86Extensions.h \
--		      xf86Extensions.c xf86vmode.c \
-+		      xf86Extensions.c $(XF86VMODESOURCES) \
-                       $(XVSOURCES) $(BUSSOURCES) $(RANDRSOURCES)
- nodist_libcommon_la_SOURCES = xf86DefModeSet.c xf86Build.h
- libcommon_la_LIBADD = $(top_builddir)/config/libconfig.la
-diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
-index bb2903d..74da438 100644
---- a/hw/xfree86/common/xf86.h
-+++ b/hw/xfree86/common/xf86.h
-@@ -468,4 +468,8 @@ extern _X_EXPORT ScreenPtr xf86ScrnToScreen(ScrnInfoPtr pScrn);
- /* flags passed to xf86 allocate screen */
- #define XF86_ALLOCATE_GPU_SCREEN 1
- 
-+/* Update the internal total dimensions of all ScreenRecs together */
-+extern _X_EXPORT void
-+xf86UpdateDesktopDimensions(void);
-+
- #endif                          /* _XF86_H */
-diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
-index 6de8409..4ffbf7e 100644
---- a/hw/xfree86/common/xf86Bus.c
-+++ b/hw/xfree86/common/xf86Bus.c
-@@ -81,6 +81,8 @@ xf86CallDriverProbe(DriverPtr drv, Bool detect_only)
-     if (drv->platformProbe != NULL) {
-         foundScreen = xf86platformProbeDev(drv);
-     }
-+    if (ServerIsNotSeat0())
-+        return foundScreen;
- #endif
- 
- #ifdef XSERVER_LIBPCIACCESS
-@@ -214,6 +216,8 @@ xf86BusProbe(void)
- {
- #ifdef XSERVER_PLATFORM_BUS
-     xf86platformProbe();
-+    if (ServerIsNotSeat0())
-+        return;
- #endif
- #ifdef XSERVER_LIBPCIACCESS
-     xf86PciProbe();
-diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
-index f681a85..721159d 100644
---- a/hw/xfree86/common/xf86Helper.c
-+++ b/hw/xfree86/common/xf86Helper.c
-@@ -1898,3 +1898,9 @@ xf86ScrnToScreen(ScrnInfoPtr pScrn)
-         return screenInfo.screens[pScrn->scrnIndex];
-     }
- }
-+
-+void
-+xf86UpdateDesktopDimensions(void)
-+{
-+    update_desktop_dimensions();
-+}
-diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
-index 83f9790..f58b87e 100644
---- a/hw/xfree86/common/xf86Module.h
-+++ b/hw/xfree86/common/xf86Module.h
-@@ -80,7 +80,7 @@ typedef enum {
-  * mask is 0xFFFF0000.
-  */
- #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
--#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(13, 0)
-+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(13, 1)
- #define ABI_XINPUT_VERSION	SET_ABI_VERSION(18, 0)
- #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(7, 0)
- #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index 24b9473..0525e39 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -213,11 +213,12 @@ xf86platformProbe(void)
-     int i;
-     Bool pci = TRUE;
- 
-+    config_odev_probe(xf86PlatformDeviceProbe);
-+
-     if (!xf86scanpci()) {
-         pci = FALSE;
-     }
- 
--    config_odev_probe(&xf86PlatformDeviceProbe);
-     for (i = 0; i < xf86_num_platform_devices; i++) {
-         char *busid = xf86_get_platform_attrib(i, ODEV_ATTRIB_BUSID);
- 
-@@ -358,6 +359,9 @@ xf86platformProbeDev(DriverPtr drvp)
-                     break;
-             }
-             else {
-+                /* for non-seat0 servers assume first device is the master */
-+                if (ServerIsNotSeat0())
-+                    break;
-                 if (xf86_platform_devices[j].pdev) {
-                     if (xf86IsPrimaryPlatform(&xf86_platform_devices[j]))
-                         break;
-diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
-index 23f589c..40963c3 100644
---- a/hw/xfree86/dri2/dri2.c
-+++ b/hw/xfree86/dri2/dri2.c
-@@ -766,6 +766,44 @@ static inline PixmapPtr GetDrawablePixmap(DrawablePtr drawable)
-     }
- }
- 
-+/*
-+ * A TraverseTree callback to invalidate all windows using the same
-+ * pixmap
-+ */
-+static int
-+DRI2InvalidateWalk(WindowPtr pWin, pointer data)
-+{
-+    if (pWin->drawable.pScreen->GetWindowPixmap(pWin) != data)
-+        return WT_DONTWALKCHILDREN;
-+    DRI2InvalidateDrawable(&pWin->drawable);
-+    return WT_WALKCHILDREN;
-+}
-+
-+static void
-+DRI2InvalidateDrawableAll(DrawablePtr pDraw)
-+{
-+    if (pDraw->type == DRAWABLE_WINDOW) {
-+        WindowPtr pWin = (WindowPtr) pDraw;
-+        PixmapPtr pPixmap = pDraw->pScreen->GetWindowPixmap(pWin);
-+
-+        /*
-+         * Find the top-most window using this pixmap
-+         */
-+        while (pWin->parent &&
-+               pDraw->pScreen->GetWindowPixmap(pWin->parent) == pPixmap)
-+            pWin = pWin->parent;
-+
-+        /*
-+         * Walk the sub-tree to invalidate all of the
-+         * windows using the same pixmap
-+         */
-+        TraverseTree(pWin, DRI2InvalidateWalk, pPixmap);
-+        DRI2InvalidateDrawable(&pPixmap->drawable);
-+    }
-+    else
-+        DRI2InvalidateDrawable(pDraw);
-+}
-+
- DrawablePtr DRI2UpdatePrime(DrawablePtr pDraw, DRI2BufferPtr pDest)
- {
-     DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
-@@ -831,6 +869,8 @@ DrawablePtr DRI2UpdatePrime(DrawablePtr pDraw, DRI2BufferPtr pDest)
-     spix->screen_x = mpix->screen_x;
-     spix->screen_y = mpix->screen_y;
- #endif
-+
-+    DRI2InvalidateDrawableAll(pDraw);
-     return &spix->drawable;
- }
- 
-@@ -1048,18 +1088,7 @@ DRI2WaitSwap(ClientPtr client, DrawablePtr pDrawable)
-     return FALSE;
- }
- 
--/*
-- * A TraverseTree callback to invalidate all windows using the same
-- * pixmap
-- */
--static int
--DRI2InvalidateWalk(WindowPtr pWin, pointer data)
--{
--    if (pWin->drawable.pScreen->GetWindowPixmap(pWin) != data)
--        return WT_DONTWALKCHILDREN;
--    DRI2InvalidateDrawable(&pWin->drawable);
--    return WT_WALKCHILDREN;
--}
-+
- 
- int
- DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
-@@ -1162,26 +1191,7 @@ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
-      */
-     *swap_target = pPriv->swap_count + pPriv->swapsPending;
- 
--    if (pDraw->type == DRAWABLE_WINDOW) {
--        WindowPtr pWin = (WindowPtr) pDraw;
--        PixmapPtr pPixmap = pScreen->GetWindowPixmap(pWin);
--
--        /*
--         * Find the top-most window using this pixmap
--         */
--        while (pWin->parent &&
--               pScreen->GetWindowPixmap(pWin->parent) == pPixmap)
--            pWin = pWin->parent;
--
--        /*
--         * Walk the sub-tree to invalidate all of the
--         * windows using the same pixmap
--         */
--        TraverseTree(pWin, DRI2InvalidateWalk, pPixmap);
--        DRI2InvalidateDrawable(&pPixmap->drawable);
--    }
--    else
--        DRI2InvalidateDrawable(pDraw);
-+    DRI2InvalidateDrawableAll(pDraw);
- 
-     return Success;
- }
-diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
-index 37cd8b3..1cf0f02 100644
---- a/hw/xwin/InitOutput.c
-+++ b/hw/xwin/InitOutput.c
-@@ -164,7 +164,7 @@ void XwinExtensionInit(void)
-     int i;
- 
- #ifdef XWIN_GLX_WINDOWS
--    if ((g_fNativeGl) && (serverGeneration == 1)) {
-+    if (g_fNativeGl) {
-         /* install the native GL provider */
-         glxWinPushNativeProvider();
-     }
-@@ -901,7 +901,8 @@ InitOutput(ScreenInfo * screenInfo, int argc, char *argv[])
- {
-     int i;
- 
--    XwinExtensionInit();
-+    if (serverGeneration == 1)
-+        XwinExtensionInit();
- 
-     /* Log the command line */
-     winLogCommandLine(argc, argv);
-diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
-index 4c2f04e..33729a9 100644
---- a/hw/xwin/Makefile.am
-+++ b/hw/xwin/Makefile.am
-@@ -109,13 +109,16 @@ SRCS =	InitInput.c \
- 	winclipboard.h \
- 	winconfig.h \
- 	win.h \
-+	winglobals.h \
- 	winkeybd.h \
- 	winkeynames.h \
- 	winlayouts.h \
- 	winmessages.h \
-+	winmonitors.h \
- 	winmsg.h \
- 	winms.h \
- 	winmultiwindowclass.h \
-+	winmultiwindowicons.h \
- 	winprefs.h \
- 	winresource.h \
- 	winwindow.h \
-diff --git a/hw/xwin/glx/Makefile.am b/hw/xwin/glx/Makefile.am
-index 7222a9f..59f6879 100644
---- a/hw/xwin/glx/Makefile.am
-+++ b/hw/xwin/glx/Makefile.am
-@@ -6,7 +6,8 @@ libXwinGLX_la_SOURCES = \
- 	glwindows.h \
- 	glwrap.c \
- 	indirect.c \
--	wgl_ext_api.c
-+	wgl_ext_api.c \
-+	wgl_ext_api.h
- 
- if XWIN_MULTIWINDOW
- DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW
-diff --git a/include/input.h b/include/input.h
-index 5747f3c..f8459b8 100644
---- a/include/input.h
-+++ b/include/input.h
-@@ -579,6 +579,7 @@ extern int TouchListenerAcceptReject(DeviceIntPtr dev, TouchPointInfoPtr ti,
-                                      int listener, int mode);
- extern int TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode,
-                              uint32_t touchid, Window grab_window, XID *error);
-+extern void TouchEndPhysicallyActiveTouches(DeviceIntPtr dev);
- 
- /* misc event helpers */
- extern Mask GetEventMask(DeviceIntPtr dev, xEvent *ev, InputClientsPtr clients);
-diff --git a/man/Xserver.man b/man/Xserver.man
-index 8d243d6..b103551 100644
---- a/man/Xserver.man
-+++ b/man/Xserver.man
-@@ -130,7 +130,7 @@ causes the server to generate a core dump on fatal errors.
- .B \-displayfd \fIfd\fP
- specifies a file descriptor in the launching process.  Rather than specify
- a display number, the X server will attempt to listen on successively higher
--display numbers, and upon finding a free one, will write the port number back
-+display numbers, and upon finding a free one, will write the display number back
- on this file descriptor as a newline-terminated string.  The \-pn option is
- ignored when using \-displayfd.
- .TP 8
-diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
-index 082c0db..c1af32e 100644
---- a/xkb/xkbAccessX.c
-+++ b/xkb/xkbAccessX.c
-@@ -709,7 +709,7 @@ ProcessPointerEvent(InternalEvent *ev, DeviceIntPtr mouse)
-     xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(mouse);
-     DeviceEvent *event = &ev->device_event;
- 
--    dev = IsFloating(mouse) ? mouse : GetMaster(mouse, MASTER_KEYBOARD);
-+    dev = (IsMaster(mouse) || IsFloating(mouse)) ? mouse : GetMaster(mouse, MASTER_KEYBOARD);
- 
-     if (dev && dev->key) {
-         xkbi = dev->key->xkbInfo;
+From 5047810a4c20fab444b8c6eb146c55dcdb0d4219 Mon Sep 17 00:00:00 2001
+From: Aaron Plattner <aplattner@nvidia.com>
+Date: Wed, 06 Mar 2013 17:40:28 +0000
+Subject: fb: Rename wfbDestroyGlyphCache
+
+Renaming this function was missed in commit
+9cbcb5bd6a5360a128d15b77a02d8d3351f74366, so both libfb.so and libwfb.so define
+functions named fbDestroyGlyphCache.
+
+Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+Reviewed-by: Søren Sandmann <ssp@redhat.com>
+Signed-off-by: Keith Packard <keithp@keithp.com>
+---
+diff --git a/fb/wfbrename.h b/fb/wfbrename.h
+index 588440c..54d00d0 100644
+--- a/fb/wfbrename.h
++++ b/fb/wfbrename.h
+@@ -52,6 +52,7 @@
+ #define fbCreatePixmap wfbCreatePixmap
+ #define fbCreatePixmapBpp wfbCreatePixmapBpp
+ #define fbCreateWindow wfbCreateWindow
++#define fbDestroyGlyphCache wfbDestroyGlyphCache
+ #define fbDestroyPixmap wfbDestroyPixmap
+ #define fbDestroyWindow wfbDestroyWindow
+ #define fbDoCopy wfbDoCopy
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xorg-server/loongson.patch b/extra/xorg-server/loongson.patch
index ba4811ccf..632753873 100644
--- a/extra/xorg-server/loongson.patch
+++ b/extra/xorg-server/loongson.patch
@@ -1,6 +1,6 @@
-diff -ru xorg-server-1.12.1.orig/hw/xfree86/dri/sarea.h xorg-server-1.12.1/hw/xfree86/dri/sarea.h
---- xorg-server-1.12.1.orig/hw/xfree86/dri/sarea.h	2012-05-17 20:42:38.676378113 +0200
-+++ xorg-server-1.12.1/hw/xfree86/dri/sarea.h	2012-05-17 20:45:49.936966941 +0200
+diff -ru xorg-server-1.14.0.orig/hw/xfree86/dri/sarea.h xorg-server-1.14.0/hw/xfree86/dri/sarea.h
+--- xorg-server-1.14.0.orig/hw/xfree86/dri/sarea.h	2013-03-19 13:50:10.838242935 +0100
++++ xorg-server-1.14.0/hw/xfree86/dri/sarea.h	2013-03-19 13:50:39.129859642 +0100
 @@ -41,6 +41,8 @@
  /* SAREA area needs to be at least a page */
  #if defined(__alpha__)
@@ -10,40 +10,47 @@ diff -ru xorg-server-1.12.1.orig/hw/xfree86/dri/sarea.h xorg-server-1.12.1/hw/xf
  #elif defined(__ia64__)
  #define SAREA_MAX			0x10000 /* 64kB */
  #else
-diff -ru xorg-server-1.12.1.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.12.1/hw/xfree86/os-support/linux/lnx_video.c
---- xorg-server-1.12.1.orig/hw/xfree86/os-support/linux/lnx_video.c	2012-05-17 20:42:38.672349775 +0200
-+++ xorg-server-1.12.1/hw/xfree86/os-support/linux/lnx_video.c	2012-05-17 20:47:23.059649687 +0200
-@@ -484,9 +484,10 @@
- Bool
- xf86EnableIO(void)
- {
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
-     int fd;
-     unsigned int ioBase_phys;
-+    extern unsigned int IOPortBase;
- #endif
+diff -ru xorg-server-1.14.0.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.14.0/hw/xfree86/os-support/linux/lnx_video.c
+--- xorg-server-1.14.0.orig/hw/xfree86/os-support/linux/lnx_video.c	2013-03-19 13:50:10.869508709 +0100
++++ xorg-server-1.14.0/hw/xfree86/os-support/linux/lnx_video.c	2013-03-19 14:02:26.536090562 +0100
+@@ -503,6 +503,40 @@
+     ioBase = NULL;
+ }
  
-     if (ExtendedEnabled)
-@@ -511,6 +512,21 @@
- #endif
-     }
-     close(fd);
 +#elif defined(__mips__)
-+	fd = open("/dev/mem", O_RDWR);
-+	IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
-+			PROT_READ | PROT_WRITE, MAP_SHARED, fd,
-+			0x1fd00000);
-+	if (IOPortBase == MAP_FAILED) {
-+		xf86Msg(X_WARNING,
-+				"xf86EnableIOPorts: Failed to map iobase (%s)\n",
-+				strerror(errno));
-+		return FALSE;
-+	}
-+	close(fd);
-+	xf86Msg(X_WARNING,
-+		"xf86EnableIOPorts: map iobase (%x)\n",
-+		IOPortBase);
- #elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
-     if (ioperm(0, 1024, 1) || iopl(3)) {
-         if (errno == ENODEV)
++
++extern unsigned int IOPortBase;
++
++static Bool
++hwEnableIO(void)
++{
++    int fd;
++
++    fd = open("/dev/mem", O_RDWR);
++    IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
++                  PROT_READ | PROT_WRITE, MAP_SHARED, fd,
++                  0x1fd00000);
++    if (IOPortBase == MAP_FAILED) {
++        xf86Msg(X_WARNING,
++                "xf86EnableIOPorts: Failed to map iobase (%s)\n",
++                strerror(errno));
++        return FALSE;
++    }
++    close(fd);
++    xf86Msg(X_WARNING,
++            "xf86EnableIOPorts: map iobase (%x)\n",
++            IOPortBase);
++
++    return IOPortBase != MAP_FAILED;
++}
++
++static void
++hwDisableIO(void)
++{
++    munmap(IOPortBase, 0x20000);
++    IOPortBase = NULL;
++}
++
+ #elif defined(__i386__) || defined(__x86_64__) || defined(__ia64__) || \
+       defined(__alpha__)
+ 
diff --git a/extra/xorg-server/use-pixman-glyph-cache.patch b/extra/xorg-server/use-pixman-glyph-cache.patch
deleted file mode 100644
index c1cd90d3a..000000000
--- a/extra/xorg-server/use-pixman-glyph-cache.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-From 9cbcb5bd6a5360a128d15b77a02d8d3351f74366 Mon Sep 17 00:00:00 2001
-From: Søren Sandmann Pedersen <ssp@redhat.com>
-Date: Wed, 30 May 2012 09:19:08 +0000
-Subject: Use new pixman_glyph_cache_t API that will be in pixman 0.28.0
-
-This new API allows glyphs to be cached in a data structure in pixman,
-and entire glyph strings to be composited in one go.
-
-Also bump pixman dependency to 0.27.2.
-
-Results from the cairo peformance test suite running against Xvfb with
-a screen size of 1680x1050@32bpp:
-
-Speedups
-========
- xlib          firefox-talos-gfx  12416.63 -> 3603.93   3.45x speedup
-██▌
- xlib          xfce4-terminal-a1   1727.57 -> 1048.85:  1.65x speedup
-▋
- xlib                  evolution   1370.49 -> 869.34:   1.58x speedup
-▋
- xlib         gnome-terminal-vim   1832.83 -> 1251.94:  1.46x speedup
-▌
- xlib                    poppler   1519.70 -> 1204.05:  1.26x speedup
-▎
- xlib       firefox-planet-gnome   6982.55 -> 5598.16:  1.25x speedup
-▎
- xlib                  ocitysmap   1142.77 -> 1071.53:  1.07x speedup
-▏
-
-No slowdowns were reported.
-
-Results of x11perf -aa10text:
-
-Before:
-
-      8000000 reps @   0.0007 msec (1450000.0/sec)
-      8000000 reps @   0.0007 msec (1460000.0/sec)
-      8000000 reps @   0.0007 msec (1460000.0/sec)
-      8000000 reps @   0.0007 msec (1470000.0/sec)
-      8000000 reps @   0.0007 msec (1480000.0/sec)
-     40000000 trep @   0.0007 msec (1460000.0/sec)
-
-After:
-
-     32000000 reps @   0.0002 msec (4910000.0/sec)
-     32000000 reps @   0.0002 msec (4830000.0/sec)
-     32000000 reps @   0.0002 msec (4890000.0/sec)
-     32000000 reps @   0.0002 msec (4830000.0/sec)
-     32000000 reps @   0.0002 msec (4900000.0/sec)
-    160000000 trep @   0.0002 msec (4870000.0/sec)
-
-Version 2: Destroy the glyph cache at server regen time
-
-Acked-by: Aaron Plattner <aplattner@nvidia.com>
-Reviewed-by: Keith Packard <keithp@keithp.com>
-Signed-off-by: Soren Sandmann <ssp@redhat.com>
----
-diff --git a/configure.ac b/configure.ac
-index e686614..b6ed92c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -811,7 +811,7 @@ LIBPCIACCESS="pciaccess >= 0.12.901"
- LIBUDEV="libudev >= 143"
- LIBSELINUX="libselinux >= 2.0.86"
- LIBDBUS="dbus-1 >= 1.0"
--LIBPIXMAN="pixman-1 >= 0.21.8"
-+LIBPIXMAN="pixman-1 >= 0.27.2"
- 
- dnl Pixman is always required, but we separate it out so we can link
- dnl specific modules against it
-diff --git a/fb/fb.h b/fb/fb.h
-index 75596c5..b869d12 100644
---- a/fb/fb.h
-+++ b/fb/fb.h
-@@ -1344,6 +1344,9 @@ extern _X_EXPORT void
- extern _X_EXPORT Bool
-  fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats);
- 
-+extern _X_EXPORT void
-+fbDestroyGlyphCache(void);
-+
- /*
-  * fbpixmap.c
-  */
-diff --git a/fb/fbpict.c b/fb/fbpict.c
-index 097a1a6..2804ff4 100644
---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
-@@ -70,6 +70,156 @@ fbComposite(CARD8 op,
-     free_pixman_pict(pDst, dest);
- }
- 
-+static pixman_glyph_cache_t *glyphCache;
-+
-+void
-+fbDestroyGlyphCache(void)
-+{
-+    if (glyphCache)
-+    {
-+	pixman_glyph_cache_destroy (glyphCache);
-+	glyphCache = NULL;
-+    }
-+}
-+
-+static void
-+fbUnrealizeGlyph(ScreenPtr pScreen,
-+		 GlyphPtr pGlyph)
-+{
-+    if (glyphCache)
-+	pixman_glyph_cache_remove (glyphCache, pGlyph, NULL);
-+}
-+
-+static void
-+fbGlyphs(CARD8 op,
-+	 PicturePtr pSrc,
-+	 PicturePtr pDst,
-+	 PictFormatPtr maskFormat,
-+	 INT16 xSrc,
-+	 INT16 ySrc, int nlist,
-+	 GlyphListPtr list,
-+	 GlyphPtr *glyphs)
-+{
-+#define N_STACK_GLYPHS 512
-+    ScreenPtr pScreen = pDst->pDrawable->pScreen;
-+    pixman_glyph_t stack_glyphs[N_STACK_GLYPHS];
-+    pixman_glyph_t *pglyphs = stack_glyphs;
-+    pixman_image_t *srcImage, *dstImage;
-+    int srcXoff, srcYoff, dstXoff, dstYoff;
-+    GlyphPtr glyph;
-+    int n_glyphs;
-+    int x, y;
-+    int i, n;
-+    int xDst = list->xOff, yDst = list->yOff;
-+
-+    miCompositeSourceValidate(pSrc);
-+    
-+    n_glyphs = 0;
-+    for (i = 0; i < nlist; ++i)
-+	n_glyphs += list[i].len;
-+
-+    if (!glyphCache)
-+	glyphCache = pixman_glyph_cache_create();
-+
-+    pixman_glyph_cache_freeze (glyphCache);
-+    
-+    if (n_glyphs > N_STACK_GLYPHS) {
-+	if (!(pglyphs = malloc (n_glyphs * sizeof (pixman_glyph_t))))
-+	    goto out;
-+    }
-+    
-+    i = 0;
-+    x = y = 0;
-+    while (nlist--) {
-+        x += list->xOff;
-+        y += list->yOff;
-+        n = list->len;
-+        while (n--) {
-+	    const void *g;
-+
-+            glyph = *glyphs++;
-+
-+	    if (!(g = pixman_glyph_cache_lookup (glyphCache, glyph, NULL))) {
-+		pixman_image_t *glyphImage;
-+		PicturePtr pPicture;
-+		int xoff, yoff;
-+
-+		pPicture = GetGlyphPicture(glyph, pScreen);
-+		if (!pPicture) {
-+		    n_glyphs--;
-+		    goto next;
-+		}
-+
-+		if (!(glyphImage = image_from_pict(pPicture, FALSE, &xoff, &yoff)))
-+		    goto out;
-+
-+		g = pixman_glyph_cache_insert(glyphCache, glyph, NULL,
-+					      glyph->info.x,
-+					      glyph->info.y,
-+					      glyphImage);
-+
-+		free_pixman_pict(pPicture, glyphImage);
-+
-+		if (!g)
-+		    goto out;
-+	    }
-+
-+	    pglyphs[i].x = x;
-+	    pglyphs[i].y = y;
-+	    pglyphs[i].glyph = g;
-+	    i++;
-+
-+	next:
-+            x += glyph->info.xOff;
-+            y += glyph->info.yOff;
-+	}
-+	list++;
-+    }
-+
-+    if (!(srcImage = image_from_pict(pSrc, FALSE, &srcXoff, &srcYoff)))
-+	goto out;
-+
-+    if (!(dstImage = image_from_pict(pDst, TRUE, &dstXoff, &dstYoff)))
-+	goto out_free_src;
-+
-+    if (maskFormat) {
-+	pixman_format_code_t format;
-+	pixman_box32_t extents;
-+	int x, y;
-+
-+	format = maskFormat->format | (maskFormat->depth << 24);
-+
-+	pixman_glyph_get_extents(glyphCache, n_glyphs, pglyphs, &extents);
-+
-+	x = extents.x1;
-+	y = extents.y1;
-+
-+	pixman_composite_glyphs(op, srcImage, dstImage, format,
-+				xSrc + srcXoff + xDst, ySrc + srcYoff + yDst,
-+				x, y,
-+				x + dstXoff, y + dstYoff,
-+				extents.x2 - extents.x1,
-+				extents.y2 - extents.y1,
-+				glyphCache, n_glyphs, pglyphs);
-+    }
-+    else {
-+	pixman_composite_glyphs_no_mask(op, srcImage, dstImage,
-+					xSrc + srcXoff - xDst, ySrc + srcYoff - yDst,
-+					dstXoff, dstYoff,
-+					glyphCache, n_glyphs, pglyphs);
-+    }
-+
-+    free_pixman_pict(pDst, dstImage);
-+
-+out_free_src:
-+    free_pixman_pict(pSrc, srcImage);
-+
-+out:
-+    pixman_glyph_cache_thaw(glyphCache);
-+    if (pglyphs != stack_glyphs)
-+	free(pglyphs);
-+}
-+
- static pixman_image_t *
- create_solid_fill_image(PicturePtr pict)
- {
-@@ -357,7 +507,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
-         return FALSE;
-     ps = GetPictureScreen(pScreen);
-     ps->Composite = fbComposite;
--    ps->Glyphs = miGlyphs;
-+    ps->Glyphs = fbGlyphs;
-+    ps->UnrealizeGlyph = fbUnrealizeGlyph;
-     ps->CompositeRects = miCompositeRects;
-     ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
-     ps->Trapezoids = fbTrapezoids;
-diff --git a/fb/fbscreen.c b/fb/fbscreen.c
-index 7c7d656..f9080a4 100644
---- a/fb/fbscreen.c
-+++ b/fb/fbscreen.c
-@@ -32,6 +32,7 @@ fbCloseScreen(ScreenPtr pScreen)
-     int d;
-     DepthPtr depths = pScreen->allowedDepths;
- 
-+    fbDestroyGlyphCache();
-     for (d = 0; d < pScreen->numDepths; d++)
-         free(depths[d].vids);
-     free(depths);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch b/extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch
new file mode 100644
index 000000000..b42c2d7c8
--- /dev/null
+++ b/extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch
@@ -0,0 +1,25 @@
+From 0002cde5312e785529b2901d7f8a82d5623e4ca7 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 9 Nov 2011 11:52:06 +1000
+Subject: [PATCH 2/7] Don't build the ACPI code.
+
+No good can come of this.
+---
+ configure.ac |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a12783c..54f4464 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1620,7 +1620,6 @@ if test "x$XORG" = xyes; then
+ 		  	linux_alpha=yes
+ 			;;
+ 		  i*86|amd64*|x86_64*|ia64*)
+-			linux_acpi="yes"
+ 			;;
+ 		  *)
+ 			;;
+-- 
+1.7.10.1
+
diff --git a/extra/xorg-sessreg/PKGBUILD b/extra/xorg-sessreg/PKGBUILD
index a9b930917..7096159ea 100644
--- a/extra/xorg-sessreg/PKGBUILD
+++ b/extra/xorg-sessreg/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 176901 2013-02-02 07:10:44Z andyrtr $
+# $Id: PKGBUILD 177990 2013-02-12 19:46:14Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-sessreg
-pkgver=1.0.7
-pkgrel=2
+pkgver=1.0.8
+pkgrel=1
 pkgdesc="Register X sessions in system utmp/utmpx databases"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -12,7 +12,7 @@ depends=('glibc')
 makedepends=('xorg-util-macros' 'xproto')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/sessreg-${pkgver}.tar.bz2)
-sha256sums=('8734ee580264ab92e984d8f84611dada89906d6b548334a5e7d4b0ddba7c2e52')
+sha256sums=('0e2accc6272fcc2321aef7370f4ccf0df0fe259b2e942938264e2aaedee6c4c3')
 
 build() {
   cd "${srcdir}/sessreg-${pkgver}"
diff --git a/extra/xorg-twm/PKGBUILD b/extra/xorg-twm/PKGBUILD
index fe1a8dc94..a89787cf8 100644
--- a/extra/xorg-twm/PKGBUILD
+++ b/extra/xorg-twm/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=xorg-twm
 pkgver=1.0.7
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="Tab Window Manager for the X Window System"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
diff --git a/extra/xorg-x11perf/PKGBUILD b/extra/xorg-x11perf/PKGBUILD
index 29d413201..a46972d16 100644
--- a/extra/xorg-x11perf/PKGBUILD
+++ b/extra/xorg-x11perf/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=xorg-x11perf
 pkgver=1.5.4
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="Simple X server performance benchmarker"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
diff --git a/extra/xorg-xclock/PKGBUILD b/extra/xorg-xclock/PKGBUILD
index 07bc3b4a6..282ea3614 100644
--- a/extra/xorg-xclock/PKGBUILD
+++ b/extra/xorg-xclock/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=xorg-xclock
 pkgver=1.0.6
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="X clock"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
diff --git a/extra/xorg-xdm/LICENSE b/extra/xorg-xdm/LICENSE
deleted file mode 100644
index 5f8d6fcc0..000000000
--- a/extra/xorg-xdm/LICENSE
+++ /dev/null
@@ -1,132 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/app/
-
-Copyright 1988, 1989, 1990, 1991, 1994, 1998  
-The Open Group
-Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-prngc.c:
-Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
-Copyright (c) 2001-2002 Damien Miller.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-dm_socket.h, dm_error.h, dm_auth.h
-Copyright 1998 by Thomas E. Dickey <dickey@clark.net>
-
-                        All Rights Reserved
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name(s) of the above copyright
-holders shall not be used in advertising or otherwise to promote the
-sale, use or other dealings in this Software without prior written
-authorization.
-
-genauth.c:
-Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999.  All
-rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, and the entire permission notice in its entirety,
-   including the disclaimer of warranties.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote
-   products derived from this software without specific prior
-   written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
-WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-Makefile.am
-Copyright 2005  Red Hat, Inc.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Red Hat not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Red Hat makes no
-representations about the suitability of this software for any purpose. It
-is provided "as is" without express or implied warranty.
-
-RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
diff --git a/extra/xorg-xdm/xdm-consolekit.patch b/extra/xorg-xdm/xdm-consolekit.patch
deleted file mode 100644
index c52a26138..000000000
--- a/extra/xorg-xdm/xdm-consolekit.patch
+++ /dev/null
@@ -1,225 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -362,6 +362,20 @@
- 
- AM_CONDITIONAL(DYNAMIC_GREETER, test x$DYNAMIC_GREETER = xyes)
- 
-+# ConsoleKit support
-+AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]),
-+	[USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes])
-+if test x"$USE_CONSOLEKIT" != xno; then
-+	PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector,
-+		[USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no])
-+	if test x"$USE_CONSOLEKIT" = xyes; then
-+		AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit])
-+		XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS -DUSE_CONSOLEKIT"
-+		XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS"
-+	fi
-+fi
-+dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes)
-+
- #
- #  XDM
- #
---- a/xdm/session.c
-+++ b/xdm/session.c
-@@ -66,6 +66,11 @@
- #endif
- #endif /* USE_PAM */
- 
-+#ifdef USE_CONSOLEKIT
-+#include <ck-connector.h>
-+#include <dbus/dbus.h>
-+#endif
-+
- #ifdef __SCO__
- #include <prot.h>
- #endif
-@@ -472,6 +477,97 @@
-     }
- }
- 
-+#ifdef USE_CONSOLEKIT
-+
-+static CkConnector *connector;
-+
-+static int openCKSession(struct verify_info *verify, struct display *d)
-+{
-+    int ret;
-+    DBusError error;
-+    char  *remote_host_name = "";
-+    dbus_bool_t is_local;
-+    char *display_name = "";
-+    char *display_device = "";
-+    char devtmp[16];
-+
-+    if (!use_consolekit)
-+	return 1;
-+
-+    is_local = d->displayType.location == Local;
-+    if (d->peerlen > 0 && d->peer)
-+	remote_host_name = d->peer;
-+    if (d->name)
-+	display_name = d->name;
-+    /* how can we get the corresponding tty at best...? */
-+    if (d->windowPath) {
-+	display_device = strchr(d->windowPath, ':');
-+	if (display_device && display_device[1])
-+	    display_device++;
-+	else
-+	    display_device = d->windowPath;
-+	snprintf(devtmp, sizeof(devtmp), "/dev/tty%s", display_device);
-+	display_device = devtmp;
-+    }
-+
-+    connector = ck_connector_new();
-+    if (!connector) {
-+	LogOutOfMem("ck_connector");
-+	return 0;
-+    }
-+
-+    dbus_error_init(&error);
-+    ret = ck_connector_open_session_with_parameters(
-+		connector, &error,
-+		"unix-user", &verify->uid,
-+		"x11-display", &display_name,
-+		"x11-display-device", &display_device,
-+		"remote-host-name", &remote_host_name,
-+		"is-local", &is_local,
-+		NULL);
-+    if (!ret) {
-+	if (dbus_error_is_set(&error)) {
-+	    LogError("Dbus error: %s\n", error.message);
-+	    dbus_error_free(&error);
-+	} else {
-+	    LogError("ConsoleKit error\n");
-+	}
-+	LogError("console-kit-daemon not running?\n");
-+	ck_connector_unref(connector);
-+	connector = NULL;
-+	return 1;
-+    }
-+
-+    verify->userEnviron = setEnv(verify->userEnviron,
-+		"XDG_SESSION_COOKIE", ck_connector_get_cookie(connector));
-+    return 1;
-+}
-+
-+static void closeCKSession(void)
-+{
-+    DBusError error;
-+
-+    if (!connector)
-+	return;
-+
-+    dbus_error_init(&error);
-+    if (!ck_connector_close_session(connector, &error)) {
-+	if (dbus_error_is_set(&error)) {
-+	    LogError("Dbus error: %s\n", error.message);
-+	    dbus_error_free(&error);
-+	} else {
-+	    LogError("ConsoleKit close error\n");
-+	}
-+	LogError("console-kit-daemon not running?\n");
-+    }
-+    ck_connector_unref(connector);
-+    connector = NULL;
-+}
-+#else
-+#define openCKSession(v,d)	1
-+#define closeCKSession()
-+#endif
-+
- void
- SessionExit (struct display *d, int status, int removeAuth)
- {
-@@ -486,6 +580,8 @@
-     }
- #endif
- 
-+    closeCKSession();
-+
-     /* make sure the server gets reset after the session is over */
-     if (d->serverPid >= 2 && d->resetSignal)
- 	kill (d->serverPid, d->resetSignal);
-@@ -568,6 +664,10 @@
- #ifdef USE_PAM
-     if (pamh) pam_open_session(pamh, 0);
- #endif
-+
-+    if (!openCKSession(verify, d))
-+	return 0;
-+
-     switch (pid = fork ()) {
-     case 0:
- 	CleanUpChild ();
---- a/include/dm.h
-+++ b/include/dm.h
-@@ -325,6 +325,9 @@
- extern char	*prngdSocket;
- extern int	prngdPort;
- # endif
-+#ifdef USE_CONSOLEKIT
-+extern int	use_consolekit;
-+#endif
- 
- extern char	*greeterLib;
- extern char	*willing;
---- a/xdm/resource.c
-+++ b/xdm/resource.c
-@@ -68,6 +68,9 @@
- char	*prngdSocket;
- int	prngdPort;
- #endif
-+#ifdef USE_CONSOLEKIT
-+int	use_consolekit;
-+#endif
- 
- char	*greeterLib;
- char	*willing;
-@@ -258,6 +261,10 @@
- 				"false"} ,
- { "willing",	"Willing",	DM_STRING,	&willing,
- 				""} ,
-+#ifdef USE_CONSOLEKIT
-+{ "consoleKit",	"ConsoleKit",	DM_BOOL,	(char **) &use_consolekit,
-+				"true"} ,
-+#endif
- };
- 
- # define NUM_DM_RESOURCES	(sizeof DmResources / sizeof DmResources[0])
-@@ -440,7 +447,11 @@
- {"-debug",	"*debugLevel",		XrmoptionSepArg,	(caddr_t) NULL },
- {"-xrm",	NULL,			XrmoptionResArg,	(caddr_t) NULL },
- {"-daemon",	".daemonMode",		XrmoptionNoArg,		"true"         },
--{"-nodaemon",	".daemonMode",		XrmoptionNoArg,		"false"        }
-+{"-nodaemon",	".daemonMode",		XrmoptionNoArg,		"false"        },
-+#ifdef USE_CONSOLEKIT
-+{"-consolekit",	".consoleKit",		XrmoptionNoArg,		"true"  },
-+{"-noconsolekit", ".consoleKit",	XrmoptionNoArg,		"false" }
-+#endif
- };
- 
- static int	originalArgc;
---- a/man/xdm.man
-+++ b/man/xdm.man
-@@ -51,6 +51,8 @@
- ] [
- .B \-session
- .I session_program
-+] [
-+.B \-noconsolekit
- ]
- .SH DESCRIPTION
- .I Xdm
-@@ -218,6 +220,10 @@
- .IP "\fB\-xrm\fP \fIresource_specification\fP"
- Allows an arbitrary resource to be specified, as in most
- X Toolkit applications.
-+.IP "\fB\-noconsolekit\fP"
-+Specifies ``false'' as the value for the \fBDisplayManager.consoleKit\fP
-+resource.
-+This suppresses the session management using ConsoleKit.
- .SH RESOURCES
- At many stages the actions of
- .I xdm
diff --git a/extra/xorg-xeyes/PKGBUILD b/extra/xorg-xeyes/PKGBUILD
index aef7b1845..4efe1ce00 100644
--- a/extra/xorg-xeyes/PKGBUILD
+++ b/extra/xorg-xeyes/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=xorg-xeyes
 pkgver=1.1.1
-pkgrel=2.1
+pkgrel=2.2
 pkgdesc="Follow the mouse/SHAPE extension X demo"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
diff --git a/extra/xorg-xkbutils/PKGBUILD b/extra/xorg-xkbutils/PKGBUILD
index 44a97a950..22ceec025 100644
--- a/extra/xorg-xkbutils/PKGBUILD
+++ b/extra/xorg-xkbutils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151027 2012-02-24 13:40:04Z allan $
+# $Id: PKGBUILD 177986 2013-02-12 19:41:06Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xkbutils
-pkgver=1.0.3
-pkgrel=3.1
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="XKB utility demos"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -12,7 +12,7 @@ depends=('libxaw' 'libxt' 'libx11')
 makedepends=('xorg-util-macros' 'xproto' 'inputproto')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xkbutils-${pkgver}.tar.bz2)
-sha1sums=('e5a2619b9449f95e02b520b492de0575bc4551d6')
+sha256sums=('d2a18ab90275e8bca028773c44264d2266dab70853db4321bdbc18da75148130')
 
 build() {
   cd "${srcdir}/xkbutils-${pkgver}"
diff --git a/extra/xorg-xlsfonts/PKGBUILD b/extra/xorg-xlsfonts/PKGBUILD
deleted file mode 100644
index a0e22a221..000000000
--- a/extra/xorg-xlsfonts/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 156352 2012-04-17 16:02:26Z andyrtr $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=xorg-xlsfonts
-pkgver=1.0.4
-pkgrel=1
-pkgdesc='List available X fonts'
-url='http://xorg.freedesktop.org/'
-license=('custom')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('libx11')
-makedepends=('xorg-util-macros')
-source=("http://xorg.freedesktop.org/archive/individual/app/xlsfonts-${pkgver}.tar.bz2")
-sha1sums=('6fc23537797bb1ae4945efd8c01e675edf4a4c3f')
-
-build() {
-	cd "${srcdir}/xlsfonts-${pkgver}"
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}/xlsfonts-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}
diff --git a/extra/xorg-xprop/PKGBUILD b/extra/xorg-xprop/PKGBUILD
index eab97a6fc..9a68e6606 100644
--- a/extra/xorg-xprop/PKGBUILD
+++ b/extra/xorg-xprop/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=xorg-xprop
 pkgver=1.2.1
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="Property displayer for X"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
diff --git a/extra/xorg-xrandr/PKGBUILD b/extra/xorg-xrandr/PKGBUILD
index 8eb8ca012..1ca040ad8 100644
--- a/extra/xorg-xrandr/PKGBUILD
+++ b/extra/xorg-xrandr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 130753 2011-07-07 22:30:11Z andyrtr $
+# $Id: PKGBUILD 178018 2013-02-13 16:44:53Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xrandr
-pkgver=1.3.5
-pkgrel=1.1
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="Primitive command line interface to RandR extension"
 arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -12,7 +12,7 @@ depends=('libxrandr' 'libx11')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xrandr-${pkgver}.tar.bz2)
-sha1sums=('ef45925d5b0e72c73d21798d65a41d476fdb0d3f')
+sha256sums=('a76b004abe6fd7606eba9ad161ac6391fe5c665708cc5fb7c7ea7d36459d9693')
 
 build() {
   cd "${srcdir}/xrandr-${pkgver}"
diff --git a/extra/xorg-xvinfo/PKGBUILD b/extra/xorg-xvinfo/PKGBUILD
index 82ebec11c..6d8d13b74 100644
--- a/extra/xorg-xvinfo/PKGBUILD
+++ b/extra/xorg-xvinfo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151163 2012-02-25 06:42:49Z allan $
+# $Id: PKGBUILD 177988 2013-02-12 19:43:20Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xvinfo
-pkgver=1.1.1
-pkgrel=3.1
+pkgver=1.1.2
+pkgrel=1
 pkgdesc="Prints out the capabilities of any video adaptors associated with the display that are accessible through the X-Video extension"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
@@ -12,7 +12,7 @@ depends=('libx11' 'libxv')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 source=(http://xorg.freedesktop.org/archive/individual/app/xvinfo-${pkgver}.tar.bz2)
-sha1sums=('dc326464748fa608da50386112a89024804c1910')
+sha256sums=('eed3d90ffd788ef728c4a5e7aa4bd86dc6bbcebac929caf7a0479cf8b53b50e3')
 
 build() {
   cd "${srcdir}/xvinfo-${pkgver}"
diff --git a/extra/xsd/PKGBUILD b/extra/xsd/PKGBUILD
index 117543842..4a0cf2a7f 100644
--- a/extra/xsd/PKGBUILD
+++ b/extra/xsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 176296 2013-01-28 16:48:29Z stephane $
+# $Id: PKGBUILD 181130 2013-03-31 19:17:00Z stephane $
 # Maintainer:
 # Contributor: kevku <kevku@gmx.com>
 
 pkgname=xsd
 pkgver=3.3.0
 _pkgver=3.3.0-2+dep
-pkgrel=7
+pkgrel=8
 pkgdesc="An open-source, cross-platform W3C XML Schema to C++ data binding compiler"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.codesynthesis.com/products/xsd"
diff --git a/extra/xsnow/LICENSE b/extra/xsnow/LICENSE
deleted file mode 100644
index b5645bacf..000000000
--- a/extra/xsnow/LICENSE
+++ /dev/null
@@ -1,9 +0,0 @@
- Copyright
- ---------
- Xsnow is available freely and you may give it to other people as is, 
- but I retain all rights. Therefore it does not classify as 'Public 
- Domain' software. It *is* allowed to package Xsnow for Unix/Linux
- distributions, CD-Roms etc, and to make the necessary changes to
- makefiles etc. to facilitate this. 
-
-�Copyright 1984, 1988, 1990, 1993-1995, 2000-2001 by Rick Jansen, all rights reserved.
diff --git a/extra/xsnow/PKGBUILD b/extra/xsnow/PKGBUILD
deleted file mode 100644
index 0a24514ab..000000000
--- a/extra/xsnow/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 122681 2011-05-06 04:34:00Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xsnow
-pkgver=1.42
-pkgrel=5
-pkgdesc="Xsnow will let it snow on the root window and on windows. Santa and his reindeer will complete your festive-season feeling."
-arch=('i686' 'x86_64')
-url="http://dropmix.xs4all.nl/rick/Xsnow/"
-license=('custom')
-depends=('libxpm')
-makedepends=('imake')
-source=(http://dropmix.xs4all.nl/rick/Xsnow/${pkgname}-${pkgver}.tar.gz LICENSE)
-md5sums=('451d8fc0a2b5393b428faa496a556036'
-         '60d377d8f9c0e99297160a464d4a0a9e')
-sha1sums=('d63987560dac9c6341e50d270089e40d17031ce3'
-          'c93e236bed35a2d5dc23202c1c615d4e146fba49')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  xmkmf
-  make depend
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" MANPATH=/usr/share/man install install.man
-  chmod 644 "${pkgdir}/usr/share/man/man1/xsnow.1x"
-  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/xsp/PKGBUILD b/extra/xsp/PKGBUILD
deleted file mode 100644
index 7c8a888c6..000000000
--- a/extra/xsp/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 168400 2012-10-10 22:19:53Z tomegun $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=xsp
-pkgver=2.10.2
-pkgrel=4
-pkgdesc="A simple webserver based on mono - provides ASP.NET support"
-arch=(i686 x86_64)
-license=('custom')
-url="http://www.go-mono.com"
-depends=('mono>=2.10.2' 'sqlite')
-options=(!makeflags)
-install=${pkgname}.install
-source=(http://download.mono-project.com/sources/xsp/xsp-2.10.2.tar.bz2
-        ${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp ${pkgname}.service)
-
-build() {
- # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR=${srcdir}/src/weird
-  mkdir -p "${MONO_SHARED_DIR}"
- # import pathes
- # build
-  cd ${srcdir}/${pkgname}-${pkgver}
-  #sed -i 's|/bin/sh|\0\nexport MONO_PATH=${MONO_PATH}:/opt/mono/lib/mono/1.0|' scripts/script.in
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make || return 1
- # tweak the xsp shellscript to grab system dll's
-  for script in scripts/*2; do
-    sed -i 's|/usr/lib/mono/1.0|/usr/lib/mono/2.0|' $script
-  done
-   #destdir related bugfixes
-  sed -i 's|mkdir \$(datadir)|mkdir $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile
-  sed -i 's|gif \$(datadir)|gif $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir}/ install
- # move test files from share to arch' default html home
-  mkdir -p ${pkgdir}/srv/http/html
-  mv ${pkgdir}/usr/lib/xsp/test ${pkgdir}/srv/http/html/xsp
-  rm -rf ${pkgdir}/usr/share
-  chown -R http:http ${pkgdir}/srv/http/html/${pkgname}
-
- # install a deamon
-  install -D -m755 ${srcdir}/${pkgname}.rc.d \
-    ${pkgdir}/etc/rc.d/${pkgname}
- # install a deamon configurationfile
-  install -D -m644 ${srcdir}/$pkgname.conf.d \
-    ${pkgdir}/etc/conf.d/${pkgname}
- # install a xsp configuration home
-  install -D -m644 ${srcdir}/${pkgname}.webapp \
-    ${pkgdir}/etc/${pkgname}/${pkgname}.webapp
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
- # install systemd service file
-  install -D -m644 ${srcdir}/${pkgname}.service \
-    ${pkgdir}/usr/lib/systemd/system/xsp.service
-}
-md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6'
-         '9575bd7d6f64d51ba05bdd6370665858'
-         '35d921df0fefc30f47a438c95d420efc'
-         'c917c07f68b945691506c29750db482f'
-         '9d83bd36d209f8d36a11dfbc4fa50819')
diff --git a/extra/xsp/xsp.conf.d b/extra/xsp/xsp.conf.d
deleted file mode 100644
index 99d634929..000000000
--- a/extra/xsp/xsp.conf.d
+++ /dev/null
@@ -1,10 +0,0 @@
-# xsp options
-
-
-# note that is just the helping app for mod_mono if you like production like
-# quality
-# xsp is for ASP testing mainly  -- read the manpage for xsp to know what
-# options are available. Archlinux will provide xsp configured by a .webapp
-# configuration file which rests in /etc/xsp
-
-XSP_PARAMS="--appconfigdir /etc/xsp"
diff --git a/extra/xsp/xsp.install b/extra/xsp/xsp.install
deleted file mode 100644
index b8a8f3136..000000000
--- a/extra/xsp/xsp.install
+++ /dev/null
@@ -1,37 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  cat << EOM
-
--->  xsp is just the helping app for mod_mono if you like a production like
--->  server. xsp itself is for ASP testing mainly  -- read the manpage for xsp
--->  to know which options are available.
--->  Archlinux will provide xsp configured by a .webapp configuration file
--->  which rests in /etc/xsp. Just put your other webapp files there to let
--->  xsp pick them up.
--->  xsp is commandline based configuration is done in /etc/conf.d/xsp. Set all
--->  your arguments there. Don't forget that you can run xsp from the console
--->  as oridinary user, which is safer and for testing absolutely sufficient!!
-
--->  You can run the testpages simply by starting the server and calling 
-                       http://localhost:8080
--->  from your browser's location bar
-
-
-EOM
-}
-
-# 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() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
diff --git a/extra/xsp/xsp.rc.d b/extra/xsp/xsp.rc.d
deleted file mode 100644
index b4fcda15c..000000000
--- a/extra/xsp/xsp.rc.d
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/xsp ] && . /etc/conf.d/xsp
-
-PID=`pidof -o %PPID /usr/bin/mono`
-case "$1" in
-  start)
-    stat_busy "Starting Xsp Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/bin/xsp $XSP_PARAMS --nonstop &> /dev/null &
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon xsp
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Xsp Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon xsp
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/extra/xsp/xsp.service b/extra/xsp/xsp.service
deleted file mode 100644
index 36b802e21..000000000
--- a/extra/xsp/xsp.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=XSP Web Server
-
-[Service]
-ExecStart=/usr/bin/xsp --appconfigdir /etc/xsp --nonstop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/xsp/xsp.webapp b/extra/xsp/xsp.webapp
deleted file mode 100644
index a685dd171..000000000
--- a/extra/xsp/xsp.webapp
+++ /dev/null
@@ -1,8 +0,0 @@
-<apps>
-  <web-application>
-    <name>Root</name>
-      <vpath>/</vpath>
-      <path>/srv/http/html/xsp</path>
-      <vhost>localhost</vhost>
-  </web-application>
-</apps>
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index 6f5ca2bce..2133e855a 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 174967 2013-01-09 16:07:11Z andyrtr $
+# $Id: PKGBUILD 183672 2013-04-26 12:52:31Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=288
+pkgver=292
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
         LICENSE)
-md5sums=('b9bef1abf6e397be6fa2e5f534964d17'
+md5sums=('d6e7d1bd31b23fb58ca213c912f32009'
          '10ecc3f8ee91e3189863a172f68282d2')
 
 build() {
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index fb0564edf..e68d8b5ed 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 172188 2012-12-01 13:10:31Z foutrelis $
+# $Id: PKGBUILD 182413 2013-04-10 13:01:03Z foutrelis $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xulrunner
-pkgver=17.0.1
+pkgver=20.0
 pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13')
+depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2')
+makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13')
 url="http://wiki.mozilla.org/XUL:Xul_Runner"
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2
         mozconfig
         mozilla-pkgconfig.patch
         shared-libs.patch)
 options=('!emptydirs')
 replaces=('xulrunner-oss')
-md5sums=('13d616028eb77de927c29b6655c832c9'
-         '4afe63440e2f1935ff90de15db3b70f0'
+md5sums=('1b8a1907919eb805f390a05216f2d8d0'
+         'f26710bcf3e65699a0646c47155cb147'
          '27271ce647a83906ef7a24605e840d61'
          '52e52f840a49eb1d14be1c0065b03a93')
 
-build() {
+prepare() {
   cd "$srcdir/mozilla-release"
   cp "$srcdir/mozconfig" .mozconfig
 
@@ -29,6 +29,20 @@ build() {
   patch -Np1 -i ../mozilla-pkgconfig.patch
   patch -Np1 -i ../shared-libs.patch
 
+  # WebRTC build tries to execute "python" and expects Python 2
+  # Workaround taken from chromium PKGBUILD
+  mkdir "$srcdir/python2-path"
+  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
+
+  # configure script misdetects the preprocessor without an optimization level
+  # https://bugs.archlinux.org/task/34644
+  sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+}
+
+build() {
+  cd "$srcdir/mozilla-release"
+
+  export PATH="$srcdir/python2-path:$PATH"
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver"
   export PYTHON="/usr/bin/python2"
 
diff --git a/extra/xulrunner/mozconfig b/extra/xulrunner/mozconfig
index 9756e5cee..6679dac21 100644
--- a/extra/xulrunner/mozconfig
+++ b/extra/xulrunner/mozconfig
@@ -20,19 +20,10 @@ ac_add_options --enable-system-pixman
 ac_add_options --with-pthreads
 
 # Features
-ac_add_options --enable-safe-browsing
 ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
+#ac_add_options --enable-gstreamer
 
-ac_add_options --disable-gnomevfs
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-tests
-ac_add_options --disable-mochitest
 ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
diff --git a/extra/xvidcore/PKGBUILD b/extra/xvidcore/PKGBUILD
index b76dcab4b..5805c61df 100644
--- a/extra/xvidcore/PKGBUILD
+++ b/extra/xvidcore/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=xvidcore
 pkgver=1.3.2
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="XviD is an open source MPEG-4 video codec"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xvid.org/"
diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD
index 93fd97ac2..b91266562 100644
--- a/extra/yelp/PKGBUILD
+++ b/extra/yelp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170857 2012-11-12 20:06:11Z heftig $
+# $Id: PKGBUILD 183469 2013-04-21 22:12:25Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=yelp
-pkgver=3.6.2
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="A help browser for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 install=yelp.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f83d10cb6dfbbaa7d3d5a9ff930edd4a0eef657de0e8aeeaaef0b187038681e1')
+sha256sums=('f4a02dad614bfc04b6a998440123633145f4011c3a1d35415492d2ff76c1707f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/yp-tools/PKGBUILD b/extra/yp-tools/PKGBUILD
index f9a1a377c..ca81d3f20 100644
--- a/extra/yp-tools/PKGBUILD
+++ b/extra/yp-tools/PKGBUILD
@@ -1,20 +1,22 @@
-# $Id: PKGBUILD 165833 2012-08-31 12:24:13Z tomegun $
+# $Id: PKGBUILD 184213 2013-05-03 22:54:47Z tomegun $
 # Mantainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=yp-tools
-pkgver=2.12
-pkgrel=4
+pkgver=2.14
+pkgrel=2
 pkgdesc='Linux NIS Tools'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.linux-nis.org/nis/yp-tools/'
 license=('GPL2')
 depends=('ypbind-mt')
-#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz")
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	'domainname.service')
+backup=('etc/nisdomainname')
+install=yp-tools.install
+source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+	'domainname.service'
+	'domainname.conf')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -25,7 +27,9 @@ build() {
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
+	install -D -m644 ../domainname.conf "${pkgdir}/etc/nisdomainname"
 	install -D -m644 ../domainname.service "${pkgdir}/usr/lib/systemd/system/domainname.service"
 }
-md5sums=('ce1e06d86caa285fa8cd76fdf103f51e'
-         '8d354b76eb0df9a3b06637bfff87453b')
+md5sums=('ba1f121c17e3ad65368be173b977cd13'
+         '5a78cd2218936241133e5f61383a2dc8'
+         '74298e047121f528a2a5c221afd783ab')
diff --git a/extra/yp-tools/domainname.conf b/extra/yp-tools/domainname.conf
new file mode 100644
index 000000000..d43d5f53e
--- /dev/null
+++ b/extra/yp-tools/domainname.conf
@@ -0,0 +1,4 @@
+#
+# NIS domain to be set by domainname.service
+#
+NISDOMAINNAME=""
diff --git a/extra/yp-tools/domainname.service b/extra/yp-tools/domainname.service
index 035f767c8..7a1705688 100644
--- a/extra/yp-tools/domainname.service
+++ b/extra/yp-tools/domainname.service
@@ -3,7 +3,7 @@ Description=NIS Domainname
 
 [Service]
 Type=oneshot
-EnvironmentFile=/etc/conf.d/nisdomainname
+EnvironmentFile=/etc/nisdomainname
 ExecStart=/usr/bin/nisdomainname $NISDOMAINNAME
 RemainAfterExit=true
 
diff --git a/extra/yp-tools/yp-tools.install b/extra/yp-tools/yp-tools.install
new file mode 100644
index 000000000..19e8ecaf4
--- /dev/null
+++ b/extra/yp-tools/yp-tools.install
@@ -0,0 +1,5 @@
+post_upgrade() {
+	if [ "$(vercmp 2.14-2 "$2")" -eq 1 ]; then
+		printf '===> Configure your NIS domain name in /etc/nisdomainname\n'
+	fi
+}
diff --git a/extra/ypbind-mt/PKGBUILD b/extra/ypbind-mt/PKGBUILD
index 3ec53a072..27fb1b8fe 100644
--- a/extra/ypbind-mt/PKGBUILD
+++ b/extra/ypbind-mt/PKGBUILD
@@ -1,24 +1,20 @@
-# $Id: PKGBUILD 162167 2012-06-22 13:00:20Z dreisner $
+# $Id: PKGBUILD 184214 2013-05-03 22:54:48Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ypbind-mt
-pkgver=1.33
-pkgrel=5
+pkgver=1.37.1
+pkgrel=4
 pkgdesc='Linux NIS daemon'
 url='http://www.linux-nis.org/nis/ypbind-mt/'
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('networkmanager')
-depends=('rpcbind' 'openslp' 'dbus-glib' 'yp-tools')
-backup=('etc/yp.conf' 'etc/conf.d/ypbind' 'etc/conf.d/nisdomainname')
-#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz"
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'nisdomainname.conf'
-        'ypbind.conf'
-        'ypbind'
+depends=('rpcbind' 'openslp' 'yp-tools')
+backup=('etc/yp.conf')
+source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
 	'ypbind.service')
 
 build() {
@@ -26,8 +22,7 @@ build() {
 
 	./configure \
 		--prefix=/usr \
-		--enable-dbus-nm \
-		--build=$CHOST \
+		--build=$CHOST
 
 	make
 }
@@ -38,14 +33,8 @@ package() {
 	make DESTDIR="${pkgdir}" install
 
 	install -D -m644 etc/yp.conf "${pkgdir}"/etc/yp.conf
-	install -D -m755 ../ypbind "${pkgdir}"/etc/rc.d/ypbind
-	install -D -m644 ../ypbind.conf "${pkgdir}"/etc/conf.d/ypbind
-	install -D -m644 ../nisdomainname.conf "${pkgdir}"/etc/conf.d/nisdomainname
 	install -D -m644 ../ypbind.service "${pkgdir}"/usr/lib/systemd/system/ypbind.service
 	install -d -m755 "${pkgdir}"/var/yp/binding
 }
-md5sums=('692f68ed0476762be4228ce543a5b791'
-         'e83a85291ea2ee152a78f2c16b0b1185'
-         '229309a989abad27703ac2e6d07dc7ae'
-         '1f7a4c80414d580c9afb3a08267beed0'
-         '88a721095e334cd442f4649a151ba9be')
+md5sums=('8af8d35e7b9a7fcc3a1576697a04bd82'
+         '9083debd16fc49c6645372caa25969b5')
diff --git a/extra/ypbind-mt/ypbind b/extra/ypbind-mt/ypbind
deleted file mode 100755
index 6a5ef11e3..000000000
--- a/extra/ypbind-mt/ypbind
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-. /etc/conf.d/ypbind
-. /etc/conf.d/nisdomainname
-
-name=ypbind
-PID=$(pidof -o %PPID /usr/sbin/ypbind)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -n $NISDOMAINNAME ]] && /usr/bin/domainname "$NISDOMAINNAME" &>/dev/null
-	[[ -z "$PID" ]] && /usr/sbin/ypbind $YPBIND_ARGS &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart}"
-	exit 1
-	;;
-esac
diff --git a/extra/ypbind-mt/ypbind.conf b/extra/ypbind-mt/ypbind.conf
deleted file mode 100644
index fd0ebd491..000000000
--- a/extra/ypbind-mt/ypbind.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to ypbind
-#
-YPBIND_ARGS=""
diff --git a/extra/ypbind-mt/ypbind.service b/extra/ypbind-mt/ypbind.service
index c59231000..08e4fe14e 100644
--- a/extra/ypbind-mt/ypbind.service
+++ b/extra/ypbind-mt/ypbind.service
@@ -8,6 +8,9 @@ Before=systemd-user-sessions.service
 Type=forking
 PIDFile=/run/ypbind.pid
 ExecStart=/usr/sbin/ypbind
+# Terrible hack, upstream ypbind should sort something out
+# Wait for at most 10 seconds for a NIS master to become available
+ExecStartPost=/bin/sh -c "for i in 1 2 3 4 5 6 7 8 9 10; do ypwhich && break; sleep 1; done"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/ypserv/PKGBUILD b/extra/ypserv/PKGBUILD
index c2bcda8c6..3e20855a7 100644
--- a/extra/ypserv/PKGBUILD
+++ b/extra/ypserv/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 168108 2012-10-06 00:49:54Z dreisner $
+# $Id: PKGBUILD 184215 2013-05-03 22:54:49Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ypserv
-pkgver=2.28
-pkgrel=2
+pkgver=2.31
+pkgrel=1
 pkgdesc='Linux NIS Server'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.linux-nis.org/nis/ypserv/'
@@ -15,16 +15,12 @@ depends=('gdbm' 'openslp' 'inetutils' 'yp-tools')
 optdepends=('gawk: for printcap support')
 backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets')
 source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	'confpost.patch'
         'ypxfrd.service'
         'yppasswdd.service'
-	'ypserv.service'
-        'yppasswd'
-        'ypserv')
+	'ypserv.service')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../confpost.patch
 	./configure --prefix=/usr
 	make
 }
@@ -36,19 +32,11 @@ package() {
 	install -D -m644 etc/netgroup "${pkgdir}"/etc/netgroup
 	install -D -m644 etc/ypserv.conf "${pkgdir}"/etc/ypserv.conf
 	install -D -m644 etc/securenets "${pkgdir}"/var/yp/securenets
-	install -D -m755 ../ypserv "${pkgdir}"/etc/rc.d/ypserv
-	install -D -m755 ../yppasswd "${pkgdir}"/etc/rc.d/yppasswd
 	install -D -m644 ../ypxfrd.service "${pkgdir}"/usr/lib/systemd/system/ypxfrd.service
 	install -D -m644 ../ypserv.service "${pkgdir}"/usr/lib/systemd/system/ypserv.service
 	install -D -m644 ../yppasswdd.service "${pkgdir}"/usr/lib/systemd/system/yppasswdd.service
-
-	# Provide native service for arch-daemons generator
-	ln -s yppasswdd.service "$pkgdir/usr/lib/systemd/system/yppasswd.service"
 }
-md5sums=('ed64f489bab494218fc5c5942b95d5b6'
-         '8acb314f30d6e531ac9efa8655f68ccb'
+md5sums=('4537b8f0e917edca8f57b70b9cbc37f3'
          'c80e253756446d59a90c4c21b1cb8740'
          '7cba3dd3544436c3c1f05e36c0018e92'
-         '3398271c3e0a054e64b06b99aa2dc63d'
-         '4bc84c48ed1bb9659698853acb5cfd76'
-         'c40befe5932f1b42efaced6b46809303')
+         '3398271c3e0a054e64b06b99aa2dc63d')
diff --git a/extra/ypserv/confpost.patch b/extra/ypserv/confpost.patch
deleted file mode 100644
index 489e4368a..000000000
--- a/extra/ypserv/confpost.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up ypserv-2.27/conf_post.h.qdbm ypserv-2.27/conf_post.h
---- ypserv-2.27/conf_post.h.qdbm	2012-02-01 14:18:01.780846425 +0100
-+++ ypserv-2.27/conf_post.h	2012-02-01 14:18:01.780846425 +0100
-@@ -0,0 +1,10 @@
-+/* Define common preprocessor symbol for HAVE_LIBGDBM and HAVE_LIBQDBM, since
-+ * libraries gdbm and qdbm have same symbol names. */
-+#undef HAVE_COMPAT_LIBGDBM
-+#ifdef HAVE_LIBGDBM
-+#define HAVE_COMPAT_LIBGDBM
-+#endif
-+#ifdef HAVE_LIBQDBM
-+#define HAVE_COMPAT_LIBGDBM
-+#endif
-+
diff --git a/extra/ypserv/yppasswd b/extra/ypserv/yppasswd
deleted file mode 100755
index c2b00b2ca..000000000
--- a/extra/ypserv/yppasswd
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting NIS Password Daemon"
-    /usr/sbin/rpc.yppasswdd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon yppasswd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping NIS Password Daemon"
-    killall -q /usr/sbin/rpc.yppasswdd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon yppasswd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/extra/ypserv/ypserv b/extra/ypserv/ypserv
deleted file mode 100755
index c36e6901b..000000000
--- a/extra/ypserv/ypserv
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting NIS Server"
-    /usr/sbin/ypserv
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ypserv
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping NIS Server"
-    killall -q /usr/sbin/ypserv
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ypserv
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/extra/zeitgeist/PKGBUILD b/extra/zeitgeist/PKGBUILD
index a852b9ff0..0fa260fa5 100644
--- a/extra/zeitgeist/PKGBUILD
+++ b/extra/zeitgeist/PKGBUILD
@@ -1,36 +1,46 @@
-# $Id: PKGBUILD 169475 2012-10-21 21:14:01Z eric $
-# Maintainer:
+# $Id: PKGBUILD 183481 2013-04-21 22:21:01Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=zeitgeist
-pkgver=0.9.5
+pkgver=0.9.12
 pkgrel=1
-pkgdesc="A service which logs the users's activities and events and makes relevant information available to other applications"
-arch=('i686' 'x86_64' 'mips64el')
+pkgdesc="Service logging user activities and events"
+arch=(i686 x86_64 mips64el)
 url="http://zeitgeist-project.com/"
-license=('GPL')
-depends=('python2-dbus' 'python2-gobject2' 'python2-xdg' 'xapian-core')
-makedepends=('intltool' 'raptor' 'python2-rdflib')
-checkdepends=('vala')
-source=("https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.bz2")
-md5sums=('5841e4624b07ba74866fb177f1c9aae7')
+license=(GPL2 LGPL2.1)
+depends=(sqlite json-glib telepathy-glib gtk3)
+makedepends=(intltool gobject-introspection vala raptor python2-rdflib)
+provides=(zeitgeist-datahub)
+conflicts=(zeitgeist-datahub)
+replaces=(zeitgeist-datahub)
+options=('!libtool')
+source=("https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz")
+sha256sums=('f9b1b656dcd4da57438289316d44f8960ce0ee4773ea2fbab4bce165330f41cd')
+
+prepare() {
+  cd $pkgname-$pkgver
+  sed -i 's/python -/$PYTHON -/' configure configure.ac
+}
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's/python -/$PYTHON -/' configure
-  PYTHON=/usr/bin/python2 LIBS+="-lgmodule-2.0" ./configure --prefix=/usr \
-    --sysconfdir=/etc --libexecdir=/usr/lib/zeitgeist --localstatedir=/var
+  cd $pkgname-$pkgver
+  export PYTHON=/usr/bin/python2
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname
   make
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -j1 check
+  cd $pkgname-$pkgver
+  # Log test fails in chroot, as we have no X and no proper dbus
+  make -k check || :
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" zeitgeistdocdir=/usr/share/doc/zeitgeist install
-  install -D -m644 data/zeitgeist-daemon.bash_completion "$pkgdir/usr/share/bash-completion/completions/zeitgeist-daemon"
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install #zeitgeistdocdir=/usr/share/doc/zeitgeist install
+  #install -D -m644 data/zeitgeist-daemon.bash_completion "$pkgdir/usr/share/bash-completion/completions/zeitgeist-daemon"
 }
diff --git a/extra/zenity/PKGBUILD b/extra/zenity/PKGBUILD
index c9d4dd09b..15ac03b05 100644
--- a/extra/zenity/PKGBUILD
+++ b/extra/zenity/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169963 2012-10-30 22:58:54Z heftig $
+# $Id: PKGBUILD 183472 2013-04-21 22:12:29Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=zenity
-pkgver=3.6.0
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="Display graphical dialog boxes from shell scripts"
 arch=(i686 x86_64 'mips64el')
@@ -11,7 +11,7 @@ depends=('gtk3' 'libnotify')
 makedepends=('intltool' 'gtk-doc' 'itstool' 'docbook-xsl')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('5de4ebbb6888ad4928fa9eebcd42dbe5bb282bee9dd7dd21475d9eaa854c74be')
+sha256sums=('94fbf0b71592f26dce0e2c49b82b4401139c8434084ad24c2c6a61ace1e6563f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/zile/PKGBUILD b/extra/zile/PKGBUILD
deleted file mode 100644
index 0fc8f4c15..000000000
--- a/extra/zile/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 167747 2012-10-03 14:08:02Z eric $
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-
-pkgname=zile
-pkgver=2.4.9
-pkgrel=1
-pkgdesc="A small, fast, and powerful Emacs clone"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gnu.org/software/zile/"
-license=('GPL3')
-depends=('acl' 'gc' 'ncurses')
-source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
-sha1sums=('f233487e2d0ce99d7670832d106d1a2503d4c925'
-          'cfc6f526bd4f14e127b32f91ae3e414e58d722c3')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index 571be36c4..ca388b4aa 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=zsh
 pkgver=5.0.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.zsh.org/'
diff --git a/extra/zvbi/PKGBUILD b/extra/zvbi/PKGBUILD
index 237e02821..e21ddf8d5 100644
--- a/extra/zvbi/PKGBUILD
+++ b/extra/zvbi/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=zvbi
 pkgver=0.2.33
-pkgrel=4.1
+pkgrel=4.2
 pkgdesc="VBI capture and decoding library"
 url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome"
 arch=('i686' 'x86_64' 'mips64el')