diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-17 16:37:04 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-17 16:37:04 +0000 |
commit | 320f8ba1677c86103984668a6d7c5b1494f0696e (patch) | |
tree | b249b4a12247702a30410c203b271f597eb018b7 /games-board | |
parent | Version bump (diff) | |
download | gentoo-2-320f8ba1677c86103984668a6d7c5b1494f0696e.tar.gz gentoo-2-320f8ba1677c86103984668a6d7c5b1494f0696e.tar.bz2 gentoo-2-320f8ba1677c86103984668a6d7c5b1494f0696e.zip |
Fix building with libpng15 wrt #383199 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'games-board')
-rw-r--r-- | games-board/eboard/ChangeLog | 6 | ||||
-rw-r--r-- | games-board/eboard/eboard-1.1.1-r1.ebuild | 5 | ||||
-rw-r--r-- | games-board/eboard/files/eboard-1.1.1-libpng15.patch | 16 |
3 files changed, 24 insertions, 3 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/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); + } + |