From 200750d6967fa7413bbdfc5959a9d6c18219e730 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Wed, 10 Mar 2010 20:43:28 +0000 Subject: Fix building with libpng14 wrt #308885 by Locke Shinseiko. (Portage version: 2.2_rc66/cvs/Linux x86_64) --- games-sports/gracer/ChangeLog | 8 ++++++-- games-sports/gracer/files/gracer-0.1.5-libpng14.patch | 13 +++++++++++++ games-sports/gracer/gracer-0.1.5.ebuild | 9 +++++---- 3 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 games-sports/gracer/files/gracer-0.1.5-libpng14.patch (limited to 'games-sports/gracer') diff --git a/games-sports/gracer/ChangeLog b/games-sports/gracer/ChangeLog index 27c27224fed1..00029e452826 100644 --- a/games-sports/gracer/ChangeLog +++ b/games-sports/gracer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-sports/gracer -# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/ChangeLog,v 1.18 2009/02/11 13:31:26 tupone Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/ChangeLog,v 1.19 2010/03/10 20:43:27 ssuominen Exp $ + + 10 Mar 2010; Samuli Suominen gracer-0.1.5.ebuild, + +files/gracer-0.1.5-libpng14.patch: + Fix building with libpng14 wrt #308885 by Locke Shinseiko. 11 Feb 2009; Alfredo Tupone +files/gracer-0.1.5-as-needed.patch, gracer-0.1.5.ebuild: diff --git a/games-sports/gracer/files/gracer-0.1.5-libpng14.patch b/games-sports/gracer/files/gracer-0.1.5-libpng14.patch new file mode 100644 index 000000000000..6230eb276401 --- /dev/null +++ b/games-sports/gracer/files/gracer-0.1.5-libpng14.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/show_bug.cgi?id=308885 + +--- common/gr_texture.c ++++ common/gr_texture.c +@@ -419,7 +419,7 @@ read_png_file (GrTexture *texture, char + if (fread (header, 1, PNG_BYTES_TO_CHECK, file) != PNG_BYTES_TO_CHECK) { + goto ERROR; + } +- if (!png_check_sig (header, PNG_BYTES_TO_CHECK)) { ++ if (png_sig_cmp (header, 0, PNG_BYTES_TO_CHECK)) { + goto ERROR; + } + diff --git a/games-sports/gracer/gracer-0.1.5.ebuild b/games-sports/gracer/gracer-0.1.5.ebuild index ea8e1a33fb74..cc3c73e4e8c5 100644 --- a/games-sports/gracer/gracer-0.1.5.ebuild +++ b/games-sports/gracer/gracer-0.1.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/gracer-0.1.5.ebuild,v 1.18 2009/02/11 13:31:26 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-sports/gracer/gracer-0.1.5.ebuild,v 1.19 2010/03/10 20:43:27 ssuominen Exp $ EAPI=2 inherit eutils games @@ -21,7 +21,7 @@ DEPEND="x11-libs/libXi virtual/opengl dev-lang/tcl media-libs/giflib - media-libs/jpeg + media-libs/jpeg:0 media-libs/libpng media-libs/plib" @@ -29,7 +29,8 @@ src_prepare() { epatch "${FILESDIR}"/${PV}-gldefs.patch \ "${FILESDIR}"/${PN}-gcc-3.4.patch \ "${FILESDIR}/${P}"-gcc41.patch \ - "${FILESDIR}"/${P}-as-needed.patch + "${FILESDIR}"/${P}-as-needed.patch \ + "${FILESDIR}"/${P}-libpng14.patch } src_configure() { -- cgit v1.2.3-65-gdbad