Re: multiple vala versions in 3.4

[Colin Walters <walters verbum org>]

Any objections to this patch for the moduleset?


>From 93b05f15f3cd218dab7517e798ca3daf2e05bfc1 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters verbum org>
Date: Mon, 23 Jan 2012 16:44:55 -0500
Subject: [PATCH] 3.4: Switch to building from git for vala, libgee, and folks

jhbuild should always be building from actual source code (i.e. git)
for modules we expect GNOMErs to possibly hack on.  This set
definitely includes vala and folks, but probably not e.g. SQLite.
---
 modulesets/gnome-suites-core-deps-3.4.modules |   23 +++++++++--------------
 1 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/modulesets/gnome-suites-core-deps-3.4.modules b/modulesets/gnome-suites-core-deps-3.4.modules
index 25bb7bd..d655df3 100644
--- a/modulesets/gnome-suites-core-deps-3.4.modules
+++ b/modulesets/gnome-suites-core-deps-3.4.modules
@@ -379,9 +379,8 @@
     </dependencies>
   </tarball>
 
-  <tarball id="folks" version="0.6.6" autogenargs="--enable-eds-backend">
-    <source href="http://ftp.gnome.org/pub/GNOME/sources/folks/0.6/folks-0.6.6.tar.xz";
-            hash="sha256:3dd6a2983969a6369c6b0e25f28ec92415b5570dd6c89b25385807ecc4aeb0a8"/>
+  <autotools id="folks" autogenargs="--enable-eds-backend">
+    <branch revision="wip/vala-0-15"/>
     <dependencies>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
@@ -394,7 +393,7 @@
     <suggests>
       <dep package="telepathy-logger"/>
     </suggests>
-  </tarball>
+  </autotools>
 
   <tarball id="fontconfig" version="2.8.0">
     <pkg-config>fontconfig.pc</pkg-config>
@@ -758,18 +757,16 @@
     </dependencies>
   </autotools>
 
-  <tarball id="libgee" version="0.6.2.1">
+  <autotools id="libgee">
+    <branch revision="0.6"/>
     <pkg-config>gee-1.0.pc</pkg-config>
-    <source href="http://download.gnome.org/sources/libgee/0.6/libgee-0.6.2.1.tar.bz2";
-            hash="sha256:e177be887727c9c214bd41f46063e386a7292ba207f586930148190580c829ad"
-            md5sum="9c95ab9462179610d39df3c5a0911f3b" size="477230"/>
     <dependencies>
       <dep package="glib"/>
     </dependencies>
     <suggests>
       <dep package="gobject-introspection"/>
     </suggests>
-  </tarball>
+  </autotools>
 
   <autotools id="libgnomekbd">
     <branch/>
@@ -1234,15 +1231,13 @@
     </suggests>
   </autotools>
 
-  <tarball id="vala" version="0.15.0">
+  <autotools id="vala" autogenargs="--enable-vapigen">
+    <branch/>
     <pkg-config>libvala-0.16.pc</pkg-config>
-    <source href="http://download.gnome.org/sources/vala/0.15/vala-0.15.0.tar.xz";
-            hash="sha256:828f7341a3c4fc14b6d0f5a14ce3bdf4c40f5eae3e7ccf11c2b49061df9d2e23"
-            md5sum="2bffc49985cc790f0a9522b159ef935b" size="2618360"/>
     <dependencies>
       <dep package="glib"/>
     </dependencies>
-  </tarball>
+  </autotools>
 
   <autotools id="WebKit" makefile="GNUmakefile"
              autogenargs="--enable-introspection">
-- 
1.7.6.5