Fix building with libpng15 wrt #383199 by Diego Elio Pettenò

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

4 files changed, 32 insertions, 10 deletions

diff --git a/games-board/eboard/ChangeLog b/games-board/eboard/ChangeLog
index 62efc796930c..4f697424ae3d 100644
--- a/games-board/eboard/ChangeLog
+++ b/games-board/eboard/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/eboard
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/ChangeLog,v 1.33 2011/06/10 07:11:28 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/ChangeLog,v 1.34 2011/09/17 16:37:04 ssuominen Exp $
+
+  17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> eboard-1.1.1-r1.ebuild,
+  +files/eboard-1.1.1-libpng15.patch:
+  Fix building with libpng15 wrt #383199 by Diego Elio Pettenò
 
   10 Jun 2011; Tupone Alfredo <tupone@gentoo.org> eboard-1.1.1-r1.ebuild:
   Fix underlink. Bug #367843 by Diego Elio Pettenò
diff --git a/games-board/eboard/Manifest b/games-board/eboard/Manifest
index ddc391bd3b72..16eb9b6ca4d3 100644
--- a/games-board/eboard/Manifest
+++ b/games-board/eboard/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX eboard-1.1.1-as-needed.patch 726 RMD160 9c7451fdc76d8d1599c6fae35aa2b6335493de0a SHA1 59307c52cc7be479dcffaf070c2334912e908900 SHA256 2a4831e85706579059886baa73e87561dae2af87a280e7cb8d0e905227347008
 AUX eboard-1.1.1-gcc44.patch 182 RMD160 ee62e6285e3b1d59474103a82a6bd1cfc1462168 SHA1 c913f0645a201028a5bd469b195b037e73d3835b SHA256 f8da530fd5db4fdac4b0d09f8fedc31f412d3851708e1c2cc37874c1a1fa97a6
+AUX eboard-1.1.1-libpng15.patch 355 RMD160 7f858fac1136ba73ddd646f507977f3c56ae136b SHA1 c6da350713775cc34f79a5c4f746077364419967 SHA256 fa566dae344a604319055098f4e27c34953a597ad0b773b0f293431a404f8253
 AUX eboard-1.1.1-ovflfix.patch 853 RMD160 e21f259220ff3cb49cabf7400d076fc888bc8351 SHA1 688c73beb68e1b105bd4a9f9ed9c6355d623d1a3 SHA256 8c29c0deb64f0ddb1ce541eba20da1ceb055ead5978e26796fd29e355196014a
 DIST eboard-1.1.1.tar.bz2 462386 RMD160 13bdfe6d33a143d619c6c5be8d849ced9b95e2c4 SHA1 029cf1e7503fc2a862b9880da9ea6ab91e5614cd SHA256 ad971086697c0d5a1c8a64401f6675339e832acb386dc96fa4e17da1832ca26e
 DIST eboard-extras-1pl2.tar.gz 361237 RMD160 342b1b48091958f5b0e4613e1c9de8b6c23d5b67 SHA1 aac0f4ec4cc83f2e76726fcbe54c707bd0ebe44a SHA256 6849cc104e454167db8b8e9ae0573accade5c941a140b47e58b601164e99fcc3
 DIST eboard-extras-2.tar.gz 598909 RMD160 d6b7b9f39167752301018048010fee312acb97c0 SHA1 6b2a88ada8a5b009e7fb97950c0596e23030d161 SHA256 0b98bd4c90b2e275f8535186c3e7cbeeef9c9bb611a7febfcd866486a9f41a9c
 DIST eboard_1.1.1-4.1.diff.gz 17247 RMD160 3e32c44274a83fa1978ed341fb940a9ea2dfea12 SHA1 bce48ec2d4eb4e5817e45579a217e6e7f635d3ba SHA256 9be0e7fb3cc59edec3fd5c0c2c562eb56fea36afd3c23ac21c1f3ada6acf3617
-EBUILD eboard-1.1.1-r1.ebuild 1935 RMD160 0e05f5839df3a5b8b3d1749d921c744ee8e85d35 SHA1 2fe52b5788f7cabe83310483ab66de1e15674388 SHA256 09a6d1f3239279704da7607ebe2680ca8f79050febcc615c6021c58ae225fa4e
-MISC ChangeLog 5622 RMD160 3a42eb2b6acbdd354d52272e03a79ce1f2efe3d0 SHA1 704e4626cef784af1c2e7618186ef06cbfc3061f SHA256 292908a39afc40fa36e6d0de96116a1376fec557f920e7551891c7156f0822e9
+EBUILD eboard-1.1.1-r1.ebuild 1976 RMD160 9113adeba19f151c9a540fff3d65b490f392cf90 SHA1 49c1f0c2e4abc4677e4f43ff9c6708cd9830f428 SHA256 5cb368f724f6f9781e3fb900e46da71d65aa452bdde0d36ced52b96018ed5834
+MISC ChangeLog 5806 RMD160 d25ed6a179c5b758e13d0abf2dc5f3f9e5d819e8 SHA1 d89380297159159123922ca2287dd09a48b810ff SHA256 4ecaa47b778b758b418490dc5becd66fd9e9a9bc088f592430bdcd1db3813784
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk3xw6oACgkQIY77eQFFFC1Q5QCgrKqF+GdERP4b+7ocTV5PSZLs
-zYMAn3doQlMFzpqfZh4uJCgCZ52ZLkPZ
-=pNx6
+iF4EAREIAAYFAk50zOwACgkQXkR9YqOcLPGnSAD+Pk6a32Z4XJHoyTAD0FXv81Zs
+PIom18VAQn3eo/Al0gQA/1QYOFMorQMF2sLIz5cEV/TfBhIu8Wsr3qsBSGOk1Lj7
+=8y5I
 -----END PGP SIGNATURE-----
diff --git a/games-board/eboard/eboard-1.1.1-r1.ebuild b/games-board/eboard/eboard-1.1.1-r1.ebuild
index 637261a8e641..9cb11809a138 100644
--- a/games-board/eboard/eboard-1.1.1-r1.ebuild
+++ b/games-board/eboard/eboard-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.1.1-r1.ebuild,v 1.8 2011/06/10 07:11:28 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.1.1-r1.ebuild,v 1.9 2011/09/17 16:37:04 ssuominen Exp $
 
 EAPI=2
 inherit eutils games
@@ -31,7 +31,8 @@ src_prepare() {
 		"${WORKDIR}"/${PN}_${DEB_V}.diff \
 		"${FILESDIR}"/${P}-as-needed.patch \
 		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-ovflfix.patch
+		"${FILESDIR}"/${P}-ovflfix.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
 	sed -i \
 		-e "s:(\"-O6\"):split(' ', \"${CXXFLAGS}\"):" \
 		configure \
diff --git a/games-board/eboard/files/eboard-1.1.1-libpng15.patch b/games-board/eboard/files/eboard-1.1.1-libpng15.patch
new file mode 100644
index 000000000000..8ab283259f79
--- /dev/null
+++ b/games-board/eboard/files/eboard-1.1.1-libpng15.patch
@@ -0,0 +1,16 @@
+--- cimg.cc
++++ cimg.cc
+@@ -94,11 +95,11 @@
+       ct == PNG_COLOR_TYPE_GRAY_ALPHA)
+     png_set_gray_to_rgb(pngp);
+ 
+-  alloc(pngp->width,pngp->height);
++  alloc(width,height);
+   if (!ok) { fclose(f); return; }
+   ok = 0;
+ 
+-  for(i=0;i<pngp->height;i++) {
++  for(i=0;i<height;i++) {
+     png_read_row(pngp, (png_bytep) (&data[i*rowlen]), NULL);
+   }
+