0.84: use copy of glucose-external.modules without 0.86 changes

2 files changed, 162 insertions, 1 deletions

diff --git a/config/modulesets/glucose-external-0.84.modules b/config/modulesets/glucose-external-0.84.modules
new file mode 100644
index 0000000..557bcc8
--- /dev/null
+++ b/config/modulesets/glucose-external-0.84.modules
@@ -0,0 +1,161 @@
+<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*-->
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+  <repository type="git" name="dev.laptop.org/projects"
+      href="git://dev.laptop.org/projects/" />
+  <repository type="git" name="git.gnome.org"
+      href="git://git.gnome.org"/>
+  <repository type="svn" name="squeakvm.org"
+        href="http://squeakvm.org/svn/squeak/branches/" trunk-template="olpc"/>
+  <repository type="git" name="git.imendio.com"
+      href="git://git.imendio.com/projects/"/>
+  <repository type="tarball" name="telepathy"
+      href="http://telepathy.freedesktop.org/releases/"/>
+  <repository type="tarball" name="xulrunner"
+      href="http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/"/>
+  <repository type="tarball" name="dbus"
+	  href="http://dbus.freedesktop.org/releases/"/>
+  <repository type="git" name="git.sugarlabs.org" default="yes"
+      href="git://git.sugarlabs.org"/>
+  <repository type="tarball" name="ftp.gnome.org"
+      href="http://ftp.gnome.org/pub/gnome/sources/"/>
+  <tarball id="pygobject" version="2.14">
+    <source href="http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.14/pygobject-2.14.2.tar.bz2"
+            md5sum="0e9e9300e81847f4f7266f49d3bebbaf" size="366808"/>
+    <patches>
+      <patch file="pygobject-pylint.patch" strip="0"/>
+    </patches>
+  </tarball>
+  <autotools id="metacity">
+    <branch repo="git.gnome.org"/>
+   </autotools>
+  <autotools id="xulrunner" autogenargs="--disable-accessibility --with-pthreads --disable-strip --disable-install-strip --disable-tests --disable-debug --disable-installer --enable-optimize --enable-xinerama --enable-default-toolkit=cairo-gtk2 --disable-xprint --enable-pango --enable-svg --enable-canvas --enable-application=xulrunner --disable-javaxpcom --disable-gnomeui --disable-gnomevfs --disable-airbag --enable-extensions=default,cookie,python/xpcom --disable-crashreporter" makeinstallargs="install SKIP_GRE_REGISTRATION=1">
+    <branch repo="xulrunner" module="1.9.0.7/source/xulrunner-1.9.0.7-source.tar.bz2" version="1.9.0.7"
+            size="37066129" md5sum="9875c9237b532009df8e91c3785539a3" checkoutdir="mozilla"/>
+    <dependencies>
+    </dependencies>
+   <patches>
+     <patch file="xulrunner-xds.patch" strip="0"/>
+     <patch file="xulrunner-no-native-theme.patch" strip="0"/>
+     <patch file="xulrunner-perms.patch" strip="0"/>
+   </patches>
+  </autotools>
+  <tarball id="abiword" autogenargs="--enable-libabiword --enable-debug --disable-bonobo --disable-gnomevfs --disable-gnomeui --disable-gucharmap --disable-printing" makefile="GNUmakefile" version="2.6.8">
+    <source href="http://abisource.com/downloads/abiword/2.6.8/source/abiword-2.6.8.tar.gz"
+            md5sum="fab04d8ef999c303f720197adf261310"/>
+  </tarball>
+  <tarball id="abiword-plugins" autogenargs="--enable-libabiword --enable-debug --disable-all --enable-OpenDocument --enable-abicollab --with-abicollab-sugar-backend --enable-abicollab-record-always --enable-loadbindings --with-abiword=../abiword-2.6.8" makefile="GNUmakefile" version="2.6.8">
+    <source href="http://abisource.com/downloads/abiword/2.6.8/source/abiword-plugins-2.6.8.tar.gz"
+            md5sum="421c49723e209c971ddb0798c1b313a9"/>
+    <dependencies>
+      <dep package="abiword"/>
+    </dependencies>
+  </tarball>
+  <tarball id="pyabiword" version="0.6.2">
+    <source href="http://www.abisource.com/downloads/pyabiword/0.6.2/pyabiword-0.6.2.tar.gz"
+            md5sum="c2e652ff6c5f9b5df0d28773952e4c0c"/>
+    <dependencies>
+      <dep package="abiword"/>
+    </dependencies>
+  </tarball>
+  <autotools id="squeak">
+    <branch repo="squeakvm.org" module="olpc" checkoutdir="squeak"/>
+    <dependencies>
+    </dependencies>
+  </autotools>
+  <autotools id="hulahop">
+    <branch module="hulahop/mainline.git" checkoutdir="hulahop"/>
+    <dependencies>
+      <dep package="xulrunner"/>
+    </dependencies>
+  </autotools>
+  <autotools id="hippo-canvas">
+    <branch repo="git.gnome.org"/>
+    <dependencies>
+      <dep package="pygobject"/>
+    </dependencies>
+  </autotools>
+  <autotools id="telepathy-gabble"
+             autogen-sh="configure">
+    <branch repo="telepathy"
+            version="0.7.25"
+            module="telepathy-gabble/telepathy-gabble-0.7.25.tar.gz"
+            size="1732475" md5sum="5fae7fbfb8e40be28e8dae5cba5cb947">
+      <patch file="telepathy-gabble-0001-Add-gthread-2.0-to-pkgconfig-check.patch" strip="1" />
+    </branch>
+    <dependencies>
+      <dep package="telepathy-glib"/>
+      <dep package="dbus-glib"/>
+      <dep package="libsoup"/>
+    </dependencies>
+  </autotools>
+  <autotools id="libsoup">
+    <branch repo="ftp.gnome.org"
+    				version="2.4.1"
+            module="libsoup/2.4/libsoup-2.4.1.tar.bz2"
+            size="627890" md5sum="d0fc91ccb9da401e9e40d2f4612bdac9" />
+    <dependencies>
+      <!-- sysdeps: -->
+      <!-- glib 2.15.3 -->
+      <!-- libgnutls -->
+      <!-- libgcrypt 1.2.0 -->
+      <!-- optional: gtk-doc 1.0 -->
+      <!-- optional: curl -->
+    </dependencies>
+  </autotools>
+  <autotools id="telepathy-salut"
+             autogen-sh="configure" autogenargs="--enable-olpc --enable-ssl">
+    <branch repo="telepathy"
+            version="0.3.9"
+            module="telepathy-salut/telepathy-salut-0.3.9.tar.gz"
+            size="1172347" md5sum="b61b6f8a86b07a10315c4cca9d78b4fa">
+    </branch>
+    <dependencies>
+      <dep package="telepathy-glib"/>
+      <dep package="libsoup"/>
+    </dependencies>
+  </autotools>
+  <autotools id="telepathy-glib" autogen-sh="configure">
+    <branch repo="telepathy" version="0.7.29"
+            module="telepathy-glib/telepathy-glib-0.7.29.tar.gz"
+            size="5009792" md5sum="ae67d4fe42c7e337813754cb5927b6cc" />
+  </autotools>
+  <distutils id="telepathy-python">
+    <branch module="telepathy-python/telepathy-python-0.15.7.tar.gz"
+            repo="telepathy" version="0.15.7"
+            size="180111" md5sum="e65f660f10076df4149b64308b650de1"/>
+    <dependencies>
+      <dep package="telepathy-gabble"/>
+    </dependencies>
+  </distutils>
+  <tarball id="evince" autogenargs="--disable-static --disable-scrollkeeper --disable-schemas-install --disable-dvi --enable-pixbuf --disable-thumbnailer --disable-djvu --disable-comics --disable-nautilus --without-keyring">
+    <source href="http://download.gnome.org/sources/evince/2.25/evince-2.25.90.tar.bz2"
+            version="2.25.90" size="1790620" md5sum="931b4d5fb4c5a2e4e079a62662b9d224"/>
+  </tarball>
+  <tarball id="gnome-python-desktop">
+    <source href="http://download.gnome.org/sources/gnome-python-desktop/2.25/gnome-python-desktop-2.25.90.tar.bz2"
+            version="2.25.90" size="571621" md5sum="9bc794079fb4dd02f4d0651ff04bbace"/>
+    <dependencies>
+      <dep package="evince"/>
+    </dependencies>
+  </tarball>
+  <tarball id="GConf-dbus">
+    <source href="http://ftp.gnome.org/pub/gnome/sources/GConf-dbus/2.16/GConf-dbus-2.16.0.tar.bz2"
+            version="2.16.0" size="1363876" md5sum="3e7d648f75949b5362af807f5408546b"/>
+    <patches>
+      <patch file="gconf-dbus-defaultpath.patch" strip="0"/>
+    </patches>
+  </tarball>
+  <autotools id="dbus-glib" autogen-sh="configure">
+    <branch repo="dbus" version="0.78"
+	    module="dbus-glib/dbus-glib-0.78.tar.gz"
+	    size="683454" md5sum="d4aa04b9df35b4bd663be38e959941c8" />
+  </autotools>
+  <distutils id="sugar-update-control">
+    <branch repo="git.sugarlabs.org"
+	    module="sugar-update-control/mainline.git" checkoutdir="sugar-update-control" />
+    <dependencies>
+      <dep package="sugar"/>
+    </dependencies>
+  </distutils>
+</moduleset>
diff --git a/config/modulesets/sugar-0.84.modules b/config/modulesets/sugar-0.84.modules
index 1d223cf..601df3e 100644
--- a/config/modulesets/sugar-0.84.modules
+++ b/config/modulesets/sugar-0.84.modules
@@ -3,7 +3,7 @@
 <moduleset>
 
   <include href="tools.modules"/>
-  <include href="glucose-external.modules"/>
+  <include href="glucose-external-0.84.modules"/>
   <include href="glucose-0.84.modules"/>
   <include href="fructose-0.84.modules"/>
   <include href="extra.modules"/>