- New upstream version 2.3.11.

- Match patches from Fedora native version.
- Recheck package with rpmlint.
This commit is contained in:
Richard W.M. Jones 2010-01-12 16:00:45 +00:00
parent eb3528d1da
commit caaab4fccb
5 changed files with 33 additions and 24 deletions

View File

@ -1,2 +1,2 @@
freetype-2.3.8.tar.bz2
freetype-doc-2.3.8.tar.bz2
freetype-2.3.11.tar.bz2
freetype-doc-2.3.11.tar.gz

View File

@ -1,14 +0,0 @@
--- freetype-2.2.1/src/psaux/psobjs.c~ 2006-04-26 16:38:17.000000000 +0200
+++ freetype-2.2.1/src/psaux/psobjs.c 2006-09-10 15:01:13.000000000 +0200
@@ -165,6 +165,11 @@
return PSaux_Err_Invalid_Argument;
}
+ if ( length < 0 ) {
+ FT_ERROR(( "ps_table_add: invalid length\n" ));
+ return PSaux_Err_Invalid_Argument;
+ }
+
/* grow the base block if needed */
if ( table->cursor + length > table->capacity )
{

View File

@ -0,0 +1,18 @@
diff -up freetype-2.3.11/ft2demos-2.3.11/Makefile.more-demos freetype-2.3.11/ft2demos-2.3.11/Makefile
--- freetype-2.3.11/ft2demos-2.3.11/Makefile.more-demos 2009-10-22 16:02:26.000000000 -0400
+++ freetype-2.3.11/ft2demos-2.3.11/Makefile 2009-10-22 16:02:32.000000000 -0400
@@ -288,10 +288,10 @@ else
# Note that ttdebug only works if the FreeType's `truetype' driver has
# been compiled with TT_CONFIG_OPTION_BYTECODE_INTERPRETER defined.
#
- # EXES += ftchkwd
- # EXES += ftmemchk
- # EXES += ftpatchk
- # EXES += fttimer
+ EXES += ftchkwd
+ EXES += ftmemchk
+ EXES += ftpatchk
+ EXES += fttimer
# EXES += testname
# EXES += ttdebug

View File

@ -16,14 +16,14 @@
%define with_xfree86 0
Name: mingw32-freetype
Version: 2.3.8
Release: 4%{?dist}
Version: 2.3.11
Release: 1%{?dist}
Summary: Free and portable font rendering engine
License: FTL or GPLv2+
URL: http://www.freetype.org
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2
Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.bz2
Source: http://mirrors.aixtools.net/sv/freetype/freetype-%{version}.tar.bz2
Source1: http://mirrors.aixtools.net/sv/freetype/freetype-doc-%{version}.tar.gz
#Source2: http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -33,8 +33,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch20: freetype-2.1.10-enable-ft2-bci.patch
Patch21: freetype-2.3.0-enable-spr.patch
Patch46: freetype-2.2.1-enable-valid.patch
#Patch47: freetype-2.3.11-more-demos.patch
Patch88: freetype-multilib.patch
Patch89: freetype-2.2.1-memcpy-fix.patch
BuildArch: noarch
@ -67,9 +67,9 @@ MinGW Windows Freetype library.
%endif
%patch46 -p1 -b .enable-valid
#%patch47 -p1 -b .more-demos
%patch88 -p1 -b .multilib
%patch89 -p1 -b .memcpy
%build
@ -108,6 +108,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Jan 12 2010 Richard W.M. Jones <rjones@redhat.com> - 2.3.11-1
- New upstream version 2.3.11.
- Match patches from Fedora native version.
- Recheck package with rpmlint.
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

View File

@ -1,2 +1,2 @@
6cf31a08826715a0d16ae366da9c7d3b freetype-2.3.8.tar.bz2
de1cc7cf098e11fba5898efdab1bc23d freetype-doc-2.3.8.tar.bz2
519c7cbf5cbd72ffa822c66844d3114c freetype-2.3.11.tar.bz2
a329c92c1d8c16464023149393851166 freetype-doc-2.3.11.tar.gz