diff options
| -rw-r--r-- | net-irc/telepathy-idle/ChangeLog | 6 | ||||
| -rw-r--r-- | net-irc/telepathy-idle/Manifest | 5 | ||||
| -rw-r--r-- | net-irc/telepathy-idle/files/telepathy-idle-0.1.2-glibc-2.10.patch | 60 | ||||
| -rw-r--r-- | net-irc/telepathy-idle/telepathy-idle-0.1.2.ebuild | 11 |
4 files changed, 77 insertions, 5 deletions
diff --git a/net-irc/telepathy-idle/ChangeLog b/net-irc/telepathy-idle/ChangeLog index 4cacb86be1ec..440d0dbd9db8 100644 --- a/net-irc/telepathy-idle/ChangeLog +++ b/net-irc/telepathy-idle/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-irc/telepathy-idle # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/telepathy-idle/ChangeLog,v 1.7 2009/03/29 15:45:26 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/telepathy-idle/ChangeLog,v 1.8 2009/08/07 12:29:42 ssuominen Exp $ + + 07 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> + telepathy-idle-0.1.2.ebuild, +files/telepathy-idle-0.1.2-glibc-2.10.patch: + Fix building with GLIBC 2.10+ wrt #271640. 29 Mar 2009; <solar@gentoo.org> telepathy-idle-0.1.2.ebuild: - keyword ~arm diff --git a/net-irc/telepathy-idle/Manifest b/net-irc/telepathy-idle/Manifest index e1f1a9251993..b866e918cb1b 100644 --- a/net-irc/telepathy-idle/Manifest +++ b/net-irc/telepathy-idle/Manifest @@ -1,6 +1,7 @@ +AUX telepathy-idle-0.1.2-glibc-2.10.patch 1605 RMD160 c0029d3b18236c7206aacbb3ecc5e8a1ddc9b5fd SHA1 f5c81880b1f4891655780f0b9aceaeb9313095e1 SHA256 dabd6f6573a17b60f25ab66e6f26a502c1b197114faa0e6dedf4cf8e5590e37f DIST telepathy-idle-0.1.1.tar.gz 383416 RMD160 58799ec1ae1f40581e8e320ada52fef8d16aa1a0 SHA1 6d65f7d6b5516e3886f5d10da9f0d06170676ff3 SHA256 b45f175f62e5ee5626ed8737cc4f3b00da8fcf1eff7017649546a54ce44953b2 DIST telepathy-idle-0.1.2.tar.gz 405694 RMD160 124ca06ba8077016c0dea54f0635a8652049018b SHA1 c8ffa208b18db1a7b7f88237bbc5167c6a585f03 SHA256 3ed0cb5dd687e4d9fa838a318f9ef12a8c221894ff188687c27625f0ac3bce82 EBUILD telepathy-idle-0.1.1.ebuild 743 RMD160 e646e1ccc1a09721dc01d4a44c0d55496b7b21dd SHA1 2b25e4fcf346de681227f50e28debc96a284141b SHA256 c58de0fb5b4205967686de3f93adcb32a60aed89a334014f645041503a159e8a -EBUILD telepathy-idle-0.1.2.ebuild 765 RMD160 b884fdecea40d65b651c74e8062b6e65967130ec SHA1 da92a79de2cf7df200ab5cc1625afc5ecffd2102 SHA256 5d32124c9eb93e9c0277e61aa76836fcca4b15e5307cbfea1a10a4ab64786e1f -MISC ChangeLog 1087 RMD160 5445fbc91f8eccd42f225d61ad7260ef3b953b94 SHA1 e51f19e471a4e1fa98ebfde73e34bf81387dc1c4 SHA256 f3f3f9b491f67586ed9d8c2c487db59f0eea557a9ef0168e361f5fb535e6330f +EBUILD telepathy-idle-0.1.2.ebuild 857 RMD160 8191057b5de30da742ba37617ac45059faf9020f SHA1 da1544cddf2c9203ab20beefa1aae240f4990e14 SHA256 7f5dde69e919a64f575edc01c5b71a0f83415a0b7817811b251906a690fa0913 +MISC ChangeLog 1268 RMD160 75e6f9669f1afafc0837083081144693bfb442db SHA1 18a8d988e35350545a8effdf0ac4d3dcc80a3536 SHA256 10612ad0d56f4e596af87f0e295215112287ce52e04e9e9de07733282700a815 MISC metadata.xml 346 RMD160 9cabc0f7042688059612d5864f3dae8ec4701519 SHA1 84eb0abed9fc3457633204c42f2b20b9e7c9af1c SHA256 5bfe8fbda3e1a7a56e586297c099c537e5cf56342c55249fba5d3ccfc391c239 diff --git a/net-irc/telepathy-idle/files/telepathy-idle-0.1.2-glibc-2.10.patch b/net-irc/telepathy-idle/files/telepathy-idle-0.1.2-glibc-2.10.patch new file mode 100644 index 000000000000..32264d5eac80 --- /dev/null +++ b/net-irc/telepathy-idle/files/telepathy-idle-0.1.2-glibc-2.10.patch @@ -0,0 +1,60 @@ +From 1380db9f7a3feab144452f990b79728c9f2e3dbf Mon Sep 17 00:00:00 2001 +From: Will Thompson <will.thompson@collabora.co.uk> +Date: Sat, 20 Jun 2009 18:22:15 +0100 +Subject: [PATCH] Define _GNU_SOURCE not __USE_GNU to get strnlen(3). + +__USE_GNU is a glibc-internal macro that we should not be using; this +was causing a build failure in openSUSE, which has a glibc from the +future. + +idle-connection.c doesn't actually use strnlen. + +Based on a patch by Vincent Untz, which didn't compile for me: it seemed +like string.h was getting #included before the #define, and thus strnlen +wasn't exposed. Making the #define the first thing in idle-parser.c +fixed this. +--- + src/idle-connection.c | 2 -- + src/idle-parser.c | 5 +++-- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/idle-connection.c b/src/idle-connection.c +index 7080ae3..10613b4 100644 +--- a/src/idle-connection.c ++++ b/src/idle-connection.c +@@ -22,8 +22,6 @@ + + #include <config.h> + +-/* strnlen */ +-#define __USE_GNU + #include <string.h> + #include <time.h> + +diff --git a/src/idle-parser.c b/src/idle-parser.c +index b5d561a..93c330d 100644 +--- a/src/idle-parser.c ++++ b/src/idle-parser.c +@@ -18,6 +18,9 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++/* For strnlen(), which is a GNU extension. */ ++#define _GNU_SOURCE ++ + #include "idle-parser.h" + + #include "idle-connection.h" +@@ -26,9 +29,7 @@ + #include <glib.h> + #include <glib-object.h> + +-#define __USE_GNU + #include <string.h> +-#undef __USE_GNU + #include <stdio.h> + + #define IDLE_DEBUG_FLAG IDLE_DEBUG_PARSER +-- +1.6.3.1 + diff --git a/net-irc/telepathy-idle/telepathy-idle-0.1.2.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.1.2.ebuild index 6a3a78bb5c98..160fb8d0ff55 100644 --- a/net-irc/telepathy-idle/telepathy-idle-0.1.2.ebuild +++ b/net-irc/telepathy-idle/telepathy-idle-0.1.2.ebuild @@ -1,6 +1,9 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/telepathy-idle/telepathy-idle-0.1.2.ebuild,v 1.5 2009/03/29 15:45:26 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/telepathy-idle/telepathy-idle-0.1.2.ebuild,v 1.6 2009/08/07 12:29:42 ssuominen Exp $ + +EAPI=2 +inherit eutils DESCRIPTION="Full-featured IRC connection manager for Telepathy." HOMEPAGE="http://telepathy.freedesktop.org/wiki/Components" @@ -12,13 +15,17 @@ KEYWORDS="~arm ~alpha ~amd64 ~ia64 ~sparc ~x86" IUSE="" RDEPEND="dev-libs/dbus-glib - >=dev-libs/glib-2.8.6 + >=dev-libs/glib-2.8.6:2 dev-libs/openssl net-libs/telepathy-glib sys-apps/dbus" DEPEND="${RDEPEND} dev-util/pkgconfig" +src_prepare() { + epatch "${FILESDIR}"/${P}-glibc-2.10.patch +} + src_install() { emake DESTDIR="${D}" install || die "emake install failed" dodoc AUTHORS || die |