From anholt@anholt.dyndns.org  Thu Apr 10 12:11:37 2003
Return-Path: <anholt@anholt.dyndns.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E4A4D37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 10 Apr 2003 12:11:36 -0700 (PDT)
Received: from anholt.dyndns.org (copeland-30-191.lclark.edu [149.175.30.191])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4F3A443F3F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 10 Apr 2003 12:10:48 -0700 (PDT)
	(envelope-from anholt@anholt.dyndns.org)
Received: from anholt.dyndns.org (localhost [127.0.0.1])
	by anholt.dyndns.org (8.12.9/8.12.7) with ESMTP id h3AJFxde016730
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 10 Apr 2003 12:15:59 -0700 (PDT)
	(envelope-from anholt@anholt.dyndns.org)
Received: (from anholt@localhost)
	by anholt.dyndns.org (8.12.9/8.12.7/Submit) id h3AJFwho016729;
	Thu, 10 Apr 2003 12:15:58 -0700 (PDT)
Message-Id: <200304101915.h3AJFwho016729@anholt.dyndns.org>
Date: Thu, 10 Apr 2003 12:15:58 -0700 (PDT)
From: Eric Anholt <anholt@freebsd.org>
Reply-To: Eric Anholt <anholt@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update freetype to 2.1.4, fixing fc-cache
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         50791
>Category:       ports
>Synopsis:       Update freetype to 2.1.4, fixing fc-cache
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    sobomax
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 10 12:20:02 PDT 2003
>Closed-Date:    Thu Apr 10 13:10:57 PDT 2003
>Last-Modified:  Sun Mar 17 02:33:42 UTC 2013
>Originator:     Eric Anholt <anholt@FreeBSD.org>
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD anholt.dyndns.org 5.0-CURRENT FreeBSD 5.0-CURRENT #10: Mon Apr 7 16:56:12 PDT 2003 anholt@anholt.dyndns.org:/usr/obj/usr/src/current/sys/MYKERNEL i386


	
>Description:
	Update freetype to 2.1.4, fixing a memory leak which caused fc-cache -f -v
	to take about 180M with a default installation of XFree86 fonts + webfonts.
	
>How-To-Repeat:
	
>Fix:

--- freetype-2.1.4.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/print/freetype2/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- Makefile	7 Mar 2003 06:09:03 -0000	1.44
+++ Makefile	10 Apr 2003 18:57:44 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	freetype2
-PORTVERSION=	2.1.3
-PORTREVISION=	1
+PORTVERSION=	2.1.4
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/print/freetype2/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo	17 Jan 2003 19:44:11 -0000	1.21
+++ distinfo	10 Apr 2003 18:58:37 -0000
@@ -1 +1 @@
-MD5 (freetype-2.1.3.tar.bz2) = 09775a4111e066f782866d8a57d8481b
+MD5 (freetype-2.1.4.tar.bz2) = 1fc0b188f1fe1216776e5855d2da141f
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/print/freetype2/pkg-plist,v
retrieving revision 1.25
diff -u -r1.25 pkg-plist
--- pkg-plist	17 Jan 2003 19:44:11 -0000	1.25
+++ pkg-plist	10 Apr 2003 19:12:23 -0000
@@ -39,6 +39,7 @@
 include/freetype2/freetype/ftsystem.h
 include/freetype2/freetype/fttrigon.h
 include/freetype2/freetype/fttypes.h
+include/freetype2/freetype/ftwinfnt.h
 include/freetype2/freetype/ftxf86.h
 include/freetype2/freetype/internal/autohint.h
 include/freetype2/freetype/internal/bdftypes.h
Index: files/patch-src_gzip_ftgzip.c
===================================================================
RCS file: files/patch-src_gzip_ftgzip.c
diff -N files/patch-src_gzip_ftgzip.c
--- files/patch-src_gzip_ftgzip.c	18 Jan 2003 22:27:21 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
---- src/gzip/ftgzip.c.orig	Sat Jan 18 13:04:29 2003
-+++ src/gzip/ftgzip.c	Sat Jan 18 13:04:40 2003
-@@ -177,7 +177,7 @@
-     (void)FT_STREAM_SKIP( 6 );
- 
-     /* skip the extra field */
--    if ( head[3] && FT_GZIP_EXTRA_FIELD )
-+    if ( head[3] & FT_GZIP_EXTRA_FIELD )
-     {
-       FT_UInt  len;
- 
-@@ -187,7 +187,7 @@
-     }
- 
-     /* skip original file name */
--    if ( head[3] && FT_GZIP_ORIG_NAME )
-+    if ( head[3] & FT_GZIP_ORIG_NAME )
-       for (;;)
-       {
-         FT_UInt  c;
--- freetype-2.1.4.diff ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sobomax 
Responsible-Changed-By: marcus 
Responsible-Changed-When: Thu Apr 10 12:41:01 PDT 2003 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=50791 

From: Joe Marcus Clarke <marcus@marcuscom.com>
To: freebsd-gnats-submit@freebsd.org, anholt@freebsd.org
Cc:  
Subject: Re: ports/50791: Update freetype to 2.1.4, fixing fc-cache
Date: 10 Apr 2003 15:40:54 -0400

 --=-5EtfYGZxU2UU1vQRVSUe
 Content-Type: text/plain
 Content-Transfer-Encoding: quoted-printable
 
 You beat me to it by two seconds.  Here is my diff which removes another
 unused patch.  With this diff, you need to cvs rm:
 
 files/patch-src_gzip_ftgzip.c
 files/patch-src_gzip_infcodes.c
 
 Joe
 
 diff -ruN freetype2.orig/Makefile freetype2/Makefile
 --- freetype2.orig/Makefile	Thu Apr 10 15:35:03 2003
 +++ freetype2/Makefile	Thu Apr 10 15:24:19 2003
 @@ -2,12 +2,11 @@
  # Date created:		January 24, 1998
  # Whom:			jseger@FreeBSD.org
  #
 -# $FreeBSD: ports/print/freetype2/Makefile,v 1.44 2003/03/07 06:09:03
 ade Exp $
 +# $FreeBSD$
  #
 =20
  PORTNAME=3D	freetype2
 -PORTVERSION=3D	2.1.3
 -PORTREVISION=3D	1
 +PORTVERSION=3D	2.1.4
  CATEGORIES=3D	print
  MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
  		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
 @@ -28,7 +27,7 @@
  USE_LIBTOOL=3D	yes
  LIBTOOLFILES=3D	builds/unix/configure
  CONFIGURE_ARGS=3D	--disable-nls
 -CONFIGURE_TARGET=3D	--target=3D${MACHINE_ARCH}-unknown-freebsd${OSREL}
 +CONFIGURE_TARGET=3D	--build=3D${MACHINE_ARCH}-unknown-freebsd${OSREL}
  CONFIGURE_WRKSRC=3D	${WRKSRC}/builds/unix
 =20
  post-configure:
 diff -ruN freetype2.orig/distinfo freetype2/distinfo
 --- freetype2.orig/distinfo	Thu Apr 10 15:35:03 2003
 +++ freetype2/distinfo	Thu Apr 10 15:24:42 2003
 @@ -1 +1 @@
 -MD5 (freetype-2.1.3.tar.bz2) =3D 09775a4111e066f782866d8a57d8481b
 +MD5 (freetype-2.1.4.tar.bz2) =3D 1fc0b188f1fe1216776e5855d2da141f
 diff -ruN freetype2.orig/files/patch-src_gzip_ftgzip.c
 freetype2/files/patch-src_gzip_ftgzip.c
 --- freetype2.orig/files/patch-src_gzip_ftgzip.c	Thu Apr 10 15:35:03
 2003
 +++ freetype2/files/patch-src_gzip_ftgzip.c	Wed Dec 31 19:00:00 1969
 @@ -1,20 +0,0 @@
 ---- src/gzip/ftgzip.c.orig	Sat Jan 18 13:04:29 2003
 -+++ src/gzip/ftgzip.c	Sat Jan 18 13:04:40 2003
 -@@ -177,7 +177,7 @@
 -     (void)FT_STREAM_SKIP( 6 );
 -=20
 -     /* skip the extra field */
 --    if ( head[3] && FT_GZIP_EXTRA_FIELD )
 -+    if ( head[3] & FT_GZIP_EXTRA_FIELD )
 -     {
 -       FT_UInt  len;
 -=20
 -@@ -187,7 +187,7 @@
 -     }
 -=20
 -     /* skip original file name */
 --    if ( head[3] && FT_GZIP_ORIG_NAME )
 -+    if ( head[3] & FT_GZIP_ORIG_NAME )
 -       for (;;)
 -       {
 -         FT_UInt  c;
 diff -ruN freetype2.orig/files/patch-src_gzip_infcodes.c
 freetype2/files/patch-src_gzip_infcodes.c
 --- freetype2.orig/files/patch-src_gzip_infcodes.c	Thu Apr 10 15:35:03
 2003
 +++ freetype2/files/patch-src_gzip_infcodes.c	Wed Dec 31 19:00:00 1969
 @@ -1,13 +0,0 @@
 ---- src/gzip/infcodes.c.orig	Sat Jan 18 15:44:46 2003
 -+++ src/gzip/infcodes.c	Sat Jan 18 15:46:10 2003
 -@@ -196,8 +196,8 @@
 -       c->mode =3D COPY;
 -     case COPY:          /* o: copying bytes in window, waiting for
 space */
 -       f =3D q - c->sub.copy.dist;
 --      while (f < s->window)             /* modulo window size-"while"
 instead */
 --        f +=3D s->end - s->window;        /* of "if" handles invalid
 distances */
 -+      if ((uInt)(q - s->window) < c->sub.copy.dist)
 -+	  f =3D s->end - (c->sub.copy.dist - (uInt)(q - s->window));
 -       while (c->len)
 -       {
 -         NEEDOUT
 diff -ruN freetype2.orig/pkg-plist freetype2/pkg-plist
 --- freetype2.orig/pkg-plist	Thu Apr 10 15:35:03 2003
 +++ freetype2/pkg-plist	Sat Feb 22 19:04:35 2003
 @@ -39,6 +39,7 @@
  include/freetype2/freetype/ftsystem.h
  include/freetype2/freetype/fttrigon.h
  include/freetype2/freetype/fttypes.h
 +include/freetype2/freetype/ftwinfnt.h
  include/freetype2/freetype/ftxf86.h
  include/freetype2/freetype/internal/autohint.h
  include/freetype2/freetype/internal/bdftypes.h
 
 
 --=20
 PGP Key : http://www.marcuscom.com/pgp.asc
 
 
 
 --=-5EtfYGZxU2UU1vQRVSUe
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Description: This is a digitally signed message part
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.1 (FreeBSD)
 
 iD8DBQA+lcjFb2iPiv4Uz4cRAvjxAJ9s8itPNavl1QgYrviEvrIsk39s5gCfWhjb
 EAkJV83vRYc59lPcR5mxKhw=
 =GAgQ
 -----END PGP SIGNATURE-----
 
 --=-5EtfYGZxU2UU1vQRVSUe--
 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Thu Apr 10 13:10:39 PDT 2003 
State-Changed-Why:  
Committed per Maxim's approval.  Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=50791 
>Unformatted:
