Wed Mar 20 00:06:15 PDT 2013

44 files changed, 779 insertions, 899 deletions

diff --git a/community/bbswitch/PKGBUILD b/community/bbswitch/PKGBUILD
index 4f9eba675..3dbf06f98 100644
--- a/community/bbswitch/PKGBUILD
+++ b/community/bbswitch/PKGBUILD
@@ -4,23 +4,26 @@
 
 pkgname=bbswitch
 pkgver=0.5
-_extramodules=extramodules-3.7-ARCH # Don't forget to update bbswitch.install
-pkgrel=2
+_extramodules=extramodules-3.8-ARCH # Don't forget to update bbswitch.install
+pkgrel=3
 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops"
 arch=('i686' 'x86_64')
 url=("http://github.com/Bumblebee-Project/bbswitch")
 license=('GPL')
-depends=('linux>=3.7' 'linux<3.8')
-makedepends=('linux-headers>=3.7' 'linux-headers<3.8')
+depends=('linux>=3.8' 'linux<3.9')
+makedepends=('linux-headers>=3.8' 'linux-headers<3.9')
 install=bbswitch.install
-source=("https://github.com/downloads/Bumblebee-Project/bbswitch/${pkgname}-${pkgver}.tar.gz")
-md5sums=('5e0e6eb9c5e8c10db56e5b349b43bba7')
+source=("https://github.com/downloads/Bumblebee-Project/bbswitch/${pkgname}-${pkgver}.tar.gz"
+        "https://github.com/Bumblebee-Project/bbswitch/commit/5593d9519364dc7f6f28c3dd8358afb907f39c0f.patch")
+md5sums=('5e0e6eb9c5e8c10db56e5b349b43bba7'
+         'd76180b8f6fd092038d5ae7c71a9caa8')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
    
+  patch -Np1 < ${srcdir}/5593d9519364dc7f6f28c3dd8358afb907f39c0f.patch
   make KDIR=/usr/src/linux-${_kernver}
 }
 
diff --git a/community/bbswitch/bbswitch.install b/community/bbswitch/bbswitch.install
index b19b2f9c4..1b791a89d 100644
--- a/community/bbswitch/bbswitch.install
+++ b/community/bbswitch/bbswitch.install
@@ -1,5 +1,5 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.7-ARCH'
+    EXTRAMODULES='extramodules-3.8-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD
index 5b712d8d1..ae1e35a1e 100644
--- a/community/cinnamon-screensaver/PKGBUILD
+++ b/community/cinnamon-screensaver/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=cinnamon-screensaver
 pkgver=1.7.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -25,7 +25,7 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensav
 sha256sums=('055abbc24305dad5efa609b354e01fdc367792ccac5383df4b28090ab0bf64e1'
             '2f29a72991deb5cc2b44da06f49d1115148fee6a0a22b1abfecee1c1661abcaa'
             '335df8f2fb270484829d94995622521f0a42a12d6887f7de827db34fc81f583a'
-            'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb'
+            '99457b683c2e766a8c09a75ca906e3e00db6d294bb204a2e7a2a05c2e6b1d77e'
             '827276b01e658afb8045fb0dcbebb54f679ef47dac482f4399e1839369277ccc'
             'fed5f1f94404fab13c5369f4106b0b498cff2bb71351cae4f3d9c27f417f5e6a'
             '9013004395a401e99ce6685abb8319eb1e9ddd888c4fa6a7e45729fb93d285d1')
diff --git a/community/cinnamon-screensaver/cinnamon-screensaver.pam b/community/cinnamon-screensaver/cinnamon-screensaver.pam
index 453dae646..fd8d42d03 100644
--- a/community/cinnamon-screensaver/cinnamon-screensaver.pam
+++ b/community/cinnamon-screensaver/cinnamon-screensaver.pam
@@ -1,3 +1,3 @@
 #%PAM-1.0
 auth        required     pam_unix_auth.so nullok
-auth        optional     pam_gnome_keyring.so
+-auth        optional     pam_gnome_keyring.so
diff --git a/community/glee/Makefile b/community/glee/Makefile
new file mode 100644
index 000000000..06425fd82
--- /dev/null
+++ b/community/glee/Makefile
@@ -0,0 +1,55 @@
+all: libGLee.so
+
+MAJOR=5
+MINOR=4
+
+SOURCES = $(shell find . -name "*.c")
+
+SHARED_OBJS = $(SOURCES:.c=.shared.o)
+STATIC_OBJS = $(SOURCES:.c=.static.o)
+
+EXTRA_CFLAGS= $(CFLAGS)
+SHARED_CFLAGS= -Wall $(EXTRA_CFLAGS) -fPIC
+
+LDFLAGS= -Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined
+EXTRA_LDFLAGS=
+LIBS=-lGL
+EXTRA_LIBS=
+
+libGLee.so.$(MAJOR).$(MINOR): $(SHARED_OBJS)
+	g++ $(LDFLAGS) $(EXTRA_LDFLAGS) -shared \
+		-Wl,-soname,libGLee.so.$(MAJOR) \
+		-o libGLee.so.$(MAJOR).$(MINOR) \
+		$+ -o $@ $(EXTRA_LIBS) $(LIBS)
+
+libGLee.so: libGLee.so.$(MAJOR).$(MINOR)
+	rm -f $@.$(MAJOR)
+	ln -s $@.$(MAJOR).$(MINOR) $@.$(MAJOR)
+	rm -f $@
+	ln -s $@.$(MAJOR) $@
+
+%.shared.o: %.cpp
+	g++ -o $@ -c $+ $(SHARED_CFLAGS)
+
+%.shared.o: %.c
+	gcc -o $@ -c $+ $(SHARED_CFLAGS)
+
+%.so : %.o
+	g++ $(LDFLAGS) $(EXTRA_LDFLAGS) -shared $^ -o $@
+
+clean:
+	rm -f $(SHARED_OBJS)
+	rm -f $(FIXED_OBJS)
+	rm -f *.so *.so* *~
+
+DESTDIR=
+
+install: libGLee.so
+	install -d "$(DESTDIR)/usr/lib/"
+	cp -a *.so* "$(DESTDIR)/usr/lib/"
+	install -d "$(DESTDIR)/usr/include/"
+	install -Dm644 *.h "$(DESTDIR)/usr/include/"
+	install -d "$(DESTDIR)/usr/lib/pkgconfig/"
+	install -Dm644 glee.pc "$(DESTDIR)/usr/lib/pkgconfig/"
+	install -d  "$(DESTDIR)/usr/share/licenses/glee"
+	sed '9,32!d' readme.txt > "$(DESTDIR)/usr/share/licenses/glee/LICENSE"
diff --git a/community/glee/PKGBUILD b/community/glee/PKGBUILD
index ca0b404fb..4f89ad918 100644
--- a/community/glee/PKGBUILD
+++ b/community/glee/PKGBUILD
@@ -1,38 +1,31 @@
-# $Id: PKGBUILD 72465 2012-06-14 23:53:43Z ebelanger $
-# Maintainer : SpepS <dreamspepser at yahoo dot it>
-# Contributor: Philipp Brüschweiler <blei42 at gmail dot com >
+# $Id: PKGBUILD 86549 2013-03-19 04:49:29Z speps $
+# Maintainer : speps <speps at aur dot archlinux dot org>
 
 pkgname=glee
-pkgver=5.4
-pkgrel=4
-pkgdesc="Free cross-platform extension loading library for OpenGL."
+pkgver=5.4.0
+pkgrel=1
+pkgdesc="Free cross-platform extension loading library for OpenGL"
 arch=('i686' 'x86_64')
 url="http://elf-stone.com/glee.php"
-license=('BSD')
+license=('custom:BSD')
 depends=('gcc-libs' 'libgl')
 makedepends=('mesa')
-source=("http://elf-stone.com/downloads/GLee/GLee-5.4.0-src.tar.gz")
-md5sums=('0bd03db136dbc075488b6c6e83f326ae')
+#source=("http://elf-stone.com/downloads/GLee/GLee-$pkgver-src.tar.gz")
+md5sums=('0bd03db136dbc075488b6c6e83f326ae'
+         '937a48856486291070943488fa2824d0'
+         'b59e8d11402fb2ee6c4a92bf6916b3aa')
+_spkg=GLee-$pkgver-src.tar.gz
+source=("http://pkgs.fedoraproject.org/repo/pkgs/GLee/$_spkg/$md5sums/$_spkg"
+        glee.pc Makefile) # implement FS#32670 + fix TEXTREL for i686
 
 build() {
   cd "$srcdir"
-
-  [ "$CARCH" = 'x86_64' ] && export CXXFLAGS="$CXXFLAGS -fPIC"
-
-  ./configure --prefix=/usr
   make
 }
 
 package() {
   cd "$srcdir"
-
-  # lib and headers
-  install -Dm755 libGLee.so "$pkgdir/usr/lib/libGLee.so"
-  install -Dm644 GLee.h "$pkgdir/usr/include/GLee.h"
-
-  # license
-  install -Dm644 readme.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  sed -i '9,32!d' "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  make DESTDIR="$pkgdir/" install
 }
 
-# vim:set ts=2 sw=2 et:
+# vim:set ts=2 sw=2 et:
\ No newline at end of file
diff --git a/community/glee/glee.pc b/community/glee/glee.pc
new file mode 100644
index 000000000..0f03b450a
--- /dev/null
+++ b/community/glee/glee.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: GLee
+Description: GL Easy Extension library
+Version: 5.4.0
+Requires: 
+Conflicts: 
+Libs: -L${libdir} -lglee
+Cflags: -I${includedir}
diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD
index c25ad2edb..f7c5221cd 100644
--- a/community/i3-wm/PKGBUILD
+++ b/community/i3-wm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 86213 2013-03-13 09:19:21Z ttoepper $
+# $Id: PKGBUILD 86553 2013-03-19 09:17:14Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3-wm
 _pkgsourcename=i3
-pkgver=4.5
+pkgver=4.5.1
 pkgrel=1
 pkgdesc="An improved dynamic tiling window manager"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ optdepends=('dmenu: As menu.'
             'i3status: To display systeminformation with a bar.')
 options=('docs' '!strip')
 source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2")
-md5sums=('9eea2f570ec19affa3ec60b5ab411497')
+md5sums=('a448388a9e26b7ae371534ff9f6ca353')
 
 build() {
   cd "$srcdir/$_pkgsourcename-$pkgver"
diff --git a/community/php-memcache/PKGBUILD b/community/php-memcache/PKGBUILD
index f9c3e0fa7..e67b0a5a7 100644
--- a/community/php-memcache/PKGBUILD
+++ b/community/php-memcache/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 76558 2012-09-23 05:22:53Z foutrelis $
+# $Id: PKGBUILD 86563 2013-03-19 15:14:56Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=php-memcache
 pkgver=3.0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Memcache module for PHP"
 arch=('i686' 'x86_64')
 url="http://pecl.php.net/package/memcache"
@@ -11,12 +11,17 @@ license=('PHP')
 depends=('php')
 backup=('etc/php/conf.d/memcache.ini')
 install=php-memcache.install
-source=(http://pecl.php.net/get/memcache-$pkgver.tgz)
-sha256sums=('f34e2ef42dd8f1f7e6a2cfbb9417a9e58e3bfd7f5db7227ca5afab686cefdd1f')
+source=(http://pecl.php.net/get/memcache-$pkgver.tgz
+        php-memcache-3.0.7-fix-segfault-with-object-serialization.patch)
+sha256sums=('f34e2ef42dd8f1f7e6a2cfbb9417a9e58e3bfd7f5db7227ca5afab686cefdd1f'
+            '100bffed22ad537de1cb03653e2dbb6768617ba3b8b49b1cf05c59554270c25b')
 
 build() {
   cd "$srcdir/memcache-$pkgver"
 
+  # https://bugs.php.net/bug.php?id=63142
+  patch -Np0 -i "$srcdir/php-memcache-3.0.7-fix-segfault-with-object-serialization.patch"
+
   phpize
   ./configure --prefix=/usr
   make
diff --git a/community/php-memcache/php-memcache-3.0.7-fix-segfault-with-object-serialization.patch b/community/php-memcache/php-memcache-3.0.7-fix-segfault-with-object-serialization.patch
new file mode 100644
index 000000000..f3909746b
--- /dev/null
+++ b/community/php-memcache/php-memcache-3.0.7-fix-segfault-with-object-serialization.patch
@@ -0,0 +1,162 @@
+Index: memcache.c
+===================================================================
+--- memcache.c	(revision 329831)
++++ memcache.c	(working copy)
+@@ -1529,15 +1529,13 @@
+ 	unsigned int flags, unsigned long cas, void *param TSRMLS_DC) /*
+ 	receives a multiple values, param is a zval** array to store value and flags in {{{ */
+ {
+-	zval *arrval, **result = (zval **)param;
+-	ALLOC_ZVAL(arrval);
+-	*((zval *)arrval) = *value;
++	zval **result = (zval **)param;
+ 
+ 	/* add value to result */
+ 	if (Z_TYPE_P(result[0]) != IS_ARRAY) {
+ 		array_init(result[0]);
+ 	}
+-	add_assoc_zval_ex(result[0], (char *)key, key_len + 1, arrval);
++	add_assoc_zval_ex(result[0], (char *)key, key_len + 1, value);
+ 
+ 	/* add flags to result */
+ 	if (result[1] != NULL) {
+@@ -1565,7 +1563,7 @@
+ 	receives a single value, param is a zval pointer to store value to {{{ */
+ {
+ 	zval **result = (zval **)param;
+-	*(result[0]) = *value;
++	ZVAL_ZVAL(result[0], value, 1, 1);
+ 
+ 	if (result[1] != NULL) {
+ 		ZVAL_LONG(result[1], flags);
+Index: memcache_ascii_protocol.c
+===================================================================
+--- memcache_ascii_protocol.c	(revision 329831)
++++ memcache_ascii_protocol.c	(working copy)
+@@ -122,7 +122,7 @@
+ 	line_len = mmc_stream_get_line(request->io, &line TSRMLS_CC);
+ 	if (line_len > 0) {
+ 		long lval;
+-		zval value;
++		zval *value;
+ 
+ 		int response = mmc_request_check_response(line, line_len);
+ 		if (response != MMC_RESPONSE_UNKNOWN) {
+@@ -132,10 +132,10 @@
+ 		if (sscanf(line, "%lu", &lval) < 1) {
+ 			return mmc_server_failure(mmc, request->io, "Malformed VALUE header", 0 TSRMLS_CC);
+ 		}
+-		
+-		INIT_PZVAL(&value);
+-		ZVAL_LONG(&value, lval);
+-		return request->value_handler(request->key, request->key_len, &value, 0, 0, request->value_handler_param TSRMLS_CC);
++	
++		MAKE_STD_ZVAL(value);
++		ZVAL_LONG(value, lval);
++		return request->value_handler(request->key, request->key_len, value, 0, 0, request->value_handler_param TSRMLS_CC);
+ 	}
+ 	
+ 	return MMC_REQUEST_MORE;
+Index: memcache_binary_protocol.c
+===================================================================
+--- memcache_binary_protocol.c	(revision 329831)
++++ memcache_binary_protocol.c	(working copy)
+@@ -225,14 +225,14 @@
+ 	header = (mmc_mutate_response_header_t *)mmc_stream_get(request->io, sizeof(*header) TSRMLS_CC);
+ 	if (header != NULL) {
+ 		int result;
+-		zval *key, value;
++		zval *key, *value;
+ 
+ 		/* convert remembered key to string and unpack value */
+ 		key = (zval *)mmc_queue_item(&(req->keys), req->command.reqid);
++	
++		MAKE_STD_ZVAL(value);
++		ZVAL_LONG(value, ntohll(header->value));
+ 		
+-		INIT_PZVAL(&value);
+-		ZVAL_LONG(&value, ntohll(header->value));
+-		
+ 		if (Z_TYPE_P(key) != IS_STRING) {
+ 			zval keytmp = *key;
+ 			
+@@ -241,14 +241,14 @@
+ 			convert_to_string(&keytmp);
+ 
+ 			result = request->value_handler(
+-				Z_STRVAL(keytmp), Z_STRLEN(keytmp), &value, 
++				Z_STRVAL(keytmp), Z_STRLEN(keytmp), value, 
+ 				req->value.flags, req->value.cas, request->value_handler_param TSRMLS_CC);
+ 			
+ 			zval_dtor(&keytmp);
+ 		}
+ 		else {
+ 			result = request->value_handler(
+-				Z_STRVAL_P(key), Z_STRLEN_P(key), &value,
++				Z_STRVAL_P(key), Z_STRLEN_P(key), value,
+ 				req->value.flags, req->value.cas, request->value_handler_param TSRMLS_CC);
+ 		}
+ 		
+Index: memcache_pool.c
+===================================================================
+--- memcache_pool.c	(revision 329831)
++++ memcache_pool.c	(working copy)
+@@ -428,8 +428,8 @@
+ 	unsigned long data_len;
+ 	int rv;
+ 
+-	zval value;
+-	INIT_ZVAL(value);
++	zval *object;
++	MAKE_STD_ZVAL(object);
+ 
+ 	if (flags & MMC_COMPRESSED) {
+ 		if (mmc_uncompress(buffer->value.c, bytes, &data, &data_len) != MMC_OK) {
+@@ -445,8 +445,6 @@
+ 	if (flags & MMC_SERIALIZED) {
+ 		php_unserialize_data_t var_hash;
+ 		const unsigned char *p = (unsigned char *)data;
+-		zval *object = &value;
+-
+ 		char key_tmp[MMC_MAX_KEY_LEN + 1];
+ 		mmc_request_value_handler value_handler;
+ 		void *value_handler_param;
+@@ -501,7 +499,7 @@
+ 				long val;
+ 				data[data_len] = '\0';
+ 				val = strtol(data, NULL, 10);
+-				ZVAL_LONG(&value, val);
++				ZVAL_LONG(object, val);
+ 				break;
+ 			}
+ 
+@@ -509,17 +507,17 @@
+ 				double val = 0;
+ 				data[data_len] = '\0';
+ 				sscanf(data, "%lg", &val);
+-				ZVAL_DOUBLE(&value, val);
++				ZVAL_DOUBLE(object, val);
+ 				break;
+ 			}
+ 
+ 			case MMC_TYPE_BOOL:
+-				ZVAL_BOOL(&value, data_len == 1 && data[0] == '1');
++				ZVAL_BOOL(object, data_len == 1 && data[0] == '1');
+ 				break;
+ 
+ 			default:
+ 				data[data_len] = '\0';
+-				ZVAL_STRINGL(&value, data, data_len, 0);
++				ZVAL_STRINGL(object, data, data_len, 0);
+ 
+ 				if (!(flags & MMC_COMPRESSED)) {
+ 					/* release buffer because it's now owned by the zval */
+@@ -528,7 +526,7 @@
+ 		}
+ 
+ 		/* delegate to value handler */
+-		return request->value_handler(key, key_len, &value, flags, cas, request->value_handler_param TSRMLS_CC);
++		return request->value_handler(key, key_len, object, flags, cas, request->value_handler_param TSRMLS_CC);
+ 	}
+ }
+ /* }}}*/
diff --git a/community/shotwell/0001-Port-to-GStreamer-1.0.patch b/community/shotwell/0001-Port-to-GStreamer-1.0.patch
deleted file mode 100644
index a7a2cbf4c..000000000
--- a/community/shotwell/0001-Port-to-GStreamer-1.0.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From 4db67e385c9c2d89947077f1520aa31af2538d65 Mon Sep 17 00:00:00 2001
-From: Alban Browaeys <prahal@yahoo.com>
-Date: Wed, 09 Jan 2013 01:11:27 +0000
-Subject: Ports Shotwell to GStreamer 1.0. Closes #6055.
-
----
-diff --git a/Makefile b/Makefile
-index 2488f82..5a7e262 100644
---- a/Makefile
-+++ b/Makefile
-@@ -37,7 +37,7 @@ EXTRAS_SUPPORTED_LANGUAGES=fr de it es pl et sv sk lv pt bg bn nl da zh_CN el ru
- LOCAL_LANG_DIR=locale-langpack
- SYSTEM_LANG_DIR := $(DESTDIR)$(PREFIX)/share/locale
- 
--VALAFLAGS := -g --enable-checking --thread --fatal-warnings --enable-deprecated $(USER_VALAFLAGS)
-+VALAFLAGS := -g --enable-checking --thread --fatal-warnings --enable-deprecated --enable-experimental $(USER_VALAFLAGS)
- ifdef UNITY_SUPPORT
- VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT
- endif
-@@ -293,9 +293,9 @@ EXT_PKGS = \
- 	gio-unix-2.0 \
- 	glib-2.0 \
- 	gmodule-2.0 \
--	gstreamer-0.10 \
--	gstreamer-base-0.10 \
--	gstreamer-pbutils-0.10 \
-+	gstreamer-1.0 \
-+	gstreamer-base-1.0 \
-+	gstreamer-pbutils-1.0 \
- 	gtk+-3.0 \
- 	gudev-1.0 \
- 	libexif \
-@@ -314,8 +314,8 @@ endif
- THUMBNAILER_PKGS = \
-     gtk+-3.0 \
-     gee-1.0 \
--    gstreamer-0.10 \
--    gstreamer-base-0.10
-+    gstreamer-1.0 \
-+    gstreamer-base-1.0
- 
- DIRECT_LIBS =
- 
-@@ -325,10 +325,10 @@ EXT_PKG_VERSIONS = \
- 	gio-unix-2.0 >= 2.20 \
- 	glib-2.0 >= $(MIN_GLIB_VERSION) \
- 	gmodule-2.0 >= 2.24.0 \
--	gstreamer-0.10 >= 0.10.28 \
--	gstreamer-base-0.10 >= 0.10.28 \
--	gstreamer-plugins-base-0.10 >= 0.10.32 \
--	gstreamer-pbutils-0.10 >= 0.10.32 \
-+	gstreamer-1.0 >= 1.0.0 \
-+	gstreamer-base-1.0 >= 1.0.0 \
-+	gstreamer-plugins-base-1.0 >= 1.0.0 \
-+	gstreamer-pbutils-1.0 >= 1.0.0 \
- 	gtk+-3.0 >= 3.0.11 \
- 	gudev-1.0 >= 145 \
- 	libexif >= 0.6.16 \
-@@ -683,7 +683,7 @@ $(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(GPHOTO_VAPI_FILE)
- 	$(call check_valac_version)
- 	@echo Compiling Vala code...
- 	@mkdir -p $(BUILD_DIR)
--	@$(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \
-+	$(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \
- 		$(foreach pkg,$(VALA_PKGS),--pkg=$(pkg)) \
- 		$(foreach vapidir,$(VAPI_DIRS),--vapidir=$(vapidir)) \
- 		$(foreach def,$(DEFINES),-X -D$(def)) \
-diff --git a/src/VideoSupport.vala b/src/VideoSupport.vala
-index deb45e2..f679bd0 100644
---- a/src/VideoSupport.vala
-+++ b/src/VideoSupport.vala
-@@ -163,8 +163,8 @@ public class VideoReader {
-                 file.get_path()));
-         
-         try {
--            Gst.Discoverer d = new Gst.Discoverer((Gst.ClockTime) (Gst.SECOND * 5));
--            Gst.DiscovererInfo info = d.discover_uri(file.get_uri());
-+            Gst.PbUtils.Discoverer d = new Gst.PbUtils.Discoverer((Gst.ClockTime) (Gst.SECOND * 5));
-+            Gst.PbUtils.DiscovererInfo info = d.discover_uri(file.get_uri());
-             
-             clip_duration = ((double) info.get_duration()) / 1000000000.0;
-             
-@@ -172,7 +172,7 @@ public class VideoReader {
-             // TODO: Note that TAG_DATE can be changed to TAG_DATE_TIME in the future
-             // (and the corresponding output struct) in order to implement #2836.
-             Date? video_date = null;
--            if (info.get_tags() != null && info.get_tags().get_date(Gst.TAG_DATE, out video_date)) {
-+            if (info.get_tags() != null && info.get_tags().get_date(Gst.Tags.DATE, out video_date)) {
-                 timestamp = new DateTime.local(video_date.get_year(), video_date.get_month(), 
-                     video_date.get_day(), 0, 0, 0);
-             }
-@@ -323,7 +323,7 @@ public class Video : VideoSource, Flaggable, Monitorable, Dateable {
-         Gst.init(ref fake_unowned_args);
-         
-         int saved_state = Config.Facade.get_instance().get_video_interpreter_state_cookie();
--        current_state = (int) Gst.Registry.get_default().get_feature_list_cookie();
-+        current_state = (int) Gst.Registry.get().get_feature_list_cookie();
-         if (saved_state == Config.Facade.NO_VIDEO_INTERPRETER_STATE) {
-             message("interpreter state cookie not found; assuming all video thumbnails are out of date");
-             interpreter_state_changed = true;
-diff --git a/thumbnailer/shotwell-video-thumbnailer.vala b/thumbnailer/shotwell-video-thumbnailer.vala
-index 79a2d7e..ae1e537 100644
---- a/thumbnailer/shotwell-video-thumbnailer.vala
-+++ b/thumbnailer/shotwell-video-thumbnailer.vala
-@@ -10,22 +10,15 @@
- // Shotwell Thumbnailer takes in a video file and returns a thumbnail to stdout.  This is
- // a replacement for totem-video-thumbnailer
- class ShotwellThumbnailer {
--    const string caps_string = """video/x-raw-rgb,bpp = (int) 32, depth = (int) 32,
--                                      endianness = (int) BIG_ENDIAN,
--                                      red_mask = (int)   0xFF000000,
--                                      green_mask = (int) 0x00FF0000,
--                                      blue_mask = (int)  0x0000FF00,
--                                      width = (int) [ 1, max ],
--                                      height = (int) [ 1, max ],
--                                      framerate = (fraction) [ 0, max ]""";
-+    const string caps_string = """video/x-raw,format=RGB,bpp=32,depth=32,pixel-aspect-ratio=1/1""";
-     
-     public static int main(string[] args) {
-         Gst.Element pipeline, sink;
-         int width, height;
--        Gst.Buffer buffer;
-+        Gst.Sample sample;
-         string descr;
-         Gdk.Pixbuf pixbuf;
--        int64 position;
-+        int64 duration, position;
-         Gst.StateChangeReturn ret;
-         bool res;
-         
-@@ -36,7 +29,7 @@ class ShotwellThumbnailer {
-             return 1;
-         }
-         
--        descr = "filesrc location=\"%s\" ! decodebin2 ! ffmpegcolorspace ! ".printf(args[1]) + 
-+        descr = "filesrc location=\"%s\" ! decodebin ! videoconvert ! videoscale ! ".printf(args[1]) +
-             "appsink name=sink caps=\"%s\"".printf(caps_string);
-         
-         try {
-@@ -64,29 +57,41 @@ class ShotwellThumbnailer {
-                 stderr.printf("Failed to play the file: couldn't get state.\n");
-                 return 3;
-             }
--            
--            // Seek to the a position in the file. Most files have a black first frame so
--            // by seeking to somewhere else we have a bigger chance of getting something
--            // more interesting. An optimization would be to detect black images and then
--            // seek a little more.
--            position = (int64) (Gst.Format.PERCENT_MAX * 0.05);
--            pipeline.seek_simple(Gst.Format.PERCENT, Gst.SeekFlags.KEY_UNIT | Gst.SeekFlags.FLUSH , position);
--            
--            // Get the preroll buffer from appsink, this block untils appsink really
--            // prerolls.
--            GLib.Signal.emit_by_name(sink, "pull-preroll", out buffer, null);
--            
-+
-+            /* get the duration */
-+            pipeline.query_duration (Gst.Format.TIME, out duration);
-+
-+            if (duration != -1) {
-+                /* we have a duration, seek to 5% */
-+                position = duration * 5 / 100;
-+            } else {
-+                /* no duration, seek to 1 second, this could EOS */
-+                position = 1 * Gst.SECOND;
-+            }
-+
-+            /* seek to the a position in the file. Most files have a black first frame so
-+             * by seeking to somewhere else we have a bigger chance of getting something
-+             * more interesting. An optimisation would be to detect black images and then
-+             * seek a little more */
-+            pipeline.seek_simple (Gst.Format.TIME, Gst.SeekFlags.KEY_UNIT | Gst.SeekFlags.FLUSH, position);
-+
-+            /* get the preroll buffer from appsink, this block untils appsink really
-+             * prerolls */
-+            GLib.Signal.emit_by_name (sink, "pull-preroll", out sample, null);
-+
-             // if we have a buffer now, convert it to a pixbuf. It's possible that we
-             // don't have a buffer because we went EOS right away or had an error.
--            if (buffer != null) {
-+            if (sample != null) {
-+                Gst.Buffer buffer;
-                 Gst.Caps caps;
-                 Gst.Structure s;
-+                Gst.MapInfo mapinfo;
- 
-                 // Get the snapshot buffer format now. We set the caps on the appsink so
-                 // that it can only be an rgb buffer. The only thing we have not specified
-                 // on the caps is the height, which is dependant on the pixel-aspect-ratio
-                 // of the source material.
--                caps = buffer.get_caps();
-+                caps = sample.get_caps();
-                 if (caps == null) {
-                     stderr.printf("could not get snapshot format\n");
-                     return 5;
-@@ -101,14 +106,18 @@ class ShotwellThumbnailer {
-                     stderr.printf("Could not get snapshot dimension\n");
-                     return 6;
-                 }
--                
-+
-+                buffer = sample.get_buffer();
-+                buffer.map(out mapinfo, Gst.MapFlags.READ);
-+
-                 // Create pixmap from buffer and save, gstreamer video buffers have a stride
-                 // that is rounded up to the nearest multiple of 4.
--                pixbuf = new Gdk.Pixbuf.from_data(buffer.data, Gdk.Colorspace.RGB, true, 8, 
--                    width, height, width * 4, null);
-+                pixbuf = new Gdk.Pixbuf.from_data(mapinfo.data, Gdk.Colorspace.RGB, false, 8,
-+                    width, height, (((width * 3)+3)&~3), null);
-                 
-                 // Save the pixbuf.
-                 pixbuf.save("/dev/stdout", "png");
-+                buffer.unmap(mapinfo);
-             } else {
-                 stderr.printf("Could not make snapshot\n");
-                 return 10;
---
-cgit v0.9
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index 8ff178ab2..e791e168d 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 85690 2013-03-05 07:36:48Z bgyorgy $
+# $Id: PKGBUILD 86560 2013-03-19 11:35:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 
 pkgname=shotwell
-pkgver=0.13.1
-pkgrel=6
+pkgver=0.14.0
+pkgrel=1
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
 arch=('i686' 'x86_64')
 url="http://yorba.org/shotwell/"
@@ -15,28 +15,16 @@ depends=('libgee' 'libwebkit3' 'libgexiv2' 'libraw' 'rest'
 	 'gst-plugins-base' 'libgphoto2')
 makedepends=('intltool' 'vala>=0.17.2' 'libunique3')
 install=shotwell.install
-source=("http://yorba.org/download/shotwell/0.13/shotwell-${pkgver}.tar.xz"
-	"no-libexec.patch"
-        "0001-Port-to-GStreamer-1.0.patch"
-        "regenerate-video-thumbnails.patch")
-md5sums=('71eb1346093705ca2b37c12a21994d14'
-         'b4124e022c98b4382530e6fbcef965e2'
-         '666d28c2a1b78632df8ab5f24c3aa3cd'
-         '4b70442c6d9c04f3be23426ef92adb43')
+source=("http://yorba.org/download/shotwell/stable/shotwell-$pkgver.tar.xz"
+	"no-libexec.patch")
+md5sums=('14b8e02091376fa69ac0a04ba61ea608'
+         'b4124e022c98b4382530e6fbcef965e2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   patch -p1 <$srcdir/no-libexec.patch
 
-  # Port to GSreamer 1.0 (video thumbnailer)
-  # http://redmine.yorba.org/issues/6055
-  patch -p1 <$srcdir/0001-Port-to-GStreamer-1.0.patch
-
-  # Regenerate video thumbnails on lost
-  # http://redmine.yorba.org/issues/6152
-  patch -p1 <$srcdir/regenerate-video-thumbnails.patch
-
   ./configure --prefix=/usr \
 	--disable-schemas-compile \
 	--disable-desktop-update \
diff --git a/community/shotwell/regenerate-video-thumbnails.patch b/community/shotwell/regenerate-video-thumbnails.patch
deleted file mode 100644
index 8a399355e..000000000
--- a/community/shotwell/regenerate-video-thumbnails.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From 05c10b9c6107dc785808732216498ef5f3f6b87d Mon Sep 17 00:00:00 2001
-From: Clint Rogers <clinton@yorba.org>
-Date: Wed, 16 Jan 2013 00:09:42 +0000
-Subject: Causes video thumbnails to get regenerated if lost; closes #6152.
-
-Also moves some code around so regeneration for both stills and videos happens in the same spot, improving code navigability.
----
-diff --git a/src/PhotoMonitor.vala b/src/PhotoMonitor.vala
-index 40416d1..3dcc481 100644
---- a/src/PhotoMonitor.vala
-+++ b/src/PhotoMonitor.vala
-@@ -287,16 +287,7 @@ private class PhotoMonitor : MediaMonitor {
-             
-             return MediaMonitor.DiscoveredFile.UNKNOWN;
-         }
--        
--        if (!ThumbnailCache.exists(photo)) {
--            try {
--                ThumbnailCache.import_from_source(photo, true);
--                photo.notify_altered(new Alteration("image","thumbnail"));
--            } catch (Error e) {
--                // thumbnail for this object was already broken, so nothing got worse.
--            }
--        }
--        
-+
-         switch (state) {
-             case LibraryPhotoSourceCollection.State.ONLINE:
-             case LibraryPhotoSourceCollection.State.OFFLINE:
-diff --git a/src/ThumbnailCache.vala b/src/ThumbnailCache.vala
-index be97183..2a2c716 100644
---- a/src/ThumbnailCache.vala
-+++ b/src/ThumbnailCache.vala
-@@ -1,7 +1,7 @@
--/* Copyright 2009-2012 Yorba Foundation
-+/* Copyright 2009-2013 Yorba Foundation
-  *
-  * This software is licensed under the GNU LGPL (version 2.1 or later).
-- * See the COPYING file in this distribution. 
-+ * See the COPYING file in this distribution.
-  */
- 
- public class Thumbnails {
-@@ -74,6 +74,7 @@ public class ThumbnailCache : Object {
-     private class AsyncFetchJob : BackgroundJob {
-         public ThumbnailCache cache;
-         public string thumbnail_name;
-+        public ThumbnailSource source;
-         public PhotoFileFormat source_format;
-         public Dimensions dim;
-         public Gdk.InterpType interp;
-@@ -84,13 +85,14 @@ public class ThumbnailCache : Object {
-         public bool fetched = false;
-         
-         public AsyncFetchJob(ThumbnailCache cache, string thumbnail_name,
--            PhotoFileFormat source_format, Gdk.Pixbuf? prefetched, Dimensions dim,
-+            ThumbnailSource source, Gdk.Pixbuf? prefetched, Dimensions dim,
-             Gdk.InterpType interp, AsyncFetchCallback callback, Cancellable? cancellable) {
-             base(cache, async_fetch_completion_callback, cancellable);
-             
-             this.cache = cache;
-             this.thumbnail_name = thumbnail_name;
--            this.source_format = source_format;
-+            this.source = source;
-+            this.source_format = source.get_preferred_thumbnail_format();
-             this.unscaled = prefetched;
-             this.dim = dim;
-             this.interp = interp;
-@@ -126,11 +128,42 @@ public class ThumbnailCache : Object {
-                 // scale if specified
-                 scaled = dim.has_area() ? resize_pixbuf(unscaled, dim, interp) : unscaled;
-             } catch (Error err) {
-+                // Is the problem that the thumbnail couldn't be read? If so, it's recoverable;
-+                // we'll just create it and leave this.err as null if creation works.
-+                if (err is FileError) {
-+                    try {
-+                        Photo photo = source as Photo;
-+                        Video video = source as Video;
-+
-+                        if (photo != null) {
-+                            unscaled = photo.get_pixbuf(Scaling.for_best_fit(dim.width, true));
-+                            photo.notify_altered(new Alteration("image","thumbnail"));
-+                            return;
-+                        }
-+
-+                        if (video != null) {
-+                            unscaled = video.create_thumbnail(dim.width);
-+                            scaled = resize_pixbuf(unscaled, dim, interp);
-+                            cache.save_thumbnail(cache.get_source_cached_file(source),
-+                                unscaled, source);
-+                            replace(source, cache.size, unscaled);
-+                            return;
-+                        }
-+
-+                    } catch (Error e) {
-+                        // Creating the thumbnail failed; tell the rest of the app.
-+                        this.err = e;
-+                        return;
-+                    }
-+                }
-+
-+                // ...the original error wasn't from reading the file, but something else;
-+                // tell the rest of the app.
-                 this.err = err;
-             }
-         }
-     }
--        
-+
-     private static Workers fetch_workers = null;
-     
-     public const ulong MAX_BIG_CACHED_BYTES = 40 * 1024 * 1024;
-@@ -230,13 +263,13 @@ public class ThumbnailCache : Object {
-     
-     public static void fetch_async(ThumbnailSource source, int scale, AsyncFetchCallback callback,
-         Cancellable? cancellable = null) {
--        get_best_cache(scale)._fetch_async(source.get_source_id(), source.get_preferred_thumbnail_format(),
-+        get_best_cache(scale)._fetch_async(source, source.get_preferred_thumbnail_format(),
-             Dimensions(), DEFAULT_INTERP, callback, cancellable);
-     }
-     
--    public static void fetch_async_scaled(ThumbnailSource source, int scale, Dimensions dim, 
-+    public static void fetch_async_scaled(ThumbnailSource source, int scale, Dimensions dim,
-         Gdk.InterpType interp, AsyncFetchCallback callback, Cancellable? cancellable = null) {
--        get_best_cache(scale)._fetch_async(source.get_source_id(),
-+        get_best_cache(scale)._fetch_async(source,
-             source.get_preferred_thumbnail_format(), dim, interp, callback, cancellable);
-     }
-     
-@@ -343,9 +376,10 @@ public class ThumbnailCache : Object {
-         return pixbuf;
-     }
-     
--    private void _fetch_async(string thumbnail_name, PhotoFileFormat format, Dimensions dim, 
-+    private void _fetch_async(ThumbnailSource source, PhotoFileFormat format, Dimensions dim,
-         Gdk.InterpType interp, AsyncFetchCallback callback, Cancellable? cancellable) {
-         // check if the pixbuf is already in memory
-+        string thumbnail_name = source.get_source_id();
-         Gdk.Pixbuf pixbuf = fetch_from_memory(thumbnail_name);
-         if (pixbuf != null && (!dim.has_area() || Dimensions.for_pixbuf(pixbuf).equals(dim))) {
-             // if no scaling operation required, callback in this context and done (otherwise,
-@@ -365,8 +399,8 @@ public class ThumbnailCache : Object {
-         // situation.  This may change in the future, and the caching situation will need to be 
-         // handled.
-         
--        fetch_workers.enqueue(new AsyncFetchJob(this, thumbnail_name, format, pixbuf, dim, interp, 
--            callback, cancellable));
-+        fetch_workers.enqueue(new AsyncFetchJob(this, thumbnail_name, source, pixbuf, dim,
-+            interp, callback, cancellable));
-     }
-     
-     // Called within Gtk.main's thread context
---
-cgit v0.9
diff --git a/community/udevil/PKGBUILD b/community/udevil/PKGBUILD
index 63b7a9a15..79939c3c7 100644
--- a/community/udevil/PKGBUILD
+++ b/community/udevil/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 84145 2013-02-11 17:05:04Z bpiotrowski $
+# $Id: PKGBUILD 86567 2013-03-19 17:52:24Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/
 
 pkgname=udevil
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Mount and unmount without password'
@@ -24,7 +24,7 @@ provides=('devmon')
 backup=('etc/udevil/udevil.conf')
 install=$pkgname.install
 source=(https://raw.github.com/IgnorantGuru/$pkgname/master/packages/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('baaab9b65ccbab55849ce4dec22ba412fd45655b14d163030c2245bc62fc7265')
+sha256sums=('fa4a3d85361d17bb69dd7dabdcfeecd2b0f5fff95698113975d8fbd504af6c2e')
 
 build() {
     cd $srcdir/$pkgname-$pkgver
diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD
index f94746e86..5d6c62f84 100644
--- a/extra/brasero/PKGBUILD
+++ b/extra/brasero/PKGBUILD
@@ -1,30 +1,32 @@
-# $Id: PKGBUILD 170846 2012-11-12 15:20:28Z heftig $
+# $Id: PKGBUILD 180254 2013-03-18 23:32:28Z jgc $
 # 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
+pkgrel=2
 pkgdesc="A disc burning application for Gnome"
 arch=('i686' 'x86_64')
 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')
+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')
 makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus' '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
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d293eb28dc45af3535f09cf91aa6ccc523f3f3d8b7ad3339b5e79b4acc19b932')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        use-mpegaudioparse.patch)
+sha256sums=('d293eb28dc45af3535f09cf91aa6ccc523f3f3d8b7ad3339b5e79b4acc19b932'
+            'c75331d130c248edeaa68211cf96f386d86905510d09b104e4e0cd0ff4c92218')
 
 build() {
   cd "$pkgname-$pkgver"
+  patch -Np1 -i ../use-mpegaudioparse.patch
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-caches \
       --disable-schemas-compile
diff --git a/extra/brasero/use-mpegaudioparse.patch b/extra/brasero/use-mpegaudioparse.patch
new file mode 100644
index 000000000..79c24d6a8
--- /dev/null
+++ b/extra/brasero/use-mpegaudioparse.patch
@@ -0,0 +1,53 @@
+From 895777890485428a23f2e0da0e8ccd2edf624f6e Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha@ubuntu.com>
+Date: Fri, 25 Jan 2013 03:26:10 +0000
+Subject: use mpegaudioparse gstreamer plugin instead of mp3parse
+
+Fix "not suitable for audio or video media" error when
+attempting to create a mp3 audio project
+The plugin was basically renamed for gstreamer 1.0.
+Thanks tuxor for identifying the problem!
+
+https://bugzilla.gnome.org/show_bug.cgi?id=687886
+---
+diff --git a/libbrasero-utils/brasero-metadata.c b/libbrasero-utils/brasero-metadata.c
+index 1088121..7f10088 100644
+--- a/libbrasero-utils/brasero-metadata.c
++++ b/libbrasero-utils/brasero-metadata.c
+@@ -1200,12 +1200,12 @@ brasero_metadata_create_mp3_pipeline (BraseroMetadata *self)
+ 	}
+ 	gst_bin_add (GST_BIN (priv->pipeline_mp3), source);
+ 
+-	parse = gst_element_factory_make ("mp3parse", NULL);
++	parse = gst_element_factory_make ("mpegaudioparse", NULL);
+ 	if (!parse) {
+ 		priv->error = g_error_new (BRASERO_UTILS_ERROR,
+ 					   BRASERO_UTILS_ERROR_GENERAL,
+ 					   _("%s element could not be created"),
+-					   "\"mp3parse\"");
++					   "\"mpegaudioparse\"");
+ 
+ 		g_object_unref (priv->pipeline_mp3);
+ 		priv->pipeline_mp3 = NULL;
+diff --git a/plugins/transcode/burn-transcode.c b/plugins/transcode/burn-transcode.c
+index a6a0f40..6861168 100644
+--- a/plugins/transcode/burn-transcode.c
++++ b/plugins/transcode/burn-transcode.c
+@@ -284,13 +284,13 @@ brasero_transcode_create_pipeline_size_mp3 (BraseroTranscode *transcode,
+ 
+ 	BRASERO_JOB_LOG (transcode, "Creating specific pipeline for MP3s");
+ 
+-	parse = gst_element_factory_make ("mp3parse", NULL);
++	parse = gst_element_factory_make ("mpegaudioparse", NULL);
+ 	if (!parse) {
+ 		g_set_error (error,
+ 			     BRASERO_BURN_ERROR,
+ 			     BRASERO_BURN_ERROR_GENERAL,
+ 			     _("%s element could not be created"),
+-			     "\"Mp3parse\"");
++			     "\"mpegaudioparse\"");
+ 		g_object_unref (pipeline);
+ 		return FALSE;
+ 	}
+--
+cgit v0.9.1
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 38291f4f5..7cefbaaca 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')
 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/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-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/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/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index d1f17eb87..d587c7832 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 170725 2012-11-10 05:22:37Z heftig $
+# $Id: PKGBUILD 180259 2013-03-18 23:57:36Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gdk-pixbuf2
 pkgver=2.26.5
-pkgrel=1
+pkgrel=2
 pkgdesc="An image loading library"
 arch=('i686' 'x86_64')
 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
@@ -19,8 +19,8 @@ build() {
   cd gdk-pixbuf-$pkgver
 
   ./configure --prefix=/usr \
-    --without-libjasper \
     --with-x11 \
+    --with-libjasper \
     --with-included-loaders=png
   make
 }
diff --git a/extra/geoclue/PKGBUILD b/extra/geoclue/PKGBUILD
index 851e5725f..403ef5296 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')
+arch=(i686 x86_64)
 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/geoclue/geoclue.install b/extra/geoclue/geoclue.install
new file mode 100644
index 000000000..c25dff2d3
--- /dev/null
+++ b/extra/geoclue/geoclue.install
@@ -0,0 +1,11 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD
index f08c41d60..49640bb9c 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/lilv/PKGBUILD b/extra/lilv/PKGBUILD
index bcc97d988..60ac98930 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)
-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')
+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/lv2/PKGBUILD b/extra/lv2/PKGBUILD
index e80a4b247..2afbd2d12 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/php/PKGBUILD b/extra/php/PKGBUILD
index 50e1075ff..850dbaef6 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180086 2013-03-16 08:30:44Z pierre $
+# $Id: PKGBUILD 180290 2013-03-19 19:00:59Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -22,7 +22,7 @@ pkgname=('php'
          'php-tidy'
          'php-xsl')
 pkgver=5.4.13
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
@@ -34,7 +34,7 @@ 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=('cacd308e978b7cf9ba4993196612ccf7'
-         '0b0bc7a917fc592bdf11dcd3c5c255e9'
+         '44c1bb1df346b3b9d3e092c7df9a37d0'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          '5c1f4c967b66ce3eaf819b46951dcbf5'
          'e036c721e5ad927cd1613c7475a58b3a'
@@ -235,7 +235,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/sord/PKGBUILD b/extra/sord/PKGBUILD
index 2f9921d89..f9895597d 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)
-url="http://drobilla.net/software/$pkgname/"
+pkgdesc="A lightweight C library for storing RDF data in memory"
+arch=('i686' 'x86_64')
+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/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index b3b8d70b9..16c9eaefc 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 180284 2013-03-19 15:40:26Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite"
 pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc') 
-_amalgamationver=3071502
+_amalgamationver=3071600
 #_docver=${_amalgamationver}
-_docver=3071502
-pkgver=3.7.15.2
+_docver=3071600
+pkgver=3.7.16
 pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64')
@@ -15,12 +15,12 @@ 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/sqlite-doc-${_docver}.zip
+	http://www.sqlite.org/2013/sqlite-autoconf-$_amalgamationver.tar.gz
+	http://www.sqlite.org/2013/sqlite-doc-${_docver}.zip
 	license.txt)
 options=('!libtool' '!emptydirs')
-md5sums=('bcb0ab0b5b30116b2531cfeef3c861b4'
-         '159594c17290291fbbb47ee190b180f9'
+md5sums=('919aedd0c84e1d8fb07129251dbe05bf'
+         'fbf875524bd3af1cf0b0580d13cc665e'
          'c1cdbc5544034d9012e421e75a5e4890')
 
 build() {
diff --git a/extra/sratom/PKGBUILD b/extra/sratom/PKGBUILD
index bc7881bba..c36012be5 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)
-url="http://drobilla.net/software/$pkgname/"
+arch=('i686' 'x86_64')
+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/suil/PKGBUILD b/extra/suil/PKGBUILD
index 6be96e5dd..8f43b4ab7 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
-pkgrel=2
+pkgver=0.6.12
+pkgrel=1
 pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs"
-arch=(i686 x86_64)
-url="http://drobilla.net/software/$pkgname/"
+arch=('i686' 'x86_64')
+url="http://drobilla.net/software/suil/"
 license=('custom:ISC')
 depends=('lv2')
 makedepends=('python2' 'qt4' 'gtk2')
-optdepends=('qt4: Qt UIs wrapping support'
-            'gtk2: Gtk2 UIs wrapping support')
+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/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD
index 9c926c1b2..af8e1756c 100644
--- a/extra/xf86-video-openchrome/PKGBUILD
+++ b/extra/xf86-video-openchrome/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180208 2013-03-18 16:09:15Z andyrtr $
+# $Id: PKGBUILD 180257 2013-03-18 23:41:34Z jgc $
 # Contributor: Paul Mattal <paul@mattal.com>
 # Maintainer: Juergen Hoetzel <juergen@hoetzel.info>
 
 pkgname=xf86-video-openchrome
 pkgver=0.3.1
-pkgrel=4
+pkgrel=5
 pkgdesc="X.Org Openchrome drivers"
 arch=(i686 x86_64)
 license=('custom')
@@ -16,14 +16,18 @@ 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
-        fix_system_lock.diff)
+        fix_system_lock.diff
+        no-mibstore.patch)
 sha1sums=('89e56dcfe851345f72c61a95b4fa5ab6ad7e0d83'
-          '539ba65df1755af97799f49410e4091b8d222eca')
+          '539ba65df1755af97799f49410e4091b8d222eca'
+          'af0d7cace699b105e4405e48abc2f433032a7483')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   # https://bugs.freedesktop.org/show_bug.cgi?id=53307
   patch -Np1 -i ${srcdir}/fix_system_lock.diff
+  # https://bugs.freedesktop.org/show_bug.cgi?id=62112
+  patch -Np1 -i ../no-mibstore.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-openchrome/no-mibstore.patch b/extra/xf86-video-openchrome/no-mibstore.patch
new file mode 100644
index 000000000..e223babb7
--- /dev/null
+++ b/extra/xf86-video-openchrome/no-mibstore.patch
@@ -0,0 +1,11 @@
+diff -rup a/src/via_driver.c b/src/via_driver.c
+--- a/src/via_driver.c	2013-03-10 16:11:57.614059200 +0100
++++ b/src/via_driver.c	2013-03-10 16:12:46.374062244 +0100
+@@ -1873,7 +1873,6 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL)
+     if (!pVia->NoAccel && !viaInitExa(pScreen))
+         return FALSE;
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+ #if 0
+     xf86SetSilkenMouse(pScreen);
\ No newline at end of file
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 1885f4743..d7ef13b69 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -9,15 +9,15 @@
 _pkgname=clementine
 pkgname=clementine-libre
 pkgver=1.1.1
-pkgrel=6
+pkgrel=7
 pkgdesc="A music player and library organizer, without spotify support"
 url="http://www.clementine-player.org/"
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod'
+depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' 'projectm'
          'libmtp' 'libplist' 'hicolor-icon-theme' 'qt4' 'libimobiledevice'
          'sparsehash' 'qjson' 'libcdio-paranoia' 'protobuf' 'qca' 'qca-ossl' 'gvfs')
-makedepends=('cmake' 'boost' 'mesa')
+makedepends=('cmake' 'boost' 'mesa-libgl')
 optdepends=('gstreamer0.10-base-plugins: for more open formats'
             'gstreamer0.10-good-plugins: for use with "Good" plugin libraries'
             'gstreamer0.10-bad-libre-plugins: for use with "Bad" plugin libraries'
@@ -49,7 +49,7 @@ build() {
    # Create a blank file due that is a dependency for clementine
    touch data/schema/schema-30.sql  
 
-   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
+   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1
    make
 }
 
diff --git a/libre/virtualbox-libre/18-system-xorg.patch b/libre/virtualbox-libre/18-system-xorg.patch
new file mode 100644
index 000000000..c527f7f20
--- /dev/null
+++ b/libre/virtualbox-libre/18-system-xorg.patch
@@ -0,0 +1,245 @@
+diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:55:28.774951223 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:58:06.337193736 +0000
+@@ -63,18 +63,12 @@
+ VBoxOGL_INCS           = .
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+  VBoxOGL_INCS     += \
+-	$(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
+-	$(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
+-	$(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
+-	$(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
+-	$(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
+-	$(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
+-	$(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
+-	$(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
+-	$(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
+-	$(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
++	/usr/include/x11 \
++	/usr/include/xorg \
++	/usr/include/pixman-1 \
+ 	$(VBOX_MESA_INCS) \
+-	$(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
++	/usr/include/drm \
++	/usr/include/libdrm
+  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
+ endif
+ 
+diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2013-03-19 18:55:28.778284533 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
+@@ -40,8 +40,8 @@
+ 	VBoxGuestR3LibShared
+ ifndef VBOX_ONLY_TESTSUITE
+  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
+-  LIBRARIES += \
+-  	VBoxGuestR3LibXFree86
++#  LIBRARIES += \
++#  	VBoxGuestR3LibXFree86
+  endif
+ endif
+ LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
+diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk	2013-03-19 18:55:28.974949837 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
+@@ -17,6 +17,10 @@
+ SUB_DEPTH = ../../../..
+ include $(KBUILD_PATH)/subheader.kmk
+ 
++ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110 111)
++ XSERVER_VERSION := 17
++endif
++
+ # Include sub-makefiles.
+ if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
+  include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
+diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	2013-03-19 18:55:28.818284256 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
+@@ -29,7 +29,6 @@
+ # vboxmouse_drv
+ #
+ if1of ($(KBUILD_TARGET), linux)
+- SYSMODS += vboxmouse_drv
+  vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
+  vboxmouse_drv_DEFS.linux = linux
+  vboxmouse_drv_DEFS.x86 += __i386__
+@@ -69,7 +68,6 @@
+ #
+ # vboxmouse_drv_70
+ #
+-DLLS += vboxmouse_drv_70
+ vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_70_DEFS = \
+ 	XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE DONT_DEFINE_WRAPPERS NO_ANSIC
+@@ -85,7 +83,6 @@
+ #
+ # vboxmouse_drv_71
+ #
+-DLLS += vboxmouse_drv_71
+ vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_71_INCS := \
+@@ -100,7 +97,6 @@
+ #
+ # vboxmouse_drv_13
+ #
+-DLLS += vboxmouse_drv_13
+ vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_13_INCS := \
+@@ -114,7 +110,6 @@
+ #
+ # vboxmouse_drv_14
+ #
+-DLLS += vboxmouse_drv_14
+ vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_14_INCS := \
+@@ -128,7 +123,6 @@
+ #
+ # vboxmouse_drv_15
+ #
+-DLLS += vboxmouse_drv_15
+ vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_15_INCS := \
+@@ -142,7 +136,6 @@
+ #
+ # vboxmouse_drv_16
+ #
+-DLLS += vboxmouse_drv_16
+ vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_16_INCS := \
+diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2013-03-19 18:55:28.974949837 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
+@@ -53,7 +53,6 @@
+ # vboxvideo_drv
+ #
+ if1of ($(KBUILD_TARGET), linux)
+- SYSMODS += vboxvideo_drv
+ endif   # target linux
+ vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
+ vboxvideo_drv_DEFS.linux = linux
+@@ -128,7 +127,6 @@
+ #         base keywords instead of using .solaris or .linux.
+ #         Also it is *important* to use := and not = when deriving a property.
+ #
+-DLLS += vboxvideo_drv_70
+ vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
+ if1of ($(KBUILD_TARGET), linux)
+  vboxvideo_drv_70_CFLAGS += \
+@@ -149,7 +147,6 @@
+ #
+ # vboxvideo_drv_71
+ #
+-DLLS += vboxvideo_drv_71
+ vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_71_DEFS := $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700100000
+@@ -164,7 +161,6 @@
+ #
+ # vboxvideo_drv_13
+ #
+-DLLS += vboxvideo_drv_13
+ vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_13_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100300000
+@@ -178,7 +174,6 @@
+ #
+ # vboxvideo_drv_14
+ #
+-DLLS += vboxvideo_drv_14
+ vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_14_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100400000
+@@ -192,7 +187,6 @@
+ #
+ # vboxvideo_drv_15
+ #
+-DLLS += vboxvideo_drv_15
+ vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000
+@@ -213,7 +207,6 @@
+ #
+ # vboxvideo_drv_16
+ #
+-DLLS += vboxvideo_drv_16
+ vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000
+@@ -227,7 +220,6 @@
+ #
+ # vboxvideo_drv_17
+ #
+-DLLS += vboxvideo_drv_17
+ vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
+@@ -241,7 +233,6 @@
+ #
+ # vboxvideo_drv_18
+ #
+-DLLS += vboxvideo_drv_18
+ vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100800000
+@@ -255,7 +246,6 @@
+ #
+ # vboxvideo_drv_19
+ #
+-DLLS += vboxvideo_drv_19
+ vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100900000
+@@ -269,7 +259,6 @@
+ #
+ # vboxvideo_drv_110
+ #
+-DLLS += vboxvideo_drv_110
+ vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
+@@ -283,7 +272,6 @@
+ #
+ # vboxvideo_drv_111
+ #
+-DLLS += vboxvideo_drv_111
+ vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
+@@ -297,7 +285,6 @@
+ #
+ # vboxvideo_drv_112
+ #
+-DLLS += vboxvideo_drv_112
+ vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
+@@ -341,6 +328,23 @@
+ endif
+ 
+ 
++vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
++vboxvideo_drv_$(XSERVER_VERSION)_INCS := \
++	/usr/include/xorg \
++	/usr/include/x11 \
++	/usr/include/pixman-1 \
++	/usr/include/X11/dri \
++	/usr/include/drm \
++	/usr/include/libdrm
++vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
++DLLS += vboxvideo_drv_$(XSERVER_VERSION)
++
++# required for lenny backports
++ifeq ($(XSERVER_VERSION),14)
++	vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg
++endif
++
++
+ # Check the undefined symbols in the X.Org modules against lists of allowed
+ # symbols.  Not very elegant, but it will catch problems early.
+ 
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index a83e20ab4..3619c0c1b 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-sdk'
          'virtualbox-libre-guest-utils')
 pkgver=4.2.10
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -22,7 +22,7 @@ makedepends=('alsa-lib'
              'cdrkit'
              'curl'
              'dev86'
-             'gsoap'
+             'gsoap=2.8.11-1'
              'iasl'
              'jdk7-openjdk'
              'libidl2'
@@ -43,7 +43,7 @@ makedepends=('alsa-lib'
              'sdl'
              'sdl_ttf'
              'vde2'
-             'xalan-c')
+             'xalan-c' 'xorg-server-devel' 'xf86driproto' 'libxcomposite')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2"
         '10-vboxdrv.rules'
@@ -53,6 +53,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         'vboxweb.service'
         '001-vboxdrv-reference.patch'
         '002-change_default_driver_dir.patch'
+        '18-system-xorg.patch'
         'os_blag_64.png'
         'os_blag.png'
         'os_dragora_64.png'
@@ -81,6 +82,7 @@ md5sums=('99349df34caacdecbb7cf3908631c3f3'
          'bc9efed88e0469cd7fc460d5a5cd7b4b'
          'f4e4c7895ede9c524109589bf16ae660'
          '97e193f050574dd272a38e5ee5ebe62b'
+         '4da461f8c90caa123b47c62479f426b4'
          '8538dba8686d7449cb481c9bae9d722a'
          '545c925b46f2ac95e5f8ae407fad101a'
          'f6416f509c2e5460e4dc624e0a57f3c1'
@@ -183,7 +185,6 @@ package_virtualbox-libre() {
     cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
     install -dm755 "$pkgdir"/usr/{bin,lib/virtualbox/components,share/virtualbox/nls,share/virtualbox/rdesktop-vrdp-keymaps}
 
-
     #Binaries and Wrapper with Launchers
     install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox"
 
@@ -315,7 +316,7 @@ package_virtualbox-libre-guest-utils(){
         "$pkgdir"/usr/bin/VBoxClient-all
     install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \
         "$pkgdir"/etc/xdg/autostart/vboxclient.desktop
-    install -D vboxvideo_drv_113.so \
+    install -D vboxvideo_drv.so \
         "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so"
     install -d "$pkgdir/usr/lib/xorg/modules/dri"
     install -m755 VBoxOGL*.so "$pkgdir/usr/lib"