[gtk-osx] Update versions and autogenargs for meta-gtk-osx-freetype.

[John Ralls <jralls src gnome org>]

commit 643ab1c831f7577a4692d87e6f1bfce68a77dc4f
Author: John Ralls <jralls ceridwen us>
Date:   Sat Mar 1 11:18:05 2014 -0800

    Update versions and autogenargs for meta-gtk-osx-freetype.

 modulesets-stable/gtk-osx-bootstrap.modules   |   11 ++++++-----
 modulesets-unstable/gtk-osx-bootstrap.modules |    4 ++--
 modulesets/gtk-osx-bootstrap.modules          |   10 +++++-----
 3 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index e7e4a6f..84df077 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -106,8 +106,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="harfbuzz" autogen-sh="configure">
-    <branch repo="harfbuzz" module="harfbuzz-0.9.10.tar.bz2" version="0.9.10"/>
+  <autotools id="harfbuzz" autogen-sh="configure" autogenargs="--with-coretext">
+    <branch repo="harfbuzz" module="harfbuzz-0.9.26.tar.bz2" version="0.9.26"/>
     <dependencies>
       <dep package="freetype"/>
       <dep package="fontconfig"/>
@@ -115,8 +115,9 @@
     </dependencies>
   </autotools>
 
-  <autotools id="freetype" autogen-sh="configure" skip-autogen="never">
-    <branch module="freetype/freetype-2.4.10.tar.gz" version="2.4.10"
+  <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"
             repo="sourceforge">
     </branch>
     <dependencies>
@@ -126,7 +127,7 @@
 
   <autotools id="fontconfig" autogen-sh="autoreconf"
             autogenargs="--disable-docs">
-    <branch repo="fontconfig" version="2.10.91" module="fontconfig-2.10.91.tar.gz"/>
+    <branch repo="fontconfig" version="2.11.0" module="fontconfig-2.11.0.tar.gz"/>
     <dependencies>
       <dep package="freetype"/>
     </dependencies>
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 5786207..64fa837 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -108,7 +108,7 @@
   </autotools>
 
 
-  <autotools id="harfbuzz">
+  <autotools id="harfbuzz" autogenargs="--with-coretext">
     <branch repo="freedesktop" module="harfbuzz">
       <patch 
href="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-53815-CoreText-backend-doesn-t-link.patch"/>
     </branch>
@@ -132,7 +132,7 @@
 -->
 
 
-  <autotools id="freetype" skip-autogen="never"
+  <autotools id="freetype" skip-autogen="never" autogenargs="--without-bzip2"
             autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s 
--libdir %(libdir)s %(autogenargs)s"
             supports-non-srcdir-builds="no">
     <branch module="freetype/freetype2" repo="nongnu"/>
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 429dd90..dcd7514 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -102,8 +102,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="harfbuzz">
-    <branch repo="freedesktop" tag="0.9.5"/>
+  <autotools id="harfbuzz" autogenargs="--with-coretext">
+    <branch repo="freedesktop" tag="0.9.26"/>
     <dependencies>
       <dep package="freetype"/>
       <dep package="fontconfig"/>
@@ -111,15 +111,15 @@
     </dependencies>
   </autotools>
 
-  <autotools id="freetype" skip-sutogen="never">
-    <branch module="freetype/freetype2" tag="VER-2-4-10" repo="nongnu"/>
+  <autotools id="freetype" skip-sutogen="never" autogenargs="--without-bzip2">
+    <branch module="freetype/freetype2" tag="VER-2-5-2" repo="nongnu"/>
     <dependencies>
       <dep package="zlib"/>
     </dependencies>
  </autotools>
 
   <autotools id="fontconfig" autogenargs="--disable-docs">
-    <branch repo="freedesktop" tag="2.10.1"/>
+    <branch repo="freedesktop" tag="2.11.0"/>
     <dependencies>
       <dep package="freetype"/>
     </dependencies>