diff options
-rw-r--r-- | config/modulesets/glucose-external.modules | 19 | ||||
-rw-r--r-- | config/modulesets/glucose-versionsupport.modules | 1 | ||||
-rw-r--r-- | config/modulesets/glucose.modules | 1 | ||||
-rw-r--r-- | config/sysdeps/50debian-squeeze.xml | 2 | ||||
-rw-r--r-- | config/sysdeps/50debian-unstable.xml | 2 | ||||
-rw-r--r-- | config/sysdeps/50fedora-11.xml | 3 | ||||
-rw-r--r-- | config/sysdeps/50ubuntu-10.04.xml | 2 | ||||
-rw-r--r-- | config/sysdeps/50ubuntu-10.10.xml | 2 | ||||
-rw-r--r-- | config/sysdeps/50ubuntu-11.04.xml | 2 | ||||
-rw-r--r-- | config/sysdeps/50ubuntu-9.04.xml | 1 | ||||
-rw-r--r-- | config/sysdeps/50ubuntu-9.10.xml | 1 | ||||
-rw-r--r-- | config/sysdeps/fedora-family.xml | 1 |
12 files changed, 0 insertions, 37 deletions
diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules index f83182d..57bd527 100644 --- a/config/modulesets/glucose-external.modules +++ b/config/modulesets/glucose-external.modules @@ -11,8 +11,6 @@ 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" @@ -32,17 +30,6 @@ <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"/> @@ -69,12 +56,6 @@ <patch file="squeak-makefile.patch" strip="0" /> </branch> </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> diff --git a/config/modulesets/glucose-versionsupport.modules b/config/modulesets/glucose-versionsupport.modules index a26c8a6..7d2b03a 100644 --- a/config/modulesets/glucose-versionsupport.modules +++ b/config/modulesets/glucose-versionsupport.modules @@ -53,7 +53,6 @@ <dep package="abiword-plugins"/> <dep package="squeak"/> <dep package="gnome-python-desktop"/> - <dep package="hulahop"/> </dependencies> </metamodule> </moduleset> diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules index 078e100..5488ceb 100644 --- a/config/modulesets/glucose.modules +++ b/config/modulesets/glucose.modules @@ -61,7 +61,6 @@ <dep package="pyabiword"/> <dep package="abiword-plugins"/> <dep package="gnome-python-desktop"/> - <dep package="hulahop"/> </dependencies> </metamodule> </moduleset> diff --git a/config/sysdeps/50debian-squeeze.xml b/config/sysdeps/50debian-squeeze.xml index 810c674..2c8e0e5 100644 --- a/config/sysdeps/50debian-squeeze.xml +++ b/config/sysdeps/50debian-squeeze.xml @@ -7,11 +7,9 @@ <package name="abiword" source="abiword-plugins"/><!-- for Write --> <package name="python-abiword" source="pyabiword"/><!-- for Write --> <package name="python-evince" source="gnome-python-desktop"/><!-- for Read --> - <package name="python-hulahop" source="hulahop"/><!-- for Browse --> <package name="python-rsvg" source="gnome-python-desktop"/><!-- for many activities --> <package name="python-wnck" source="gnome-python-desktop"/><!-- for sugar --> <package name="python-xklavier" source="python-xklavier"/><!-- for sugar --> - <package name="python-xpcom" source="xulrunner"/><!-- for Browse <130 --> <!-- Sugar Platform --> <package name="espeak"/> diff --git a/config/sysdeps/50debian-unstable.xml b/config/sysdeps/50debian-unstable.xml index cf949b0..7bf1692 100644 --- a/config/sysdeps/50debian-unstable.xml +++ b/config/sysdeps/50debian-unstable.xml @@ -11,13 +11,11 @@ <package name="pylint" source="pylint"/> <package name="python-abiword" source="pyabiword"/> <package name="python-evince" source="gnome-python-desktop"/> - <package name="python-hulahop" source="hulahop"/> <!-- <package name="python-metacity" source="gnome-python-desktop"/> --> <package name="python-telepathy" source="telepathy-python"/> <package name="python-rsvg" source="gnome-python-desktop"/> <package name="python-wnck" source="gnome-python-desktop"/> <package name="python-xklavier" source="python-xklavier"/> - <package name="python-xpcom" source="xulrunner"/> <package name="telepathy-gabble" source="telepathy-gabble"/> <package name="telepathy-mission-control-5" source="telepathy-mission-control"/> <package name="telepathy-salut" source="telepathy-salut"/> diff --git a/config/sysdeps/50fedora-11.xml b/config/sysdeps/50fedora-11.xml index 5d1a659..54326fc 100644 --- a/config/sysdeps/50fedora-11.xml +++ b/config/sysdeps/50fedora-11.xml @@ -5,8 +5,5 @@ <package name="libcanberra-devel"/><!-- for metacity --> <package name="libxkbfile-devel"/><!-- for libxklavier --> <package name="libXdamage-devel"/><!-- for metacity? --> - <package name="xulrunner-devel-unstable" source="xulrunner"/> - <package name="xulrunner-python" source="xulrunner"/> - <package name="xulrunner-python-devel" source="xulrunner"/> <package name="zenity"/><!-- for metacity --> </dependencies> diff --git a/config/sysdeps/50ubuntu-10.04.xml b/config/sysdeps/50ubuntu-10.04.xml index 7ac6839..e752124 100644 --- a/config/sysdeps/50ubuntu-10.04.xml +++ b/config/sysdeps/50ubuntu-10.04.xml @@ -13,6 +13,4 @@ <!-- <package name="python-metacity" source="gnome-python-desktop"/> --> <package name="python-rsvg" source="gnome-python-desktop"/> <package name="python-wnck" source="gnome-python-desktop"/> - <!-- python-xpcom has been dropped from Ubuntu so hulahop won't work, but it builds --> - <package name="xulrunner-1.9" source="xulrunner"/><!-- for hulahop --> </dependencies> diff --git a/config/sysdeps/50ubuntu-10.10.xml b/config/sysdeps/50ubuntu-10.10.xml index 33064d4..7a58696 100644 --- a/config/sysdeps/50ubuntu-10.10.xml +++ b/config/sysdeps/50ubuntu-10.10.xml @@ -16,8 +16,6 @@ <package name="python-telepathy" source="telepathy-python"/> <package name="python-wnck" source="gnome-python-desktop"/> <package name="python-xklavier" source="python-xklavier"/> - <!-- python-xpcom still isn't packaged so hulahop won't work, but it builds --> <package name="telepathy-gabble" source="telepathy-gabble"/> <package name="telepathy-salut" source="telepathy-salut"/> - <package name="xulrunner-1.9.2" source="xulrunner"/><!-- for hulahop --> </dependencies> diff --git a/config/sysdeps/50ubuntu-11.04.xml b/config/sysdeps/50ubuntu-11.04.xml index 636b7d4..14e718e 100644 --- a/config/sysdeps/50ubuntu-11.04.xml +++ b/config/sysdeps/50ubuntu-11.04.xml @@ -16,9 +16,7 @@ <package name="python-telepathy" source="telepathy-python"/> <package name="python-wnck" source="gnome-python-desktop"/> <package name="python-xklavier" source="python-xklavier"/> - <!-- python-xpcom still isn't packaged so hulahop won't work, but it builds --> <package name="telepathy-gabble" source="telepathy-gabble"/> <package name="telepathy-salut" source="telepathy-salut"/> <package name="telepathy-mission-control-5" source="telepathy-mission-control"/> - <package name="xulrunner-1.9.2" source="xulrunner"/><!-- for hulahop --> </dependencies> diff --git a/config/sysdeps/50ubuntu-9.04.xml b/config/sysdeps/50ubuntu-9.04.xml index f286557..362160c 100644 --- a/config/sysdeps/50ubuntu-9.04.xml +++ b/config/sysdeps/50ubuntu-9.04.xml @@ -8,7 +8,6 @@ <package name="libxkbfile-dev"/><!-- for libxklavier --> <package name="python-gnome2-desktop" source="gnome-python-desktop"/> <package name="python-setuptools"/><!-- for pep8 --> - <package name="xulrunner-1.9-dev" source="xulrunner"/><!-- for hulahop --> <package name="zenity"/><!-- for metacity --> <!-- TODO: check whether we actually need these (not included for Ubuntu 8.10) --> <package name="python-empy"/> diff --git a/config/sysdeps/50ubuntu-9.10.xml b/config/sysdeps/50ubuntu-9.10.xml index e51068e..c224d24 100644 --- a/config/sysdeps/50ubuntu-9.10.xml +++ b/config/sysdeps/50ubuntu-9.10.xml @@ -9,5 +9,4 @@ <package name="python-rsvg" source="gnome-python-desktop"/> <package name="python-setuptools"/><!-- for pep8 --> <package name="python-wnck" source="gnome-python-desktop"/> - <package name="xulrunner-1.9.1-dev" source="xulrunner"/><!-- for hulahop --> </dependencies> diff --git a/config/sysdeps/fedora-family.xml b/config/sysdeps/fedora-family.xml index 148c490..8045cbc 100644 --- a/config/sysdeps/fedora-family.xml +++ b/config/sysdeps/fedora-family.xml @@ -39,7 +39,6 @@ <package name="gtk2-devel"/> <package name="gtk3-devel"/><!-- for sugar-toolkit-gtk3 --> <package name="hippo-canvas-python" source="hippo-canvas"/> - <package name="hulahop" source="hulahop"/> <package name="icon-naming-utils"/> <package name="icon-slicer"/> <package name="intltool"/> |