- Update to 2.3.5.

- Drop freetype-2.3.4-ttf-overflow.patch
This commit is contained in:
Behdad Esfahbod 2007-07-25 18:43:19 +00:00
parent 5095c76c67
commit d148773125
4 changed files with 12 additions and 43 deletions

View File

@ -1,3 +1,3 @@
freetype-2.3.4.tar.bz2
freetype-doc-2.3.4.tar.bz2
ft2demos-2.3.4.tar.bz2
freetype-2.3.5.tar.bz2
freetype-doc-2.3.5.tar.bz2
ft2demos-2.3.5.tar.bz2

View File

@ -1,32 +0,0 @@
--- freetype-2.3.4/src/truetype/ttgload.c~ 2007/04/09 08:40:11 1.177
+++ freetype-2.3.4/src/truetype/ttgload.c 2007/04/27 17:16:50 1.178
@@ -271,7 +271,11 @@
n_points = 0;
if ( n_contours > 0 )
+ {
n_points = cont[-1] + 1;
+ if ( n_points < 0 )
+ goto Invalid_Outline;
+ }
/* note that we will add four phantom points later */
error = FT_GLYPHLOADER_CHECK_POINTS( gloader, n_points + 4, 0 );
@@ -682,7 +686,7 @@
FT_GlyphLoader gloader = loader->gloader;
FT_Error error = TT_Err_Ok;
FT_Outline* outline;
- FT_UInt n_points;
+ FT_Int n_points;
outline = &gloader->current.outline;
@@ -709,7 +713,7 @@
/* Deltas apply to the unscaled data. */
FT_Vector* deltas;
FT_Memory memory = loader->face->memory;
- FT_UInt i;
+ FT_Int i;
error = TT_Vary_Get_Glyph_Deltas( (TT_Face)(loader->face),

View File

@ -7,8 +7,8 @@
Summary: A free and portable font rendering engine
Name: freetype
Version: 2.3.4
Release: 4%{?dist}
Version: 2.3.5
Release: 1%{?dist}
License: BSD/GPL dual license
Group: System Environment/Libraries
URL: http://www.freetype.org
@ -31,7 +31,6 @@ Patch88: freetype-multilib.patch
Patch89: freetype-2.2.1-memcpy-fix.patch
# Upstream patches
Patch100: freetype-2.3.4-ttf-overflow.patch
Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@ -93,8 +92,6 @@ popd
%patch88 -p1 -b .multilib
%patch89 -p1 -b .memcpy
%patch100 -p1 -b .ttf-overflow
%build
%configure --disable-static
@ -210,6 +207,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/
%changelog
* Wed Jul 25 2007 Behdad Esfahbod <besfahbo@redhat.com> 2.3.5-1
- Update to 2.3.5.
- Drop freetype-2.3.4-ttf-overflow.patch
* Fri Jun 29 2007 Adam Jackson <ajax@redhat.com> 2.3.4-4
- Fix builds/unix/libtool to not emit rpath into binaries. (#225770)

View File

@ -1,3 +1,3 @@
1a6c59a7723d637c78672e7784da865d freetype-2.3.4.tar.bz2
40cb37ba6c003845208c1b89cf507249 freetype-doc-2.3.4.tar.bz2
51684210fc73d59ba107ad6302b21118 ft2demos-2.3.4.tar.bz2
65234327c5ac46ee00ebda15995d4c1c freetype-2.3.5.tar.bz2
8f443368764f7cd776749e0143f423dd freetype-doc-2.3.5.tar.bz2
708bf1bc13a0a1d1bb801466d6d97c40 ft2demos-2.3.5.tar.bz2