[jhbuild] 3.24: Move caribou to sysdeps

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 6aa574d96b255ffbcfd29621ed2dcca8bd7ca0f4
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Dec 11 14:41:10 2016 -0600

    3.24: Move caribou to sysdeps
    
    This is not ideal, because it is hosted on git.gnome.org so we should
    prefer to build it from git, but the build currently depends on
    python2-pygobject, which we don't want to bring back, so get rid of
    caribou for now.

 modulesets/gnome-suites-core-deps-3.24.modules |   12 ------------
 modulesets/gnome-sysdeps-3.24.modules          |    5 +++++
 2 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.24.modules b/modulesets/gnome-suites-core-deps-3.24.modules
index e258964..e00165b 100644
--- a/modulesets/gnome-suites-core-deps-3.24.modules
+++ b/modulesets/gnome-suites-core-deps-3.24.modules
@@ -155,18 +155,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="caribou" autogenargs="--disable-gtk2-module">
-    <branch/>
-    <dependencies>
-      <dep package="pygobject"/>
-      <dep package="gtk+-3"/>
-      <dep package="clutter"/>
-      <dep package="libgee"/>
-      <dep package="libxklavier"/>
-      <dep package="vala"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="clutter" autogenargs="--enable-installed-tests --disable-maintainer-flags">
     <if condition-unset="quartz">
       <autogenargs value="--enable-egl-backend"/>
diff --git a/modulesets/gnome-sysdeps-3.24.modules b/modulesets/gnome-sysdeps-3.24.modules
index 74bc73c..773c21b 100644
--- a/modulesets/gnome-sysdeps-3.24.modules
+++ b/modulesets/gnome-sysdeps-3.24.modules
@@ -66,6 +66,11 @@
     <branch repo="system" version="1.14.0"/>
   </systemmodule>
 
+  <systemmodule id="caribou">
+    <pkg-config>caribou-1.0.pc</pkg-config>
+    <branch repo="system"/>
+  </systemmodule>
+
   <systemmodule id="c++">
     <branch repo="system"/>
     <systemdependencies>