[jhbuild] 3.20: Move fontconfig back to -sysdeps

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 62f26c53203e9bf14e95a1e9a72f0f9624b6e262
Author: Javier Jardón <jjardon gnome org>
Date:   Fri Oct 23 20:13:11 2015 +0100

    3.20: Move fontconfig back to -sysdeps
    
    Build fontconfig ourselves was a tempary solution, see
    4a2b2c03af089442b3b31b3846310da0a8587860

 modulesets/gnome-suites-core-deps-3.20.modules |   13 -------------
 modulesets/gnome-sysdeps-3.20.modules          |    6 ++++++
 2 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index 4131e4e..392c798 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -490,19 +490,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="fontconfig"
-    autogenargs="--disable-docs --with-default-fonts=${prefix}/share/fonts 
--with-add-fonts=/usr/local/share/fonts,/usr/share/fonts">
-    <pkg-config>fontconfig.pc</pkg-config>
-    <branch repo="freedesktop.org"
-            module="fontconfig/release/fontconfig-${version}.tar.bz2"
-            version="2.11.1"
-            hash="sha256:dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99"/>
-    <dependencies>
-      <dep package="freetype2"/>
-      <dep package="libxml2"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="caribou" autogenargs="--disable-gtk2-module">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.20.modules b/modulesets/gnome-sysdeps-3.20.modules
index 599ad00..fdaf2a6 100644
--- a/modulesets/gnome-sysdeps-3.20.modules
+++ b/modulesets/gnome-sysdeps-3.20.modules
@@ -204,6 +204,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="fontconfig">
+    <pkg-config>fontconfig.pc</pkg-config>
+    <branch repo="system"
+            version="2.11.0"/>
+  </systemmodule>
+
   <systemmodule id="freetype2">
     <pkg-config>freetype2.pc</pkg-config>
     <branch repo="system"