Fix telepathy-glib-0.4 compatibility (bug #413423, thanks to Antoine Lemoine and Jack River). Fix a crash and do not silently fail to send messages. Drop old.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

6 files changed, 174 insertions, 12 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 9db492f1d808..9c6e9472b010 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.102 2012/02/14 04:57:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.103 2012/05/02 05:45:35 tetromino Exp $
+
+*empathy-3.2.2-r1 (02 May 2012)
+
+  02 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -empathy-3.2.1.2.ebuild, +empathy-3.2.2-r1.ebuild,
+  +files/empathy-3.2.2-cancellable-not-NULL.patch,
+  +files/empathy-3.2.2-delivery-failed.patch,
+  +files/empathy-3.2.2-telepathy-logger-0.4.patch:
+  Fix telepathy-glib-0.4 compatibility (bug #413423, thanks to Antoine Lemoine
+  and Jack River). Fix a crash and do not silently fail to send messages. Drop
+  old.
 
   14 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   empathy-3.2.1.2.ebuild, empathy-3.2.2.ebuild:
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 1c452ff53b54..eed50397850a 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,24 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX empathy-2.32.2-libnotify-0.7.patch 1644 RMD160 87941e9933ec4fb83f45a0e052af77273a6aa250 SHA1 8696716fd49d0a0bce7eeb7044db66b7591e0d82 SHA256 8f7280c95fb67a2f91dc38984523f8ae4be95643e7404ea672d88d6541987ca8
 AUX empathy-2.34.0-CVE-2011-3635.patch 2451 RMD160 74947ef5803899f2882fd80186329673303c84d2 SHA1 36b1e435df44238ad8ec457148198c6f33e402c8 SHA256 7b82ba0d9e002ba78975caff45ec08eb7b176feb513ba72c0c312f0a2a8ccd54
 AUX empathy-2.34.0-auth-dialog-crash-fix.patch 976 RMD160 97ea8bb28e5673baaca8d437158202d9b40019d1 SHA1 ab18d8759a46da7e34b0f2261c7c3b802688663a SHA256 cad7bc8885b94cfe777223bd167006f5fd5e57dcff87ba861260d08e961c22f3
 AUX empathy-2.34.0-missing-include.patch 379 RMD160 c0284cfd166c731b8214f849c0503e646eb4bf7b SHA1 e01c5f0dfc57550e7933b85f0d4c61d29e58b061 SHA256 4e0db8f73a72c5adfd331f53d291f600f83a01832a22121a4b946306f8bc23b6
+AUX empathy-3.2.2-cancellable-not-NULL.patch 1292 RMD160 a57258f87b5c4f410593b6d5a90efcf074e482d9 SHA1 867c9ca42b4ce8d4f21f22b559d497b1054bb248 SHA256 b25914257a9403b24b5219e73882dd6b865c0a6f1e4300d9b27962ce0109aa63
+AUX empathy-3.2.2-delivery-failed.patch 1119 RMD160 cb7d3fb4ae4a9b7384f5bc756f37cc7eeabc8f89 SHA1 0ac7347815bbaea5e30de9ee06ce6a42f65b2e1f SHA256 25a155d821f6264b76c43ed2e0597b9149520de4d2a4a0a1da38fb1edb1a9571
+AUX empathy-3.2.2-telepathy-logger-0.4.patch 2980 RMD160 c665a2ab69ef82beca02e78692a17c6d9cb23f02 SHA1 9bf26a9e2ec7a6a905a662f61d4627e4a72ddab7 SHA256 5b55c7c4b7c8bea11a0e842a44d52836f6b7d1dbfb2d0a567109ff0662c95448
 DIST empathy-2.32.2.tar.bz2 2936340 RMD160 36d42e08343e49c1963405caeb35e76400bab209 SHA1 b956af129aaecc54491c7bc01892bb29c33c1d32 SHA256 f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861
 DIST empathy-2.34.0.tar.bz2 3361496 RMD160 a76e9633d88dbd48c5d494d3393566a88a5b35c4 SHA1 cc82c871fb1d3dbc428b851c59ad44184f064d10 SHA256 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1
-DIST empathy-3.2.1.2.tar.xz 3183768 RMD160 f3f5b7cfb852a1f82d6a6e3b2a62aba95ac1042f SHA1 6bf4e0d0c3fcfb8c62269ad324b21c6a15f2dab1 SHA256 44e149ecadce6269a6d31d93bbd7d4a4bda8d092d4e95de9d5ca09cf067d8ab7
 DIST empathy-3.2.2.tar.xz 3184408 RMD160 f323ef6c46f074c32947e64bad3d9c94194f3aa3 SHA1 fbf0e43c75c49caca4e4a25d1790afcbae7942f2 SHA256 d6a391b801f58024ed6f97d9bf4e774b9ab9e1262d79aefb5c1dd95233fd5aa1
 EBUILD empathy-2.32.2.ebuild 3094 RMD160 6750e1c10320f05155305d5ee6d4b212c4c824fe SHA1 73e342aaf5e3e34ae8fdb23e7e9aed0d9fab407f SHA256 7e7c676ccc653618979cecd68aa42d33e8d49e169132288a457923620abd7162
 EBUILD empathy-2.34.0-r2.ebuild 3295 RMD160 8cc785377256c4e4322d1045b61c6041c6640254 SHA1 a9ffdeabfbe54b73d5fa4da5907d69066649cc07 SHA256 b84c50a9bb41fe2f6cc2ef26ae8993f066a1923e11281bb27ec717dc6e05fb78
-EBUILD empathy-3.2.1.2.ebuild 3384 RMD160 925c81656a92e60dc6afed6668f18932b26b39e0 SHA1 376c9f4a22e213060dc1eb30ffb3904db4afbe70 SHA256 e8e284af064f015cc4e3c59f358bbd1f00a35646d95f95b5453c345d2a88a1cf
+EBUILD empathy-3.2.2-r1.ebuild 3687 RMD160 cf72ac7a2cc2fcb6d782e2553ac48ca01480ab11 SHA1 5146df4bc7b2e0dbeae7beb7054a2855200c80be SHA256 bed0e24a14602a955103124153847061266f69759dabcd12c937ea0f931f120a
 EBUILD empathy-3.2.2.ebuild 3382 RMD160 201bd90ed630bff24bcd05c9f3562b83ddafc604 SHA1 4ab0415514bade33d3658201bbd213cb5f583dad SHA256 6901edd6a6cdda1ada12ed8237e6813f73e9f7a23ba5e414eb2b4e4769b8645e
-MISC ChangeLog 17873 RMD160 b839640c405321b8282b18e5a7173c6ebab735a5 SHA1 4877d9982358a08314cffd541555618e769beeff SHA256 1a28e537b7fee2dc9d37ed0332584cc8287878bc4d508c237e884e55537fe6dd
+MISC ChangeLog 18332 RMD160 8e9efed3f3a95d55760f3a482472762be585069b SHA1 85be2e7fb2b9e6f215315917203e14d71bbc5834 SHA256 fd579c4a44c15cb393e59dbf8f7a25a922cb65910dfb81da09495b4737e625d0
 MISC metadata.xml 1425 RMD160 38d0a65bd440db5fe8deb90bd79f079b12a5502d SHA1 d1743cb72216d94a45eae200cd40d310a121cb5b SHA256 0a68cd5576cafddcf96b2046679bcd0511adc7f3205fefb8f8cc1cb4de87d7c0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk856doACgkQdjK8w9WeBnBN4QD/ZNsBGW0enMDv9t+0EyKhLH+4
-/t8NUHeRk00skcmhNuYBAKFav/xzfiOg1msmIF1R8hPOZ6HQ1uoMA5Aw63MpdkyA
-=o9xB
+iQEcBAEBAgAGBQJPoMoEAAoJEJ0WA1zPCt1hjl4H/08NirTF+rbN+190X3ApQpHR
+UbW2qcAsA/3kFqGEmmUhW7Lu+ud77QoC3648xFn8j6RHp2XBMM+rP+Kdgt8sZp20
+ss1+eg89Mu3hh5v6AykgADHsf0139nea1ygf3QKgPVdZwvxkOPvjKEE7mXWwVlFE
+6thVVbD5BAhA/KbXqthZplOJPe47mGjVYjLfcw3ox7AqPbPjH1+OVbhuCxDGTvMH
+cHu1B2qcW7rZNoDe19deZ4ZRWqQC0g2CEvN2xfkS1sLCXabZLAtv1KggrZkdv+LB
+T/xkMMabONNvsNg7V00mh9C7JNW3zT/11AnfEDcS1oEyX1sQ6hyEq3mO+rKU/3o=
+=RWH8
 -----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-3.2.1.2.ebuild b/net-im/empathy/empathy-3.2.2-r1.ebuild
index 110fef95cb1e..2fa11075c6ec 100644
--- a/net-im/empathy/empathy-3.2.1.2.ebuild
+++ b/net-im/empathy/empathy-3.2.2-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.2.1.2.ebuild,v 1.4 2012/02/14 04:57:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.2.2-r1.ebuild,v 1.1 2012/05/02 05:45:35 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.5"
 
-inherit gnome2 python
+inherit eutils gnome2 python
 
 DESCRIPTION="Telepathy client and library using GTK+"
 HOMEPAGE="http://live.gnome.org/Empathy"
@@ -41,7 +41,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	media-libs/gstreamer:0.10
 	media-libs/gst-plugins-base:0.10
 	media-libs/gst-plugins-bad
-	>=net-im/telepathy-logger-0.2.8
+	>=net-im/telepathy-logger-0.2.13
 	net-libs/farsight2
 	>=net-libs/telepathy-farsight-0.0.14
 	net-im/telepathy-connection-managers
@@ -108,6 +108,16 @@ pkg_setup() {
 	python_pkg_setup
 }
 
+src_prepare() {
+	# In next release
+	epatch "${FILESDIR}/${P}-delivery-failed.patch"
+	epatch "${FILESDIR}/${P}-cancellable-not-NULL.patch"
+	# Fix telepathy-logger-0.4 compatibility, bug #413423; patch from 3.4
+	epatch "${FILESDIR}/${PN}-3.2.2-telepathy-logger-0.4.patch"
+
+	gnome2_src_prepare
+}
+
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	emake check
diff --git a/net-im/empathy/files/empathy-3.2.2-cancellable-not-NULL.patch b/net-im/empathy/files/empathy-3.2.2-cancellable-not-NULL.patch
new file mode 100644
index 000000000000..c58e7563a77d
--- /dev/null
+++ b/net-im/empathy/files/empathy-3.2.2-cancellable-not-NULL.patch
@@ -0,0 +1,36 @@
+From 641a6b06225cd00f62001d041316e72535662306 Mon Sep 17 00:00:00 2001
+From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+Date: Wed, 30 Nov 2011 12:55:29 +0100
+Subject: [PATCH] ui-utils: don't expect that cancellable is not NULL
+
+cancellable are always optional so this code should be NULL safe.
+---
+ libempathy-gtk/empathy-ui-utils.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
+index d5f63c9..2b9f5cf 100644
+--- a/libempathy-gtk/empathy-ui-utils.c
++++ b/libempathy-gtk/empathy-ui-utils.c
+@@ -549,7 +549,8 @@ pixbuf_avatar_from_individual_closure_new (FolksIndividual    *individual,
+ 	closure->result = g_object_ref (result);
+ 	closure->width = width;
+ 	closure->height = height;
+-	closure->cancellable = g_object_ref (cancellable);
++	if (cancellable != NULL)
++		closure->cancellable = g_object_ref (cancellable);
+ 
+ 	return closure;
+ }
+@@ -558,7 +559,7 @@ static void
+ pixbuf_avatar_from_individual_closure_free (
+ 		PixbufAvatarFromIndividualClosure *closure)
+ {
+-	g_object_unref (closure->cancellable);
++	g_clear_object (&closure->cancellable);
+ 	tp_clear_object (&closure->loader);
+ 	g_object_unref (closure->individual);
+ 	g_object_unref (closure->result);
+-- 
+1.7.8.6
+
diff --git a/net-im/empathy/files/empathy-3.2.2-delivery-failed.patch b/net-im/empathy/files/empathy-3.2.2-delivery-failed.patch
new file mode 100644
index 000000000000..84c0dd841150
--- /dev/null
+++ b/net-im/empathy/files/empathy-3.2.2-delivery-failed.patch
@@ -0,0 +1,31 @@
+From 457cdd199d2aa20cbebcc25ea305137ce7b0f440 Mon Sep 17 00:00:00 2001
+From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+Date: Tue, 22 Nov 2011 15:42:11 +0100
+Subject: [PATCH] don't ignore TP_DELIVERY_STATUS_TEMPORARILY_FAILED delivery
+ report
+
+We should display an error message as well if not the user will assume the
+message has been sent and the spinner keeps spinning.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=664564
+---
+ libempathy/empathy-tp-chat.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
+index 2285f3f..f65f25d 100644
+--- a/libempathy/empathy-tp-chat.c
++++ b/libempathy/empathy-tp-chat.c
+@@ -375,7 +375,8 @@ handle_delivery_report (EmpathyTpChat *self,
+ 		tp_chat_set_delivery_status (self, delivery_token,
+ 			EMPATHY_DELIVERY_STATUS_NONE);
+ 		goto out;
+-	} else if (delivery_status != TP_DELIVERY_STATUS_PERMANENTLY_FAILED) {
++	} else if (delivery_status != TP_DELIVERY_STATUS_PERMANENTLY_FAILED &&
++		   delivery_status != TP_DELIVERY_STATUS_TEMPORARILY_FAILED) {
+ 		goto out;
+ 	}
+ 
+-- 
+1.7.8.6
+
diff --git a/net-im/empathy/files/empathy-3.2.2-telepathy-logger-0.4.patch b/net-im/empathy/files/empathy-3.2.2-telepathy-logger-0.4.patch
new file mode 100644
index 000000000000..4ce89197bd49
--- /dev/null
+++ b/net-im/empathy/files/empathy-3.2.2-telepathy-logger-0.4.patch
@@ -0,0 +1,68 @@
+From 86ba5be5fa9a044fbcce6618ac6cd6dd7bdf3482 Mon Sep 17 00:00:00 2001
+From: Danielle Madeley <danielle.madeley@collabora.co.uk>
+Date: Tue, 3 Apr 2012 10:35:09 +1000
+Subject: [PATCH] TplCallEndReason ceased to exist on March 28
+
+---
+ libempathy-gtk/empathy-log-window.c |   11 ++++++-----
+ libempathy/empathy-message.c        |    2 +-
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
+index 72d4d46..c11bb02 100644
+--- a/libempathy-gtk/empathy-log-window.c
++++ b/libempathy-gtk/empathy-log-window.c
+@@ -1236,11 +1236,11 @@ get_icon_for_event (TplEvent *event)
+   else if (TPL_IS_CALL_EVENT (event))
+     {
+       TplCallEvent *call = TPL_CALL_EVENT (event);
+-      TplCallEndReason reason = tpl_call_event_get_end_reason (call);
++      TpCallStateChangeReason reason = tpl_call_event_get_end_reason (call);
+       TplEntity *sender = tpl_event_get_sender (event);
+       TplEntity *receiver = tpl_event_get_receiver (event);
+ 
+-      if (reason == TPL_CALL_END_REASON_NO_ANSWER)
++      if (reason == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
+         icon = EMPATHY_IMAGE_CALL_MISSED;
+       else if (tpl_entity_get_entity_type (sender) == TPL_ENTITY_SELF)
+         icon = EMPATHY_IMAGE_CALL_OUTGOING;
+@@ -1357,7 +1357,7 @@ log_window_append_call (TplEvent *event,
+       COL_EVENTS_EVENT, event,
+       -1);
+ 
+-  if (tpl_call_event_get_end_reason (call) != TPL_CALL_END_REASON_NO_ANSWER)
++  if (tpl_call_event_get_end_reason (call) != TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
+     {
+       gchar *body;
+       gchar *tmp;
+@@ -3243,11 +3243,12 @@ log_window_got_messages_for_date_cb (GObject *manager,
+             }
+           else
+             {
+-              TplCallEndReason reason = tpl_call_event_get_end_reason (call);
++              TpCallStateChangeReason reason =
++                tpl_call_event_get_end_reason (call);
+               TplEntity *sender = tpl_event_get_sender (event);
+               TplEntity *receiver = tpl_event_get_receiver (event);
+ 
+-              if (reason == TPL_CALL_END_REASON_NO_ANSWER)
++              if (reason == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
+                 {
+                   if (ctx->subtype & EVENT_CALL_MISSED)
+                     append = TRUE;
+diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
+index 6111bcd..a4caae1 100644
+--- a/libempathy/empathy-message.c
++++ b/libempathy/empathy-message.c
+@@ -411,7 +411,7 @@ empathy_message_from_tpl_log_event (TplEvent *logevent)
+ 
+ 		timestamp = tpl_event_get_timestamp (logevent);
+ 
+-		if (tpl_call_event_get_end_reason (call) == TPL_CALL_END_REASON_NO_ANSWER)
++		if (tpl_call_event_get_end_reason (call) == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
+ 			body = g_strdup_printf (_("Missed call from %s"),
+ 				tpl_entity_get_alias (tpl_event_get_sender (logevent)));
+ 		else if (tpl_entity_get_entity_type (tpl_event_get_sender (logevent)) == TPL_ENTITY_SELF)
+-- 
+1.7.8.6
+