[gnome-ostree] 3.6: Update xkeyboard-config patch

[Colin Walters <walters src gnome org>]

commit c041a2fe6c31cdd2e261d14258a63d5429f59659
Author: Colin Walters <walters verbum org>
Date:   Wed May 9 15:35:59 2012 -0400

    3.6: Update xkeyboard-config patch

 gnomeos-3.6.json                       |    2 +-
 patches/xkeyboard-config-autogen.patch |   24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/gnomeos-3.6.json b/gnomeos-3.6.json
index 1a4f9ee..af7640e 100644
--- a/gnomeos-3.6.json
+++ b/gnomeos-3.6.json
@@ -371,7 +371,7 @@
 		{"src": "fd:xkeyboard-config",
 		 "config-opts": ["--with-xkb-rules-symlink=xorg",
 		                 "--with-xkb-base=/usr/share/X11/xkb"],
-		 "patches": ["xorg-autogen.patch"]},
+		 "patches": ["xkeyboard-config-autogen.patch"]},
 
 		{"src": "fd:xorg/xserver",
 		 "patches": ["xorg-autogen.patch"]},
diff --git a/patches/xkeyboard-config-autogen.patch b/patches/xkeyboard-config-autogen.patch
new file mode 100644
index 0000000..a9ada6a
--- /dev/null
+++ b/patches/xkeyboard-config-autogen.patch
@@ -0,0 +1,24 @@
+From 726dfcee576ffaaa2fa486411a1891b4600ed5cc Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Wed, 9 May 2012 14:56:15 -0400
+Subject: [PATCH] autogen.sh: Honor NOCONFIGURE=1
+
+---
+ autogen.sh |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index f9c2384..34b7145 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -10,4 +10,6 @@ autopoint --force
+ AUTOPOINT='intltoolize --automake --copy' autoreconf -v --install --force || exit 1
+ 
+ cd $ORIGDIR || exit $?
+-$srcdir/configure --enable-maintainer-mode "$@"
++if test -z "$NOCONFIGURE"; then
++    $srcdir/configure --enable-maintainer-mode "$@"
++fi
+-- 
+1.7.7.6
+