Use system poppler, switch to dsd's sugar-evince

6 files changed, 9 insertions, 17 deletions

diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules
index bc35657..b9ace6c 100644
--- a/config/modulesets/glucose-external.modules
+++ b/config/modulesets/glucose-external.modules
@@ -15,8 +15,8 @@
       href="http://telepathy.freedesktop.org/releases/"/>
   <repository type="tarball" name="xulrunner"
       href="http://dev.laptop.org/pub/sugar/xulrunner/"/>
-  <repository type="git" name="dev.laptop.org/users/rwh"
-      href="git://dev.laptop.org/users/rwh/"/>
+  <repository type="git" name="dev.laptop.org/users/dsd"
+      href="git://dev.laptop.org/users/dsd/"/>
   <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"/>
@@ -24,15 +24,6 @@
       <patch file="pygobject-pylint.patch" strip="0"/>
     </patches>
   </tarball>
-  <tarball id="poppler" version="0.6.2">
-    <source href="http://poppler.freedesktop.org/poppler-0.6.2.tar.gz"
-            size="1289454" md5sum="9aa3247277f56d4ea8c045626531d19b"/>
-    <dependencies>
-    </dependencies>
-   <patches>
-     <patch file="poppler-build.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"/>
@@ -136,11 +127,8 @@
       <dep package="telepathy-gabble"/>
     </dependencies>
   </distutils>
-  <autotools id="evince" autogenargs="--disable-static --disable-binary --enable-embed --without-libgnome --disable-scrollkeeper --disable-schemas-install --disable-dvi --without-print --enable-pixbuf --disable-thumbnailer --disable-djvu --disable-comics">
-    <branch repo="dev.laptop.org/users/rwh" />
-    <dependencies>
-        <dep package="poppler"/>
-    </dependencies>
+  <autotools id="sugar-evince" autogenargs="--disable-static --disable-binary --enable-embed --without-libgnome --disable-scrollkeeper --disable-schemas-install --disable-dvi --without-print --enable-pixbuf --disable-thumbnailer --disable-djvu --disable-comics">
+    <branch repo="dev.laptop.org/users/dsd" />
   </autotools>
   <tarball id="GConf-dbus">
     <source href="http://ftp.gnome.org/pub/gnome/sources/GConf-dbus/2.16/GConf-dbus-2.16.0.tar.bz2"
diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules
index 0375087..d70b05f 100644
--- a/config/modulesets/glucose.modules
+++ b/config/modulesets/glucose.modules
@@ -51,7 +51,7 @@
       <dep package="pyabiword"/>
       <dep package="abiword-plugins"/>
       <dep package="squeak"/>
-      <dep package="evince"/>
+      <dep package="sugar-evince"/>
       <dep package="hulahop"/>
     </dependencies>
   </metamodule>
diff --git a/config/sysdeps/debian-unstable.xml b/config/sysdeps/debian-unstable.xml
index a2dbcd2..0971c58 100644
--- a/config/sysdeps/debian-unstable.xml
+++ b/config/sysdeps/debian-unstable.xml
@@ -65,4 +65,5 @@
   <package name="libavahi-gobject-dev"/>
   <package name="python-avahi"/>
   <package name="libsoup2.2-dev"/>
+  <package name="libpoppler-glib-dev"/>
 </dependencies>
diff --git a/config/sysdeps/fedora-10.xml b/config/sysdeps/fedora-10.xml
index 5afef5a..190db8c 100644
--- a/config/sysdeps/fedora-10.xml
+++ b/config/sysdeps/fedora-10.xml
@@ -47,6 +47,7 @@
   <package name="dbus-glib-devel"/>
   <package name="loudmouth-devel"/>
   <package name="libsoup22-devel"/>
+  <package name="poppler-glib-devel"/>
 
   <package name="avahi"
            source="avahi"/>
diff --git a/config/sysdeps/fedora-rawhide.xml b/config/sysdeps/fedora-rawhide.xml
index 5afef5a..190db8c 100644
--- a/config/sysdeps/fedora-rawhide.xml
+++ b/config/sysdeps/fedora-rawhide.xml
@@ -47,6 +47,7 @@
   <package name="dbus-glib-devel"/>
   <package name="loudmouth-devel"/>
   <package name="libsoup22-devel"/>
+  <package name="poppler-glib-devel"/>
 
   <package name="avahi"
            source="avahi"/>
diff --git a/config/sysdeps/ubuntu-8.10.xml b/config/sysdeps/ubuntu-8.10.xml
index 3b46957..e9e9380 100644
--- a/config/sysdeps/ubuntu-8.10.xml
+++ b/config/sysdeps/ubuntu-8.10.xml
@@ -56,4 +56,5 @@
 	   source="xulrunner"/>
   <package name="libsoup2.2-dev"/>
   <package name="libglib2.0-dev"/>
+  <package name="libpoppler-glib-dev"/>
 </dependencies>