[Sugar-devel] [PATCH] Update the versions of our telepathy dependencies and add mission control #2228
David Farning
dfarning at gmail.com
Wed Sep 8 13:58:53 EDT 2010
On Tue, Sep 7, 2010 at 12:42 PM, Tomeu Vizoso
<tomeu.vizoso at collabora.co.uk> wrote:
> On Tue, Sep 7, 2010 at 19:39, Tomeu Vizoso <tomeu.vizoso at collabora.co.uk> wrote:
>> Signed-off-by: Tomeu Vizoso <tomeu.vizoso at collabora.co.uk>
>
> This has been tested only in Fedora 13, further testing appreciated.
>
> Will be sending a patch for adding specific Fedora versions after this lands.
This now requires libtelepathy-glib-dev as a dependency for ubuntu 10.10.
thanks
> Thanks,
>
> Tomeu
>
>> ---
>> config/modulesets/glucose-external.modules | 35 ++++++++++++++++++---------
>> config/modulesets/glucose.modules | 1 +
>> config/sysdeps/50debian-unstable.xml | 4 ---
>> config/sysdeps/50ubuntu-10.04.xml | 4 ---
>> config/sysdeps/debian-family.xml | 3 ++
>> config/sysdeps/fedora-family.xml | 7 ++---
>> sjhbuild/config.py | 1 +
>> 7 files changed, 31 insertions(+), 24 deletions(-)
>>
>> diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules
>> index 0577963..9d50db0 100644
>> --- a/config/modulesets/glucose-external.modules
>> +++ b/config/modulesets/glucose-external.modules
>> @@ -84,9 +84,9 @@
>> <autotools id="telepathy-gabble"
>> autogen-sh="configure">
>> <branch repo="telepathy"
>> - version="0.8.9"
>> - module="telepathy-gabble/telepathy-gabble-0.8.9.tar.gz"
>> - size="1493009" md5sum="ddf89b1eea2f418a68b1013427eb0cb1">
>> + version="0.9.16"
>> + module="telepathy-gabble/telepathy-gabble-0.9.16.tar.gz"
>> + size="2900705" md5sum="7f2ab9256a6202f717bffaf341c99f75">
>> </branch>
>> <dependencies>
>> <dep package="telepathy-glib"/>
>> @@ -111,9 +111,9 @@
>> <autotools id="telepathy-salut"
>> autogen-sh="configure" autogenargs="--enable-olpc --enable-ssl">
>> <branch repo="telepathy"
>> - version="0.3.10"
>> - module="telepathy-salut/telepathy-salut-0.3.10.tar.gz"
>> - size="1190762" md5sum="145580837ba7727f7c97bcfbd1b4a71f">
>> + version="0.3.13"
>> + module="telepathy-salut/telepathy-salut-0.3.13.tar.gz"
>> + size="1209052" md5sum="173448d2680026c5e311f7c97cdda327">
>> </branch>
>> <dependencies>
>> <dep package="telepathy-glib"/>
>> @@ -121,22 +121,33 @@
>> </dependencies>
>> </autotools>
>> <autotools id="telepathy-glib" autogen-sh="configure">
>> - <branch repo="telepathy" version="0.9.2"
>> - module="telepathy-glib/telepathy-glib-0.9.2.tar.gz"
>> - size="2548558" md5sum="83be89144539472eac4ee4a4487f68c4" />
>> + <branch repo="telepathy" version="0.11.11"
>> + module="telepathy-glib/telepathy-glib-0.11.11.tar.gz"
>> + size="2431238" md5sum="ff78ff73851841b47582d5cf99dd5a34" />
>> <dependencies>
>> <dep package="dbus-glib"/>
>> </dependencies>
>> </autotools>
>> <autotools id="telepathy-python" autogen-sh="configure">
>> - <branch module="telepathy-python/telepathy-python-0.15.14.tar.gz"
>> - repo="telepathy" version="0.15.14"
>> - size="306178" md5sum="058b929055710410f420989c20d5e981"/>
>> + <branch module="telepathy-python/telepathy-python-0.15.18.tar.gz"
>> + repo="telepathy" version="0.15.18"
>> + size="356285" md5sum="51da78a77681b0652d9b4ca941da0658"/>
>> </autotools>
>> <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.92.tar.bz2"
>> version="2.25.92" size="1842261" md5sum="5e0d0fc2d900856074b556e4eacc68e6"/>
>> </tarball>
>> + <autotools id="telepathy-mission-control"
>> + autogen-sh="configure">
>> + <branch repo="telepathy"
>> + version="5.5.3"
>> + module="telepathy-mission-control/telepathy-mission-control-5.5.3.tar.gz"
>> + size="1245954" md5sum="117528e399d190f66c176e37aefb85d6">
>> + </branch>
>> + <dependencies>
>> + <dep package="telepathy-glib"/>
>> + </dependencies>
>> + </autotools>
>> <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"/>
>> diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules
>> index 2a9a8ce..ac9e237 100644
>> --- a/config/modulesets/glucose.modules
>> +++ b/config/modulesets/glucose.modules
>> @@ -35,6 +35,7 @@
>> <dep package="telepathy-gabble"/>
>> <dep package="telepathy-salut"/>
>> <dep package="telepathy-python"/>
>> + <dep package="telepathy-mission-control"/>
>> </dependencies>
>> </autotools>
>> <autotools id="sugar-artwork">
>> diff --git a/config/sysdeps/50debian-unstable.xml b/config/sysdeps/50debian-unstable.xml
>> index e04de63..ffa8f0c 100644
>> --- a/config/sysdeps/50debian-unstable.xml
>> +++ b/config/sysdeps/50debian-unstable.xml
>> @@ -4,7 +4,6 @@
>> <package name="espeak"/>
>> <package name="espeak-data"/>
>> <package name="libabiword-2.8-dev" source="abiword"/>
>> - <package name="libtelepathy-glib0" source="telepathy-glib"/>
>> <package name="libdbus-glib-1-dev" source="dbus-glib"/>
>> <package name="metacity" source="metacity"/>
>> <package name="pep8" source="pep8"/>
>> @@ -13,12 +12,9 @@
>> <package name="python-evince" source="gnome-python-desktop"/>
>> <!-- <package name="python-metacity" source="gnome-python-desktop"/> -->
>> <package name="python-rsvg" source="gnome-python-desktop"/>
>> - <package name="python-telepathy" source="telepathy-python"/>
>> <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-salut" source="telepathy-salut"/>
>> <package name="xulrunner-dev" source="xulrunner"/><!-- for hulahop -->
>> <!-- TODO: check whether we actually need these (commented out for Ubuntu 9.04) -->
>> <package name="cdbs"/>
>> diff --git a/config/sysdeps/50ubuntu-10.04.xml b/config/sysdeps/50ubuntu-10.04.xml
>> index 89efc0d..7ac6839 100644
>> --- a/config/sysdeps/50ubuntu-10.04.xml
>> +++ b/config/sysdeps/50ubuntu-10.04.xml
>> @@ -4,7 +4,6 @@
>> <package name="espeak"/>
>> <package name="espeak-data"/>
>> <package name="libabiword-2.8-dev" source="abiword"/>
>> - <package name="libtelepathy-glib0" source="telepathy-glib"/>
>> <package name="libdbus-glib-1-dev" source="dbus-glib"/>
>> <package name="libxklavier-dev" source="libxklavier"/>
>> <package name="metacity" source="metacity"/>
>> @@ -13,10 +12,7 @@
>> <package name="python-evince" source="gnome-python-desktop"/>
>> <!-- <package name="python-metacity" source="gnome-python-desktop"/> -->
>> <package name="python-rsvg" source="gnome-python-desktop"/>
>> - <package name="python-telepathy" source="telepathy-python"/>
>> <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="telepathy-gabble" source="telepathy-gabble"/>
>> - <package name="telepathy-salut" source="telepathy-salut"/>
>> <package name="xulrunner-1.9" source="xulrunner"/><!-- for hulahop -->
>> </dependencies>
>> diff --git a/config/sysdeps/debian-family.xml b/config/sysdeps/debian-family.xml
>> index d7c1354..6b03287 100644
>> --- a/config/sysdeps/debian-family.xml
>> +++ b/config/sysdeps/debian-family.xml
>> @@ -39,9 +39,11 @@
>> <package name="libgtk2.0-dev"/>
>> <package name="libidl-dev"/>
>> <package name="libloudmouth1-dev"/>
>> + <package name="libnice-dev"/>
>> <package name="libpoppler-glib-dev"/>
>> <package name="libpopt-dev"/>
>> <package name="librsvg2-dev"/>
>> + <package name="libsqlite3-dev"/>
>> <package name="libssl-dev"/>
>> <package name="libsoup2.4-dev" source="libsoup"/>
>> <package name="libtool"/>
>> @@ -75,6 +77,7 @@
>> <package name="python-xapian"/>
>> <package name="subversion"/>
>> <package name="unzip"/>
>> + <package name="uuid-dev"/>
>> <package name="vnc4server"/><!-- for sugar-emulator (sugar) -->
>> <package name="x11-utils"/>
>> <package name="xserver-xephyr"/>
>> diff --git a/config/sysdeps/fedora-family.xml b/config/sysdeps/fedora-family.xml
>> index 35ee6c0..d5a64db 100644
>> --- a/config/sysdeps/fedora-family.xml
>> +++ b/config/sysdeps/fedora-family.xml
>> @@ -46,6 +46,7 @@
>> <package name="libffi-devel"/>
>> <package name="libglade2-devel"/>
>> <package name="libgsf-devel"/>
>> + <package name="libnice-devel"/><!-- for telepathy-gabble -->
>> <package name="librsvg2-devel"/>
>> <package name="libsoup-devel" source="libsoup"/>
>> <package name="libtool"/>
>> @@ -69,14 +70,12 @@
>> <package name="python-distutils-extra"/><!-- for sugar-update-control -->
>> <package name="python-pep8" source="pep8"/>
>> <package name="python-simplejson"/>
>> - <package name="python-telepathy" source="telepathy-python"/>
>> <package name="pywebkitgtk" /><!-- for Read -->
>> + <package name="sqlite-devel"/><!-- for telepathy-gabble -->
>> <package name="subversion"/>
>> - <package name="telepathy-gabble" source="telepathy-gabble"/>
>> - <package name="telepathy-glib" source="telepathy-glib"/>
>> - <package name="telepathy-salut" source="telepathy-salut"/>
>> <package name="tigervnc"/><!-- for sugar-emulator (sugar) -->
>> <package name="tigervnc-server"/><!-- for sugar-emulator (sugar) -->
>> + <package name="uuid-devel"/><!-- for telepathy-gabble -->
>> <package name="wv-devel"/>
>> <package name="xapian-bindings-python"/>
>> <package name="xapian-core-libs"/>
>> diff --git a/sjhbuild/config.py b/sjhbuild/config.py
>> index 8fd4ec0..e451f93 100644
>> --- a/sjhbuild/config.py
>> +++ b/sjhbuild/config.py
>> @@ -61,6 +61,7 @@ class Config(jhbuild.config.Config):
>> # Enable debug log of the Telepathy components
>> os.environ.setdefault('GABBLE_DEBUG', 'all')
>> os.environ.setdefault('SALUT_DEBUG', 'all')
>> + os.environ.setdefault('MC_DEBUG', 'all')
>> os.environ.setdefault('STREAM_ENGINE_DEBUG', 'all')
>>
>> # We need to add the gtk-2.0 directory explicitly to
>> --
>> 1.7.2.2
>>
>> _______________________________________________
>> Sugar-devel mailing list
>> Sugar-devel at lists.sugarlabs.org
>> http://lists.sugarlabs.org/listinfo/sugar-devel
>>
> _______________________________________________
> Sugar-devel mailing list
> Sugar-devel at lists.sugarlabs.org
> http://lists.sugarlabs.org/listinfo/sugar-devel
>
More information about the Sugar-devel
mailing list