diff options
Diffstat (limited to 'graphics/pngwriter')
| -rw-r--r-- | graphics/pngwriter/Makefile | 6 | ||||
| -rw-r--r-- | graphics/pngwriter/files/patch-pngwriter.cc | 37 |
2 files changed, 39 insertions, 4 deletions
diff --git a/graphics/pngwriter/Makefile b/graphics/pngwriter/Makefile index 4ca373f71034..9db6905ca1e6 100644 --- a/graphics/pngwriter/Makefile +++ b/graphics/pngwriter/Makefile @@ -8,20 +8,20 @@ PORTNAME= pngwriter PORTVERSION= 0.5.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A C++ library for creating PNG images -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_GNOME= pkgconfig -CXXFLAGS+= `pkg-config --cflags freetype2 libpng14` -I${LOCALBASE}/include +CXXFLAGS+= `pkg-config --cflags freetype2 libpng15` -I${LOCALBASE}/include PORTDOCS= * PORTEXAMPLES= * diff --git a/graphics/pngwriter/files/patch-pngwriter.cc b/graphics/pngwriter/files/patch-pngwriter.cc index 8ea130fba529..135ab18302c3 100644 --- a/graphics/pngwriter/files/patch-pngwriter.cc +++ b/graphics/pngwriter/files/patch-pngwriter.cc @@ -1,5 +1,31 @@ --- src/pngwriter.cc.orig 2009-02-10 22:45:16.000000000 +0100 -+++ src/pngwriter.cc 2010-03-29 15:55:32.000000000 +0200 ++++ src/pngwriter.cc 2012-05-07 20:50:38.000000000 +0200 +@@ -988,19 +988,19 @@ + time(&gmt); + png_convert_from_time_t(&mod_time, gmt); + png_set_tIME(png_ptr, info_ptr, &mod_time); +- text_ptr[0].key = "Title"; ++ text_ptr[0].key = (char*)"Title"; + text_ptr[0].text = texttitle_; + text_ptr[0].compression = PNG_TEXT_COMPRESSION_NONE; +- text_ptr[1].key = "Author"; ++ text_ptr[1].key = (char*)"Author"; + text_ptr[1].text = textauthor_; + text_ptr[1].compression = PNG_TEXT_COMPRESSION_NONE; +- text_ptr[2].key = "Description"; ++ text_ptr[2].key = (char*)"Description"; + text_ptr[2].text = textdescription_; + text_ptr[2].compression = PNG_TEXT_COMPRESSION_NONE; +- text_ptr[3].key = "Creation Time"; +- text_ptr[3].text = png_convert_to_rfc1123(png_ptr, &mod_time); ++ text_ptr[3].key = (char*)"Creation Time"; ++ text_ptr[3].text = (char *)png_convert_to_rfc1123(png_ptr, &mod_time); + text_ptr[3].compression = PNG_TEXT_COMPRESSION_NONE; +- text_ptr[4].key = "Software"; ++ text_ptr[4].key = (char*)"Software"; + text_ptr[4].text = textsoftware_; + text_ptr[4].compression = PNG_TEXT_COMPRESSION_NONE; + png_set_text(png_ptr, info_ptr, text_ptr, 5); @@ -1204,8 +1204,8 @@ FILE *fp; png_structp png_ptr; @@ -20,3 +46,12 @@ transformation_ = 1; } +@@ -1530,7 +1530,7 @@ + fclose(fp); + return 0; + } +- if (setjmp((*png_ptr)->jmpbuf)) /*(setjmp(png_jmpbuf(*png_ptr)) )*////////////////////////////////////// ++ if (setjmp( png_jmpbuf((*png_ptr)))) + { + png_destroy_read_struct(png_ptr, info_ptr, (png_infopp)NULL); + std::cerr << " PNGwriter::read_png_info - ERROR **: This file may be a corrupted PNG file. (setjmp(*png_ptr)->jmpbf) failed)." << std::endl; |