diff options
author | Morgan Collett <morgan.collett@gmail.com> | 2009-01-21 13:29:59 (GMT) |
---|---|---|
committer | Morgan Collett <morgan.collett@gmail.com> | 2009-01-21 13:29:59 (GMT) |
commit | 3adf80619912c770905123cb6a294b30c1d17f75 (patch) | |
tree | 8e43fb1ed30af60fec061830188d9c057640b952 | |
parent | 6f653f8fa17149fd938264879c8c25bf71f41874 (diff) |
Update to tp-gabble 0.7.18, include dbus-glib 0.78, fix gabble chmod patch
-rw-r--r-- | config/modulesets/glucose-external.modules | 14 | ||||
-rw-r--r-- | config/modulesets/patches/telepathy-gabble-chmod-unix-socket.patch | 15 |
2 files changed, 17 insertions, 12 deletions
diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules index 6b6b2ad..5a21d13 100644 --- a/config/modulesets/glucose-external.modules +++ b/config/modulesets/glucose-external.modules @@ -17,6 +17,8 @@ href="http://dev.laptop.org/pub/sugar/xulrunner/"/> <repository type="git" name="dev.laptop.org/users/dsd" href="git://dev.laptop.org/users/dsd/"/> + <repository type="tarball" name="dbus" + href="http://dbus.freedesktop.org/releases/"/> <repository type="git" name="git.sugarlabs.org" default="yes" href="git://git.sugarlabs.org"/> <tarball id="pygobject" version="2.14"> @@ -93,14 +95,15 @@ <autotools id="telepathy-gabble" autogen-sh="configure"> <branch repo="telepathy" - version="0.7.16" - module="telepathy-gabble/telepathy-gabble-0.7.16.tar.gz" - size="1417532" md5sum="8a4be460b5d8233afa170f433ca116cc"> + version="0.7.18" + module="telepathy-gabble/telepathy-gabble-0.7.18.tar.gz" + size="1474712" md5sum="807260037be70882be3bcdb6b26ff031"> <patch file="telepathy-gabble-chmod-unix-socket.patch" strip="1"/> <patch file="telepathy-gabble-olpc-no-dbus-uid-check.patch" strip="1"/> </branch> <dependencies> <dep package="telepathy-glib"/> + <dep package="dbus-glib"/> </dependencies> </autotools> <autotools id="telepathy-salut" @@ -139,4 +142,9 @@ <patch file="gconf-dbus-defaultpath.patch" strip="0"/> </patches> </tarball> + <autotools id="dbus-glib" autogen-sh="configure"> + <branch repo="dbus" version="0.78" + module="dbus-glib/dbus-glib-0.78.tar.gz" + size="683454" md5sum="d4aa04b9df35b4bd663be38e959941c8" /> + </autotools> </moduleset> diff --git a/config/modulesets/patches/telepathy-gabble-chmod-unix-socket.patch b/config/modulesets/patches/telepathy-gabble-chmod-unix-socket.patch index bb16883..17988ca 100644 --- a/config/modulesets/patches/telepathy-gabble-chmod-unix-socket.patch +++ b/config/modulesets/patches/telepathy-gabble-chmod-unix-socket.patch @@ -1,14 +1,11 @@ -diff -rN -u old-telepathy-gabble-rainbow/src/tube-stream.c new-telepathy-gabble-rainbow/src/tube-stream.c ---- old-telepathy-gabble-rainbow/src/tube-stream.c 2007-12-11 16:28:48.000000000 +0100 -+++ new-telepathy-gabble-rainbow/src/tube-stream.c 2007-12-11 16:28:48.000000000 +0100 -@@ -650,6 +650,9 @@ - "Error binding socket: %s", g_strerror (errno)); +--- a/src/tube-stream.c ++++ b/src/tube-stream.c +@@ -667,6 +667,8 @@ tube_stream_open (GabbleTubeStream *self, + g_free (path); return FALSE; } -+ + /* Everyone can use the socket */ -+ chmod (addr.sun_path, 0777); ++ chmod (path, 0777); + g_free (path); } else if (priv->address_type == TP_SOCKET_ADDRESS_TYPE_IPV4) - { - |