diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-11 15:59:53 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-11 15:59:53 +0000 |
| commit | 0685f978502689be3d53698c58359777bbde444e (patch) | |
| tree | 73c44edc04171da7fdd96474f00e04571a3bc19a /x11-libs | |
| parent | Marked ppc/ppc64 stable for bug #301473. (diff) | |
| download | gentoo-2-0685f978502689be3d53698c58359777bbde444e.tar.gz gentoo-2-0685f978502689be3d53698c58359777bbde444e.tar.bz2 gentoo-2-0685f978502689be3d53698c58359777bbde444e.zip | |
Fix building with libpng14.
(Portage version: 2.2_rc67/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-libpng14.patch | 13 | ||||
| -rw-r--r-- | x11-libs/fltk/fltk-2.0_pre6970.ebuild | 3 |
3 files changed, 20 insertions, 2 deletions
diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog index 2adba5632a82..328dace4bfac 100644 --- a/x11-libs/fltk/ChangeLog +++ b/x11-libs/fltk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/fltk # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.149 2010/02/09 18:15:51 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.150 2010/03/11 15:59:52 ssuominen Exp $ + + 11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> + fltk-2.0_pre6970.ebuild, +files/fltk-2.0_pre6970-libpng14.patch: + Fix building with libpng14. *fltk-2.0_pre6970 (09 Feb 2010) diff --git a/x11-libs/fltk/files/fltk-2.0_pre6970-libpng14.patch b/x11-libs/fltk/files/fltk-2.0_pre6970-libpng14.patch new file mode 100644 index 000000000000..bef3f7ae9008 --- /dev/null +++ b/x11-libs/fltk/files/fltk-2.0_pre6970-libpng14.patch @@ -0,0 +1,13 @@ +http://repos.archlinux.org/wsvn/community/fltk2/trunk/libpng14.patch + +--- images/fl_png.cxx ++++ images/fl_png.cxx +@@ -62,7 +62,7 @@ bool pngImage::test(const uchar* datas, + #if !HAVE_LIBPNG + return 0; + #else +- return png_check_sig((png_byte*)datas, (int)size)!=0; ++ return png_sig_cmp((png_byte*)datas, 0, (int)size)==0; + #endif + } + diff --git a/x11-libs/fltk/fltk-2.0_pre6970.ebuild b/x11-libs/fltk/fltk-2.0_pre6970.ebuild index 7032d023a0ae..9d7f1bb9cc75 100644 --- a/x11-libs/fltk/fltk-2.0_pre6970.ebuild +++ b/x11-libs/fltk/fltk-2.0_pre6970.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.ebuild,v 1.1 2010/02/09 18:15:51 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6970.ebuild,v 1.2 2010/03/11 15:59:52 ssuominen Exp $ EAPI="2" inherit multilib autotools flag-o-matic @@ -41,6 +41,7 @@ src_prepare() { epatch "${FILESDIR}"/fltk2-gcc43.patch epatch "${FILESDIR}"/fltk2-ldflags.patch # bug 251233 epatch "${FILESDIR}"/fltk2-fluid2.patch # bug 282472 + epatch "${FILESDIR}"/${P}-libpng14.patch sed -i "/STRIP/d" fluid/Makefile # don't pre-strip, bug 246694 use opengl || epatch "${FILESDIR}"/fltk2-nogl.patch eautoreconf |