Ticket #2228: 0001-Update-the-versions-of-our-telepathy-dependencies-an.patch

File 0001-Update-the-versions-of-our-telepathy-dependencies-an.patch, 9.1 KB (added by tomeu, 14 years ago)

  • config/modulesets/glucose-external-0.84.modules 

    From 873ab2098a30ad517aef574ae521bfd498055989 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date: Wed, 25 Aug 2010 15:55:56 +0200
Subject: [PATCH 1/2] Update the versions of our telepathy dependencies and add mission control

---
 config/modulesets/glucose-external-0.84.modules |    3 ++
 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/fedora-family.xml                |    3 --
 sjhbuild/config.py                              |    7 ++++
 7 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/config/modulesets/glucose-external-0.84.modules b/config/modulesets/glucose-external-0.84.modules
index e47f085..9cd7eed 100644
    a b  
    9898      <dep package="telepathy-glib"/>
    9999      <dep package="dbus-glib"/>
    100100      <dep package="libsoup"/>
     101      <dep package="sqlite3"/>
     102      <dep package="libuuid"/>
     103      <dep package="libnice"/>
    101104    </dependencies>
    102105  </autotools>
    103106  <autotools id="libsoup">

  • config/modulesets/glucose-external.modules 

    diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules
index 33aaa9a..04cc65a 100644
    a b  
    8181  <autotools id="telepathy-gabble"
    8282             autogen-sh="configure">
    8383    <branch repo="telepathy"
    84             version="0.8.9"
    85             module="telepathy-gabble/telepathy-gabble-0.8.9.tar.gz"
    86             size="1493009" md5sum="ddf89b1eea2f418a68b1013427eb0cb1">
     84            version="0.9.16"
     85            module="telepathy-gabble/telepathy-gabble-0.9.16.tar.gz"
     86            size="2900705" md5sum="7f2ab9256a6202f717bffaf341c99f75">
    8787    </branch>
    8888    <dependencies>
    8989      <dep package="telepathy-glib"/>
    … …  
    108108  <autotools id="telepathy-salut"
    109109             autogen-sh="configure" autogenargs="--enable-olpc --enable-ssl">
    110110    <branch repo="telepathy"
    111             version="0.3.10"
    112             module="telepathy-salut/telepathy-salut-0.3.10.tar.gz"
    113             size="1190762" md5sum="145580837ba7727f7c97bcfbd1b4a71f">
     111            version="0.3.13"
     112            module="telepathy-salut/telepathy-salut-0.3.13.tar.gz"
     113            size="1209052" md5sum="173448d2680026c5e311f7c97cdda327">
    114114    </branch>
    115115    <dependencies>
    116116      <dep package="telepathy-glib"/>
    … …  
    118118    </dependencies>
    119119  </autotools>
    120120  <autotools id="telepathy-glib" autogen-sh="configure">
    121     <branch repo="telepathy" version="0.9.2"
    122             module="telepathy-glib/telepathy-glib-0.9.2.tar.gz"
    123             size="2548558" md5sum="83be89144539472eac4ee4a4487f68c4" />
     121    <branch repo="telepathy" version="0.11.11"
     122            module="telepathy-glib/telepathy-glib-0.11.11.tar.gz"
     123            size="2431238" md5sum="ff78ff73851841b47582d5cf99dd5a34" />
    124124    <dependencies>
    125125      <dep package="dbus-glib"/>
    126126    </dependencies>
    127127  </autotools>
    128128  <autotools id="telepathy-python" autogen-sh="configure">
    129     <branch module="telepathy-python/telepathy-python-0.15.14.tar.gz"
    130             repo="telepathy" version="0.15.14"
    131             size="306178" md5sum="058b929055710410f420989c20d5e981"/>
     129    <branch module="telepathy-python/telepathy-python-0.15.18.tar.gz"
     130            repo="telepathy" version="0.15.18"
     131            size="356285" md5sum="51da78a77681b0652d9b4ca941da0658"/>
    132132  </autotools>
    133133  <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">
    134134    <source href="http://download.gnome.org/sources/evince/2.25/evince-2.25.92.tar.bz2"
    135135            version="2.25.92" size="1842261" md5sum="5e0d0fc2d900856074b556e4eacc68e6"/>
    136136  </tarball>
     137  <autotools id="telepathy-mission-control"
     138             autogen-sh="configure">
     139    <branch repo="telepathy"
     140            version="5.5.3"
     141            module="telepathy-mission-control/telepathy-mission-control-5.5.3.tar.gz"
     142            size="1245954" md5sum="117528e399d190f66c176e37aefb85d6">
     143    </branch>
     144    <dependencies>
     145      <dep package="telepathy-glib"/>
     146    </dependencies>
     147  </autotools>
    137148  <tarball id="gnome-python-desktop">
    138149    <source href="http://download.gnome.org/sources/gnome-python-desktop/2.25/gnome-python-desktop-2.25.90.tar.bz2"
    139150            version="2.25.90" size="571621" md5sum="9bc794079fb4dd02f4d0651ff04bbace"/>

  • config/modulesets/glucose.modules 

    diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules
index 2a9a8ce..ac9e237 100644
    a b  
    3535      <dep package="telepathy-gabble"/>
    3636      <dep package="telepathy-salut"/>
    3737      <dep package="telepathy-python"/>
     38      <dep package="telepathy-mission-control"/>
    3839    </dependencies>
    3940  </autotools>
    4041  <autotools id="sugar-artwork">

  • config/sysdeps/50debian-unstable.xml 

    diff --git a/config/sysdeps/50debian-unstable.xml b/config/sysdeps/50debian-unstable.xml
index e04de63..ffa8f0c 100644
    a b  
    44  <package name="espeak"/>
    55  <package name="espeak-data"/>
    66  <package name="libabiword-2.8-dev" source="abiword"/>
    7   <package name="libtelepathy-glib0" source="telepathy-glib"/>
    87  <package name="libdbus-glib-1-dev" source="dbus-glib"/>
    98  <package name="metacity" source="metacity"/>
    109  <package name="pep8" source="pep8"/>
    … …  
    1312  <package name="python-evince" source="gnome-python-desktop"/>
    1413<!--  <package name="python-metacity" source="gnome-python-desktop"/> -->
    1514  <package name="python-rsvg" source="gnome-python-desktop"/>
    16   <package name="python-telepathy" source="telepathy-python"/>
    1715  <package name="python-wnck" source="gnome-python-desktop"/>
    1816  <package name="python-xklavier" source="python-xklavier"/>
    1917  <package name="python-xpcom" source="xulrunner"/>
    20   <package name="telepathy-gabble" source="telepathy-gabble"/>
    21   <package name="telepathy-salut" source="telepathy-salut"/>
    2218  <package name="xulrunner-dev" source="xulrunner"/><!-- for hulahop -->
    2319  <!-- TODO: check whether we actually need these (commented out for Ubuntu 9.04) -->
    2420  <package name="cdbs"/>

  • config/sysdeps/50ubuntu-10.04.xml 

    diff --git a/config/sysdeps/50ubuntu-10.04.xml b/config/sysdeps/50ubuntu-10.04.xml
index e7f8452..9ecb421 100644
    a b  
    22<dependencies>
    33  <package name="espeak"/>
    44  <package name="espeak-data"/>
    5   <package name="libtelepathy-glib0" source="telepathy-glib"/>
    65  <package name="libdbus-glib-1-dev" source="dbus-glib"/>
    76  <package name="libxklavier-dev" source="libxklavier"/>
    87  <package name="metacity" source="metacity"/>
    … …  
    109  <package name="python-evince" source="gnome-python-desktop"/>
    1110<!--  <package name="python-metacity" source="gnome-python-desktop"/> -->
    1211  <package name="python-rsvg" source="gnome-python-desktop"/>
    13   <package name="python-telepathy" source="telepathy-python"/>
    1412  <package name="python-wnck" source="gnome-python-desktop"/>
    15   <package name="telepathy-gabble" source="telepathy-gabble"/>
    16   <package name="telepathy-salut" source="telepathy-salut"/>
    1713  <package name="xulrunner-1.9" source="xulrunner"/><!-- for hulahop -->
    1814</dependencies>

  • config/sysdeps/fedora-family.xml 

    diff --git a/config/sysdeps/fedora-family.xml b/config/sysdeps/fedora-family.xml
index 83ec629..82090cc 100644
    a b  
    7070  <package name="python-telepathy" source="telepathy-python"/>
    7171  <package name="pywebkitgtk" /><!-- for Read -->
    7272  <package name="subversion"/>
    73   <package name="telepathy-gabble" source="telepathy-gabble"/>
    74   <package name="telepathy-glib" source="telepathy-glib"/>
    75   <package name="telepathy-salut" source="telepathy-salut"/>
    7673  <package name="tigervnc"/><!-- for sugar-emulator (sugar) -->
    7774  <package name="tigervnc-server"/><!-- for sugar-emulator (sugar) -->
    7875  <package name="wv-devel"/>

  • sjhbuild/config.py 

    diff --git a/sjhbuild/config.py b/sjhbuild/config.py
index 8fd4ec0..8451dda 100644
    a b class Config(jhbuild.config.Config): 
    6161        # Enable debug log of the Telepathy components
    6262        os.environ.setdefault('GABBLE_DEBUG', 'all')
    6363        os.environ.setdefault('SALUT_DEBUG', 'all')
     64        os.environ.setdefault('MC_DEBUG', 'all')
    6465        os.environ.setdefault('STREAM_ENGINE_DEBUG', 'all')
    6566
     67        # Make Mission Control 5 use our accounts dir
     68        accounts_dir = os.path.join(os.path.expanduser('~/.sugar'),
     69                                    os.environ.get('SUGAR_PROFILE', 'default'),
     70                                    'accounts')
     71        os.environ.setdefault('MC_ACCOUNT_DIR', accounts_dir)
     72
    6673        # We need to add the gtk-2.0 directory explicitly to
    6774        # the Python path since '.pth' files (here pygtk.pth)
    6875        # only work properly in system directories