[gtk-osx] Adjust unstable Pango for the new Harfbuzz, CoreText-only configuration

[John Ralls <jralls src gnome org>]

commit d7cda77d94ef9275384378cd94ceb29f6213736f
Author: John Ralls <jralls ceridwen us>
Date:   Sun Aug 19 13:32:28 2012 -0700

    Adjust unstable Pango for the new Harfbuzz, CoreText-only configuration

 modulesets-unstable/gtk-osx.modules |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 4511ee5..71cc700 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -5,8 +5,10 @@
   <repository type="git" name="git.gnome.org" default="yes"
               href="git://git.gnome.org/"/>
   <repository type="git" name="github" href="git://github.com/"/>
-  <repository type="git" name="cairographics" 
+  <repository type="git" name="freedesktop"
               href="git://anongit.freedesktop.org/git/"/>
+  <repository type="tarball" name="complang"
+	      href="http://www.complang.org/"/>
 
   <!-- This module set works a bit differently than for example the
        GNOME ones do. It's split up in seperate pieces:
@@ -82,12 +84,13 @@
     </dependencies>
   </autotools>
 
-  <autotools id="pango" 
-             autogenargs="--without-x --with-included-modules=basic-atsui"
+  <autotools id="pango"
+             autogenargs="--with-included-modules=basic-coretext --disable-introspection"
              makeargs="-k -C modules; make">
     <branch />
     <dependencies>
       <dep package="cairo"/>
+      <dep package="harfbuzz"/>
       <dep package="fontconfig"/>
       <dep package="freetype"/>
       <dep package="glib"/>
@@ -161,14 +164,14 @@
   </autotools>
 
   <autotools id="pixman" autogenargs="--disable-gtk --disable-openmp">
-    <branch repo="cairographics" module="pixman" />
+    <branch repo="freedesktop" module="pixman" />
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
   </autotools>
 
   <autotools id="cairo" autogenargs="--enable-pdf --enable-quartz --enable-xlib=no --without-x">
-    <branch repo="cairographics" module="cairo" />
+    <branch repo="freedesktop" module="cairo" />
     <dependencies>
       <dep package="pixman"/>
     </dependencies>
@@ -180,6 +183,22 @@
     </after>
   </autotools>
 
+<!-- Ragel, like Vala, isn't bootstrappable from git, so we might as well just use the tarball. -->
+  <autotools id="ragel">
+    <branch repo="complang" module="ragel/ragel-6.7.tar.gz" version="6.7"/>
+  </autotools>
+
+  <autotools id="harfbuzz">
+    <branch repo="freedesktop" module="harfbuzz"/>
+    <dependencies>
+      <dep package="ragel"/>
+    </dependencies>
+    <after>
+      <dep package="glib"/>
+      <dep package="cairo"/>
+    </after>
+  </autotools>
+
   <autotools id="gtk-mac-integration" autogenargs="--disable-python">
     <branch/>
     <after>