Revision: 6697
http://ipcop.svn.sourceforge.net/ipcop/?rev=6697&view=rev
Author: gespinasse
Date: 2012-07-09 06:28:49 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
My patch to fix the strict-aliasinhg warning has been accepted upstream,
slightly modified
Modified Paths:
--------------
ipcop/trunk/lfs/freetype
Added Paths:
-----------
ipcop/trunk/src/patches/freetype-2.4.10_strict-aliasing.patch
Modified: ipcop/trunk/lfs/freetype
===================================================================
--- ipcop/trunk/lfs/freetype 2012-07-09 04:56:18 UTC (rev 6696)
+++ ipcop/trunk/lfs/freetype 2012-07-09 06:28:49 UTC (rev 6697)
@@ -81,6 +81,8 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ # Fix include in upstream tree, drop after 2.4.10
+ cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_strict-aliasing.patch
# configuration may have three stages
# 1 select modules in modules.cfg (look to have priority to next
ftoption.h)
Added: ipcop/trunk/src/patches/freetype-2.4.10_strict-aliasing.patch
===================================================================
--- ipcop/trunk/src/patches/freetype-2.4.10_strict-aliasing.patch
(rev 0)
+++ ipcop/trunk/src/patches/freetype-2.4.10_strict-aliasing.patch
2012-07-09 06:28:49 UTC (rev 6697)
@@ -0,0 +1,38 @@
+Fix include in upstream tree, drop after 2.4.10
+
+diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c
+index 591b57a..7363c7d 100644
+--- a/src/base/ftglyph.c
++++ b/src/base/ftglyph.c
+@@ -4,7 +4,7 @@
+ /* */
+ /* FreeType convenience functions to handle glyphs (body). */
+ /* */
+-/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2007, 2008, 2010 by */
++/* Copyright 1996-2005, 2007, 2008, 2010, 2012 by */
+ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
+ /* */
+ /* This file is part of the FreeType project, and may only be used, */
+@@ -510,7 +510,7 @@
+ FT_GlyphSlotRec dummy;
+ FT_GlyphSlot_InternalRec dummy_internal;
+ FT_Error error = FT_Err_Ok;
+- FT_Glyph glyph;
++ FT_Glyph b, glyph;
+ FT_BitmapGlyph bitmap = NULL;
+ const FT_Glyph_Class* clazz;
+
+@@ -547,10 +547,10 @@
+ dummy.format = clazz->glyph_format;
+
+ /* create result bitmap glyph */
+- error = ft_new_glyph( library, FT_BITMAP_GLYPH_CLASS_GET,
+- (FT_Glyph*)(void*)&bitmap );
++ error = ft_new_glyph( library, FT_BITMAP_GLYPH_CLASS_GET, &b );
+ if ( error )
+ goto Exit;
++ bitmap = (FT_BitmapGlyph)b;
+
+ #if 1
+ /* if `origin' is set, translate the glyph image */
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
