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 | 54fc41d5576c12c6def7150c5c24aefefe931fd1 (patch) | |
| tree | 5db1813c71ecd2463e3ce9062e937047f16bda26 /media-radio | |
| parent | Version bump (diff) | |
| download | historical-54fc41d5576c12c6def7150c5c24aefefe931fd1.tar.gz historical-54fc41d5576c12c6def7150c5c24aefefe931fd1.tar.bz2 historical-54fc41d5576c12c6def7150c5c24aefefe931fd1.zip | |
fix libpng14 problem (see Bug #321201). Thanks for patch Xarthisius.
Package-Manager: portage-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/Manifest | 5 | ||||
| -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 |
4 files changed, 29 insertions, 5 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/Manifest b/media-radio/fldigi/Manifest index 3fd1e1ae595b..f4171d3c70eb 100644 --- a/media-radio/fldigi/Manifest +++ b/media-radio/fldigi/Manifest @@ -1,5 +1,6 @@ +AUX fldigi-3.12.5-libpng14.patch 336 RMD160 89cf0018921a3b554933be3ece0d9d6c7e151b13 SHA1 ae8c65c6668c675f92cb0ddec558e6eecdd76f92 SHA256 d4124a3652623d175f1a1cb6538cbd4df4ebd9fe6a19ca639ed87b490cb85f77 DIST fldigi-3.12.5.tar.gz 1264031 RMD160 700dcb9c0214ccb4c704afa7c7ca48954d701352 SHA1 555458aaca5fec762f5ecf7b16d5f9e465344b3a SHA256 d7986077a331afe124bf0efb47f82cfa1b4983c6c9da400205a694a6823cf8ed DIST fldigi-3.12.pdf 4416220 RMD160 a2e9b0c43e3edcfca5e94ed231e99c5987b8a59e SHA1 a40e8c754590eda42683103eb490db3f7bb2676f SHA256 46db6b31f7717e6766db59ea9f15ccb1a4063d46ae4e281e95b110064988115c -EBUILD fldigi-3.12.5.ebuild 1570 RMD160 4bd89c9c54bb958b0b6c28aa560478087ac7951a SHA1 6f06187f1fbc665cd3882052f3789f4efc8f4b0b SHA256 64d55bb5df124e2355ff72b120c049820327d309d816adebd933579448f7d6a8 -MISC ChangeLog 391 RMD160 cc01ce8d2a8fa57fefc247c332df3b90b444441a SHA1 ee3659b22f7e12c41dd7b0f8338734cfe7a19251 SHA256 331bd438d230cb55211c0ef446f2540c17ecb7b2369aae3f0be2f3bf4989566f +EBUILD fldigi-3.12.5.ebuild 1638 RMD160 944e73fe8afed15140fd989d2fc516fe780ee27f SHA1 6d2b7ea7c81542eeb88a5c30831c5ff656a91c68 SHA256 a4ef3a4e61af3433ad6d9ac70ef6549dee3082fa5ce7de0f1aa0dfb253930591 +MISC ChangeLog 576 RMD160 201b137c3540164f77e7138fef9754ac85b8eb58 SHA1 2feba2783dc272a73daf9f99b8c2022666231699 SHA256 89c02dd69d0a47332a709689067217938e696be687a32c1f999fe5078f559964 MISC metadata.xml 427 RMD160 11a4d509ef32b3b97ea6bddd1b70f6aea4ea74e1 SHA1 484c3f7b2725ad22fd1269b4da7a19724d4abdc9 SHA256 a75082876433eed2f71c0a1664d1abf0113a9b9d8725241007739c6ebbe19461 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) \ |