On 8/4/06, Marco Pesenti Gritti <[EMAIL PROTECTED]> wrote:
[...]
Looks like also the addition of evince-olpc is part of the patch for
some reason? Can you remove it so that it applies cleanly?
Lack of git-fu here, sorry.
- Rob
diff --git a/build-scripts/olpc.jhbuildrc b/build-scripts/olpc.jhbuildrc
index 336c8df..941906b 100644
--- a/build-scripts/olpc.jhbuildrc
+++ b/build-scripts/olpc.jhbuildrc
@@ -7,6 +7,8 @@ moduleset = [ 'gnome-2.16' ]
moduleset.append(os.path.join(base_dir, 'build-scripts', 'sugar.modules'))
modules = [ 'sugar' ]
+branches['abiword'] = 'sugar'
+
user_config = os.path.expanduser('~/.olpc.jhbuildrc')
if os.path.isfile(user_config):
try:
diff --git a/build-scripts/sugar.modules b/build-scripts/sugar.modules
index 8ff5c54..4306447 100644
--- a/build-scripts/sugar.modules
+++ b/build-scripts/sugar.modules
@@ -8,6 +8,9 @@
<repository type="cvs" name="mozilla.org"
cvsroot=":pserver:[EMAIL PROTECTED]:/cvsroot"
password="anonymous"/>
+ <repository type="cvs" name="abisource.com"
+ cvsroot=":pserver:[EMAIL PROTECTED]:/cvsroot"
+ password="anoncvs"/>
<repository type="git" name="git.laptop.org" default="yes"
href="git://dev.laptop.org/"/>
<repository type="git" name="git.laptop.org/projects" default="yes"
@@ -82,4 +85,13 @@
<dep package="gnome-python"/>
</dependencies>
</autotools>
+ <autotools id="wv" >
+ <branch repo="abisource.com" module="wv"/>
+ </autotools>
+ <autotools id="abiword" autogenargs="--enable-sugar --enable-symbols --disable-debug --disable-gnome --disable-gucharmap">
+ <branch repo="abisource.com" module="abi" checkoutdir="abiword"/>
+ <dependencies>
+ <dep package="wv"/>
+ </dependencies>
+ </autotools>
</moduleset>
_______________________________________________
Sugar mailing list
[email protected]
http://mailman.laptop.org/mailman/listinfo/sugar
