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

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

diff --git a/games-board/ace/ChangeLog b/games-board/ace/ChangeLog
index 9cfd5d851967bc55e8979bac7a673d2a3c3ba46d..77a91cd460afae8e392d3a8782d1b05abbfae7c1 100644 (file)
--- 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/Manifest b/games-board/ace/Manifest
index f4a392d2dcfdc5b186c3b566204c2b6b51ce9b68..0960d805b76b817a30f77d22da2f162904ee5585 100644 (file)
--- a/games-board/ace/Manifest
+++ b/games-board/ace/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ace-1.3-implicit-pointer.patch 332 RMD160 3244045392a207891764db9884ad697fc0cd5472 SHA1 fbfbe2e1622e313e3bd1c524383717aab399b9f4 SHA256 eb0f02425048347f5596e93cc5c0f93bf6ef3e46823e525ab8ca244c615b1a64
+AUX ace-1.3-libpng15.patch 845 RMD160 5571a4e96fb52f4810a5e1ae15cc8366f6f2c9a0 SHA1 b3bc2d5184b6c0b01e1d95424172adccffe6dfa1 SHA256 3b24eb7e13e32515e47ea615ba6adce75dc1889aa36a0b1e61ce420f8aa45a6f
 AUX ace-1.3-no-xpm.patch 572 RMD160 f7d5675f909a274907210b846573b5937ad2dcf1 SHA1 5814cbf0131b9cc4ffceeb17431e5922b6733f03 SHA256 c2f2ad6cdcc774b8db07f69b45a9debd0b289556ff60204e61bbc0f39c0de503
 DIST ace-1.3.tar.gz 528916 RMD160 07772190956ebe2a0f78a613c40ab6e0221e0df4 SHA1 3b9b79e525c7e819e79a48c95fe2ad1bf2a33a49 SHA256 4fb6ca9e1ff34e42d9498f06e2bccaa61f5650daf48774015468d5f75c5347d3
-EBUILD ace-1.3.ebuild 1068 RMD160 b427fd2c0152d87733c8c46b0c1eba7f0a935c90 SHA1 a4dc4892d819a814e2b990e3c0fc316fc914d955 SHA256 cc8b9e1f2e01cb680e99dee19ada65caff410d2b68b5f3677f3fc8b44627b57a
-MISC ChangeLog 2938 RMD160 24b1b40b39673ba57409ed90865c7a1b6e4005d6 SHA1 8d4ed870a40ab9a16a7f4cf2f640e6ad56fbadec SHA256 53077c5ed5a6799f502e1dd9cf6ebebf32036eee345857cc271d3979144e6b69
+EBUILD ace-1.3.ebuild 1109 RMD160 184270d2df7391d7e181fed48e3c67493ef56d4e SHA1 8cf4305c16bde4e1feb6a1fae0305582d2c85aea SHA256 fd034cae74bb980d6d21899a10eb522c3f518eb96441c22aa043de8a982fc660
+MISC ChangeLog 3109 RMD160 381320395c7474c3ccc85b7ebaf7e1da7bcec9fb SHA1 7bc63eedc30507e52fb46ffe0a54373c0b1a6cd5 SHA256 f5735bd2c9d90d6e23de849ba6501505b8d35b13708b0e2db61fb24e58f7c880
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk5xqCsACgkQXkR9YqOcLPHwqwD+K6Fd6Ga9F1eSz4ISg/xQ0f88
+Ho8zGyEcHo/442jg6pUA/0WEB1Yoby62Do5xMrvR9k2h5pd4/zKjeb2VcbxAHpP3
+=XSkB
+-----END PGP SIGNATURE-----

diff --git a/games-board/ace/ace-1.3.ebuild b/games-board/ace/ace-1.3.ebuild
index 573da0fca17d2978df95ed49f001d993474af989..41ecee16443c53faba4dcbf3b86b3602f0ba0e26 100644 (file)
--- 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 (file)
index 0000000..f0ec4e9
--- /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);
+