Date: Wed, 15 Mar 2000 18:29:48 +0100 (CET) From: dirk.meyer@dinoex.sub.org To: FreeBSD-gnats-submit@freebsd.org Subject: ports/17396: graphics/gd fix for 1.8 Message-ID: <200003151729.SAA04184@home.dinoex.sub.org>
next in thread | raw e-mail | index | archive | help
>Number: 17396 >Category: ports >Synopsis: graphics/gd fix for 1.8 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Mar 15 10:00:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Dirk Meyer >Release: FreeBSD 3.4-STABLE i386 >Organization: privat >Environment: programs using gd lib, ports/www/wealizer ports/german/wealizer >Description: gd lib distfiles has changed, ist is identical with the a new version: 178809 Mar 13 19:30 /src/distfiles/gd-1.8.tar.gz 178809 Mar 13 19:30 /src/distfiles/gd-1.8.1.tar.gz >How-To-Repeat: try to build gd, checksum fails, ignoring it and fixing a new workdir give failing patches >Fix: apply this fix diff gd/Makefile gd-1.8.1/Makefile --- gd/Makefile Sun Mar 12 08:22:48 2000 +++ gd-1.8.1/Makefile Wed Mar 15 18:01:29 2000 @@ -6,7 +6,7 @@ # $FreeBSD: ports/graphics/gd/Makefile,v 1.19 2000/03/11 02:30:41 billf Exp $ # -DISTNAME= gd-1.8 +DISTNAME= gd-1.8.1 CATEGORIES= graphics MASTER_SITES= http://www.boutell.com/gd/http/ \ ftp://ftp.boutell.com/pub/boutell/gd/ diff gd/files/md5 gd-1.8.1/files/md5 --- gd/files/md5 Sun Mar 12 08:22:48 2000 +++ gd-1.8.1/files/md5 Wed Mar 15 18:02:02 2000 @@ -1 +1 @@ -MD5 (gd-1.8.tar.gz) = 81eba35290c2d38beb3aa93ce845e9fb +MD5 (gd-1.8.1.tar.gz) = 7d3890e728ee5bbde165ef75448d5a3f diff gd/patches/patch-ac gd-1.8.1/patches/patch-ac --- gd/patches/patch-ac Sun Mar 12 08:22:48 2000 +++ gd-1.8.1/patches/patch-ac Wed Mar 15 18:20:17 2000 @@ -1,6 +1,6 @@ ---- Makefile.orig Wed Mar 8 14:54:37 2000 -+++ Makefile Fri Mar 10 21:09:49 2000 -@@ -3,35 +3,45 @@ +--- Makefile.orig Mon Mar 13 19:25:57 2000 ++++ Makefile Wed Mar 15 18:14:12 2000 +@@ -3,35 +3,47 @@ #If you do not have gcc, change the setting for COMPILER, but you must #use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc #compiler; get gcc if you are still using it). @@ -19,28 +19,30 @@ #If you don't have FreeType, libjpeg and/or Xpm installed, including the #header files, uncomment this (default). - #CFLAGS=-O +-CFLAGS=-O ++#CFLAGS=-O #If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a #variation of this and comment out the line above. See also LIBS below. --CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF -- + #CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF +.if defined(WANT_X11) +CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF +.else +CFLAGS+=-DHAVE_JPEG +.endif -+ + #If you don't have FreeType and/or Xpm fully installed, uncomment this #(default). --#LIBS=-lm -lgd -lpng -lz +-LIBS=-lm -lgd -lpng -lz +LIBS=-lm -lgd -lpng -lz -ljpeg #If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a #variation of this and comment out the line above. Note that #Xpm requires X11. See also CFLAGS above. +-#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 +.if defined(WANT_X11) - LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 ++LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 +.endif ++ #Typical install locations for freetype, zlib, xpm, libjpeg and libpng header files. #If yours are somewhere else, change this. @@ -53,7 +55,7 @@ #Typical install locations for freetype, zlib, xpm and libpng libraries. #If yours are somewhere else, other than a standard location -@@ -39,16 +49,19 @@ +@@ -39,16 +51,19 @@ #-L. as this allows the gd library itself to be found. #Put -L. first so that old versions of the gd library elsewhere #on your system can't cause conflicts while building a new one. @@ -77,7 +79,7 @@ # # -@@ -58,34 +71,41 @@ +@@ -58,34 +73,41 @@ VERSION=1.7 @@ -139,7 +141,7 @@ gddemo: gddemo.o libgd.a $(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS) -@@ -120,16 +140,19 @@ +@@ -120,16 +142,19 @@ gdtestttf: gdtestttf.o libgd.a $(CC) gdtestttf.o -o gdtestttf $(LIBDIRS) $(LIBS) diff gd/patches/patch-ad gd-1.8.1/patches/patch-ad --- gd/patches/patch-ad Sat Mar 11 03:30:44 2000 +++ gd-1.8.1/patches/patch-ad Thu Jan 1 01:00:00 1970 @@ -1,18 +0,0 @@ ---- gd_jpeg.c.orig Fri Mar 10 21:15:15 2000 -+++ gd_jpeg.c Fri Mar 10 21:19:40 2000 -@@ -20,12 +20,14 @@ - #include <setjmp.h> - #include <limits.h> - #include <string.h> --#include "jinclude.h" -+/* #include "jinclude.h" */ - #include "jpeglib.h" - #include "jerror.h" - #include "gd.h" - - static const char * const GD_JPEG_VERSION = "1.0"; -+ -+#define SIZEOF(object) ((size_t) sizeof(object)) - - typedef struct _jmpbuf_wrapper { - jmp_buf jmpbuf; >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200003151729.SAA04184>