[gtk-osx] Implement two-phase build for freetype when built from git.

[John Ralls <jralls src gnome org>]

commit 94d1c5b58651c854c78e05efe5843fe66cecf9e7
Author: John Ralls <jralls ceridwen us>
Date:   Tue Mar 4 14:31:44 2014 -0800

    Implement two-phase build for freetype when built from git.
    
    https://bugzilla.freedesktop.org/show_bug.cgi?id=75652

 modulesets-unstable/gtk-osx-bootstrap.modules |   19 ++++++++++++++-----
 modulesets/gtk-osx-bootstrap.modules          |   16 ++++++++++++----
 2 files changed, 26 insertions(+), 9 deletions(-)
---
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 9accecb..57734ac 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -107,14 +107,22 @@
     </dependencies>
   </autotools>
 
+  <autotools id="freetype-no-harfbuzz" skip-sutogen="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"
+            supports-non-srcdir-builds="no">
+    <branch module="freetype/freetype2" repo="nongnu"/>
+    <dependencies>
+      <dep package="zlib"/>
+    </dependencies>
+  </autotools>
 
+ 
   <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>
     <dependencies>
-      <dep package="freetype"/>
-      <dep package="fontconfig"/>
+      <dep package="freetype-no-harfbuzz"/>
       <dep package="ragel"/>
     </dependencies>
     <after>
@@ -124,10 +132,11 @@
   </autotools>
 
   <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"
+            autogen-template="make distclean &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s --libdir 
%(libdir)s %(autogenargs)s"
             supports-non-srcdir-builds="no">
     <branch module="freetype/freetype2" repo="nongnu"/>
     <dependencies>
+      <dep package="harfbuzz"/>
       <dep package="zlib"/>
     </dependencies>
   </autotools>
@@ -170,8 +179,8 @@
 
   <metamodule id="meta-gtk-osx-freetype">
     <dependencies>
-      <dep package="harfbuzz"/>
-      <dep package="freetype"/>
+      <!--dep package="harfbuzz"/>
+      <dep package="freetype"/-->
       <dep package="fontconfig"/>
     </dependencies>
   </metamodule>
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index dcd7514..6343b1f 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -105,15 +105,25 @@
   <autotools id="harfbuzz" autogenargs="--with-coretext">
     <branch repo="freedesktop" tag="0.9.26"/>
     <dependencies>
-      <dep package="freetype"/>
+      <dep package="freetype-no-harfbuzz"/>
       <dep package="fontconfig"/>
       <dep package="glib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="freetype" skip-sutogen="never" autogenargs="--without-bzip2">
+  <autotools id="freetype-no-harfbuzz" skip-sutogen="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"/>
+    <dependencies>
+      <dep package="zlib"/>
+    </dependencies>
+ </autotools>
+
+  <autotools id="freetype" skip-sutogen="never" autogenargs="--without-bzip2"
+            autogen-template="make distclean &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s --libdir 
%(libdir)s %(autogenargs)s">
     <branch module="freetype/freetype2" tag="VER-2-5-2" repo="nongnu"/>
     <dependencies>
+      <dep package="harfbuzz"/>
       <dep package="zlib"/>
     </dependencies>
  </autotools>
@@ -157,8 +167,6 @@
 
   <metamodule id="meta-gtk-osx-freetype">
     <dependencies>
-      <dep package="harfbuzz"/>
-      <dep package="freetype"/>
       <dep package="fontconfig"/>
     </dependencies>
   </metamodule>