[gtk-osx] Reconcile gtk-osx-bootstrap.modules between modulesets.

[John Ralls <jralls src gnome org>]

commit 60639adfc55ae4709c5c8fc4f424506ce34d58b8
Author: John Ralls <jralls ceridwen us>
Date:   Mon Nov 19 08:33:09 2012 +0900

    Reconcile gtk-osx-bootstrap.modules between modulesets.

 modulesets-unstable/gtk-osx-bootstrap.modules |   11 +++++++----
 modulesets/gtk-osx-bootstrap.modules          |    6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 63c2e00..717be9f 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -55,15 +55,17 @@
      module won't link. In case you're wondering, gnome-doc-utils
      needs libxml2's python module. -->
   <autotools id="libxml2" autogen-sh="configure">
-    <branch version="2.7.8" module="libxml2-2.7.8.tar.gz"
-	    repo="xmlsoft.org"/>
+   <branch version="2.9.0" module="libxml2-2.9.0.tar.gz"
+	    repo="xmlsoft.org">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/libxml2-Bug-686118-pthreads_once_init.patch"; strip="1"/>
+    </branch>
     <dependencies>
       <dep package="python2.7"/>
     </dependencies>
   </autotools>
 
   <autotools id="libxslt" autogen-sh="configure">
-    <branch version="1.1.26" module="libxslt-1.1.26.tar.gz"
+    <branch version="1.1.27" module="libxslt-1.1.27.tar.gz"
 	    repo="xmlsoft.org"/>
     <dependencies>
       <dep package="libxml2"/>
@@ -130,7 +132,7 @@
   <perl id="perl-xml-simple">
     <branch repo="cpan"
         module="authors/id/G/GR/GRANTM/XML-Simple-2.20.tar.gz" version="2.20"
-        size="71129" md5sum="593aa8001e5c301cdcdb4bb3b63abc33"/>
+        size="75993" md5sum="4d10964e123b76eca36678464daa63cd"/>
     <dependencies>
       <dep package="perl-xml-parser"/>
     </dependencies>
@@ -187,6 +189,7 @@
 
   <metamodule id="meta-gtk-osx-freetype">
     <dependencies>
+      <dep package="harfbuzz"/>
       <dep package="freetype"/>
       <dep package="fontconfig"/>
       <dep package="expat"/>
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index c14794e..921beb5 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -49,7 +49,7 @@
     </dependencies>
   </autotools>
 
- <!-- The python package is in gtk-osx-python.modules. If you're
+<!-- The python package is in gtk-osx-python.modules. If you're
      building "native" you can safely add python to the skip list, but
      otherwise the links in the SDKs are messed up and libxml's python
      module won't link. In case you're wondering, gnome-doc-utils
@@ -57,7 +57,7 @@
   <autotools id="libxml2" autogen-sh="configure">
    <branch version="2.9.0" module="libxml2-2.9.0.tar.gz"
 	    repo="xmlsoft.org">
-      <patch file="///Users/john/Development/GTK-OSX/gtk-osx-build/patches/libxml2-Bug-686118-pthreads_once_init.patch" strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/libxml2-Bug-686118-pthreads_once_init.patch"; strip="1"/>
     </branch>
     <dependencies>
       <dep package="python"/>
@@ -132,7 +132,7 @@
   <perl id="perl-xml-simple">
     <branch repo="cpan"
         module="authors/id/G/GR/GRANTM/XML-Simple-2.20.tar.gz" version="2.20"
-        size="71129" md5sum="593aa8001e5c301cdcdb4bb3b63abc33"/>
+        size="75993" md5sum="4d10964e123b76eca36678464daa63cd"/>
     <dependencies>
       <dep package="perl-xml-parser"/>
     </dependencies>