Fix building tests with >=glib-2.31 (bug #397765, thanks to Mathias for reporting).

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

4 files changed, 43 insertions, 11 deletions

diff --git a/net-voip/telepathy-salut/ChangeLog b/net-voip/telepathy-salut/ChangeLog
index c2687c0bfd54..6c3056a2f85a 100644
--- a/net-voip/telepathy-salut/ChangeLog
+++ b/net-voip/telepathy-salut/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-voip/telepathy-salut
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-salut/ChangeLog,v 1.33 2011/12/29 18:10:08 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-salut/ChangeLog,v 1.34 2012/01/05 23:47:11 tetromino Exp $
+
+  05 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  telepathy-salut-0.6.0.ebuild,
+  +files/telepathy-salut-0.6.0-glib-gtypes.h.patch:
+  Fix building tests with >=glib-2.31 (bug #397765, thanks to Mathias for
+  reporting).
 
   29 Dec 2011; Pacho Ramos <pacho@gentoo.org> telepathy-salut-0.6.0.ebuild:
   amd64 stable, bug 393007
diff --git a/net-voip/telepathy-salut/Manifest b/net-voip/telepathy-salut/Manifest
index f0b4caa667fe..2a2503e2279d 100644
--- a/net-voip/telepathy-salut/Manifest
+++ b/net-voip/telepathy-salut/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX telepathy-salut-0.5.0-uninitialized.patch 496 RMD160 00200ebebfbedb308f448e7b23eeebc18dd65129 SHA1 9297afbbe61470c274a55f0f0ee9debbd6e2cdd0 SHA256 9f5c77d889880a070d7fee99c6177632f183a38a8b27c32b4761f6f0736ab3e5
+AUX telepathy-salut-0.6.0-glib-gtypes.h.patch 606 RMD160 02c73987823a6d63923831556412212aae837cd0 SHA1 6190b1dd7a1d7dd41b0bd01d7b7675bf65e3db57 SHA256 53d6e5abf33c34dc142a026ad9f70de29ad0f52a91fb989eb9b1ad9480899cc5
 DIST telepathy-salut-0.5.0.tar.gz 2338191 RMD160 18c6edca2aa935ef65e8cf5d0099894624302b53 SHA1 0371b77a8a1a329d7111501b568cb0a0c9122c97 SHA256 37998f456224d0e9fbfa174300ce97f8debf20beed2f7ce6ee4519fe1c4ce9f6
 DIST telepathy-salut-0.5.1.tar.gz 1971284 RMD160 09e835f5759176393933f6344613f7432a713e88 SHA1 659dbcfd7ae6be9f9dfe4b204cf431b99d530a12 SHA256 0d328231d6c60a0d44d0356d9b16819053ce4b72ddd8fa9e19be281032ca693e
 DIST telepathy-salut-0.5.2.tar.gz 1998906 RMD160 3e56ffeef6a6e1e608f0ae0051e86922bc060cc7 SHA1 3e4aff7d547ca484bf7873b4aa3739094a8703e4 SHA256 c55dc3e81451d46925ead4ba184fcdab3a47beafe8839c3755c88126a40ea5bf
@@ -9,13 +10,13 @@ DIST telepathy-salut-0.6.0.tar.gz 1977560 RMD160 d532bde43e69a29ccd1478ffb2c807c
 EBUILD telepathy-salut-0.5.0.ebuild 1367 RMD160 4f1cb5b9202a240804761ac864f2cef6a7de2456 SHA1 0abcf8bc24766d81ff82da3baa13ac797352944c SHA256 77879325ad4ca0838224212265926fb56afaaf392612f7d77faf04f95f155465
 EBUILD telepathy-salut-0.5.1.ebuild 1381 RMD160 2514cc1847113e7546a151d987b03ff442625901 SHA1 15e05a1c03ce084765ac1f22403aa701e5bfda3a SHA256 d16bd2c749627ae835b7653869b3ae4057ba5beeb366c294d46726e44efee62b
 EBUILD telepathy-salut-0.5.2.ebuild 1402 RMD160 55eeaa0bdbab62c614b75a0ff6439e9bd4cc8a8a SHA1 462409a8349ea0343b93f9f10ca5ba691e98ce20 SHA256 dd4277ebae3a55801edf671e9b283c88eb103b60050f27b0c0eedca571a24fde
-EBUILD telepathy-salut-0.6.0.ebuild 1401 RMD160 3f63f27d191a0582a39b36bd3c8e9fa95095368b SHA1 ca28eda88a53ff05141a048e91c86c2ee6058a20 SHA256 115a7c4576025e3dd8cf0ca66891f75ae3d42ba91e3f43c6bfdb9f053e0a3691
-MISC ChangeLog 4684 RMD160 3081d693901943c34c851f55c6aa30a72bd92d94 SHA1 792dd3c9c018b7100d18a72bb84bab6408b67880 SHA256 33dd9b0329ab13b570ee65d45614b6e8471a2f270c57cb73ec57ad6f400b4c8b
+EBUILD telepathy-salut-0.6.0.ebuild 1535 RMD160 23853ff24f0341d7ce9db7e0cfea0b246ac0405c SHA1 94cf8fe0f712740313fd90d569230b602817ba92 SHA256 ed2263a814787f5ced8fdd86c3734e2343ae456e8a153b33eb198b3b27cf7f74
+MISC ChangeLog 4920 RMD160 c501256e91436c2099dfcb6d29e8adf9072388ed SHA1 f9d49f77402a05ab8bd7645467afff9b13bb3c0d SHA256 9d5b40efaea46fff3f295032d440c8c52c6da81128913c9f7c05eca4349b189c
 MISC metadata.xml 361 RMD160 c9250423f016c93ca08c2442dd157e2870a0c517 SHA1 65ed238acaa9586b0b1bee360e83152aed562a31 SHA256 7f74f962b8ee0ed285dd876f8071022f772e0160eaeb70f78098b3d683e75647
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk78rQYACgkQCaWpQKGI+9T4RwCfdhnO+gLi9xg4hs/JcSeN8wsR
-d5YAnioY8XN10NOKT2itPLV39ktzbeI5
-=9Uet
+iF4EAREIAAYFAk8GNoUACgkQdjK8w9WeBnD1wQD/UiBF89jG91bsDLqe6E0oDAIP
+kpNVGCPh+JWjzrpK2mkBAK8u6az/mgF73ij6aJ3c3J8NiWlsKbsBWZhaR3xK2ygc
+=Ta3r
 -----END PGP SIGNATURE-----
diff --git a/net-voip/telepathy-salut/files/telepathy-salut-0.6.0-glib-gtypes.h.patch b/net-voip/telepathy-salut/files/telepathy-salut-0.6.0-glib-gtypes.h.patch
new file mode 100644
index 000000000000..9488f68e1037
--- /dev/null
+++ b/net-voip/telepathy-salut/files/telepathy-salut-0.6.0-glib-gtypes.h.patch
@@ -0,0 +1,22 @@
+From 3c43751dc90e4cdb08f57f48e2a8e6adf715ed8e Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc@gnome.org>
+Date: Wed, 12 Oct 2011 16:45:49 +0000
+Subject: test-resolver: don't include glib/types.h directly
+
+Use the glib.h header instead.
+---
+diff --git a/lib/ext/wocky/tests/test-resolver.h b/lib/ext/wocky/tests/test-resolver.h
+index 7823ee6..3948fdc 100644
+--- a/lib/ext/wocky/tests/test-resolver.h
++++ b/lib/ext/wocky/tests/test-resolver.h
+@@ -22,7 +22,7 @@
+ #define __TEST_RESOLVER_H__
+ 
+ #include <gio/gio.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/net-voip/telepathy-salut/telepathy-salut-0.6.0.ebuild b/net-voip/telepathy-salut/telepathy-salut-0.6.0.ebuild
index 2254992a9b88..bd869c8d73f3 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.6.0.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-salut/telepathy-salut-0.6.0.ebuild,v 1.2 2011/12/29 18:10:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-salut/telepathy-salut-0.6.0.ebuild,v 1.3 2012/01/05 23:47:11 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.5"
@@ -43,6 +43,9 @@ src_prepare() {
 	# Fix uninitialized variable, upstream bug #37701
 	epatch "${FILESDIR}/${PN}-0.5.0-uninitialized.patch"
 
+	# Fix building with >=glib-2.31, patch from wocky git master, bug #397765
+	epatch "${FILESDIR}/${PN}-0.6.0-glib-gtypes.h.patch"
+
 	python_convert_shebangs -r 2 .
 }