From e7dda181e640f48670824c0eadab980c9e2241ed Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Fri, 7 Oct 2005 18:34:22 +0000
Subject: [PATCH] 2.1.10

---
 .cvsignore    |  3 +++
 freetype.spec | 35 ++++++++++++++++++++++++++++-------
 sources       |  6 +++---
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 367bdcf..0a523e4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,6 @@ freetype-2.1.9.tar.bz2
 freetype-pre1.4.tar.bz2
 ft2demos-2.1.9.tar.bz2
 ftdocs-2.1.9.tar.bz2
+freetype-2.1.10.tar.bz2
+freetype-doc-2.1.10.tar.bz2
+ft2demos-2.1.10.tar.bz2
diff --git a/freetype.spec b/freetype.spec
index 4a1135a..203c708 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -10,13 +10,13 @@
 
 Summary: A free and portable TrueType font rendering engine.
 Name: freetype
-Version: 2.1.9
-Release: 4
+Version: 2.1.10
+Release: 1
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
 Source:  freetype-%{version}.tar.bz2
-Source1: ftdocs-%{version}.tar.bz2
+Source1: freetype-doc-%{version}.tar.bz2
 Source2: ft2demos-%{version}.tar.bz2
 Source3: %{ft1}.tar.bz2
 
@@ -27,7 +27,19 @@ Patch4: freetype-1.4-gcc33.patch
 Patch5: ft2demos-2.1.9-mathlib.patch
 Patch20:  freetype-2.1.3-enable-ft2-bci.patch
 Patch21:  freetype-1.4-disable-ft1-bci.patch
-Patch30:  freetype-2.1.9-lib64-fix.patch
+
+# CVS bug fixes, mostly for embolding
+Patch40:  freetype-2.1.10-cvsfixes.patch
+# put back internal API, used by xorg 
+Patch41:  freetype-2.1.10-xorgfix.patch
+# fix autofit render setup
+Patch42:  freetype-2.1.10-fixautofit.patch
+# fix memleak
+Patch43:  freetype-2.1.10-memleak.patch
+# fix kerning wrongly disabled
+Patch44:  freetype-2.1.10-fixkerning.patch
+# fix bad anti-aliasing 
+Patch45:  freetype-2.1.10-fixaliasing.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: automake autoconf >= 2.59 libtool symlinks zlib-devel xorg-x11-devel
@@ -120,9 +132,14 @@ aclocal
 autoconf
 popd
 
-# freetype-config --libs gives you a nasty --rpath in the output on 64
-# bit platforms because it doesn't know about /usr/lib64.
-%patch30 -p1 -b .lib64-fix
+# Assorted fixes for 2.1.10 (thanks to Frederic Crozat)
+%patch40 -p1 -b .cvsfixes
+%patch41 -p1 -b .xorgfix
+%patch42 -p1 -b .fixautofit
+%patch43 -p1 -b .memleak
+%patch44 -p1 -b .fixkerning
+%patch45 -p1 -b .fixaliasing
+
 
 %build
 # Work around code generation problem with strict-aliasing
@@ -268,6 +285,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/
 
 %changelog
+* Fri Oct  7 2005 Matthias Clasen  <mclasen@redhat.com> 2.1.10-1
+- Update to 2.1.10
+- Add necessary fixes
+
 * Tue Aug 16 2005 Kristian Høgsberg <krh@redhat.com> 2.1.9-4
 - Fix freetype-config on 64 bit platforms.
 
diff --git a/sources b/sources
index 7b5de03..0f9e95c 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-ec1b903e4be5f073caa72458ea58c29c  freetype-2.1.9.tar.bz2
 609f25b80f9e2c25349127813e10386c  freetype-pre1.4.tar.bz2
-43ca06d7a926d07db4bbb1885c4a2971  ft2demos-2.1.9.tar.bz2
-db77177afe35955f55bcaa2953724b78  ftdocs-2.1.9.tar.bz2
+a4012e7d1f6400df44a16743b11b8423  freetype-2.1.10.tar.bz2
+10608a55ee9ee12e29ba3d705318e61d  freetype-doc-2.1.10.tar.bz2
+4edaff5721fedcf1932e76935f3029b3  ft2demos-2.1.10.tar.bz2