[jhbuild] 3.26: Drop freetype2 down to sysdeps

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 3651caefafcc5929440e17d789a9a66146ce3ece
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Wed Aug 16 12:15:41 2017 -0500

    3.26: Drop freetype2 down to sysdeps
    
    freetype2 is now banned from core-deps! Darn circular dependencies.

 modulesets/gnome-suites-core-deps-3.26.modules |   13 -------------
 modulesets/gnome-sysdeps-3.26.modules          |   10 ++++++++++
 2 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.26.modules b/modulesets/gnome-suites-core-deps-3.26.modules
index 4c5a713..240ee45 100644
--- a/modulesets/gnome-suites-core-deps-3.26.modules
+++ b/modulesets/gnome-suites-core-deps-3.26.modules
@@ -335,19 +335,6 @@ the module and we will just change it to use a tarball anyway.
     </suggests>
   </autotools>
 
-  <autotools id="freetype2" autogen-sh="configure">
-    <branch repo="savannah-download"
-            module="freetype/freetype-2.8.tar.bz2"
-            version="2.8.0"
-            hash="sha256:a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b"
-            size="1873526"/>
-    <dependencies>
-      <dep package="zlib"/>
-      <dep package="libpng"/>
-      <dep package="harfbuzz"/>
-    </dependencies>
-  </autotools>
-
   <meson id="fwupd"
          mesonargs="-Denable-colorhug=false -Denable-uefi=false -Denable-dell=false">
     <branch repo="github.com" checkoutdir="fwupd" module="hughsie/fwupd"/>
diff --git a/modulesets/gnome-sysdeps-3.26.modules b/modulesets/gnome-sysdeps-3.26.modules
index 54070ae..13b7c1c 100644
--- a/modulesets/gnome-sysdeps-3.26.modules
+++ b/modulesets/gnome-sysdeps-3.26.modules
@@ -229,6 +229,16 @@
             version="2.11.0"/>
   </systemmodule>
 
+  <!-- Do not move this to core-deps! There is a circular dependency between
+       freetype2 and harfbuzz. If you need a newer version of freetype2 than is
+       available via sysdeps then you are simply out of luck. Note the
+       pkg-config version is nonsense, so be careful with that. -->
+  <systemmodule id="freetype2">
+    <pkg-config>freetype2.pc</pkg-config>
+    <branch repo="system"
+            version="12.0.6"/>
+  </systemmodule>
+
   <systemmodule id="gbm">
     <pkg-config>gbm.pc</pkg-config>
     <branch repo="system"/>