From d088175043bc71e571733070a57d7e959bf1d66b Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@fedoraproject.org>
Date: Oct 08 2009 23:47:28 +0000
Subject: - Drop freetype-2.3.9-aliasing.patch

- Update to 2.3.10.

---

diff --git a/.cvsignore b/.cvsignore
index 45331b1..1139a56 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-freetype-2.3.9.tar.bz2
-freetype-doc-2.3.9.tar.bz2
-ft2demos-2.3.9.tar.bz2
+freetype-doc-2.3.10.tar.bz2
+ft2demos-2.3.10.tar.bz2
+freetype-2.3.10.tar.bz2
diff --git a/freetype-2.3.9-aliasing.patch b/freetype-2.3.9-aliasing.patch
deleted file mode 100644
index e93603c..0000000
--- a/freetype-2.3.9-aliasing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- freetype-2.3.9.bak/src/cache/ftccache.h	2007-05-16 17:37:05.000000000 +0200
-+++ freetype-2.3.9/src/cache/ftccache.h	2009-07-02 14:54:10.000000000 +0200
-@@ -246,8 +246,7 @@
-     error = FTC_Cache_NewNode( _cache, _hash, query, &_node );           \
-                                                                          \
-   _Ok:                                                                   \
--    _pnode = (FTC_Node*)(void*)&(node);                                  \
--    *_pnode = _node;                                                     \
-+    node = _node;							 \
-   FT_END_STMNT
- 
- #else /* !FTC_INLINE */
diff --git a/freetype.spec b/freetype.spec
index 2844f2d..a063cda 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -8,8 +8,8 @@
 
 Summary: A free and portable font rendering engine
 Name: freetype
-Version: 2.3.9
-Release: 6%{?dist}
+Version: 2.3.10
+Release: 1%{?dist}
 License: FTL or GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -31,9 +31,6 @@ Patch88:  freetype-multilib.patch
 # Fix crash https://bugs.freedesktop.org/show_bug.cgi?id=6841
 Patch89:  freetype-2.2.1-memcpy-fix.patch
 
-# Fix aliasing issue
-Patch90: freetype-2.3.9-aliasing.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
 BuildRequires: libX11-devel
@@ -100,7 +97,6 @@ popd
 
 %patch88 -p1 -b .multilib
 %patch89 -p1 -b .memcpy
-%patch90 -p1 -b .aliasing
 
 %build
 
@@ -230,6 +226,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/tutorial
 
 %changelog
+* Thu Oct 08 2009 Behdad Esfahbod <behdad@redhat.com> 2.3.10-1
+- Drop freetype-2.3.9-aliasing.patch
+- Update to 2.3.10.
+
 * Thu Jul 30 2009 Behdad Esfahbod <behdad@redhat.com> 2.3.9-6
 - Add freetype-2.3.9-aliasing.patch
 - Resolves: 513582
diff --git a/sources b/sources
index 627f11c..317e40b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-d76233108aca9c9606cdbd341562ad9a  freetype-2.3.9.tar.bz2
-ddcb766f7c5abab0e7061dcf32a0268f  freetype-doc-2.3.9.tar.bz2
-144b4c750e91595154a66709c75fdf0d  ft2demos-2.3.9.tar.bz2
+9bdd83c5b6559bdfb68984f0b3d1dc8c  freetype-doc-2.3.10.tar.bz2
+e6d762885ecc8222774f5063a1605e45  ft2demos-2.3.10.tar.bz2
+b7a8a26cc137716a32b788664697d727  freetype-2.3.10.tar.bz2