[gtk-osx] Update harfbuzz and fontconfig

[John Ralls <jralls src gnome org>]

commit 63ac709e1a7edab4921f9bdb67293ac3ac516b3a
Author: Philip Chimento <philip chimento gmail com>
Date:   Thu Nov 20 21:30:31 2014 -0800

    Update harfbuzz and fontconfig
    
    This also synchronizes their dependencies across modulesets. A harfbuzz
    patch is now obsolete.

 modulesets-stable/gtk-osx-bootstrap.modules        |   11 ++++---
 modulesets-unstable/gtk-osx-bootstrap.modules      |    9 +-----
 modulesets/gtk-osx-bootstrap.modules               |    6 ++--
 ...1-Bug-53815-CoreText-backend-doesn-t-link.patch |   27 --------------------
 4 files changed, 11 insertions(+), 42 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index ad2b5c4..992ecc7 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -125,11 +125,11 @@
     </dependencies>
   </autotools>
 
-  <autotools id="harfbuzz" autogen-sh="configure" autogenargs="--with-coretext">
-    <branch repo="harfbuzz" module="harfbuzz-0.9.26.tar.bz2" version="0.9.26"/>
+  <autotools id="harfbuzz" autogen-sh="configure"
+             autogenargs="--with-coretext --with-freetype">
+    <branch repo="harfbuzz" module="harfbuzz-0.9.35.tar.bz2" version="0.9.35"/>
     <dependencies>
-      <dep package="freetype"/>
-      <dep package="fontconfig"/>
+      <dep package="freetype-no-harfbuzz"/>
       <dep package="glib"/>
     </dependencies>
   </autotools>
@@ -157,7 +157,8 @@
 
   <autotools id="fontconfig" autogen-sh="autoreconf"
             autogenargs="--disable-docs">
-    <branch repo="fontconfig" version="2.11.0" module="fontconfig-2.11.0.tar.gz"/>
+    <branch repo="fontconfig" version="2.11.1"
+            module="fontconfig-2.11.1.tar.bz2"/>
     <dependencies>
       <dep package="freetype"/>
     </dependencies>
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 52cf9db..9a574e6 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -129,17 +129,12 @@
 
  
   <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>
+    <branch repo="freedesktop" module="harfbuzz"/>
     <dependencies>
       <dep package="freetype-no-harfbuzz"/>
       <dep package="ragel"/>
-    </dependencies>
-    <after>
       <dep package="glib"/>
-      <dep package="cairo"/>
-    </after>
+    </dependencies>
   </autotools>
 
   <autotools id="freetype" skip-autogen="never" autogenargs="--without-bzip2"
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 51b3e73..f9f29b9 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -121,8 +121,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="harfbuzz" autogenargs="--with-coretext">
-    <branch repo="freedesktop" tag="0.9.26"/>
+  <autotools id="harfbuzz" autogenargs="--with-coretext --with-freetype">
+    <branch repo="freedesktop" tag="0.9.35"/>
     <dependencies>
       <dep package="freetype-no-harfbuzz"/>
       <dep package="ragel"/>
@@ -148,7 +148,7 @@
  </autotools>
 
   <autotools id="fontconfig" autogenargs="--disable-docs">
-    <branch repo="freedesktop" tag="2.11.0"/>
+    <branch repo="freedesktop" tag="2.11.1"/>
     <dependencies>
       <dep package="freetype"/>
     </dependencies>