Fix uninitialized GError*s causing tests to break, bug #323751

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 40 insertions, 7 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index a65ae27d3664..720dbfb5f288 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.55 2010/06/14 15:33:42 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.56 2010/06/16 09:08:16 pacho Exp $
+
+  16 Jun 2010; Pacho Ramos <pacho@gentoo.org> empathy-2.30.1.1.ebuild,
+  +files/empathy-2.30.1.1-init-gerror.patch:
+  Fix uninitialized GError*s causing tests to break, bug #323751
 
   14 Jun 2010; Olivier Crête <tester@gentoo.org> empathy-2.30.1.1.ebuild:
   Older libunique prevent empathy from compiling, bug #323905
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 167dd5555044..b988bbc8545b 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX empathy-2.28-networkmanager-0.8.patch 674 RMD160 a507683f229700db3bbc82f4d75d76404655bf28 SHA1 2a4676d8e629297df7d756e8fadc4a443d86d0c5 SHA256 f5d15db62b88e8df457885f2d6d65c482c7537d605c404828f05640964433432
+AUX empathy-2.30.1.1-init-gerror.patch 696 RMD160 39482777c9d5aab1f54be06634fdd5a3fa649790 SHA1 e06e1e1553d3cd96b0572c3bae78f1b186379a50 SHA256 1794f29a5af099db032cfaf0d5bce0fb19209069f72b1ff55dd8a1c5ddd1745d
 DIST empathy-2.24.1.tar.bz2 1761446 RMD160 97e58664c1cf3977806884cc401d679ecca91365 SHA1 7c2b6434d5fd855e887e6ef27300601609706ea5 SHA256 24b675e389fb91898bd2924f8b35db7e7aef4c40bbb69412e445048dd9e18123
 DIST empathy-2.26.2.tar.bz2 2021659 RMD160 58d995c9e616aa5d429dde9fad5861d66a33521f SHA1 d2eb4de3d3efd7728dc28eb16dfe60c64141be70 SHA256 2790502f62056926feeab71681033e5787856f7b56ae0beaa49f89b4763f1b9a
 DIST empathy-2.28.2.tar.bz2 2432940 RMD160 a306be47d681c5192eb30db91792ac823ef27528 SHA1 712752a7675429215dc92e3f35106b91baa9772b SHA256 8f1dc1cbf7bda0dcb9804d5aa5d5d0e625c35dee10bfba7050aa3a8b6d491f3b
@@ -10,13 +11,13 @@ EBUILD empathy-2.24.1.ebuild 1899 RMD160 cec86f7a9e92da7799aac0eb64b24ac01882304
 EBUILD empathy-2.26.2.ebuild 2458 RMD160 22232403dabf5b43f872ab0e4d19f25139a7002e SHA1 d176af1eae77dc6fb5afccfc3fa72dfa30b50e31 SHA256 540af849275cf1107df562e964c3092a279f858217e838cad20847417c9f0e28
 EBUILD empathy-2.28.2-r1.ebuild 3082 RMD160 a0e7d0c8b372de8af58bb18012b31a6abc4f3956 SHA1 eec7628d6c7a84770bd0ef159eeaab973c911a90 SHA256 052a59e324fd6464786640c79ac232ef5af2ba0f7c5175c89f3150c09d17f2cc
 EBUILD empathy-2.28.2.ebuild 2995 RMD160 5ac841b2c410fcfb060048d96845bc9ad484435e SHA1 a208d1aac8c4e38b8382b1223ae823f2fcb6e200 SHA256 380004301610861a5dd6aa035ad269673dbc88b243e8108469a3afd289272708
-EBUILD empathy-2.30.1.1.ebuild 2573 RMD160 4e3fcf9b9098cad6acfcf6d0bd6cbb9a9be84f51 SHA1 fc9aef3d7800d1c6672f50122b39dd16099f77ee SHA256 b55a49c4e3fc8471219268667509e7b7918db74822b77276dc07b6e17e188538
-MISC ChangeLog 10479 RMD160 381169a89a95342a823145449626db639200feea SHA1 5562d994560cc655679ae655852487fe2d641e4e SHA256 7e321acc405dd8196e0b89e64fa8c2465f47a2aad51f0c7429dee40929d7b2ba
+EBUILD empathy-2.30.1.1.ebuild 2723 RMD160 70cfd0e065a2a1cd3ee32b50453a8b6fb0b226e0 SHA1 7e556198eef06b418acac05c60fe38243d4eea33 SHA256 ec3f90c8708e2422aba2880119c18bcaec0fe9f7155d300c7de8053f675d976a
+MISC ChangeLog 10660 RMD160 7ff7a1fd5b4277a3f744eaad2d2851f2b856e5c9 SHA1 7161136dbffc3a4b1d91eff3bdf34ece705bb98a SHA256 775aa03b05fd9722f27bc51c71310693c66d6629ba8d816e4690e89570d3c332
 MISC metadata.xml 937 RMD160 69906d677ab5c5d05d39a04caef2b617a25889c7 SHA1 1d6d3d10666fff0e5e937f1626a5f9ef0660cf54 SHA256 ac3b78a9174587a123a573709a0ea9e66e7ca9f7f0f05aa4ff1bf0f262b3f912
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwWS9gACgkQmOfEJZHYOKdymwCg5weF8zEwa/yBXdC9NpnkG5T0
-9p0AoIidxc7ygxHwNUXlHG2moPHECKd1
-=tr/q
+iEYEARECAAYFAkwYlIsACgkQCaWpQKGI+9SlOQCeOBSjCnueNxjIqYocw+BhseZs
+WmMAn1gnLXDGnLUTugwZSnxBhWL9oTyR
+=A7PQ
 -----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-2.30.1.1.ebuild b/net-im/empathy/empathy-2.30.1.1.ebuild
index 578c03a94c4b..9cd86886ea9f 100644
--- a/net-im/empathy/empathy-2.30.1.1.ebuild
+++ b/net-im/empathy/empathy-2.30.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.30.1.1.ebuild,v 1.2 2010/06/14 15:33:42 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.30.1.1.ebuild,v 1.3 2010/06/16 09:08:16 pacho Exp $
 
 EAPI="2"
 
@@ -79,6 +79,13 @@ pkg_setup() {
 		$(use_enable webkit)"
 }
 
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix uninitialized GError*s causing tests to break, bug #323751
+	epatch "${FILESDIR}/${P}-init-gerror.patch"
+}
+
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	emake check || die "emake check failed."
diff --git a/net-im/empathy/files/empathy-2.30.1.1-init-gerror.patch b/net-im/empathy/files/empathy-2.30.1.1-init-gerror.patch
new file mode 100644
index 000000000000..aba40ac31949
--- /dev/null
+++ b/net-im/empathy/files/empathy-2.30.1.1-init-gerror.patch
@@ -0,0 +1,21 @@
+From 9783f0a3cf1449e2566de295b2ffa1ad17519fdc Mon Sep 17 00:00:00 2001
+From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+Date: Tue, 15 Jun 2010 11:17:09 +0000
+Subject: init GError so 'make check' will be happy (#621409)
+
+---
+diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
+index c5908a8..f616a99 100644
+--- a/libempathy/empathy-dispatcher.c
++++ b/libempathy/empathy-dispatcher.c
+@@ -344,7 +344,7 @@ dispatcher_connection_invalidated_cb (TpConnection *connection,
+   if (connection_data != NULL)
+     {
+       GList *l;
+-      GError *error;
++      GError *error = NULL;
+ 
+       error = g_error_new_literal (domain, code, message);
+ 
+--
+cgit v0.8.3.1