Add naive patch to make it working with farsight >=0.1.8. Add RESTRICT=test b/c tests are only ready enough to crash.

(Portage version: 2.1.2_rc1-r1)

3 files changed, 44 insertions, 2 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/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"
 }