diff options
| author | dinoex <dinoex@FreeBSD.org> | 2012-06-01 13:26:28 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2012-06-01 13:26:28 +0800 |
| commit | 530706893f31269bbfa303e069f2e76cbbe2fce7 (patch) | |
| tree | a8077a0d6e20d70b39e6a7fe3e57a6dafe7c7f33 /cad/leocad | |
| parent | 9d262811a145d3e715edefd1d5d64ceac41de547 (diff) | |
| download | freebsd-ports-gnome-530706893f31269bbfa303e069f2e76cbbe2fce7.tar.gz freebsd-ports-gnome-530706893f31269bbfa303e069f2e76cbbe2fce7.tar.zst freebsd-ports-gnome-530706893f31269bbfa303e069f2e76cbbe2fce7.zip | |
- update png to 1.5.10
Diffstat (limited to 'cad/leocad')
| -rw-r--r-- | cad/leocad/Makefile | 4 | ||||
| -rw-r--r-- | cad/leocad/files/patch-im_png.cpp | 47 |
2 files changed, 48 insertions, 3 deletions
diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile index 528517a507cd..c7730cc3416c 100644 --- a/cad/leocad/Makefile +++ b/cad/leocad/Makefile @@ -7,7 +7,7 @@ PORTNAME= leocad PORTVERSION= 0.73 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= arved @@ -19,7 +19,7 @@ COMMENT= A CAD program that uses bricks similar to those found in many toys EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png USE_GL= glut USE_XORG= x11 diff --git a/cad/leocad/files/patch-im_png.cpp b/cad/leocad/files/patch-im_png.cpp index 127f267823d1..39415c645ea7 100644 --- a/cad/leocad/files/patch-im_png.cpp +++ b/cad/leocad/files/patch-im_png.cpp @@ -1,5 +1,5 @@ --- common/im_png.cpp.orig 2000-09-16 19:18:01.000000000 +0200 -+++ common/im_png.cpp 2010-03-29 20:47:19.000000000 +0200 ++++ common/im_png.cpp 2012-04-27 08:02:21.000000000 +0200 @@ -34,7 +34,7 @@ return NULL; @@ -9,3 +9,48 @@ { fclose(f); return NULL; // bad signature +@@ -55,7 +55,7 @@ + return NULL; // out of memory + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(f); +@@ -69,7 +69,7 @@ + png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, + NULL, NULL, NULL); + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(f); +@@ -80,7 +80,7 @@ + { + png_get_bKGD(png_ptr, info_ptr, &pBackground); + +- if (setjmp (png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(f); +@@ -113,7 +113,7 @@ + } + else + { +- if (setjmp (png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(f); +@@ -283,7 +283,7 @@ + return false; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_write_struct(&png_ptr, (png_infopp)NULL); + fclose(fp); |