Date: Wed, 14 May 2003 17:07:12 +0200 (CEST) From: Mathieu Arnold <m@absolight.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: m@absolight.net Subject: ports/52235: (update) graphics/gd2 to 2.0.12 Message-ID: <20030514150712.BC14E869F@aragorn.reaumur.absolight.net> Resent-Message-ID: <200305141510.h4EFAIb7030767@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 52235 >Category: ports >Synopsis: (update) graphics/gd2 to 2.0.12 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed May 14 08:10:17 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Mathieu Arnold >Release: FreeBSD 4.8-RELEASE i386 >Organization: Absolight >Environment: System: FreeBSD aragorn.reaumur.absolight.net 4.8-RELEASE FreeBSD 4.8-RELEASE #0: Thu Apr 10 13:45:07 CEST 2003 root@aragorn.reaumur.absolight.net:/usr/obj/usr/src/sys/ARAGORN i386 >Description: Update to 2.0.12 >How-To-Repeat: >Fix: --- gd-2.0.12.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/gd2/Makefile,v retrieving revision 1.60 diff -u -b -w -r1.60 Makefile --- Makefile 2003/03/25 02:22:37 1.60 +++ Makefile 2003/05/14 15:05:37 @@ -6,7 +6,7 @@ # PORTNAME= gd -PORTVERSION= 2.0.11 +PORTVERSION= 2.0.12 CATEGORIES+= graphics MASTER_SITES= http://www.boutell.com/gd/http/ \ ftp://ftp.boutell.com/pub/boutell/gd/ \ @@ -57,7 +57,7 @@ post-patch: .if !defined(WITH_LZW) - ${MV} ${WRKSRC}/gd_gif_out.c ${WRKSRC}/gd_gif_out.c.nogif && \ + @${MV} ${WRKSRC}/gd_gif_out.c ${WRKSRC}/gd_gif_out.c.nogif && \ ${SED} -e "s|#define LZW_LICENCED||g" \ < ${WRKSRC}/gd_gif_out.c.nogif \ > ${WRKSRC}/gd_gif_out.c Index: distinfo =================================================================== RCS file: /home/ncvs/ports/graphics/gd2/distinfo,v retrieving revision 1.18 diff -u -b -w -r1.18 distinfo --- distinfo 2003/03/25 02:22:37 1.18 +++ distinfo 2003/05/14 15:05:37 @@ -1 +1 @@ -MD5 (gd-2.0.11.tar.gz) = e2b6a14e7ac9781789e5d9f189af8475 +MD5 (gd-2.0.12.tar.gz) = de82080fbac781cfcd512c3c299066d7 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/graphics/gd2/pkg-plist,v retrieving revision 1.14 diff -u -b -w -r1.14 pkg-plist --- pkg-plist 2003/03/25 02:22:37 1.14 +++ pkg-plist 2003/05/14 15:05:37 @@ -21,5 +21,5 @@ lib/libgd.a lib/libgd.so lib/libgd.so.4 -%%PORTDOCS%%share/doc/gd/index.html -%%PORTDOCS%%@dirrm share/doc/gd +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%@dirrm %%DOCSDIR%% Index: files/Makefile.bsd =================================================================== RCS file: /home/ncvs/ports/graphics/gd2/files/Makefile.bsd,v retrieving revision 1.8 diff -u -b -w -r1.8 Makefile.bsd --- files/Makefile.bsd 2003/03/25 02:22:37 1.8 +++ files/Makefile.bsd 2003/05/14 15:05:38 @@ -6,7 +6,7 @@ gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c \ gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c \ gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h \ - gdkanji.c gdtables.c gdxpm.c jisx0208.h mathmake.c \ + gdkanji.c gdtables.c gdxpm.c jisx0208.h \ wbmp.c wbmp.h SRCS+= gd_gif_in.c gd_gif_out.c gd_biggif_out.c gd_lzw_out.c MAKEDIR=/usr/share/mk Index: files/patch-gd.c =================================================================== RCS file: /home/ncvs/ports/graphics/gd2/files/patch-gd.c,v retrieving revision 1.2 diff -u -b -w -r1.2 patch-gd.c --- files/patch-gd.c 2003/03/25 02:22:37 1.2 +++ files/patch-gd.c 2003/05/14 15:05:38 @@ -1,12 +1,9 @@ ---- gd.c Thu Apr 25 14:15:15 2002 -+++ gd.c Thu Apr 25 12:43:55 2002 -@@ -2211,7 +2230,17 @@ - } - +--- gd.c.orig Sat Mar 29 17:25:42 2003 ++++ gd.c Wed May 14 16:46:34 2003 +@@ -2696,6 +2696,16 @@ void --gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c) -+gdImagePolygon(gdImagePtr im, gdPointPtr p, int n, int c) -+{ + gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c) + { + if (!n) { + return; + } @@ -16,25 +13,15 @@ + +void +gdImageOpenPolygon (gdImagePtr im, gdPointPtr p, int n, int c) - { ++{ int i; int lx, ly; -@@ -2221,7 +2250,6 @@ - } + if (!n) +@@ -2710,7 +2720,6 @@ + lx = p->x; ly = p->y; - gdImageLine (im, lx, ly, p[n - 1].x, p[n - 1].y, c); for (i = 1; (i < n); i++) { p++; -@@ -2461,8 +2489,8 @@ - { - for (x = 0; (x < sx); x++) - { -- p1 = im1->pixels[y][x]; -- p2 = im2->pixels[y][x]; -+ p1 = im1->trueColor ? gdImageTrueColorPixel(im1, x, y) : gdImagePalettePixel(im1, x, y); -+ p2 = im2->trueColor ? gdImageTrueColorPixel(im2, x, y) : gdImagePalettePixel(im2, x, y); - if (gdImageRed (im1, p1) != gdImageRed (im2, p2)) - { - cmpStatus |= GD_CMP_COLOR + GD_CMP_IMAGE; --- gd-2.0.12.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030514150712.BC14E869F>