[gtk-osx] Update and reorganize meta-gtk-osx-freetype.

[John Ralls <jralls src gnome org>]

commit 61db4c683da40d84515b480953367c696ea9da17
Author: John Ralls <jralls ceridwen us>
Date:   Wed Jul 31 16:15:50 2019 -0700

    Update and reorganize meta-gtk-osx-freetype.
    
    Harfbuzz can now be built without freetype so freetype-no-harfbuzz isn't
    needed.

 modulesets-stable/gtk-osx-bootstrap.modules | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 64d07e1..b9be568 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -140,12 +140,10 @@
   </autotools>
 
   <autotools id="harfbuzz" autogen-sh="configure"
-             autogenargs="--with-coretext --with-freetype --with-icu">
-    <branch repo="harfbuzz" module="harfbuzz-1.4.5.tar.bz2" version="1..45">
-       <!--patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/harfbuzz-kCTTypesetterOptionForcedEmbeddingLevel-Leopard.patch";
 strip="1"/-->
+             autogenargs="--with-coretext --with-icu">
+    <branch repo="harfbuzz" module="harfbuzz-2.5.3.tar.xz" version="2.5.3">
     </branch>
     <dependencies>
-      <dep package="freetype-no-harfbuzz"/>
       <dep package="ragel"/>
       <dep package="glib"/>
       <dep package="icu"/>
@@ -155,33 +153,20 @@
     </after>
   </autotools>
 
-  <autotools id="freetype-no-harfbuzz" autogen-sh="configure"
+  <autotools id="freetype" autogen-sh="configure"
              skip-autogen="never"
              autogenargs="--without-bzip2 --without-harfbuzz">
-    <branch module="freetype/freetype-2.9.1.tar.gz" version="2.9.1"
+    <branch module="freetype/freetype-2.10.1.tar.gz" version="2.10.1"
             repo="sourceforge">
-      <!--patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/freetype-2.5.3-ccexe_cflags.patch"; 
strip="1"/-->
     </branch>
     <dependencies>
       <dep package="zlib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="freetype" autogen-sh="configure" skip-autogen="never"
-            autogenargs="--without-bzip2">
-    <branch module="freetype/freetype-2.9.1.tar.gz" version="2.9.1"
-            repo="sourceforge">
-    </branch>
-    <dependencies>
-      <dep package="harfbuzz"/>
-      <dep package="zlib"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="fontconfig" autogen-sh="autoreconf"
              autogenargs="--disable-docs 
'--with-add-fonts=/System/Library/Fonts,/Library/Fonts,~/Library/Fonts'">
-    <branch repo="fontconfig" version="2.13.0" module="fontconfig-2.13.0.tar.bz2">
-      <patch file="https://bugs.freedesktop.org/attachment.cgi?id=137886"; strip="1" />
+    <branch repo="fontconfig" version="2.13.1" module="fontconfig-2.13.1.tar.bz2">
     </branch>
     <dependencies>
       <dep package="freetype"/>