[PATCH] jhbuild and question

[Jaap Haitsma <jaap haitsma org>]

Hi,

Today was the first time that I tried to build gnome with jhbuild. (A
very nice tool I have to say). This is also the first time I submit a
patch. So if I do something wrong please tell me.

I discovered two small bugs in jhbuild.

1. If you specify a tarball dir in your .jhbuildrc jhbuild does not
build external libraries such as audiofile. Downloading can fail because
you didn't make the tarball dir by hand. The patch of config.py checks
if the tarball dir exists. If not it tries to make it.

untarring also didn't work correctly. Therefore I changed tarball.py

These fixes are in the first patch.

2. gnome-system-tools doesn't contain the right dependencies. Due to the
additions in the 2nd patch it compiles correctly


I also have a question. In the documentation of jhbuild it says that I 
need to add jhbuild run gnome-session to a session script of gdm. In the 
version of gdm I use (2.6.0.3 in Debian sid) works .desktop so I thought
I set the exec field to "jhbuild run gnome-session" but that doesn't 
work the session dies immediately and the log says that gdm could not 
run the command. If I put /opt/gnome2/bin/gnome-session instead gnome 
starts. (In my case still not completely OK, because nautilus crashes 
immediately). So should I put /opt/gnome2/bin/gnome-session or should it 
work with jhbuild?

I guess the safest thing is to make a seperate account for when I log 
into gnome cvs, right?? I'm afraid that the cvs version can add or 
change settings on my normal account such that gnome 2.6 will not start 
anymore on that account. Or shouldn't I be afraid for this??

Thanks

Jaap

Index: jhbuild/jhbuild/config.py
===================================================================
RCS file: /cvs/gnome/jhbuild/jhbuild/config.py,v
retrieving revision 1.15
diff -u -r1.15 config.py
--- jhbuild/jhbuild/config.py	12 Jun 2004 05:07:47 -0000	1.15
+++ jhbuild/jhbuild/config.py	17 Jul 2004 18:07:20 -0000
@@ -86,6 +86,12 @@
         # default tarballdir to checkoutroot
         if not self.tarballdir: self.tarballdir = self.checkoutroot
 
+        if not os.path.exists(self.tarballdir):
+            try:
+                os.makedirs(self.tarballdir)
+            except:
+                raise FatalError("Can't create %s directory" % self.prefix)
+
         self.setup_env()
 
     def setup_env(self):
Index: jhbuild/jhbuild/modtypes/tarball.py
===================================================================
RCS file: /cvs/gnome/jhbuild/jhbuild/modtypes/tarball.py,v
retrieving revision 1.24
diff -u -r1.24 tarball.py
--- jhbuild/jhbuild/modtypes/tarball.py	12 Jun 2004 05:07:47 -0000	1.24
+++ jhbuild/jhbuild/modtypes/tarball.py	17 Jul 2004 18:07:21 -0000
@@ -123,7 +123,7 @@
         return (self.STATE_UNPACK, None, None)
 
     def do_unpack(self, buildscript):
-        os.chdir(buildscript.config.checkoutroot)
+        os.chdir(buildscript.config.tarballdir)
         localfile = self.get_localfile(buildscript)
         srcdir = self.get_srcdir(buildscript)
 

Index: jhbuild/modulesets/gnome28.modules
===================================================================
RCS file: /cvs/gnome/jhbuild/modulesets/gnome28.modules,v
retrieving revision 1.28
diff -u -r1.28 gnome28.modules
--- jhbuild/modulesets/gnome28.modules	12 Jul 2004 12:20:22 -0000	1.28
+++ jhbuild/modulesets/gnome28.modules	17 Jul 2004 18:09:18 -0000
@@ -1152,6 +1152,11 @@
   <cvsmodule id="gnome-system-tools">
     <dependencies>
       <dep package="glib" />
+      <dep package="libxml2" />
+      <dep package="gconf" />
+      <dep package="libgnomeui" />
+      <dep package="libbonoboui" />
+      <dep package="libglade" />
     </dependencies>
   </cvsmodule>
   <cvsmodule id="gnome-user-docs">