Replace matchbox with metacity

3 files changed, 6 insertions, 17 deletions

diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules
index 4f4f3f6..557bcc8 100644
--- a/config/modulesets/glucose-external.modules
+++ b/config/modulesets/glucose-external.modules
@@ -9,8 +9,6 @@
         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="svn" name="matchbox.o-hand.com"
-      href="http://svn.o-hand.com/repos/matchbox/"/>
   <repository type="tarball" name="telepathy"
       href="http://telepathy.freedesktop.org/releases/"/>
   <repository type="tarball" name="xulrunner"
@@ -28,18 +26,9 @@
       <patch file="pygobject-pylint.patch" strip="0"/>
     </patches>
   </tarball>
-  <tarball id="libmatchbox" version="1.8" autogenargs="--enable-pango">
-    <source href="http://matchbox-project.org/sources/libmatchbox/1.8/libmatchbox-1.8.tar.bz2"
-            size="303304" md5sum="6bbd6b41f4fd78b7baa6157b303e5ac0"/>
-    <dependencies>
-    </dependencies>
-  </tarball>
-  <autotools id="matchbox-window-manager">
-    <branch repo="matchbox.o-hand.com" module="trunk/matchbox-window-manager"/>
-    <dependencies>
-      <dep package="libmatchbox"/>
-    </dependencies>
-  </autotools>
+  <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"/>
diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules
index 29e1c1e..a96a1df 100644
--- a/config/modulesets/glucose.modules
+++ b/config/modulesets/glucose.modules
@@ -25,7 +25,7 @@
       <dep package="sugar-base"/>
       <dep package="sugar-toolkit"/>
       <dep package="sugar-artwork"/>
-      <dep package="matchbox-window-manager"/>
+      <dep package="metacity"/>
     </dependencies>
   </autotools>
   <autotools id="sugar-presence-service">
diff --git a/config/sysdeps/fedora-11.xml b/config/sysdeps/fedora-11.xml
index 35be595..d5aa2b9 100644
--- a/config/sysdeps/fedora-11.xml
+++ b/config/sysdeps/fedora-11.xml
@@ -35,19 +35,19 @@
   <package name="intltool"/>
   <package name="libabiword" source="abiword"/>
   <package name="libabiword" source="abiword-plugins"/>
+  <package name="libcanberra-devel"/>
   <package name="libcroco-devel"/>
   <package name="libffi-devel"/>
   <package name="libglade2-devel"/>
   <package name="libgsf-devel"/>
-  <package name="libmatchbox" source="libmatchbox"/>
   <package name="librsvg2-devel"/>
   <package name="libsoup-devel" source="libsoup"/>
   <package name="libtool"/>
+  <package name="libXdamage-devel"/>
   <package name="libxml2-python"/>
   <package name="libXt-devel"/>
   <package name="loudmouth-devel"/>
   <package name="make"/>
-  <package name="matchbox-window-manager" source="matchbox-window-manager"/>
   <package name="numpy"/>
   <package name="olpcsound-devel"/>
   <package name="openssl-devel"/>