diff options
| author |   Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2010-12-16 20:35:43 +0100 |
|---|---|---|
| committer | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2010-12-16 20:35:43 +0100 |
| commit | 0ece6bc5381c645267577781bd13c6504d1d125a (patch) | |
| tree | 250e0b4c851e75923c10328401c3d603e2babf0a /net-voip | |
| parent | bump tp stuff (diff) | |
| download | keruspe-0ece6bc5381c645267577781bd13c6504d1d125a.tar.gz keruspe-0ece6bc5381c645267577781bd13c6504d1d125a.tar.bz2 keruspe-0ece6bc5381c645267577781bd13c6504d1d125a.zip | |
fix tp-butterfly
Diffstat (limited to 'net-voip')
| -rw-r--r-- | net-voip/telepathy-butterfly/Manifest | 3 | ||||
| -rw-r--r-- | net-voip/telepathy-butterfly/files/fail.patch | 24 | ||||
| -rw-r--r-- | net-voip/telepathy-butterfly/telepathy-butterfly-0.5.15.ebuild | 1 |
3 files changed, 27 insertions, 1 deletions
diff --git a/net-voip/telepathy-butterfly/Manifest b/net-voip/telepathy-butterfly/Manifest index d50a2615..d8eb42e7 100644 --- a/net-voip/telepathy-butterfly/Manifest +++ b/net-voip/telepathy-butterfly/Manifest @@ -1,2 +1,3 @@ -EBUILD telepathy-butterfly-0.5.15.ebuild 773 RMD160 c0d914eacae1851e4f2fb296f5288acaa2186eeb SHA1 9ebe7a76491642de4fcf478ebd9f39a2ed509581 SHA256 df98e200c72801d2c2fc9b573ff416db5bf431261475af009705778c5ff5cb51 +AUX fail.patch 834 RMD160 12d7e2923524c87b91173aab7480b3839b99e865 SHA1 9045b350b7e844e81653c359baae08d495dff4a8 SHA256 1870d10e45e3686023a949cb2df66fecfa35aacd264c1946ec77fbb502884e0d +EBUILD telepathy-butterfly-0.5.15.ebuild 804 RMD160 2e4b156617ed6dfe9e76980d47524949bb0895e1 SHA1 a21e4ca486b11cbdfcef7cb7ff94d84ee42539a7 SHA256 39861241c5a1fc94fc1031e1e74014507059bc20edf57fa1de5c3c07b379ef66 DIST telepathy-butterfly-0.5.15.tar.gz 160946 RMD160 7b747c922428352d7fc92d2939918a005f321bda SHA1 73c9dba9f97ae5a6d981485e5f51c5930168f8ce SHA256 d48eef7f938c2b5bb805dd6bbbcde673b1c6526ca15af6b5f8fe03d926d35b90 diff --git a/net-voip/telepathy-butterfly/files/fail.patch b/net-voip/telepathy-butterfly/files/fail.patch new file mode 100644 index 00000000..6ad1a04d --- /dev/null +++ b/net-voip/telepathy-butterfly/files/fail.patch @@ -0,0 +1,24 @@ +From: Ionut Biru <ibiru@archlinux.org> +Date: Mon, 6 Dec 2010 12:22:45 +0000 (-0800) +Subject: bugfix: remove bad import from im module +X-Git-Url: http://git.collabora.co.uk/?p=telepathy-butterfly.git;a=commitdiff_plain;h=18b44dd2909b2cb75e8cc91a80f6e6b8ba253a7f + +bugfix: remove bad import from im module + +Signed-off-by: Ionut Biru <ibiru@archlinux.org> +Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> +--- + +diff --git a/butterfly/channel/im.py b/butterfly/channel/im.py +index 1781234..ac8dd44 100644 +--- a/butterfly/channel/im.py ++++ b/butterfly/channel/im.py +@@ -30,8 +30,6 @@ import papyon.event + + from butterfly.channel.text import ButterflyTextChannel + +-from butterfly.Channel_Interface_Conference import CHANNEL_INTERFACE_CONFERENCE +- + __all__ = ['ButterflyImChannel'] + + logger = logging.getLogger('Butterfly.ImChannel') diff --git a/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.15.ebuild b/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.15.ebuild index bfb119b2..4ad2801f 100644 --- a/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.15.ebuild +++ b/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.15.ebuild @@ -22,6 +22,7 @@ RDEPEND=">=dev-python/telepathy-python-0.15.17 DOCS="AUTHORS NEWS" src_prepare() { + epatch ${FILESDIR}/fail.patch mv py-compile py-compile-disabled ln -s $(type -P true) py-compile } |