[jhbuild] core-deps-3.26: Build freetype2 from tarball

[Emmanuele Bassi <ebassi src gnome org>]

commit f140a3bcb8c3a86d0fd46fefeb6ead30b5d73362
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Jun 9 12:33:21 2017 +0100

    core-deps-3.26: Build freetype2 from tarball
    
    Versions prior 2.8 have a bug in the ft-config.h header that trips
    everything building with `-Wundef`. The new 2.8 release of freetype
    fixes this issue.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=783179

 modulesets/gnome-suites-core-deps-3.26.modules |   16 ++++++++++++++++
 modulesets/gnome-sysdeps-3.26.modules          |    6 ------
 2 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.26.modules b/modulesets/gnome-suites-core-deps-3.26.modules
index eec1617..c8075f8 100644
--- a/modulesets/gnome-suites-core-deps-3.26.modules
+++ b/modulesets/gnome-suites-core-deps-3.26.modules
@@ -70,6 +70,8 @@
     href="https://people.mozilla.org/~sstangl/"/>
 <repository type="tarball" name="mozilla2"
     href="https://people-mozilla.org/~sfink/"/>
+<repository type="tarball" name="savannah-download"
+    href="http://download.savannah.gnu.org/releases/"/>
 
 <include href="gnome-sysdeps-3.26.modules"/>
 
@@ -339,6 +341,20 @@
     </suggests>
   </autotools>
 
+  <autotools id="freetype2" autogen-sh="configure">
+    <pkg-config>freetype2.pc</pkg-config>
+    <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 3238d8c..63b8cbf 100644
--- a/modulesets/gnome-sysdeps-3.26.modules
+++ b/modulesets/gnome-sysdeps-3.26.modules
@@ -224,12 +224,6 @@
             version="2.11.0"/>
   </systemmodule>
 
-  <systemmodule id="freetype2">
-    <pkg-config>freetype2.pc</pkg-config>
-    <branch repo="system"
-            version="2.4.9"/>
-  </systemmodule>
-
   <systemmodule id="gbm">
     <pkg-config>gbm.pc</pkg-config>
     <branch repo="system"/>