[jhbuild] core-deps-3.14/3.16/3.18: Remove libxkbcommon autogenargs

[Ting-Wei Lan <lantw src gnome org>]

commit 04fb017a67dd3dbbc6233ef9916726c0df970aca
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Wed Oct 29 21:14:00 2014 +0800

    core-deps-3.14/3.16/3.18: Remove libxkbcommon autogenargs
    
    The --with-xkb-config-root option is not needed because its configure
    script already uses 'pkg-config --variable=xkb_base xkeyboard-config' to
    get the value. We should stop using this option to prevent gnome-shell from
    crashing on systems which does not have xkeyboard-config installed in
    the expected location.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=735988

 modulesets/gnome-suites-core-deps-3.14.modules |    3 ++-
 modulesets/gnome-suites-core-deps-3.16.modules |    3 ++-
 modulesets/gnome-suites-core-deps-3.18.modules |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.14.modules b/modulesets/gnome-suites-core-deps-3.14.modules
index c81dd65..e1a0376 100644
--- a/modulesets/gnome-suites-core-deps-3.14.modules
+++ b/modulesets/gnome-suites-core-deps-3.14.modules
@@ -1315,9 +1315,10 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libxkbcommon" autogenargs="--with-xkb-config-root=/usr/share/X11/xkb">
+  <autotools id="libxkbcommon">
     <branch repo="github.com" checkoutdir="libxkbcommon" module="xkbcommon/libxkbcommon.git"/>
     <dependencies>
+      <dep package="xkeyboard-config"/>
       <dep package="xorg-x11-util-macros"/>
       <dep package="xorg-xproto"/>
       <dep package="xorg-kbproto"/>
diff --git a/modulesets/gnome-suites-core-deps-3.16.modules b/modulesets/gnome-suites-core-deps-3.16.modules
index afe61db..0663500 100644
--- a/modulesets/gnome-suites-core-deps-3.16.modules
+++ b/modulesets/gnome-suites-core-deps-3.16.modules
@@ -1233,13 +1233,14 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libxkbcommon" autogenargs="--with-xkb-config-root=/usr/share/X11/xkb">
+  <autotools id="libxkbcommon">
     <branch repo="libxkbcommon"
             module="http://xkbcommon.org/download/libxkbcommon-${version}.tar.xz";
             version="0.5.0"
             hash="sha256:90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c"
             size="615504"/>
     <dependencies>
+      <dep package="xkeyboard-config"/>
       <dep package="xorg-macros"/>
       <dep package="xorg-xproto"/>
       <dep package="xorg-kbproto"/>
diff --git a/modulesets/gnome-suites-core-deps-3.18.modules b/modulesets/gnome-suites-core-deps-3.18.modules
index dd119fd..bd7fe1d 100644
--- a/modulesets/gnome-suites-core-deps-3.18.modules
+++ b/modulesets/gnome-suites-core-deps-3.18.modules
@@ -1233,13 +1233,14 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libxkbcommon" autogenargs="--with-xkb-config-root=/usr/share/X11/xkb">
+  <autotools id="libxkbcommon">
     <branch repo="libxkbcommon"
             module="http://xkbcommon.org/download/libxkbcommon-${version}.tar.xz";
             version="0.5.0"
             hash="sha256:90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c"
             size="615504"/>
     <dependencies>
+      <dep package="xkeyboard-config"/>
       <dep package="xorg-macros"/>
       <dep package="xorg-xproto"/>
       <dep package="xorg-kbproto"/>