[ostree] 3.4: Update libxklavier, re-enable-introspection

[Colin Walters <walters src gnome org>]

commit 69d0c00892f91fdd03abea0b53c2846ef8c62c90
Author: Colin Walters <walters verbum org>
Date:   Tue May 1 17:28:25 2012 -0400

    3.4: Update libxklavier, re-enable-introspection
    
    This fixes gnome-shell too.

 gnomeos/3.4/gnomeos-3.4-src.json          |    7 +++----
 gnomeos/3.4/libxklavier-builddir.patch    |   25 +++++++++++++++++++++++++
 gnomeos/3.4/libxklavier-no-builddir.patch |   26 --------------------------
 3 files changed, 28 insertions(+), 30 deletions(-)
---
diff --git a/gnomeos/3.4/gnomeos-3.4-src.json b/gnomeos/3.4/gnomeos-3.4-src.json
index 467d1fd..fa1c79f 100644
--- a/gnomeos/3.4/gnomeos-3.4-src.json
+++ b/gnomeos/3.4/gnomeos-3.4-src.json
@@ -502,11 +502,10 @@
 		             "iso-codes-builddir.patch"]},
 
 		{"src": "fd:libxklavier",
-		 "branch": "v.5.2",
-		 "config-opts": ["--disable-introspection"]},
+		 "patches": ["libxklavier-builddir.patch"],
+		 "branch": "v.5.2.1"},
 
-		{"src": "gnome:libgnomekbd",
-		 "config-opts": ["--disable-introspection"]},
+		{"src": "gnome:libgnomekbd"},
 
 		{"src": "fd-pulse:pulseaudio",
 		 "branch": "v0.9.23",
diff --git a/gnomeos/3.4/libxklavier-builddir.patch b/gnomeos/3.4/libxklavier-builddir.patch
new file mode 100644
index 0000000..380e404
--- /dev/null
+++ b/gnomeos/3.4/libxklavier-builddir.patch
@@ -0,0 +1,25 @@
+From 41e2d4eaec24006139d4e64ee0ae6a21c9ea2d74 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Tue, 1 May 2012 15:59:51 -0400
+Subject: [PATCH] build: Fix srcdir != builddir when introspection is enabled
+
+---
+ libxklavier/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am
+index c53ff6d..5be41b9 100644
+--- a/libxklavier/Makefile.am
++++ b/libxklavier/Makefile.am
+@@ -94,7 +94,7 @@ introspection_sources = $(xklavier_headers) $(filter %.c, $(libxklavier_la_SOURC
+ 
+ Xkl-1.0.gir: libxklavier.la
+ Xkl_1_0_gir_INCLUDES = GObject-2.0 xlib-2.0
+-Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS)
++Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS)
+ Xkl_1_0_gir_LIBS = libxklavier.la
+ Xkl_1_0_gir_FILES = $(xklavier_headers) $(introspection_sources)
+ INTROSPECTION_GIRS += Xkl-1.0.gir
+-- 
+1.7.7.6
+