[gtk-osx] Update freetype to 2.5.3 and split

[John Ralls <jralls src gnome org>]

commit ed0ab9a5b7f34dff6408ee5b52111407e70ec7bd
Author: Philip Chimento <philip chimento gmail com>
Date:   Thu Nov 20 21:26:16 2014 -0800

    Update freetype to 2.5.3 and split
    
    Split freetype into two modules across all modulesets -- freetype
    without harfbuzz, which is used to build harfbuzz, and the real freetype
    which depends on harfbuzz and is used to build other packages.

 modulesets-stable/gtk-osx-bootstrap.modules |   13 ++++++++++++-
 modulesets/gtk-osx-bootstrap.modules        |    4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 30ec0cf..ad2b5c4 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -134,12 +134,23 @@
     </dependencies>
   </autotools>
 
+  <autotools id="freetype-no-harfbuzz" autogen-sh="configure"
+             skip-autogen="never"
+             autogenargs="--without-bzip2 --without-harfbuzz">
+    <branch module="freetype/freetype-2.5.3.tar.gz" version="2.5.3"
+            repo="sourceforge"/>
+    <dependencies>
+      <dep package="zlib"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="freetype" autogen-sh="configure" skip-autogen="never"
             autogenargs="--without-bzip2">
-    <branch module="freetype/freetype-2.5.2.tar.gz" version="2.5.2"
+    <branch module="freetype/freetype-2.5.3.tar.gz" version="2.5.3"
             repo="sourceforge">
     </branch>
     <dependencies>
+      <dep package="harfbuzz"/>
       <dep package="zlib"/>
     </dependencies>
   </autotools>
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index acc023c..51b3e73 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -132,7 +132,7 @@
 
   <autotools id="freetype-no-harfbuzz" skip-autogen="never" autogenargs="--without-bzip2 --without-harfbuzz"
             autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s 
--libdir %(libdir)s %(autogenargs)s">
-    <branch module="freetype/freetype2" tag="VER-2-5-2" repo="nongnu"/>
+    <branch module="freetype/freetype2" tag="VER-2-5-3" repo="nongnu"/>
     <dependencies>
       <dep package="zlib"/>
     </dependencies>
@@ -140,7 +140,7 @@
 
   <autotools id="freetype" skip-autogen="never" autogenargs="--without-bzip2"
             autogen-template="make distclean &amp;&amp; %(srcdir)s/autogen.sh &amp;&amp; 
%(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s">
-    <branch module="freetype/freetype2" tag="VER-2-5-2" repo="nongnu"/>
+    <branch module="freetype/freetype2" tag="VER-2-5-3" repo="nongnu"/>
     <dependencies>
       <dep package="harfbuzz"/>
       <dep package="zlib"/>