>Number:         15152
>Category:       pkg
>Synopsis:       package php4-gd won't compile
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Jan 06 02:26:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Thomas T. Thai
>Release:        NetBSD 1.5.1
>Organization:
---
Thomas T. Thai | Minnesota.com | tom@minnesota.com 

>Environment:
	
System: NetBSD ns01 1.5.2 NetBSD 1.5.2 (ns01) #2: Fri Jan 4 19:43:48 PST 2002 root@ns01:/mnt2/usr/src/sys/arch/alpha/compile/ns01 alpha


>Description:
building of pkg php4-gd will stop at an error about previously defined gdIOCtx
>How-To-Repeat:
build the package
>Fix:
new patch-ab file with digest:

SHA1 (patch-ab) = d7fabc3b5fa6d380f5ae0a1cfab29b4c4efa146d

and the patch itself:

---cut---
--- gd.c.orig   Mon Jun 11 10:22:10 2001
+++ gd.c        Sun Jan  6 03:37:05 2002
@@ -92,7 +92,7 @@
 #define gdImageCreateFromJpegCtx NULL
 #define gdImageCreateFromPngCtx  NULL
 #define gdImageCreateFromWBMPCtx NULL
-typedef FILE gdIOCtx;
+//typedef FILE gdIOCtx;
 #define CTX_PUTC(c,fp) fputc(c, fp)
 #endif

@@ -2662,7 +2662,7 @@
        fontname = (unsigned char *) Z_STRVAL_PP(FONTNAME);

 #ifdef USE_GD_IMGSTRTTF
-# if HAVE_LIBGD20 & HAVE_LIBFREETYPE
+# if HAVE_LIBGD20 && HAVE_LIBFREETYPE
        error = gdImageStringFT(im, brect, col, fontname, ptsize, angle, x, y, str);
 # else
        error = gdImageStringTTF(im, brect, col, fontname, ptsize, angle, x, y, str);
---cut---
>Release-Note:
>Audit-Trail:
>Unformatted: