--- a/open-src/lib/freetype/6997986.patch Fri Dec 03 15:09:51 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- freetype-2.4.2/src/truetype/ttinterp.c Thu Aug 5 15:36:55 2010
-+++ freetype-2.4.2/src/truetype/ttinterp.c Thu Nov 4 14:30:34 2010
-@@ -5795,7 +5795,16 @@
- if ( CUR.GS.gep2 == 0 && CUR.zp2.n_points > 0 )
- last_point = (FT_UShort)( CUR.zp2.n_points - 1 );
- else if ( CUR.GS.gep2 == 1 && CUR.zp2.n_contours > 0 )
-+ {
- last_point = (FT_UShort)( CUR.zp2.contours[CUR.zp2.n_contours - 1] );
-+
-+ if ( BOUNDS( last_point, CUR.zp2.n_points ) )
-+ {
-+ if ( CUR.pedantic_hinting )
-+ CUR.error = TT_Err_Invalid_Reference;
-+ return;
-+ }
-+ }
- else
- last_point = 0;
-
--- a/open-src/lib/freetype/COPYING Fri Dec 03 15:09:51 2010 -0800
+++ b/open-src/lib/freetype/COPYING Tue Dec 07 15:41:55 2010 -0800
@@ -4,7 +4,11 @@
Redistribution of this software is made under the terms of The
Freetype Project License, as reproduced below.
-The FreeType PCF driver is Copyright (C) 2000 by Francesco Zappa Nardelli
+The FreeType BDF & PCF drivers are covered by the following notices:
+
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ 2009, 2010, by Francesco Zappa Nardelli
+Copyright 2000 Computing Research Labs, New Mexico State University
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -25,6 +29,29 @@
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright 1990, 1994, 1998 The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+
--------------------------------
The FreeType Project LICENSE
--- a/open-src/lib/freetype/Makefile Fri Dec 03 15:09:51 2010 -0800
+++ b/open-src/lib/freetype/Makefile Tue Dec 07 15:41:55 2010 -0800
@@ -63,11 +63,11 @@
LIBNAME=freetype
# Version number (used in path names)
-MODULE_VERSION=2.4.2
+MODULE_VERSION=2.4.4
# Checksums for upstream tarball
-TARBALL_MD5 = 647ee8ed266f9a4117c8d0a4855b3d3e
-TARBALL_SHA1 = cc257ceda2950b8c80950d780ccf3ce665a815d1
+TARBALL_MD5 = b3e2b6e2f1c3e0dffa1fd2a0f848b671
+TARBALL_SHA1 = 1d136cbc51c67b212c91ba04dc5db797f35e64e6
# Download site for source
SOURCE_URL=http://download.savannah.gnu.org/releases/freetype/$(SOURCE_TARBALL_NAME)
@@ -77,8 +77,7 @@
SOURCE_PATCHES= \
freetype-config.patch,-p1 \
freetype-GS-conflict.patch,-p1 \
- unix-cc.in.9.patch,-p1 \
- 6997986.patch,-p1
+ unix-cc.in.9.patch,-p1
# Where to install freetype files
MODULE_PREFIX=/usr
@@ -95,10 +94,6 @@
# pkg-config files that need to have -R added
FIX_PC_FILES=builds/unix/freetype2.in
-# License file
-LICENSE_FILE=docs/FTL.TXT
-LICENSE_FILE_SET=yes
-
# Need to use GNU Make to build
MODULE_MAKE=$(GNUMAKE)
MODULE_MAKE_SET=yes