4 files changed, 66 insertions, 10 deletions
diff --git a/net-im/tapiocaui/ChangeLog b/net-im/tapiocaui/ChangeLog
index 4977fa94b7b0..7c7ba969bee7 100644
--- a/net-im/tapiocaui/ChangeLog
+++ b/net-im/tapiocaui/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/tapiocaui
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/tapiocaui/ChangeLog,v 1.3 2006/10/08 18:04:15 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/tapiocaui/ChangeLog,v 1.4 2006/10/30 16:56:23 peper Exp $
+
+  30 Oct 2006; Piotr Jaroszyński <peper@gentoo.org>
+  +files/tapiocaui-0.3.9-farsight.patch, tapiocaui-0.3.9.ebuild:
+  Add naive patch to make it working with farsight >=0.1.8. Add RESTRICT=test
+  b/c tests are only ready enough to crash.
 
   07 Oct 2006; Simon Stelling <blubb@gentoo.org> tapiocaui-0.3.9.ebuild:
   added ~amd64
diff --git a/net-im/tapiocaui/Manifest b/net-im/tapiocaui/Manifest
index 157089100077..f7ee0481926f 100644
--- a/net-im/tapiocaui/Manifest
+++ b/net-im/tapiocaui/Manifest
@@ -1,12 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX tapiocaui-0.3.9-farsight.patch 1294 RMD160 52b9f26c32ed599eb0f23d913674475022625fb5 SHA1 cdf0d4591f2ddad51b7cc49df967316f7f1724d6 SHA256 f78ed5cdbc8ee1553456cf5110c82b2b70efc6dba3a1d33136d7cfc3cab36114
+MD5 9a1fbcd04754f2a13c97a32b8a30f1e0 files/tapiocaui-0.3.9-farsight.patch 1294
+RMD160 52b9f26c32ed599eb0f23d913674475022625fb5 files/tapiocaui-0.3.9-farsight.patch 1294
+SHA256 f78ed5cdbc8ee1553456cf5110c82b2b70efc6dba3a1d33136d7cfc3cab36114 files/tapiocaui-0.3.9-farsight.patch 1294
 DIST tapiocaui-0.3.9.tar.gz 444408 RMD160 8c4fb29baac5378a17cd944e89571b1d219a0765 SHA1 30633027dd1d3d8bed7bcdfc35d54110cc86f8df SHA256 d6efca333742757e4f0517f03f3dd153af20f5bbeaa15aca26534711c7b0a5a8
-EBUILD tapiocaui-0.3.9.ebuild 1664 RMD160 6ab339f5c962aff0b2a45df26f788d882984ef4d SHA1 9cf5a9c5b95f6cf0909e508141d8cb33802ac306 SHA256 e140e5450df9b1117c5156d0d966b27ddabb907f8e77f5c2e50d23922e2c850d
-MD5 cd5a85d14a3eeb886cf658fbf0ab5b47 tapiocaui-0.3.9.ebuild 1664
-RMD160 6ab339f5c962aff0b2a45df26f788d882984ef4d tapiocaui-0.3.9.ebuild 1664
-SHA256 e140e5450df9b1117c5156d0d966b27ddabb907f8e77f5c2e50d23922e2c850d tapiocaui-0.3.9.ebuild 1664
-MISC ChangeLog 639 RMD160 e50f7a19fc7bc3642d81e77d53df24af11d52392 SHA1 c8e68eeea6470589ca1db6d3d52d9d0b9cff70e7 SHA256 948709bb85734419d9aa523c4d234b241bef97e7e933404e438749cfecab66c3
-MD5 ac62f86499a284c01c1a74a024647bbb ChangeLog 639
-RMD160 e50f7a19fc7bc3642d81e77d53df24af11d52392 ChangeLog 639
-SHA256 948709bb85734419d9aa523c4d234b241bef97e7e933404e438749cfecab66c3 ChangeLog 639
+EBUILD tapiocaui-0.3.9.ebuild 1866 RMD160 3fa593d1388be1c342ee24c0f8ff28d93bc68753 SHA1 7b61e5f7dc9cd44bb124acbd5ce4eff0ac84454a SHA256 240553831ed48c3168f397ad45fd826f0ad38a9884c5f2479b964f4246257015
+MD5 d34fdf9730bad1970446aca2cbd95c82 tapiocaui-0.3.9.ebuild 1866
+RMD160 3fa593d1388be1c342ee24c0f8ff28d93bc68753 tapiocaui-0.3.9.ebuild 1866
+SHA256 240553831ed48c3168f397ad45fd826f0ad38a9884c5f2479b964f4246257015 tapiocaui-0.3.9.ebuild 1866
+MISC ChangeLog 880 RMD160 a136fe8601d732d10b2049ef23174a9261ebb0bf SHA1 20dfdfc2a392d3e3fe1fe442faca5af1e070480d SHA256 e2c22f01df10b1e8b2774c3cbd849046780b83d5cee77347349d02a74746ffed
+MD5 28f079fa0eaf59f6fc3c5d29b0b2094f ChangeLog 880
+RMD160 a136fe8601d732d10b2049ef23174a9261ebb0bf ChangeLog 880
+SHA256 e2c22f01df10b1e8b2774c3cbd849046780b83d5cee77347349d02a74746ffed ChangeLog 880
 MISC metadata.xml 157 RMD160 cb900ea8bf389b8f6147746711462b5757752b16 SHA1 bbbbd897cfe8d8bac785b23bead8e185871055bd SHA256 6759dc127ff53f85505b9b455ba325e65015b694b1ec50eb99ddfc8903b967bf
 MD5 b334f14db95c08e71ab02ffd5d712607 metadata.xml 157
 RMD160 cb900ea8bf389b8f6147746711462b5757752b16 metadata.xml 157
@@ -14,3 +21,10 @@ SHA256 6759dc127ff53f85505b9b455ba325e65015b694b1ec50eb99ddfc8903b967bf metadata
 MD5 724ed10ce22564735bae437963a5ad00 files/digest-tapiocaui-0.3.9 247
 RMD160 743021099cc4724fa1d81dd6668344a9dfddd5a1 files/digest-tapiocaui-0.3.9 247
 SHA256 cfaff4feab545e0ea3f214653f28d7d304525f82a9bb584afd738053622cefda files/digest-tapiocaui-0.3.9 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFRi6+ppoStNGKGywRApNAAJ9oAkpt2nowp2fsHpug+vJVdMJuawCfc3WV
+RPEOM+8xIH1L3y8fmkVf7ro=
+=jgE5
+-----END PGP SIGNATURE-----
diff --git a/net-im/tapiocaui/files/tapiocaui-0.3.9-farsight.patch b/net-im/tapiocaui/files/tapiocaui-0.3.9-farsight.patch
new file mode 100644
index 000000000000..1fe10b3361b1
--- /dev/null
+++ b/net-im/tapiocaui/files/tapiocaui-0.3.9-farsight.patch
@@ -0,0 +1,26 @@
+diff -uNr tapiocaui-0.3.9-org/src/tapiocaui_shell_media.c tapiocaui-0.3.9/src/tapiocaui_shell_media.c
+--- tapiocaui-0.3.9-org/src/tapiocaui_shell_media.c	2006-06-08 21:57:31.000000000 +0200
++++ tapiocaui-0.3.9/src/tapiocaui_shell_media.c	2006-10-30 17:12:14.000000000 +0100
+@@ -173,7 +173,7 @@
+     g_signal_handlers_disconnect_by_func (G_OBJECT (stream), G_CALLBACK (new_native_candidate), comm);
+     g_signal_handlers_disconnect_by_func (G_OBJECT (stream), G_CALLBACK (state_changed), self);
+ 
+-    if (farsight_stream_get_state != FARSIGHT_STREAM_STATE_STOPPED)
++    if (farsight_stream_get_state != FARSIGHT_STREAM_STATE_DISCONNECTED)
+         farsight_stream_stop (stream);
+     g_object_unref (stream);
+     comm->stream = NULL;
+@@ -357,11 +357,11 @@
+     TapiocaUIShell *self = (TapiocaUIShell *) user_data;
+ 
+     switch (state) {
+-        case FARSIGHT_STREAM_STATE_STOPPED:
++        case FARSIGHT_STREAM_STATE_DISCONNECTED:
+             tapiocaui_debug ("stream stopped: stream=%p", stream);
+             tapiocaui_shell_close_call (self, self->priv->active_comm);
+             break;
+-        case FARSIGHT_STREAM_STATE_PLAYING:
++        case FARSIGHT_STREAM_STATE_CONNECTED:
+             tapiocaui_debug ("stream playing: stream=%p", stream);
+             break;
+         default:
diff --git a/net-im/tapiocaui/tapiocaui-0.3.9.ebuild b/net-im/tapiocaui/tapiocaui-0.3.9.ebuild
index 874e8b7f8645..5f05d92886a8 100644
--- a/net-im/tapiocaui/tapiocaui-0.3.9.ebuild
+++ b/net-im/tapiocaui/tapiocaui-0.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/tapiocaui/tapiocaui-0.3.9.ebuild,v 1.3 2006/10/08 18:04:15 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/tapiocaui/tapiocaui-0.3.9.ebuild,v 1.4 2006/10/30 16:56:23 peper Exp $
 
 inherit eutils
 
@@ -26,6 +26,9 @@ RDEPEND="net-im/tapiocad
 	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2"
 
+# Test is not ready yet, but it's ready enough to crash :]
+RESTRICT="test"
+
 pkg_setup() {
 	if ! built_with_use media-plugins/gst-plugins-farsight jingle ; then
 		eerror "In order to use tapioca core and client, you need to have"
@@ -41,6 +44,14 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Naive fix due to farsight ABI change.
+	epatch "${FILESDIR}/${P}-farsight.patch"
+}
+
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 }