diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-02-21 01:19:56 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-02-21 01:19:56 +0000 |
| commit | fd4061a2669202bffa2265b970225e6c3e1c0fc9 (patch) | |
| tree | cc6d16bc1acbddb788ea6675a61272e7db64f847 /x11-libs | |
| parent | Version bump. Fix building with libpng-1.5.x. (diff) | |
| download | gentoo-2-fd4061a2669202bffa2265b970225e6c3e1c0fc9.tar.gz gentoo-2-fd4061a2669202bffa2265b970225e6c3e1c0fc9.tar.bz2 gentoo-2-fd4061a2669202bffa2265b970225e6c3e1c0fc9.zip | |
Fix building with libpng-1.5.x.
(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/fltk/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-2.0_pre6970-libpng15.patch | 11 | ||||
| -rw-r--r-- | x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild | 5 |
3 files changed, 19 insertions, 3 deletions
diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog index 97ba95640c5e..02582f5e8fee 100644 --- a/x11-libs/fltk/ChangeLog +++ b/x11-libs/fltk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/fltk # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.172 2011/01/19 19:13:40 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.173 2011/02/21 01:19:56 vapier Exp $ + + 21 Feb 2011; Mike Frysinger <vapier@gentoo.org> fltk-2.0_pre6970-r1.ebuild, + +files/fltk-2.0_pre6970-libpng15.patch: + Fix building with libpng-1.5.x. 19 Jan 2011; Justin Lecher <jlec@gentoo.org> +fltk-1.1.9-r1.ebuild: Reverted removal of fltk-1.1.9-r1.ebuild diff --git a/x11-libs/fltk/files/fltk-2.0_pre6970-libpng15.patch b/x11-libs/fltk/files/fltk-2.0_pre6970-libpng15.patch new file mode 100644 index 000000000000..b4b171858af9 --- /dev/null +++ b/x11-libs/fltk/files/fltk-2.0_pre6970-libpng15.patch @@ -0,0 +1,11 @@ +--- images/fl_png.cxx ++++ images/fl_png.cxx +@@ -111,7 +111,7 @@ bool pngImage::fetch() + png_set_sig_bytes(png_ptr, 8); + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + goto error; + + png_read_info(png_ptr, info_ptr); diff --git a/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild b/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild index c0b69c372c48..73dd6fcb77da 100644 --- a/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild +++ b/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild,v 1.2 2010/11/08 12:50:02 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild,v 1.3 2011/02/21 01:19:56 vapier Exp $ EAPI="2" inherit multilib autotools flag-o-matic @@ -43,6 +43,7 @@ src_prepare() { epatch "${FILESDIR}"/fltk2-ldflags.patch # bug 251233 epatch "${FILESDIR}"/fltk2-fluid2.patch # bug 282472 epatch "${FILESDIR}"/${P}-libpng14.patch + epatch "${FILESDIR}"/${P}-libpng15.patch sed -i "/STRIP/d" fluid/Makefile # don't pre-strip, bug 246694 use opengl || epatch "${FILESDIR}"/fltk2-nogl.patch eautoconf # bug 253253 |