Tue Feb 4 03:33:07 UTC 2014

18 files changed, 401 insertions, 228 deletions

diff --git a/extra/efl/PKGBUILD b/extra/efl/PKGBUILD
index 0d637ad4f..ad4ba444d 100644
--- a/extra/efl/PKGBUILD
+++ b/extra/efl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 204914 2014-01-31 11:05:39Z ronald $
+# $Id: PKGBUILD 205022 2014-02-03 10:02:52Z heftig $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Enlightenment Developers <enlightenment-devel@enlightenment.org>
 
 pkgbase=efl
 pkgname=('efl' 'efl-docs')
 pkgver=1.8.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Enlightenment Foundation Libraries"
 arch=('i686' 'x86_64')
 url="http://www.enlightenment.org"
diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD
index 5dd71a169..8d07f616b 100644
--- a/extra/gssdp/PKGBUILD
+++ b/extra/gssdp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198636 2013-10-31 15:44:36Z heftig $
+# $Id: PKGBUILD 205055 2014-02-03 21:25:19Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gssdp
-pkgver=0.14.6
+pkgver=0.14.7
 pkgrel=1
 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ depends=(libsoup)
 makedepends=(gobject-introspection gtk3 gtk-doc vala)
 optdepends=('gtk3: gssdp-device-sniffer')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('9acfdeb99080b165c34ea7c65fb909ea356b4550937972a73df5b69b419eeacd')
+sha256sums=('02db81cb90a86c08579fc06f55584aea6b30dc6dcc7a5b5a4864a0ecb2f3d8b5')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD
index bb4442bc7..8e287bede 100644
--- a/extra/gthumb/PKGBUILD
+++ b/extra/gthumb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 204756 2014-01-26 12:16:01Z andyrtr $
+# $Id: PKGBUILD 205024 2014-02-03 10:02:54Z 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.2.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Image browser and viewer for the GNOME Desktop"
 arch=(i686 x86_64)
 license=(GPL)
diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD
index f267dae55..9b1a687e2 100644
--- a/extra/gupnp-av/PKGBUILD
+++ b/extra/gupnp-av/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 199920 2013-11-19 00:13:08Z heftig $
+# $Id: PKGBUILD 205057 2014-02-03 21:26:34Z 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.12.4
+pkgver=0.12.5
 pkgrel=1
 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ license=(LGPL)
 depends=(gupnp)
 makedepends=(gobject-introspection gtk-doc vala)
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('548a9cef8ab3007734e20a4ce284c422ae299b7e024a4824299f6ae7e3dd7a5b')
+sha256sums=('8375034ccc4a45e90923c26135517aab57a88f5757ce65a1b23378df4c60bff6')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD
index 4f5665441..4672d7c4a 100644
--- a/extra/gupnp/PKGBUILD
+++ b/extra/gupnp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 201545 2013-12-14 15:50:45Z heftig $
+# $Id: PKGBUILD 205056 2014-02-03 21:25:57Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gupnp
-pkgver=0.20.9
+pkgver=0.20.10
 pkgrel=1
 pkgdesc="An object-oriented UPNP framework"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ depends=(gssdp util-linux)
 makedepends=(gobject-introspection gtk-doc vala) 
 optdepends=('python2: gupnp-binding-tool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('61650a3be46979973b82c79eab5c3baf16a4ad3a051d8a710e5d1c376cf32c6e')
+sha256sums=('5c7f9278b50ed252606552e2f148be4e1b1616bc93ebc8b09b22fcf5d8aa08e4')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index f1f9a8a47..f7ea2e412 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 204904 2014-01-30 22:09:43Z eric $
+# $Id: PKGBUILD 205025 2014-02-03 10:02:55Z heftig $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
 pkgver=6.8.8.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
 license=('custom')
diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD
index 04b0e1c52..64efd9b1d 100644
--- a/extra/libwebp/PKGBUILD
+++ b/extra/libwebp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198264 2013-10-30 13:48:46Z allan $
+# $Id: PKGBUILD 205027 2014-02-03 10:02:57Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jon Nordby <jononor@gmail.com>
 
 pkgname=libwebp
-pkgver=0.3.1
-pkgrel=3
+pkgver=0.4.0
+pkgrel=1
 pkgdesc="WebP library and conversion tools"
 arch=(x86_64 i686)
 url="https://developers.google.com/speed/webp/"
@@ -14,7 +14,7 @@ depends=(libpng libjpeg libtiff giflib)
 makedepends=(freeglut mesa glu)
 optdepends=('freeglut: vwebp viewer')
 source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha256sums=('b37932c625322a69fe4e9b88884b5c7aed2b3eaf9fd5e5b480aee339a92e6ee7')
+sha256sums=('31913577e96386556855b41d210736449445fe96cfbe9289014e9b8afa944d69')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/mono-debugger/PKGBUILD b/extra/mono-debugger/PKGBUILD
index 21946154d..7e41d830f 100644
--- a/extra/mono-debugger/PKGBUILD
+++ b/extra/mono-debugger/PKGBUILD
@@ -2,27 +2,31 @@
 
 pkgname=mono-debugger
 pkgver=2.10
-pkgrel=2
+pkgrel=3
 pkgdesc="The Mono Debugger"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.mono-project.com/"
 depends=('mono>=2.10.1')
-makedepends=('pkgconfig')
-source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+options=('!makeflags')
+source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('02ee485f2aae279f2fa3a7051c7d580e')
 
-build() {
+prepare() {
   # get rid of that .wapi errors; thanks to brice
   export MONO_SHARED_DIR=${srcdir}/weird
   mkdir -p "${MONO_SHARED_DIR}"
-  # build mono debugger
-  cd ${srcdir}/${pkgname}-${pkgver}
+  
+  rm -rf build/*.dll
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
-  make || return 1
+  make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index 3c3f89092..d32728fc7 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204922 2014-01-31 12:35:17Z foutrelis $
+# $Id: PKGBUILD 205035 2014-02-03 14:10:17Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,25 +6,20 @@
 # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
 
 pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.8
-pkgrel=2
+pkgver=2.10.9
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://pidgin.im/"
 license=('GPL')
 makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
              'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi'
              'tk' 'ca-certificates' 'intltool' 'networkmanager')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2{,.asc}
-        pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch)
-sha256sums=('b633367e3588ff3e615d68e812302dfdbe32e73693cbe42a0d827b7aed7a8227'
-            'SKIP'
-            '4b4cc2d0816bbc7de83d34de6880935163007193a36dcc13afc89fc1ffacc5d2')
+source=(https://downloads.sourceforge.net/project/$pkgname/Pidgin/$pkgver/$pkgname-$pkgver.tar.bz2{,.asc})
+sha256sums=('dc362ed8577f623eea4554a79e917073aa726825074fea402f2e515f0f51f319'
+            'SKIP')
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # https://developer.pidgin.im/ticket/15879
-  patch -Np1 -i "$srcdir/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch"
-
   # 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.8-fix-login-issues-with-certain-xmpp-servers.patch b/extra/pidgin/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch
deleted file mode 100644
index 32f28aa25..000000000
--- a/extra/pidgin/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-
-# HG changeset patch
-# User Mark Doliner <mark@kingant.net>
-# Date 1391153359 28800
-# Node ID b8e2a5fbffd3052ccba7160b56eac70f8e19c49a
-# Parent  e733020a9d3840275ffa931a9aeefe4d8befc08e
-Fix problems logging into some servers including jabber.org and
-chat.facebook.com.
-
-See my length comment in iq.c for details.
-
-diff --git a/libpurple/protocols/jabber/iq.c b/libpurple/protocols/jabber/iq.c
---- a/libpurple/protocols/jabber/iq.c
-+++ b/libpurple/protocols/jabber/iq.c
-@@ -283,6 +283,52 @@
- 	g_hash_table_remove(js->iq_callbacks, id);
- }
- 
-+/**
-+ * Verify that the 'from' attribute of an IQ reply is a valid match for
-+ * a given IQ request. The expected behavior is outlined in section
-+ * 8.1.2.1 of the XMPP CORE spec (RFC 6120). We consider the reply to
-+ * be a valid match if any of the following is true:
-+ * - Request 'to' matches reply 'from' (including the case where
-+ *   neither are set).
-+ * - Request 'to' was empty and reply 'from' is server JID.
-+ * - Request 'to' was empty and reply 'from' is my JID. The spec says
-+ *   we should only allow bare JID, but we also allow full JID for
-+ *   compatibility with some servers.
-+ *
-+ * These rules should allow valid IQ replies while preventing spoofed
-+ * ones.
-+ *
-+ * For more discussion see the "Spoofing of iq ids and misbehaving
-+ * servers" email thread from January 2014 on the jdev and security
-+ * mailing lists.
-+ *
-+ * @return TRUE if this reply is valid for the given request.
-+ */
-+static gboolean does_reply_from_match_request_to(JabberStream *js, JabberID *to, JabberID *from)
-+{
-+	if (jabber_id_equal(to, from)) {
-+		/* Request 'to' matches reply 'from' */
-+		return TRUE;
-+	}
-+
-+	if (!to && purple_strequal(from->domain, js->user->domain)) {
-+		/* Request 'to' is empty and reply 'from' domain matches our domain */
-+
-+		if (!from->node && !from->resource) {
-+			/* Reply 'from' is server bare JID */
-+			return TRUE;
-+		}
-+
-+		if (purple_strequal(from->node, js->user->node)
-+				&& (!from->resource || purple_strequal(from->resource, js->user->resource))) {
-+			/* Reply 'from' is my full or bare JID */
-+			return TRUE;
-+		}
-+	}
-+
-+	return FALSE;
-+}
-+
- void jabber_iq_parse(JabberStream *js, xmlnode *packet)
- {
- 	JabberIqCallbackData *jcd;
-@@ -377,8 +423,9 @@
- 
- 	/* First, lets see if a special callback got registered */
- 	if(type == JABBER_IQ_RESULT || type == JABBER_IQ_ERROR) {
--		if((jcd = g_hash_table_lookup(js->iq_callbacks, id))) {
--			if(jabber_id_equal(js, jcd->to, from_id)) {
-+		jcd = g_hash_table_lookup(js->iq_callbacks, id);
-+		if (jcd) {
-+			if (does_reply_from_match_request_to(js, jcd->to, from_id)) {
- 				jcd->callback(js, from, type, id, packet, jcd->data);
- 				jabber_iq_remove_callback_by_id(js, id);
- 				jabber_id_free(from_id);
-diff --git a/libpurple/protocols/jabber/jutil.c b/libpurple/protocols/jabber/jutil.c
---- a/libpurple/protocols/jabber/jutil.c
-+++ b/libpurple/protocols/jabber/jutil.c
-@@ -510,30 +510,21 @@
- 
- 
- gboolean
--jabber_id_equal(JabberStream *js, const JabberID *jid1, const JabberID *jid2)
-+jabber_id_equal(const JabberID *jid1, const JabberID *jid2)
- {
--	const JabberID *j1, *j2;
--	JabberID *bare_user_jid;
--	gboolean equal;
-+	if (!jid1 && !jid2) {
-+		/* Both are null therefore equal */
-+		return TRUE;
-+	}
- 
--	/* If an outgoing stanza has no 'to', or an incoming has no 'from',
--	 * then those are "the server acting as my account". This function will
--	 * handle that correctly.
--	 */
--	if (!jid1 && !jid2)
--		return TRUE;
-+	if (!jid1 || !jid2) {
-+		/* One is null, other is non-null, therefore not equal */
-+		return FALSE;
-+	}
- 
--	bare_user_jid = jabber_id_to_bare_jid(js->user);
--	j1 = jid1 ? jid1 : bare_user_jid;
--	j2 = jid2 ? jid2 : bare_user_jid;
--
--	equal = purple_strequal(j1->node, j2->node) &&
--			purple_strequal(j1->domain, j2->domain) &&
--			purple_strequal(j1->resource, j2->resource);
--
--	jabber_id_free(bare_user_jid);
--
--	return equal;
-+	return purple_strequal(jid1->node, jid2->node) &&
-+			purple_strequal(jid1->domain, jid2->domain) &&
-+			purple_strequal(jid1->resource, jid2->resource);
- }
- 
- char *jabber_get_domain(const char *in)
-diff --git a/libpurple/protocols/jabber/jutil.h b/libpurple/protocols/jabber/jutil.h
---- a/libpurple/protocols/jabber/jutil.h
-+++ b/libpurple/protocols/jabber/jutil.h
-@@ -46,12 +46,10 @@
- JabberID* jabber_id_new(const char *str);
- 
- /**
-- * Compare two JIDs for equality.
-- *
-- * Warning: If either JID is NULL then this function uses the user's
-- * bare JID, instead!
-+ * Compare two JIDs for equality. In addition to the node and domain,
-+ * the resources of the two JIDs must also be equal (or both absent).
-  */
--gboolean jabber_id_equal(JabberStream *js, const JabberID *jid1, const JabberID *jid2);
-+gboolean jabber_id_equal(const JabberID *jid1, const JabberID *jid2);
- 
- void jabber_id_free(JabberID *jid);
- 
-
diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD
index a51814c95..e609ff018 100644
--- a/extra/racket/PKGBUILD
+++ b/extra/racket/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 204725 2014-01-26 04:25:23Z eric $
+# $Id: PKGBUILD 205059 2014-02-03 21:57:41Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=racket
-pkgver=5.92
+pkgver=5.93
 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')
@@ -13,21 +13,21 @@ makedepends=('gsfonts' 'sqlite')
 options=('!strip' '!emptydirs')
 install=racket.install
 source=(http://download.racket-lang.org/installers/${pkgver}/${pkgname}-${pkgver}-src-builtpkgs.tgz)
-sha1sums=('cd0aecc252a56bf1809738aa1af426d428b78e8e')
+sha1sums=('94b7e2708b6eff2083e3e9c6a3ac338011958e13')
 
 prepare() {
-  echo "Icon=drracket" >> ${pkgname}/share/pkgs/drracket/drracket/drracket.desktop
+  echo "Icon=drracket" >> ${pkgname}-${pkgver}/share/pkgs/drracket/drracket/drracket.desktop
 }
 
 build() {
-  cd ${pkgname}/src
+  cd ${pkgname}-${pkgver}/src
   [ "$CARCH" == "x86_64" ] && export CFLAGS+=" -fPIC"
   ./configure --prefix=/usr --sysconfdir=/etc --enable-shared
   make
 }
 
 package() {
-  cd ${pkgname}/src
+  cd ${pkgname}-${pkgver}/src
   make DESTDIR="${pkgdir}" install
   install -D -m644 COPYING-libscheme.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
diff --git a/extra/sg3_utils/PKGBUILD b/extra/sg3_utils/PKGBUILD
index 35ac783df..b57efbda4 100644
--- a/extra/sg3_utils/PKGBUILD
+++ b/extra/sg3_utils/PKGBUILD
@@ -1,16 +1,16 @@
-#$Id: PKGBUILD 197372 2013-10-25 03:01:52Z allan $
+#$Id: PKGBUILD 205030 2014-02-03 10:47:54Z bpiotrowski $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=sg3_utils
-pkgver=1.36
-pkgrel=2
+pkgver=1.37
+pkgrel=1
 pkgdesc="Generic SCSI utilities"
 arch=(i686 x86_64)
 url="http://sg.danny.cz/sg/sg3_utils.html"
 license=('GPL' 'custom:BSD')
 depends=('glibc')
 source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tar.xz)
-md5sums=('5d1846c8aa03a2e39e1368cf05bf1cfd')
+md5sums=('ade022cf1ece91e94865e2c68d369c79')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD
index 461730a8f..61597344f 100644
--- a/extra/texmacs/PKGBUILD
+++ b/extra/texmacs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 188082 2013-06-08 11:18:26Z bpiotrowski $
+# $Id: PKGBUILD 205031 2014-02-03 10:47:55Z bpiotrowski $
 # 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.19
-pkgrel=2
+pkgver=1.0.7.21
+pkgrel=1
 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')
 url="http://www.texmacs.org/"
@@ -14,11 +14,12 @@ depends=('perl' 'guile1.8' 'texlive-core' 'python2' 'libxext' 'freetype2' 'share
 # do not remove texlive-core dependency, as it is needed!
 optdepends=('transfig: convert images using fig2ps'
             'gawk: conversion of some files')
+makedepends=('ghostscript')
 #source=(ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-${pkgver}-src.tar.gz)
 source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${pkgver}-src.tar.gz)
 install=texmacs.install
 options=('!emptydirs')
-sha1sums=('855b8252f561b69deb45a3b80f4531a9055ea465')
+sha1sums=('e8086acd4b7c1bb3aaccf75b6b0199aa612cb66c')
 
 build() {
   cd ${srcdir}/TeXmacs-${pkgver}-src
@@ -35,7 +36,7 @@ build() {
   sed -i '/update-mime-database/d' Makefile.in
   sed -i '/gtk-update-icon-cache/d' Makefile.in
   sed -i '\/icons\/gnome 2>\/dev\/null/d' Makefile.in
-  
+
   export QMAKE=qmake-qt4
   export MOC=moc-qt4
   export UIC=uic-qt4
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
index f90306e98..93e829688 100644
--- a/extra/webkitgtk/PKGBUILD
+++ b/extra/webkitgtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 204518 2014-01-22 00:26:03Z heftig $
+# $Id: PKGBUILD 205028 2014-02-03 10:02:58Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=webkitgtk
 pkgver=2.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK+ Web content engine library"
 arch=(i686 x86_64)
 url="http://webkitgtk.org/"
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index efc847fdb..440c3c493 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 204961 2014-02-01 20:25:59Z andyrtr $
+# $Id: PKGBUILD 205021 2014-02-03 09:57:43Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
 pkgver=2.99.909
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -23,8 +23,15 @@ provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
 conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16'
            'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('7541187161ee379f07591e1d2655f51e2d9772d98b34e8f21d7159d28ce70f55')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        git_fixes.diff)
+sha256sums=('7541187161ee379f07591e1d2655f51e2d9772d98b34e8f21d7159d28ce70f55'
+            '9d8387d69dca613f526b417241be0d2e529a3751cd39e8c2d4b7c00a2e7cdcea')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git_fixes.diff
+}
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/xf86-video-intel/git_fixes.diff b/extra/xf86-video-intel/git_fixes.diff
new file mode 100644
index 000000000..dfc33928f
--- /dev/null
+++ b/extra/xf86-video-intel/git_fixes.diff
@@ -0,0 +1,327 @@
+From 699b4fd3139d1d6d02911d6c8f193ead3445f613 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat, 01 Feb 2014 20:13:53 +0000
+Subject: sna: Undo region translation before returning
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index aecae51..d654660 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -2433,6 +2433,9 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
+ 					sna_damage_add(&priv->cpu_damage, region);
+ 					discard_gpu = false;
+ 				}
++
++				if (dx | dy)
++					RegionTranslate(region, -dx, -dy);
+ 			} else
+ 				sna_pixmap_free_cpu(sna, priv, false);
+ 		}
+--
+cgit v0.9.0.2-2-gbebe
+From 26613b046012f0ad968a15ab6bdfa8f6a6652e77 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat, 01 Feb 2014 21:37:41 +0000
+Subject: sna: Allow more inplace promotions of CPU to GPU bo
+
+If the CPU bo is wholly damaged, then it makes an ideal candidate for
+simply converting into the GPU bo.
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/kgem.c b/src/sna/kgem.c
+index f7404df..788b710 100644
+--- a/src/sna/kgem.c
++++ b/src/sna/kgem.c
+@@ -6743,14 +6743,19 @@ kgem_replace_bo(struct kgem *kgem,
+ 	return dst;
+ }
+ 
+-bool kgem_bo_convert_to_gpu(struct kgem *kgem, struct kgem_bo *bo)
++bool kgem_bo_convert_to_gpu(struct kgem *kgem,
++			    struct kgem_bo *bo,
++			    unsigned flags)
+ {
+-	DBG(("%s: converting handle=%d from CPU to GPU\n", __FUNCTION__, bo->handle));
++	DBG(("%s: converting handle=%d from CPU to GPU, flags=%x\n", __FUNCTION__, bo->handle));
+ 	assert(bo->tiling == I915_TILING_NONE);
+ 
+ 	if (kgem->has_llc)
+ 		return true;
+ 
++	if (flags & MOVE_ASYNC_HINT && __kgem_bo_is_busy(kgem, bo))
++		return false;
++
+ 	assert(bo->snoop);
+ 
+ 	kgem_bo_submit(kgem, bo);
+diff --git a/src/sna/kgem.h b/src/sna/kgem.h
+index f670b60..4c4996f 100644
+--- a/src/sna/kgem.h
++++ b/src/sna/kgem.h
+@@ -301,7 +301,9 @@ struct kgem_bo *kgem_create_cpu_2d(struct kgem *kgem,
+ 				   int bpp,
+ 				   uint32_t flags);
+ 
+-bool kgem_bo_convert_to_gpu(struct kgem *kgem, struct kgem_bo *bo);
++bool kgem_bo_convert_to_gpu(struct kgem *kgem,
++			    struct kgem_bo *bo,
++			    unsigned flags);
+ 
+ uint32_t kgem_bo_get_binding(struct kgem_bo *bo, uint32_t format);
+ void kgem_bo_set_binding(struct kgem_bo *bo, uint32_t format, uint16_t offset);
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index d654660..9d7dec4 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -3868,7 +3868,7 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
+ 
+ 			if (tiling == I915_TILING_NONE &&
+ 			    priv->cpu_bo && !priv->shm &&
+-			    kgem_bo_convert_to_gpu(&sna->kgem, priv->cpu_bo)) {
++			    kgem_bo_convert_to_gpu(&sna->kgem, priv->cpu_bo, flags)) {
+ 				assert(!priv->mapped);
+ 				assert(!IS_STATIC_PTR(priv->ptr));
+ #ifdef DEBUG_MEMORY
+@@ -3933,6 +3933,28 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
+ 	if (priv->cpu_damage == NULL)
+ 		goto done;
+ 
++	if (DAMAGE_IS_ALL(priv->cpu_damage) &&
++	    priv->gpu_bo->tiling == I915_TILING_NONE &&
++	    priv->cpu_bo && !priv->shm &&
++	    kgem_bo_convert_to_gpu(&sna->kgem, priv->cpu_bo, flags)) {
++		assert(!priv->mapped);
++		assert(!IS_STATIC_PTR(priv->ptr));
++#ifdef DEBUG_MEMORY
++		sna->debug_memory.cpu_bo_allocs--;
++		sna->debug_memory.cpu_bo_bytes -= kgem_bo_size(priv->cpu_bo);
++#endif
++		sna_pixmap_free_gpu(sna, priv);
++		priv->gpu_bo = priv->cpu_bo;
++		priv->cpu_bo = NULL;
++		priv->ptr = NULL;
++		pixmap->devPrivate.ptr = NULL;
++		sna_damage_all(&priv->gpu_damage,
++			       pixmap->drawable.width,
++			       pixmap->drawable.height);
++		sna_damage_destroy(&priv->cpu_damage);
++		goto done;
++	}
++
+ 	if (priv->shm) {
+ 		assert(!priv->flush);
+ 		sna_add_flush_pixmap(sna, priv, priv->cpu_bo);
+--
+cgit v0.9.0.2-2-gbebe
+From ed8d4f0ce3bff662d02063528df64d478ac0dc00 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat, 01 Feb 2014 21:38:47 +0000
+Subject: sna: Skip discarding CPU bo when using as a render target
+
+The issue with unwanted serialisation does not affect the async
+move-to-cpu of a render target.
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index 9d7dec4..4221a55 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -2420,19 +2420,45 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
+ 
+ 		sna_damage_destroy(&priv->gpu_damage);
+ 
+-		if ((flags & MOVE_READ) == 0 &&
++		if ((flags & (MOVE_READ | MOVE_ASYNC_HINT)) == 0 &&
+ 		    priv->cpu_bo && !priv->cpu_bo->flush &&
+ 		    __kgem_bo_is_busy(&sna->kgem, priv->cpu_bo)) {
++			DBG(("%s: active CPU bo replacing\n", __FUNCTION__));
++			assert(!priv->shm);
++			assert(!IS_STATIC_PTR(priv->ptr));
++
+ 			if (!region_subsumes_pixmap(region, pixmap)) {
++				DBG(("%s: partial replacement\n", __FUNCTION__));
+ 				if (get_drawable_deltas(drawable, pixmap, &dx, &dy))
+ 					RegionTranslate(region, dx, dy);
+ 
+-				sna_damage_subtract(&priv->cpu_damage, region);
+-				if (sna_pixmap_move_to_gpu(pixmap, MOVE_READ | MOVE_ASYNC_HINT)) {
+-					sna_pixmap_free_cpu(sna, priv, false);
+-					sna_damage_add(&priv->cpu_damage, region);
+-					discard_gpu = false;
++				if (sna->kgem.has_llc &&
++				    sna_pixmap_choose_tiling(pixmap,
++							     DEFAULT_TILING) == I915_TILING_NONE) {
++#ifdef DEBUG_MEMORY
++					sna->debug_memory.cpu_bo_allocs--;
++					sna->debug_memory.cpu_bo_bytes -= kgem_bo_size(priv->cpu_bo);
++#endif
++					DBG(("%s: promoting CPU bo to GPU bo\n", __FUNCTION__));
++					sna_pixmap_free_gpu(sna, priv);
++					priv->gpu_bo = priv->cpu_bo;
++					priv->cpu_bo = NULL;
++					priv->ptr = NULL;
++					pixmap->devPrivate.ptr = NULL;
++
++					sna_damage_destroy(&priv->cpu_damage);
++				} else {
++					DBG(("%s: pushing surrounding damage to GPU bo\n", __FUNCTION__));
++					sna_damage_subtract(&priv->cpu_damage, region);
++					assert(priv->cpu_damage);
++					if (sna_pixmap_move_to_gpu(pixmap, MOVE_READ | MOVE_ASYNC_HINT)) {
++						sna_pixmap_free_cpu(sna, priv, false);
++						if (priv->flush)
++							sna_add_flush_pixmap(sna, priv, priv->gpu_bo);
++						discard_gpu = false;
++					}
+ 				}
++				sna_damage_add(&priv->cpu_damage, region);
+ 
+ 				if (dx | dy)
+ 					RegionTranslate(region, -dx, -dy);
+--
+cgit v0.9.0.2-2-gbebe
+From 8b0748c57ee4c38ea98c4b6ca18cb2b99f8f9ed4 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat, 01 Feb 2014 21:54:43 +0000
+Subject: sna: Add some more DBG for choosing render targets
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
+index 08c9f78..aadc6f7 100644
+--- a/src/sna/gen6_render.c
++++ b/src/sna/gen6_render.c
+@@ -1831,6 +1831,8 @@ gen6_composite_set_target(struct sna *sna,
+ 	BoxRec box;
+ 	unsigned int hint;
+ 
++	DBG(("%s: (%d, %d)x(%d, %d), partial?=%d\n", __FUNCTION__, x, y, w, h));
++
+ 	op->dst.pixmap = get_drawable_pixmap(dst->pDrawable);
+ 	op->dst.format = dst->format;
+ 	op->dst.width = op->dst.pixmap->drawable.width;
+diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
+index 1574813..a90bd15 100644
+--- a/src/sna/gen7_render.c
++++ b/src/sna/gen7_render.c
+@@ -2111,6 +2111,8 @@ gen7_composite_set_target(struct sna *sna,
+ 	BoxRec box;
+ 	unsigned int hint;
+ 
++	DBG(("%s: (%d, %d)x(%d, %d), partial?=%d\n", __FUNCTION__, x, y, w, h));
++
+ 	op->dst.pixmap = get_drawable_pixmap(dst->pDrawable);
+ 	op->dst.format = dst->format;
+ 	op->dst.width  = op->dst.pixmap->drawable.width;
+diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c
+index 5c718bc..c096db1 100644
+--- a/src/sna/gen8_render.c
++++ b/src/sna/gen8_render.c
+@@ -1862,6 +1862,8 @@ gen8_composite_set_target(struct sna *sna,
+ 	BoxRec box;
+ 	unsigned int hint;
+ 
++	DBG(("%s: (%d, %d)x(%d, %d), partial?=%d\n", __FUNCTION__, x, y, w, h));
++
+ 	op->dst.pixmap = get_drawable_pixmap(dst->pDrawable);
+ 	op->dst.format = dst->format;
+ 	op->dst.width  = op->dst.pixmap->drawable.width;
+--
+cgit v0.9.0.2-2-gbebe
+From 853588ad5be9407d2123f6055458ca84e72b8eb9 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat, 01 Feb 2014 21:55:09 +0000
+Subject: sna: If IGNORE_CPU is not set we must mark the move as MOVE_READ
+
+Logic reversal in discarding CPU damage. An old bug revealed by the more
+aggressive attempts to discard CPU damage.
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index 4221a55..acf4849 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -3689,7 +3689,7 @@ cpu_fail:
+ 		goto cpu_fail;
+ 
+ 	if (!sna_drawable_move_region_to_cpu(&pixmap->drawable, &region,
+-					     (flags & IGNORE_CPU ? MOVE_READ : 0) | MOVE_WRITE | MOVE_ASYNC_HINT)) {
++					     (flags & IGNORE_CPU ? 0 : MOVE_READ) | MOVE_WRITE | MOVE_ASYNC_HINT)) {
+ 		DBG(("%s: failed to move-to-cpu, fallback\n", __FUNCTION__));
+ 		goto cpu_fail;
+ 	}
+--
+cgit v0.9.0.2-2-gbebe
+From 7f08250a8960f90f6bd34de8c4a17870703bfa60 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun, 02 Feb 2014 03:52:11 +0000
+Subject: sna: Reconstruct damage for the partially replaced discarded CPU bo
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index acf4849..d31fa22 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -2432,7 +2432,7 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
+ 				if (get_drawable_deltas(drawable, pixmap, &dx, &dy))
+ 					RegionTranslate(region, dx, dy);
+ 
+-				if (sna->kgem.has_llc &&
++				if (sna->kgem.has_llc && !priv->pinned &&
+ 				    sna_pixmap_choose_tiling(pixmap,
+ 							     DEFAULT_TILING) == I915_TILING_NONE) {
+ #ifdef DEBUG_MEMORY
+@@ -2440,13 +2440,17 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
+ 					sna->debug_memory.cpu_bo_bytes -= kgem_bo_size(priv->cpu_bo);
+ #endif
+ 					DBG(("%s: promoting CPU bo to GPU bo\n", __FUNCTION__));
+-					sna_pixmap_free_gpu(sna, priv);
++					if (priv->gpu_bo)
++						sna_pixmap_free_gpu(sna, priv);
+ 					priv->gpu_bo = priv->cpu_bo;
+ 					priv->cpu_bo = NULL;
+ 					priv->ptr = NULL;
+ 					pixmap->devPrivate.ptr = NULL;
+ 
+-					sna_damage_destroy(&priv->cpu_damage);
++					priv->gpu_damage = priv->cpu_damage;
++					priv->cpu_damage = NULL;
++
++					discard_gpu = false;
+ 				} else {
+ 					DBG(("%s: pushing surrounding damage to GPU bo\n", __FUNCTION__));
+ 					sna_damage_subtract(&priv->cpu_damage, region);
+@@ -2456,6 +2460,12 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
+ 						if (priv->flush)
+ 							sna_add_flush_pixmap(sna, priv, priv->gpu_bo);
+ 						discard_gpu = false;
++
++						assert(priv->cpu_damage == NULL);
++						sna_damage_all(&priv->gpu_damage,
++							       pixmap->drawable.width,
++							       pixmap->drawable.height);
++						sna_damage_subtract(&priv->gpu_damage, region);
+ 					}
+ 				}
+ 				sna_damage_add(&priv->cpu_damage, region);
+@@ -3959,9 +3969,9 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
+ 	if (priv->cpu_damage == NULL)
+ 		goto done;
+ 
+-	if (DAMAGE_IS_ALL(priv->cpu_damage) &&
++	if (DAMAGE_IS_ALL(priv->cpu_damage) && priv->cpu_bo &&
++	    !priv->pinned && !priv->shm &&
+ 	    priv->gpu_bo->tiling == I915_TILING_NONE &&
+-	    priv->cpu_bo && !priv->shm &&
+ 	    kgem_bo_convert_to_gpu(&sna->kgem, priv->cpu_bo, flags)) {
+ 		assert(!priv->mapped);
+ 		assert(!IS_STATIC_PTR(priv->ptr));
+--
+cgit v0.9.0.2-2-gbebe
+
diff --git a/extra/xf86-video-intel/intel-2.21.15-xserver-1.15-compat.patch b/extra/xf86-video-intel/intel-2.21.15-xserver-1.15-compat.patch
deleted file mode 100644
index 714609b1e..000000000
--- a/extra/xf86-video-intel/intel-2.21.15-xserver-1.15-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up xf86-video-intel-2.21.15/src/compat-api.h.jx xf86-video-intel-2.21.15/src/compat-api.h
---- xf86-video-intel-2.21.15/src/compat-api.h.jx	2013-05-21 06:15:11.000000000 -0400
-+++ xf86-video-intel-2.21.15/src/compat-api.h	2013-10-24 15:30:52.291337300 -0400
-@@ -158,4 +158,8 @@ static inline void FreePixmap(PixmapPtr
- 	if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h)
- #endif
- 
-+#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(1,14,99,3,0)
-+#define DamageUnregister(a, b) DamageUnregister(a)
-+#endif
-+
- #endif
-
diff --git a/extra/xfce4-clipman-plugin/PKGBUILD b/extra/xfce4-clipman-plugin/PKGBUILD
index 981a05e11..605fe0e48 100644
--- a/extra/xfce4-clipman-plugin/PKGBUILD
+++ b/extra/xfce4-clipman-plugin/PKGBUILD
@@ -1,35 +1,32 @@
-# $Id: PKGBUILD 198547 2013-10-30 15:31:55Z allan $
+# $Id: PKGBUILD 205037 2014-02-03 16:37:24Z eric $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=xfce4-clipman-plugin
-pkgver=1.2.3
-pkgrel=2
+pkgver=1.2.4
+pkgrel=1
 pkgdesc="A clipboard plugin for the Xfce4 panel"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libunique' 'libxtst')
+depends=('xfce4-panel' 'libunique' 'libxtst' 'qrencode')
 makedepends=('intltool')
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('61f3be97efa379cb358980c94e14692a')
+sha1sums=('d787962058f21a4cc2e354764375a6b84eba7e08')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|$(TARGET_DIR)/C/media|$(docdir)/html/C/media|' doc/Makefile.in
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
 	--localstatedir=/var \
-	--disable-static \
-	--enable-unique \
 	--disable-debug
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }