Fix building with libpng14 wrt #308885 by Locke Shinseiko.

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

diff --git a/games-sports/gracer/ChangeLog b/games-sports/gracer/ChangeLog
index 27c27224fed16117446e9daf8e2a067b4e635dc2..00029e452826142212d30290ed6511a593af89d9 100644 (file)
--- 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 <ssuominen@gentoo.org> 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 <tupone@gentoo.org>
   +files/gracer-0.1.5-as-needed.patch, gracer-0.1.5.ebuild:

diff --git a/games-sports/gracer/Manifest b/games-sports/gracer/Manifest
index f38d75b87c15e4f9d696c9674baed61b865615de..62a4d3df8fda7cee95d9bd6c208247b9f1c2546c 100644 (file)
--- a/games-sports/gracer/Manifest
+++ b/games-sports/gracer/Manifest
@@ -1,8 +1,9 @@
 AUX 0.1.5-gldefs.patch 1068 RMD160 47d1b371534831dd5d1980db9c6f30d1bf78bdfd SHA1 8f49a7358f924d2219e1aced7a8bc35a8ee89b69 SHA256 78e0b8c0e38ed16bb55207d76cdce192508371f624567d4c27633b6d44b97241
 AUX gracer-0.1.5-as-needed.patch 1134 RMD160 f914206ed44c1aa98d87b17b68aaa12b92505f5a SHA1 cdb91529219f59119a62134efacdf693b6929320 SHA256 332d7c5fcf810139f4c7f759e79636d7cb98ce3ee5fe83a8367a1051bb6a8144
 AUX gracer-0.1.5-gcc41.patch 414 RMD160 b0571a4eb2ce8c399afa50fa2ce43966b8ee947a SHA1 9f1e56f54468c0d9600df46cf5ccd9b22d9d7f5b SHA256 2f5b3cd8620aa8e9df3b8fcc61aa0d901d329a7734a9a89e850d726e3fc60f2a
+AUX gracer-0.1.5-libpng14.patch 385 RMD160 09fb9086be00e9161ada846dabc6f0c0accdcd14 SHA1 5616503d1c0963d4ce43ae81afcd1be9c15e56e0 SHA256 6aaf0ffbb1b5978ab73ee70c9767f9fc7dd6d9c79e4783dbf324dfde30061ddb
 AUX gracer-gcc-3.4.patch 1755 RMD160 17083ad43ac9694313e573e1d9cba36a18b07cc9 SHA1 db8fad5111bfa07ec28163f5227e42b93ab476db SHA256 50680ff8fe9e51dbbb9fd07953c2be0e028cb7a89db703413ad448052bc47427
 DIST gracer-0.1.5.tar.gz 520599 RMD160 31cfda3061c025cbdd454ec537f7f3c3621c4271 SHA1 f459ae644c7f74553354e7cc10285ee31ed63b99 SHA256 dc478610d60cd5f00a52cc52877a333bd4b3a2d96ed1660ba8d26ad7143367c0
-EBUILD gracer-0.1.5.ebuild 1159 RMD160 de6f6f26b3d48bbfe217ba6c066bb4ef30127c53 SHA1 455522ecf0fe52bf1bb13f2b8a29692fde1f5f2b SHA256 82db1f864ba3bb288b9cbc79e317cfef8eae8a350d09af7493d706124eef9b9a
-MISC ChangeLog 2035 RMD160 af419b5043d9a1d523a9f7c1dd7e72319ada6390 SHA1 9e81da2db5bcf22ef2f96c1cb902c5b94418d13d SHA256 6ab14686d30b03aaf2e6e9a334b1ae587a2a350bfcbfb1d085b33d6fb7103060
+EBUILD gracer-0.1.5.ebuild 1202 RMD160 1ab57b92cc6f6377efe95f6ca3fa91b613705361 SHA1 8eb69d48e6f5c34a61ee757a40ae564ca652e6c8 SHA256 5b264f83afee8671f4f0c7e3ed134308f035eef96ffff04bfb8cef687256f7a4
+MISC ChangeLog 2213 RMD160 6fc902256fdfab0bbd9176f6231441bed6da0e91 SHA1 5287bec91e13b12f5833ac4ade4039e6203eff7d SHA256 867fde45f1c6d17675c822f86c7b2d25da808fd6bd8690a7a12a66f37d5e6353
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3

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 (file)
index 0000000..6230eb2
--- /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 ea8e1a33fb746a6c0d40a76c6c1baec29afa31e1..cc3c73e4e8c5fee8bf04397d7b701562b335a4a3 100644 (file)
--- 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() {