diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2012-04-19 09:43:38 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2012-04-19 09:43:38 +0000 |
| commit | d80039a0fc9f85a38aaeb142220b2c05cc88890e (patch) | |
| tree | a743b396bd7bdad0c1e777bd95a0f4f011bbc698 /x11-plugins/pidgin-encryption | |
| parent | Fix glib-2.32 building, bug #412071 by Looze Vladimir. (diff) | |
| download | gentoo-2-d80039a0fc9f85a38aaeb142220b2c05cc88890e.tar.gz gentoo-2-d80039a0fc9f85a38aaeb142220b2c05cc88890e.tar.bz2 gentoo-2-d80039a0fc9f85a38aaeb142220b2c05cc88890e.zip | |
Fix glib-2.32 building, bug #412091 by Balint SZENTE.
(Portage version: 2.1.10.56/cvs/Linux x86_64)
Diffstat (limited to 'x11-plugins/pidgin-encryption')
3 files changed, 26 insertions, 6 deletions
diff --git a/x11-plugins/pidgin-encryption/ChangeLog b/x11-plugins/pidgin-encryption/ChangeLog index bd6c266691f4..e0ac86e80946 100644 --- a/x11-plugins/pidgin-encryption/ChangeLog +++ b/x11-plugins/pidgin-encryption/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-plugins/pidgin-encryption -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-encryption/ChangeLog,v 1.23 2011/06/30 12:57:01 pva Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-encryption/ChangeLog,v 1.24 2012/04/19 09:43:38 pacho Exp $ + + 19 Apr 2012; Pacho Ramos <pacho@gentoo.org> + +files/pidgin-encryption-3.1-glib2.32.patch, pidgin-encryption-3.1.ebuild: + Fix glib-2.32 building, bug #412091 by Balint SZENTE. 30 Jun 2011; Peter Volkov <pva@gentoo.org> pidgin-encryption-3.1.ebuild: Depend on net-im/pidgin[gtk], bug #373049 thank Piotr Szymaniak. diff --git a/x11-plugins/pidgin-encryption/files/pidgin-encryption-3.1-glib2.32.patch b/x11-plugins/pidgin-encryption/files/pidgin-encryption-3.1-glib2.32.patch new file mode 100644 index 000000000000..1262056bd27c --- /dev/null +++ b/x11-plugins/pidgin-encryption/files/pidgin-encryption-3.1-glib2.32.patch @@ -0,0 +1,12 @@ +diff -urN pidgin-encryption-3.1.orig/rsa_nss.c pidgin-encryption-3.1/rsa_nss.c +--- pidgin-encryption-3.1.orig/rsa_nss.c 2010-04-26 04:53:46.000000000 +0300 ++++ pidgin-encryption-3.1/rsa_nss.c 2012-04-15 13:16:21.438852032 +0300 +@@ -24,7 +24,7 @@ + #include <debug.h> + #include <gtkdialogs.h> + +-#include "glib/gmain.h" ++#include <glib.h> + + #include <string.h> + #include <assert.h> diff --git a/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild b/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild index 68ca44493b93..a054d826b344 100644 --- a/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild +++ b/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild @@ -1,8 +1,8 @@ -# 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/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild,v 1.9 2011/06/30 12:57:01 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild,v 1.10 2012/04/19 09:43:38 pacho Exp $ -EAPI="2" +EAPI=4 inherit flag-o-matic eutils @@ -22,6 +22,10 @@ RDEPEND="net-im/pidgin[gtk] DEPEND="${RDEPEND} dev-util/pkgconfig" +src_prepare() { + epatch "${FILESDIR}/${P}-glib2.32.patch" +} + src_configure() { strip-flags replace-flags -O? -O2 @@ -29,6 +33,6 @@ src_configure() { } src_install() { - make install DESTDIR="${D}" || die "Install failed" + emake install DESTDIR="${D}" dodoc CHANGELOG INSTALL NOTES README TODO VERSION WISHLIST } |