[jhbuild] 3.4: Add guile 2.x, dependency of aisleriot

[Craig Keogh <cskeogh src gnome org>]

commit 77c41a220d9f5fac622421a3219127f4237c1ac3
Author: Craig Keogh <cskeogh adam com au>
Date:   Tue Dec 27 09:56:50 2011 +1030

    3.4: Add guile 2.x, dependency of aisleriot
    
    Even Fedora 16 doesn't have guile 2.x, therefore must JHBuild guile 2.x
    to build aesleriot

 modulesets/bootstrap.modules      |    4 ++--
 modulesets/gnome-apps-3.4.modules |   11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/modulesets/bootstrap.modules b/modulesets/bootstrap.modules
index 7415c22..a618031 100644
--- a/modulesets/bootstrap.modules
+++ b/modulesets/bootstrap.modules
@@ -73,7 +73,7 @@
             size="1881090" md5sum="26cec15a90885042dd4a15c4003b08ae"/>
   </tarball>
 
-  <autotools id="guile" autogenargs="--enable-error-on-warning=no">
+  <autotools id="guile1" autogenargs="--enable-error-on-warning=no">
     <branch repo="ftp.gnu.org" module="guile/guile-1.8.7.tar.gz"
             version="1.8.7"
             hash="sha1:24cd2f06439c76d41d982a7384fe8a0fe5313b54"
@@ -104,7 +104,7 @@
       <dep package="automake" />
       <dep package="pkg-config" />
       <dep package="python" />
-      <dep package="guile" />
+      <dep package="guile1" />
     </dependencies>
   </metamodule>
 
diff --git a/modulesets/gnome-apps-3.4.modules b/modulesets/gnome-apps-3.4.modules
index 695be9a..14c187b 100644
--- a/modulesets/gnome-apps-3.4.modules
+++ b/modulesets/gnome-apps-3.4.modules
@@ -385,6 +385,16 @@
     </dependencies>
   </autotools>
 
+  <repository type="tarball" name="gnu.org"
+              href="http://ftp.gnu.org/pub/gnu/"/>
+  <autotools id="guile">
+    <pkg-config>guile-2.0.pc</pkg-config>
+    <branch module="guile/guile-2.0.3.tar.xz" version="2.0.3"
+            repo="gnu.org"
+            hash="sha256:d2ebcd78dc587080b96d9120053a57d8e2d22c3d54a444dff06513d5fba53093"
+            size="4196064"/>
+  </autotools>
+
   <autotools id="opal" autogenargs="--disable-vpb"
              check-target="false" supports-non-srcdir-builds="no">
     <branch module="opal/3.10/opal-3.10.2.tar.xz" repo="gnome.org"
@@ -979,6 +989,7 @@
       <dep package="libcanberra"/>
       <dep package="librsvg"/>
       <dep package="gconf"/>
+      <dep package="guile"/>
     </dependencies>
   </autotools>