Thu Aug 4 23:58:36 2011 UTC ()
Add upstream bug report URL.


(wiz)
diff -r1.9 -r1.10 pkgsrc/chat/amsn/distinfo
diff -r1.3 -r1.4 pkgsrc/chat/amsn/patches/patch-utils_TkCximage_src_CxImage_ximapng.cpp
diff -r1.1 -r1.2 pkgsrc/chat/amsn/patches/patch-utils_TkCximage_src_CxImage_ximapng.h
cvs diff -r1.9 -r1.10 pkgsrc/chat/amsn/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/amsn/Attic/distinfo 2011/08/01 01:16:50 1.9
+++ pkgsrc/chat/amsn/Attic/distinfo 2011/08/04 23:58:35 1.10
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.9 2011/08/01 01:16:50 dholland Exp $ 1$NetBSD: distinfo,v 1.10 2011/08/04 23:58:35 wiz Exp $
2 2
3SHA1 (amsn-0.98.3-src.tar.bz2) = aa8383a11ce66352aceee27f9c291c1410b3403d 3SHA1 (amsn-0.98.3-src.tar.bz2) = aa8383a11ce66352aceee27f9c291c1410b3403d
4RMD160 (amsn-0.98.3-src.tar.bz2) = 20f707062da4a5ab1eb6beec49d01dfd2ba90a99 4RMD160 (amsn-0.98.3-src.tar.bz2) = 20f707062da4a5ab1eb6beec49d01dfd2ba90a99
5Size (amsn-0.98.3-src.tar.bz2) = 13275477 bytes 5Size (amsn-0.98.3-src.tar.bz2) = 13275477 bytes
6SHA1 (patch-configure) = ddbd6a9616683c44202a551d734b2c9b10b2e05b 6SHA1 (patch-configure) = ddbd6a9616683c44202a551d734b2c9b10b2e05b
7SHA1 (patch-utils_TkCximage_src_CxImage_ximapng.cpp) = 823904f7b17aff6034339e7873135edb7362b489 7SHA1 (patch-utils_TkCximage_src_CxImage_ximapng.cpp) = fc0e4a13e3d13948240a31c001c525def9d37fe9
8SHA1 (patch-utils_TkCximage_src_CxImage_ximapng.h) = 1d7a1cc0acd397629a0e6b1f83f9fdf943fb6d8a 8SHA1 (patch-utils_TkCximage_src_CxImage_ximapng.h) = 77fec828125c21000252b995cfdaa13116478254
cvs diff -r1.3 -r1.4 pkgsrc/chat/amsn/patches/Attic/patch-utils_TkCximage_src_CxImage_ximapng.cpp (expand / switch to unified diff)

--- pkgsrc/chat/amsn/patches/Attic/patch-utils_TkCximage_src_CxImage_ximapng.cpp 2011/08/01 01:16:50 1.3
+++ pkgsrc/chat/amsn/patches/Attic/patch-utils_TkCximage_src_CxImage_ximapng.cpp 2011/08/04 23:58:36 1.4
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: patch-utils_TkCximage_src_CxImage_ximapng.cpp,v 1.3 2011/08/01 01:16:50 dholland Exp $ 1$NetBSD: patch-utils_TkCximage_src_CxImage_ximapng.cpp,v 1.4 2011/08/04 23:58:36 wiz Exp $
2 2
3Fix build with png-1.5. 3Fix build with png-1.5.
 4https://sourceforge.net/tracker/?func=detail&aid=3386428&group_id=54091&atid=472655
4 5
5--- utils/TkCximage/src/CxImage/ximapng.cpp.orig 2010-01-29 09:09:27.000000000 +0000 6--- utils/TkCximage/src/CxImage/ximapng.cpp.orig 2010-01-29 09:09:27.000000000 +0000
6+++ utils/TkCximage/src/CxImage/ximapng.cpp 7+++ utils/TkCximage/src/CxImage/ximapng.cpp
7@@ -15,7 +15,7 @@ 8@@ -15,7 +15,7 @@
8 void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message) 9 void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message)
9 { 10 {
10 strcpy(info.szLastError,message); 11 strcpy(info.szLastError,message);
11- longjmp(png_ptr->jmpbuf, 1); 12- longjmp(png_ptr->jmpbuf, 1);
12+ longjmp(png_jmpbuf(png_ptr), 1); 13+ longjmp(png_jmpbuf(png_ptr), 1);
13 } 14 }
14 //////////////////////////////////////////////////////////////////////////////// 15 ////////////////////////////////////////////////////////////////////////////////
15 #if CXIMAGE_SUPPORT_DECODE 16 #if CXIMAGE_SUPPORT_DECODE
16@@ -62,7 +62,7 @@ bool CxImagePNG::Decode(CxFile *hFile) 17@@ -62,7 +62,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
cvs diff -r1.1 -r1.2 pkgsrc/chat/amsn/patches/Attic/patch-utils_TkCximage_src_CxImage_ximapng.h (expand / switch to unified diff)

--- pkgsrc/chat/amsn/patches/Attic/patch-utils_TkCximage_src_CxImage_ximapng.h 2011/04/03 15:26:36 1.1
+++ pkgsrc/chat/amsn/patches/Attic/patch-utils_TkCximage_src_CxImage_ximapng.h 2011/08/04 23:58:36 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: patch-utils_TkCximage_src_CxImage_ximapng.h,v 1.1 2011/04/03 15:26:36 wiz Exp $ 1$NetBSD: patch-utils_TkCximage_src_CxImage_ximapng.h,v 1.2 2011/08/04 23:58:36 wiz Exp $
2 2
3Fix build with png-1.5. 3Fix build with png-1.5.
 4https://sourceforge.net/tracker/?func=detail&aid=3386428&group_id=54091&atid=472655
4 5
5--- utils/TkCximage/src/CxImage/ximapng.h.orig 2008-03-07 19:14:37.000000000 +0000 6--- utils/TkCximage/src/CxImage/ximapng.h.orig 2008-03-07 19:14:37.000000000 +0000
6+++ utils/TkCximage/src/CxImage/ximapng.h 7+++ utils/TkCximage/src/CxImage/ximapng.h
7@@ -64,8 +64,8 @@ protected: 8@@ -64,8 +64,8 @@ protected:
8  9
9 static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg) 10 static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg)
10 { 11 {
11- strncpy((char*)png_ptr->error_ptr,error_msg,255); 12- strncpy((char*)png_ptr->error_ptr,error_msg,255);
12- longjmp(png_ptr->jmpbuf, 1); 13- longjmp(png_ptr->jmpbuf, 1);
13+ strncpy((char*)png_get_error_ptr(png_ptr),error_msg,255); 14+ strncpy((char*)png_get_error_ptr(png_ptr),error_msg,255);
14+ longjmp(png_jmpbuf(png_ptr), 1); 15+ longjmp(png_jmpbuf(png_ptr), 1);
15 } 16 }
16 }; 17 };