[gtk-osx] Move libxml2 and libxslt into gtk-osx-bootstrap.modules

[John Ralls <jralls src gnome org>]

commit 5a78ebfc78493c8c13499e13aaecea3e63fc859b
Author: John Ralls <jralls ceridwen us>
Date:   Mon Nov 7 17:58:46 2011 -0800

    Move libxml2 and libxslt into gtk-osx-bootstrap.modules
    
    Having them in bootstrap.modules made dependency tracking difficult. Furthermore, the Apple-provided ones didn't install the python modules needed for gnome-doc-utils, so the skips are removed from .jhbuildrc

 jhbuildrc-gtk-osx                             |    9 ---------
 modulesets-stable/bootstrap.modules           |   17 -----------------
 modulesets-stable/gtk-osx-bootstrap.modules   |   17 ++++++++++++++++-
 modulesets-unstable/gtk-osx-bootstrap.modules |   19 +++++++++++++++++++
 modulesets/gtk-osx-bootstrap.modules          |   15 +++++++++++++++
 5 files changed, 50 insertions(+), 27 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index b620579..9c0e82f 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -199,15 +199,6 @@ def setup_sdk(target, sdk_version, architectures=[_default_arch]):
             #
             os.environ["CUPS_CONFIG"] = os.path.join(sdkdir,
                                                      "usr/bin/cups-config")
-    if (sdk_version == "10.6" or
-        ((_osx_version.startswith("10") or _osx_version.startswith("11") )
-         and sdk_version == "native")):
-            # Use libxml/libxslt from the system. Append to the
-            # pkg-config path to get the system versions picked up.
-            #
-            skip.append("libxml2")
-            skip.append("libxslt")
-            addpath("PKG_CONFIG_PATH", "/usr/lib/pkgconfig")
 
     #Glib and autoconf-2.63 have issues with endianness
     #
diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index be47c72..bf981f0 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/bootstrap.modules
@@ -9,8 +9,6 @@
       href="http://www.python.org/ftp/python/"/>
   <repository type="tarball" name="sourceforge"
       href="http://downloads.sourceforge.net/sourceforge/"/>
-  <repository type="tarball" name="xmlsoft.org"
-	      href="ftp://xmlsoft.org/libxml2/"/>
   <repository type="tarball" name="tukaani.org"
 	      href="http://tukaani.org/"/>
 
@@ -89,19 +87,6 @@
             module="pkg-config-0.25.tar.gz" version="0.25"/>
   </autotools>
 
-   <autotools id="libxml2" autogen-sh="configure">
-    <branch version="2.7.8" module="libxml2-2.7.8.tar.gz"
-	    repo="xmlsoft.org"/>
-  </autotools>
-
-  <autotools id="libxslt" autogen-sh="configure">
-    <branch version="1.1.26" module="libxslt-1.1.26.tar.gz"
-	    repo="xmlsoft.org"/>
-    <dependencies>
-      <dep package="libxml2"/>
-    </dependencies>
-  </autotools>
-
   <!-- 10.4 has 1.28 which is too old, 10.5 & 10.6 have 2.3 which is OK. -->
   <autotools id="bison" autogen-sh="configure">
     <branch repo="ftp.gnu.org" module="bison/bison-2.4.1.tar.bz2"
@@ -126,8 +111,6 @@
       <dep package="automake-1.10" />
       <dep package="automake-1.11" />
       <dep package="pkg-config" />
-      <dep package="libxml2"/> <!-- included for compatibility -->
-      <dep package="libxslt"/> <!-- included for compatibility -->
       <dep package="bison"/>   <!-- included for Tiger, skipped otherwise -->
       <dep package="flex"/>    <!-- included for Tiger, skipped otherwise -->
       <dep package="readline"/>
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 717aed1..05fbad6 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -19,6 +19,8 @@
 	      href="http://icon-theme.freedesktop.org/releases/"/>
   <repository type="tarball" name="cmake"
 	      href="http://www.cmake.org/files/"/>
+  <repository type="tarball" name="xmlsoft.org"
+	      href="ftp://xmlsoft.org/libxml2/"/>
 
 <!-- Libpng-1.5 has made private struct definitions; gdk-pixbuf 2-23
      hasn't adjusted -->
@@ -43,7 +45,20 @@
     </dependencies>
   </autotools>
 
-  <!-- This is generated by tarring up the needed docbook stylesheets
+  <autotools id="libxml2" autogen-sh="configure">
+    <branch version="2.7.8" module="libxml2-2.7.8.tar.gz"
+	    repo="xmlsoft.org"/>
+  </autotools>
+
+  <autotools id="libxslt" autogen-sh="configure">
+    <branch version="1.1.26" module="libxslt-1.1.26.tar.gz"
+	    repo="xmlsoft.org"/>
+    <dependencies>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
+ <!-- This is generated by tarring up the needed docbook stylesheets
        for gtk-doc to work. If someone wants to work on a setup that
        uses the real docbook source from upstream, feel free to do so,
        it used to be a huge amount of work, but might be easier these
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 717aed1..f3f4600 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -19,6 +19,12 @@
 	      href="http://icon-theme.freedesktop.org/releases/"/>
   <repository type="tarball" name="cmake"
 	      href="http://www.cmake.org/files/"/>
+  <repository type="tarball" name="xmlsoft.org"
+	      href="ftp://xmlsoft.org/libxml2/"/>
+  <repository type="tarball" name="intltool"
+	       href="http://launchpad.net/intltool/trunk/"/>
+  <repository type="git" name="git.gnome.org"
+              href="git://git.gnome.org/"/>
 
 <!-- Libpng-1.5 has made private struct definitions; gdk-pixbuf 2-23
      hasn't adjusted -->
@@ -43,6 +49,19 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libxml2" autogen-sh="configure">
+    <branch version="2.7.8" module="libxml2-2.7.8.tar.gz"
+	    repo="xmlsoft.org"/>
+  </autotools>
+
+  <autotools id="libxslt" autogen-sh="configure">
+    <branch version="1.1.26" module="libxslt-1.1.26.tar.gz"
+	    repo="xmlsoft.org"/>
+    <dependencies>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
   <!-- This is generated by tarring up the needed docbook stylesheets
        for gtk-doc to work. If someone wants to work on a setup that
        uses the real docbook source from upstream, feel free to do so,
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 717aed1..6784d5c 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -19,6 +19,8 @@
 	      href="http://icon-theme.freedesktop.org/releases/"/>
   <repository type="tarball" name="cmake"
 	      href="http://www.cmake.org/files/"/>
+  <repository type="tarball" name="xmlsoft.org"
+	      href="ftp://xmlsoft.org/libxml2/"/>
 
 <!-- Libpng-1.5 has made private struct definitions; gdk-pixbuf 2-23
      hasn't adjusted -->
@@ -43,6 +45,19 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libxml2" autogen-sh="configure">
+    <branch version="2.7.8" module="libxml2-2.7.8.tar.gz"
+	    repo="xmlsoft.org"/>
+  </autotools>
+
+  <autotools id="libxslt" autogen-sh="configure">
+    <branch version="1.1.26" module="libxslt-1.1.26.tar.gz"
+	    repo="xmlsoft.org"/>
+    <dependencies>
+      <dep package="libxml2"/>
+    </dependencies>
+  </autotools>
+
   <!-- This is generated by tarring up the needed docbook stylesheets
        for gtk-doc to work. If someone wants to work on a setup that
        uses the real docbook source from upstream, feel free to do so,