[gnome-ostree] 3.6: Update to pulseaudio 2.0

[Colin Walters <walters src gnome org>]

commit 620dd7fbc1dc96ca513494eb182da4fb44af053c
Author: Colin Walters <walters verbum org>
Date:   Wed Jul 11 16:10:53 2012 -0400

    3.6: Update to pulseaudio 2.0

 gnomeos-3.6.json             |    6 +++++-
 patches/json-c-autogen.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/gnomeos-3.6.json b/gnomeos-3.6.json
index 0cb497c..97a4849 100644
--- a/gnomeos-3.6.json
+++ b/gnomeos-3.6.json
@@ -537,8 +537,12 @@
 
 		{"src": "gnome:libgnomekbd"},
 
+		{"src": "git:git://github.com/json-c/json-c.git",
+		 "tag": "381f77c5bccf20234a2bddae2b6ac43997faf0a2",
+		 "patches": ["json-c-autogen.patch"]},
+
 		{"src": "fd-pulse:pulseaudio",
-		 "tag": "v0.9.23",
+		 "branch": "stable-2.x",
 		 "config-opts": ["--disable-openssl"],
 		 "patches": ["pulseaudio-autogen.patch"]},
 
diff --git a/patches/json-c-autogen.patch b/patches/json-c-autogen.patch
new file mode 100644
index 0000000..480eb27
--- /dev/null
+++ b/patches/json-c-autogen.patch
@@ -0,0 +1,26 @@
+From 6d9437725acbeaf9619beb326d6363e7dd96f1e2 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Wed, 11 Jul 2012 15:33:49 -0400
+Subject: [PATCH] autogen.sh: Add /bin/sh interpreter, honor NOCONFIGURE=1
+
+First, we should be able to execute as "./autogen.sh".  Second,
+add support for NOCONFIGURE=1.  For more information,
+see http://people.gnome.org/~walters/docs/build-api.txt
+---
+ autogen.sh |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index 990096c..169d689 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -1,2 +1,5 @@
++#!/bin/sh
+ autoreconf -v --install || exit 1
+-exec ./configure  "$@"
++if test -z "$NOCONFIGURE"; then
++    exec ./configure  "$@"
++fi
+-- 
+1.7.10.4
+