[jhbuild] 3.20: Move speech-dispatcher back to core-deps

[Michael Catanzaro <mcatanzaro src gnome org>]

commit d6281bd5f1c398c5da19a7ddb50239dbe0ee7ed5
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Mon Feb 1 22:46:57 2016 -0600

    3.20: Move speech-dispatcher back to core-deps
    
    This .pc file doesn't exist in Fedora. Basically the dleyna-renderer
    situation all over again, except this time the .pc file does not seem to
    be removed intentionally... in fact, I have not the faintest clue why it
    is missing.
    
    It really should be in sysdeps, but move it to core-deps until we can
    figure out how to make it work in sysdeps without breaking Fedora.

 modulesets/gnome-suites-core-deps-3.20.modules |   11 +++++++++++
 modulesets/gnome-sysdeps-3.20.modules          |    6 ------
 2 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index 8ce5b95..e2ad1b9 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -1356,6 +1356,17 @@
             size="478237"/>
   </autotools>
 
+  <autotools id="speech-dispatcher" autogenargs="--with-espeak">
+    <branch repo="speech-dispatcher"
+            module="speech-dispatcher-${version}.tar.gz"
+            version="0.8"
+            hash="sha256:0a6ce544cfbac8592a8ea08e3ab24c389153904ea51c6fd68756cea52de9efa2"/>
+    <dependencies>
+      <dep package="dotconf"/>
+      <dep package="espeak"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="spice-gtk" autogenargs="--disable-smartcard --enable-vala --enable-webdav --enable-static">
     <if condition-set="freebsd">
       <autogenargs value="SSL_CFLAGS=' ' SSL_LIBS='-lssl'"/>
diff --git a/modulesets/gnome-sysdeps-3.20.modules b/modulesets/gnome-sysdeps-3.20.modules
index 320efa9..473fafe 100644
--- a/modulesets/gnome-sysdeps-3.20.modules
+++ b/modulesets/gnome-sysdeps-3.20.modules
@@ -1025,12 +1025,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="speech-dispatcher">
-    <pkg-config>speech-dispatcher.pc</pkg-config>
-    <branch repo="system"
-            version="0.8"/>
-  </systemmodule>
-
   <systemmodule id="speex">
     <pkg-config>speex.pc</pkg-config>
     <branch repo="system"