diff options
author | wiz <wiz> | 2006-04-19 17:04:31 +0000 |
---|---|---|
committer | wiz <wiz> | 2006-04-19 17:04:31 +0000 |
commit | 31f52f2a3808af4ce3098d262f6e5404933aba01 (patch) | |
tree | e8a5b07c2211ac5c13fafed150af46f5715f5bb4 /graphics/xart/patches | |
parent | 8c3c251f4d76d27a739f78fffa020de1ac4eaed5 (diff) | |
download | pkgsrc-31f52f2a3808af4ce3098d262f6e5404933aba01.tar.gz |
Fix build after png-1.2.9nb2 update. Bump PKGREVISION.
Diffstat (limited to 'graphics/xart/patches')
-rw-r--r-- | graphics/xart/patches/patch-ac | 18 | ||||
-rw-r--r-- | graphics/xart/patches/patch-af | 40 |
2 files changed, 43 insertions, 15 deletions
diff --git a/graphics/xart/patches/patch-ac b/graphics/xart/patches/patch-ac index 74a924a8fb0..33d5c25c792 100644 --- a/graphics/xart/patches/patch-ac +++ b/graphics/xart/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.6 2006/02/23 21:24:12 joerg Exp $ +$NetBSD: patch-ac,v 1.7 2006/04/19 17:04:31 wiz Exp $ ---- Local.config.orig Wed Apr 1 02:58:05 1998 +--- Local.config.orig 1998-04-01 02:58:05.000000000 +0200 +++ Local.config -@@ -62,8 +62,8 @@ +@@ -62,8 +62,8 @@ XCOMM #define HaveTIFF #ifdef HaveTIFF @@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.6 2006/02/23 21:24:12 joerg Exp $ #endif XCOMM If you have the JPEG library, make HaveJPEG defined -@@ -73,8 +73,8 @@ +@@ -73,8 +73,8 @@ XCOMM includes are correct. #define HaveJPEG #ifdef HaveJPEG @@ -24,18 +24,18 @@ $NetBSD: patch-ac,v 1.6 2006/02/23 21:24:12 joerg Exp $ #endif XCOMM If you have the PNG library, make HavePNG defined -@@ -84,8 +84,8 @@ +@@ -84,8 +84,8 @@ XCOMM includes are correct. #define HavePNG #ifdef HavePNG -PNG_LIB = -L/usr/local/lib -lpng -lz -PNG_INCLUDE = -I/usr/local/include/png -+PNG_LIB = -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lpng -lz ++PNG_LIB = -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lpng12 -lz -lm +PNG_INCLUDE = -I${LOCALBASE}/include #endif XCOMM If you are running SunOS and get an error with the following undefined -@@ -102,11 +102,11 @@ +@@ -102,11 +102,11 @@ XCOMM XCOMM You must have the XPM library. XCOMM Make sure the path name to the library is correct. @@ -49,7 +49,7 @@ $NetBSD: patch-ac,v 1.6 2006/02/23 21:24:12 joerg Exp $ DEPENDFLAGS = -I./bitmaps -@@ -114,10 +114,10 @@ +@@ -114,10 +114,10 @@ DEPENDFLAGS = -I./bitmaps XCOMM Uncomment these lines and tailor to taste, if you don't like XCOMM the default paths and man page extension. XCOMM @@ -61,7 +61,7 @@ $NetBSD: patch-ac,v 1.6 2006/02/23 21:24:12 joerg Exp $ XCOMM Add '-g' here if you want to include debugging information. XCOMM Also add any optimizer flags etc. that you want. -@@ -138,9 +138,9 @@ +@@ -138,9 +138,9 @@ XCOMM This should take care of everythin #if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || \ defined(BSD386Architecture) ARCH_DEFINES = -DHAVE_PARAM_H diff --git a/graphics/xart/patches/patch-af b/graphics/xart/patches/patch-af index 750a72cd88f..e4340b745e6 100644 --- a/graphics/xart/patches/patch-af +++ b/graphics/xart/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.1 2001/08/03 09:43:18 wiz Exp $ +$NetBSD: patch-af,v 1.2 2006/04/19 17:04:31 wiz Exp $ ---- rw/readPNG.c.orig Thu Aug 29 07:24:48 1996 +--- rw/readPNG.c.orig 1996-08-29 07:24:48.000000000 +0200 +++ rw/readPNG.c -@@ -46,8 +46,8 @@ +@@ -46,8 +46,8 @@ Image * ReadPNG(char *file) { FILE *fp; @@ -13,7 +13,7 @@ $NetBSD: patch-af,v 1.1 2001/08/03 09:43:18 wiz Exp $ int i, hasAlpha=FALSE; int width, height, level, bit_depth, npasses; Image *image = NULL; -@@ -59,14 +59,15 @@ +@@ -59,14 +59,15 @@ ReadPNG(char *file) return NULL; } @@ -31,16 +31,17 @@ $NetBSD: patch-af,v 1.1 2001/08/03 09:43:18 wiz Exp $ if (!info_ptr) { RWSetMsg("Error allocating PNG info_ptr memory"); free(png_ptr); -@@ -74,17 +75,13 @@ +@@ -74,17 +75,13 @@ ReadPNG(char *file) return NULL; } - if (setjmp(png_ptr->jmpbuf)) { + if (setjmp(png_jmpbuf(png_ptr))) { RWSetMsg("Error setting longjmp error handler"); - png_read_destroy(png_ptr, info_ptr, (png_info *)0); +- png_read_destroy(png_ptr, info_ptr, (png_info *)0); - free(png_ptr); - free(info_ptr); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); fclose(fp); return NULL; } @@ -50,3 +51,30 @@ $NetBSD: patch-af,v 1.1 2001/08/03 09:43:18 wiz Exp $ png_init_io(png_ptr, fp); png_read_info(png_ptr, info_ptr); +@@ -183,7 +180,7 @@ ReadPNG(char *file) + info_ptr->color_type); + fflush(stderr); + RWSetMsg("Unknown PNG image type"); +- png_read_destroy(png_ptr, info_ptr, (png_infop)NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + free(png_ptr); + free(info_ptr); + fclose(fp); +@@ -217,7 +214,7 @@ ReadPNG(char *file) + fprintf(stderr, "ReadPNG error: unable to malloc png_data\n"); + fflush(stderr); + ImageDelete(image); +- png_read_destroy(png_ptr, info_ptr, (png_infop)NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + free(png_ptr); + free(info_ptr); + fclose(fp); +@@ -271,7 +268,7 @@ ReadPNG(char *file) + */ + + png_read_end(png_ptr, info_ptr); +- png_read_destroy(png_ptr, info_ptr, (png_infop)NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + free(png_ptr); + free(info_ptr); + fclose(fp); |