diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-07-30 15:48:17 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-30 15:48:17 +0000 |
| commit | c3d93f5aa1f11bc724b3510c8da25911a414197b (patch) | |
| tree | 65f57fb30f21fcb186c026b3a41a6423d5aa87cc /net-libs/gloox | |
| parent | Version bump (diff) | |
| download | gentoo-2-c3d93f5aa1f11bc724b3510c8da25911a414197b.tar.gz gentoo-2-c3d93f5aa1f11bc724b3510c8da25911a414197b.tar.bz2 gentoo-2-c3d93f5aa1f11bc724b3510c8da25911a414197b.zip | |
Fix building with GCC 4.4 wrt #274315, thanks to Victor Ostorga.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/gloox')
| -rw-r--r-- | net-libs/gloox/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/gloox/files/gloox-0.9.9.5-gcc44.patch | 31 | ||||
| -rw-r--r-- | net-libs/gloox/gloox-0.9.9.5.ebuild | 10 |
3 files changed, 41 insertions, 6 deletions
diff --git a/net-libs/gloox/ChangeLog b/net-libs/gloox/ChangeLog index 5f82071d3747..4effbb2dc9f4 100644 --- a/net-libs/gloox/ChangeLog +++ b/net-libs/gloox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/gloox # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/ChangeLog,v 1.10 2009/01/31 21:33:45 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/ChangeLog,v 1.11 2009/07/30 15:48:17 ssuominen Exp $ + + 30 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> gloox-0.9.9.5.ebuild, + +files/gloox-0.9.9.5-gcc44.patch: + Fix building with GCC 4.4 wrt #274315, thanks to Victor Ostorga. *gloox-1.0_beta4 (31 Jan 2009) diff --git a/net-libs/gloox/files/gloox-0.9.9.5-gcc44.patch b/net-libs/gloox/files/gloox-0.9.9.5-gcc44.patch new file mode 100644 index 000000000000..27541033d85b --- /dev/null +++ b/net-libs/gloox/files/gloox-0.9.9.5-gcc44.patch @@ -0,0 +1,31 @@ +diff -NrU5 gloox-0.9.9.5.original/src/md5.cpp gloox-0.9.9.5/src/md5.cpp +--- gloox-0.9.9.5.original/src/md5.cpp 2009-06-18 15:19:28.000000000 -0600 ++++ gloox-0.9.9.5/src/md5.cpp 2009-06-18 15:22:11.000000000 -0600 +@@ -70,10 +70,11 @@ + */ + + #include "md5.h" + + #include <string.h> ++#include <cstdio> + + namespace gloox + { + // #undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown */ + // #ifdef ARCH_IS_BIG_ENDIAN +diff -NrU5 gloox-0.9.9.5.original/src/sha.cpp gloox-0.9.9.5/src/sha.cpp +--- gloox-0.9.9.5.original/src/sha.cpp 2009-06-18 15:19:28.000000000 -0600 ++++ gloox-0.9.9.5/src/sha.cpp 2009-06-18 15:31:29.000000000 -0600 +@@ -10,10 +10,12 @@ + This software is distributed without any warranty. + */ + + #include "sha.h" + ++#include <cstdio> ++ + namespace gloox + { + + SHA::SHA() + { diff --git a/net-libs/gloox/gloox-0.9.9.5.ebuild b/net-libs/gloox/gloox-0.9.9.5.ebuild index cf791ab6b2bd..766babc5adc4 100644 --- a/net-libs/gloox/gloox-0.9.9.5.ebuild +++ b/net-libs/gloox/gloox-0.9.9.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/gloox-0.9.9.5.ebuild,v 1.2 2009/01/31 21:33:45 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/gloox-0.9.9.5.ebuild,v 1.3 2009/07/30 15:48:17 ssuominen Exp $ EAPI=2 @@ -15,15 +15,15 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="debug gnutls idn ssl zlib" -DEPEND="idn? ( >=net-dns/libidn-0.5.0 ) +RDEPEND="idn? ( >=net-dns/libidn-0.5.0 ) gnutls? ( >=net-libs/gnutls-1.2.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) zlib? ( >=sys-libs/zlib-1.2.3 )" - -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" src_prepare() { - epatch "${FILESDIR}"/${P}-gcc43.patch + epatch "${FILESDIR}"/${P}-gcc43.patch \ + "${FILESDIR}"/${P}-gcc44.patch } src_configure() { |