[gtk-osx] Add build of cups-1.2.12 for Tiger

[John Ralls <jralls src gnome org>]

commit db5bf9b46458a93fcbaed1683a63c33444e08c6f
Author: John Ralls <jralls ceridwen us>
Date:   Thu Mar 7 15:35:19 2013 -0800

    Add build of cups-1.2.12 for Tiger

 jhbuildrc-gtk-osx                           |    3 +++
 modulesets-stable/gtk-osx-bootstrap.modules |   17 +++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 558531f..54147fd 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -257,6 +257,7 @@ def setup_sdk(target, sdk_version, architectures=[_default_arch]):
             #
             os.environ["CUPS_CONFIG"] = os.path.join(sdkdir,
                                                      "usr/bin/cups-config")
+            
 
     #Glib and autoconf-2.63 have issues with endianness
     #
@@ -314,6 +315,8 @@ def setup_sdk(target, sdk_version, architectures=[_default_arch]):
     # link libresolv:
     if _osx_version < 5.0 or sdk_version.startswith("10.4"):
         append_autogenargs("glib", 'LIBS="-lresolv"')
+    else:
+        skip.append("cups")
 
     # gettext-fw rebuilds gettext with an in-tree libiconv to get
     # around the Apple-provided one not defining _libiconv_init for
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 8cd3510..769f122 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -27,6 +27,8 @@
               href="git://git.gnome.org/"/>
   <repository type="tarball" name="harfbuzz"
               href="http://www.freedesktop.org/software/harfbuzz/release/"/>
+  <repository type="tarball" name="cups"
+             href="http://ftp.easysw.com/pub/"/>
 
   <autotools id="libpng" autogenargs="--enable-shared" autogen-sh="configure">
     <branch version="1.5.13" module="libpng/libpng-1.5.13.tar.bz2"
@@ -107,10 +109,20 @@
     <branch module="expat/expat-2.1.0.tar.gz" version="2.1.0"
            repo="sourceforge"/>
   </autotools>
+  <!-- Cups is needed *only* for Tiger, and skipped otherwise -->
+  <autotools id='cups' autogen-sh='configure' skip-autogen='never'
+            autogenargs='DSOFLAGS="$LDFLAGS"'>
+    <branch module="cups/1.2.12/cups-1.2.12-source.tar.bz2"
+           version="1.2.12" repo="cups"  checkoutdir='cups-1.2.12'/>
+    <dependencies>
+      <dep package="libtiff"/>
+    </dependencies>
+  </autotools>
+           
 
   <autotools id="harfbuzz" autogen-sh="configure">
-    <branch repo="harfbuzz" module="harfbuzz-0.9.9.tar.bz2" version="0.9.9"/>
-    <dependencies>
+    <branch repo="harfbuzz" module="harfbuzz-0.9.10.tar.bz2" version="0.9.10"/>
+    <dependemcies>
       <dep package="freetype"/>
       <dep package="fontconfig"/>
       <dep package="glib"/>
@@ -193,6 +205,7 @@
 
   <metamodule id="meta-gtk-osx-bootstrap">
     <dependencies>
+      <dep package="cups"/>
       <dep package="libpng"/>
       <dep package="gtk-doc"/>
       <dep package="libjpeg"/>