rpms/freetype-freeworld/F-11 freetype-2.3.9-aliasing.patch, NONE, 1.1 freetype-freeworld.spec, 1.6, 1.7

[Kevin Kofler]

Author: kkofler

Update of /cvs/free/rpms/freetype-freeworld/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23985/F-11

Modified Files:
	freetype-freeworld.spec 
Added Files:
	freetype-2.3.9-aliasing.patch 
Log Message:
* Tue Jul 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.3.9-3
- Add freetype-2.3.9-aliasing.patch to fix Navit crash (rh#513582)

freetype-2.3.9-aliasing.patch:

--- NEW FILE freetype-2.3.9-aliasing.patch ---
--- 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 */


Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/F-11/freetype-freeworld.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- freetype-freeworld.spec	28 Mar 2009 03:11:45 -0000	1.6
+++ freetype-freeworld.spec	28 Jul 2009 00:06:16 -0000	1.7
@@ -8,7 +8,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype-freeworld
 Version: 2.3.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: FTL or GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -24,6 +24,9 @@
 # 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)
 
 %if !0%{?without_bytecode_interpreter}
@@ -78,6 +81,7 @@
 %patch46  -p1 -b .enable-valid
 
 %patch89 -p1 -b .memcpy
+%patch90 -p1 -b .aliasing
 
 %build
 
@@ -127,6 +131,9 @@
 %config(noreplace) %{_sysconfdir}/fonts/conf.d/*.conf
 
 %changelog
+* Tue Jul 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.3.9-3
+- Add freetype-2.3.9-aliasing.patch to fix Navit crash (rh#513582)
+
 * Sat Mar 28 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.3.9-2
 - Provides freetype-bytecode and freetype-subpixel (rh#155210)