diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-01-05 23:47:12 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-01-05 23:47:12 +0000 |
| commit | e2554bf1d18311bb1b9f106230574fde0eec3f12 (patch) | |
| tree | baa7bf701b5b1ad4fa9c6de2185efedbc23b9e47 /net-voip/telepathy-salut | |
| parent | Move libxml2 out of the USE=X conditional. (diff) | |
| download | gentoo-2-e2554bf1d18311bb1b9f106230574fde0eec3f12.tar.gz gentoo-2-e2554bf1d18311bb1b9f106230574fde0eec3f12.tar.bz2 gentoo-2-e2554bf1d18311bb1b9f106230574fde0eec3f12.zip | |
Fix building tests with >=glib-2.31 (bug #397765, thanks to Mathias for reporting).
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'net-voip/telepathy-salut')
| -rw-r--r-- | net-voip/telepathy-salut/ChangeLog | 10 | ||||
| -rw-r--r-- | net-voip/telepathy-salut/files/telepathy-salut-0.6.0-glib-gtypes.h.patch | 22 | ||||
| -rw-r--r-- | net-voip/telepathy-salut/telepathy-salut-0.6.0.ebuild | 7 |
3 files changed, 35 insertions, 4 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/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 . } |