Fri Aug 5 00:56:37 2011 UTC ()
Add upstream bug report URL.


(wiz)
diff -r1.7 -r1.8 pkgsrc/games/stratagus/distinfo
diff -r1.1 -r1.2 pkgsrc/games/stratagus/patches/patch-src_video_png.c
cvs diff -r1.7 -r1.8 pkgsrc/games/stratagus/distinfo (expand / switch to unified diff)

--- pkgsrc/games/stratagus/distinfo 2011/04/03 10:28:20 1.7
+++ pkgsrc/games/stratagus/distinfo 2011/08/05 00:56:36 1.8
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.7 2011/04/03 10:28:20 wiz Exp $ 1$NetBSD: distinfo,v 1.8 2011/08/05 00:56:36 wiz Exp $
2 2
3SHA1 (stratagus-2.1-src.tar.gz) = 33181d57e018825a450f1e8c0ec31b0887cbd39c 3SHA1 (stratagus-2.1-src.tar.gz) = 33181d57e018825a450f1e8c0ec31b0887cbd39c
4RMD160 (stratagus-2.1-src.tar.gz) = f5f97854cad9f17104de34613012fd3aa2efbb9b 4RMD160 (stratagus-2.1-src.tar.gz) = f5f97854cad9f17104de34613012fd3aa2efbb9b
5Size (stratagus-2.1-src.tar.gz) = 995686 bytes 5Size (stratagus-2.1-src.tar.gz) = 995686 bytes
6SHA1 (patch-aa) = 2f1403d58b3a745845c3b3e94abb7cf65b00194d 6SHA1 (patch-aa) = 2f1403d58b3a745845c3b3e94abb7cf65b00194d
7SHA1 (patch-ab) = cd9235023dcb2bc05828857c8f1d538a0d06eab5 7SHA1 (patch-ab) = cd9235023dcb2bc05828857c8f1d538a0d06eab5
8SHA1 (patch-ac) = 78aca58075dd730a799dc9d0fb79ca4c6c010a34 8SHA1 (patch-ac) = 78aca58075dd730a799dc9d0fb79ca4c6c010a34
9SHA1 (patch-ad) = 20dc341faf2fc160fbbd8b6ae68b1de1a9e21294 9SHA1 (patch-ad) = 20dc341faf2fc160fbbd8b6ae68b1de1a9e21294
10SHA1 (patch-af) = 06e264e6a3fb785285da503f240405dedf851ec5 10SHA1 (patch-af) = 06e264e6a3fb785285da503f240405dedf851ec5
11SHA1 (patch-src_video_png.c) = fe1ac8d6c610b6f2e0dc259c98fc912b3259bfde 11SHA1 (patch-src_video_png.c) = 5fb6d1f54a2eb0adbfffc2fb8b9ac95519ae63c6
cvs diff -r1.1 -r1.2 pkgsrc/games/stratagus/patches/patch-src_video_png.c (expand / switch to unified diff)

--- pkgsrc/games/stratagus/patches/patch-src_video_png.c 2011/04/03 10:28:21 1.1
+++ pkgsrc/games/stratagus/patches/patch-src_video_png.c 2011/08/05 00:56:37 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: patch-src_video_png.c,v 1.1 2011/04/03 10:28:21 wiz Exp $ 1$NetBSD: patch-src_video_png.c,v 1.2 2011/08/05 00:56:37 wiz Exp $
2 2
3Fix build with png-1.5. 3Fix build with png-1.5.
 4https://bugs.launchpad.net/stratagus/+bug/821210
4 5
5--- src/video/png.c.orig 2004-06-26 22:38:20.000000000 +0000 6--- src/video/png.c.orig 2004-06-26 22:38:20.000000000 +0000
6+++ src/video/png.c 7+++ src/video/png.c
7@@ -133,7 +133,7 @@ Graphic* LoadGraphicPNG(const char* name 8@@ -133,7 +133,7 @@ Graphic* LoadGraphicPNG(const char* name
8 * the normal method of doing things with libpng). REQUIRED unless you 9 * the normal method of doing things with libpng). REQUIRED unless you
9 * set up your own error handlers in png_create_read_struct() earlier. 10 * set up your own error handlers in png_create_read_struct() earlier.
10 */ 11 */
11- if (setjmp(png_ptr->jmpbuf)) { 12- if (setjmp(png_ptr->jmpbuf)) {
12+ if (setjmp(png_jmpbuf(png_ptr))) { 13+ if (setjmp(png_jmpbuf(png_ptr))) {
13 fprintf(stderr, "Error reading the PNG file."); 14 fprintf(stderr, "Error reading the PNG file.");
14 goto done; 15 goto done;
15 } 16 }
16@@ -212,11 +212,11 @@ Graphic* LoadGraphicPNG(const char* name 17@@ -212,11 +212,11 @@ Graphic* LoadGraphicPNG(const char* name