Index: branches/2018Q3/graphics/gd/Makefile =================================================================== --- branches/2018Q3/graphics/gd/Makefile (revision 475430) +++ branches/2018Q3/graphics/gd/Makefile (revision 475431) @@ -1,95 +1,95 @@ # Created by: jeff@cetlink.net # $FreeBSD$ PORTNAME= libgd -PORTVERSION= 2.2.4 -PORTREVISION= 1 +PORTVERSION= 2.2.5 PORTEPOCH= 1 CATEGORIES+= graphics MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/gd-${PORTVERSION}/ MAINTAINER?= dinoex@FreeBSD.org COMMENT?= Graphics library for fast creation of images LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libtiff.so:graphics/tiff \ libpng.so:graphics/png \ libfreetype.so:print/freetype2 CONFLICTS= bazaar-1.* USES= tar:xz pkgconfig pathfix libtool:keepla shebangfix jpeg SHEBANG_FILES= ${WRKSRC}/src/bdftogd GNU_CONFIGURE= yes USE_LDCONFIG= yes +TEST_TARGET= check OPTIONS_DEFINE= FONTCONFIG ICONV XPM WEBP OPTIONS_DEFAULT=FONTCONFIG WEBP NO_OPTIONS_SORT=yes FONTCONFIG_LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig FONTCONFIG_CONFIGURE_OFF= --with-fontconfig=no ICONV_USES= iconv ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} XPM_USE= xorg=xpm,x11 XPM_CONFIGURE_ON= --with-x XPM_CONFIGURE_OFF= --with-xpm=no WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_CONFIGURE_OFF= --without-webp .include # force gdlib-config --ldflags LDFLAGS+= -L${LOCALBASE}/lib # The GD_FONTS environment variable can be set to specify the gzipped # tar-ball containing the fonts in bdf format and the bdf file names. # The tarball is the first argument, the tiny, small, medium-bold, # large, and giant fonts follow. # # For example: # GD_FONTS="/usr/ports/distfiles/x-koi8u.tgz koi6x10.bdf koi8x13.bdf \ # koi9x15.bdf koi12x24.bdf koi10x20.bdf" # .if defined(GD_FONTS) USES+= perl5 USE_PERL5= build WRKFONTS= ${WRKSRC}/src .endif pre-extract:: @${ECHO_MSG} "" @${ECHO_MSG} "GD_FONTS can be set to specify an alternative list of .bdf files" @${ECHO_MSG} "" post-extract: .if defined(GD_FONTS) cd ${WRKFONTS} && ${SH} ${FILESDIR}/makefonts extract ${GD_FONTS} .endif pre-configure: .if defined(GD_FONTS) cd ${WRKFONTS} && ${SH} ${FILESDIR}/makefonts configure ${GD_FONTS} .endif # bump shlib version ${REINPLACE_CMD} \ -e 's|^GDLIB_LT_CURRENT=3|GDLIB_LT_CURRENT=6|' \ ${WRKSRC}/configure pre-configure-ICONV-off: ${REINPLACE_CMD} \ -e 's|iconv|noiconv|' \ ${WRKSRC}/configure .if defined(GD_FONTS) pre-build: cd ${WRKFONTS} && ${SH} ${FILESDIR}/makefonts build ${GD_FONTS} .endif post-install: ${INSTALL_DATA} ${WRKSRC}/src/gdhelpers.h \ ${STAGEDIR}${PREFIX}/include/ - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.6.0.4 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.6* .include Index: branches/2018Q3/graphics/gd/distinfo =================================================================== --- branches/2018Q3/graphics/gd/distinfo (revision 475430) +++ branches/2018Q3/graphics/gd/distinfo (revision 475431) @@ -1,3 +1,3 @@ -TIMESTAMP = 1485463341 -SHA256 (libgd-2.2.4.tar.xz) = 137f13a7eb93ce72e32ccd7cebdab6874f8cf7ddf31d3a455a68e016ecd9e4e6 -SIZE (libgd-2.2.4.tar.xz) = 2478528 +TIMESTAMP = 1531337629 +SHA256 (libgd-2.2.5.tar.xz) = 8c302ccbf467faec732f0741a859eef4ecae22fea2d2ab87467be940842bde51 +SIZE (libgd-2.2.5.tar.xz) = 2594092 Index: branches/2018Q3/graphics/gd/files/patch-gd_gif_in.c =================================================================== --- branches/2018Q3/graphics/gd/files/patch-gd_gif_in.c (nonexistent) +++ branches/2018Q3/graphics/gd/files/patch-gd_gif_in.c (revision 475431) @@ -0,0 +1,34 @@ +See: + + https://bugs.php.net/bug.php?id=75571 + +--- src/gd_gif_in.c 2017-08-30 07:05:54.000000000 -0400 ++++ src/gd_gif_in.c 2018-07-11 15:39:11.746181000 -0400 +@@ -336,9 +336,4 @@ + } + +- if(!im->colorsTotal) { +- gdImageDestroy(im); +- return 0; +- } +- + /* Check for open colors at the end, so + * we can reduce colorsTotal and ultimately +@@ -352,4 +347,9 @@ + } + ++ if(!im->colorsTotal) { ++ gdImageDestroy(im); ++ return 0; ++ } ++ + return im; + } +@@ -447,6 +447,5 @@ + GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_size, int flag, int *ZeroDataBlockP) + { +- int i, j, ret; +- unsigned char count; ++ int i, j, ret, count; + + if(flag) { Property changes on: branches/2018Q3/graphics/gd/files/patch-gd_gif_in.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q3/graphics/gd/pkg-plist =================================================================== --- branches/2018Q3/graphics/gd/pkg-plist (revision 475430) +++ branches/2018Q3/graphics/gd/pkg-plist (revision 475431) @@ -1,33 +1,33 @@ bin/annotate bin/bdftogd bin/gd2copypal bin/gd2togif bin/gd2topng bin/gdcmpgif bin/gdlib-config bin/gdparttopng bin/gdtopng bin/giftogd2 bin/pngtogd bin/pngtogd2 bin/webpng include/entities.h include/gd.h include/gd_color_map.h include/gd_errors.h include/gd_io.h include/gdcache.h include/gdfontg.h include/gdfontl.h include/gdfontmb.h include/gdfonts.h include/gdfontt.h include/gdfx.h include/gdhelpers.h include/gdpp.h lib/libgd.a lib/libgd.la lib/libgd.so lib/libgd.so.6 -lib/libgd.so.6.0.4 +lib/libgd.so.6.0.5 libdata/pkgconfig/gdlib.pc Index: branches/2018Q3 =================================================================== --- branches/2018Q3 (revision 475430) +++ branches/2018Q3 (revision 475431) Property changes on: branches/2018Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r475415