Pycairo and jhbuild

[Brent Smith <gnome nextreality net>]

Elijah,

So Behdad modified the gnome-2.14 moduleset to make all modules
dependent on cairo-1-0 and pycairo-1-0.  cairo-1-0 is defined as a
tarball for the 1.0.4 cairo release (since we don't have support for git
in jhbuild[1]), and pycairo-1-0 is defined as a cvsmodule.

For some reason, with this configuration, when I try to do a "jhbuild
update", I get the following error.

jhbuild update: dependent module "pycairo-1-0" not found

but pycairo-1-0 is definitely defined in freedesktop.modules.

To resolve this, I changed pycairo-1-0 from a cvsmodule to a tarball for
the 1.0.2 release.  I've attached a patch to this email with the change
in jhbuild.

If I could get pycairo to work as a cvsmodule, then we could just
specify the branch tag RELEASE_1_0_2.

Unfortunately, it looks like pycairo HEAD is tracking cairo 1.1 and
there is no branch in place to track the stable version of cairo[2].  So
pycairo HEAD will not compile against the cairo 1.0.4 tarball, and
results in the errors you see in [2].

[1] http://bugzilla.gnome.org/show_bug.cgi?id=333425
[2] https://bugs.freedesktop.org/show_bug.cgi?id=6133

Thanks,

--
Brent Smith <gnome nextreality net>
IRC: smitten

? modulesets/test.html
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/jhbuild/ChangeLog,v
retrieving revision 1.965
diff -u -r1.965 ChangeLog
--- ChangeLog	17 Mar 2006 16:28:10 -0000	1.965
+++ ChangeLog	17 Mar 2006 17:45:37 -0000
@@ -1,3 +1,9 @@
+2006-03-17  Brent Smith  <gnome nextreality net>
+
+	* modulesets/freedesktop.modules: use pycairo-1.0.2 tarball for
+	pycairo-1-0, instead of CVS HEAD which targets the development branch
+	of cairo, 1.1.
+
 2006-03-17  Wouter Bolsterlee <uws+gnome xs4all nl>
 
 	* modulesets/gnome-2.14.modules: Added muine to the 2.14
Index: modulesets/freedesktop.modules
===================================================================
RCS file: /cvs/gnome/jhbuild/modulesets/freedesktop.modules,v
retrieving revision 1.62
diff -u -r1.62 freedesktop.modules
--- modulesets/freedesktop.modules	17 Mar 2006 15:22:53 -0000	1.62
+++ modulesets/freedesktop.modules	17 Mar 2006 17:45:37 -0000
@@ -72,11 +72,13 @@
             size="1475777" md5sum="9002b0e69b3f94831a22d3f2a7735ce2" />
   </tarball>
 
-  <cvsmodule id="pycairo-1-0" module="pycairo" cvsroot="cairo.freedesktop.org">
+  <tarball id="pycairo-1-0" version="1.0.2" supports-non-srcdir-builds="no">
+    <source href="http://cairographics.org/releases/pycairo-1.0.2.tar.gz";
+            size="469704" md5sum="5bb6a202ebc3990712bced1da6dfb7a8"/>
     <dependencies>
       <dep package="cairo-1-0"/>
     </dependencies>
-  </cvsmodule>
+  </tarball>
 
   <cvsmodule id="pycairo" cvsroot="cairo.freedesktop.org">
     <dependencies>