[jhbuild] core-deps-3.4: add patch for libxklavier 5.2

[Ryan Lortie <ryanl src gnome org>]

commit f659785b49431506408de6941e8e9c7b3e1fd918
Author: Ryan Lortie <desrt desrt ca>
Date:   Wed Feb 15 05:07:47 2012 -0500

    core-deps-3.4: add patch for libxklavier 5.2
    
    The released tarball contains a bug that causes introspection to break
    the build.  Adding a patch cherry-picked from upstream git master to
    solve that.  Hopefully a new release will be along soon.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=670123

 modulesets/gnome-suites-core-deps-3.4.modules |    5 ++++-
 patches/libxklavier-5.2-introspection.patch   |   22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.4.modules b/modulesets/gnome-suites-core-deps-3.4.modules
index 9979cd5..4870e2f 100644
--- a/modulesets/gnome-suites-core-deps-3.4.modules
+++ b/modulesets/gnome-suites-core-deps-3.4.modules
@@ -977,7 +977,10 @@
             module="libxklavier/5.2/libxklavier-5.2.tar.xz"
             version="5.2"
             hash="sha256:7c1f04a80035e03cec992e16b89bc708a32b3578d6e133343d2cb56385d25dfe"
-            size="312864"/>
+            size="312864">
+      <!-- This patch is in upstream git.  Remove it for releases after 5.2. -->
+      <patch file="libxklavier-5.2-introspection.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="gtk-doc"/>
diff --git a/patches/libxklavier-5.2-introspection.patch b/patches/libxklavier-5.2-introspection.patch
new file mode 100644
index 0000000..703de8c
--- /dev/null
+++ b/patches/libxklavier-5.2-introspection.patch
@@ -0,0 +1,22 @@
+commit 57785c952444e4cb9d13e43d4f9cc9713d66958b
+Author: Martin Pitt <martin pitt ubuntu com>
+Date:   Mon Jan 16 16:00:18 2012 +0100
+
+    Use local include files for building GIR
+    
+    Add -I argument for g-ir-scanner to use the include files from the local tree
+    instead of the ones installed in the system.
+
+diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am
+index 6c8631a..c53ff6d 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 = $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS)
++Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) $(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