Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/addresses/PKGBUILD
	community-testing/gcc-avr/PKGBUILD
	community-testing/gnumail/PKGBUILD
	community-testing/gnustep-back/PKGBUILD
	community-testing/gnustep-base/PKGBUILD
	community-testing/gnustep-gui/PKGBUILD
	community-testing/llvm/PKGBUILD
	community-testing/systemd/PKGBUILD
	community/llvm/PKGBUILD
	community/lua-yajl-git/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/python-scipy/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bin86/PKGBUILD
	core/cloog-ppl/PKGBUILD
	core/gcc/PKGBUILD
	core/mpfr/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/kdeedu/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/latex2html/PKGBUILD
	extra/libmad/PKGBUILD
	extra/postgresql/PKGBUILD
	multilib-testing/binutils-multilib/PKGBUILD
	multilib-testing/gcc-multilib/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/gcc-multilib/gcc-go.install
	testing/bin86/PKGBUILD
	testing/binutils/PKGBUILD
	testing/coreutils/PKGBUILD
	testing/glibc/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/less/PKGBUILD
	testing/linux-api-headers/PKGBUILD
	testing/mdadm/PKGBUILD
	testing/mpfr/PKGBUILD
	testing/udev/PKGBUILD

2 files changed, 71 insertions, 5 deletions

diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD
index dfdabb0e5..740c7a989 100644
--- a/community/i3-wm/PKGBUILD
+++ b/community/i3-wm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 37999 2011-01-20 08:04:31Z ttopper $
+# $Id: PKGBUILD 45625 2011-04-26 00:58:22Z dreisner $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3-wm
 _pkgsourcename=i3
 pkgver=3.e_bf2
 _pkgver=3.e-bf2
-pkgrel=1
+pkgrel=2
 pkgdesc="An improved dynamic tiling window manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://i3.zekjur.net/"
@@ -17,12 +17,17 @@ makedepends=('bison' 'flex')
 optdepends=('rxvt-unicode: The terminal emulator used in the default config.'
             'dmenu: As menu.')
 options=('docs' '!strip')
-source=(http://i3.zekjur.net/downloads/${_pkgsourcename}-${_pkgver}.tar.bz2)
-md5sums=('dc2c59623fdc9e69003b8807a0443544')
+source=(http://i3.zekjur.net/downloads/${_pkgsourcename}-${_pkgver}.tar.bz2
+        yajl-2.x.patch)
+md5sums=('dc2c59623fdc9e69003b8807a0443544'
+         '8c2a58e743ee0f8d76455d2afbeedd6f')
 
 build() {
   cd "$srcdir/$_pkgsourcename-$_pkgver"
-  
+
+  # fixes for yajl 2.x API
+  patch -Np1 < "$srcdir/yajl-2.x.patch"
+
   make
 }
 
diff --git a/community/i3-wm/yajl-2.x.patch b/community/i3-wm/yajl-2.x.patch
new file mode 100644
index 000000000..dae2ac4da
--- /dev/null
+++ b/community/i3-wm/yajl-2.x.patch
@@ -0,0 +1,61 @@
+From b095db986c7a22c03e2766180e053817563ef244 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <d@falconindy.com>
+Date: Mon, 25 Apr 2011 17:06:51 -0400
+Subject: [PATCH] ipc: fixup for yajl 2.0 API changes
+
+---
+ src/ipc.c |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/ipc.c b/src/ipc.c
+index 1937d55..ab0a265 100644
+--- a/src/ipc.c
++++ b/src/ipc.c
+@@ -182,7 +182,7 @@ IPC_HANDLER(get_workspaces) {
+         if (last_focused == SLIST_END(&(c_ws->focus_stack)))
+                 last_focused = NULL;
+ 
+-        yajl_gen gen = yajl_gen_alloc(NULL, NULL);
++        yajl_gen gen = yajl_gen_alloc(NULL);
+         y(array_open);
+ 
+         TAILQ_FOREACH(ws, workspaces, workspaces) {
+@@ -226,7 +226,7 @@ IPC_HANDLER(get_workspaces) {
+         y(array_close);
+ 
+         const unsigned char *payload;
+-        unsigned int length;
++        size_t length;
+         y(get_buf, &payload, &length);
+ 
+         ipc_send_message(fd, payload, I3_IPC_REPLY_TYPE_WORKSPACES, length);
+@@ -241,7 +241,7 @@ IPC_HANDLER(get_workspaces) {
+ IPC_HANDLER(get_outputs) {
+         Output *output;
+ 
+-        yajl_gen gen = yajl_gen_alloc(NULL, NULL);
++        yajl_gen gen = yajl_gen_alloc(NULL);
+         y(array_open);
+ 
+         TAILQ_FOREACH(output, &outputs, outputs) {
+@@ -276,7 +276,7 @@ IPC_HANDLER(get_outputs) {
+         y(array_close);
+ 
+         const unsigned char *payload;
+-        unsigned int length;
++        size_t length;
+         y(get_buf, &payload, &length);
+ 
+         ipc_send_message(fd, payload, I3_IPC_REPLY_TYPE_OUTPUTS, length);
+@@ -338,7 +338,7 @@ IPC_HANDLER(subscribe) {
+         memset(&callbacks, 0, sizeof(yajl_callbacks));
+         callbacks.yajl_string = add_subscription;
+ 
+-        p = yajl_alloc(&callbacks, NULL, NULL, (void*)client);
++        p = yajl_alloc(&callbacks, NULL, (void*)client);
+         stat = yajl_parse(p, (const unsigned char*)message, message_size);
+         if (stat != yajl_status_ok) {
+                 unsigned char *err;
+-- 
+1.7.4.4
+