diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-15 07:23:31 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-15 07:23:31 +0000 |
| commit | 8123a782467b501c2a1f47cb119652d2803e555b (patch) | |
| tree | bfd438df1228ed976353f5892dea490e0225123a /games-board/ace | |
| parent | Version bump. (diff) | |
| download | gentoo-2-8123a782467b501c2a1f47cb119652d2803e555b.tar.gz gentoo-2-8123a782467b501c2a1f47cb119652d2803e555b.tar.bz2 gentoo-2-8123a782467b501c2a1f47cb119652d2803e555b.zip | |
Fix building with libpng15 wrt #380191 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'games-board/ace')
| -rw-r--r-- | games-board/ace/ChangeLog | 6 | ||||
| -rw-r--r-- | games-board/ace/ace-1.3.ebuild | 5 | ||||
| -rw-r--r-- | games-board/ace/files/ace-1.3-libpng15.patch | 29 |
3 files changed, 37 insertions, 3 deletions
diff --git a/games-board/ace/ChangeLog b/games-board/ace/ChangeLog index 9cfd5d851967..77a91cd460af 100644 --- a/games-board/ace/ChangeLog +++ b/games-board/ace/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-board/ace # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.22 2011/01/11 22:05:07 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.23 2011/09/15 07:23:31 ssuominen Exp $ + + 15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> ace-1.3.ebuild, + +files/ace-1.3-libpng15.patch: + Fix building with libpng15 wrt #380191 by Diego Elio Pettenò 11 Jan 2011; Brent Baude <ranger@gentoo.org> ace-1.3.ebuild: Marking ace-1.3 ppc for bug 343463 diff --git a/games-board/ace/ace-1.3.ebuild b/games-board/ace/ace-1.3.ebuild index 573da0fca17d..41ecee16443c 100644 --- a/games-board/ace/ace-1.3.ebuild +++ b/games-board/ace/ace-1.3.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/ace/ace-1.3.ebuild,v 1.4 2011/01/11 22:05:07 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ace-1.3.ebuild,v 1.5 2011/09/15 07:23:31 ssuominen Exp $ EAPI=2 inherit eutils games @@ -22,7 +22,8 @@ DEPEND="${RDEPEND} src_prepare() { epatch \ "${FILESDIR}"/${P}-no-xpm.patch \ - "${FILESDIR}"/${P}-implicit-pointer.patch + "${FILESDIR}"/${P}-implicit-pointer.patch \ + "${FILESDIR}"/${P}-libpng15.patch } src_configure() { diff --git a/games-board/ace/files/ace-1.3-libpng15.patch b/games-board/ace/files/ace-1.3-libpng15.patch new file mode 100644 index 000000000000..f0ec4e9f6359 --- /dev/null +++ b/games-board/ace/files/ace-1.3-libpng15.patch @@ -0,0 +1,29 @@ +--- lib/make-imglib.c ++++ lib/make-imglib.c +@@ -86,7 +86,7 @@ + png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0); + info_ptr = png_create_info_struct (png_ptr); + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + fclose (f); + continue; + } +--- lib/xwin.c ++++ lib/xwin.c +@@ -824,13 +824,13 @@ + png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0); + info_ptr = png_create_info_struct (png_ptr); + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + fprintf(stderr, "Invalid PNG image!\n"); + return; + } + + file_bytes = src->file_data; +- png_set_read_fn (png_ptr, (voidp)&file_bytes, (png_rw_ptr)png_reader); ++ png_set_read_fn (png_ptr, (png_voidp)&file_bytes, (png_rw_ptr)png_reader); + + png_read_info (png_ptr, info_ptr); + |