diff options
| author |   Thomas Beierlein <tomjbe@gentoo.org> | 2010-05-24 11:46:24 +0000 |
|---|---|---|
| committer | Thomas Beierlein <tomjbe@gentoo.org> | 2010-05-24 11:46:24 +0000 |
| commit | d6d32a20b289a50487e230491dea4fc1abff3c8c (patch) | |
| tree | 1c43dab1fb41e742f82d871627126f08d611d9f2 /media-radio | |
| parent | Version bump (diff) | |
| download | gentoo-2-d6d32a20b289a50487e230491dea4fc1abff3c8c.tar.gz gentoo-2-d6d32a20b289a50487e230491dea4fc1abff3c8c.tar.bz2 gentoo-2-d6d32a20b289a50487e230491dea4fc1abff3c8c.zip | |
fix libpng14 problem (see Bug #321201). Thanks for patch Xarthisius.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'media-radio')
| -rw-r--r-- | media-radio/fldigi/ChangeLog | 6 | ||||
| -rw-r--r-- | media-radio/fldigi/files/fldigi-3.12.5-libpng14.patch | 15 | ||||
| -rw-r--r-- | media-radio/fldigi/fldigi-3.12.5.ebuild | 8 |
3 files changed, 26 insertions, 3 deletions
diff --git a/media-radio/fldigi/ChangeLog b/media-radio/fldigi/ChangeLog index d607b5a64083..e149440fe510 100644 --- a/media-radio/fldigi/ChangeLog +++ b/media-radio/fldigi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-radio/fldigi # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/fldigi/ChangeLog,v 1.1 2010/05/04 18:59:43 tomjbe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/fldigi/ChangeLog,v 1.2 2010/05/24 11:46:24 tomjbe Exp $ + + 24 May 2010; Thomas Beierlein <tomjbe@gentoo.org> fldigi-3.12.5.ebuild, + +files/fldigi-3.12.5-libpng14.patch: + fix libpng14 problem (see Bug #321201). Thanks for patch Xarthisius. *fldigi-3.12.5 (04 May 2010) diff --git a/media-radio/fldigi/files/fldigi-3.12.5-libpng14.patch b/media-radio/fldigi/files/fldigi-3.12.5-libpng14.patch new file mode 100644 index 000000000000..ff91b013785b --- /dev/null +++ b/media-radio/fldigi/files/fldigi-3.12.5-libpng14.patch @@ -0,0 +1,15 @@ +Fixing build with libpng-1.4 + +https://bugs.gentoo.org/321201 + +--- src/widgets/picture.cxx ++++ src/widgets/picture.cxx +@@ -279,7 +279,7 @@ + return -1; + } + if ((info = png_create_info_struct(png)) == NULL) { +- png_destroy_write_struct(&png, png_infopp_NULL); ++ png_destroy_write_struct(&png, NULL); + fclose(fp); + return -1; + } diff --git a/media-radio/fldigi/fldigi-3.12.5.ebuild b/media-radio/fldigi/fldigi-3.12.5.ebuild index 213497d8d7f2..1322b424ae4f 100644 --- a/media-radio/fldigi/fldigi-3.12.5.ebuild +++ b/media-radio/fldigi/fldigi-3.12.5.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/fldigi/fldigi-3.12.5.ebuild,v 1.1 2010/05/04 18:59:43 tomjbe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/fldigi/fldigi-3.12.5.ebuild,v 1.2 2010/05/24 11:46:24 tomjbe Exp $ EAPI=2 -inherit versionator +inherit eutils versionator MY_DOC_PN=${PN}-$(get_version_component_range 1-2) @@ -33,6 +33,10 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) dev-util/pkgconfig" +src_prepare() { + epatch "${FILESDIR}"/${P}-libpng14.patch +} + src_configure() { econf $(use_with sndfile) \ $(use_with portaudio) \ |