diff options
| author |   Peter Volkov <pva@gentoo.org> | 2009-12-24 11:28:33 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2009-12-24 11:28:33 +0000 |
| commit | 32533dbe4f469dc3efc10a3e3ed28a8d0b4d37fe (patch) | |
| tree | d3520c7d03a7838a1c751dd039b15d236a0ad502 | |
| parent | version bump to p3 and fixes (diff) | |
| download | gentoo-2-32533dbe4f469dc3efc10a3e3ed28a8d0b4d37fe.tar.gz gentoo-2-32533dbe4f469dc3efc10a3e3ed28a8d0b4d37fe.tar.bz2 gentoo-2-32533dbe4f469dc3efc10a3e3ed28a8d0b4d37fe.zip | |
Version bump. Respect CFLAGS and LDFLAGS.
(Portage version: 2.2_rc60/cvs/Linux x86_64)
| -rw-r--r-- | x11-plugins/msn-pecan/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-plugins/msn-pecan/files/msn-pecan-0.1.0_rc1-oim-crash.patch | 22 | ||||
| -rw-r--r-- | x11-plugins/msn-pecan/msn-pecan-0.1.0_rc2.ebuild (renamed from x11-plugins/msn-pecan/msn-pecan-0.1.0_rc1-r1.ebuild) | 9 |
3 files changed, 13 insertions, 26 deletions
diff --git a/x11-plugins/msn-pecan/ChangeLog b/x11-plugins/msn-pecan/ChangeLog index 34275e7f4aeb..b925d37f16c5 100644 --- a/x11-plugins/msn-pecan/ChangeLog +++ b/x11-plugins/msn-pecan/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-plugins/msn-pecan # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/msn-pecan/ChangeLog,v 1.3 2009/12/24 09:54:26 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/msn-pecan/ChangeLog,v 1.4 2009/12/24 11:28:33 pva Exp $ + +*msn-pecan-0.1.0_rc2 (24 Dec 2009) + + 24 Dec 2009; Peter Volkov <pva@gentoo.org> -msn-pecan-0.1.0_rc1-r1.ebuild, + +msn-pecan-0.1.0_rc2.ebuild, -files/msn-pecan-0.1.0_rc1-oim-crash.patch: + Version bump. Respect CFLAGS and LDFLAGS. *msn-pecan-0.1.0_rc1-r1 (24 Dec 2009) diff --git a/x11-plugins/msn-pecan/files/msn-pecan-0.1.0_rc1-oim-crash.patch b/x11-plugins/msn-pecan/files/msn-pecan-0.1.0_rc1-oim-crash.patch deleted file mode 100644 index 0bdd60143438..000000000000 --- a/x11-plugins/msn-pecan/files/msn-pecan-0.1.0_rc1-oim-crash.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit e0fa9a5bcc356ad20c359cf208bbc84f155cdb71 -Author: Simone Contini <s.contini@oltrelinux.com> -Date: Sun Dec 13 10:01:37 2009 +0100 - - oim: handle malformed data in process_body_receive - - Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> - -diff --git a/pn_oim.c b/pn_oim.c -index 6faaabe..496e3c0 100644 ---- a/pn_oim.c -+++ b/pn_oim.c -@@ -576,7 +576,8 @@ process_body_receive (OimRequest *oim_request, - gchar *end; - cur += 2; - end = strstr (cur, "\r\n\r\n"); -- *end = '\0'; -+ if (end) -+ *end = '\0'; - message = (gchar *) purple_base64_decode (cur, NULL); - } - diff --git a/x11-plugins/msn-pecan/msn-pecan-0.1.0_rc1-r1.ebuild b/x11-plugins/msn-pecan/msn-pecan-0.1.0_rc2.ebuild index cc4ee7c6d963..8e7ddd2e2c18 100644 --- a/x11-plugins/msn-pecan/msn-pecan-0.1.0_rc1-r1.ebuild +++ b/x11-plugins/msn-pecan/msn-pecan-0.1.0_rc2.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/x11-plugins/msn-pecan/msn-pecan-0.1.0_rc1-r1.ebuild,v 1.1 2009/12/24 09:54:26 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/msn-pecan/msn-pecan-0.1.0_rc2.ebuild,v 1.1 2009/12/24 11:28:33 pva Exp $ EAPI="2" @@ -24,11 +24,14 @@ DEPEND="dev-util/pkgconfig S=${WORKDIR}/${P/_/-} src_prepare() { - epatch "${FILESDIR}/${P}-oim-crash.patch" + sed -e "/^LDFLAGS/{s/$/ ${LDFLAGS}/;}" \ + -e "/^CFLAGS/{s/$/ ${CFLAGS}/;}" -i Makefile || die } src_compile() { - emake CC="$(tc-getCC)" || die "emake failed" + emake CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS=${LDFLAGS} || die "emake failed" } src_install() { |