[jhbuild] 3.22: update pinyin stack

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 50ec26bb65ff1386f19b263e1a7142f82a1392c2
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Wed Sep 7 16:58:59 2016 -0500

    3.22: update pinyin stack
    
    ibus-libpinyin has been broken for a while. Seems there are API changes
    in libpinyin, so it probably can't be a sysdep anymore.

 modulesets/gnome-suites-core-deps-3.22.modules |   17 +++++++++++++++--
 modulesets/gnome-sysdeps-3.22.modules          |   10 +++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.22.modules b/modulesets/gnome-suites-core-deps-3.22.modules
index d3a5079..d0c3510 100644
--- a/modulesets/gnome-suites-core-deps-3.22.modules
+++ b/modulesets/gnome-suites-core-deps-3.22.modules
@@ -939,10 +939,10 @@
              autogenargs="--disable-lua-extension --with-python=python3"
              supports-non-srcdir-builds="no">
     <branch repo="github-tar"
-            version="1.7.4"
+            version="1.8.0"
             module="libpinyin/ibus-libpinyin/archive/${version}.tar.gz"
             checkoutdir="ibus-libpinyin-${version}"
-            hash="sha256:4627eab10ded24bd1a95ee56a2f7bd6a82deb94435aea674267fc40febd66f81"/>
+            hash="sha256:c8f9fbd374273f6210afb6e647dac4574dd0a7c3c4d8d57d2e8592c33a25296d"/>
     <dependencies>
       <dep package="ibus"/>
       <dep package="libpinyin"/>
@@ -1191,6 +1191,19 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libpinyin"
+             autogenargs="--with-dbm=KyotoCabinet">
+    <branch repo="github-tar"
+            version="1.6.0"
+            module="libpinyin/libpinyin/archive/${version}.tar.gz"
+            checkoutdir="libpinyin-${version}"
+            hash="sha256:ca4a33f01fb4301cfad1f977276823f0172b1aa5736046a5c2ca73c474386e37"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="kyotocabinet"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="osinfo-db-tools">
     <branch repo="gitlab.com" module="libosinfo/osinfo-db-tools.git"/>
     <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.22.modules b/modulesets/gnome-sysdeps-3.22.modules
index ec0d00a..500a6f3 100644
--- a/modulesets/gnome-sysdeps-3.22.modules
+++ b/modulesets/gnome-sysdeps-3.22.modules
@@ -385,6 +385,11 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="kyotocabinet">
+    <branch repo="system"/>
+    <pkg-config>kyotocabinet.pc</pkg-config>
+  </systemmodule>
+
   <systemmodule id="lcms2">
     <pkg-config>lcms2.pc</pkg-config>
     <branch repo="system"
@@ -651,11 +656,6 @@
             version="0.9.4"/>
   </systemmodule>
 
-  <systemmodule id="libpinyin">
-    <pkg-config>libpinyin.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="libpng">
     <pkg-config>libpng.pc</pkg-config>
     <branch repo="system"/>